Merge branch 'main' into dm-coder-inbox-oom-ood

Author: DanielleMaywood

CHANGELOG.md

@@ -2,10 +2,19 @@
 
 ## Unreleased
 
+### Changed
+
+- Make the MS Remote SSH extension part of an extension pack rather than a hard dependency, to enable
+  using the plugin in other VSCode likes (cursor, windsurf, etc.)
+
+## [v1.4.2](https://github.com/coder/vscode-coder/releases/tag/v1.4.2) (2025-03-07)
+
 ### Fixed
 
 - Remove agent singleton so that client TLS certificates are reloaded on every API request.
 - Use Axios client to receive event stream so TLS settings are properly applied.
+- Set `usage-app=vscode` on `coder ssh` to fix deployment session counting.
+- Fix version comparison logic for checking wildcard support in "coder ssh"
 
 ## [v1.4.1](https://github.com/coder/vscode-coder/releases/tag/v1.4.1) (2025-02-19)
 

CLAUDE.md

@@ -0,0 +1,26 @@
+# Coder Extension Development Guidelines
+
+## Build and Test Commands
+
+- Build: `yarn build`
+- Watch mode: `yarn watch`
+- Package: `yarn package`
+- Lint: `yarn lint`
+- Lint with auto-fix: `yarn lint:fix`
+- Run all tests: `yarn test`
+- Run specific test: `vitest ./src/filename.test.ts`
+- CI test mode: `yarn test:ci`
+
+## Code Style Guidelines
+
+- TypeScript with strict typing
+- No semicolons (see `.prettierrc`)
+- Trailing commas for all multi-line lists
+- 120 character line width
+- Use ES6 features (arrow functions, destructuring, etc.)
+- Use `const` by default; `let` only when necessary
+- Prefix unused variables with underscore (e.g., `_unused`)
+- Sort imports alphabetically in groups: external → parent → sibling
+- Error handling: wrap and type errors appropriately
+- Use async/await for promises, avoid explicit Promise construction where possible
+- Test files must be named `*.test.ts` and use Vitest

CONTRIBUTING.md

@@ -125,11 +125,14 @@ Some dependencies are not directly used in the source but are required anyway.
 - `glob`, `nyc`, `vscode-test`, and `@vscode/test-electron` are currently unused
   but we need to switch back to them from `vitest`.
 
+The coder client is vendored from coder/coder. Every now and then, we should be running `yarn upgrade coder --latest`
+to make sure we're using up to date versions of the client.
+
 ## Releasing
 
 1. Check that the changelog lists all the important changes.
 2. Update the package.json version and add a version heading to the changelog.
 3. Push a tag matching the new package.json version.
 4. Update the resulting draft release with the changelog contents.
 5. Publish the draft release.
