aws-runtime-bridge 1.9.10 → 1.9.21

package/package/acode/dist/runtime.js

@@ -4,6 +4,7 @@ import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { createBuiltInFileTools, } from "./built-in-file-tools.js";
+import { cleanupAcodeCmdDist } from "./builtins/commandArtifacts.js";
 import { loadAcodeCommands } from "./commands/commandLoader.js";
 import { ACodeCommandRegistry } from "./commands/commandRegistry.js";
 import { loadAcodeConfig, loadAcodeSkills } from "./config.js";
@@ -891,9 +892,16 @@ export class ACodeRuntime extends EventEmitter {
         const acodeConfig = await loadAcodeConfig(this.config.configPath);
         const skills = await loadAcodeSkills(this.config.skillsDir);
         const provider = resolveProviderConfig(this.config, acodeConfig);
+        // [DEBUG] ACode Runtime 最终解析的 provider 配置（写入 stdout，bridge 会捕获）
+        console.log(`[ACodeRuntime] ★★★ DEBUG ★★★ resolveProviderConfig 结果: config.model=${this.config.model ?? "(undefined)"}, ` +
+            `resolvedModel=${provider.model}, baseURL=${provider.baseURL ?? "(none)"}, apiKey=${provider.apiKey ? "[set]" : "(none)"}, ` +
+            `configPath=${this.config.configPath ?? "(none)"}`);
         const permissions = resolvePermissionConfig(this.config, acodeConfig);
         const mcpConnections = await this.connectMcpServers(acodeConfig.mcpServers ?? {}, provider.mcpToolTimeoutMs);
-        const builtInTools = createBuiltInFileTools(this.config.workingDirectory);
+        const agentId = this.config.agentId || "unknown";
+        // 重启时清理旧 spillover 输出
+        void cleanupAcodeCmdDist(agentId);
+        const builtInTools = createBuiltInFileTools(this.config.workingDirectory, agentId);
         const exposedTools = [
             ...builtInTools,
             ...mcpConnections.flatMap((connection) => connection.tools),
@@ -1002,29 +1010,48 @@ export class ACodeRuntime extends EventEmitter {
         return contextVersion !== this.contextVersion;
     }
     async executeSubmit(message, contextVersion) {
+        const turnStartTime = Date.now();
+        console.log(`[ACodeRuntime] ══════════════════════════════════════════`);
+        console.log(`[ACodeRuntime] ▶️ executeSubmit STARTED`);
+        console.log(`[ACodeRuntime]  Message: ${message.slice(0, 100)}${message.length > 100 ? '...' : ''}`);
+        console.log(`[ACodeRuntime] 🔢 Context version: ${contextVersion}`);
+        console.log(`[ACodeRuntime] ═══════════════════════════════════════════`);
         if (!this.state.started || this.state.terminated) {
+            console.error(`[ACodeRuntime] ❌ Runtime not active (started: ${this.state.started}, terminated: ${this.state.terminated})`);
             throw new Error("ACode runtime is not active");
         }
         this.activeTurn = true;
         this.abortRequested = false;
         const originalPrompt = message.trim();
+        let turnCompleted = false;
         try {
+            console.log(`[ACodeRuntime] 🔍 Dispatching UserPromptSubmit hook...`);
+            const promptHookStartTime = Date.now();
             const promptHookResults = await this.hookBus.dispatch("UserPromptSubmit", { prompt: originalPrompt });
+            const promptHookDuration = Date.now() - promptHookStartTime;
+            console.log(`[ACodeRuntime] ✅ UserPromptSubmit hook completed in ${promptHookDuration}ms, ` +
+                `results: ${promptHookResults.length}`);
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ⚠️ Turn superseded after hook, aborting`);
                 return;
             }
             const promptDeny = findDeniedHookResult(promptHookResults);
             if (promptDeny) {
+                console.error(`[ACodeRuntime] ❌ Prompt denied by hook: ${promptDeny.message}`);
                 this.emitAcodeEvent("error", {
                     message: promptDeny.message || "ACode prompt was denied by hook",
                 });
                 this.emitAcodeEvent("turn_complete", { failed: true });
+                turnCompleted = true;
+                console.log(`[ACodeRuntime] 📤 Emitted turn_complete (failed=true) due to hook deny`);
                 return;
             }
+            console.log(`[ACodeRuntime] 🔍 Expanding command if any...`);
             const expandedCommand = this.state.commandRegistry.expand(originalPrompt);
             const trimmed = expandedCommand?.prompt.trim() || originalPrompt;
             const commandAllowedTools = expandedCommand?.command.allowedTools;
             if (expandedCommand) {
+                console.log(`[ACodeRuntime] 📋 Slash command detected: ${expandedCommand.command.name}`);
                 this.emitAcodeEvent("command_status", {
                     action: "slash_command",
                     command: expandedCommand.command.name,
@@ -1033,29 +1060,47 @@ export class ACodeRuntime extends EventEmitter {
                 });
             }
             if (!this.state.provider.baseURL || !this.state.provider.apiKey) {
+                console.log(`[ACodeRuntime] ⚠️ No provider configured, using fallback response`);
                 const text = createFallbackResponse(trimmed, this.state);
                 this.emitAcodeEvent("assistant_delta", { text });
                 this.emitAcodeEvent("turn_complete", {
                     usage: { inputTokens: trimmed.length, outputTokens: text.length },
                 });
+                turnCompleted = true;
+                console.log(`[ACodeRuntime] 📤 Emitted turn_complete (fallback mode)`);
                 return;
             }
+            console.log(`[ACodeRuntime] 📎 Parsing attachment message...`);
             const parsedContent = parseAttachmentMessage(trimmed);
             if (parsedContent.hasImages && !this.state.provider.supportsImageInput) {
+                console.error(`[ACodeRuntime] ❌ Image input not supported by current provider`);
                 throw new Error("ACode provider/model is not configured for image input. Enable provider.default.models[model].modalities.input including 'image' or options.supportsImageInput=true.");
             }
+            console.log(`[ACodeRuntime] 🖼️ Materializing image content if any...`);
             const userContent = await materializeImageContent(parsedContent.content);
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ️ Turn superseded after materializing content, aborting`);
                 return;
             }
+            console.log(`[ACodeRuntime] 💬 Adding user message to conversation`);
             this.state.conversation.push({ role: "user", content: userContent });
+            console.log(`[ACodeRuntime]  Conversation size: ${this.state.conversation.length} messages`);
+            console.log(`[ACodeRuntime]  Starting runModelTurn...`);
+            const modelTurnStartTime = Date.now();
             const result = await this.runModelTurn(commandAllowedTools, contextVersion);
+            const modelTurnDuration = Date.now() - modelTurnStartTime;
+            console.log(`[ACodeRuntime] ✅ runModelTurn completed in ${modelTurnDuration}ms`);
+            console.log(`[ACodeRuntime] 📝 Result: text=${result.text ? result.text.slice(0, 80) + (result.text.length > 80 ? '...' : '') : '(empty)'}, ` +
+                `finishReason=${result.finishReason || '(none)'}`);
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ️ Turn superseded after runModelTurn, aborting`);
                 return;
             }
             if (result.text && !this.state.provider.stream) {
+                console.log(`[ACodeRuntime] 📤 Emitting assistant_delta (non-streaming mode)`);
                 this.emitAcodeEvent("assistant_delta", { text: result.text });
             }
+            console.log(`[ACodeRuntime] 📤 Emitting turn_complete...`);
             this.emitAcodeEvent("turn_complete", {
                 usage: result.usage ?? {
                     inputTokens: trimmed.length,
@@ -1064,23 +1109,52 @@ export class ACodeRuntime extends EventEmitter {
                 ...(result.responseBody ? { responseBody: result.responseBody } : {}),
                 ...(result.finishReason ? { finishReason: result.finishReason } : {}),
             });
+            turnCompleted = true;
+            const totalDuration = Date.now() - turnStartTime;
+            console.log(`[ACodeRuntime] ═══════════════════════════════════════════`);
+            console.log(`[ACodeRuntime] ✅ executeSubmit COMPLETED in ${totalDuration}ms`);
+            console.log(`[ACodeRuntime] ══════════════════════════════════════════`);
         }
         catch (error) {
+            const errorDuration = Date.now() - turnStartTime;
+            console.error(`[ACodeRuntime] ❌ executeSubmit FAILED after ${errorDuration}ms:`, error instanceof Error ? error.message : String(error));
+            console.error(`[ACodeRuntime] 🔍 Error stack:`, error instanceof Error ? error.stack : '(no stack)');
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ️ Turn superseded in error handler, skipping recovery`);
                 return;
             }
             if (this.abortRequested) {
+                console.log(`[ACodeRuntime] ⚠️ Abort requested, emitting aborted turn_complete`);
                 this.emitAcodeEvent("turn_complete", { aborted: true });
+                turnCompleted = true;
                 return;
             }
