aws-runtime-bridge 1.9.33 → 1.9.41

package/dist/adapter/AcodeSdkAdapter.d.ts

@@ -11,7 +11,8 @@
  *  - 解析结果会写入 d:/Instance-ai-configuration-debug.log，bridge + 后端共享同一份
  */
 import { EventEmitter } from "node:events";
-import type { AdapterSessionConfig, BaseProviderAdapter, ConversationMessage, SessionStatus } from "./types.js";
+import type { SubAgentManager } from "@agentswork/acode";
+import type { AdapterSessionConfig, BaseProviderAdapter, ConversationMessage, RuntimeCapabilities, SessionStatus } from "./types.js";
 type ACodeEvent = {
     type: string;
     sessionId: string;
@@ -25,6 +26,8 @@ type ACodeRuntimeInstance = {
     abort(): Promise<void>;
     resetContext?(): Promise<void>;
     stop(): Promise<void>;
+    /** 接收用户对 ask_user_question 的回答；返回 false 表示无对应 waiter（已过期或终止） */
+    submitQuestionAnswer?(toolCallId: string, answers: Record<string, string>): boolean;
 };
 type ACodeRuntimeConstructor = new (config: {
     sessionId: string;
@@ -39,6 +42,7 @@ type ACodeRuntimeConstructor = new (config: {
     rolePrompt?: string;
     memory?: string;
     env?: Record<string, string>;
+    subAgentManager?: SubAgentManager;
 }) => ACodeRuntimeInstance;
 export declare function toAcodeEsmImportSpecifier(modulePath: string): string;
 /**
@@ -54,6 +58,13 @@ export declare class AcodeSdkAdapter extends EventEmitter implements BaseProvide
     startSession(sessionId: string, config: AdapterSessionConfig): Promise<void>;
     sendMessage(sessionId: string, message: string): Promise<void>;
     sendConfirmation(_sessionId: string, _accept: boolean): Promise<void>;
+    /**
+     * 接收前端对 ask_user_question 的回答（来自 terminal.ts /sdk/answer 路由）。
+     * 通过 pendingQuestionToolCallId 找到 runtime.submitQuestionAnswer 的入参 toolCallId，
+     * resolve 阻塞的工具 execute()，让 ACode 继续下一轮 LLM 请求。
+     * 重新启动 submit 超时检测（继续计费后续工具执行时间）。
+     */
+    sendQuestionAnswer(sessionId: string, answers: Record<string, string>): Promise<void>;
     abortCurrentTurn(sessionId: string): Promise<void>;
     resetContext(sessionId: string): Promise<void>;
     terminateSession(sessionId: string): Promise<void>;
@@ -61,6 +72,22 @@ export declare class AcodeSdkAdapter extends EventEmitter implements BaseProvide
     hasSession(sessionId: string): boolean;
     getProviderSessionId(sessionId: string): string | undefined;
     getSessionStatus(sessionId: string): SessionStatus | undefined;
+    /**
+     * 主动查询会话的运行时能力清单（MCP 工具 + skills）。
+     * 只读 adapter 内存缓存（lastCombinedCapabilities），不触发 runtime 重新探测。
+     * 由 mcp_status / skill_status 事件维护；若尚未收到任何 runtime_capabilities 事件则返回 undefined。
+     */
+    getCapabilities(sessionId: string): RuntimeCapabilities | undefined;
+    /**
+     * 主动查询会话当前挂起的 ask_user_question。
+     * 只读 adapter 内存缓存（pendingQuestionToolCallId + pendingQuestions）。
+     * 由 bridge GET /runtime/sdk/pending-questions 端点调用，用于前端刷新后重建提问 UI。
+     * 返回 undefined 表示当前无挂起提问（会话不存在或 agent 未提问）。
+     */
+    getPendingQuestion(sessionId: string): {
+        toolCallId: string;
+        questions: unknown[];
+    } | undefined;
     cleanup(): void;
     setIdleCommands(sessionId: string, commands: {
         idleInputCommand: string;
@@ -122,6 +149,13 @@ export declare class AcodeSdkAdapter extends EventEmitter implements BaseProvide
     private isTerminalStatus;
     private emitRuntimeError;
     private emitRuntimeErrorEvent;
+    /**
+     * 从会话消息中估算 AI 输出 token 数（字符数 / 4 粗略估算）。
+     * 注意：该估算对 CJK 文本偏高（实际每字约 1-2 tokens），
+     * 对纯 ASCII 文本偏低（约 3-5 字符/token），仅供面板展示实时趋势使用，
+     * 不应用于精确计费或配额判定。精确值以 turn_complete 事件中的 usage 为准。
+     */
+    private estimateOutputTokensFromMessages;
     private recoverTurnFailure;
     /**
      * Recover turns where runtime.submit() resolved but no terminal turn event arrived.
@@ -134,16 +168,43 @@ export declare class AcodeSdkAdapter extends EventEmitter implements BaseProvide
      */
     private recoverResolvedTurnWithoutTerminalEvent;
     /**
-     * 启动 submit 超时检测（治本修复：防止状态永久卡住）
+     * 启动异步看门狗：周期性轮询运行时状态，仅在真正卡死时恢复。
+     *
+     * 替代原来两个独立的 setTimeout（submitTimeoutDetection + dataFlowWatchdog），
+     * 改为单一 setInterval 轮询。核心设计：
+     * - 每 ACODE_WATCHDOG_POLL_INTERVAL_MS（5s）检查一次状态
+     * - waiting_input 状态下不累计超时（agent 正在有意等待，如 poll_message/ask_user_question）
+     * - 仅在 thinking/tool_using 状态下累计"活跃持续时间"和"无数据流时间"
+     * - submit 超时 120s 或数据流超时 40s 时触发 recoverTurnFailure
      *
-     * 如果 runtime.submit() 在指定时间内未返回，强制触发恢复机制，
-     * 避免会话永久卡在 thinking/tool_using 状态。
+     * 相比 setTimeout 方案的优势：
+     * 1. 状态感知：每次轮询都读取当前真实状态，不会因状态在定时周期内多次变化而误判
+     * 2. waiting_input 自动暂停计时：无需递归重新计时，天然跳过
+     * 3. 单一 timer：避免两个独立 timer 的竞态和重复恢复
      */
     private startSubmitTimeoutDetection;
     /**
-     * 取消 submit 超时检测
+     * 执行看门狗恢复：abort runtime + recoverTurnFailure
+     */
+    private executeWatchdogRecovery;
+    /**
+     * 取消看门狗
      */
     private cancelSubmitTimeoutDetection;
+    /**
+     * 重置数据流计时基准：收到流式数据（assistant_delta/thinking_delta）时调用。
+     * 不再重启定时器，仅更新计时基准，下次轮询时从新基准计算。
+     */
+    private resetDataFlowWatchdog;
+    /**
+     * 启动数据流看门狗：由 ai_request 调用，初始化数据流计时基准。
+     * 实际的轮询由 startSubmitTimeoutDetection 的 interval 统一处理。
+     */
+    private startDataFlowWatchdog;
+    /**
+     * 取消数据流看门狗（已合并到 cancelSubmitTimeoutDetection，此方法保留兼容性）
+     */
+    private cancelDataFlowWatchdog;
 }
 export {};
 //# sourceMappingURL=AcodeSdkAdapter.d.ts.map

package/dist/adapter/AcodeSdkAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/AcodeSdkAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/AcodeSdkAdapter.ts"],"names":[],"mappings":"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"}