dsh-opendesign-corouter 0.1.6 → 0.1.7

package/lib/generated/typert.remote-client.js

@@ -122,9 +122,9 @@ function amount(value, label, negative = false) {
   if (typeof value !== "number" || !Number.isFinite(value) || !negative && value < 0) throw new Error(`${label} \u5FC5\u987B\u662F${negative ? "" : "\u975E\u8D1F"}\u6709\u9650\u6570\u5B57`);
   return value;
 }
-function positiveInteger(value, label, max) {
+function positiveInteger(value, label, max, min = 1) {
   const result = count(value, label);
-  if (result === 0 || result > max) throw new Error(`${label} \u8D85\u51FA\u8303\u56F4`);
+  if (result < min || result > max) throw new Error(`${label} \u8D85\u51FA\u8303\u56F4`);
   return result;
 }
 function parseEfforts(value) {
@@ -227,9 +227,9 @@ function parseStatusConfig(value) {
     apiKeyEnv,
     ...value.apiProtocol === void 0 ? {} : { apiProtocol: member(value.apiProtocol, API_PROTOCOL_IDS, "\u63A8\u7406\u534F\u8BAE") },
     ...value.modelSettings === void 0 ? {} : { modelSettings: parseModelSettingsMap(value.modelSettings) },
-    ...value.requestTimeoutMs === void 0 ? {} : { requestTimeoutMs: positiveInteger(value.requestTimeoutMs, "\u8BF7\u6C42\u8D85\u65F6", 36e5) },
-    ...value.streamIdleTimeoutMs === void 0 ? {} : { streamIdleTimeoutMs: positiveInteger(value.streamIdleTimeoutMs, "\u6D41\u7A7A\u95F2\u8D85\u65F6", 18e5) },
-    ...value.quotaRefreshSeconds === void 0 ? {} : { quotaRefreshSeconds: positiveInteger(value.quotaRefreshSeconds, "\u81EA\u52A8\u5237\u65B0\u95F4\u9694", 3600) }
+    ...value.requestTimeoutMs === void 0 ? {} : { requestTimeoutMs: positiveInteger(value.requestTimeoutMs, "\u8BF7\u6C42\u8D85\u65F6", 36e5, 1e3) },
+    ...value.streamIdleTimeoutMs === void 0 ? {} : { streamIdleTimeoutMs: positiveInteger(value.streamIdleTimeoutMs, "\u6D41\u7A7A\u95F2\u8D85\u65F6", 18e5, 1e3) },
+    ...value.quotaRefreshSeconds === void 0 ? {} : { quotaRefreshSeconds: positiveInteger(value.quotaRefreshSeconds, "\u81EA\u52A8\u5237\u65B0\u95F4\u9694", 3600, 5) }
   };
 }
 function parseStatus(value) {
@@ -242,9 +242,13 @@ function parseStatus(value) {
     if (ids.has(model.id)) throw new Error(`\u6A21\u578B\u5217\u8868\u91CD\u590D\u4E86 id "${model.id}"`);
     ids.add(model.id);
   }
+  const apiKeyConfigured = flag(value.apiKeyConfigured, "\u51ED\u636E\u662F\u5426\u5C31\u7EEA");
+  const apiKeySource = value.apiKeySource === void 0 ? void 0 : member(value.apiKeySource, ["reference", "stored", "device"], "\u63A8\u7406\u51ED\u636E\u6765\u6E90");
+  if (!apiKeyConfigured && apiKeySource !== void 0) throw new Error("\u672A\u914D\u7F6E\u51ED\u636E\u65F6\u4E0D\u80FD\u6307\u5B9A\u63A8\u7406\u51ED\u636E\u6765\u6E90");
   return {
     revision: text(value.revision, "\u914D\u7F6E\u7248\u672C", MAX_REVISION),
-    apiKeyConfigured: flag(value.apiKeyConfigured, "\u51ED\u636E\u662F\u5426\u5C31\u7EEA"),
+    apiKeyConfigured,
+    ...apiKeySource === void 0 ? {} : { apiKeySource },
     ...value.sessionSource === void 0 ? {} : { sessionSource: member(value.sessionSource, SESSION_SOURCES, "\u767B\u5F55\u6001\u6765\u6E90") },
     quota: parseQuotaSnapshot(value.quota),
     login: parseLoginState(value.login),

package/lib/index.js

@@ -302,7 +302,7 @@ var DEFAULT_BASE_URL = "https://amr-link.open-design.ai/v1";
 var Config = Schema.object({
   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(),
+  apiProtocol: Schema.union(API_PROTOCOL_IDS).default("chat-completions").description("\u7F51\u5173\u652F\u6301\u7684\u63A8\u7406\u534F\u8BAE\uFF1B\u6A21\u578B\u76EE\u5F55\u901A\u8FC7\u8BE5\u7F51\u5173\u7684\u517C\u5BB9\u63A5\u53E3\u8BFB\u53D6").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(),
@@ -2200,7 +2200,7 @@ import { randomUUID } from "node:crypto";
 
 // src/device-auth.ts
 var DEVICE_AUTH_ENDPOINT = "https://amr-api.open-design.ai/api/v1/cli/device-authorizations";
-var DEVICE_AUTH_PLUGIN_VERSION = "0.1.6";
+var DEVICE_AUTH_PLUGIN_VERSION = "0.1.7";
 var DEVICE_REQUEST_TIMEOUT_MS = 2e4;
 var DEVICE_RESPONSE_MAX_BYTES = 65536;
 var DEVICE_POLL_MIN_MS = 1e3;
@@ -3171,9 +3171,9 @@ function amount(value, label, negative = false) {
   if (typeof value !== "number" || !Number.isFinite(value) || !negative && value < 0) throw new Error(`${label} \u5FC5\u987B\u662F${negative ? "" : "\u975E\u8D1F"}\u6709\u9650\u6570\u5B57`);
   return value;
 }
-function positiveInteger(value, label, max) {
+function positiveInteger(value, label, max, min = 1) {
   const result = count(value, label);
-  if (result === 0 || result > max) throw new Error(`${label} \u8D85\u51FA\u8303\u56F4`);
+  if (result < min || result > max) throw new Error(`${label} \u8D85\u51FA\u8303\u56F4`);
   return result;
 }
 function parseEfforts(value) {
@@ -3276,9 +3276,9 @@ function parseStatusConfig(value) {
     apiKeyEnv,
     ...value.apiProtocol === void 0 ? {} : { apiProtocol: member(value.apiProtocol, API_PROTOCOL_IDS, "\u63A8\u7406\u534F\u8BAE") },
     ...value.modelSettings === void 0 ? {} : { modelSettings: parseModelSettingsMap(value.modelSettings) },
-    ...value.requestTimeoutMs === void 0 ? {} : { requestTimeoutMs: positiveInteger(value.requestTimeoutMs, "\u8BF7\u6C42\u8D85\u65F6", 36e5) },
-    ...value.streamIdleTimeoutMs === void 0 ? {} : { streamIdleTimeoutMs: positiveInteger(value.streamIdleTimeoutMs, "\u6D41\u7A7A\u95F2\u8D85\u65F6", 18e5) },
-    ...value.quotaRefreshSeconds === void 0 ? {} : { quotaRefreshSeconds: positiveInteger(value.quotaRefreshSeconds, "\u81EA\u52A8\u5237\u65B0\u95F4\u9694", 3600) }
+    ...value.requestTimeoutMs === void 0 ? {} : { requestTimeoutMs: positiveInteger(value.requestTimeoutMs, "\u8BF7\u6C42\u8D85\u65F6", 36e5, 1e3) },
+    ...value.streamIdleTimeoutMs === void 0 ? {} : { streamIdleTimeoutMs: positiveInteger(value.streamIdleTimeoutMs, "\u6D41\u7A7A\u95F2\u8D85\u65F6", 18e5, 1e3) },
+    ...value.quotaRefreshSeconds === void 0 ? {} : { quotaRefreshSeconds: positiveInteger(value.quotaRefreshSeconds, "\u81EA\u52A8\u5237\u65B0\u95F4\u9694", 3600, 5) }
   };
 }
 function parseStatus(value) {
@@ -3291,9 +3291,13 @@ function parseStatus(value) {
     if (ids.has(model.id)) throw new Error(`\u6A21\u578B\u5217\u8868\u91CD\u590D\u4E86 id "${model.id}"`);
     ids.add(model.id);
   }
+  const apiKeyConfigured = flag(value.apiKeyConfigured, "\u51ED\u636E\u662F\u5426\u5C31\u7EEA");
+  const apiKeySource = value.apiKeySource === void 0 ? void 0 : member(value.apiKeySource, ["reference", "stored", "device"], "\u63A8\u7406\u51ED\u636E\u6765\u6E90");
+  if (!apiKeyConfigured && apiKeySource !== void 0) throw new Error("\u672A\u914D\u7F6E\u51ED\u636E\u65F6\u4E0D\u80FD\u6307\u5B9A\u63A8\u7406\u51ED\u636E\u6765\u6E90");
   return {
     revision: text(value.revision, "\u914D\u7F6E\u7248\u672C", MAX_REVISION),
-    apiKeyConfigured: flag(value.apiKeyConfigured, "\u51ED\u636E\u662F\u5426\u5C31\u7EEA"),
+    apiKeyConfigured,
+    ...apiKeySource === void 0 ? {} : { apiKeySource },
     ...value.sessionSource === void 0 ? {} : { sessionSource: member(value.sessionSource, SESSION_SOURCES, "\u767B\u5F55\u6001\u6765\u6E90") },
     quota: parseQuotaSnapshot(value.quota),
     login: parseLoginState(value.login),
@@ -3332,7 +3336,8 @@ var inject = ["llm"];
 var API_KEY = credentialKey(name, "api-key");
 var SESSION = credentialKey(name, "console");
 var hash = (value) => createHash("sha256").update(JSON.stringify(value) ?? "").digest("hex");
-var needLogin = () => ({ state: "need-login", updatedAt: (/* @__PURE__ */ new Date()).toISOString(), windows: [], balances: {}, note: "\u5C1A\u672A\u8BFB\u53D6\u989D\u5EA6\uFF1B\u53EF\u4F7F\u7528\u684C\u9762\u767B\u5F55\u6001\u6216\u5728\u8FDE\u63A5\u9875\u767B\u5F55" });
+var needLogin = () => ({ state: "need-login", updatedAt: (/* @__PURE__ */ new Date()).toISOString(), windows: [], balances: {}, note: "\u8BF7\u5728\u8FDE\u63A5\u4E0E\u767B\u5F55\u9875\u5B8C\u6210\u8D26\u53F7\u6388\u6743\u540E\u8BFB\u53D6\u989D\u5EA6\u3002" });
+var unreadQuota = () => ({ state: "partial", updatedAt: (/* @__PURE__ */ new Date()).toISOString(), windows: [], balances: {}, note: "\u989D\u5EA6\u5C1A\u672A\u8BFB\u53D6\uFF0C\u8BF7\u5237\u65B0\u989D\u5EA6\u3002" });
 function grantOf(value) {
   if (value?.kind !== "grant" || !record(value.payload)) return;
   if (value.payload.kind === "device") return deviceGrant(value.payload);
@@ -3351,7 +3356,7 @@ var OpenDesignCoRouterService = class extends (_a = TypertRemoteService, _status
     __publicField(this, "_lifetime", new AbortController());
     __publicField(this, "_revision", randomUUID2());
     __publicField(this, "_fingerprint", "");
-    __publicField(this, "_quota", needLogin());
+    __publicField(this, "_quota", unreadQuota());
     __publicField(this, "_quotaAt", 0);
     __publicField(this, "_quotaConfig", "");
     __publicField(this, "_quotaIdentity");
@@ -3417,15 +3422,15 @@ var OpenDesignCoRouterService = class extends (_a = TypertRemoteService, _status
   async _key(ref, baseURL, apiRecord, sessionRecord) {
     const credentials = this.ctx.get("credentials");
     const ambient = credentials ? (await credentials.resolve(credentialRef(ref)))?.value : launchEnvironmentOf(this.ctx).get(ref)?.value;
-    if (ambient?.trim()) return ambient;
-    if (apiRecord?.kind === "api-key" && apiRecord.key?.trim()) return apiRecord.key;
+    if (ambient?.trim()) return { key: ambient, source: "reference" };
+    if (apiRecord?.kind === "api-key" && apiRecord.key?.trim()) return { key: apiRecord.key, source: "stored" };
     const grant = grantOf(sessionRecord);
-    return isOfficialRuntimeUrl(baseURL) && grant && "kind" in grant && grant.kind === "device" ? grant.runtimeKey : void 0;
+    return isOfficialRuntimeUrl(baseURL) && grant && "kind" in grant && grant.kind === "device" ? { key: grant.runtimeKey, source: "device" } : void 0;
   }
   async resolveApiKey(ref, baseURL = this._config().baseURL) {
     const credentials = this.ctx.get("credentials");
     const [apiRecord, sessionRecord] = await Promise.all([credentials?.readRecord(API_KEY), credentials?.readRecord(SESSION)]);
-    return this._key(ref, baseURL, apiRecord, sessionRecord);
+    return (await this._key(ref, baseURL, apiRecord, sessionRecord))?.key;
   }
   _invalidateModels() {
     const changed = this._modelsUpdatedAt !== void 0;
@@ -3445,8 +3450,9 @@ var OpenDesignCoRouterService = class extends (_a = TypertRemoteService, _status
   async _state() {
     const credentials = this.ctx.get("credentials"), config = this._config();
     const [apiRecord, sessionRecord] = await Promise.all([credentials?.readRecord(API_KEY), credentials?.readRecord(SESSION)]);
-    const key = await this._key(config.apiKeyEnv, config.baseURL, apiRecord, sessionRecord);
-    const state = { apiRecord, sessionRecord, key, config };
+    const resolved = await this._key(config.apiKeyEnv, config.baseURL, apiRecord, sessionRecord);
+    const key = resolved?.key;
+    const state = { apiRecord, sessionRecord, key, keySource: resolved?.source, config };
     const modelsFingerprint = hash({ key, baseURL: config.baseURL });
     if (modelsFingerprint !== this._modelsFingerprint) {
       this._modelsFingerprint = modelsFingerprint;
@@ -3468,7 +3474,7 @@ var OpenDesignCoRouterService = class extends (_a = TypertRemoteService, _status
   _invalidateQuota() {
     this._quotaAt = 0;
     this._quotaEpoch++;
-    this._quota = needLogin();
+    this._quota = unreadQuota();
     this._quotaIdentity = void 0;
     this._quotaController?.abort();
     this._quotaPending = void 0;
@@ -3483,6 +3489,7 @@ var OpenDesignCoRouterService = class extends (_a = TypertRemoteService, _status
     return parseStatus({
       revision: this._revision,
       apiKeyConfigured: Boolean(state.key?.trim()),
+      ...state.keySource ? { apiKeySource: state.keySource } : {},
       ...this._quota.source ? { sessionSource: this._quota.source } : {},
       quota: this._quota,
       login: this._login.status(),
@@ -3507,7 +3514,7 @@ var OpenDesignCoRouterService = class extends (_a = TypertRemoteService, _status
     if (this._modelsPending) return this._modelsPending;
     const key = state.key;
     if (!key?.trim()) {
-      this._modelsError = "\u8BF7\u5148\u914D\u7F6E API Key\uFF0C\u518D\u4ECE OpenAI \u7AEF\u53E3\u62C9\u53D6\u6A21\u578B\u3002";
+      this._modelsError = "\u8BF7\u5148\u914D\u7F6E API Key\uFF0C\u518D\u4ECE\u5F53\u524D\u7F51\u5173\u8BFB\u53D6\u6A21\u578B\u76EE\u5F55\u3002";
       return this.status();
     }
     const epoch = this._modelsEpoch;
@@ -3519,10 +3526,18 @@ var OpenDesignCoRouterService = class extends (_a = TypertRemoteService, _status
         const models = await (this.dependencies.fetchModels ?? fetchModelCatalog)(state.config.baseURL, key, signal);
         await this._state();
         if (signal.aborted || epoch !== this._modelsEpoch) return this.status();
+        const previousModels = this._models;
+        const previousUpdatedAt = this._modelsUpdatedAt;
         this._models = models;
         this._modelsUpdatedAt = (/* @__PURE__ */ new Date()).toISOString();
         this._modelsError = void 0;
-        this.dependencies.modelsChanged?.();
+        try {
+          this.dependencies.modelsChanged?.();
+        } catch {
+          this._models = previousModels;
+          this._modelsUpdatedAt = previousUpdatedAt;
+          this._modelsError = "\u6A21\u578B\u76EE\u5F55\u5DF2\u8BFB\u53D6\uFF0C\u4F46\u6A21\u578B\u9009\u62E9\u5668\u66F4\u65B0\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\u3002";
+        }
       } catch (error) {
         if (!signal.aborted && epoch === this._modelsEpoch) this._modelsError = error instanceof ModelDiscoveryError ? error.message : "\u6A21\u578B\u5217\u8868\u66F4\u65B0\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002";
       }