aws-runtime-bridge 1.9.57 → 1.9.60

package/dist/routes/sub-agents.js

@@ -31,10 +31,29 @@ subAgentsRouter.get("/sub-agents/:agentId", validateToken, async (req, res) => {
     }
     try {
         // 从 store 读取全部历史
-        const allRecords = await subAgentStore.list(agentId);
+        let allRecords = await subAgentStore.list(agentId);
         // 从 manager 读取活跃 entry（pending / running），已完成但未 TTL 清理的不计入
         const runningEntries = subAgentManager.listActiveByParent(agentId);
         const runningIds = new Set(runningEntries.map((e) => e.subId));
+        // 修正数据不一致：持久化记录中 status 为 running/pending 但不在内存活跃列表中的条目，
+        // 说明 store 状态未同步（如 store.updateStatus 超时失败、或 bridge 重启后 entry 丢失）。
+        // 修正为 failed 并重新读取，避免前端"历史"列表中混入异常的 running 条目。
+        let dirty = false;
+        for (const record of allRecords) {
+            if ((record.status === "running" || record.status === "pending") && !runningIds.has(record.subId)) {
+                dirty = true;
+                await subAgentStore.updateStatus(agentId, record.subId, {
+                    status: "failed",
+                    errorMessage: "sub-agent status mismatch: store says running/pending but not in memory",
+                    endedAt: record.startedAt,
+                    durationMs: 0,
+                    contextSnapshot: undefined,
+                }).catch(() => { });
+            }
+        }
+        if (dirty) {
+            allRecords = await subAgentStore.list(agentId);
+        }
         // 合并：运行中的用 manager 的实时状态覆盖 store 的记录
         const running = runningEntries.map((e) => ({
             subId: e.subId,
@@ -203,10 +222,10 @@ subAgentsRouter.get("/sub-agents/:agentId/:subId/events", validateToken, async (
         "X-Accel-Buffering": "no", // nginx 关闭缓冲
     });
     res.write(": connected\n\n");
-    // 1. 补发历史 tool 事件（从 store 读取，按时间升序）
+    // 1. 补发历史 tool 事件（从独立 jsonl 事件文件读取，按时间升序）
+    //    事件文件与主记录文件分离，避免高频 appendEvent 阻塞终态 updateStatus
     try {
-        const record = await subAgentStore.get(agentId, subId);
-        const historyEvents = record?.events ?? [];
+        const historyEvents = await subAgentStore.readEvents(agentId, subId);
         for (const ev of historyEvents) {
             res.write(`data: ${JSON.stringify(ev)}\n\n`);
         }

package/package/acode/dist/fs-utils.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 对 `fs.rename` 做指数退避重试，仅针对 Windows 上目标被打开时
+ * 的瞬时错误（EPERM/EBUSY/EACCES/ENOTEMPTY）。
+ *
+ * 其他错误（ENOENT 源不存在、ENOSPC 磁盘满等）直接抛出，不重试。
+ *
+ * @param src 源文件路径（通常是 `.tmp` 临时文件）
+ * @param dest 目标文件路径
+ * @returns 成功时 resolve，全部重试都失败时 reject 最后一次错误
+ */
+export declare function renameWithRetry(src: string, dest: string): Promise<void>;
+//# sourceMappingURL=fs-utils.d.ts.map

package/package/acode/dist/fs-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fs-utils.d.ts","sourceRoot":"","sources":["../src/fs-utils.ts"],"names":[],"mappings":"AA6BA;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB9E"}

package/package/acode/dist/fs-utils.js

@@ -0,0 +1,58 @@
+import { promises as fs } from "node:fs";
+/**
+ * 文件系统原子写入相关的辅助工具。
+ *
+ * 主要解决 Windows 上 `fs.rename` 在目标文件被其他进程/句柄打开时
+ * 抛出 EPERM/EBUSY/EACCES 的问题（POSIX 上 rename 是真原子的，
+ * 不会触发此类错误）。这些错误通常是瞬时的——等 reader 释放 fd
+ * 后重试即可成功。
+ *
+ * 不引入 fs-ext/native 依赖，纯 JS 退避重试实现。
+ */
+/**
+ * 视为可重试的瞬时错误码。
+ *
+ * - EPERM: Windows 上目标被另一进程打开时 rename 常见错误
+ * - EBUSY: 资源忙（Linux/Windows 均可能出现）
+ * - EACCES: 权限瞬时不可用（如杀软扫描中）
+ * - ENOTEMPTY: 极少数情况下 rename 目标存在残留
+ */
+const RENAME_RETRYABLE_CODES = ["EPERM", "EBUSY", "EACCES", "ENOTEMPTY"];
+/**
+ * 退避序列（毫秒）。总退避 ≈ 50+150+400+800 = 1400ms，
+ * 留充足余量给 5s 的 STORE_WRITE_TIMEOUT_MS。
+ */
+const RENAME_BACKOFF_MS = [50, 150, 400, 800];
+/**
+ * 对 `fs.rename` 做指数退避重试，仅针对 Windows 上目标被打开时
+ * 的瞬时错误（EPERM/EBUSY/EACCES/ENOTEMPTY）。
+ *
+ * 其他错误（ENOENT 源不存在、ENOSPC 磁盘满等）直接抛出，不重试。
+ *
+ * @param src 源文件路径（通常是 `.tmp` 临时文件）
+ * @param dest 目标文件路径
+ * @returns 成功时 resolve，全部重试都失败时 reject 最后一次错误
+ */
+export async function renameWithRetry(src, dest) {
+    let lastErr;
+    // 尝试次数 = 1（初始）+ RENAME_BACKOFF_MS.length（重试）
+    const maxAttempts = 1 + RENAME_BACKOFF_MS.length;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+            await fs.rename(src, dest);
+            return;
+        }
+        catch (err) {
+            lastErr = err;
+            const code = err?.code ?? "";
+            if (!RENAME_RETRYABLE_CODES.includes(code)) {
+                // 非瞬时错误，直接抛出避免无谓重试
+                throw err;
+            }
+            if (attempt < RENAME_BACKOFF_MS.length) {
+                await new Promise((r) => setTimeout(r, RENAME_BACKOFF_MS[attempt]));
+            }
+        }
+    }
+    throw lastErr;
+}

package/package/acode/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}

package/package/acode/dist/runtime.js

@@ -105,6 +105,24 @@ const SUB_AGENT_ALLOWED_MCP_TOOLS = new Set([
     "memory_recurrence",
     "memory_recurrence_complete",
 ]);
+/**
+ * explore 类型 sub-agent 被禁用的内建工具（只读模式黑名单）。
+ *
+ * 'explore' 语义上不修改主工作区文件，仅用于代码探索 / memory 整理等只读任务。
+ * 此处过滤直接写工作区文件的内建工具：
+ *   - write_file / edit_file / delete_file：直接写工作区文件
+ *
+ * Bash 保留：只读探索常用（git diff / git log / ripgrep 高级查询等），
+ *   风险由工具内部的 workingDirectory 限制 + 用户授权流程管控。
+ *
+ * read_file / grep / symbols / Bash / ask_user_question / skill / todo_* 等只读工具保留。
+ * MCP 工具白名单由 SUB_AGENT_ALLOWED_MCP_TOOLS 独立施加，此处不重复。
+ */
+const EXPLORE_READONLY_DENIED_TOOLS = new Set([
+    "write_file",
+    "edit_file",
+    "delete_file",
+]);
 const DEFAULT_BASH_BUILT_IN_TOOL_TIMEOUT_MS = 10 * 60_000 + 2000;
 const DEFAULT_RUNTIME_SHUTDOWN_TIMEOUT_MS = 10_000;
 /**
@@ -1172,6 +1190,15 @@ export class ACodeRuntime extends EventEmitter {
             ...subAgentTools,
             ...mcpConnections.flatMap((connection) => connection.tools),
         ];
+        // ★ explore 类型 sub-agent 只读模式：过滤掉会修改主工作区文件的内建工具。
+        //   'explore' 语义上不修改主工作区文件（见 SubAgentManager.spawn 注释），
+        //   原设计仅靠 SUB_AGENT_ALLOWED_MCP_TOOLS 白名单限制 MCP 工具，
+        //   内建工具（write_file/edit_file/delete_file）未被过滤，
+        //   导致 explore 子 agent 仍能改写工作区文件，违背只读语义。
+        //   Bash 保留：只读探索常用（git diff/log 等）。
+        const filteredExposedTools = this.config.subagentType === "explore"
+            ? exposedTools.filter((tool) => !EXPLORE_READONLY_DENIED_TOOLS.has(tool.exposedName))
+            : exposedTools;
         const commandDirs = this.resolveCommandDirs(acodeConfig);
         this.emitAcodeEvent("startup_phase", { phase: "loading_commands" });
         const commands = await loadAcodeCommands(commandDirs);
@@ -1214,7 +1241,7 @@ export class ACodeRuntime extends EventEmitter {
             permissions,
             mcpConnections,
             ownsMcpConnections,
-            exposedTools,
+            exposedTools: filteredExposedTools,
             commands,
             commandRegistry,
             conversation: cloneChatConversation(initialConversation),
@@ -1236,7 +1263,7 @@ export class ACodeRuntime extends EventEmitter {
             workingDirectory: this.config.workingDirectory,
             model: provider.model,
             commandCount: commands.length,
-            estimatedContextTokens: estimateContextTokens(systemMessagesPlainText, exposedTools),
+            estimatedContextTokens: estimateContextTokens(systemMessagesPlainText, filteredExposedTools),
             contextLimit: compactionConfig.contextLimit,
             maxOutput: compactionConfig.maxOutput,
             ...(compactionConfig.inputLimit !== undefined
@@ -1250,11 +1277,11 @@ export class ACodeRuntime extends EventEmitter {
             servers: Object.keys(acodeConfig.mcpServers ?? {}),
             connectedCount: mcpConnections.length,
             builtInToolCount: builtInTools.length,
-            toolCount: exposedTools.length,
+            toolCount: filteredExposedTools.length,
             permissionMode: permissions.mode,
             allowedToolRules: permissions.allow,
             deniedToolRules: permissions.deny,
-            tools: exposedTools.map((tool) => ({
+            tools: filteredExposedTools.map((tool) => ({
                 name: tool.exposedName,
                 source: tool.kind === "mcp"
                     ? `${tool.serverName}.${tool.toolName}`
@@ -3148,13 +3175,34 @@ ${urisText}
         return `你是一条专门处理永久记忆文件变更更新的子 agent。
 
 以下 ${delegate.uris.length} 个永久记忆绑定的文件已发生变更：
-${urisText}
+${delegate.uris.map(uri => {
+            const fc = delegate.fileChanges?.find(f => f.uri === uri);
+            if (!fc) {
+                return `- ${uri}`;
+            }
+            const statusLabel = {
+                no_change: '无变更',
+                content_changed: '内容变更',
+                not_found: '文件找不到',
+            };
+            // 逐文件状态：优先用 fileStatuses（含被删除文件），回退到 boundFiles 清单
+            const fileStatuses = fc.fileStatuses && fc.fileStatuses.length > 0 ? fc.fileStatuses : [];
+            // 展示全部绑定文件：无变更的仅列路径不加标注，内容变更/文件找不到的在路径后标注状态
+            const bound = fileStatuses.length > 0
+                ? fileStatuses.map(s => s.status === 'no_change'
+                    ? `    · ${s.path}`
+                    : `    · ${s.path}（${statusLabel[s.status] ?? s.status}）`).join('\n')
+                : (fc.boundFiles && fc.boundFiles.length > 0
+                    ? fc.boundFiles.map(f => `    · ${f}`).join('\n')
+                    : '    无（请通过 read_memory 查看 bound_files）');
+            return `- ${uri}\n  - 绑定文件:\n${bound}`;
+        }).join('\n')}
 
 请执行以下步骤（核心逻辑：更新 → 验证 → 未完成则继续）：
 
 === 更新阶段 ===
-1. 调用 read_memory 读取这些 memory 的当前内容
-2. 查看相关绑定文件的最新内容（bound_files 中列出），理解变更点
+1. 调用 read_memory 读取这些 memory 的当前内容（上方已列出每个 memory 的绑定文件，有变更/找不到的已在路径后标注状态，可直接定位读取，无需等待 read_memory 返回 bound_files）
+2. 重点查看带（内容变更）/（文件找不到）标注的绑定文件，理解变更点；若列出的绑定文件均无标注，则表示本轮均无变更，可调用 read_memory 核对确认
 3. 调用 update_memory 更新 memory 内容，确保与文件最新状态同步
 
 === 验证阶段（关键，不可跳过） ===
@@ -3222,15 +3270,26 @@ ${urisText}
                     continue;
                 }
                 // 用过滤后的 URI 构造 prompt
+                // 若 delegate 携带了 fileChanges（memory_file_change 类型），同步过滤到 newUris，
+                // 让子 agent 无需先 read_memory 即可知晓每个 memory 绑定/变更了哪些文件。
+                const filteredFileChanges = Array.isArray(delegate.fileChanges)
+                    ? delegate.fileChanges.filter(fc => newUris.includes(fc.uri))
+                    : undefined;
                 const prompt = this.buildMemoryDelegatePrompt({
                     type: delegate.type,
                     uris: newUris,
+                    fileChanges: filteredFileChanges,
                 });
                 try {
                     const subId = await manager.spawn({
                         parentAgentId: this.config.agentId || 'unknown',
                         parentSessionId: this.config.sessionId,
-                        subagentType: 'general',
+                        // 使用只读类型 'explore'：
+                        //   - MCP 工具由 SUB_AGENT_ALLOWED_MCP_TOOLS 白名单施加（仅 memory 工具）
+                        //   - 内建工具由 runtime.start() 的 EXPLORE_READONLY_DENIED_TOOLS
+                        //     黑名单过滤（禁用 write_file/edit_file/delete_file，保留 Bash 用于 git diff 等）
+                        // 'explore' 语义上表示该子 agent 不修改主工作区文件，仅处理 memory 整理任务。
+                        subagentType: 'explore',
                         description: `Memory ${delegate.type} auto-delegate (${newUris.length} items)`,
                         prompt,
                         workingDirectory: this.config.workingDirectory,

package/package/acode/dist/sub-agent-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sub-agent-manager.d.ts","sourceRoot":"","sources":["../src/sub-agent-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sub-agent-manager.d.ts","sourceRoot":"","sources":["../src/sub-agent-manager.ts"],"names":[],"mappings":"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"}

package/package/acode/dist/sub-agent-manager.js

@@ -14,13 +14,22 @@ const SUBAGENT_PENDING_ZOMBIE_MS = 2 * 60 * 1000;
  * 正常 LLM 子任务即便较长也应有上界；卡死多因 runtime.start()/submit() 挂起
  * （如复用的父 MCP 连接异常、模型调用无响应），需回收以释放资源并解除锁。
  *
- * ★ 曾为 30min，但实际现象：子 agent 卡死时前端 modal 长时间显示"运行中 + 0消息 + 0tokens"，
- *   且 pendingMemorySubAgents URI 锁会持续抑制该 memory 的重新委托，加上 10min 冷却
- *   总卡顿可达 30~45min。缩到 5min：自动 memory 委托是后台任务，5min 足够覆盖
- *   正常 LLM 子任务（通常 30s~2min），更长时间无终态基本可判定为卡死。
- *   task 工具显式调用的 sub-agent 不走此自动路径，不受影响。
+ * ★ 设为 12min（> SUBAGENT_SUBMIT_TIMEOUT_MS=10min）：
+ *   - 子 agent 卡死时，submit() 10min 超时会先触发，给出明确的错误信息
+ *     （如 "runtime.submit() turn=1 timed out after 600000ms"）
+ *   - zombie 兜底覆盖 submit 内部无超时保护的步骤（如 hookBus.dispatch）
+ *   - 之前 5min 比 submit 10min 更早触发，导致用户永远看不到真正的 submit 超时错误
+ *   - task 工具显式调用的 sub-agent 不走此自动路径，不受影响
  */
-const SUBAGENT_RUNNING_ZOMBIE_MS = 5 * 60 * 1000;
+const SUBAGENT_RUNNING_ZOMBIE_MS = 12 * 60 * 1000;
+/**
+ * store 写入超时兜底（毫秒）。
+ * SubAgentStore.write 使用 writeChain 串行化所有文件写入，若前一个 write 卡住
+ * （磁盘 IO 慢、tmp 文件 rename 卡住、文件系统问题等），后续所有 write 都会
+ * 被永久阻塞，导致 sub-agent 卡在 store.updateStatus 处无法继续 start()。
+ * 5s 超时足够覆盖正常文件 IO（通常 < 100ms），超时后放弃落盘（不影响内存态）。
+ */
+const STORE_WRITE_TIMEOUT_MS = 5_000;
 /**
  * 子 agent runtime.start() 整体超时兜底（毫秒）。
  * start() 内部正常路径秒级完成（loadSkills/resolveProvider/filterMcp/fetchProfile/emitStatus），
@@ -112,6 +121,10 @@ export class SubAgentManager {
             initialPrompt: undefined,
             // sub-agent 不允许再 spawn 自己的子 agent（禁止递归嵌套）
             subAgentManager: undefined,
+            // ★ 注入 subagentType：runtime.start() 据此过滤内建写入工具。
+            //   explore 类型仅暴露只读工具（read_file/grep/symbols 等），
+            //   防止 explore 子 agent 改写主工作区文件，违背只读语义。
+            subagentType: opts.subagentType,
             // Sub Agent 模型/强度覆盖：有值则覆盖继承的 model/effort
             ...(opts.parentConfig.subAgentModel
                 ? { model: opts.parentConfig.subAgentModel }
@@ -334,10 +347,24 @@ export class SubAgentManager {
             }
         };
         entry.runtime.on("event", onEvent);
-        // 状态 -> running
+        // ★ 状态 -> running：先同步设置 + emit + currentTool 标记，再异步落盘。
+        //   之前顺序是 status=running → await store.updateStatus → emit running，
+        //   若 store.updateStatus 因 writeChain 串行化卡住（前一个 write 卡死），
+        //   emit running 不会执行，start() 也不会被调用，前端 modal 永远显示
+        //   初始 snapshot（0消息 0tokens 当前工具-），与"从未运行"无法区分。
+        //   调整顺序后即使落盘卡住，前端也能立即看到 [starting] 标记。
         entry.status = "running";
-        await this.store.updateStatus(entry.parentAgentId, entry.subId, { status: "running" });
-        this.emitEvent(entry.subId, "running", {});
+        entry.contextSnapshot.currentTool = "[starting]";
+        entry.contextSnapshot.updatedAt = new Date().toISOString();
+        this.emitEvent(entry.subId, "running", { snapshot: { ...entry.contextSnapshot } });
+        // 落盘带超时保护：writeChain 串行化可能卡住，超时后放弃落盘（不影响内存态）
+        try {
+            await withTimeout(this.store.updateStatus(entry.parentAgentId, entry.subId, { status: "running" }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${entry.subId} store.updateStatus(running)`);
+        }
+        catch (err) {
+            console.error(`[SubAgentManager] store.updateStatus(running) failed for subId=${entry.subId}: ` +
+                `${err instanceof Error ? err.message : String(err)}`);
+        }
         try {
             await entry.runtime.start();
             // 记录启动后的可用工具列表
@@ -353,14 +380,31 @@ export class SubAgentManager {
             entry.result = output;
             entry.endedAt = Date.now();
             entry.durationMs = entry.endedAt - entry.startedAt;
-            await this.store.updateStatus(entry.parentAgentId, entry.subId, {
-                status: "completed",
-                result: output,
-                endedAt: entry.endedAt,
-                durationMs: entry.durationMs,
-                contextSnapshot: undefined, // 完成后清空快照
-            });
+            // ★ emit 前置：先把 completed 事件发出，让前端 modal 立即看到状态变化
+            //   （subscribers 同步执行，SSE 路由立即推送）。
             this.emitEvent(entry.subId, "completed", { result: output });
+            // ★ store.updateStatus 必须在 completionResolve 之前：否则 awaitCompletion 在
+            //   resolve 后立即调 store.get 读文件，会与 store.updateStatus 的 fs.rename
+            //   并发，Windows 上 fs.rename 因 target 被打开而抛 EPERM，导致 store
+            //   永远写不进 completed 状态。
+            try {
+                await withTimeout(this.store.updateStatus(entry.parentAgentId, entry.subId, {
+                    status: "completed",
+                    result: output,
+                    endedAt: entry.endedAt,
+                    durationMs: entry.durationMs,
+                    // ★ 持久化 availableTools：start() 后才填充，必须随终态落盘，
+                    //   否则 entry 从内存清理后 store 永远是 spawn 时的空数组，
+                    //   前端 modal "可用工具" tab 始终显示"暂无工具信息"。
+                    availableTools: entry.availableTools,
+                    contextSnapshot: undefined, // 完成后清空快照
+                }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${entry.subId} store.updateStatus(completed)`);
+            }
+            catch (storeErr) {
+                console.error(`[SubAgentManager] store.updateStatus(completed) failed for subId=${entry.subId}: ` +
+                    `${storeErr instanceof Error ? storeErr.message : String(storeErr)}`);
+            }
+            // 持久化完成（或超时放弃）后，settle completionPromise + 入队通知
             entry.completionResolve?.({ output });
             this.enqueueCompletion(entry, output, undefined);
         }
@@ -370,14 +414,22 @@ export class SubAgentManager {
             entry.errorMessage = errorMessage;
             entry.endedAt = Date.now();
             entry.durationMs = entry.endedAt - entry.startedAt;
-            await this.store.updateStatus(entry.parentAgentId, entry.subId, {
-                status: "failed",
-                errorMessage,
-                endedAt: entry.endedAt,
-                durationMs: entry.durationMs,
-                contextSnapshot: undefined,
-            });
+            // ★ emit 前置 + store 超时保护（同 completed 路径的设计理由）
             this.emitEvent(entry.subId, "failed", { error: errorMessage });
+            try {
+                await withTimeout(this.store.updateStatus(entry.parentAgentId, entry.subId, {
+                    status: "failed",
+                    errorMessage,
+                    endedAt: entry.endedAt,
+                    durationMs: entry.durationMs,
+                    availableTools: entry.availableTools,
+                    contextSnapshot: undefined,
+                }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${entry.subId} store.updateStatus(failed)`);
+            }
+            catch (storeErr) {
+                console.error(`[SubAgentManager] store.updateStatus(failed) failed for subId=${entry.subId}: ` +
+                    `${storeErr instanceof Error ? storeErr.message : String(storeErr)}`);
+            }
             entry.completionResolve?.({ output: "", error: errorMessage });
             this.enqueueCompletion(entry, "", errorMessage);
         }
@@ -436,10 +488,24 @@ export class SubAgentManager {
             }
         };
         entry.runtime.on("event", onEvent);
-        // 状态 -> running
+        // ★ 状态 -> running：先同步设置 + emit + currentTool 标记，再异步落盘。
+        //   之前顺序是 status=running → await store.updateStatus → emit running，
+        //   若 store.updateStatus 因 writeChain 串行化卡住（前一个 write 卡死），
+        //   emit running 不会执行，start() 也不会被调用，前端 modal 永远显示
+        //   初始 snapshot（0消息 0tokens 当前工具-），与"从未运行"无法区分。
+        //   调整顺序后即使落盘卡住，前端也能立即看到 [starting] 标记。
         entry.status = "running";
-        await this.store.updateStatus(entry.parentAgentId, entry.subId, { status: "running" });
-        this.emitEvent(entry.subId, "running", {});
+        entry.contextSnapshot.currentTool = "[starting]";
+        entry.contextSnapshot.updatedAt = new Date().toISOString();
+        this.emitEvent(entry.subId, "running", { snapshot: { ...entry.contextSnapshot } });
+        // 落盘带超时保护：writeChain 串行化可能卡住，超时后放弃落盘（不影响内存态）
+        try {
+            await withTimeout(this.store.updateStatus(entry.parentAgentId, entry.subId, { status: "running" }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${entry.subId} store.updateStatus(running)`);
+        }
+        catch (err) {
+            console.error(`[SubAgentManager] store.updateStatus(running) failed for subId=${entry.subId}: ` +
+                `${err instanceof Error ? err.message : String(err)}`);
+        }
         try {
             // ★ 超时兜底：start() 通常秒级完成，超时说明卡在 hookBus/fetchProfile/loadCommands
             //   等无超时保护的步骤。抛错后被外层 catch 标记为 failed，前端可见。
@@ -498,14 +564,24 @@ export class SubAgentManager {
             entry.result = output;
             entry.endedAt = Date.now();
             entry.durationMs = entry.endedAt - entry.startedAt;
-            await this.store.updateStatus(entry.parentAgentId, entry.subId, {
-                status: "completed",
-                result: output,
-                endedAt: entry.endedAt,
-                durationMs: entry.durationMs,
-                contextSnapshot: undefined,
-            });
+            // ★ emit 前置 + store 超时保护 + completionResolve 在 store 之后
+            //   （设计理由同 runEntryToCompletion，避免 awaitCompletion 读 store
+            //   与 store.updateStatus 的 fs.rename 并发触发 Windows EPERM）
             this.emitEvent(entry.subId, "completed", { result: output });
+            try {
+                await withTimeout(this.store.updateStatus(entry.parentAgentId, entry.subId, {
+                    status: "completed",
+                    result: output,
+                    endedAt: entry.endedAt,
+                    durationMs: entry.durationMs,
+                    availableTools: entry.availableTools,
+                    contextSnapshot: undefined,
+                }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${entry.subId} store.updateStatus(completed)`);
+            }
+            catch (storeErr) {
+                console.error(`[SubAgentManager] store.updateStatus(completed) failed for subId=${entry.subId}: ` +
+                    `${storeErr instanceof Error ? storeErr.message : String(storeErr)}`);
+            }
             entry.completionResolve?.({ output });
             this.enqueueCompletion(entry, output, undefined);
         }
@@ -515,14 +591,22 @@ export class SubAgentManager {
             entry.errorMessage = errorMessage;
             entry.endedAt = Date.now();
             entry.durationMs = entry.endedAt - entry.startedAt;
-            await this.store.updateStatus(entry.parentAgentId, entry.subId, {
-                status: "failed",
-                errorMessage,
-                endedAt: entry.endedAt,
-                durationMs: entry.durationMs,
-                contextSnapshot: undefined,
-            });
+            // ★ emit 前置 + store 超时保护（同 completed 路径的设计理由）
             this.emitEvent(entry.subId, "failed", { error: errorMessage });
+            try {
+                await withTimeout(this.store.updateStatus(entry.parentAgentId, entry.subId, {
+                    status: "failed",
+                    errorMessage,
+                    endedAt: entry.endedAt,
+                    durationMs: entry.durationMs,
+                    availableTools: entry.availableTools,
+                    contextSnapshot: undefined,
+                }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${entry.subId} store.updateStatus(failed)`);
+            }
+            catch (storeErr) {
+                console.error(`[SubAgentManager] store.updateStatus(failed) failed for subId=${entry.subId}: ` +
+                    `${storeErr instanceof Error ? storeErr.message : String(storeErr)}`);
+            }
             entry.completionResolve?.({ output: "", error: errorMessage });
             this.enqueueCompletion(entry, "", errorMessage);
         }
@@ -580,13 +664,22 @@ export class SubAgentManager {
         entry.status = "cancelled";
         entry.endedAt = Date.now();
         entry.durationMs = entry.endedAt - entry.startedAt;
-        await this.store.updateStatus(entry.parentAgentId, subId, {
-            status: "cancelled",
-            endedAt: entry.endedAt,
-            durationMs: entry.durationMs,
-            contextSnapshot: undefined,
-        });
+        // ★ emit 前置 + store 超时保护 + completionResolve 在 store 之后
+        //   （设计理由同 completed 路径，避免 abort 调用方读 store 与 fs.rename 并发 EPERM）
         this.emitEvent(subId, "cancelled", {});
+        try {
+            await withTimeout(this.store.updateStatus(entry.parentAgentId, subId, {
+                status: "cancelled",
+                endedAt: entry.endedAt,
+                durationMs: entry.durationMs,
+                availableTools: entry.availableTools,
+                contextSnapshot: undefined,
+            }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${subId} store.updateStatus(cancelled)`);
+        }
+        catch (storeErr) {
+            console.error(`[SubAgentManager] store.updateStatus(cancelled) failed for subId=${subId}: ` +
+                `${storeErr instanceof Error ? storeErr.message : String(storeErr)}`);
+        }
         // settle completionPromise（cancelled 视为 error）
         entry.completionResolve?.({ output: "", error: "aborted" });
         this.enqueueCompletion(entry, "", "aborted");
@@ -782,19 +875,24 @@ export class SubAgentManager {
         entry.errorMessage = errorMessage;
         entry.endedAt = Date.now();
         entry.durationMs = entry.endedAt - entry.startedAt;
+        // ★ emit 前置 + store 超时保护 + completionResolve 在 store 之后
+        //   （与其他终态路径保持一致，zombie 回收路径若 writeChain 卡住，
+        //   也应保证 runtime 收到 failed 事件从而释放 pendingMemorySubAgents URI 锁）
+        this.emitEvent(entry.subId, "failed", { error: errorMessage });
         try {
-            await this.store.updateStatus(entry.parentAgentId, entry.subId, {
+            await withTimeout(this.store.updateStatus(entry.parentAgentId, entry.subId, {
                 status: "failed",
                 errorMessage,
                 endedAt: entry.endedAt,
                 durationMs: entry.durationMs,
+                availableTools: entry.availableTools,
                 contextSnapshot: undefined,
-            });
+            }), STORE_WRITE_TIMEOUT_MS, `sub-agent ${entry.subId} store.updateStatus(zombie-failed)`);
         }
-        catch {
-            /* 落盘失败不影响内存态与事件通知 */
+        catch (storeErr) {
+            console.error(`[SubAgentManager] store.updateStatus(zombie-failed) failed for subId=${entry.subId}: ` +
+                `${storeErr instanceof Error ? storeErr.message : String(storeErr)}`);
         }
-        this.emitEvent(entry.subId, "failed", { error: errorMessage });
         entry.completionResolve?.({ output: "", error: errorMessage });
         this.enqueueCompletion(entry, "", errorMessage);
         try {