Skip to content

Commit af14ff3

Browse files
jaggederestclaude
jaggederest
and
claude
committed
Merge main and move integration tests to src/test
- Resolved merge conflicts from main branch - Moved integration tests from src/test/integration to src/test for consistency - Updated logo assets and package dependencies 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
2 parents a9db00f + 0c73c83 commit af14ff3

17 files changed

+196
-11
lines changed

‎.git-blame-ignore-revs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# If you would like `git blame` to ignore commits from this file, run:
2+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
3+
4+
# chore: simplify prettier config (#528)
5+
f785902f3ad20d54344cc1107285c2a66299c7f6

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22

33
## Unreleased
44

5+
## [v1.9.2](https://github.com/coder/vscode-coder/releases/tag/v1.9.2) 2025-06-25
6+
57
### Fixed
68

79
- Use `--header-command` properly when starting a workspace.
810

11+
- Handle `agent` parameter when opening workspace.
12+
13+
### Changed
14+
15+
- The Coder logo has been updated.
16+
917
## [v1.9.1](https://github.com/coder/vscode-coder/releases/tag/v1.9.1) 2025-05-27
1018

1119
### Fixed

‎media/logo-black.svg

Lines changed: 17 additions & 0 deletions
Loading

‎media/logo-white.svg

Lines changed: 19 additions & 0 deletions
Loading

‎media/logo.png

-1.1 KB
Loading

‎media/logo.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "coder-remote",
33
"displayName": "Coder",
4-
"version": "1.9.1",
4+
"version": "1.9.2",
55
"description": "Open any workspace with a single click.",
66
"categories": [
77
"Other"
@@ -26,8 +26,8 @@
2626
"package": "webpack --mode production --devtool hidden-source-map",
2727
"package:prerelease": "npx vsce package --pre-release",
2828
"pretest": "tsc -p . --outDir out && yarn run build && yarn run lint",
29-
"test": "yarn lint:fix && vitest",
30-
"test:ci": "yarn lint:fix && CI=true yarn test",
29+
"test": "vitest",
30+
"test:ci": "CI=true yarn test",
3131
"test:integration": "vscode-test",
3232
"vscode:prepublish": "yarn package",
3333
"watch": "webpack --watch"
@@ -133,7 +133,7 @@
133133
{
134134
"id": "coder",
135135
"title": "Coder Remote",
136-
"icon": "media/logo.svg"
136+
"icon": "media/logo-white.svg"
137137
}
138138
]
139139
},
@@ -143,13 +143,13 @@
143143
"id": "myWorkspaces",
144144
"name": "My Workspaces",
145145
"visibility": "visible",
146-
"icon": "media/logo.svg"
146+
"icon": "media/logo-white.svg"
147147
},
148148
{
149149
"id": "allWorkspaces",
150150
"name": "All Workspaces",
151151
"visibility": "visible",
152-
"icon": "media/logo.svg",
152+
"icon": "media/logo-white.svg",
153153
"when": "coder.authenticated && coder.isOwner"
154154
}
155155
]

‎src/commands.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ export class Commands {
599599
} else {
600600
workspaceOwner = args[0] as string;
601601
workspaceName = args[1] as string;
602-
// workspaceAgent is reserved for args[2], but multiple agents aren't supported yet.
602+
workspaceAgent = args[2] as string | undefined;
603603
folderPath = args[3] as string | undefined;
604604
openRecent = args[4] as boolean | undefined;
605605
}
@@ -627,7 +627,7 @@ export class Commands {
627627

628628
const workspaceOwner = args[0] as string;
629629
const workspaceName = args[1] as string;
630-
const workspaceAgent = undefined; // args[2] is reserved, but we do not support multiple agents yet.
630+
const workspaceAgent = args[2] as string;
631631
const devContainerName = args[3] as string;
632632
const devContainerFolder = args[4] as string;
633633

@@ -747,7 +747,7 @@ async function openDevContainer(
747747
baseUrl: string,
748748
workspaceOwner: string,
749749
workspaceName: string,
750-
workspaceAgent: string | undefined,
750+
workspaceAgent: string,
751751
devContainerName: string,
752752
devContainerFolder: string,
753753
) {

‎src/extension.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ export function setupRemoteSSHExtension(): {
1414
vscodeProposed: typeof vscode;
1515
remoteSSHExtension: vscode.Extension<unknown> | undefined;
1616
} {
17+
// The Remote SSH extension's proposed APIs are used to override the SSH host
18+
// name in VS Code itself. It's visually unappealing having a lengthy name!
19+
//
20+
// This is janky, but that's alright since it provides such minimal
21+
// functionality to the extension.
22+
//
23+
// Cursor and VSCode are covered by ms remote, and the only other is windsurf for now
24+
// Means that vscodium is not supported by this for now
1725
const remoteSSHExtension =
1826
vscode.extensions.getExtension("jeanp413.open-remote-ssh") ||
1927
vscode.extensions.getExtension("codeium.windsurf-remote-openssh") ||

‎src/remote.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ export class Remote {
919919
this.storage.writeToCoderOutputChannel(
920920
`SSH proxy diagnostics are being written to ${logDir}`,
921921
);
922-
return ` --log-dir ${escape(logDir)}`;
922+
return ` --log-dir ${escapeCommandArg(logDir)}`;
923923
}
924924

925925
// updateSSHConfig updates the SSH configuration with a wildcard that handles

‎src/test/integration/app-status-logs.test.ts renamed to ‎src/test/app-status-logs.test.ts

File renamed without changes.

‎src/test/integration/authentication.test.ts renamed to ‎src/test/authentication.test.ts

File renamed without changes.

‎src/test/integration/cli-integration.test.ts renamed to ‎src/test/cli-integration.test.ts

File renamed without changes.

‎src/test/integration/index.test.ts renamed to ‎src/test/index.test.ts

File renamed without changes.

‎src/test/integration/uri-handler.test.ts renamed to ‎src/test/uri-handler.test.ts

File renamed without changes.

‎src/test/integration/workspace-operations.test.ts renamed to ‎src/test/workspace-operations.test.ts

File renamed without changes.

0 commit comments

Comments
 (0)