fix: clear pending chat ID when open flow is abandoned

If commands.open() returns without actually opening a window (e.g.
the user cancels a workspace, agent, or folder prompt), clear the
pending chat ID from memento so it does not leak into a future,
unrelated reload.

- commands.open() and openWorkspace() now return boolean indicating
  whether a window was actually opened.
- handleOpen() clears the pending chat ID when open() returns false.
- Add clearPendingChatId() to MementoManager.

Author: ThomasK33

src/commands.ts

@@ -430,7 +430,7 @@ export class Commands {
 
 	 * Throw if not logged into a deployment.
 	 */
-	public async openFromSidebar(item: OpenableTreeItem) {
+	public async openFromSidebar(item: OpenableTreeItem): Promise<void> {
 		if (item) {
 			const baseUrl = this.extensionClient.getAxiosInstance().defaults.baseURL;
 			if (!baseUrl) {
@@ -463,9 +463,8 @@ export class Commands {
 			}
 		} else {
 			// If there is no tree item, then the user manually ran this command.
-			// Default to the regular open instead.
-			return this.open();
-		}
+				// Default to the regular open instead.
+				await this.open();		}
 	}
 
 	public async openAppStatus(app: {
@@ -529,7 +528,7 @@ export class Commands {
 		agentName?: string,
 		folderPath?: string,
 		openRecent?: boolean,
-	): Promise<void> {
+	): Promise<boolean> {
 		const baseUrl = this.extensionClient.getAxiosInstance().defaults.baseURL;
 		if (!baseUrl) {
 			throw new Error("You are not logged in");
@@ -545,18 +544,24 @@ export class Commands {
 			workspace = await this.pickWorkspace();
 			if (!workspace) {
 				// User declined to pick a workspace.
-				return;
+				return false;
 			}
 		}
 
 		const agents = await this.extractAgentsWithFallback(workspace);
 		const agent = await maybeAskAgent(agents, agentName);
 		if (!agent) {
 			// User declined to pick an agent.
-			return;
+			return false;
 		}
 
-		await this.openWorkspace(baseUrl, workspace, agent, folderPath, openRecent);
+		return this.openWorkspace(
+			baseUrl,
+			workspace,
+			agent,
+			folderPath,
+			openRecent,
+		);
 	}
 
 	/**
@@ -745,7 +750,7 @@ export class Commands {
 		agent: WorkspaceAgent,
 		folderPath: string | undefined,
 		openRecent = false,
-	) {
+	): Promise<boolean> {
 		const remoteAuthority = toRemoteAuthority(
 			baseUrl,
 			workspace.owner_name,
@@ -788,7 +793,7 @@ export class Commands {
 				});
 				if (!folderPath) {
 					// User aborted.
-					return;
+					return false;
 				}
 			}
 		}
@@ -806,14 +811,15 @@ export class Commands {
 				// Open this in a new window!
 				newWindow,
 			);
-			return;
+			return true;
 		}
 
 		// This opens the workspace without an active folder opened.
 		await vscode.commands.executeCommand("vscode.newWindow", {
 			remoteAuthority: remoteAuthority,
 			reuseWindow: !newWindow,
 		});
+		return true;
 	}
 }
 

src/core/mementoManager.ts

@@ -81,4 +81,13 @@ export class MementoManager {
 		}
 		return chatId;
 	}
+
+	/**
+	 * Clear the pending chat ID without reading it.  Used when
+	 * the open flow is abandoned (e.g. user cancels a prompt)
+	 * so the stale ID does not leak into a future reload.
+	 */
+	public async clearPendingChatId(): Promise<void> {
+		await this.memento.update("pendingChatId", undefined);
+	}
 }

src/uri/uriHandler.ts

@@ -93,20 +93,27 @@ async function handleOpen(ctx: UriRouteContext): Promise<void> {
 	// a remote-authority reload that wipes in-memory state.
 	// The extension picks this up after the reload in activate().
 	const chatId = params.get("chatId");
+	const mementoManager = serviceContainer.getMementoManager();
 	if (chatId) {
-		const mementoManager = serviceContainer.getMementoManager();
 		await mementoManager.setPendingChatId(chatId);
 	}
 
 	await setupDeployment(params, serviceContainer, deploymentManager);
 
-	await commands.open(
+	const opened = await commands.open(
 		owner,
 		workspace,
 		agent ?? undefined,
 		folder ?? undefined,
 		openRecent,
 	);
+
+	// If commands.open() returned without opening a window (e.g. the
+	// user cancelled a prompt), clear the pending chat ID so it does
+	// not leak into a future, unrelated reload.
+	if (!opened && chatId) {
+		await mementoManager.clearPendingChatId();
+	}
 }
 
 async function handleOpenDevContainer(ctx: UriRouteContext): Promise<void> {