@mars-sea/dsh-commandcode-provider 0.9.1 → 0.10.0-alpha.2

package/lib/index.d.ts

@@ -24,7 +24,7 @@ declare const KNOWN_EFFORTS: Readonly<Record<string, readonly string[]>>;
  */
 declare const KNOWN_IMAGE_MODELS: ReadonlySet<string>;
 /**
- * Models the official CLI's model table (command-code@1.37.0) marks
+ * Models the official CLI's model table (command-code@1.38.2) marks
  * `reasoning:!0` but defines no selectable `reasoning_effort` levels — they
  * think automatically, with Command Code driving the depth. This is the
  * authoritative "thinks, effort not adjustable" set: `KNOWN_EFFORTS` (which
@@ -32,13 +32,15 @@ declare const KNOWN_IMAGE_MODELS: ReadonlySet<string>;
  * effort levels, and this snapshot is not surfaced in the picker's compact
  * description — it exists for programmatic consumers.
  *
- * Source: the command-code@1.37.0 bundled model table (dist/cli.mjs),
+ * Source: the command-code@1.38.2 bundled model table (dist/cli.mjs),
  * cross-checked with https://commandcode.ai/docs/reference/cli/models.
  * (`stealth/ox-alpha` left this set in command-code@1.32.1, which gave it
  * selectable `['low', 'high', 'max']` efforts; the preview then ended in
  * 1.34.0, removing the model from the catalog entirely. `tencent/hy4-preview`
  * joined this set in command-code@1.37.0 — reasoning:!0, no efforts, 1M
- * context, routed through OpenRouter.)
+ * context, routed through OpenRouter — then gained selectable
+ * `['low', 'medium', 'high']` efforts in command-code@1.38.0 and moved to
+ * `KNOWN_EFFORTS`.)
  * Keep in sync via the dsh-commandcode-upstream skill.
  */
 declare const KNOWN_THINKING_MODELS: ReadonlySet<string>;
@@ -189,7 +191,7 @@ declare function peakPricingState(modelId: string, now?: number): 'peak' | 'off-
  * for models without time-of-day pricing.
  */
 declare function peakPricingLabel(modelId: string, now?: number): string | undefined;
-declare const COMMAND_CODE_CLI_VERSION = "1.37.0";
+declare const COMMAND_CODE_CLI_VERSION = "1.38.2";
 declare const DEFAULT_API_BASE = "https://api.commandcode.ai";
 declare const DEFAULT_GENERATE_MAX_TOKENS = 64000;
 declare const DEFAULT_MAX_OUTPUT_TOKENS = 65536;
