neoctl 0.2.30 → 0.2.32

package/README.md

@@ -262,10 +262,10 @@ REPL 当前注册的内置工具：
 
 ### 命令执行
 
-`exec_command` 根据平台和 `shell` 参数选择 PowerShell、cmd、bash 或 sh。命令启动后持续收集输出；首次等待期内结束则直接返回，仍在运行则返回 `session_id`，进程不会依赖当前模型轮次存活。
+`exec_command` 根据平台和 `shell` 参数选择 PowerShell、cmd、bash 或 sh。命令启动后持续收集输出；首次等待期内结束则直接返回，仍在运行则返回 `session_id`，进程不会依赖当前模型轮次存活。`timeout_ms` 约束命令进入后台前的前台阶段；一旦命令让出成为后台终端，超时计时器会被清除，任务将持续运行到自行退出、显式停止或宿主进程关闭。
 
 - `workdir`：命令工作目录。
-- `timeout_ms`：进程总生命周期上限。
+- `timeout_ms`：命令进入后台前的前台阶段超时上限；后台任务不设自动超时。
 - `yield_time_ms`：首次等待时间；到期后将仍在运行的命令交还为后台终端。
 - `max_output_chars`：分别限制每次待读取的 stdout/stderr，超限时保留开头和结尾。
 - `tty=true`：通过 PTY/ConPTY 运行需要真实终端语义的交互程序。
@@ -286,7 +286,7 @@ REPL 当前注册的内置工具：
 压缩实现位于 `src/context/compaction.ts`：
 
 - `DeterministicCompactor` 提供可预测的 snip、microcompact、summary fallback。
-- 默认运行时使用 `ManualOnlyCompactor`，仅保留 manual compact 和 pure compact；显式注入其它 `Compactor` 时仍可用于测试或定制策略。
+- 默认运行时使用 `ModelDrivenCompactor`：达到上下文窗口阈值时主动压缩，模型返回上下文超限错误时执行响应式压缩并重试；如需仅允许手动压缩，可显式注入 `ManualOnlyCompactor`。
 - 当工具结果过大时，session 模式下 `FileToolResultMemory` 会把完整结果写入文件，仅把预览和路径留在上下文中。
 
 ## 会话持久化
@@ -406,6 +406,40 @@ const canUseTool = createSkillAwareCanUseTool(skills, parentCanUseTool);
 
 建议：开放 `skill_create`/`skill_update` 给模型时保持 approval；对 remote/plugin skill 使用只读 root；生产环境使用 `createSkillAwareCanUseTool()` 或父级权限系统强制 `allowedTools`。
 
+## 插件协议
+
+Core 提供 `neo-plugin/v1` 目录资源协议和 `loadNeoPlugins()` 动态加载器。Core 只定义协议、校验并加载资源，不内置任何外部插件实现。
+
+一个插件根目录可以包含多个直接子目录；每个插件目录必须包含 `neo-plugin.json`：
+
+```json
+{
+  "protocol": "neo-plugin/v1",
+  "id": "example",
+  "name": "Example",
+  "version": "1.0.0",
+  "entry": "index.mjs",
+  "defaultEnabled": true
+}
+```
+
+入口模块导出 `createPlugin(context)` 或默认工厂函数，返回以下能力之一或多项：
+
+- `tools`: 符合 Core `Tool` 协议的工具数组。
+- `promptSections`: 符合 `PromptSection` 协议的系统提示词段。
+- `route(req, res, url, helpers)`: 由嵌入后台托管的 HTTP 路由处理器。
+
+```ts
+import { loadNeoPlugins } from "neoctl";
+
+const plugins = await loadNeoPlugins({
+  directories: "/absolute/path/to/plugins",
+  appDataDir: "/absolute/path/to/app-data",
+});
+```
+
+加载器会校验清单版本、插件 id、入口边界、工具/提示词结构、插件 id 冲突和工具名冲突；不存在的插件根目录视为空目录。
+
 ## 作为库使用
 
 包入口会导出核心 agent 编排运行时、模型网关、上下文管理、任务/子代理、工具系统、session 与 safety 边界：

