test(webview): F2a - profile-mutation state semantics and the mode-rollback guard

apps/vscode-e2e/src/suite/restart-persistence.test.ts

@@ -61,6 +61,11 @@ async function runCreate(api: RooCodeAPI): Promise<void> {
 		const createdTaskId: string = taskId
 		await waitFor(() => api.hasTaskUiMessageText(createdTaskId, MARKER))
 
+		// history_item.json is written outside the ui_messages.json flush as well: wait for
+		// the task to be visible in history before quitting, or the verify phase can assert
+		// on a task that only ever existed in memory.
+		await waitFor(() => api.isTaskInHistory(createdTaskId))
+
 		const result: PhaseResult = {
 			version: PHASE_RESULT_VERSION,
 			phase: "create",

packages/types/src/__tests__/global-settings.test.ts

@@ -3,6 +3,7 @@ import {
 	DEFAULT_DESTRUCTIVE_COMMAND_GUARD_ENABLED,
 	GLOBAL_SETTINGS_KEYS,
 	globalSettingsSchema,
+	viewStateSchema,
 } from "../global-settings.js"
 
 describe("destructive command guard global setting", () => {
@@ -51,3 +52,69 @@ describe("collapseCommandOutputByDefault global setting", () => {
 		expect(globalSettingsSchema.safeParse({ collapseCommandOutputByDefault: "true" }).success).toBe(false)
 	})
 })
+
+describe("viewStates global setting", () => {
+	it("preserves each webview instance selection through the persisted schema", () => {
+		const parsed = globalSettingsSchema.parse({
+			viewStates: {
+				"session-1": { mode: "code", currentApiConfigName: "default", updatedAt: 1700000000000 },
+				"session-2": { mode: "architect" },
+			},
+		})
+		// Every field has to survive the round trip: a selection the schema drops is
+		// written back as absent, so the next window opens in the default mode.
+		expect(parsed.viewStates).toEqual({
+			"session-1": { mode: "code", currentApiConfigName: "default", updatedAt: 1700000000000 },
+			"session-2": { mode: "architect" },
+		})
+	})
+
+	it("parses a single view state on its own", () => {
+		expect(viewStateSchema.parse({ mode: "ask", currentApiConfigName: "x", updatedAt: 5 })).toEqual({
+			mode: "ask",
+			currentApiConfigName: "x",
+			updatedAt: 5,
+		})
+	})
+
+	it("rejects a numeric mode and names the offending path", () => {
+		// The control first: the same record without the bad field must parse, so a
+		// failure here can only mean the schema rejected that value - not that the record
+		// shape is unsupported or the assertion never ran.
+		expect(globalSettingsSchema.safeParse({ viewStates: { a: { mode: "code" } } }).success).toBe(true)
+
+		const result = globalSettingsSchema.safeParse({ viewStates: { a: { mode: 42 } } })
+
+		expect(result.success).toBe(false)
+		expect(result.error?.issues[0]?.path).toEqual(["viewStates", "a", "mode"])
+	})
+
+	it("rejects a non-string currentApiConfigName and names the offending path", () => {
+		expect(globalSettingsSchema.safeParse({ viewStates: { a: { currentApiConfigName: "x" } } }).success).toBe(true)
+
+		const result = globalSettingsSchema.safeParse({ viewStates: { a: { currentApiConfigName: 7 } } })
+
+		expect(result.success).toBe(false)
+		expect(result.error?.issues[0]?.path).toEqual(["viewStates", "a", "currentApiConfigName"])
+	})
+
+	it("rejects a non-numeric updatedAt and names the offending path", () => {
+		expect(globalSettingsSchema.safeParse({ viewStates: { a: { updatedAt: 1 } } }).success).toBe(true)
+
+		const result = globalSettingsSchema.safeParse({ viewStates: { a: { updatedAt: "1" } } })
+
+		expect(result.success).toBe(false)
+		expect(result.error?.issues[0]?.path).toEqual(["viewStates", "a", "updatedAt"])
+	})
+
+	it("rejects a view state that is not an object", () => {
+		// A bare string under a session id is what a half-migrated store looks like;
+		// accepting it defers the crash to whoever reads the selection back.
+		expect(globalSettingsSchema.safeParse({ viewStates: { a: { mode: "code" } } }).success).toBe(true)
+
+		const result = globalSettingsSchema.safeParse({ viewStates: { a: "code" } })
+
+		expect(result.success).toBe(false)
+		expect(result.error?.issues[0]?.path).toEqual(["viewStates", "a"])
+	})
+})

packages/types/src/__tests__/index.test.ts

@@ -3,6 +3,10 @@
 import { GLOBAL_STATE_KEYS } from "../index.js"
 
 describe("GLOBAL_STATE_KEYS", () => {
+	it("should contain registered durable per-view state", () => {
+		expect(GLOBAL_STATE_KEYS).toContain("viewStates")
+	})
+
 	it("should contain provider settings keys", () => {
 		expect(GLOBAL_STATE_KEYS).toContain("autoApprovalEnabled")
 	})
@@ -13,6 +17,7 @@ describe("GLOBAL_STATE_KEYS", () => {
 
 	it("should not contain secret state keys", () => {
 		expect(GLOBAL_STATE_KEYS).not.toContain("openRouterApiKey")
+		expect(GLOBAL_STATE_KEYS).not.toContain("apiKey")
 	})
 
 	it("should contain OpenAI Compatible base URL setting", () => {

packages/types/src/global-settings.ts

@@ -114,6 +114,15 @@ export const MAX_CHECKPOINT_TIMEOUT_SECONDS = 60
  */
 export const DEFAULT_CHECKPOINT_TIMEOUT_SECONDS = 15
 
+/**
+ * Persisted non-secret selections for a stable webview instance.
+ */
+export const viewStateSchema = z.object({
+	mode: z.string().optional(),
+	currentApiConfigName: z.string().optional(),
+	updatedAt: z.number().optional(),
+})
+
 /**
  * GlobalSettings
  */
@@ -122,6 +131,7 @@ export const globalSettingsSchema = z.object({
 	currentApiConfigName: z.string().optional(),
 	listApiConfigMeta: z.array(providerSettingsEntrySchema).optional(),
 	pinnedApiConfigs: z.record(z.string(), z.boolean()).optional(),
+	viewStates: z.record(z.string(), viewStateSchema).optional(),
 
 	lastShownAnnouncementId: z.string().optional(),
 	customInstructions: z.string().optional(),

packages/types/src/vscode-extension-host.ts

@@ -712,6 +712,7 @@ export interface WebviewMessage {
 		| "themeFixtureProbeResponse"
 		| "diagnosticsResponse"
 	text?: string
+	viewStateId?: string
 	taskId?: string
 	editedMessageContent?: string
 	tab?: "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "cloud"

packages/types/src/vscode.ts

@@ -35,6 +35,14 @@ export const commandIds = [
 	"popoutButtonClicked",
 	"settingsButtonClicked",
 
+	// Editor-tab (popped-out) surface variants of the title-bar buttons. The
+	// shared ids above target the sidebar click origin, so the tab surface
+	// needs its own ids (see registerCommands.ts getTabProvider).
+	"plusButtonClickedInTab",
+	"settingsButtonClickedInTab",
+	"marketplaceButtonClickedInTab",
+	"historyButtonClickedInTab",
+
 	"openInNewTab",
 
 	"newTask",

src/__tests__/extension.spec.ts

@@ -338,6 +338,7 @@ describe("extension.ts", () => {
 			context: mockContext,
 			outputChannel,
 			webviewFocusTracker: tracker,
+			forceNew: true,
 		})
 		tracker?.dispose()
 	})