-6. Download the `.vsix` file from the release and upload to the marketplace.
+6. Download the `.vsix` file from the release and upload to both the [official VS Code Extension Marketplace](https://code.visualstudio.com/api/working-with-extensions/publishing-extension), and the [open-source VSX Registry](https://open-vsx.org/).

README.md

@@ -4,14 +4,20 @@
 [!["Join us on
 Discord"](https://badgen.net/discord/online-members/coder)](https://coder.com/chat?utm_source=github.com/coder/vscode-coder&utm_medium=github&utm_campaign=readme.md)
 
-The Coder Remote VS Code extension lets you open
-[Coder](https://github.com/coder/coder) workspaces with a single click.
+The Coder Remote extension lets you open [Coder](https://github.com/coder/coder)
+workspaces with a single click.
 
 - Open workspaces from the dashboard in a single click.
 - Automatically start workspaces when opened.
-- No command-line or local dependencies required - just install VS Code!
+- No command-line or local dependencies required - just install your editor!
 - Works in air-gapped or restricted networks. Just connect to your Coder
   deployment!
+- Supports multiple editors: VS Code, Cursor, and Windsurf.
+  > [!NOTE]  
+  > The extension builds on VSCode provided implementations of SSH. Make sure
+  > you have the correct ssh extension installed for your editor
+  > (ms-vscode-remote.remote-ssh or codeium.windsurf-remote-openssh for
+  > windsurf)
 
 ![Demo](https://github.com/coder/vscode-coder/raw/main/demo.gif?raw=true)
 

package.json

@@ -4,7 +4,7 @@
   "displayName": "Coder",
   "description": "Open any workspace with a single click.",
   "repository": "https://github.com/coder/vscode-coder",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "engines": {
     "vscode": "^1.73.0"
   },
@@ -24,14 +24,14 @@
   "categories": [
     "Other"
   ],
+  "extensionPack": [
+    "ms-vscode-remote.remote-ssh"
+  ],
   "activationEvents": [
     "onResolveRemoteAuthority:ssh-remote",
     "onCommand:coder.connect",
     "onUri"
   ],
-  "extensionDependencies": [
-    "ms-vscode-remote.remote-ssh"
-  ],
   "main": "./dist/extension.js",
   "contributes": {
     "configuration": {

src/api.ts

@@ -225,7 +225,7 @@ export async function waitForBuild(
   }
 
   // This fetches the initial bunch of logs.
-  const logs = await restClient.getWorkspaceBuildLogs(workspace.latest_build.id, new Date())
+  const logs = await restClient.getWorkspaceBuildLogs(workspace.latest_build.id)
   logs.forEach((log) => writeEmitter.fire(log.output + "\r\n"))
 
   // This follows the logs for new activity!

src/extension.ts

@@ -19,13 +19,13 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   // This is janky, but that's alright since it provides such minimal
   // functionality to the extension.
   //
-  // Prefer the anysphere.open-remote-ssh extension if it exists.  This makes
-  // our extension compatible with Cursor.  Otherwise fall back to the official
-  // SSH extension.
+  // Cursor and VSCode are covered by ms remote, and the only other is windsurf for now
+  // Means that vscodium is not supported by this for now
   const remoteSSHExtension =
-    vscode.extensions.getExtension("anysphere.open-remote-ssh") ||
+    vscode.extensions.getExtension("codeium.windsurf-remote-openssh") ||
     vscode.extensions.getExtension("ms-vscode-remote.remote-ssh")
   if (!remoteSSHExtension) {
+    vscode.window.showErrorMessage("Remote SSH extension not found, cannot activate Coder extension")
     throw new Error("Remote SSH extension not found")
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/featureSet.test.ts

@@ -11,4 +11,12 @@ describe("check version support", () => {
       expect(featureSetForVersion(semver.parse(v)).proxyLogDirectory).toBeTruthy()
     })
   })
+  it("wildcard ssh", () => {
+    ;["v1.3.3+e491217", "v2.3.3+e491217"].forEach((v: string) => {
+      expect(featureSetForVersion(semver.parse(v)).wildcardSSH).toBeFalsy()
+    })
+    ;["v2.19.0", "v2.19.1", "v2.20.0+e491217", "v5.0.4+e491217"].forEach((v: string) => {
+      expect(featureSetForVersion(semver.parse(v)).wildcardSSH).toBeTruthy()
+    })
+  })
 })

src/featureSet.ts

@@ -22,6 +22,6 @@ export function featureSetForVersion(version: semver.SemVer | null): FeatureSet
     // If this check didn't exist, VS Code connections would fail on
     // older versions because of an unknown CLI argument.
     proxyLogDirectory: (version?.compare("2.3.3") || 0) > 0 || version?.prerelease[0] === "devel",
-    wildcardSSH: (version?.compare("2.19.0") || 0) > 0 || version?.prerelease[0] === "devel",
+    wildcardSSH: (version ? version.compare("2.19.0") : -1) >= 0 || version?.prerelease[0] === "devel",
   }
 }

src/remote.ts

@@ -633,7 +633,7 @@ export class Remote {
     const proxyCommand = featureSet.wildcardSSH
       ? `${escape(binaryPath)}${headerArg} --global-config ${escape(
           path.dirname(this.storage.getSessionTokenPath(label)),
-        )} ssh --stdio --network-info-dir ${escape(this.storage.getNetworkInfoPath())}${await this.formatLogArg(logDir)} --ssh-host-prefix ${hostPrefix} %h`
+        )} ssh --stdio --usage-app=vscode --network-info-dir ${escape(this.storage.getNetworkInfoPath())}${await this.formatLogArg(logDir)} --ssh-host-prefix ${hostPrefix} %h`
       : `${escape(binaryPath)}${headerArg} vscodessh --network-info-dir ${escape(
           this.storage.getNetworkInfoPath(),
         )}${await this.formatLogArg(logDir)} --session-token-file ${escape(this.storage.getSessionTokenPath(label))} --url-file ${escape(