package/dist/agents/agent-activity.d.ts

@@ -34,6 +34,7 @@ export interface AgentActivity {
     totalEvents: number;
     totalToolUseCount: number;
     totalTokens?: number;
+    activeTools?: Record<string, AgentToolActivity>;
     currentTool?: AgentToolActivity;
     timeline: AgentTimelineEntry[];
     lastText?: string;
@@ -63,6 +64,8 @@ export declare class AgentActivityStore {
     private recordMessageBlocks;
     private recordToolStarted;
     private recordToolFinished;
+    private removeActiveTool;
+    private refreshCurrentTool;
     private recordUsage;
     private push;
     private notify;

package/dist/agents/agent-activity.js

@@ -32,6 +32,8 @@ export class AgentActivityStore {
             totalEvents: existing?.totalEvents ?? 0,
             totalToolUseCount: existing?.totalToolUseCount ?? 0,
             totalTokens: existing?.totalTokens,
+            activeTools: {},
+            currentTool: undefined,
             timeline: existing?.timeline ?? [],
             lastText: existing?.lastText,
             resultPreview: undefined,
@@ -57,9 +59,18 @@ export class AgentActivityStore {
         else if (event.type === "tool.started") {
             this.recordToolStarted(activity, event.toolUse);
         }
-        else if (event.type === "tool.finished") {
+        else if (event.type === "tool.progress") {
+            const active = activity.activeTools?.[event.toolUse.id];
+            if (active)
+                active.inputPreview = previewText(event.progress.message);
+            this.refreshCurrentTool(activity);
+        }
+        else if (event.type === "tool.result.available") {
             this.recordToolFinished(activity, event.toolUse, event.ok);
         }
+        else if (event.type === "tool.finished") {
+            this.removeActiveTool(activity, event.toolUse.id);
+        }
         else if (event.type === "usage") {
             this.recordUsage(activity, event.usage);
         }
@@ -86,6 +97,7 @@ export class AgentActivityStore {
         activity.totalTokens = result.total_tokens ?? activity.totalTokens;
         activity.totalToolUseCount = result.total_tool_use_count || activity.totalToolUseCount;
         activity.resultPreview = previewText(result.content);
+        activity.activeTools = {};
         activity.currentTool = undefined;
         this.push(activity, { kind: "status", title: "completed", detail: activity.resultPreview, status: "ok" });
         this.activities.set(agentId, activity);
@@ -99,6 +111,7 @@ export class AgentActivityStore {
         activity.error = error;
         activity.completedAt = new Date().toISOString();
         activity.updatedAt = activity.completedAt;
+        activity.activeTools = {};
         activity.currentTool = undefined;
         this.push(activity, { kind: "error", title: status, detail: error, status: "failed" });
         this.activities.set(agentId, activity);
@@ -123,7 +136,7 @@ export class AgentActivityStore {
             }
             else if (block.type === "tool_use") {
                 // Some providers surface tool_use only as a message block. Avoid double-counting if tool.started already ran.
-                if (activity.currentTool?.id !== block.id)
+                if (!activity.activeTools?.[block.id])
                     this.recordToolStarted(activity, block);
             }
             else if (block.type === "tool_result") {
@@ -137,23 +150,26 @@ export class AgentActivityStore {
         }
     }
     recordToolStarted(activity, toolUse) {
+        if (activity.activeTools?.[toolUse.id])
+            return;
         activity.totalToolUseCount += 1;
-        activity.currentTool = {
+        const tool = {
             id: toolUse.id,
             name: toolUse.name,
             inputPreview: previewValue(toolUse.input),
             startedAt: new Date().toISOString(),
         };
+        activity.activeTools = { ...(activity.activeTools ?? {}), [toolUse.id]: tool };
+        this.refreshCurrentTool(activity);
         this.push(activity, {
             kind: "tool_start",
             title: toolUse.name,
-            detail: activity.currentTool.inputPreview,
+            detail: tool.inputPreview,
             status: "running",
         });
     }
     recordToolFinished(activity, toolUse, ok) {
-        if (activity.currentTool?.id === toolUse.id)
-            activity.currentTool = undefined;
+        this.removeActiveTool(activity, toolUse.id);
         this.push(activity, {
             kind: "tool_result",
             title: `${toolUse.name} ${ok ? "finished" : "failed"}`,
@@ -161,6 +177,17 @@ export class AgentActivityStore {
             status: ok ? "ok" : "failed",
         });
     }
+    removeActiveTool(activity, toolUseId) {
+        if (!activity.activeTools?.[toolUseId])
+            return;
+        const activeTools = { ...activity.activeTools };
+        delete activeTools[toolUseId];
+        activity.activeTools = activeTools;
+        this.refreshCurrentTool(activity);
+    }
+    refreshCurrentTool(activity) {
+        activity.currentTool = Object.values(activity.activeTools ?? {}).sort((left, right) => right.startedAt.localeCompare(left.startedAt))[0];
+    }
     recordUsage(activity, usage) {
         activity.totalTokens = usage.totalTokens ?? activity.totalTokens;
     }

package/dist/agents/agent-activity.js.map

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

package/dist/agents/agent-definition.d.ts

@@ -20,9 +20,9 @@ export interface AgentDefinition {
     memory?: "user" | "project" | "local";
     isolation?: AgentIsolation;
     omitProjectMemory?: boolean;
-    /** Require an authoritative final result via agent_report instead of normal assistant text. */
+    /** Require an authoritative final result via subagent_report instead of normal assistant text. */
     requiresReport?: boolean;
-    /** Report tool name used when requiresReport is enabled. Defaults to agent_report. */
+    /** Report tool name used when requiresReport is enabled. Defaults to subagent_report. */
     reportToolName?: string;
     /** Number of extra short turns allowed to recover a missing report. */
     reportRetryTurns?: number;

package/dist/agents/agent-definition.js

@@ -3,7 +3,7 @@ export const FORK_AGENT = {
     agentType: "fork",
     whenToUse: "Fork the current conversation into an isolated worker for scoped parallel work.",
     tools: ["*"],
-    disallowedTools: ["plan"],
+    disallowedTools: ["plan_update"],
     model: "inherit",
     permissionMode: "bubble",
     requiresReport: true,
@@ -14,28 +14,28 @@ export const GENERAL_PURPOSE_AGENT = {
     agentType: "general-purpose",
     whenToUse: "General engineering worker for scoped implementation, investigation, or verification tasks.",
     tools: ["*"],
-    disallowedTools: ["plan"],
+    disallowedTools: ["plan_update"],
     permissionMode: "inherit",
     requiresReport: true,
     reportRetryTurns: 1,
     buildSystemPrompt: () => [
         "You are a subagent worker inside the same neo runtime.",
-        "Complete the assigned scope, then end with agent_report status='completed' or status='incomplete'.",
+        "Complete the assigned scope, then end with subagent_report status='completed' or status='incomplete'.",
         "If blocked or out of scope, use status='incomplete' and include what was and was not done.",
     ].join("\n"),
 };
 export const EXPLORE_AGENT = {
     agentType: "explore",
     whenToUse: "Fast read-only codebase exploration: locate files, trace symbols, summarize architecture, and report findings without modifying anything.",
-    tools: ["list", "read", "grep", "search", "exec_command", "write_stdin", "agent_report"],
-    disallowedTools: ["edit", "write", "agent", "plan"],
+    tools: ["file_list", "file_read", "file_search", "web_search", "terminal_run", "terminal_control", "subagent_report"],
+    disallowedTools: ["file_edit", "file_write", "subagent_run", "plan_update"],
     permissionMode: "readonly",
     requiresReport: true,
     reportRetryTurns: 1,
     buildSystemPrompt: () => [
         "You are a read-only codebase exploration subagent.",
         "Use read-only tools to inspect the assigned scope; do not edit files or spawn agents.",
-        "End with agent_report status='completed' or status='incomplete'.",
+        "End with subagent_report status='completed' or status='incomplete'.",
         "Report files inspected, findings with file-path evidence, risks/unknowns, and next steps.",
     ].join("\n"),
 };

package/dist/agents/agent-definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-definition.js","sourceRoot":"","sources":["../../src/agents/agent-definition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-definition.js","sourceRoot":"","sources":["../../src/agents/agent-definition.ts"],"names":[],"mappings":"AAiCA,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAoB;IACzC,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,iFAAiF;IAC5F,KAAK,EAAE,CAAC,GAAG,CAAC;IACZ,eAAe,EAAE,CAAC,aAAa,CAAC;IAChC,KAAK,EAAE,SAAS;IAChB,cAAc,EAAE,QAAQ;IACxB,cAAc,EAAE,IAAI;IACpB,gBAAgB,EAAE,CAAC;IACnB,iBAAiB,EAAE,GAAG,EAAE,CAAC,EAAE;CAC5B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAoB;IACpD,SAAS,EAAE,iBAAiB;IAC5B,SAAS,EAAE,6FAA6F;IACxG,KAAK,EAAE,CAAC,GAAG,CAAC;IACZ,eAAe,EAAE,CAAC,aAAa,CAAC;IAChC,cAAc,EAAE,SAAS;IACzB,cAAc,EAAE,IAAI;IACpB,gBAAgB,EAAE,CAAC;IACnB,iBAAiB,EAAE,GAAG,EAAE,CAAC;QACvB,wDAAwD;QACxD,uGAAuG;QACvG,4FAA4F;KAC7F,CAAC,IAAI,CAAC,IAAI,CAAC;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAoB;IAC5C,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,2IAA2I;IACtJ,KAAK,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,CAAC;IACrH,eAAe,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,CAAC;IAC3E,cAAc,EAAE,UAAU;IAC1B,cAAc,EAAE,IAAI;IACpB,gBAAgB,EAAE,CAAC;IACnB,iBAAiB,EAAE,GAAG,EAAE,CAAC;QACvB,oDAAoD;QACpD,uFAAuF;QACvF,qEAAqE;QACrE,2FAA2F;KAC5F,CAAC,IAAI,CAAC,IAAI,CAAC;CACb,CAAC;AAOF,MAAM,OAAO,kBAAkB;IACZ,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IAElE,YAAY,cAA0C,CAAC,qBAAqB,EAAE,aAAa,CAAC;QAC1F,KAAK,MAAM,UAAU,IAAI,WAAW;YAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC/F,CAAC;IAED,OAAO,CAAC,SAAkB;QACxB,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAC;QACtG,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;QACrE,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI;QACF,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7G,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAuB;IACxD,IAAI,OAAO,CAAC,SAAS,KAAK,UAAU,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5D,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CACnG,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,OAAO;QACL,oBAAoB;QACpB,uCAAuC;QACvC,8CAA8C;QAC9C,qEAAqE;QACrE,wCAAwC;QACxC,EAAE;QACF,SAAS;KACV,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}

package/dist/agents/agent-report-tool.d.ts

@@ -1,5 +1,5 @@
 import type { Tool } from "../tools/tool.js";
-export declare const AGENT_REPORT_TOOL_NAME = "agent_report";
+export declare const AGENT_REPORT_TOOL_NAME = "subagent_report";
 export type AgentReportStatus = "draft" | "completed" | "incomplete";
 export interface AgentReportInput {
     content: string;

package/dist/agents/agent-report-tool.js

@@ -1,4 +1,4 @@
-export const AGENT_REPORT_TOOL_NAME = "agent_report";
+export const AGENT_REPORT_TOOL_NAME = "subagent_report";
 export function createAgentReportTool() {
     return {
         name: AGENT_REPORT_TOOL_NAME,
@@ -26,13 +26,13 @@ export function createAgentReportTool() {
         metadata: { readOnly: true, concurrent: false, visible: true },
         validate(input, _context) {
             if (!input || typeof input !== "object")
-                throw new Error("agent_report input must be an object");
+                throw new Error("subagent_report input must be an object");
             const value = input;
             if (typeof value.content !== "string" || value.content.trim().length === 0) {
-                throw new Error("agent_report.content must be a non-empty string");
+                throw new Error("subagent_report.content must be a non-empty string");
             }
             if (value.status !== undefined && value.status !== "draft" && value.status !== "completed" && value.status !== "incomplete") {
-                throw new Error("agent_report.status must be 'draft', 'completed', or 'incomplete'");
+                throw new Error("subagent_report.status must be 'draft', 'completed', or 'incomplete'");
             }
             return { content: value.content, status: value.status };
         },

package/dist/agents/agent-report-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-report-tool.js","sourceRoot":"","sources":["../../src/agents/agent-report-tool.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAG,cAAc,CAAC;AAerD,MAAM,UAAU,qBAAqB;IACnC,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EAAE;YACX,iEAAiE;YACjE,kMAAkM;YAClM,4EAA4E;SAC7E,CAAC,IAAI,CAAC,GAAG,CAAC;QACX,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,iIAAiI;iBAC/I;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC;oBAC1C,WAAW,EAAE,oIAAoI;iBAClJ;aACF;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC;YACrB,oBAAoB,EAAE,KAAK;SAC5B;QACD,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;QAC9D,QAAQ,CAAC,KAAc,EAAE,QAAwB;YAC/C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YACjG,MAAM,KAAK,GAAG,KAAgC,CAAC;YAC/C,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3E,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACrE,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;gBAC5H,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAoC,EAAE,CAAC;QACxF,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAuB;YAChC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1F,MAAM,KAAK,GAAG,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,YAAY,CAAC;YAChE,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAA8B;gBAC7D,OAAO,EAAE,KAAK;oBACZ,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,sCAAsC,CAAC;oBACvG,CAAC,CAAC,+BAA+B;aACpC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"agent-report-tool.js","sourceRoot":"","sources":["../../src/agents/agent-report-tool.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAC;AAexD,MAAM,UAAU,qBAAqB;IACnC,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EAAE;YACX,iEAAiE;YACjE,kMAAkM;YAClM,4EAA4E;SAC7E,CAAC,IAAI,CAAC,GAAG,CAAC;QACX,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,iIAAiI;iBAC/I;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC;oBAC1C,WAAW,EAAE,oIAAoI;iBAClJ;aACF;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC;YACrB,oBAAoB,EAAE,KAAK;SAC5B;QACD,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;QAC9D,QAAQ,CAAC,KAAc,EAAE,QAAwB;YAC/C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YACpG,MAAM,KAAK,GAAG,KAAgC,CAAC;YAC/C,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3E,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACxE,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;gBAC5H,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;YAC1F,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAoC,EAAE,CAAC;QACxF,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAuB;YAChC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1F,MAAM,KAAK,GAAG,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,YAAY,CAAC;YAChE,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAA8B;gBAC7D,OAAO,EAAE,KAAK;oBACZ,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,sCAAsC,CAAC;oBACvG,CAAC,CAAC,+BAA+B;aACpC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/agents/agent-tool.d.ts

@@ -6,7 +6,7 @@ import type { ToolRegistry } from "../tools/registry.js";
 import { type AgentCatalog, type AgentIsolation, type AgentPermissionMode } from "./agent-definition.js";
 import { type TaskStore } from "../tasks/task-store.js";
 import { type AgentActivityStore } from "./agent-activity.js";
-export declare const AGENT_TOOL_NAME = "agent";
+export declare const AGENT_TOOL_NAME = "subagent_run";
 export declare const AGENT_TOOL_PROMPT_RULES: string;
 export interface AgentToolInput {
     prompt: string;

package/dist/agents/agent-tool.js

@@ -1,16 +1,16 @@
 import { createTextMessage } from "../types/messages.js";
 import { runAgent } from "../core/run-agent.js";
-import { createLocalAgentTask, updateProgressFromMessage } from "./local-agent-task.js";
+import { createLocalAgentTask, updateProgressFromEvent, updateProgressFromMessage } from "./local-agent-task.js";
 import { EXPLORE_AGENT, FORK_AGENT, GENERAL_PURPOSE_AGENT, StaticAgentCatalog, isForkChildContext, } from "./agent-definition.js";
 import { globalTaskStore } from "../tasks/task-store.js";
 import { globalAgentActivityStore } from "./agent-activity.js";
 import path from "node:path";
-export const AGENT_TOOL_NAME = "agent";
+export const AGENT_TOOL_NAME = "subagent_run";
 export const AGENT_TOOL_PROMPT_RULES = [
     "Fresh agents do not inherit conversation context; prompts must include goal, relevant files, constraints, and expected output.",
     "Fork agents inherit parent context and should receive a scoped directive, not a full background briefing.",
     "Background agents return an output file and task notification; do not fabricate results before the task completes.",
-    "Use mode=explore for read-only codebase reconnaissance: file discovery, symbol tracing, architecture summaries, and implementation planning. Explore agents can inspect with exec_command but cannot edit/write or spawn subagents.",
+    "Use mode=explore for read-only codebase reconnaissance: file discovery, symbol tracing, architecture summaries, and implementation planning. Explore agents can inspect with terminal_run but cannot use file_edit/file_write or spawn subagents.",
     "To run multiple subagents truly in parallel in one model turn: set parallel=true (sync but concurrent), or run_in_background/mode=background (fire-and-forget with task_id). Without those, subagents run one after another and wall time stacks.",
     "Subagents are bounded by max turns (see agent definitions / AGENT_SUBAGENT_MAX_TURNS) and optional wall time (AGENT_SUBAGENT_WALL_TIMEOUT_MS) so they cannot run indefinitely.",
     "Launch independent agents in the same model turn when parallel work is useful.",
@@ -33,7 +33,7 @@ export function createAgentTool(runtime) {
                 subagent_type: { type: "string", description: "Agent definition to use. Omit for general-purpose or fork mode." },
                 model: { type: "string" },
                 run_in_background: { type: "boolean" },
-                name: { type: "string", description: "Optional stable name for later SendMessage routing." },
+                name: { type: "string", description: "Optional stable name for later subagent_message routing." },
                 team_name: { type: "string" },
                 mode: { type: "string", description: "Execution/special mode: sync, background, fork, explore, or permission aliases." },
                 isolation: { type: "string", enum: ["shared", "worktree", "remote"] },
@@ -90,7 +90,7 @@ export function createAgentTool(runtime) {
             if (background) {
                 return launchAsyncAgent({ input, context, options, runtime, agent, fork, agentId, description });
             }
-            return runSyncAgent({ input, context, runtime, agent, fork, agentId, description });
+            return runSyncAgent({ input, context, options, runtime, agent, fork, agentId, description });
         },
     };
 }
@@ -121,21 +121,27 @@ async function runSyncAgent(input) {
             fork: input.fork,
             workspaceCwd,
         });
+        input.options.onProgress?.({ toolName: AGENT_TOOL_NAME, message: input.description, channel: "state", operation: "replace", phase: "running", data: { agent_id: input.agentId, agent_type: input.agent.agentType } });
         let completed = await stream.next();
         while (!completed.done) {
             activityStore.recordEvent(input.agentId, completed.value);
+            emitSyncAgentEvent(input.options.onProgress, input.agentId, completed.value);
             if (completed.value.type === "message")
                 agentMessages.push(completed.value.message);
             completed = await stream.next();
         }
+        if (completed.value.status === "aborted") {
+            activityStore.fail(input.agentId, completed.value.terminalReason, "killed");
+            return { ok: false, output: { status: "cancelled", error: completed.value.terminalReason, description: input.description, ...completed.value.result } };
+        }
+        if (completed.value.status === "failed") {
+            activityStore.fail(input.agentId, completed.value.terminalReason);
+            return { ok: false, output: { status: "failed", error: completed.value.terminalReason, description: input.description, ...completed.value.result } };
+        }
         activityStore.complete(input.agentId, completed.value.result);
         return {
             ok: true,
-            output: {
-                status: "completed",
-                description: input.description,
-                ...completed.value.result,
-            },
+            output: { status: "completed", description: input.description, ...completed.value.result },
             newMessages: [createTextMessage("progress", `Subagent ${input.agentId} completed: ${input.description}`)],
         };
     }
@@ -151,6 +157,56 @@ async function runSyncAgent(input) {
         wall?.dispose();
     }
 }
+function emitSyncAgentEvent(emit, agentId, event) {
+    if (!emit)
+        return;
+    const childKey = (key, toolUseId) => `${agentId}:${toolUseId}:${key ?? "state"}`;
+    if (event.type === "tool.started") {
+        emit({ toolName: AGENT_TOOL_NAME, message: childToolPurpose(event.toolUse), channel: "item", operation: "upsert", key: childKey("summary", event.toolUse.id), phase: "tool_running", data: { agent_id: agentId, child_event: event } });
+        return;
+    }
+    if (event.type === "tool.progress") {
+        const progress = event.progress;
+        emit({
+            ...progress,
+            toolName: AGENT_TOOL_NAME,
+            toolUseId: undefined,
+            message: progress.message || childToolPurpose(event.toolUse),
+            key: childKey(progress.key, event.toolUse.id),
+            data: childProgressData(progress.data, agentId, event),
+        });
+        return;
+    }
+    if (event.type === "tool.result.available") {
+        emit({ toolName: AGENT_TOOL_NAME, message: childToolPurpose(event.toolUse), channel: "item", operation: "upsert", key: childKey("summary", event.toolUse.id), phase: event.ok ? "tool_completed" : "tool_failed", data: { agent_id: agentId, child_event: event } });
+        return;
+    }
+    if (event.type === "state" && event.phase !== "running_tools") {
+        emit({ toolName: AGENT_TOOL_NAME, message: event.detail || event.phase, channel: "state", operation: "replace", key: `${agentId}:agent:state`, phase: event.phase, data: { agent_id: agentId } });
+    }
+}
+function childProgressData(data, agentId, childEvent) {
+    if (data && typeof data === "object" && !Array.isArray(data))
+        return { ...data, agent_id: agentId, child_event: childEvent };
+    return data ?? { agent_id: agentId, child_event: childEvent };
+}
+function childToolPurpose(toolUse) {
+    if (toolUse.input && typeof toolUse.input === "object" && !Array.isArray(toolUse.input)) {
+        const input = toolUse.input;
+        const description = typeof input.description === "string" ? input.description.trim() : "";
+        if (description)
+            return description;
+        if (toolUse.name === "file_read" && typeof input.path === "string")
+            return `读取 ${path.basename(input.path)}`;
+        if (toolUse.name === "file_list" && typeof input.path === "string")
+            return `查看 ${input.path}`;
+        if (toolUse.name === "file_search" && typeof input.query === "string")
+            return `搜索 ${input.query}`;
+        if (toolUse.name === "terminal_run" && typeof input.cmd === "string")
+            return input.cmd;
+    }
+    return toolUse.name;
+}
 function launchAsyncAgent(input) {
     const taskStore = input.runtime.taskStore ?? globalTaskStore;
     const taskId = makeTaskId();
@@ -183,6 +239,10 @@ function launchAsyncAgent(input) {
     };
 }
 async function runAsyncAgentLifecycle(input) {
+    const runGeneration = input.runGeneration ?? input.taskStore.get(input.taskId)?.runGeneration ?? 1;
+    const ownsRun = () => input.taskStore.get(input.taskId)?.runGeneration === runGeneration;
+    if (!ownsRun())
+        return;
     input.taskStore.markRunning(input.taskId);
     const task = input.taskStore.get(input.taskId);
     const workspaceCwd = resolveAgentWorkspaceCwd(input.input.cwd, input.context);
@@ -216,12 +276,15 @@ async function runAsyncAgentLifecycle(input) {
         let completed = await stream.next();
         while (!completed.done) {
             const event = completed.value;
-            activityStore.recordEvent(input.agentId, event);
             const current = input.taskStore.get(input.taskId);
-            if (!current || current.status === "killed") {
-                activityStore.fail(input.agentId, "Task killed", "killed");
+            if (!ownsRun() || !current || current.status === "killed") {
                 return;
             }
+            activityStore.recordEvent(input.agentId, event);
+            if (event.type !== "message") {
+                updateProgressFromEvent(current, event);
+                input.taskStore.upsert(current);
+            }
             if (event.type === "message") {
                 current.messages.push(event.message);
                 updateProgressFromMessage(current, event.message);
@@ -245,12 +308,10 @@ async function runAsyncAgentLifecycle(input) {
             let remaining = await stream.next();
             while (!remaining.done) {
                 const event = remaining.value;
-                activityStore.recordEvent(input.agentId, event);
                 const current = input.taskStore.get(input.taskId);
-                if (!current || current.status === "killed") {
-                    activityStore.fail(input.agentId, "Task killed", "killed");
+                if (!ownsRun() || !current || current.status === "killed")
                     return;
-                }
+                activityStore.recordEvent(input.agentId, event);
                 if (event.type === "message") {
                     current.messages.push(event.message);
                     updateProgressFromMessage(current, event.message);
@@ -260,6 +321,18 @@ async function runAsyncAgentLifecycle(input) {
             }
             completed = remaining;
         }
+        if (!ownsRun())
+            return;
+        if (completed.value.status === "aborted") {
+            input.taskStore.kill(input.taskId, completed.value.terminalReason);
+            activityStore.fail(input.agentId, completed.value.terminalReason, "killed");
+            return;
+        }
+        if (completed.value.status === "failed") {
+            input.taskStore.fail(input.taskId, completed.value.terminalReason);
+            activityStore.fail(input.agentId, completed.value.terminalReason);
+            return;
+        }
         input.taskStore.complete(input.taskId, completed.value.result);
         activityStore.complete(input.agentId, completed.value.result);
         const finished = input.taskStore.get(input.taskId);
@@ -271,6 +344,8 @@ async function runAsyncAgentLifecycle(input) {
             task.notified = false;
     }
     catch (error) {
+        if (!ownsRun())
+            return;
         const message = error instanceof Error ? error.message : String(error);
         input.taskStore.fail(input.taskId, message);
         activityStore.fail(input.agentId, message);
@@ -289,6 +364,8 @@ export function resumeAgentTask(taskId, directive, runtime, taskStore, parentCon
     const agent = catalog.resolve(task.agentType);
     const abortController = new AbortController();
     task.status = "pending";
+    task.runGeneration = (task.runGeneration ?? 0) + 1;
+    const runGeneration = task.runGeneration;
     task.abortController = abortController;
     task.error = undefined;
     task.completedAt = undefined;
@@ -307,8 +384,10 @@ export function resumeAgentTask(taskId, directive, runtime, taskStore, parentCon
         abortController,
         isResume: true,
         existingMessages: [...task.messages],
+        runGeneration,
     }).catch((error) => {
-        taskStore.fail(taskId, error instanceof Error ? error.message : String(error));
+        if (taskStore.get(taskId)?.runGeneration === runGeneration)
+            taskStore.fail(taskId, error instanceof Error ? error.message : String(error));
     });
     return Promise.resolve({ ok: true });
 }