@mars-sea/dsh-commandcode-provider 0.6.1 → 0.6.2

package/lib/index.d.ts

@@ -61,8 +61,9 @@ declare const PLAN_LABELS: Readonly<Record<string, string>>;
  */
 declare const PLAN_ORDER: Readonly<Record<string, number>>;
 /**
- * Comparator for the model picker: sort by plan tier (lowest first), then by
- * model name, then by id as a tiebreak. Models with no known plan sort last.
+ * Comparator for the model picker: free models first (zero credit cost, usable
+ * by every account), then by plan tier (lowest first), then by model name,
+ * then by id as a tiebreak. Models with no known plan sort last.
  */
 declare function compareByPlan(a: {
   id: string;
@@ -313,6 +314,12 @@ interface CommandCodePlan {
   /** Billing period end in millis; 0 when the endpoint did not report one. */
   currentPeriodEnd: number;
 }
+/**
+ * Why every account endpoint failed at once (the report then carries no data
+ * at all, so the degraded per-endpoint view would hide the root cause behind
+ * a generic "partial data" note). Undefined for partial failures.
+ */
+type UsageBlockReason = 'invalid-key' | 'service-unavailable' | 'network';
 /** Everything the usage endpoints report, fetched together. */
 interface CommandCodeUsageReport {
   account?: CommandCodeAccount;
@@ -321,6 +328,13 @@ interface CommandCodeUsageReport {
   plan?: CommandCodePlan;
   /** Endpoint failures degrade the report instead of failing it. */
   failures: string[];
+  /**
+   * The single reason every endpoint failed, when they all did: `invalid-key`
+   * (every call rejected with 401 — the stored key is wrong or expired),
+   * `service-unavailable` (every call answered 5xx), or `network` (no HTTP
+   * response at all). Undefined when any endpoint succeeded.
+   */
+  blocked?: UsageBlockReason;
 }
 declare class CommandCodeAdapter<C extends CommandCodeConnectionOptions = CommandCodeConnectionOptions> extends LlmAdapter {
   private readonly deps;

package/lib/index.js

@@ -160,11 +160,11 @@ var CommandCodeAccountPool = class {
 		const revived = selectActiveAccount(await this.resolvedAccounts(), this.deps.preferredId?.());
 		if (revived !== void 0) return this.pick(revived);
 		const latest = await this.resolvedAccounts();
-		if (latest.filter((account) => account.state?.kind === "disabled").length === latest.length) throw new LlmError(`llm-commandcode: every configured Command Code account (${latest.length}) was rejected with 401 — check the stored API keys (Models page / settings) or the auth file`, "INVALID_CREDENTIAL");
+		if (latest.filter((account) => account.state?.kind === "disabled").length === latest.length) throw new LlmError(`llm-commandcode: every configured Command Code account (${latest.length}) was rejected with 401 — check the stored API keys (Models page / settings) or the auth file；已配置的 ${latest.length} 个 Command Code 账户密钥均被拒绝（401）——请在设置页检查存储的 API 密钥，或重新运行 command-code login`, "INVALID_CREDENTIAL");
 		const resets = latest.map((account) => account.state).filter((state) => state !== void 0 && state.kind === "cooldown" && state.until > 0).map((state) => state.until);
 		const earliest = resets.length > 0 ? Math.min(...resets) : 0;
 		const wait = earliest > 0 ? Math.max(1e3, earliest - Date.now()) : 0;
-		throw new LlmError(`llm-commandcode: all ${latest.length} Command Code account(s) have exhausted their usage window` + (earliest > 0 ? `; the earliest window resets at ${clockLabel(earliest)}` : "") + " — requests will succeed again after the reset (or add another account)", "RATE_LIMIT", wait > 0 && wait <= 9e5 ? { providerRetryAfterMs: wait } : void 0);
+		throw new LlmError(`llm-commandcode: all ${latest.length} Command Code account(s) have exhausted their usage window` + (earliest > 0 ? `; the earliest window resets at ${clockLabel(earliest)}` : "") + ` — requests will succeed again after the reset (or add another account)；已用尽全部 ${latest.length} 个 Command Code 账户的用量窗口` + (earliest > 0 ? `，最早的重置时间为 ${clockLabel(earliest)}` : "") + "——窗口重置后请求会自动恢复（也可以添加更多账户）", "RATE_LIMIT", wait > 0 && wait <= 9e5 ? { providerRetryAfterMs: wait } : void 0);
 	}
 	/**
 	* Record a rejection against one key. `rate-limit` (429) marks the key
@@ -556,10 +556,22 @@ const PLAN_ORDER = {
 	max: 4
 };
 /**
-* Comparator for the model picker: sort by plan tier (lowest first), then by
-* model name, then by id as a tiebreak. Models with no known plan sort last.
+* Whether a model is free (requests cost no credits), per the pricing page's
+* deals (`KNOWN_DEALS` `free: true`). Free models lead the picker regardless
+* of tier — they are usable by every account, so they are the best default
+* candidates.
+*/
+function isFreeModel(modelId) {
+	return KNOWN_DEALS[modelId]?.free === true;
+}
+/**
+* Comparator for the model picker: free models first (zero credit cost, usable
+* by every account), then by plan tier (lowest first), then by model name,
+* then by id as a tiebreak. Models with no known plan sort last.
 */
 function compareByPlan(a, b) {
+	const freeDelta = Number(isFreeModel(b.id)) - Number(isFreeModel(a.id));
+	if (freeDelta !== 0) return freeDelta;
 	const pa = PLAN_ORDER[KNOWN_PLANS[a.id] ?? ""] ?? Number.MAX_SAFE_INTEGER;
 	const pb = PLAN_ORDER[KNOWN_PLANS[b.id] ?? ""] ?? Number.MAX_SAFE_INTEGER;
 	if (pa !== pb) return pa - pb;
@@ -1009,6 +1021,8 @@ async function messagesToCC(messages, readImage) {
 	}
 	return out;
 }
+/** Account endpoints fetched by one `getUsage()` run (see the classification there). */
+const USAGE_ENDPOINT_COUNT = 4;
 var CommandCodeAdapter = class extends LlmAdapter {
 	deps;
 	catalog = [];
@@ -1206,6 +1220,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 		const base = this.deps.options().apiBase;
 		const headers = await this.accountHeaders(apiKey);
 		const failures = [];
+		const failedStatuses = [];
 		const getJson = async (path) => {
 			try {
 				const response = await this.fetchImpl(`${base}${path}`, {
@@ -1214,12 +1229,14 @@ var CommandCodeAdapter = class extends LlmAdapter {
 				});
 				if (!response.ok) {
 					failures.push(`${path}: HTTP ${response.status}`);
+					failedStatuses.push(response.status);
 					return;
 				}
 				const parsed = await response.json();
 				return isRecord(parsed) ? parsed : void 0;
 			} catch (error) {
 				failures.push(`${path}: ${error instanceof Error ? error.message : String(error)}`);
+				failedStatuses.push(void 0);
 				return;
 			}
 		};
@@ -1280,6 +1297,12 @@ var CommandCodeAdapter = class extends LlmAdapter {
 				currentPeriodEnd: periodEndValue(subData?.currentPeriodEnd)
 			};
 		}
+		if (failures.length === USAGE_ENDPOINT_COUNT) {
+			const codes = failedStatuses.filter((status) => status !== void 0);
+			if (codes.length === USAGE_ENDPOINT_COUNT && codes.every((code) => code === 401)) report.blocked = "invalid-key";
+			else if (codes.length === USAGE_ENDPOINT_COUNT && codes.every((code) => code >= 500)) report.blocked = "service-unavailable";
+			else if (codes.length === 0) report.blocked = "network";
+		}
 		return report;
 	}
 	/**
@@ -1678,7 +1701,7 @@ function generateHttpError(status, errText, retryAfterMs) {
 		if (isRecord(parsed) && isRecord(parsed.error)) providerCode = stringValue(parsed.error.code);
 	} catch {}
 	const detail = providerCode ?? `HTTP ${status}`;
-	if (status === 401) return new LlmError(`Command Code API error 401 (${detail}): the API key is missing or invalid — check the key stored for COMMANDCODE_API_KEY (Models page) or the auth file`, "INVALID_CREDENTIAL", { status: 401 });
+	if (status === 401) return new LlmError(`Command Code API error 401 (${detail}): the API key is missing or invalid — check the key stored for COMMANDCODE_API_KEY (Models page) or the auth file；Command Code API 返回 401：API 密钥缺失或无效——请在设置页检查 COMMANDCODE_API_KEY 存储的密钥，或检查 auth 文件`, "INVALID_CREDENTIAL", { status: 401 });
 	return new LlmError(`Command Code API error ${status}${detail === `HTTP ${status}` ? "" : ` (${detail})`}: ${errText.slice(0, 500)}`, status === 429 ? "RATE_LIMIT" : "PROVIDER_HTTP_ERROR", {
 		status,
 		...retryAfterMs !== void 0 && retryAfterMs > 0 && retryAfterMs <= 9e5 ? { providerRetryAfterMs: retryAfterMs } : {}
@@ -1719,8 +1742,7 @@ function money(value) {
 function moneyShort(value) {
 	return `$${value.toFixed(2)}`;
 }
-/** Format a token count with thousands separators. */
-/** Format a large token count compactly (1.9亿 style). */
+/** Format a large token count compactly (1.9M style). */
 function tokensCompact(value) {
 	if (value >= 1e9) return `${(value / 1e9).toFixed(1)}B`;
 	if (value >= 1e6) return `${(value / 1e6).toFixed(1)}M`;
@@ -1754,6 +1776,9 @@ function renderReport(report, title) {
 	const lines = [];
 	const account = report.account ? ` (${report.account.userName || report.account.name})` : "";
 	lines.push(title ?? `📊 Command Code 用量${account}`, "");
+	if (report.blocked === "invalid-key") lines.push("⛔ API 密钥无效或已过期 — 服务端拒绝了全部请求（401），请检查该账户的密钥配置", "");
+	else if (report.blocked === "service-unavailable") lines.push("⚠️ Command Code 服务暂时不可用（5xx），稍后重试", "");
+	else if (report.blocked === "network") lines.push("⚠️ 无法连接 Command Code 服务 — 请检查网络或 API 地址", "");
 	if (report.plan && report.plan.name !== "") {
 		const p = report.plan;
 		const status = p.status !== "" && p.status !== "active" ? ` (${p.status})` : "";
@@ -1864,6 +1889,11 @@ function parseUsageReport(value) {
 	const failures = source.failures;
 	if (!Array.isArray(failures) || failures.some((entry) => typeof entry !== "string")) reject("failures");
 	const report = { failures };
+	if (source.blocked !== void 0) {
+		const blocked = source.blocked;
+		if (blocked !== "invalid-key" && blocked !== "service-unavailable" && blocked !== "network") reject("blocked");
+		report.blocked = blocked;
+	}
 	if (source.account !== void 0) {
 		const account = record(source.account, "account");
 		report.account = {