aws-runtime-bridge 1.7.50 → 1.8.1

package/dist/routes/terminal.js

@@ -4,44 +4,91 @@
  * 提供 SDK Agent 会话的启动、输入、调整大小和停止功能
  * 终端 UI 仅作为 SDK Agent 的消息输入/状态输出载体
  */
-import { spawn } from 'node:child_process';
-import { promises as fs } from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { TextDecoder } from 'node:util';
-import { Router } from 'express';
-import { v4 as uuidv4 } from 'uuid';
-import { adapterRegistry, getToolActionInfo, isTransientClipboardPasteFilePath, redactTransientClipboardPastePaths, registerSdkProviders, resolveSdkProviderIdByCommand, } from '../adapter/index.js';
-import { validateToken } from '../middleware/auth.js';
-import { getAgentProcessManager } from '../services/agent-process-manager.js';
-import { getAiConfigService } from '../services/cc-switch-sdk.js';
-import { enqueueMcpLaunchBinding } from '../services/mcp-launch-binding-queue.js';
-import { findClaudeCodeProcesses, isProcessRunning } from '../services/process-detector.js';
-import { sendOutput, sendQuestionRequest, sendStatus } from '../services/session-output.js';
-import { findPersistedSessionByAgentId, removePersistedSession, savePersistedSessions, updatePersistedSessionAutoCommands, updatePersistedSessionRuntimeState, upsertPersistedSession, } from '../services/terminal-persistence.js';
+import { spawn } from "node:child_process";
+import { promises as fs } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { TextDecoder } from "node:util";
+import { Router } from "express";
+import { v4 as uuidv4 } from "uuid";
+import { adapterRegistry, getToolActionInfo, isTransientClipboardPasteFilePath, redactTransientClipboardPastePaths, registerSdkProviders, resolveSdkProviderIdByCommand, } from "../adapter/index.js";
+import { validateToken } from "../middleware/auth.js";
+import { getAgentProcessManager } from "../services/agent-process-manager.js";
+import { getAiConfigService } from "../services/cc-switch-sdk.js";
+import { enqueueMcpLaunchBinding } from "../services/mcp-launch-binding-queue.js";
+import { findClaudeCodeProcesses, isProcessRunning, } from "../services/process-detector.js";
+import { sendOutput, sendQuestionRequest, sendStatus, } from "../services/session-output.js";
+import { findPersistedSessionByAgentId, removePersistedSession, savePersistedSessions, updatePersistedSessionAutoCommands, updatePersistedSessionRuntimeState, upsertPersistedSession, } from "../services/terminal-persistence.js";
 export const terminalRouter = Router();
 // 导出 SDK 会话存储，供其他模块使用（如 sessions.ts）
 export const sdkSessions = new Map();
 const TOOL_RESULT_PREVIEW_MAX_LENGTH = 4000;
+const AI_REQUEST_BODY_MARKER = "\n\n请求体:\n";
 const startingAgents = new Set();
 export function resolveStatusChangeUsage(actionInfo) {
     const usage = actionInfo?.usage;
     if (!usage)
         return undefined;
-    const inputTokens = Number.isFinite(usage.inputTokens) ? usage.inputTokens : 0;
-    const outputTokens = Number.isFinite(usage.outputTokens) ? usage.outputTokens : 0;
+    const inputTokens = Number.isFinite(usage.inputTokens)
+        ? usage.inputTokens
+        : 0;
+    const outputTokens = Number.isFinite(usage.outputTokens)
+        ? usage.outputTokens
+        : 0;
     if (inputTokens <= 0 && outputTokens <= 0)
         return undefined;
     return { inputTokens, outputTokens };
 }
 const terminalCommandStates = new Map();
