feat(auth): replace sessionId with generateNewSessionClientId for cross-window communication (#553)

Author: mini2s

src/core/costrict/activate.ts

@@ -38,7 +38,7 @@ import {
 	startIPCServer,
 	stopIPCServer,
 } from "./auth/ipc"
-import { getClientId } from "../../utils/getClientId"
+import { generateNewSessionClientId, getClientId } from "../../utils/getClientId"
 import ZgsmCodebaseIndexManager, { zgsmCodebaseIndexManager } from "./codebase-index"
 import { workspaceEventMonitor } from "./codebase-index/workspace-event-monitor"
 import { initGitCheckoutDetector } from "./codebase-index/git-checkout-detector"
@@ -99,12 +99,12 @@ export async function activate(
 			provider.log(`new token from other window: ${tokens.access_token}`)
 		}),
 		onZgsmLogout((sessionId: string) => {
-			if (vscode.env.sessionId === sessionId) return
+			if (generateNewSessionClientId() === sessionId) return
 			zgsmAuthService.logout(true)
 			provider.log(`logout from other window`)
 		}),
 		onCloseWindow((sessionId: string) => {
-			if (vscode.env.sessionId === sessionId) return
+			if (generateNewSessionClientId() === sessionId) return
 			vscode.commands.executeCommand("workbench.action.closeWindow")
 		}),
 	)

src/core/costrict/auth/authService.ts

@@ -8,7 +8,7 @@ import type { ClineProvider } from "../../webview/ClineProvider"
 import { getParams, retryWrapper } from "../../../utils/zgsmUtils"
 import { joinUrl } from "../../../utils/joinUrl"
 import { ZgsmAuthStatus, ZgsmAuthTokens, ZgsmLoginState, LoginTokenResponse } from "./types"
-import { getClientId } from "../../../utils/getClientId"
+import { generateNewSessionClientId, getClientId } from "../../../utils/getClientId"
 import { sendZgsmLogout } from "./ipc/client"
 import { CompletionStatusBar } from "../completion"
 import { t } from "../../../i18n"
@@ -332,7 +332,7 @@ export class ZgsmAuthService {
 		// Clear stored login information
 		await ZgsmAuthStorage.getInstance().clearAllLoginState()
 		if (!auto) {
-			sendZgsmLogout(vscode.env.sessionId)
+			sendZgsmLogout(generateNewSessionClientId())
 		}
 	}
 

src/core/costrict/base/common/util.ts

@@ -107,17 +107,6 @@ export function formatTimeDifference(differenceInMilliseconds: number): string {
 	return result.trim() || "0s"
 }
 
-/**
- * Generate a UUID
- */
-export function getUuid() {
-	return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
-		const r = (Math.random() * 16) | 0,
-			v = c === "x" ? r : (r & 0x3) | 0x8
-		return v.toString(16)
-	})
-}
-
 /**
  * Return a random string of specified length
  */

src/core/costrict/workflow/CoworkflowFileWatcher.ts

@@ -386,11 +386,6 @@ export class CoworkflowFileWatcher implements ICoworkflowFileWatcher {
 		}
 	}
 
-	private getDocumentTypeFromUri(uri: vscode.Uri): CoworkflowDocumentType | undefined {
-		const documentInfo = this.getDocumentInfoFromUri(uri)
-		return documentInfo?.type
-	}
-
 	/**
 	 * Initialize file contexts for existing files that match the pattern
 	 */
@@ -414,15 +409,15 @@ export class CoworkflowFileWatcher implements ICoworkflowFileWatcher {
 							isActive: true,
 						})
 
-						this.errorHandler.logError(
-							this.errorHandler.createError(
-								"file_system_error",
-								"info",
-								`Initialized file context for ${documentInfo.relativePath}`,
-								undefined,
-								fileUri,
-							),
-						)
+						// this.errorHandler.logError(
+						// 	this.errorHandler.createError(
+						// 		"file_system_error",
+						// 		"info",
+						// 		`Initialized file context for ${documentInfo.relativePath}`,
+						// 		undefined,
+						// 		fileUri,
+						// 	),
+						// )
 					}
 				} catch (error) {
 					this.errorHandler.logError(

src/core/webview/ClineProvider.ts

@@ -92,12 +92,12 @@ import { Task } from "../task/Task"
 import { getSystemPromptFilePath } from "../prompts/sections/custom-system-prompt"
 
 import { webviewMessageHandler } from "./webviewMessageHandler"
-import type { ClineMessage } from "@roo-code/types"
-import { readApiMessages, saveApiMessages, saveTaskMessages } from "../task-persistence"
+// import type { ClineMessage } from "@roo-code/types"
+// import { readApiMessages, saveApiMessages, saveTaskMessages } from "../task-persistence"
 import { getNonce } from "./getNonce"
 import { getUri } from "./getUri"
 import { ZgsmAuthCommands } from "../costrict/auth"
-import { getClientId } from "../../utils/getClientId"
+import { generateNewSessionClientId, getClientId } from "../../utils/getClientId"
 import { defaultCodebaseIndexEnabled } from "../../services/code-index/constants"
 import { CodeReviewService, ReviewTargetType } from "../costrict/code-review"
 import { defaultLang } from "../../utils/language"
@@ -2372,7 +2372,7 @@ export class ClineProvider
 				}
 			}
 
-			sendZgsmCloseWindow(vscode.env.sessionId)
+			sendZgsmCloseWindow(generateNewSessionClientId())
 			await delay(1000)
 			await vscode.commands.executeCommand("workbench.action.closeWindow")
 		} catch (error) {
@@ -2495,7 +2495,7 @@ export class ClineProvider
 		await BridgeOrchestrator.connectOrDisconnect(userInfo, enabled, {
 			...config,
 			provider: this,
-			sessionId: vscode.env.sessionId,
+			sessionId: generateNewSessionClientId(),
 			isCloudAgent: CloudService.instance.isCloudAgent,
 		})
 

src/utils/getClientId.ts

@@ -21,8 +21,25 @@ const getZgsmDirPath = (): string => {
 
 // Generates new client ID
 const generateNewClientId = (): string => {
-	// Use vscode machineId as base, append random UUID prefix if remote
-	return `${vscode?.env?.machineId}${vscode?.env?.remoteName ? `.${crypto.randomUUID().slice(0, 8)}` : ""}`
+	let machineId = vscode?.env?.machineId
+	if (!vscode?.env?.machineId || ["intellij-machine", "development-machine"].includes(vscode?.env?.machineId)) {
+		machineId = getUuid()
+	}
+	return `${machineId}${vscode?.env?.remoteName ? `.${crypto.randomUUID().slice(0, 8)}` : ""}`
+}
+
+let sessionId = ""
+// Generates new sessionId
+export const generateNewSessionClientId = (): string => {
+	if (sessionId) {
+		return sessionId
+	}
+	sessionId = vscode?.env?.sessionId
+	if (!sessionId || ["intellij-session", "development-session"].includes(sessionId)) {
+		sessionId = getUuid()
+	}
+
+	return `${sessionId}${vscode?.env?.remoteName ? `.${crypto.randomUUID().slice(0, 8)}` : ""}`
 }
 
 // Exported function to get client ID
@@ -66,3 +83,14 @@ export const getClientId = (): string => {
 		return fallbackId
 	}
 }
+
+/**
+ * Generate a UUID
+ */
+export function getUuid() {
+	return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+		const r = (Math.random() * 16) | 0,
+			v = c === "x" ? r : (r & 0x3) | 0x8
+		return v.toString(16)
+	})
+}