@eddyskywalker/dsh-chatgpt-subscription 0.3.8 → 0.4.0

package/lib/index.js

@@ -192,7 +192,9 @@ function resolveCodexFallbackModel(model) {
 const PROVIDER_ID$3 = CODEX_CHATGPT_PROVIDER_ID;
 const PROVIDER_NAME$3 = "Codex（ChatGPT 订阅）";
 function listCodexModels(preferences) {
-	const visible = new Set(preferences?.status().visibleModelIds ?? CODEX_MODEL_CATALOG.map((entry) => entry.id));
+	const status = preferences?.status();
+	if (status?.enabled === false) return [];
+	const visible = new Set(status?.visibleModelIds ?? CODEX_MODEL_CATALOG.map((entry) => entry.id));
 	return CODEX_MODEL_CATALOG.filter((entry) => visible.has(entry.id)).map((entry) => ({
 		provider: PROVIDER_ID$3,
 		id: entry.id,
@@ -1597,6 +1599,7 @@ var ProxyManager = class {
 //#region src/shared/preferences.ts
 const PREFERENCES_NAMESPACE = "dsh-chatgpt-subscription";
 const DEFAULT_PREFERENCES = {
+	enabled: true,
 	quickQuotaVisible: false,
 	fastMode: false,
 	outputVerbosity: null,
@@ -1630,6 +1633,7 @@ function isProxyMode(value) {
 function registerPreferenceStore(settings) {
 	const ns = SettingsModule.settingsNamespace ? SettingsModule.settingsNamespace(PREFERENCES_NAMESPACE) : PREFERENCES_NAMESPACE;
 	return new SettingsPreferenceStore(settings.register.call(settings, ns, z.object({
+		enabled: z.boolean().default(DEFAULT_PREFERENCES.enabled ?? true),
 		quickQuotaVisible: z.boolean().default(DEFAULT_PREFERENCES.quickQuotaVisible),
 		fastMode: z.boolean().default(DEFAULT_PREFERENCES.fastMode),
 		outputVerbosity: z.union([
@@ -1671,6 +1675,7 @@ var SettingsPreferenceStore = class {
 	}
 	async update(patch) {
 		const normalized = {};
+		if (patch.enabled !== void 0) normalized.enabled = patch.enabled;
 		if (patch.quickQuotaVisible !== void 0) normalized.quickQuotaVisible = patch.quickQuotaVisible;
 		if (patch.fastMode !== void 0) normalized.fastMode = patch.fastMode;
 		if (patch.outputVerbosity !== void 0) {
@@ -1682,7 +1687,7 @@ var SettingsPreferenceStore = class {
 			normalized.reasoningSummary = patch.reasoningSummary;
 		}
 		if (patch.visibleModelIds !== void 0) {
-			if (patch.visibleModelIds.length === 0 || !patch.visibleModelIds.every(isCodexModelId)) throw new PreferenceError("At least one supported Codex model must be visible.");
+			if (!patch.visibleModelIds.every(isCodexModelId)) throw new PreferenceError("Unsupported Codex model.");
 			normalized.visibleModelIds = [...new Set(patch.visibleModelIds)];
 		}
 		if (patch.searchProvider !== void 0) {
@@ -1899,7 +1904,7 @@ async function buildResponsesPayload(options, attachments, localRawImages = {},
 	const instructionParts = [
 		options.system?.trim(),
 		latestSystemPrompt(options.messages),
-		progressExplanationInstruction(options.tools),
+		progressExplanationInstruction$1(options.tools),
 		sandboxToolInstruction(options.tools, sandboxRetryTools),
 		commandToolInstruction(options.tools),
 		runCodeInstruction(options.tools)
@@ -1985,7 +1990,7 @@ async function buildResponsesPayload(options, attachments, localRawImages = {},
 	}
 	return payload;
 }
-function progressExplanationInstruction(tools) {
+function progressExplanationInstruction$1(tools) {
 	if (!tools?.length) return void 0;
 	return "Progress and tool execution rule: when executing multi-step tasks or invoking tools, output 1-2 concise sentences of progress, intent, or intermediate findings before each tool call. Keep progress text brief, professional, and factual. Only present the comprehensive final answer and summary in the final turn after all tool operations are completed.";
 }
@@ -3435,8 +3440,12 @@ function isRecord$6(value) {
 }
 function readPreferencesUpdate(value, current) {
 	const patch = {};
+	if ("enabled" in value) {
+		if (typeof value.enabled !== "boolean") throw new PreferenceError("enabled must be a boolean.");
+		patch.enabled = value.enabled;
+	}
 	if ("visibleModelIds" in value) {
-		if (!Array.isArray(value.visibleModelIds) || value.visibleModelIds.length === 0 || !value.visibleModelIds.every(isCodexModelId)) throw new PreferenceError("visibleModelIds must contain at least one supported Codex model.");
+		if (!Array.isArray(value.visibleModelIds) || !value.visibleModelIds.every(isCodexModelId)) throw new PreferenceError("visibleModelIds must be an array of supported Codex models.");
 		patch.visibleModelIds = [...new Set(value.visibleModelIds)];
 	}
 	if ("quickQuotaVisible" in value) {
@@ -3730,6 +3739,9 @@ function isMissing(error) {
 //#region src/host/token-store-windows.ts
 const PROTECT_SCRIPT = String.raw`
 $ErrorActionPreference = 'Stop'
+[Console]::InputEncoding = [Text.Encoding]::UTF8
+[Console]::OutputEncoding = [Text.Encoding]::UTF8
+$OutputEncoding = [Text.Encoding]::UTF8
 Add-Type -AssemblyName System.Security
 $path = $env:DSH_CODEX_TOKEN_PATH
 $plain = [Console]::In.ReadToEnd()
@@ -3751,6 +3763,9 @@ try {
 `;
 const UNPROTECT_SCRIPT = String.raw`
 $ErrorActionPreference = 'Stop'
+[Console]::InputEncoding = [Text.Encoding]::UTF8
+[Console]::OutputEncoding = [Text.Encoding]::UTF8
+$OutputEncoding = [Text.Encoding]::UTF8
 Add-Type -AssemblyName System.Security
 $path = $env:DSH_CODEX_TOKEN_PATH
 if (-not [IO.File]::Exists($path)) { exit 3 }
@@ -3965,7 +3980,8 @@ const SCOPES = [
 const DEFAULT_CLIENT_ID = Buffer.from("MTA3MTAwNjA2MDU5MS10bWhzc2luMmgyMWxjcmUyMzV2dG9sb2poNGc0MDNlcC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbQ==", "base64").toString("utf8");
 const DEFAULT_CLIENT_SECRET = Buffer.from("R09DU1BYLUs1OEZXUjQ4NkxkTEoxbUxCOHNYQzR6NnFEQWY=", "base64").toString("utf8");
 const ANTIGRAVITY_SYSTEM_INSTRUCTION = "You are Antigravity, a powerful agentic AI coding assistant designed by Google DeepMind. You are pair programming with a user to solve coding tasks. Be concise, practical, and tool-aware.";
-const ANTIGRAVITY_NO_PREAMBLE_INSTRUCTION = "CRITICAL: NEVER output rule checks, formatting guidelines, constraint checklists, or thinking/personality preambles in the final response. Output only the final response.";
+const ANTIGRAVITY_NO_PREAMBLE_INSTRUCTION = "CRITICAL: NEVER output rule checks, formatting guidelines, constraint checklists, or thinking/personality preambles in the final response. Output only the final response. This forbids meta commentary only; it does not forbid the short progress lines the next rule requires before tool calls.";
+const ANTIGRAVITY_PROGRESS_INSTRUCTION = "Progress and tool execution rule: before EVERY tool call, emit 1-2 short sentences of ordinary, visible assistant text stating what you are about to do and why, written as normal response text the user can read. Never write those sentences only inside your thinking/thought summary: the visible text part must exist, otherwise the progress is not delivered. These progress lines are required and take precedence over the no-preamble rule. Keep them brief, professional, and factual; do not restate the whole plan. Only present the comprehensive final answer and summary in the final turn, after all tool operations are completed.";
 const GEMINI_ROLE = {
 	user: "user",
 	model: "model"
@@ -4357,6 +4373,7 @@ const ANTIGRAVITY_PREFERENCES_NAMESPACE = "dsh-antigravity";
 function registerAntigravityPreferenceStore(settings, fallbackStore = new FileModelSettingsStore$1()) {
 	if (!settings) return {
 		status: () => ({
+			enabled: true,
 			enabledModelIds: MODELS.map((m) => m.id),
 			catalogModels: [],
 			contextWindowOverrides: {},
@@ -4366,6 +4383,7 @@ function registerAntigravityPreferenceStore(settings, fallbackStore = new FileMo
 	};
 	const ns = SettingsModule.settingsNamespace ? SettingsModule.settingsNamespace(ANTIGRAVITY_PREFERENCES_NAMESPACE) : ANTIGRAVITY_PREFERENCES_NAMESPACE;
 	const scope = settings.register.call(settings, ns, z.object({
+		enabled: z.boolean().default(true),
 		enabledModelIds: z.array(z.string()).default(MODELS.map((m) => m.id)),
 		contextWindowOverrides: z.dict(z.number()).default({}),
 		defaultReasoningEffort: z.union([
@@ -4379,6 +4397,7 @@ function registerAntigravityPreferenceStore(settings, fallbackStore = new FileMo
 		status: () => {
 			const val = scope.get();
 			return {
+				enabled: val.enabled !== false,
 				enabledModelIds: val.enabledModelIds,
 				catalogModels: [],
 				contextWindowOverrides: val.contextWindowOverrides,
@@ -4388,6 +4407,7 @@ function registerAntigravityPreferenceStore(settings, fallbackStore = new FileMo
 		update: async (patch) => {
 			const current = scope.get();
 			const normalized = {
+				enabled: patch.enabled !== void 0 ? patch.enabled : current.enabled !== false,
 				enabledModelIds: patch.enabledModelIds ?? current.enabledModelIds,
 				contextWindowOverrides: patch.contextWindowOverrides ? {
 					...current.contextWindowOverrides,
@@ -4533,15 +4553,21 @@ var FileModelSettingsStore$1 = class {
 			const parsed = JSON.parse(content);
 			if (typeof parsed === "object" && parsed !== null) {
 				const record = parsed;
+				const enabledModelIds = Array.isArray(record.enabledModelIds) ? record.enabledModelIds.filter((id) => typeof id === "string") : MODELS.map((m) => m.id);
+				const catalogModels = Array.isArray(record.catalogModels) ? record.catalogModels : [];
+				const contextWindowOverrides = typeof record.contextWindowOverrides === "object" && record.contextWindowOverrides !== null ? record.contextWindowOverrides : {};
+				const defaultReasoningEffort = record.defaultReasoningEffort === "low" || record.defaultReasoningEffort === "medium" || record.defaultReasoningEffort === "high" ? record.defaultReasoningEffort : null;
 				return {
-					enabledModelIds: Array.isArray(record.enabledModelIds) ? record.enabledModelIds.filter((id) => typeof id === "string") : MODELS.map((m) => m.id),
-					catalogModels: Array.isArray(record.catalogModels) ? record.catalogModels : [],
-					contextWindowOverrides: typeof record.contextWindowOverrides === "object" && record.contextWindowOverrides !== null ? record.contextWindowOverrides : {},
-					defaultReasoningEffort: record.defaultReasoningEffort === "low" || record.defaultReasoningEffort === "medium" || record.defaultReasoningEffort === "high" ? record.defaultReasoningEffort : null
+					enabled: record.enabled !== false,
+					enabledModelIds,
+					catalogModels,
+					contextWindowOverrides,
+					defaultReasoningEffort
 				};
 			}
 		} catch {}
 		return {
+			enabled: true,
 			enabledModelIds: MODELS.map((m) => m.id),
 			catalogModels: [],
 			contextWindowOverrides: {},
@@ -4558,6 +4584,7 @@ var FileModelSettingsStore$1 = class {
 		const current = await this.read();
 		const next = {
 			...current,
+			...patch.enabled !== void 0 ? { enabled: patch.enabled } : {},
 			...patch.enabledModelIds !== void 0 ? { enabledModelIds: patch.enabledModelIds } : {},
 			...patch.contextWindowOverrides !== void 0 ? { contextWindowOverrides: {
 				...current.contextWindowOverrides || {},
@@ -5064,7 +5091,7 @@ async function exchangeOAuthCode(code, verifier, callbackUrl, fetchFn = fetch, s
 		email
 	};
 }
-async function beginWebLogin$1(store, fetchFn = fetch, signal) {
+async function beginWebLogin$1(store, fetchFn = fetch, signal, onSave) {
 	if (webLoginFlow$2.status === "pending") return { ...webLoginFlow$2 };
 	const { verifier, challenge } = generatePKCE();
 	const state = base64Url(randomBytes(32));
@@ -5096,6 +5123,7 @@ async function beginWebLogin$1(store, fetchFn = fetch, signal) {
 				webLoginFlow$2.progress = stage;
 			});
 			await store.write(credentials);
+			if (onSave) await onSave(credentials).catch(() => void 0);
 			webLoginFlow$2.status = "complete";
 			webLoginFlow$2.email = credentials.email;
 			webLoginFlow$2.completedAt = Date.now();
@@ -5316,9 +5344,13 @@ function attachmentLabel$2(block) {
 function collectImageRefs$2(content, refs) {
 	if (!Array.isArray(content)) return;
 	for (const block of content) {
-		if (!isRecord$4(block) || block.type !== "image") continue;
-		const attachment = attachmentOf$2(block);
-		if (attachment) refs.set(attachment.attachmentId, attachment);
+		if (!isRecord$4(block)) continue;
+		if (block.type === "image") {
+			const attachment = attachmentOf$2(block);
+			if (attachment) refs.set(attachment.attachmentId, attachment);
+			continue;
+		}
+		if (block.type === "tool-result") collectImageRefs$2(block.content, refs);
 	}
 }
 function isAbort$2(error, signal) {
@@ -5487,6 +5519,24 @@ function contentToUserParts(content, images) {
 	}
 	return parts;
 }
+/**
+* Image parts for one tool result, flattened the same way so a nested
+* `tool-result` cannot hide one. Gemini's `functionResponse` has nowhere to put
+* an image, so these become `inlineData` siblings on the same user content.
+*/
+function toolResultImageParts(blocks, images) {
+	if (!Array.isArray(blocks)) return [];
+	const parts = [];
+	for (const block of blocks) {
+		if (!isRecord$4(block)) continue;
+		if (block.type === "image") {
+			parts.push(imageBlockToPart(block, images) ?? { text: unavailableImageText$2(block) });
+			continue;
+		}
+		if (block.type === "tool-result") parts.push(...toolResultImageParts(block.content, images));
+	}
+	return parts;
+}
 function toolResultText$2(blocks) {
 	if (!Array.isArray(blocks)) return "";
 	return blocks.map((block) => {
@@ -5572,7 +5622,7 @@ function assistantParts(message, model, runtimeModel, toolCalls) {
 	}
 	return parts;
 }
-function pushToolResult(contents, result, toolCalls, model, runtimeModel) {
+function pushToolResult(contents, result, toolCalls, model, runtimeModel, images = NO_RESOLVED_IMAGES$2) {
 	const toolCallId = String(result.toolCallId || "");
 	const call = toolCalls.get(toolCallId);
 	const toolName = call?.name || "unknown";
@@ -5583,11 +5633,12 @@ function pushToolResult(contents, result, toolCalls, model, runtimeModel) {
 		response: result.isError ? { error: responseText } : { output: responseText },
 		...wireId ? { id: wireId } : {}
 	} };
+	const extraParts = toolResultImageParts(result.content, images);
 	const last = contents[contents.length - 1];
-	if (last?.role === GEMINI_ROLE.user && last.parts.some((entry) => "functionResponse" in entry)) last.parts.push(part);
+	if (last?.role === GEMINI_ROLE.user && last.parts.some((entry) => "functionResponse" in entry)) last.parts.push(part, ...extraParts);
 	else contents.push({
 		role: GEMINI_ROLE.user,
-		parts: [part]
+		parts: [part, ...extraParts]
 	});
 }
 function convertMessages(options, model, runtimeModel, images = NO_RESOLVED_IMAGES$2) {
@@ -5616,7 +5667,7 @@ function convertMessages(options, model, runtimeModel, images = NO_RESOLVED_IMAG
 			role: GEMINI_ROLE.user,
 			parts: userParts
 		});
-		for (const b of content) if (isRecord$4(b) && b.type === "tool-result") pushToolResult(contents, b, toolCalls, model, runtimeModel);
+		for (const b of content) if (isRecord$4(b) && b.type === "tool-result") pushToolResult(contents, b, toolCalls, model, runtimeModel, images);
 	}
 	return contents;
 }
@@ -5642,7 +5693,12 @@ function mapToolChoiceMode(toolChoice) {
 function getMaxOutputTokens(modelId, runtimeModel) {
 	return RUNTIME_MAX_OUTPUT_TOKENS[runtimeModel] || RUNTIME_MAX_OUTPUT_TOKENS[modelId] || 65536;
 }
+function progressExplanationInstruction(tools) {
+	if (!tools?.length) return void 0;
+	return ANTIGRAVITY_PROGRESS_INSTRUCTION;
+}
 function buildRequest$2(options, model, projectId, runtimeModel, effort, images = NO_RESOLVED_IMAGES$2) {
+	const progressInstruction = progressExplanationInstruction(options.tools);
 	const request = {
 		contents: convertMessages(options, model, runtimeModel, images),
 		systemInstruction: {
@@ -5651,7 +5707,8 @@ function buildRequest$2(options, model, projectId, runtimeModel, effort, images
 				{ text: ANTIGRAVITY_SYSTEM_INSTRUCTION },
 				{ text: `Please ignore following [ignore]${ANTIGRAVITY_SYSTEM_INSTRUCTION}[/ignore]` },
 				{ text: ANTIGRAVITY_NO_PREAMBLE_INSTRUCTION },
-				...options.system ? [{ text: sanitizeText$2(options.system) }] : []
+				...options.system ? [{ text: sanitizeText$2(options.system) }] : [],
+				...progressInstruction ? [{ text: progressInstruction }] : []
 			]
 		}
 	};
@@ -5897,6 +5954,259 @@ function closeStream$2(state) {
 	return out;
 }
 //#endregion
+//#region src/host/antigravity/account-pool.ts
+function poolPath() {
+	return path.join(dshHomeDir(), "storages", "antigravity-pool.json");
+}
+function parseAntigravityPoolData(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error("Antigravity pool payload is invalid");
+	const record = value;
+	const strategy = record.rotationStrategy === "round-robin" ? "round-robin" : "sequential";
+	const activeAccountId = typeof record.activeAccountId === "string" ? record.activeAccountId : void 0;
+	const rawAccounts = Array.isArray(record.accounts) ? record.accounts : [];
+	const accounts = [];
+	for (const item of rawAccounts) {
+		if (typeof item !== "object" || item === null) continue;
+		const r = item;
+		if (typeof r.id !== "string") continue;
+		const credentials = parseAntigravityCredentials(r.credentials);
+		const acc = {
+			id: r.id,
+			alias: typeof r.alias === "string" ? r.alias : credentials.email || "账号",
+			credentials,
+			addedAt: typeof r.addedAt === "number" ? r.addedAt : Date.now(),
+			isPrimary: r.isPrimary === true
+		};
+		if (typeof r.email === "string") acc.email = r.email;
+		else if (credentials.email) acc.email = credentials.email;
+		if (typeof r.projectId === "string") acc.projectId = r.projectId;
+		else if (credentials.projectId) acc.projectId = credentials.projectId;
+		if (typeof r.planLabel === "string") acc.planLabel = r.planLabel;
+		if (typeof r.lastUsedAt === "number") acc.lastUsedAt = r.lastUsedAt;
+		if (typeof r.cooldownUntil === "number") acc.cooldownUntil = r.cooldownUntil;
+		if (typeof r.cooldownReason === "string") acc.cooldownReason = r.cooldownReason;
+		accounts.push(acc);
+	}
+	const res = {
+		version: 1,
+		rotationStrategy: strategy,
+		accounts
+	};
+	if (activeAccountId) res.activeAccountId = activeAccountId;
+	return res;
+}
+function poolCredentialAccount(filePath) {
+	return createHash("sha256").update(path.resolve(filePath)).digest("hex");
+}
+function createPoolCredentialBackend(filePath) {
+	if (process.platform === "win32") return new WindowsDpapiCredentialStore(`${filePath}.dpapi`, parseAntigravityPoolData);
+	if (process.platform === "darwin") return new MacKeychainCredentialStore("dsh-antigravity-pool", poolCredentialAccount(filePath), parseAntigravityPoolData);
+	if (process.platform === "linux") return new SecretServiceCredentialStore("dsh-antigravity-pool", poolCredentialAccount(filePath), parseAntigravityPoolData);
+	throw new Error("Antigravity pool encrypted storage requires Windows, macOS, or Linux.");
+}
+const poolOperations = /* @__PURE__ */ new Map();
+var AccountPoolStore = class {
+	filePath;
+	backend;
+	legacyStore;
+	constructor(filePath = poolPath(), backend = createPoolCredentialBackend(filePath), legacyStore = new FileCredentialStore$1()) {
+		this.filePath = filePath;
+		this.backend = backend;
+		this.legacyStore = legacyStore;
+	}
+	path() {
+		if (process.platform === "win32") return `${this.filePath}.dpapi`;
+		return `${process.platform === "darwin" ? "Keychain" : "Secret Service"}: dsh-antigravity-pool/${poolCredentialAccount(this.filePath)}`;
+	}
+	serialize(operation) {
+		const key = path.resolve(this.filePath);
+		const result = (poolOperations.get(key) || Promise.resolve()).then(operation);
+		const settled = result.then(() => void 0, () => void 0);
+		poolOperations.set(key, settled);
+		settled.then(() => {
+			if (poolOperations.get(key) === settled) poolOperations.delete(key);
+		});
+		return result;
+	}
+	async saveVerified(data) {
+		const normalized = parseAntigravityPoolData(data);
+		await this.backend.save(normalized);
+		if (!isDeepStrictEqual(await this.backend.load(), normalized)) throw new Error("Antigravity pool encrypted verification failed");
+	}
+	read() {
+		return this.serialize(async () => {
+			let current = null;
+			try {
+				current = await this.backend.load();
+			} catch {}
+			if (current !== null && Array.isArray(current.accounts) && current.accounts.length > 0) return current;
+			try {
+				const legacy = await this.legacyStore.read();
+				if (legacy && (legacy.access || legacy.access_token || legacy.refresh || legacy.refresh_token)) {
+					const defaultAccount = {
+						id: "acc_primary",
+						alias: legacy.email || "主账号",
+						email: legacy.email,
+						projectId: legacy.projectId,
+						credentials: legacy,
+						addedAt: Date.now(),
+						isPrimary: true
+					};
+					return {
+						version: 1,
+						activeAccountId: "acc_primary",
+						rotationStrategy: current?.rotationStrategy || "sequential",
+						accounts: [defaultAccount]
+					};
+				}
+			} catch {}
+			return current || {
+				version: 1,
+				rotationStrategy: "sequential",
+				accounts: []
+			};
+		});
+	}
+	write(data) {
+		return this.serialize(() => this.saveVerified(parseAntigravityPoolData(data)));
+	}
+	async listAccounts() {
+		const data = await this.read();
+		const now = Date.now();
+		return data.accounts.map((acc) => {
+			const expires = acc.credentials.expires || acc.credentials.expires_at;
+			return {
+				id: acc.id,
+				alias: acc.alias,
+				email: acc.email,
+				projectId: acc.projectId,
+				planLabel: acc.planLabel,
+				isPrimary: acc.isPrimary === true,
+				lastUsedAt: acc.lastUsedAt,
+				cooldownUntil: acc.cooldownUntil && acc.cooldownUntil > now ? acc.cooldownUntil : void 0,
+				cooldownReason: acc.cooldownUntil && acc.cooldownUntil > now ? acc.cooldownReason : void 0,
+				expiresAt: expires
+			};
+		});
+	}
+	async addAccount(credentials, alias) {
+		const data = await this.read();
+		const email = credentials.email;
+		const existingIndex = email ? data.accounts.findIndex((a) => a.email === email) : -1;
+		const id = existingIndex >= 0 ? data.accounts[existingIndex].id : `acc_${randomBytes(6).toString("hex")}`;
+		const isPrimary = data.accounts.length === 0 || existingIndex >= 0 && data.accounts[existingIndex].isPrimary;
+		const account = {
+			id,
+			alias: alias?.trim() || email || `账号 ${data.accounts.length + 1}`,
+			email,
+			projectId: credentials.projectId,
+			credentials,
+			addedAt: Date.now(),
+			isPrimary: !!isPrimary
+		};
+		if (existingIndex >= 0) data.accounts[existingIndex] = {
+			...data.accounts[existingIndex],
+			...account,
+			isPrimary: data.accounts[existingIndex].isPrimary
+		};
+		else data.accounts.push(account);
+		if (!data.activeAccountId || account.isPrimary) data.activeAccountId = account.id;
+		await this.write(data);
+		if (account.isPrimary) this.legacyStore.write(credentials).catch(() => void 0);
+		return account;
+	}
+	async setPrimary(accountId) {
+		const data = await this.read();
+		for (const a of data.accounts) a.isPrimary = a.id === accountId;
+		const primary = data.accounts.find((a) => a.isPrimary);
+		if (primary) {
+			data.activeAccountId = primary.id;
+			this.legacyStore.write(primary.credentials).catch(() => void 0);
+		}
+		await this.write(data);
+	}
+	async setAlias(accountId, alias) {
+		const data = await this.read();
+		const target = data.accounts.find((a) => a.id === accountId);
+		if (target && alias.trim()) {
+			target.alias = alias.trim();
+			await this.write(data);
+		}
+	}
+	async deleteAccount(accountId) {
+		const data = await this.read();
+		const wasPrimary = data.accounts.find((a) => a.id === accountId)?.isPrimary;
+		data.accounts = data.accounts.filter((a) => a.id !== accountId);
+		if (wasPrimary && data.accounts.length > 0) {
+			data.accounts[0].isPrimary = true;
+			this.legacyStore.write(data.accounts[0].credentials).catch(() => void 0);
+		} else if (data.accounts.length === 0) this.legacyStore.delete().catch(() => void 0);
+		if (data.activeAccountId === accountId) data.activeAccountId = data.accounts.find((a) => a.isPrimary)?.id ?? data.accounts[0]?.id;
+		await this.write(data);
+	}
+	async setStrategy(strategy) {
+		const data = await this.read();
+		data.rotationStrategy = strategy;
+		await this.write(data);
+	}
+	async markCooldown(accountId, durationMs, reason) {
+		const data = await this.read();
+		const target = data.accounts.find((a) => a.id === accountId);
+		if (target) {
+			target.cooldownUntil = Date.now() + Math.max(1e4, durationMs);
+			target.cooldownReason = reason;
+			await this.write(data);
+		}
+	}
+	async clearCooldown(accountId) {
+		const data = await this.read();
+		const target = data.accounts.find((a) => a.id === accountId);
+		if (target) {
+			target.cooldownUntil = void 0;
+			target.cooldownReason = void 0;
+			await this.write(data);
+		}
+	}
+	async hasAnotherAvailableAccount(triedAccountIds) {
+		const data = await this.read();
+		const now = Date.now();
+		return data.accounts.some((a) => !triedAccountIds.has(a.id) && (!a.cooldownUntil || a.cooldownUntil <= now));
+	}
+	async getEffectiveAccount(excludeIds, fetchFn = fetch) {
+		const data = await this.read();
+		if (data.accounts.length === 0) throw new Error("未登录 Antigravity 账号，请在「设置 → Antigravity」中添加并登录账号。");
+		const now = Date.now();
+		const eligible = data.accounts.filter((a) => (!excludeIds || !excludeIds.has(a.id)) && (!a.cooldownUntil || a.cooldownUntil <= now));
+		if (eligible.length === 0) {
+			let shortest = Infinity;
+			for (const a of data.accounts) if (a.cooldownUntil && a.cooldownUntil > now) shortest = Math.min(shortest, a.cooldownUntil - now);
+			const waitMins = Number.isFinite(shortest) ? Math.ceil(shortest / 6e4) : 15;
+			throw new LlmError(`全部 ${data.accounts.length} 个 Antigravity 账号均处于配额限制或冷却中 (429)。最短预计在 ${waitMins} 分钟后解除冷却。`, "RATE_LIMIT", { status: 429 });
+		}
+		let selected;
+		if (data.rotationStrategy === "round-robin") selected = [...eligible].sort((a, b) => (a.lastUsedAt || 0) - (b.lastUsedAt || 0))[0];
+		else selected = eligible.find((a) => a.isPrimary) || eligible[0];
+		const creds = selected.credentials;
+		const expires = creds.expires || creds.expires_at || 0;
+		if (!(creds.access || creds.access_token) || expires <= now + 6e4) {
+			const refreshed = await refreshAntigravityToken(creds, fetchFn);
+			selected.credentials = refreshed;
+			selected.projectId = refreshed.projectId || selected.projectId;
+			const idx = data.accounts.findIndex((a) => a.id === selected.id);
+			if (idx >= 0) data.accounts[idx] = selected;
+			if (selected.isPrimary) this.legacyStore.write(refreshed).catch(() => void 0);
+		}
+		selected.lastUsedAt = now;
+		data.activeAccountId = selected.id;
+		await this.write(data);
+		return {
+			account: selected,
+			token: selected.credentials.access || selected.credentials.access_token,
+			projectId: selected.projectId || selected.credentials.projectId
+		};
+	}
+};
+//#endregion
 //#region src/host/antigravity/adapter.ts
 function resolveDefaultReasoningEffort$2(efforts, configuredEffort) {
 	if (configuredEffort && efforts.includes(configuredEffort)) return ReasoningEffortId(configuredEffort);
@@ -5909,12 +6219,14 @@ var AntigravityAdapter = class extends LlmAdapter {
 	modelSettings;
 	preferences;
 	options;
-	constructor(store = new FileCredentialStore$1(), modelSettings = new FileModelSettingsStore$1(), preferences, options = {}) {
+	accountPool;
+	constructor(store = new FileCredentialStore$1(), modelSettings = new FileModelSettingsStore$1(), preferences, options = {}, accountPool) {
 		super();
 		this.store = store;
 		this.modelSettings = modelSettings;
 		this.preferences = preferences;
 		this.options = options;
+		this.accountPool = accountPool ?? new AccountPoolStore(void 0, void 0, store);
 	}
 	providerInfo(provider) {
 		return {
@@ -5927,6 +6239,7 @@ var AntigravityAdapter = class extends LlmAdapter {
 	async listModels(provider) {
 		const prov = provider || "antigravity";
 		const settings = this.preferences ? this.preferences.status() : await this.modelSettings.read();
+		if (settings.enabled === false) return [];
 		const enabledSet = new Set(settings.enabledModelIds);
 		const available = MODELS.filter((m) => enabledSet.has(m.id));
 		const overrides = settings.contextWindowOverrides || {};
@@ -5997,8 +6310,6 @@ var AntigravityAdapter = class extends LlmAdapter {
 	}
 	async *requestStream(options, model, signal) {
 		const fetchFn = this.options.fetchFn ?? fetch;
-		const { token, projectId: defaultProj } = await ensureApiKey(this.store, fetchFn);
-		const projectId = defaultProj || "antigravity-default";
 		const effort = String(options.reasoningEffort || "medium").toLowerCase();
 		const routing = ROUTING[model.id];
 		const initialRuntime = routing?.routing[effort] || routing?.defaultRequestId || model.id;
@@ -6010,26 +6321,54 @@ var AntigravityAdapter = class extends LlmAdapter {
 		}
 		const requestOptions = offloadOldestRequestImages$2(options);
 		const images = await resolveRequestImages$2(requestOptions, this.options.attachments, signal);
+		const triedAccountIds = /* @__PURE__ */ new Set();
 		let response;
-		for (const runtimeModel of candidates) {
-			const body = JSON.stringify(buildRequest$2(requestOptions, model, projectId, runtimeModel, effort, images));
-			const headers = {
-				...antigravityHeaders(token),
-				...model.id.startsWith("claude-") ? { "anthropic-beta": "interleaved-thinking-2025-05-14" } : {}
-			};
-			for (const endpoint of endpointCandidates()) try {
-				response = await fetchFn(`${endpoint}/v1internal:streamGenerateContent?alt=sse`, {
-					method: "POST",
-					headers,
-					body,
-					signal
-				});
-				if (response.ok || response.status === 400) break;
-				if (response.status === 404) break;
-			} catch (err) {
-				if (signal.aborted) throw new LlmError("Antigravity request aborted", "ABORTED", { cause: err });
+		while (true) {
+			let eff;
+			try {
+				eff = await this.accountPool.getEffectiveAccount(triedAccountIds, fetchFn);
+			} catch (poolErr) {
+				const poolData = await this.accountPool.read().catch(() => null);
+				if (!poolData || poolData.accounts.length === 0) {
+					const { token, projectId: defaultProj } = await ensureApiKey(this.store, fetchFn);
+					eff = {
+						account: { id: "legacy" },
+						token,
+						projectId: defaultProj
+					};
+				} else throw poolErr;
 			}
-			if (response && (response.ok || response.status === 400)) break;
+			const { account, token, projectId: defaultProj } = eff;
+			const projectId = defaultProj || "antigravity-default";
+			triedAccountIds.add(account.id);
+			for (const runtimeModel of candidates) {
+				const body = JSON.stringify(buildRequest$2(requestOptions, model, projectId, runtimeModel, effort, images));
+				const headers = {
+					...antigravityHeaders(token),
+					...model.id.startsWith("claude-") ? { "anthropic-beta": "interleaved-thinking-2025-05-14" } : {}
+				};
+				for (const endpoint of endpointCandidates()) try {
+					response = await fetchFn(`${endpoint}/v1internal:streamGenerateContent?alt=sse`, {
+						method: "POST",
+						headers,
+						body,
+						signal
+					});
+					if (response.ok || response.status === 400) break;
+					if (response.status === 404) break;
+				} catch (err) {
+					if (signal.aborted) throw new LlmError("Antigravity request aborted", "ABORTED", { cause: err });
+				}
+				if (response && (response.ok || response.status === 400)) break;
+			}
+			if (response && response.status === 429) {
+				const retryAfterHeader = response.headers.get("retry-after");
+				const retryAfterSec = retryAfterHeader ? Number(retryAfterHeader) : NaN;
+				const cooldownMs = Number.isFinite(retryAfterSec) && retryAfterSec > 0 ? retryAfterSec * 1e3 : 900 * 1e3;
+				await this.accountPool.markCooldown(account.id, cooldownMs, "429 Rate Limit");
+				if (await this.accountPool.hasAnotherAvailableAccount(triedAccountIds)) continue;
+			}
+			break;
 		}
 		if (!response || !response.ok) {
 			const status = response?.status ?? 500;
@@ -6097,7 +6436,7 @@ async function readRequestJson$2(request) {
 		request.on("error", reject);
 	});
 }
-async function getAntigravityWebStatus(store, modelSettings, preferences) {
+async function getAntigravityWebStatus(store, modelSettings, preferences, accountPool = new AccountPoolStore(void 0, void 0, store)) {
 	const credentials = await store.read();
 	const settings = preferences ? preferences.status() : await modelSettings.read();
 	const quota = getCachedQuota();
@@ -6111,20 +6450,27 @@ async function getAntigravityWebStatus(store, modelSettings, preferences) {
 		contextWindow: overrides[m.id] || m.contextWindow,
 		reasoningEfforts: m.reasoningEfforts
 	}));
+	const accounts = await accountPool.listAccounts().catch(() => []);
+	const poolData = await accountPool.read().catch(() => null);
+	const activeAccount = accounts.find((a) => a.id === poolData?.activeAccountId) || accounts[0];
 	return {
-		authenticated: !!(credentials?.access || credentials?.access_token),
-		email: credentials?.email,
-		projectId: credentials?.projectId,
-		hasCredentials: !!credentials,
+		enabled: settings.enabled !== false,
+		authenticated: accounts.length > 0 || !!(credentials?.access || credentials?.access_token),
+		email: activeAccount?.email || credentials?.email,
+		projectId: activeAccount?.projectId || credentials?.projectId,
+		hasCredentials: accounts.length > 0 || !!credentials,
 		storagePath: store.path(),
 		lastFetchedAt: quota?.fetchedAt,
 		quota,
 		models,
 		contextWindowOverrides: overrides,
-		defaultReasoningEffort: settings.defaultReasoningEffort || null
+		defaultReasoningEffort: settings.defaultReasoningEffort || null,
+		accounts,
+		activeAccountId: poolData?.activeAccountId || activeAccount?.id,
+		rotationStrategy: poolData?.rotationStrategy || "sequential"
 	};
 }
-function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetchFn = fetch) {
+function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetchFn = fetch, accountPool = new AccountPoolStore(void 0, void 0, store)) {
 	return ctx.webServer.register({
 		kind: "prefix",
 		path: "/antigravity/api",
@@ -6139,14 +6485,16 @@ function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetch
 					if (authenticated && (!cached || Date.now() - (cached.fetchedAt || 0) > 12e4)) await fetchAccountQuota(store, modelSettings, fetchFn).catch(() => void 0);
 					return sendJson$3(response, 200, {
 						ok: true,
-						value: await getAntigravityWebStatus(store, modelSettings, preferences)
+						value: await getAntigravityWebStatus(store, modelSettings, preferences, accountPool)
 					});
 				}
-				if (path === "login") {
+				if (path === "login" || path === "accounts/login") {
 					if (request.method !== "POST") return sendMethodNotAllowed$2(response);
 					return sendJson$3(response, 200, {
 						ok: true,
-						value: await beginWebLogin$1(store, fetchFn)
+						value: await beginWebLogin$1(store, fetchFn, void 0, async (creds) => {
+							await accountPool.addAccount(creds);
+						})
 					});
 				}
 				if (path === "login/status") {
@@ -6156,13 +6504,33 @@ function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetch
 						value: getWebLoginStatus$2()
 					});
 				}
+				if (path === "accounts") {
+					if (request.method === "GET") return sendJson$3(response, 200, {
+						ok: true,
+						value: await accountPool.listAccounts()
+					});
+					if (request.method === "POST") {
+						const body = await readRequestJson$2(request);
+						const action = String(body.action || "");
+						if (action === "set-primary" && typeof body.accountId === "string") await accountPool.setPrimary(body.accountId);
+						else if (action === "set-alias" && typeof body.accountId === "string" && typeof body.alias === "string") await accountPool.setAlias(body.accountId, body.alias);
+						else if (action === "delete" && typeof body.accountId === "string") await accountPool.deleteAccount(body.accountId);
+						else if (action === "strategy" && (body.strategy === "sequential" || body.strategy === "round-robin")) await accountPool.setStrategy(body.strategy);
+						else if (action === "clear-cooldown" && typeof body.accountId === "string") await accountPool.clearCooldown(body.accountId);
+						return sendJson$3(response, 200, {
+							ok: true,
+							value: await getAntigravityWebStatus(store, modelSettings, preferences, accountPool)
+						});
+					}
+					return sendMethodNotAllowed$2(response);
+				}
 				if (path === "quota") {
 					if (request.method !== "GET" && request.method !== "POST") return sendMethodNotAllowed$2(response);
 					const quota = await fetchAccountQuota(store, modelSettings, fetchFn, true);
 					return sendJson$3(response, 200, {
 						ok: true,
 						value: {
-							...await getAntigravityWebStatus(store, modelSettings, preferences),
+							...await getAntigravityWebStatus(store, modelSettings, preferences, accountPool),
 							quota
 						}
 					});
@@ -6174,32 +6542,39 @@ function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetch
 					else await modelSettings.updateSettings(body);
 					return sendJson$3(response, 200, {
 						ok: true,
-						value: await getAntigravityWebStatus(store, modelSettings, preferences)
+						value: await getAntigravityWebStatus(store, modelSettings, preferences, accountPool)
 					});
 				}
 				if (path === "models") {
 					if (request.method === "GET") return sendJson$3(response, 200, {
 						ok: true,
-						value: (await getAntigravityWebStatus(store, modelSettings, preferences)).models
+						value: (await getAntigravityWebStatus(store, modelSettings, preferences, accountPool)).models
 					});
 					if (request.method === "POST") {
 						const body = await readRequestJson$2(request);
-						if (Array.isArray(body.enabledModelIds) || body.contextWindowOverrides || body.defaultReasoningEffort !== void 0) if (preferences) await preferences.update(body);
+						if (Array.isArray(body.enabledModelIds) || body.enabled !== void 0 || body.contextWindowOverrides || body.defaultReasoningEffort !== void 0) if (preferences) await preferences.update(body);
 						else await modelSettings.updateSettings(body);
 						return sendJson$3(response, 200, {
 							ok: true,
-							value: await getAntigravityWebStatus(store, modelSettings, preferences)
+							value: await getAntigravityWebStatus(store, modelSettings, preferences, accountPool)
 						});
 					}
 					return sendMethodNotAllowed$2(response);
 				}
 				if (path === "logout") {
 					if (request.method !== "POST") return sendMethodNotAllowed$2(response);
-					await store.delete();
+					const body = await readRequestJson$2(request).catch(() => ({}));
+					const targetId = typeof body.accountId === "string" ? body.accountId : void 0;
+					if (targetId) await accountPool.deleteAccount(targetId);
+					else {
+						const poolData = await accountPool.read().catch(() => null);
+						if (poolData?.activeAccountId) await accountPool.deleteAccount(poolData.activeAccountId);
+						else await store.delete();
+					}
 					clearCachedQuota();
 					return sendJson$3(response, 200, {
 						ok: true,
-						value: await getAntigravityWebStatus(store, modelSettings)
+						value: await getAntigravityWebStatus(store, modelSettings, preferences, accountPool)
 					});
 				}
 				return sendJson$3(response, 404, {
@@ -7223,6 +7598,7 @@ const DEFAULT_ENABLED_MODEL_IDS$1 = FALLBACK_MODELS$1.map((model) => model.id);
 function registerCommandCodePreferenceStore(settings, fallbackStore = new FileModelSettingsStore()) {
 	if (!settings) return {
 		status: () => ({
+			enabled: true,
 			enabledModelIds: [...DEFAULT_ENABLED_MODEL_IDS$1],
 			catalogModels: [],
 			contextWindowOverrides: {},
@@ -7232,6 +7608,7 @@ function registerCommandCodePreferenceStore(settings, fallbackStore = new FileMo
 	};
 	const ns = SettingsModule.settingsNamespace ? SettingsModule.settingsNamespace(COMMAND_CODE_PREFERENCES_NAMESPACE) : COMMAND_CODE_PREFERENCES_NAMESPACE;
 	const scope = settings.register.call(settings, ns, z.object({
+		enabled: z.boolean().default(true),
 		enabledModelIds: z.array(z.string()).default([...DEFAULT_ENABLED_MODEL_IDS$1]),
 		contextWindowOverrides: z.dict(z.number()).default({}),
 		defaultReasoningEffort: z.union([...COMMAND_CODE_REASONING_EFFORTS.map((effort) => z.const(effort)), z.const(null)]).default(null)
@@ -7240,6 +7617,7 @@ function registerCommandCodePreferenceStore(settings, fallbackStore = new FileMo
 		status: () => {
 			const value = scope.get();
 			return {
+				enabled: value.enabled !== false,
 				enabledModelIds: value.enabledModelIds,
 				catalogModels: [],
 				contextWindowOverrides: value.contextWindowOverrides,
@@ -7249,6 +7627,7 @@ function registerCommandCodePreferenceStore(settings, fallbackStore = new FileMo
 		update: async (patch) => {
 			const current = scope.get();
 			const normalized = {
+				enabled: patch.enabled !== void 0 ? patch.enabled : current.enabled !== false,
 				enabledModelIds: patch.enabledModelIds ?? current.enabledModelIds,
 				contextWindowOverrides: patch.contextWindowOverrides ? {
 					...current.contextWindowOverrides,
@@ -7404,15 +7783,21 @@ var FileModelSettingsStore = class {
 			const parsed = JSON.parse(content);
 			if (typeof parsed === "object" && parsed !== null) {
 				const record = parsed;
+				const enabledModelIds = Array.isArray(record.enabledModelIds) ? record.enabledModelIds.filter((id) => typeof id === "string") : [...DEFAULT_ENABLED_MODEL_IDS$1];
+				const catalogModels = Array.isArray(record.catalogModels) ? record.catalogModels : [];
+				const contextWindowOverrides = typeof record.contextWindowOverrides === "object" && record.contextWindowOverrides !== null ? record.contextWindowOverrides : {};
+				const defaultReasoningEffort = isReasoningEffort$1(record.defaultReasoningEffort) ? record.defaultReasoningEffort : null;
 				return {
-					enabledModelIds: Array.isArray(record.enabledModelIds) ? record.enabledModelIds.filter((id) => typeof id === "string") : [...DEFAULT_ENABLED_MODEL_IDS$1],
-					catalogModels: Array.isArray(record.catalogModels) ? record.catalogModels : [],
-					contextWindowOverrides: typeof record.contextWindowOverrides === "object" && record.contextWindowOverrides !== null ? record.contextWindowOverrides : {},
-					defaultReasoningEffort: isReasoningEffort$1(record.defaultReasoningEffort) ? record.defaultReasoningEffort : null
+					enabled: record.enabled !== false,
+					enabledModelIds,
+					catalogModels,
+					contextWindowOverrides,
+					defaultReasoningEffort
 				};
 			}
 		} catch {}
 		return {
+			enabled: true,
 			enabledModelIds: [...DEFAULT_ENABLED_MODEL_IDS$1],
 			catalogModels: [],
 			contextWindowOverrides: {},
@@ -7429,6 +7814,7 @@ var FileModelSettingsStore = class {
 		const current = await this.read();
 		const next = {
 			...current,
+			...patch.enabled !== void 0 ? { enabled: patch.enabled } : {},
 			...patch.enabledModelIds !== void 0 ? { enabledModelIds: patch.enabledModelIds } : {},
 			...patch.contextWindowOverrides !== void 0 ? { contextWindowOverrides: {
 				...current.contextWindowOverrides,
@@ -8335,9 +8721,13 @@ function attachmentLabel$1(block) {
 function collectImageRefs$1(content, refs) {
 	if (!Array.isArray(content)) return;
 	for (const block of content) {
-		if (!isRecord$2(block) || block.type !== "image") continue;
-		const attachment = attachmentOf$1(block);
-		if (attachment) refs.set(attachment.attachmentId, attachment);
+		if (!isRecord$2(block)) continue;
+		if (block.type === "image") {
+			const attachment = attachmentOf$1(block);
+			if (attachment) refs.set(attachment.attachmentId, attachment);
+			continue;
+		}
+		if (block.type === "tool-result") collectImageRefs$1(block.content, refs);
 	}
 }
 function base64Length$1(bytes) {
@@ -8475,6 +8865,83 @@ function toolResultText$1(blocks) {
 		return "";
 	}).join("");
 }
+/**
+* Anthropic `tool_result` content for one tool result, or `undefined` when the
+* result carries no image. Returning `undefined` is what keeps a plain tool
+* result a byte-identical string on the wire: the image-less path never changes
+* shape, so only results that actually hold pixels take the block-array form.
+*/
+function toolResultBlocks$1(blocks, images) {
+	if (!Array.isArray(blocks)) return void 0;
+	const out = [];
+	let hasImage = false;
+	for (const block of blocks) {
+		if (!isRecord$2(block)) continue;
+		if (block.type === "text" && typeof block.text === "string") {
+			out.push({
+				type: "text",
+				text: sanitizeText$1(block.text)
+			});
+			continue;
+		}
+		if (block.type === "image") {
+			hasImage = true;
+			const inline = imageBlockToInline$1(block, images);
+			if (inline && SUPPORTED_IMAGE_MEDIA_TYPES$1.has(inline.mediaType)) out.push({
+				type: "image",
+				source: {
+					type: "base64",
+					media_type: inline.mediaType,
+					data: inline.data
+				}
+			});
+			else out.push({
+				type: "text",
+				text: unavailableImageText$1(block)
+			});
+			continue;
+		}
+		if (block.type === "tool-result") {
+			const nested = toolResultBlocks$1(block.content, images);
+			if (nested) {
+				hasImage = true;
+				out.push(...nested);
+			}
+		}
+	}
+	if (!hasImage) return void 0;
+	if (out[0]?.type !== "text") out.unshift({
+		type: "text",
+		text: ""
+	});
+	return out;
+}
+/**
+* OpenAI `image_url` blocks for one tool result. A `role: "tool"` message can
+* only carry text, so these ride on a `user` message appended after the run of
+* tool messages rather than inside it.
+*/
+function toolResultImageBlocks$1(blocks, images) {
+	if (!Array.isArray(blocks)) return [];
+	const out = [];
+	for (const block of blocks) {
+		if (!isRecord$2(block)) continue;
+		if (block.type === "image") {
+			const inline = imageBlockToInline$1(block, images);
+			if (inline && SUPPORTED_IMAGE_MEDIA_TYPES$1.has(inline.mediaType)) out.push({
+				type: "image_url",
+				image_url: { url: `data:${inline.mediaType};base64,${inline.data}` }
+			});
+			else out.push({
+				type: "text",
+				text: unavailableImageText$1(block)
+			});
+			continue;
+		}
+		if (block.type === "tool-result") out.push(...toolResultImageBlocks$1(block.content, images));
+	}
+	return out;
+}
 function toolCallArguments$1(raw) {
 	if (typeof raw === "string") return raw;
 	if (raw === void 0 || raw === null) return "{}";
@@ -8571,14 +9038,27 @@ function buildOpenAIRequest$1(options, images = NO_RESOLVED_IMAGES$1) {
 		role: "system",
 		content: system
 	});
-	for (const message of nonSystemMessages$1(options)) {
+	const conversation = nonSystemMessages$1(options);
+	for (let index = 0; index < conversation.length; index++) {
+		const message = conversation[index];
 		if (isToolResultMessage$1(message)) {
-			const block = message.content[0];
-			const callId = isRecord$2(block) && typeof block.toolCallId === "string" ? block.toolCallId : "";
-			messages.push({
-				role: "tool",
-				tool_call_id: callId,
-				content: toolResultText$1(message.content)
+			const imageBlocks = [];
+			while (index < conversation.length && isToolResultMessage$1(conversation[index])) {
+				const current = conversation[index];
+				const block = current.content[0];
+				const callId = isRecord$2(block) && typeof block.toolCallId === "string" ? block.toolCallId : "";
+				messages.push({
+					role: "tool",
+					tool_call_id: callId,
+					content: toolResultText$1(current.content)
+				});
+				imageBlocks.push(...toolResultImageBlocks$1(current.content, images));
+				index += 1;
+			}
+			index -= 1;
+			if (imageBlocks.length > 0) messages.push({
+				role: "user",
+				content: imageBlocks
 			});
 			continue;
 		}
@@ -8650,10 +9130,11 @@ function anthropicUserContent$1(message, images) {
 			});
 		} else if (block.type === "tool-result") {
 			const callId = typeof block.toolCallId === "string" ? block.toolCallId : "";
+			const resultBlocks = toolResultBlocks$1(block.content, images);
 			blocks.push({
 				type: "tool_result",
 				tool_use_id: callId,
-				content: toolResultText$1(block.content),
+				content: resultBlocks ?? toolResultText$1(block.content),
 				...block.isError === true ? { is_error: true } : {}
 			});
 		}
@@ -9231,9 +9712,10 @@ var CommandCodeAdapter = class extends LlmAdapter {
 	async listModels(provider) {
 		const prov = provider || "command-code";
 		const settings = await this.settings();
+		if (settings.enabled === false) return [];
 		const catalog = await this.catalog();
 		const enabled = new Set(settings.enabledModelIds);
-		return (enabled.size === 0 ? catalog : catalog.filter((model) => enabled.has(model.id))).map((model) => ({
+		return catalog.filter((model) => enabled.has(model.id)).map((model) => ({
 			provider: prov,
 			id: model.id,
 			name: model.name ?? model.id,
@@ -9858,14 +10340,13 @@ function fallbackCatalog$1() {
 * "everything currently offered" keeps a first run from hiding the whole
 * catalog behind an unedited default. Any explicit edit is honoured exactly.
 */
-function resolveEnabledModelIds$1(stored, catalog) {
+function resolveEnabledModelIds$1(stored, catalog, enabled = true) {
+	if (!enabled) return [];
 	const catalogIds = catalog.map((model) => model.id);
 	const shippedDefaults = new Set(FALLBACK_MODELS$1.map((model) => model.id));
-	const isUntouchedDefault = stored.length > 0 && stored.length === shippedDefaults.size && stored.every((id) => shippedDefaults.has(id));
-	if (stored.length === 0 || isUntouchedDefault) return catalogIds;
+	if (stored.length > 0 && stored.length === shippedDefaults.size && stored.every((id) => shippedDefaults.has(id))) return catalogIds;
 	const known = new Set(catalogIds);
-	const kept = stored.filter((id) => known.has(id));
-	return kept.length === 0 ? catalogIds : kept;
+	return stored.filter((id) => known.has(id));
 }
 function readOption$1(value, fallback) {
 	return typeof value === "function" ? value() : value ?? fallback;
@@ -9880,9 +10361,11 @@ async function getCommandCodeWebStatus(store, modelSettings, preferences, option
 		apiEnv
 	});
 	const catalog = live.length > 0 ? live : fallbackCatalog$1();
-	const models = buildModelOptions$1(catalog, resolveEnabledModelIds$1(settings.enabledModelIds, catalog), settings.contextWindowOverrides);
+	const enabled = settings.enabled !== false;
+	const models = buildModelOptions$1(catalog, resolveEnabledModelIds$1(settings.enabledModelIds, catalog, enabled), settings.contextWindowOverrides);
 	const quota = getCachedQuota$1();
 	return {
+		enabled,
 		authenticated: credentials !== null,
 		hasCredentials: credentials !== null,
 		storagePath: store.path(),
@@ -10014,6 +10497,7 @@ function registerCommandCodeRoutes(ctx, store, modelSettings, preferences, optio
 					});
 					const body = await readRequestJson$1(request);
 					const patch = {};
+					if (typeof body.enabled === "boolean") patch.enabled = body.enabled;
 					if (Array.isArray(body.enabledModelIds)) patch.enabledModelIds = body.enabledModelIds.filter((id) => typeof id === "string");
 					if (typeof body.contextWindowOverrides === "object" && body.contextWindowOverrides !== null) {
 						const overrides = {};
@@ -10360,6 +10844,7 @@ const DEFAULT_ENABLED_MODEL_IDS = FALLBACK_MODELS.map((model) => model.id);
 function registerKimiCodePreferenceStore(settings, fallbackStore = new FileModelSettingsStore$2()) {
 	if (!settings) return {
 		status: () => ({
+			enabled: true,
 			enabledModelIds: [...DEFAULT_ENABLED_MODEL_IDS],
 			catalogModels: [],
 			contextWindowOverrides: {},
@@ -10369,6 +10854,7 @@ function registerKimiCodePreferenceStore(settings, fallbackStore = new FileModel
 	};
 	const ns = SettingsModule.settingsNamespace ? SettingsModule.settingsNamespace(KIMI_CODE_PREFERENCES_NAMESPACE) : KIMI_CODE_PREFERENCES_NAMESPACE;
 	const scope = settings.register.call(settings, ns, z.object({
+		enabled: z.boolean().default(true),
 		enabledModelIds: z.array(z.string()).default([...DEFAULT_ENABLED_MODEL_IDS]),
 		contextWindowOverrides: z.dict(z.number()).default({}),
 		defaultReasoningEffort: z.union([...KIMI_CODE_REASONING_EFFORTS.map((effort) => z.const(effort)), z.const(null)]).default(null)
@@ -10377,6 +10863,7 @@ function registerKimiCodePreferenceStore(settings, fallbackStore = new FileModel
 		status: () => {
 			const value = scope.get();
 			return {
+				enabled: value.enabled !== false,
 				enabledModelIds: value.enabledModelIds,
 				catalogModels: [],
 				contextWindowOverrides: value.contextWindowOverrides,
@@ -10386,6 +10873,7 @@ function registerKimiCodePreferenceStore(settings, fallbackStore = new FileModel
 		update: async (patch) => {
 			const current = scope.get();
 			const normalized = {
+				enabled: patch.enabled !== void 0 ? patch.enabled : current.enabled !== false,
 				enabledModelIds: patch.enabledModelIds ?? current.enabledModelIds,
 				contextWindowOverrides: patch.contextWindowOverrides ? {
 					...current.contextWindowOverrides,
@@ -10576,15 +11064,21 @@ var FileModelSettingsStore$2 = class {
 			const parsed = JSON.parse(content);
 			if (typeof parsed === "object" && parsed !== null) {
 				const record = parsed;
+				const enabledModelIds = Array.isArray(record.enabledModelIds) ? record.enabledModelIds.filter((id) => typeof id === "string") : [...DEFAULT_ENABLED_MODEL_IDS];
+				const catalogModels = Array.isArray(record.catalogModels) ? record.catalogModels : [];
+				const contextWindowOverrides = typeof record.contextWindowOverrides === "object" && record.contextWindowOverrides !== null ? record.contextWindowOverrides : {};
+				const defaultReasoningEffort = isReasoningEffort(record.defaultReasoningEffort) ? record.defaultReasoningEffort : null;
 				return {
-					enabledModelIds: Array.isArray(record.enabledModelIds) ? record.enabledModelIds.filter((id) => typeof id === "string") : [...DEFAULT_ENABLED_MODEL_IDS],
-					catalogModels: Array.isArray(record.catalogModels) ? record.catalogModels : [],
-					contextWindowOverrides: typeof record.contextWindowOverrides === "object" && record.contextWindowOverrides !== null ? record.contextWindowOverrides : {},
-					defaultReasoningEffort: isReasoningEffort(record.defaultReasoningEffort) ? record.defaultReasoningEffort : null
+					enabled: record.enabled !== false,
+					enabledModelIds,
+					catalogModels,
+					contextWindowOverrides,
+					defaultReasoningEffort
 				};
 			}
 		} catch {}
 		return {
+			enabled: true,
 			enabledModelIds: [...DEFAULT_ENABLED_MODEL_IDS],
 			catalogModels: [],
 			contextWindowOverrides: {},
@@ -10601,6 +11095,7 @@ var FileModelSettingsStore$2 = class {
 		const current = await this.read();
 		const next = {
 			...current,
+			...patch.enabled !== void 0 ? { enabled: patch.enabled } : {},
 			...patch.enabledModelIds !== void 0 ? { enabledModelIds: patch.enabledModelIds } : {},
 			...patch.contextWindowOverrides !== void 0 ? { contextWindowOverrides: {
 				...current.contextWindowOverrides,
@@ -12131,9 +12626,13 @@ function attachmentLabel(block) {
 function collectImageRefs(content, refs) {
 	if (!Array.isArray(content)) return;
 	for (const block of content) {
-		if (!isRecord(block) || block.type !== "image") continue;
-		const attachment = attachmentOf(block);
-		if (attachment) refs.set(attachment.attachmentId, attachment);
+		if (!isRecord(block)) continue;
+		if (block.type === "image") {
+			const attachment = attachmentOf(block);
+			if (attachment) refs.set(attachment.attachmentId, attachment);
+			continue;
+		}
+		if (block.type === "tool-result") collectImageRefs(block.content, refs);
 	}
 }
 function base64Length(bytes) {
@@ -12410,6 +12909,83 @@ function toolResultText(blocks) {
 		return "";
 	}).join("");
 }
+/**
+* Anthropic `tool_result` content for one tool result, or `undefined` when the
+* result carries no image. Returning `undefined` is what keeps a plain tool
+* result a byte-identical string on the wire: the image-less path never changes
+* shape, so only results that actually hold pixels take the block-array form.
+*/
+function toolResultBlocks(blocks, images) {
+	if (!Array.isArray(blocks)) return void 0;
+	const out = [];
+	let hasImage = false;
+	for (const block of blocks) {
+		if (!isRecord(block)) continue;
+		if (block.type === "text" && typeof block.text === "string") {
+			out.push({
+				type: "text",
+				text: sanitizeText(block.text)
+			});
+			continue;
+		}
+		if (block.type === "image") {
+			hasImage = true;
+			const inline = imageBlockToInline(block, images);
+			if (inline && SUPPORTED_IMAGE_MEDIA_TYPES.has(inline.mediaType)) out.push({
+				type: "image",
+				source: {
+					type: "base64",
+					media_type: inline.mediaType,
+					data: inline.data
+				}
+			});
+			else out.push({
+				type: "text",
+				text: unavailableImageText(block)
+			});
+			continue;
+		}
+		if (block.type === "tool-result") {
+			const nested = toolResultBlocks(block.content, images);
+			if (nested) {
+				hasImage = true;
+				out.push(...nested);
+			}
+		}
+	}
+	if (!hasImage) return void 0;
+	if (out[0]?.type !== "text") out.unshift({
+		type: "text",
+		text: ""
+	});
+	return out;
+}
+/**
+* OpenAI `image_url` blocks for one tool result. A `role: "tool"` message can
+* only carry text, so these ride on a `user` message appended after the run of
+* tool messages rather than inside it.
+*/
+function toolResultImageBlocks(blocks, images) {
+	if (!Array.isArray(blocks)) return [];
+	const out = [];
+	for (const block of blocks) {
+		if (!isRecord(block)) continue;
+		if (block.type === "image") {
+			const inline = imageBlockToInline(block, images);
+			if (inline && SUPPORTED_IMAGE_MEDIA_TYPES.has(inline.mediaType)) out.push({
+				type: "image_url",
+				image_url: { url: `data:${inline.mediaType};base64,${inline.data}` }
+			});
+			else out.push({
+				type: "text",
+				text: unavailableImageText(block)
+			});
+			continue;
+		}
+		if (block.type === "tool-result") out.push(...toolResultImageBlocks(block.content, images));
+	}
+	return out;
+}
 function toolCallArguments(raw) {
 	if (typeof raw === "string") return raw;
 	if (raw === void 0 || raw === null) return "{}";
@@ -12444,15 +13020,134 @@ function leadingSystemText(options) {
 function nonSystemMessages(options) {
 	return options.messages.filter((message) => message.role !== "system");
 }
-/** Drop the JSON-Schema keywords provider gateways reject or ignore. */
-function stripMetaSchema(schema) {
+function cloneJsonValue(value) {
+	if (Array.isArray(value)) return value.map(cloneJsonValue);
+	if (isRecord(value)) {
+		const res = {};
+		for (const [k, v] of Object.entries(value)) res[k] = cloneJsonValue(v);
+		return res;
+	}
+	return value;
+}
+function resolveLocalJsonPointer(root, ref) {
+	if (ref === "#") return {
+		found: true,
+		value: root
+	};
+	let current = root;
+	for (const rawPart of ref.slice(2).split("/")) {
+		const part = rawPart.replaceAll("~1", "/").replaceAll("~0", "~");
+		if (isRecord(current)) {
+			if (!Object.prototype.hasOwnProperty.call(current, part)) return { found: false };
+			current = current[part];
+		} else if (Array.isArray(current)) {
+			const idx = Number(part);
+			if (!/^(0|[1-9]\d*)$/.test(part) || idx >= current.length) return { found: false };
+			current = current[idx];
+		} else return { found: false };
+	}
+	return {
+		found: true,
+		value: current
+	};
+}
+function derefNode(node, root, visited) {
+	if (Array.isArray(node)) return node.map((item) => derefNode(item, root, visited));
+	if (isRecord(node)) {
+		if (typeof node["$ref"] === "string" && (node["$ref"] === "#" || node["$ref"].startsWith("#/"))) {
+			const ref = node["$ref"];
+			if (visited.has(ref)) return node;
+			const resolved = resolveLocalJsonPointer(root, ref);
+			if (resolved.found) {
+				visited.add(ref);
+				const inlined = derefNode(resolved.value, root, visited);
+				visited.delete(ref);
+				if (isRecord(inlined)) {
+					const merged = { ...inlined };
+					for (const [k, v] of Object.entries(node)) {
+						if (k === "$ref") continue;
+						merged[k] = derefNode(v, root, visited);
+					}
+					return merged;
+				}
+				return inlined;
+			}
+			return node;
+		}
+		const res = {};
+		for (const [k, v] of Object.entries(node)) res[k] = derefNode(v, root, visited);
+		return res;
+	}
+	return node;
+}
+function hasUnresolvedDefinitionRef(node, bucketKey) {
+	if (Array.isArray(node)) return node.some((child) => hasUnresolvedDefinitionRef(child, bucketKey));
+	if (isRecord(node)) {
+		const ref = node["$ref"];
+		if (typeof ref === "string" && ref.startsWith(`#/${bucketKey}/`)) return true;
+		for (const [k, v] of Object.entries(node)) {
+			if (k === bucketKey) continue;
+			if (hasUnresolvedDefinitionRef(v, bucketKey)) return true;
+		}
+	}
+	return false;
+}
+function inferValueType(val) {
+	if (val === null) return "null";
+	if (Array.isArray(val)) return "array";
+	switch (typeof val) {
+		case "string": return "string";
+		case "number": return Number.isInteger(val) ? "integer" : "number";
+		case "boolean": return "boolean";
+		case "object": return "object";
+		default: return;
+	}
+}
+function inferTypeFromValues(values) {
+	const types = /* @__PURE__ */ new Set();
+	for (const v of values) {
+		const t = inferValueType(v);
+		if (t) types.add(t);
+	}
+	if (types.has("number") && types.has("integer")) types.delete("integer");
+	if (types.size === 1) return types.values().next().value;
+}
+function normalizeSchemaProperties(node) {
+	if (!isRecord(node)) return;
+	if (isRecord(node.properties)) {
+		for (const propSchema of Object.values(node.properties)) if (isRecord(propSchema)) {
+			if (!propSchema.type && !propSchema.$ref) {
+				if (Array.isArray(propSchema.enum) && propSchema.enum.length > 0) propSchema.type = inferTypeFromValues(propSchema.enum) ?? "string";
+				else if (propSchema.const !== void 0) propSchema.type = inferValueType(propSchema.const) ?? "string";
+				else if (isRecord(propSchema.properties)) propSchema.type = "object";
+				else if (propSchema.items) propSchema.type = "array";
+			}
+			normalizeSchemaProperties(propSchema);
+		}
+	}
+	if (isRecord(node.items)) normalizeSchemaProperties(node.items);
+	else if (Array.isArray(node.items)) for (const item of node.items) normalizeSchemaProperties(item);
+}
+/**
+* Normalizes tool parameter schemas for Kimi by stripping meta keywords ($schema),
+* inlining definitions ($defs/definitions/$ref), and ensuring property types for enums/consts.
+*/
+function normalizeKimiToolSchema(schema) {
 	if (!isRecord(schema)) return {
 		type: "object",
 		properties: {}
 	};
-	const copy = { ...schema };
-	delete copy.$schema;
-	return copy;
+	const cloned = cloneJsonValue(schema);
+	delete cloned.$schema;
+	const dereffed = derefNode(cloned, cloned, /* @__PURE__ */ new Set());
+	if (!hasUnresolvedDefinitionRef(dereffed, "$defs")) delete dereffed.$defs;
+	if (!hasUnresolvedDefinitionRef(dereffed, "definitions")) delete dereffed.definitions;
+	normalizeSchemaProperties(dereffed);
+	return dereffed;
+}
+/** Drop the JSON-Schema keywords provider gateways reject or ignore, and normalize properties. */
+function stripMetaSchema(schema) {
+	return normalizeKimiToolSchema(schema);
 }
 /** Concatenated reasoning text one assistant message carries, when it has any. */
 function reasoningText(message) {
@@ -12663,26 +13358,41 @@ function buildOpenAIRequest(options, images = NO_RESOLVED_IMAGES, preserveThinki
 		}
 	};
 	flushSlots(0);
-	for (const message of nonSystemMessages(options)) {
+	const conversation = nonSystemMessages(options);
+	for (let index = 0; index < conversation.length; index++) {
+		const message = conversation[index];
 		flushSlots(nonSystemIndex);
 		nonSystemIndex += 1;
 		if (isToolResultMessage(message)) {
-			const block = message.content[0];
-			const callId = isRecord(block) && typeof block.toolCallId === "string" ? block.toolCallId : "";
-			messages.push({
-				role: "tool",
-				tool_call_id: clampToolCallId(callId),
-				content: toolResultText(message.content)
+			const imageBlocks = [];
+			while (index < conversation.length && isToolResultMessage(conversation[index])) {
+				const current = conversation[index];
+				if (index > 0) {
+					flushSlots(nonSystemIndex);
+					nonSystemIndex += 1;
+				}
+				const block = current.content[0];
+				const callId = isRecord(block) && typeof block.toolCallId === "string" ? block.toolCallId : "";
+				messages.push({
+					role: "tool",
+					tool_call_id: clampToolCallId(callId),
+					content: toolResultText(current.content)
+				});
+				imageBlocks.push(...toolResultImageBlocks(current.content, images));
+				index += 1;
+			}
+			index -= 1;
+			if (imageBlocks.length > 0) messages.push({
+				role: "user",
+				content: imageBlocks
 			});
 			continue;
 		}
 		if (message.role === "assistant") {
 			const { content, toolCalls, reasoning } = openAIAssistantContent(message);
-			if (content === "" && toolCalls.length === 0) continue;
-			const entry = {
-				role: "assistant",
-				content
-			};
+			if (content === "" && toolCalls.length === 0 && reasoning === "") continue;
+			const entry = { role: "assistant" };
+			if (content !== "" || toolCalls.length === 0) entry.content = content;
 			if (toolCalls.length > 0) entry.tool_calls = toolCalls;
 			if (thinkingOn) entry.reasoning_content = reasoning;
 			messages.push(entry);
@@ -12732,11 +13442,12 @@ function buildOpenAIRequest(options, images = NO_RESOLVED_IMAGES, preserveThinki
 /**
 * Stable identifier for the conversation this request belongs to.
 *
-* Derived from the first user turn rather than a fresh value per request, so it
-* stays identical across the steps of one session and changes when a new
-* conversation starts.
+* Prioritizes the session identifier (GenerateOptions.sessionId) if present,
+* ensuring the cache key stays strictly constant across turns, context compactions,
+* and multimodal message changes. Falls back to hashing the first user message text.
 */
 function promptCacheKey(options) {
+	if (typeof options.sessionId === "string" && options.sessionId.trim() !== "") return `dsh-${options.sessionId.trim()}`;
 	for (const message of options.messages) {
 		if (message.role !== "user") continue;
 		const text = textOf(message.content);
@@ -12778,10 +13489,11 @@ function anthropicUserContent(message, images) {
 			});
 		} else if (block.type === "tool-result") {
 			const callId = typeof block.toolCallId === "string" ? block.toolCallId : "";
+			const resultBlocks = toolResultBlocks(block.content, images);
 			blocks.push({
 				type: "tool_result",
 				tool_use_id: clampToolCallId(callId),
-				content: toolResultText(block.content),
+				content: resultBlocks ?? toolResultText(block.content),
 				...block.isError === true ? { is_error: true } : {}
 			});
 		}
@@ -13540,9 +14252,10 @@ var KimiCodeAdapter = class extends LlmAdapter {
 	async listModels(provider) {
 		const prov = provider || "kimi-code";
 		const settings = await this.settings();
+		if (settings.enabled === false) return [];
 		const catalog = await this.catalog();
 		const enabled = new Set(settings.enabledModelIds);
-		return (enabled.size === 0 ? catalog : catalog.filter((model) => enabled.has(model.id))).map((model) => ({
+		return catalog.filter((model) => enabled.has(model.id)).map((model) => ({
 			provider: prov,
 			id: model.id,
 			name: model.name ?? model.id,
@@ -13742,14 +14455,13 @@ function fallbackCatalog() {
 * "everything currently offered" keeps a first run from hiding the whole
 * catalog behind an unedited default. Any explicit edit is honoured exactly.
 */
-function resolveEnabledModelIds(stored, catalog) {
+function resolveEnabledModelIds(stored, catalog, enabled = true) {
+	if (!enabled) return [];
 	const catalogIds = catalog.map((model) => model.id);
 	const shippedDefaults = new Set(FALLBACK_MODELS.map((model) => model.id));
-	const isUntouchedDefault = stored.length > 0 && stored.length === shippedDefaults.size && stored.every((id) => shippedDefaults.has(id));
-	if (stored.length === 0 || isUntouchedDefault) return catalogIds;
+	if (stored.length > 0 && stored.length === shippedDefaults.size && stored.every((id) => shippedDefaults.has(id))) return catalogIds;
 	const known = new Set(catalogIds);
-	const kept = stored.filter((id) => known.has(id));
-	return kept.length === 0 ? catalogIds : kept;
+	return stored.filter((id) => known.has(id));
 }
 function readOption(value, fallback) {
 	return typeof value === "function" ? value() : value ?? fallback;
@@ -13766,10 +14478,12 @@ async function getKimiCodeWebStatus(store, modelSettings, preferences, options =
 		accessToken: credentials?.accessToken
 	}).catch(() => []);
 	const catalog = live.length > 0 ? live : fallbackCatalog();
-	const models = buildModelOptions(catalog, resolveEnabledModelIds(settings.enabledModelIds, catalog), settings.contextWindowOverrides);
+	const enabled = settings.enabled !== false;
+	const models = buildModelOptions(catalog, resolveEnabledModelIds(settings.enabledModelIds, catalog, enabled), settings.contextWindowOverrides);
 	const quota = getCachedQuota$2();
 	const account = quota?.account ?? (credentials === null ? null : accountFromCredentials(credentials));
 	return {
+		enabled,
 		authenticated: credentials !== null,
 		hasCredentials: credentials !== null,
 		storagePath: store.path(),
@@ -13922,6 +14636,7 @@ function registerKimiCodeRoutes(ctx, store, modelSettings, preferences, options
 					});
 					const body = await readRequestJson(request);
 					const patch = {};
+					if (typeof body.enabled === "boolean") patch.enabled = body.enabled;
 					if (Array.isArray(body.enabledModelIds)) patch.enabledModelIds = body.enabledModelIds.filter((id) => typeof id === "string");
 					if (typeof body.contextWindowOverrides === "object" && body.contextWindowOverrides !== null) {
 						const overrides = {};
@@ -15727,6 +16442,7 @@ function apply(ctx, pluginConfig = {}) {
 	const store = createPlatformTokenStore();
 	const preferences = registerPreferenceStore(ctx.settings);
 	const antigravityStore = new FileCredentialStore$1();
+	const antigravityAccountPool = new AccountPoolStore(void 0, void 0, antigravityStore);
 	const antigravityModelSettings = new FileModelSettingsStore$1();
 	const antigravityPreferences = registerAntigravityPreferenceStore(ctx.settings, antigravityModelSettings);
 	const commandCodeStore = new FileCredentialStore();
@@ -15769,9 +16485,25 @@ function apply(ctx, pluginConfig = {}) {
 		const antigravityAdapter = new AntigravityAdapter(antigravityStore, antigravityModelSettings, antigravityPreferences, {
 			fetchFn: proxyFetch,
 			attachments: ctx.attachments
-		});
-		const disposeAntigravityAdapter = ctx.llm.registerAdapter([PROVIDER_ID$2], antigravityAdapter);
-		const disposeAntigravityRoutes = registerAntigravityRoutes(ctx, antigravityStore, antigravityModelSettings, antigravityPreferences, proxyFetch);
+		}, antigravityAccountPool);
+		let antigravityRegistration;
+		let antigravityConflict = null;
+		const claimAntigravityRoute = () => {
+			if (antigravityRegistration !== void 0) return;
+			try {
+				antigravityRegistration = ctx.llm.registerAdapter([PROVIDER_ID$2], antigravityAdapter);
+				if (antigravityConflict !== null) ctx.logger.info(`[dsh-chatgpt-subscription] Antigravity route "${PROVIDER_ID$2}" is now served by this plugin`);
+				antigravityConflict = null;
+			} catch (error) {
+				antigravityConflict = error instanceof Error ? error.message : String(error);
+				ctx.logger.warn(`[dsh-chatgpt-subscription] provider route "${PROVIDER_ID$2}" is already owned by another adapter; Antigravity models keep being served by that one until its configuration is removed (${antigravityConflict})`);
+			}
+		};
+		claimAntigravityRoute();
+		const antigravityRouteWatch = typeof ctx.on === "function" ? ctx.on("llm/adapters-updated", () => {
+			claimAntigravityRoute();
+		}) : void 0;
+		const disposeAntigravityRoutes = registerAntigravityRoutes(ctx, antigravityStore, antigravityModelSettings, antigravityPreferences, proxyFetch, antigravityAccountPool);
 		const disposeCommandCodeRoutes = registerCommandCodeRoutes(ctx, commandCodeStore, commandCodeModelSettings, commandCodePreferences, {
 			fetchFn: proxyFetch,
 			serving: () => commandCodeRegistration !== void 0,
@@ -15894,7 +16626,9 @@ function apply(ctx, pluginConfig = {}) {
 			disposeAdapter();
 			disposeRoutes();
 			disposeAntigravityRoutes();
-			disposeAntigravityAdapter();
+			releaseHandle(antigravityRouteWatch);
+			antigravityRegistration?.();
+			antigravityRegistration = void 0;
 			disposeCommandCodeRoutes();
 			releaseHandle(commandCodeRouteWatch);
 			commandCodeRegistration?.();
@@ -15920,4 +16654,4 @@ function localWebServerBaseUrl(host, port) {
 	return `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}`;
 }
 //#endregion
-export { AntigravityAdapter, CodexChatGptAdapter, CommandCodeAdapter, FileCredentialStore as CommandCodeCredentialStore, FileModelSettingsStore as CommandCodeModelSettingsStore, Config, DEFAULT_SUBAGENT_INHERIT_TOOLS, FileCredentialStore$1 as FileCredentialStore, FileModelSettingsStore$1 as FileModelSettingsStore, KIMI_CODE_MODELS, KIMI_CODE_RETRY_POLICY_CONFIG, KimiCodeAdapter, FileCredentialStore$2 as KimiCodeCredentialStore, FileModelSettingsStore$2 as KimiCodeModelSettingsStore, LinuxFileTokenStore, MacKeychainTokenStore, OAuthService, ProxyManager, RELAY_PROBE_ENV, RELAY_PROBE_FILE_ENV, RELAY_PROBE_FILE_NAME, RELAY_PROBE_MAX_BYTES, RELAY_SOURCE_KINDS, RelayProbe, ResponsesClient, SUBAGENT_MODEL_SELECTION_NAMESPACE, SUBAGENT_POLICY_EVENT, SearchProviderSwitcher, UsageService, WindowsDpapiTokenStore, apply, auditChildRoutes, auditedRoutesOf, authorizedRoutesFor, beginWebLogin as beginKimiCodeLogin, beginWebLogin$1 as beginWebLogin, childRoutesOf, classifyKimiFailure, clearCachedQuota, clearCachedQuota$1 as clearCommandCodeQuota, clearCachedQuota$2 as clearKimiCodeQuota, credentialPath as commandCodeCredentialPath, modelSettingsPath as commandCodeModelSettingsPath, createCodexFetchProvider, createCodexImageTool, createCodexSearchProvider, createFileRelayProbeSink, createPlatformTokenStore, createSubagentAuthorization, credentialPath$1 as credentialPath, delegationDenialReason, delegationModeOf, detectSystemProxy, effectiveRouteOf, ensureAccessToken as ensureKimiCodeAccessToken, fetchAccountQuota, fetchAccountQuota$1 as fetchCommandCodeQuota, fetchAccountQuota$2 as fetchKimiCodeQuota, fetchUserInfo as fetchKimiCodeUserInfo, getCachedQuota, getWebLoginStatus as getCommandCodeLoginStatus, getCachedQuota$1 as getCommandCodeQuota, getCommandCodeWebStatus, getWebLoginStatus$1 as getKimiCodeLoginStatus, getCachedQuota$2 as getKimiCodeQuota, getKimiCodeWebStatus, inheritOverrideReason, inheritRouteDenialReason, inheritedRouteOf, inject, installRelayProbe, installSubagentModelAuthorization, credentialPath$2 as kimiCodeCredentialPath, kimiCodeModelDef, modelSettingsPath$1 as kimiCodeModelSettingsPath, loadProviderModels as loadCommandCodeModels, loadProviderModels$1 as loadKimiCodeModels, loginAndSave, mapCodexUsage, modelSettingsPath$2 as modelSettingsPath, normalizeDelegationToolNames, normalizeInheritToolNames, parseAllowedRoutes, parseCodexUsage, parseResponsesStream, policyRoutesOf, readChildDescriptor, refreshAntigravityToken, refreshAccessToken as refreshKimiCodeToken, registerCommandCodePreferenceStore, registerCommandCodeRoutes, registerKimiCodePreferenceStore, registerKimiCodeRoutes, relayProbeEnabled, relayProbeEnvFile, relayProbeEnvValue, relayProbeLogPath, requestDeviceAuthorization as requestKimiCodeDeviceAuthorization, resolveRegion as resolveKimiCodeRegion, saveApiKey as saveCommandCodeApiKey, beginWebLogin$2 as startCommandCodeLogin, subagentModelSelectionPreference, unauthorizedRouteReason, validateAuthorizationScope, validateDelegationToolNames, validateInheritToolNames, violationText };
+export { AccountPoolStore, AntigravityAdapter, CodexChatGptAdapter, CommandCodeAdapter, FileCredentialStore as CommandCodeCredentialStore, FileModelSettingsStore as CommandCodeModelSettingsStore, Config, DEFAULT_SUBAGENT_INHERIT_TOOLS, FileCredentialStore$1 as FileCredentialStore, FileModelSettingsStore$1 as FileModelSettingsStore, KIMI_CODE_MODELS, KIMI_CODE_RETRY_POLICY_CONFIG, KimiCodeAdapter, FileCredentialStore$2 as KimiCodeCredentialStore, FileModelSettingsStore$2 as KimiCodeModelSettingsStore, LinuxFileTokenStore, MacKeychainTokenStore, OAuthService, ProxyManager, RELAY_PROBE_ENV, RELAY_PROBE_FILE_ENV, RELAY_PROBE_FILE_NAME, RELAY_PROBE_MAX_BYTES, RELAY_SOURCE_KINDS, RelayProbe, ResponsesClient, SUBAGENT_MODEL_SELECTION_NAMESPACE, SUBAGENT_POLICY_EVENT, SearchProviderSwitcher, UsageService, WindowsDpapiTokenStore, apply, auditChildRoutes, auditedRoutesOf, authorizedRoutesFor, beginWebLogin as beginKimiCodeLogin, beginWebLogin$1 as beginWebLogin, childRoutesOf, classifyKimiFailure, clearCachedQuota, clearCachedQuota$1 as clearCommandCodeQuota, clearCachedQuota$2 as clearKimiCodeQuota, credentialPath as commandCodeCredentialPath, modelSettingsPath as commandCodeModelSettingsPath, createCodexFetchProvider, createCodexImageTool, createCodexSearchProvider, createFileRelayProbeSink, createPlatformTokenStore, createSubagentAuthorization, credentialPath$1 as credentialPath, delegationDenialReason, delegationModeOf, detectSystemProxy, effectiveRouteOf, ensureAccessToken as ensureKimiCodeAccessToken, fetchAccountQuota, fetchAccountQuota$1 as fetchCommandCodeQuota, fetchAccountQuota$2 as fetchKimiCodeQuota, fetchUserInfo as fetchKimiCodeUserInfo, getCachedQuota, getWebLoginStatus as getCommandCodeLoginStatus, getCachedQuota$1 as getCommandCodeQuota, getCommandCodeWebStatus, getWebLoginStatus$1 as getKimiCodeLoginStatus, getCachedQuota$2 as getKimiCodeQuota, getKimiCodeWebStatus, inheritOverrideReason, inheritRouteDenialReason, inheritedRouteOf, inject, installRelayProbe, installSubagentModelAuthorization, credentialPath$2 as kimiCodeCredentialPath, kimiCodeModelDef, modelSettingsPath$1 as kimiCodeModelSettingsPath, loadProviderModels as loadCommandCodeModels, loadProviderModels$1 as loadKimiCodeModels, loginAndSave, mapCodexUsage, modelSettingsPath$2 as modelSettingsPath, normalizeDelegationToolNames, normalizeInheritToolNames, parseAllowedRoutes, parseCodexUsage, parseResponsesStream, policyRoutesOf, readChildDescriptor, refreshAntigravityToken, refreshAccessToken as refreshKimiCodeToken, registerCommandCodePreferenceStore, registerCommandCodeRoutes, registerKimiCodePreferenceStore, registerKimiCodeRoutes, relayProbeEnabled, relayProbeEnvFile, relayProbeEnvValue, relayProbeLogPath, requestDeviceAuthorization as requestKimiCodeDeviceAuthorization, resolveRegion as resolveKimiCodeRegion, saveApiKey as saveCommandCodeApiKey, beginWebLogin$2 as startCommandCodeLogin, subagentModelSelectionPreference, unauthorizedRouteReason, validateAuthorizationScope, validateDelegationToolNames, validateInheritToolNames, violationText };