aws-runtime-bridge 1.9.10 → 1.9.20

package/dist/adapter/AcodeSdkAdapter.d.ts

@@ -3,6 +3,12 @@
  *
  * 主流程：直接加载随 aws-runtime-bridge 内置发布的 ACode headless runtime，
  * 不依赖外部 CLI 安装；将 ACode 的结构化事件映射为 runtime-bridge 统一事件流。
+ *
+ * 模型/baseURL/apiKey 解析（核心）：
+ *  - 调用 instance-ai-config-resolver 按 "instance > global > default" 三层仲裁
+ *  - "instance" 包含 per-session config.model 与 per-instance config.instanceAiConfig
+ *  - "global" 来自 configPath 指向的 acode.json（per-instance 文件已 deep-merge 全局）
+ *  - 解析结果会写入 d:/Instance-ai-configuration-debug.log，bridge + 后端共享同一份
  */
 import { EventEmitter } from "node:events";
 import type { AdapterSessionConfig, BaseProviderAdapter, ConversationMessage, SessionStatus } from "./types.js";
@@ -22,6 +28,7 @@ type ACodeRuntimeInstance = {
 };
 type ACodeRuntimeConstructor = new (config: {
     sessionId: string;
+    agentId?: string;
     workingDirectory: string;
     configPath?: string;
     skillsDir?: string;
@@ -58,6 +65,28 @@ export declare class AcodeSdkAdapter extends EventEmitter implements BaseProvide
     }): void;
     /** Injects a runtime constructor for adapter tests without loading the packaged ACode module. */
     setRuntimeConstructorForTest(runtimeConstructor: ACodeRuntimeConstructor): void;
+    /**
+     * 加载 ACode acode.json 顶层 provider 字段，提取 model/baseURL/apiKey，
+     * 以及顶层 contextLimit（用户自定义上下文窗口大小）。
+     * 主流程：先尝试 per-instance 文件（由 instance-ai-config-service 写入，含 deep-merge 结果），
+     * 失败回退到 global acode.json；解析失败返回空对象。
+     */
+    /**
+     * 从 acode.json 中读取 provider.default 信息及模型配置字典。
+     * 返回包含 model/baseURL/apiKey 的仲裁配置，以及：
+     * - contextLimit: 顶层 contextLimit（优先）
+     * - modelContextLimits: 各模型的 contextLimit 字典，供 resolveAcodeProvider 回退查找
+     */
+    private loadAcodeProviderSection;
+    /**
+     * 解析 ACode provider 配置：按 "instance > global > default" 优先级逐字段仲裁。
+     * 入口在 createRuntime；该方法独立出来便于测试。
+     *
+     * @param config AdapterSessionConfig（per-session model 与 per-instance instanceAiConfig）
+     * @param configPath 实际作为 ACodeRuntime.configPath 的 acode.json 路径
+     *                  （可能为 per-instance 文件或全局文件）
+     */
+    private resolveAcodeProvider;
     private createRuntime;
     private loadRuntimeConstructor;
     private requireSession;
@@ -101,6 +130,17 @@ export declare class AcodeSdkAdapter extends EventEmitter implements BaseProvide
      * look permanently stuck. Recover to waiting_input and arm the listening loop.
      */
     private recoverResolvedTurnWithoutTerminalEvent;
+    /**
+     * 启动 submit 超时检测（治本修复：防止状态永久卡住）
+     *
+     * 如果 runtime.submit() 在指定时间内未返回，强制触发恢复机制，
+     * 避免会话永久卡在 thinking/tool_using 状态。
+     */
+    private startSubmitTimeoutDetection;
+    /**
+     * 取消 submit 超时检测
+     */
+    private cancelSubmitTimeoutDetection;
 }
 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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"}

package/dist/adapter/AcodeSdkAdapter.js

@@ -3,13 +3,23 @@
  *
  * 主流程：直接加载随 aws-runtime-bridge 内置发布的 ACode headless runtime，
  * 不依赖外部 CLI 安装；将 ACode 的结构化事件映射为 runtime-bridge 统一事件流。
