aws-runtime-bridge 1.0.0

package/dist/routes/terminal.js

@@ -0,0 +1,663 @@
+/**
+ * 终端 API 路由
+ *
+ * 提供终端会话的启动、输入、调整大小和停止功能
+ * 支持 PTY 模式和 SDK 模式
+ */
+import { Router } from 'express';
+import pty from 'node-pty';
+import { v4 as uuidv4 } from 'uuid';
+import { adapterRegistry, registerSdkProviders, resolveSdkProviderIdByCommand, } from '../adapter/index.js';
+import { validateToken } from '../middleware/auth.js';
+import { getAgentProcessManager } from '../services/agent-process-manager.js';
+import { AWS_MCP_SERVER_NAME, buildAwsMcpServerConfig } from '../services/aws-client-agent-mcp.js';
+import { findClaudeCodeProcesses } from '../services/process-detector.js';
+import { flushSessionOutput, scheduleOutputFlush, sendQuestionRequest, sendStatus, sessions } from '../services/session-output.js';
+import { loadPersistedSessions, removePersistedSession, removePersistedSessionByAgentId, savePersistedSessions, upsertPersistedSession, } from '../services/terminal-persistence.js';
+export const terminalRouter = Router();
+// 导出 SDK 会话存储，供其他模块使用（如 sessions.ts）
+export const sdkSessions = new Map();
+export function resolveSdkProviderId(command) {
+    return resolveSdkProviderIdByCommand(command);
+}
+// ============ 初始化 Adapter ============
+let adapterInitialized = false;
+function ensureAdapterInitialized() {
+    if (adapterInitialized)
+        return;
+    registerSdkProviders(adapterRegistry, wireSdkAdapterEvents);
+    adapterInitialized = true;
+}
+function wireSdkAdapterEvents(adapter, definition) {
+    adapter.on('event', (event) => {
+        const entry = sdkSessions.get(event.sessionId);
+        if (entry) {
+            console.log(`[${definition.displayName} Adapter] Event: ${event.type} for session ${event.sessionId}`);
+            if (event.type === 'turn_complete' && event.data.usage) {
+                sendStatus(entry.agentId, event.sessionId, 'waiting_input', undefined, event.data.usage);
+            }
+        }
+    });
+    adapter.on('status-change', (sessionId, status, actionInfo) => {
+        const entry = sdkSessions.get(sessionId);
+        if (entry) {
+            console.log(`[${definition.displayName} Adapter] Status changed: ${status} for agent ${entry.agentId}`, actionInfo || '');
+            sendStatus(entry.agentId, sessionId, status, actionInfo);
+        }
+    });
+    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 : []);
+        }
+    });
+    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}`);
+        }
+    });
+}
+/**
+ * 启动终端会话
+ * POST /runtime/start
+ * 支持 mode: 'pty' | 'sdk'
+ */
+terminalRouter.post('/start', validateToken, async (req, res) => {
+    const { agentId, workspacePath, command, mode = 'pty' } = req.body || {};
+    if (!agentId || !workspacePath) {
+        res.status(400).json({ error: 'agentId and workspacePath are required' });
+        return;
+    }
+    // SDK 模式
+    if (mode === 'sdk') {
+        await startSdkSession(req, res);
+        return;
+    }
+    // PTY 模式（原有逻辑）
+    const oldSession = Array.from(sessions.entries()).find(([, value]) => value.agentId === agentId);
+    if (oldSession) {
+        try {
+            oldSession[1].ptyProcess.kill();
+        }
+        catch {
+            // ignore stale session cleanup errors
+        }
+        if (oldSession[1].flushTimer) {
+            clearTimeout(oldSession[1].flushTimer);
+        }
+        sessions.delete(oldSession[0]);
+        await removePersistedSession(oldSession[0]);
+    }
+    const sessionId = uuidv4();
+    const shell = process.platform === 'win32' ? 'powershell.exe' : 'bash';
+    const shellArgs = process.platform === 'win32' ? ['-NoLogo'] : [];
+    const actualCommand = command || 'claude';
+    const terminal = pty.spawn(shell, shellArgs, {
+        name: 'xterm-color',
+        cols: 120,
+        rows: 30,
+        cwd: workspacePath,
+        env: {
+            ...process.env,
+            AWS_AGENT_ID: String(agentId),
+        },
+    });
+    sessions.set(sessionId, {
+        agentId,
+        workspacePath,
+        ptyProcess: terminal,
+        outputBuffer: '',
+        flushTimer: null,
+        flushInFlight: null,
+        seq: 0,
+    });
+    await upsertPersistedSession({
+        sessionId,
+        agentId,
+        workspacePath,
+        command: actualCommand,
+        startedAt: new Date().toISOString(),
+        status: 'running',
+        mode: 'pty',
+        // ★ PTY 模式：记录 pty 进程的 PID
+        pid: terminal.pid,
+    });
+    // ★ 注册到进程管理器
+    const processManager = getAgentProcessManager();
+    await processManager.startProcess({
+        agentId,
+        sessionId,
+        pid: terminal.pid,
+        mode: 'pty',
+        workspacePath,
+        command: actualCommand,
+    });
+    await sendStatus(agentId, sessionId, 'running');
+    terminal.onData((data) => {
+        const session = sessions.get(sessionId);
+        if (!session) {
+            return;
+        }
+        session.outputBuffer += data;
+        scheduleOutputFlush(sessionId);
+    });
+    terminal.onExit(async () => {
+        const session = sessions.get(sessionId);
+        if (session?.flushTimer) {
+            clearTimeout(session.flushTimer);
+            session.flushTimer = null;
+        }
+        await flushSessionOutput(sessionId);
+        sessions.delete(sessionId);
+        // 直接删除持久化会话，而不是改成 stopped，避免后续被恢复
+        await removePersistedSession(sessionId);
+        // ★ 从进程管理器中移除
+        const processManager = getAgentProcessManager();
+        await processManager.removeProcess(agentId);
+        await sendStatus(agentId, null, 'stopped');
+    });
+    terminal.write(`${actualCommand}\r`);
+    res.json({
+        sessionId,
+        status: 'running',
+        agentId,
+        workspacePath,
+        command: actualCommand,
+        mode: 'pty',
+    });
+});
+/**
+ * 启动 SDK 会话
+ * 支持 MCP 配置和空闲命令
+ */
+async function startSdkSession(req, res) {
+    const { agentId, workspacePath, command, autoAccept = true, initialPrompt, 
+    // MCP 配置 - 加载 aws-client-agent-mcp
+    mcpConfigPath, extraMcpServers, 
+    // 空闲命令配置
+    idleInputAutoCommand, nonInputAutoCommand, } = req.body || {};
+    let sessionId = null;
+    let agentForCleanup = null;
+    try {
+        ensureAdapterInitialized();
+        // 根据命令选择对应的 adapter
+        const normalizedCommand = (command || 'claude').toLowerCase();
+        const providerId = resolveSdkProviderId(command);
+        // ★ 特征日志：明确输出选择的 provider
+        console.log(`[Runtime] ★★★ SDK启动 ★★★ command="${command}", normalizedCommand="${normalizedCommand}", providerId="${providerId}"`);
+        const adapter = adapterRegistry.get(providerId);
+        sessionId = uuidv4();
+        agentForCleanup = agentId;
+        // 构建SDK配置
+        const config = {
+            command: command || 'claude',
+            workingDirectory: workspacePath,
+            autoAccept: Boolean(autoAccept),
+            initialPrompt,
+            // MCP 配置
+            mcpConfigPath,
+            extraMcpServers: {
+                // 默认加载 aws-mcp（用于 Agent 间通信）
+                [AWS_MCP_SERVER_NAME]: buildAwsMcpServerConfig({ agentId, workspacePath }),
+                ...(extraMcpServers || {}),
+            },
+        };
+        // 存储会话信息
+        sdkSessions.set(sessionId, {
+            agentId,
+            workspacePath,
+            sessionId,
+            config,
+            providerId, // 记录使用的 provider
+        });
+        // 启动 SDK 会话
+        await adapter.startSession(sessionId, config);
+        // ★ 尝试获取 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}`);
+                }
+            }
+        }
+        catch (pidError) {
+            console.warn(`[Runtime] Failed to get SDK PID for agentId=${agentId}:`, pidError);
+        }
+        // ★ 持久化会话信息（包含 PID）
+        await upsertPersistedSession({
+            sessionId,
+            agentId,
+            workspacePath,
+            command: config.command,
+            startedAt: new Date().toISOString(),
+            status: 'running',
+            mode: 'sdk',
+            pid: sdkPid,
+            providerSessionId: adapter.getProviderSessionId(sessionId),
+        });
+        // ★ 注册到进程管理器（如果有 PID）
+        if (sdkPid) {
+            const processManager = getAgentProcessManager();
+            await processManager.startProcess({
+                agentId,
+                sessionId,
+                pid: sdkPid,
+                mode: 'sdk',
+                workspacePath,
+                command: config.command,
+            });
+        }
+        // 存储空闲命令配置（用于SDK模式的空闲检测）
+        if (idleInputAutoCommand || nonInputAutoCommand) {
+            adapter.setIdleCommands?.(sessionId, {
+                idleInputCommand: idleInputAutoCommand || '',
+                nonInputCommand: nonInputAutoCommand || '',
+            });
+        }
+        res.json({
+            sessionId,
+            status: 'running',
+            agentId,
+            workspacePath,
+            command: config.command,
+            mode: 'sdk',
+            pid: sdkPid, // ★ 返回 PID 信息
+        });
+    }
+    catch (error) {
+        if (sessionId) {
+            sdkSessions.delete(sessionId);
+            await removePersistedSession(sessionId);
+        }
+        if (agentForCleanup) {
+            await removePersistedSessionByAgentId(agentForCleanup);
+        }
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: `Failed to start SDK session: ${errorMessage}` });
+    }
+}
+// ============ SDK 专用路由 ============
+/**
+ * 发送消息到 SDK 会话
+ * POST /runtime/sdk/message
+ */
+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' });
+        return;
+    }
+    const entry = sdkSessions.get(sessionId);
+    if (!entry) {
+        res.status(404).json({ error: 'SDK session not found' });
+        return;
+    }
+    try {
+        // 根据 providerId 获取对应的 adapter
+        const providerId = entry.providerId || 'claude-code';
+        const adapter = adapterRegistry.get(providerId);
+        await adapter.sendMessage(sessionId, message);
+        res.json({ ok: true });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: errorMessage });
+    }
+});
+/**
+ * 回答 AskUserQuestion
+ * POST /runtime/sdk/answer
+ */
+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' });
+        return;
+    }
+    const entry = sdkSessions.get(sessionId);
+    if (!entry) {
+        res.status(404).json({ error: 'SDK session not found' });
+        return;
+    }
+    try {
+        // 根据 providerId 获取对应的 adapter
+        const providerId = entry.providerId || 'claude-code';
+        const adapter = adapterRegistry.get(providerId);
+        if (adapter.sendQuestionAnswer) {
+            await adapter.sendQuestionAnswer(sessionId, answers);
+        }
+        res.json({ ok: true });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: errorMessage });
+    }
+});
+/**
+ * 确认权限请求
+ * POST /runtime/sdk/confirm
+ */
+terminalRouter.post('/sdk/confirm', validateToken, async (req, res) => {
+    const { sessionId, accept } = req.body || {};
+    if (!sessionId) {
+        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' });
+        return;
+    }
+    try {
+        // 根据 providerId 获取对应的 adapter
+        const providerId = entry.providerId || 'claude-code';
+        const adapter = adapterRegistry.get(providerId);
+        await adapter.sendConfirmation(sessionId, Boolean(accept));
+        res.json({ ok: true });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: errorMessage });
+    }
+});
+/**
+ * 中止当前轮次
+ * POST /runtime/sdk/abort
+ */
+terminalRouter.post('/sdk/abort', validateToken, async (req, res) => {
+    const { sessionId } = req.body || {};
+    if (!sessionId) {
+        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' });
+        return;
+    }
+    try {
+        // 根据 providerId 获取对应的 adapter
+        const providerId = entry.providerId || 'claude-code';
+        const adapter = adapterRegistry.get(providerId);
+        await adapter.abortCurrentTurn(sessionId);
+        res.json({ ok: true });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: errorMessage });
+    }
+});
+/**
+ * 停止 SDK 会话
+ * POST /runtime/sdk/stop
+ */
+terminalRouter.post('/sdk/stop', validateToken, async (req, res) => {
+    const { sessionId } = req.body || {};
+    if (!sessionId) {
+        res.status(400).json({ error: 'sessionId is required' });
+        return;
+    }
+    const entry = sdkSessions.get(sessionId);
+    if (!entry) {
+        res.json({ ok: true, status: 'stopped' });
+        return;
+    }
+    try {
+        // 根据 providerId 获取对应的 adapter
+        const providerId = entry.providerId || 'claude-code';
+        const adapter = adapterRegistry.get(providerId);
+        await adapter.terminateSession(sessionId);
+        sdkSessions.delete(sessionId);
+        await removePersistedSession(sessionId);
+        // ★ 从进程管理器中移除
+        const processManager = getAgentProcessManager();
+        await processManager.removeProcess(entry.agentId);
+        await sendStatus(entry.agentId, null, 'stopped');
+        res.json({ ok: true, status: 'stopped' });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: errorMessage });
+    }
+});
+/**
+ * 获取 SDK 会话状态
+ * GET /runtime/sdk/status/:sessionId
+ */
+terminalRouter.get('/sdk/status/:sessionId', validateToken, (req, res) => {
+    const sessionId = req.params.sessionId;
+    if (!sessionId) {
+        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' });
+        return;
+    }
+    try {
+        // 根据 providerId 获取对应的 adapter
+        const providerId = entry.providerId || 'claude-code';
+        const adapter = adapterRegistry.get(providerId);
+        const status = adapter.getSessionStatus(sessionId);
+        const conversation = adapter.getConversation(sessionId);
+        res.json({
+            sessionId,
+            status,
+            agentId: entry.agentId,
+            workspacePath: entry.workspacePath,
+            messageCount: conversation.length,
+        });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: errorMessage });
+    }
+});
+// ============ PTY 模式原有路由 ============
+/**
+ * 发送输入到终端（PTY 模式）
+ * POST /runtime/input
+ */
+terminalRouter.post('/input', validateToken, (req, res) => {
+    const { sessionId, input } = req.body || {};
+    if (!sessionId || input === undefined || input === null) {
+        res.status(400).json({ error: 'sessionId and input are required' });
+        return;
+    }
+    const session = sessions.get(sessionId);
+    if (!session) {
+        res.status(404).json({ error: 'session not found' });
+        return;
+    }
+    session.ptyProcess.write(input);
+    res.json({ ok: true });
+});
+/**
+ * 调整终端大小（PTY 模式）
+ * POST /runtime/resize
+ */
+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' });
+        return;
+    }
+    const session = sessions.get(sessionId);
+    if (!session) {
+        res.status(404).json({ error: 'session not found' });
+        return;
+    }
+    session.ptyProcess.resize(Number(cols), Number(rows));
+    res.json({ ok: true, cols: Number(cols), rows: Number(rows) });
+});
+/**
+ * 停止终端会话（PTY 模式和 SDK 模式）
+ * POST /runtime/stop
+ */
+terminalRouter.post('/stop', validateToken, async (req, res) => {
+    const { sessionId } = req.body || {};
+    if (!sessionId) {
+        res.status(400).json({ error: 'sessionId is required' });
+        return;
+    }
+    // 1. 检查是否是 SDK 会话
+    const sdkEntry = sdkSessions.get(sessionId);
+    if (sdkEntry) {
+        const agentId = sdkEntry.agentId;
+        try {
+            // 根据 providerId 获取对应的 adapter
+            const providerId = sdkEntry.providerId || 'claude-code';
+            const adapter = adapterRegistry.get(providerId);
+            await adapter.terminateSession(sessionId);
+            sdkSessions.delete(sessionId);
+            // 同时按 sessionId 和 agentId 删除，确保持久化会话被清除
+            await removePersistedSession(sessionId);
+            await removePersistedSessionByAgentId(agentId);
+            // ★ 从进程管理器中移除
+            const processManager = getAgentProcessManager();
+            await processManager.removeProcess(agentId);
+            await sendStatus(agentId, null, 'stopped');
+            res.json({ ok: true, status: 'stopped', mode: 'sdk' });
+            return;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            // 即使终止失败，也清理会话记录
+            sdkSessions.delete(sessionId);
+            // 同时按 sessionId 和 agentId 删除，确保持久化会话被清除
+            await removePersistedSession(sessionId);
+            await removePersistedSessionByAgentId(agentId);
+            // ★ 也从进程管理器清理
+            const processManager = getAgentProcessManager();
+            await processManager.removeProcess(agentId);
+            console.error(`[Runtime] Failed to terminate SDK session ${sessionId}:`, errorMessage);
+            res.json({ ok: true, status: 'stopped', mode: 'sdk', warning: errorMessage });
+            return;
+        }
+    }
+    // 2. 检查是否是 PTY 会话
+    const session = sessions.get(sessionId);
+    if (!session) {
+        // 3. 会话不存在于内存，直接清理持久化记录，避免后续恢复
+        await removePersistedSession(sessionId);
+        // 也从进程管理器清理（通过持久化会话查找 agentId）
+        try {
+            const persistedSessions = await loadPersistedSessions();
+            const persistedSession = persistedSessions.find(p => p.sessionId === sessionId);
+            if (persistedSession) {
+                const processManager = getAgentProcessManager();
+                await processManager.removeProcess(persistedSession.agentId);
+            }
+        }
+        catch {
+            // ignore cleanup errors
+        }
+        res.json({ ok: true, status: 'stopped', mode: 'none' });
+        return;
+    }
+    // 4. 终止 PTY 进程
+    const agentId = session.agentId;
+    try {
+        session.ptyProcess.kill();
+    }
+    catch {
+        // ignore stop race errors
+    }
+    if (session.flushTimer) {
+        clearTimeout(session.flushTimer);
+        session.flushTimer = null;
+    }
+    await flushSessionOutput(sessionId);
+    sessions.delete(sessionId);
+    // 同时按 sessionId 和 agentId 删除，确保持久化会话被清除
+    await removePersistedSession(sessionId);
+    await removePersistedSessionByAgentId(agentId);
+    // ★ 从进程管理器中移除
+    const processManager = getAgentProcessManager();
+    await processManager.removeProcess(agentId);
+    await sendStatus(agentId, null, 'stopped');
+    res.json({ ok: true, status: 'stopped', mode: 'pty' });
+});
+/**
+ * 停止所有终端会话（PTY 和 SDK）
+ * POST /runtime/stop-all
+ * 用于 aws-mcp-server 重启时清理所有终端
+ */
+terminalRouter.post('/stop-all', validateToken, async (_req, res) => {
+    const stoppedPty = [];
+    const stoppedSdk = [];
+    const errors = [];
+    // 1. 停止所有 PTY 会话
+    for (const [sessionId, session] of sessions.entries()) {
+        try {
+            if (session.flushTimer) {
+                clearTimeout(session.flushTimer);
+                session.flushTimer = null;
+            }
+            await flushSessionOutput(sessionId);
+            try {
+                session.ptyProcess.kill();
+            }
+            catch {
+                // ignore kill errors
+            }
+            sessions.delete(sessionId);
+            stoppedPty.push(sessionId);
+            await sendStatus(session.agentId, null, 'stopped');
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            errors.push(`PTY ${sessionId}: ${errorMessage}`);
+        }
+    }
+    // 2. 停止所有 SDK 会话
+    for (const [sessionId, entry] of sdkSessions.entries()) {
+        try {
+            // 根据 providerId 获取对应的 adapter
+            const providerId = entry.providerId || 'claude-code';
+            const adapter = adapterRegistry.get(providerId);
+            await adapter.terminateSession(sessionId);
+            sdkSessions.delete(sessionId);
+            stoppedSdk.push(sessionId);
+            await sendStatus(entry.agentId, null, 'stopped');
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            errors.push(`SDK ${sessionId}: ${errorMessage}`);
+        }
+    }
+    // 3. 清理持久化状态，避免 stop-all 后还能被恢复
+    // 直接清空整个持久化文件，确保不会有残留
+    try {
+        await savePersistedSessions([]);
+        console.log('[Runtime] 已清空所有持久化会话');
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        errors.push(`Persistence: ${errorMessage}`);
+    }
+    res.json({
+        ok: true,
+        stopped: {
+            pty: stoppedPty.length,
+            sdk: stoppedSdk.length,
+        },
+        errors: errors.length > 0 ? errors : undefined,
+    });
+});

package/dist/routes/terminal.test.d.ts

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

package/dist/routes/terminal.test.d.ts.map

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