@eddyskywalker/dsh-chatgpt-subscription 0.57.0 → 0.59.0

package/lib/index.js

@@ -9,7 +9,7 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 import { z } from "zod";
 import z$1 from "@deepseek-ai/schemastery";
 import fs, { chmod, lstat, mkdir, open, readFile, realpath, rename, stat, unlink, writeFile } from "node:fs/promises";
-import path, { basename, dirname, join, relative, resolve } from "node:path";
+import path, { basename, dirname, extname, join, relative, resolve } from "node:path";
 import os, { homedir, platform, userInfo } from "node:os";
 import { constants, createCipheriv, createDecipheriv, createHash, createHmac, publicEncrypt, randomBytes, randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
@@ -807,11 +807,20 @@ const ROUTE_PREFIX$5 = "/api/dsh-chatgpt-subscription";
 * `test/responses-client.test.ts` asserts the two agree, so a release that
 * forgets this constant fails the suite instead of shipping quietly.
 */
-const PLUGIN_VERSION = "0.57.0";
+const PLUGIN_VERSION = "0.59.0";
 const CODEX_CHATGPT_PROVIDER_ID = "codex-chatgpt";
 const CODEX_API_BASE = "https://chatgpt.com/backend-api/codex";
 const CODEX_RESPONSES_URL = `${CODEX_API_BASE}/responses`;
 const CODEX_IMAGE_GENERATION_URL = `${CODEX_API_BASE}/images/generations`;
+/**
+* The edit route: the same image surface, addressed for reference-image input.
+*
+* A generation has nothing to modify and goes to `/images/generations`; a
+* request that names reference images is an EDIT and goes here, with those
+* images carried inline in a JSON `images` array. It is a separate route, not a
+* flag on the generation body, so the two are stated as two constants.
+*/
+const CODEX_IMAGE_EDIT_URL = `${CODEX_API_BASE}/images/edits`;
 const CODEX_SEARCH_URL = `${CODEX_API_BASE}/alpha/search`;
 const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 /**
@@ -1345,6 +1354,144 @@ async function rehydrateCatalogCache(name, parseModels, accept, currentFetchedAt
 	return snapshot.fetchedAt;
 }
 //#endregion
+//#region src/host/codex-identity.ts
+/**
+* Who one ChatGPT credential belongs to, and what makes two sign-ins the same
+* account.
+*
+* TWO IDENTITIES, AND THEY ARE NOT THE SAME THING.
+*
+* - The WORKSPACE identity is `chatgpt_account_id`, carried as
+*   `credentials.accountId` and sent upstream as `chatgpt-account-id`. It
+*   decides which workspace a request is billed to and what its listing serves,
+*   and every member of that workspace shares it.
+* - The LOCAL LOGIN identity is (workspace, user): that same workspace id plus a
+*   stable id for the person who signed in. Two members of one workspace are two
+*   accounts here — separate tokens, separate rows, separately selectable — and
+*   re-authorizing the same person updates the row that person already owns.
+*
+* Keying the account pool on the workspace alone is the bug this module exists to
+* prevent. Adding a second member of a workspace replaced the first: the card read
+* "1 account signed in", the earlier sign-in was gone from the list, and nothing in
+* the credential was wrong — the pool simply believed both sign-ins were one
+* account, because that is what the key said.
+*
+* The user id is read from the tokens themselves, most explicit claim first:
+* `chatgpt_user_id` (the field upstream states for exactly this purpose), then
+* the OIDC `sub` that an id token always carries, then the address. Only when none
+* of the three is present does the workspace stand in on its own, because nothing
+* better exists then and merging is what every row written before this module
+* already did. The workspace id alone is NEVER treated as a user identity while
+* some user claim is available.
+*/
+/** Namespace of the ChatGPT auth claims inside an id or access token. */
+const CODEX_AUTH_CLAIMS_KEY = "https://api.openai.com/auth";
+/**
+* The claims of a JWT, decoded in process, or nothing.
+*
+* The payload is the second base64url segment; the signature is never touched and
+* the result is used only for the non-secret facts above. Never sent anywhere: a
+* token handed to a decoder service is a token handed away.
+*
+* No verification is claimed and none is possible here. What this does instead is
+* refuse to invent: a token that does not decode is treated as stating nothing,
+* which leaves the caller on its own fallback rather than on a guessed identity.
+*/
+function parseJwtClaims(token) {
+	if (token === void 0) return void 0;
+	const parts = token.split(".");
+	if (parts.length !== 3) return void 0;
+	try {
+		const value = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
+		return typeof value === "object" && value !== null ? value : void 0;
+	} catch {
+		return;
+	}
+}
+/**
+* What the tokens state about their owner.
+*
+* The id token is read before the access token, because it is the document that
+* describes the sign-in; the access token is the fallback for credentials stored
+* without one. First statement wins, so a value the id token states is never
+* overwritten by the access token's copy of it.
+*/
+function extractIdentity(credentials) {
+	const result = {};
+	let subject;
+	for (const token of [credentials.idToken, credentials.accessToken]) {
+		const claims = parseJwtClaims(token);
+		if (claims === void 0) continue;
+		const nested = claims[CODEX_AUTH_CLAIMS_KEY];
+		result.email ??= stringClaim(claims.email);
+		result.planType ??= stringClaim(claims.chatgpt_plan_type) ?? stringClaim(nested?.chatgpt_plan_type);
+		result.userId ??= stringClaim(claims.chatgpt_user_id) ?? stringClaim(nested?.chatgpt_user_id);
+		result.accountId ??= stringClaim(claims.chatgpt_account_id) ?? stringClaim(nested?.chatgpt_account_id) ?? stringClaim(claims.organizations?.[0]?.id) ?? stringClaim(nested?.organizations?.[0]?.id);
+		subject ??= stringClaim(claims.sub);
+	}
+	result.userId ??= subject;
+	return result;
+}
+/**
+* The stable id of the human behind a credential, or nothing.
+*
+* Explicit claim first, then `sub`, and deliberately NOT the email: an address is
+* the caller's fallback (see {@link codexAccountIdentity}), while this function
+* answers the narrower question "does this credential name its user outright?".
+* A persisted `userId` wins over anything re-derived from the tokens, so an opaque
+* access token handed back by a rotation cannot make an account look like a
+* different one.
+*/
+function codexUserId(credentials) {
+	const stored = nonEmpty$3(credentials.userId);
+	if (stored !== void 0) return stored;
+	return extractIdentity(credentials).userId;
+}
+/**
+* One opaque key per local login: the pool's dedupe key, and the scope of every
+* per-account cache this line keeps.
+*
+* A digest of an EXPLICIT serialization rather than a readable join, for three
+* reasons that are really one: the string is a label, not data.
+*
+* - A separator can be forged. `workspace:user` joins two values that may
+*   themselves contain the separator, so `a` + `b:c` and `a:b` + `c` would have to
+*   be the same key. A JSON array has no such ambiguity: quotes and escapes are
+*   the boundary, and they cannot be re-cut by a value.
+* - The key becomes a FILE NAME. `catalogSnapshotName` folds everything outside
+*   `[a-z0-9]` to `_`, so a readable key would collide with its neighbours after
+*   folding *and* leave an email address on disk. Hex survives the fold unchanged.
+* - It is compared for equality only, so nothing is lost by making it opaque.
+*
+* `v1` is part of the serialized tuple, not decoration: a future change to the
+* composition has to produce different keys, and a version tag is what lets that
+* change be told apart from a corrupted row instead of silently merging two
+* accounts that the new rule would separate.
+*
+* Returns `undefined` when the credential states nothing at all about who it is.
+* The pool then mints its own `acc_<random>` and ADDS the row, which is the honest
+* answer: a credential nothing identifies cannot be recognized again, and merging
+* it with an unrelated one would be worse than a duplicate.
+*/
+function codexAccountIdentity(credentials) {
+	const workspace = nonEmpty$3(credentials.accountId);
+	const user = codexUserId(credentials) ?? nonEmpty$3(credentials.email);
+	if (workspace === void 0 && user === void 0) return void 0;
+	const serialized = JSON.stringify([
+		"v1",
+		workspace ?? "",
+		user ?? ""
+	]);
+	return "v1-" + createHash("sha256").update(serialized).digest("hex").slice(0, 32);
+}
+function stringClaim(value) {
+	return typeof value === "string" && value !== "" ? value : void 0;
+}
+function nonEmpty$3(value) {
+	const trimmed = value?.trim();
+	return trimmed === void 0 || trimmed === "" ? void 0 : trimmed;
+}
+//#endregion
 //#region src/host/wire-auth.ts
 /**
 * Turn-state header the Codex backend hands back on a responses response.
@@ -1441,18 +1588,36 @@ const CATALOG_TTL_MS = 15 * 6e4;
 * scope a rehydrated listing from one account would answer another's picker.
 */
 const SNAPSHOT_SCOPE = "chatgpt-codex";
-let catalogCache$2 = null;
+/**
+* How many accounts' listings are held at once.
+*
+* One slot was enough while a workspace id was mistaken for an account, because
+* every member of a workspace then shared one. It is not enough now: a pool
+* rotates between accounts, and a single slot would have each rotation evict the
+* other account's listing and re-fetch it, which turns the 15-minute TTL into
+* "no cache at all" for exactly the multi-account setup this line supports. The
+* bound is the pool's own order of magnitude, so a real composition always fits
+* and a pathological one only loses the coldest entry.
+*/
+const CATALOG_CACHE_ACCOUNTS = 8;
+/** Listings held per login identity; see {@link CATALOG_CACHE_ACCOUNTS}. */
+const catalogCache$2 = /* @__PURE__ */ new Map();
+/** The entry {@link getCachedCatalog} answers with: the one a load last wrote. */
+let latestKey = null;
 const catalogInFlight$6 = /* @__PURE__ */ new Map();
-let snapshotRehydrated = null;
+/** Snapshots already read back from disk, per identity. */
+const snapshotRehydrated = /* @__PURE__ */ new Map();
 /**
 * The listing currently held, or undefined before the first load.
 *
-* Callers that need a catalog with no credential read the shipped table
-* directly; returning it here under a different entry type would force every
-* one of them to convert it.
+* "Currently held" is the entry a load wrote last: a picker asks what the
+* account serving it can call, and that is the account whose listing was fetched
+* most recently. Callers that need a catalog with no credential read the shipped
+* table directly; returning it here under a different entry type would force
+* every one of them to convert it.
 */
 function getCachedCatalog$3() {
-	return catalogCache$2?.models;
+	return latestKey === null ? void 0 : catalogCache$2.get(latestKey)?.models;
 }
 /**
 * Read the models this subscription can call.
@@ -1470,8 +1635,11 @@ function getCachedCatalog$3() {
 function loadCodexCatalog(credentials, options = {}) {
 	const key = accountKeyFor$1(credentials);
 	if (options.force !== true) {
-		const cached = catalogCache$2;
-		if (cached !== null && cached.key === key && Date.now() - cached.at < CATALOG_TTL_MS) return Promise.resolve(cached.models);
+		const cached = catalogCache$2.get(key);
+		if (cached !== void 0 && Date.now() - cached.at < CATALOG_TTL_MS) {
+			latestKey = key;
+			return Promise.resolve(cached.models);
+		}
 	}
 	const pending = catalogInFlight$6.get(key);
 	if (pending !== void 0) return pending;
@@ -1488,10 +1656,17 @@ function loadCodexCatalog(credentials, options = {}) {
 async function performCatalogLoad$1(credentials, options) {
 	const key = accountKeyFor$1(credentials);
 	const fetchFn = options.fetchFn ?? fetch;
-	snapshotRehydrated ??= rehydrateSnapshot(key);
-	await snapshotRehydrated;
-	const cached = catalogCache$2;
-	if (cached !== null && cached.key === key && Date.now() - cached.at < CATALOG_TTL_MS) return cached.models;
+	let rehydrated = snapshotRehydrated.get(key);
+	if (rehydrated === void 0) {
+		rehydrated = rehydrateSnapshot(key);
+		snapshotRehydrated.set(key, rehydrated);
+	}
+	await rehydrated;
+	const cached = catalogCache$2.get(key);
+	if (cached !== void 0 && Date.now() - cached.at < CATALOG_TTL_MS) {
+		latestKey = key;
+		return cached.models;
+	}
 	let models;
 	let live = false;
 	try {
@@ -1510,18 +1685,34 @@ async function performCatalogLoad$1(credentials, options) {
 		live = true;
 		writeCatalogSnapshot(catalogSnapshotName(SNAPSHOT_SCOPE, key), [...models], Date.now());
 	} catch {
-		models = getCachedCatalog$3() ?? [];
+		models = catalogCache$2.get(key)?.models ?? [];
 		live = false;
 	}
-	catalogCache$2 = {
+	remember(key, {
 		at: Date.now(),
 		models,
 		key,
 		live
-	};
+	});
 	return models;
 }
 /**
+* File one listing under its identity, keeping the map bounded.
+*
+* Eviction is oldest-fetch-first, which is the entry a rotation is least likely to
+* ask for next; the bound exists so a composition that signs in far more accounts
+* than the pool holds cannot grow this map without end.
+*/
+function remember(key, entry) {
+	catalogCache$2.set(key, entry);
+	latestKey = key;
+	while (catalogCache$2.size > CATALOG_CACHE_ACCOUNTS) {
+		const oldest = [...catalogCache$2.entries()].filter(([candidate]) => candidate !== key).sort((left, right) => left[1].at - right[1].at)[0];
+		if (oldest === void 0) break;
+		catalogCache$2.delete(oldest[0]);
+	}
+}
+/**
 * Seed the in-memory cache from the last persisted listing.
 *
 * Best effort by construction: a missing or malformed snapshot leaves the cache
@@ -1530,13 +1721,13 @@ async function performCatalogLoad$1(credentials, options) {
 async function rehydrateSnapshot(key) {
 	const snapshot = await readCatalogSnapshot(catalogSnapshotName(SNAPSHOT_SCOPE, key), (value) => Array.isArray(value) ? value.flatMap((item) => parseListingEntry$1(item)) : void 0).catch(() => void 0);
 	if (snapshot === void 0 || snapshot.models.length === 0) return;
-	if (catalogCache$2 !== null) return;
-	catalogCache$2 = {
+	if (catalogCache$2.has(key)) return;
+	remember(key, {
 		at: snapshot.fetchedAt,
 		models: snapshot.models,
 		key,
 		live: true
-	};
+	});
 }
 /**
 * Read the listing payload.
@@ -1605,12 +1796,19 @@ function parseEfforts(value) {
 /**
 * Cache identity for one credential.
 *
-* The account id is the entitlement boundary: two accounts of the same user can
-* see different listings, and a pool rotates between them, so the key has to
-* follow the account rather than the person.
+* The listing is served per PLAN, and a plan belongs to the local login — the
+* workspace id alone is not an identity here either: two members of one workspace
+* can hold different plans, so filing both listings under the workspace would let
+* one member's picker answer with models the other member's plan does not serve.
+* The key is therefore the same composite identity the pool dedupes on, and its
+* digest form is what keeps the persisted snapshot's file name both distinct after
+* `catalogSnapshotName` folds it and free of an email address.
+*
+* `'default'` answers a credential that states nothing about itself, which is the
+* single pre-sign-in case this loader ever sees.
 */
 function accountKeyFor$1(credentials) {
-	return credentials.accountId || "default";
+	return codexAccountIdentity(credentials) ?? "default";
 }
 function asRecord$20(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
@@ -1729,6 +1927,7 @@ function parseStoredCredentials(value) {
 		expiresAt: record.expiresAt,
 		idToken: optional("idToken"),
 		accountId: optional("accountId"),
+		userId: optional("userId"),
 		email: optional("email"),
 		planType: optional("planType")
 	};
@@ -4498,17 +4697,6 @@ function buildAuthorizationUrl(verifier, state) {
 		originator: OAUTH_ORIGINATOR
 	}).toString()}`;
 }
-function parseJwtClaims(token) {
-	if (token === void 0) return void 0;
-	const parts = token.split(".");
-	if (parts.length !== 3) return void 0;
-	try {
-		const value = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
-		return typeof value === "object" && value !== null ? value : void 0;
-	} catch {
-		return;
-	}
-}
 function publicError(error, fallback = "internal") {
 	if (error instanceof OAuthServiceError) return {
 		code: error.code,
@@ -4535,28 +4723,25 @@ function credentialsFromTokenResponse(response, now, previous) {
 	return {
 		...base,
 		accountId: identity.accountId ?? previous?.accountId,
+		userId: identity.userId ?? previous?.userId,
 		email: identity.email ?? previous?.email,
 		planType: identity.planType ?? previous?.planType
 	};
 }
-function extractIdentity(credentials) {
-	const result = {};
-	for (const token of [credentials.idToken, credentials.accessToken]) {
-		const claims = parseJwtClaims(token);
-		if (claims === void 0) continue;
-		const nested = claims["https://api.openai.com/auth"];
-		result.email ??= stringClaim(claims.email);
-		result.planType ??= stringClaim(claims.chatgpt_plan_type) ?? stringClaim(nested?.chatgpt_plan_type);
-		result.accountId ??= stringClaim(claims.chatgpt_account_id) ?? stringClaim(nested?.chatgpt_account_id) ?? stringClaim(claims.organizations?.[0]?.id) ?? stringClaim(nested?.organizations?.[0]?.id);
-	}
-	return result;
-}
-/** Identity one refresh is keyed by, so a rotation is never redeemed twice. */
+/**
+* Identity one refresh is keyed by, so a rotation is never redeemed twice.
+*
+* The SAME key the pool dedupes on, and deliberately so: it has to separate two
+* members of one workspace, because their grants are unrelated and sharing one
+* in-flight refresh between them would hand one account's rotated token to the
+* other. A workspace id alone cannot do that — it is what both members have in
+* common — so this is the composite local login identity, with the rotating
+* refresh token as the fallback for a credential that states nothing else. That
+* fallback is the conservative direction: a token that differs always gets its
+* own flight, and a flight nobody joined simply runs by itself.
+*/
 function refreshKey(credentials) {
-	return credentials.accountId ?? credentials.email ?? credentials.refreshToken;
-}
-function stringClaim(value) {
-	return typeof value === "string" && value !== "" ? value : void 0;
+	return codexAccountIdentity(credentials) ?? credentials.refreshToken;
 }
 function maskEmail(email) {
 	if (email === void 0) return null;
@@ -4851,8 +5036,6 @@ const CODEX_CLI_CREDENTIAL_FILE = "auth.json";
 const CODEX_CLI_TOKENS_KEY = "tokens";
 /** Where an adopted snapshot came from, for the card and for the pool record. */
 const CODEX_CLI_CREDENTIAL_SOURCE = "codex";
-/** Namespace the id token carries the ChatGPT account claims under. */
-const CODEX_AUTH_CLAIMS_KEY = "https://api.openai.com/auth";
 /**
 * What the user is told when an adopted credential has aged out.
 *
@@ -5256,7 +5439,7 @@ var CodexAccountPool = class extends AccountPoolCore {
 			poolFile: codexPoolPath(),
 			keychainService: "dsh-chatgpt-subscription-pool",
 			parsePoolData: parseCodexPoolData,
-			dedupeKey: (credentials) => credentials.accountId ?? credentials.email,
+			dedupeKey: (credentials) => codexAccountIdentity(credentials),
 			defaultAlias: (credentials, position) => credentials.email ?? `账号 ${position}`,
 			createAccount: ({ id, alias, credentials, addedAt, isPrimary }) => {
 				const adopted = isAdoptedCodexPoolCredential(credentials);
@@ -5925,6 +6108,33 @@ function normalizeGenerateOptions(options) {
 }
 //#endregion
 //#region src/host/codex-images.ts
+/**
+* Output canvases the Codex image endpoint accepts in `size`.
+*
+* These are the official client's own three canvases plus the default `auto`,
+* which lets the service pick. A size outside this set is not negotiated: the
+* backend answers it with a 400, so the tool refuses it before the request.
+*/
+const CODEX_IMAGE_SIZES = [
+	"auto",
+	"1024x1024",
+	"1536x1024",
+	"1024x1536"
+];
+/** Render effort the endpoint accepts in `quality`; `auto` is the service's own default. */
+const CODEX_IMAGE_QUALITIES = [
+	"auto",
+	"low",
+	"medium",
+	"high"
+];
+/** Frame budget of an animated GIF the endpoint accepts. */
+const GIF_MIN_FRAMES = 2;
+const GIF_MAX_FRAMES = 16;
+const GIF_MIN_FRAME_MS = 20;
+const GIF_MAX_FRAME_MS = 2e3;
+/** How much of an upstream error body is quoted back to the caller. */
+const MAX_UPSTREAM_EXCERPT_CHARS = 300;
 const PNG_SIGNATURE = [
 	137,
 	80,
@@ -5935,16 +6145,78 @@ const PNG_SIGNATURE = [
 	26,
 	10
 ];
+/**
+* Magic-byte checks per media type.
+*
+* An extension is a claim about a file's name; the bytes are the claim the file
+* itself makes. Both are checked, because sending a file whose declared type the
+* service cannot decode returns a plain upstream error rather than an image.
+*/
+const SIGNATURES$1 = {
+	"image/png": (bytes) => bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71,
+	"image/jpeg": (bytes) => bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255,
+	"image/webp": (bytes) => bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80,
+	"image/gif": (bytes) => bytes[0] === 71 && bytes[1] === 73 && bytes[2] === 70
+};
+/**
+* Extensions a reference image may carry.
+*
+* Deliberately narrower than {@link SIGNATURES}: an edit accepts stills only.
+* Animated GIF input is not part of the edit wire contract, so it is refused
+* here instead of being sent to an endpoint that does not take it.
+*/
+const REFERENCE_EXTENSIONS = {
+	".png": "image/png",
+	".jpg": "image/jpeg",
+	".jpeg": "image/jpeg",
+	".webp": "image/webp"
+};
 function createCodexImageTool(oauth, attachments, options = {}) {
 	const fetchFn = options.fetchFn ?? fetch;
 	return defineTool({
 		name: CODEX_IMAGE_TOOL_NAME,
-		description: "Generate a PNG image using the signed-in ChatGPT subscription-backed Codex image endpoint.",
-		parameters: { prompt: {
-			type: "string",
-			required: true,
-			description: "A detailed image generation prompt."
-		} },
+		description: "Generate or edit a PNG or GIF image with the signed-in ChatGPT subscription-backed Codex image endpoint. Describe the subject, style, composition and any text to render in the prompt; pass referenceImagePaths to edit local PNG/JPEG/WebP images, and gif to animate the result. Scheduling: call this tool yourself for a single generation, an edit, or a retry - never create a subagent just to generate one image. Delegate only when the creative task needs several candidate images or is large enough to be a multi-step task of its own.",
+		parameters: {
+			prompt: {
+				type: "string",
+				required: true,
+				description: "A detailed image generation prompt."
+			},
+			size: {
+				type: "string",
+				enum: CODEX_IMAGE_SIZES,
+				description: "Output canvas. Omit or pass auto to let the service choose. 1024x1024 is square, 1536x1024 landscape and 1024x1536 portrait."
+			},
+			quality: {
+				type: "string",
+				enum: CODEX_IMAGE_QUALITIES,
+				description: "Render effort. Omit or pass auto for the service default; low is fastest and high is most detailed."
+			},
+			transparentBackground: {
+				type: "boolean",
+				description: "true for a transparent background (PNG or GIF alpha), false for an explicitly opaque one. Omit it to leave the background decision to the service."
+			},
+			referenceImagePaths: {
+				type: "array",
+				items: { type: "string" },
+				description: "Up to 5 local PNG, JPEG or WebP files to edit. Absolute paths recommended. The request becomes an edit against those images; nothing else on disk is read."
+			},
+			gif: {
+				type: "object",
+				additionalProperties: false,
+				description: "Ask for an animated GIF. An empty object is allowed and lets the service choose the frames.",
+				properties: {
+					frameCount: {
+						type: "integer",
+						description: "Number of frames, 2 to 16."
+					},
+					frameDurationMs: {
+						type: "integer",
+						description: "Milliseconds each frame is shown, 20 to 2000."
+					}
+				}
+			}
+		},
 		output: {
 			schema: {
 				type: "object",
@@ -5969,7 +6241,7 @@ function createCodexImageTool(oauth, attachments, options = {}) {
 							},
 							mediaType: {
 								type: "string",
-								enum: ["image/png"],
+								enum: ["image/png", "image/gif"],
 								required: true
 							},
 							bytes: {
@@ -6016,34 +6288,52 @@ function createCodexImageTool(oauth, attachments, options = {}) {
 		async execute(args, exec) {
 			const prompt = args.prompt.trim();
 			if (prompt === "") throw new HarnessError("Image prompt cannot be empty.", "CODEX_IMAGE_INVALID_PROMPT");
-			if (!attachments.imageLimits.mediaTypes.includes("image/png")) throw new HarnessError("PNG image attachments are not enabled in this DSH environment.", "CODEX_IMAGE_ATTACHMENT_UNSUPPORTED");
+			const gif = readGifOptions(args.gif);
+			const references = await readReferenceImages(args.referenceImagePaths ?? [], attachments);
+			assertOutputTypeSupported(attachments, gif === void 0 ? "image/png" : "image/gif");
+			const body = buildImageBody({
+				prompt,
+				size: args.size ?? "auto",
+				quality: args.quality ?? "auto",
+				...args.transparentBackground !== void 0 ? { transparentBackground: args.transparentBackground } : {},
+				...gif !== void 0 ? { gif } : {},
+				references
+			});
+			const url = references.length > 0 ? CODEX_IMAGE_EDIT_URL : CODEX_IMAGE_GENERATION_URL;
+			const turnId = String(exec.callId);
 			let credentials = await imageCredentials(oauth);
-			let response = await requestImage$1(fetchFn, credentials, prompt, String(exec.callId), exec.signal);
+			let response = await requestImage$1(fetchFn, credentials, url, body, turnId, exec.signal);
 			if (response.status === 401) {
 				await response.body?.cancel().catch(() => void 0);
 				credentials = await imageCredentials(oauth, true);
-				response = await requestImage$1(fetchFn, credentials, prompt, String(exec.callId), exec.signal);
+				response = await requestImage$1(fetchFn, credentials, url, body, turnId, exec.signal);
 			}
 			if (response.status === 429) {
-				await response.body?.cancel().catch(() => void 0);
-				throw new HarnessError("Codex image generation was rate limited.", "CODEX_IMAGE_RATE_LIMITED");
+				const detail = upstreamExcerpt(await response.text().catch(() => ""));
+				throw new HarnessError(`Codex image generation was rate limited (429).${detail === "" ? "" : ` ${detail}`}`, "CODEX_IMAGE_RATE_LIMITED");
+			}
+			if (response.status === 400) {
+				const detail = upstreamExcerpt(await response.text().catch(() => ""));
+				throw new HarnessError(`Codex rejected the image request (400). The parameters this call stated were: ${statedParameterSummary(args, gif, references.length)}. One of them is not accepted as given, and no field was dropped to retry.` + (detail === "" ? "" : ` Upstream said: ${detail}`), "CODEX_IMAGE_REQUEST_REJECTED");
 			}
 			if (!response.ok) {
-				await response.body?.cancel().catch(() => void 0);
-				throw new HarnessError(`Codex image generation failed (${response.status}).`, "CODEX_IMAGE_FAILED");
+				const detail = upstreamExcerpt(await response.text().catch(() => ""));
+				throw new HarnessError(`Codex image generation failed (${response.status}).${detail === "" ? "" : ` ${detail}`}`, "CODEX_IMAGE_FAILED");
 			}
-			const bytes = decodeImageBytes(readBase64Image(await response.json()), maxGeneratedImageBytes(attachments));
+			const decoded = decodeImageBytes(readBase64Image(await response.json()), maxGeneratedImageBytes(attachments));
+			if (gif !== void 0 && decoded.mediaType !== "image/gif") throw new HarnessError(`Codex was asked for an animated GIF but returned ${decoded.mediaType}. Nothing was saved: the answer is not the animation that was requested. Omit the gif parameter to accept a still image.`, "CODEX_IMAGE_RESPONSE_INVALID");
+			if (!attachments.imageLimits.mediaTypes.includes(decoded.mediaType)) throw new HarnessError(`Codex returned ${decoded.mediaType} but this DSH environment does not accept that attachment type.`, "CODEX_IMAGE_ATTACHMENT_UNSUPPORTED");
 			const image = await attachments.saveImage({
-				data: bytes,
-				mediaType: "image/png",
-				name: "codex-generated-image.png"
+				data: decoded.data,
+				mediaType: decoded.mediaType,
+				name: `codex-generated-image.${decoded.mediaType === "image/gif" ? "gif" : "png"}`
 			});
 			const output = {
 				prompt,
 				model: CODEX_IMAGE_MODEL,
 				image: {
 					attachmentId: image.attachmentId,
-					mediaType: "image/png",
+					mediaType: decoded.mediaType,
 					bytes: image.bytes,
 					width: image.width,
 					height: image.height,
@@ -6065,6 +6355,124 @@ function createCodexImageTool(oauth, attachments, options = {}) {
 		}
 	});
 }
+/**
+* Validate the frame options of a GIF request.
+*
+* An empty object is legal: it asks for an animation and leaves both numbers to
+* the service. A stated number is checked here rather than by the parameter
+* schema because the schema DSL carries no numeric bounds, and because
+* `execute` is reachable directly.
+*/
+function readGifOptions(gif) {
+	if (gif === void 0) return void 0;
+	const result = {};
+	const frameCount = gif.frameCount;
+	if (frameCount !== void 0) {
+		if (!Number.isInteger(frameCount) || frameCount < GIF_MIN_FRAMES || frameCount > GIF_MAX_FRAMES) throw new HarnessError(`gif.frameCount must be a whole number from ${GIF_MIN_FRAMES} to ${GIF_MAX_FRAMES} (got ${String(frameCount)}).`, "CODEX_IMAGE_GIF_INVALID");
+		result.frameCount = frameCount;
+	}
+	const frameDurationMs = gif.frameDurationMs;
+	if (frameDurationMs !== void 0) {
+		if (!Number.isInteger(frameDurationMs) || frameDurationMs < GIF_MIN_FRAME_MS || frameDurationMs > GIF_MAX_FRAME_MS) throw new HarnessError(`gif.frameDurationMs must be a whole number of milliseconds from ${GIF_MIN_FRAME_MS} to ${GIF_MAX_FRAME_MS} (got ${String(frameDurationMs)}).`, "CODEX_IMAGE_GIF_INVALID");
+		result.frameDurationMs = frameDurationMs;
+	}
+	return result;
+}
+/** Refuse an output type this deployment cannot store, before anything is requested. */
+function assertOutputTypeSupported(attachments, outputType) {
+	if (attachments.imageLimits.mediaTypes.includes(outputType)) return;
+	throw new HarnessError(outputType === "image/gif" ? "GIF output was requested, but this DSH environment does not accept GIF attachments, so nothing was requested. Omit the gif parameter to generate a PNG instead." : "PNG image attachments are not enabled in this DSH environment.", "CODEX_IMAGE_ATTACHMENT_UNSUPPORTED");
+}
+/**
+* Build the wire body of one request.
+*
+* Field order and the defaults are deliberate: a call with no new options
+* produces exactly `prompt/background auto/model/quality auto/size auto`, which
+* is the body this tool has always sent. Every new field appears only when the
+* caller stated it, so an old call site keeps its old bytes on the wire.
+*/
+function buildImageBody(request) {
+	const body = {
+		prompt: request.prompt,
+		background: request.transparentBackground === true ? "transparent" : request.transparentBackground === false ? "opaque" : "auto",
+		model: CODEX_IMAGE_MODEL,
+		quality: request.quality,
+		size: request.size
+	};
+	if (request.gif !== void 0) {
+		body.output_format = "gif";
+		if (request.gif.frameCount !== void 0) body.frame_count = request.gif.frameCount;
+		if (request.gif.frameDurationMs !== void 0) body.frame_duration_ms = request.gif.frameDurationMs;
+	}
+	if (request.references.length > 0) body.images = request.references.map((image) => ({ image_url: `data:${image.mediaType};base64,${Buffer.from(image.data).toString("base64")}` }));
+	return body;
+}
+/**
+* The optional parameters one request actually stated, in words.
+*
+* A 400 says only that the request was invalid, which is useless on a tool with
+* seven parameters: the caller has to be told WHICH ones it sent, or it has no
+* way to know what to change. Only stated options are named - a default that the
+* tool has always sent cannot be the field to fix - and each GIF sub-field is
+* named separately, because `gif: {}` is a legal call that stated neither number.
+*/
+function statedParameterSummary(args, gif, referenceCount) {
+	const stated = [];
+	if (args.size !== void 0) stated.push(`size=${args.size}`);
+	if (args.quality !== void 0) stated.push(`quality=${args.quality}`);
+	if (args.transparentBackground !== void 0) stated.push(`transparentBackground=${String(args.transparentBackground)}`);
+	if (referenceCount > 0) stated.push(`referenceImagePaths (${referenceCount} image${referenceCount === 1 ? "" : "s"})`);
+	if (gif !== void 0) {
+		const frames = [];
+		if (gif.frameCount !== void 0) frames.push(`frameCount=${String(gif.frameCount)}`);
+		if (gif.frameDurationMs !== void 0) frames.push(`frameDurationMs=${String(gif.frameDurationMs)}`);
+		stated.push(frames.length === 0 ? "gif (frame numbers left to the service)" : `gif (${frames.join(", ")})`);
+	}
+	return stated.length === 0 ? "no optional parameter was stated" : stated.join(", ");
+}
+/**
+* Read and validate the reference images one edit request names.
+*
+* Every named file is checked as a local still image: the path must not be a
+* URL, the extension must be PNG/JPEG/WebP, the file must be a regular non-empty
+* file inside the attachment byte limits, and its leading bytes must match the
+* declared type. Nothing else on disk is read, and the returned bytes are the
+* ONLY image data that reaches the request.
+*/
+async function readReferenceImages(files, attachments) {
+	if (files.length === 0) return [];
+	const limit = Math.min(5, attachments.imageLimits.maxImagesPerMessage);
+	if (files.length > limit) throw new HarnessError(`At most ${limit} reference images are accepted; ${files.length} were given.`, "CODEX_IMAGE_REFERENCE_LIMIT");
+	const perImageBytes = attachments.imageLimits.maxImageBytes;
+	const totalBytes = attachments.imageLimits.maxMessageImageBytes;
+	const images = [];
+	let sentBytes = 0;
+	for (const [index, raw] of files.entries()) {
+		const label = `referenceImagePaths[${index}]`;
+		const value = raw.trim();
+		if (value === "") throw new HarnessError(`${label} is empty; every reference image must name a local file.`, "CODEX_IMAGE_REFERENCE_INVALID_PATH");
+		if (/^[a-z][a-z0-9+.-]*:\/\//i.test(value) || /^data:/i.test(value)) throw new HarnessError(`${label} is a URL (${value}). Reference images must be local PNG, JPEG or WebP files; nothing is fetched.`, "CODEX_IMAGE_REFERENCE_INVALID_PATH");
+		const extension = extname(value).toLowerCase();
+		const mediaType = REFERENCE_EXTENSIONS[extension];
+		if (mediaType === void 0) throw new HarnessError(extension === ".gif" ? `${label} (${value}) is a GIF. Reference images must be still PNG, JPEG or WebP files; animated input is not part of the edit request.` : `${label} (${value}) is not a PNG, JPEG or WebP file (extension ${extension === "" ? "(none)" : `"${extension}"`}).`, "CODEX_IMAGE_REFERENCE_UNSUPPORTED");
+		if (!attachments.imageLimits.mediaTypes.includes(mediaType)) throw new HarnessError(`${label} is ${mediaType}, which this DSH environment does not accept as an attachment.`, "CODEX_IMAGE_ATTACHMENT_UNSUPPORTED");
+		const absolute = resolve(value);
+		const stats = await stat(absolute).catch(() => void 0);
+		if (stats === void 0) throw new HarnessError(`${label} (${value}) does not exist or cannot be read.`, "CODEX_IMAGE_REFERENCE_NOT_FOUND");
+		if (!stats.isFile()) throw new HarnessError(`${label} (${value}) is not a regular file; pass a path to one PNG, JPEG or WebP file.`, "CODEX_IMAGE_REFERENCE_NOT_A_FILE");
+		if (stats.size === 0) throw new HarnessError(`${label} (${value}) is empty.`, "CODEX_IMAGE_REFERENCE_EMPTY");
+		if (stats.size > perImageBytes) throw new HarnessError(`${label} (${value}) is ${stats.size} bytes, above the ${perImageBytes} byte limit for one attachment.`, "CODEX_IMAGE_REFERENCE_TOO_LARGE");
+		const data = new Uint8Array(await readFile(absolute));
+		if (!SIGNATURES$1[mediaType](data)) throw new HarnessError(`${label} (${value}) does not start like a ${mediaType} file, so its bytes contradict its extension.`, "CODEX_IMAGE_REFERENCE_INVALID_CONTENT");
+		sentBytes += data.byteLength;
+		if (sentBytes > totalBytes) throw new HarnessError(`The reference images total ${sentBytes} bytes, above the ${totalBytes} byte limit for one message.`, "CODEX_IMAGE_REFERENCE_TOO_LARGE");
+		images.push({
+			mediaType,
+			data
+		});
+	}
+	return images;
+}
 async function imageCredentials(oauth, force = false) {
 	try {
 		return await oauth.credentials(force, { purpose: "tool" });
@@ -6072,8 +6480,8 @@ async function imageCredentials(oauth, force = false) {
 		throw new HarnessError(`ChatGPT subscription credentials are required for Codex image generation.${error instanceof Error && error.message !== "" ? ` (${error.message})` : ""}`, "CODEX_IMAGE_CREDENTIAL_MISSING", { cause: error });
 	}
 }
-function requestImage$1(fetchFn, credentials, prompt, turnId, signal) {
-	return fetchFn(CODEX_IMAGE_GENERATION_URL, {
+function requestImage$1(fetchFn, credentials, url, body, turnId, signal) {
+	return fetchFn(url, {
 		method: "POST",
 		headers: {
 			...codexHeaders(credentials),
@@ -6081,16 +6489,19 @@ function requestImage$1(fetchFn, credentials, prompt, turnId, signal) {
 			"content-type": "application/json",
 			"x-codex-image-turn-id": turnId
 		},
-		body: JSON.stringify({
-			prompt,
-			background: "auto",
-			model: CODEX_IMAGE_MODEL,
-			quality: "auto",
-			size: "auto"
-		}),
+		body: JSON.stringify(body),
 		signal
 	});
 }
+/**
+* The upstream error body, short enough to read in a message and stripped of
+* anything that must never be echoed: bearer credentials, base64 image payloads
+* and any long base64-shaped run.
+*/
+function upstreamExcerpt(text) {
+	const collapsed = text.replace(/data:[a-z0-9.+-]+\/[a-z0-9.+-]+;base64,[A-Za-z0-9+/=]*/gi, "data:<redacted>").replace(/Bearer\s+[A-Za-z0-9._~+/=-]{6,}/gi, "Bearer <redacted>").replace(/[A-Za-z0-9+/]{200,}={0,2}/g, "<redacted>").replace(/\s+/g, " ").trim();
+	return collapsed.length > MAX_UPSTREAM_EXCERPT_CHARS ? `${collapsed.slice(0, MAX_UPSTREAM_EXCERPT_CHARS)}…` : collapsed;
+}
 function readBase64Image(value) {
 	const root = record$7(value);
 	const data = Array.isArray(root?.data) ? root.data[0] : null;
@@ -6098,12 +6509,27 @@ function readBase64Image(value) {
 	if (image === null) throw new HarnessError("Codex image response did not include image data.", "CODEX_IMAGE_RESPONSE_INVALID");
 	return image;
 }
+/**
+* Decode one returned image and identify it by its own magic bytes.
+*
+* The endpoint answers a requested GIF with GIF bytes in the same `b64_json`
+* field it uses for PNG, and states nothing about which one it produced, so the
+* bytes are the only reliable source for the media type – and storing a GIF
+* under `image/png` would fail at save time or, worse, mislabel the file.
+*/
 function decodeImageBytes(base64, maxBytes) {
 	if (!/^[A-Za-z0-9+/]+={0,2}$/.test(base64) || base64.length % 4 !== 0) throw new HarnessError("Codex image response was not valid base64.", "CODEX_IMAGE_RESPONSE_INVALID");
 	const buffer = Buffer.from(base64, "base64");
 	if (buffer.length > maxBytes) throw new HarnessError("Generated image exceeds the configured attachment size limit.", "CODEX_IMAGE_TOO_LARGE");
-	for (const [index, byte] of PNG_SIGNATURE.entries()) if (buffer[index] !== byte) throw new HarnessError("Codex image response was not a PNG image.", "CODEX_IMAGE_RESPONSE_INVALID");
-	return buffer;
+	if (SIGNATURES$1["image/gif"](buffer)) return {
+		mediaType: "image/gif",
+		data: buffer
+	};
+	for (const [index, byte] of PNG_SIGNATURE.entries()) if (buffer[index] !== byte) throw new HarnessError("Codex image response was neither PNG nor GIF image data.", "CODEX_IMAGE_RESPONSE_INVALID");
+	return {
+		mediaType: "image/png",
+		data: buffer
+	};
 }
 function maxGeneratedImageBytes(attachments) {
 	return Math.min(attachments.imageLimits.maxImageBytes, attachments.imageLimits.maxMessageImageBytes);
@@ -10277,6 +10703,9 @@ var AntigravityAdapter = class extends LlmAdapter {
 /**
 * Aspect ratios Gemini image models accept in `imageConfig.aspectRatio`.
 * Omitted, the model picks one itself, which is what the request then does.
+*
+* The last four are the extreme strips: a wider or taller frame than the square
+* family covers, useful for banners, headers and phone wallpapers.
 */
 const ANTIGRAVITY_IMAGE_ASPECT_RATIOS = [
 	"1:1",
@@ -10288,7 +10717,21 @@ const ANTIGRAVITY_IMAGE_ASPECT_RATIOS = [
 	"5:4",
 	"9:16",
 	"16:9",
-	"21:9"
+	"21:9",
+	"1:4",
+	"4:1",
+	"1:8",
+	"8:1"
+];
+/**
+* Image sizes Gemini image models accept in `imageConfig.imageSize`.
+* Omitted, the model picks one itself, which is what the request then does.
+*/
+const ANTIGRAVITY_IMAGE_SIZES = [
+	"0.5K",
+	"1K",
+	"2K",
+	"4K"
 ];
 /** Images one call keeps; the model normally returns one. */
 const MAX_IMAGES_PER_CALL = 4;
@@ -10302,7 +10745,11 @@ const MAX_IMAGES_PER_CALL = 4;
 * Antigravity clients send for image runtimes; it has not been captured from
 * the official client.
 */
-function buildImageRequest(prompt, projectId, aspectRatio) {
+function buildImageRequest(prompt, projectId, aspectRatio, imageSize) {
+	const imageConfig = {
+		...aspectRatio ? { aspectRatio } : {},
+		...imageSize ? { imageSize } : {}
+	};
 	return {
 		project: projectId,
 		model: ANTIGRAVITY_IMAGE_MODEL,
@@ -10313,7 +10760,7 @@ function buildImageRequest(prompt, projectId, aspectRatio) {
 			}],
 			generationConfig: {
 				responseModalities: ["TEXT", "IMAGE"],
-				...aspectRatio ? { imageConfig: { aspectRatio } } : {}
+				...Object.keys(imageConfig).length > 0 ? { imageConfig } : {}
 			}
 		},
 		requestType: "image_gen",
@@ -10425,7 +10872,7 @@ function createAntigravityImageTool(accountPool, store, attachments, options = {
 	const fetchFn = options.fetchFn ?? fetch;
 	return defineTool({
 		name: ANTIGRAVITY_IMAGE_TOOL_NAME,
-		description: "Generate an image with Gemini image generation through the signed-in Antigravity account. Describe the subject, style, composition and any text to render in the prompt.",
+		description: "Generate an image with Gemini image generation through the signed-in Antigravity account. Describe the subject, style, composition and any text to render in the prompt. Scheduling: a single generation, a change to an image already generated, and a retry of a failed attempt are direct calls from the agent that needs the image — do not create a subagent just to generate one image. Delegate only a task that genuinely needs several alternative directions or complex creative planning, and pass the prompt that comes back to this tool.",
 		parameters: {
 			prompt: {
 				type: "string",
@@ -10435,7 +10882,12 @@ function createAntigravityImageTool(accountPool, store, attachments, options = {
 			aspectRatio: {
 				type: "string",
 				enum: ANTIGRAVITY_IMAGE_ASPECT_RATIOS,
-				description: "Optional aspect ratio. Omit it to let the model choose."
+				description: "Optional aspect ratio, one of the listed values. Omit it to let the model choose. If the upstream rejects the value, re-issue the call with another value from the list rather than the same one."
+			},
+			imageSize: {
+				type: "string",
+				enum: ANTIGRAVITY_IMAGE_SIZES,
+				description: "Optional output size, one of 0.5K, 1K, 2K or 4K. Omit it to let the model choose. It is sent only when given, so it never overrides an aspect ratio the caller did not set."
 			}
 		},
 		output: {
@@ -10519,7 +10971,7 @@ function createAntigravityImageTool(accountPool, store, attachments, options = {
 			const prompt = args.prompt.trim();
 			if (prompt === "") throw new HarnessError("Image prompt cannot be empty.", "ANTIGRAVITY_IMAGE_INVALID_PROMPT");
 			if (options.isEnabled?.() === false) throw new HarnessError("The Antigravity line is switched off; enable it in Settings → Antigravity to generate images.", "ANTIGRAVITY_IMAGE_DISABLED");
-			const response = await requestImage(accountPool, store, fetchFn, prompt, args.aspectRatio, exec.signal);
+			const response = await requestImage(accountPool, store, fetchFn, prompt, args.aspectRatio, args.imageSize, exec.signal);
 			if (response.images.length === 0) throw new HarnessError(noImageMessage(response), "ANTIGRAVITY_IMAGE_EMPTY");
 			const keep = Math.min(MAX_IMAGES_PER_CALL, attachments.imageLimits.maxImagesPerMessage, response.images.length);
 			const saved = [];
@@ -10578,12 +11030,37 @@ async function acquireAccount(accountPool, store, tried, fetchFn) {
 		}
 	}
 }
-async function requestImage(accountPool, store, fetchFn, prompt, aspectRatio, signal) {
+/**
+* Whether a status means the upstream refused the SHAPE of the request rather
+* than the account, the allowance or the transient state of the service.
+*/
+const PARAMETER_REJECTION_STATUSES = /* @__PURE__ */ new Set([400, 422]);
+/**
+* What a failed image request reports: the status, a bounded excerpt of what
+* the upstream said, and — when the refusal was about the request — which
+* optional fields were sent.
+*
+* A parameter rejection is never retried without the field it names. Dropping
+* `aspectRatio` or `imageSize` would answer with an image that silently has a
+* shape nobody asked for, so the caller is told which fields to change and
+* makes that call itself.
+*/
+function imageFailureMessage(status, errorText, sent) {
+	const parts = [`Antigravity image generation failed (${status ?? "no response"}).`];
+	if (status !== void 0 && PARAMETER_REJECTION_STATUSES.has(status)) {
+		const fields = [sent.aspectRatio === void 0 ? void 0 : `aspectRatio "${sent.aspectRatio}"`, sent.imageSize === void 0 ? void 0 : `imageSize "${sent.imageSize}"`].filter((field) => field !== void 0);
+		parts.push(fields.length > 0 ? `The request itself was refused, and these optional fields were what it carried: ${fields.join(", ")}. It is not retried without them: re-issue the call with a different candidate value, or omit the field, because the upstream refused this request shape.` : "The request itself was refused while no aspectRatio or imageSize was set, so a different value for either cannot fix it; change the prompt or check the account before retrying.");
+	}
+	const excerpt = upstreamBodyExcerpt(errorText);
+	if (excerpt !== "") parts.push(`Upstream said: ${excerpt}`);
+	return parts.join(" ");
+}
+async function requestImage(accountPool, store, fetchFn, prompt, aspectRatio, imageSize, signal) {
 	const tried = /* @__PURE__ */ new Set();
 	while (true) {
 		const { account, token, projectId } = await acquireAccount(accountPool, store, tried, fetchFn);
 		tried.add(account.id);
-		const body = JSON.stringify(buildImageRequest(prompt, projectId || "antigravity-default", aspectRatio));
+		const body = JSON.stringify(buildImageRequest(prompt, projectId || "antigravity-default", aspectRatio, imageSize));
 		let response;
 		let firstResponse;
 		for (const endpoint of endpointCandidates()) try {
@@ -10615,7 +11092,10 @@ async function requestImage(accountPool, store, fetchFn, prompt, aspectRatio, si
 			}
 			throw new HarnessError(`Antigravity image generation was rate limited (429) without a stated reset time, so it is handled as a transient rate limit rather than a spent quota. ${upstreamBodyExcerpt(errorText)}`.trim(), "ANTIGRAVITY_IMAGE_RATE_LIMITED");
 		}
-		throw new HarnessError(`Antigravity image generation failed (${status ?? "no response"}).${errorText ? ` ${errorText}` : ""}`, "ANTIGRAVITY_IMAGE_FAILED");
+		throw new HarnessError(imageFailureMessage(status, errorText, {
+			aspectRatio,
+			imageSize
+		}), "ANTIGRAVITY_IMAGE_FAILED");
 	}
 }
 //#endregion
@@ -15123,8 +15603,17 @@ function readableLimitName(value) {
 function isWindow(value) {
 	return value !== null;
 }
+/**
+* The identity a reading is filed under when no pool row names one.
+*
+* The composite local login identity, for the same reason the pool dedupes on it:
+* with several accounts in one composition, a workspace id alone would make two
+* members of that workspace share a slot — each showing the other's numbers. The
+* trailing fallbacks are for a credential that states nothing about itself, which
+* is the single-account case, where there is nobody to mix up.
+*/
 function identityKey(credentials) {
-	return credentials.accountId ?? credentials.email ?? credentials.planType ?? "signed-in";
+	return codexAccountIdentity(credentials) ?? credentials.planType ?? "signed-in";
 }
 //#endregion
 //#region src/host/routes.ts
@@ -27788,6 +28277,25 @@ const TOOL_SOURCE = /(?:^|[-_/])(?:read|view|cat|open|edit|write|patch|apply_pat
 /** 独立开关覆盖的检索工具；只有明确导航任务才允许进入新投影。 */
 const TOOL_RETRIEVAL = /^(?:read|web_fetch|grep|glob)$/;
 /**
+* PTC 家族的**程序传输**工具名（一个集合，两个名字）。
+*
+* 「模型写一段程序、工具调用发生在程序内部」是同一种传输，只是不同预设给主工具起
+* 了不同名字：PTC 预设叫 `run_code`，Code Mode 预设叫 `code_run`。凡是按工具名判断
+* 「这条结果来自程序传输」的地方都必须认这**整个集合**——名字只写一个，预设一换，
+* 大结果的 `ref://` 预览与精确补读就会静默失效。
+*/
+const CACHE_WARMUP_PTC_TRANSPORT_TOOLS = /* @__PURE__ */ new Set(["run_code", "code_run"]);
+/**
+* 这个名字是否属于 PTC 家族的程序传输工具。
+*
+* 只做**精确**匹配：`code_runner` 之类的近似名不算，宁可少投影也不能误伤。
+* @param name - 工具名。
+* @returns 属于 {@link CACHE_WARMUP_PTC_TRANSPORT_TOOLS} 时为 true。
+*/
+function isPtcTransportName(name) {
+	return CACHE_WARMUP_PTC_TRANSPORT_TOOLS.has(name);
+}
+/**
 * 多节/多读输出进入新投影的最小长度门槛（字符）。
 *
 * 短于这个长度、又没有 spill 的普通源码与契约读一律逐字保留：
@@ -29083,7 +29591,7 @@ function planProjection(text, toolName, navigation, retrievalOnly, spilled = fal
 		kind: "verbatim",
 		strategy: "verbatim-contract"
 	};
-	if (toolName === "run_code" && navigation === true) {
+	if (isPtcTransportName(toolName) && navigation === true) {
 		const outline = planRetrievalOutline(text, "read");
 		if (outline !== void 0) return outline;
 		if (retrievalOnly === true) return {
@@ -92344,6 +92852,20 @@ const PRESET_REGISTRY_PACKAGE = "@deepseek-ai/dsh-agent-preset";
 const WORKING_DIRECTORY_PACKAGE = "@deepseek-ai/dsh-working-directory";
 /** The standalone PTC executor introduced when tool presentation split into executor plugins. */
 const PTC_EXECUTOR_PACKAGE = "@deepseek-ai/dsh-tool-executor-ptc";
