dsh-opendesign-corouter 0.1.2 → 0.1.3

package/lib/index.js

@@ -228,96 +228,59 @@ function inferenceEndpoint(baseURL, protocol) {
   return baseURL.trim() === "" ? suffix : `${openAiBaseURL(baseURL.trim())}${suffix}`;
 }
 
-// src/util.ts
-function record(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function finite(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
-}
-function safeSecret(raw) {
-  const value = raw.trim();
-  if (!value || /[^\x20-\x7e]/u.test(value)) throw new Error("\u51ED\u636E\u4E3A\u7A7A\u6216\u542B\u6709\u4E0D\u53EF\u7528\u4E8E HTTP \u8BF7\u6C42\u5934\u7684\u5B57\u7B26");
-  return value;
-}
-function combinedSignal(signal, timeoutMs) {
-  const deadline = AbortSignal.timeout(timeoutMs);
-  return signal ? AbortSignal.any([signal, deadline]) : deadline;
-}
-function sleep(ms, signal) {
-  return new Promise((resolve) => {
-    if (signal.aborted) return resolve();
-    const done = () => {
-      clearTimeout(timer);
-      signal.removeEventListener("abort", done);
-      resolve();
-    };
-    const timer = setTimeout(done, ms);
-    signal.addEventListener("abort", done, { once: true });
-  });
-}
-
 // src/model-settings.ts
-var MAX_ENTRIES = 512;
-var MAX_MODEL_ID_LENGTH = 128;
-var MODEL_ID = /^[A-Za-z0-9._:/-]{1,128}$/u;
-var MAX_TEMPERATURE = 2;
-var MAX_TOP_P = 1;
-var MAX_TOKENS = 1e7;
-var MAX_CONTEXT_WINDOW = 1e8;
-var REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh", "ultra", "max"];
 var RESERVED_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
-var SETTINGS_FIELDS = /* @__PURE__ */ new Set(["enabled", "temperature", "topP", "maxTokens", "contextWindow", "reasoningEffort"]);
-function flag(value) {
-  if (typeof value !== "boolean") throw new Error("\u6A21\u578B\u8BBE\u7F6E\u7684 enabled \u5FC5\u987B\u662F\u5E03\u5C14\u503C");
-  return value;
-}
-function bounded(value, max, label) {
-  if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > max) throw new Error(`\u6A21\u578B\u8BBE\u7F6E\u7684 ${label} \u5FC5\u987B\u662F 0 \u5230 ${max} \u4E4B\u95F4\u7684\u6709\u9650\u6570\u5B57`);
-  return value;
-}
-function capacity(value, max, label) {
-  if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 1 || value > max) throw new Error(`\u6A21\u578B\u8BBE\u7F6E\u7684 ${label} \u5FC5\u987B\u662F 1 \u5230 ${max} \u4E4B\u95F4\u7684\u6574\u6570`);
-  return value;
-}
-function effort(value) {
-  const hit = REASONING_EFFORTS.find((candidate) => candidate === value);
-  if (hit === void 0) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u7684 reasoningEffort \u4E0D\u5728\u5141\u8BB8\u7684\u53D6\u503C\u5185");
-  return hit;
-}
-function settingsOf(value) {
-  if (!record(value)) throw new Error("\u6BCF\u4E2A\u6A21\u578B\u7684\u8BBE\u7F6E\u5FC5\u987B\u662F\u5BF9\u8C61");
-  for (const field of Object.keys(value)) {
-    if (!SETTINGS_FIELDS.has(field)) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u542B\u6709\u4E0D\u652F\u6301\u7684\u5B57\u6BB5");
-  }
-  const out = {};
-  if (value.enabled !== void 0) out.enabled = flag(value.enabled);
-  if (value.temperature !== void 0) out.temperature = bounded(value.temperature, MAX_TEMPERATURE, "temperature");
-  if (value.topP !== void 0) out.topP = bounded(value.topP, MAX_TOP_P, "topP");
-  if (value.maxTokens !== void 0) out.maxTokens = capacity(value.maxTokens, MAX_TOKENS, "maxTokens");
-  if (value.contextWindow !== void 0) out.contextWindow = capacity(value.contextWindow, MAX_CONTEXT_WINDOW, "contextWindow");
-  if (value.reasoningEffort !== void 0) out.reasoningEffort = effort(value.reasoningEffort);
-  return out;
-}
 function parseModelSettingsMap(value) {
-  if (!record(value)) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u5FC5\u987B\u662F\u5BF9\u8C61");
+  if (value === null || typeof value !== "object" || Array.isArray(value)) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u5FC5\u987B\u662F\u5BF9\u8C61");
   const keys = Object.keys(value);
-  if (keys.length > MAX_ENTRIES) throw new Error(`\u6A21\u578B\u8BBE\u7F6E\u6700\u591A\u5141\u8BB8 ${MAX_ENTRIES} \u4E2A\u6A21\u578B`);
+  if (keys.length > 512) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u6700\u591A\u5141\u8BB8 512 \u4E2A\u6A21\u578B");
+  const fields = /* @__PURE__ */ new Set(["enabled", "temperature", "topP", "maxTokens", "contextWindow", "reasoningEffort"]);
+  const efforts = ["none", "minimal", "low", "medium", "high", "xhigh", "ultra", "max"];
   const out = {};
   for (const id of keys) {
-    if (RESERVED_KEYS.has(id)) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u4E0D\u5141\u8BB8\u4FDD\u7559\u5B57\u6BB5\u540D");
-    if (!MODEL_ID.test(id)) throw new Error(`\u6A21\u578B ID \u5FC5\u987B\u662F 1\u2013${MAX_MODEL_ID_LENGTH} \u4F4D\u5B57\u6BCD\u3001\u6570\u5B57\u6216 . _ : / -`);
-    out[id] = settingsOf(value[id]);
+    if (["__proto__", "constructor", "prototype"].includes(id)) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u4E0D\u5141\u8BB8\u4FDD\u7559\u5B57\u6BB5\u540D");
+    if (!/^[A-Za-z0-9._:/-]{1,128}$/u.test(id)) throw new Error("\u6A21\u578B ID \u5FC5\u987B\u662F 1\u2013128 \u4F4D\u5B57\u6BCD\u3001\u6570\u5B57\u6216 . _ : / -");
+    const entry = value[id];
+    if (entry === null || typeof entry !== "object" || Array.isArray(entry)) throw new Error("\u6BCF\u4E2A\u6A21\u578B\u7684\u8BBE\u7F6E\u5FC5\u987B\u662F\u5BF9\u8C61");
+    const settings = entry;
+    for (const field of Object.keys(settings)) {
+      if (!fields.has(field)) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u542B\u6709\u4E0D\u652F\u6301\u7684\u5B57\u6BB5");
+    }
+    const parsed = {};
+    if (settings.enabled !== void 0) {
+      if (typeof settings.enabled !== "boolean") throw new Error("\u6A21\u578B\u8BBE\u7F6E\u7684 enabled \u5FC5\u987B\u662F\u5E03\u5C14\u503C");
+      parsed.enabled = settings.enabled;
+    }
+    for (const [field, max] of [["temperature", 2], ["topP", 1]]) {
+      const item = settings[field];
+      if (item === void 0) continue;
+      if (typeof item !== "number" || !Number.isFinite(item) || item < 0 || item > max) throw new Error(`\u6A21\u578B\u8BBE\u7F6E\u7684 ${field} \u5FC5\u987B\u662F 0 \u5230 ${max} \u4E4B\u95F4\u7684\u6709\u9650\u6570\u5B57`);
+      parsed[field] = item;
+    }
+    for (const [field, max] of [["maxTokens", 1e7], ["contextWindow", 1e8]]) {
+      const item = settings[field];
+      if (item === void 0) continue;
+      if (typeof item !== "number" || !Number.isSafeInteger(item) || item < 1 || item > max) throw new Error(`\u6A21\u578B\u8BBE\u7F6E\u7684 ${field} \u5FC5\u987B\u662F 1 \u5230 ${max} \u4E4B\u95F4\u7684\u6574\u6570`);
+      parsed[field] = item;
+    }
+    if (settings.reasoningEffort !== void 0) {
+      if (typeof settings.reasoningEffort !== "string" || !efforts.includes(settings.reasoningEffort)) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u7684 reasoningEffort \u4E0D\u5728\u5141\u8BB8\u7684\u53D6\u503C\u5185");
+      parsed.reasoningEffort = settings.reasoningEffort;
+    }
+    if (parsed.maxTokens !== void 0 && parsed.contextWindow !== void 0 && parsed.maxTokens >= parsed.contextWindow) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u7684 maxTokens \u5FC5\u987B\u5C0F\u4E8E contextWindow");
+    out[id] = parsed;
   }
   return out;
 }
 function applyModelSettings(row, settings) {
   const { contextWindow, maxTokens } = settings ?? {};
   if (contextWindow === void 0 && maxTokens === void 0) return { ...row };
+  if (contextWindow !== void 0) parseModelSettingsMap({ model: { contextWindow } });
+  if (maxTokens !== void 0) parseModelSettingsMap({ model: { maxTokens } });
   return {
     ...row,
-    ...contextWindow === void 0 ? {} : { contextWindow: capacity(contextWindow, MAX_CONTEXT_WINDOW, "contextWindow") },
-    ...maxTokens === void 0 ? {} : { maxOutputTokens: capacity(maxTokens, MAX_TOKENS, "maxTokens") }
+    ...contextWindow === void 0 ? {} : { contextWindow },
+    ...maxTokens === void 0 ? {} : { maxOutputTokens: maxTokens }
   };
 }
 function isModelEnabled(id, settings = {}) {
@@ -331,10 +294,10 @@ var PLAN_PROVIDER = "opendesign-corouter-plan";
 var PAID_PROVIDER = "opendesign-corouter-paid";
 var DEFAULT_BASE_URL = "https://amr-link.open-design.ai/v1";
 var Config = Schema.object({
-  apiKeyEnv: Schema.string().pattern(/^[A-Za-z_][A-Za-z0-9_]*$/u).default("COROUTER_API_KEY").description("CoRouter API Key \u7684\u73AF\u5883\u53D8\u91CF\u6216 DSH \u51ED\u636E\u5F15\u7528\u540D").volatile(),
-  baseURL: Schema.transform(Schema.string(), (value) => assertBaseURL(value)).default(DEFAULT_BASE_URL).description("CoRouter \u7F51\u5173\u5730\u5740\uFF1B\u4E0D\u7528\u4E8E\u63A7\u5236\u53F0\u767B\u5F55\u6216\u989D\u5EA6\u67E5\u8BE2").volatile(),
+  apiKeyEnv: Schema.string().max(128).pattern(/^[A-Za-z_][A-Za-z0-9_]*$/u).default("COROUTER_API_KEY").description("CoRouter API Key \u7684\u73AF\u5883\u53D8\u91CF\u6216 DSH \u51ED\u636E\u5F15\u7528\u540D").volatile(),
+  baseURL: Schema.transform(Schema.string(), assertBaseURL).default(DEFAULT_BASE_URL).description("CoRouter \u7F51\u5173\u5730\u5740\uFF1B\u4E0D\u7528\u4E8E\u63A7\u5236\u53F0\u767B\u5F55\u6216\u989D\u5EA6\u67E5\u8BE2").volatile(),
   apiProtocol: Schema.union(API_PROTOCOL_IDS).default("chat-completions").description("\u63A8\u7406 API \u534F\u8BAE\uFF1B\u6A21\u578B\u53D1\u73B0\u59CB\u7EC8\u4F7F\u7528 OpenAI models \u63A5\u53E3").volatile(),
-  modelSettings: Schema.transform(Schema.dict(Schema.any()), (value) => parseModelSettingsMap(value)).default({}).description("\u9010\u6A21\u578B\u542F\u7528\u72B6\u6001\u548C\u8BF7\u6C42\u53C2\u6570").volatile(),
+  modelSettings: Schema.transform(Schema.dict(Schema.any()), parseModelSettingsMap).default({}).description("\u9010\u6A21\u578B\u542F\u7528\u72B6\u6001\u548C\u8BF7\u6C42\u53C2\u6570").volatile(),
   useDesktopCredential: Schema.boolean().default(true).description("\u4F18\u5148\u8BFB\u53D6 OpenDesign \u684C\u9762\u7AEF\u767B\u5F55\u6001\u67E5\u8BE2\u989D\u5EA6").volatile(),
   emptyTurnGuard: Schema.boolean().default(true).description("\u76D1\u63A7\u5957\u9910\u8D60\u9001\u6A21\u578B\u7684\u7A7A\u8F6E/\u534F\u8BAE\u6B8B\u6E23\uFF1B\u7531\u5BBF\u4E3B\u91CD\u8BD5\u7B56\u7565\u5904\u7406\uFF0C\u53EF\u80FD\u989D\u5916\u6D88\u8017\u8D60\u9001\u989D\u5EA6").volatile(),
   quotaRefreshSeconds: Schema.natural().min(5).max(3600).default(60).description("\u989D\u5EA6\u81EA\u52A8\u5237\u65B0\u95F4\u9694\uFF08\u79D2\uFF09").volatile(),
@@ -342,6 +305,7 @@ var Config = Schema.object({
   streamIdleTimeoutMs: Schema.natural().min(1e3).max(18e5).default(3e5).description("\u6D41\u5F0F\u54CD\u5E94\u65E0\u6570\u636E\u8D85\u65F6\uFF08\u6BEB\u79D2\uFF09").volatile()
 });
 function assertBaseURL(raw) {
+  if (raw.length > 2048) throw new Error("\u63A8\u7406 Base URL \u6700\u591A\u5141\u8BB8 2048 \u5B57\u7B26");
   let url;
   try {
     url = new URL(raw);
@@ -350,7 +314,9 @@ function assertBaseURL(raw) {
   }
   if (!["https:", "http:"].includes(url.protocol) || url.username || url.password || url.search || url.hash) throw new Error("\u63A8\u7406 Base URL \u4E0D\u53EF\u5305\u542B\u51ED\u636E\u3001\u67E5\u8BE2\u4E32\u6216\u7247\u6BB5");
   if (url.protocol === "http:" && !["localhost", "127.0.0.1", "[::1]"].includes(url.hostname)) throw new Error("\u975E\u672C\u673A\u63A8\u7406\u5730\u5740\u5FC5\u987B\u4F7F\u7528 HTTPS");
-  return url.href.replace(/\/+$/u, "");
+  const normalized = url.href.replace(/\/+$/u, "");
+  if (normalized.length > 2048) throw new Error("\u63A8\u7406 Base URL \u6700\u591A\u5141\u8BB8 2048 \u5B57\u7B26");
+  return normalized;
 }
 function readConfig(config) {
   return {
@@ -462,6 +428,35 @@ function estimateTokens(value) {
 // src/stream.ts
 import { LlmError as LlmError4, ToolCallId } from "@deepseek-ai/dsh-llm";
 
+// src/util.ts
+function record(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function finite(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function safeSecret(raw) {
+  const value = raw.trim();
+  if (!value || /[^\x20-\x7e]/u.test(value)) throw new Error("\u51ED\u636E\u4E3A\u7A7A\u6216\u542B\u6709\u4E0D\u53EF\u7528\u4E8E HTTP \u8BF7\u6C42\u5934\u7684\u5B57\u7B26");
+  return value;
+}
+function combinedSignal(signal, timeoutMs) {
+  const deadline = AbortSignal.timeout(timeoutMs);
+  return signal ? AbortSignal.any([signal, deadline]) : deadline;
+}
+function sleep(ms, signal) {
+  return new Promise((resolve) => {
+    if (signal.aborted) return resolve();
+    const done = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", done);
+      resolve();
+    };
+    const timer = setTimeout(done, ms);
+    signal.addEventListener("abort", done, { once: true });
+  });
+}
+
 // src/protocols/errors.ts
 import {
   ACCOUNT_QUOTA_EXCEEDED_CODE,
@@ -1130,12 +1125,12 @@ function buildMessagesRequest(ctx) {
   if (ctx.topP !== void 0) body.top_p = ctx.topP;
   if (options.stop?.length) body.stop_sequences = options.stop;
   if (options.reasoningEffort !== void 0) {
-    const effort2 = String(options.reasoningEffort);
-    if (effort2 === "none") body.thinking = { type: "disabled" };
-    else if (THINKING_EFFORTS.includes(effort2)) {
+    const effort = String(options.reasoningEffort);
+    if (effort === "none") body.thinking = { type: "disabled" };
+    else if (THINKING_EFFORTS.includes(effort)) {
       body.thinking = { type: "adaptive" };
-      body.output_config = { effort: effort2 };
-    } else throw new LlmError7(`Anthropic Messages \u534F\u8BAE\u4E0D\u63A5\u53D7\u601D\u8003\u6DF1\u5EA6\u300C${effort2}\u300D`, "UNSUPPORTED_OPTION");
+      body.output_config = { effort };
+    } else throw new LlmError7(`Anthropic Messages \u534F\u8BAE\u4E0D\u63A5\u53D7\u601D\u8003\u6DF1\u5EA6\u300C${effort}\u300D`, "UNSUPPORTED_OPTION");
   }
   return { url: messagesURL(ctx.baseURL), headers: streamHeaders(ctx.apiKey, { "anthropic-version": ANTHROPIC_VERSION }), body };
 }
@@ -1330,7 +1325,7 @@ import {
   LlmError as LlmError8,
   ToolCallId as ToolCallId3
 } from "@deepseek-ai/dsh-llm";
-var REASONING_EFFORTS2 = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
+var REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
 function userContent(text2, images) {
   if (!images.length) return text2;
   return [
@@ -1390,9 +1385,9 @@ function buildResponsesRequest(ctx) {
     body.max_output_tokens = options.maxTokens;
   }
   if (options.reasoningEffort !== void 0) {
-    const effort2 = String(options.reasoningEffort);
-    if (!REASONING_EFFORTS2.includes(effort2)) throw new LlmError8(`Responses \u534F\u8BAE\u4E0D\u63A5\u53D7\u601D\u8003\u6DF1\u5EA6\u300C${effort2}\u300D`, "UNSUPPORTED_OPTION");
-    body.reasoning = { effort: effort2, summary: "auto" };
+    const effort = String(options.reasoningEffort);
+    if (!REASONING_EFFORTS.includes(effort)) throw new LlmError8(`Responses \u534F\u8BAE\u4E0D\u63A5\u53D7\u601D\u8003\u6DF1\u5EA6\u300C${effort}\u300D`, "UNSUPPORTED_OPTION");
+    body.reasoning = { effort, summary: "auto" };
   }
   if (options.stop?.length) throw new LlmError8("Responses \u534F\u8BAE\u4E0D\u652F\u6301 stop \u5E8F\u5217", "UNSUPPORTED_OPTION");
   return { url: inferenceEndpoint(ctx.baseURL, "responses"), headers: streamHeaders(ctx.apiKey), body };
@@ -1485,6 +1480,18 @@ async function* streamResponses(body, signal, idleMs) {
     }
     out.push({ type: "tool-call-delta", index: call.index, id: ToolCallId3(call.id), ...name2, argumentsDelta: delta });
   }
+  function completeCall(call, item, out) {
+    const args = item.arguments;
+    let delta = "";
+    if (args !== void 0) {
+      if (typeof args !== "string" || !args.startsWith(call.args)) {
+        throw new LlmError8("OpenDesign\uFF1A\u5DE5\u5177\u8C03\u7528\u5B8C\u6574\u53C2\u6570\u4E0E\u6D41\u5F0F\u589E\u91CF\u4E0D\u4E00\u81F4", "INVALID_RESPONSE");
+      }
+      delta = args.slice(call.args.length);
+      call.args = args;
+    }
+    flushCall(call, delta, out);
+  }
   function keyFor(value, kind, outputIndex) {
     const itemId = str(value.item_id) ?? (outputIndex === void 0 ? void 0 : keyByOutput.get(outputIndex));
     return `${kind}:${itemId ?? `idx:${outputIndex ?? -1}`}`;
@@ -1496,10 +1503,10 @@ async function* streamResponses(body, signal, idleMs) {
       if (item.type === "function_call") {
         const itemId = str(item.id) ?? str(item.call_id);
         const callId = str(item.call_id) ?? itemId;
-        if (!callId || [...calls.values()].some((call2) => call2.id === callId)) continue;
-        const call = callState(`call:${itemId ?? callId}`, item, out);
-        call.args = str(item.arguments) ?? call.args;
-        flushCall(call, call.args, out);
+        if (!callId) continue;
+        const existing = [...calls].find(([, call2]) => call2.id === callId);
+        const call = callState(existing?.[0] ?? `call:${itemId ?? callId}`, item, out);
+        completeCall(call, item, out);
         continue;
       }
       if (item.type === "message") {
@@ -1612,11 +1619,7 @@ async function* streamResponses(body, signal, idleMs) {
         const outputIndex = int(value.output_index);
         if (item.type === "function_call") {
           const call = callState(keyFor(value, "call", outputIndex), item, out);
-          const args = str(item.arguments);
-          if (args !== void 0 && call.args === "") {
-            call.args = args;
-            flushCall(call, args, out);
-          } else flushCall(call, "", out);
+          completeCall(call, item, out);
         } else if (item.type === "message") {
           const key = `text:${str(item.id) ?? `idx:${outputIndex ?? -1}`}:0`;
           if (!texts.has(key)) {
@@ -1787,13 +1790,13 @@ var CoRouterAdapter = class extends LlmAdapter {
       if (room < 1) throw new LlmError10("\u5F53\u524D\u8F93\u5165\u6CA1\u6709\u4E3A\u8F93\u51FA\u7559\u4E0B\u4E0A\u4E0B\u6587\u7A7A\u95F4", "CONTEXT_WINDOW_EXCEEDED");
       maxTokens = Math.min(capped, Math.floor(room));
     }
-    const effort2 = options.reasoningEffort ?? (setting.reasoningEffort ? ReasoningEffortId(setting.reasoningEffort) : void 0);
-    if (effort2 !== void 0 && row.reasoningEfforts && !row.reasoningEfforts.includes(effort2)) throw new LlmError10("\u8BE5\u6A21\u578B\u4E0D\u652F\u6301\u6240\u9009\u601D\u8003\u6DF1\u5EA6", "UNSUPPORTED_OPTION");
+    const effort = options.reasoningEffort ?? (setting.reasoningEffort ? ReasoningEffortId(setting.reasoningEffort) : void 0);
+    if (effort !== void 0 && row.reasoningEfforts && !row.reasoningEfforts.includes(effort)) throw new LlmError10("\u8BE5\u6A21\u578B\u4E0D\u652F\u6301\u6240\u9009\u601D\u8003\u6DF1\u5EA6", "UNSUPPORTED_OPTION");
     const effective = {
       ...projectedOptions,
       ...(options.temperature ?? setting.temperature) === void 0 ? {} : { temperature: options.temperature ?? setting.temperature },
       ...maxTokens === void 0 ? {} : { maxTokens },
-      ...effort2 === void 0 ? {} : { reasoningEffort: effort2 }
+      ...effort === void 0 ? {} : { reasoningEffort: effort }
     };
     const protocol = protocolFor(protocolId);
     const request = protocol.build({ baseURL: config.baseURL, apiKey: key, model: row, options: effective, images, ...setting.topP === void 0 ? {} : { topP: setting.topP } });
@@ -1859,7 +1862,7 @@ var DISCOVERY_TIMEOUT_MS = 2e4;
 var MAX_DISCOVERY_BODY_BYTES = 2 * 1024 * 1024;
 var MAX_MODELS = 512;
 var MAX_MODEL_NAME_LENGTH = 128;
-var MODEL_ID2 = /^[A-Za-z0-9._:/-]{1,128}$/u;
+var MODEL_ID = /^[A-Za-z0-9._:/-]{1,128}$/u;
 var MEDIA_MODEL_ID = /^(?:gpt-image-|nano-banana-|seedream-|imagen-|veo-|doubao-seedance-|sora-)/u;
 var MESSAGES2 = {
   url: "\u6A21\u578B\u53D1\u73B0\u5730\u5740\u65E0\u6548\uFF1A\u5FC5\u987B\u662F\u7EDD\u5BF9 HTTP(S) \u5730\u5740\uFF0C\u4E14\u4E0D\u542B\u51ED\u636E\u3001\u67E5\u8BE2\u4E32\u6216\u7247\u6BB5",
@@ -1933,7 +1936,7 @@ function normalize(body) {
   const seen = /* @__PURE__ */ new Set();
   const rows = [];
   for (const value of body.data) {
-    if (!record(value) || typeof value.id !== "string" || !MODEL_ID2.test(value.id) || ["__proto__", "constructor", "prototype"].includes(value.id)) continue;
+    if (!record(value) || typeof value.id !== "string" || !MODEL_ID.test(value.id) || ["__proto__", "constructor", "prototype"].includes(value.id)) continue;
     if (MEDIA_MODEL_ID.test(value.id) || seen.has(value.id)) continue;
     seen.add(value.id);
     const known = findModel(value.id);
@@ -2249,7 +2252,7 @@ var ConsoleLogin = class {
     job.status.jobId = job.id;
     job.status.startedAt = job.startedAt;
     this.job = job;
-    job.timer = setTimeout(() => this.finish(job, "cancelled", "\u767B\u5F55\u5DF2\u8D85\u8FC7\u4E94\u5206\u949F\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB"), this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+    job.timer = setTimeout(() => this.requestCancellation(job, "\u767B\u5F55\u5DF2\u8D85\u8FC7\u4E94\u5206\u949F\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB"), this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
     job.timer.unref?.();
     job.capturedAt = Promise.resolve().then(() => this.callbacks.capture(job.expectedRevision)).then((captured) => {
       job.captured = captured;
@@ -2269,25 +2272,31 @@ var ConsoleLogin = class {
   cancel(request) {
     const job = this.job;
     if (!job || job.status.jobId !== request.jobId) return this.status();
-    if (job.committing) {
-      job.cancelRequested = true;
-      job.controller.abort();
-      return this.status();
-    }
-    if (ACTIVE.has(job.status.state)) this.finish(job, "cancelled", "\u767B\u5F55\u5DF2\u53D6\u6D88\uFF0C\u672A\u4FDD\u5B58 Cookie");
+    this.requestCancellation(job, "\u767B\u5F55\u5DF2\u53D6\u6D88\uFF0C\u672A\u4FDD\u5B58 Cookie");
     return this.status();
   }
   /** Plugin teardown: abort the attempt and close the browser. */
   dispose() {
     const job = this.job;
-    if (job && job.committing) {
-      job.cancelRequested = true;
-      job.controller.abort();
-    } else if (job && ACTIVE.has(job.status.state)) {
-      this.finish(job, "cancelled", "\u670D\u52A1\u5DF2\u5378\u8F7D\uFF0C\u767B\u5F55\u5DF2\u53D6\u6D88");
-    }
+    if (job) this.requestCancellation(job, "\u670D\u52A1\u5DF2\u5378\u8F7D\uFF0C\u767B\u5F55\u5DF2\u53D6\u6D88");
     this.disposed = true;
   }
+  /** Every cancellation source must let an in-flight atomic store decide the final outcome. */
+  requestCancellation(job, message) {
+    if (this.job !== job || !ACTIVE.has(job.status.state)) return;
+    if (!job.committing) {
+      this.finish(job, "cancelled", message);
+      return;
+    }
+    if (!job.cancelRequested) {
+      job.cancellationMessage = message;
+      job.status.message = "\u6B63\u5728\u786E\u8BA4\u4F1A\u8BDD\u4FDD\u5B58\u7ED3\u679C";
+    }
+    job.cancelRequested = true;
+    this.stopTimer(job);
+    job.controller.abort();
+    void this.close(job);
+  }
   alive(job) {
     if (this.disposed || this.job !== job) return false;
     if (job.controller.signal.aborted && !job.committing) return false;
@@ -2325,7 +2334,7 @@ var ConsoleLogin = class {
     const browser = await launch(job.controller.signal);
     if (!browser) return null;
     job.browser = browser;
-    browser.on?.("disconnected", () => this.finish(job, "cancelled", "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED\uFF0C\u672A\u4FDD\u5B58 Cookie"));
+    browser.on?.("disconnected", () => this.requestCancellation(job, "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED\uFF0C\u672A\u4FDD\u5B58 Cookie"));
     return browser;
   }
   async run(job) {
@@ -2342,7 +2351,7 @@ var ConsoleLogin = class {
       return;
     }
     const page = await context.newPage();
-    page.on?.("close", () => this.finish(job, "cancelled", "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED\uFF0C\u672A\u4FDD\u5B58 Cookie"));
+    page.on?.("close", () => this.requestCancellation(job, "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED\uFF0C\u672A\u4FDD\u5B58 Cookie"));
     if (!this.alive(job)) {
       await this.close(job);
       return;
@@ -2416,7 +2425,7 @@ var ConsoleLogin = class {
     } catch (error) {
       job.committing = false;
       if (job.cancelRequested || job.controller.signal.aborted) {
-        this.finish(job, "cancelled", "\u767B\u5F55\u5DF2\u53D6\u6D88\uFF0C\u672A\u4FDD\u5B58 Cookie");
+        this.finish(job, "cancelled", job.cancellationMessage ?? "\u767B\u5F55\u5DF2\u53D6\u6D88\uFF0C\u672A\u4FDD\u5B58 Cookie");
         return "cancelled";
       }
       if (FATAL_COMMIT_CODES.has(errorCode(error) ?? "")) {
@@ -2611,6 +2620,7 @@ async function readDesktopQuota(session, signal, runner = runVela, fetcher = fet
     consoleJson(`${session.apiUrl}/api/v1/wallet/balance`, session, deadline, fetcher),
     cli
   ]);
+  if (wallet.status === "rejected" && wallet.reason instanceof ConsoleError && wallet.reason.kind === "auth") throw wallet.reason;
   const walletBalances = wallet.status === "fulfilled" ? normalizeBalances(wallet.value) : {};
   const cliBalances = funding.status === "fulfilled" && "balance" in funding.value ? normalizeBalances({ balanceUsd: funding.value.balance }) : {};
   const windows = funding.status === "fulfilled" ? funding.value.windows : [];
@@ -2623,7 +2633,7 @@ async function readDesktopQuota(session, signal, runner = runVela, fetcher = fet
   }
   const tier = (funding.status === "fulfilled" ? funding.value.tier : void 0) ?? session.plan;
   const updatedAt = funding.status === "fulfilled" && funding.value.generatedAt || (/* @__PURE__ */ new Date()).toISOString();
-  const note = noSubscription ? "\u684C\u9762\u767B\u5F55\u6001\u663E\u793A\u8BE5\u8D26\u53F7\u6CA1\u6709 Design Plan \u8BA2\u9605\uFF1B\u672A\u8BFB\u5230\u7684\u5206\u6C60\u4FDD\u6301\u672A\u77E5\u3002\u5982\u9700\u5B8C\u6574\u5206\u6C60\uFF0C\u8BF7\u5728\u8FDE\u63A5\u9875\u767B\u5F55\u5E76\u5173\u95ED\u201C\u4F18\u5148\u684C\u9762\u767B\u5F55\u6001\u201D\u3002" : !windows.length ? "\u684C\u9762\u767B\u5F55\u6001\u672A\u8FD4\u56DE\u5957\u9910\u7A97\u53E3\uFF1B\u5DF2\u8BFB\u5230\u7684\u94B1\u5305\u4F59\u989D\u7167\u5E38\u663E\u793A\uFF0C\u672A\u8BFB\u5230\u7684\u5206\u6C60\u4FDD\u6301\u672A\u77E5\u3002\u5982\u9700\u5B8C\u6574\u5206\u6C60\uFF0C\u8BF7\u5728\u8FDE\u63A5\u9875\u767B\u5F55\u5E76\u5173\u95ED\u201C\u4F18\u5148\u684C\u9762\u767B\u5F55\u6001\u201D\u3002" : "\u684C\u9762\u767B\u5F55\u6001\u90E8\u5206\u63A5\u53E3\u6743\u9650\u53D7\u9650\uFF1B\u672A\u8BFB\u5230\u7684\u5206\u6C60\u663E\u793A\u672A\u77E5\u3002\u5982\u9700\u5B8C\u6574\u5206\u6C60\uFF0C\u8BF7\u5728\u8FDE\u63A5\u9875\u767B\u5F55\u5E76\u5173\u95ED\u201C\u4F18\u5148\u684C\u9762\u767B\u5F55\u6001\u201D\u3002";
+  const note = noSubscription ? "\u684C\u9762\u767B\u5F55\u6001\u663E\u793A\u8BE5\u8D26\u53F7\u6CA1\u6709 Design Plan \u8BA2\u9605\uFF1B\u672A\u8BFB\u5230\u7684\u5206\u6C60\u4FDD\u6301\u672A\u77E5\u3002\u53EF\u5728\u8FDE\u63A5\u9875\u5B8C\u6210\u72EC\u7ACB\u767B\u5F55\uFF0C\u63D2\u4EF6\u4F1A\u4F18\u5148\u91C7\u7528\u53EF\u8BFB\u53D6\u7684\u5B8C\u6574\u989D\u5EA6\u3002" : !windows.length ? "\u684C\u9762\u767B\u5F55\u6001\u672A\u8FD4\u56DE\u5957\u9910\u7A97\u53E3\uFF1B\u5DF2\u8BFB\u5230\u7684\u94B1\u5305\u4F59\u989D\u7167\u5E38\u663E\u793A\uFF0C\u672A\u8BFB\u5230\u7684\u5206\u6C60\u4FDD\u6301\u672A\u77E5\u3002\u53EF\u5728\u8FDE\u63A5\u9875\u5B8C\u6210\u72EC\u7ACB\u767B\u5F55\uFF0C\u63D2\u4EF6\u4F1A\u4F18\u5148\u91C7\u7528\u53EF\u8BFB\u53D6\u7684\u5B8C\u6574\u989D\u5EA6\u3002" : "\u684C\u9762\u767B\u5F55\u6001\u90E8\u5206\u63A5\u53E3\u6743\u9650\u53D7\u9650\uFF1B\u672A\u8BFB\u5230\u7684\u5206\u6C60\u663E\u793A\u672A\u77E5\u3002\u53EF\u5728\u8FDE\u63A5\u9875\u5B8C\u6210\u72EC\u7ACB\u767B\u5F55\uFF0C\u63D2\u4EF6\u4F1A\u4F18\u5148\u91C7\u7528\u53EF\u8BFB\u53D6\u7684\u5B8C\u6574\u989D\u5EA6\u3002";
   return {
     state: "partial",
     source: "desktop",
@@ -2649,7 +2659,7 @@ var MAX_WINDOWS = 64;
 var MAX_API_KEY = 16384;
 var HTTP_ASCII = /^[\x21-\x7e]+$/u;
 var ENV_REF = /^[A-Za-z_][A-Za-z0-9_]*$/u;
-var MODEL_ID3 = /^[A-Za-z0-9._:/-]{1,128}$/u;
+var MODEL_ID2 = /^[A-Za-z0-9._:/-]{1,128}$/u;
 var LOGIN_PHASES = ["idle", "launching", "waiting", "verifying", "success", "cancelled", "error"];
 var QUOTA_STATES = ["ok", "partial", "need-login", "error"];
 var SESSION_SOURCES = ["desktop", "login", "environment"];
@@ -2663,7 +2673,7 @@ function isoTime(value, label) {
   if (!Number.isFinite(Date.parse(time))) throw new Error(`${label} \u5FC5\u987B\u662F ISO \u65F6\u95F4\u5B57\u7B26\u4E32`);
   return time;
 }
-function flag2(value, label) {
+function flag(value, label) {
   if (typeof value !== "boolean") throw new Error(`${label} \u5FC5\u987B\u662F\u5E03\u5C14\u503C`);
   return value;
 }
@@ -2719,11 +2729,11 @@ function parseQuotaSnapshot(value) {
     ...value.subscriptionPeriodStart === void 0 ? {} : { subscriptionPeriodStart: isoTime(value.subscriptionPeriodStart, "\u8BA2\u9605\u5468\u671F\u5F00\u59CB\u65F6\u95F4") },
     ...value.subscriptionPeriodEnd === void 0 ? {} : { subscriptionPeriodEnd: isoTime(value.subscriptionPeriodEnd, "\u8BA2\u9605\u5468\u671F\u7ED3\u675F\u65F6\u95F4") },
     ...value.nextRefreshAt === void 0 ? {} : { nextRefreshAt: isoTime(value.nextRefreshAt, "\u4E0B\u6B21\u81EA\u52A8\u5237\u65B0\u65F6\u95F4") },
-    ...value.stale === void 0 ? {} : { stale: flag2(value.stale, "\u5386\u53F2\u989D\u5EA6\u8BFB\u6570") },
+    ...value.stale === void 0 ? {} : { stale: flag(value.stale, "\u5386\u53F2\u989D\u5EA6\u8BFB\u6570") },
     ...value.refreshFailures === void 0 ? {} : { refreshFailures: count(value.refreshFailures, "\u8FDE\u7EED\u5237\u65B0\u5931\u8D25\u6B21\u6570") },
-    ...value.autoRefreshPaused === void 0 ? {} : { autoRefreshPaused: flag2(value.autoRefreshPaused, "\u81EA\u52A8\u5237\u65B0\u6682\u505C\u72B6\u6001") },
+    ...value.autoRefreshPaused === void 0 ? {} : { autoRefreshPaused: flag(value.autoRefreshPaused, "\u81EA\u52A8\u5237\u65B0\u6682\u505C\u72B6\u6001") },
     ...value.tier === void 0 ? {} : { tier: text(value.tier, "\u5957\u9910\u540D", MAX_TIER) },
-    ...value.eligible === void 0 ? {} : { eligible: flag2(value.eligible, "\u5957\u9910\u8D44\u683C") },
+    ...value.eligible === void 0 ? {} : { eligible: flag(value.eligible, "\u5957\u9910\u8D44\u683C") },
     windows: windows.map(parseQuotaWindow),
     balances: {
       ...balances.subscriptionUsd === void 0 ? {} : { subscriptionUsd: amount(balances.subscriptionUsd, "\u8BA2\u9605\u4F59\u989D") },
@@ -2748,12 +2758,12 @@ function parseLoginState(value) {
 function parseStatusModel(value) {
   if (!record(value)) throw new Error("\u6A21\u578B\u6761\u76EE\u5FC5\u987B\u662F\u5BF9\u8C61");
   const id = text(value.id, "\u6A21\u578B id", 128);
-  if (!MODEL_ID3.test(id)) throw new Error("\u6A21\u578B id \u542B\u4E0D\u5141\u8BB8\u7684\u5B57\u7B26");
+  if (!MODEL_ID2.test(id)) throw new Error("\u6A21\u578B id \u542B\u4E0D\u5141\u8BB8\u7684\u5B57\u7B26");
   return {
     id,
     name: text(value.name, "\u6A21\u578B\u540D", 128),
     group: member(value.group, MODEL_GROUPS, "\u6A21\u578B\u5206\u7EC4"),
-    ...value.enabled === void 0 ? {} : { enabled: flag2(value.enabled, "\u6A21\u578B\u542F\u7528\u72B6\u6001") },
+    ...value.enabled === void 0 ? {} : { enabled: flag(value.enabled, "\u6A21\u578B\u542F\u7528\u72B6\u6001") },
     ...value.contextWindow === void 0 ? {} : { contextWindow: positiveInteger(value.contextWindow, "\u4E0A\u4E0B\u6587\u9884\u7B97", 1e8) },
     ...value.maxOutputTokens === void 0 ? {} : { maxOutputTokens: positiveInteger(value.maxOutputTokens, "\u6700\u5927\u8F93\u51FA", 1e7) },
     ...value.reasoningEfforts === void 0 ? {} : { reasoningEfforts: parseEfforts(value.reasoningEfforts) }
@@ -2764,8 +2774,8 @@ function parseStatusConfig(value) {
   const apiKeyEnv = text(value.apiKeyEnv, "\u51ED\u636E\u5F15\u7528\u540D", MAX_ENV_REF);
   if (!ENV_REF.test(apiKeyEnv)) throw new Error("\u51ED\u636E\u5F15\u7528\u540D\u5FC5\u987B\u662F\u5408\u6CD5\u6807\u8BC6\u7B26");
   return {
-    emptyTurnGuard: flag2(value.emptyTurnGuard, "\u7A7A\u8F6E\u4FDD\u62A4\u5F00\u5173"),
-    useDesktopCredential: flag2(value.useDesktopCredential, "\u684C\u9762\u767B\u5F55\u6001\u5F00\u5173"),
+    emptyTurnGuard: flag(value.emptyTurnGuard, "\u7A7A\u8F6E\u4FDD\u62A4\u5F00\u5173"),
+    useDesktopCredential: flag(value.useDesktopCredential, "\u684C\u9762\u767B\u5F55\u6001\u5F00\u5173"),
     baseURL: text(value.baseURL, "\u63A8\u7406\u5730\u5740", MAX_BASE_URL),
     apiKeyEnv,
     ...value.apiProtocol === void 0 ? {} : { apiProtocol: member(value.apiProtocol, API_PROTOCOL_IDS, "\u63A8\u7406\u534F\u8BAE") },
@@ -2787,7 +2797,7 @@ function parseStatus(value) {
   }
   return {
     revision: text(value.revision, "\u914D\u7F6E\u7248\u672C", MAX_REVISION),
-    apiKeyConfigured: flag2(value.apiKeyConfigured, "\u51ED\u636E\u662F\u5426\u5C31\u7EEA"),
+    apiKeyConfigured: flag(value.apiKeyConfigured, "\u51ED\u636E\u662F\u5426\u5C31\u7EEA"),
     ...value.sessionSource === void 0 ? {} : { sessionSource: member(value.sessionSource, SESSION_SOURCES, "\u767B\u5F55\u6001\u6765\u6E90") },
     quota: parseQuotaSnapshot(value.quota),
     login: parseLoginState(value.login),