aws-runtime-bridge 1.7.40 → 1.7.42

package/dist/routes/terminal.d.ts

@@ -60,6 +60,11 @@ export declare function evaluatePersistedSessionReuse(session: Pick<PersistedSes
  */
 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>;
+/**
+ * 将 SDK 工具结束事件转换为时间线返回数据状态。
+ * 主流程：格式化工具结果 -> 保留 MCP 专用展示 -> 其它工具按动作类型追加到对应时间线事件。
+ */
+export declare function buildToolResultTimelineActionInfo(event: ProviderEvent): RuntimeStatusActionInfo | undefined;
 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,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKxC,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,aAAa,EAClB,KAAK,uBAAuB,EAI7B,MAAM,qBAAqB,CAAC;AAc7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,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;IACZ,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAGD,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAa,CAAC;AAKnE,wBAAgB,wBAAwB,CAAC,UAAU,CAAC,EAAE,uBAAuB;;;cAS5E;AAaD;;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;AA2CD,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,YAAY,GAAG,aAAa,GAAG,UAAU,CAAC;CACnD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,EACtC,YAAY,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAA0B,GACxD,6BAA6B,CAU/B;AA4BD;;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,EAGzB,KAAK,aAAa,EAClB,KAAK,uBAAuB,EAI7B,MAAM,qBAAqB,CAAC;AAc7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,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;IACZ,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAGD,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAa,CAAC;AAKnE,wBAAgB,wBAAwB,CAAC,UAAU,CAAC,EAAE,uBAAuB;;;cAS5E;AAaD;;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;AA2CD,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,YAAY,GAAG,aAAa,GAAG,UAAU,CAAC;CACnD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,EACtC,YAAY,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAA0B,GACxD,6BAA6B,CAU/B;AA4BD;;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;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,aAAa,GAAG,uBAAuB,GAAG,SAAS,CAiC3G;AAED,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

@@ -11,7 +11,7 @@ import path from 'node:path';
 import { TextDecoder } from 'node:util';
 import { Router } from 'express';
 import { v4 as uuidv4 } from 'uuid';
-import { adapterRegistry, registerSdkProviders, resolveSdkProviderIdByCommand, } from '../adapter/index.js';
+import { adapterRegistry, getToolActionInfo, registerSdkProviders, resolveSdkProviderIdByCommand, } from '../adapter/index.js';
 import { validateToken } from '../middleware/auth.js';
 import { getAgentProcessManager } from '../services/agent-process-manager.js';
 import { enqueueMcpLaunchBinding } from '../services/mcp-launch-binding-queue.js';
@@ -317,6 +317,40 @@ function isMcpProviderEvent(event) {
     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') {
+        return undefined;
+    }
+    const actionResult = formatToolResultForTimeline(event.data.toolResult ?? event.data.actionResult);
+    if (!actionResult) {
+        return undefined;
+    }
+    const inferredAction = getToolActionInfo(event.data.toolName, event.data.toolInput);
+    const actionType = event.data.actionType || inferredAction.actionType;
+    if (actionType === 'idle') {
+        return undefined;
+    }
+    if (actionType === 'mcp' && isMcpProviderEvent(event)) {
+        return {
+            actionType: 'mcp',
+            actionLabel: 'MCP返回',
+            actionDetail: event.data.actionDetail || event.data.toolName,
+            actionId: event.data.actionId || event.data.toolUseId,
+            actionResult,
+        };
+    }
+    return {
+        actionType,
+        actionLabel: event.data.actionLabel || inferredAction.actionLabel,
+        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') {
         return event.data.text || undefined;
@@ -351,17 +385,9 @@ function wireSdkAdapterEvents(adapter, definition) {
         if (entry) {
             console.log(`[${definition.displayName} Adapter] Event: ${event.type} for session ${event.sessionId}`);
             forwardSdkOutputEvent(event, entry);
-            if (event.type === 'tool_use_end' && isMcpProviderEvent(event)) {
-                const actionResult = formatToolResultForTimeline(event.data.toolResult);
-                if (actionResult) {
-                    void sendStatus(entry.agentId, event.sessionId, 'tool_result', {
-                        actionType: 'mcp',
-                        actionLabel: 'MCP返回',
-                        actionDetail: event.data.toolName,
-                        actionId: event.data.toolUseId,
-                        actionResult,
-                    });
-                }
+            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 }));

package/dist/routes/terminal.test.js

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { SDK_PROVIDER_DEFINITIONS } from '../adapter/SdkProviderSpi.js';
-import { buildRuntimeEnv, createTerminalOutputDecoder, decodeTerminalOutputChunk, evaluatePersistedSessionReuse, formatTerminalPrompt, formatSdkOutputEvent, normalizeTerminalCommandInput, parseTerminalDirectoryChangeTarget, resolveTerminalOutputEncoding, resolveSdkProviderId, resolveStatusChangeUsage, } from './terminal.js';
+import { buildRuntimeEnv, buildToolResultTimelineActionInfo, createTerminalOutputDecoder, decodeTerminalOutputChunk, evaluatePersistedSessionReuse, formatTerminalPrompt, formatSdkOutputEvent, normalizeTerminalCommandInput, parseTerminalDirectoryChangeTarget, resolveTerminalOutputEncoding, resolveSdkProviderId, resolveStatusChangeUsage, } from './terminal.js';
 describe('terminal route validation', () => {
     it('requires agentId and workspacePath for start', () => {
         const validateStartRequest = (body) => {
@@ -188,3 +188,93 @@ describe('SDK output forwarding', () => {
         expect(formatSdkOutputEvent(toolEvent)).toBeUndefined();
     });
 });
+describe('SDK tool result timeline action info', () => {
+    it('keeps MCP tool results on MCP timeline events', () => {
+        const event = {
+            type: 'tool_use_end',
+            sessionId: 'session-1',
+            timestamp: new Date(0).toISOString(),
+            data: {
+                toolName: 'mcp__aws-mcp__get_profile',
+                toolUseId: 'tool-1',
+                toolResult: '{"displayName":"Agent"}',
+            },
+        };
+        expect(buildToolResultTimelineActionInfo(event)).toEqual({
+            actionType: 'mcp',
+            actionLabel: 'MCP返回',
+            actionDetail: 'mcp__aws-mcp__get_profile',
+            actionId: 'tool-1',
+            actionResult: '{"displayName":"Agent"}',
+        });
+    });
+    it('forwards bash tool results to command timeline events', () => {
+        const event = {
+            type: 'tool_use_end',
+            sessionId: 'session-1',
+            timestamp: new Date(0).toISOString(),
+            data: {
+                toolName: 'bash',
+                toolInput: { command: 'npm run build' },
+                toolUseId: 'tool-2',
+                toolResult: 'build passed',
+            },
+        };
+        expect(buildToolResultTimelineActionInfo(event)).toEqual({
+            actionType: 'bash',
+            actionLabel: '执行命令',
+            actionDetail: 'npm run build',
+            actionId: 'tool-2',
+            actionResult: 'build passed',
+        });
+    });
+    it('forwards read tool results to file-read timeline events', () => {
+        const event = {
+            type: 'tool_use_end',
+            sessionId: 'session-1',
+            timestamp: new Date(0).toISOString(),
+            data: {
+                toolName: 'read_file',
+                toolInput: { path: 'src/index.ts' },
+                actionId: 'tool-3',
+                actionResult: 'export const ok = true',
+            },
+        };
+        expect(buildToolResultTimelineActionInfo(event)).toEqual({
+            actionType: 'read_file',
+            actionLabel: '读取文件',
+            actionDetail: 'src/index.ts',
+            actionId: 'tool-3',
+            actionResult: 'export const ok = true',
+        });
+    });
+    it('keeps MCP-named filesystem results on semantic file-read timeline events', () => {
+        const event = {
+            type: 'tool_use_end',
+            sessionId: 'session-1',
+            timestamp: new Date(0).toISOString(),
+            data: {
+                toolName: 'mcp__filesystem__read_file',
+                toolInput: { path: 'src/index.ts' },
+                toolUseId: 'tool-4',
+                toolResult: 'export const ok = true',
+            },
+        };
+        expect(buildToolResultTimelineActionInfo(event)).toEqual({
+            actionType: 'read_file',
+            actionLabel: '读取文件',
+            actionDetail: 'src/index.ts',
+            actionId: 'tool-4',
+            actionResult: 'export const ok = true',
+        });
+    });
+    it('ignores tool result events without displayable result content', () => {
+        const event = {
+            type: 'tool_use_end',
+            sessionId: 'session-1',
+            timestamp: new Date(0).toISOString(),
+            data: { toolName: 'read_file', toolResult: '   ' },
+        };
+        expect(buildToolResultTimelineActionInfo(event)).toBeUndefined();
+    });
+});

package/dist/services/instance-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance-state.d.ts","sourceRoot":"","sources":["../../src/services/instance-state.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAiB/E;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,GAC5B,OAAO,CAAC,aAAa,CAAC,CAiBxB;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD"}
+{"version":3,"file":"instance-state.d.ts","sourceRoot":"","sources":["../../src/services/instance-state.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAqBjD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAgB/E;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,GAC5B,OAAO,CAAC,aAAa,CAAC,CAiBxB;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD"}

package/dist/services/instance-state.js

@@ -3,12 +3,27 @@
  *
  * 管理 Agent 实例的初始化状态持久化
  */
-import path from 'node:path';
-import os from 'node:os';
 import { promises as fs } from 'node:fs';
-import { ensureEnabledTools } from '../utils/validation.js';
-import { parseBoolean } from '../utils/validation.js';
-import { ensureDir } from '../utils/file-utils.js';
+import os from 'node:os';
+import path from 'node:path';
+import { getRuntimeHomeDir } from '../config.js';
+import { atomicWriteJsonFile, ensureDir } from '../utils/file-utils.js';
+import { ensureEnabledTools, parseBoolean } from '../utils/validation.js';
+function getLegacyInstanceStateFile(agentId) {
+    return path.join(os.tmpdir(), 'agentswork-runtime-init', String(agentId), 'state.json');
+}
+function createDefaultInstanceState() {
+    return {
+        initialized: false,
+        skills: [],
+        mcpServers: [],
+        enabledTools: ['claude', 'opencode', 'codex'],
+        toolStatus: {},
+        skillEnabled: true,
+        mcpEnabled: true,
+        updatedAt: null,
+    };
+}
 /**
  * 获取实例状态文件路径
  *
@@ -16,7 +31,7 @@ import { ensureDir } from '../utils/file-utils.js';
  * @returns 状态文件路径
  */
 export function getInstanceStateFile(agentId) {
-    return path.join(os.tmpdir(), 'agentswork-runtime-init', String(agentId), 'state.json');
+    return path.join(getRuntimeHomeDir(), '.aws-bridge', 'instances', String(agentId), 'state.json');
 }
 /**
  * 加载实例状态
@@ -26,21 +41,21 @@ export function getInstanceStateFile(agentId) {
  */
 export async function loadInstanceState(agentId) {
     const filePath = getInstanceStateFile(agentId);
+    const legacyFilePath = getLegacyInstanceStateFile(agentId);
     try {
         const raw = await fs.readFile(filePath, 'utf-8');
         return JSON.parse(raw);
     }
     catch {
-        return {
-            initialized: false,
-            skills: [],
-            mcpServers: [],
-            enabledTools: ['claude', 'opencode', 'codex'],
-            toolStatus: {},
-            skillEnabled: true,
-            mcpEnabled: true,
-            updatedAt: null,
-        };
+        try {
+            const raw = await fs.readFile(legacyFilePath, 'utf-8');
+            const legacyState = JSON.parse(raw);
+            await atomicWriteJsonFile(filePath, legacyState);
+            return legacyState;
+        }
+        catch {
+            return createDefaultInstanceState();
+        }
     }
 }
 /**
@@ -65,7 +80,7 @@ export async function saveInstanceState(agentId, state) {
         mcpEnabled: parseBoolean(state?.mcpEnabled, true),
         updatedAt: new Date().toISOString(),
     };
-    await fs.writeFile(filePath, JSON.stringify(next, null, 2), 'utf-8');
+    await atomicWriteJsonFile(filePath, next);
     return next;
 }
 /**
@@ -75,5 +90,5 @@ export async function saveInstanceState(agentId, state) {
  * @returns 初始化根目录路径
  */
 export function getAgentInitRoot(agentId) {
-    return path.join(os.tmpdir(), 'agentswork-runtime-init', String(agentId));
+    return path.join(getRuntimeHomeDir(), '.aws-bridge', 'instances', String(agentId));
 }

package/dist/services/instance-state.test.js

@@ -1,33 +1,46 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { promises as fs } from 'node:fs';
 import { getInstanceStateFile, loadInstanceState, saveInstanceState, getAgentInitRoot, } from './instance-state.js';
 describe('instance-state service', () => {
     const testAgentId = 'test-agent-123';
-    const stateFilePath = getInstanceStateFile(testAgentId);
+    const originalRuntimeHomeDir = process.env.AWS_RUNTIME_HOME_DIR;
+    const testRuntimeHomeDir = path.join(os.tmpdir(), `aws-instance-state-home-${Date.now()}`);
+    function getCurrentStateFilePath() {
+        return getInstanceStateFile(testAgentId);
+    }
     beforeEach(async () => {
+        process.env.AWS_RUNTIME_HOME_DIR = testRuntimeHomeDir;
         // 清理测试文件
         try {
-            await fs.rm(path.dirname(stateFilePath), { recursive: true, force: true });
+            await fs.rm(testRuntimeHomeDir, { recursive: true, force: true });
+            await fs.rm(path.join(os.tmpdir(), 'agentswork-runtime-init', testAgentId), { recursive: true, force: true });
         }
         catch {
             // 目录不存在，忽略
         }
     });
     afterEach(async () => {
+        if (originalRuntimeHomeDir === undefined) {
+            delete process.env.AWS_RUNTIME_HOME_DIR;
+        }
+        else {
+            process.env.AWS_RUNTIME_HOME_DIR = originalRuntimeHomeDir;
+        }
         // 清理测试文件
         try {
-            await fs.rm(path.dirname(stateFilePath), { recursive: true, force: true });
+            await fs.rm(testRuntimeHomeDir, { recursive: true, force: true });
+            await fs.rm(path.join(os.tmpdir(), 'agentswork-runtime-init', testAgentId), { recursive: true, force: true });
         }
         catch {
             // 目录不存在，忽略
         }
     });
     describe('getInstanceStateFile', () => {
-        it('should return correct path in temp directory', () => {
+        it('should return correct path in runtime home directory', () => {
             const result = getInstanceStateFile(testAgentId);
-            const expected = path.join(os.tmpdir(), 'agentswork-runtime-init', testAgentId, 'state.json');
+            const expected = path.join(testRuntimeHomeDir, '.aws-bridge', 'instances', testAgentId, 'state.json');
             expect(result).toBe(expected);
         });
         it('should handle agentId with special characters', () => {
@@ -45,7 +58,7 @@ describe('instance-state service', () => {
     describe('getAgentInitRoot', () => {
         it('should return correct init root directory', () => {
             const result = getAgentInitRoot(testAgentId);
-            const expected = path.join(os.tmpdir(), 'agentswork-runtime-init', testAgentId);
+            const expected = path.join(testRuntimeHomeDir, '.aws-bridge', 'instances', testAgentId);
             expect(result).toBe(expected);
         });
     });
@@ -92,6 +105,7 @@ describe('instance-state service', () => {
         });
         it('should handle corrupted JSON file gracefully', async () => {
             // 创建损坏的 JSON 文件
+            const stateFilePath = getCurrentStateFilePath();
             await fs.mkdir(path.dirname(stateFilePath), { recursive: true });
             await fs.writeFile(stateFilePath, '{ invalid json }', 'utf-8');
             const state = await loadInstanceState(testAgentId);
@@ -99,6 +113,24 @@ describe('instance-state service', () => {
             expect(state.initialized).toBe(false);
             expect(state.skills).toEqual([]);
         });
+        it('should migrate readable legacy temp state into runtime home', async () => {
+            const legacyFilePath = path.join(os.tmpdir(), 'agentswork-runtime-init', testAgentId, 'state.json');
+            const legacyState = {
+                initialized: true,
+                skills: [],
+                mcpServers: [],
+                enabledTools: ['claude'],
+                toolStatus: {},
+                skillEnabled: true,
+                mcpEnabled: false,
+                updatedAt: '2026-01-01T00:00:00.000Z',
+            };
+            await fs.mkdir(path.dirname(legacyFilePath), { recursive: true });
+            await fs.writeFile(legacyFilePath, JSON.stringify(legacyState), 'utf-8');
+            const state = await loadInstanceState(testAgentId);
+            expect(state).toEqual(legacyState);
+            expect(JSON.parse(await fs.readFile(getInstanceStateFile(testAgentId), 'utf-8'))).toEqual(legacyState);
+        });
     });
     describe('saveInstanceState', () => {
         it('should save complete state with all fields', async () => {
@@ -128,7 +160,7 @@ describe('instance-state service', () => {
             expect(result.mcpEnabled).toBe(true);
             expect(result.updatedAt).not.toBeNull();
             // 验证文件已创建
-            const fileContent = await fs.readFile(stateFilePath, 'utf-8');
+            const fileContent = await fs.readFile(getCurrentStateFilePath(), 'utf-8');
             const parsed = JSON.parse(fileContent);
             expect(parsed.initialized).toBe(true);
         });
@@ -198,7 +230,7 @@ describe('instance-state service', () => {
             const result = await saveInstanceState(testAgentId, { initialized: false });
             expect(result.initialized).toBe(false);
             // 验证文件内容
-            const fileContent = await fs.readFile(stateFilePath, 'utf-8');
+            const fileContent = await fs.readFile(getCurrentStateFilePath(), 'utf-8');
             const parsed = JSON.parse(fileContent);
             expect(parsed.initialized).toBe(false);
         });

package/dist/services/startup-config-wizard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startup-config-wizard.d.ts","sourceRoot":"","sources":["../../src/services/startup-config-wizard.ts"],"names":[],"mappings":"AAuBA,UAAU,QAAQ;IAChB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,KAAK,IAAI,IAAI,CAAC;CACf;AAED,UAAU,0BAA0B;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,MAAM,CAAC;CACtC;AAED,MAAM,MAAM,yBAAyB,GACjC,QAAQ,GACR,SAAS,GACT,YAAY,GACZ,SAAS,GACT,iBAAiB,GACjB,QAAQ,CAAC;AAqKb,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,yBAAyB,CAAC,CAiDpC;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,yBAAyB,CAAC,CA0BpC"}
+{"version":3,"file":"startup-config-wizard.d.ts","sourceRoot":"","sources":["../../src/services/startup-config-wizard.ts"],"names":[],"mappings":"AAuBA,UAAU,QAAQ;IAChB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,KAAK,IAAI,IAAI,CAAC;CACf;AAED,UAAU,0BAA0B;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,MAAM,CAAC;CACtC;AAED,MAAM,MAAM,yBAAyB,GACjC,QAAQ,GACR,SAAS,GACT,YAAY,GACZ,SAAS,GACT,iBAAiB,GACjB,QAAQ,CAAC;AAoKb,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,yBAAyB,CAAC,CAiDpC;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,yBAAyB,CAAC,CA0BpC"}

package/dist/services/startup-config-wizard.js

@@ -1,9 +1,9 @@
 import { randomBytes } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import os from "node:os";
-import path from "node:path";
 import { stdin as input, stdout as output } from "node:process";
 import { createInterface } from "node:readline/promises";
+import { atomicWriteJsonFile } from "../utils/file-utils.js";
 import { logger } from "../utils/logger.js";
 import { getAutoRegisterConfigFilePath } from "./auto-register.js";
 function normalizeAnswer(answer) {
@@ -15,10 +15,6 @@ function isYes(answer) {
 function isNo(answer) {
     return ["n", "no", "否", "不", "跳过", "skip", "s"].includes(normalizeAnswer(answer));
 }
-function writeConfigFile(configPath, config) {
-    mkdirSync(path.dirname(configPath), { recursive: true });
-    writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf-8");
-}
 function readExistingConfig(configPath) {
     if (!existsSync(configPath)) {
         return {};
@@ -38,9 +34,12 @@ function readExistingConfig(configPath) {
 function generateDefaultConnectionKey() {
     return `awsb_${randomBytes(24).toString("base64url")}`;
 }
-function writeSkippedConfig(configPath, generateConnectionKey) {
+async function writeConfigFile(configPath, config) {
+    await atomicWriteJsonFile(configPath, config);
+}
+async function writeSkippedConfig(configPath, generateConnectionKey) {
     const connectionKey = generateConnectionKey();
-    writeConfigFile(configPath, { connectionKey });
+    await writeConfigFile(configPath, { connectionKey });
     const message = `[runtime-bridge] 已创建配置文件: ${configPath}\n` +
         `[runtime-bridge] 自动生成 connectionKey: ${connectionKey}\n` +
         "[runtime-bridge] 请保存该 connectionKey；server/面板连接此 Bridge 时需要使用它。";
@@ -115,13 +114,13 @@ export async function ensureStartupConfig(options = {}) {
     }
     const env = options.env || process.env;
     if (env.AWS_BRIDGE_SKIP_SETUP === "true") {
-        writeSkippedConfig(configPath, generateConnectionKey);
+        await writeSkippedConfig(configPath, generateConnectionKey);
         logger.info("[runtime-bridge] AWS_BRIDGE_SKIP_SETUP=true，跳过首次配置引导");
         return "skipped";
     }
     const interactive = options.interactive ?? Boolean(process.stdin.isTTY && process.stdout.isTTY);
     if (!interactive) {
-        writeSkippedConfig(configPath, generateConnectionKey);
+        await writeSkippedConfig(configPath, generateConnectionKey);
         logger.info(`[runtime-bridge] 未检测到配置文件: ${configPath}；当前为非交互环境，跳过首次配置引导`);
         return "non-interactive";
     }
@@ -129,12 +128,12 @@ export async function ensureStartupConfig(options = {}) {
     try {
         const shouldConfigure = await askShouldConfigure(prompt);
         if (!shouldConfigure) {
-            writeSkippedConfig(configPath, generateConnectionKey);
+            await writeSkippedConfig(configPath, generateConnectionKey);
             logger.info("[runtime-bridge] 已跳过首次配置引导");
             return "skipped";
         }
         const config = await collectStartupConfig(prompt);
-        writeConfigFile(configPath, config);
+        await writeConfigFile(configPath, config);
         logger.info(`[runtime-bridge] 已写入配置文件: ${configPath}`);
         return "created";
     }
@@ -160,7 +159,7 @@ export async function configureStartupConfig(options = {}) {
     try {
         const existingConfig = readExistingConfig(configPath);
         const config = await collectStartupConfig(prompt, existingConfig);
-        writeConfigFile(configPath, config);
+        await writeConfigFile(configPath, config);
         logger.info(`[runtime-bridge] 已更新配置文件: ${configPath}`);
         return "configured";
     }

package/dist/utils/file-utils.d.ts

@@ -1,7 +1,8 @@
-import type { SkillPackage, DownloadResult, Skill } from '../types.js';
 import type { AppFlags, InstalledSkill, CcSwitchSdk } from '@cc-switch/sdk';
+import type { SkillPackage, DownloadResult, Skill } from '../types.js';
 export declare function ensureDir(targetDir: string): Promise<string>;
 export declare function withFileLock<T>(targetPath: string, operation: () => Promise<T>): Promise<T>;
+export declare function stringifyStableJson(value: unknown): string;
 export declare function atomicWriteFile(targetPath: string, content: string): Promise<void>;
 export declare function atomicWriteJsonFile(targetPath: string, value: unknown): Promise<void>;
 export declare function downloadSkillZip(skillPackage: SkillPackage, targetDir: string): Promise<DownloadResult | null>;

package/dist/utils/file-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI5E,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAqBjG;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWxF;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA+ChC;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,wBAAsB,oCAAoC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASlG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAW1E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAM1D;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAyBhC"}
+{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG5E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIvE,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAqBjG;AA2BD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE1D;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBxF;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA+ChC;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,wBAAsB,oCAAoC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASlG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAW1E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAM1D;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAyBhC"}

package/dist/utils/file-utils.js

@@ -1,7 +1,7 @@
-import path from 'node:path';
 import { spawn } from 'node:child_process';
-import { promises as fs } from 'node:fs';
 import { createHash, randomUUID } from 'node:crypto';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
 import axios from 'axios';
 import { schedulerBaseUrl } from '../config.js';
 import { getRuntimeAccessToken } from '../services/runtime-binding.js';
@@ -30,16 +30,46 @@ export async function withFileLock(targetPath, operation) {
         }
     }
 }
+function isPlainObject(value) {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+}
+function sortJsonValue(value) {
+    if (Array.isArray(value)) {
+        return value.map((item) => sortJsonValue(item));
+    }
+    if (isPlainObject(value)) {
+        return Object.keys(value)
+            .sort()
+            .reduce((acc, key) => {
+            acc[key] = sortJsonValue(value[key]);
+            return acc;
+        }, {});
+    }
+    return value;
+}
+export function stringifyStableJson(value) {
+    return `${JSON.stringify(sortJsonValue(value), null, 2)}\n`;
+}
 export async function atomicWriteFile(targetPath, content) {
     await ensureDir(path.dirname(targetPath));
     const targetDir = path.dirname(targetPath);
     const targetBase = path.basename(targetPath);
     const tmpPath = path.join(targetDir, `.${targetBase}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`);
-    await fs.writeFile(tmpPath, content, 'utf-8');
-    await fs.rename(tmpPath, targetPath);
+    try {
+        await fs.writeFile(tmpPath, content, 'utf-8');
+        await fs.rename(tmpPath, targetPath);
+    }
+    catch (error) {
+        await fs.rm(tmpPath, { force: true }).catch(() => undefined);
+        throw error;
+    }
 }
 export async function atomicWriteJsonFile(targetPath, value) {
-    await atomicWriteFile(targetPath, `${JSON.stringify(value, null, 2)}\n`);
+    await atomicWriteFile(targetPath, stringifyStableJson(value));
 }
 export async function downloadSkillZip(skillPackage, targetDir) {
     if (!skillPackage || !skillPackage.downloadUrl) {

package/dist/utils/file-utils.test.js

@@ -1,8 +1,8 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import path from 'node:path';
 import { promises as fs } from 'node:fs';
 import os from 'node:os';
-import { ensureDir, escapePowerShellLiteral, resolveSkillSourceDirFromExtractRoot, toSdkAppsFromEnabledTools, resolveSkillSourceDir, } from './file-utils.js';
+import path from 'node:path';
+import { atomicWriteJsonFile, ensureDir, escapePowerShellLiteral, resolveSkillSourceDirFromExtractRoot, stringifyStableJson, toSdkAppsFromEnabledTools, resolveSkillSourceDir, } from './file-utils.js';
 // Mock axios for download tests
 vi.mock('axios', () => ({
     default: {
@@ -47,6 +47,47 @@ describe('file-utils', () => {
             expect(result).toBe(tempDir);
         });
     });
+    describe('atomicWriteJsonFile', () => {
+        const tempDir = path.join(os.tmpdir(), `aws-file-utils-json-test-${Date.now()}`);
+        afterEach(async () => {
+            await fs.rm(tempDir, { recursive: true, force: true }).catch(() => undefined);
+        });
+        it('should write stable sorted json for deterministic config files', async () => {
+            const filePath = path.join(tempDir, 'config.json');
+            await atomicWriteJsonFile(filePath, {
+                z: 1,
+                nested: { b: true, a: false },
+                array: [{ d: 4, c: 3 }],
+            });
+            expect(await fs.readFile(filePath, 'utf-8')).toBe('{\n' +
+                '  "array": [\n' +
+                '    {\n' +
+                '      "c": 3,\n' +
+                '      "d": 4\n' +
+                '    }\n' +
+                '  ],\n' +
+                '  "nested": {\n' +
+                '    "a": false,\n' +
+                '    "b": true\n' +
+                '  },\n' +
+                '  "z": 1\n' +
+                '}\n');
+        });
+    });
+    describe('stringifyStableJson', () => {
+        it('should preserve array order while sorting object keys', () => {
+            expect(stringifyStableJson([{ b: 2, a: 1 }, { d: 4, c: 3 }])).toBe('[\n' +
+                '  {\n' +
+                '    "a": 1,\n' +
+                '    "b": 2\n' +
+                '  },\n' +
+                '  {\n' +
+                '    "c": 3,\n' +
+                '    "d": 4\n' +
+                '  }\n' +
+                ']\n');
+        });
+    });
     describe('escapePowerShellLiteral', () => {
         it('should escape single quotes by doubling them', () => {
             expect(escapePowerShellLiteral("test'value")).toBe("test''value");

package/package/aws-client-agent-mcp/dist/agent-client.js

@@ -347,7 +347,10 @@ export class AgentClient {
         if (options.blockTimeoutMs && options.blockTimeoutMs > 0) {
             dmArgs.blockTimeoutMs = options.blockTimeoutMs;
         }
-        const directMessagesResponse = await this.httpClient.callTool("get_dm_messages", dmArgs);
+        const dmToolName = options.includePipelineTasks
+            ? "poll_message"
+            : "get_dm_messages";
+        const directMessagesResponse = await this.httpClient.callTool(dmToolName, dmArgs);
         const groups = await this.discoverGroupRooms();
         const roomIds = this.collectRoomIds(groups, targetProject);
         const groupMessageResponses = await Promise.all(roomIds.map(async (currentRoomId) => {