aws-runtime-bridge 1.5.0 → 1.6.2

package/dist/routes/sessions.js

@@ -1,39 +1,25 @@
 /**
  * 会话管理 API 路由
  *
- * 提供终端会话的查询和恢复功能
+ * 提供 SDK Agent 会话的查询和恢复功能
  */
+import { execSync } from 'node:child_process';
 import { Router } from 'express';
-import { v4 as uuidv4 } from 'uuid';
-import { execSync } from 'child_process';
-import pty from 'node-pty';
+import { adapterRegistry } from '../adapter/index.js';
 import { validateToken } from '../middleware/auth.js';
-import { sessions, sendStatus, scheduleOutputFlush, flushSessionOutput } from '../services/session-output.js';
-import { loadPersistedSessions, upsertPersistedSession, removePersistedSession, findPersistedSessionByAgentId } from '../services/terminal-persistence.js';
 import { isProcessRunning, findOrphanProcessByAgentId, findOrphanProcessByWorkspace } from '../services/process-detector.js';
+import { findPersistedSessionByAgentId, loadPersistedSessions, removePersistedSession, } from '../services/terminal-persistence.js';
 import { createLogger } from '../utils/logger.js';
-// 导入 SDK 会话存储
 import { sdkSessions } from './terminal.js';
-// 导入 Adapter 注册�?
-import { adapterRegistry } from '../adapter/index.js';
 const log = createLogger('sessions');
 export const sessionsRouter = Router();
 /**
- * 获取所有终端会话（PTY �?SDK�?
+ * 获取所有 SDK Agent 会话
  * GET /runtime/sessions
  */
 sessionsRouter.get('/sessions', validateToken, async (_req, res) => {
     try {
-        // 1. 获取 PTY 会话
-        const activePtySessions = Array.from(sessions.entries()).map(([sessionId, session]) => ({
-            sessionId,
-            agentId: session.agentId,
-            workspacePath: session.workspacePath,
-            status: 'running',
-            mode: 'pty',
-            startedAt: null,
-        }));
-        // 2. 获取 SDK 会话
+        // 1. 获取 SDK 会话
         const activeSdkSessions = Array.from(sdkSessions.entries()).map(([sessionId, entry]) => ({
             sessionId,
             agentId: entry.agentId,
@@ -42,8 +28,8 @@ sessionsRouter.get('/sessions', validateToken, async (_req, res) => {
             mode: 'sdk',
             startedAt: null,
         }));
-        // 3. 合并活跃会话
-        const activeSessions = [...activePtySessions, ...activeSdkSessions];
+        // 2. SDK-only：活跃会话全部来自 SDK adapter。
+        const activeSessions = activeSdkSessions;
         const persistedSessions = await loadPersistedSessions();
         const activeSessionIds = new Set(activeSessions.map(s => s.sessionId));
         const persistedOnly = persistedSessions.filter(s => !activeSessionIds.has(s.sessionId));
@@ -73,22 +59,7 @@ sessionsRouter.post('/sessions/recover', validateToken, async (req, res) => {
         return;
     }
     try {
-        // 1. 检查是否已有活跃会�?
-        const existingSession = Array.from(sessions.entries()).find(([, s]) => s.agentId === agentId);
-        if (existingSession) {
-            res.json({
-                ok: true,
-                sessionId: existingSession[0],
-                agentId,
-                workspacePath: existingSession[1].workspacePath,
-                command: '',
-                status: 'running',
-                recovered: false,
-                message: 'Session already active',
-            });
-            return;
-        }
-        // 2. 检查是否有 SDK 活跃会话
+        // 1. 检查是否有 SDK 活跃会话
         const existingSdkSession = Array.from(sdkSessions.entries()).find(([, s]) => s.agentId === agentId);
         if (existingSdkSession) {
             res.json({
@@ -125,7 +96,7 @@ sessionsRouter.post('/sessions/recover', validateToken, async (req, res) => {
         }
         const resolvedWorkspacePath = workspacePath || persistedSession?.workspacePath;
         const resolvedCommand = command || persistedSession?.command || 'claude';
-        const resolvedMode = persistedSession?.mode || 'pty';
+        const resolvedMode = persistedSession?.mode || 'sdk';
         if (!resolvedWorkspacePath) {
             res.status(400).json({ error: 'workspacePath is required (not found in persisted session)' });
             return;
@@ -136,7 +107,7 @@ sessionsRouter.post('/sessions/recover', validateToken, async (req, res) => {
             log.info(`[Recover] Returning orphan process info for agentId=${agentId}`);
             res.json({
                 ok: true,
-                sessionId: persistedSession?.sessionId || uuidv4(),
+                sessionId: persistedSession?.sessionId || '',
                 agentId,
                 workspacePath: resolvedWorkspacePath,
                 command: resolvedCommand,
@@ -150,69 +121,17 @@ sessionsRouter.post('/sessions/recover', validateToken, async (req, res) => {
             });
             return;
         }
-        // 6. 无孤儿进程，启动新会�?
-        const sessionId = uuidv4();
-        const shell = process.platform === 'win32' ? 'powershell.exe' : 'bash';
-        const shellArgs = process.platform === 'win32' ? ['-NoLogo'] : [];
-        const terminal = pty.spawn(shell, shellArgs, {
-            name: 'xterm-color',
-            cols: 120,
-            rows: 30,
-            cwd: resolvedWorkspacePath,
-            env: {
-                ...process.env,
-                AWS_AGENT_ID: String(agentId),
-            },
-        });
-        sessions.set(sessionId, {
-            agentId,
-            workspacePath: resolvedWorkspacePath,
-            ptyProcess: terminal,
-            outputBuffer: '',
-            flushTimer: null,
-            flushInFlight: null,
-            seq: 0,
-        });
-        await upsertPersistedSession({
-            sessionId,
-            agentId,
-            workspacePath: resolvedWorkspacePath,
-            command: resolvedCommand,
-            startedAt: new Date().toISOString(),
-            status: 'running',
-            mode: resolvedMode,
-            pid: terminal.pid, // �?记录新进程的 PID
-        });
-        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);
-            await sendStatus(agentId, null, 'stopped');
-        });
-        terminal.write(`${resolvedCommand}\r`);
+        // 6. SDK-only 恢复不再创建本地终端；由上游重新调用 /runtime/start 创建新的 SDK 会话。
+        await removePersistedSession(persistedSession?.sessionId || '');
         const result = {
-            ok: true,
-            sessionId,
+            ok: false,
+            sessionId: persistedSession?.sessionId || '',
             agentId,
             workspacePath: resolvedWorkspacePath,
             command: resolvedCommand,
-            status: 'running',
-            recovered: true,
+            status: 'stopped',
+            recovered: false,
+            message: 'No active SDK session found; start a new SDK runtime session instead.',
         };
         res.json(result);
     }
@@ -241,10 +160,9 @@ sessionsRouter.post('/search-orphan', validateToken, async (req, res) => {
         return;
     }
     try {
-        // 1. 首先检�?runtime-bridge 是否已经有活跃会�?
-        const activeSession = Array.from(sessions.entries()).find(([, s]) => s.agentId === agentId);
+        // 1. 首先检查 runtime-bridge 是否已经有活跃 SDK 会话
         const activeSdkSession = Array.from(sdkSessions.entries()).find(([, s]) => s.agentId === agentId);
-        const hasActiveSession = activeSession || activeSdkSession;
+        const hasActiveSession = activeSdkSession;
         // 2. 搜索标记了该 agentId 的进程（命令�?+ 环境变量 + 进程树匹配）
         const orphanProcess = findOrphanProcessByAgentId(agentId);
         // 3. 如果找到残留进程，返回进程信�?
@@ -408,23 +326,7 @@ sessionsRouter.get('/sessions/by-agent/:agentId', validateToken, async (req, res
         return;
     }
     try {
-        // 1. 检查活�?PTY 会话
-        const activeSession = Array.from(sessions.entries()).find(([, s]) => s.agentId === agentId);
-        if (activeSession) {
-            res.json({
-                ok: true,
-                sessionId: activeSession[0],
-                agentId,
-                workspacePath: activeSession[1].workspacePath,
-                status: 'running',
-                isActive: true,
-                mode: 'pty',
-                pid: activeSession[1].ptyProcess.pid,
-                isManaged: true,
-            });
-            return;
-        }
-        // 2. 检查活�?SDK 会话
+        // 1. 检查活跃 SDK 会话
         const activeSdkSession = Array.from(sdkSessions.entries()).find(([, s]) => s.agentId === agentId);
         if (activeSdkSession) {
             const adapter = adapterRegistry.get(activeSdkSession[1].providerId || 'claude-code');
@@ -443,7 +345,7 @@ sessionsRouter.get('/sessions/by-agent/:agentId', validateToken, async (req, res
             });
             return;
         }
-        // 3. 检查持久化会话
+        // 2. 检查持久化会话
         const persistedSession = await findPersistedSessionByAgentId(agentId);
         if (persistedSession) {
             // 检查进程是否仍在运�?
@@ -494,22 +396,7 @@ sessionsRouter.post('/takeover-session', validateToken, async (req, res) => {
         return;
     }
     try {
-        // 1. 检查是否已有活跃PTY会话
-        const existingPtySession = Array.from(sessions.entries()).find(([, s]) => s.agentId === agentId);
-        if (existingPtySession) {
-            res.json({
-                ok: true,
-                agentId,
-                sessionId: existingPtySession[0],
-                mode: 'pty',
-                status: 'running',
-                isActive: true,
-                recovered: false,
-                message: 'PTY session already active',
-            });
-            return;
-        }
-        // 2. 检查是否已有活跃SDK会话
+        // 1. 检查是否已有活跃 SDK 会话
         const existingSdkSession = Array.from(sdkSessions.entries()).find(([, s]) => s.agentId === agentId);
         if (existingSdkSession) {
             res.json({
@@ -524,7 +411,7 @@ sessionsRouter.post('/takeover-session', validateToken, async (req, res) => {
             });
             return;
         }
-        // 3. 查找持久化会�?
+        // 2. 查找持久化会�?
         const persistedSession = await findPersistedSessionByAgentId(agentId);
         if (!persistedSession) {
             res.status(404).json({
@@ -533,7 +420,7 @@ sessionsRouter.post('/takeover-session', validateToken, async (req, res) => {
             });
             return;
         }
-        // 4. 检查SDK进程是否仍在运行
+        // 3. 检查 SDK 进程是否仍在运行
         let isProcessAlive = false;
         if (persistedSession.mode === 'sdk') {
             // 对于SDK模式，尝试通过agentId查找进程
@@ -544,10 +431,6 @@ sessionsRouter.post('/takeover-session', validateToken, async (req, res) => {
                 isProcessAlive = isProcessRunning(persistedSession.pid);
             }
         }
-        else if (persistedSession.pid) {
-            // 对于PTY模式，检查PID
-            isProcessAlive = isProcessRunning(persistedSession.pid);
-        }
         if (!isProcessAlive) {
             log.info(`[takeover-session] Process not alive for agentId=${agentId}, mode=${persistedSession.mode}`);
             res.json({
@@ -594,68 +477,10 @@ sessionsRouter.post('/takeover-session', validateToken, async (req, res) => {
             }
         }
         else {
-            // PTY模式，重新创建PTY会话
-            const sessionId = uuidv4();
-            const shell = process.platform === 'win32' ? 'powershell.exe' : 'bash';
-            const shellArgs = process.platform === 'win32' ? ['-NoLogo'] : [];
-            const terminal = pty.spawn(shell, shellArgs, {
-                name: 'xterm-color',
-                cols: 120,
-                rows: 30,
-                cwd: persistedSession.workspacePath,
-                env: {
-                    ...process.env,
-                    AWS_AGENT_ID: String(agentId),
-                },
-            });
-            sessions.set(sessionId, {
+            res.status(410).json({
+                error: 'Session takeover is no longer supported; start a new SDK runtime session.',
                 agentId,
-                workspacePath: persistedSession.workspacePath,
-                ptyProcess: terminal,
-                outputBuffer: '',
-                flushTimer: null,
-                flushInFlight: null,
-                seq: 0,
-            });
-            await upsertPersistedSession({
-                sessionId,
-                agentId,
-                workspacePath: persistedSession.workspacePath,
-                command: persistedSession.command,
-                startedAt: new Date().toISOString(),
-                status: 'running',
-                mode: 'pty',
-                pid: terminal.pid,
-            });
-            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);
-                await removePersistedSession(sessionId);
-                await sendStatus(agentId, null, 'stopped');
-            });
-            res.json({
-                ok: true,
-                agentId,
-                sessionId,
-                mode: 'pty',
-                status: 'running',
-                isActive: true,
-                recovered: true,
-                pid: terminal.pid,
+                mode: 'sdk',
             });
         }
     }
@@ -689,15 +514,10 @@ sessionsRouter.post('/terminate-tree', validateToken, async (req, res) => {
             targetSessionId = persistedSession.sessionId;
         }
         // 2. 检查是否是活跃会话
-        const activeSession = sessions.get(targetSessionId);
         const activeSdkSession = sdkSessions.get(targetSessionId);
         let pid;
         let mode;
-        if (activeSession) {
-            pid = activeSession.ptyProcess.pid;
-            mode = 'pty';
-        }
-        else if (activeSdkSession) {
+        if (activeSdkSession) {
             const adapter = adapterRegistry.get(activeSdkSession.providerId || 'claude-code');
             pid = adapter.getSessionPid?.(targetSessionId);
             mode = 'sdk';
@@ -710,7 +530,7 @@ sessionsRouter.post('/terminate-tree', validateToken, async (req, res) => {
                 return;
             }
             pid = persistedSession.pid;
-            mode = persistedSession.mode || 'pty';
+            mode = persistedSession.mode || 'sdk';
         }
         // 3. 终止进程树
         const { terminateProcessTree, waitForProcessExit } = await import('../services/process-detector.js');
@@ -769,9 +589,8 @@ sessionsRouter.get('/health/:agentId', validateToken, async (req, res) => {
             return;
         }
         // 2. 检查是否是活跃会话
-        const activeSession = sessions.get(persistedSession.sessionId);
         const activeSdkSession = sdkSessions.get(persistedSession.sessionId);
-        const isManaged = !!(activeSession || activeSdkSession);
+        const isManaged = !!activeSdkSession;
         // 3. 获取健康状态
         const { checkProcessHealth } = await import('../services/process-detector.js');
         const healthResponse = {
@@ -779,7 +598,7 @@ sessionsRouter.get('/health/:agentId', validateToken, async (req, res) => {
             mode: persistedSession.mode,
             workspacePath: persistedSession.workspacePath,
             isManaged,
-            isActive: !!(activeSession || activeSdkSession),
+            isActive: !!activeSdkSession,
         };
         if (persistedSession.pid) {
             const health = await checkProcessHealth(persistedSession.pid, agentId);

package/dist/routes/terminal.d.ts

@@ -1,10 +1,11 @@
 /**
  * 终端 API 路由
  *
- * 提供终端会话的启动、输入、调整大小和停止功能
- * 支持 PTY 模式和 SDK 模式
+ * 提供 SDK Agent 会话的启动、输入、调整大小和停止功能
+ * 终端 UI 仅作为 SDK Agent 的消息输入/状态输出载体
  */
-import { type AdapterSessionConfig } from '../adapter/index.js';
+import { TextDecoder } from 'node:util';
+import { type AdapterSessionConfig, type ProviderEvent } from '../adapter/index.js';
 export declare const terminalRouter: import("express-serve-static-core").Router;
 export interface SdkSessionEntry {
     agentId: string;
@@ -12,7 +13,35 @@ export interface SdkSessionEntry {
     sessionId: string;
     config: AdapterSessionConfig;
     providerId: string;
+    seq: number;
 }
 export declare const sdkSessions: Map<string, SdkSessionEntry>;
+/**
+ * 标准化终端输入：将前端回车符还原为 shell 可执行命令文本。
+ */
+export declare function normalizeTerminalCommandInput(value: unknown): string;
+/**
+ * 解析终端命令输出解码编码。
+ * 主流程：优先使用环境变量覆盖 -> Windows 默认 GB18030 -> 其他平台默认 UTF-8。
+ */
+export declare function resolveTerminalOutputEncoding(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): string;
+/**
+ * 创建终端输出流式解码器，避免多字节中文被 chunk 边界截断。
+ */
+export declare function createTerminalOutputDecoder(encoding?: string): TextDecoder;
+/**
+ * 解码终端输出 chunk；end=true 时刷新解码器内部剩余字节。
+ */
+export declare function decodeTerminalOutputChunk(decoder: TextDecoder, chunk?: Buffer, end?: boolean): string;
+/**
+ * 解析 cd 命令目标；返回 undefined 表示不是目录切换命令，null 表示仅查看当前目录。
+ */
+export declare function parseTerminalDirectoryChangeTarget(command: string): string | null | undefined;
+/**
+ * 生成显示在终端输出流中的工作目录提示符。
+ */
+export declare function formatTerminalPrompt(currentDirectory: string): string;
+export declare function buildRuntimeEnv(agentId: string, workspacePath: string | undefined, baseEnv: NodeJS.ProcessEnv, envOverrides?: Record<string, unknown>): Record<string, string>;
+export declare function formatSdkOutputEvent(event: ProviderEvent): string | undefined;
 export declare function resolveSdkProviderId(command?: string): string;
 //# sourceMappingURL=terminal.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAEL,KAAK,oBAAoB,EAM1B,MAAM,qBAAqB,CAAC;AAc7B,eAAO,MAAM,cAAc,4CAAW,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAGD,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAa,CAAC;AAEnE,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7D"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKxC,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,aAAa,EAInB,MAAM,qBAAqB,CAAC;AAc7B,eAAO,MAAM,cAAc,4CAAW,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;CACb;AAGD,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAa,CAAC;AAenE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEpE;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAMR;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,SAAkC,GAAG,WAAW,CAMnG;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,UAAQ,GAAG,MAAM,CAQnG;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAiB7F;AA0CD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAErE;AAyGD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA+BxB;AA8BD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAU7E;AAYD,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7D"}