@zhushanwen/pi-subagent-workflow 0.3.3 → 0.4.0

package/src/interface/subagent-tool.ts

@@ -31,23 +31,6 @@ import { type RenderContext,renderSubagentCall, renderSubagentResult } from "./t
  * 无法从 SubagentParams schema 反向推断参数类型）。
  * action 与对应 param 不匹配时 handler 内 throw。
  */
-interface StartParam {
-  task: string;
-  /** 短标签（≤35 字符，kebab-case），必填。展示在 TUI 标题行/列表。 */
-  slug: string;
-  agent?: string;
-  model?: string;
-  thinkingLevel?: string;
-  skillPath?: string;
-  appendSystemPrompt?: string[];
-  schema?: Record<string, unknown>;
-  maxTurns?: number;
-  graceTurns?: number;
-  fork?: boolean;
-  worktree?: boolean;
-  cwd?: string;
-}
-
 interface ListParam {
   includeFinished?: boolean;
   limit?: number;
@@ -59,7 +42,22 @@ interface CancelParam {
 
 interface SubagentExecuteParams {
   action: "start" | "list" | "cancel";
-  startParam?: StartParam;
+  // action:"start" 的 13 字段拍平到顶层（弱模型常省略 startParam 嵌套层导致调用失败）。
+  // 拍平后这些字段直接在顶层（全部 optional——schema flat 无法表达「action 条件必填」，
+  // 由 startHandler runtime 校验 task/slug 必填）。
+  task?: string;
+  slug?: string;
+  agent?: string;
+  model?: string;
+  thinkingLevel?: string;
+  skillPath?: string;
+  appendSystemPrompt?: string[];
+  schema?: Record<string, unknown>;
+  maxTurns?: number;
+  graceTurns?: number;
+  fork?: boolean;
+  worktree?: boolean;
+  cwd?: string;
   listParam?: ListParam;
   cancelParam?: CancelParam;
 }
@@ -89,54 +87,56 @@ type SubagentRenderResultCb = (
 
 // Params schema（模块内消费，未导出）。
 //
-// TODO(long-term, option-A): startParam/listParam/cancelParam 全标 Optional 是 flat
-// JSON Schema 表达「action 分发的条件必填」的妥协——required[] 只能表达静态必填，
-// 无法表达「action:"start" 时 startParam 必填、action:"list" 时不需要」。长期方案是
-// 拆成 3 个独立 tool（subagent_start / subagent_list / subagent_cancel），让每个 tool
-// 的 schema 真实反映必填性，消除全新上下文下的字段误判。当前靠 description 强标记 +
-// runtime guard（subagent-actions.ts startHandler/cancelHandler throw）兜底。
-// 勿在此基础上继续堆 action 条件逻辑——要加就拆 tool。
+// action:"start" 的 13 字段（task/slug/agent/model/...）拍平在顶层，不再用 startParam
+// 嵌套容器包。原因：弱模型（GLM/DeepSeek）信任 schema 结构信号 > 文本信号，经常省略
+// startParam 嵌套层把 task/slug 直接平铺到顶层导致调用失败。拍平后 schema 结构与模型
+// 的自然倾向一致，消除这层误用。task/slug 必填性由 startHandler runtime 校验（flat
+// JSON Schema 无法表达「action 条件必填」）。
+//
+// TODO(long-term, option-A): listParam/cancelParam 仍标 Optional 也是 flat JSON Schema
+// 表达「action 分发条件必填」的妥协——长期方案是拆成 3 个独立 tool
+// （subagent_start / subagent_list / subagent_cancel），让每个 tool 的 schema 真实
+// 反映必填性。勿在此基础上继续堆 action 条件逻辑——要加就拆 tool。
 const SubagentParams = Type.Object({
   action: StringEnum(["start", "list", "cancel"], {
     description: "Operation: 'start' runs a subagent, 'list' shows running subagents (optional includeFinished), 'cancel' stops a background subagent by id.",
   }),
-  // action:"start" → startParam REQUIRED. Missing/empty task or slug throws at runtime.
+  // ── action:"start" fields (flattened to top level). task/slug REQUIRED for start. ──
+  // Missing/empty task or slug throws at runtime (startHandler).
   // (flat JSON Schema can't express conditional requirement — see file-level TODO.)
-  startParam: Type.Optional(Type.Object({
-    task: Type.String({
-      description: "REQUIRED for action:'start'. The task for the subagent to execute. Throws if missing or whitespace-only.",
-    }),
-    slug: Type.String({
-      description:
-        "REQUIRED for action:'start'. Short label (≤35 chars) for this subagent, e.g. 'fix-login', 'extract-urls'. " +
-        "Shown in TUI to distinguish concurrent subagents.",
-      maxLength: SLUG_MAX_LENGTH,
-    }),
-    agent: Type.Optional(Type.String({
-      description: 'Agent name (system prompt + tools). If omitted, defaults to "general-purpose" — a generic agent that inherits the main agent\'s model and project context. Available: general-purpose (default fallback), worker, researcher, explorer, planner, reviewer, oracle, context-builder. Custom agents configurable.',
-    })),
-    model: Type.Optional(Type.String({
-      description: 'Model override in "provider/modelId" format. Resolution order (top wins): (1) this param, (2) agent .md frontmatter model, (3) the main agent\'s current model (zero-config default). An explicit model (param or frontmatter) that is missing or unauthorized THROWS — there is no silent fallback to the main model. Omit this param to inherit the main model.',
-    })),
-    thinkingLevel: Type.Optional(StringEnum(["off", "minimal", "low", "medium", "high", "xhigh"] as const)),
-    skillPath: Type.Optional(Type.String()),
-    appendSystemPrompt: Type.Optional(Type.Array(Type.String())),
-    schema: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
-    maxTurns: Type.Optional(Type.Number({
-      description: "Turn limit. The subagent is terminated via SIGTERM after maxTurns turn_end events + graceTurns of slack. There is no graceful wrap-up message — the process is killed. 0 or omitted = unlimited.",
-    })),
-    graceTurns: Type.Optional(Type.Number({
-      description: "Extra turns allowed after maxTurns is reached before SIGTERM (default 2). Only meaningful when maxTurns is set.",
-    })),
-    fork: Type.Optional(Type.Boolean({
-      description: "Fork mode: inherit the parent's conversation context. When true, the subagent receives the parent's session file via --fork and builds a branched conversation (it sees prior turns/messages). The subagent still runs in a separate spawned child process (process isolation) — fork is about context inheritance, not process sharing. Use worktree:true (requires fork:true) for file-system isolation.",
-    })),
-    worktree: Type.Optional(Type.Boolean({
-      description: "Worktree isolation (requires fork:true): run the subagent in a dedicated git worktree, providing file-system level isolation from the parent session. Prevents concurrent file-write conflicts between parent and subagent. Only takes effect when fork:true; passing worktree:true without fork:true throws an error.",
-    })),
-    cwd: Type.Optional(Type.String({
-      description: 'Override the working directory for the subagent execution. Must be an absolute path. Defaults to the parent session\'s cwd.',
-    })),
+  task: Type.Optional(Type.String({
+    description: "REQUIRED for action:'start'. The task for the subagent to execute. Throws if missing or whitespace-only.",
+  })),
+  slug: Type.Optional(Type.String({
+    description:
+      "REQUIRED for action:'start'. Short label (≤35 chars) for this subagent, e.g. 'fix-login', 'extract-urls'. " +
+      "Shown in TUI to distinguish concurrent subagents.",
+    maxLength: SLUG_MAX_LENGTH,
+  })),
+  agent: Type.Optional(Type.String({
+    description: 'Agent name (system prompt + tools). If omitted, defaults to "general-purpose" — a generic agent that inherits the main agent\'s model and project context. Available: general-purpose (default fallback), worker, researcher, explorer, planner, reviewer, oracle, context-builder, orchestrator. Custom agents configurable.',
+  })),
+  model: Type.Optional(Type.String({
+    description: 'Model override in "provider/modelId" format. Resolution order (top wins): (1) this param, (2) agent .md frontmatter model, (3) the main agent\'s current model (zero-config default). An explicit model (param or frontmatter) that is missing or unauthorized THROWS — there is no silent fallback to the main model. Omit this param to inherit the main model.',
+  })),
+  thinkingLevel: Type.Optional(StringEnum(["off", "minimal", "low", "medium", "high", "xhigh"] as const)),
+  skillPath: Type.Optional(Type.String()),
+  appendSystemPrompt: Type.Optional(Type.Array(Type.String())),
+  schema: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
+  maxTurns: Type.Optional(Type.Number({
+    description: "Turn limit. The subagent is terminated via SIGTERM after maxTurns turn_end events + graceTurns of slack. There is no graceful wrap-up message — the process is killed. 0 or omitted = unlimited.",
+  })),
+  graceTurns: Type.Optional(Type.Number({
+    description: "Extra turns allowed after maxTurns is reached before SIGTERM (default 2). Only meaningful when maxTurns is set.",
+  })),
+  fork: Type.Optional(Type.Boolean({
+    description: "Fork mode: inherit the parent's conversation context. When true, the subagent receives the parent's session file via --fork and builds a branched conversation (it sees prior turns/messages). The subagent still runs in a separate spawned child process (process isolation) — fork is about context inheritance, not process sharing. Use worktree:true (requires fork:true) for file-system isolation.",
+  })),
+  worktree: Type.Optional(Type.Boolean({
+    description: "Worktree isolation (requires fork:true): run the subagent in a dedicated git worktree, providing file-system level isolation from the parent session. Prevents concurrent file-write conflicts between parent and subagent. Only takes effect when fork:true; passing worktree:true without fork:true throws an error.",
+  })),
+  cwd: Type.Optional(Type.String({
+    description: 'Override the working directory for the subagent execution. Must be an absolute path. Defaults to the parent session\'s cwd.',
   })),
   // action:"list" → listParam OPTIONAL (all fields optional, defaults apply). Ignored by other actions.
   listParam: Type.Optional(Type.Object({
@@ -171,22 +171,8 @@ function isModelOverrideObj(a: unknown): a is { model?: unknown; thinkingLevel?:
   return typeof a === "object" && a !== null;
 }
 
-/** unknown args 是否含 startParam（类型守卫，替代 `in` 后的 `as`）。 */
-function hasStartParam(a: unknown): a is { startParam?: unknown } {
-  return typeof a === "object" && a !== null && "startParam" in a;
-}
-
-/** action:'start' 入参是否把 task/slug 平铺到顶层（弱模型常见误用：缺 startParam 嵌套）。 */
-/**
- * action:'start' 入参是否把 task/slug 平铺到顶层（弱模型常见误用：缺 startParam 嵌套）。
- * export 供 behavioral 测试（trigger/no-trigger），不改变运行时行为。
- */
-export function hasFlattenedStartFields(a: unknown): boolean {
-  if (typeof a !== "object" || a === null) return false;
-  return "task" in a || "slug" in a;
-}
-
-/** 从 unknown args 安全提取 model/thinkingLevel override（传给 resolveModel）。 */
+/** 从 unknown args 安全提取 model/thinkingLevel override（传给 resolveModel）。
+ *  拍平后 args 已是顶层平铺结构（model/thinkingLevel 直接在 args 上）。 */
 function extractModelOverride(args: unknown): { model?: string; thinkingLevel?: string } | undefined {
   if (!isModelOverrideObj(args)) return undefined;
   const override: { model?: string; thinkingLevel?: string } = {};
@@ -214,17 +200,17 @@ Delegate when the task needs a distinct role (researcher/worker), context isolat
 
 ## Actions
 
-- action:"start" — run a subagent. REQUIRED startParam: { task, slug, ... } (task and slug REQUIRED). Background only: returns a subagentId immediately, notifies on completion.
+- action:"start" — run a subagent. Pass task and slug as top-level fields (REQUIRED). Optional: agent, model, thinkingLevel, skillPath, appendSystemPrompt, schema, maxTurns, graceTurns, fork, worktree, cwd. Background only: returns a subagentId immediately, notifies on completion.
 - action:"list" — list subagents. Pass listParam: { includeFinished?, limit? } (all optional). Read an item's sessionFile for full detail.
 - action:"cancel" — cancel a background subagent. REQUIRED cancelParam: { subagentId }.
 
 ## Examples
 
 \`\`\`
-{"action":"start","startParam":{"task":"<your task>","slug":"<kebab-case>"}}
-{"action":"start","startParam":{"task":"...","slug":"fix-login","agent":"worker","model":"anthropic/claude-3.5-sonnet","fork":true}}
+{"action":"start","task":"<your task>","slug":"<kebab-case>"}
+{"action":"start","task":"...","slug":"fix-login","agent":"worker","model":"anthropic/claude-3.5-sonnet","fork":true}
 {"action":"list","listParam":{"includeFinished":false,"limit":20}}
-{"action":"cancel","cancelParam":{"subagentId":"sa_abc123"}}
+{"action":"cancel","cancelParam":{"subagentId":"sa-550e8400"}}
 \`\`\`
 
 ## After launching — do NOT wait
@@ -237,7 +223,8 @@ Completion auto-notifies you (steer wakes next turn, even mid-poll). So:
 
 ## Anti-patterns
 
-- Putting task/slug at the top level instead of inside startParam — the tool reads startParam.task, not a top-level task.
+- Forgetting the REQUIRED top-level task/slug fields for action:"start" — both must be present at the top level (not nested).
+- Over-generalizing the flatten: ONLY start fields are top-level. list and cancel params stay nested under listParam / cancelParam (e.g. {"action":"list","listParam":{"includeFinished":true}}, NOT {"action":"list","includeFinished":true}).
 - Launching background, then sleeping/polling instead of working or stopping.
 - Treating subagent results as authoritative without verification.
 - Delegating trivial tasks you could do faster yourself.
@@ -278,9 +265,10 @@ const subagentRenderCall: SubagentRenderCallCb = (args, theme, ctx) => {
   // 主 agent model 由 ModelConfigService 缓存（session_start 注入，model_select 刷新），
   // 补偿 renderCall 的 ToolRenderContext 不含 model 的 SDK 限制。
   // service 未就绪 / 缓存为空 / 解析失败 → 降级不显示 model。
-  const startParam = hasStartParam(args) ? args.startParam : undefined;
-  const agent = extractAgentName(startParam);
-  const override = extractModelOverride(startParam);
+  // 拍平后 args 已是顶层平铺结构（agent/model/thinkingLevel 直接在 args 上），
+  // extractAgentName / extractModelOverride 都是 unknown-safe 顶层读取，对平铺形态天然兼容。
+  const agent = extractAgentName(args);
+  const override = extractModelOverride(args);
   let resolved: { model: string; thinkingLevel?: string } | undefined;
   try {
     const service = getSubagentService();
@@ -309,7 +297,7 @@ const subagentRenderResult: SubagentRenderResultCb = (result, options, theme, ct
  *   ║  service = getSubagentService() —— 未初始化 throw                  ║
  *   ║                                                                    ║
  *   ║  switch(params.action):                                           ║
- *   ║    "start"  → startHandler(service, params.startParam, signal) → 领域对象  ║
+ *   ║    "start"  → startHandler(service, params, signal) → 领域对象       ║
  *   ║    "list"   → listHandler(service, params.listParam) → 领域对象    ║
  *   ║    "cancel" → cancelHandler(service, params.cancelParam) → 领域对象║
  *   ║                                                                    ║
@@ -317,6 +305,10 @@ const subagentRenderResult: SubagentRenderResultCb = (result, options, theme, ct
  *   ║  return { content: [{text: JSON.stringify(result)}], details: result }║
  *   ╚══════════════════════════════════════════════════════════════════╝
  *
+ * 拍平后 startHandler 直接接收顶层 params（13 字段已在顶层）。startHandler 的入参
+ * 类型 StartHandlerInput 是 SubagentExecuteParams 的子集（13 字段全 optional），
+ * 结构兼容——SubagentExecuteParams 多出的 action/listParam/cancelParam 被忽略。
+ *
  * handler 返回纯领域对象（不碰 {content, details}），adapter 唯一包装。
  * content（JSON 字符串）给 LLM，details（领域对象 + action）给 renderResult，同源。
  */
@@ -332,20 +324,11 @@ const executeSubagent: SubagentExecuteCb = async (
   const service = getSubagentService();
   if (!service) throw new Error("subagents runtime not initialized");
 
-  // 弱模型常见误用：action:'start' 时把 task/slug 平铺到顶层（缺 startParam 嵌套层）。
-  // schema 用 Type.Optional 表达条件必填（flat JSON Schema 无法表达），弱模型信任
-  // 结构信号 > 文本信号，倾向省略嵌套层。这里在进 startHandler 之前拦截平铺形态，
-  // throw 带 Correct 正例，让弱模型撞错后第二次能直接照抄。
-  if (params.action === "start" && !params.startParam && hasFlattenedStartFields(params)) {
-    throw new Error(
-      "startParam is required for action:'start' — wrap task/slug inside startParam. " +
-      "Correct: {\"action\":\"start\",\"startParam\":{\"task\":\"<your task>\",\"slug\":\"<kebab-case>\"}}",
-    );
-  }
-
   switch (params.action) {
     case "start":
-      return adapter({ action: "start", domain: await startHandler(service, params.startParam, signal, _ctx?.model) }, toGuiCtx(_ctx));
+      // 拍平后直接传顶层 params（StartHandlerInput 是 SubagentExecuteParams 子集，
+      // action/listParam/cancelParam 被忽略；task/slug 必填性由 startHandler 校验）。
+      return adapter({ action: "start", domain: await startHandler(service, params, signal, _ctx?.model) }, toGuiCtx(_ctx));
     case "list":
       return adapter({ action: "list", domain: listHandler(service, params.listParam) }, toGuiCtx(_ctx));
     case "cancel":

package/src/interface/tool-render.ts

@@ -92,15 +92,13 @@ export function renderSubagentCall(
   resolved?: { model: string; thinkingLevel?: string },
 ): Component {
   const t = theme as ThemeLike;
-  // args 结构：{ action:"start", startParam:{ agent, task, ... } }（见 subagent-tool.ts schema）。
-  // 从 startParam 提取 agent + task，对齐 nicobailon 的 renderCall 多行布局。
-  const startParam = typeof args === "object" && args !== null && "startParam" in args
-    ? (args as { startParam?: unknown }).startParam
-    : undefined;
-  const agent = extractAgentName(startParam);
-  // slug：从 startParam 提取（必填字段），非空时在 agent 后用 · 分隔展示。
-  const slug = typeof startParam === "object" && startParam !== null && "slug" in startParam
-    ? (startParam as { slug?: unknown }).slug
+  // args 结构（拍平后）：{ action:"start", agent, task, slug, ... }（见 subagent-tool.ts schema）。
+  // 13 字段直接在顶层，extractAgentName / slug / task 都从 args 顶层提取，
+  // 对齐 nicobailon 的 renderCall 多行布局。
+  const agent = extractAgentName(args);
+  // slug：从顶层 args 提取（必填字段），非空时在 agent 后用 · 分隔展示。
+  const slug = typeof args === "object" && args !== null && "slug" in args
+    ? (args as { slug?: unknown }).slug
     : undefined;
   const slugStr = typeof slug === "string" ? slug.trim() : "";
   const parts = slugStr
@@ -122,8 +120,8 @@ export function renderSubagentCall(
   // task preview 行——对齐 nicobailon：renderCall 输出多行（标题 + \n + task 预览）。
   // 实验假设：call 多行让首帧（无 result）与后续帧（有 result）的高度跳变模式
   // 与 nicobailon 一致，可能影响 pi diff 引擎的行对齐路径。preview 截断到 60 字符。
-  const task = typeof startParam === "object" && startParam !== null && "task" in startParam
-    ? (startParam as { task?: unknown }).task
+  const task = typeof args === "object" && args !== null && "task" in args
+    ? (args as { task?: unknown }).task
     : undefined;
   if (typeof task === "string" && task.length > 0) {
     // task 取首行——prompt 常含换行（多行指令），直接 slice 会保留 \n，

package/src/interface/tool-workflow.ts

@@ -1,5 +1,5 @@
 /**
- * Workflow Extension — workflow tool（7 actions，FR-5 tool 收口）。
+ * Workflow Extension — workflow tool（5 actions，FR-5 tool 收口）。
  *
  * 合并原 tool-workflow.ts + tool-workflow-run.ts 为单 tool。
  *
@@ -9,12 +9,10 @@
  * - pause: 调 pauseRun
  * - resume: 调 resumeRun
  * - abort: 调 abortRun
- * - retry-node: 调 retryNode
- * - skip-node: 调 skipNode
  *
  * **restart 不包含**（D-9 废弃）。
  *
- * 层归属：Interface。依赖 Pi SDK + Engine lifecycle/node-ops/launcher + helpers。
+ * 层归属：Interface。依赖 Pi SDK + Engine lifecycle/launcher + helpers。
  *
  * 参考：domain-models.md §FR-5（tool 收口 4→2）。
  */
@@ -36,7 +34,6 @@ import type { LauncherDeps } from "../orchestration/launcher.ts";
 import { abortRun, pauseRun, resumeRun, runWorkflow } from "../orchestration/lifecycle.ts";
 import type { RunStore } from "../orchestration/models/ports.ts";
 import type { WorkflowRun } from "../orchestration/models/workflow-run.ts";
-import { retryNode, skipNode } from "../orchestration/node-ops.ts";
 import { mapRunIcon, mapRunStatus, toGuiCtx } from "./gui-mappers.ts";
 import {
   acquireReentryGuard,
@@ -54,9 +51,7 @@ export type WorkflowAction =
   | "status"
   | "pause"
   | "resume"
-  | "abort"
-  | "retry-node"
-  | "skip-node";
+  | "abort";
 
 const WORKFLOW_ACTIONS: readonly WorkflowAction[] = [
   "run",
@@ -64,8 +59,6 @@ const WORKFLOW_ACTIONS: readonly WorkflowAction[] = [
   "pause",
   "resume",
   "abort",
-  "retry-node",
-  "skip-node",
 ];
 
 const WorkflowParams = Type.Object({
@@ -82,10 +75,7 @@ const WorkflowParams = Type.Object({
     }),
   ),
   runId: Type.Optional(
-    Type.String({ description: "Workflow run ID (pause/resume/abort/retry-node/skip-node)" }),
-  ),
-  callId: Type.Optional(
-    Type.Number({ description: "Agent call ID (retry-node/skip-node)" }),
+    Type.String({ description: "Workflow run ID (pause/resume/abort)" }),
   ),
   args: Type.Optional(
     Type.Record(Type.String(), Type.Unknown(), {
@@ -151,8 +141,7 @@ interface RunSummary {
 export type WorkflowToolDetails =
   | { action: "run"; runId: string; status: "running" | "not_found"; name: string; slug?: string; stateFile?: string; __gui__?: GuiRenderResult }
   | { action: "status"; runs: RunSummary[]; __gui__?: GuiRenderResult }
-  | { action: "pause" | "resume" | "abort"; runId: string; status: string; reason?: string; __gui__?: GuiRenderResult }
-  | { action: "retry-node" | "skip-node"; runId: string; callId: number; __gui__?: GuiRenderResult };
+  | { action: "pause" | "resume" | "abort"; runId: string; status: string; reason?: string; __gui__?: GuiRenderResult };
 
 /** Result returned by the `workflow` tool's execute. */
 export interface ToolResult {
@@ -206,8 +195,8 @@ export function buildWorkflowGui(details: WorkflowToolDetails) {
       }),
     });
   }
-  // pause/resume/abort/retry-node/skip-node
-  // abort 是破坏性终止、pause 是挂起（非成功完成），用 warn 区分；resume/retry/skip 保留 ok
+  // pause/resume/abort
+  // abort 是破坏性终止、pause 是挂起（非成功完成），用 warn 区分；resume 保留 ok
   const severity = details.action === "abort" || details.action === "pause" ? "warn" as const : "ok" as const;
   return guiComponent("stats-line", {
     items: [{
@@ -221,7 +210,7 @@ export function buildWorkflowGui(details: WorkflowToolDetails) {
 // ── Tool registration ────────────────────────────────────────
 
 /**
- * 注册 workflow tool（7 actions）。
+ * 注册 workflow tool（5 actions: run / status / pause / resume / abort）。
  *
  * @param pi ExtensionAPI
  * @param deps LauncherDeps（LifecycleDeps + registry）
@@ -241,9 +230,7 @@ export function registerWorkflowTool(
     name: "workflow",
     label: "Workflow",
     description:
-      "Execute and control workflows: run (start), status, pause, resume, abort, " +
-      "retry-node (re-run a failed agent call to refresh its trace; does NOT resume the " +
-      "workflow script or change its output — see promptGuidelines), skip-node (mark a call as skipped).\n" +
+      "Execute and control workflows: run (start), status, pause, resume, abort.\n" +
       "Replaces workflow + workflow-run tools.",
     promptSnippet: "Run, pause, resume, abort, or check workflow status",
     promptGuidelines: [
@@ -259,15 +246,10 @@ export function registerWorkflowTool(
       "with source tags and descriptions. Then use this tool's run action to start one.",
       "run: discover by name/description, then start in background (no user confirmation needed).",
       "Do NOT poll status after starting — results appear automatically via notifyDone.",
-      "retry-node/skip-node: for specific failed agent calls (requires runId + callId). " +
-      "retry-node only re-runs the call and refreshes the trace — the workflow script has " +
-      "already moved past the failed call, so the new result does NOT feed back into the " +
-      "script flow. Use retry-node for diagnostics, not to resume the workflow.",
       "Call shapes (JSON): " +
       "- run: {\"action\":\"run\",\"name\":\"<script>\",\"args\":{...},\"tokens\":N,\"time\":N}. " +
       "- status: {\"action\":\"status\"}. " +
-      "- pause/resume/abort: {\"action\":\"pause\",\"runId\":\"<id>\"} (abort optional: ,\"error\":\"<reason>\"}). " +
-      "- retry-node/skip-node: {\"action\":\"retry-node\",\"runId\":\"<id>\",\"callId\":N}.",
+      "- pause/resume/abort: {\"action\":\"pause\",\"runId\":\"<id>\"} (abort optional: ,\"error\":\"<reason>\"}).",
       "Anti-patterns: Flattening args sub-fields (task/items/...) to the top level — they belong inside args. Calling {\"action\":\"run\"} without name.",
     ],
     parameters: WorkflowParams,
@@ -308,12 +290,6 @@ export function registerWorkflowTool(
           case "abort":
             result = await actionLifecycle("abort", params, deps);
             break;
-          case "retry-node":
-            result = await actionRetryNode(params, deps);
-            break;
-          case "skip-node":
-            result = await actionSkipNode(params, deps);
-            break;
           default: {
             // Exhaustiveness check — 新增 WorkflowAction 成员时未补 case，tsc 在此报错。
             const _exhaustive: never = action;
@@ -503,62 +479,6 @@ async function actionLifecycle(
   }
 }
 
-// ── retry-node / skip-node ───────────────────────────────────
-
-async function actionRetryNode(params: WorkflowToolParams, deps: LauncherDeps): Promise<ToolResult> {
-  const runId = params.runId;
-  const callId = params.callId;
-  if (!runId || callId === undefined) {
-    return textResult("retry-node requires 'runId' and 'callId'. Correct: {\"action\":\"retry-node\",\"runId\":\"<id>\",\"callId\":<number>}", true);
-  }
-  const run = deps.runs.get(runId);
-  if (!run) {
-    return textResult(
-      `Workflow '${runId}' not found. Use action:status to list active runs and their runIds.`,
-      true,
-    );
-  }
-  try {
-    await retryNode(run, callId, deps);
-    return {
-      content: [
-        { type: "text", text: `Retried call ${callId} in run ${runId.slice(0, RUNID_SHORT)}.` },
-      ],
-      details: { action: "retry-node", runId, callId },
-    };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    return textResult(`Error: ${msg}`, true);
-  }
-}
-
-async function actionSkipNode(params: WorkflowToolParams, deps: LauncherDeps): Promise<ToolResult> {
-  const runId = params.runId;
-  const callId = params.callId;
-  if (!runId || callId === undefined) {
-    return textResult("skip-node requires 'runId' and 'callId'. Correct: {\"action\":\"skip-node\",\"runId\":\"<id>\",\"callId\":<number>}", true);
-  }
-  const run = deps.runs.get(runId);
-  if (!run) {
-    return textResult(
-      `Workflow '${runId}' not found. Use action:status to list active runs and their runIds.`,
-      true,
-    );
-  }
-  try {
-    await skipNode(run, callId, deps);
-    return {
-      content: [
-        { type: "text", text: `Skipped call ${callId} in run ${runId.slice(0, RUNID_SHORT)}.` },
-      ],
-      details: { action: "skip-node", runId, callId },
-    };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    return textResult(`Error: ${msg}`, true);
-  }
-}
-
 // ── helpers ──────────────────────────────────────────────────
 
 /** WorkflowRun → 摘要（status action 用）。 */

package/src/orchestration/error-recovery.ts

@@ -492,8 +492,8 @@ function postAgentResult(
  * 更新 spent()/remaining()）。每次 agent 调用消费 usage 后发送，保持 worker 内 $BUDGET
  * 与主线程 Budget 值对象同步。
  *
- * D-12 regression fix (round-2 #1)：重建 budget-update 发送方。被 error-recovery（dispatch
- * 后）和 node-ops（retry/skip 后）共用——单一实现，避免消息形状漂移。
+ * D-12 regression fix (round-2 #1)：重建 budget-update 发送方。被 error-recovery 主路径调用
+ * （dispatch 后同步 worker $BUDGET）——单一实现，避免消息形状漂移。
  */
 export function postBudgetUpdate(run: WorkflowRun): void {
   run.runtime?.worker.postMessage({

package/src/orchestration/models/ports.ts

@@ -5,7 +5,7 @@
  * 是真需要 mock 测试的依赖（子进程/文件系统/线程）。
  *
  * 编排层共享类型（WorkerHandlers / LifecycleDeps）——打破 lifecycle ↔
- * error-recovery ↔ node-ops 循环依赖：3 个 engine 函数文件各自独立，共用同一组
+ * error-recovery 循环依赖：2 个 engine 函数文件各自独立，共用同一组
  * 依赖签名（D-12）。
  *
  * 层归属：Engine。零 infra 依赖（AC-1）。
@@ -72,7 +72,7 @@ export interface WorkerHost {
 
 /**
  * Worker 线程事件回调集合——WorkerHost.start 的入参，由 lifecycle
- * 构造并注入。3 个 engine 文件（lifecycle / error-recovery / node-ops）共用此签名，
+ * 构造并注入。2 个 engine 文件（lifecycle / error-recovery）共用此签名，
  * 避免各自定义形状不一致的 handler bag（打破循环依赖）。
  *
  * 所有回调返回 Promise——允许 engine 层在回调内做 await persistState 等异步操作。
@@ -89,7 +89,7 @@ export interface WorkerHandlers {
 // ── 编排层共享类型 2: LifecycleDeps ────────────────────────────
 
 /**
- * lifecycle / error-recovery / node-ops 3 个 engine 函数文件的共同依赖 bag。
+ * lifecycle / error-recovery 2 个 engine 函数文件的共同依赖 bag。
  *
  * 取代旧 4 个 Context factory（errorHandlerContext / agentCallContext /
  * budgetCallbacks / 旧 terminate bag，AC-2 目标）。函数签名 `(deps: LifecycleDeps, ...)`

package/src/orchestration/models/workflow-run.ts

@@ -23,7 +23,7 @@
  * （runtime=undefined）。AbortController 一次性无法复用。
  * - resume 走 assignRuntime(new RunRuntime(...))，重建 worker/gate/controller。
  *
- * retryNode / worker-error-retry（G5-001 + G6-001）：
+ * worker-error-retry（G5-001 + G6-001）：
  * - replaceRuntime(newRt): 前置 status==="running"（G6-001），原子释放前一个 runtime
  * + 绑定新 runtime，全程保持不变式 I1（中间不经过 runtime===undefined 的可见状态）。
  * - paused 状态下 retry 被拒（要 retry 先 resume）。
@@ -243,11 +243,11 @@ export class WorkflowRun {
     this.runtime.release("pause");
     this.runtime = undefined;
  // 不改 status——调用方（transition）负责。独立调用时调用方需自行确保
- // status 一致（如 retryNode 用 replaceRuntime 而非 release+assign）。
+ // status 一致（如 worker-error-retry 用 replaceRuntime 而非 release+assign）。
   }
 
  /**
- * 原地替换 runtime（G5-001：retryNode / worker-error-retry）。
+ * 原地替换 runtime（G5-001：worker-error-retry）。
  *
  * 前置：status==="running"（G6-001：paused 下拒绝，要 retry 先 resume）。
  * 原子地：释放旧 runtime（worker.terminate + abort）+ 绑定新 runtime，

package/src/orchestration/worker-script-builder.ts

@@ -116,7 +116,7 @@ export function buildWorkerScript(userScript: string): string {
     '        // 把单点失败放大成整批崩溃。改为始终 resolve（错误时回退到 content 文本），',
     '        // 让 parallel() 下的脚本容错循环（parseResult → null → skip）自然接管。',
     '        // 错误原因已由主线程 executeAgentCall → trace.update(result.error) 保留在 trace/TUI，',
-    '        // 不丢失。skipNode 的 SKIP_PLACEHOLDER（无 error，resolve 为 ""）已确立此先例。',
+    '        // 不丢失。失败 resolve 为空字符串是既定容错策略。',
     '        // parsedOutput: validated data object from structured-output execute().',
     '        // Fallback to content (raw text) when no schema was requested or on error.',
     '        pending.resolve(msg.result.parsedOutput ?? msg.result.content);',