-const DEFAULT_WINDOWS_TERMINAL_OUTPUT_ENCODING = 'gb18030';
-const DEFAULT_TERMINAL_OUTPUT_ENCODING = 'utf-8';
+const DEFAULT_WINDOWS_TERMINAL_OUTPUT_ENCODING = "gb18030";
+const DEFAULT_TERMINAL_OUTPUT_ENCODING = "utf-8";
+const TERMINAL_COMMAND_OUTPUT_SPILLOVER_LINE_LIMIT = 100;
+const TERMINAL_COMMAND_INACTIVITY_TIMEOUT_MS = 60_000;
+function padDatePart(value) {
+    return String(value).padStart(2, "0");
+}
+export function buildAcodeCommandOutputPath(workspacePath, now = new Date()) {
+    const year = now.getFullYear();
+    const month = padDatePart(now.getMonth() + 1);
+    const day = padDatePart(now.getDate());
+    const hour = padDatePart(now.getHours());
+    const minute = padDatePart(now.getMinutes());
+    const timestamp = `${year}${month}${day}-${hour}${minute}${padDatePart(now.getSeconds())}-${String(now.getMilliseconds()).padStart(3, "0")}`;
+    return path.join(workspacePath, ".agentswork", "acode", "cmd-dist", `${year}-${month}-${day}`, hour, minute, `${timestamp}-cmd.out`);
+}
+export function countTerminalOutputLines(output) {
+    if (!output) {
+        return 0;
+    }
+    const normalized = output.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+    const withoutTrailingLineBreak = normalized.endsWith("\n")
+        ? normalized.slice(0, -1)
+        : normalized;
+    return withoutTrailingLineBreak
+        ? withoutTrailingLineBreak.split("\n").length
+        : 1;
+}
+export function formatCommandOutputSpilloverNotice(outputPath, lineLimit = TERMINAL_COMMAND_OUTPUT_SPILLOVER_LINE_LIMIT) {
+    return `\r\n[ACode] 命令输出超过 ${lineLimit} 行，完整输出已写入: ${outputPath}\r\n[ACode] Agent 可自行读取该文件，或在该文件中搜索需要的内容。\r\n`;
+}
+export function formatCommandInactivityTimeoutNotice(timeoutMs = TERMINAL_COMMAND_INACTIVITY_TIMEOUT_MS) {
+    return `\r\n[ACode] 命令超过 ${Math.round(timeoutMs / 1000)} 秒没有新的输出，已停止执行并保留此前输出。\r\n`;
+}
+async function persistTerminalCommandOutput(state) {
+    const outputPath = state.outputPath ||
+        buildAcodeCommandOutputPath(state.workspacePath, state.startedAt);
+    state.outputPath = outputPath;
+    await fs.mkdir(path.dirname(outputPath), { recursive: true });
+    await fs.writeFile(outputPath, state.chunks.join(""), "utf-8");
+    return outputPath;
+}
 /**
  * 标准化终端输入：将前端回车符还原为 shell 可执行命令文本。
  */
 export function normalizeTerminalCommandInput(value) {
-    return String(value ?? '').replace(/\r/g, '\n').trim();
+    return String(value ?? "")
+        .replace(/\r/g, "\n")
+        .trim();
 }
 /**
  * 解析终端命令输出解码编码。
@@ -52,7 +99,9 @@ export function resolveTerminalOutputEncoding(platform = process.platform, env =
     if (configuredEncoding) {
         return configuredEncoding;
     }
-    return platform === 'win32' ? DEFAULT_WINDOWS_TERMINAL_OUTPUT_ENCODING : DEFAULT_TERMINAL_OUTPUT_ENCODING;
+    return platform === "win32"
+        ? DEFAULT_WINDOWS_TERMINAL_OUTPUT_ENCODING
+        : DEFAULT_TERMINAL_OUTPUT_ENCODING;
 }
 /**
  * 创建终端输出流式解码器，避免多字节中文被 chunk 边界截断。
@@ -73,7 +122,7 @@ export function decodeTerminalOutputChunk(decoder, chunk, end = false) {
         return decoder.decode();
     }
     if (!chunk || chunk.length === 0) {
-        return '';
+        return "";
     }
     return decoder.decode(chunk, { stream: true });
 }
@@ -89,9 +138,9 @@ export function parseTerminalDirectoryChangeTarget(command) {
     if (!rawTarget) {
         return null;
     }
-    const withoutDriveSwitch = rawTarget.replace(/^\/d\s+/i, '').trim();
-    if ((withoutDriveSwitch.startsWith('"') && withoutDriveSwitch.endsWith('"'))
-        || (withoutDriveSwitch.startsWith("'") && withoutDriveSwitch.endsWith("'"))) {
+    const withoutDriveSwitch = rawTarget.replace(/^\/d\s+/i, "").trim();
+    if ((withoutDriveSwitch.startsWith('"') && withoutDriveSwitch.endsWith('"')) ||
+        (withoutDriveSwitch.startsWith("'") && withoutDriveSwitch.endsWith("'"))) {
         return withoutDriveSwitch.slice(1, -1);
     }
     return withoutDriveSwitch;
@@ -117,7 +166,7 @@ function findActiveSdkSessionByAgentId(agentId) {
     return undefined;
 }
 async function buildExistingSessionResponse(entry) {
-    const adapter = adapterRegistry.get(entry.providerId || 'claude-code');
+    const adapter = adapterRegistry.get(entry.providerId || "claude-code");
     const status = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(entry.sessionId), entry.currentRuntimeStatus);
     return {
         sessionId: entry.sessionId,
@@ -129,7 +178,7 @@ async function buildExistingSessionResponse(entry) {
         agentId: entry.agentId,
         workspacePath: entry.workspacePath,
         command: entry.config.command,
-        mode: 'sdk',
+        mode: "sdk",
         providerSessionId: adapter.getProviderSessionId(entry.sessionId),
         reused: true,
     };
@@ -139,12 +188,12 @@ async function buildExistingSessionResponse(entry) {
  * 主流程：优先使用 adapter 当前细粒度状态，其次使用路由内存记录的最近状态，最后才兼容旧会话回退 running。
  */
 export function resolveSdkSessionDisplayStatus(adapterStatus, currentRuntimeStatus) {
-    const normalizedAdapterStatus = String(adapterStatus || '').trim();
+    const normalizedAdapterStatus = String(adapterStatus || "").trim();
     if (normalizedAdapterStatus) {
         return normalizedAdapterStatus;
     }
-    const normalizedRuntimeStatus = String(currentRuntimeStatus || '').trim();
-    return normalizedRuntimeStatus || 'running';
+    const normalizedRuntimeStatus = String(currentRuntimeStatus || "").trim();
+    return normalizedRuntimeStatus || "running";
 }
 /**
  * Decide whether a persisted SDK session can be reused for a start request.
@@ -152,15 +201,15 @@ export function resolveSdkSessionDisplayStatus(adapterStatus, currentRuntimeStat
  */
 export function evaluatePersistedSessionReuse(session, isPidRunning = isProcessRunning) {
     if (!session.pid) {
-        return { reusable: false, reason: 'missing-pid' };
+        return { reusable: false, reason: "missing-pid" };
     }
     if (!isPidRunning(session.pid)) {
-        return { reusable: false, reason: 'dead-pid' };
+        return { reusable: false, reason: "dead-pid" };
     }
-    if (resolveSdkProviderId(session.command) === 'acode') {
-        return { reusable: false, reason: 'in-process-provider' };
+    if (resolveSdkProviderId(session.command) === "acode") {
+        return { reusable: false, reason: "in-process-provider" };
     }
-    return { reusable: true, reason: 'active-pid' };
+    return { reusable: true, reason: "active-pid" };
 }
 function stopTerminalCommandProcess(sessionId) {
     const state = terminalCommandStates.get(sessionId);
@@ -193,7 +242,7 @@ export function formatTerminalPrompt(currentDirectory) {
     return `\x1b[36m${currentDirectory}>\x1b[0m `;
 }
 function resolveDirectoryTarget(currentDirectory, target) {
-    if (target === '~') {
+    if (target === "~") {
         return os.homedir();
     }
     return path.resolve(currentDirectory, target);
@@ -233,7 +282,7 @@ async function handleDirectoryChangeCommand(entry, state, command) {
 async function executeTerminalCommand(sessionId, commandValue) {
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        throw new Error('SDK session not found');
+        throw new Error("SDK session not found");
     }
     const command = normalizeTerminalCommandInput(commandValue);
     const state = getTerminalCommandState(entry);
@@ -241,12 +290,12 @@ async function executeTerminalCommand(sessionId, commandValue) {
         return { started: false, cwd: state.currentDirectory };
     }
     if (state.runningProcess) {
-        throw new Error('A terminal command is already running for this session');
+        throw new Error("A terminal command is already running for this session");
     }
     const displayCommand = redactTransientClipboardPastePaths(command);
     appendCommandOutput(entry, `${formatTerminalPrompt(state.currentDirectory)}${displayCommand}\r\n`);
     if (isTransientClipboardPasteFilePath(command)) {
-        appendCommandOutput(entry, '[Terminal Warning] 检测到剪贴板临时 paste 文件路径，已跳过执行。请粘贴文件内容或使用显式读取命令。\r\n');
+        appendCommandOutput(entry, "[Terminal Warning] 检测到剪贴板临时 paste 文件路径，已跳过执行。请粘贴文件内容或使用显式读取命令。\r\n");
         appendCommandOutput(entry, formatTerminalPrompt(state.currentDirectory));
         return { started: false, cwd: state.currentDirectory };
     }
@@ -254,9 +303,9 @@ async function executeTerminalCommand(sessionId, commandValue) {
     if (handledDirectoryChange) {
         return { started: false, cwd: state.currentDirectory };
     }
-    await sendStatus(entry.agentId, sessionId, 'tool_using', {
-        actionType: 'bash',
-        actionLabel: '终端命令',
+    await sendStatus(entry.agentId, sessionId, "tool_using", {
+        actionType: "bash",
+        actionLabel: "终端命令",
         actionDetail: displayCommand,
     });
     const child = spawn(command, {
@@ -267,19 +316,81 @@ async function executeTerminalCommand(sessionId, commandValue) {
     state.runningProcess = child;
     const stdoutDecoder = createTerminalOutputDecoder();
     const stderrDecoder = createTerminalOutputDecoder();
-    child.stdout.on('data', (chunk) => {
-        appendCommandOutput(entry, decodeTerminalOutputChunk(stdoutDecoder, chunk));
+    const usesAcodeCommandOutputPolicy = entry.providerId === "acode";
+    const outputSpilloverState = {
+        workspacePath: entry.workspacePath,
+        startedAt: new Date(),
+        chunks: [],
+        spilled: false,
+    };
+    let inactivityTimer;
+    const clearInactivityTimer = () => {
+        if (inactivityTimer) {
+            clearTimeout(inactivityTimer);
+            inactivityTimer = undefined;
+        }
+    };
+    const resetInactivityTimer = () => {
+        clearInactivityTimer();
+        inactivityTimer = setTimeout(() => {
+            if (state.runningProcess === child) {
+                appendCommandOutput(entry, formatCommandInactivityTimeoutNotice());
+                child.kill();
+            }
+        }, TERMINAL_COMMAND_INACTIVITY_TIMEOUT_MS);
+    };
+    const appendProcessOutput = (output, trackActivity = true) => {
+        if (!output) {
+            return;
+        }
+        if (usesAcodeCommandOutputPolicy) {
+            outputSpilloverState.chunks.push(output);
+        }
+        if (usesAcodeCommandOutputPolicy && trackActivity) {
+            resetInactivityTimer();
+        }
+        if (usesAcodeCommandOutputPolicy && outputSpilloverState.spilled) {
+            return;
+        }
+        if (usesAcodeCommandOutputPolicy &&
+            countTerminalOutputLines(outputSpilloverState.chunks.join("")) >
+                TERMINAL_COMMAND_OUTPUT_SPILLOVER_LINE_LIMIT) {
+            outputSpilloverState.spilled = true;
+            void persistTerminalCommandOutput(outputSpilloverState)
+                .then((outputPath) => {
+                appendCommandOutput(entry, formatCommandOutputSpilloverNotice(outputPath));
+            })
+                .catch((error) => {
+                const message = error instanceof Error ? error.message : String(error);
+                appendCommandOutput(entry, `\r\n[ACode] 命令输出落盘失败: ${message}\r\n`);
+            });
+            return;
+        }
+        appendCommandOutput(entry, output);
+    };
+    if (usesAcodeCommandOutputPolicy) {
+        resetInactivityTimer();
+    }
+    child.stdout.on("data", (chunk) => {
+        appendProcessOutput(decodeTerminalOutputChunk(stdoutDecoder, chunk));
     });
-    child.stderr.on('data', (chunk) => {
-        appendCommandOutput(entry, decodeTerminalOutputChunk(stderrDecoder, chunk));
+    child.stderr.on("data", (chunk) => {
+        appendProcessOutput(decodeTerminalOutputChunk(stderrDecoder, chunk));
     });
-    child.on('error', (error) => {
+    child.on("error", (error) => {
         appendCommandOutput(entry, `\r\n[Terminal Error] ${error.message}\r\n`);
     });
-    child.on('close', (code, signal) => {
+    child.on("close", (code, signal) => {
+        clearInactivityTimer();
         state.runningProcess = null;
-        appendCommandOutput(entry, decodeTerminalOutputChunk(stdoutDecoder, undefined, true));
-        appendCommandOutput(entry, decodeTerminalOutputChunk(stderrDecoder, undefined, true));
+        appendProcessOutput(decodeTerminalOutputChunk(stdoutDecoder, undefined, true), false);
+        appendProcessOutput(decodeTerminalOutputChunk(stderrDecoder, undefined, true), false);
+        if (outputSpilloverState.spilled) {
+            void persistTerminalCommandOutput(outputSpilloverState).catch((error) => {
+                const message = error instanceof Error ? error.message : String(error);
+                appendCommandOutput(entry, `\r\n[ACode] 命令输出最终落盘失败: ${message}\r\n`);
+            });
+        }
         if (code && code !== 0) {
             appendCommandOutput(entry, `\r\n[exit ${code}]\r\n`);
         }
@@ -287,7 +398,7 @@ async function executeTerminalCommand(sessionId, commandValue) {
             appendCommandOutput(entry, `\r\n[signal ${signal}]\r\n`);
         }
         appendCommandOutput(entry, formatTerminalPrompt(state.currentDirectory));
-        void sendStatus(entry.agentId, sessionId, 'waiting_input');
+        void sendStatus(entry.agentId, sessionId, "waiting_input");
     });
     return { started: true, cwd: state.currentDirectory };
 }
@@ -315,7 +426,7 @@ export function buildRuntimeEnv(agentId, workspacePath, baseEnv, envOverrides) {
         }
     }
     env.AWS_AGENT_ID = String(agentId);
-    env.AWS_MCP_CLAIM_LAUNCH_BINDING = 'true';
+    env.AWS_MCP_CLAIM_LAUNCH_BINDING = "true";
     return env;
 }
 function stripWrappingQuotes(value) {
@@ -340,7 +451,7 @@ export async function resolveSdkInputMessage(input) {
     if (!path.isAbsolute(filePath)) {
         return message;
     }
-    return fs.readFile(filePath, 'utf-8');
+    return fs.readFile(filePath, "utf-8");
 }
 /**
  * 主流程：将已持久化的 ClaudeCode AI 配置合并到启动配置，再让请求级覆盖保持最高优先级。
@@ -363,9 +474,9 @@ export function buildClaudeCodeLaunchConfig(savedClaudeConfig, requestEnvOverrid
             envOverrides[normalizedKey] = normalizedValue;
         }
     }
-    const model = envOverrides.ANTHROPIC_MODEL?.trim()
-        || envOverrides.CODEX_MODEL?.trim()
-        || undefined;
+    const model = envOverrides.ANTHROPIC_MODEL?.trim() ||
+        envOverrides.CODEX_MODEL?.trim() ||
+        undefined;
     return { envOverrides, model };
 }
 /**
@@ -385,7 +496,7 @@ function formatToolResultForTimeline(result) {
     if (result === undefined || result === null) {
         return undefined;
     }
-    const text = typeof result === 'string' ? result : JSON.stringify(result, null, 2);
+    const text = typeof result === "string" ? result : JSON.stringify(result, null, 2);
     const normalized = text.trim();
     if (!normalized) {
         return undefined;
@@ -397,18 +508,20 @@ function formatToolResultForTimeline(result) {
 }
 function isMcpProviderEvent(event) {
     const actionType = event.data.actionType;
-    if (actionType === 'mcp') {
+    if (actionType === "mcp") {
         return true;
     }
-    const toolName = String(event.data.toolName || '').toLowerCase();
-    return toolName.startsWith('mcp__') || toolName.includes('-mcp__') || toolName.includes('mcp_');
+    const toolName = String(event.data.toolName || "").toLowerCase();
+    return (toolName.startsWith("mcp__") ||
+        toolName.includes("-mcp__") ||
+        toolName.includes("mcp_"));
 }
 /**
  * 将 SDK 工具结束事件转换为时间线返回数据状态。
  * 主流程：格式化工具结果 -> 保留 MCP 专用展示 -> 其它工具按动作类型追加到对应时间线事件。
  */
 export function buildToolResultTimelineActionInfo(event) {
-    if (event.type !== 'tool_use_end') {
+    if (event.type !== "tool_use_end") {
         return undefined;
     }
     const actionResult = formatToolResultForTimeline(event.data.toolResult ?? event.data.actionResult);
@@ -417,13 +530,13 @@ export function buildToolResultTimelineActionInfo(event) {
     }
     const inferredAction = getToolActionInfo(event.data.toolName, event.data.toolInput);
     const actionType = event.data.actionType || inferredAction.actionType;
-    if (actionType === 'idle') {
+    if (actionType === "idle") {
         return undefined;
     }
-    if (actionType === 'mcp' && isMcpProviderEvent(event)) {
+    if (actionType === "mcp" && isMcpProviderEvent(event)) {
         return {
-            actionType: 'mcp',
-            actionLabel: 'MCP返回',
+            actionType: "mcp",
+            actionLabel: "MCP返回",
             actionDetail: event.data.actionDetail || event.data.toolName,
             actionId: event.data.actionId || event.data.toolUseId,
             actionResult,
@@ -432,17 +545,224 @@ export function buildToolResultTimelineActionInfo(event) {
     return {
         actionType,
         actionLabel: event.data.actionLabel || inferredAction.actionLabel,
-        actionDetail: event.data.actionDetail || inferredAction.actionDetail || event.data.toolName,
+        actionDetail: event.data.actionDetail ||
+            inferredAction.actionDetail ||
+            event.data.toolName,
         actionId: event.data.actionId || event.data.toolUseId,
         actionResult,
     };
 }
 export function formatSdkOutputEvent(event) {
-    if (event.type === 'text_delta' || event.type === 'thinking') {
+    if (event.type === "ai_request") {
+        const model = event.data.model ? ` ${event.data.model}` : "";
+        const preview = event.data.lastUserMessagePreview
+            ? `：${event.data.lastUserMessagePreview}`
+            : "";
+        return `\r\n[ACode] 正在请求模型${model}${preview}\r\n`;
+    }
+    if (event.type === "text_delta") {
         return event.data.text || undefined;
     }
-    if (event.type === 'error') {
-        return event.data.text ? `\r\n[SDK Error] ${event.data.text}\r\n` : undefined;
+    if (event.type === "thinking") {
+        return event.data.text || undefined;
+    }
+    if (event.type === "error") {
+        return event.data.text
+            ? `\r\n[SDK Error] ${event.data.text}\r\n`
+            : undefined;
+    }
+    return undefined;
+}
+export function buildSdkOutputMetadata(event) {
+    const logMessage = formatSdkLogMessage(event);
+    return {
+        sourceEventType: event.type,
+        logCategory: "acode",
+        ...(logMessage
+            ? {
+                logLevel: event.type === "error" ? "error" : "info",
+                logMessage,
+            }
+            : {}),
+    };
+}
+function formatSdkLogMessage(event) {
+    if (event.type === "ai_request") {
+        const model = event.data.model || "unknown-model";
+        const endpoint = event.data.endpoint ? ` @ ${event.data.endpoint}` : "";
+        const toolCount = typeof event.data.toolCount === "number"
+            ? `, tools=${event.data.toolCount}`
+            : "";
+        return `AI request started: ${model}${endpoint}${toolCount}`;
+    }
+    if (event.type === "tool_use_start") {
+        return formatSdkToolLogMessage(event, "开始");
+    }
+    if (event.type === "tool_use_end") {
+        return formatSdkToolLogMessage(event, "完成");
+    }
+    if (event.type === "turn_complete") {
+        const finishReason = event.data.finishReason
+            ? `, finish=${event.data.finishReason}`
+            : "";
+        return `Turn completed${finishReason}`;
+    }
+    if (event.type === "session_complete") {
+        return `Session completed: exitCode=${event.data.exitCode ?? 0}`;
+    }
+    if (event.type === "error") {
+        return event.data.text || "ACode runtime error";
+    }
+    return undefined;
+}
+function formatSdkToolLogMessage(event, phaseLabel) {
+    const actionInfo = getToolActionInfo(event.data.toolName, event.data.toolInput);
+    const actionLabel = event.data.actionLabel || actionInfo.actionLabel || "调用工具";
+    const detail = resolveSdkToolLogDetail(event, actionInfo);
+    return detail
+        ? `${phaseLabel}${actionLabel}: ${detail}`
+        : `${phaseLabel}${actionLabel}: ${event.data.actionDetail || event.data.toolName || "tool"}`;
+}
+function resolveSdkToolLogDetail(event, actionInfo) {
+    const input = event.data.toolInput;
+    if (actionInfo.actionType === "bash") {
+        return getCommandDisplayDetail(input) || event.data.actionDetail || actionInfo.actionDetail;
+    }
+    if (actionInfo.actionType === "read_file" ||
+        actionInfo.actionType === "edit_file" ||
+        actionInfo.actionType === "write_file") {
+        return getFileDisplayDetail(input) || event.data.actionDetail || actionInfo.actionDetail;
+    }
+    return event.data.actionDetail || actionInfo.actionDetail;
+}
+function getCommandDisplayDetail(input) {
+    const command = firstDisplayString(input?.command, input?.cmd);
+    if (command)
+        return command;
+    if (Array.isArray(input?.argv)) {
+        const argv = input.argv
+            .map((item) => String(item ?? "").trim())
+            .filter(Boolean)
+            .join(" ");
+        return argv ? redactTransientClipboardPastePaths(argv) : undefined;
+    }
+    return firstDisplayString(input?.args);
+}
+function getFileDisplayDetail(input) {
+    const paths = displayStringList(input?.paths);
+    if (paths.length > 0) {
+        return paths.length === 1
+            ? paths[0]
+            : `${paths.length}个文件: ${paths.join(", ")}`;
+    }
+    return firstDisplayString(input?.file_path, input?.filePath, input?.path, input?.target_file, input?.targetFile);
+}
+function firstDisplayString(...values) {
+    for (const value of values) {
+        if (typeof value === "string" && value.trim()) {
+            return redactTransientClipboardPastePaths(value.trim());
+        }
+        if (Array.isArray(value)) {
+            const first = displayStringList(value)[0];
+            if (first)
+                return first;
+        }
+    }
+    return undefined;
+}
+function displayStringList(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value
+        .map((item) => (typeof item === "string" ? item.trim() : ""))
+        .filter(Boolean)
+        .map((item) => redactTransientClipboardPastePaths(item));
+}
+function formatAiRequestDetail(data) {
+    const lines = [
+        data.model ? `模型: ${data.model}` : undefined,
+        data.endpoint ? `接口: ${data.endpoint}` : undefined,
+        typeof data.stream === "boolean"
+            ? `流式: ${data.stream ? "是" : "否"}`
+            : undefined,
+        typeof data.messageCount === "number"
+            ? `上下文消息: ${data.messageCount}`
+            : undefined,
+        typeof data.toolCount === "number"
+            ? `可用工具: ${data.toolCount}`
+            : undefined,
+        data.lastUserMessagePreview
+            ? `最后请求: ${data.lastUserMessagePreview}`
+            : undefined,
+    ].filter((line) => Boolean(line));
+    const base = lines.join("\n") || "ACode 正在发送 AI 请求";
+    return data.requestBody
+        ? `${base}${AI_REQUEST_BODY_MARKER}${data.requestBody}`
+        : base;
+}
+/**
+ * 主干流程：把 provider 事件转换为面板运行状态。
+ *
+ * text_delta 表示助手正在生成；thinking 表示推理/内部过程。
+ * tool_use_start 表示正在执行工具；turn_complete 才表示真正空闲。
+ */
+export function resolveRuntimeStatusFromProviderEvent(event) {
+    if (event.type === "ai_request") {
+        return {
+            status: "thinking",
+            actionInfo: {
+                actionType: "ai_request",
+                actionLabel: "AI请求",
+                actionDetail: formatAiRequestDetail(event.data),
+            },
+        };
+    }
+    if (event.type === "thinking" || event.type === "text_delta") {
+        return { status: "thinking" };
+    }
+    if (event.type === "tool_use_start") {
+        const inferredAction = getToolActionInfo(event.data.toolName, event.data.toolInput);
+        const actionDetail = resolveSdkToolLogDetail(event, inferredAction);
+        if (event.data.actionType === "idle" ||
+            inferredAction.actionType === "idle") {
+            return {
+                status: "waiting_input",
+                actionInfo: {
+                    actionType: event.data.actionType || inferredAction.actionType,
+                    actionLabel: event.data.actionLabel || inferredAction.actionLabel,
+                    actionDetail: actionDetail || event.data.actionDetail || inferredAction.actionDetail || event.data.toolName,
+                    actionId: event.data.actionId || event.data.toolUseId,
+                },
+            };
+        }
+        return {
+            status: "tool_using",
+            actionInfo: {
+                actionType: event.data.actionType || inferredAction.actionType,
+                actionLabel: event.data.actionLabel || inferredAction.actionLabel,
+                actionDetail: actionDetail || event.data.actionDetail || inferredAction.actionDetail || event.data.toolName,
+                actionId: event.data.actionId || event.data.toolUseId,
+            },
+        };
+    }
+    if (event.type === "turn_complete") {
+        const responseActionInfo = event.data
+            .responseBody
+            ? {
+                actionType: "ai_request",
+                actionLabel: "AI响应",
+                actionResult: event.data.responseBody,
+                usage: event.data.usage,
+            }
+            : undefined;
+        return {
+            status: "waiting_input",
+            actionInfo: responseActionInfo ||
+                (event.data.usage ? { usage: event.data.usage } : undefined),
+        };
+    }
+    if (event.type === "error") {
+        return { status: "error" };
     }
     return undefined;
 }
@@ -452,7 +772,7 @@ function forwardSdkOutputEvent(event, entry) {
         return;
     }
     entry.seq += 1;
-    void sendOutput(entry.agentId, output, event.sessionId, entry.seq);
+    void sendOutput(entry.agentId, output, event.sessionId, entry.seq, buildSdkOutputMetadata(event), { runtimeAccessToken: entry.runtimeAccessToken });
 }
 export function resolveSdkProviderId(command) {
     return resolveSdkProviderIdByCommand(command);
@@ -466,45 +786,52 @@ function ensureAdapterInitialized() {
     adapterInitialized = true;
 }
 function wireSdkAdapterEvents(adapter, definition) {
-    adapter.on('event', (event) => {
+    adapter.on("event", (event) => {
         const entry = sdkSessions.get(event.sessionId);
         if (entry) {
             console.log(`[${definition.displayName} Adapter] Event: ${event.type} for session ${event.sessionId}`);
+            const runtimeStatus = resolveRuntimeStatusFromProviderEvent(event);
+            if (runtimeStatus) {
+                void sendStatus(entry.agentId, event.sessionId, runtimeStatus.status, runtimeStatus.actionInfo, resolveStatusChangeUsage(runtimeStatus.actionInfo), { runtimeAccessToken: entry.runtimeAccessToken });
+            }
             forwardSdkOutputEvent(event, entry);
             const toolResultActionInfo = buildToolResultTimelineActionInfo(event);
             if (toolResultActionInfo) {
-                void sendStatus(entry.agentId, event.sessionId, 'tool_result', toolResultActionInfo);
-            }
-            if (event.type === 'turn_complete' && event.data.usage) {
-                sendStatus(entry.agentId, event.sessionId, 'waiting_input', undefined, resolveStatusChangeUsage({ usage: event.data.usage }));
+                void sendStatus(entry.agentId, event.sessionId, "tool_result", toolResultActionInfo, undefined, {
+                    runtimeAccessToken: entry.runtimeAccessToken,
+                });
             }
         }
     });
-    adapter.on('status-change', (sessionId, status, actionInfo) => {
+    adapter.on("status-change", (sessionId, status, actionInfo) => {
         const entry = sdkSessions.get(sessionId);
         if (entry) {
             entry.currentRuntimeStatus = status;
             entry.currentRuntimeActionType = actionInfo?.actionType;
             entry.currentRuntimeActionLabel = actionInfo?.actionLabel;
             entry.currentRuntimeActionDetail = actionInfo?.actionDetail;
-            console.log(`[${definition.displayName} Adapter] Status changed: ${status} for agent ${entry.agentId}`, actionInfo || '');
+            console.log(`[${definition.displayName} Adapter] Status changed: ${status} for agent ${entry.agentId}`, actionInfo || "");
             void updatePersistedSessionRuntimeState(sessionId, {
                 runtimeStatus: status,
                 runtimeActionType: actionInfo?.actionType,
                 runtimeActionLabel: actionInfo?.actionLabel,
                 runtimeActionDetail: actionInfo?.actionDetail,
             });
-            void sendStatus(entry.agentId, sessionId, status, actionInfo, resolveStatusChangeUsage(actionInfo));
+            void sendStatus(entry.agentId, sessionId, status, actionInfo, resolveStatusChangeUsage(actionInfo), {
+                runtimeAccessToken: entry.runtimeAccessToken,
+            });
         }
     });
-    adapter.on('ask-user-question', (data) => {
+    adapter.on("ask-user-question", (data) => {
         const entry = sdkSessions.get(data.sessionId);
         if (entry) {
             console.log(`[${definition.displayName} Adapter] AskUserQuestion for agent ${entry.agentId}`);
-            void sendQuestionRequest(entry.agentId, data.sessionId, Array.isArray(data.questions) ? data.questions : []);
+            void sendQuestionRequest(entry.agentId, data.sessionId, Array.isArray(data.questions) ? data.questions : [], {
+                runtimeAccessToken: entry.runtimeAccessToken,
+            });
         }
     });
-    adapter.on('permission-request', (data) => {
+    adapter.on("permission-request", (data) => {
         const entry = sdkSessions.get(data.sessionId);
         if (entry) {
             console.log(`[${definition.displayName} Adapter] Permission request: ${data.toolName} for agent ${entry.agentId}`);
@@ -515,10 +842,10 @@ function wireSdkAdapterEvents(adapter, definition) {
  * 启动 SDK Agent 会话
  * POST /runtime/start
  */
-terminalRouter.post('/start', validateToken, async (req, res) => {
-    const { agentId, workspacePath, mode = 'sdk', } = req.body || {};
+terminalRouter.post("/start", validateToken, async (req, res) => {
+    const { agentId, workspacePath, mode = "sdk" } = req.body || {};
     if (!agentId || !workspacePath) {
-        res.status(400).json({ error: 'agentId and workspacePath are required' });
+        res.status(400).json({ error: "agentId and workspacePath are required" });
         return;
     }
     enqueueMcpLaunchBinding({
@@ -529,7 +856,7 @@ terminalRouter.post('/start', validateToken, async (req, res) => {
         userId: req.body?.userId,
         schedulerBaseUrl: req.body?.schedulerBaseUrl,
     });
-    if (mode && mode !== 'sdk') {
+    if (mode && mode !== "sdk") {
         console.warn(`[Runtime] Unsupported runtime mode "${mode}" requested for agent ${agentId}; starting SDK session instead.`);
     }
     await startSdkSession(req, res);
@@ -545,11 +872,12 @@ async function startSdkSession(req, res) {
     // 空闲命令配置
     idleInputAutoCommand, nonInputAutoCommand, } = req.body || {};
     let sessionId = null;
-    const normalizedAgentId = String(agentId || '').trim();
+    const normalizedAgentId = String(agentId || "").trim();
+    const runtimeAccessToken = String(req.body?.runtimeAccessToken || "").trim() || undefined;
     try {
         ensureAdapterInitialized();
         if (!normalizedAgentId) {
-            res.status(400).json({ error: 'agentId is required' });
+            res.status(400).json({ error: "agentId is required" });
             return;
         }
         const activeSession = findActiveSdkSessionByAgentId(normalizedAgentId);
@@ -561,8 +889,8 @@ async function startSdkSession(req, res) {
         if (persistedSession) {
             const reuseDecision = evaluatePersistedSessionReuse(persistedSession);
             if (!reuseDecision.reusable) {
-                console.warn(`[Runtime] Ignoring stale persisted SDK session for agentId=${normalizedAgentId}, `
-                    + `sessionId=${persistedSession.sessionId}, reason=${reuseDecision.reason}`);
+                console.warn(`[Runtime] Ignoring stale persisted SDK session for agentId=${normalizedAgentId}, ` +
+                    `sessionId=${persistedSession.sessionId}, reason=${reuseDecision.reason}`);
                 await removePersistedSession(persistedSession.sessionId);
             }
             else {
@@ -572,7 +900,7 @@ async function startSdkSession(req, res) {
                     agentId: persistedSession.agentId,
                     workspacePath: persistedSession.workspacePath,
                     command: persistedSession.command,
-                    mode: persistedSession.mode || 'sdk',
+                    mode: persistedSession.mode || "sdk",
                     pid: persistedSession.pid,
                     reused: true,
                     persistedOnly: true,
@@ -581,26 +909,28 @@ async function startSdkSession(req, res) {
             }
         }
         if (startingAgents.has(normalizedAgentId)) {
-            res.status(409).json({ error: 'SDK session is already starting for this agent' });
+            res
+                .status(409)
+                .json({ error: "SDK session is already starting for this agent" });
             return;
         }
         startingAgents.add(normalizedAgentId);
         // 根据命令选择对应的 adapter
-        const normalizedCommand = (command || 'acode').toLowerCase();
+        const normalizedCommand = (command || "acode").toLowerCase();
         const providerId = resolveSdkProviderId(command);
         // ★ 特征日志：明确输出选择的 provider
         console.log(`[Runtime] ★★★ SDK启动 ★★★ command="${command}", normalizedCommand="${normalizedCommand}", providerId="${providerId}"`);
         const adapter = adapterRegistry.get(providerId);
         sessionId = uuidv4();
-        const savedClaudeConfig = providerId === 'claude-code'
+        const savedClaudeConfig = providerId === "claude-code"
             ? await readSavedClaudeCodeLaunchConfig()
             : null;
-        const claudeLaunchConfig = providerId === 'claude-code'
+        const claudeLaunchConfig = providerId === "claude-code"
             ? buildClaudeCodeLaunchConfig(savedClaudeConfig, envOverrides)
             : buildClaudeCodeLaunchConfig(null, envOverrides);
         // 构建SDK配置
         const config = {
-            command: command || 'acode',
+            command: command || "acode",
             workingDirectory: workspacePath,
             autoAccept: Boolean(autoAccept),
             initialPrompt,
@@ -618,22 +948,30 @@ async function startSdkSession(req, res) {
             config,
             providerId, // 记录使用的 provider
             seq: 0,
+            runtimeAccessToken,
         });
         // 启动 SDK 会话
         await adapter.startSession(sessionId, config);
+        // 尽早注入空闲命令，避免后续 PID 探测/进程注册延迟 poll_message 空闲轮询。
+        if (idleInputAutoCommand || nonInputAutoCommand) {
+            adapter.setIdleCommands?.(sessionId, {
+                idleInputCommand: idleInputAutoCommand || "",
+                nonInputCommand: nonInputAutoCommand || "",
+            });
+        }
         // ★ 尝试获取 SDK 进程的 PID（用于孤儿进程检测）
         // SDK 不直接暴露 PID，通过进程检测服务查找匹配的进程
         let sdkPid;
         try {
             // 等待一小段时间让进程启动
-            await new Promise(resolve => setTimeout(resolve, 500));
+            await new Promise((resolve) => setTimeout(resolve, 500));
             // 尝试通过 adapter 获取 PID（如果支持）
             sdkPid = adapter.getSessionPid?.(sessionId);
             // 如果 adapter 不支持，尝试通过进程检测服务查找
             if (!sdkPid) {
                 const processes = findClaudeCodeProcesses();
                 // 查找匹配 agentId 或工作目录的进程
-                const matched = processes.find(p => p.agentId === agentId ||
+                const matched = processes.find((p) => p.agentId === agentId ||
                     p.cwd === workspacePath ||
                     p.command.includes(workspacePath));
                 if (matched) {
@@ -653,9 +991,9 @@ async function startSdkSession(req, res) {
             workspacePath,
             command: config.command,
             startedAt: new Date().toISOString(),
-            status: 'running',
+            status: "running",
             runtimeStatus: startedStatus,
-            mode: 'sdk',
+            mode: "sdk",
             pid: sdkPid,
             providerSessionId: adapter.getProviderSessionId(sessionId),
         });
@@ -666,18 +1004,11 @@ async function startSdkSession(req, res) {
                 agentId: normalizedAgentId,
                 sessionId,
                 pid: sdkPid,
-                mode: 'sdk',
+                mode: "sdk",
                 workspacePath,
                 command: config.command,
             });
         }
-        // 存储空闲命令配置（用于SDK模式的空闲检测）
-        if (idleInputAutoCommand || nonInputAutoCommand) {
-            adapter.setIdleCommands?.(sessionId, {
-                idleInputCommand: idleInputAutoCommand || '',
-                nonInputCommand: nonInputAutoCommand || '',
-            });
-        }
         res.json({
             sessionId,
             status: startedStatus,
@@ -685,7 +1016,7 @@ async function startSdkSession(req, res) {
             agentId,
             workspacePath,
             command: config.command,
-            mode: 'sdk',
+            mode: "sdk",
             pid: sdkPid, // ★ 返回 PID 信息
         });
     }
@@ -695,7 +1026,9 @@ async function startSdkSession(req, res) {
             await removePersistedSession(sessionId);
         }
         const errorMessage = error instanceof Error ? error.message : String(error);
-        res.status(500).json({ error: `Failed to start SDK session: ${errorMessage}` });
+        res
+            .status(500)
+            .json({ error: `Failed to start SDK session: ${errorMessage}` });
     }
     finally {
         if (normalizedAgentId) {
@@ -708,20 +1041,20 @@ async function startSdkSession(req, res) {
  * 发送消息到 SDK 会话
  * POST /runtime/sdk/message
  */
-terminalRouter.post('/sdk/message', validateToken, async (req, res) => {
+terminalRouter.post("/sdk/message", validateToken, async (req, res) => {
     const { sessionId, message } = req.body || {};
     if (!sessionId || !message) {
-        res.status(400).json({ error: 'sessionId and message are required' });
+        res.status(400).json({ error: "sessionId and message are required" });
         return;
     }
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        res.status(404).json({ error: 'SDK session not found' });
+        res.status(404).json({ error: "SDK session not found" });
         return;
     }
     try {
         // 根据 providerId 获取对应的 adapter
-        const providerId = entry.providerId || 'claude-code';
+        const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
         await adapter.sendMessage(sessionId, message);
         res.json({ ok: true });
@@ -735,20 +1068,20 @@ terminalRouter.post('/sdk/message', validateToken, async (req, res) => {
  * 回答 AskUserQuestion
  * POST /runtime/sdk/answer
  */
-terminalRouter.post('/sdk/answer', validateToken, async (req, res) => {
+terminalRouter.post("/sdk/answer", validateToken, async (req, res) => {
     const { sessionId, answers } = req.body || {};
     if (!sessionId || !answers) {
-        res.status(400).json({ error: 'sessionId and answers are required' });
+        res.status(400).json({ error: "sessionId and answers are required" });
         return;
     }
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        res.status(404).json({ error: 'SDK session not found' });
+        res.status(404).json({ error: "SDK session not found" });
         return;
     }
     try {
         // 根据 providerId 获取对应的 adapter
-        const providerId = entry.providerId || 'claude-code';
+        const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
         if (adapter.sendQuestionAnswer) {
             await adapter.sendQuestionAnswer(sessionId, answers);
@@ -764,20 +1097,20 @@ terminalRouter.post('/sdk/answer', validateToken, async (req, res) => {
  * 确认权限请求
  * POST /runtime/sdk/confirm
  */
-terminalRouter.post('/sdk/confirm', validateToken, async (req, res) => {
+terminalRouter.post("/sdk/confirm", validateToken, async (req, res) => {
     const { sessionId, accept } = req.body || {};
     if (!sessionId) {
-        res.status(400).json({ error: 'sessionId is required' });
+        res.status(400).json({ error: "sessionId is required" });
         return;
     }
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        res.status(404).json({ error: 'SDK session not found' });
+        res.status(404).json({ error: "SDK session not found" });
         return;
     }
     try {
         // 根据 providerId 获取对应的 adapter
-        const providerId = entry.providerId || 'claude-code';
+        const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
         await adapter.sendConfirmation(sessionId, Boolean(accept));
         res.json({ ok: true });
@@ -791,20 +1124,20 @@ terminalRouter.post('/sdk/confirm', validateToken, async (req, res) => {
  * 中止当前轮次
  * POST /runtime/sdk/abort
  */
-terminalRouter.post('/sdk/abort', validateToken, async (req, res) => {
+terminalRouter.post("/sdk/abort", validateToken, async (req, res) => {
     const { sessionId } = req.body || {};
     if (!sessionId) {
-        res.status(400).json({ error: 'sessionId is required' });
+        res.status(400).json({ error: "sessionId is required" });
         return;
     }
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        res.status(404).json({ error: 'SDK session not found' });
+        res.status(404).json({ error: "SDK session not found" });
         return;
     }
     try {
         // 根据 providerId 获取对应的 adapter
-        const providerId = entry.providerId || 'claude-code';
+        const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
         await adapter.abortCurrentTurn(sessionId);
         res.json({ ok: true });
@@ -818,20 +1151,20 @@ terminalRouter.post('/sdk/abort', validateToken, async (req, res) => {
  * 停止 SDK 会话
  * POST /runtime/sdk/stop
  */
-terminalRouter.post('/sdk/stop', validateToken, async (req, res) => {
+terminalRouter.post("/sdk/stop", validateToken, async (req, res) => {
     const { sessionId } = req.body || {};
     if (!sessionId) {
-        res.status(400).json({ error: 'sessionId is required' });
+        res.status(400).json({ error: "sessionId is required" });
         return;
     }
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        res.json({ ok: true, status: 'stopped' });
+        res.json({ ok: true, status: "stopped" });
         return;
     }
     try {
         // 根据 providerId 获取对应的 adapter
-        const providerId = entry.providerId || 'claude-code';
+        const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
         await adapter.terminateSession(sessionId);
         sdkSessions.delete(sessionId);
@@ -840,8 +1173,10 @@ terminalRouter.post('/sdk/stop', validateToken, async (req, res) => {
         // ★ 从进程管理器中移除
         const processManager = getAgentProcessManager();
         await processManager.removeProcess(entry.agentId);
-        await sendStatus(entry.agentId, null, 'stopped');
-        res.json({ ok: true, status: 'stopped' });
+        await sendStatus(entry.agentId, null, "stopped", undefined, undefined, {
+            runtimeAccessToken: entry.runtimeAccessToken,
+        });
+        res.json({ ok: true, status: "stopped" });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -852,20 +1187,20 @@ terminalRouter.post('/sdk/stop', validateToken, async (req, res) => {
  * 获取 SDK 会话状态
  * GET /runtime/sdk/status/:sessionId
  */
-terminalRouter.get('/sdk/status/:sessionId', validateToken, (req, res) => {
+terminalRouter.get("/sdk/status/:sessionId", validateToken, (req, res) => {
     const sessionId = req.params.sessionId;
     if (!sessionId) {
-        res.status(400).json({ error: 'sessionId is required' });
+        res.status(400).json({ error: "sessionId is required" });
         return;
     }
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        res.status(404).json({ error: 'SDK session not found' });
+        res.status(404).json({ error: "SDK session not found" });
         return;
     }
     try {
         // 根据 providerId 获取对应的 adapter
-        const providerId = entry.providerId || 'claude-code';
+        const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
         const status = adapter.getSessionStatus(sessionId);
         const conversation = adapter.getConversation(sessionId);
@@ -888,15 +1223,15 @@ terminalRouter.get('/sdk/status/:sessionId', validateToken, (req, res) => {
  * 主流程：校验 session/command -> 读取会话 workspacePath -> 在该 cwd 下启动 shell 命令 -> 通过终端输出回调流式返回。
  * POST /runtime/command
  */
-terminalRouter.post('/command', validateToken, async (req, res) => {
+terminalRouter.post("/command", validateToken, async (req, res) => {
     const { sessionId, command } = req.body || {};
     if (!sessionId || command === undefined || command === null) {
-        res.status(400).json({ error: 'sessionId and command are required' });
+        res.status(400).json({ error: "sessionId and command are required" });
         return;
     }
     try {
         const result = await executeTerminalCommand(String(sessionId), command);
-        res.json({ ok: true, mode: 'terminal', ...result });
+        res.json({ ok: true, mode: "terminal", ...result });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -910,31 +1245,33 @@ terminalRouter.post('/command', validateToken, async (req, res) => {
  * 主流程：校验 session/input -> 定位 SDK 会话 -> 通过 provider adapter 发送用户消息。
  * POST /runtime/input
  */
-terminalRouter.post('/input', validateToken, async (req, res) => {
+terminalRouter.post("/input", validateToken, async (req, res) => {
     const { sessionId, input, mode } = req.body || {};
     if (!sessionId || input === undefined || input === null) {
-        res.status(400).json({ error: 'sessionId and input are required' });
+        res.status(400).json({ error: "sessionId and input are required" });
         return;
     }
     const entry = sdkSessions.get(sessionId);
     if (!entry) {
-        res.status(404).json({ error: 'SDK session not found' });
+        res.status(404).json({ error: "SDK session not found" });
         return;
     }
     try {
-        const providerId = entry.providerId || 'claude-code';
+        const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
-        if (mode === 'shortcut') {
+        if (mode === "shortcut") {
             if (!adapter.sendShortcutInput) {
-                res.status(400).json({ error: 'shortcut input is not supported by this SDK provider' });
+                res.status(400).json({
+                    error: "shortcut input is not supported by this SDK provider",
+                });
                 return;
             }
             await adapter.sendShortcutInput(sessionId, String(input));
-            res.json({ ok: true, mode: 'shortcut' });
+            res.json({ ok: true, mode: "shortcut" });
             return;
         }
         await adapter.sendMessage(sessionId, await resolveSdkInputMessage(input));
-        res.json({ ok: true, mode: 'sdk' });
+        res.json({ ok: true, mode: "sdk" });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -947,22 +1284,22 @@ terminalRouter.post('/input', validateToken, async (req, res) => {
  * 主流程：按 agentId 定位 SDK 会话 -> 更新 adapter 内存配置 -> 同步持久化会话字段。
  * POST /runtime/update-auto-commands
  */
-terminalRouter.post('/update-auto-commands', validateToken, async (req, res) => {
-    const { agentId, idleInputAutoCommand = '', nonInputAutoCommand = '' } = req.body || {};
-    const normalizedAgentId = String(agentId || '').trim();
+terminalRouter.post("/update-auto-commands", validateToken, async (req, res) => {
+    const { agentId, idleInputAutoCommand = "", nonInputAutoCommand = "", } = req.body || {};
+    const normalizedAgentId = String(agentId || "").trim();
     if (!normalizedAgentId) {
-        res.status(400).json({ error: 'agentId is required' });
+        res.status(400).json({ error: "agentId is required" });
         return;
     }
     const entry = [...sdkSessions.values()].find((session) => session.agentId === normalizedAgentId);
     const commands = {
-        idleInputCommand: String(idleInputAutoCommand || ''),
-        nonInputCommand: String(nonInputAutoCommand || ''),
+        idleInputCommand: String(idleInputAutoCommand || ""),
+        nonInputCommand: String(nonInputAutoCommand || ""),
     };
     try {
         let sessionUpdated = false;
         if (entry) {
-            const adapter = adapterRegistry.get(entry.providerId || 'claude-code');
+            const adapter = adapterRegistry.get(entry.providerId || "claude-code");
             adapter.setIdleCommands?.(entry.sessionId, commands);
             sessionUpdated = true;
         }
@@ -970,11 +1307,11 @@ terminalRouter.post('/update-auto-commands', validateToken, async (req, res) =>
             idleInputAutoCommand: commands.idleInputCommand,
             nonInputAutoCommand: commands.nonInputCommand,
         });
-        res.json({ ok: true, mode: 'sdk', sessionUpdated, persistedUpdated });
+        res.json({ ok: true, mode: "sdk", sessionUpdated, persistedUpdated });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        res.status(500).json({ ok: false, mode: 'sdk', error: errorMessage });
+        res.status(500).json({ ok: false, mode: "sdk", error: errorMessage });
     }
 });
 /**
@@ -983,37 +1320,43 @@ terminalRouter.post('/update-auto-commands', validateToken, async (req, res) =>
  * SDK 会话没有终端尺寸概念；保留该端点用于前端 xterm fit 回调，返回 no-op。
  * POST /runtime/resize
  */
-terminalRouter.post('/resize', validateToken, (req, res) => {
+terminalRouter.post("/resize", validateToken, (req, res) => {
     const { sessionId, cols, rows } = req.body || {};
     if (!sessionId || !cols || !rows) {
-        res.status(400).json({ error: 'sessionId, cols, rows are required' });
+        res.status(400).json({ error: "sessionId, cols, rows are required" });
         return;
     }
     if (!sdkSessions.has(sessionId)) {
-        res.status(404).json({ error: 'SDK session not found' });
+        res.status(404).json({ error: "SDK session not found" });
         return;
     }
-    res.json({ ok: true, mode: 'sdk', noop: true, cols: Number(cols), rows: Number(rows) });
+    res.json({
+        ok: true,
+        mode: "sdk",
+        noop: true,
+        cols: Number(cols),
+        rows: Number(rows),
+    });
 });
 /**
  * 停止 SDK 会话。
  * POST /runtime/stop
  */
-terminalRouter.post('/stop', validateToken, async (req, res) => {
+terminalRouter.post("/stop", validateToken, async (req, res) => {
     const { sessionId } = req.body || {};
     if (!sessionId) {
-        res.status(400).json({ error: 'sessionId is required' });
+        res.status(400).json({ error: "sessionId is required" });
         return;
     }
     const sdkEntry = sdkSessions.get(sessionId);
     if (!sdkEntry) {
         await removePersistedSession(sessionId);
-        res.json({ ok: true, status: 'stopped', mode: 'none' });
+        res.json({ ok: true, status: "stopped", mode: "none" });
         return;
     }
     const agentId = sdkEntry.agentId;
     try {
-        const providerId = sdkEntry.providerId || 'claude-code';
+        const providerId = sdkEntry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
         await adapter.terminateSession(sessionId);
         sdkSessions.delete(sessionId);
@@ -1021,13 +1364,20 @@ terminalRouter.post('/stop', validateToken, async (req, res) => {
         await removePersistedSession(sessionId);
         const processManager = getAgentProcessManager();
         await processManager.removeProcess(agentId);
-        await sendStatus(agentId, null, 'stopped');
-        res.json({ ok: true, status: 'stopped', mode: 'sdk' });
+        await sendStatus(agentId, null, "stopped", undefined, undefined, {
+            runtimeAccessToken: sdkEntry.runtimeAccessToken,
+        });
+        res.json({ ok: true, status: "stopped", mode: "sdk" });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         console.error(`[Runtime] Failed to terminate SDK session ${sessionId}:`, errorMessage);
-        res.status(500).json({ ok: false, status: 'stop_failed', mode: 'sdk', error: errorMessage });
+        res.status(500).json({
+            ok: false,
+            status: "stop_failed",
+            mode: "sdk",
+            error: errorMessage,
+        });
     }
 });
 /**
@@ -1035,20 +1385,22 @@ terminalRouter.post('/stop', validateToken, async (req, res) => {
  * POST /runtime/stop-all
  * 用于 aws-mcp-server 重启时清理所有 SDK Agent 会话
  */
-terminalRouter.post('/stop-all', validateToken, async (_req, res) => {
+terminalRouter.post("/stop-all", validateToken, async (_req, res) => {
     const stoppedSdk = [];
     const errors = [];
     // 1. 停止所有 SDK 会话
     for (const [sessionId, entry] of sdkSessions.entries()) {
         try {
             // 根据 providerId 获取对应的 adapter
-            const providerId = entry.providerId || 'claude-code';
+            const providerId = entry.providerId || "claude-code";
             const adapter = adapterRegistry.get(providerId);
             await adapter.terminateSession(sessionId);
             sdkSessions.delete(sessionId);
             stopTerminalCommandProcess(sessionId);
             stoppedSdk.push(sessionId);
-            await sendStatus(entry.agentId, null, 'stopped');
+            await sendStatus(entry.agentId, null, "stopped", undefined, undefined, {
+                runtimeAccessToken: entry.runtimeAccessToken,
+            });
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1059,7 +1411,7 @@ terminalRouter.post('/stop-all', validateToken, async (_req, res) => {
     // 直接清空整个持久化文件，确保不会有残留
     try {
         await savePersistedSessions([]);
-        console.log('[Runtime] 已清空所有持久化会话');
+        console.log("[Runtime] 已清空所有持久化会话");
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);