@zqagent/core 0.3.11 → 0.3.12

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { M as Mode, S as ShellPolicy, E as EngineHook, C as CompactionStartInfo, a as CompactionDoneInfo, b as EventType, c as EngineErrorInfo, P as ProviderClient, T as TurnEngine } from './TurnEngine-BPKhWuSI.cjs';
-export { A as ApprovalOutcome, d as Approver, e as CompactionTrigger, D as Decision, O as OpenAIProvider, f as PermissionEngine, g as PermissionRequest, h as ShellSandboxStatus, i as TurnEngineOpts, W as WsEvent } from './TurnEngine-BPKhWuSI.cjs';
+import { M as Mode, S as ShellPolicy, E as EngineHook, C as CompactionStartInfo, a as CompactionDoneInfo, b as EventType, c as EngineErrorInfo, P as ProviderClient, T as TurnEngine } from './TurnEngine-BSciNywD.cjs';
+export { A as ApprovalOutcome, d as Approver, e as CompactionTrigger, D as Decision, O as OpenAIProvider, f as PermissionEngine, g as PermissionRequest, h as ShellSandboxStatus, i as TurnEngineOpts, W as WsEvent } from './TurnEngine-BSciNywD.cjs';
 import { T as TokenUsage, M as Message, R as ReasoningEffort } from './types-BYyXWWPW.cjs';
 export { A as ATTACHMENT_DIR, d as AssistantTurn, e as AttachmentError, f as MAX_ATTACHMENTS, g as MAX_ATTACHMENT_BYTES, b as MessageAttachment, c as StoredAttachment, S as StreamChunk, h as ToolCall, a as ToolSchema, U as UPLOAD_DIR, W as WorkspaceFileRef, i as attachmentBytes, j as buildWorkspaceFileNotice, k as hasNonImageAttachments, n as normalizeAttachments, r as readStoredAttachment, s as saveAttachments, l as saveAttachmentsToWorkspace, m as splitByCapability, o as stripAttachments } from './types-BYyXWWPW.cjs';
 import { T as ToolRegistry } from './ToolRegistry-DouDvn9E.cjs';
@@ -24,6 +24,7 @@ export { registerMediaTool } from './tools/media.cjs';
 export { QuestionHandler, parsePicks, registerAskTool, setQuestionHandler } from './tools/ask.cjs';
 export { PlanHandler, PlanReply, interpretPlanReply, isAffirmativeText, isRejectionText, registerPlanTool, setPlanHandler } from './internal/tools/plan.cjs';
 export { DirectoryHandler, registerDirectoryTool, setDirectoryHandler } from './tools/directories.cjs';
+import { ApiMode } from './internal/providers/diagnostics.cjs';
 import 'openai/resources/chat/completions.js';
 import 'openai/core.mjs';
 import '@zqagent/shared/model-capabilities';