+ *
+ * 模型/baseURL/apiKey 解析（核心）：
+ *  - 调用 instance-ai-config-resolver 按 "instance > global > default" 三层仲裁
+ *  - "instance" 包含 per-session config.model 与 per-instance config.instanceAiConfig
+ *  - "global" 来自 configPath 指向的 acode.json（per-instance 文件已 deep-merge 全局）
+ *  - 解析结果会写入 d:/Instance-ai-configuration-debug.log，bridge + 后端共享同一份
  */
 import { EventEmitter } from "node:events";
 import path from "node:path";
+import fs from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import { v4 as uuidv4 } from "uuid";
 import { getAcodeConfigFile, getAcodeSkillsDir, getRuntimeHomeDir, } from "../config.js";
 import { getReleasedAcodeEntryPath } from "../services/acode-package.js";
+import { getInstanceAiConfigDebugLogger } from "../utils/instance-ai-config-debug-logger.js";
+import { redactForLog } from "../services/instance-ai-config-service.js";
+import { resolveAcodeProviderConfig, } from "./instance-ai-config-resolver.js";
 import { isMessagePollingIdleCommand, isPollMessageToolDescriptor, } from "./acode-tool-names.js";
 import { IdlePollLoop } from "./idle-poll-loop.js";
 import { getCanonicalMcpDetail, getToolActionInfo } from "./types.js";
@@ -24,6 +34,9 @@ const ACODE_AUTO_POLL_DELAY_MS = 250;
 // model 5xx, provider unreachable). Larger than ACODE_AUTO_POLL_DELAY_MS to
 // avoid busy-looping when the same failure recurs on every retry.
 const ACODE_AUTO_POLL_FAILURE_DELAY_MS = 2000;
