use cli version for featureset detection

bcpeinhardt · bcpeinhardt · commit 2770ea71d904 · 2024-07-25T16:13:09.000Z
diff --git a/package.json b/package.json
@@ -304,5 +304,6 @@
     "semver": "7.6.2",
     "trim": "0.0.3",
     "word-wrap": "1.2.5"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/src/remote.ts b/src/remote.ts
@@ -12,6 +12,7 @@ import * as semver from "semver"
 import * as vscode from "vscode"
 import { makeCoderSdk, startWorkspace, waitForBuild } from "./api"
 import { extractAgents } from "./api-helper"
+import * as cli from "./cliManager"
 import { Commands } from "./commands"
 import { getHeaderCommand } from "./headers"
 import { SSHConfig, SSHValues, mergeSSHConfigValues } from "./sshConfig"
@@ -541,11 +542,28 @@ export class Remote {
     }
   }
 
+  /**
+   * Tries to get the install CLI version. If that fails, defaults
+   * to the remote coder version. For the most part these should be in sync.
+   */
+  private async probableCoderVersion(binaryPath: string): Promise<semver.SemVer | null> {
+    try {
+      const version = await cli.version(binaryPath)
+      const parsedVersion = semver.parse(version)
+      if (!parsedVersion) {
+        return this.coderVersion
+      }
+      return parsedVersion
+    } catch (e) {
+      return this.coderVersion
+    }
+  }
+
   /**
    * Format's the --log-dir argument for the ProxyCommand
    */
-  private async formatLogArg(): Promise<string> {
-    if (!supportsCoderAgentLogDirFlag(this.coderVersion)) {
+  private async formatLogArg(binpath: string): Promise<string> {
+    if (!supportsCoderAgentLogDirFlag(await this.probableCoderVersion(binpath))) {
       return ""
     }
 
@@ -659,7 +677,7 @@ export class Remote {
       Host: label ? `${AuthorityPrefix}.${label}--*` : `${AuthorityPrefix}--*`,
       ProxyCommand: `${escape(binaryPath)}${headerArg} vscodessh --network-info-dir ${escape(
         this.storage.getNetworkInfoPath(),
-      )}${await this.formatLogArg()} --session-token-file ${escape(this.storage.getSessionTokenPath(label))} --url-file ${escape(
+      )}${await this.formatLogArg(binaryPath)} --session-token-file ${escape(this.storage.getSessionTokenPath(label))} --url-file ${escape(
         this.storage.getUrlPath(label),
       )} %h`,
       ConnectTimeout: "0",

Original file line number	Diff line number	Diff line change
`@@ -304,5 +304,6 @@`
`304`	`304`	`"semver": "7.6.2",`
`305`	`305`	`"trim": "0.0.3",`
`306`	`306`	`"word-wrap": "1.2.5"`
`307`		`- }`
	`307`	`+ },`
	`308`	`+ "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"`
`308`	`309`	`}`