Commit0e9fb55

authored

Ensure an agent is always set when opening a workspace (#552)

This guarantees we open the same session each time, even if you click on the workspace rather than a specific agent.

1 parent2d7dac8 commit0e9fb55Copy full SHA for 0e9fb55

File tree

3 files changed

+35

-15

lines changed

3 files changed

+35

-15

lines changed

`‎CHANGELOG.md‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,10 @@`
`8`	`8`	`update notifications.`
`9`	`9`	`- Coder output panel enhancements: All log entries now include timestamps, and you`
`10`	`10`	`can filter messages by log level in the panel.`
	`11`	`+- Consistently use the same session for each agent. Previously,`
	`12`	`+ depending on how you connected, it could be possible to get two`
	`13`	`+ different sessions for an agent. Existing connections may still`
	`14`	`+ have this problem, only new connections are fixed.`
`11`	`15`
`12`	`16`	`##[v1.9.2](https://github.com/coder/vscode-coder/releases/tag/v1.9.2) 2025-06-25`
`13`	`17`

`‎src/commands.ts‎`

Lines changed: 27 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -437,12 +437,15 @@ export class Commands {`
`437`	`437`	`if(!baseUrl){`
`438`	`438`	`thrownewError("You are not logged in");`
`439`	`439`	`}`
	`440`	`+if(treeItem.primaryAgentName===undefined){`
	`441`	`+return;`
	`442`	`+}`
`440`	`443`	`awaitopenWorkspace(`
`441`	`444`	`baseUrl,`
`442`	`445`	`treeItem.workspaceOwner,`
`443`	`446`	`treeItem.workspaceName,`
`444`		`-treeItem.workspaceAgent,`
`445`		`-treeItem.workspaceFolderPath,`
	`447`	`+treeItem.primaryAgentName,`
	`448`	`+treeItem.primaryAgentFolderPath,`
`446`	`449`	`true,`
`447`	`450`	`);`
`448`	`451`	`}else{`
`@@ -525,6 +528,8 @@ export class Commands {`
`525`	`528`	`letfolderPath:string\|undefined;`
`526`	`529`	`letopenRecent:boolean\|undefined;`
`527`	`530`
	`531`	`+letworkspace:Workspace\|undefined;`
	`532`	`+`
`528`	`533`	`constbaseUrl=this.restClient.getAxiosInstance().defaults.baseURL;`
`529`	`534`	`if(!baseUrl){`
`530`	`535`	`thrownewError("You are not logged in");`
`@@ -571,7 +576,7 @@ export class Commands {`
`571`	`576`	`});`
`572`	`577`	`});`
`573`	`578`	`quickPick.show();`
`574`		`-constworkspace=awaitnewPromise<Workspace\|undefined>((resolve)=>{`
	`579`	`+workspace=awaitnewPromise<Workspace\|undefined>((resolve)=>{`
`575`	`580`	`quickPick.onDidHide(()=>{`
`576`	`581`	`resolve(undefined);`
`577`	`582`	`});`
`@@ -590,20 +595,31 @@ export class Commands {`
`590`	`595`	`}`
`591`	`596`	`workspaceOwner=workspace.owner_name;`
`592`	`597`	`workspaceName=workspace.name;`
	`598`	`+}else{`
	`599`	`+workspaceOwner=args[0]asstring;`
	`600`	`+workspaceName=args[1]asstring;`
	`601`	`+workspaceAgent=args[2]asstring\|undefined;`
	`602`	`+folderPath=args[3]asstring\|undefined;`
	`603`	`+openRecent=args[4]asboolean\|undefined;`
	`604`	`+}`
	`605`	`+`
	`606`	`+if(!workspaceAgent){`
	`607`	`+if(workspace===undefined){`
	`608`	`+workspace=awaitthis.restClient.getWorkspaceByOwnerAndName(`
	`609`	`+workspaceOwner,`
	`610`	`+workspaceName,`
	`611`	`+);`
	`612`	`+}`
`593`	`613`
`594`	`614`	`constagent=awaitthis.maybeAskAgent(workspace);`
`595`	`615`	`if(!agent){`
`596`	`616`	`// User declined to pick an agent.`
`597`	`617`	`return;`
`598`	`618`	`}`
`599`		`-folderPath=agent.expanded_directory;`
	`619`	`+if(!folderPath){`
	`620`	`+folderPath=agent.expanded_directory;`
	`621`	`+}`
`600`	`622`	`workspaceAgent=agent.name;`
`601`		`-}else{`
`602`		`-workspaceOwner=args[0]asstring;`
`603`		`-workspaceName=args[1]asstring;`
`604`		`-workspaceAgent=args[2]asstring\|undefined;`
`605`		`-folderPath=args[3]asstring\|undefined;`
`606`		`-openRecent=args[4]asboolean\|undefined;`
`607`	`623`	`}`
`608`	`624`
`609`	`625`	`awaitopenWorkspace(`
`@@ -679,7 +695,7 @@ async function openWorkspace(`
`679`	`695`	`baseUrl:string,`
`680`	`696`	`workspaceOwner:string,`
`681`	`697`	`workspaceName:string,`
`682`		`-workspaceAgent:string\|undefined,`
	`698`	`+workspaceAgent:string,`
`683`	`699`	`folderPath:string\|undefined,`
`684`	`700`	`openRecent:boolean\|undefined,`
`685`	`701`	`){`

`‎src/workspacesProvider.ts‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -436,8 +436,8 @@ export class OpenableTreeItem extends vscode.TreeItem {`
`436`	`436`
`437`	`437`	`publicreadonlyworkspaceOwner:string,`
`438`	`438`	`publicreadonlyworkspaceName:string,`
`439`		`-publicreadonlyworkspaceAgent:string\|undefined,`
`440`		`-publicreadonlyworkspaceFolderPath:string\|undefined,`
	`439`	`+publicreadonlyprimaryAgentName:string\|undefined,`
	`440`	`+publicreadonlyprimaryAgentFolderPath:string\|undefined,`
`441`	`441`
`442`	`442`	`contextValue:CoderOpenableTreeItemType,`
`443`	`443`	`){`
`@@ -476,7 +476,7 @@ class AgentTreeItem extends OpenableTreeItem {`
`476`	`476`	`}`
`477`	`477`	`}`
`478`	`478`
`479`		`-exportclassWorkspaceTreeItemextendsOpenableTreeItem{`
	`479`	`+classWorkspaceTreeItemextendsOpenableTreeItem{`
`480`	`480`	`publicappStatus:{`
`481`	`481`	`name:string;`
`482`	`482`	`url?:string;`
`@@ -509,7 +509,7 @@ export class WorkspaceTreeItem extends OpenableTreeItem {`
`509`	`509`	`:vscode.TreeItemCollapsibleState.Expanded,`
`510`	`510`	`workspace.owner_name,`
`511`	`511`	`workspace.name,`
`512`		`-undefined,`
	`512`	`+agents[0]?.name,`
`513`	`513`	`agents[0]?.expanded_directory,`
`514`	`514`	`agents.length>1`
`515`	`515`	`?"coderWorkspaceMultipleAgents"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0e9fb55

File tree

3 files changed

3 files changed

`‎CHANGELOG.md‎`

`‎src/commands.ts‎`

`‎src/workspacesProvider.ts‎`

0 commit comments