Zoo-Code-Org
diff --git a/‎src/activate/__tests__/handleUri.spec.ts‎
Lines changed: 97 additions & 16 deletions b/‎src/activate/__tests__/handleUri.spec.ts‎
Lines changed: 97 additions & 16 deletions
diff --git a/‎src/activate/handleUri.ts‎
Lines changed: 29 additions & 4 deletions b/‎src/activate/handleUri.ts‎
Lines changed: 29 additions & 4 deletions
@@ -6,25 +6,32 @@ vi.mock("vscode", () => ({
 
 import * as vscode from "vscode"
 
-const { mockGetVisibleInstance, mockHandleZooCodeAuthCallback, mockSetZooCodeUserInfo, mockVisibleProvider } =
-	vi.hoisted(() => {
-		const mockVisibleProvider = {
-			handleOpenRouterCallback: vi.fn(),
-			handleRequestyCallback: vi.fn(),
-			handleZooCodeCallback: vi.fn(),
-		} as any
-
-		return {
-			mockGetVisibleInstance: vi.fn(() => mockVisibleProvider),
-			mockHandleZooCodeAuthCallback: vi.fn(),
-			mockSetZooCodeUserInfo: vi.fn(),
-			mockVisibleProvider,
-		}
-	})
+const {
+	mockGetVisibleInstance,
+	mockGetAllInstances,
+	mockHandleZooCodeAuthCallback,
+	mockSetZooCodeUserInfo,
+	mockVisibleProvider,
+} = vi.hoisted(() => {
+	const mockVisibleProvider = {
+		handleOpenRouterCallback: vi.fn(),
+		handleRequestyCallback: vi.fn(),
+		handleZooCodeCallback: vi.fn(),
+	} as any
+
+	return {
+		mockGetVisibleInstance: vi.fn(() => mockVisibleProvider),
+		mockGetAllInstances: vi.fn(() => [mockVisibleProvider]),
+		mockHandleZooCodeAuthCallback: vi.fn(),
+		mockSetZooCodeUserInfo: vi.fn(),
+		mockVisibleProvider,
+	}
+})
 
 vi.mock("../../core/webview/ClineProvider", () => ({
 	ClineProvider: {
 		getVisibleInstance: mockGetVisibleInstance,
+		getAllInstances: mockGetAllInstances,
 	},
 }))
 
@@ -39,6 +46,7 @@ describe("handleUri", () => {
 	beforeEach(() => {
 		vi.clearAllMocks()
 		mockGetVisibleInstance.mockReturnValue(mockVisibleProvider)
+		mockGetAllInstances.mockReturnValue([mockVisibleProvider])
 	})
 
 	it("ignores legacy cloud auth callback", async () => {
@@ -54,8 +62,9 @@ describe("handleUri", () => {
 		)
 	})
 
-	it("stores callback user info even when no webview is visible", async () => {
+	it("stores callback user info even when no provider instances exist", async () => {
 		mockGetVisibleInstance.mockReturnValue(null)
+		mockGetAllInstances.mockReturnValue([])
 		mockHandleZooCodeAuthCallback.mockResolvedValue(true)
 
 		await handleUri({
@@ -69,6 +78,7 @@ describe("handleUri", () => {
 			email: "jane@example.com",
 			image: "https://example.com/avatar.png",
 		})
+		// No provider instances exist, so handleZooCodeCallback should not be called
 		expect(mockVisibleProvider.handleZooCodeCallback).not.toHaveBeenCalled()
 	})
 
@@ -116,4 +126,75 @@ describe("handleUri", () => {
 		expect(mockSetZooCodeUserInfo).not.toHaveBeenCalled()
 		expect(mockVisibleProvider.handleZooCodeCallback).not.toHaveBeenCalled()
 	})
+
+	it("propagates the callback token to every ClineProvider instance, not just the visible one", async () => {
+		// Regression: prior to multi-instance fan-out, hidden providers (sidebar collapsed,
+		// secondary panels) never received the zooSessionToken, so their profile settings
+		// stayed unauthenticated until reload.
+		mockHandleZooCodeAuthCallback.mockResolvedValue(true)
+
+		const hiddenProvider = { handleZooCodeCallback: vi.fn() } as any
+		const secondHidden = { handleZooCodeCallback: vi.fn() } as any
+		mockGetAllInstances.mockReturnValue([mockVisibleProvider, hiddenProvider, secondHidden])
+
+		await handleUri({
+			path: "/auth-callback",
+			query: "token=zoo_ext_test_token",
+		} as any)
+
+		expect(mockHandleZooCodeAuthCallback).toHaveBeenCalledWith("zoo_ext_test_token")
+		expect(mockSetZooCodeUserInfo).toHaveBeenCalled()
+		expect(mockVisibleProvider.handleZooCodeCallback).toHaveBeenCalledWith("zoo_ext_test_token")
+		expect(hiddenProvider.handleZooCodeCallback).toHaveBeenCalledWith("zoo_ext_test_token")
+		expect(secondHidden.handleZooCodeCallback).toHaveBeenCalledWith("zoo_ext_test_token")
+	})
+
+	it("serializes callbacks across instances to avoid concurrent profile-store writes", async () => {
+		// Regression: a previous implementation used Promise.all which fanned out concurrent
+		// read-modify-write operations on the same provider settings store. Verify the
+		// callbacks are invoked sequentially.
+		mockHandleZooCodeAuthCallback.mockResolvedValue(true)
+
+		const order: string[] = []
+		const makeProvider = (name: string) =>
+			({
+				handleZooCodeCallback: vi.fn(async () => {
+					order.push(`${name}:start`)
+					// Yield to the event loop so a concurrent call would interleave.
+					await new Promise((resolve) => setTimeout(resolve, 0))
+					order.push(`${name}:end`)
+				}),
+			}) as any
+
+		const a = makeProvider("a")
+		const b = makeProvider("b")
+		mockGetAllInstances.mockReturnValue([a, b])
+
+		await handleUri({
+			path: "/auth-callback",
+			query: "token=zoo_ext_test_token",
+		} as any)
+
+		expect(order).toEqual(["a:start", "a:end", "b:start", "b:end"])
+	})
+
+	it("continues fan-out when one instance fails to persist the callback token", async () => {
+		mockHandleZooCodeAuthCallback.mockResolvedValue(true)
+
+		const failingProvider = {
+			handleZooCodeCallback: vi.fn(async () => {
+				throw new Error("profile store unavailable")
+			}),
+		} as any
+		const healthyProvider = { handleZooCodeCallback: vi.fn() } as any
+		mockGetAllInstances.mockReturnValue([failingProvider, healthyProvider])
+
+		await handleUri({
+			path: "/auth-callback",
+			query: "token=zoo_ext_test_token",
+		} as any)
+
+		expect(failingProvider.handleZooCodeCallback).toHaveBeenCalledWith("zoo_ext_test_token")
+		expect(healthyProvider.handleZooCodeCallback).toHaveBeenCalledWith("zoo_ext_test_token")
+	})
 })
@@ -4,6 +4,34 @@ import { getRouterUnavailableSignInMessage } from "../core/config/routerRemoval"
 import { ClineProvider } from "../core/webview/ClineProvider"
 import { handleAuthCallback as handleZooCodeAuthCallback, setZooCodeUserInfo } from "../services/zoo-code-auth"
 
+/**
+ * Persist the Zoo Code session token to every active provider instance.
+ *
+ * The profile settings write (handleZooCodeCallback) must run on any active
+ * instance — not just the visible one — so the zoo-gateway zooSessionToken is
+ * persisted even when the sidebar/panel is hidden at callback time.
+ *
+ * Run sequentially (NOT Promise.all): each ClineProvider's handleZooCodeCallback
+ * does a read-modify-write on the same backing provider settings store
+ * (listConfig → getProfile → saveConfig / upsertProviderProfile). Fanning out
+ * concurrently across N instances can interleave reads/writes and clobber
+ * updates. Serialization is cheap (at most a handful of instances) and avoids
+ * the race.
+ */
+async function propagateZooGatewayCallback(token: string): Promise<void> {
+	const allInstances = ClineProvider.getAllInstances()
+	for (const instance of allInstances) {
+		try {
+			await instance.handleZooCodeCallback(token)
+		} catch (error) {
+			console.error(
+				"Failed to persist Zoo Gateway token for a provider instance:",
+				error instanceof Error ? error.message : error,
+			)
+		}
+	}
+}
+
 export const handleUri = async (uri: vscode.Uri) => {
 	const path = uri.path
 	const query = new URLSearchParams(uri.query.replace(/\+/g, "%2B"))
@@ -50,10 +78,7 @@ export const handleUri = async (uri: vscode.Uri) => {
 						email,
 						image,
 					})
-					// Refresh webview state if a panel is currently open
-					if (visibleProvider) {
-						await visibleProvider.handleZooCodeCallback(token)
-					}
+					await propagateZooGatewayCallback(token)
 				}
 			}
 			break