+            console.log(`[ACodeRuntime]  Emitting error and failed turn_complete...`);
             this.emitAcodeEvent("error", {
                 message: error instanceof Error ? error.message : String(error),
             });
             this.emitAcodeEvent("turn_complete", { failed: true });
+            turnCompleted = true;
         }
         finally {
+            const finallyDuration = Date.now() - turnStartTime;
+            console.log(`[ACodeRuntime] 🔚 executeSubmit finally block entered after ${finallyDuration}ms`);
+            console.log(`[ACodeRuntime] 🔍 turnCompleted=${turnCompleted}, activeTurn=${this.activeTurn}, ` +
+                `abortRequested=${this.abortRequested}`);
             this.activeTurn = false;
             this.abortRequested = false;
+            // 关键修复：如果异常路径没有发射 turn_complete，强制发射一个
+            // 这确保 adapter 层的 recoverResolvedTurnWithoutTerminalEvent 能够正确触发
+            if (!turnCompleted && !this.isTurnSuperseded(contextVersion)) {
+                console.error(`[ACodeRuntime] 🚨 CRITICAL: executeSubmit finally block reached without turn_complete event!`);
+                console.error(`[ACodeRuntime] 🚨 This indicates a code path that should have emitted turn_complete but didn't.`);
+                console.error(`[ACodeRuntime]  Forcing failed turn_complete to prevent state stuck.`);
+                this.emitAcodeEvent("error", {
+                    message: "ACode turn completed without proper completion event (internal error)",
+                });
+                this.emitAcodeEvent("turn_complete", { failed: true });
+                console.log(`[ACodeRuntime]  Emergency turn_complete (failed=true) emitted`);
+            }
         }
     }
     /** 中止当前轮次；由执行轮次统一发出一个终态事件，避免 aborted/failed 双终态。 */