+// 新增：submit 超时检测配置（治本修复：防止状态永久卡住）
+// 当 submit 超过此时间未返回，强制触发恢复机制
+const ACODE_SUBMIT_TIMEOUT_MS = 120000; // 120秒（2分钟）
 const ACODE_MESSAGE_POLLING_IDLE_PROMPT = "系统提醒：当前工作已完成或运行时已进入空闲状态。请立即调用 poll_message 工具阻塞等待新消息和流程线任务提醒；收到流程任务提醒后调用 my_task 查看已由后台静默抢占的任务详情并直接处理；完成任务后调用 submit_task_result 提交结果，然后继续 poll_message。";
 function getAcodePackageEntryPath() {
     return path.resolve(getReleasedAcodeEntryPath());
@@ -31,6 +44,63 @@ function getAcodePackageEntryPath() {
 export function toAcodeEsmImportSpecifier(modulePath) {
     return pathToFileURL(path.resolve(modulePath)).href;
 }
+/**
+ * Known model context window limits lookup.
+ * Maps model name prefixes to { contextLimit, maxOutput }.
+ * Falls back to DEFAULT_CONTEXT_LIMIT (128K) when no match is found.
+ * This is aligned with aws-client-agent-mcp's context-manager.ts MODEL_CONTEXT_LIMITS.
+ */
+const DEFAULT_CONTEXT_LIMIT = 128_000;
+const MODEL_CONTEXT_LIMITS = {
+    "claude-4": { contextLimit: 200_000, maxOutput: 8_192 },
+    "claude-sonnet-4": { contextLimit: 200_000, maxOutput: 8_192 },
+    "claude-3-5-sonnet": { contextLimit: 200_000, maxOutput: 8_192 },
+    "claude-3-opus": { contextLimit: 200_000, maxOutput: 8_192 },
+    "claude-3-haiku": { contextLimit: 200_000, maxOutput: 8_192 },
+    "claude-2": { contextLimit: 100_000, maxOutput: 4_096 },
+    "gpt-4o": { contextLimit: 128_000, maxOutput: 16_384 },
+    "gpt-4-turbo": { contextLimit: 128_000, maxOutput: 4_096 },
+    "gpt-4": { contextLimit: 8_192, maxOutput: 4_096 },
+    "gpt-3.5-turbo": { contextLimit: 16_384, maxOutput: 4_096 },
+    "o1": { contextLimit: 200_000, maxOutput: 100_000 },
+    "o3-mini": { contextLimit: 200_000, maxOutput: 100_000 },
+    "gemini-2.0-flash": { contextLimit: 1_048_576, maxOutput: 8_192 },
+    "gemini-2.5-pro": { contextLimit: 1_048_576, maxOutput: 8_192 },
+    "gemini-1.5-pro": { contextLimit: 2_097_152, maxOutput: 8_192 },
+    "gemini-1.5-flash": { contextLimit: 1_048_576, maxOutput: 8_192 },
+    "deepseek": { contextLimit: 64_000, maxOutput: 8_192 },
+    "deepseek-chat": { contextLimit: 64_000, maxOutput: 8_192 },
+    "deepseek-reasoner": { contextLimit: 64_000, maxOutput: 8_192 },
+    "qwen-max": { contextLimit: 32_000, maxOutput: 8_192 },
+    "qwen-plus": { contextLimit: 128_000, maxOutput: 8_192 },
+    "qwen-turbo": { contextLimit: 1_000_000, maxOutput: 8_192 },
+    "glm-4": { contextLimit: 128_000, maxOutput: 4_096 },
+    "yi-": { contextLimit: 200_000, maxOutput: 4_096 },
+    "llama-3": { contextLimit: 8_192, maxOutput: 4_096 },
+    "llama-2": { contextLimit: 4_096, maxOutput: 4_096 },
+    "mistral": { contextLimit: 32_000, maxOutput: 4_096 },
+    "mixtral": { contextLimit: 32_000, maxOutput: 4_096 },
+    "codestral": { contextLimit: 256_000, maxOutput: 8_192 },
+    "grok": { contextLimit: 131_072, maxOutput: 4_096 },
+    "nova-": { contextLimit: 200_000, maxOutput: 8_192 },
+};
+/**
+ * Look up model context window limit by model name.
+ * Exact match first, then prefix match (longest prefix wins).
+ */
+function lookupModelContextLimit(modelName) {
+    if (!modelName)
+        return DEFAULT_CONTEXT_LIMIT;
+    const key = modelName.toLowerCase().trim();
+    if (MODEL_CONTEXT_LIMITS[key])
+        return MODEL_CONTEXT_LIMITS[key].contextLimit;
+    const matches = Object.keys(MODEL_CONTEXT_LIMITS)
+        .filter((prefix) => key.startsWith(prefix))
+        .sort((a, b) => b.length - a.length);
+    if (matches.length > 0)
+        return MODEL_CONTEXT_LIMITS[matches[0]].contextLimit;
+    return DEFAULT_CONTEXT_LIMIT;
+}
 function toUsage(value) {
     if (!value || typeof value !== "object") {
         return undefined;
@@ -132,17 +202,24 @@ export class AcodeSdkAdapter extends EventEmitter {
     }
     async startSession(sessionId, config) {
         const runtimeHome = getRuntimeHomeDir();
+        // Resolve provider config first to get the resolved model and context limit,
+        // so totalUsage can carry contextLimit from the start.
+        const configPath = config.mcpConfigPath || getAcodeConfigFile(runtimeHome);
+        const { resolved, configContextLimit } = await this.resolveAcodeProvider(config, configPath);
+        const resolvedModel = resolved.model;
+        // priority: acode.json top-level contextLimit > model lookup table > 128K default
+        const contextLimit = configContextLimit ?? lookupModelContextLimit(resolvedModel);
         const session = {
             sessionId,
             status: "starting",
             messages: [],
             createdAt: new Date().toISOString(),
-            totalUsage: { inputTokens: 0, outputTokens: 0 },
+            totalUsage: { inputTokens: 0, outputTokens: 0, contextLimit },
         };
         this.sessions.set(sessionId, {
             adapterSession: session,
             config,
-            runtime: await this.createRuntime(sessionId, config, runtimeHome),
+            runtime: await this.createRuntime(sessionId, resolvedModel, config, runtimeHome),
             autoPollActive: false,
         });
         this.emit("status-change", sessionId, "starting");
@@ -177,7 +254,15 @@ export class AcodeSdkAdapter extends EventEmitter {
         }
     }
     async sendMessage(sessionId, message) {
+        const sendStartTime = Date.now();
+        console.log(`[ACode] ═══════════════════════════════════════════════════`);
+        console.log(`[ACode] ▶️ sendMessage STARTED`);
+        console.log(`[ACode]  Session: ${sessionId}`);
+        console.log(`[ACode]  Message: ${message.slice(0, 100)}${message.length > 100 ? '...' : ''}`);
+        console.log(`[ACode] ════════════════════════════════════════════════════`);
         const entry = this.requireSession(sessionId);
+        const previousStatus = entry.adapterSession.status;
+        console.log(`[ACode]  Previous status: ${previousStatus}`);
         this.cancelScheduledAutoPoll(entry);
         entry.failedTurnRecoveryScheduled = false;
         entry.idlePollLoop?.stop();
@@ -190,14 +275,36 @@ export class AcodeSdkAdapter extends EventEmitter {
         };
         entry.adapterSession.messages.push(userMessage);
         this.emit("conversation-message", sessionId, userMessage);
+        console.log(`[ACode]  Changing status: ${previousStatus} → thinking`);
         entry.adapterSession.status = "thinking";
         this.emit("status-change", sessionId, "thinking");
+        // 启动超时检测
+        this.startSubmitTimeoutDetection(sessionId, entry, "sendMessage");
         try {
+            console.log(`[ACode] ▶️ Calling runtime.submit()...`);
+            const submitStartTime = Date.now();
             await entry.runtime.submit(message);
+            const submitDuration = Date.now() - submitStartTime;
+            // submit 成功返回，取消超时检测
+            this.cancelSubmitTimeoutDetection(entry);
+            console.log(`[ACode] ✅ runtime.submit() completed in ${submitDuration}ms`);
+            console.log(`[ACode]  Current status after submit: ${entry.adapterSession.status}`);
+            console.log(`[ACode] ▶️ Calling recoverResolvedTurnWithoutTerminalEvent()...`);
             this.recoverResolvedTurnWithoutTerminalEvent(sessionId);
+            console.log(`[ACode]  Status after recovery: ${entry.adapterSession.status}`);
+            const totalDuration = Date.now() - sendStartTime;
+            console.log(`[ACode] ════════════════════════════════════════════════════`);
+            console.log(`[ACode] ✅ sendMessage COMPLETED in ${totalDuration}ms`);
+            console.log(`[ACode] ═══════════════════════════════════════════════════`);
         }
         catch (error) {
+            const errorDuration = Date.now() - sendStartTime;
+            console.error(`[ACode] ❌ sendMessage FAILED after ${errorDuration}ms:`, error instanceof Error ? error.message : String(error));
+            // submit 抛出异常，取消超时检测
+            this.cancelSubmitTimeoutDetection(entry);
+            console.log(`[ACode] ▶️ Calling emitRuntimeError with recover=true...`);
             this.emitRuntimeError(sessionId, error, { recover: true });
+            console.log(`[ACode]  Status after error recovery: ${entry.adapterSession.status}`);
         }
     }
     async sendConfirmation(_sessionId, _accept) { }
@@ -218,7 +325,7 @@ export class AcodeSdkAdapter extends EventEmitter {
         }
         await entry.runtime.resetContext();
         entry.adapterSession.messages = [];
-        entry.adapterSession.totalUsage = { inputTokens: 0, outputTokens: 0 };
+        entry.adapterSession.totalUsage = { inputTokens: 0, outputTokens: 0, contextLimit: entry.adapterSession.totalUsage.contextLimit };
         entry.adapterSession.status = "waiting_input";
         this.emit("status-change", sessionId, "waiting_input", {
             usage: entry.adapterSession.totalUsage,
@@ -280,19 +387,178 @@ export class AcodeSdkAdapter extends EventEmitter {
     setRuntimeConstructorForTest(runtimeConstructor) {
         this.runtimeConstructor = runtimeConstructor;
     }
-    async createRuntime(sessionId, config, runtimeHome) {
+    /**
+     * 加载 ACode acode.json 顶层 provider 字段，提取 model/baseURL/apiKey，
+     * 以及顶层 contextLimit（用户自定义上下文窗口大小）。
+     * 主流程：先尝试 per-instance 文件（由 instance-ai-config-service 写入，含 deep-merge 结果），
+     * 失败回退到 global acode.json；解析失败返回空对象。
+     */
+    /**
+     * 从 acode.json 中读取 provider.default 信息及模型配置字典。
+     * 返回包含 model/baseURL/apiKey 的仲裁配置，以及：
+     * - contextLimit: 顶层 contextLimit（优先）
+     * - modelContextLimits: 各模型的 contextLimit 字典，供 resolveAcodeProvider 回退查找
+     */
+    async loadAcodeProviderSection(configPath) {
+        try {
+            const raw = await fs.readFile(configPath, "utf-8");
+            const parsed = JSON.parse(raw);
+            const provider = parsed.provider;
+            const defaultProvider = provider?.default;
+            const options = defaultProvider?.options;
+            // 读取顶层 contextLimit（用户可在 acode.json 中配置自定义上下文窗口）
+            const contextLimit = toFiniteTokenCount(parsed.contextLimit);
+            // 从 provider.default.models 中提取各模型的 contextLimit 字典
+            const modelContextLimits = {};
+            const models = defaultProvider?.models;
+            if (models && typeof models === "object") {
+                for (const [modelName, modelConfig] of Object.entries(models)) {
+                    if (modelConfig && typeof modelConfig === "object") {
+                        const limit = toFiniteTokenCount(modelConfig.contextLimit);
+                        if (limit > 0) {
+                            modelContextLimits[modelName.trim()] = limit;
+                        }
+                    }
+                }
+            }
+            return {
+                ...(defaultProvider?.model ? { model: defaultProvider.model } : {}),
+                ...(options?.baseURL || options?.baseUrl
+                    ? { baseURL: options?.baseURL || options?.baseUrl }
+                    : {}),
+                ...(options?.apiKey ? { apiKey: options.apiKey } : {}),
+                ...(contextLimit > 0 ? { contextLimit } : {}),
+                ...(Object.keys(modelContextLimits).length > 0 ? { modelContextLimits } : {}),
+            };
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const dbg = getInstanceAiConfigDebugLogger();
+            void dbg.log({
+                level: "warn",
+                category: "load",
+                message: `loadAcodeProviderSection failed: ${configPath}: ${message}`,
+                source: "bridge",
+            });
+            return {};
+        }
+    }
+    /**
+     * 解析 ACode provider 配置：按 "instance > global > default" 优先级逐字段仲裁。
+     * 入口在 createRuntime；该方法独立出来便于测试。
+     *
+     * @param config AdapterSessionConfig（per-session model 与 per-instance instanceAiConfig）
+     * @param configPath 实际作为 ACodeRuntime.configPath 的 acode.json 路径
+     *                  （可能为 per-instance 文件或全局文件）
+     */
+    async resolveAcodeProvider(config, configPath) {
+        // 实例层 = per-session model (config.model) + per-instance instanceAiConfig
+        // 注意：priority 上 per-session model 高于 per-instance instanceAiConfig.model
+        // per-session model 是请求级最具体的覆盖，应拥有最高优先级
+        const perSessionModel = typeof config.model === "string" && config.model.trim()
+            ? config.model.trim()
+            : undefined;
+        const _dbg = getInstanceAiConfigDebugLogger();
+        void _dbg.log({
+            level: "info",
+            category: "resolve",
+            message: "resolveAcodeProvider 输入",
+            source: "bridge",
+            details: {
+                configModel: config.model ?? null,
+                configInstanceAiConfig: config.instanceAiConfig ? redactForLog(config.instanceAiConfig) : null,
+                configPath,
+            },
+        });
+        // 优先级仲裁：perSessionModel(request) > instanceAiConfig(instance) > global > default
+        // perSessionModel 是请求级最具体的覆盖，拥有最高优先级
+        const instanceConfig = {
+            ...(config.instanceAiConfig?.model
+                ? { model: config.instanceAiConfig.model }
+                : {}),
+            ...(config.instanceAiConfig?.baseURL
+                ? { baseURL: config.instanceAiConfig.baseURL }
+                : {}),
+            ...(config.instanceAiConfig?.apiKey
+                ? { apiKey: config.instanceAiConfig.apiKey }
+                : {}),
+            ...(config.instanceAiConfig?.effort
+                ? { effort: config.instanceAiConfig.effort }
+                : {}),
+            // perSessionModel 最后设置，确保优先级最高
+            ...(perSessionModel ? { model: perSessionModel } : {}),
+        };
+        // 全局层 = acode.json 顶层 provider.default（含 deep-merge 后的 per-instance 文件）
+        const globalConfig = await this.loadAcodeProviderSection(configPath);
+        // 顶层 contextLimit（用户自定义上下文窗口大小）
+        // 回退：从 provider.default.models[resolvedModel].contextLimit 读取
+        let configContextLimit = globalConfig.contextLimit;
+        if (!configContextLimit && globalConfig.modelContextLimits) {
+            // 优先使用 perSessionModel，其次 instanceAiConfig 中的 model
+            const fallbackModel = perSessionModel ||
+                config.instanceAiConfig?.model ||
+                globalConfig.model;
+            if (fallbackModel && globalConfig.modelContextLimits[fallbackModel]) {
+                configContextLimit = globalConfig.modelContextLimits[fallbackModel];
+            }
+        }
+        const resolved = resolveAcodeProviderConfig(instanceConfig, globalConfig, "acode-default");
+        void _dbg.log({
+            level: "info",
+            category: "resolve",
+            message: "resolveAcodeProvider 解析结果",
+            source: "bridge",
+            details: {
+                instanceConfig: redactForLog(instanceConfig),
+                globalConfigModel: globalConfig?.model ?? null,
+                resolvedModel: resolved.model,
+                resolvedBaseURL: resolved.baseURL ?? null,
+                resolvedApiKey: resolved.apiKey ? "[set]" : null,
+                configContextLimit,
+                resolvedSource: resolved.source,
+            },
+        });
+        return {
+            resolved,
+            configPath,
+            perSessionModel,
+            configContextLimit,
+        };
+    }
+    async createRuntime(sessionId, resolvedModel, config, runtimeHome) {
         const ACodeRuntime = await this.loadRuntimeConstructor();
+        const configPath = config.mcpConfigPath || getAcodeConfigFile(runtimeHome);
         const runtime = new ACodeRuntime({
             sessionId,
+            agentId: config.agentId,
             workingDirectory: config.workingDirectory,
-            configPath: config.mcpConfigPath || getAcodeConfigFile(runtimeHome),
+            configPath,
             skillsDir: getAcodeSkillsDir(runtimeHome),
-            model: config.model,
+            model: resolvedModel,
             systemPrompt: typeof config.systemPrompt === "string"
                 ? config.systemPrompt
                 : undefined,
             env: config.envOverrides,
         });
+        const debugLogger = getInstanceAiConfigDebugLogger();
+        void debugLogger.log({
+            level: "info",
+            category: "resolve",
+            message: "ACode provider resolved",
+            source: "bridge",
+            sessionId,
+            details: {
+                resolvedModel,
+                perInstanceModel: config.instanceAiConfig?.model || null,
+                perInstanceBaseURL: config.instanceAiConfig?.baseURL
+                    ? "[set]"
+                    : null,
+                perInstanceApiKey: config.instanceAiConfig?.apiKey
+                    ? "[set]"
+                    : null,
+                configPath,
+            },
+        });
         runtime.on("event", (event) => this.forwardAcodeEvent(event));
         return runtime;
     }
@@ -327,9 +593,13 @@ export class AcodeSdkAdapter extends EventEmitter {
         }
         entry.adapterSession.status = "thinking";
         this.emit("status-change", sessionId, "thinking");
+        // 启动超时检测
+        this.startSubmitTimeoutDetection(sessionId, entry, "startInitialPromptTurn");
         void entry.runtime
             .submit(initialPrompt)
             .then(() => {
+            // submit 成功返回，取消超时检测
+            this.cancelSubmitTimeoutDetection(entry);
             this.recoverResolvedTurnWithoutTerminalEvent(sessionId);
         })
             .catch((error) => {
@@ -337,6 +607,8 @@ export class AcodeSdkAdapter extends EventEmitter {
             if (!currentEntry) {
                 return;
             }
+            // submit 抛出异常，取消超时检测
+            this.cancelSubmitTimeoutDetection(currentEntry);
             // R4 fix: a failed initial prompt turn used to leave the session
             // permanently in 'error' because autoPollActive was false at this
             // point (only set by submitAutoPollPrompt), so the R2 recovery in
@@ -433,6 +705,11 @@ export class AcodeSdkAdapter extends EventEmitter {
                 entry.adapterSession.totalUsage.inputTokens += usage.inputTokens;
                 entry.adapterSession.totalUsage.outputTokens += usage.outputTokens;
             }
+            // 关键日志：记录 turn_complete 事件
+            const previousStatus = entry.adapterSession.status;
+            console.log(`[ACode] turn_complete event received (session: ${event.sessionId}), ` +
+                `previous status: ${previousStatus}, failed: ${event.data.failed === true}, ` +
+                `aborted: ${event.data.aborted === true}`);
             if (isFailedAcodeTurnComplete(event.data)) {
                 // R2 fix: a failed polling-driven turn (e.g., 60s MCP tool timeout,
                 // model 5xx, provider unreachable) used to leave the session parked
@@ -446,6 +723,7 @@ export class AcodeSdkAdapter extends EventEmitter {
                 // initial prompt turn failed, autoPollActive was false and the
                 // session got permanently stuck in 'error'. Now we always recover
                 // for non-terminal sessions so the idle loop can retry.
+                console.log(`[ACode] Recovering from failed turn_complete (session: ${event.sessionId})`);
                 this.recoverTurnFailure(event.sessionId, entry);
                 return;
             }
@@ -462,6 +740,7 @@ export class AcodeSdkAdapter extends EventEmitter {
             this.emit("status-change", event.sessionId, "waiting_input", {
                 usage: entry.adapterSession.totalUsage,
             });
+            console.log(`[ACode] Status changed to waiting_input after turn_complete (session: ${event.sessionId})`);
             if (entry.autoPollActive &&
                 entry.autoPollObservedAssistantText &&
                 !entry.autoPollObservedPollingTool) {
@@ -565,7 +844,10 @@ export class AcodeSdkAdapter extends EventEmitter {
                     ? "waiting_input"
                     : "thinking";
                 entry.adapterSession.status = status;
-                this.emit("status-change", event.sessionId, status);
+                // 关键修复：
+                // - thinking 状态：不传递 actionInfo，让前端清除旧的 tool_using action
+                // - waiting_input 状态：传递 actionInfo，保留 poll_message 的"监听消息"显示
+                this.emit("status-change", event.sessionId, status, status === "thinking" ? undefined : eventData);
                 return;
             }
             const status = actionInfo.actionType === "idle" ? "waiting_input" : "tool_using";
@@ -585,6 +867,24 @@ export class AcodeSdkAdapter extends EventEmitter {
             }
             return;
         }
+        if (event.type === "exit_plan_mode") {
+            // 需求 4.1.1：exit_plan_mode 映射为 status 事件，等待用户审批计划
+            entry.adapterSession.status = "waiting_input";
+            const planText = typeof event.data.plan === "string"
+                ? event.data.plan
+                : undefined;
+            this.emitProviderEvent(event, "exit_plan_mode", {
+                toolInput: event.data.toolInput && typeof event.data.toolInput === "object"
+                    ? event.data.toolInput
+                    : undefined,
+                text: planText || "退出计划模式",
+            });
+            this.emit("status-change", event.sessionId, "waiting_input", {
+                actionLabel: "审批计划",
+                actionDetail: planText || "等待用户审批退出计划模式",
+            });
+            return;
+        }
         this.emitProviderEvent(event, "thinking", {
             text: JSON.stringify(event.data),
         });
@@ -639,6 +939,8 @@ export class AcodeSdkAdapter extends EventEmitter {
             entry.adapterSession.status = "thinking";
             this.emit("status-change", sessionId, "thinking");
         }
+        // 启动 submit 超时检测，防止 auto-poll 请求永久卡住
+        this.startSubmitTimeoutDetection(sessionId, entry, "submitAutoPollPrompt");
         void entry.runtime
             .submit(prompt)
             .catch((error) => {
@@ -648,6 +950,8 @@ export class AcodeSdkAdapter extends EventEmitter {
             const latestEntry = this.sessions.get(sessionId);
             if (!latestEntry)
                 return;
+            // 无论 submit 是正常返回还是超时恢复，都需要取消超时检测（超时回调里已设置 submitTimeoutTimer=undefined，再调 cancel 是安全的）
+            this.cancelSubmitTimeoutDetection(latestEntry);
             latestEntry.autoPollActive = false;
             // If the R2 recovery path already scheduled a delayed re-arm for a
             // failed polling-driven turn, skip armIdleLoopOrAutoPoll so we do
@@ -787,16 +1091,58 @@ export class AcodeSdkAdapter extends EventEmitter {
      * look permanently stuck. Recover to waiting_input and arm the listening loop.
      */
     recoverResolvedTurnWithoutTerminalEvent(sessionId) {
+        console.log(`[ACode] ▶️ recoverResolvedTurnWithoutTerminalEvent called for session ${sessionId}`);
         const entry = this.sessions.get(sessionId);
         if (!entry || this.isTerminalStatus(entry.adapterSession.status)) {
+            console.log(`[ACode]  Skipping recovery: entry=${!!entry}, isTerminal=${entry ? this.isTerminalStatus(entry.adapterSession.status) : 'N/A'}`);
             return;
         }
+        console.log(`[ACode]  Current status: ${entry.adapterSession.status}`);
         if (entry.adapterSession.status !== "thinking" &&
             entry.adapterSession.status !== "tool_using") {
+            console.log(`[ACode]  Skipping recovery: status is ${entry.adapterSession.status} (not thinking/tool_using)`);
             return;
         }
+        console.log(`[ACode] ⚠️ Detected stuck state: ${entry.adapterSession.status} after submit resolved!`);
+        console.log(`[ACode]  Recovering to waiting_input...`);
         entry.adapterSession.status = "waiting_input";
         this.emit("status-change", sessionId, "waiting_input");
+        console.log(`[ACode] ✅ Recovery complete, status now: ${entry.adapterSession.status}`);
+        console.log(`[ACode] ▶️ Arming idle loop or auto-poll...`);
         this.armIdleLoopOrAutoPoll(sessionId);
+        console.log(`[ACode] ✅ Idle loop armed, recovery process complete`);
+    }
+    /**
+     * 启动 submit 超时检测（治本修复：防止状态永久卡住）
+     *
+     * 如果 runtime.submit() 在指定时间内未返回，强制触发恢复机制，
+     * 避免会话永久卡在 thinking/tool_using 状态。
+     */
+    startSubmitTimeoutDetection(sessionId, entry, source) {
+        // 清除之前的超时检测
+        this.cancelSubmitTimeoutDetection(entry);
+        entry.submitStartTime = Date.now();
+        entry.submitTimeoutTimer = setTimeout(() => {
+            const currentEntry = this.sessions.get(sessionId);
+            if (!currentEntry)
+                return;
+            const elapsed = Date.now() - (currentEntry.submitStartTime || 0);
+            console.warn(`[ACode] CRITICAL: submit timeout detected after ${Math.round(elapsed / 1000)}s ` +
+                `(source: ${source}, session: ${sessionId}, status: ${currentEntry.adapterSession.status}). ` +
+                `Forcing recovery to prevent permanent state stuck.`);
+            // 强制恢复到 waiting_input 状态
+            currentEntry.submitTimeoutTimer = undefined;
+            this.recoverTurnFailure(sessionId, currentEntry);
+        }, ACODE_SUBMIT_TIMEOUT_MS);
+    }
+    /**
+     * 取消 submit 超时检测
+     */
+    cancelSubmitTimeoutDetection(entry) {
+        if (entry.submitTimeoutTimer) {
+            clearTimeout(entry.submitTimeoutTimer);
+            entry.submitTimeoutTimer = undefined;
+        }
+        entry.submitStartTime = undefined;
     }
 }