From 18b8512f0cb9f20d83fb82a8bdbb247a71253c4d Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Mon, 2 Nov 2026 17:10:16 +0000 Subject: [PATCH 01/14] Scope provider profiles by custom storage path --- src/core/config/ProviderSettingsManager.ts | 89 +++++- .../__tests__/ProviderSettingsManager.spec.ts | 287 ++++++++++++++++++ 2 files changed, 374 insertions(+), 2 deletions(-) diff --git a/src/core/config/ProviderSettingsManager.ts b/src/core/config/ProviderSettingsManager.ts index 01695d7994..92aaaf13b8 100644 --- a/src/core/config/ProviderSettingsManager.ts +++ b/src/core/config/ProviderSettingsManager.ts @@ -1,4 +1,7 @@ +import * as crypto from "node:crypto" +import * as path from "node:path" import { ExtensionContext } from "vscode" +import * as vscode from "vscode" import { z, ZodError } from "zod" import deepEqual from "fast-deep-equal" @@ -20,6 +23,7 @@ import { TelemetryService } from "@roo-code/telemetry" import { Mode, modes } from "../../shared/modes" import { buildApiHandler } from "../../api" import { disposeApiHandler } from "../../api/dispose-api-handler" +import { Package } from "../../shared/package" import { downgradeLegacyRooConfig } from "./routerRemoval" // Type-safe model migrations mapping @@ -57,7 +61,9 @@ export type ProviderProfiles = z.infer export class ProviderSettingsManager { private static readonly SCOPE_PREFIX = "roo_cline_config_" + private static readonly LEGACY_SECRET_STORAGE_KEY = `${ProviderSettingsManager.SCOPE_PREFIX}api_config` private readonly defaultConfigId = this.generateId() + private readonly customStoragePath: string private readonly defaultModeApiConfigs: Record = Object.fromEntries( modes.map((mode) => [mode.slug, this.defaultConfigId]), @@ -80,8 +86,11 @@ export class ProviderSettingsManager { private readonly context: ExtensionContext - constructor(context: ExtensionContext) { + constructor(context: ExtensionContext, customStoragePath?: string) { this.context = context + this.customStoragePath = ProviderSettingsManager.normalizeCustomStoragePath( + customStoragePath ?? ProviderSettingsManager.getConfiguredCustomStoragePath(), + ) // TODO: We really shouldn't have async methods in the constructor. this.initialize().catch(console.error) @@ -653,12 +662,88 @@ export class ProviderSettingsManager { }) } + private static getConfiguredCustomStoragePath(): string { + try { + const configuration = vscode.workspace.getConfiguration(Package.name) + return configuration.get("customStoragePath", "") ?? "" + } catch { + return "" + } + } + + private static normalizeCustomStoragePath(customStoragePath?: string): string { + const value = customStoragePath?.trim() ?? "" + if (!value) { + return "" + } + + const isWindowsLike = value.includes("\\") || /^[A-Za-z]:[\\/]/.test(value) + const normalized = isWindowsLike ? path.win32.normalize(value).replace(/\\/g, "/") : path.normalize(value) + const absolute = isWindowsLike + ? path.win32.isAbsolute(value) + ? path.win32.normalize(value) + : path.win32.resolve(value) + : path.isAbsolute(normalized) + ? normalized + : path.resolve(normalized) + + if (isWindowsLike) { + return absolute.replace(/\\/g, "/").replace(/^([A-Za-z]):/, (_, drive: string) => `${drive.toLowerCase()}:`) + } + + return absolute + } + + private get isCustomStorageScoped() { + return Boolean(this.customStoragePath) + } + + private get migrationMarkerKey() { + return `${this.secretsKey}:migration-complete` + } + + private get legacySecretsKey() { + return ProviderSettingsManager.LEGACY_SECRET_STORAGE_KEY + } + private get secretsKey() { - return `${ProviderSettingsManager.SCOPE_PREFIX}api_config` + if (!this.customStoragePath) { + return this.legacySecretsKey + } + + return `${ProviderSettingsManager.SCOPE_PREFIX}api_config_${crypto + .createHash("sha256") + .update(this.customStoragePath) + .digest("hex")}` + } + + private async ensureStorageScopeMigration() { + if (!this.isCustomStorageScoped) { + return + } + + const migrationComplete = await this.context.globalState.get(this.migrationMarkerKey) + if (migrationComplete === true) { + return + } + + const scopedConfig = await this.context.secrets.get(this.secretsKey) + if (scopedConfig) { + await this.context.globalState.update(this.migrationMarkerKey, true) + return + } + + const legacyConfig = await this.context.secrets.get(this.legacySecretsKey) + if (legacyConfig) { + await this.context.secrets.store(this.secretsKey, legacyConfig) + } + + await this.context.globalState.update(this.migrationMarkerKey, true) } private async load(): Promise { try { + await this.ensureStorageScopeMigration() const content = await this.context.secrets.get(this.secretsKey) if (!content) { diff --git a/src/core/config/__tests__/ProviderSettingsManager.spec.ts b/src/core/config/__tests__/ProviderSettingsManager.spec.ts index a1fc9ac7de..38318e7d01 100644 --- a/src/core/config/__tests__/ProviderSettingsManager.spec.ts +++ b/src/core/config/__tests__/ProviderSettingsManager.spec.ts @@ -1,5 +1,7 @@ // npx vitest src/core/config/__tests__/ProviderSettingsManager.spec.ts +import * as vscode from "vscode" + import { OPEN_AI_CODEX_SERVICE_TIER_KEY, OpenAiCodexServiceTier, @@ -74,9 +76,66 @@ const mockContext = makeExtensionContext({ globalState: { ...baseContext.globalState, ...mockGlobalState }, }) +// This test double provides the get, has, inspect, and update methods used by the manager. +const makeProviderWorkspaceConfiguration = (values: Record = {}): vscode.WorkspaceConfiguration => + ({ + get: vi.fn( + (section: string, defaultValue?: T) => + (section in values ? values[section] : defaultValue) as T | undefined, + ), + has: vi.fn((section: string) => section in values), + inspect: vi.fn(), + update: vi.fn().mockResolvedValue(undefined), + }) as unknown as vscode.WorkspaceConfiguration + +const makeCustomStorageContext = ({ + customStoragePath = "", + secrets = new Map(), + globalState = new Map(), +}: { + customStoragePath?: string + secrets?: Map + globalState?: Map +} = {}) => { + const context = makeExtensionContext({ + secrets: { + get: vi.fn(async (key: string) => secrets.get(key) ?? null), + store: vi.fn(async (key: string, value: string) => { + secrets.set(key, value) + }), + delete: vi.fn(async (key: string) => { + secrets.delete(key) + }), + onDidChange: new Map(), + }, + globalState: { + get: vi.fn((key: string) => globalState.get(key)), + update: vi.fn(async (key: string, value: unknown) => { + globalState.set(key, value) + }), + keys: vi.fn(() => [...globalState.keys()]), + }, + }) + + vi.spyOn(vscode.workspace, "getConfiguration").mockReturnValue( + makeProviderWorkspaceConfiguration({ customStoragePath }), + ) + + return { context, secrets, globalState } +} + +const legacySecretKey = "roo_cline_config_api_config" + +const parseStoredProfiles = (value: string | null | undefined): ProviderProfiles | undefined => + value ? (JSON.parse(value) as ProviderProfiles) : undefined + describe("ProviderSettingsManager", () => { let providerSettingsManager: ProviderSettingsManager + afterEach(() => { + vi.restoreAllMocks() + }) + beforeEach(() => { clearAllMocks() // Reset all mock implementations to default successful behavior @@ -578,6 +637,234 @@ describe("ProviderSettingsManager", () => { }) }) + describe("custom storage scope", () => { + it("uses the legacy global key when no custom storage path is configured", () => { + const configSpy = vi + .spyOn(vscode.workspace, "getConfiguration") + .mockReturnValue(makeProviderWorkspaceConfiguration({ customStoragePath: "" })) + const manager = new ProviderSettingsManager(mockContext) + + expect((manager as unknown as { secretsKey: string }).secretsKey).toBe(legacySecretKey) + expect(configSpy).toHaveBeenCalledWith("zoo-code") + }) + + it("uses different secret keys for different custom storage paths", () => { + const managerA = new ProviderSettingsManager(mockContext, "C:\\Projects\\A\\.vscode\\zoo-code") + const managerB = new ProviderSettingsManager(mockContext, "C:\\Projects\\B\\.vscode\\zoo-code") + + expect((managerA as unknown as { secretsKey: string }).secretsKey).not.toBe( + (managerB as unknown as { secretsKey: string }).secretsKey, + ) + }) + + it("uses the same secret key for the same normalized custom storage path", () => { + const managerA = new ProviderSettingsManager(mockContext, "C:/Projects/A/.vscode/zoo-code") + const managerB = new ProviderSettingsManager(mockContext, "c:\\Projects\\A\\.vscode\\zoo-code") + + expect((managerA as unknown as { secretsKey: string }).secretsKey).toBe( + (managerB as unknown as { secretsKey: string }).secretsKey, + ) + }) + + it("keeps provider configurations isolated across differently scoped managers", async () => { + const pathA = "C:/Projects/A/.vscode/zoo-code" + const pathB = "C:/Projects/B/.vscode/zoo-code" + const { context: contextA } = makeCustomStorageContext({ customStoragePath: pathA }) + const { context: contextB } = makeCustomStorageContext({ customStoragePath: pathB }) + const managerA = new ProviderSettingsManager(contextA, pathA) + const managerB = new ProviderSettingsManager(contextB, pathB) + + await managerA.saveConfig("profile-a", { + id: "profile-a-id", + apiProvider: providerIdentifiers.anthropic, + apiModelId: "claude-3-5-sonnet-20241022", + }) + await managerB.saveConfig("profile-b", { + id: "profile-b-id", + apiProvider: providerIdentifiers.openai, + apiModelId: "gpt-4o", + }) + + await managerA.activateProfile({ name: "profile-a" }) + await managerB.activateProfile({ name: "profile-b" }) + + expect(await managerA.listConfig()).toEqual( + expect.arrayContaining([expect.objectContaining({ name: "profile-a" })]), + ) + expect(await managerB.listConfig()).toEqual( + expect.arrayContaining([expect.objectContaining({ name: "profile-b" })]), + ) + expect((await managerA.getProfile({ name: "profile-a" })).apiProvider).toBe(providerIdentifiers.anthropic) + expect((await managerB.getProfile({ name: "profile-b" })).apiProvider).toBe(providerIdentifiers.openai) + expect(await managerA.hasConfig("profile-b")).toBe(false) + expect(await managerB.hasConfig("profile-a")).toBe(false) + }) + + it("migrates the legacy global configuration into the custom storage scope without deleting the legacy entry", async () => { + const legacyProfiles: ProviderProfiles = { + currentApiConfigName: "legacy-default", + apiConfigs: { + "legacy-default": { + id: "legacy-id", + apiProvider: providerIdentifiers.anthropic, + apiModelId: "claude-3-5-sonnet-20241022", + }, + }, + modeApiConfigs: {}, + migrations: { + rateLimitSecondsMigrated: true, + openAiHeadersMigrated: true, + consecutiveMistakeLimitMigrated: true, + toolRepetitionLimitsMigrated: true, + todoListEnabledMigrated: true, + claudeCodeLegacySettingsMigrated: true, + routerProviderMigrated: true, + }, + } + + const { context, secrets, globalState } = makeCustomStorageContext({ + customStoragePath: "C:/Projects/A/.vscode/zoo-code", + }) + secrets.set(legacySecretKey, JSON.stringify(legacyProfiles)) + const manager = new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code") + + await manager.initialize() + + const scopedKey = (manager as unknown as { secretsKey: string }).secretsKey + expect(secrets.get(scopedKey)).toBeTruthy() + expect(parseStoredProfiles(secrets.get(scopedKey))).toMatchObject({ + currentApiConfigName: "legacy-default", + }) + expect(secrets.get(legacySecretKey)).toBe(JSON.stringify(legacyProfiles)) + expect(globalState.get(`${scopedKey}:migration-complete`)).toBe(true) + }) + + it("prefers an existing scoped configuration over the legacy global configuration", async () => { + const legacyProfiles: ProviderProfiles = { + currentApiConfigName: "legacy", + apiConfigs: { + legacy: { id: "legacy-id", apiProvider: providerIdentifiers.openai, apiModelId: "gpt-4o" }, + }, + modeApiConfigs: {}, + migrations: { + rateLimitSecondsMigrated: true, + openAiHeadersMigrated: true, + consecutiveMistakeLimitMigrated: true, + toolRepetitionLimitsMigrated: true, + todoListEnabledMigrated: true, + claudeCodeLegacySettingsMigrated: true, + routerProviderMigrated: true, + }, + } + const scopedProfiles: ProviderProfiles = { + currentApiConfigName: "scoped", + apiConfigs: { + scoped: { + id: "scoped-id", + apiProvider: providerIdentifiers.anthropic, + apiModelId: "claude-3-5-sonnet-20241022", + }, + }, + modeApiConfigs: {}, + migrations: { + rateLimitSecondsMigrated: true, + openAiHeadersMigrated: true, + consecutiveMistakeLimitMigrated: true, + toolRepetitionLimitsMigrated: true, + todoListEnabledMigrated: true, + claudeCodeLegacySettingsMigrated: true, + routerProviderMigrated: true, + }, + } + + const { context, secrets } = makeCustomStorageContext({ + customStoragePath: "C:/Projects/A/.vscode/zoo-code", + }) + secrets.set(legacySecretKey, JSON.stringify(legacyProfiles)) + secrets.set( + ( + new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code") as unknown as { + secretsKey: string + } + ).secretsKey, + JSON.stringify(scopedProfiles), + ) + + const manager = new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code") + await manager.initialize() + + const current = parseStoredProfiles(secrets.get((manager as unknown as { secretsKey: string }).secretsKey)) + expect(current?.currentApiConfigName).toBe("scoped") + expect(parseStoredProfiles(secrets.get(legacySecretKey))?.currentApiConfigName).toBe("legacy") + }) + + it("keeps the migration marker across resetAllConfigs and does not re-import the legacy configuration", async () => { + const legacyProfiles: ProviderProfiles = { + currentApiConfigName: "legacy-default", + apiConfigs: { + "legacy-default": { + id: "legacy-id", + apiProvider: providerIdentifiers.anthropic, + apiModelId: "claude-3-5-sonnet-20241022", + }, + }, + modeApiConfigs: {}, + migrations: { + rateLimitSecondsMigrated: true, + openAiHeadersMigrated: true, + consecutiveMistakeLimitMigrated: true, + toolRepetitionLimitsMigrated: true, + todoListEnabledMigrated: true, + claudeCodeLegacySettingsMigrated: true, + routerProviderMigrated: true, + }, + } + const { context, secrets, globalState } = makeCustomStorageContext({ + customStoragePath: "C:/Projects/A/.vscode/zoo-code", + }) + secrets.set(legacySecretKey, JSON.stringify(legacyProfiles)) + const manager = new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code") + + await manager.initialize() + await manager.resetAllConfigs() + + const scopedKey = (manager as unknown as { secretsKey: string }).secretsKey + expect(secrets.has(scopedKey)).toBe(false) + expect(secrets.get(legacySecretKey)).toBe(JSON.stringify(legacyProfiles)) + expect(globalState.get(`${scopedKey}:migration-complete`)).toBe(true) + + const reloadedManager = new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code") + await reloadedManager.initialize() + expect(secrets.get(scopedKey)).toBeUndefined() + expect(parseStoredProfiles(secrets.get(legacySecretKey))?.currentApiConfigName).toBe("legacy-default") + }) + + it("does not delete or affect another manager's scoped configuration when resetting a different scope", async () => { + const pathA = "C:/Projects/A/.vscode/zoo-code" + const pathB = "C:/Projects/B/.vscode/zoo-code" + const { context: contextA, secrets: secretsA } = makeCustomStorageContext({ customStoragePath: pathA }) + const { context: contextB } = makeCustomStorageContext({ customStoragePath: pathB }) + const managerA = new ProviderSettingsManager(contextA, pathA) + const managerB = new ProviderSettingsManager(contextB, pathB) + + await managerA.saveConfig("profile-a", { + id: "a", + apiProvider: providerIdentifiers.anthropic, + apiModelId: "claude-3-5-sonnet-20241022", + }) + await managerB.saveConfig("profile-b", { + id: "b", + apiProvider: providerIdentifiers.openai, + apiModelId: "gpt-4o", + }) + + await managerA.resetAllConfigs() + + expect(secretsA.get((managerA as unknown as { secretsKey: string }).secretsKey)).toBeUndefined() + expect(await managerB.hasConfig("profile-b")).toBe(true) + }) + }) + describe("ListConfig", () => { it("should list all available configs", async () => { const existingConfig: ProviderProfiles = { From 698f4dffa8eeeedf4d0854d77a11ad612609084e Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Mon, 2 Nov 2026 17:27:06 +0000 Subject: [PATCH 02/14] Fix provider scope test context types --- .../__tests__/ProviderSettingsManager.spec.ts | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/core/config/__tests__/ProviderSettingsManager.spec.ts b/src/core/config/__tests__/ProviderSettingsManager.spec.ts index 38318e7d01..5ecdf3f8ff 100644 --- a/src/core/config/__tests__/ProviderSettingsManager.spec.ts +++ b/src/core/config/__tests__/ProviderSettingsManager.spec.ts @@ -12,7 +12,7 @@ import { } from "@roo-code/types" import { clearAllMocks } from "../../../test-utils/reset" -import { makeExtensionContext } from "../../../test-utils/vscode" +import { makeEventEmitter, makeExtensionContext } from "../../../test-utils/vscode" import { ProviderSettingsManager, ProviderProfiles } from "../ProviderSettingsManager" @@ -97,24 +97,27 @@ const makeCustomStorageContext = ({ secrets?: Map globalState?: Map } = {}) => { + const secretStorage: vscode.SecretStorage = { + get: vi.fn(async (key: string) => secrets.get(key)), + store: vi.fn(async (key: string, value: string) => { + secrets.set(key, value) + }), + delete: vi.fn(async (key: string) => { + secrets.delete(key) + }), + onDidChange: makeEventEmitter().event, + } + const testGlobalState: vscode.Memento & { setKeysForSync: (keys: readonly string[]) => void } = { + get: vi.fn((key: string) => globalState.get(key) as T | undefined), + update: vi.fn(async (key: string, value: unknown) => { + globalState.set(key, value) + }), + keys: vi.fn(() => [...globalState.keys()]), + setKeysForSync: vi.fn(), + } const context = makeExtensionContext({ - secrets: { - get: vi.fn(async (key: string) => secrets.get(key) ?? null), - store: vi.fn(async (key: string, value: string) => { - secrets.set(key, value) - }), - delete: vi.fn(async (key: string) => { - secrets.delete(key) - }), - onDidChange: new Map(), - }, - globalState: { - get: vi.fn((key: string) => globalState.get(key)), - update: vi.fn(async (key: string, value: unknown) => { - globalState.set(key, value) - }), - keys: vi.fn(() => [...globalState.keys()]), - }, + secrets: secretStorage, + globalState: testGlobalState, }) vi.spyOn(vscode.workspace, "getConfiguration").mockReturnValue( From ee5703ca6a4a17ff1293259c58da75108ed28b03 Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Mon, 2 Nov 2026 17:55:24 +0000 Subject: [PATCH 03/14] Ref #2303: Use bracket access in provider tests --- .../__tests__/ProviderSettingsManager.spec.ts | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/core/config/__tests__/ProviderSettingsManager.spec.ts b/src/core/config/__tests__/ProviderSettingsManager.spec.ts index 5ecdf3f8ff..78d64d470f 100644 --- a/src/core/config/__tests__/ProviderSettingsManager.spec.ts +++ b/src/core/config/__tests__/ProviderSettingsManager.spec.ts @@ -647,7 +647,7 @@ describe("ProviderSettingsManager", () => { .mockReturnValue(makeProviderWorkspaceConfiguration({ customStoragePath: "" })) const manager = new ProviderSettingsManager(mockContext) - expect((manager as unknown as { secretsKey: string }).secretsKey).toBe(legacySecretKey) + expect(manager["secretsKey"]).toBe(legacySecretKey) expect(configSpy).toHaveBeenCalledWith("zoo-code") }) @@ -655,18 +655,14 @@ describe("ProviderSettingsManager", () => { const managerA = new ProviderSettingsManager(mockContext, "C:\\Projects\\A\\.vscode\\zoo-code") const managerB = new ProviderSettingsManager(mockContext, "C:\\Projects\\B\\.vscode\\zoo-code") - expect((managerA as unknown as { secretsKey: string }).secretsKey).not.toBe( - (managerB as unknown as { secretsKey: string }).secretsKey, - ) + expect(managerA["secretsKey"]).not.toBe(managerB["secretsKey"]) }) it("uses the same secret key for the same normalized custom storage path", () => { const managerA = new ProviderSettingsManager(mockContext, "C:/Projects/A/.vscode/zoo-code") const managerB = new ProviderSettingsManager(mockContext, "c:\\Projects\\A\\.vscode\\zoo-code") - expect((managerA as unknown as { secretsKey: string }).secretsKey).toBe( - (managerB as unknown as { secretsKey: string }).secretsKey, - ) + expect(managerA["secretsKey"]).toBe(managerB["secretsKey"]) }) it("keeps provider configurations isolated across differently scoped managers", async () => { @@ -733,7 +729,7 @@ describe("ProviderSettingsManager", () => { await manager.initialize() - const scopedKey = (manager as unknown as { secretsKey: string }).secretsKey + const scopedKey = manager["secretsKey"] expect(secrets.get(scopedKey)).toBeTruthy() expect(parseStoredProfiles(secrets.get(scopedKey))).toMatchObject({ currentApiConfigName: "legacy-default", @@ -785,18 +781,14 @@ describe("ProviderSettingsManager", () => { }) secrets.set(legacySecretKey, JSON.stringify(legacyProfiles)) secrets.set( - ( - new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code") as unknown as { - secretsKey: string - } - ).secretsKey, + new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code")["secretsKey"], JSON.stringify(scopedProfiles), ) const manager = new ProviderSettingsManager(context, "C:/Projects/A/.vscode/zoo-code") await manager.initialize() - const current = parseStoredProfiles(secrets.get((manager as unknown as { secretsKey: string }).secretsKey)) + const current = parseStoredProfiles(secrets.get(manager["secretsKey"])) expect(current?.currentApiConfigName).toBe("scoped") expect(parseStoredProfiles(secrets.get(legacySecretKey))?.currentApiConfigName).toBe("legacy") }) @@ -831,7 +823,7 @@ describe("ProviderSettingsManager", () => { await manager.initialize() await manager.resetAllConfigs() - const scopedKey = (manager as unknown as { secretsKey: string }).secretsKey + const scopedKey = manager["secretsKey"] expect(secrets.has(scopedKey)).toBe(false) expect(secrets.get(legacySecretKey)).toBe(JSON.stringify(legacyProfiles)) expect(globalState.get(`${scopedKey}:migration-complete`)).toBe(true) @@ -863,7 +855,7 @@ describe("ProviderSettingsManager", () => { await managerA.resetAllConfigs() - expect(secretsA.get((managerA as unknown as { secretsKey: string }).secretsKey)).toBeUndefined() + expect(secretsA.get(managerA["secretsKey"])).toBeUndefined() expect(await managerB.hasConfig("profile-b")).toBe(true) }) }) From 2057064900a08c13d458d7975fd232b2a99a1c29 Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Mon, 2 Nov 2026 18:21:35 +0000 Subject: [PATCH 04/14] Fix invalid custom storage setting fallback --- src/core/config/ProviderSettingsManager.ts | 3 ++- .../config/__tests__/ProviderSettingsManager.spec.ts | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/core/config/ProviderSettingsManager.ts b/src/core/config/ProviderSettingsManager.ts index 92aaaf13b8..b75da5b46b 100644 --- a/src/core/config/ProviderSettingsManager.ts +++ b/src/core/config/ProviderSettingsManager.ts @@ -665,7 +665,8 @@ export class ProviderSettingsManager { private static getConfiguredCustomStoragePath(): string { try { const configuration = vscode.workspace.getConfiguration(Package.name) - return configuration.get("customStoragePath", "") ?? "" + const customStoragePath = configuration.get("customStoragePath", "") + return typeof customStoragePath === "string" ? customStoragePath : "" } catch { return "" } diff --git a/src/core/config/__tests__/ProviderSettingsManager.spec.ts b/src/core/config/__tests__/ProviderSettingsManager.spec.ts index 78d64d470f..b10e6a2e54 100644 --- a/src/core/config/__tests__/ProviderSettingsManager.spec.ts +++ b/src/core/config/__tests__/ProviderSettingsManager.spec.ts @@ -651,6 +651,15 @@ describe("ProviderSettingsManager", () => { expect(configSpy).toHaveBeenCalledWith("zoo-code") }) + it("uses the legacy global key when customStoragePath is not a string", () => { + vi.spyOn(vscode.workspace, "getConfiguration").mockReturnValue( + makeProviderWorkspaceConfiguration({ customStoragePath: [] }), + ) + const manager = new ProviderSettingsManager(mockContext) + + expect(manager["secretsKey"]).toBe(legacySecretKey) + }) + it("uses different secret keys for different custom storage paths", () => { const managerA = new ProviderSettingsManager(mockContext, "C:\\Projects\\A\\.vscode\\zoo-code") const managerB = new ProviderSettingsManager(mockContext, "C:\\Projects\\B\\.vscode\\zoo-code") From 7904704325a800a83d8507225add3eef3e52755b Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Fri, 6 Nov 2026 18:43:33 +0000 Subject: [PATCH 05/14] Preserve task context and add automatic management opt-out Restore the full API history when rolling back before a compaction. Add a setting to disable automatic compaction and truncation. --- packages/types/src/global-settings.ts | 1 + packages/types/src/vscode-extension-host.ts | 1 + .../__tests__/context-management.spec.ts | 40 +++++++++++++++ src/core/context-management/index.ts | 12 +++++ src/core/message-manager/index.spec.ts | 37 ++++++++++++++ src/core/task/Task.ts | 16 ++++-- src/core/task/__tests__/Task.spec.ts | 49 +++++++++++++++++++ src/core/webview/ClineProvider.ts | 3 ++ .../webview/__tests__/ClineProvider.spec.ts | 27 ++++++++++ .../settings/ContextManagementSettings.tsx | 19 +++++++ .../src/components/settings/SettingsView.tsx | 3 ++ .../ContextManagementSettings.spec.tsx | 10 ++++ .../SettingsView.change-detection.spec.tsx | 1 + .../SettingsView.unsaved-changes.spec.tsx | 1 + .../src/context/ExtensionStateContext.tsx | 2 + .../__tests__/ExtensionStateContext.spec.tsx | 2 + webview-ui/src/i18n/locales/en/settings.json | 4 ++ 17 files changed, 225 insertions(+), 3 deletions(-) diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts index f5757a51c7..c44b04f40e 100644 --- a/packages/types/src/global-settings.ts +++ b/packages/types/src/global-settings.ts @@ -187,6 +187,7 @@ export const globalSettingsSchema = z.object({ allowedMaxCost: z.number().nullish(), autoCondenseContext: z.boolean().optional(), autoCondenseContextPercent: z.number().optional(), + disableAutoContextManagement: z.boolean().optional(), /** * Whether to include current time in the environment details diff --git a/packages/types/src/vscode-extension-host.ts b/packages/types/src/vscode-extension-host.ts index 8a006c0639..e3a76896c0 100644 --- a/packages/types/src/vscode-extension-host.ts +++ b/packages/types/src/vscode-extension-host.ts @@ -412,6 +412,7 @@ export type ExtensionState = Pick< autoCondenseContext: boolean autoCondenseContextPercent: number + disableAutoContextManagement: boolean marketplaceItems?: MarketplaceItem[] // eslint-disable-next-line @typescript-eslint/no-explicit-any marketplaceInstalledMetadata?: { project: Record; global: Record } diff --git a/src/core/context-management/__tests__/context-management.spec.ts b/src/core/context-management/__tests__/context-management.spec.ts index 38c941cf4f..cef06d6d4f 100644 --- a/src/core/context-management/__tests__/context-management.spec.ts +++ b/src/core/context-management/__tests__/context-management.spec.ts @@ -267,6 +267,46 @@ describe("Context Management", () => { * Tests for the manageContext function */ describe("manageContext", () => { + it("does not condense or truncate when automatic context management is disabled", async () => { + const summarizeSpy = vi.spyOn(condenseModule, "summarizeConversation") + const messages: ApiMessage[] = [ + { role: "user", content: [{ type: "text", text: "Large context" }] }, + { role: "user", content: [{ type: "text", text: "Latest message" }] }, + ] + + const result = await manageContext({ + messages, + totalTokens: 200_000, + contextWindow: 100_000, + maxTokens: 10_000, + apiHandler: mockApiHandler, + autoCondenseContext: true, + autoCondenseContextPercent: 70, + disableAutoContextManagement: true, + systemPrompt: "System prompt", + taskId, + profileThresholds: {}, + currentProfileId: "default", + }) + + expect(result.messages).toBe(messages) + expect(result.truncationId).toBeUndefined() + expect(result.summary).toBe("") + expect(summarizeSpy).not.toHaveBeenCalled() + expect( + willManageContext({ + totalTokens: 200_000, + contextWindow: 100_000, + maxTokens: 10_000, + autoCondenseContext: true, + autoCondenseContextPercent: 70, + disableAutoContextManagement: true, + profileThresholds: {}, + currentProfileId: "default", + lastMessageTokens: 1, + }), + ).toBe(false) + }) const createModelInfo = (contextWindow: number, maxTokens?: number): ModelInfo => ({ contextWindow, supportsPromptCache: true, diff --git a/src/core/context-management/index.ts b/src/core/context-management/index.ts index 2050cef373..cc1ac06922 100644 --- a/src/core/context-management/index.ts +++ b/src/core/context-management/index.ts @@ -168,6 +168,7 @@ export type WillManageContextOptions = { maxTokens?: number | null autoCondenseContext: boolean autoCondenseContextPercent: number + disableAutoContextManagement?: boolean profileThresholds: Record currentProfileId: string lastMessageTokens: number @@ -193,11 +194,16 @@ export function willManageContext({ maxTokens, autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, profileThresholds, currentProfileId, lastMessageTokens, useAvailableInputForContextPercent, }: WillManageContextOptions): boolean { + if (disableAutoContextManagement) { + return false + } + if (!autoCondenseContext) { // When auto-condense is disabled, only truncation can occur // vscode-lm reports maxTokens: -1 (unlimited); a negative reserve must not distort the window math. @@ -251,6 +257,7 @@ export type ContextManagementOptions = { apiHandler: ApiHandler autoCondenseContext: boolean autoCondenseContextPercent: number + disableAutoContextManagement?: boolean systemPrompt: string taskId: string customCondensingPrompt?: string @@ -294,6 +301,7 @@ export async function manageContext({ apiHandler, autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, systemPrompt, taskId, customCondensingPrompt, @@ -323,6 +331,10 @@ export async function manageContext({ // Calculate total effective tokens (totalTokens never includes the last message) const prevContextTokens = totalTokens + lastMessageTokens + if (disableAutoContextManagement) { + return { messages, summary: "", cost: 0, prevContextTokens } + } + // Calculate available tokens for conversation history // Truncate if we're within TOKEN_BUFFER_PERCENTAGE of the context window const allowedTokens = contextWindow * (1 - TOKEN_BUFFER_PERCENTAGE) - reservedTokens diff --git a/src/core/message-manager/index.spec.ts b/src/core/message-manager/index.spec.ts index 770b8347cf..b310a592b3 100644 --- a/src/core/message-manager/index.spec.ts +++ b/src/core/message-manager/index.spec.ts @@ -1,5 +1,6 @@ import { MessageManager } from "./index" import * as condenseModule from "../condense" +import type { ApiMessage } from "../task-persistence/apiMessages" describe("MessageManager", () => { let mockTask: any @@ -248,6 +249,42 @@ describe("MessageManager", () => { }, ) + it("should restore full context when rewinding before a compaction whose summary predates the checkpoint", async () => { + const condenseId = "summary-before-checkpoint" + + mockTask.clineMessages = [ + { ts: 100, say: "user", text: "Task" }, + { ts: 200, say: "checkpoint_saved", text: "checkpoint-hash" }, + { ts: 300, say: "condense_context", contextCondense: { condenseId, summary: "Summary" } }, + { ts: 400, say: "user", text: "After compaction" }, + ] + + mockTask.apiConversationHistory = [ + { + ts: 100, + role: "user", + content: [{ type: "text", text: "Original user context" }], + condenseParent: condenseId, + }, + { + ts: 150, + role: "assistant", + content: [{ type: "text", text: "Original assistant context" }], + condenseParent: condenseId, + }, + { ts: 175, role: "user", content: [{ type: "text", text: "Summary" }], isSummary: true, condenseId }, + { ts: 250, role: "user", content: [{ type: "text", text: "After compaction" }] }, + ] + + await manager.rewindToTimestamp(200, { includeTargetMessage: true }) + + const apiHistory = mockTask.overwriteApiConversationHistory.mock.calls[0][0] as ApiMessage[] + expect(apiHistory).toHaveLength(2) + expect(apiHistory.some((message) => message.isSummary)).toBe(false) + expect(apiHistory[0].content).toEqual([{ type: "text", text: "Original user context" }]) + expect(apiHistory[1].content).toEqual([{ type: "text", text: "Original assistant context" }]) + }) + it("should clear orphaned condenseParent tags via cleanup", async () => { const condenseId = "summary-123" diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index b911479bc6..f25fd4644e 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -5536,7 +5536,10 @@ export class Task extends EventEmitter implements TaskLike { private async handleContextWindowExceededError(requestModelInfo: ModelInfo): Promise { const state = await this.providerRef.deref()?.getState() - const { profileThresholds = {} } = state ?? {} + const { profileThresholds = {}, disableAutoContextManagement = false } = state ?? {} + if (disableAutoContextManagement) { + return + } // Use task-local values, not provider state, to prevent cross-task configuration leaks. const mode = await this.getTaskMode() const apiConfiguration = this.apiConfiguration @@ -5706,6 +5709,7 @@ export class Task extends EventEmitter implements TaskLike { autoApprovalEnabled, autoCondenseContext = true, autoCondenseContextPercent = 100, + disableAutoContextManagement = false, profileThresholds = {}, } = state ?? {} // Use task-local values, not provider state, to prevent cross-task configuration leaks. @@ -5804,6 +5808,7 @@ export class Task extends EventEmitter implements TaskLike { maxTokens, autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, profileThresholds, currentProfileId, lastMessageTokens, @@ -5824,7 +5829,7 @@ export class Task extends EventEmitter implements TaskLike { let contextMgmtTools: import("openai").default.Chat.ChatCompletionTool[] = [] { const provider = this.providerRef.deref() - if (provider) { + if (provider && !disableAutoContextManagement) { const toolsResult = await buildNativeToolsArrayWithRestrictions({ provider, cwd: this.cwd, @@ -5880,6 +5885,7 @@ export class Task extends EventEmitter implements TaskLike { apiHandler: this.api, autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, systemPrompt, taskId: this.taskId, customCondensingPrompt, @@ -6049,7 +6055,11 @@ export class Task extends EventEmitter implements TaskLike { } // If it's a context window error and we haven't exceeded max retries for this error type - if (isContextWindowExceededError && retryAttempt < MAX_CONTEXT_WINDOW_RETRIES) { + if ( + isContextWindowExceededError && + !disableAutoContextManagement && + retryAttempt < MAX_CONTEXT_WINDOW_RETRIES + ) { console.warn( `[Task#${this.taskId}] Context window exceeded for model ${this.api.getModel().id}. ` + `Retry attempt ${retryAttempt + 1}/${MAX_CONTEXT_WINDOW_RETRIES}. ` + diff --git a/src/core/task/__tests__/Task.spec.ts b/src/core/task/__tests__/Task.spec.ts index c1ee5a0b13..965dd76978 100644 --- a/src/core/task/__tests__/Task.spec.ts +++ b/src/core/task/__tests__/Task.spec.ts @@ -2537,6 +2537,15 @@ describe("Cline", () => { const getSystemPromptSpy = vi .spyOn(getTaskTestAccess(task), "getSystemPrompt") .mockResolvedValue("mock system prompt") + const condenseId = "context-window-condense-id" + vi.mocked(summarizeConversation).mockResolvedValueOnce({ + messages: task.apiConversationHistory, + summary: "summary", + cost: 0, + newContextTokens: 1, + condenseId, + }) + const saySpy = vi.spyOn(task, "say") await getTaskTestAccess(task).handleContextWindowExceededError(ctxModelInfo) @@ -2545,6 +2554,46 @@ describe("Cline", () => { // the model info; the second argument must be the snapshot threaded // into the handler, not a fresh re-read. expect(getSystemPromptSpy).toHaveBeenCalledWith(snapshot, ctxModelInfo) + expect(saySpy).toHaveBeenCalledWith( + "condense_context", + undefined, + undefined, + false, + undefined, + undefined, + { isNonInteractive: true }, + expect.objectContaining({ condenseId }), + ) + }) + + it("does not automatically condense after a context-window error when disabled", async () => { + const task = new Task({ + provider: mockProvider, + apiConfiguration: mockApiConfig, + task: "test task", + startTask: false, + }) + await task.getTaskMode() + vi.spyOn(mockProvider, "getState").mockResolvedValue( + providerStateWith({ disableAutoContextManagement: true }), + ) + + const originalHistory: ApiMessage[] = [ + { role: "user", content: [{ type: "text", text: "Keep this context intact" }], ts: 1 }, + ] + task.apiConversationHistory = originalHistory + const getSystemPromptSpy = vi + .spyOn(getTaskTestAccess(task), "getSystemPrompt") + .mockResolvedValue("mock system prompt") + + await getTaskTestAccess(task).handleContextWindowExceededError({ + contextWindow: 1, + maxTokens: 1, + supportsPromptCache: false, + }) + + expect(task.apiConversationHistory).toBe(originalHistory) + expect(getSystemPromptSpy).not.toHaveBeenCalled() }) describe("emergency condense reporting (#1769)", () => { diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 8fff156425..d2a86740d8 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -3123,6 +3123,7 @@ export class ClineProvider allowedMaxCost, autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, soundEnabled, ttsEnabled, ttsSpeed, @@ -3286,6 +3287,7 @@ export class ClineProvider allowedMaxCost, autoCondenseContext: autoCondenseContext ?? true, autoCondenseContextPercent: autoCondenseContextPercent ?? 100, + disableAutoContextManagement: disableAutoContextManagement ?? false, uriScheme: vscode.env.uriScheme, currentTaskId: currentTask?.taskId, currentTaskItem: currentTask?.taskId ? this.taskHistoryStore.get(currentTask.taskId) : undefined, @@ -3536,6 +3538,7 @@ export class ClineProvider allowedMaxCost: stateValues.allowedMaxCost, autoCondenseContext: stateValues.autoCondenseContext ?? true, autoCondenseContextPercent: stateValues.autoCondenseContextPercent ?? 100, + disableAutoContextManagement: stateValues.disableAutoContextManagement ?? false, taskHistory: includeTaskHistory ? this.taskHistoryStore.getAll() : [], allowedCommands: stateValues.allowedCommands, deniedCommands: stateValues.deniedCommands, diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts index 97a25a7038..bf7aa9ce18 100644 --- a/src/core/webview/__tests__/ClineProvider.spec.ts +++ b/src/core/webview/__tests__/ClineProvider.spec.ts @@ -3199,6 +3199,7 @@ describe("ClineProvider", () => { organizationAllowList: ORGANIZATION_ALLOW_ALL, autoCondenseContext: true, autoCondenseContextPercent: 100, + disableAutoContextManagement: false, cloudIsAuthenticated: false, sharingEnabled: false, publicSharingEnabled: false, @@ -4471,12 +4472,38 @@ describe("ClineProvider", () => { expect(state.autoCondenseContext).toBe(true) }) + test("disableAutoContextManagement defaults to false", async () => { + const state = await provider.getState() + expect(state.disableAutoContextManagement).toBe(false) + }) + + test("getStateToPostToWebview returns saved disableAutoContextManagement", async () => { + await provider.resolveWebviewView(mockWebviewView) + await provider.contextProxy.setValue("disableAutoContextManagement", true) + + const state = await provider.getStateToPostToWebview() + + expect(state.disableAutoContextManagement).toBe(true) + }) + + test("getStateToPostToWebview returns the saved automatic context management opt-out", async () => { + await provider.resolveWebviewView(mockWebviewView) + await provider.contextProxy.setValue("disableAutoContextManagement", true) + + const state = await provider.getStateToPostToWebview() + + expect(state.disableAutoContextManagement).toBe(true) + }) + test("handles autoCondenseContext message", async () => { await provider.resolveWebviewView(mockWebviewView) const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0] await messageHandler({ type: "updateSettings", updatedSettings: { autoCondenseContext: false } }) expect(updateGlobalStateSpy).toHaveBeenCalledWith("autoCondenseContext", false) expect(mockContext.globalState.update).toHaveBeenCalledWith("autoCondenseContext", false) + await messageHandler({ type: "updateSettings", updatedSettings: { disableAutoContextManagement: true } }) + expect(updateGlobalStateSpy).toHaveBeenCalledWith("disableAutoContextManagement", true) + expect(mockContext.globalState.update).toHaveBeenCalledWith("disableAutoContextManagement", true) expect(mockPostMessage).toHaveBeenCalled() }) diff --git a/webview-ui/src/components/settings/ContextManagementSettings.tsx b/webview-ui/src/components/settings/ContextManagementSettings.tsx index c3af315d99..3f18bc1686 100644 --- a/webview-ui/src/components/settings/ContextManagementSettings.tsx +++ b/webview-ui/src/components/settings/ContextManagementSettings.tsx @@ -28,6 +28,7 @@ import { SearchableSetting } from "./SearchableSetting" type ContextManagementSettingsProps = HTMLAttributes & { autoCondenseContext: boolean autoCondenseContextPercent: number + disableAutoContextManagement: boolean listApiConfigMeta: any[] maxOpenTabsContext: number maxWorkspaceFiles: number @@ -48,6 +49,7 @@ type ContextManagementSettingsProps = HTMLAttributes & { setCachedStateField: SetCachedStateField< | "autoCondenseContext" | "autoCondenseContextPercent" + | "disableAutoContextManagement" | "maxOpenTabsContext" | "maxWorkspaceFiles" | "showRooIgnoredFiles" @@ -68,6 +70,7 @@ type ContextManagementSettingsProps = HTMLAttributes & { export const ContextManagementSettings = ({ autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, listApiConfigMeta, maxOpenTabsContext, maxWorkspaceFiles, @@ -511,6 +514,22 @@ export const ContextManagementSettings = ({ {t("settings:contextManagement.autoCondenseContext.name")} + + setCachedStateField("disableAutoContextManagement", e.target.checked)} + data-testid="disable-auto-context-management-checkbox"> + + {t("settings:contextManagement.disableAutoContextManagement.name")} + + +
+ {t("settings:contextManagement.disableAutoContextManagement.description")} +
+
{autoCondenseContext && (
diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx index 26955663ee..a61149612b 100644 --- a/webview-ui/src/components/settings/SettingsView.tsx +++ b/webview-ui/src/components/settings/SettingsView.tsx @@ -188,6 +188,7 @@ const SettingsView = forwardRef(({ onDone, t allowedWriteFiles, autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, enableCheckpoints, checkpointTimeout, experiments, @@ -438,6 +439,7 @@ const SettingsView = forwardRef(({ onDone, t allowedMaxCost: allowedMaxCost ?? null, autoCondenseContext, autoCondenseContextPercent, + disableAutoContextManagement, soundEnabled: soundEnabled ?? true, soundVolume: soundVolume ?? 0.5, ttsEnabled, @@ -931,6 +933,7 @@ const SettingsView = forwardRef(({ onDone, t { const defaultProps = { autoCondenseContext: false, autoCondenseContextPercent: 80, + disableAutoContextManagement: false, listApiConfigMeta: [], maxOpenTabsContext: 20, maxWorkspaceFiles: 200, @@ -114,6 +115,15 @@ describe("ContextManagementSettings", () => { vi.clearAllMocks() }) + it("updates the automatic context management opt-out from the cached setting", () => { + const setCachedStateField = vi.fn() + render() + + fireEvent.click(screen.getByTestId("disable-auto-context-management-checkbox").querySelector("input")!) + + expect(setCachedStateField).toHaveBeenCalledWith("disableAutoContextManagement", true) + }) + it("renders diagnostic settings", () => { render() diff --git a/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx b/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx index 6704aa1cf0..e6fd94cf2e 100644 --- a/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx +++ b/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx @@ -410,6 +410,7 @@ describe("SettingsView - Change Detection Fix", () => { alwaysAllowWriteProtected: false, autoCondenseContext: false, autoCondenseContextPercent: 50, + disableAutoContextManagement: false, enableCheckpoints: false, experiments: {}, maxOpenTabsContext: 10, diff --git a/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx b/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx index 1bc4ab1afb..eea280f753 100644 --- a/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx +++ b/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx @@ -280,6 +280,7 @@ describe("SettingsView - Unsaved Changes Detection", () => { alwaysAllowWriteProtected: false, autoCondenseContext: false, autoCondenseContextPercent: 50, + disableAutoContextManagement: false, enableCheckpoints: false, experiments: {}, maxOpenTabsContext: 10, diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index 770f051dc5..3a1d079fc2 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -149,6 +149,7 @@ export interface ExtensionStateContextType extends ExtensionState { setAutoCondenseContext: (value: boolean) => void autoCondenseContextPercent: number setAutoCondenseContextPercent: (value: number) => void + disableAutoContextManagement: boolean routerModels?: RouterModels includeDiagnosticMessages?: boolean setIncludeDiagnosticMessages: (value: boolean) => void @@ -302,6 +303,7 @@ export const createInitialExtensionState = (): ExtensionState => ({ organizationSettingsVersion: -1, autoCondenseContext: true, autoCondenseContextPercent: 100, + disableAutoContextManagement: false, profileThresholds: {}, codebaseIndexConfig: { codebaseIndexEnabled: true, diff --git a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx index 424255245a..230ba9a7d1 100644 --- a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx +++ b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx @@ -911,6 +911,7 @@ describe("mergeExtensionState", () => { organizationAllowList: { allowAll: true, providers: {} }, autoCondenseContext: true, autoCondenseContextPercent: 100, + disableAutoContextManagement: false, cloudIsAuthenticated: false, sharingEnabled: false, publicSharingEnabled: false, @@ -983,6 +984,7 @@ describe("mergeExtensionState", () => { organizationAllowList: { allowAll: true, providers: {} }, autoCondenseContext: true, autoCondenseContextPercent: 100, + disableAutoContextManagement: false, cloudIsAuthenticated: false, sharingEnabled: false, publicSharingEnabled: false, diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 67a9f146e4..f2648cbbe3 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -787,6 +787,10 @@ "autoCondenseContext": { "name": "Automatically trigger intelligent context condensing" }, + "disableAutoContextManagement": { + "name": "Disable automatic context compaction and truncation", + "description": "When enabled, Zoo Code will not automatically condense or truncate task context, including after a context-window error. You are responsible for avoiding context-window limits. Manual context condensation remains available." + }, "openTabs": { "label": "Open tabs context limit", "description": "Maximum number of VSCode open tabs to include in context. Higher values provide more context but increase token usage." From 07c24177024183b7236bb19debd997d2fb45bcde Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Fri, 6 Nov 2026 20:24:44 +0000 Subject: [PATCH 06/14] test(webview): disable transitions in welcome visual tests --- webview-ui/eslint-suppressions.json | 1 + .../components/welcome/__tests__/WelcomeViewProvider.visual.tsx | 1 + 2 files changed, 2 insertions(+) create mode 100644 webview-ui/eslint-suppressions.json diff --git a/webview-ui/eslint-suppressions.json b/webview-ui/eslint-suppressions.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/webview-ui/eslint-suppressions.json @@ -0,0 +1 @@ +{} diff --git a/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.visual.tsx b/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.visual.tsx index 89861542a8..88817f5149 100644 --- a/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.visual.tsx +++ b/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.visual.tsx @@ -8,6 +8,7 @@ for (const theme of visualThemes) { test(`renders the full welcome screen in the VS Code ${theme.name} theme`, async ({ mount, page }) => { await page.setViewportSize({ width: 480, height: 640 }) const component = mountedStory(await mount("welcome")) + await page.addStyleTag({ content: "* { transition: none !important; }" }) await applyVisualTheme(page, theme) const screen = component.locator(".fixed.inset-0") From 2eacffaf97101b4eac37483b4b0c1e5af9af76dc Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Fri, 6 Nov 2026 20:43:56 +0000 Subject: [PATCH 07/14] added translations --- webview-ui/src/i18n/locales/ca/settings.json | 4 ++++ webview-ui/src/i18n/locales/de/settings.json | 4 ++++ webview-ui/src/i18n/locales/es/settings.json | 4 ++++ webview-ui/src/i18n/locales/fr/settings.json | 4 ++++ webview-ui/src/i18n/locales/hi/settings.json | 4 ++++ webview-ui/src/i18n/locales/id/settings.json | 4 ++++ webview-ui/src/i18n/locales/it/settings.json | 4 ++++ webview-ui/src/i18n/locales/ja/settings.json | 4 ++++ webview-ui/src/i18n/locales/ko/settings.json | 4 ++++ webview-ui/src/i18n/locales/nl/settings.json | 4 ++++ webview-ui/src/i18n/locales/pl/settings.json | 4 ++++ webview-ui/src/i18n/locales/pt-BR/settings.json | 4 ++++ webview-ui/src/i18n/locales/ru/settings.json | 4 ++++ webview-ui/src/i18n/locales/tr/settings.json | 4 ++++ webview-ui/src/i18n/locales/vi/settings.json | 4 ++++ webview-ui/src/i18n/locales/zh-CN/settings.json | 4 ++++ webview-ui/src/i18n/locales/zh-TW/settings.json | 4 ++++ 17 files changed, 68 insertions(+) diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index 74adb11620..8aea565df5 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Activar automàticament la condensació intel·ligent de context" }, + "disableAutoContextManagement": { + "name": "Desactiva la compactació i el truncament automàtics del context", + "description": "Quan està activat, Zoo Code no condensarà ni truncarà automàticament el context de la tasca, ni tan sols després d'un error de finestra de context. Ets responsable d'evitar els límits de la finestra de context. La condensació manual del context continua disponible." + }, "openTabs": { "label": "Límit de context de pestanyes obertes", "description": "Nombre màxim de pestanyes obertes de VSCode a incloure al context. Valors més alts proporcionen més context però augmenten l'ús de token." diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index 078c5c6ebf..3cce93fdac 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Intelligente Kontextkomprimierung automatisch auslösen" }, + "disableAutoContextManagement": { + "name": "Automatische Kontextkomprimierung und -kürzung deaktivieren", + "description": "Wenn diese Option aktiviert ist, komprimiert oder kürzt Zoo Code den Aufgabenkontext nicht automatisch, auch nicht nach einem Kontextfensterfehler. Sie sind dafür verantwortlich, die Kontextfenstergrenzen einzuhalten. Die manuelle Kontextkomprimierung bleibt verfügbar." + }, "openTabs": { "label": "Geöffnete Tabs Kontextlimit", "description": "Maximale Anzahl von geöffneten VSCode-Tabs, die im Kontext enthalten sein sollen. Höhere Werte bieten mehr Kontext, erhöhen aber den Token-Verbrauch." diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index 81aeb1744c..5af93dafe6 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Activar automáticamente la condensación inteligente de contexto" }, + "disableAutoContextManagement": { + "name": "Desactivar la compactación y el truncamiento automáticos del contexto", + "description": "Cuando está activado, Zoo Code no condensará ni truncará automáticamente el contexto de la tarea, incluso después de un error de ventana de contexto. Eres responsable de evitar los límites de la ventana de contexto. La condensación manual del contexto sigue estando disponible." + }, "openTabs": { "label": "Límite de contexto de pestañas abiertas", "description": "Número máximo de pestañas abiertas de VSCode a incluir en el contexto. Valores más altos proporcionan más contexto pero aumentan el uso de token." diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 555b088322..f606dccf1f 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Déclencher automatiquement la condensation intelligente du contexte" }, + "disableAutoContextManagement": { + "name": "Désactiver la compaction et la troncature automatiques du contexte", + "description": "Lorsque cette option est activée, Zoo Code ne condensera ni ne tronquera automatiquement le contexte de la tâche, même après une erreur de fenêtre de contexte. Il vous appartient de ne pas dépasser les limites de la fenêtre de contexte. La condensation manuelle du contexte reste disponible." + }, "openTabs": { "label": "Limite de contexte des onglets ouverts", "description": "Nombre maximum d'onglets VSCode ouverts à inclure dans le contexte. Des valeurs plus élevées fournissent plus de contexte mais augmentent l'utilisation de token." diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 5c33bf5ccb..ce1c7dace9 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "बुद्धिमान संदर्भ संघनन को स्वचालित रूप से ट्रिगर करें" }, + "disableAutoContextManagement": { + "name": "स्वचालित संदर्भ संक्षेपण और कटौती अक्षम करें", + "description": "सक्षम होने पर, Zoo Code कार्य संदर्भ को स्वचालित रूप से संक्षिप्त या सीमित नहीं करेगा, यहाँ तक कि संदर्भ विंडो त्रुटि के बाद भी। संदर्भ विंडो की सीमाओं से बचने की ज़िम्मेदारी आपकी है। मैन्युअल संदर्भ संक्षेपण उपलब्ध रहेगा।" + }, "openTabs": { "label": "खुले टैब संदर्भ सीमा", "description": "संदर्भ में शामिल करने के लिए VSCode खुले टैब की अधिकतम संख्या। उच्च मान अधिक संदर्भ प्रदान करते हैं लेकिन token उपयोग बढ़ाते हैं।" diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index 62d91e4d06..8e625e5eec 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Secara otomatis memicu kondensasi konteks cerdas" }, + "disableAutoContextManagement": { + "name": "Nonaktifkan pemadatan dan pemangkasan konteks otomatis", + "description": "Jika diaktifkan, Zoo Code tidak akan memadatkan atau memangkas konteks tugas secara otomatis, termasuk setelah terjadi kesalahan batas konteks. Anda bertanggung jawab untuk menghindari batas konteks. Pemadatan konteks secara manual tetap tersedia." + }, "diagnostics": { "includeMessages": { "label": "Secara otomatis sertakan diagnostik dalam konteks", diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index eb090e3f47..ed3df6b9f4 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Attiva automaticamente la condensazione intelligente del contesto" }, + "disableAutoContextManagement": { + "name": "Disattiva la compattazione e il troncamento automatici del contesto", + "description": "Se attivata, Zoo Code non condenserà né troncherà automaticamente il contesto dell'attività, nemmeno dopo un errore della finestra di contesto. È tua responsabilità evitare di superare i limiti della finestra di contesto. La condensazione manuale del contesto rimane disponibile." + }, "openTabs": { "label": "Limite contesto schede aperte", "description": "Numero massimo di schede VSCode aperte da includere nel contesto. Valori più alti forniscono più contesto ma aumentano l'utilizzo di token." diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index a7939d2e3d..430f285406 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "インテリジェントなコンテキスト圧縮を自動的にトリガーする" }, + "disableAutoContextManagement": { + "name": "コンテキストの自動圧縮と切り詰めを無効にする", + "description": "有効にすると、コンテキストウィンドウのエラー後も含め、Zoo Codeはタスクのコンテキストを自動的に圧縮または切り詰めません。コンテキストウィンドウの上限を超えないようにする責任はユーザーにあります。手動でのコンテキスト圧縮は引き続き利用できます。" + }, "openTabs": { "label": "オープンタブコンテキスト制限", "description": "コンテキストに含めるVSCodeオープンタブの最大数。高い値はより多くのコンテキストを提供しますが、token使用量が増加します。" diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index 572141342a..2a8ec82ca3 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "지능적 컨텍스트 압축 자동 트리거" }, + "disableAutoContextManagement": { + "name": "자동 컨텍스트 압축 및 잘라내기 비활성화", + "description": "활성화하면 컨텍스트 창 오류가 발생한 후에도 Zoo Code가 작업 컨텍스트를 자동으로 압축하거나 잘라내지 않습니다. 컨텍스트 창 제한을 넘지 않도록 하는 책임은 사용자에게 있습니다. 수동 컨텍스트 압축은 계속 사용할 수 있습니다." + }, "openTabs": { "label": "열린 탭 컨텍스트 제한", "description": "컨텍스트에 포함할 VSCode 열린 탭의 최대 수. 높은 값은 더 많은 컨텍스트를 제공하지만 token 사용량이 증가합니다." diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index 2103bfd08c..82f2d40a87 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Automatisch intelligente contextcompressie activeren" }, + "disableAutoContextManagement": { + "name": "Automatische contextcompressie en -inkorting uitschakelen", + "description": "Wanneer ingeschakeld, comprimeert of kort Zoo Code de taakcontext niet automatisch in, ook niet na een fout met het contextvenster. U bent zelf verantwoordelijk voor het vermijden van de limieten van het contextvenster. Handmatige contextcompressie blijft beschikbaar." + }, "openTabs": { "label": "Limiet geopende tabbladen in context", "description": "Maximaal aantal geopende VSCode-tabbladen dat in de context wordt opgenomen. Hogere waarden geven meer context maar verhogen het tokengebruik." diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index 7a0ea345ec..48dfc529c6 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Automatycznie wyzwalaj inteligentną kondensację kontekstu" }, + "disableAutoContextManagement": { + "name": "Wyłącz automatyczne kompresowanie i skracanie kontekstu", + "description": "Po włączeniu Zoo Code nie będzie automatycznie kompresować ani skracać kontekstu zadania, również po błędzie okna kontekstu. Odpowiadasz za nieprzekraczanie limitów okna kontekstu. Ręczne kompresowanie kontekstu pozostanie dostępne." + }, "openTabs": { "label": "Limit kontekstu otwartych kart", "description": "Maksymalna liczba otwartych kart VSCode do uwzględnienia w kontekście. Wyższe wartości zapewniają więcej kontekstu, ale zwiększają zużycie token." diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index 3c755f7ee2..617e5b1b04 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Acionar automaticamente a condensação inteligente de contexto" }, + "disableAutoContextManagement": { + "name": "Desativar a compactação e o truncamento automáticos do contexto", + "description": "Quando ativado, o Zoo Code não condensará nem truncará automaticamente o contexto da tarefa, inclusive após um erro de janela de contexto. Você é responsável por evitar os limites da janela de contexto. A condensação manual do contexto continua disponível." + }, "openTabs": { "label": "Limite de contexto de abas abertas", "description": "Número máximo de abas abertas do VSCode a incluir no contexto. Valores mais altos fornecem mais contexto, mas aumentam o uso de token." diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index 69486d9e72..abdb63a5e9 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Автоматически запускать интеллектуальное сжатие контекста" }, + "disableAutoContextManagement": { + "name": "Отключить автоматическое сжатие и усечение контекста", + "description": "Если этот параметр включён, Zoo Code не будет автоматически сжимать или усекать контекст задачи, в том числе после ошибки окна контекста. Вы несёте ответственность за соблюдение ограничений окна контекста. Ручное сжатие контекста останется доступным." + }, "openTabs": { "label": "Лимит контекста открытых вкладок", "description": "Максимальное количество открытых вкладок VSCode, включаемых в контекст. Большее значение даёт больше контекста, но увеличивает расход токенов." diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 760990b0c2..68e7f28f05 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Akıllı bağlam sıkıştırmayı otomatik olarak tetikle" }, + "disableAutoContextManagement": { + "name": "Otomatik bağlam sıkıştırmayı ve kısaltmayı devre dışı bırak", + "description": "Etkinleştirildiğinde Zoo Code, bağlam penceresi hatasından sonra bile görev bağlamını otomatik olarak sıkıştırmaz veya kısaltmaz. Bağlam penceresi sınırlarını aşmaktan kaçınmak sizin sorumluluğunuzdadır. Bağlamı elle sıkıştırma seçeneği kullanılabilir olmaya devam eder." + }, "openTabs": { "label": "Açık sekmeler bağlam sınırı", "description": "Bağlama dahil edilecek maksimum VSCode açık sekme sayısı. Daha yüksek değerler daha fazla bağlam sağlar ancak token kullanımını artırır." diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index 07c2596d43..0e0fbc8a3a 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "Tự động kích hoạt nén ngữ cảnh thông minh" }, + "disableAutoContextManagement": { + "name": "Tắt tự động nén và cắt ngắn ngữ cảnh", + "description": "Khi được bật, Zoo Code sẽ không tự động nén hoặc cắt ngắn ngữ cảnh tác vụ, kể cả sau khi xảy ra lỗi cửa sổ ngữ cảnh. Bạn chịu trách nhiệm tránh vượt quá giới hạn cửa sổ ngữ cảnh. Tính năng nén ngữ cảnh thủ công vẫn khả dụng." + }, "openTabs": { "label": "Giới hạn ngữ cảnh tab đang mở", "description": "Số lượng tab VSCode đang mở tối đa để đưa vào ngữ cảnh. Giá trị cao hơn cung cấp nhiều ngữ cảnh hơn nhưng tăng sử dụng token." diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index 12fd5afe63..2d1acc2d1b 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -714,6 +714,10 @@ "autoCondenseContext": { "name": "自动触发智能上下文压缩" }, + "disableAutoContextManagement": { + "name": "禁用自动上下文压缩和截断", + "description": "启用后,即使发生上下文窗口错误,Zoo Code 也不会自动压缩或截断任务上下文。您需要自行避免超出上下文窗口限制。仍可手动压缩上下文。" + }, "openTabs": { "label": "标签页数量限制", "description": "允许纳入上下文的最大标签页数(数值越大消耗token越多)" diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index 6760aa6458..5ae79ab907 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -741,6 +741,10 @@ "autoCondenseContext": { "name": "自動觸發智慧上下文壓縮" }, + "disableAutoContextManagement": { + "name": "停用自動上下文壓縮與截斷", + "description": "啟用後,即使發生上下文視窗錯誤,Zoo Code 也不會自動壓縮或截斷工作上下文。您需要自行避免超出上下文視窗限制。仍可手動壓縮上下文。" + }, "openTabs": { "label": "開啟分頁的上下文限制", "description": "上下文中最多包含多少個 VS Code 開啟的分頁。數值越高提供的上下文越多,但 Token 用量也會增加。" From e5eb703419cdc431688cb20a47c4d6d3baa29d9b Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Fri, 6 Nov 2026 21:16:29 +0000 Subject: [PATCH 08/14] update changelog --- src/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index f6bc53ad23..eec4d0c63b 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -1,5 +1,12 @@ # Zoo Code Changelog +## [3.94.1] + +- Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/1 +- Ref #2303: Use bracket access in provider tests by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/2 +- Fix invalid custom storage setting fallback by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/3 +- Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/5 + ## [3.94.0] - ✨ **Broader model and provider support:** Use Claude Haiku 5.5 through Anthropic, send images to compatible VS Code LM models, tune temperature for OpenCode Go Responses models, and cancel requests cleanly across more providers. From fbd1593d1e388da46594203feba3677ed2ac6417 Mon Sep 17 00:00:00 2001 From: FullstackSensei Date: Fri, 6 Nov 2026 21:20:29 +0000 Subject: [PATCH 09/14] ci(release): attach VSIX to GitHub Releases without marketplace publishing --- .github/workflows/release-kickoff.yml | 11 +++--- .github/workflows/release-validation.yml | 1 + ...rketplace-publish.yml => release-vsix.yml} | 37 +++++-------------- .roo/commands/release.md | 26 ++++++------- 4 files changed, 29 insertions(+), 46 deletions(-) rename .github/workflows/{marketplace-publish.yml => release-vsix.yml} (81%) diff --git a/.github/workflows/release-kickoff.yml b/.github/workflows/release-kickoff.yml index 6e406c5a93..4e687d0bb4 100644 --- a/.github/workflows/release-kickoff.yml +++ b/.github/workflows/release-kickoff.yml @@ -1,8 +1,8 @@ name: Weekly release kickoff # Kicks off the weekly Zoo Code release. The message pings one maintainer per -# week as a reminder to review and approve the release PR, tag the release -# branch, and approve the marketplace-production deployment, then @mentions +# week as a reminder to review and approve the release PR and tag the release +# branch, then @mentions # zoomote as the visible cue of who cuts the release. Webhook-posted mentions # do not trigger Roomote (confirmed by test), so the release prep (release PR # per .roo/commands/release.md, posted in the release channel) runs from the @@ -63,13 +63,12 @@ jobs: ${on_deck} — reminder: you are on deck for this week's release. When the release PR is up: 1. Review and approve the release PR. - 2. Tag the release branch tip (\`v[version]\`) to trigger the Marketplace publish workflow. - 3. Approve the deployment when the \`marketplace-production\` environment requests it. - 4. After publishing succeeds, add the release PR to the merge queue. + 2. Tag the release branch tip (\`v[version]\`) to build the VSIX and attach it to the GitHub Release. + 3. After the release workflow succeeds, add the release PR to the merge queue. ${ZOOMOTE_MENTION} prepare this week's Zoo Code release per \`.roo/commands/release.md\` and post the release PR in this channel. - Avoid merging or rebasing the release branch before publishing, so the approved tag keeps the intended commit SHA. + Avoid merging or rebasing the release branch before the VSIX release build completes, so the approved tag keeps the intended commit SHA. More detail: https://discord.com/channels/1497384592494297201/1498024845945081999/1512914847124291667 EOF diff --git a/.github/workflows/release-validation.yml b/.github/workflows/release-validation.yml index 7471fe1856..5e33855771 100644 --- a/.github/workflows/release-validation.yml +++ b/.github/workflows/release-validation.yml @@ -15,6 +15,7 @@ on: - "webview-ui/src/components/chat/Announcement.tsx" - "releases/**" - ".github/workflows/release-validation.yml" + - ".github/workflows/release-vsix.yml" # Cancel superseded runs when a pull request is updated. Non-PR events keep # unique groups, so manual runs are never cancelled. diff --git a/.github/workflows/marketplace-publish.yml b/.github/workflows/release-vsix.yml similarity index 81% rename from .github/workflows/marketplace-publish.yml rename to .github/workflows/release-vsix.yml index e74f30bdca..7cea435d3f 100644 --- a/.github/workflows/marketplace-publish.yml +++ b/.github/workflows/release-vsix.yml @@ -1,4 +1,4 @@ -name: Publish Stable Extension +name: Build Stable VSIX Release on: push: @@ -6,8 +6,8 @@ on: - "v*.*.*" workflow_dispatch: -# Least privilege: publish-stable escalates to contents: write via its own -# job-level permissions block. +# Least privilege: build-stable-release escalates to contents: write to create +# the GitHub release and attach the VSIX. permissions: contents: read @@ -28,7 +28,7 @@ jobs: --jq '.[0].number // empty') if [ -z "$pr_number" ]; then - echo "No PR found for commit ${SHA}. Deployment requires an approved PR." + echo "No PR found for commit ${SHA}. Release requires an approved PR." exit 1 fi @@ -49,16 +49,15 @@ jobs: echo "PR #${pr_number} review_decision: ${review_decision}" if [ "$review_decision" != "APPROVED" ]; then - echo "PR #${pr_number} is not approved (state: ${review_decision}). Deployment blocked." + echo "PR #${pr_number} is not approved (state: ${review_decision}). Release blocked." exit 1 fi - echo "PR #${pr_number} is approved. Proceeding." + echo "PR #${pr_number} is approved. Building release." - publish-stable: + build-stable-release: needs: [check-pr-approval] runs-on: ubuntu-latest - environment: marketplace-production permissions: contents: write @@ -79,10 +78,10 @@ jobs: test "$package_name" = "zoo-code" test "$publisher" = "ZooCodeOrganization" - - name: Validate publish ref + - name: Validate release ref run: | if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ] && [ "$GITHUB_REF_NAME" != "main" ]; then - echo "Manual stable publishes must run from main, not ${GITHUB_REF_NAME}." + echo "Manual stable release builds must run from main, not ${GITHUB_REF_NAME}." exit 1 fi @@ -132,23 +131,7 @@ jobs: test "$artifact_name" = "zoo-code" test "$artifact_publisher" = "ZooCodeOrganization" - - name: Publish to VS Code Marketplace - env: - VSCE_PAT: ${{ secrets.VSCE_PAT }} - run: | - package_version=$(node -p "require('./src/package.json').version") - npx @vscode/vsce publish --packagePath "bin/zoo-code-${package_version}.vsix" - echo "Published ZooCodeOrganization.zoo-code ${package_version} to VS Code Marketplace" - - - name: Publish to Open VSX Registry - env: - OVSX_PAT: ${{ secrets.OVSX_PAT }} - run: | - package_version=$(node -p "require('./src/package.json').version") - pnpm exec ovsx publish "bin/zoo-code-${package_version}.vsix" --skip-duplicate - echo "Published ZooCodeOrganization.zoo-code ${package_version} to Open VSX Registry" - - - name: Create GitHub release + - name: Create GitHub release and attach VSIX env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | diff --git a/.roo/commands/release.md b/.roo/commands/release.md index 62f9abe668..0a65034a4d 100644 --- a/.roo/commands/release.md +++ b/.roo/commands/release.md @@ -38,7 +38,7 @@ mode: code 6. Write the release notes directly into `CHANGELOG.md` on the release branch. - - Use the heading format `## [version]` (with square brackets) — e.g. `## [3.58.1]`. The publish workflow at `.github/workflows/marketplace-publish.yml` extracts release notes by matching this exact pattern; headings without brackets will be missed and the GitHub release will fall back to a generic message. + - Use the heading format `## [version]` (with square brackets) — e.g. `## [3.58.1]`. The release workflow at `.github/workflows/release-vsix.yml` extracts release notes by matching this exact pattern; headings without brackets will be missed and the GitHub release will fall back to a generic message. - Always include contributor attribution and the PR number: use `(PR # by @username)`. - For PRs that close issues, include both issue and PR authors: `- Fix: Description (#123 by @reporter, PR #456 by @contributor)`. - For PRs without linked issues, include the PR number and author: `- Add support for feature (PR #456 by @contributor)`. @@ -84,7 +84,7 @@ mode: code 11. Once the release PR is open and passing checks, get it approved by a reviewer before proceeding. - - Do not create the tag until the PR has at least one approval — the publish workflow enforces this automatically and will fail if no approved PR is found for the tagged commit. + - Do not create the tag until the PR has at least one approval — the release workflow enforces this automatically and will fail if no approved PR is found for the tagged commit. 12. After the PR is approved, create the release tag on the release branch tip and push it: @@ -94,27 +94,27 @@ mode: code ``` - Tag the branch tip as-is. Do not rebase or merge additional commits into the release branch before tagging — doing so changes the commit SHA and may pull in unreviewed changes that weren't part of the approval. - - The publish workflow validates that the tag version matches `src/package.json`. + - The release workflow validates that the tag version matches `src/package.json`. -13. The tag push triggers the stable publish workflow. +13. The tag push triggers the stable VSIX release workflow. - - The workflow first checks that the tagged commit belongs to an approved PR. If the PR is not yet approved this step fails — approve the PR first, then retrigger by recreating and pushing the tag: `git tag -d v[version] && git push origin :refs/tags/v[version] && git tag v[version] && git push origin v[version]`. - - Once the approval check passes, the `marketplace-production` environment gate fires and notifies the configured approvers. - - A human approver must then approve the deployment before the extension is published to VS Code Marketplace and Open VSX. + - The workflow checks that the tagged commit belongs to an approved PR, validates the tag against `src/package.json`, builds the VSIX, and creates the GitHub Release with the VSIX attached. + - If the PR is not yet approved, the workflow fails — approve the PR first, then retrigger by recreating and pushing the tag: `git tag -d v[version] && git push origin :refs/tags/v[version] && git tag v[version] && git push origin v[version]`. + - This workflow only builds and attaches the VSIX; it does not publish to the VS Code Marketplace or Open VSX. -14. After a successful deployment, add the release PR to the merge queue. +14. After the GitHub Release has been created with the VSIX attached, add the release PR to the merge queue. ```bash gh pr merge [pr-number] --auto --squash ``` - - Do not merge before the deployment succeeds — merging first and then discovering a publish failure leaves `main` ahead of what was actually shipped. + - Do not merge before the release workflow succeeds — merging first and then discovering a build failure leaves `main` ahead of the release artifact. - The merge queue runs all required checks against the release branch before merging to `main`. 15. As the final stable extension release step, open a separate documentation PR in `Zoo-Code-Org/Zoo-Code-Docs`. - - Run this step only after the marketplace workflow for the exact stable tag has succeeded, the corresponding GitHub release exists, and step 14 has added the Zoo Code release PR to the merge queue. This step does not apply to nightly, CLI, npm, or types releases. - - Retain the exact Zoo Code changelog section, complete merged-PR inventory, release PR URL, tag and GitHub release URL, marketplace workflow URL, successful publication timestamp, and release PR merge-queue state as inputs to the docs work and final report. + - Run this step only after the VSIX release workflow for the exact stable tag has succeeded, the corresponding GitHub release with the VSIX exists, and step 14 has added the Zoo Code release PR to the merge queue. This step does not apply to nightly, CLI, npm, or types releases. + - Retain the exact Zoo Code changelog section, complete merged-PR inventory, release PR URL, tag and GitHub release URL, VSIX release workflow URL, release creation timestamp, and release PR merge-queue state as inputs to the docs work and final report. **Preflight and checkout** @@ -160,9 +160,9 @@ mode: code - Inspect build warnings explicitly. Block the PR on newly introduced broken-link, document, MDX, sidebar, or content warnings. Verify the changed and staged scope contains only intended source files and no generated output. - Commit as `docs(release): document v[version]`, push normally (never force-push) to `docs/release-v[version]`, and stop rather than overwrite a remote race. - - Open or reuse a PR in `Zoo-Code-Org/Zoo-Code-Docs` with base `main` and title `[Docs] Update documentation for Zoo Code v[version]`. Its body must include the source release and tag, Zoo Code release PR, marketplace workflow and successful publication timestamp, summary, package version synchronization, per-PR impact matrix and exclusions, evergreen changes or no-change rationale, validation results and warning review, and an explicit statement that this is a separate docs PR and will not be auto-merged. Never enable auto-merge for this PR. + - Open or reuse a PR in `Zoo-Code-Org/Zoo-Code-Docs` with base `main` and title `[Docs] Update documentation for Zoo Code v[version]`. Its body must include the source release and tag, Zoo Code release PR, VSIX release workflow and release creation timestamp, summary, package version synchronization, per-PR impact matrix and exclusions, evergreen changes or no-change rationale, validation results and warning review, and an explicit statement that this is a separate docs PR and will not be auto-merged. Never enable auto-merge for this PR. **Reporting and partial failure** - Docs failure cannot roll back or invalidate the published extension. A failure report must begin: `Zoo Code v[version] is already published and docs PR completion is pending.` Then report the failed checkpoint, checkout path, branch, PR URL/state when present, failure details, and the safe recovery action. - - The final release report must include release/tag/workflow URLs and the successful publication timestamp, the Zoo Code release PR merge-queue state, docs PR URL/state, docs branch and commit SHA, package-version synchronization status, release-note/index/sidebar status, evergreen documentation status, validation results and inspected warnings, and confirmation that the separate docs PR was not auto-merged. + - The final release report must include release/tag/workflow URLs and the release creation timestamp, the Zoo Code release PR merge-queue state, docs PR URL/state, docs branch and commit SHA, package-version synchronization status, release-note/index/sidebar status, evergreen documentation status, validation results and inspected warnings, and confirmation that the separate docs PR was not auto-merged. From edd424ac7cacd2f9f60004aab92d9123cf53b28e Mon Sep 17 00:00:00 2001 From: Ali Mualla Date: Fri, 6 Nov 2026 21:53:14 +0000 Subject: [PATCH 10/14] bump version in package.json --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 8a30d614e1..5a95640056 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "ZooCodeOrganization", - "version": "3.94.0", + "version": "3.94.1", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From 8503483ab9d48fa7805b72e116a713a258c13d77 Mon Sep 17 00:00:00 2001 From: Ali Mualla Date: Fri, 6 Nov 2026 21:54:56 +0000 Subject: [PATCH 11/14] bump version in package.json --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 8a30d614e1..5a95640056 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "ZooCodeOrganization", - "version": "3.94.0", + "version": "3.94.1", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From e8f94729c1bbefd54dc27080fd8456f1043a54a9 Mon Sep 17 00:00:00 2001 From: Ali Mualla Date: Fri, 6 Nov 2026 22:01:54 +0000 Subject: [PATCH 12/14] add version changes in changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6bc53ad23..7cf2ee421c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Zoo Code Changelog +[3.94.1] +* Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/1 +* Ref #2303: Use bracket access in provider tests by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/2 +* Fix invalid custom storage setting fallback by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/3 +* Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/5 + ## [3.94.0] - ✨ **Broader model and provider support:** Use Claude Haiku 5.5 through Anthropic, send images to compatible VS Code LM models, tune temperature for OpenCode Go Responses models, and cancel requests cleanly across more providers. From d84addb95693c9da99b24d3d97b2ccd2b93d4542 Mon Sep 17 00:00:00 2001 From: Ali Mualla Date: Fri, 6 Nov 2026 22:05:01 +0000 Subject: [PATCH 13/14] fix changelog header --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cf2ee421c..893b304459 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Zoo Code Changelog -[3.94.1] +## [3.94.1] * Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/1 * Ref #2303: Use bracket access in provider tests by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/2 * Fix invalid custom storage setting fallback by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/3 From 95c1861ec12f827deff3f99805bad0b79d90826f Mon Sep 17 00:00:00 2001 From: Ali Mualla Date: Fri, 6 Nov 2026 22:09:13 +0000 Subject: [PATCH 14/14] fix changelog formatting --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 893b304459..0294a5a4e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Zoo Code Changelog ## [3.94.1] -* Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/1 -* Ref #2303: Use bracket access in provider tests by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/2 -* Fix invalid custom storage setting fallback by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/3 -* Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/5 +- Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/1 +- Ref #2303: Use bracket access in provider tests by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/2 +- Fix invalid custom storage setting fallback by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/3 +- Workspace provider isolation by @FullstackSensei in https://github.com/FullstackSensei/Zoo-Code/pull/5 ## [3.94.0]