@p4code/cli 0.6.51 → 0.6.53

package/dist/bin.mjs

@@ -263,7 +263,7 @@ const make$123 = () => {
 const layer$124 = Layer.sync(NetService, make$123);
 //#endregion
 //#region package.json
-var version$1 = "0.6.51";
+var version$1 = "0.6.53";
 //#endregion
 //#region ../../packages/shared/src/serverInstance.ts
 /**
@@ -7950,9 +7950,18 @@ const RESET_CREDIT_IDEMPOTENCY_KEY_MAX_LENGTH = 128;
 * the request never produced an answer - the provider may or may not have
 * acted, so retrying with the same `idempotencyKey` is the safe next step.
 */
+/** A Codex account a usage source pools, named by the source and the source's account id. */
+const UsageLimitSourceAccountRef = Schema$1.Struct({
+	sourceId: UsageLimitSourceId,
+	accountId: TrimmedNonEmptyString
+});
+/** Whose reset credit: a native provider instance, or an account a usage source pools. */
+const ResetCreditTarget = Schema$1.Union([Schema$1.Struct({ instanceId: ProviderInstanceId }), Schema$1.Struct({ sourceAccount: UsageLimitSourceAccountRef })]);
 const ProviderResetCreditAttempt = Schema$1.Struct({
 	idempotencyKey: TrimmedNonEmptyString,
-	instanceId: ProviderInstanceId,
+	/** Set for a native instance's attempt; `sourceAccount` is set instead for a pooled account. */
+	instanceId: Schema$1.optional(ProviderInstanceId),
+	sourceAccount: Schema$1.optional(UsageLimitSourceAccountRef),
 	/** The credit this attempt named, fixed at its first try so a retry cannot switch credits. */
 	creditId: Schema$1.optional(TrimmedNonEmptyString),
 	requestedAt: IsoDateTime,
@@ -7960,15 +7969,27 @@ const ProviderResetCreditAttempt = Schema$1.Struct({
 	detail: Schema$1.optional(TrimmedNonEmptyString),
 	completedAt: Schema$1.optional(IsoDateTime)
 });
-const ConsumeProviderResetCreditInput = Schema$1.Struct({
-	instanceId: ProviderInstanceId,
+const ConsumeProviderResetCreditFields = {
 	/** One logical attempt; resend the same key to retry it without spending twice. */
 	idempotencyKey: TrimmedNonEmptyString.check(Schema$1.isMaxLength(RESET_CREDIT_IDEMPOTENCY_KEY_MAX_LENGTH)),
-	/** The credit the client was shown; omitted lets the provider pick the next one. */
+	/**
+	* The credit the client was shown; omitted lets the provider pick the next
+	* one. Required for a pooled account, whose source may since hold another
+	* login: naming the credit makes Codex refuse instead of spending its reset.
+	*/
 	creditId: Schema$1.optional(TrimmedNonEmptyString)
-});
-var ProviderResetCreditError = class extends Schema$1.TaggedErrorClass()("ProviderResetCreditError", {
+};
+const ConsumeProviderResetCreditInput = Schema$1.Union([Schema$1.Struct({
 	instanceId: ProviderInstanceId,
+	...ConsumeProviderResetCreditFields
+}), Schema$1.Struct({
+	sourceAccount: UsageLimitSourceAccountRef,
+	...ConsumeProviderResetCreditFields,
+	creditId: TrimmedNonEmptyString
+})]);
+var ProviderResetCreditError = class extends Schema$1.TaggedErrorClass()("ProviderResetCreditError", {
+	instanceId: Schema$1.optionalKey(ProviderInstanceId),
+	sourceAccount: Schema$1.optionalKey(UsageLimitSourceAccountRef),
 	detail: Schema$1.String,
 	/** True once the request reached Codex, so a reset may have been used. */
 	consumeSent: Schema$1.optionalKey(Schema$1.Boolean),
@@ -16276,17 +16297,18 @@ const WsServerGetProviderUsageRpc = Rpc.make(WS_METHODS.serverGetProviderUsage,
 	error: Schema$1.Union([TextGenerationError, EnvironmentAuthorizationError])
 });
 /**
-* Redeem one of the account's banked reset credits. Only providers that can
-* redeem natively answer; the rest fail with `ProviderResetCreditError`.
+* Redeem one of the account's banked reset credits: natively for a Codex
+* instance, or through the usage source for a pooled Codex account. Anything
+* else fails with `ProviderResetCreditError`.
 */
 const WsServerConsumeProviderResetCreditRpc = Rpc.make(WS_METHODS.serverConsumeProviderResetCredit, {
 	payload: ConsumeProviderResetCreditInput,
 	success: Schema$1.Struct({ attempt: ProviderResetCreditAttempt }),
 	error: Schema$1.Union([ProviderResetCreditError, EnvironmentAuthorizationError])
 });
-/** Redemptions started through P4 for one instance, newest first. */
+/** Redemptions started through P4 for one instance or pooled account, newest first. */
 const WsServerListProviderResetCreditAttemptsRpc = Rpc.make(WS_METHODS.serverListProviderResetCreditAttempts, {
-	payload: Schema$1.Struct({ instanceId: ProviderInstanceId }),
+	payload: ResetCreditTarget,
 	success: Schema$1.Struct({ attempts: Schema$1.Array(ProviderResetCreditAttempt) }),
 	error: Schema$1.Union([ProviderResetCreditError, EnvironmentAuthorizationError])
 });
@@ -33511,7 +33533,7 @@ const ManifestFile = Schema$1.Struct({
 	directories: Schema$1.Record(Schema$1.String, Schema$1.Array(ManifestEntry))
 });
 const ManifestFileFromJson = Schema$1.fromJsonString(ManifestFile);
-const decodeManifest$1 = Schema$1.decodeUnknownEffect(ManifestFileFromJson);
+const decodeManifest = Schema$1.decodeUnknownEffect(ManifestFileFromJson);
 const encodeManifest = Schema$1.encodeEffect(ManifestFileFromJson);
 const EMPTY = {
 	version: 1,
@@ -33528,7 +33550,7 @@ const EMPTY = {
 const readSkillManifest = Effect.fn("skillManifest.read")(function* (manifestPath) {
 	const raw = yield* (yield* FileSystem.FileSystem).readFileString(manifestPath).pipe(Effect.orElseSucceed(() => void 0));
 	if (raw === void 0) return EMPTY;
-	return yield* decodeManifest$1(raw).pipe(Effect.orElseSucceed(() => EMPTY));
+	return yield* decodeManifest(raw).pipe(Effect.orElseSucceed(() => EMPTY));
 });
 const entriesFor = (manifest, skillsRoot) => manifest.directories[skillsRoot] ?? [];
 const withEntriesFor = (manifest, skillsRoot, entries) => ({
@@ -37146,7 +37168,7 @@ function collectForkedAttachmentCopies(threadId, rows) {
 	}
 	return copies;
 }
-function isRecord$6(value) {
+function isRecord$7(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 /**
@@ -37157,7 +37179,7 @@ function isRecord$6(value) {
 function buildForkedProviderBinding(threadId, source) {
 	if (source === void 0) return { rejection: "no-binding" };
 	if (!FORKABLE_PROVIDERS.has(source.provider)) return { rejection: "provider-cannot-fork" };
-	if (!isRecord$6(source.resumeCursor) || typeof source.resumeCursor.resume !== "string") return { rejection: "no-resume-cursor" };
+	if (!isRecord$7(source.resumeCursor) || typeof source.resumeCursor.resume !== "string") return { rejection: "no-resume-cursor" };
 	return { binding: {
 		threadId,
 		provider: source.provider,
@@ -62754,18 +62776,18 @@ function deriveToolActivityPresentation(input) {
 }
 //#endregion
 //#region src/provider/acp/AcpRuntimeModel.ts
-function isRecord$5(value) {
+function isRecord$6(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isSessionModelState(value) {
-	if (!isRecord$5(value) || typeof value.currentModelId !== "string") return false;
+	if (!isRecord$6(value) || typeof value.currentModelId !== "string") return false;
 	if (!Array.isArray(value.availableModels)) return false;
-	return value.availableModels.every((model) => isRecord$5(model) && typeof model.modelId === "string" && typeof model.name === "string" && (model.description === void 0 || model.description === null || typeof model.description === "string"));
+	return value.availableModels.every((model) => isRecord$6(model) && typeof model.modelId === "string" && typeof model.name === "string" && (model.description === void 0 || model.description === null || typeof model.description === "string"));
 }
 function isSessionModeState(value) {
-	if (!isRecord$5(value) || typeof value.currentModeId !== "string") return false;
+	if (!isRecord$6(value) || typeof value.currentModeId !== "string") return false;
 	if (!Array.isArray(value.availableModes)) return false;
-	return value.availableModes.every((mode) => isRecord$5(mode) && typeof mode.id === "string" && typeof mode.name === "string" && (mode.description === void 0 || typeof mode.description === "string"));
+	return value.availableModes.every((mode) => isRecord$6(mode) && typeof mode.id === "string" && typeof mode.name === "string" && (mode.description === void 0 || typeof mode.description === "string"));
 }
 function extractModelConfigId(sessionResponse) {
 	const configOptions = sessionResponse.configOptions;
@@ -62841,7 +62863,7 @@ function extractCommandFromTitle(title) {
 	return /`([^`]+)`/.exec(title)?.[1]?.trim() || void 0;
 }
 function extractToolCallCommand(rawInput, title) {
-	if (isRecord$5(rawInput)) {
+	if (isRecord$6(rawInput)) {
 		const directCommand = normalizeCommandValue(rawInput.command);
 		if (directCommand) return directCommand;
 		const executable = typeof rawInput.executable === "string" ? rawInput.executable.trim() : "";
@@ -62963,7 +62985,7 @@ function parsePermissionRequest(params) {
 }
 function sessionUpdateIsReplay(params) {
 	const meta = params._meta;
-	return isRecord$5(meta) && meta.isReplay === true;
+	return isRecord$6(meta) && meta.isReplay === true;
 }
 const waitForSessionLoadReplayIdle = (input) => Effect.gen(function* () {
 	const pollInterval = Duration.millis(25);
@@ -62978,8 +63000,8 @@ const waitForSessionLoadReplayIdle = (input) => Effect.gen(function* () {
 });
 function syntheticLoadSessionResponseFromInitialize(initializeResult) {
 	const meta = initializeResult._meta;
-	const modelState = isRecord$5(meta) ? meta.modelState : void 0;
-	const modeState = isRecord$5(meta) ? meta.modeState : void 0;
+	const modelState = isRecord$6(meta) ? meta.modelState : void 0;
+	const modeState = isRecord$6(meta) ? meta.modeState : void 0;
 	const models = isSessionModelState(modelState) ? modelState : void 0;
 	const modes = isSessionModeState(modeState) ? modeState : void 0;
 	return {
@@ -67083,24 +67105,426 @@ function hasValidClaudeManifestAdapters(manifest) {
 	return Object.values(catalog.profiles).every((profile) => Option.isSome(decodeClaudeProfileAdapter(profile.adapter ?? {}))) && catalog.models.every((model) => Option.isSome(decodeClaudeModelAdapter(model.adapter ?? {})));
 }
 //#endregion
+//#region src/usage/usageSourceHttp.ts
+const MAX_RESPONSE_BYTES$1 = 1024 * 1024;
+const LOOPBACK_HOSTS$1 = /* @__PURE__ */ new Set([
+	"localhost",
+	"127.0.0.1",
+	"[::1]"
+]);
+/** The management key stays on the configured origin, including redirects. */
+async function readManagementJson(config, path, body, signal) {
+	const base = new URL(config.url);
+	if (base.username || base.password || base.search || base.hash || base.protocol !== "https:" && !(base.protocol === "http:" && LOOPBACK_HOSTS$1.has(base.hostname))) throw new Error("Invalid usage source origin");
+	if (path !== "auth-files" && path !== "api-call" && !/^model-definitions\/[a-z0-9-]+$/.test(path)) throw new Error("Unsupported management operation");
+	const response = await fetch(new URL(`/v0/management/${path}`, base), {
+		method: body === void 0 ? "GET" : "POST",
+		redirect: "error",
+		signal,
+		headers: {
+			authorization: `Bearer ${config.managementKey}`,
+			"content-type": "application/json"
+		},
+		...body === void 0 ? {} : { body: JSON.stringify(body) }
+	});
+	if (!response.ok || !response.body) {
+		await response.body?.cancel();
+		throw new UsageLimitSourceError({ detail: response.status === 401 || response.status === 403 ? `The usage source rejected its management key (HTTP ${response.status}). Edit the source under Usage sources to update the management key; a provider API key cannot replace it.` : `The usage source management request failed (HTTP ${response.status}). Check the source URL and management API availability.` });
+	}
+	const reader = response.body.getReader();
+	const chunks = [];
+	let total = 0;
+	try {
+		for (;;) {
+			const chunk = await reader.read();
+			if (chunk.done) break;
+			total += chunk.value.byteLength;
+			if (total > MAX_RESPONSE_BYTES$1) throw new Error("Usage source response too large");
+			chunks.push(chunk.value);
+		}
+		return JSON.parse(Buffer.concat(chunks).toString("utf8"));
+	} finally {
+		await reader.cancel().catch(() => void 0);
+		reader.releaseLock();
+	}
+}
+//#endregion
+//#region src/provider/externalModelCatalog.ts
+/**
+* External model list folded over the bundled manifest. Sources in order: the
+* user's CLIProxyAPI (CPA) usage source, models.dev, then OpenRouter. Each
+* provider comes from the first source that lists it.
+*
+* The external list decides which Anthropic, OpenAI and Google models exist,
+* their names, context sizes and which one is current in each family. The
+* bundled manifest keeps what only P4 Code knows: Claude Code option profiles
+* (ultracode, effort mapping), minimum CLI versions, aliases and Antigravity's
+* effort-suffixed slugs. A model the bundle does not know yet inherits the
+* newest bundled model of its family.
+*/
+const MODELS_DEV_URL = "https://models.dev/api.json";
+const OPENROUTER_MODELS_URL = "https://openrouter.ai/api/v1/models";
+const ExternalProvider = Schema$1.Literals([
+	"anthropic",
+	"openai",
+	"google"
+]);
+const EXTERNAL_PROVIDERS = [
+	"anthropic",
+	"openai",
+	"google"
+];
+/** CPA `model-definitions` channels per provider. Its Google channels trail models.dev. */
+const CPA_CHANNELS = [
+	{
+		provider: "anthropic",
+		channel: "claude"
+	},
+	{
+		provider: "openai",
+		channel: "codex-pro"
+	},
+	{
+		provider: "openai",
+		channel: "codex-plus"
+	},
+	{
+		provider: "openai",
+		channel: "codex-team"
+	},
+	{
+		provider: "openai",
+		channel: "codex-free"
+	}
+];
+const ExternalModel = Schema$1.Struct({
+	provider: ExternalProvider,
+	id: Schema$1.String,
+	name: Schema$1.String,
+	family: Schema$1.String,
+	/** ISO date; the newest model of a family is its current one. */
+	releaseDate: Schema$1.optional(Schema$1.String),
+	contextTokens: Schema$1.optional(Schema$1.Number),
+	/** Effort levels the model accepts, when the source lists them. */
+	effort: Schema$1.optional(Schema$1.Array(Schema$1.String)),
+	/** Whether a fast mode exists, when the source says. */
+	fastMode: Schema$1.optional(Schema$1.Boolean)
+});
+const isRecord$5 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const stringOr = (value) => typeof value === "string" && value.trim() !== "" ? value.trim() : void 0;
+const numberOr = (value) => typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
+/** Coding agents only run tool-calling models that answer in text; image, audio and TTS models share families with them. */
+const isTextOnly = (modalities) => Array.isArray(modalities) && modalities.length === 1 && modalities[0] === "text";
+/** Family of a model id with its version tokens removed: `claude-opus-5-5` is `claude-opus`. */
+function familyOf(id) {
+	return id.split("-").filter((token) => !/^\d+(\.\d+)*$/.test(token)).join("-");
+}
+/** Parse one CPA `/v0/management/model-definitions/:channel` response. */
+function parseCpaModelDefinitions(json, provider) {
+	if (!isRecord$5(json) || !Array.isArray(json.models)) return [];
+	return json.models.flatMap((raw) => {
+		if (!isRecord$5(raw)) return [];
+		const id = stringOr(raw.id);
+		const output = raw.supportedOutputModalities;
+		if (!id || output !== void 0 && !isTextOnly(output)) return [];
+		const created = numberOr(raw.created);
+		const contextTokens = numberOr(raw.context_length) ?? numberOr(raw.inputTokenLimit);
+		const levels = isRecord$5(raw.thinking) ? raw.thinking.levels : void 0;
+		return [{
+			provider,
+			id,
+			name: stringOr(raw.display_name) ?? id,
+			family: familyOf(id),
+			...created ? { releaseDate: (/* @__PURE__ */ new Date(created * 1e3)).toISOString() } : {},
+			...contextTokens ? { contextTokens } : {},
+			...Array.isArray(levels) ? { effort: levels.filter((level) => typeof level === "string") } : {}
+		}];
+	});
+}
+/** Parse `https://models.dev/api.json`; null when it lists none of our providers. */
+function parseModelsDev(json) {
+	if (!isRecord$5(json)) return null;
+	const models = [];
+	for (const provider of EXTERNAL_PROVIDERS) {
+		const entry = json[provider];
+		if (!isRecord$5(entry) || !isRecord$5(entry.models)) continue;
+		for (const raw of Object.values(entry.models)) {
+			if (!isRecord$5(raw)) continue;
+			const id = stringOr(raw.id);
+			const output = isRecord$5(raw.modalities) ? raw.modalities.output : void 0;
+			if (!id || raw.tool_call !== true || !isTextOnly(output)) continue;
+			const effort = Array.isArray(raw.reasoning_options) ? raw.reasoning_options.find((option) => isRecord$5(option) && option.type === "effort") : void 0;
+			const effortValues = isRecord$5(effort) && Array.isArray(effort.values) ? effort.values.filter((value) => typeof value === "string") : void 0;
+			const modes = isRecord$5(raw.experimental) ? raw.experimental.modes : void 0;
+			const releaseDate = stringOr(raw.release_date);
+			const contextTokens = isRecord$5(raw.limit) ? numberOr(raw.limit.context) : void 0;
+			models.push({
+				provider,
+				id,
+				name: stringOr(raw.name) ?? id,
+				family: stringOr(raw.family) ?? familyOf(id),
+				...releaseDate ? { releaseDate } : {},
+				...contextTokens ? { contextTokens } : {},
+				...effortValues ? { effort: effortValues } : {},
+				fastMode: isRecord$5(modes) && modes.fast !== void 0
+			});
+		}
+	}
+	return models.length > 0 ? models : null;
+}
+/** Parse `https://openrouter.ai/api/v1/models`; null when it lists none of our providers. */
+function parseOpenRouter(json) {
+	if (!isRecord$5(json) || !Array.isArray(json.data)) return null;
+	const models = [];
+	for (const raw of json.data) {
+		if (!isRecord$5(raw)) continue;
+		const fullId = stringOr(raw.id);
+		if (!fullId || fullId.includes(":")) continue;
+		const output = isRecord$5(raw.architecture) ? raw.architecture.output_modalities : void 0;
+		const parameters = Array.isArray(raw.supported_parameters) ? raw.supported_parameters : [];
+		if (!isTextOnly(output) || !parameters.includes("tools")) continue;
+		const [prefix, rawId] = fullId.split("/", 2);
+		const provider = EXTERNAL_PROVIDERS.find((candidate) => candidate === prefix);
+		if (!provider || !rawId) continue;
+		const id = provider === "anthropic" ? rawId.replace(/(\d)\.(\d)/g, "$1-$2") : rawId;
+		const created = numberOr(raw.created);
+		const contextTokens = numberOr(raw.context_length);
+		models.push({
+			provider,
+			id,
+			name: (stringOr(raw.name) ?? id).replace(/^[^:]+:\s*/, ""),
+			family: familyOf(id),
+			...created ? { releaseDate: (/* @__PURE__ */ new Date(created * 1e3)).toISOString() } : {},
+			...contextTokens ? { contextTokens } : {}
+		});
+	}
+	return models.length > 0 ? models : null;
+}
+/** Providers the list has no models for. */
+function missingProviders(models) {
+	return EXTERNAL_PROVIDERS.filter((provider) => !models.some((model) => model.provider === provider));
+}
+/** Add `next` for the providers `models` lacks; ids already present win. */
+function fillMissingProviders(models, next) {
+	const missing = new Set(missingProviders(models));
+	return [...models, ...next.filter((model) => missing.has(model.provider))];
+}
+const DATED_SNAPSHOT = /-\d{8}$/;
+const releaseMs = (model) => {
+	const parsed = model?.releaseDate ? Date.parse(model.releaseDate) : NaN;
+	return Number.isNaN(parsed) ? 0 : parsed;
+};
+/** A family the bundle never listed is retired once its newest release trails the provider's by this much. */
+const CURRENT_FAMILY_WINDOW_MS = 4320 * 60 * 60 * 1e3;
+/**
+* Ids that are current: the newest release of each family, and `-latest`
+* pointers. Families the bundle lists keep their newest model current however
+* long the next release takes; other families and `-latest` pointers must be
+* recent enough to still be shipping.
+*/
+function currentIds(models, bundledFamilies) {
+	const newest = /* @__PURE__ */ new Map();
+	let providerNewest = 0;
+	for (const model of models) {
+		const released = releaseMs(model);
+		newest.set(model.family, Math.max(newest.get(model.family) ?? 0, released));
+		providerNewest = Math.max(providerNewest, released);
+	}
+	return new Set(models.filter((model) => {
+		const released = releaseMs(model);
+		const recent = providerNewest - released <= CURRENT_FAMILY_WINDOW_MS;
+		if (model.id.endsWith("-latest")) return recent;
+		return released === newest.get(model.family) && (recent || bundledFamilies.has(model.family));
+	}).map((model) => model.id));
+}
+/** Effort values only Claude Code offers, with the API effort each one needs. */
+const CLAUDE_CODE_EFFORTS = {
+	ultracode: "xhigh",
+	ultrathink: null
+};
+/** Template profile narrowed to what the external entry says the model supports. */
+function deriveClaudeProfile(template, model) {
+	const descriptors = (template?.capabilities?.optionDescriptors ?? []).flatMap((descriptor) => {
+		if (descriptor.id === "fastMode" && model.fastMode === false) return [];
+		if (descriptor.id !== "effort" || descriptor.type !== "select" || !model.effort) return [descriptor];
+		const supported = new Set(model.effort);
+		const options = descriptor.options.filter((option) => {
+			const needs = CLAUDE_CODE_EFFORTS[option.id];
+			return supported.has(option.id) || needs === null || needs !== void 0 && supported.has(needs);
+		});
+		return options.length > 0 ? [{
+			...descriptor,
+			options
+		}] : [];
+	});
+	const adapter = isRecord$5(template?.adapter) ? template.adapter : {};
+	const claudeCode = isRecord$5(adapter.claudeCode) ? adapter.claudeCode : {};
+	const hasContextPicker = descriptors.some((descriptor) => descriptor.id === "contextWindow");
+	return {
+		capabilities: { optionDescriptors: descriptors },
+		adapter: {
+			...adapter,
+			claudeCode: {
+				...claudeCode,
+				...!hasContextPicker && model.contextTokens ? { fixedContextWindowTokens: model.contextTokens } : {}
+			}
+		}
+	};
+}
+/** `claude-opus-6-1` reads `opus-6.1` and `claude-opus-6.1`; `claude-opus-6` reads `opus-6`. */
+function shortAliases(slug) {
+	const dotted = slug.replace(/-(\d+)-(\d+)$/, "-$1.$2");
+	return [.../* @__PURE__ */ new Set([dotted.replace(/^claude-/, ""), dotted])].filter((alias) => alias !== slug);
+}
+function deriveClaudeCatalog(catalog, external) {
+	const models = external.filter((model) => !DATED_SNAPSHOT.test(model.id));
+	const current = currentIds(models, new Set(catalog.models.map((entry) => familyOf(entry.slug))));
+	const byId = new Map(models.map((model) => [model.id, model]));
+	const profiles = { ...catalog.profiles };
+	const entries = catalog.models.map((entry) => {
+		if (!byId.get(entry.slug)) return { ...entry };
+		return {
+			...entry,
+			status: current.has(entry.slug) ? "current" : "legacy"
+		};
+	});
+	const bundledSlugs = new Set(catalog.models.map((entry) => entry.slug));
+	for (const model of models) {
+		if (bundledSlugs.has(model.id) || !current.has(model.id)) continue;
+		const template = catalog.models.filter((entry) => familyOf(entry.slug) === model.family).toSorted((left, right) => releaseMs(byId.get(right.slug)) - releaseMs(byId.get(left.slug))).at(0);
+		const profileKey = `models.dev:${model.id}`;
+		profiles[profileKey] = deriveClaudeProfile(template?.profile ? catalog.profiles[template.profile] : void 0, model);
+		const aliases = shortAliases(model.id);
+		entries.push({
+			slug: model.id,
+			name: model.name,
+			...aliases.length > 0 ? { aliases } : {},
+			status: "current",
+			profile: profileKey,
+			...template?.adapter !== void 0 ? { adapter: template.adapter } : {}
+		});
+	}
+	for (const entry of entries) {
+		const familyAlias = familyOf(entry.slug).replace(/^claude-/, "");
+		if (entry.status === "current" || !entry.aliases?.includes(familyAlias)) continue;
+		const successor = entries.find((candidate) => candidate.status === "current" && familyOf(candidate.slug) === familyOf(entry.slug));
+		if (!successor) continue;
+		entry.aliases = entry.aliases.filter((alias) => alias !== familyAlias);
+		successor.aliases = [familyAlias, ...successor.aliases ?? []];
+	}
+	return {
+		catalog: {
+			...catalog,
+			...withCurrentDefault(catalog, entries),
+			profiles,
+			models: entries
+		},
+		current: entries.filter((entry) => entry.status === "current").map((entry) => entry.slug)
+	};
+}
+/** Keep the chat default; when it went legacy, move it to its family's current model. */
+function withCurrentDefault(catalog, entries, matches = (candidate, previous) => familyOf(candidate.slug) === familyOf(previous.slug)) {
+	const chat = catalog.defaults?.chat;
+	const previous = entries.find((entry) => entry.slug === chat);
+	if (!previous || previous.status === "current") return { defaults: catalog.defaults };
+	const next = entries.find((entry) => entry.status === "current" && matches(entry, previous));
+	return { defaults: {
+		...catalog.defaults,
+		chat: next?.slug ?? chat
+	} };
+}
+const ANTIGRAVITY_EFFORT_SUFFIX = /-(high|medium|low|minimal)$/;
+const effortLabel = (effort) => effort.charAt(0).toUpperCase() + effort.slice(1);
+/**
+* Antigravity slugs carry their effort (`gemini-3.8-flash-high`). Every current
+* Google model in a family the bundle already offers gets the same variants.
+*/
+function deriveAntigravityCatalog(catalog, external) {
+	const byId = new Map(external.map((model) => [model.id, model]));
+	const baseOf = (slug) => slug.replace(ANTIGRAVITY_EFFORT_SUFFIX, "");
+	const suffixes = [...new Set(catalog.models.flatMap((entry) => entry.slug.match(ANTIGRAVITY_EFFORT_SUFFIX)?.[1] ?? []))];
+	const families = new Set(catalog.models.flatMap((entry) => byId.get(baseOf(entry.slug))?.family ?? []));
+	const current = currentIds(external, families);
+	const entries = catalog.models.map((entry) => {
+		const known = byId.get(baseOf(entry.slug));
+		if (!known) return entry;
+		return {
+			...entry,
+			status: current.has(known.id) ? "current" : "legacy"
+		};
+	});
+	const slugs = new Set(entries.map((entry) => entry.slug));
+	for (const model of external) {
+		if (!families.has(model.family) || !current.has(model.id) || model.id.endsWith("-latest")) continue;
+		for (const suffix of suffixes) {
+			const slug = `${model.id}-${suffix}`;
+			if (slugs.has(slug) || model.effort && !model.effort.includes(suffix)) continue;
+			slugs.add(slug);
+			entries.push({
+				slug,
+				name: `${model.name} (${effortLabel(suffix)})`,
+				status: "current"
+			});
+		}
+	}
+	return {
+		catalog: {
+			...catalog,
+			...withCurrentDefault(catalog, entries, (candidate, previous) => candidate.slug.match(ANTIGRAVITY_EFFORT_SUFFIX)?.[1] === previous.slug.match(ANTIGRAVITY_EFFORT_SUFFIX)?.[1]),
+			models: entries
+		},
+		current: entries.filter((entry) => entry.status === "current").map((entry) => entry.slug)
+	};
+}
+/** Codex discovers its own models; the manifest only says which are current. */
+function deriveCodexCurrent(bundledCurrent, external) {
+	const byId = new Map(external.map((model) => [model.id, model]));
+	const current = currentIds(external, new Set(bundledCurrent.map((slug) => byId.get(slug)?.family ?? familyOf(slug))));
+	const known = new Set(byId.keys());
+	return [.../* @__PURE__ */ new Set([...current, ...bundledCurrent.filter((slug) => !known.has(slug))])];
+}
+/** Fold the external model list over the bundled manifest. */
+function deriveModelManifest(bundled, external) {
+	const forProvider = (provider) => external.filter((model) => model.provider === provider);
+	const providers = { ...bundled.providers };
+	const currentModels = { ...bundled.currentModels };
+	const claude = bundled.providers?.claudeAgent;
+	if (claude) {
+		const derived = deriveClaudeCatalog(claude, forProvider("anthropic"));
+		providers.claudeAgent = derived.catalog;
+		currentModels.claudeAgent = derived.current;
+	}
+	const antigravity = bundled.providers?.antigravity;
+	if (antigravity) {
+		const derived = deriveAntigravityCatalog(antigravity, forProvider("google"));
+		providers.antigravity = derived.catalog;
+		currentModels.antigravity = derived.current;
+	}
+	currentModels.codex = deriveCodexCurrent(bundled.currentModels.codex ?? [], forProvider("openai"));
+	return {
+		...bundled,
+		currentModels,
+		providers
+	};
+}
+//#endregion
 //#region src/provider/model-manifest.json
 var model_manifest_default = {
 	version: 1,
-	updatedAt: "2026-09-28T20:00:00Z",
+	updatedAt: "2026-10-07T19:00:00Z",
 	currentModels: {
 		"codex": [
 			"gpt-6-astra",
-			"gpt-5.6-luna",
-			"gpt-5.6-terra",
-			"gpt-5.6-sol",
+			"gpt-6.1-sol",
+			"gpt-6-luna",
 			"gpt-daybreak-blue-latest",
 			"gpt-daybreak-red-latest"
 		],
 		"claudeAgent": [
 			"claude-fable-5-1",
-			"claude-opus-5",
+			"claude-opus-5-5",
 			"claude-sonnet-5-5",
-			"claude-sonnet-5"
+			"claude-haiku-5-5"
 		],
 		"antigravity": [
 			"gemini-3.8-flash-high",
@@ -67110,7 +67534,7 @@ var model_manifest_default = {
 	},
 	providers: {
 		"claudeAgent": {
-			"defaults": { "chat": "claude-sonnet-5" },
+			"defaults": { "chat": "claude-fable-5-1" },
 			"profiles": {
 				"fable-5": {
 					"capabilities": { "optionDescriptors": [{
@@ -67124,13 +67548,60 @@ var model_manifest_default = {
 							},
 							{
 								"id": "medium",
-								"label": "Medium"
+								"label": "Medium",
+								"isDefault": true
 							},
 							{
 								"id": "high",
-								"label": "High",
+								"label": "High"
+							},
+							{
+								"id": "xhigh",
+								"label": "Extra High"
+							},
+							{
+								"id": "max",
+								"label": "Max"
+							},
+							{
+								"id": "ultracode",
+								"label": "Ultracode",
+								"description": "xhigh effort plus multi-agent workflow orchestration"
+							},
+							{
+								"id": "ultrathink",
+								"label": "Ultrathink"
+							}
+						],
+						"promptInjectedValues": ["ultrathink"]
+					}] },
+					"adapter": { "claudeCode": {
+						"effortMap": {
+							"ultracode": "xhigh",
+							"ultrathink": null
+						},
+						"fixedContextWindowTokens": 1e6
+					} }
+				},
+				"opus-5-5": {
+					"capabilities": { "optionDescriptors": [{
+						"id": "effort",
+						"label": "Reasoning",
+						"type": "select",
+						"options": [
+							{
+								"id": "low",
+								"label": "Low"
+							},
+							{
+								"id": "medium",
+								"label": "Medium",
 								"isDefault": true
 							},
+							{
+								"id": "high",
+								"label": "High"
+							},
 							{
 								"id": "xhigh",
 								"label": "Extra High"
@@ -67151,99 +67622,67 @@ var model_manifest_default = {
 						],
 						"promptInjectedValues": ["ultrathink"]
 					}, {
-						"id": "contextWindow",
-						"label": "Context Window",
-						"type": "select",
-						"options": [{
-							"id": "200k",
-							"label": "200k"
-						}, {
-							"id": "1m",
-							"label": "1M",
-							"isDefault": true
-						}]
+						"id": "fastMode",
+						"label": "Fast Mode",
+						"type": "boolean"
 					}] },
 					"adapter": { "claudeCode": {
 						"effortMap": {
 							"ultracode": "xhigh",
 							"ultrathink": null
 						},
-						"modelSuffixes": { "contextWindow": { "1m": "[1m]" } },
-						"contextWindowTokens": {
-							"200k": 2e5,
-							"1m": 1e6
-						}
+						"fixedContextWindowTokens": 1e6
 					} }
 				},
 				"opus-5": {
-					"capabilities": { "optionDescriptors": [
-						{
-							"id": "effort",
-							"label": "Reasoning",
-							"type": "select",
-							"options": [
-								{
-									"id": "low",
-									"label": "Low"
-								},
-								{
-									"id": "medium",
-									"label": "Medium"
-								},
-								{
-									"id": "high",
-									"label": "High",
-									"isDefault": true
-								},
-								{
-									"id": "xhigh",
-									"label": "Extra High"
-								},
-								{
-									"id": "max",
-									"label": "Max"
-								},
-								{
-									"id": "ultracode",
-									"label": "Ultracode",
-									"description": "xhigh effort plus multi-agent workflow orchestration"
-								},
-								{
-									"id": "ultrathink",
-									"label": "Ultrathink"
-								}
-							],
-							"promptInjectedValues": ["ultrathink"]
-						},
-						{
-							"id": "fastMode",
-							"label": "Fast Mode",
-							"type": "boolean"
-						},
-						{
-							"id": "contextWindow",
-							"label": "Context Window",
-							"type": "select",
-							"options": [{
-								"id": "200k",
-								"label": "200k"
-							}, {
-								"id": "1m",
-								"label": "1M",
+					"capabilities": { "optionDescriptors": [{
+						"id": "effort",
+						"label": "Reasoning",
+						"type": "select",
+						"options": [
+							{
+								"id": "low",
+								"label": "Low"
+							},
+							{
+								"id": "medium",
+								"label": "Medium"
+							},
+							{
+								"id": "high",
+								"label": "High",
 								"isDefault": true
-							}]
-						}
-					] },
+							},
+							{
+								"id": "xhigh",
+								"label": "Extra High"
+							},
+							{
+								"id": "max",
+								"label": "Max"
+							},
+							{
+								"id": "ultracode",
+								"label": "Ultracode",
+								"description": "xhigh effort plus multi-agent workflow orchestration"
+							},
+							{
+								"id": "ultrathink",
+								"label": "Ultrathink"
+							}
+						],
+						"promptInjectedValues": ["ultrathink"]
+					}, {
+						"id": "fastMode",
+						"label": "Fast Mode",
+						"type": "boolean"
+					}] },
 					"adapter": { "claudeCode": {
 						"effortMap": {
 							"ultracode": "xhigh",
 							"ultrathink": null
 						},
-						"modelSuffixes": { "contextWindow": { "1m": "[1m]" } },
-						"contextWindowTokens": {
-							"200k": 2e5,
-							"1m": 1e6
-						}
+						"fixedContextWindowTokens": 1e6
 					} }
 				},
 				"opus-4-8": {
@@ -67431,7 +67870,7 @@ var model_manifest_default = {
 						"label": "Fast Mode",
 						"type": "boolean"
 					}] },
-					"adapter": { "claudeCode": {} }
+					"adapter": { "claudeCode": { "fixedContextWindowTokens": 2e5 } }
 				},
 				"sonnet-5": {
 					"capabilities": { "optionDescriptors": [{
@@ -67466,26 +67905,10 @@ var model_manifest_default = {
 							}
 						],
 						"promptInjectedValues": ["ultrathink"]
-					}, {
-						"id": "contextWindow",
-						"label": "Context Window",
-						"type": "select",
-						"options": [{
-							"id": "200k",
-							"label": "200k",
-							"isDefault": true
-						}, {
-							"id": "1m",
-							"label": "1M"
-						}]
 					}] },
 					"adapter": { "claudeCode": {
 						"effortMap": { "ultrathink": null },
-						"modelSuffixes": { "contextWindow": { "1m": "[1m]" } },
-						"contextWindowTokens": {
-							"200k": 2e5,
-							"1m": 1e6
-						}
+						"fixedContextWindowTokens": 1e6
 					} }
 				},
 				"sonnet-4-6": {
@@ -67542,16 +67965,81 @@ var model_manifest_default = {
 						}
 					} }
 				},
+				"haiku-5-5": {
+					"capabilities": { "optionDescriptors": [{
+						"id": "effort",
+						"label": "Reasoning",
+						"type": "select",
+						"options": [
+							{
+								"id": "low",
+								"label": "Low"
+							},
+							{
+								"id": "medium",
+								"label": "Medium",
+								"isDefault": true
+							},
+							{
+								"id": "high",
+								"label": "High"
+							},
+							{
+								"id": "xhigh",
+								"label": "Extra High"
+							},
+							{
+								"id": "max",
+								"label": "Max"
+							},
+							{
+								"id": "ultrathink",
+								"label": "Ultrathink"
+							}
+						],
+						"promptInjectedValues": ["ultrathink"]
+					}] },
+					"adapter": { "claudeCode": {
+						"effortMap": { "ultrathink": null },
+						"fixedContextWindowTokens": 1e6
+					} }
+				},
 				"haiku-4-5": {
 					"capabilities": { "optionDescriptors": [{
 						"id": "thinking",
 						"label": "Thinking",
 						"type": "boolean"
 					}] },
-					"adapter": { "claudeCode": {} }
+					"adapter": { "claudeCode": { "fixedContextWindowTokens": 2e5 } }
 				}
 			},
 			"models": [
+				{
+					"slug": "claude-opus-5-5",
+					"name": "Claude Opus 5.5",
+					"aliases": [
+						"opus",
+						"opus-5.5",
+						"claude-opus-5.5"
+					],
+					"status": "current",
+					"badge": "new",
+					"profile": "opus-5-5",
+					"adapter": { "claudeCode": { "minVersion": "2.1.280" } }
+				},
+				{
+					"slug": "claude-sonnet-5-5",
+					"name": "Claude Sonnet 5.5",
+					"aliases": [
+						"sonnet",
+						"sonnet-5.5",
+						"claude-sonnet-5.5"
+					],
+					"status": "current",
+					"badge": "new",
+					"profile": "sonnet-5",
+					"adapter": { "claudeCode": { "minVersion": "2.1.284" } }
+				},
 				{
 					"slug": "claude-fable-5-1",
 					"name": "Claude Fable 5.1",
@@ -67561,7 +68049,6 @@ var model_manifest_default = {
 						"claude-fable-5.1"
 					],
 					"status": "current",
-					"badge": "new",
 					"profile": "fable-5",
 					"adapter": { "claudeCode": { "minVersion": "2.1.257" } }
 				},
@@ -67576,12 +68063,11 @@ var model_manifest_default = {
 					"slug": "claude-opus-5",
 					"name": "Claude Opus 5",
 					"aliases": [
-						"opus",
 						"opus-5",
 						"claude-opus-5.0",
 						"claude-opus-5-0"
 					],
-					"status": "current",
+					"status": "legacy",
 					"profile": "opus-5",
 					"adapter": { "claudeCode": { "minVersion": "2.1.219" } }
 				},
@@ -67618,25 +68104,15 @@ var model_manifest_default = {
 					"status": "legacy",
 					"profile": "opus-4-5"
 				},
-				{
-					"slug": "claude-sonnet-5-5",
-					"name": "Claude Sonnet 5.5",
-					"aliases": ["sonnet-5.5", "claude-sonnet-5.5"],
-					"status": "current",
-					"badge": "new",
-					"profile": "sonnet-5",
-					"adapter": { "claudeCode": { "minVersion": "2.1.284" } }
-				},
 				{
 					"slug": "claude-sonnet-5",
 					"name": "Claude Sonnet 5",
 					"aliases": [
-						"sonnet",
 						"sonnet-5",
 						"claude-sonnet-5.0",
 						"claude-sonnet-5-0"
 					],
-					"status": "current",
+					"status": "legacy",
 					"profile": "sonnet-5"
 				},
 				{
@@ -67650,11 +68126,23 @@ var model_manifest_default = {
 					"status": "legacy",
 					"profile": "sonnet-4-6"
 				},
+				{
+					"slug": "claude-haiku-5-5",
+					"name": "Claude Haiku 5.5",
+					"aliases": [
+						"haiku",
+						"haiku-5.5",
+						"claude-haiku-5.5"
+					],
+					"status": "current",
+					"badge": "new",
+					"profile": "haiku-5-5",
+					"adapter": { "claudeCode": { "minVersion": "2.1.293" } }
+				},
 				{
 					"slug": "claude-haiku-4-5",
 					"name": "Claude Haiku 4.5",
 					"aliases": [
-						"haiku",
 						"haiku-4.5",
 						"claude-haiku-4.5",
 						"claude-haiku-4-5-20251001"
@@ -67690,27 +68178,27 @@ var model_manifest_default = {
 //#endregion
 //#region src/provider/ModelManifest.ts
 /**
-* ModelManifest — remote provider-model metadata with a bundled offline
-* fallback.
+* ModelManifest — provider-model metadata: the bundled manifest folded with
+* the external model list from models.dev (OpenRouter as fallback).
 *
-* Provider catalogs and legacy classification live in `model-manifest.json`.
-* The bundled copy ships with every release; at runtime the service refreshes
-* it from the same file on `main`. Preference order is remote, then the last
-* successful on-disk copy, then the bundle. A failed fetch never fails a
-* provider check.
+* Provider catalogs and legacy classification live in `model-manifest.json`,
+* which ships with every release. At runtime the service fetches the external
+* list and derives the manifest from both (`externalModelCatalog.ts`).
+* Preference order is a fresh fetch, then the last successful list on disk,
+* then the bundle alone. A failed fetch never fails a provider check.
 *
 * Providers with authoritative discovery can use only the classification
 * overlay. Providers with static catalogs can resolve presentation and
 * capabilities from `providers`, then decode their own allowlisted adapter
 * payload separately.
 */
-const MODEL_MANIFEST_URL = "https://raw.githubusercontent.com/pingdotgg/t3code/main/apps/server/src/provider/model-manifest.json";
 /** How long a fetched manifest stays fresh before the next probe re-fetches. */
 const MANIFEST_TTL_MS = 3600 * 1e3;
 /** Minimum gap between fetch attempts after a failure, so an offline server
 * does not pay a network timeout on every provider check. */
 const MANIFEST_RETRY_MS = 300 * 1e3;
-const FETCH_TIMEOUT_MS = 1e4;
+/** models.dev serves about 0.5 MB compressed, so allow more than a small JSON. */
+const FETCH_TIMEOUT_MS = 2e4;
 const ManifestModelStatus = Schema$1.Literals(["current", "legacy"]);
 const ManifestModelProfile = Schema$1.Struct({
 	capabilities: Schema$1.optional(ModelCapabilities),
@@ -67738,11 +68226,7 @@ const ManifestProviderCatalog = Schema$1.Struct({
 */
 const ModelManifestEnvelopeSchema = Schema$1.Struct({
 	version: Schema$1.Literal(1),
-	/**
-	* ISO date of the last edit. A release bundles its manifest, and a disk
-	* cache of an older edit must not outrank it. Optional so older remote
-	* files still decode; they count as older than any dated bundle.
-	*/
+	/** ISO date of the last edit. */
 	updatedAt: Schema$1.optional(Schema$1.String),
 	currentModels: Schema$1.Record(Schema$1.String, Schema$1.Array(Schema$1.String)),
 	providers: Schema$1.optional(Schema$1.Record(Schema$1.String, ManifestProviderCatalog))
@@ -67756,13 +68240,22 @@ const hasValidProviderCatalogReferences = (manifest) => Object.values(manifest.p
 	}) && (catalog.defaults?.chat === void 0 || slugs.has(catalog.defaults.chat));
 });
 const ModelManifestSchema = ModelManifestEnvelopeSchema.pipe(Schema$1.check(Schema$1.makeFilter(hasValidProviderCatalogReferences, { expected: "unique model slugs and existing model and profile references" }), Schema$1.makeFilter(hasValidClaudeManifestAdapters, { expected: "valid Claude adapter metadata" })));
-const decodeManifest = Schema$1.decodeUnknownEffect(ModelManifestSchema);
+const decodeManifestOption = Schema$1.decodeUnknownOption(ModelManifestSchema);
+/** Public sources after the user's CPA, in order. */
+const PUBLIC_SOURCES = [{
+	url: MODELS_DEV_URL,
+	parse: parseModelsDev
+}, {
+	url: OPENROUTER_MODELS_URL,
+	parse: parseOpenRouter
+}];
 const BUNDLED_MODEL_MANIFEST = Schema$1.decodeUnknownSync(ModelManifestSchema)(model_manifest_default);
-/** Epoch millis of the manifest's `updatedAt`, or 0 when absent or unparsable. */
-function manifestUpdatedAtMs(manifest) {
-	if (manifest.updatedAt === void 0) return 0;
-	const parsed = Date.parse(manifest.updatedAt);
-	return Number.isNaN(parsed) ? 0 : parsed;
+/**
+* The bundle folded with an external list. A derived manifest that fails the
+* catalog checks is dropped in favour of the bundle alone.
+*/
+function manifestFromExternalModels(external) {
+	return Option.getOrNull(decodeManifestOption(deriveModelManifest(BUNDLED_MODEL_MANIFEST, external)));
 }
 /** Resolve provider-neutral model presentation and capability data. */
 function resolveProviderCatalog(manifest, driverKind) {
@@ -67798,13 +68291,12 @@ function resolveProviderCatalog(manifest, driverKind) {
 		defaults: { chat: catalog.defaults?.chat }
 	};
 }
-/** On-disk shape of the last successfully fetched manifest. */
+/** On-disk shape of the last successfully fetched external model list. */
 const ManifestCacheFile = Schema$1.Struct({
 	fetchedAtMs: Schema$1.Number,
-	manifest: ModelManifestSchema
+	models: Schema$1.Array(ExternalModel)
 });
 const decodeManifestCache = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(ManifestCacheFile));
-/** Exported for tests that seed the disk cache. */
 const encodeManifestCache = Schema$1.encodeEffect(Schema$1.fromJsonString(ManifestCacheFile));
 /** True when the manifest classifies `slug` as legacy for `driverKind`. */
 function isLegacyModel(manifest, driverKind, slug) {
@@ -67885,7 +68377,7 @@ const make$76 = Effect.gen(function* () {
 	const settingsService = yield* ServerSettingsService;
 	const httpClient = yield* HttpClient.HttpClient;
 	const serviceScope = yield* Effect.scope;
-	const cachePath = path.join(config.stateDir, "model-manifest.json");
+	const cachePath = path.join(config.stateDir, "external-models.json");
 	let manifest = BUNDLED_MODEL_MANIFEST;
 	let fetchedAtMs = null;
 	let lastAttemptMs = null;
@@ -67893,10 +68385,26 @@ const make$76 = Effect.gen(function* () {
 	const ensureDiskCacheLoaded = yield* Effect.cached(Effect.gen(function* () {
 		const fromDisk = yield* fileSystem.readFileString(cachePath).pipe(Effect.flatMap((raw) => decodeManifestCache(raw)), Effect.catchCause(() => Effect.succeed(null)));
 		if (fromDisk === null) return;
-		if (manifestUpdatedAtMs(BUNDLED_MODEL_MANIFEST) > manifestUpdatedAtMs(fromDisk.manifest)) return;
-		manifest = fromDisk.manifest;
+		const derived = manifestFromExternalModels(fromDisk.models);
+		if (derived === null) return;
+		manifest = derived;
 		fetchedAtMs = fromDisk.fetchedAtMs;
 	}));
+	const fetchPublic = (source) => httpClient.get(source.url).pipe(Effect.flatMap(HttpClientResponse.filterStatusOk), Effect.flatMap((response) => response.json), Effect.map((json) => source.parse(json) ?? []), Effect.timeout(FETCH_TIMEOUT_MS), Effect.catchCause(() => Effect.succeed([])));
+	/** Static model definitions from the first enabled CPA usage source; credentials do not matter. */
+	const fetchCpa = (sources) => {
+		const source = Object.values(sources).find((candidate) => candidate.enabled && candidate.managementKey !== "");
+		if (!source) return Effect.succeed([]);
+		return Effect.forEach(CPA_CHANNELS, ({ provider, channel }) => Effect.tryPromise((signal) => readManagementJson(source, `model-definitions/${channel}`, void 0, signal)).pipe(Effect.map((json) => parseCpaModelDefinitions(json, provider)), Effect.timeout(FETCH_TIMEOUT_MS), Effect.catchCause(() => Effect.succeed([]))), { concurrency: "unbounded" }).pipe(Effect.map((lists) => {
+			const seen = /* @__PURE__ */ new Set();
+			return lists.flat().filter((model) => {
+				const key = `${model.provider}:${model.id}`;
+				if (seen.has(key)) return false;
+				seen.add(key);
+				return true;
+			});
+		}));
+	};
 	const refresh = Effect.fn("ModelManifest.refresh")(function* () {
 		yield* ensureDiskCacheLoaded;
 		const now = yield* Clock.currentTimeMillis;
@@ -67906,13 +68414,18 @@ const make$76 = Effect.gen(function* () {
 		const settings = yield* settingsService.getSettings.pipe(Effect.catchCause(() => Effect.succeed(null)));
 		if (settings !== null && !settings.enableProviderUpdateChecks) return manifest;
 		lastAttemptMs = now;
-		const fetched = yield* httpClient.get(MODEL_MANIFEST_URL).pipe(Effect.flatMap(HttpClientResponse.filterStatusOk), Effect.flatMap((response) => response.json), Effect.flatMap((json) => decodeManifest(json)), Effect.timeout(FETCH_TIMEOUT_MS), Effect.catchCause(() => Effect.succeed(null)));
+		let models = settings === null ? [] : yield* fetchCpa(settings.usageLimitSources);
+		for (const source of PUBLIC_SOURCES) {
+			if (missingProviders(models).length === 0) break;
+			models = fillMissingProviders(models, yield* fetchPublic(source));
+		}
+		const fetched = models.length === 0 ? null : manifestFromExternalModels(models);
 		if (fetched === null) return manifest;
 		manifest = fetched;
 		fetchedAtMs = now;
 		yield* encodeManifestCache({
 			fetchedAtMs: now,
-			manifest: fetched
+			models
 		}).pipe(Effect.flatMap((serialized) => fileSystem.writeFileString(cachePath, serialized)), Effect.catchCause(() => Effect.void));
 		return manifest;
 	});
@@ -69891,7 +70404,7 @@ const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(function*
 				const baseUrl = claudeEnvironment.ANTHROPIC_BASE_URL?.trim();
 				return yield* new TextGenerationError({
 					operation,
-					detail: baseUrl && !/^https:\/\/api\.anthropic\.com\/?$/i.test(baseUrl) ? "This Claude instance uses a custom API endpoint. The CLI did not report subscription limits. For pooled accounts, open Subscription limits > Manage usage sources and configure the proxy's management URL and management key." : "Claude CLI did not return subscription limits. API-key accounts do not report subscription allowances here. If this instance should use a subscription, check its login and CLAUDE_CONFIG_DIR."
+					detail: baseUrl && !/^https:\/\/api\.anthropic\.com\/?$/i.test(baseUrl) ? "This Claude instance uses a custom API endpoint. The CLI did not report subscription limits. For pooled accounts, open Subscription limits > Usage sources and configure the proxy's management URL and management key." : "Claude CLI did not return subscription limits. API-key accounts do not report subscription allowances here. If this instance should use a subscription, check its login and CLAUDE_CONFIG_DIR."
 				});
 			}
 			return { report };
@@ -71765,6 +72278,10 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 				rawMethod: "claude/stream_event/message_delta",
 				rawPayload: message
 			});
+			if (!context.contextBreakdownRequested) {
+				context.contextBreakdownRequested = true;
+				yield* queryCurrentContextUsage(context, context.lastKnownTotalProcessedTokens).pipe(Effect.flatMap((usage) => emitThreadTokenUsage(context, usage, { rawMethod: "claude/get_context_usage" })), Effect.forkChild);
+			}
 			return;
 		}
 		if (event.type === "content_block_delta") {
@@ -73042,6 +73559,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			lastKnownContextWindow: initialContextWindow,
 			lastKnownTokenUsage: void 0,
 			lastKnownTotalProcessedTokens: void 0,
+			contextBreakdownRequested: false,
 			lastAssistantUuid: resumeState?.resumeSessionAt,
 			lastThreadStartedId: void 0,
 			interruptRequested: false,
@@ -103153,50 +103671,6 @@ const makeProviderInstallation = Effect.fn("makeProviderInstallation")(function*
 	};
 });
 //#endregion
-//#region src/usage/usageSourceHttp.ts
-const MAX_RESPONSE_BYTES$1 = 1024 * 1024;
-const LOOPBACK_HOSTS$1 = /* @__PURE__ */ new Set([
-	"localhost",
-	"127.0.0.1",
-	"[::1]"
-]);
-/** The management key stays on the configured origin, including redirects. */
-async function readManagementJson(config, path, body, signal) {
-	const base = new URL(config.url);
-	if (base.username || base.password || base.search || base.hash || base.protocol !== "https:" && !(base.protocol === "http:" && LOOPBACK_HOSTS$1.has(base.hostname))) throw new Error("Invalid usage source origin");
-	if (path !== "auth-files" && path !== "api-call") throw new Error("Unsupported management operation");
-	const response = await fetch(new URL(`/v0/management/${path}`, base), {
-		method: body === void 0 ? "GET" : "POST",
-		redirect: "error",
-		signal,
-		headers: {
-			authorization: `Bearer ${config.managementKey}`,
-			"content-type": "application/json"
-		},
-		...body === void 0 ? {} : { body: JSON.stringify(body) }
-	});
-	if (!response.ok || !response.body) {
-		await response.body?.cancel();
-		throw new UsageLimitSourceError({ detail: response.status === 401 || response.status === 403 ? `The usage source rejected its management key (HTTP ${response.status}). Update the management key in Manage usage sources; a provider API key cannot replace it.` : `The usage source management request failed (HTTP ${response.status}). Check the source URL and management API availability.` });
-	}
-	const reader = response.body.getReader();
-	const chunks = [];
-	let total = 0;
-	try {
-		for (;;) {
-			const chunk = await reader.read();
-			if (chunk.done) break;
-			total += chunk.value.byteLength;
-			if (total > MAX_RESPONSE_BYTES$1) throw new Error("Usage source response too large");
-			chunks.push(chunk.value);
-		}
-		return JSON.parse(Buffer.concat(chunks).toString("utf8"));
-	} finally {
-		await reader.cancel().catch(() => void 0);
-		reader.releaseLock();
-	}
-}
-//#endregion
 //#region src/usage/cliproxyApi.ts
 const isUsageLimitSourceError$1 = Schema$1.is(UsageLimitSourceError);
 const MAX_SOURCE_ACCOUNTS = 128;
@@ -103261,7 +103735,21 @@ const CreditList = Schema$1.Struct({ credits: Schema$1.Array(Schema$1.Struct({
 	reset_type: Schema$1.String,
 	expires_at: Schema$1.String
 })) });
+/** Codex's answer to a consume request (openai/codex backend-client `ConsumeRateLimitResetCreditResponse`). */
+const ConsumeResponse = Schema$1.Struct({ code: Schema$1.Literals([
+	"reset",
+	"nothing_to_reset",
+	"no_credit",
+	"already_redeemed"
+]) });
+const CONSUME_OUTCOMES = {
+	reset: "reset",
+	nothing_to_reset: "nothingToReset",
+	no_credit: "noCredit",
+	already_redeemed: "alreadyRedeemed"
+};
 const decodeAuthFiles = Schema$1.decodeUnknownEffect(AuthFiles);
+const decodeConsumeResponse = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(ConsumeResponse));
 const encodeJson$5 = Schema$1.encodeEffect(Schema$1.fromJsonString(Schema$1.Unknown));
 const decodeApiResponse = Schema$1.decodeUnknownEffect(ApiResponse);
 const decodeCreditList = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(CreditList));
@@ -103269,6 +103757,7 @@ const decodeClaudeUsage = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(C
 const decodeCodexUsage = Schema$1.decodeUnknownEffect(Schema$1.fromJsonString(CodexUsage));
 const CODEX_BASE = "https://chatgpt.com/backend-api/wham";
 const CREDIT_URL = `${CODEX_BASE}/rate-limit-reset-credits`;
+const CONSUME_URL = `${CREDIT_URL}/consume`;
 const makeCliproxyApi = Effect.gen(function* () {
 	const management = (config, path, body) => Effect.tryPromise({
 		try: (signal) => readManagementJson(config, path, body, signal),
@@ -103389,10 +103878,32 @@ const makeCliproxyApi = Effect.gen(function* () {
 			})
 		})));
 	});
-	return { readAccounts: Effect.fn("CliproxyApi.readAccounts")(function* (config) {
-		const accounts = yield* authFiles(config).pipe(Effect.mapError((cause) => isUsageLimitSourceError$1(cause) ? cause : new UsageLimitSourceError({ detail: "The usage source returned an unsupported account list." })));
-		return yield* Effect.forEach(accounts.filter((account) => !account.disabled && (account.provider === "codex" || account.provider === "claude")), (account) => readAccount(config, account), { concurrency: ACCOUNT_READ_CONCURRENCY });
-	}) };
+	return {
+		readAccounts: Effect.fn("CliproxyApi.readAccounts")(function* (config) {
+			const accounts = yield* authFiles(config).pipe(Effect.mapError((cause) => isUsageLimitSourceError$1(cause) ? cause : new UsageLimitSourceError({ detail: "The usage source returned an unsupported account list." })));
+			return yield* Effect.forEach(accounts.filter((account) => !account.disabled && (account.provider === "codex" || account.provider === "claude")), (account) => readAccount(config, account), { concurrency: ACCOUNT_READ_CONCURRENCY });
+		}),
+		consumeResetCredit: Effect.fn("CliproxyApi.consumeResetCredit")(function* (config, accountId, input) {
+			const notSent = (detail) => ({
+				detail,
+				sent: false
+			});
+			const account = (yield* authFiles(config).pipe(Effect.mapError((cause) => notSent(isUsageLimitSourceError$1(cause) ? cause.detail : "The usage source returned an unsupported account list.")))).find((file) => file.id === accountId && file.provider === "codex" && !file.disabled);
+			if (!account) return yield* Effect.fail(notSent("The usage source no longer has this Codex account. Refresh and try again."));
+			const body = yield* apiCall(config, account, CONSUME_URL, {
+				redeem_request_id: input.idempotencyKey,
+				credit_id: input.creditId
+			}).pipe(Effect.mapError((cause) => ({
+				detail: isUsageLimitSourceError$1(cause) ? cause.detail : "The usage source could not send the reset request.",
+				sent: true
+			})));
+			const response = yield* decodeConsumeResponse(body).pipe(Effect.mapError(() => ({
+				detail: "Codex answered the reset request in a form P4 does not understand.",
+				sent: true
+			})));
+			return CONSUME_OUTCOMES[response.code];
+		})
+	};
 });
 //#endregion
 //#region src/usage/UsageLimitSources.ts
@@ -103441,9 +103952,21 @@ const makeWithReader = (api) => Effect.gen(function* () {
 	yield* settings.streamChanges.pipe(Stream.map((value) => value.usageLimitSources), Stream.changes, Stream.switchMap(() => Stream.fromEffect(publish([]).pipe(Effect.andThen(refresh)))), Stream.runDrain, Effect.forkScoped);
 	yield* Effect.forever(Effect.sleep(REFRESH_INTERVAL).pipe(Effect.andThen(refresh))).pipe(Effect.forkScoped);
 	yield* refresh.pipe(Effect.forkScoped);
+	const consumeResetCredit = (account, input) => Effect.gen(function* () {
+		const config = (yield* settings.getSettings.pipe(Effect.mapError(() => ({
+			detail: "Could not read the usage source settings.",
+			sent: false
+		})))).usageLimitSources[account.sourceId];
+		if (!config?.enabled || !config.managementKey) return yield* Effect.fail({
+			detail: "This usage source is off or has no management key.",
+			sent: false
+		});
+		return yield* api.consumeResetCredit(config, account.accountId, input);
+	});
 	return {
 		current: Ref.get(state),
 		refresh,
+		consumeResetCredit,
 		streamChanges: Stream.unwrap(Effect.gen(function* () {
 			const subscription = yield* PubSub.subscribe(changes);
 			return Stream.concat(Stream.make(yield* Ref.get(state)), Stream.fromSubscription(subscription)).pipe(Stream.changes);
@@ -130256,10 +130779,18 @@ const make$27 = Effect.gen(function* PreviewManagerMake() {
 }).pipe(Effect.withSpan("PreviewManager.make"));
 const layer$19 = Layer.effect(PreviewManager, make$27);
 const isStoredOutcome = Schema$1.is(Schema$1.Union([ProviderResetCreditOutcome, Schema$1.Literal("failed")]));
-function toAttempt(row) {
+/**
+* The `instance_id` column holds the target's owner key. Instance ids never
+* contain a colon, so a pooled account's `source:` key cannot collide with one,
+* and the JSON keeps any source id unambiguous.
+*/
+function resetCreditOwnerKey(target) {
+	return "instanceId" in target ? target.instanceId : `source:${JSON.stringify([target.sourceAccount.sourceId, target.sourceAccount.accountId])}`;
+}
+function toAttempt(row, target) {
 	return {
 		idempotencyKey: row.idempotency_key,
-		instanceId: ProviderInstanceId.make(row.instance_id),
+		...target,
 		...row.credit_id ? { creditId: row.credit_id } : {},
 		requestedAt: row.requested_at,
 		...row.outcome !== null && isStoredOutcome(row.outcome) ? { outcome: row.outcome } : {},
@@ -130272,28 +130803,39 @@ function toAttempt(row) {
 * attempt already wrote. The stored row wins: its credit is the one a retry
 * must ask about, whatever the retry itself sent.
 *
-* A new attempt is refused while another attempt for the same provider has no
+* A new attempt is refused while another attempt for the same target has no
 * answer; `blockedBy` is that attempt, which the caller must retry instead.
 * The partial unique index makes the refusal hold across concurrent clients.
+* `foreign` marks a key already used for another target.
 */
 const beginResetCreditAttempt = Effect.fn("ProviderResetCreditAttempts.begin")(function* (input) {
 	const sql = yield* SqlClient.SqlClient;
+	const owner = resetCreditOwnerKey(input.target);
 	yield* sql`INSERT INTO provider_reset_credit_attempts
         (idempotency_key, instance_id, credit_id, requested_at)
-      VALUES (${input.idempotencyKey}, ${input.instanceId}, ${input.creditId ?? null},
+      VALUES (${input.idempotencyKey}, ${owner}, ${input.creditId ?? null},
         ${input.requestedAt})
       ON CONFLICT DO NOTHING`;
 	const own = yield* sql`SELECT * FROM provider_reset_credit_attempts
       WHERE idempotency_key = ${input.idempotencyKey}`;
-	if (own[0] !== void 0) return {
-		attempt: toAttempt(own[0]),
-		blockedBy: null
-	};
+	if (own[0] !== void 0) {
+		if (own[0].instance_id !== owner) return {
+			attempt: null,
+			blockedBy: null,
+			foreign: true
+		};
+		return {
+			attempt: toAttempt(own[0], input.target),
+			blockedBy: null,
+			foreign: false
+		};
+	}
 	const unresolved = yield* sql`SELECT * FROM provider_reset_credit_attempts
-      WHERE instance_id = ${input.instanceId} AND (outcome IS NULL OR outcome = 'failed')`;
+      WHERE instance_id = ${owner} AND (outcome IS NULL OR outcome = 'failed')`;
 	return {
 		attempt: null,
-		blockedBy: unresolved[0] === void 0 ? null : toAttempt(unresolved[0])
+		blockedBy: unresolved[0] === void 0 ? null : toAttempt(unresolved[0], input.target),
+		foreign: false
 	};
 });
 /** Write what the provider answered, or `failed` when no answer came back. */
@@ -130305,15 +130847,15 @@ const completeResetCreditAttempt = Effect.fn("ProviderResetCreditAttempts.comple
       WHERE idempotency_key = ${input.idempotencyKey}
         AND (outcome IS NULL OR outcome = 'failed')
       RETURNING *`;
-	if (rows[0] !== void 0) return toAttempt(rows[0]);
+	if (rows[0] !== void 0) return toAttempt(rows[0], input.target);
 	return toAttempt((yield* sql`SELECT * FROM provider_reset_credit_attempts
-      WHERE idempotency_key = ${input.idempotencyKey}`)[0]);
+      WHERE idempotency_key = ${input.idempotencyKey}`)[0], input.target);
 });
-/** This instance's attempts, newest first. */
-const listResetCreditAttempts = Effect.fn("ProviderResetCreditAttempts.list")(function* (instanceId) {
+/** This target's attempts, newest first. */
+const listResetCreditAttempts = Effect.fn("ProviderResetCreditAttempts.list")(function* (target) {
 	return (yield* (yield* SqlClient.SqlClient)`SELECT * FROM provider_reset_credit_attempts
-    WHERE instance_id = ${instanceId}
-    ORDER BY requested_at DESC LIMIT ${20}`).map(toAttempt);
+    WHERE instance_id = ${resetCreditOwnerKey(target)}
+    ORDER BY requested_at DESC LIMIT ${20}`).map((row) => toAttempt(row, target));
 });
 //#endregion
 //#region src/workspace/WorkspaceSearchIndex.ts
@@ -133715,35 +134257,51 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 			detail: "This provider does not report account usage."
 		})), { "rpc.aggregate": "server" }),
 		[WS_METHODS.serverConsumeProviderResetCredit]: (input) => {
+			const target = "instanceId" in input ? { instanceId: input.instanceId } : { sourceAccount: input.sourceAccount };
 			let consumeSent = false;
 			return observeRpcEffect$1(WS_METHODS.serverConsumeProviderResetCredit, Effect.gen(function* () {
 				const fail = (detail, cause) => new ProviderResetCreditError({
-					instanceId: input.instanceId,
+					...target,
 					detail,
 					...consumeSent ? { consumeSent } : {},
 					...cause === void 0 ? {} : { cause }
 				});
 				const begun = yield* beginResetCreditAttempt({
 					idempotencyKey: input.idempotencyKey,
-					instanceId: input.instanceId,
+					target,
 					creditId: input.creditId,
 					requestedAt: yield* nowIso$2
 				});
+				if (begun.foreign) return yield* fail("This attempt belongs to another account.");
 				const started = begun.attempt;
 				if (started === null) return yield* fail(begun.blockedBy === null ? "Another reset request just finished. Check the count and try again." : "An earlier reset request has no answer from Codex yet. Retry it before starting another.");
-				if (started.instanceId !== input.instanceId) return yield* fail("This attempt belongs to another provider.");
 				if (started.outcome !== void 0 && started.outcome !== "failed") return { attempt: started };
-				const consume = textGeneration.consumeResetCredit;
-				if (!consume) return yield* fail("This provider cannot redeem resets from P4.");
+				const creditId = started.creditId;
+				let send;
+				let refresh;
+				if ("instanceId" in target) {
+					const consume = textGeneration.consumeResetCredit;
+					if (!consume) return yield* fail("This provider cannot redeem resets from P4.");
+					send = consume({
+						instanceId: target.instanceId,
+						idempotencyKey: input.idempotencyKey,
+						creditId
+					}).pipe(Effect.map((answer) => answer.outcome));
+					refresh = providerRegistry.refreshInstance(target.instanceId).pipe(Effect.ignoreCause({ log: true }));
+				} else {
+					send = usageLimitSources.consumeResetCredit(target.sourceAccount, {
+						idempotencyKey: input.idempotencyKey,
+						creditId: creditId ?? ("sourceAccount" in input ? input.creditId : "")
+					});
+					refresh = usageLimitSources.refresh;
+				}
 				consumeSent = true;
-				const result = yield* consume({
-					instanceId: input.instanceId,
-					idempotencyKey: input.idempotencyKey,
-					creditId: started.creditId
-				}).pipe(Effect.result);
+				const result = yield* send.pipe(Effect.result);
 				if (Result$1.isFailure(result)) {
+					if (result.failure.sent === false) consumeSent = false;
 					const recorded = yield* completeResetCreditAttempt({
 						idempotencyKey: input.idempotencyKey,
+						target,
 						outcome: "failed",
 						detail: result.failure.detail,
 						completedAt: yield* nowIso$2
@@ -133753,20 +134311,21 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 				}
 				const attempt = yield* completeResetCreditAttempt({
 					idempotencyKey: input.idempotencyKey,
-					outcome: result.success.outcome,
+					target,
+					outcome: result.success,
 					completedAt: yield* nowIso$2
 				});
-				yield* providerRegistry.refreshInstance(input.instanceId).pipe(Effect.ignoreCause({ log: true }));
+				yield* refresh;
 				return { attempt };
 			}).pipe(Effect.catchTag("SqlError", (cause) => Effect.fail(new ProviderResetCreditError({
-				instanceId: input.instanceId,
+				...target,
 				detail: "Could not record the reset attempt.",
 				...consumeSent ? { consumeSent } : {},
 				cause
 			}))), Effect.provideService(SqlClient.SqlClient, sql)), { "rpc.aggregate": "server" });
 		},
-		[WS_METHODS.serverListProviderResetCreditAttempts]: (input) => observeRpcEffect$1(WS_METHODS.serverListProviderResetCreditAttempts, listResetCreditAttempts(input.instanceId).pipe(Effect.map((attempts) => ({ attempts })), Effect.catchTag("SqlError", (cause) => Effect.fail(new ProviderResetCreditError({
-			instanceId: input.instanceId,
+		[WS_METHODS.serverListProviderResetCreditAttempts]: (input) => observeRpcEffect$1(WS_METHODS.serverListProviderResetCreditAttempts, listResetCreditAttempts(input).pipe(Effect.map((attempts) => ({ attempts })), Effect.catchTag("SqlError", (cause) => Effect.fail(new ProviderResetCreditError({
+			...input,
 			detail: "Could not read reset history.",
 			cause
 		}))), Effect.provideService(SqlClient.SqlClient, sql)), { "rpc.aggregate": "server" }),