@acosmi/sdk-ts 2.4.0 → 2.6.0

package/dist/browser/index.mjs

@@ -320,13 +320,20 @@ function resolveThinkingLevel(body, req, caps) {
   }
   delete body["temperature"];
 }
-var AnthropicAdapter;
+var ANTHROPIC_SDK_MANAGED_BODY_KEYS, AnthropicAdapter;
 var init_anthropic = __esm({
   "src/models/adapters/anthropic.ts"() {
     init_types();
     init_errors();
     init_betas();
     init_adapters();
+    ANTHROPIC_SDK_MANAGED_BODY_KEYS = /* @__PURE__ */ new Set([
+      "thinking",
+      "effort",
+      "max_tokens",
+      "temperature",
+      "betas"
+    ]);
     AnthropicAdapter = class {
       format() {
         return 0 /* Anthropic */;
@@ -414,6 +421,12 @@ var init_anthropic = __esm({
         }
         if (req.extraBody) {
           for (const [k, v] of Object.entries(req.extraBody)) {
+            if (ANTHROPIC_SDK_MANAGED_BODY_KEYS.has(k)) {
+              console.warn(
+                `acosmi-sdk: extraBody key "${k}" is SDK-managed and was ignored (use the dedicated request field instead).`
+              );
+              continue;
+            }
             body[k] = v;
           }
         }
@@ -773,6 +786,9 @@ var init_openai = __esm({
       messageStarted = false;
       thinkingStarted = false;
       thinkingStopped = false;
+      /** thinking block 打开时占用的 Anthropic block index — 关闭时必须用它, 不能用
+       *  可能已被 text/tool 推进的 this.blockIndex (否则 content_block_stop 索引错配)。 */
+      thinkingBlockIndex = 0;
       textStarted = false;
       /** OpenAI tool_call index → Anthropic block index */
       toolBlockIndex = /* @__PURE__ */ new Map();
@@ -813,6 +829,7 @@ var init_openai = __esm({
         if (choice.delta.reasoning_content && choice.delta.reasoning_content !== "") {
           if (!this.thinkingStarted) {
             this.thinkingStarted = true;
+            this.thinkingBlockIndex = this.blockIndex;
             const blockJSON = JSON.stringify({
               type: "content_block_start",
               index: this.blockIndex,
@@ -822,7 +839,7 @@ var init_openai = __esm({
           }
           const deltaJSON = JSON.stringify({
             type: "content_block_delta",
-            index: this.blockIndex,
+            index: this.thinkingBlockIndex,
             delta: { type: "thinking_delta", thinking: choice.delta.reasoning_content }
           });
           events.push({ event: "content_block_delta", data: deltaJSON });
@@ -832,7 +849,7 @@ var init_openai = __esm({
             this.thinkingStopped = true;
             const stopJSON = JSON.stringify({
               type: "content_block_stop",
-              index: this.blockIndex
+              index: this.thinkingBlockIndex
             });
             events.push({ event: "content_block_stop", data: stopJSON });
             this.blockIndex++;
@@ -855,6 +872,15 @@ var init_openai = __esm({
         }
         for (const tc of choice.delta.tool_calls ?? []) {
           if (!this.toolBlockIndex.has(tc.index)) {
+            if (this.thinkingStarted && !this.thinkingStopped) {
+              this.thinkingStopped = true;
+              const stopJSON = JSON.stringify({
+                type: "content_block_stop",
+                index: this.thinkingBlockIndex
+              });
+              events.push({ event: "content_block_stop", data: stopJSON });
+              this.blockIndex++;
+            }
             if (this.textStarted) {
               const stopJSON = JSON.stringify({
                 type: "content_block_stop",
@@ -899,9 +925,10 @@ var init_openai = __esm({
             });
             events.push({ event: "content_block_stop", data: stopJSON2 });
           } else if (this.thinkingStarted && !this.thinkingStopped) {
+            this.thinkingStopped = true;
             const stopJSON2 = JSON.stringify({
               type: "content_block_stop",
-              index: this.blockIndex
+              index: this.thinkingBlockIndex
             });
             events.push({ event: "content_block_stop", data: stopJSON2 });
           }
@@ -942,13 +969,6 @@ function getAdapter(provider) {
   return defaultOpenAIAdapter;
 }
 function getAdapterForModel(m) {
-  const pref = (m.preferred_format ?? "").trim().toLowerCase();
-  switch (pref) {
-    case "anthropic":
-      return new AnthropicAdapter();
-    case "openai":
-      return new OpenAIAdapter();
-  }
   let hasAnthropic = false;
   let hasOpenAI = false;
   for (const f of m.supported_formats ?? []) {
@@ -961,6 +981,16 @@ function getAdapterForModel(m) {
         break;
     }
   }
+  const declared = hasAnthropic || hasOpenAI;
+  const pref = (m.preferred_format ?? "").trim().toLowerCase();
+  switch (pref) {
+    case "anthropic":
+      if (!declared || hasAnthropic) return new AnthropicAdapter();
+      break;
+    case "openai":
+      if (!declared || hasOpenAI) return new OpenAIAdapter();
+      break;
+  }
   if (hasAnthropic) return new AnthropicAdapter();
   if (hasOpenAI) return new OpenAIAdapter();
   return getAdapter((m.provider ?? "").toLowerCase());
@@ -970,6 +1000,7 @@ var init_adapters = __esm({
   "src/models/adapters/index.ts"() {
     init_anthropic();
     init_openai();
+    init_openai();
     ProviderFormat = /* @__PURE__ */ ((ProviderFormat2) => {
       ProviderFormat2[ProviderFormat2["Anthropic"] = 0] = "Anthropic";
       ProviderFormat2[ProviderFormat2["OpenAI"] = 1] = "OpenAI";
@@ -990,8 +1021,14 @@ init_types();
 // src/auth/types.ts
 function tokenSetIsExpired(t) {
   const expiresAt = new Date(t.expires_at).getTime();
+  if (!Number.isFinite(expiresAt)) return true;
   return Date.now() > expiresAt - 3e4;
 }
+function isValidTokenSet(x) {
+  if (typeof x !== "object" || x === null) return false;
+  const t = x;
+  return typeof t.access_token === "string" && typeof t.refresh_token === "string" && typeof t.expires_at === "string" && typeof t.scope === "string" && typeof t.client_id === "string" && typeof t.server_url === "string";
+}
 
 // src/core/client.ts
 init_errors();
@@ -1025,7 +1062,7 @@ var OAuthTokenEndpointError = class extends Error {
 function isInvalidGrantError(err) {
   return err instanceof OAuthTokenEndpointError && err.oauthError === "invalid_grant";
 }
-async function discoverWithProfile(serverURL, profile, signal) {
+async function discoverWithProfile(serverURL, profile, signal, fetchImpl = globalThis.fetch) {
   let parsed;
   try {
     parsed = new URL(serverURL.replace(/\/+$/, ""));
@@ -1037,7 +1074,7 @@ async function discoverWithProfile(serverURL, profile, signal) {
   const ctl = withTimeout(authTimeoutMs, signal);
   let resp;
   try {
-    resp = await fetch(endpoint, { method: "GET", signal: ctl.signal });
+    resp = await fetchImpl(endpoint, { method: "GET", signal: ctl.signal });
   } catch (e) {
     throw new Error(`discover: ${e instanceof Error ? e.message : String(e)}`);
   } finally {
@@ -1059,13 +1096,13 @@ async function discoverWithProfile(serverURL, profile, signal) {
   }
   return meta;
 }
-async function discover(serverURL, signal) {
-  return discoverWithProfile(serverURL, "desktop", signal);
+async function discover(serverURL, signal, fetchImpl = globalThis.fetch) {
+  return discoverWithProfile(serverURL, "desktop", signal, fetchImpl);
 }
-async function discoverWebOAuthMetadata(serverURL, signal) {
-  return discoverWithProfile(serverURL, "web", signal);
+async function discoverWebOAuthMetadata(serverURL, signal, fetchImpl = globalThis.fetch) {
+  return discoverWithProfile(serverURL, "web", signal, fetchImpl);
 }
-async function register(meta, appName, signal) {
+async function register(meta, appName, signal, fetchImpl = globalThis.fetch) {
   const regReq = {
     client_name: appName,
     token_endpoint_auth_method: "none",
@@ -1076,7 +1113,7 @@ async function register(meta, appName, signal) {
   const ctl = withTimeout(authTimeoutMs, signal);
   let resp;
   try {
-    resp = await fetch(meta.registration_endpoint, {
+    resp = await fetchImpl(meta.registration_endpoint, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(regReq),
@@ -1096,7 +1133,7 @@ async function register(meta, appName, signal) {
     throw new Error(`register: decode: ${e instanceof Error ? e.message : String(e)}`);
   }
 }
-async function registerWebOAuthClient(meta, opts, signal) {
+async function registerWebOAuthClient(meta, opts, signal, fetchImpl = globalThis.fetch) {
   const regReq = {
     client_name: opts.clientName,
     token_endpoint_auth_method: "none",
@@ -1108,7 +1145,7 @@ async function registerWebOAuthClient(meta, opts, signal) {
   const ctl = withTimeout(authTimeoutMs, signal);
   let resp;
   try {
-    resp = await fetch(meta.registration_endpoint, {
+    resp = await fetchImpl(meta.registration_endpoint, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(regReq),
@@ -1312,7 +1349,7 @@ async function createWebAuthorizationRequest(meta, opts) {
     createdAt: Date.now()
   };
 }
-async function completeWebAuthorizationRequest(pending, params, signal) {
+async function completeWebAuthorizationRequest(pending, params, signal, fetchImpl = globalThis.fetch) {
   if (!params.code) {
     throw new Error("completeWebAuthorizationRequest: missing authorization code");
   }
@@ -1321,18 +1358,19 @@ async function completeWebAuthorizationRequest(pending, params, signal) {
       `completeWebAuthorizationRequest: ${ErrStateMismatch}: callback state does not match pending state (possible CSRF)`
     );
   }
-  const meta = await discoverWebOAuthMetadata(pending.serverURL, signal);
+  const meta = await discoverWebOAuthMetadata(pending.serverURL, signal, fetchImpl);
   const resp = await exchangeCode(
     meta,
     pending.clientID,
     params.code,
     pending.redirectURI,
     pending.verifier,
-    signal
+    signal,
+    fetchImpl
   );
   return newTokenSet(resp, pending.clientID, pending.serverURL);
 }
-async function exchangeCode(meta, clientID, code, redirectURI, codeVerifier, signal) {
+async function exchangeCode(meta, clientID, code, redirectURI, codeVerifier, signal, fetchImpl = globalThis.fetch) {
   const data = new URLSearchParams({
     grant_type: "authorization_code",
     client_id: clientID,
@@ -1340,9 +1378,9 @@ async function exchangeCode(meta, clientID, code, redirectURI, codeVerifier, sig
     redirect_uri: redirectURI,
     code_verifier: codeVerifier
   });
-  return postToken(meta.token_endpoint, data, signal);
+  return postToken(meta.token_endpoint, data, signal, fetchImpl);
 }
-async function exchangeCodeWithExpiry(meta, clientID, code, redirectURI, codeVerifier, expiresIn, signal) {
+async function exchangeCodeWithExpiry(meta, clientID, code, redirectURI, codeVerifier, expiresIn, signal, fetchImpl = globalThis.fetch) {
   const data = new URLSearchParams({
     grant_type: "authorization_code",
     client_id: clientID,
@@ -1351,24 +1389,24 @@ async function exchangeCodeWithExpiry(meta, clientID, code, redirectURI, codeVer
     code_verifier: codeVerifier,
     expires_in: String(expiresIn)
   });
-  return postToken(meta.token_endpoint, data, signal);
+  return postToken(meta.token_endpoint, data, signal, fetchImpl);
 }
-async function refreshToken(meta, clientID, refreshTokenValue, signal) {
+async function refreshToken(meta, clientID, refreshTokenValue, signal, fetchImpl = globalThis.fetch) {
   const data = new URLSearchParams({
     grant_type: "refresh_token",
     client_id: clientID,
     refresh_token: refreshTokenValue
   });
-  return postToken(meta.token_endpoint, data, signal);
+  return postToken(meta.token_endpoint, data, signal, fetchImpl);
 }
-async function revokeToken(meta, token, signal) {
+async function revokeToken(meta, token, signal, fetchImpl = globalThis.fetch) {
   if (!meta.revocation_endpoint || meta.revocation_endpoint === "") {
     return;
   }
   const data = new URLSearchParams({ token });
   const ctl = withTimeout(authTimeoutMs, signal);
   try {
-    await fetch(meta.revocation_endpoint, {
+    await fetchImpl(meta.revocation_endpoint, {
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       body: data,
@@ -1380,11 +1418,11 @@ async function revokeToken(meta, token, signal) {
     ctl.dispose();
   }
 }
-async function postToken(endpoint, data, signal) {
+async function postToken(endpoint, data, signal, fetchImpl = globalThis.fetch) {
   const ctl = withTimeout(authTimeoutMs, signal);
   let resp;
   try {
-    resp = await fetch(endpoint, {
+    resp = await fetchImpl(endpoint, {
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       body: data,
@@ -1602,7 +1640,15 @@ ${Date.now()}
       await fs.mkdir(dir, { recursive: true, mode: 448 });
       const tmp = `${p}.tmp.${process.pid}.${Date.now()}.${Math.floor(Math.random() * 1e6)}`;
       const data = JSON.stringify(tokens, null, 2);
-      await fs.writeFile(tmp, data, { encoding: "utf8", mode: 384 });
+      {
+        const fh = await fs.open(tmp, "w", 384);
+        try {
+          await fh.writeFile(data, { encoding: "utf8" });
+          await fh.sync();
+        } finally {
+          await fh.close();
+        }
+      }
       try {
         await fs.rename(tmp, p);
       } catch (e) {
@@ -1612,6 +1658,15 @@ ${Date.now()}
         }
         throw e;
       }
+      try {
+        const dirHandle = await fs.open(dir, "r");
+        try {
+          await dirHandle.sync();
+        } finally {
+          await dirHandle.close();
+        }
+      } catch {
+      }
     });
   }
   load() {
@@ -1620,7 +1675,14 @@ ${Date.now()}
       const p = await this.resolvePath();
       try {
         const data = await fs.readFile(p, "utf8");
-        return JSON.parse(data);
+        let parsed;
+        try {
+          parsed = JSON.parse(data);
+        } catch {
+          return null;
+        }
+        if (!isValidTokenSet(parsed)) return null;
+        return parsed;
       } catch (e) {
         if (isNotExistError(e)) return null;
         throw new Error(
@@ -1671,11 +1733,14 @@ var LocalStorageTokenStore = class {
   async load() {
     const data = globalThis.localStorage.getItem(this.key);
     if (data == null || data === "") return null;
+    let parsed;
     try {
-      return JSON.parse(data);
+      parsed = JSON.parse(data);
     } catch {
       return null;
     }
+    if (!isValidTokenSet(parsed)) return null;
+    return parsed;
   }
   async clear() {
     globalThis.localStorage.removeItem(this.key);
@@ -2044,6 +2109,32 @@ function normalizeGatewayBaseURL(input) {
   const path = parsed.pathname.replace(/\/+$/, "");
   return path ? `${parsed.origin}${path}` : parsed.origin;
 }
+function normalizeOverrideBaseURL(raw, label) {
+  if (typeof raw !== "string") {
+    throw new TypeError(`${label} must be a string`);
+  }
+  const trimmed = raw.trim();
+  if (trimmed.length === 0) {
+    throw new Error(`${label} is empty`);
+  }
+  let parsed;
+  try {
+    parsed = new URL(trimmed);
+  } catch {
+    throw new Error(`${label} is not a valid URL: ${trimmed}`);
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    throw new Error(`${label} only allows http/https, got ${parsed.protocol} (${trimmed})`);
+  }
+  if (!parsed.host) {
+    throw new Error(`${label} has empty host: ${trimmed}`);
+  }
+  if (parsed.search.length > 0 || parsed.hash.length > 0) {
+    throw new Error(`${label} must not contain query or hash: ${trimmed}`);
+  }
+  const path = parsed.pathname.replace(/\/+$/, "");
+  return path ? `${parsed.origin}${path}` : parsed.origin;
+}
 function pickAndNormalizeGatewayURL(cfg) {
   const inputs = [];
   if (cfg.serverURL !== void 0) inputs.push(["serverURL", cfg.serverURL]);
@@ -2064,6 +2155,7 @@ var ErrOAuthCORSBlocked = "oauth_cors_blocked";
 var ErrRefreshProxyFailed = "refresh_proxy_failed";
 var ErrTokenExpired = "token_expired";
 var CHAT_REQUEST_TIMEOUT_MS = 11 * 60 * 1e3;
+var DEFAULT_API_TIMEOUT_MS = 6e4;
 function newDeferred() {
   let resolve;
   let reject;
@@ -2121,8 +2213,8 @@ var Client = class _Client {
   constructor(cfg = {}) {
     const picked = pickAndNormalizeGatewayURL(cfg);
     this.serverURL = picked ?? DEFAULT_GATEWAY_BASE_URL;
-    this.complianceBaseURL = cfg.complianceBaseURL ? cfg.complianceBaseURL.replace(/\/+$/, "") : null;
-    this.apiBaseURL = cfg.apiBaseURL ? cfg.apiBaseURL.replace(/\/+$/, "") : null;
+    this.complianceBaseURL = cfg.complianceBaseURL ? normalizeOverrideBaseURL(cfg.complianceBaseURL, "complianceBaseURL") : null;
+    this.apiBaseURL = cfg.apiBaseURL ? normalizeOverrideBaseURL(cfg.apiBaseURL, "apiBaseURL") : null;
     this.oauthMetadataProfile = cfg.oauthMetadataProfile ?? "desktop";
     this.browserRefreshMode = cfg.browserRefreshMode ?? "direct";
     this.refreshProxyURL = cfg.refreshProxyURL ?? null;
@@ -2214,7 +2306,7 @@ var Client = class _Client {
     try {
       let meta;
       try {
-        meta = await discover(this.serverURL, signal);
+        meta = await discover(this.serverURL, signal, this.fetchImpl);
       } catch (err) {
         emitError(ErrDiscovery, err);
         throw new Error(`discovery failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -2223,7 +2315,7 @@ var Client = class _Client {
       let clientID = this.getCachedClientID();
       if (clientID === "") {
         try {
-          const reg = await register(meta, appName, signal);
+          const reg = await register(meta, appName, signal, this.fetchImpl);
           clientID = reg.client_id;
         } catch (err) {
           emitError(ErrRegistration, err);
@@ -2240,7 +2332,7 @@ var Client = class _Client {
         verifier = r.verifier;
       } catch (err) {
         try {
-          const reg = await register(meta, appName, signal);
+          const reg = await register(meta, appName, signal, this.fetchImpl);
           clientID = reg.client_id;
         } catch (regErr) {
           emitError(ErrRegistration, regErr);
@@ -2268,7 +2360,8 @@ var Client = class _Client {
             result.redirectURI,
             verifier,
             opts.expiresIn,
-            signal
+            signal,
+            this.fetchImpl
           );
         } else {
           tokenResp = await exchangeCode(
@@ -2277,7 +2370,8 @@ var Client = class _Client {
             result.code,
             result.redirectURI,
             verifier,
-            signal
+            signal,
+            this.fetchImpl
           );
         }
       } catch (err) {
@@ -2314,18 +2408,18 @@ var Client = class _Client {
     if (tokens) {
       if (!meta) {
         try {
-          meta = await discoverWithProfile(this.serverURL, this.oauthMetadataProfile, signal);
+          meta = await discoverWithProfile(this.serverURL, this.oauthMetadataProfile, signal, this.fetchImpl);
         } catch (e) {
           console.warn(`[acosmi-sdk] warning: discover for revocation failed: ${e instanceof Error ? e.message : String(e)}`);
         }
       }
       if (meta) {
         try {
-          await revokeToken(meta, tokens.access_token, signal);
+          await revokeToken(meta, tokens.access_token, signal, this.fetchImpl);
         } catch {
         }
         try {
-          await revokeToken(meta, tokens.refresh_token, signal);
+          await revokeToken(meta, tokens.refresh_token, signal, this.fetchImpl);
         } catch {
         }
       }
@@ -2419,7 +2513,7 @@ var Client = class _Client {
     }
     if (this.meta == null) {
       try {
-        this.meta = await discoverWithProfile(this.serverURL, this.oauthMetadataProfile, signal);
+        this.meta = await discoverWithProfile(this.serverURL, this.oauthMetadataProfile, signal, this.fetchImpl);
       } catch (e) {
         throw new Error(
           `discover for refresh: ${e instanceof Error ? e.message : String(e)}`
@@ -2432,7 +2526,8 @@ var Client = class _Client {
         this.meta,
         this.tokens.client_id,
         this.tokens.refresh_token,
-        signal
+        signal,
+        this.fetchImpl
       );
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e);
@@ -2699,10 +2794,10 @@ var Client = class _Client {
    * v0.5.0: 根据 provider 自动路由到 /anthropic 或 /chat 端点
    */
   async chat(modelID, req, signal) {
-    req.stream = false;
+    const r = { ...req, stream: false };
     const ctl = withRequestTimeout(CHAT_REQUEST_TIMEOUT_MS, signal);
     try {
-      const { body, adapter } = await this.buildChatRequest(modelID, req, ctl.signal);
+      const { body, adapter } = await this.buildChatRequest(modelID, r, ctl.signal);
       const endpoint = `/managed-models/${encodeURIComponent(modelID)}${adapter.endpointSuffix()}`;
       const { result, headers } = await this.doJSONFullRaw("POST", endpoint, body, ctl.signal);
       const resp = adapter.parseResponse(result);
@@ -2800,11 +2895,11 @@ var Client = class _Client {
     return this.chatMessagesOpenAI(modelID, req, adapter, signal);
   }
   async chatMessagesAnthropic(modelID, req, adapter, signal) {
-    req.stream = false;
+    const r = { ...req, stream: false };
     const ctl = withRequestTimeout(CHAT_REQUEST_TIMEOUT_MS, signal);
     try {
       const caps = this.getCachedCapabilities(modelID) ?? zeroModelCapabilities();
-      const body = adapter.buildRequestBody(caps, req);
+      const body = adapter.buildRequestBody(caps, r);
       const data = JSON.stringify(body);
       const { result } = await this.doJSONFullRaw(
         "POST",
@@ -2837,11 +2932,11 @@ var Client = class _Client {
     }
   }
   async chatMessagesOpenAI(modelID, req, adapter, signal) {
-    req.stream = false;
+    const r = { ...req, stream: false };
     const ctl = withRequestTimeout(CHAT_REQUEST_TIMEOUT_MS, signal);
     try {
       const caps = this.getCachedCapabilities(modelID) ?? zeroModelCapabilities();
-      const body = adapter.buildRequestBody(caps, req);
+      const body = adapter.buildRequestBody(caps, r);
       const data = JSON.stringify(body);
       const endpoint = `/managed-models/${encodeURIComponent(modelID)}${adapter.endpointSuffix()}`;
       const { result } = await this.doJSONFullRaw("POST", endpoint, data, ctl.signal);
@@ -2871,8 +2966,8 @@ var Client = class _Client {
     };
   }
   async *chatStreamGen(modelID, req, signal, retried) {
-    req.stream = true;
-    const { body, adapter } = await this.buildChatRequest(modelID, req, signal);
+    const r = { ...req, stream: true };
+    const { body, adapter } = await this.buildChatRequest(modelID, r, signal);
     const token = await this.ensureToken(signal);
     const endpoint = `/managed-models/${encodeURIComponent(modelID)}${adapter.endpointSuffix()}`;
     const url = this.apiURL(endpoint);
@@ -2940,8 +3035,8 @@ var Client = class _Client {
     }
   }
   async *chatMessagesStreamGen(modelID, req, signal, retried) {
-    req.stream = true;
-    const { body, adapter } = await this.buildChatRequest(modelID, req, signal);
+    const r = { ...req, stream: true };
+    const { body, adapter } = await this.buildChatRequest(modelID, r, signal);
     const token = await this.ensureToken(signal);
     const endpoint = `/managed-models/${encodeURIComponent(modelID)}${adapter.endpointSuffix()}`;
     const url = this.apiURL(endpoint);
@@ -3113,6 +3208,9 @@ var Client = class _Client {
         throw parseHTTPErrorWithHeader(resp.status, bodyBytes, resp.headers);
       }
       const text = await resp.text();
+      if (!text) {
+        return { result: void 0, headers: resp.headers };
+      }
       const result = JSON.parse(text);
       if (result && typeof result === "object" && "code" in result) {
         const bizErr = apiResponseBusinessError(result);
@@ -3213,6 +3311,18 @@ var Client = class _Client {
       ctl.dispose();
     }
   }
+  /**
+   * 给子 client (agent-runs / compliance) 用的请求超时组合器。
+   *
+   * 返回一个 controller, 其 `signal` 同时受默认/指定超时与外部 `parent` signal 约束 —
+   * 二者任一触发都会 abort (用户传入的 signal 仍然生效)。调用方**必须**在 finally 里
+   * `dispose()` 清掉定时器与监听, 否则 timer 泄漏。
+   *
+   * 仅用于非流式 JSON 请求; 流式 (SSE) / 下载路径不应套短超时 (会切断长连接)。
+   */
+  withRequestTimeout(ms, parent) {
+    return withRequestTimeout(ms, parent);
+  }
   /**
    * fetch 包装 — 错误经 classifyTransport 转 NetworkError
    * 6 处原始 fetch() 全部走此 helper
@@ -3782,6 +3892,10 @@ var ScopeRemoteControl = "remote_control";
 var ScopeRemoteControlAgentRun = "remote_control:agent-run";
 var ScopeRemoteControlSessionControl = "remote_control:session-control";
 var ScopeRemoteControlPermissionResponse = "remote_control:permission-response";
+var ScopeChatBridge = "chat_bridge";
+var ScopeChatBridgeRead = "chat_bridge:read";
+var ScopeChatBridgeWrite = "chat_bridge:write";
+var ScopeChatBridgeRotate = "chat_bridge:rotate";
 var ScopeModels = "models";
 var ScopeModelsChat = "models:chat";
 var ScopeEntitlements = "entitlements";
@@ -3807,6 +3921,9 @@ function skillScopes() {
 function remoteControlScopes() {
   return [ScopeRemoteControl];
 }
+function chatBridgeScopes() {
+  return [ScopeChatBridge];
+}
 
 // src/models/index.ts
 init_types();
@@ -3998,9 +4115,10 @@ Client.prototype.waitForPayment = async function(orderID, pollIntervalMs, signal
   if (pollIntervalMs <= 0) pollIntervalMs = 2e3;
   while (true) {
     const status = await this.getOrderStatus(orderID, signal);
-    if (isOrderTerminal(status.status)) {
-      if (isOrderSuccess(status.status)) return status;
-      throw new OrderTerminalError(orderID, status.status);
+    const st = status.paymentStatus ?? status.orderStatus;
+    if (isOrderTerminal(st)) {
+      if (isOrderSuccess(st)) return status;
+      throw new OrderTerminalError(orderID, st);
     }
     await sleepWithSignal(pollIntervalMs, signal);
   }
@@ -4381,6 +4499,9 @@ Client.prototype.updateNotificationPreference = async function(typeCode, pref, s
 
 // src/notifications/ws.ts
 Client.prototype.connect = async function(cfg, signal) {
+  if (this.ws) {
+    await this.disconnect();
+  }
   const noop = () => {
   };
   const filledCfg = {
@@ -4449,11 +4570,17 @@ function getWebSocketCtor() {
   return WSCtor;
 }
 async function wsConnectOnce(c, ws) {
-  const token = await c.ensureToken(ws.abort.signal);
   const url = wsURL(c);
   const WSCtor = getWebSocketCtor();
+  const ticketResp = await c.doJSON(
+    "POST",
+    "/ws/stream-ticket",
+    null,
+    ws.abort.signal
+  );
+  const ticket = ticketResp.data.ticket;
   const u = new URL(url);
-  u.searchParams.set("token", token);
+  u.searchParams.set("ticket", ticket);
   let conn;
   try {
     conn = new WSCtor(u.toString());
@@ -4909,7 +5036,10 @@ var AgentRunsClient = class {
     );
     const contentType = resp.headers.get("Content-Type") ?? void 0;
     const filename = filenameFromContentDisposition(resp.headers.get("Content-Disposition")) ?? artifactId;
-    const data = await readLimited(resp.body, maxDownloadSize);
+    const data = await readLimited(resp.body, maxDownloadSize + 1);
+    if (data.byteLength > maxDownloadSize) {
+      throw new Error(`download artifact: response exceeds ${maxDownloadSize >> 20}MB limit`);
+    }
     return { data, filename, contentType };
   }
   submitLocalToolResult(runId, result, signal) {
@@ -4965,7 +5095,6 @@ var AgentRunsClient = class {
       };
     }
     const ctl = new AbortController();
-    const timer = setTimeout(() => ctl.abort(), timeoutMs);
     let parentAbort;
     if (signal) {
       if (signal.aborted) ctl.abort();
@@ -4974,7 +5103,18 @@ var AgentRunsClient = class {
         signal.addEventListener("abort", parentAbort);
       }
     }
-    try {
+    let timer;
+    const timeoutResult = new Promise((resolve) => {
+      timer = setTimeout(() => {
+        ctl.abort();
+        resolve({
+          requestId: event.requestId,
+          ok: false,
+          error: `local tool timed out after ${timeoutMs}ms`
+        });
+      }, timeoutMs);
+    });
+    const handlerTask = (async () => {
       const content = await handler(event.input, {
         runId,
         requestId: event.requestId,
@@ -4982,6 +5122,11 @@ var AgentRunsClient = class {
         signal: ctl.signal
       });
       return { requestId: event.requestId, ok: true, content };
+    })();
+    handlerTask.catch(() => {
+    });
+    try {
+      return await Promise.race([handlerTask, timeoutResult]);
     } catch (e) {
       if (signal?.aborted) throw e;
       const timedOut = ctl.signal.aborted;
@@ -5014,14 +5159,29 @@ var AgentRunsClient = class {
     }
   }
   async requestAPI(method, path, body, signal, opts) {
-    const resp = await this.requestRaw(method, path, body, signal, opts);
+    const resp = await this.requestRaw(method, path, body, signal, {
+      ...opts,
+      timeoutMs: opts.timeoutMs ?? DEFAULT_API_TIMEOUT_MS
+    });
     const text = await resp.text();
+    if (!text) return void 0;
     const result = JSON.parse(text);
     const bizErr = apiResponseBusinessError(result);
     if (bizErr) throw bizErr;
     return result.data;
   }
   async requestRaw(method, path, body, signal, opts, retried = false) {
+    if (opts.timeoutMs != null && opts.timeoutMs > 0) {
+      const ctl = this.client.withRequestTimeout(opts.timeoutMs, signal);
+      try {
+        return await this.requestRawInner(method, path, body, ctl.signal, opts, retried);
+      } finally {
+        ctl.dispose();
+      }
+    }
+    return this.requestRawInner(method, path, body, signal, opts, retried);
+  }
+  async requestRawInner(method, path, body, signal, opts, retried) {
     const token = await this.client.ensureToken(signal);
     const url = this.client.apiURL(path);
     const headers = {
@@ -5040,7 +5200,7 @@ var AgentRunsClient = class {
       } catch {
       }
       await this.client.forceRefresh(signal);
-      return this.requestRaw(method, path, body, signal, opts, true);
+      return this.requestRawInner(method, path, body, signal, opts, true);
     }
     if (resp.status < 200 || resp.status >= 300) {
       const bodyBytes = resp.body ? await readLimited(resp.body, maxErrorBodySize) : new Uint8Array();
@@ -6372,6 +6532,14 @@ var ComplianceClient = class {
     });
   }
   async executeJson(method, path, body, signal, opts, retried = false) {
+    const ctl = this.client.withRequestTimeout(DEFAULT_API_TIMEOUT_MS, signal);
+    try {
+      return await this.executeJsonInner(method, path, body, ctl.signal, opts, retried);
+    } finally {
+      ctl.dispose();
+    }
+  }
+  async executeJsonInner(method, path, body, signal, opts, retried) {
     const token = await this.client.ensureToken(signal);
     const url = this.client.complianceURL(path);
     const headers = {
@@ -6391,7 +6559,7 @@ var ComplianceClient = class {
       } catch {
       }
       await this.client.forceRefresh(signal);
-      return this.executeJson(method, path, body, signal, opts, true);
+      return this.executeJsonInner(method, path, body, signal, opts, true);
     }
     if (resp.status < 200 || resp.status >= 300) {
       const bodyBytes = resp.body ? await readLimited(resp.body, maxErrorBodySize) : new Uint8Array();
@@ -6416,7 +6584,11 @@ var ComplianceClient = class {
     let lastValue;
     while (Date.now() < deadline) {
       if (opts.signal?.aborted) {
-        throw new CompliancePollError("compliance poll aborted", "unknown");
+        throw new CompliancePollError(
+          "compliance poll aborted",
+          "unknown",
+          deriveLastInfo(lastValue, false)
+        );
       }
       lastValue = await fetcher();
       const decision = classify(lastValue);
@@ -6424,7 +6596,8 @@ var ComplianceClient = class {
       if (decision === "failed") {
         throw new CompliancePollError(
           "compliance poll observed terminal failure",
-          "terminal_failure"
+          "terminal_failure",
+          deriveLastInfo(lastValue, true)
         );
       }
       const sleepMs = Math.min(interval, deadline - Date.now());
@@ -6432,9 +6605,30 @@ var ComplianceClient = class {
       await sleep2(sleepMs, opts.signal);
       interval = Math.min(Math.floor(interval * cfg.multiplier), cfg.maxIntervalMs);
     }
-    throw new CompliancePollError("compliance poll timed out", "timeout");
+    throw new CompliancePollError(
+      "compliance poll timed out",
+      "timeout",
+      deriveLastInfo(lastValue, false)
+    );
   }
 };
+function deriveLastInfo(value, terminal) {
+  if (value == null || typeof value !== "object") return void 0;
+  const v = value;
+  const statusStr = typeof v["status"] === "string" && v["status"] || typeof v["verificationStatus"] === "string" && v["verificationStatus"] || "";
+  const rawCode = v["errorCode"] ?? v["code"];
+  const code = typeof rawCode === "number" ? rawCode : 0;
+  const rawMsg = v["errorMessage"] ?? v["message"];
+  const message = typeof rawMsg === "string" && rawMsg || (statusStr ? `last polled status: ${statusStr}` : "") || "compliance poll: last observed status (no detail)";
+  return {
+    code,
+    message,
+    key: "UNKNOWN_COMPLIANCE_ERROR",
+    retryable: false,
+    terminal,
+    stepUpRequired: false
+  };
+}
 function classifyTimestamp(status) {
   switch (status) {
     case "VERIFIED":
@@ -6554,14 +6748,36 @@ Client.prototype.listPlans = async function(audience, signal) {
   );
   return Array.isArray(resp.data) ? resp.data : [];
 };
-Client.prototype.listUserSubscriptions = async function(signal) {
+Client.prototype.getMembership = async function(signal) {
   const resp = await this.doJSON(
     "GET",
-    "/distribution/user/subscriptions",
+    "/entitlements/membership",
     null,
     signal
   );
-  return Array.isArray(resp.data) ? resp.data : [];
+  return resp.data;
+};
+Client.prototype.getSubscriptionTier = async function(signal) {
+  const resp = await this.doJSON(
+    "GET",
+    "/entitlements/subscription",
+    null,
+    signal
+  );
+  return resp.data;
+};
+Client.prototype.subscriptionPrecheck = async function(signal) {
+  const resp = await this.doJSON(
+    "GET",
+    "/consumer/subscriptions/precheck",
+    null,
+    signal
+  );
+  return resp.data;
+};
+Client.prototype.listUserSubscriptions = async function(signal) {
+  const m = await this.getMembership(signal);
+  return m.hasActive ? [m] : [];
 };
 Client.prototype.getPlanByCode = async function(planCode, signal) {
   if (!planCode) return null;
@@ -6976,6 +7192,6 @@ function asCredentialRef(s) {
   return s;
 }
 
-export { ALL_INTEGRATION_STATUS, ALL_PLATFORMS, ALL_REGIONS, AgentRunStreamError, AgentRunsClient, AnthropicAdapter, AudienceEnum, BillingModeEnum, BucketClassCommercial, BucketClassGeneric, BusinessError, Client, ComplianceClient, CompliancePollError, DEFAULT_GATEWAY_BASE_URL, LocalStorageTokenStore as DefaultBrowserTokenStore, DefaultRetryPolicy, ErrAuthDenied, ErrBillingCallbackCannotCommit, ErrBillingCommitRequiresLocalVerify, ErrBillingS2sForbidden, ErrBrowserOpen, ErrComplianceStepUpRequired, ErrDiscovery, ErrEnvelopeGateClosed, ErrOAuthCORSBlocked, ErrProviderNotConfigured, ErrProviderUnknownNoRetry, ErrRefreshProxyFailed, ErrRegistration, ErrSSLProxy, ErrSealApprovalContractHashMismatch, ErrSealApprovalExpired, ErrSealApprovalLocationMismatch, ErrSealApprovalNonceUsed, ErrSealApprovalNotApproved, ErrSealApprovalSealMismatch, ErrSealApprovalTransactorMismatch, ErrSealUseAlreadyConsumed, ErrStateMismatch, ErrTimeout, ErrTokenExchange, ErrTokenExpired, EventAuthURL, EventComplete, EventError, FileTokenStore, FilterStatusAdminBypass, FilterStatusDisabledByFlag, FilterStatusFallbackMissingUser, FilterStatusFallbackNoBuckets, FilterStatusFallbackTkdistError, FilterStatusFallbackTkdistSkew, FilterStatusInternalBypass, FilterStatusOK, FilterStatusUnknown, HTTPError, IdempotencyKeyHeader, InMemoryTokenStore, LocalStorageTokenStore, ModelNotFoundError, NetworkError, OAuthTokenEndpointError, OpenAIAdapter, OrderTerminalError, ProductFamilyEnum, ProviderFormat, RETRY_ADVICE_REASONS, RateLimitError, RegionScopeEnum, ScopeAI, ScopeAccount, ScopeComplianceContractSigningRead, ScopeComplianceContractSigningWrite, ScopeComplianceContractTemplateRead, ScopeComplianceContractTemplateWrite, ScopeComplianceEvidenceRead, ScopeComplianceEvidenceWrite, ScopeComplianceReportsPublish, ScopeComplianceReportsRead, ScopeComplianceReportsWrite, ScopeComplianceSealApprovalApprove, ScopeComplianceSealApprovalRequest, ScopeComplianceSealManage, ScopeComplianceSealUseExecute, ScopeComplianceTimestampIssue, ScopeComplianceTimestampVerify, ScopeEntitlements, ScopeModels, ScopeModelsChat, ScopeProfile, ScopeRemoteControl, ScopeRemoteControlAgentRun, ScopeRemoteControlPermissionResponse, ScopeRemoteControlSessionControl, ScopeSkillStore, ScopeSkills, ScopeTokenPackages, ScopeTools, ScopeToolsExecute, ScopeWallet, ScopeWalletReadonly, ServerToolTypeWebSearch, StreamError, ThinkingHigh, ThinkingHighMinMaxTokens, ThinkingMax, ThinkingMaxFallbackMaxTokens, ThinkingOff, allScopes, anthropicResponseTextContent, anthropicResponseThinkingContent, anthropicResponseToolUseBlocks, apiResponseBusinessError, apiResponseGetMessage, asCredentialRef, authorize, bucketInfoIsCommercial, bucketRowIsCommercial, buildBetas, classifyComplianceError, commerceScopes, completeWebAuthorizationRequest, complianceErrorToRetryAdvice, complianceScopes, computeBackoff, createWebAuthorizationRequest, defaultRetryable, defaultSafeToRetry, discover, discoverWebOAuthMetadata, discoverWithProfile, effectivePolicy, exchangeCode, extractAnthropicBlockMeta, fileLockDefaults, findDesktopVisualUnderstandingModel, findFirstModelByInputModality, generateState, getAdapter, getAdapterForModel, isBillingConfirmable, isChannelInboundEvent, isComplianceBusinessError, isComplianceTerminalError, isIntegrationStatus, isInvalidGrantError, isPlatform, isRegion, isSSECommentLine, isSSLError, isTerminalRemoteEvent, maxEndUserIdLength, modelScopes, modelSupportsImageInput, modelSupportsInputModality, newFileTokenStore, newThinkingConfig, newTokenSet, newWebSearchTool, normalizeGatewayBaseURL, parseNotificationEvent, parseRemoteControlEvent, parseSettlement, parseSourcesEvent, refreshToken, register, registerWebOAuthClient, remoteControlScopes, retryReasonForComplianceKey, retryReasonForOAuthError, revokeToken, sanitize_exports as sanitize, skillScopes, tokenSetIsExpired, uniqueMerge, validateEndUserId };
+export { ALL_INTEGRATION_STATUS, ALL_PLATFORMS, ALL_REGIONS, AgentRunStreamError, AgentRunsClient, AnthropicAdapter, AudienceEnum, BillingModeEnum, BucketClassCommercial, BucketClassGeneric, BusinessError, Client, ComplianceClient, CompliancePollError, DEFAULT_API_TIMEOUT_MS, DEFAULT_GATEWAY_BASE_URL, LocalStorageTokenStore as DefaultBrowserTokenStore, DefaultRetryPolicy, ErrAuthDenied, ErrBillingCallbackCannotCommit, ErrBillingCommitRequiresLocalVerify, ErrBillingS2sForbidden, ErrBrowserOpen, ErrComplianceStepUpRequired, ErrDiscovery, ErrEnvelopeGateClosed, ErrOAuthCORSBlocked, ErrProviderNotConfigured, ErrProviderUnknownNoRetry, ErrRefreshProxyFailed, ErrRegistration, ErrSSLProxy, ErrSealApprovalContractHashMismatch, ErrSealApprovalExpired, ErrSealApprovalLocationMismatch, ErrSealApprovalNonceUsed, ErrSealApprovalNotApproved, ErrSealApprovalSealMismatch, ErrSealApprovalTransactorMismatch, ErrSealUseAlreadyConsumed, ErrStateMismatch, ErrTimeout, ErrTokenExchange, ErrTokenExpired, EventAuthURL, EventComplete, EventError, FileTokenStore, FilterStatusAdminBypass, FilterStatusDisabledByFlag, FilterStatusFallbackMissingUser, FilterStatusFallbackNoBuckets, FilterStatusFallbackTkdistError, FilterStatusFallbackTkdistSkew, FilterStatusInternalBypass, FilterStatusOK, FilterStatusUnknown, HTTPError, IdempotencyKeyHeader, InMemoryTokenStore, LocalStorageTokenStore, ModelNotFoundError, NetworkError, OAuthTokenEndpointError, OpenAIAdapter, OrderTerminalError, ProductFamilyEnum, ProviderFormat, RETRY_ADVICE_REASONS, RateLimitError, RegionScopeEnum, ScopeAI, ScopeAccount, ScopeChatBridge, ScopeChatBridgeRead, ScopeChatBridgeRotate, ScopeChatBridgeWrite, ScopeComplianceContractSigningRead, ScopeComplianceContractSigningWrite, ScopeComplianceContractTemplateRead, ScopeComplianceContractTemplateWrite, ScopeComplianceEvidenceRead, ScopeComplianceEvidenceWrite, ScopeComplianceReportsPublish, ScopeComplianceReportsRead, ScopeComplianceReportsWrite, ScopeComplianceSealApprovalApprove, ScopeComplianceSealApprovalRequest, ScopeComplianceSealManage, ScopeComplianceSealUseExecute, ScopeComplianceTimestampIssue, ScopeComplianceTimestampVerify, ScopeEntitlements, ScopeModels, ScopeModelsChat, ScopeProfile, ScopeRemoteControl, ScopeRemoteControlAgentRun, ScopeRemoteControlPermissionResponse, ScopeRemoteControlSessionControl, ScopeSkillStore, ScopeSkills, ScopeTokenPackages, ScopeTools, ScopeToolsExecute, ScopeWallet, ScopeWalletReadonly, ServerToolTypeWebSearch, StreamError, ThinkingHigh, ThinkingHighMinMaxTokens, ThinkingMax, ThinkingMaxFallbackMaxTokens, ThinkingOff, allScopes, anthropicResponseTextContent, anthropicResponseThinkingContent, anthropicResponseToolUseBlocks, apiResponseBusinessError, apiResponseGetMessage, asCredentialRef, authorize, bucketInfoIsCommercial, bucketRowIsCommercial, buildBetas, chatBridgeScopes, classifyComplianceError, commerceScopes, completeWebAuthorizationRequest, complianceErrorToRetryAdvice, complianceScopes, computeBackoff, createWebAuthorizationRequest, defaultRetryable, defaultSafeToRetry, discover, discoverWebOAuthMetadata, discoverWithProfile, effectivePolicy, exchangeCode, extractAnthropicBlockMeta, fileLockDefaults, findDesktopVisualUnderstandingModel, findFirstModelByInputModality, generateState, getAdapter, getAdapterForModel, isBillingConfirmable, isChannelInboundEvent, isComplianceBusinessError, isComplianceTerminalError, isIntegrationStatus, isInvalidGrantError, isPlatform, isRegion, isSSECommentLine, isSSLError, isTerminalRemoteEvent, isValidTokenSet, maxEndUserIdLength, modelScopes, modelSupportsImageInput, modelSupportsInputModality, newFileTokenStore, newThinkingConfig, newTokenSet, newWebSearchTool, normalizeGatewayBaseURL, normalizeOverrideBaseURL, parseNotificationEvent, parseRemoteControlEvent, parseSettlement, parseSourcesEvent, refreshToken, register, registerWebOAuthClient, remoteControlScopes, retryReasonForComplianceKey, retryReasonForOAuthError, revokeToken, sanitize_exports as sanitize, skillScopes, tokenSetIsExpired, uniqueMerge, validateEndUserId };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map