aws-runtime-bridge 1.6.14 → 1.7.0

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,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"}
+{"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;AAgBnE;;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;AAiED;;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"}

package/dist/routes/terminal.js

@@ -17,11 +17,12 @@ import { getAgentProcessManager } from '../services/agent-process-manager.js';
 import { enqueueMcpLaunchBinding } from '../services/mcp-launch-binding-queue.js';
 import { findClaudeCodeProcesses } from '../services/process-detector.js';
 import { sendOutput, sendQuestionRequest, sendStatus } from '../services/session-output.js';
-import { removePersistedSession, removePersistedSessionByAgentId, savePersistedSessions, updatePersistedSessionAutoCommands, upsertPersistedSession, } from '../services/terminal-persistence.js';
+import { findPersistedSessionByAgentId, removePersistedSession, savePersistedSessions, updatePersistedSessionAutoCommands, 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 startingAgents = new Set();
 const terminalCommandStates = new Map();
 const DEFAULT_WINDOWS_TERMINAL_OUTPUT_ENCODING = 'gb18030';
 const DEFAULT_TERMINAL_OUTPUT_ENCODING = 'utf-8';
@@ -96,6 +97,27 @@ function getTerminalCommandState(entry) {
     terminalCommandStates.set(entry.sessionId, state);
     return state;
 }
+function findActiveSdkSessionByAgentId(agentId) {
+    for (const entry of sdkSessions.values()) {
+        if (entry.agentId === agentId) {
+            return entry;
+        }
+    }
+    return undefined;
+}
+async function buildExistingSessionResponse(entry) {
+    const adapter = adapterRegistry.get(entry.providerId || 'claude-code');
+    return {
+        sessionId: entry.sessionId,
+        status: adapter.getSessionStatus(entry.sessionId) || 'running',
+        agentId: entry.agentId,
+        workspacePath: entry.workspacePath,
+        command: entry.config.command,
+        mode: 'sdk',
+        providerSessionId: adapter.getProviderSessionId(entry.sessionId),
+        reused: true,
+    };
+}
 function stopTerminalCommandProcess(sessionId) {
     const state = terminalCommandStates.get(sessionId);
     if (!state?.runningProcess) {
@@ -374,9 +396,38 @@ async function startSdkSession(req, res) {
     // 空闲命令配置
     idleInputAutoCommand, nonInputAutoCommand, } = req.body || {};
     let sessionId = null;
-    let agentForCleanup = null;
+    const normalizedAgentId = String(agentId || '').trim();
     try {
         ensureAdapterInitialized();
+        if (!normalizedAgentId) {
+            res.status(400).json({ error: 'agentId is required' });
+            return;
+        }
+        const activeSession = findActiveSdkSessionByAgentId(normalizedAgentId);
+        if (activeSession) {
+            res.json(await buildExistingSessionResponse(activeSession));
+            return;
+        }
+        const persistedSession = await findPersistedSessionByAgentId(normalizedAgentId);
+        if (persistedSession) {
+            res.json({
+                sessionId: persistedSession.sessionId,
+                status: persistedSession.status,
+                agentId: persistedSession.agentId,
+                workspacePath: persistedSession.workspacePath,
+                command: persistedSession.command,
+                mode: persistedSession.mode || 'sdk',
+                pid: persistedSession.pid,
+                reused: true,
+                persistedOnly: true,
+            });
+            return;
+        }
+        if (startingAgents.has(normalizedAgentId)) {
+            res.status(409).json({ error: 'SDK session is already starting for this agent' });
+            return;
+        }
+        startingAgents.add(normalizedAgentId);
         // 根据命令选择对应的 adapter
         const normalizedCommand = (command || 'claude').toLowerCase();
         const providerId = resolveSdkProviderId(command);
@@ -384,7 +435,6 @@ async function startSdkSession(req, res) {
         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',
@@ -398,7 +448,7 @@ async function startSdkSession(req, res) {
         };
         // 存储会话信息
         sdkSessions.set(sessionId, {
-            agentId,
+            agentId: normalizedAgentId,
             workspacePath,
             sessionId,
             config,
@@ -447,7 +497,7 @@ async function startSdkSession(req, res) {
         if (sdkPid) {
             const processManager = getAgentProcessManager();
             await processManager.startProcess({
-                agentId,
+                agentId: normalizedAgentId,
                 sessionId,
                 pid: sdkPid,
                 mode: 'sdk',
@@ -477,12 +527,14 @@ async function startSdkSession(req, res) {
             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}` });
     }
+    finally {
+        if (normalizedAgentId) {
+            startingAgents.delete(normalizedAgentId);
+        }
+    }
 }
 // ============ SDK 专用路由 ============
 /**
@@ -800,7 +852,6 @@ terminalRouter.post('/stop', validateToken, async (req, res) => {
         sdkSessions.delete(sessionId);
         stopTerminalCommandProcess(sessionId);
         await removePersistedSession(sessionId);
-        await removePersistedSessionByAgentId(agentId);
         const processManager = getAgentProcessManager();
         await processManager.removeProcess(agentId);
         await sendStatus(agentId, null, 'stopped');

package/dist/services/terminal-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-persistence.d.ts","sourceRoot":"","sources":["../../src/services/terminal-persistence.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA6BpD;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAOzE;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAKvF;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrF;AAED;;;;GAIG;AACH,wBAAsB,kCAAkC,CACtD,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE;IAAE,oBAAoB,EAAE,MAAM,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,GACtE,OAAO,CAAC,OAAO,CAAC,CAclB;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7E;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAGvC;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBpF"}
+{"version":3,"file":"terminal-persistence.d.ts","sourceRoot":"","sources":["../../src/services/terminal-persistence.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA8BpD;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAOzE;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAKvF;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAQrF;AAED;;;;GAIG;AACH,wBAAsB,kCAAkC,CACtD,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE;IAAE,oBAAoB,EAAE,MAAM,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,GACtE,OAAO,CAAC,OAAO,CAAC,CAclB;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7E;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAKvC;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBpF"}

package/dist/services/terminal-persistence.js

@@ -3,9 +3,9 @@
  *
  * 管理终端会话元数据的持久化存储
  */
-import path from 'node:path';
-import os from 'node:os';
 import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import { atomicWriteJsonFile, withFileLock } from '../utils/file-utils.js';
 import { createLogger } from '../utils/logger.js';
 const log = createLogger('terminal-persistence');
@@ -69,14 +69,10 @@ export async function savePersistedSessions(sessions) {
  */
 export async function upsertPersistedSession(session) {
     await updatePersistedSessions((sessions) => {
-        const runningSessions = sessions.filter(s => s.status === 'running');
-        const index = runningSessions.findIndex(s => s.sessionId === session.sessionId);
-        if (index >= 0) {
-            runningSessions[index] = session;
-        }
-        else {
-            runningSessions.push(session);
-        }
+        const runningSessions = sessions
+            .filter(s => s.status === 'running')
+            .filter(s => s.sessionId !== session.sessionId && s.agentId !== session.agentId);
+        runningSessions.push(session);
         return runningSessions;
     });
 }
@@ -129,7 +125,9 @@ export async function removePersistedSession(sessionId) {
  */
 export async function findPersistedSessionByAgentId(agentId) {
     const sessions = await loadPersistedSessions();
-    return sessions.find(s => s.agentId === agentId);
+    return sessions
+        .filter(s => s.agentId === agentId)
+        .sort((a, b) => String(b.startedAt || '').localeCompare(String(a.startedAt || '')))[0];
 }
 /**
  * 根据 agentId 移除持久化会话

package/dist/services/terminal-persistence.test.js

@@ -1,8 +1,8 @@
 /**
  * Terminal Persistence 服务单元测试
  */
-import path from 'node:path';
 import { promises as fs } from 'node:fs';
+import path from 'node:path';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 const tmpRoot = path.join(process.cwd(), '.tmp-vitest-terminal-persistence');
 vi.mock('node:os', () => ({
@@ -110,6 +110,13 @@ describe('terminal-persistence service', () => {
         };
         expect(parseSessions('invalid json')).toEqual([]);
     });
+    it('keeps a single running session per agent when upserting', async () => {
+        await persistence.upsertPersistedSession(makeSession('session-old', 'agent-1'));
+        await persistence.upsertPersistedSession(makeSession('session-new', 'agent-1'));
+        const sessions = await persistence.loadPersistedSessions();
+        expect(sessions).toHaveLength(1);
+        expect(sessions[0].sessionId).toBe('session-new');
+    });
     it('serializes concurrent upserts without losing sessions', async () => {
         await Promise.all([
             persistence.upsertPersistedSession(makeSession('session-1', 'agent-1')),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-runtime-bridge",
-  "version": "1.6.14",
+  "version": "1.7.0",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",