@@ -1127,15 +1201,29 @@ export class ACodeRuntime extends EventEmitter {
         let finalUsage;
         let finalResponseBody;
         let finalFinishReason;
-        for (let step = 0; step < 5; step += 1) {
+        // 日志：开始 runModelTurn
+        console.log(`[ACodeRuntime] ▶️ runModelTurn started (contextVersion: ${contextVersion})`);
+        // 移除5次限制，添加安全上限防止真正的无限循环
+        const SAFETY_LIMIT = 50; // 安全上限，正常情况下不会达到
+        for (let step = 0; step < SAFETY_LIMIT; step += 1) {
+            // 详细日志：记录每次迭代
+            console.log(`[ACodeRuntime] 🔄 Iteration ${step + 1} starting...`);
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ⚠️ Turn superseded at iteration ${step + 1}, aborting`);
                 return { text: "" };
             }
+            const requestStartTime = Date.now();
             const response = await this.requestChatCompletion(commandAllowedTools);
+            const requestDuration = Date.now() - requestStartTime;
+            // 日志：AI请求完成
+            console.log(`[ACodeRuntime] 🤖 AI request completed in ${requestDuration}ms, ` +
+                `choices: ${response.choices?.length || 0}`);
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ⚠️ Turn superseded after AI response at iteration ${step + 1}`);
                 return { text: "" };
             }
             if (this.state.terminated) {
+                console.log(`[ACodeRuntime]  Runtime terminated at iteration ${step + 1}`);
                 throw new Error("ACode runtime was stopped during the active turn");
             }
             const choice = response.choices?.[0];
@@ -1149,6 +1237,11 @@ export class ACodeRuntime extends EventEmitter {
             const toolCalls = Array.isArray(message?.tool_calls)
                 ? message.tool_calls
                 : [];
+            // 日志：AI响应详情
+            console.log(`[ACodeRuntime]  AI response: ` +
+                `content=${content ? content.slice(0, 100) + (content.length > 100 ? '...' : '') : '(empty)'}, ` +
+                `toolCalls=${toolCalls.length}, ` +
+                `finishReason=${finalFinishReason || '(none)'}`);
             if (response.usage) {
                 const rtInputTokens = response.usage.prompt_tokens ?? response.usage.input_tokens;
                 const rtOutputTokens = response.usage.completion_tokens ?? response.usage.output_tokens;
@@ -1158,6 +1251,7 @@ export class ACodeRuntime extends EventEmitter {
                         inputTokens: rtInputTokens,
                         outputTokens: rtOutputTokens,
                     };
+                    console.log(`[ACodeRuntime] 💰 Token usage: input=${rtInputTokens}, output=${rtOutputTokens}`);
                 }
             }
             this.state.conversation.push({
@@ -1167,8 +1261,10 @@ export class ACodeRuntime extends EventEmitter {
             });
             if (content) {
                 finalText = content;
+                console.log(`[ACodeRuntime] ✨ Captured assistant text: ${content.slice(0, 80)}...`);
             }
             if (toolCalls.length === 0) {
+                console.log(`[ACodeRuntime] ✅ No tool calls at iteration ${step + 1}, completing turn`);
                 return {
                     text: finalText,
                     usage: finalUsage,
@@ -1176,16 +1272,29 @@ export class ACodeRuntime extends EventEmitter {
                     finishReason: finalFinishReason,
                 };
             }
+            // 日志：即将执行工具调用
+            const toolNames = toolCalls.map(tc => tc.function.name).join(", ");
+            console.log(`[ACodeRuntime] 🔧 Executing ${toolCalls.length} tool(s) at iteration ${step + 1}: ${toolNames}`);
+            const toolStart = Date.now();
             await this.handleToolCalls(toolCalls, commandAllowedTools, contextVersion);
+            const toolDuration = Date.now() - toolStart;
+            // 日志：工具执行完成
+            console.log(`[ACodeRuntime] ⚙️ Tool execution completed in ${toolDuration}ms at iteration ${step + 1}`);
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ⚠️ Turn superseded after tool execution at iteration ${step + 1}`);
                 return { text: "" };
             }
+            // 日志：准备下一次迭代
+            console.log(`[ACodeRuntime] 🔄 Preparing iteration ${step + 2}...`);
         }
+        // 达到安全上限（理论上不应该发生）
+        console.error(`[ACodeRuntime] 🚨 CRITICAL: Reached safety limit of ${SAFETY_LIMIT} iterations! ` +
+            `This indicates a potential infinite loop. Forcing turn completion.`);
         return {
-            text: finalText || "ACode 已达到本轮 MCP 工具调用上限。",
+            text: finalText || `ACode 已达到安全迭代上限（${SAFETY_LIMIT}次），强制结束本轮对话。`,
             usage: finalUsage,
             responseBody: finalResponseBody,
-            finishReason: finalFinishReason,
+            finishReason: finalFinishReason || "safety_iteration_limit_reached",
         };
     }
     async requestChatCompletion(commandAllowedTools) {
@@ -1219,6 +1328,8 @@ export class ACodeRuntime extends EventEmitter {
         const redactedRequestHeaders = redactRequestHeaders(requestHeaders);
         const emitAiRequest = (body) => {
             const requestBody = JSON.stringify(body, null, 2);
+            // [DEBUG] ACode Runtime 实际发送的模型名称
+            console.log(`[ACodeRuntime] ★★★ DEBUG ★★★ emitAiRequest: 发送请求 model=${provider.model}, endpoint=${requestUrl}, messageCount=${this.state.conversation.length}`);
             this.emitAcodeEvent("ai_request", {
                 model: provider.model,
                 endpoint: requestUrl,
@@ -1264,7 +1375,15 @@ export class ACodeRuntime extends EventEmitter {
                         timedOut = true;
                         requestAbortController.abort();
                     }));
-                    return isRecord(payload) ? payload : {};
+                    // ★ 容错处理: 如果网关返回的不是有效对象,记录警告并返回空响应
+                    // 避免 Agent 永久卡在 thinking/tool_using 状态
+                    if (!isRecord(payload)) {
+                        this.emitAcodeEvent("warning", {
+                            message: `ACode provider returned invalid response format (expected object, got ${typeof payload}); treating as empty response`,
+                        });
+                        return {};
+                    }
+                    return payload;
                 })(), 0, "ACode provider request");
             }
             catch (error) {
@@ -1380,12 +1499,18 @@ export class ACodeRuntime extends EventEmitter {
         };
     }
     async handleToolCalls(toolCalls, commandAllowedTools, contextVersion = this.contextVersion) {
+        console.log(`[ACodeRuntime]  handleToolCalls started with ${toolCalls.length} tool(s)`);
         for (const toolCall of toolCalls) {
             if (this.isTurnSuperseded(contextVersion)) {
+                console.log(`[ACodeRuntime] ️ Turn superseded, skipping remaining tools`);
                 return;
             }
+            const toolName = toolCall.function.name;
+            console.log(`[ACodeRuntime] 🔍 Looking up tool: ${toolName}`);
             const tool = this.state.exposedTools.find((item) => item.exposedName === toolCall.function.name);
             if (!tool) {
+                console.error(`[ACodeRuntime] ❌ Tool not found: ${toolCall.function.name}, ` +
+                    `available tools: ${this.state.exposedTools.map(t => t.exposedName).join(", ")}`);
                 this.state.conversation.push({
                     role: "tool",
                     tool_call_id: toolCall.id,
@@ -1393,9 +1518,11 @@ export class ACodeRuntime extends EventEmitter {
                 });
                 continue;
             }
+            console.log(`[ACodeRuntime]  Found tool: ${tool.toolName} (kind: ${tool.kind}, source: ${tool.kind === 'mcp' ? tool.serverName : 'builtin'})`);
             try {
                 if (tool.kind === "builtin") {
                     const toolArguments = coerceArguments(toolCall.function.arguments);
+                    console.log(`[ACodeRuntime]  Built-in tool arguments: ${JSON.stringify(toolArguments).slice(0, 200)}`);
                     assertToolPermission(tool, this.state.permissions, commandAllowedTools);
                     const preResults = await this.hookBus.dispatch("PreToolUse", {
                         source: "builtin",
@@ -1408,9 +1535,11 @@ export class ACodeRuntime extends EventEmitter {
                     }
                     const denied = findDeniedHookResult(preResults);
                     if (denied) {
+                        console.error(`[ACodeRuntime] ❌ Tool denied by hook: ${tool.exposedName}: ${denied.message}`);
                         throw new Error(denied.message ||
                             `ACode tool denied by hook: ${tool.exposedName}`);
                     }
+                    console.log(`[ACodeRuntime]  Emitting mcp_status call_tool for ${tool.exposedName}`);
                     this.emitAcodeEvent("mcp_status", {
                         action: "call_tool",
                         server: "builtin",
@@ -1420,6 +1549,8 @@ export class ACodeRuntime extends EventEmitter {
                         arguments: toolArguments,
                         argumentsPreview: summarizeToolArguments(toolArguments),
                     });
+                    const toolStart = Date.now();
+                    console.log(`[ACodeRuntime] ▶️ Executing built-in tool: ${tool.exposedName}`);
                     const result = await withTimeout(tool.execute(toolArguments, {
                         onOutput: (outputEvent) => {
                             this.emitAcodeEvent("command_output", {
@@ -1438,6 +1569,8 @@ export class ACodeRuntime extends EventEmitter {
                             });
                         },
                     }), getBuiltInToolTimeoutMs(tool, toolArguments, this.state.provider.mcpToolTimeoutMs), `ACode built-in tool ${tool.toolName}`);
+                    const toolDuration = Date.now() - toolStart;
+                    console.log(`[ACodeRuntime] ✅ Built-in tool ${tool.exposedName} completed in ${toolDuration}ms`);
                     if (this.isTurnSuperseded(contextVersion)) {
                         return;
                     }
@@ -1451,6 +1584,8 @@ export class ACodeRuntime extends EventEmitter {
                         return;
                     }
                     const resultText = toToolResultText(result);
+                    console.log(`[ACodeRuntime] 📤 Emitting mcp_status tool_result for ${tool.exposedName}, ` +
+                        `result length: ${resultText.length} chars`);
                     this.emitAcodeEvent("mcp_status", {
                         action: "tool_result",
                         server: "builtin",
@@ -1465,8 +1600,11 @@ export class ACodeRuntime extends EventEmitter {
                     await this.appendSyntheticMultimodalUserMessage(resultText, contextVersion);
                     continue;
                 }
+                // MCP工具处理
                 const connection = this.state.mcpConnections.find((item) => item.serverName === tool.serverName);
                 if (!connection) {
+                    console.error(`[ACodeRuntime] ❌ MCP server not connected: ${tool.serverName}, ` +
+                        `connected servers: ${this.state.mcpConnections.map(c => c.serverName).join(", ")}`);
                     this.state.conversation.push({
                         role: "tool",
                         tool_call_id: toolCall.id,
@@ -1475,6 +1613,7 @@ export class ACodeRuntime extends EventEmitter {
                     continue;
                 }
                 const toolArguments = coerceArguments(toolCall.function.arguments);
+                console.log(`[ACodeRuntime]  MCP tool arguments: ${JSON.stringify(toolArguments).slice(0, 200)}`);
                 assertToolPermission(tool, this.state.permissions, commandAllowedTools);
                 const preResults = await this.hookBus.dispatch("PreToolUse", {
                     source: "mcp",
@@ -1488,8 +1627,10 @@ export class ACodeRuntime extends EventEmitter {
                 }
                 const denied = findDeniedHookResult(preResults);
                 if (denied) {
+                    console.error(`[ACodeRuntime] ❌ MCP tool denied by hook: ${tool.exposedName}: ${denied.message}`);
                     throw new Error(denied.message || `ACode tool denied by hook: ${tool.exposedName}`);
                 }
+                console.log(`[ACodeRuntime] 📤 Emitting mcp_status call_tool for MCP ${tool.exposedName}`);
                 this.emitAcodeEvent("mcp_status", {
                     action: "call_tool",
                     server: tool.serverName,
@@ -1503,7 +1644,12 @@ export class ACodeRuntime extends EventEmitter {
                 const toolTimeoutMs = isPollingTool
                     ? this.state.provider.mcpPollingToolTimeoutMs
                     : this.state.provider.mcpToolTimeoutMs;
+                const toolStart = Date.now();
+                console.log(`[ACodeRuntime] ▶️ Executing MCP tool: ${tool.exposedName} ` +
+                    `(timeout: ${toolTimeoutMs}ms, polling: ${isPollingTool})`);
                 const result = await this.callMcpToolWithTimeout(connection, tool, toolArguments, toolTimeoutMs, isPollingTool);
+                const toolDuration = Date.now() - toolStart;
+                console.log(`[ACodeRuntime] ✅ MCP tool ${tool.exposedName} completed in ${toolDuration}ms`);
                 if (this.isTurnSuperseded(contextVersion)) {
                     return;
                 }
@@ -1518,6 +1664,8 @@ export class ACodeRuntime extends EventEmitter {
                     return;
                 }
                 const resultText = toToolResultText(result);
+                console.log(`[ACodeRuntime] 📤 Emitting mcp_status tool_result for MCP ${tool.exposedName}, ` +
+                    `result length: ${resultText.length} chars`);
                 this.emitAcodeEvent("mcp_status", {
                     action: "tool_result",
                     server: tool.serverName,
@@ -1532,15 +1680,18 @@ export class ACodeRuntime extends EventEmitter {
                 await this.appendSyntheticMultimodalUserMessage(resultText, contextVersion);
             }
             catch (error) {
+                console.error(`[ACodeRuntime] ❌ Tool execution failed: ${toolCall.function.name}`, error instanceof Error ? error.message : String(error));
                 if (this.isTurnSuperseded(contextVersion)) {
                     return;
                 }
                 if (this.abortRequested || this.state.terminated) {
+                    console.log(`[ACodeRuntime] ⚠️ Rethrowing error due to abort/termination`);
                     throw error instanceof Error ? error : new Error(String(error));
                 }
                 this.appendToolFailureResult(toolCall, tool, error);
             }
         }
+        console.log(`[ACodeRuntime]  handleToolCalls completed for all ${toolCalls.length} tool(s)`);
     }
     async callMcpToolWithTimeout(connection, tool, toolArguments, timeoutMs, retrySdkTimeout) {
         const sdkTimeout = timeoutMs > 0 ? timeoutMs : MCP_SDK_MAX_SAFE_TIMEOUT_MS;

package/package/acode/dist/types.d.ts

@@ -87,6 +87,7 @@ export type ACodeHookHandler = (event: ACodeHookEvent) => ACodeHookResult | unde
 export interface ACodeRuntimeConfig {
     sessionId: string;
     workingDirectory: string;
+    agentId?: string;
     configPath?: string;
     skillsDir?: string;
     initialPrompt?: string;

package/package/acode/dist/types.d.ts.map

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

package/package/aws-client-agent-mcp/dist/agent-client.d.ts

@@ -20,6 +20,7 @@ export declare class AgentClient {
     private profileHandler;
     private pollTimer;
     private statusReporter;
+    private newCharacterHandler;
     /**
      * Profile 缓存
      * 用于处理 PROFILE_INFO 消息在 profileHandler 设置之前到达的情况
@@ -107,13 +108,15 @@ export declare class AgentClient {
      */
     fetchUnreadMessages(options?: FetchUnreadMessagesOptions): Promise<UnreadMessagesResult>;
     /**
-     * 拉取服务端私信并对 poll_message 长轮询临时失败做恢复。
-     * 主流程：正常调用 HTTP MCP tool -> 仅当服务端阻塞 poll_message 返回 503 或客户端硬超时时转为空结果，让本地轮询退避后继续等待。
+     * 拉取服务端私信并对 poll_message 长轮询做容错处理。
+     * 主流程：针对 poll_message 使用 callToolOnce（单次长阻塞，无重试干扰）；
+     *         非 poll_message 工具走 callTool（标准带重试逻辑）。
+     *         callToolOnce 超时后转为空结果，让 hydrateUnreadMessagesUntilAvailable 继续等待。
      */
     private fetchDirectMessagesWithRecovery;
     /**
      * 判断是否为 poll_message 长轮询的可恢复失败。
-     * 主流程：只匹配明确的 MCP tool HTTP 503 或客户端超时，避免吞掉业务工具错误或认证错误。
+     * 主流程：只匹配明确的 HTTP 503 或客户端硬超时，避免吞掉业务工具错误或认证错误。
      */
     private isRecoverableLongPollError;
     /**
@@ -186,6 +189,10 @@ export declare class AgentClient {
     private processMessage;
     private ensureRegistered;
     private delay;
+    /**
+     * 注册新角色回调：当 registerAsNewAgent 返回 isExisting === false 时触发。
+     */
+    onNewCharacter(handler: () => void): void;
     getState(): {
         agentId: string | null;
         displayName: string | null;

package/package/aws-client-agent-mcp/dist/agent-client.d.ts.map

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

package/package/aws-client-agent-mcp/dist/agent-client.js

@@ -23,6 +23,7 @@ export class AgentClient {
     profileHandler = null;
     pollTimer = null;
     statusReporter = null;
+    newCharacterHandler = null;
     /**
      * Profile 缓存
      * 用于处理 PROFILE_INFO 消息在 profileHandler 设置之前到达的情况
@@ -150,6 +151,10 @@ export class AgentClient {
         logger.info("[AgentClient] WebSocket 连接已建立，Agent 现在已上线");
         // 初始化状态报告器
         this.initializeStatusReporter();
+        // 触发新角色回调
+        if (result.isExisting === false && this.newCharacterHandler) {
+            this.newCharacterHandler();
+        }
         return result;
     }
     /**
@@ -389,24 +394,30 @@ export class AgentClient {
         };
     }
     /**
-     * 拉取服务端私信并对 poll_message 长轮询临时失败做恢复。
-     * 主流程：正常调用 HTTP MCP tool -> 仅当服务端阻塞 poll_message 返回 503 或客户端硬超时时转为空结果，让本地轮询退避后继续等待。
+     * 拉取服务端私信并对 poll_message 长轮询做容错处理。
+     * 主流程：针对 poll_message 使用 callToolOnce（单次长阻塞，无重试干扰）；
+     *         非 poll_message 工具走 callTool（标准带重试逻辑）。
+     *         callToolOnce 超时后转为空结果，让 hydrateUnreadMessagesUntilAvailable 继续等待。
      */
     async fetchDirectMessagesWithRecovery(toolName, args) {
-        try {
-            return await this.httpClient.callTool(toolName, args);
-        }
-        catch (error) {
-            if (toolName === "poll_message" && this.isRecoverableLongPollError(error)) {
-                logger.warn("[AgentClient] 服务端 poll_message 长轮询临时不可用，按空结果退避后继续等待:", error);
-                return { messages: [] };
+        if (toolName === "poll_message") {
+            try {
+                return await this.httpClient.callToolOnce(toolName, args);
+            }
+            catch (error) {
+                if (this.isRecoverableLongPollError(error)) {
+                    logger.warn("[AgentClient] poll_message 单次长轮询超时，按空结果退避后继续等待:", error);
+                    return { messages: [] };
+                }
+                throw error;
             }
-            throw error;
         }
+        // 非 poll_message 工具走标准带重试路径
+        return await this.httpClient.callTool(toolName, args);
     }
     /**
      * 判断是否为 poll_message 长轮询的可恢复失败。
-     * 主流程：只匹配明确的 MCP tool HTTP 503 或客户端超时，避免吞掉业务工具错误或认证错误。
+     * 主流程：只匹配明确的 HTTP 503 或客户端硬超时，避免吞掉业务工具错误或认证错误。
      */
     isRecoverableLongPollError(error) {
         if (!(error instanceof Error)) {
@@ -623,6 +634,11 @@ export class AgentClient {
             this.projectName = profile.projectName;
             logger.info(`[AgentClient] 更新所属项目: ${this.projectName}`);
         }
+        // 同步角色名，确保写入永久记忆的目录与服务端存储的 roleName 一致
+        if (profile.roleName && profile.roleName !== this.agentConfig.roleName) {
+            logger.info(`[AgentClient] 同步角色名: "${this.agentConfig.roleName || "(空)"}" -> "${profile.roleName}"`);
+            this.agentConfig.roleName = profile.roleName;
+        }
         if (this.profileHandler) {
             // profileHandler 已设置，直接调用
             this.profileHandler(profile);
@@ -671,6 +687,12 @@ export class AgentClient {
             this.pollTimer = setTimeout(resolve, ms);
         });
     }
+    /**
+     * 注册新角色回调：当 registerAsNewAgent 返回 isExisting === false 时触发。
+     */
+    onNewCharacter(handler) {
+        this.newCharacterHandler = handler;
+    }
     getState() {
         return {
             agentId: this.agentId,