aws-runtime-bridge 1.9.0 → 1.9.2

package/dist/routes/terminal.js

@@ -24,7 +24,53 @@ export const terminalRouter = Router();
 export const sdkSessions = new Map();
 const TOOL_RESULT_PREVIEW_MAX_LENGTH = 4000;
 const AI_REQUEST_BODY_MARKER = "\n\n请求体:\n";
+const AI_REQUEST_HEADERS_MARKER = "\n\n请求头:\n";
 const startingAgents = new Set();
+export function resolveRuntimeContextResetSupport(providerId, hasResetContext) {
+    if (providerId !== "acode") {
+        return {
+            supported: false,
+            statusCode: 400,
+            error: "context reset without restart is only supported by ACode",
+        };
+    }
+    if (!hasResetContext) {
+        return {
+            supported: false,
+            statusCode: 500,
+            error: "ACode adapter does not expose resetContext",
+        };
+    }
+    return { supported: true };
+}
+/**
+ * Decide whether SDK startup should wait for an external process PID.
+ * Main flow: in-process providers return immediately; external CLI providers keep PID probing for orphan cleanup.
+ */
+export function shouldProbeSdkProcessPid(providerId) {
+    return providerId !== "acode";
+}
+/**
+ * 主流程：解析 runtime stop 请求的状态通知选项。
+ * 内部上下文重置可抑制 stopped 广播；普通手动停止默认继续通知调度端。
+ */
+export function parseRuntimeStopOptions(body) {
+    const suppressStatus = typeof body === "object" &&
+        body !== null &&
+        "suppressStatus" in body &&
+        body.suppressStatus === true;
+    const reason = typeof body === "object" &&
+        body !== null &&
+        "reason" in body &&
+        typeof body.reason === "string" &&
+        body.reason.trim()
+        ? body.reason.trim()
+        : undefined;
+    return {
+        statusNotified: !suppressStatus,
+        reason,
+    };
+}
 export function resolveStatusChangeUsage(actionInfo) {
     const usage = actionInfo?.usage;
     if (!usage)
@@ -39,10 +85,24 @@ export function resolveStatusChangeUsage(actionInfo) {
         return undefined;
     return { inputTokens, outputTokens };
 }
+export function resolveStatusChangeRuntimeState(status, actionInfo) {
+    const normalizedStatus = String(status || "")
+        .trim()
+        .toLowerCase();
+    const normalizedActionType = String(actionInfo?.actionType || "")
+        .trim()
+        .toLowerCase();
+    if (normalizedStatus === "tool_using" && normalizedActionType === "idle") {
+        return actionInfo
+            ? { status: "waiting_input", actionInfo }
+            : { status: "waiting_input" };
+    }
+    return actionInfo ? { status, actionInfo } : { status };
+}
 const terminalCommandStates = new Map();
 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_OUTPUT_SPILLOVER_LINE_LIMIT = 300;
 const TERMINAL_COMMAND_INACTIVITY_TIMEOUT_MS = 60_000;
 function padDatePart(value) {
     return String(value).padStart(2, "0");
@@ -167,7 +227,7 @@ function findActiveSdkSessionByAgentId(agentId) {
 }
 async function buildExistingSessionResponse(entry) {
     const adapter = adapterRegistry.get(entry.providerId || "claude-code");
-    const status = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(entry.sessionId), entry.currentRuntimeStatus);
+    const status = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(entry.sessionId), entry.currentRuntimeStatus, entry.currentRuntimeActionType);
     return {
         sessionId: entry.sessionId,
         status,
@@ -187,9 +247,18 @@ async function buildExistingSessionResponse(entry) {
  * 解析 SDK 会话对外展示状态。
  * 主流程：优先使用 adapter 当前细粒度状态，其次使用路由内存记录的最近状态，最后才兼容旧会话回退 running。
  */
-export function resolveSdkSessionDisplayStatus(adapterStatus, currentRuntimeStatus) {
+export function resolveSdkSessionDisplayStatus(adapterStatus, currentRuntimeStatus, currentRuntimeActionType) {
     const normalizedAdapterStatus = String(adapterStatus || "").trim();
     if (normalizedAdapterStatus) {
+        const normalizedRuntimeStatus = String(currentRuntimeStatus || "").trim();
+        const normalizedActionType = String(currentRuntimeActionType || "")
+            .trim()
+            .toLowerCase();
+        if (normalizedAdapterStatus.toLowerCase() === "tool_using" &&
+            normalizedRuntimeStatus.toLowerCase() === "waiting_input" &&
+            normalizedActionType === "idle") {
+            return normalizedRuntimeStatus;
+        }
         return normalizedAdapterStatus;
     }
     const normalizedRuntimeStatus = String(currentRuntimeStatus || "").trim();
@@ -575,6 +644,9 @@ export function formatSdkOutputEvent(event) {
     if (event.type === "thinking") {
         return event.data.text || undefined;
     }
+    if (event.type === "command_output") {
+        return event.data.text || undefined;
+    }
     if (event.type === "error") {
         return event.data.text
             ? `\r\n[SDK Error] ${event.data.text}\r\n`
@@ -587,14 +659,44 @@ export function buildSdkOutputMetadata(event) {
     return {
         sourceEventType: event.type,
         logCategory: "acode",
+        ...buildCommandOutputMetadata(event),
         ...(logMessage
             ? {
-                logLevel: event.type === "error" ? "error" : "info",
+                logLevel: resolveSdkLogLevel(event),
                 logMessage,
             }
             : {}),
     };
 }
+function resolveSdkLogLevel(event) {
+    if (event.type === "error") {
+        return "error";
+    }
+    if (event.type === "command_output" && event.data.stream === "stderr") {
+        return "warn";
+    }
+    return "info";
+}
+function buildCommandOutputMetadata(event) {
+    if (event.type !== "command_output") {
+        return {};
+    }
+    return {
+        ...(typeof event.data.stream === "string"
+            ? { stream: event.data.stream }
+            : {}),
+        ...(typeof event.data.sequence === "number"
+            ? { sequence: event.data.sequence }
+            : {}),
+        ...(typeof event.data.cwd === "string" ? { cwd: event.data.cwd } : {}),
+        ...(typeof event.data.commandFilePath === "string"
+            ? { commandFilePath: event.data.commandFilePath }
+            : {}),
+        ...(typeof event.data.commandLineCount === "number"
+            ? { commandLineCount: event.data.commandLineCount }
+            : {}),
+    };
+}
 function formatSdkLogMessage(event) {
     if (event.type === "ai_request") {
         const model = event.data.model || "unknown-model";
@@ -610,6 +712,9 @@ function formatSdkLogMessage(event) {
     if (event.type === "tool_use_end") {
         return formatSdkToolLogMessage(event, "完成");
     }
+    if (event.type === "command_output") {
+        return formatCommandOutputLogMessage(event);
+    }
     if (event.type === "turn_complete") {
         const finishReason = event.data.finishReason
             ? `, finish=${event.data.finishReason}`
@@ -624,6 +729,15 @@ function formatSdkLogMessage(event) {
     }
     return undefined;
 }
+function formatCommandOutputLogMessage(event) {
+    const stream = typeof event.data.stream === "string" ? event.data.stream : "mixed";
+    const sequence = typeof event.data.sequence === "number" ? ` #${event.data.sequence}` : "";
+    const normalized = String(event.data.text || "")
+        .replace(/\s+/g, " ")
+        .trim();
+    const preview = normalized.length > 240 ? `${normalized.slice(0, 240)}...` : normalized;
+    return `命令输出(${stream}${sequence}): ${preview || "(empty)"}`;
+}
 function formatSdkToolLogMessage(event, phaseLabel) {
     const actionInfo = getToolActionInfo(event.data.toolName, event.data.toolInput);
     const actionLabel = event.data.actionLabel || actionInfo.actionLabel || "调用工具";
@@ -694,7 +808,10 @@ function displayStringList(value) {
 function formatAiRequestDetail(data) {
     const lines = [
         data.model ? `模型: ${data.model}` : undefined,
-        data.endpoint ? `接口: ${data.endpoint}` : undefined,
+        data.endpoint || data.requestUrl
+            ? `接口: ${data.endpoint || data.requestUrl}`
+            : undefined,
+        data.requestMethod ? `方法: ${data.requestMethod}` : undefined,
         typeof data.stream === "boolean"
             ? `流式: ${data.stream ? "是" : "否"}`
             : undefined,
@@ -708,10 +825,22 @@ function formatAiRequestDetail(data) {
             ? `最后请求: ${data.lastUserMessagePreview}`
             : undefined,
     ].filter((line) => Boolean(line));
+    const requestHeaderLines = formatAiRequestHeaders(data.requestHeaders);
     const base = lines.join("\n") || "ACode 正在发送 AI 请求";
-    return data.requestBody
-        ? `${base}${AI_REQUEST_BODY_MARKER}${data.requestBody}`
-        : base;
+    const headerBlock = requestHeaderLines.length > 0
+        ? `${AI_REQUEST_HEADERS_MARKER}${requestHeaderLines.join("\n")}`
+        : "";
+    const bodyBlock = data.requestBody
+        ? `${AI_REQUEST_BODY_MARKER}${data.requestBody}`
+        : "";
+    return `${base}${headerBlock}${bodyBlock}`;
+}
+function formatAiRequestHeaders(headers) {
+    if (!headers)
+        return [];
+    return Object.entries(headers)
+        .map(([name, value]) => `${name}: ${value}`)
+        .filter((line) => line.trim().length > 0);
 }
 /**
  * 主干流程：把 provider 事件转换为面板运行状态。
@@ -719,7 +848,19 @@ function formatAiRequestDetail(data) {
  * text_delta 表示助手正在生成；thinking 表示推理/内部过程。
  * tool_use_start 表示正在执行工具；turn_complete 才表示真正空闲。
  */
-export function resolveRuntimeStatusFromProviderEvent(event) {
+function isWaitingInputProgressEvent(event, currentRuntimeStatus) {
+    const normalizedStatus = String(currentRuntimeStatus || "")
+        .trim()
+        .toLowerCase();
+    if (normalizedStatus !== "waiting_input") {
+        return false;
+    }
+    return event.type === "thinking" || event.type === "text_delta";
+}
+export function resolveRuntimeStatusFromProviderEvent(event, currentRuntimeStatus) {
+    if (isWaitingInputProgressEvent(event, currentRuntimeStatus)) {
+        return undefined;
+    }
     if (event.type === "ai_request") {
         return {
             status: "thinking",
@@ -812,7 +953,7 @@ function wireSdkAdapterEvents(adapter, definition) {
         const entry = sdkSessions.get(event.sessionId);
         if (entry) {
             console.log(`[${definition.displayName} Adapter] Event: ${event.type} for session ${event.sessionId}`);
-            const runtimeStatus = resolveRuntimeStatusFromProviderEvent(event);
+            const runtimeStatus = resolveRuntimeStatusFromProviderEvent(event, entry.currentRuntimeStatus);
             if (runtimeStatus) {
                 void sendStatus(entry.agentId, event.sessionId, runtimeStatus.status, runtimeStatus.actionInfo, resolveStatusChangeUsage(runtimeStatus.actionInfo), {
                     runtimeAccessToken: entry.runtimeAccessToken,
@@ -832,18 +973,20 @@ function wireSdkAdapterEvents(adapter, definition) {
     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 || "");
+            const runtimeState = resolveStatusChangeRuntimeState(status, actionInfo);
+            entry.currentRuntimeStatus = runtimeState.status;
+            entry.currentRuntimeActionType = runtimeState.actionInfo?.actionType;
+            entry.currentRuntimeActionLabel = runtimeState.actionInfo?.actionLabel;
+            entry.currentRuntimeActionDetail =
+                runtimeState.actionInfo?.actionDetail;
+            console.log(`[${definition.displayName} Adapter] Status changed: ${runtimeState.status} for agent ${entry.agentId}`, runtimeState.actionInfo || "");
             void updatePersistedSessionRuntimeState(sessionId, {
-                runtimeStatus: status,
-                runtimeActionType: actionInfo?.actionType,
-                runtimeActionLabel: actionInfo?.actionLabel,
-                runtimeActionDetail: actionInfo?.actionDetail,
+                runtimeStatus: runtimeState.status,
+                runtimeActionType: runtimeState.actionInfo?.actionType,
+                runtimeActionLabel: runtimeState.actionInfo?.actionLabel,
+                runtimeActionDetail: runtimeState.actionInfo?.actionDetail,
             });
-            void sendStatus(entry.agentId, sessionId, status, actionInfo, resolveStatusChangeUsage(actionInfo), {
+            void sendStatus(entry.agentId, sessionId, runtimeState.status, runtimeState.actionInfo, resolveStatusChangeUsage(runtimeState.actionInfo), {
                 runtimeAccessToken: entry.runtimeAccessToken,
                 schedulerBaseUrl: entry.schedulerBaseUrl,
             });
@@ -992,29 +1135,31 @@ async function startSdkSession(req, res) {
         // ★ 尝试获取 SDK 进程的 PID（用于孤儿进程检测）
         // SDK 不直接暴露 PID，通过进程检测服务查找匹配的进程
         let sdkPid;
-        try {
-            // 等待一小段时间让进程启动
-            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 ||
-                    p.cwd === workspacePath ||
-                    p.command.includes(workspacePath));
-                if (matched) {
-                    sdkPid = matched.pid;
-                    console.log(`[Runtime] Found SDK process PID: ${sdkPid} for agentId=${agentId}`);
+        if (shouldProbeSdkProcessPid(providerId)) {
+            try {
+                // 等待一小段时间让进程启动
+                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 ||
+                        p.cwd === workspacePath ||
+                        p.command.includes(workspacePath));
+                    if (matched) {
+                        sdkPid = matched.pid;
+                        console.log(`[Runtime] Found SDK process PID: ${sdkPid} for agentId=${agentId}`);
+                    }
                 }
             }
-        }
-        catch (pidError) {
-            console.warn(`[Runtime] Failed to get SDK PID for agentId=${agentId}:`, pidError);
+            catch (pidError) {
+                console.warn(`[Runtime] Failed to get SDK PID for agentId=${agentId}:`, pidError);
+            }
         }
         // ★ 持久化会话信息（包含 PID）
-        const startedStatus = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(sessionId), sdkSessions.get(sessionId)?.currentRuntimeStatus);
+        const startedStatus = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(sessionId), sdkSessions.get(sessionId)?.currentRuntimeStatus, sdkSessions.get(sessionId)?.currentRuntimeActionType);
         await upsertPersistedSession({
             sessionId,
             agentId,
@@ -1196,6 +1341,8 @@ terminalRouter.post("/sdk/stop", validateToken, async (req, res) => {
         // 根据 providerId 获取对应的 adapter
         const providerId = entry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
+        // 如果有活跃 AI 请求，先立即中止（fire-and-forget），再清理资源
+        adapter.abortCurrentTurn(sessionId).catch(() => { });
         await adapter.terminateSession(sessionId);
         sdkSessions.delete(sessionId);
         stopTerminalCommandProcess(sessionId);
@@ -1369,12 +1516,65 @@ terminalRouter.post("/resize", validateToken, (req, res) => {
         rows: Number(rows),
     });
 });
+terminalRouter.post("/reset-context", validateToken, async (req, res) => {
+    const { sessionId, reason } = req.body || {};
+    if (!sessionId) {
+        res.status(400).json({ error: "sessionId is required" });
+        return;
+    }
+    const sdkEntry = sdkSessions.get(sessionId);
+    if (!sdkEntry) {
+        res.status(404).json({ error: "SDK session not found" });
+        return;
+    }
+    const providerId = sdkEntry.providerId || "claude-code";
+    const adapter = adapterRegistry.get(providerId);
+    const resetContext = adapter.resetContext?.bind(adapter);
+    const support = resolveRuntimeContextResetSupport(providerId, Boolean(resetContext));
+    if (!support.supported) {
+        res.status(support.statusCode).json({ error: support.error });
+        return;
+    }
+    if (!resetContext) {
+        res
+            .status(500)
+            .json({ error: "ACode adapter does not expose resetContext" });
+        return;
+    }
+    try {
+        await resetContext(String(sessionId));
+        const status = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(String(sessionId)), sdkEntry.currentRuntimeStatus, sdkEntry.currentRuntimeActionType);
+        res.json({
+            ok: true,
+            contextReset: true,
+            sessionId,
+            status,
+            runtimeStatus: status,
+            agentId: sdkEntry.agentId,
+            mode: "sdk",
+            providerId,
+            reason: typeof reason === "string" && reason.trim()
+                ? reason.trim()
+                : undefined,
+        });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({
+            ok: false,
+            contextReset: false,
+            mode: "sdk",
+            error: errorMessage,
+        });
+    }
+});
 /**
  * 停止 SDK 会话。
  * POST /runtime/stop
  */
 terminalRouter.post("/stop", validateToken, async (req, res) => {
     const { sessionId } = req.body || {};
+    const stopOptions = parseRuntimeStopOptions(req.body);
     if (!sessionId) {
         res.status(400).json({ error: "sessionId is required" });
         return;
@@ -1382,24 +1582,44 @@ terminalRouter.post("/stop", validateToken, async (req, res) => {
     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",
+            statusNotified: false,
+            reason: stopOptions.reason,
+        });
         return;
     }
     const agentId = sdkEntry.agentId;
     try {
+        console.log(`[Runtime] Stopping SDK session ${sessionId}; suppressStatus=${!stopOptions.statusNotified}, reason=${stopOptions.reason || "unspecified"}`);
         const providerId = sdkEntry.providerId || "claude-code";
         const adapter = adapterRegistry.get(providerId);
+        // 如果有活跃 AI 请求，先立即中止（fire-and-forget），再清理资源
+        adapter.abortCurrentTurn(sessionId).catch(() => { });
         await adapter.terminateSession(sessionId);
         sdkSessions.delete(sessionId);
         stopTerminalCommandProcess(sessionId);
         await removePersistedSession(sessionId);
         const processManager = getAgentProcessManager();
         await processManager.removeProcess(agentId);
-        await sendStatus(agentId, null, "stopped", undefined, undefined, {
-            runtimeAccessToken: sdkEntry.runtimeAccessToken,
-            schedulerBaseUrl: sdkEntry.schedulerBaseUrl,
+        if (stopOptions.statusNotified) {
+            await sendStatus(agentId, null, "stopped", undefined, undefined, {
+                runtimeAccessToken: sdkEntry.runtimeAccessToken,
+                schedulerBaseUrl: sdkEntry.schedulerBaseUrl,
+            });
+        }
+        else {
+            console.log(`[Runtime] Stopped status notification suppressed for SDK session ${sessionId}; reason=${stopOptions.reason || "unspecified"}`);
+        }
+        res.json({
+            ok: true,
+            status: "stopped",
+            mode: "sdk",
+            statusNotified: stopOptions.statusNotified,
+            reason: stopOptions.reason,
         });
-        res.json({ ok: true, status: "stopped", mode: "sdk" });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1426,6 +1646,8 @@ terminalRouter.post("/stop-all", validateToken, async (_req, res) => {
             // 根据 providerId 获取对应的 adapter
             const providerId = entry.providerId || "claude-code";
             const adapter = adapterRegistry.get(providerId);
+            // 如果有活跃 AI 请求，先立即中止（fire-and-forget），再清理资源
+            adapter.abortCurrentTurn(sessionId).catch(() => { });
             await adapter.terminateSession(sessionId);
             sdkSessions.delete(sessionId);
             stopTerminalCommandProcess(sessionId);

package/dist/routes/terminal.stop-options.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=terminal.stop-options.test.d.ts.map

package/dist/routes/terminal.stop-options.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal.stop-options.test.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.stop-options.test.ts"],"names":[],"mappings":""}

package/dist/routes/terminal.stop-options.test.js

@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+import { parseRuntimeStopOptions, resolveRuntimeContextResetSupport, } from "./terminal.js";
+describe("runtime stop options", () => {
+    it("notifies stopped status for manual stop requests by default", () => {
+        const options = parseRuntimeStopOptions({ sessionId: "session-1" });
+        expect(options).toEqual({
+            statusNotified: true,
+            reason: undefined,
+        });
+    });
+    it("suppresses stopped status for internal context reset requests", () => {
+        const options = parseRuntimeStopOptions({
+            sessionId: "session-1",
+            suppressStatus: true,
+            reason: "context_reset_after_task_submit",
+        });
+        expect(options).toEqual({
+            statusNotified: false,
+            reason: "context_reset_after_task_submit",
+        });
+    });
+});
+describe("runtime context reset support", () => {
+    it("allows only ACode sessions whose adapter exposes resetContext", () => {
+        expect(resolveRuntimeContextResetSupport("acode", true)).toEqual({
+            supported: true,
+        });
+        expect(resolveRuntimeContextResetSupport("claude-code", false)).toEqual({
+            supported: false,
+            statusCode: 400,
+            error: "context reset without restart is only supported by ACode",
+        });
+        expect(resolveRuntimeContextResetSupport("acode", false)).toEqual({
+            supported: false,
+            statusCode: 500,
+            error: "ACode adapter does not expose resetContext",
+        });
+    });
+});