@acosmi/sdk-ts 2.3.0 → 2.5.1

package/dist/node/index.cjs

@@ -322,13 +322,20 @@ function resolveThinkingLevel(body, req, caps) {
   }
   delete body["temperature"];
 }
-exports.AnthropicAdapter = void 0;
+var ANTHROPIC_SDK_MANAGED_BODY_KEYS; exports.AnthropicAdapter = void 0;
 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"
+    ]);
     exports.AnthropicAdapter = class {
       format() {
         return 0 /* Anthropic */;
@@ -416,6 +423,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;
           }
         }
@@ -775,6 +788,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();
@@ -815,6 +831,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,
@@ -824,7 +841,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 });
@@ -834,7 +851,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++;
@@ -857,6 +874,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",
@@ -901,9 +927,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 });
           }
@@ -944,13 +971,6 @@ function getAdapter(provider) {
   return defaultOpenAIAdapter;
 }
 function getAdapterForModel(m) {
-  const pref = (m.preferred_format ?? "").trim().toLowerCase();
-  switch (pref) {
-    case "anthropic":
-      return new exports.AnthropicAdapter();
-    case "openai":
-      return new exports.OpenAIAdapter();
-  }
   let hasAnthropic = false;
   let hasOpenAI = false;
   for (const f of m.supported_formats ?? []) {
@@ -963,6 +983,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 exports.AnthropicAdapter();
+      break;
+    case "openai":
+      if (!declared || hasOpenAI) return new exports.OpenAIAdapter();
+      break;
+  }
   if (hasAnthropic) return new exports.AnthropicAdapter();
   if (hasOpenAI) return new exports.OpenAIAdapter();
   return getAdapter((m.provider ?? "").toLowerCase());
@@ -972,6 +1002,7 @@ var init_adapters = __esm({
   "src/models/adapters/index.ts"() {
     init_anthropic();
     init_openai();
+    init_openai();
     exports.ProviderFormat = /* @__PURE__ */ ((ProviderFormat2) => {
       ProviderFormat2[ProviderFormat2["Anthropic"] = 0] = "Anthropic";
       ProviderFormat2[ProviderFormat2["OpenAI"] = 1] = "OpenAI";
@@ -992,8 +1023,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();
@@ -1027,7 +1064,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(/\/+$/, ""));
@@ -1039,7 +1076,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 {
@@ -1061,13 +1098,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",
@@ -1078,7 +1115,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),
@@ -1098,7 +1135,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",
@@ -1110,7 +1147,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),
@@ -1314,7 +1351,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");
   }
@@ -1323,18 +1360,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,
@@ -1342,9 +1380,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,
@@ -1353,24 +1391,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,
@@ -1382,11 +1420,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,
@@ -1604,7 +1642,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) {
@@ -1614,6 +1660,15 @@ ${Date.now()}
         }
         throw e;
       }
+      try {
+        const dirHandle = await fs.open(dir, "r");
+        try {
+          await dirHandle.sync();
+        } finally {
+          await dirHandle.close();
+        }
+      } catch {
+      }
     });
   }
   load() {
@@ -1622,7 +1677,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(
@@ -1673,11 +1735,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);
@@ -2046,6 +2111,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]);
@@ -2066,6 +2157,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;
@@ -2123,8 +2215,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;
@@ -2216,7 +2308,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)}`);
@@ -2225,7 +2317,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);
@@ -2242,7 +2334,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);
@@ -2270,7 +2362,8 @@ var Client = class _Client {
             result.redirectURI,
             verifier,
             opts.expiresIn,
-            signal
+            signal,
+            this.fetchImpl
           );
         } else {
           tokenResp = await exchangeCode(
@@ -2279,7 +2372,8 @@ var Client = class _Client {
             result.code,
             result.redirectURI,
             verifier,
-            signal
+            signal,
+            this.fetchImpl
           );
         }
       } catch (err) {
@@ -2316,18 +2410,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 {
         }
       }
@@ -2421,7 +2515,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)}`
@@ -2434,7 +2528,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);
@@ -2701,10 +2796,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);
@@ -2802,11 +2897,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",
@@ -2839,11 +2934,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);
@@ -2873,8 +2968,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);
@@ -2942,8 +3037,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);
@@ -3115,6 +3210,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);
@@ -3215,6 +3313,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
@@ -4383,6 +4493,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 = {
@@ -4911,7 +5024,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) {
@@ -4967,7 +5083,6 @@ var AgentRunsClient = class {
       };
     }
     const ctl = new AbortController();
-    const timer = setTimeout(() => ctl.abort(), timeoutMs);
     let parentAbort;
     if (signal) {
       if (signal.aborted) ctl.abort();
@@ -4976,7 +5091,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,
@@ -4984,6 +5110,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;
@@ -5016,14 +5147,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 = {
@@ -5042,7 +5188,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();
@@ -6374,6 +6520,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 = {
@@ -6393,7 +6547,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();
@@ -6418,7 +6572,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);
@@ -6426,7 +6584,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());
@@ -6434,9 +6593,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":
@@ -6988,6 +7168,7 @@ exports.BillingModeEnum = BillingModeEnum;
 exports.Client = Client;
 exports.ComplianceClient = ComplianceClient;
 exports.CompliancePollError = CompliancePollError;
+exports.DEFAULT_API_TIMEOUT_MS = DEFAULT_API_TIMEOUT_MS;
 exports.DEFAULT_GATEWAY_BASE_URL = DEFAULT_GATEWAY_BASE_URL;
 exports.DefaultRetryPolicy = DefaultRetryPolicy;
 exports.ErrAuthDenied = ErrAuthDenied;
@@ -7111,6 +7292,7 @@ exports.isRegion = isRegion;
 exports.isSSECommentLine = isSSECommentLine;
 exports.isSSLError = isSSLError;
 exports.isTerminalRemoteEvent = isTerminalRemoteEvent;
+exports.isValidTokenSet = isValidTokenSet;
 exports.maxEndUserIdLength = maxEndUserIdLength;
 exports.modelScopes = modelScopes;
 exports.modelSupportsImageInput = modelSupportsImageInput;
@@ -7120,6 +7302,7 @@ exports.newThinkingConfig = newThinkingConfig;
 exports.newTokenSet = newTokenSet;
 exports.newWebSearchTool = newWebSearchTool;
 exports.normalizeGatewayBaseURL = normalizeGatewayBaseURL;
+exports.normalizeOverrideBaseURL = normalizeOverrideBaseURL;
 exports.parseNotificationEvent = parseNotificationEvent;
 exports.parseRemoteControlEvent = parseRemoteControlEvent;
 exports.parseSettlement = parseSettlement;