Merge branch 'main' into lilac/specify-header-command

Author: aslilac

CHANGELOG.md

@@ -2,6 +2,35 @@
 
 ## Unreleased
 
+## [v1.9.1](https://github.com/coder/vscode-coder/releases/tag/v1.9.1) 2025-05-27
+
+### Fixed
+
+- Missing or otherwise malformed `START CODER VSCODE` / `END CODER VSCODE`
+  blocks in `${HOME}/.ssh/config` will now result in an error when attempting to
+  update the file. These will need to be manually fixed before proceeding.
+- Multiple open instances of the extension could potentially clobber writes to
+  `~/.ssh/config`. Updates to this file are now atomic.
+- Add support for `anysphere.remote-ssh` Remote SSH extension.
+
+## [v1.9.0](https://github.com/coder/vscode-coder/releases/tag/v1.9.0) 2025-05-15
+
+### Fixed
+
+- The connection indicator will now show for VS Code on Windows, Windsurf, and
+  when using the `jeanp413.open-remote-ssh` extension.
+
+### Changed
+
+- The connection indicator now shows if connecting through Coder Desktop.
+
+## [v1.8.0](https://github.com/coder/vscode-coder/releases/tag/v1.8.0) (2025-04-22)
+
+### Added
+
+- Coder extension sidebar now displays available app statuses, and let's
+  the user click them to drop into a session with a running AI Agent.
+
 ## [v1.7.1](https://github.com/coder/vscode-coder/releases/tag/v1.7.1) (2025-04-14)
 
 ### Fixed

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.7.1",
+  "version": "1.9.1",
   "engines": {
     "vscode": "^1.73.0"
   },
@@ -204,6 +204,12 @@
         "title": "Coder: View Logs",
         "icon": "$(list-unordered)",
         "when": "coder.authenticated"
+      },
+      {
+        "command": "coder.openAppStatus",
+        "title": "Coder: Open App Status",
+        "icon": "$(robot)",
+        "when": "coder.authenticated"
       }
     ],
     "menus": {
@@ -277,14 +283,14 @@
   "devDependencies": {
     "@types/eventsource": "^3.0.0",
     "@types/glob": "^7.1.3",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "@types/node-forge": "^1.3.11",
     "@types/ua-parser-js": "^0.7.39",
     "@types/vscode": "^1.73.0",
     "@types/ws": "^8.18.1",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "@vscode/test-electron": "^2.4.1",
+    "@vscode/test-electron": "^2.5.2",
     "@vscode/vsce": "^2.21.1",
     "bufferutil": "^4.0.9",
     "coder": "https://github.com/coder/coder#main",
@@ -293,36 +299,36 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-md": "^1.0.19",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-prettier": "^5.4.0",
     "glob": "^10.4.2",
     "nyc": "^17.1.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.5.3",
     "ts-loader": "^9.5.1",
-    "tsc-watch": "^6.2.0",
+    "tsc-watch": "^6.2.1",
     "typescript": "^5.4.5",
     "utf-8-validate": "^6.0.5",
     "vitest": "^0.34.6",
     "vscode-test": "^1.5.0",
-    "webpack": "^5.98.0",
+    "webpack": "^5.99.6",
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
     "axios": "1.8.4",
     "date-fns": "^3.6.0",
     "eventsource": "^3.0.6",
-    "find-process": "^1.4.7",
+    "find-process": "https://github.com/coder/find-process#fix/sequoia-compat",
     "jsonc-parser": "^3.3.1",
-    "memfs": "^4.9.3",
+    "memfs": "^4.17.1",
     "node-forge": "^1.3.1",
     "pretty-bytes": "^6.1.1",
     "proxy-agent": "^6.4.0",
-    "semver": "^7.6.2",
-    "ua-parser-js": "^1.0.38",
-    "ws": "^8.18.1",
-    "zod": "^3.23.8"
+    "semver": "^7.7.1",
+    "ua-parser-js": "^2.0.3",
+    "ws": "^8.18.2",
+    "zod": "^3.25.1"
   },
   "resolutions": {
-    "semver": "7.6.2",
+    "semver": "7.7.1",
     "trim": "0.0.3",
     "word-wrap": "1.2.5"
   },

src/commands.ts

@@ -1,6 +1,7 @@
 import { Api } from "coder/site/src/api/api"
 import { getErrorMessage } from "coder/site/src/api/errors"
 import { User, Workspace, WorkspaceAgent } from "coder/site/src/api/typesGenerated"
+import path from "node:path"
 import * as vscode from "vscode"
 import { makeCoderSdk, needToken } from "./api"
 import { extractAgents } from "./api-helper"
@@ -407,6 +408,63 @@ export class Commands {
     }
   }
 