+/**
+* The native executor this package delegates Code Mode execution to.
+*
+* A program sub-call must run through the harness's own policy, approval, and
+* post-execute pipeline; re-implementing that pipeline is how a plugin silently
+* drops policy. A profile plugin cannot resolve the host's kernel packages, so
+* this package carries the executor as a real dependency and drives the host
+* registry with it.
+*/
+const NATIVE_EXECUTOR_PACKAGE = "@deepseek-ai/dsh-tool-executor-native";
+/** This package's Code Mode row: the preset's own tools stay native, the rest is program-only. */
+const CODEMODE_PACKAGE = "@eddyskywalker/dsh-chatgpt-subscription/codemode";
+/** The deprecated presentation row generations without a native executor keep. */
+const AGENT_TOOL_PRESENTATION_PACKAGE = "@deepseek-ai/dsh-agent-tool-presentation";
 /** The id the `dispatch` preset is selectable under. */
 const DISPATCH_PRESET_ID = "dispatch";
 /**
@@ -92359,7 +92881,7 @@ const DISPATCH_PRESET_ID = "dispatch";
 const DISPATCH_PRESET = {
 	id: DISPATCH_PRESET_ID,
 	name: "调度模式",
-	description: "基于 PTC 模式的调度 Agent：先分诊任务复杂度，L2 任务在规划前先做澄清访谈，再由主代理规划、派发子代理（显式选择子代理模型）、审查与验收。",
+	description: "基于 Code Mode 的调度 Agent：先分诊任务复杂度，L2 任务在规划前先做澄清访谈，再由主代理规划、派发子代理（显式选择子代理模型）、审查与验收。",
 	order: 5,
 	plugins: [
 		{
@@ -92406,6 +92928,7 @@ L0/L1: execute directly (or 1 subagent for L1). L2: R-G, R9, and R6 are mandator
 - Lead-Core: tightly coupled cross-module/contract changes or sequential chains where splitting duplicates reads or causes hand_back loops. -> Implement directly in continuous steps (track in todo_write, no self-briefs) and run R6 verification.
 - Hybrid: unsettled shared contracts/seams plus orthogonal downstream work. -> Implement & freeze core seams yourself first, then delegate orthogonal adapters/tests/noisy exploration per R2/R5 (or subagent_fork for warm-context isolation).
 - Fan-out: >=3 orthogonal subtasks with disjoint files, settled interfaces, and clear parallel/routing gain. -> Coordinate (plan, R2/R5 dispatch, R6 review/acceptance, docs, non-delegable or disjoint parallel modules); never edit an active child's Boundary.
+- [Media generation] Generate/revise/retry images directly; delegate complex creative work, never a bare call.
 
 ## R2 · Model Routing (Check Availability First, Then Decide How to Dispatch)
 Check whether list_subagent_models exists (in PTC mode: tools.list_subagent_models). The tool row and provider/model/reasoning_effort parameters are mounted statically, so they are present even in a session that authorized no route at all. Read that fact instead of inferring it from the tool's output:
@@ -92650,9 +93173,8 @@ Fallback is a task-scoped, non-session-wide exception for delegated briefs: it c
 			}
 		},
 		{
-			id: "tool-presentation",
-			name: "@deepseek-ai/dsh-agent-tool-presentation",
-			config: { mode: "ptc" }
+			id: "code-mode",
+			name: CODEMODE_PACKAGE
 		},
 		{
 			id: "present",
@@ -92676,8 +93198,16 @@ Fallback is a task-scoped, non-session-wide exception for delegated briefs: it c
 * the export is absent; older harnesses keep it because their main entry does not
 * register the tool.
 *
-* When the standalone PTC executor exists, it replaces the deprecated
-* agent-tool-presentation compatibility row and its `{ mode: 'ptc' }` config.
+* Code Mode needs the native tool executor (it is the pipeline the program's
+* sub-calls are delegated to), so that package's presence decides the
+* presentation rows:
+*
+* - resolvable: the `code-mode` row mounts as-is and no PTC executor row exists
+*   beside it (one executor per scope);
+* - absent: the row falls back to the deprecated agent-tool-presentation row and,
+*   when the standalone PTC executor exists, to that executor instead — the
+*   behaviour of every generation before Code Mode.
+*
 * @param resolves - whether a bare specifier resolves in this installation.
 * @returns the preset definition for the running harness generation.
 */
