@eddyskywalker/dsh-chatgpt-subscription 0.2.10 → 0.2.12

package/lib/index.js

@@ -7,13 +7,13 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import http, { createServer } from "node:http";
 import { execSync, spawn } from "node:child_process";
+import fs, { constants } from "node:fs";
+import path, { dirname, join } from "node:path";
+import os, { homedir } from "node:os";
 import { ProxyAgent, fetch as fetch$1 } from "undici";
 import * as SettingsModule from "@deepseek-ai/dsh-settings";
 import z from "@deepseek-ai/schemastery";
-import fs, { constants } from "node:fs";
 import fsPromises, { chmod, lstat, mkdir, open, rename, stat, unlink } from "node:fs/promises";
-import os, { homedir } from "node:os";
-import path, { dirname, join } from "node:path";
 import { isDeepStrictEqual } from "node:util";
 import { URL as URL$1, URLSearchParams as URLSearchParams$1 } from "node:url";
 //#region src/compat.ts
@@ -211,6 +211,7 @@ function resolveCodexModel(model, preferences) {
 		inputModalities: [...entry.inputModalities],
 		context: { contextWindow: configuredContextWindow ?? entry.contextWindow },
 		defaultMaxTokens: 32768,
+		systemPromptUpdate: "in-history",
 		reasoning: {
 			efforts: efforts.map((effort) => ({
 				id: ReasoningEffortId(effort),
@@ -1244,8 +1245,16 @@ function parseMacOsScutilProxy(stdout) {
 }
 function parseEnvProxy(env = process.env) {
 	const proxy = env.HTTPS_PROXY || env.https_proxy || env.HTTP_PROXY || env.http_proxy || env.ALL_PROXY || env.all_proxy;
-	if (!proxy || !proxy.trim()) return null;
-	return normalizeProxyUrl(proxy);
+	if (proxy && proxy.trim()) return normalizeProxyUrl(proxy);
+	try {
+		const dshHome = env.DSH_HOME || path.join(os.homedir(), ".dsh");
+		const envFile = path.join(dshHome, ".env");
+		if (fs.existsSync(envFile)) {
+			const match = fs.readFileSync(envFile, "utf8").match(/^(?:export\s+)?(?:HTTPS_PROXY|https_proxy|HTTP_PROXY|http_proxy|ALL_PROXY|all_proxy)\s*=\s*["']?([^"'\r\n]+)["']?/m);
+			if (match && match[1]?.trim()) return normalizeProxyUrl(match[1].trim());
+		}
+	} catch {}
+	return null;
 }
 function detectSystemProxy(platform = process.platform, env = process.env) {
 	try {
@@ -1354,6 +1363,7 @@ const DEFAULT_PREFERENCES = {
 	},
 	subagentContextWindow: null,
 	subagentMaxDepth: null,
+	teamModelRules: [],
 	proxyMode: "auto",
 	customProxyUrl: null
 };
@@ -1400,6 +1410,13 @@ function registerPreferenceStore(settings) {
 		}).default(DEFAULT_PREFERENCES.contextWindowOverrides),
 		subagentContextWindow: z.union([z.number().step(1).min(1), z.const(null)]).default(DEFAULT_PREFERENCES.subagentContextWindow),
 		subagentMaxDepth: z.union([z.number().step(1).min(0).max(3), z.const(null)]).default(DEFAULT_PREFERENCES.subagentMaxDepth),
+		teamModelRules: z.array(z.object({
+			id: z.string(),
+			pattern: z.string(),
+			model: z.string(),
+			reasoningEffort: z.union([z.string(), z.const(null)]).default(null),
+			description: z.union([z.string(), z.const(null)]).default(null)
+		})).default(DEFAULT_PREFERENCES.teamModelRules),
 		proxyMode: z.union([
 			z.const("auto"),
 			z.const("custom"),
@@ -1442,6 +1459,7 @@ var SettingsPreferenceStore = class {
 		};
 		if (patch.subagentContextWindow !== void 0) normalized.subagentContextWindow = patch.subagentContextWindow;
 		if (patch.subagentMaxDepth !== void 0) normalized.subagentMaxDepth = patch.subagentMaxDepth;
+		if (patch.teamModelRules !== void 0) normalized.teamModelRules = Array.isArray(patch.teamModelRules) ? patch.teamModelRules.filter((r) => r && typeof r.pattern === "string" && typeof r.model === "string") : [];
 		if (patch.proxyMode !== void 0) {
 			if (!isProxyMode(patch.proxyMode)) throw new PreferenceError("Unsupported proxy mode preference.");
 			normalized.proxyMode = patch.proxyMode;
@@ -1875,6 +1893,14 @@ async function mapContent(message, attachments, signal, localRawImages, localIma
 			type: "input_image",
 			image_url: await imageDataUrl(block.attachment, attachments, signal)
 		});
+	} else if (block.type === "file") {
+		const file = block.attachment ?? {};
+		const fileText = `[File attachment: ${typeof file.name === "string" ? file.name : typeof file.filename === "string" ? file.filename : "unnamed"}${typeof file.byteSize === "number" ? ` (${file.byteSize} bytes)` : ""}${typeof file.savedPath === "string" ? ` path: ${file.savedPath}` : ""}]`;
+		if (message.role === "user") pushInputText(result, fileText);
+		else result.push({
+			type: "output_text",
+			text: fileText
+		});
 	}
 	return result;
 }
@@ -2005,6 +2031,10 @@ function blocksToText(blocks) {
 	return blocks.map((block) => {
 		if (block.type === "text" || block.type === "reasoning") return block.text;
 		if (block.type === "image") return `[image: ${block.attachment.name ?? block.attachment.attachmentId}]`;
+		if (block.type === "file") {
+			const file = block.attachment ?? {};
+			return `[file: ${typeof file.name === "string" ? file.name : typeof file.filename === "string" ? file.filename : "unnamed"}${typeof file.byteSize === "number" ? ` (${file.byteSize} bytes)` : ""}${typeof file.savedPath === "string" ? ` path: ${file.savedPath}` : ""}]`;
+		}
 		if (block.type === "tool-result") return blocksToText(block.content);
 		return "";
 	}).filter(Boolean).join("\n");
@@ -3130,6 +3160,19 @@ function readPreferencesUpdate(value, current) {
 		if (value.subagentMaxDepth !== null && (!Number.isSafeInteger(value.subagentMaxDepth) || value.subagentMaxDepth < 0 || value.subagentMaxDepth > 3)) throw new PreferenceError(`subagentMaxDepth must be null or an integer from 0 to 3.`);
 		patch.subagentMaxDepth = value.subagentMaxDepth;
 	}
+	if ("teamModelRules" in value) {
+		if (!Array.isArray(value.teamModelRules)) throw new PreferenceError("teamModelRules must be an array.");
+		patch.teamModelRules = value.teamModelRules.map((rule) => {
+			if (!isRecord$2(rule) || typeof rule.pattern !== "string" || typeof rule.model !== "string") throw new PreferenceError("Each teamModelRule must have a string pattern and model.");
+			return {
+				id: typeof rule.id === "string" && rule.id ? rule.id : `rule_${Date.now()}_${Math.random().toString(36).slice(2, 7)}`,
+				pattern: rule.pattern.trim(),
+				model: rule.model.trim(),
+				reasoningEffort: typeof rule.reasoningEffort === "string" ? rule.reasoningEffort : null,
+				description: typeof rule.description === "string" ? rule.description.trim() : void 0
+			};
+		});
+	}
 	if ("proxyMode" in value) {
 		if (value.proxyMode !== "auto" && value.proxyMode !== "custom" && value.proxyMode !== "direct") throw new PreferenceError("proxyMode must be auto, custom, or direct.");
 		patch.proxyMode = value.proxyMode;
@@ -3568,9 +3611,11 @@ const PROVIDER_ID = "antigravity";
 const STREAM_IDLE_TIMEOUT_MS = 3e5;
 const STREAM_IDLE_TIMEOUT_CODE = "LLM_STREAM_IDLE_TIMEOUT";
 const DISCOVERY_TIMEOUT_MS = 8e3;
-const PROJECT_CACHE_TTL_MS = 1800 * 1e3;
 const OAUTH_CALLBACK_TIMEOUT_MS = 300 * 1e3;
 const ENDPOINT_FALLBACKS = ["https://daily-cloudcode-pa.googleapis.com", "https://cloudcode-pa.googleapis.com"];
+const FREE_TIER_ID = "free-tier";
+const ONBOARD_TIMEOUT_MS = 3e4;
+const ONBOARD_POLL_INTERVAL_MS = 1e3;
 const REDIRECT_PATH = "/oauth-callback";
 const AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
 const TOKEN_URL = "https://oauth2.googleapis.com/token";
@@ -4202,13 +4247,13 @@ var FileModelSettingsStore = class {
 		return next;
 	}
 };
-//#endregion
-//#region src/host/antigravity/client.ts
-const projectCache = /* @__PURE__ */ new Map();
 let cachedQuota;
+let quotaFetchInFlight = null;
 const PLATFORM = process.platform === "darwin" ? "MACOS" : process.platform === "win32" ? "WINDOWS" : "LINUX";
 function defaultUserAgent() {
-	return `antigravity/1.15.8 ${process.platform === "darwin" ? "darwin" : process.platform === "win32" ? "windows" : "linux"}/${process.arch === "x64" ? "amd64" : process.arch}`;
+	const version = process.env.DSH_ANTIGRAVITY_VERSION || "2.8.0";
+	const cl = process.env.DSH_ANTIGRAVITY_CL || "963137146";
+	return `antigravity/hub/${version} (aidev_client; os_type=${process.env.DSH_ANTIGRAVITY_OS || "darwin"}; arch=${process.env.DSH_ANTIGRAVITY_ARCH || "arm64"}; cl=${cl})`;
 }
 function antigravityHeaders(token) {
 	return {
@@ -4254,50 +4299,97 @@ function extractProjectId(data) {
 		}
 	}
 }
-async function listCloudAICompanionProjects(token, fetchFn = fetch) {
+async function loadCodeAssistDetail(token, fetchFn = fetch, signal) {
+	const metadata = {
+		ideType: "ANTIGRAVITY",
+		platform: "PLATFORM_UNSPECIFIED",
+		pluginType: "GEMINI"
+	};
 	for (const endpoint of endpointCandidates()) try {
-		const response = await fetchFn(`${endpoint}/v1internal:listCloudAICompanionProjects`, {
+		const response = await fetchFn(`${endpoint}/v1internal:loadCodeAssist`, {
 			method: "POST",
-			headers: antigravityHeaders(token),
-			body: JSON.stringify({}),
-			signal: AbortSignal.timeout(DISCOVERY_TIMEOUT_MS)
+			headers: jsonHeaders(token),
+			body: JSON.stringify({ metadata }),
+			signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(DISCOVERY_TIMEOUT_MS)]) : AbortSignal.timeout(DISCOVERY_TIMEOUT_MS)
 		});
 		if (!response.ok) continue;
-		return extractProjectId(await response.json());
+		const data = await response.json();
+		const projectId = extractProjectId(data);
+		const allowedTiers = Array.isArray(data.allowedTiers) ? data.allowedTiers : [];
+		const ineligibleTiers = Array.isArray(data.ineligibleTiers) ? data.ineligibleTiers : [];
+		return {
+			currentTier: data.currentTier || null,
+			paidTier: data.paidTier || null,
+			allowedTiers,
+			ineligibleTiers,
+			projectId,
+			raw: data
+		};
 	} catch {}
 }
-async function loadCodeAssist(token, fetchFn = fetch) {
-	const cached = projectCache.get(token);
-	if (cached && cached.expiresAt > Date.now()) return cached.projectId;
-	const body = JSON.stringify({ metadata: {
-		ideType: "ANTIGRAVITY",
-		platform: "PLATFORM_UNSPECIFIED",
-		pluginType: "GEMINI"
-	} });
+async function onboardUser(token, fetchFn = fetch, signal) {
+	const deadline = Date.now() + ONBOARD_TIMEOUT_MS;
+	const body = JSON.stringify({
+		tierId: FREE_TIER_ID,
+		metadata: { ideType: "ANTIGRAVITY" }
+	});
 	for (const endpoint of endpointCandidates()) try {
-		const response = await fetchFn(`${endpoint}/v1internal:loadCodeAssist`, {
+		const remainingTime = Math.max(1e3, deadline - Date.now());
+		const timeoutSignal = AbortSignal.timeout(remainingTime);
+		const callSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+		const response = await fetchFn(`${endpoint}/v1internal:onboardUser`, {
 			method: "POST",
-			headers: antigravityHeaders(token),
+			headers: jsonHeaders(token),
 			body,
-			signal: AbortSignal.timeout(DISCOVERY_TIMEOUT_MS)
+			signal: callSignal
 		});
-		if (!response.ok) continue;
-		const project = extractProjectId(await response.json());
-		if (project) {
-			projectCache.set(token, {
-				projectId: project,
-				expiresAt: Date.now() + PROJECT_CACHE_TTL_MS
-			});
-			return project;
+		if (!response.ok) {
+			const errorText = await response.text().catch(() => "");
+			throw new Error(`onboardUser failed: ${response.status} ${response.statusText}: ${errorText}`);
 		}
-		const listProj = await listCloudAICompanionProjects(token, fetchFn);
-		if (listProj) {
-			projectCache.set(token, {
-				projectId: listProj,
-				expiresAt: Date.now() + PROJECT_CACHE_TTL_MS
+		let operation = await response.json();
+		while (true) {
+			if (operation.done === true) {
+				if (operation.error) {
+					const msg = operation.error.message || `Error code ${operation.error.code}`;
+					throw new Error(`OnboardUser operation failed: ${msg}`);
+				}
+				return;
+			}
+			const waitMs = Math.min(ONBOARD_POLL_INTERVAL_MS, Math.max(100, deadline - Date.now()));
+			if (Date.now() >= deadline) throw new Error(`onboardUser timed out after ${ONBOARD_TIMEOUT_MS}ms`);
+			await new Promise((r) => setTimeout(r, waitMs));
+			if (signal?.aborted) throw new Error("OAuth login cancelled");
+			const operationName = operation.name || "";
+			if (!operationName) throw new Error("onboardUser returned an operation without a name");
+			const pollTime = Math.max(1e3, deadline - Date.now());
+			const pollTimeoutSignal = AbortSignal.timeout(pollTime);
+			const pollSignal = signal ? AbortSignal.any([signal, pollTimeoutSignal]) : pollTimeoutSignal;
+			const pollResp = await fetchFn(`${endpoint}/v1internal/${operationName}`, {
+				method: "GET",
+				headers: jsonHeaders(token),
+				signal: pollSignal
 			});
-			return listProj;
+			if (!pollResp.ok) {
+				const pollErr = await pollResp.text().catch(() => "");
+				throw new Error(`onboardUser operation poll failed: ${pollResp.status}: ${pollErr}`);
+			}
+			operation = await pollResp.json();
 		}
+	} catch (err) {
+		if (Date.now() >= deadline || signal?.aborted) throw err;
+	}
+}
+async function listCloudAICompanionProjects(token, fetchFn = fetch) {
+	for (const endpoint of endpointCandidates()) try {
+		const response = await fetchFn(`${endpoint}/v1internal:listCloudAICompanionProjects`, {
+			method: "POST",
+			headers: antigravityHeaders(token),
+			body: JSON.stringify({}),
+			signal: AbortSignal.timeout(DISCOVERY_TIMEOUT_MS)
+		});
+		if (!response.ok) continue;
+		return extractProjectId(await response.json());
 	} catch {}
 }
 async function postJson(path, token, body, fetchFn = fetch) {
@@ -4365,50 +4457,63 @@ function parseCatalogModels(data) {
 	}
 	return list;
 }
-async function fetchAccountQuota(store = new FileCredentialStore(), modelSettings, fetchFn = fetch) {
-	const { token, projectId: credentialProjectId } = await ensureApiKey(store, fetchFn);
-	const [assistResult, summaryResult] = await Promise.all([postJson("/v1internal:loadCodeAssist", token, { metadata: {
-		ideType: "ANTIGRAVITY",
-		platform: "PLATFORM_UNSPECIFIED",
-		pluginType: "GEMINI"
-	} }, fetchFn).catch(() => null), postJson("/v1internal:retrieveUserQuotaSummary", token, {}, fetchFn).catch(() => null)]);
-	const discoveredProject = assistResult ? extractProjectId(assistResult.data) : void 0;
-	const projectId = credentialProjectId || discoveredProject || "antigravity-default";
-	const modelsData = (await postJson("/v1internal:fetchAvailableModels", token, { project: projectId }, fetchFn).catch(() => null))?.data;
-	const { groups, description } = summaryResult ? parseQuotaSummary(summaryResult.data) : { groups: [] };
-	const catalogModels = modelsData ? parseCatalogModels(modelsData) : [];
-	const assistData = assistResult?.data || {};
-	const currentTier = assistData.currentTier;
-	const paidTier = assistData.paidTier;
-	const planLabel = paidTier?.name || currentTier?.name || void 0;
-	cachedQuota = {
-		projectId,
-		endpoint: summaryResult?.endpoint || ENDPOINT_FALLBACKS[0],
-		planLabel,
-		productTier: currentTier,
-		paidTier,
-		groups,
-		groupDescription: description,
-		models: catalogModels.map((m) => ({
-			modelId: m.id,
-			displayName: m.name,
-			description: m.description
-		})),
-		catalogModels,
-		fetchedAt: Date.now()
-	};
-	if (modelSettings && catalogModels.length > 0) {
-		const current = await modelSettings.read();
-		const isFirstTime = current.catalogModels.length === 0 && current.enabledModelIds.length === 0;
-		const catalogIds = new Set(catalogModels.map((m) => m.id));
-		const mergedEnabled = isFirstTime ? catalogModels.map((m) => m.id) : current.enabledModelIds.filter((id) => catalogIds.has(id));
-		await modelSettings.setCatalogModels(catalogModels, { enabledModelIds: mergedEnabled });
-	}
-	return cachedQuota;
+async function fetchAccountQuota(store = new FileCredentialStore(), modelSettings, fetchFn = fetch, force = false) {
+	if (!force && cachedQuota && Date.now() - (cachedQuota.fetchedAt || 0) < 12e4) return cachedQuota;
+	if (quotaFetchInFlight) return quotaFetchInFlight;
+	quotaFetchInFlight = (async () => {
+		try {
+			const { token, projectId: credentialProjectId } = await ensureApiKey(store, fetchFn);
+			const [assistResult, summaryResult] = await Promise.all([postJson("/v1internal:loadCodeAssist", token, { metadata: {
+				ideType: "ANTIGRAVITY",
+				platform: "PLATFORM_UNSPECIFIED",
+				pluginType: "GEMINI"
+			} }, fetchFn).catch(() => null), postJson("/v1internal:retrieveUserQuotaSummary", token, {}, fetchFn).catch(() => null)]);
+			const discoveredProject = assistResult ? extractProjectId(assistResult.data) : void 0;
+			const projectId = credentialProjectId || discoveredProject || "antigravity-default";
+			const modelsData = (await postJson("/v1internal:fetchAvailableModels", token, { project: projectId }, fetchFn).catch(() => null))?.data;
+			const { groups, description } = summaryResult ? parseQuotaSummary(summaryResult.data) : { groups: [] };
+			const catalogModels = modelsData ? parseCatalogModels(modelsData) : [];
+			const assistData = assistResult?.data || {};
+			const currentTier = assistData.currentTier;
+			const paidTier = assistData.paidTier;
+			const planLabel = paidTier?.name || currentTier?.name || void 0;
+			cachedQuota = {
+				projectId,
+				endpoint: summaryResult?.endpoint || ENDPOINT_FALLBACKS[0],
+				planLabel,
+				productTier: currentTier,
+				paidTier,
+				groups,
+				groupDescription: description,
+				models: catalogModels.map((m) => ({
+					modelId: m.id,
+					displayName: m.name,
+					description: m.description
+				})),
+				catalogModels,
+				fetchedAt: Date.now()
+			};
+			if (modelSettings && catalogModels.length > 0) {
+				const current = await modelSettings.read();
+				const isFirstTime = current.catalogModels.length === 0 && current.enabledModelIds.length === 0;
+				const catalogIds = new Set(catalogModels.map((m) => m.id));
+				const mergedEnabled = isFirstTime ? catalogModels.map((m) => m.id) : current.enabledModelIds.filter((id) => catalogIds.has(id));
+				await modelSettings.setCatalogModels(catalogModels, { enabledModelIds: mergedEnabled });
+			}
+			return cachedQuota;
+		} finally {
+			quotaFetchInFlight = null;
+		}
+	})();
+	return quotaFetchInFlight;
 }
 function getCachedQuota() {
 	return cachedQuota;
 }
+function clearCachedQuota() {
+	cachedQuota = void 0;
+	quotaFetchInFlight = null;
+}
 //#endregion
 //#region src/host/antigravity/oauth.ts
 let webLoginFlow = { status: "idle" };
@@ -4553,7 +4658,36 @@ function startCallbackServer(expectedState) {
 		});
 	});
 }
-async function exchangeOAuthCode(code, verifier, callbackUrl, fetchFn = fetch) {
+function extractGoogleValidationUrl(text) {
+	const match = /https:\/\/[^\s"'><]+/i.exec(text);
+	return match ? match[0] : void 0;
+}
+function assertFreeTierEligible(payload) {
+	if (payload.allowedTiers?.some((tier) => tier.id === "free-tier") === true) return;
+	const ineligibility = payload.ineligibleTiers?.find((c) => c.tierId === FREE_TIER_ID);
+	if (!ineligibility?.reasonMessage) return;
+	const validation = ineligibility.validationUrl ? `\nValidation URL: ${ineligibility.validationUrl}` : "";
+	const err = /* @__PURE__ */ new Error(`${ineligibility.reasonMessage}${validation}`);
+	if (ineligibility.validationUrl) err.validationUrl = ineligibility.validationUrl;
+	throw err;
+}
+async function discoverAntigravityProject(token, fetchFn = fetch, signal, onProgress) {
+	onProgress?.("正在检查 Cloud Code Assist 账号状态...");
+	const initial = await loadCodeAssistDetail(token, fetchFn, signal);
+	if (!initial) throw new Error("无法连接到 Cloud Code Assist 服务，请检查网络连接");
+	assertFreeTierEligible(initial);
+	if (initial.allowedTiers?.some((tier) => tier.id === "free-tier") === true && !initial.currentTier) {
+		onProgress?.("正在为新账号开通 Antigravity 免费额度...");
+		await onboardUser(token, fetchFn, signal);
+		onProgress?.("正在获取专属项目 (Project ID)...");
+		const refreshed = await loadCodeAssistDetail(token, fetchFn, signal);
+		if (refreshed?.projectId) return refreshed.projectId;
+	} else if (initial.projectId) return initial.projectId;
+	const fallback = await listCloudAICompanionProjects(token, fetchFn);
+	if (fallback) return fallback;
+	return initial.projectId;
+}
+async function exchangeOAuthCode(code, verifier, callbackUrl, fetchFn = fetch, signal, onProgress) {
 	const tokenResponse = await fetchFn(TOKEN_URL, {
 		method: "POST",
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },
@@ -4564,7 +4698,8 @@ async function exchangeOAuthCode(code, verifier, callbackUrl, fetchFn = fetch) {
 			grant_type: "authorization_code",
 			redirect_uri: callbackUrl,
 			code_verifier: verifier
-		}).toString()
+		}).toString(),
+		signal
 	});
 	if (!tokenResponse.ok) throw new Error(`Token exchange failed: ${sanitizeOAuthProviderError(await tokenResponse.text())}`);
 	const tokenData = await tokenResponse.json();
@@ -4572,7 +4707,7 @@ async function exchangeOAuthCode(code, verifier, callbackUrl, fetchFn = fetch) {
 	const accessToken = typeof tokenData.access_token === "string" ? tokenData.access_token : "";
 	const expiresIn = typeof tokenData.expires_in === "number" ? tokenData.expires_in : 3600;
 	if (!refreshToken) throw new Error("No refresh token received. Re-run login and allow offline access.");
-	const [email, discoveredProject] = await Promise.all([getUserEmail(accessToken, fetchFn), loadCodeAssist(accessToken, fetchFn).catch(() => void 0)]);
+	const [email, discoveredProject] = await Promise.all([getUserEmail(accessToken, fetchFn), discoverAntigravityProject(accessToken, fetchFn, signal, onProgress)]);
 	return {
 		refresh: refreshToken,
 		refresh_token: refreshToken,
@@ -4584,7 +4719,7 @@ async function exchangeOAuthCode(code, verifier, callbackUrl, fetchFn = fetch) {
 		email
 	};
 }
-async function beginWebLogin(store, fetchFn = fetch) {
+async function beginWebLogin(store, fetchFn = fetch, signal) {
 	if (webLoginFlow.status === "pending") return { ...webLoginFlow };
 	const { verifier, challenge } = generatePKCE();
 	const state = base64Url(randomBytes(32));
@@ -4604,20 +4739,28 @@ async function beginWebLogin(store, fetchFn = fetch) {
 			prompt: "consent"
 		}).toString()}`,
 		startedAt: Date.now(),
-		error: void 0
+		progress: "等待浏览器授权...",
+		error: void 0,
+		validationUrl: void 0
 	};
 	(async () => {
 		try {
 			const { code, state: returnedState } = await waitForCode();
 			if (returnedState !== state) throw new Error("OAuth state mismatch");
-			const credentials = await exchangeOAuthCode(code, verifier, callbackUrl, fetchFn);
+			const credentials = await exchangeOAuthCode(code, verifier, callbackUrl, fetchFn, signal, (stage) => {
+				webLoginFlow.progress = stage;
+			});
 			await store.write(credentials);
 			webLoginFlow.status = "complete";
 			webLoginFlow.email = credentials.email;
 			webLoginFlow.completedAt = Date.now();
+			webLoginFlow.progress = "授权成功";
 		} catch (error) {
 			webLoginFlow.status = "error";
-			webLoginFlow.error = error instanceof Error ? error.message : String(error);
+			const errText = error instanceof Error ? error.message : String(error);
+			webLoginFlow.error = errText;
+			const validationUrl = error?.validationUrl || extractGoogleValidationUrl(errText);
+			if (validationUrl) webLoginFlow.validationUrl = validationUrl;
 			webLoginFlow.completedAt = Date.now();
 		} finally {
 			server.close();
@@ -4653,7 +4796,8 @@ async function refreshAntigravityToken(credentials, fetchFn = fetch) {
 		access: accessToken,
 		access_token: accessToken,
 		expires: Date.now() + expiresIn * 1e3 - 300 * 1e3,
-		expires_at: Date.now() + expiresIn * 1e3 - 300 * 1e3
+		expires_at: Date.now() + expiresIn * 1e3 - 300 * 1e3,
+		projectId: credentials.projectId
 	};
 }
 async function ensureApiKey(store, fetchFn = fetch) {
@@ -4669,7 +4813,7 @@ async function ensureApiKey(store, fetchFn = fetch) {
 		projectId: credentials.projectId
 	};
 }
-async function loginAndSave(store, signal, onUrl, fetchFn = fetch) {
+async function loginAndSave(store, signal, onUrl, fetchFn = fetch, onProgress) {
 	const { verifier, challenge } = generatePKCE();
 	const state = base64Url(randomBytes(32));
 	const { server, waitForCode } = await startCallbackServer(state);
@@ -4691,7 +4835,7 @@ async function loginAndSave(store, signal, onUrl, fetchFn = fetch) {
 		if (signal?.aborted) throw new Error("OAuth login aborted");
 		const { code, state: returnedState } = await waitForCode();
 		if (returnedState !== state) throw new Error("OAuth state mismatch");
-		const credentials = await exchangeOAuthCode(code, verifier, callbackUrl, fetchFn);
+		const credentials = await exchangeOAuthCode(code, verifier, callbackUrl, fetchFn, signal, onProgress);
 		await store.write(credentials);
 		return credentials;
 	} finally {
@@ -4839,6 +4983,12 @@ function contentToUserParts(content) {
 	else if (isRecord(block) && block.type === "image") {
 		const img = imageBlockToPart(block);
 		if (img) parts.push(img);
+	} else if (isRecord(block) && block.type === "file") {
+		const file = isRecord(block.attachment) ? block.attachment : block;
+		const name = asString(file.name) || asString(file.filename) || "unnamed";
+		const size = typeof file.byteSize === "number" ? ` (${file.byteSize} bytes)` : "";
+		const savedPath = asString(file.savedPath) ? ` path: ${asString(file.savedPath)}` : "";
+		parts.push({ text: sanitizeText(`[File attachment: ${name}${size}${savedPath}]`) });
 	}
 	return parts;
 }
@@ -4847,6 +4997,10 @@ function toolResultText(blocks) {
 	return blocks.map((block) => {
 		if (!isRecord(block)) return "";
 		if (block.type === "text" && typeof block.text === "string") return sanitizeText(block.text);
+		if (block.type === "file") {
+			const file = isRecord(block.attachment) ? block.attachment : block;
+			return sanitizeText(`[file: ${asString(file.name) || asString(file.filename) || "unnamed"}${typeof file.byteSize === "number" ? ` (${file.byteSize} bytes)` : ""}]`);
+		}
 		if (block.type === "tool-result") return toolResultText(block.content);
 		return "";
 	}).join("");
@@ -5315,6 +5469,7 @@ var AntigravityAdapter = class extends LlmAdapter {
 			inputModalities: model.inputModalities,
 			context: { contextWindow: overrides[model.id] || model.contextWindow },
 			defaultMaxTokens: model.maxTokens,
+			systemPromptUpdate: "in-history",
 			...model.reasoningEfforts ? { reasoning: {
 				efforts: efforts.map((effort) => ({
 					id: ReasoningEffortId(effort),
@@ -5482,6 +5637,10 @@ function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetch
 			try {
 				if (path === "status" || path === "") {
 					if (request.method !== "GET") return sendMethodNotAllowed(response);
+					const credentials = await store.read();
+					const authenticated = !!(credentials?.access || credentials?.access_token);
+					const cached = getCachedQuota();
+					if (authenticated && (!cached || Date.now() - (cached.fetchedAt || 0) > 12e4)) await fetchAccountQuota(store, modelSettings, fetchFn).catch(() => void 0);
 					return sendJson(response, 200, {
 						ok: true,
 						value: await getAntigravityWebStatus(store, modelSettings, preferences)
@@ -5503,7 +5662,7 @@ function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetch
 				}
 				if (path === "quota") {
 					if (request.method !== "GET" && request.method !== "POST") return sendMethodNotAllowed(response);
-					const quota = await fetchAccountQuota(store, modelSettings, fetchFn);
+					const quota = await fetchAccountQuota(store, modelSettings, fetchFn, true);
 					return sendJson(response, 200, {
 						ok: true,
 						value: {
@@ -5541,6 +5700,7 @@ function registerAntigravityRoutes(ctx, store, modelSettings, preferences, fetch
 				if (path === "logout") {
 					if (request.method !== "POST") return sendMethodNotAllowed(response);
 					await store.delete();
+					clearCachedQuota();
 					return sendJson(response, 200, {
 						ok: true,
 						value: await getAntigravityWebStatus(store, modelSettings)
@@ -5628,4 +5788,4 @@ function localWebServerBaseUrl(host, port) {
 	return `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}`;
 }
 //#endregion
-export { AntigravityAdapter, CodexChatGptAdapter, FileCredentialStore, FileModelSettingsStore, LinuxFileTokenStore, MacKeychainTokenStore, OAuthService, ProxyManager, ResponsesClient, UsageService, WindowsDpapiTokenStore, apply, beginWebLogin, createCodexFetchProvider, createCodexImageTool, createCodexSearchProvider, createPlatformTokenStore, credentialPath, detectSystemProxy, fetchAccountQuota, getCachedQuota, inject, loginAndSave, mapCodexUsage, modelSettingsPath, parseCodexUsage, parseResponsesStream, refreshAntigravityToken };
+export { AntigravityAdapter, CodexChatGptAdapter, FileCredentialStore, FileModelSettingsStore, LinuxFileTokenStore, MacKeychainTokenStore, OAuthService, ProxyManager, ResponsesClient, UsageService, WindowsDpapiTokenStore, apply, beginWebLogin, clearCachedQuota, createCodexFetchProvider, createCodexImageTool, createCodexSearchProvider, createPlatformTokenStore, credentialPath, detectSystemProxy, fetchAccountQuota, getCachedQuota, inject, loginAndSave, mapCodexUsage, modelSettingsPath, parseCodexUsage, parseResponsesStream, refreshAntigravityToken };

package/lib/types/client/antigravity/AntigravityComposerQuota.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AntigravityComposerQuota.d.ts","sourceRoot":"","sources":["../../../../src/client/antigravity/AntigravityComposerQuota.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAA;AAC5F,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAmB7C,KAAK,KAAK,GAAG,YAAY,CAAC,0BAA0B,CAAC,GACnD,WAAW,CAAC,OAAO,cAAc,CAAC,GAAG;IACnC,SAAS,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAA;IAC7C,kBAAkB,EAAE,MAAM,IAAI,CAAA;CAC/B,CAAA;AAqCH,wBAAgB,wBAAwB,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAgF3G"}
+{"version":3,"file":"AntigravityComposerQuota.d.ts","sourceRoot":"","sources":["../../../../src/client/antigravity/AntigravityComposerQuota.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAA;AAC5F,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAmB7C,KAAK,KAAK,GAAG,YAAY,CAAC,0BAA0B,CAAC,GACnD,WAAW,CAAC,OAAO,cAAc,CAAC,GAAG;IACnC,SAAS,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAA;IAC7C,kBAAkB,EAAE,MAAM,IAAI,CAAA;CAC/B,CAAA;AAqCH,wBAAgB,wBAAwB,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAyF3G"}

package/lib/types/client/antigravity/AntigravitySection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AntigravitySection.d.ts","sourceRoot":"","sources":["../../../../src/client/antigravity/AntigravitySection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAM/D,UAAU,KAAK;IACb,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAA;CAChC;AAiBD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOlE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIpD;AAuBD,wBAAgB,kBAAkB,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,YAAY,CAuanG"}
+{"version":3,"file":"AntigravitySection.d.ts","sourceRoot":"","sources":["../../../../src/client/antigravity/AntigravitySection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAM/D,UAAU,KAAK;IACb,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAA;CAChC;AAiBD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOlE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIpD;AAuBD,wBAAgB,kBAAkB,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,YAAY,CAmdnG"}