@@ -263,8 +265,12 @@ type ResolveAttachments = () => AttachmentStore | undefined;
 interface CommandCodeAdapterDeps<C extends CommandCodeConnectionOptions = CommandCodeConnectionOptions> {
   /** Resolve the current connection facts (fresh per request, settings-aware). */
   options: () => C;
-  /** Resolve a usable API key for the given connection facts, or throw `MISSING_CREDENTIAL`. */
-  resolveApiKey: (connection: C) => Promise<string>;
+  /**
+   * Resolve a usable API key for the given connection facts and the request's
+   * model id, or throw `MISSING_CREDENTIAL`. The model is optional: hosts
+   * without model-aware routing ignore it.
+   */
+  resolveApiKey: (connection: C, model?: string) => Promise<string>;
   /**
    * Multi-account rotation hook: the request sent with `rejectedKey` was
    * refused with 429 (`rate-limit`) or 401 (`invalid-credential`) before
@@ -273,7 +279,7 @@ interface CommandCodeAdapterDeps<C extends CommandCodeConnectionOptions = Comman
    * Only pre-stream rejections rotate — a mid-stream failure never replays a
    * partially consumed generation against another account.
    */
-  rotateApiKey?: (rejectedKey: string, rejection: 'rate-limit' | 'invalid-credential', connection: C) => Promise<string | undefined>;
+  rotateApiKey?: (rejectedKey: string, rejection: 'rate-limit' | 'invalid-credential', connection: C, model?: string) => Promise<string | undefined>;
   /** HTTP transport override (tests); defaults to the global `fetch`. */
   fetchImpl?: typeof fetch;
   /** Resolve the optional durable attachment service for image input (tests); defaults to none. */
@@ -502,6 +508,27 @@ interface CommandCodeAccountPoolDeps {
    * account falls back to the first usable slot.
    */
   preferredId?(): string | undefined;
+  /**
+   * Model → account routing rules, re-read per resolution so settings changes
+   * apply live. Each rule lists catalog model ids (see
+   * {@link CommandCodeModelAccountRule}) to an account slot id. When the
+   * request's model matches a rule and that account is usable, it serves
+   * before the preferred/rotation selection; an unusable routed account falls
+   * back to the normal selection (the router is a hint, never a hard gate).
+   */
+  modelAccountRules?(): readonly CommandCodeModelAccountRule[];
+}
+/**
+ * One "route these models to that account" rule. `models` lists catalog ids
+ * (`deepseek/deepseek-v4-pro`, …); `account` is a slot id (`default` or an
+ * extra account's credential reference). A request whose model id is in the
+ * list routes to that account. The first matching rule in list order wins.
+ */
+interface CommandCodeModelAccountRule {
+  /** Catalog model ids to match against the request's model. */
+  models: string[];
+  /** Account slot id to prefer for matching models. */
+  account: string;
 }
 /**
  * Whether an account with this rotation state can serve a request right now.
@@ -517,6 +544,18 @@ declare function accountUsable(state: CommandCodeAccountState | undefined): bool
  * entry (the usage view's active badge) so both always agree.
  */
 declare function selectActiveAccount(accounts: readonly ResolvedAccount[], preferredId: string | undefined): ResolvedAccount | undefined;
+/**
+ * The first routing rule whose model list contains the request's model id.
+ * Undefined when no rule matches.
+ */
+declare function matchModelRule(model: string, rules: readonly CommandCodeModelAccountRule[] | undefined): CommandCodeModelAccountRule | undefined;
+/**
+ * The routed account for a request's model: the first usable account whose
+ * slot id matches the first matching rule's target. Undefined when no rule
+ * matches or the routed account is not usable (the caller then falls back to
+ * the normal preferred/rotation selection).
+ */
+declare function selectAccountForModel(accounts: readonly ResolvedAccount[], model: string, rules: readonly CommandCodeModelAccountRule[] | undefined): ResolvedAccount | undefined;
 /**
  * The account pool. Rotation state is keyed by API key (never logged), so two
  * slots resolving to the same credential share one mark, and a key changed in
@@ -541,12 +580,17 @@ declare class CommandCodeAccountPool {
    */
   describeAccounts(): Promise<ResolvedAccount[]>;
   /**
-   * Hand out the first usable account's key (the manually preferred account
-   * when usable, else rotation order). Returns `undefined` when no account
-   * resolves any key at all (the caller then reports the missing credential).
-   * Throws `RATE_LIMIT` — naming the earliest window reset — or
+   * Hand out the key for a request: the model-routed account when the
+   * request's model matches a rule (and that account is usable), else the
+   * manually preferred account when usable, else the first usable account in
+   * rotation order. Returns `undefined` when no account resolves any key at
+   * all (the caller then reports the missing credential). Throws
+   * `RATE_LIMIT` — naming the earliest window reset — or
    * `INVALID_CREDENTIAL` when accounts exist but none can serve.
    *
+   * `options.model` is the request's model id; routing rules re-read per
+   * resolution, so a settings change applies live.
+   *
    * `options.exclude` skips one key during the probe-revival pass: the
    * rotation hook excludes the just-rejected key so a probe that clears its
    * window cannot re-offer the same key within the same request (the adapter
@@ -554,6 +598,7 @@ declare class CommandCodeAccountPool {
    */
   resolveKey(options?: {
     exclude?: string;
+    model?: string;
   }): Promise<{
     key: string;
     slot: CommandCodeAccountSlot;
@@ -601,6 +646,17 @@ declare const USAGE_REPORT_ENDPOINT = "commandcode/report";
  * deliberately minimal so one `parse` function satisfies it.
  */
 declare const usageReportSchema: TypertSchema<CommandCodeAccountsReport>;
+/** One catalog entry the settings page's routing-rule editor offers. */
+interface CommandCodeCatalogModel {
+  /** Catalog model id (e.g. `deepseek/deepseek-v4-pro`). */
+  id: string;
+  /** Display name from the catalog. */
+  name: string;
+}
+/** The model-catalog Remote result: the full catalog, sorted for picking. */
+interface CommandCodeCatalog {
+  models: CommandCodeCatalogModel[];
+}
 //#endregion
 //#region src/command-locales.d.ts
 /**
@@ -718,6 +774,12 @@ interface CommandCodeUsageDeps<C extends CommandCodeConnectionOptions = CommandC
    * entry around `adapter.getUsage()`.
    */
   reports?: () => Promise<CommandCodeAccountsReport>;
+  /**
+   * Model-catalog source for the routing-rule editor (wired by the plugin
+   * entry). Absent, the `models` endpoint answers an empty list — the page's
+   * rule editor degrades to the empty state.
+   */
+  listModels?: () => Promise<CommandCodeCatalog>;
   /**
    * The browser-login flow (wired by the plugin entry). Absent means the
    * login endpoints answer `idle` / reject with a plain message — the page's
@@ -744,6 +806,13 @@ declare class CommandCodeUsageService<C extends CommandCodeConnectionOptions = C
    * the failure branch the page renders as a hint.
    */
   report(): Promise<CommandCodeAccountsReport>;
+  /**
+   * The model catalog for the settings page's routing-rule editor. The
+   * browser never calls the Command Code API directly — the Host serves the
+   * catalog (already fetched/cached by the adapter) so rules can be picked
+   * from the live model list instead of typed by hand.
+   */
+  models(): Promise<CommandCodeCatalog>;
   /**
    * Start (or rejoin) a browser-login attempt and return its fresh status —
    * `waiting` carrying the Studio URL. Rejects when the flow cannot start
@@ -933,6 +1002,16 @@ interface Config {
    * rotation still applies). Unset means "first usable account".
    */
   activeAccount?: string;
+  /**
+   * Model → account routing rules. Each rule lists catalog model ids to an
+   * account slot id (`default`, or an extra account's credential reference).
+   * When a request's model is in a rule's list and the routed account is
+   * usable, that account serves — before the manual {@link activeAccount} and
+   * the passive rotation order. A routed account that is exhausted or invalid
+   * falls back to the normal selection, so the router is a hint, never a hard
+   * gate. The first matching rule wins.
+   */
+  modelAccountRules?: CommandCodeModelAccountRule[];
   /**
    * Language override for the `/commandcode` Host-side command's user-facing
    * copy. Host commands cannot read the client's `ctx.locale`, so this is
@@ -960,5 +1039,5 @@ interface ResolvedCommandCodeOptions extends CommandCodeConnectionOptions {
 declare function resolveAdapterOptions(config: Config): ResolvedCommandCodeOptions;
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { type ApiKeyValidation, BILLING_ACCESS_TTL_MS, COMMAND_CODE_CLI_VERSION, type CommandCodeAccountConfig, CommandCodeAccountPool, type CommandCodeAccountSlot, type CommandCodeAccountState, type CommandCodeAccountUsage, type CommandCodeAccountsReport, CommandCodeAdapter, type CommandCodeAdapterDeps, type CommandCodeBillingAccess, type CommandCodeCommandDeps, type CommandCodeConnectionOptions, type CommandCodeLoginCredentials, type CommandCodeLoginFailureReason, CommandCodeLoginFlow, type CommandCodeLoginFlowDeps, type CommandCodeLoginStatus, type CommandCodeUsageDeps, type CommandCodeUsageReport, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, type LoginFlowFacade, PLAN_LABELS, PLAN_ORDER, PROVIDER, type ResolveAttachments, ResolvedCommandCodeOptions, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectActiveAccount, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
+export { type ApiKeyValidation, BILLING_ACCESS_TTL_MS, COMMAND_CODE_CLI_VERSION, type CommandCodeAccountConfig, CommandCodeAccountPool, type CommandCodeAccountSlot, type CommandCodeAccountState, type CommandCodeAccountUsage, type CommandCodeAccountsReport, CommandCodeAdapter, type CommandCodeAdapterDeps, type CommandCodeBillingAccess, type CommandCodeCommandDeps, type CommandCodeConnectionOptions, type CommandCodeLoginCredentials, type CommandCodeLoginFailureReason, CommandCodeLoginFlow, type CommandCodeLoginFlowDeps, type CommandCodeLoginStatus, type CommandCodeModelAccountRule, type CommandCodeUsageDeps, type CommandCodeUsageReport, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, type LoginFlowFacade, PLAN_LABELS, PLAN_ORDER, PROVIDER, type ResolveAttachments, ResolvedCommandCodeOptions, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, matchModelRule, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectAccountForModel, selectActiveAccount, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -2,10 +2,9 @@ import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { MAX_TIMER_DELAY_MS } from "@deepseek-ai/dsh-timeout";
-import { CallId, LlmAdapter, LlmError, ReasoningEffortId, assertUsableApiKey, attributionHeaders, errorChain, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
+import { LlmAdapter, LlmError, ReasoningEffortId, ToolCallId, assertUsableApiKey, attributionHeaders, errorChain, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { existsSync, readFileSync } from "node:fs";
 import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { randomBytes, randomUUID } from "node:crypto";
@@ -22,9 +21,11 @@ import { createServer as createServer$1 } from "node:net";
 * This module owns that rotation:
 *
 *   - {@link CommandCodeAccountPool.resolveKey} hands out the first account
-*     whose key is not currently marked exhausted, resolving each slot's key
-*     lazily (literal config key → credential seam → launch environment → the
-*     official CLI auth file for the default slot only).
+*     whose key is not currently marked exhausted — or, when the request's
+*     model matches a {@link CommandCodeModelAccountRule} and that account is
+*     usable, the routed account — resolving each slot's key lazily (literal
+*     config key → credential seam → launch environment → the official CLI
+*     auth file for the default slot only).
 *   - {@link CommandCodeAccountPool.markRejected} records a 429 (rate limit,
 *     window unknown) or 401 (invalid key, disabled until the config changes)
 *     against the exact API key, so several slots sharing one key share one
@@ -80,6 +81,25 @@ function selectActiveAccount(accounts, preferredId) {
 	return usable[0];
 }
 /**
+* The first routing rule whose model list contains the request's model id.
+* Undefined when no rule matches.
+*/
+function matchModelRule(model, rules) {
+	if (model === "" || rules === void 0 || rules.length === 0) return void 0;
+	for (const rule of rules) if (rule.models.includes(model)) return rule;
+}
+/**
+* The routed account for a request's model: the first usable account whose
+* slot id matches the first matching rule's target. Undefined when no rule
+* matches or the routed account is not usable (the caller then falls back to
+* the normal preferred/rotation selection).
+*/
+function selectAccountForModel(accounts, model, rules) {
+	const rule = matchModelRule(model, rules);
+	if (rule === void 0) return void 0;
+	return accounts.find((account) => account.slot.id === rule.account && accountUsable(account.state));
+}
+/**
 * The account pool. Rotation state is keyed by API key (never logged), so two
 * slots resolving to the same credential share one mark, and a key changed in
 * the credentials service starts with a clean slate.
@@ -131,12 +151,17 @@ var CommandCodeAccountPool = class {
 		return out;
 	}
 	/**
-	* Hand out the first usable account's key (the manually preferred account
-	* when usable, else rotation order). Returns `undefined` when no account
-	* resolves any key at all (the caller then reports the missing credential).
-	* Throws `RATE_LIMIT` — naming the earliest window reset — or
+	* Hand out the key for a request: the model-routed account when the
+	* request's model matches a rule (and that account is usable), else the
+	* manually preferred account when usable, else the first usable account in
+	* rotation order. Returns `undefined` when no account resolves any key at
+	* all (the caller then reports the missing credential). Throws
+	* `RATE_LIMIT` — naming the earliest window reset — or
 	* `INVALID_CREDENTIAL` when accounts exist but none can serve.
 	*
+	* `options.model` is the request's model id; routing rules re-read per
+	* resolution, so a settings change applies live.
+	*
 	* `options.exclude` skips one key during the probe-revival pass: the
 	* rotation hook excludes the just-rejected key so a probe that clears its
 	* window cannot re-offer the same key within the same request (the adapter
@@ -145,6 +170,8 @@ var CommandCodeAccountPool = class {
 	async resolveKey(options) {
 		const accounts = await this.resolvedAccounts();
 		if (accounts.length === 0) return;
+		const routed = selectAccountForModel(accounts, options?.model ?? "", this.deps.modelAccountRules?.());
+		if (routed !== void 0) return this.pick(routed);
 		const chosen = selectActiveAccount(accounts, this.deps.preferredId?.());
 		if (chosen !== void 0) return this.pick(chosen);
 		await Promise.all(accounts.map(async (account) => {
@@ -216,7 +243,7 @@ var CommandCodeAccountPool = class {
 * and API key or subscription, and Command Code's terms apply.
 *
 * Wire protocol (reverse-engineered by the pi plugin, command-code@1.28.4;
-* re-verified against command-code@1.37.0 — endpoints, request shape, and
+* re-verified against command-code@1.38.2 — endpoints, request shape, and
 * stream events unchanged):
 *   POST {apiBase}/alpha/generate
 *   body: { config, memory, taste, skills, params: { model, messages, tools,
@@ -360,6 +387,11 @@ const KNOWN_EFFORTS = {
 		"max"
 	],
 	"sakana/fugu-ultra": ["high", "xhigh"],
+	"tencent/hy4-preview": [
+		"low",
+		"medium",
+		"high"
+	],
 	"xai/grok-4.5": [
 		"low",
 		"medium",
@@ -444,7 +476,7 @@ const KNOWN_IMAGE_MODELS = /* @__PURE__ */ new Set([
 	"z-ai/glm-5.3-flash"
 ]);
 /**
-* Models the official CLI's model table (command-code@1.37.0) marks
+* Models the official CLI's model table (command-code@1.38.2) marks
 * `reasoning:!0` but defines no selectable `reasoning_effort` levels — they
 * think automatically, with Command Code driving the depth. This is the
 * authoritative "thinks, effort not adjustable" set: `KNOWN_EFFORTS` (which
@@ -452,13 +484,15 @@ const KNOWN_IMAGE_MODELS = /* @__PURE__ */ new Set([
 * effort levels, and this snapshot is not surfaced in the picker's compact
 * description — it exists for programmatic consumers.
 *
-* Source: the command-code@1.37.0 bundled model table (dist/cli.mjs),
+* Source: the command-code@1.38.2 bundled model table (dist/cli.mjs),
 * cross-checked with https://commandcode.ai/docs/reference/cli/models.
 * (`stealth/ox-alpha` left this set in command-code@1.32.1, which gave it
 * selectable `['low', 'high', 'max']` efforts; the preview then ended in
 * 1.34.0, removing the model from the catalog entirely. `tencent/hy4-preview`
 * joined this set in command-code@1.37.0 — reasoning:!0, no efforts, 1M
-* context, routed through OpenRouter.)
+* context, routed through OpenRouter — then gained selectable
+* `['low', 'medium', 'high']` efforts in command-code@1.38.0 and moved to
+* `KNOWN_EFFORTS`.)
 * Keep in sync via the dsh-commandcode-upstream skill.
 */
 const KNOWN_THINKING_MODELS = /* @__PURE__ */ new Set([
@@ -475,7 +509,6 @@ const KNOWN_THINKING_MODELS = /* @__PURE__ */ new Set([
 	"stepfun/Step-3.5-Flash",
 	"stepfun/Step-3.7-Flash",
 	"tencent/hy3-paid",
-	"tencent/hy4-preview",
 	"nvidia/nemotron-3-ultra-550b-a55b",
 	"thinkingmachines/inkling",
 	"thinkingmachines/inkling-small",
@@ -515,6 +548,7 @@ const KNOWN_PLANS = {
 	"deepseek/deepseek-v4-flash-vision-exp": "go",
 	"deepseek/deepseek-v4-pro": "go",
 	"gpt-5.6-luna": "go",
+	"inclusionai/ling-3.0-flash-free": "go",
 	"meta/muse-spark-1.2-contributor": "go",
 	"minimax/minimax-m2.7-free": "go",
 	"minimax/minimax-m3-free": "go",
@@ -527,6 +561,7 @@ const KNOWN_PLANS = {
 	"poolside/laguna-s-2.1-free": "go",
 	"stepfun/Step-3.5-Flash": "go",
 	"stepfun/Step-3.7-Flash": "go",
+	"tencent/Hy3": "go",
 	"tencent/hy3-paid": "go",
 	"tencent/hy4-preview": "go",
 	"thinkingmachines/inkling": "go",
@@ -691,10 +726,6 @@ function modelVisibleInPlan(modelId, access) {
 	return weight <= access.tierWeight;
 }
 const KNOWN_DEALS = {
-	"google/gemini-3.7-flash": {
-		label: "50% off",
-		expiresAt: "2026-12-31T23:59:59Z"
-	},
 	"MiniMaxAI/MiniMax-M3": { label: "50% off" },
 	"xiaomi/mimo-v2.5-pro": { label: "99% off" },
 	"xiaomi/mimo-v2.5": { label: "98% off" },
@@ -763,7 +794,7 @@ function peakPricingLabel(modelId, now = Date.now()) {
 	if (state === void 0) return void 0;
 	return state === "peak" ? "Peak" : "Half";
 }
-const COMMAND_CODE_CLI_VERSION = "1.37.0";
+const COMMAND_CODE_CLI_VERSION = "1.38.2";
 const DEFAULT_API_BASE = "https://api.commandcode.ai";
 const DEFAULT_GENERATE_MAX_TOKENS = 64e3;
 const DEFAULT_MAX_OUTPUT_TOKENS = 65536;
@@ -1406,7 +1437,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 			readImage = (ref) => attachments.readImage(ref).then((stored) => stored.data);
 		}
 		const connection = this.deps.options();
-		let apiKey = await this.deps.resolveApiKey(connection);
+		let apiKey = await this.deps.resolveApiKey(connection, options.model);
 		const modelMax = this.catalog.find((m) => m.id === options.model)?.maxTokens ?? 65536;
 		const maxTokens = Math.min(options.maxTokens ?? modelMax, modelMax, DEFAULT_GENERATE_MAX_TOKENS);
 		const effort = options.reasoningEffort;
@@ -1516,7 +1547,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 			}
 			const rotate = this.deps.rotateApiKey;
 			if ((attempt.status === 429 || attempt.status === 401) && rotate !== void 0 && options.signal?.aborted !== true && tried.size < MAX_ACCOUNT_ROTATIONS) {
-				const next = await rotate(apiKey, attempt.status === 429 ? "rate-limit" : "invalid-credential", connection);
+				const next = await rotate(apiKey, attempt.status === 429 ? "rate-limit" : "invalid-credential", connection, options.model);
 				if (next !== void 0 && !tried.has(next)) {
 					apiKey = next;
 					continue;
@@ -1642,7 +1673,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 					}, {
 						type: "tool-call-delta",
 						index,
-						id: CallId(id),
+						id: ToolCallId(id),
 						name,
 						argumentsDelta: args
 					}, {
@@ -1650,7 +1681,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 						index,
 						block: {
 							type: "tool-call",
-							id: CallId(id),
+							id: ToolCallId(id),
 							name,
 							arguments: args
 						}
@@ -2124,6 +2155,11 @@ const USAGE_HOST_CONTRIBUTION = {
 	package: USAGE_REMOTE_PACKAGE,
 	face: "host",
 	schemas: [],
+	model: {
+		services: [],
+		events: [],
+		objects: []
+	},
 	invocations: [{
 		id: `${USAGE_REMOTE_PACKAGE}#${USAGE_REPORT_ENDPOINT}`,
 		service: "commandcodeUsage",
@@ -2138,6 +2174,39 @@ const USAGE_HOST_CONTRIBUTION = {
 		}
 	}]
 };
+/** Canonical `<namespace>/<method>` endpoint of the model-catalog Remote. */
+const MODELS_ENDPOINT = "commandcode/models";
+/** Parse one untrusted boundary value into a {@link CommandCodeCatalogModel}. */
+function parseCatalogModel(value) {
+	const source = record(value, "model");
+	return {
+		id: stringField(source, "id", "model.id"),
+		name: stringField(source, "name", "model.name")
+	};
+}
+/** Parse the wire result into a {@link CommandCodeCatalog}. */
+function parseCatalog(value) {
+	const models = record(value, "result").models;
+	if (!Array.isArray(models)) reject$1("models");
+	return { models: models.map(parseCatalogModel) };
+}
+/**
+* The model-catalog invocation descriptor, sharing the same `commandcodeUsage`
+* service and `commandcode` namespace as the usage report.
+*/
+const MODELS_DESCRIPTOR = {
+	id: `${USAGE_REMOTE_PACKAGE}#${MODELS_ENDPOINT}`,
+	service: "commandcodeUsage",
+	namespace: "commandcode",
+	method: "models",
+	invocation: { kind: "direct" },
+	parameters: [],
+	result: {
+		mode: "strict",
+		typeSymbol: `${USAGE_REMOTE_PACKAGE}#CommandCodeCatalog`,
+		schema: { parse: parseCatalog }
+	}
+};
 //#endregion
 //#region src/login-wire.ts
 /** The canonical endpoint paths of the three login Remotes. */
@@ -2250,6 +2319,15 @@ var CommandCodeUsageService = class extends TypertRemoteService {
 		}] };
 	}
 	/**
+	* The model catalog for the settings page's routing-rule editor. The
+	* browser never calls the Command Code API directly — the Host serves the
+	* catalog (already fetched/cached by the adapter) so rules can be picked
+	* from the live model list instead of typed by hand.
+	*/
+	async models() {
+		return this.deps.listModels?.() ?? { models: [] };
+	}
+	/**
 	* Start (or rejoin) a browser-login attempt and return its fresh status —
 	* `waiting` carrying the Studio URL. Rejects when the flow cannot start
 	* (no free loopback port, disposed plugin); the Gateway folds the throw
@@ -2283,7 +2361,11 @@ function applyUsageRemote(ctx, deps) {
 		new CommandCodeUsageService(remoteCtx, deps);
 		const unregister = remoteCtx.typert.register({
 			...USAGE_HOST_CONTRIBUTION,
-			invocations: [...USAGE_HOST_CONTRIBUTION.invocations, ...LOGIN_DESCRIPTORS]
+			invocations: [
+				...USAGE_HOST_CONTRIBUTION.invocations,
+				MODELS_DESCRIPTOR,
+				...LOGIN_DESCRIPTORS
+			]
 		});
 		remoteCtx.effect(() => () => void unregister(), "dsh-commandcode-provider: usage remote");
 	});
@@ -2700,7 +2782,7 @@ function corsOrigin(origin) {
 */
 const name = "llm-commandcode";
 const inject = ["llm"];
-const NS = settingsNamespace("llm-commandcode");
+const NS = "llm-commandcode";
 const DEFAULT_API_KEY_ENV = "COMMANDCODE_API_KEY";
 /** The single provider route this plugin owns. */
 const PROVIDER = "commandcode";
@@ -2721,6 +2803,10 @@ const Config = z.object({
 		apiKey: z.string()
 	})),
 	activeAccount: z.string(),
+	modelAccountRules: z.array(z.object({
+		models: z.array(z.string()),
+		account: z.string()
+	})),
 	lang: z.string().pattern(/^(zh|en)$/).default("zh")
 });
 /**
@@ -2791,10 +2877,11 @@ function apply(ctx, config) {
 		resolveRef,
 		authFileKey: resolveAuthFileApiKey,
 		probeWindow: (apiKey) => adapter.probeFiveHourWindow(apiKey),
-		preferredId
+		preferredId,
+		modelAccountRules: () => current().modelAccountRules ?? []
 	});
-	const resolveApiKey = async (connection) => {
-		const resolved = await pool.resolveKey();
+	const resolveApiKey = async (connection, model) => {
+		const resolved = await pool.resolveKey(model === void 0 ? {} : { model });
 		if (resolved !== void 0) return assertUsableApiKey(resolved.key, "llm-commandcode", resolved.slot.ref ?? `${resolved.slot.label} (config.apiKey)`);
 		const ref = connection.apiKeyEnv;
 		throw new LlmError(`llm-commandcode: no API key for provider route "${PROVIDER}"; store ${ref} through the credentials service (the web Models page writes it), export it in the launching environment, set config.apiKey, or run \`command-code login\` to write ~/.commandcode/auth.json`, "MISSING_CREDENTIAL");
@@ -2802,9 +2889,12 @@ function apply(ctx, config) {
 	const adapter = new CommandCodeAdapter({
 		options,
 		resolveApiKey,
-		rotateApiKey: async (rejectedKey, rejection) => {
+		rotateApiKey: async (rejectedKey, rejection, _connection, model) => {
 			pool.markRejected(rejectedKey, rejection);
-			const resolved = await pool.resolveKey({ exclude: rejectedKey });
+			const resolved = await pool.resolveKey(model === void 0 ? { exclude: rejectedKey } : {
+				exclude: rejectedKey,
+				model
+			});
 			return resolved === void 0 ? void 0 : assertUsableApiKey(resolved.key, "llm-commandcode", resolved.slot.ref ?? `${resolved.slot.label} (config.apiKey)`);
 		},
 		resolveAttachments: () => {
@@ -2863,19 +2953,28 @@ function apply(ctx, config) {
 		}
 	});
 	ctx.effect(() => () => loginFlow.dispose(), "dsh-commandcode-provider: login flow");
+	const catalogForRules = async () => {
+		return { models: (await adapter.listModels(PROVIDER)).map((model) => ({
+			id: model.id,
+			name: model.name.replace(/\s*\(CC\)$/, "")
+		})) };
+	};
 	applyUsageRemote(ctx, {
 		adapter,
 		reports: usageReports,
-		login: loginFlow
+		login: loginFlow,
+		listModels: catalogForRules
 	});
-	installSettingsSection(ctx, NS, Config, config, {
-		setSource: (source) => {
-			current = source;
-		},
-		onChange: () => {}
+	ctx.inject(["settings"], (settingsCtx) => {
+		settingsCtx.settings.installSection(ctx, NS, Config, config, {
+			setSource: (source) => {
+				current = source;
+			},
+			onChange: () => {}
+		});
 	});
 }
 //#endregion
-export { BILLING_ACCESS_TTL_MS, COMMAND_CODE_CLI_VERSION, CommandCodeAccountPool, CommandCodeAdapter, CommandCodeLoginFlow, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, PLAN_LABELS, PLAN_ORDER, PROVIDER, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectActiveAccount, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
+export { BILLING_ACCESS_TTL_MS, COMMAND_CODE_CLI_VERSION, CommandCodeAccountPool, CommandCodeAdapter, CommandCodeLoginFlow, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, PLAN_LABELS, PLAN_ORDER, PROVIDER, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, matchModelRule, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectAccountForModel, selectActiveAccount, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
 
 //# sourceMappingURL=index.js.map