@@ -92685,7 +93215,8 @@ function resolveDispatchPreset(resolves = resolvesFromHere) {
 	const hasWorkingDirectory = resolves(WORKING_DIRECTORY_PACKAGE);
 	const hasLegacyListAgents = resolves("@deepseek-ai/dsh-tool-subagent-control/list-agents");
 	const hasPtcExecutor = resolves(PTC_EXECUTOR_PACKAGE);
-	if (!hasWorkingDirectory && hasLegacyListAgents && !hasPtcExecutor) return DISPATCH_PRESET;
+	const hasNativeExecutor = resolves(NATIVE_EXECUTOR_PACKAGE);
+	if (!hasWorkingDirectory && hasLegacyListAgents && !hasPtcExecutor && hasNativeExecutor) return DISPATCH_PRESET;
 	return {
 		...DISPATCH_PRESET,
 		plugins: DISPATCH_PRESET.plugins.map((row) => {
@@ -92693,14 +93224,14 @@ function resolveDispatchPreset(resolves = resolvesFromHere) {
 				...row,
 				config: row.config.filter((nested) => nested.id !== "tool-subagent-list-agents")
 			};
-			if (row.id === "tool-presentation" && hasPtcExecutor) {
-				const { config: _omitted, ...rest } = row;
-				return {
-					...rest,
-					id: "tool-executor-ptc",
-					name: PTC_EXECUTOR_PACKAGE
-				};
-			}
+			if (row.id === "code-mode" && !hasNativeExecutor) return hasPtcExecutor ? {
+				id: "tool-executor-ptc",
+				name: PTC_EXECUTOR_PACKAGE
+			} : {
+				id: "tool-presentation",
+				name: AGENT_TOOL_PRESENTATION_PACKAGE,
+				config: { mode: "ptc" }
+			};
 			if (row.id !== "persona" || !hasWorkingDirectory || typeof row.config !== "object" || row.config === null) return row;
 			const { suffix: _omitted, ...rest } = row.config;
 			return {
@@ -94577,12 +95108,13 @@ const CACHE_WARMUP_PROVIDER = "kimi-code";
 /**
 * 允许进入结果投影的工具集合。
 *
-* 除了 PTC 的 `run_code`，宿主的独立 Shell 与后台任务输出工具（`win_bash`、
-* `bash`、`pwsh`、`job_output`）同样经常吐出整屏测试/构建日志。源码读取/编辑类
-* 工具（`read`、`edit`、`grep`、`glob`、CodeGraph 等）不在此列，保持 100% 原样。
+* 除了 PTC 家族的程序传输（`run_code` 与 Code Mode 的 `code_run`），宿主的独立
+* Shell 与后台任务输出工具（`win_bash`、`bash`、`pwsh`、`job_output`）同样经常
+* 吐出整屏测试/构建日志。源码读取/编辑类工具（`read`、`edit`、`grep`、`glob`、
+* CodeGraph 等）不在此列，保持 100% 原样。
 */
 const CACHE_WARMUP_SOURCE_TOOLS = /* @__PURE__ */ new Set([
-	"run_code",
+	...CACHE_WARMUP_PTC_TRANSPORT_TOOLS,
 	"win_bash",
 	"bash",
 	"pwsh",
@@ -94599,7 +95131,7 @@ const CACHE_WARMUP_SECTION_NAME = "plugin:cache-warmup";
 const CACHE_WARMUP_GUIDANCE = [
 	"## Result previews",
 	"",
-	"On large `run_code` results this line may replace the output with a preview: a short description plus one or more `ref://<session>/<sha256>` handles.",
+	"On large `run_code`/`code_run` results this line may replace the output with a preview: a short description plus one or more `ref://<session>/<sha256>` handles.",
 	"",
 	"- A preview is **not** the full result. It states `complete`, `omitted` and `nextOffset` explicitly; treat an incomplete preview as incomplete data, not as the whole output.",
 	"- To read the original, call `cache_warmup_result` with `action: \"page\"` and that `refId`, then follow `nextOffset` until `complete` is true.",
@@ -94818,7 +95350,8 @@ function installCacheWarmup(ctx, options) {
 	*
 	* 决策取舍写在代码里，因为它全是「什么时候**不动**」：
 	* - 不是 `accept`（`block` 的 feedback 是别人的东西）；
-	* - 工具名不是 `run_code`、线路不是本线、会话拿不到；
+	* - 工具名不在源工具集合里（`run_code`/`code_run`/Shell/`job_output`）、线路不是
+	*   本线、会话拿不到；
 	* - 没有存储、内容为空。
 	* 上面任何一条成立就原样返回同一个决策对象。
 	*
@@ -94836,7 +95369,7 @@ function installCacheWarmup(ctx, options) {
 		const retrievalTool = CACHE_WARMUP_RETRIEVAL_TOOLS.has(exec.name);
 		if (!sourceTool && !retrievalTool) return decision;
 		const settings = options.settings();
-		const ptcRetrieval = exec.name === "run_code" && settings.retrievalEnabled === true;
+		const ptcRetrieval = isPtcTransportName(exec.name) && settings.retrievalEnabled === true;
 		if (sourceTool && !settings.enabled && !ptcRetrieval) return decision;
 		if (retrievalTool && settings.retrievalEnabled !== true) return decision;
 		const navigation = retrievalTool || ptcRetrieval ? cacheWarmupNavigationIntentOf(exec.agent) : void 0;
@@ -95345,14 +95878,14 @@ const WORKBUDDY_STANDARD_EFFORTS = [
 * Snap a level onto the nearest rung a model's ladder actually exposes.
 *
 * The gateway names a default from a wider vocabulary than the ladder it
-* publishes for the same model: an effort-only entry (minimax-m3, kimi-k3,
-* `glm-5.3` in the cn region) reports `effort: 'medium'` while exposing only
-* `low`/`high`/`max`. Letting that value through is not cosmetic — a default
-* outside the ladder is discarded by the level-resolution step, the request
-* then carries no `reasoning_effort`, and the model returns an EMPTY
-* `reasoning_content` (measured on minimax-m3: 0 characters across three
-* samples, versus 282-659 with the field). Ties resolve upward, which is the
-* mapping the sibling Kimi line documents for `medium`. A ladder that names
+* publishes for the same model: an effort-only entry — the shape `kimi-k3`
+* publishes — names a single default while exposing only `low`/`high`/`max`.
+* Letting an unlisted value through is not cosmetic — a default outside the
+* ladder is discarded by the level-resolution step, the request then carries no
+* `reasoning_effort`, and the model returns an EMPTY `reasoning_content`
+* (measured on `minimax-m3` while that id was still served: 0 characters across
+* three samples, versus 282-659 with the field). Ties resolve upward, which is
+* the mapping the sibling Kimi line documents for `medium`. A ladder that names
 * no level (a text-only model) yields nothing to converge to.
 */
 function convergeWorkBuddyEffort(effort, ladder) {
@@ -95635,96 +96168,27 @@ function refreshSourceForDomain(domain) {
 /**
 * Models the gateway serves but does not publish in `/v3/config`.
 *
-* The catalog is a published list, not the served one: measured on the
-* international backend, `gpt-6-sol`, `gpt-6-luna` and `gemini-3.8-flash` all
-* answer a normal streaming completion with 200 while being absent from
+* The catalog is a published list, not the served one: measured 2026-10-09 on
+* the international backend, `gpt-6-sol`, `gpt-6-luna` and `gemini-3.8-flash`
+* all answered a normal streaming completion with 200 while being absent from
 * `/v3/config` entirely, and a reachable gateway *replaces* the shipped table
-* with that list. Without these rows the picker would simply never show them, so
-* they are declared here and merged into a live catalog too
-* ({@link withUnpublishedModels}) rather than living in the fallback alone.
-*
-* What each row records, and how it was established, differs by field:
-*
-* - **Existence, the reasoning ladder, image support** were measured against the
-*   live endpoint, not inferred from the name. A rejected level answers 400
-*   `code 11133` with `extError` `400002`; `gpt-6-sol` takes exactly the ladder
-*   `gpt-6-astra` publishes (`minimal` refused, `low`/`medium`/`high`/`xhigh`/
-*   `max` accepted) and both accept a 1x1 PNG.
-* - **Context window, output cap and `canDisableThinking` are inherited from the
-*   published sibling in the same family** — `gpt-6-astra` for `gpt-6-sol` and
-*   `gpt-6-luna`, `gemini-3.5-flash` for `gemini-3.8-flash`. They are marked
-*   here rather than measured because the gateway publishes nothing for these
-*   ids and offers no cheap way to read the real figure: it accepts a
-*   `max_tokens` larger than any published window (even for `gpt-6-astra`, whose
-*   own catalog caps at 128000), so the number is neither enforced nor
-*   discoverable from the request side.
-*
-* Every field stays overridable per model from the settings card, and an
-* inherited window errs low rather than high: over-declaring overflows the
-* gateway mid-session, while under-declaring only compresses earlier.
-*/
-const UNPUBLISHED_MODELS = [
-	{
-		id: "gpt-6-sol",
-		name: "GPT-6-Sol",
-		contextWindow: 4e5,
-		maxContextWindow: 1e6,
-		maxTokens: 128e3,
-		regions: ["intl"],
-		supportsImage: true,
-		reasoningEfforts: [
-			"low",
-			"medium",
-			"high",
-			"xhigh",
-			"max"
-		],
-		defaultReasoningEffort: "high",
-		canDisableThinking: true,
-		description: "OpenAI 旗舰模型，擅长复杂推理与长程任务"
-	},
-	{
-		id: "gpt-6-luna",
-		name: "GPT-6-Luna",
-		contextWindow: 4e5,
-		maxContextWindow: 1e6,
-		maxTokens: 128e3,
-		regions: ["intl"],
-		supportsImage: true,
-		reasoningEfforts: [
-			"low",
-			"medium",
-			"high",
-			"xhigh",
-			"max"
-		],
-		defaultReasoningEffort: "high",
-		canDisableThinking: true,
-		description: "OpenAI 轻量模型，响应快速，适合日常任务"
-	},
-	{
-		id: "gemini-3.8-flash",
-		name: "Gemini-3.8-Flash",
-		contextWindow: 1e6,
-		maxContextWindow: 1e6,
-		maxTokens: 65536,
-		regions: ["intl"],
-		supportsImage: true,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
-		],
-		defaultReasoningEffort: "medium",
-		canDisableThinking: false,
-		description: "能力均衡，适合日常使用"
-	}
-];
+* with that list — so a row living only in the fallback would drop out of the
+* picker the moment the catalog loaded.
+*
+* The list is empty as of the 2026-11-04 read: all three ids are published now,
+* with figures measured on the wire, and their rows therefore live in
+* {@link FALLBACK_MODELS} like any other. The seam stays rather than being
+* deleted because the gap it covers belongs to the gateway, not to those three
+* models: the next id it serves without listing belongs here, and
+* {@link withUnpublishedModels} is what keeps such a row offered.
+*/
+const UNPUBLISHED_MODELS = [];
 /**
 * Offline fallback catalog, transcribed from a live `/v3/config` read.
 *
-* Used when the gateway cannot be reached (first run before sign-in, or a
-* network failure); a reachable gateway always wins.
+* Last transcribed 2026-11-04 from both backends. Used when the gateway cannot
+* be reached (first run before sign-in, or a network failure); a reachable
+* gateway always wins.
 */
 const FALLBACK_MODELS$1 = [
 	{
@@ -95740,20 +96204,6 @@ const FALLBACK_MODELS$1 = [
 		canDisableThinking: false,
 		description: "优秀的编码模型，适合日常使用"
 	},
-	{
-		id: "default",
-		name: "Default",
-		contextWindow: 56e3,
-		maxContextWindow: 56e3,
-		maxTokens: 24e3,
-		regions: ["cn"],
-		credits: { cn: "2.00" },
-		supportsImage: false,
-		reasoningEfforts: [],
-		defaultReasoningEffort: null,
-		canDisableThinking: false,
-		description: ""
-	},
 	{
 		id: "fast-model",
 		name: "Fast",
@@ -95768,7 +96218,7 @@ const FALLBACK_MODELS$1 = [
 			"high",
 			"max"
 		],
-		defaultReasoningEffort: "medium",
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
 		description: "响应快，适合简单任务"
 	},
@@ -95786,7 +96236,7 @@ const FALLBACK_MODELS$1 = [
 			"high",
 			"max"
 		],
-		defaultReasoningEffort: "medium",
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
 		description: "速度与质量兼顾，日常工作首选"
 	},
@@ -95809,20 +96259,65 @@ const FALLBACK_MODELS$1 = [
 		description: "高质量输出，胜任复杂任务"
 	},
 	{
-		id: "deep-model",
-		name: "Deep",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 24e3,
+		id: "deepseek-v4.1-flash",
+		name: "Deepseek-V4.1-Flash",
+		contextWindow: 3e5,
+		maxContextWindow: 1e6,
+		maxTokens: 128e3,
+		regions: ["intl", "cn"],
+		credits: {
+			cn: "0.11",
+			intl: "0.00"
+		},
+		supportsImage: true,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: "DeepSeek 旗舰模型，支持 1M 上下文窗口，原生多模态"
+	},
+	{
+		id: "deepseek-v4.1-flash-sg",
+		name: "Deepseek-V4.1-Flash",
+		contextWindow: 3e5,
+		maxContextWindow: 1e6,
+		maxTokens: 128e3,
 		regions: ["intl"],
-		credits: { intl: "3.33" },
+		credits: { intl: "0.03" },
 		supportsImage: true,
-		reasoningEfforts: [],
-		defaultReasoningEffort: null,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "深度推理，适合深度分析与难题"
+		description: "DeepSeek 旗舰模型，支持 1M 上下文窗口，原生多模态"
+	},
+	{
+		id: "glm-5.3-flash",
+		name: "GLM-5.3-Flash",
+		contextWindow: 3e5,
+		maxContextWindow: 1e6,
+		maxTokens: 32e3,
+		regions: ["intl", "cn"],
+		credits: {
+			cn: "0.08",
+			intl: "0.08"
+		},
+		supportsImage: true,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: "原生多模态模型，擅长视觉理解与专业任务"
 	},
-	...UNPUBLISHED_MODELS.filter((model) => model.id === "gpt-6-sol" || model.id === "gpt-6-luna"),
 	{
 		id: "gpt-6-astra",
 		name: "GPT-6-Astra",
@@ -95843,6 +96338,37 @@ const FALLBACK_MODELS$1 = [
 		canDisableThinking: true,
 		description: "OpenAI 旗舰模型，擅长复杂推理与长程任务"
 	},
+	{
+		id: "hy4-preview",
+		name: "Hy4 Preview",
+		contextWindow: 2e5,
+		maxContextWindow: 1e6,
+		maxTokens: 64e3,
+		regions: ["intl"],
+		credits: { intl: "0.29" },
+		supportsImage: true,
+		reasoningEfforts: ["high"],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: "混元思考模型，具有增强的推理能力"
+	},
+	{
+		id: "hy3",
+		name: "Hy3",
+		contextWindow: 192e3,
+		maxContextWindow: 192e3,
+		maxTokens: 64e3,
+		regions: ["intl", "cn"],
+		credits: {
+			cn: "0.00",
+			intl: "0.00"
+		},
+		supportsImage: true,
+		reasoningEfforts: ["low", "high"],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: "混元思考模型，具有增强的推理能力"
+	},
 	{
 		id: "gpt-5.6-sol",
 		name: "GPT-5.6-Sol",
@@ -95949,8 +96475,8 @@ const FALLBACK_MODELS$1 = [
 		maxTokens: 48e3,
 		regions: ["intl", "cn"],
 		credits: {
-			cn: "0.79",
-			intl: "0.79"
+			cn: "0.69",
+			intl: "0.69"
 		},
 		supportsImage: true,
 		reasoningEfforts: [
@@ -95959,30 +96485,9 @@ const FALLBACK_MODELS$1 = [
 			"max"
 		],
 		defaultReasoningEffort: "high",
-		canDisableThinking: true,
+		canDisableThinking: false,
 		description: "能力均衡，适合日常使用"
 	},
-	{
-		id: "glm-5.3-flash",
-		name: "GLM-5.3-Flash",
-		contextWindow: 3e5,
-		maxContextWindow: 1e6,
-		maxTokens: 32e3,
-		regions: ["intl", "cn"],
-		credits: {
-			cn: "0.06",
-			intl: "0.06"
-		},
-		supportsImage: true,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
-		],
-		defaultReasoningEffort: "high",
-		canDisableThinking: true,
-		description: "原生多模态模型，擅长视觉理解与专业任务"
-	},
 	{
 		id: "glm-5.2",
 		name: "GLM-5.2",
@@ -95995,101 +96500,63 @@ const FALLBACK_MODELS$1 = [
 			intl: "0.79"
 		},
 		supportsImage: true,
-		reasoningEfforts: ["high", "xhigh"],
+		reasoningEfforts: ["high"],
 		defaultReasoningEffort: "high",
-		canDisableThinking: true,
+		canDisableThinking: false,
 		description: "1M 上下文，擅长长程任务"
 	},
 	{
-		id: "glm-5.1",
-		name: "GLM-5.1",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 48e3,
-		regions: ["cn"],
-		credits: { cn: "0.79" },
+		id: "minimax-m3.1-flash",
+		name: "MiniMax-M3.1-Flash",
+		contextWindow: 3e5,
+		maxContextWindow: 1e6,
+		maxTokens: 128e3,
+		regions: ["intl", "cn"],
+		credits: {
+			cn: "0.08",
+			intl: "0.08"
+		},
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
+			"medium",
 			"high",
+			"xhigh",
 			"max"
 		],
-		defaultReasoningEffort: "medium",
+		defaultReasoningEffort: "max",
 		canDisableThinking: false,
-		description: ""
+		description: "原生多模态，擅长office、agentic、编程任务，推理速度优异"
 	},
 	{
-		id: "glm-5v-turbo",
-		name: "GLM-5v-Turbo",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 64e3,
-		regions: ["cn"],
-		credits: { cn: "0.71" },
+		id: "kimi-k3.1-pro",
+		name: "Kimi-K3.1-Pro",
+		contextWindow: 3e5,
+		maxContextWindow: 1e6,
+		maxTokens: 32e3,
+		regions: ["intl", "cn"],
+		credits: {
+			cn: "0.97",
+			intl: "0.97"
+		},
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
 			"high",
 			"max"
 		],
-		defaultReasoningEffort: "medium",
-		canDisableThinking: false,
-		description: ""
-	},
-	{
-		id: "glm-5.0",
-		name: "GLM-5.0",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 48e3,
-		regions: ["cn"],
-		credits: { cn: "0.80" },
-		supportsImage: false,
-		reasoningEfforts: [],
-		defaultReasoningEffort: null,
-		canDisableThinking: false,
-		description: ""
-	},
-	{
-		id: "glm-5.0-turbo",
-		name: "GLM-5.0-Turbo",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 48e3,
-		regions: ["cn"],
-		credits: { cn: "0.95" },
-		supportsImage: false,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
-		],
-		defaultReasoningEffort: "medium",
-		canDisableThinking: false,
-		description: ""
-	},
-	{
-		id: "glm-4.7",
-		name: "GLM-4.7",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 48e3,
-		regions: ["cn"],
-		credits: { cn: "0.23" },
-		supportsImage: false,
-		reasoningEfforts: [],
-		defaultReasoningEffort: null,
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: ""
+		description: "Kimi 全新旗舰模型，3万亿级参数。办公、代码、3D 创作与长程 Agent 能力全面升级。"
 	},
 	{
-		id: "glm-4.6v",
-		name: "GLM-4.6V",
-		contextWindow: 128e3,
-		maxContextWindow: 128e3,
+		id: "kimi-k3.1-pro-highspeed",
+		name: "Kimi-K3.1-Pro-Highspeed",
+		contextWindow: 3e5,
+		maxContextWindow: 1e6,
 		maxTokens: 32e3,
-		regions: ["cn"],
-		credits: { cn: "0.11" },
+		regions: ["intl"],
+		credits: { intl: "1.56" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
@@ -96098,21 +96565,7 @@ const FALLBACK_MODELS$1 = [
 		],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: ""
-	},
-	{
-		id: "glm-4.6",
-		name: "GLM-4.6",
-		contextWindow: 168e3,
-		maxContextWindow: 168e3,
-		maxTokens: 32e3,
-		regions: ["cn"],
-		credits: { cn: "0.23" },
-		supportsImage: false,
-		reasoningEfforts: [],
-		defaultReasoningEffort: null,
-		canDisableThinking: false,
-		description: ""
+		description: "K3.1 Pro 高速版本，响应速度提升至 K3.1 Pro 的 2–3 倍，交互更流畅。"
 	},
 	{
 		id: "kimi-k3",
@@ -96128,166 +96581,121 @@ const FALLBACK_MODELS$1 = [
 			"high",
 			"max"
 		],
-		defaultReasoningEffort: "medium",
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
 		description: "擅长处理复杂的长程自主任务，前端开发能力突出，同时在知识工作与科研推理上表现出色。"
 	},
 	{
-		id: "kimi-k3-1",
-		name: "Kimi-K3",
-		contextWindow: 1e6,
-		maxContextWindow: 1e6,
-		maxTokens: 32e3,
-		regions: ["cn"],
-		credits: { cn: "1.62" },
+		id: "grok-4.7",
+		name: "Grok-4.7",
+		contextWindow: 2e5,
+		maxContextWindow: 5e5,
+		maxTokens: 128e3,
+		regions: ["intl"],
+		credits: { intl: "1.90" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
+			"medium",
 			"high",
-			"max"
+			"xhigh"
 		],
-		defaultReasoningEffort: "medium",
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "擅长处理复杂的长程自主任务，前端开发能力突出，同时在知识工作与科研推理上表现出色。"
+		description: "SpaceXAI 打造的前沿模型，专为编程、智能体任务及知识型工作而设计。"
 	},
 	{
-		id: "kimi-k2.8-preview",
-		name: "Kimi-K2.8-Preview",
+		id: "gemini-3.8-flash",
+		name: "Gemini-3.8-Flash",
 		contextWindow: 3e5,
 		maxContextWindow: 1e6,
-		maxTokens: 32e3,
-		regions: ["intl", "cn"],
-		credits: {
-			cn: "0.77",
-			intl: "0.77"
-		},
-		supportsImage: true,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
-		],
-		defaultReasoningEffort: "high",
-		canDisableThinking: true,
-		description: "擅长处理复杂的长程自主任务，前端开发能力突出，同时在知识工作与科研推理上表现出色。"
-	},
-	{
-		id: "kimi-k2.7",
-		name: "Kimi-K2.7-Code",
-		contextWindow: 256e3,
-		maxContextWindow: 256e3,
-		maxTokens: 32e3,
-		regions: ["cn"],
-		credits: { cn: "0.57" },
-		supportsImage: true,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
-		],
-		defaultReasoningEffort: "medium",
-		canDisableThinking: false,
-		description: ""
-	},
-	{
-		id: "kimi-k2.6",
-		name: "Kimi-K2.6",
-		contextWindow: 256e3,
-		maxContextWindow: 256e3,
-		maxTokens: 32e3,
-		regions: ["intl", "cn"],
-		credits: {
-			cn: "0.52",
-			intl: "0.52"
-		},
+		maxTokens: 65536,
+		regions: ["intl"],
+		credits: { intl: "0.95" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
-			"high",
-			"max"
+			"medium",
+			"high"
 		],
 		defaultReasoningEffort: "medium",
 		canDisableThinking: false,
-		description: "多模态模型，适合日常任务"
+		description: "能力均衡，适合日常使用"
 	},
 	{
-		id: "kimi-k2.5",
-		name: "Kimi-K2.5",
-		contextWindow: 164e3,
-		maxContextWindow: 164e3,
-		maxTokens: 32e3,
-		regions: ["cn"],
-		credits: { cn: "0.45" },
+		id: "gpt-6-sol",
+		name: "GPT-6-Sol",
+		contextWindow: 1e6,
+		maxContextWindow: 1e6,
+		maxTokens: 128e3,
+		regions: ["intl"],
+		credits: { intl: "1.33" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
+			"medium",
 			"high",
-			"max"
-		],
-		defaultReasoningEffort: "high",
-		canDisableThinking: false,
-		description: ""
-	},
-	{
-		id: "kimi-k2-thinking",
-		name: "Kimi-K2-Thinking",
-		contextWindow: 164e3,
-		maxContextWindow: 164e3,
-		maxTokens: 32e3,
-		regions: ["cn"],
-		credits: { cn: "0.54" },
-		supportsImage: false,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
+			"xhigh"
 		],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: ""
+		description: "专为复杂编码和智能体工作流构建的模型"
 	},
 	{
-		id: "deepseek-v4.1-flash",
-		name: "Deepseek-V4.1-Flash",
-		contextWindow: 3e5,
+		id: "gpt-6-luna",
+		name: "GPT-6-Luna",
+		contextWindow: 1e6,
 		maxContextWindow: 1e6,
 		maxTokens: 128e3,
-		regions: ["intl", "cn"],
-		credits: {
-			cn: "0.11",
-			intl: "0.00"
-		},
+		regions: ["intl"],
+		credits: { intl: "0.07" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
+			"medium",
 			"high",
-			"max"
+			"xhigh"
 		],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "DeepSeek 旗舰模型，支持 1M 上下文窗口，原生多模态"
+		description: "专为单一聚焦、高吞吐量任务打造的高效模型"
 	},
 	{
-		id: "deepseek-v4.1-flash-sg",
-		name: "Deepseek-V4.1-Flash",
-		contextWindow: 3e5,
+		id: "gpt-6.1-sol",
+		name: "GPT-6.1-Sol",
+		contextWindow: 272e3,
 		maxContextWindow: 1e6,
 		maxTokens: 128e3,
 		regions: ["intl"],
-		credits: { intl: "0.03" },
+		credits: { intl: "1.33" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
+			"medium",
 			"high",
-			"max"
+			"xhigh"
 		],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "DeepSeek 旗舰模型，支持 1M 上下文窗口，原生多模态"
+		description: "专为复杂编码和智能体工作流构建的模型"
+	},
+	{
+		id: "default",
+		name: "Default",
+		contextWindow: 56e3,
+		maxContextWindow: 56e3,
+		maxTokens: 24e3,
+		regions: ["cn"],
+		credits: { cn: "2.00" },
+		supportsImage: false,
+		reasoningEfforts: [],
+		defaultReasoningEffort: null,
+		canDisableThinking: false,
+		description: ""
 	},
 	{
 		id: "deepseek-v4-pro",
-		name: "Deepseek-V4-Pro",
+		name: "DeepSeek-V4-Pro",
 		contextWindow: 1e6,
 		maxContextWindow: 1e6,
 		maxTokens: 128e3,
@@ -96340,52 +96748,190 @@ const FALLBACK_MODELS$1 = [
 		description: ""
 	},
 	{
-		id: "hy4-preview",
-		name: "Hy4 preview",
+		id: "minimax-m2.5",
+		name: "MiniMax-M2.5",
 		contextWindow: 2e5,
-		maxContextWindow: 1e6,
-		maxTokens: 64e3,
-		regions: ["intl", "cn"],
-		credits: {
-			cn: "0.29",
-			intl: "0.29"
-		},
+		maxContextWindow: 2e5,
+		maxTokens: 48e3,
+		regions: ["cn"],
+		credits: { cn: "0.18" },
+		supportsImage: false,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: ""
+	},
+	{
+		id: "minimax-m2.7",
+		name: "MiniMax-M2.7",
+		contextWindow: 2e5,
+		maxContextWindow: 2e5,
+		maxTokens: 48e3,
+		regions: ["cn"],
+		credits: { cn: "0.19" },
 		supportsImage: true,
-		reasoningEfforts: ["high"],
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "混元思考模型，具有增强的推理能力"
+		description: ""
 	},
 	{
-		id: "hy4-preview-f",
-		name: "Hy4 preview",
+		id: "glm-5.0",
+		name: "GLM-5.0",
+		contextWindow: 2e5,
+		maxContextWindow: 2e5,
+		maxTokens: 48e3,
+		regions: ["cn"],
+		credits: { cn: "0.80" },
+		supportsImage: false,
+		reasoningEfforts: [],
+		defaultReasoningEffort: null,
+		canDisableThinking: false,
+		description: ""
+	},
+	{
+		id: "glm-5.0-turbo",
+		name: "GLM-5.0-Turbo",
+		contextWindow: 2e5,
+		maxContextWindow: 2e5,
+		maxTokens: 48e3,
+		regions: ["cn"],
+		credits: { cn: "0.95" },
+		supportsImage: false,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: ""
+	},
+	{
+		id: "glm-4.7",
+		name: "GLM-4.7",
+		contextWindow: 2e5,
+		maxContextWindow: 2e5,
+		maxTokens: 48e3,
+		regions: ["cn"],
+		credits: { cn: "0.23" },
+		supportsImage: false,
+		reasoningEfforts: [],
+		defaultReasoningEffort: null,
+		canDisableThinking: false,
+		description: ""
+	},
+	{
+		id: "glm-4.6",
+		name: "GLM-4.6",
+		contextWindow: 168e3,
+		maxContextWindow: 168e3,
+		maxTokens: 32e3,
+		regions: ["cn"],
+		credits: { cn: "0.23" },
+		supportsImage: false,
+		reasoningEfforts: [],
+		defaultReasoningEffort: null,
+		canDisableThinking: false,
+		description: ""
+	},
+	{
+		id: "glm-4.6v",
+		name: "GLM-4.6V",
+		contextWindow: 128e3,
+		maxContextWindow: 128e3,
+		maxTokens: 32e3,
+		regions: ["cn"],
+		credits: { cn: "0.11" },
+		supportsImage: true,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: ""
+	},
+	{
+		id: "kimi-k3-1",
+		name: "Kimi-K3",
 		contextWindow: 1e6,
 		maxContextWindow: 1e6,
-		maxTokens: 64e3,
+		maxTokens: 32e3,
 		regions: ["cn"],
-		credits: { cn: "0.00" },
+		credits: { cn: "1.62" },
 		supportsImage: true,
-		reasoningEfforts: ["high"],
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "混元思考模型，具有增强的推理能力"
+		description: "擅长处理复杂的长程自主任务，前端开发能力突出，同时在知识工作与科研推理上表现出色。"
 	},
 	{
-		id: "hy3",
-		name: "Hy3",
-		contextWindow: 192e3,
-		maxContextWindow: 192e3,
+		id: "kimi-k2.8-preview",
+		name: "Kimi-K2.8-Preview",
+		contextWindow: 1e6,
+		maxContextWindow: 1e6,
 		maxTokens: 64e3,
-		regions: ["intl", "cn"],
-		credits: {
-			cn: "0.00",
-			intl: "0.00"
-		},
+		regions: ["cn"],
+		credits: { cn: "0.77" },
 		supportsImage: true,
-		reasoningEfforts: ["low", "high"],
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
+		canDisableThinking: true,
+		description: "Moonshot AI · 擅长复杂长程自主任务、知识工作与科研推理，前端开发突出"
+	},
+	{
+		id: "kimi-k2.5",
+		name: "Kimi-K2.5",
+		contextWindow: 164e3,
+		maxContextWindow: 164e3,
+		maxTokens: 32e3,
+		regions: ["cn"],
+		credits: { cn: "0.45" },
+		supportsImage: true,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "混元思考模型，具有增强的推理能力"
+		description: ""
+	},
+	{
+		id: "kimi-k2-thinking",
+		name: "Kimi-K2-Thinking",
+		contextWindow: 164e3,
+		maxContextWindow: 164e3,
+		maxTokens: 32e3,
+		regions: ["cn"],
+		credits: { cn: "0.54" },
+		supportsImage: false,
+		reasoningEfforts: [
+			"low",
+			"high",
+			"max"
+		],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: ""
 	},
 	{
 		id: "hy3-x",
@@ -96405,6 +96951,20 @@ const FALLBACK_MODELS$1 = [
 		canDisableThinking: false,
 		description: "混元思考模型，具有增强的推理能力"
 	},
+	{
+		id: "hy4-preview-x",
+		name: "Hy4 preview",
+		contextWindow: 1e6,
+		maxContextWindow: 1e6,
+		maxTokens: 64e3,
+		regions: ["cn"],
+		credits: { cn: "0.29" },
+		supportsImage: true,
+		reasoningEfforts: ["high"],
+		defaultReasoningEffort: "high",
+		canDisableThinking: false,
+		description: "混元思考模型，具有增强的推理能力"
+	},
 	{
 		id: "hunyuan-chat",
 		name: "Hunyuan-Turbos",
@@ -96440,77 +97000,68 @@ const FALLBACK_MODELS$1 = [
 		description: "推理速度极快，编码能力强劲，并支持原生多模态输入的匿名大模型"
 	},
 	{
-		id: "minimax-m3",
-		name: "MiniMax-M3",
-		contextWindow: 512e3,
-		maxContextWindow: 512e3,
+		id: "step-5-preview",
+		name: "Step-5-Preview",
+		contextWindow: 1e6,
+		maxContextWindow: 1e6,
 		maxTokens: 64e3,
 		regions: ["cn"],
-		credits: { cn: "0.25" },
+		credits: { cn: "0.33" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
-			"high",
-			"max"
+			"medium",
+			"high"
 		],
-		defaultReasoningEffort: "medium",
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "原生多模态，擅长代码、智能体任务"
+		description: "阶跃 StepFun 面向真实任务的新一代旗舰基模"
 	},
 	{
-		id: "minimax-m2.7",
-		name: "MiniMax-M2.7",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 48e3,
+		id: "mimo-v2.6-pro",
+		name: "Xiaomi MiMo-V2.6-Pro",
+		contextWindow: 1e6,
+		maxContextWindow: 1e6,
+		maxTokens: 128e3,
 		regions: ["cn"],
-		credits: { cn: "0.19" },
+		credits: { cn: "0.13" },
 		supportsImage: true,
 		reasoningEfforts: [
 			"low",
 			"high",
 			"max"
 		],
-		defaultReasoningEffort: "medium",
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: ""
+		description: "Xiaomi · 旗舰推理模型，面向专业、复杂长程工作流，兼顾高阶科研与网络安全"
 	},
 	{
-		id: "minimax-m2.5",
-		name: "MiniMax-M2.5",
-		contextWindow: 2e5,
-		maxContextWindow: 2e5,
-		maxTokens: 48e3,
+		id: "hy4free",
+		name: "Hy4 Free",
+		contextWindow: 1e6,
+		maxContextWindow: 1e6,
+		maxTokens: 64e3,
 		regions: ["cn"],
-		credits: { cn: "0.18" },
-		supportsImage: false,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
-		],
+		credits: { cn: "0.00" },
+		supportsImage: true,
+		reasoningEfforts: ["high"],
 		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: ""
+		description: "最新旗舰模型，Agent与多模专长"
 	},
-	...UNPUBLISHED_MODELS.filter((model) => model.id === "gemini-3.8-flash"),
 	{
-		id: "gemini-3.5-flash",
-		name: "Gemini-3.5-Flash",
+		id: "hy4std",
+		name: "Hy4",
 		contextWindow: 1e6,
 		maxContextWindow: 1e6,
-		maxTokens: 65536,
-		regions: ["intl"],
-		credits: { intl: "0.99" },
+		maxTokens: 64e3,
+		regions: ["cn"],
+		credits: { cn: "0.29" },
 		supportsImage: true,
-		reasoningEfforts: [
-			"low",
-			"high",
-			"max"
-		],
-		defaultReasoningEffort: "medium",
+		reasoningEfforts: ["high"],
+		defaultReasoningEffort: "high",
 		canDisableThinking: false,
-		description: "能力均衡，适合日常使用"
+		description: "最新旗舰模型，Agent与多模专长"
 	}
 ];
 /**
@@ -96522,11 +97073,41 @@ const FALLBACK_MODELS$1 = [
 * the account's region can actually call.
 */
 const DEFAULT_VISIBLE_MODEL_IDS$1 = [
+	"glm-5.3",
+	"deepseek-v4.1-flash",
+	"hy4std",
+	"kimi-k3.1-pro"
+];
+/**
+* Default selections this table used to ship.
+*
+* "Never edited" is recognised by matching the CURRENT shipped set, so replacing
+* the set outright would turn every existing install into what looks like a user
+* who hand-picked a short list — and the picker would quietly narrow to it,
+* because the 2026-11-04 refresh dropped two of the retired ids outright
+* (`kimi-k2.6` is gone from both regions, `hy4-preview` is intl-only now).
+* Keeping the retired sets here is what lets the default move without that.
+*/
+const RETIRED_DEFAULT_SELECTIONS = [[
 	"glm-5.3",
 	"deepseek-v4.1-flash",
 	"hy4-preview",
 	"kimi-k2.6"
-];
+]];
+/**
+* Whether a stored selection is still a shipped default, i.e. the user never
+* touched the picker.
+*
+* Same size and same members, not order-sensitive: the card writes the list in
+* catalog order, which one default can spell two ways.
+*/
+function isUntouchedModelSelection(stored) {
+	if (stored.length === 0) return false;
+	return [DEFAULT_VISIBLE_MODEL_IDS$1, ...RETIRED_DEFAULT_SELECTIONS].some((shipped) => {
+		const known = new Set(shipped);
+		return stored.length === known.size && stored.every((id) => known.has(id));
+	});
+}
 /** Every id the fallback knows, in declaration order. */
 const WORKBUDDY_MODEL_IDS = FALLBACK_MODELS$1.map((model) => model.id);
 /**
@@ -96631,6 +97212,18 @@ const WORKBUDDY_VENDOR_RULES = [
 		re: /^minimax-/,
 		family: "minimax"
 	},
+	{
+		re: /^mimo-/,
+		family: "xiaomi"
+	},
+	{
+		re: /^step-/,
+		family: "stepfun"
+	},
+	{
+		re: /^grok-/,
+		family: "xai"
+	},
 	{
 		re: /^space-bunny$/,
 		family: "space-bunny"
@@ -100552,8 +101145,7 @@ function isPoolPausedError(error) {
 */
 function resolveEnabledModelIds$2(stored, available, enabled = true) {
 	if (!enabled) return [];
-	const shippedDefaults = new Set(DEFAULT_VISIBLE_MODEL_IDS$1);
-	if (stored.length > 0 && stored.length === shippedDefaults.size && stored.every((id) => shippedDefaults.has(id))) return [...available];
+	if (isUntouchedModelSelection(stored)) return [...available];
 	const known = new Set(available);
 	return stored.filter((id) => known.has(id));
 }
@@ -102220,8 +102812,7 @@ async function readRequestJson(request) {
 */
 function resolveEnabledModelIds$1(stored, available, enabled = true) {
 	if (!enabled) return [];
-	const shippedDefaults = new Set(DEFAULT_VISIBLE_MODEL_IDS$1);
-	if (stored.length > 0 && stored.length === shippedDefaults.size && stored.every((id) => shippedDefaults.has(id))) return [...available];
+	if (isUntouchedModelSelection(stored)) return [...available];
 	const known = new Set(available);
 	return stored.filter((id) => known.has(id));
 }