@@ -1098,6 +1099,10 @@ interface CreateEngineOpts {
      * DeepSeek 自动跳过。
      */
     reasoningEffort?: ReasoningEffort;
+    /** 单次请求超时（毫秒）。缺省取 OPENAI_TIMEOUT_MS，再缺省 10 分钟 */
+    timeoutMs?: number | null;
+    /** API 模式。缺省取 OPENAI_FORCE_API_MODE，再缺省 auto（Responses 优先） */
+    apiMode?: ApiMode | null;
     /** 命令白名单（Auto 模式下自动放行的命令前缀，默认空数组） */
     allowedCommands?: string[];
     /**

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { M as Mode, S as ShellPolicy, E as EngineHook, C as CompactionStartInfo, a as CompactionDoneInfo, b as EventType, c as EngineErrorInfo, P as ProviderClient, T as TurnEngine } from './TurnEngine-DtGEuVLT.js';
-export { A as ApprovalOutcome, d as Approver, e as CompactionTrigger, D as Decision, O as OpenAIProvider, f as PermissionEngine, g as PermissionRequest, h as ShellSandboxStatus, i as TurnEngineOpts, W as WsEvent } from './TurnEngine-DtGEuVLT.js';
+import { M as Mode, S as ShellPolicy, E as EngineHook, C as CompactionStartInfo, a as CompactionDoneInfo, b as EventType, c as EngineErrorInfo, P as ProviderClient, T as TurnEngine } from './TurnEngine-BU4R7q_0.js';
+export { A as ApprovalOutcome, d as Approver, e as CompactionTrigger, D as Decision, O as OpenAIProvider, f as PermissionEngine, g as PermissionRequest, h as ShellSandboxStatus, i as TurnEngineOpts, W as WsEvent } from './TurnEngine-BU4R7q_0.js';
 import { T as TokenUsage, M as Message, R as ReasoningEffort } from './types-BYyXWWPW.js';
 export { A as ATTACHMENT_DIR, d as AssistantTurn, e as AttachmentError, f as MAX_ATTACHMENTS, g as MAX_ATTACHMENT_BYTES, b as MessageAttachment, c as StoredAttachment, S as StreamChunk, h as ToolCall, a as ToolSchema, U as UPLOAD_DIR, W as WorkspaceFileRef, i as attachmentBytes, j as buildWorkspaceFileNotice, k as hasNonImageAttachments, n as normalizeAttachments, r as readStoredAttachment, s as saveAttachments, l as saveAttachmentsToWorkspace, m as splitByCapability, o as stripAttachments } from './types-BYyXWWPW.js';
 import { T as ToolRegistry } from './ToolRegistry-Cy0fQxrb.js';
@@ -24,6 +24,7 @@ export { registerMediaTool } from './tools/media.js';
 export { QuestionHandler, parsePicks, registerAskTool, setQuestionHandler } from './tools/ask.js';
 export { PlanHandler, PlanReply, interpretPlanReply, isAffirmativeText, isRejectionText, registerPlanTool, setPlanHandler } from './internal/tools/plan.js';
 export { DirectoryHandler, registerDirectoryTool, setDirectoryHandler } from './tools/directories.js';
+import { ApiMode } from './internal/providers/diagnostics.js';
 import 'openai/resources/chat/completions.js';
 import 'openai/core.mjs';
 import '@zqagent/shared/model-capabilities';
@@ -1098,6 +1099,10 @@ interface CreateEngineOpts {
      * DeepSeek 自动跳过。
      */
     reasoningEffort?: ReasoningEffort;
+    /** 单次请求超时（毫秒）。缺省取 OPENAI_TIMEOUT_MS，再缺省 10 分钟 */
+    timeoutMs?: number | null;
+    /** API 模式。缺省取 OPENAI_FORCE_API_MODE，再缺省 auto（Responses 优先） */
+    apiMode?: ApiMode | null;
     /** 命令白名单（Auto 模式下自动放行的命令前缀，默认空数组） */
     allowedCommands?: string[];
     /**

package/dist/index.js

@@ -255,9 +255,23 @@ function paramErrorHints(message, code = "") {
   }
   return hints;
 }
-function llmTimeoutMs() {
+var DEFAULT_LLM_TIMEOUT_MS = 6e5;
+function normLlmTimeoutMs(v) {
+  if (v === null || v === void 0 || v === "") return null;
+  const n = Number(v);
+  if (!Number.isFinite(n) || n <= 0) return null;
+  return Math.min(Math.round(n), 30 * 6e4);
+}
+function llmTimeoutMs(explicit) {
+  const fromArg = normLlmTimeoutMs(explicit);
+  if (fromArg) return fromArg;
   const n = Number(process.env.OPENAI_TIMEOUT_MS);
-  return Number.isFinite(n) && n > 0 ? n : 6e5;
+  return Number.isFinite(n) && n > 0 ? n : DEFAULT_LLM_TIMEOUT_MS;
+}
+function normApiMode(v) {
+  const s = typeof v === "string" ? v.trim().toLowerCase() : "";
+  if (s === "auto" || s === "responses" || s === "chat") return s;
+  return null;
 }
 function llmStreamIdleMs() {
   const n = Number(process.env.OPENAI_STREAM_IDLE_MS);
@@ -4486,6 +4500,11 @@ var ResponsesApiError = class extends Error {
   type;
   requestId;
 };
+var NO_AUTH_KEY = "not-needed";
+var degradedModes = /* @__PURE__ */ new Map();
+function modeKey(baseURL, model) {
+  return `${baseURL}::${model}`;
+}
 var OpenAIProvider = class {
   /** OpenAI SDK 客户端 */
   client;
@@ -4493,23 +4512,31 @@ var OpenAIProvider = class {
   _logDir;
   /** 服务端点 baseURL（用于识别 DeepSeek 等特定供应商） */
   _baseURL;
-  /** 模型 → API 模式缓存：某模型不支持 Responses 后，后续直走 Chat */
-  _modeByModel = /* @__PURE__ */ new Map();
+  /**
+   * 本实例的 API 模式。
+   *
+   * 显式配置 > 全局 `OPENAI_FORCE_API_MODE` > auto（先 Responses 再降级）。
+   * 早先只有全局环境变量一种表达方式，一个节点挂两家供应商时无法各自指定。
+   */
+  _apiMode;
   constructor(opts) {
+    const explicitKey = opts.apiKey !== void 0;
     const apiKey = cleanLlmValue(opts.apiKey ?? process.env.OPENAI_API_KEY);
     const baseURL = normalizeBaseURL(opts.baseURL ?? process.env.OPENAI_BASE_URL);
-    if (!apiKey) {
+    if (!apiKey && !explicitKey) {
       throw new Error(sanitizeEmoji("\u274C \u672A\u8BBE\u7F6E OPENAI_API_KEY \u73AF\u5883\u53D8\u91CF"));
     }
+    const effectiveKey = apiKey ?? NO_AUTH_KEY;
     this._baseURL = baseURL ?? "";
+    this._apiMode = normApiMode(opts.apiMode) ?? normApiMode(process.env.OPENAI_FORCE_API_MODE) ?? "auto";
     const agent = socksAgent();
     const proxyHint = unsupportedProxyHint();
     if (proxyHint) console.warn(`[llm] ${proxyHint}`);
     const baseFetch = agent ? makeSocksFetch(agent) : ((input, init) => globalThis.fetch(input, init));
     this.client = new OpenAI({
-      apiKey,
+      apiKey: effectiveKey,
       ...baseURL ? { baseURL } : {},
-      timeout: llmTimeoutMs(),
+      timeout: llmTimeoutMs(opts.timeoutMs),
       maxRetries: llmMaxRetries(),
       // 类型：SDK 期望 (RequestInfo, RequestInit) => Promise<Response>，
       // node-fetch 的 Response 与 DOM Response 结构不同，此处显式放宽
@@ -4526,14 +4553,17 @@ var OpenAIProvider = class {
   /**
    * 解析指定模型的 API 模式。
    *
-   * 优先级：环境变量 OPENAI_FORCE_API_MODE（responses|chat）强制指定
-   * > 运行时降级缓存（该模型曾因"不支持"失败而缓存为 chat）
+   * 优先级：本实例的显式配置（responses|chat）
+   * > 运行时降级缓存（该端点+模型曾因"不支持"失败而缓存为 chat）
    * > 默认 responses（Responses 优先）。
    */
   _resolveMode(model) {
-    const forced = process.env.OPENAI_FORCE_API_MODE?.toLowerCase();
-    if (forced === "responses" || forced === "chat") return forced;
-    return this._modeByModel.get(model) ?? "responses";
+    if (this._apiMode !== "auto") return this._apiMode;
+    return degradedModes.get(modeKey(this._baseURL, model)) ?? "responses";
+  }
+  /** 记录「该端点+模型不支持 Responses」，后续同进程内的请求直走 Chat */
+  _markChatMode(model) {
+    degradedModes.set(modeKey(this._baseURL, model), "chat");
   }
   /**
    * Responses 失败的分类（决定「能不能改走 Chat Completions」以及要不要缓存降级）。
@@ -4609,7 +4639,7 @@ var OpenAIProvider = class {
         } catch (err) {
           const kind = this._responsesFailureKind(err, true);
           if (kind) {
-            if (kind === "endpoint") this._modeByModel.set(model, "chat");
+            if (kind === "endpoint") this._markChatMode(model);
             console.warn(
               `[llm] ${model} Responses API \u4E0D\u53EF\u7528(${kind})\uFF0C\u6539\u7528 Chat Completions (${String(
                 err?.message ?? err
@@ -4683,7 +4713,7 @@ var OpenAIProvider = class {
       } catch (err) {
         const kind = this._responsesFailureKind(err, true);
         if (kind) {
-          if (kind === "endpoint") this._modeByModel.set(model, "chat");
+          if (kind === "endpoint") this._markChatMode(model);
           console.warn(
             `[llm] ${model} Responses API \u4E0D\u53EF\u7528(${kind})\uFF0C\u6539\u7528 Chat Completions (${String(
               err?.message ?? err
@@ -4729,7 +4759,7 @@ var OpenAIProvider = class {
     } catch (err) {
       const kind = emitted ? null : this._responsesFailureKind(err, false);
       if (!kind) throw enrichLlmError(err, this._baseURL);
-      if (kind === "endpoint") this._modeByModel.set(ctx.model, "chat");
+      if (kind === "endpoint") this._markChatMode(ctx.model);
       console.warn(
         `[llm] ${ctx.model} Responses \u6D41\u5185\u5931\u8D25(${kind})\uFF0C\u6539\u7528 Chat Completions (${String(
           err?.message ?? err
@@ -13262,6 +13292,8 @@ function createDefaultEngine(opts) {
     mode = "interactive" /* INTERACTIVE */,
     maxIterations = DEFAULT_MAX_ITERATIONS,
     reasoningEffort,
+    timeoutMs,
+    apiMode,
     allowedCommands = [],
     shellPolicy = "approve",
     sandbox,
@@ -13282,7 +13314,7 @@ function createDefaultEngine(opts) {
   } = opts;
   const envEffort = process.env.OPENAI_REASONING_EFFORT?.toLowerCase();
   const effectiveEffort = reasoningEffort ?? (envEffort === "low" || envEffort === "medium" || envEffort === "high" ? envEffort : void 0);
-  const effectiveProvider = provider ?? new OpenAIProvider({ logDir });
+  const effectiveProvider = provider ?? new OpenAIProvider({ logDir, timeoutMs, apiMode });
   const sandboxPlan = resolveSandbox({ ...sandbox, workspace });
   const registry = new ToolRegistry();
   const conflictGuard = new ConflictGuard();