+  public async openAppStatus(app: {
+    name?: string
+    url?: string
+    agent_name?: string
+    command?: string
+    workspace_name: string
+  }): Promise<void> {
+    // Launch and run command in terminal if command is provided
+    if (app.command) {
+      return vscode.window.withProgress(
+        {
+          location: vscode.ProgressLocation.Notification,
+          title: `Connecting to AI Agent...`,
+          cancellable: false,
+        },
+        async () => {
+          const terminal = vscode.window.createTerminal(app.name)
+
+          // If workspace_name is provided, run coder ssh before the command
+
+          const url = this.storage.getUrl()
+          if (!url) {
+            throw new Error("No coder url found for sidebar")
+          }
+          const binary = await this.storage.fetchBinary(this.restClient, toSafeHost(url))
+          const escape = (str: string): string => `"${str.replace(/"/g, '\\"')}"`
+          terminal.sendText(
+            `${escape(binary)} ssh --global-config ${escape(
+              path.dirname(this.storage.getSessionTokenPath(toSafeHost(url))),
+            )} ${app.workspace_name}`,
+          )
+          await new Promise((resolve) => setTimeout(resolve, 5000))
+          terminal.sendText(app.command ?? "")
+          terminal.show(false)
+        },
+      )
+    }
+    // Check if app has a URL to open
+    if (app.url) {
+      return vscode.window.withProgress(
+        {
+          location: vscode.ProgressLocation.Notification,
+          title: `Opening ${app.name || "application"} in browser...`,
+          cancellable: false,
+        },
+        async () => {
+          await vscode.env.openExternal(vscode.Uri.parse(app.url!))
+        },
+      )
+    }
+
+    // If no URL or command, show information about the app status
+    vscode.window.showInformationMessage(`${app.name}`, {
+      detail: `Agent: ${app.agent_name || "Unknown"}`,
+    })
+  }
+
   /**
    * Open a workspace belonging to the currently logged-in deployment.
    *

src/extension.ts

@@ -24,6 +24,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   const remoteSSHExtension =
     vscode.extensions.getExtension("jeanp413.open-remote-ssh") ||
     vscode.extensions.getExtension("codeium.windsurf-remote-openssh") ||
+    vscode.extensions.getExtension("anysphere.remote-ssh") ||
     vscode.extensions.getExtension("ms-vscode-remote.remote-ssh")
   if (!remoteSSHExtension) {
     vscode.window.showErrorMessage("Remote SSH extension not found, cannot activate Coder extension")
@@ -181,6 +182,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   vscode.commands.registerCommand("coder.open", commands.open.bind(commands))
   vscode.commands.registerCommand("coder.openDevContainer", commands.openDevContainer.bind(commands))
   vscode.commands.registerCommand("coder.openFromSidebar", commands.openFromSidebar.bind(commands))
+  vscode.commands.registerCommand("coder.openAppStatus", commands.openAppStatus.bind(commands))
   vscode.commands.registerCommand("coder.workspace.update", commands.updateWorkspace.bind(commands))
   vscode.commands.registerCommand("coder.createWorkspace", commands.createWorkspace.bind(commands))
   vscode.commands.registerCommand("coder.navigateToWorkspace", commands.navigateToWorkspace.bind(commands))

src/remote.ts

@@ -19,7 +19,7 @@ import { Inbox } from "./inbox"
 import { SSHConfig, SSHValues, mergeSSHConfigValues } from "./sshConfig"
 import { computeSSHProperties, sshSupportsSetEnv } from "./sshSupport"
 import { Storage } from "./storage"
-import { AuthorityPrefix, escapeCommandArg, expandPath, parseRemoteAuthority } from "./util"
+import { AuthorityPrefix, escapeCommandArg, expandPath, findPort, parseRemoteAuthority } from "./util"
 import { WorkspaceMonitor } from "./workspaceMonitor"
 
 export interface RemoteDetails extends vscode.Disposable {
@@ -684,8 +684,18 @@ export class Remote {
       derp_latency: { [key: string]: number }
       upload_bytes_sec: number
       download_bytes_sec: number
+      using_coder_connect: boolean
     }) => {
       let statusText = "$(globe) "
+
+      // Coder Connect doesn't populate any other stats
+      if (network.using_coder_connect) {
+        networkStatus.text = statusText + "Coder Connect "
+        networkStatus.tooltip = "You're connected using Coder Connect."
+        networkStatus.show()
+        return
+      }
+
       if (network.p2p) {
         statusText += "Direct "
         networkStatus.tooltip = "You're connected peer-to-peer ✨."
@@ -769,14 +779,7 @@ export class Remote {
       // this to find the SSH process that is powering this connection. That SSH
       // process will be logging network information periodically to a file.
       const text = await fs.readFile(logPath, "utf8")
-      const matches = text.match(/-> socksPort (\d+) ->/)
-      if (!matches) {
-        return
-      }
-      if (matches.length < 2) {
-        return
-      }
-      const port = Number.parseInt(matches[1])
+      const port = await findPort(text)
       if (!port) {
         return
       }