Merge branch 'main' into add-agent-metadata-statusbar

EhabY · web-flow · commit 3415626dd397 · 2025-07-25T01:10:35.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@
   update notifications.
 - Coder output panel enhancements: All log entries now include timestamps, and you
   can filter messages by log level in the panel.
+- Consistently use the same session for each agent. Previously,
+  depending on how you connected, it could be possible to get two
+  different sessions for an agent. Existing connections may still
+  have this problem, only new connections are fixed.
 - Added an agent metadata monitor status bar item, so you can view your active
   agent metadata at a glance.
 
diff --git a/package.json b/package.json
@@ -289,8 +289,8 @@
 		"jsonc-parser": "^3.3.1",
 		"memfs": "^4.17.1",
 		"node-forge": "^1.3.1",
-		"pretty-bytes": "^6.1.1",
-		"proxy-agent": "^6.4.0",
+		"pretty-bytes": "^7.0.0",
+		"proxy-agent": "^6.5.0",
 		"semver": "^7.7.1",
 		"ua-parser-js": "1.0.40",
 		"ws": "^8.18.2",
@@ -308,7 +308,7 @@
 		"@typescript-eslint/parser": "^6.21.0",
 		"@vscode/test-cli": "^0.0.10",
 		"@vscode/test-electron": "^2.5.2",
-		"@vscode/vsce": "^2.21.1",
+		"@vscode/vsce": "^3.6.0",
 		"bufferutil": "^4.0.9",
 		"coder": "https://github.com/coder/coder#main",
 		"dayjs": "^1.11.13",
@@ -323,8 +323,7 @@
 		"nyc": "^17.1.0",
 		"prettier": "^3.5.3",
 		"ts-loader": "^9.5.1",
-		"tsc-watch": "^6.2.1",
-		"typescript": "^5.4.5",
+		"typescript": "^5.8.3",
 		"utf-8-validate": "^6.0.5",
 		"vitest": "^0.34.6",
 		"vscode-test": "^1.5.0",
diff --git a/src/commands.ts b/src/commands.ts
@@ -437,12 +437,15 @@ export class Commands {
 			if (!baseUrl) {
 				throw new Error("You are not logged in");
 			}
+			if (treeItem.primaryAgentName === undefined) {
+				return;
+			}
 			await openWorkspace(
 				baseUrl,
 				treeItem.workspaceOwner,
 				treeItem.workspaceName,
-				treeItem.workspaceAgent,
-				treeItem.workspaceFolderPath,
+				treeItem.primaryAgentName,
+				treeItem.primaryAgentFolderPath,
 				true,
 			);
 		} else {
@@ -525,6 +528,8 @@ export class Commands {
 		let folderPath: string | undefined;
 		let openRecent: boolean | undefined;
 
+		let workspace: Workspace | undefined;
+
 		const baseUrl = this.restClient.getAxiosInstance().defaults.baseURL;
 		if (!baseUrl) {
 			throw new Error("You are not logged in");
@@ -571,7 +576,7 @@ export class Commands {
 					});
 			});
 			quickPick.show();
-			const workspace = await new Promise<Workspace | undefined>((resolve) => {
+			workspace = await new Promise<Workspace | undefined>((resolve) => {
 				quickPick.onDidHide(() => {
 					resolve(undefined);
 				});
@@ -590,20 +595,31 @@ export class Commands {
 			}
 			workspaceOwner = workspace.owner_name;
 			workspaceName = workspace.name;
+		} else {
+			workspaceOwner = args[0] as string;
+			workspaceName = args[1] as string;
+			workspaceAgent = args[2] as string | undefined;
+			folderPath = args[3] as string | undefined;
+			openRecent = args[4] as boolean | undefined;
+		}
+
+		if (!workspaceAgent) {
+			if (workspace === undefined) {
+				workspace = await this.restClient.getWorkspaceByOwnerAndName(
+					workspaceOwner,
+					workspaceName,
+				);
+			}
 
 			const agent = await this.maybeAskAgent(workspace);
 			if (!agent) {
 				// User declined to pick an agent.
 				return;
 			}
-			folderPath = agent.expanded_directory;
+			if (!folderPath) {
+				folderPath = agent.expanded_directory;
+			}
 			workspaceAgent = agent.name;
-		} else {
-			workspaceOwner = args[0] as string;
-			workspaceName = args[1] as string;
-			workspaceAgent = args[2] as string | undefined;
-			folderPath = args[3] as string | undefined;
-			openRecent = args[4] as boolean | undefined;
 		}
 
 		await openWorkspace(
@@ -679,7 +695,7 @@ async function openWorkspace(
 	baseUrl: string,
 	workspaceOwner: string,
 	workspaceName: string,
-	workspaceAgent: string | undefined,
+	workspaceAgent: string,
 	folderPath: string | undefined,
 	openRecent: boolean | undefined,
 ) {
diff --git a/src/workspacesProvider.ts b/src/workspacesProvider.ts
@@ -379,8 +379,8 @@ export class OpenableTreeItem extends vscode.TreeItem {
 
 		public readonly workspaceOwner: string,
 		public readonly workspaceName: string,
-		public readonly workspaceAgent: string | undefined,
-		public readonly workspaceFolderPath: string | undefined,
+		public readonly primaryAgentName: string | undefined,
+		public readonly primaryAgentFolderPath: string | undefined,
 
 		contextValue: CoderOpenableTreeItemType,
 	) {
@@ -419,7 +419,7 @@ class AgentTreeItem extends OpenableTreeItem {
 	}
 }
 
-export class WorkspaceTreeItem extends OpenableTreeItem {
+class WorkspaceTreeItem extends OpenableTreeItem {
 	public appStatus: {
 		name: string;
 		url?: string;
@@ -452,7 +452,7 @@ export class WorkspaceTreeItem extends OpenableTreeItem {
 				: vscode.TreeItemCollapsibleState.Expanded,
 			workspace.owner_name,
 			workspace.name,
-			undefined,
+			agents[0]?.name,
 			agents[0]?.expanded_directory,
 			agents.length > 1
 				? "coderWorkspaceMultipleAgents"
diff --git a/tsconfig.json b/tsconfig.json
@@ -10,7 +10,14 @@
 		"strict": true,
 		"esModuleInterop": true,
 		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true
+		"forceConsistentCasingInFileNames": true,
+		"paths": {
+			// axios contains both an index.d.ts and index.d.cts which apparently have
+			// conflicting types.  For some reason TypeScript is reading both and
+			// throwing errors about AxiosInstance not being compatible with
+			// AxiosInstance.  This ensures we use only index.d.ts.
+			"axios": ["./node_modules/axios/index.d.ts"]
+		}
 	},
 	"exclude": ["node_modules"],
 	"include": ["src/**/*"]
diff --git a/yarn.lock b/yarn.lock
