@zhushanwen/pi-subagent-workflow 9.3.0 → 9.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-subagent-workflow",
-  "version": "9.3.0",
+  "version": "9.4.1",
   "type": "module",
   "main": "index.ts",
   "description": "Unified subagent execution and multi-agent workflow orchestration for Pi — spawned-process agent runtime with sync/background modes, stateful workflow management with persistence, state machine, and execution tracing.",
@@ -58,22 +58,22 @@
     ]
   },
   "dependencies": {
-    "@zhushanwen/extension-protocol": "0.18.0",
+    "@zhushanwen/extension-protocol": "0.20.0",
     "@zhushanwen/session-delivery": "1.1.0",
-    "@zhushanwen/pi-ext-guards": "0.4.3",
+    "@zhushanwen/pi-ext-guards": "0.4.4",
     "@zhushanwen/pi-extension-logger": "0.6.2",
-    "@zhushanwen/pi-notify-ledger-host": "0.3.0",
-    "@zhushanwen/subagent-core": "1.3.0",
-    "@zhushanwen/pi-subagent-cli": "0.6.0",
-    "@zhushanwen/zcode-subagent-cli": "0.5.0"
+    "@zhushanwen/pi-notify-ledger-host": "0.3.2",
+    "@zhushanwen/subagent-core": "1.5.0",
+    "@zhushanwen/pi-subagent-cli": "0.7.1",
+    "@zhushanwen/zcode-subagent-cli": "0.7.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^1.0.0",
     "@earendil-works/pi-coding-agent": "^1.0.0",
     "@earendil-works/pi-tui": "^1.0.0",
     "typebox": "1.3.27",
-    "@zhushanwen/pi-pending-notifications": "0.8.2",
-    "@zhushanwen/pi-structured-output": "6.1.0"
+    "@zhushanwen/pi-pending-notifications": "0.8.4",
+    "@zhushanwen/pi-structured-output": "6.1.1"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-coding-agent": {
@@ -87,7 +87,7 @@
     "@types/node": "^24.0.0",
     "@vitest/coverage-v8": "^4.1.9",
     "vitest": "^4.1.8",
-    "@zhushanwen/subagent-engine-sdk": "0.9.0"
+    "@zhushanwen/subagent-engine-sdk": "0.10.1"
   },
   "scripts": {
     "typecheck": "npx tsc --noEmit",

package/src/host/pi-host.ts

@@ -107,12 +107,15 @@ export function corePackageNpmRoot(moduleUrl: string = import.meta.url): string
  * `<Resources>/extensions/@zhushanwen/pi-subagent-workflow/index.js`），其**父目录**
  * 正是 `@zhushanwen` scope 目录——npm 槽语义（"一级子项 = 包目录"）恰好成立，
  * 于是可直接当 npm 槽根用：约定目录扫描即命中
- * `pi-subagent-workflow/{workflows,agents}`（两目录由 `scripts/bundle-extensions.mjs`
- * 随包拷贝；`pi.agents`/`pi.workflows` manifest 约定及其"声明路径不存在 → 整包失败
- * 占位"语义是 subagent-core resource-discovery 的 taiji 自建规则，权威源 =
- * resource-discovery.ts processPackage——pi 上游 manifest 只有
- * extensions/skills/prompts/themes 四字段，无 agents/workflows 概念。已核仓内无任何
- * 包声明该字段，故扫描面内所有包都走约定目录分支，不进 manifest 失败分支）。
+	 * `pi-subagent-workflow/{workflows,agents}`（两目录由 `scripts/bundle-extensions.mjs`
+	 * 随包拷贝；`pi.agents`/`pi.workflows` manifest 约定及其"声明路径不存在 → 整包失败
+	 * 占位"语义是 subagent-core resource-discovery 的 taiji 自建规则，权威源 =
+	 * resource-discovery.ts processPackage——pi 上游 manifest 只有
+	 * extensions/skills/prompts/themes 四字段（锚 = pi-coding-agent
+	 * dist/core/pi-manifest.js:3 RESOURCE_FIELDS，pi@1.0.0 已核；同源登记见
+	 * docs/extensions/extension-conventions.md「readPiManifest」条），无 agents/workflows
+	 * 概念。已核仓内无任何包声明该字段，故扫描面内所有包都走约定目录分支，不进
+	 * manifest 失败分支）。
  *
  * 与 dev/npm 形态的既有语义一致：npm 槽根扫的就是 scope 下全部包目录（因此本包自带
  * 的 workflows/agents 在 dev/npm 形态同样入发现面），非新增语义。

package/src/index.ts

@@ -2,7 +2,7 @@
  * subagent-workflow Extension — Factory（extension 装配点）
  *
  * 合并 @zhushanwen/pi-subagents + @zhushanwen/pi-workflow 为统一包。
- * 注册项：4 tool（subagent + subagents + workflow + workflow-script）+ 2 command（subagents + workflows）
+ * 注册项：4 tool（subagent + subagents + workflow + workflow-script）+ 3 command（subagents + workflows + subagent-model）
  * + messageRenderer（subagent-bg-notify）+ session 事件。
  *
  * 包内结构（执行运行时已迁 packages/subagent-core，本包只留注册面与宿主适配）：
@@ -52,6 +52,8 @@ import { registerWorkflowsCommand } from "./interface/command/commands.ts";
 import { registerSubagentTool } from "./interface/tool/subagent-tool.ts";
 // ═══ interface/ 层（tools/commands/tui 合并） ═══
 import { registerSubagentsCommand } from "./interface/command/subagents.ts";
+// [subagent-model-switch U6] 模型切换 RPC 通道消费端（§7.1.1，runtime 出站点 prompt 触达）
+import { registerSubagentModelCommand } from "./interface/command/subagent-model.ts";
 import { registerSubagentsTool } from "./interface/tool/tool-subagents.ts";
 import { registerWorkflowTool } from "./interface/tool/tool-workflow.ts";
 import { registerWorkflowScriptTool } from "./interface/tool/tool-workflow-script.ts";
@@ -143,6 +145,7 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
   // ════════════════════════════════════════════════════════════
   registerSubagentTool(pi);
   registerSubagentsCommand(pi);
+  registerSubagentModelCommand(pi);
   pi.registerMessageRenderer(SUBAGENT_BG_NOTIFY_CUSTOM_TYPE, renderBgNotifyMessage);
 
   // ════════════════════════════════════════════════════════════
@@ -226,7 +229,7 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
   process.on("beforeExit", reapSpawnedChildrenOnShutdown);
 
   // ════════════════════════════════════════════════════════════
-  //  Tools（3 个）+ Commands（2 个）—— 注册面
+  //  Tools（3 个）+ Commands（3 个）—— 注册面
   //
   //  lazyDeps / isScriptRunning / registry 由 workflow-events.ts 装配结果提供。
   //  guard：workflow tool 与 subagents（批量派发入口）共用同一 guard——两者是同一条

package/src/interface/command/__tests__/commands-resume.test.ts

@@ -1,13 +1,13 @@
 /**
- * /workflows 命令的 resume 通道契约（workflow-run-resume-revision U3）。
+ * /workflows 命令的 resume 通道契约（workflow-run-resume-revision U3 + F1-26 后续项）。
  *
- * 覆盖面（TUI 模式）：/workflows resume <runId> → 执行断点续跑后 notify，不打开
- * 面板；缺 runId → Usage 提示；resumeRun 拒绝 → warning notify 透出恢复指引文案。
+ * 覆盖面（TUI 模式）：/workflows resume <runId> [model] → 执行断点续跑后 notify，
+ * 不打开面板；缺 runId → Usage 提示（含可选 [model]）；resumeRun 拒绝 → warning
+ * notify 透出恢复指引文案；显式 model 的 handler 透传（第三参 { model } / 无 model
+ * 不落键）与目录预检拒单（与 tool 通道同款 D8 语义）。
  *
- * RPC 模式（taiji GUI）的 resume verb 接线未随 U3 落地：解析词表在
- * command-actions.ts（领地外，resume verb 现仍解析为 lifecycle-removed），其
- * dispatch 断言由 src/__tests__/rpc-command-handling.test.ts 原样锁定——词表
- * 适配归编排层（见 commands.ts handleRpcMode 注释）。workflow tool 通道
+ * RPC 模式（taiji GUI）的 resume verb 接线与 model 透传由
+ * src/__tests__/rpc-command-handling.test.ts 覆盖；workflow tool 通道
  * （action:"resume"，含 D14 args 校验）由 tool-workflow-resume.test.ts 覆盖。
  *
  * mock 策略：resume-run 深路径 stub（对齐 tool-workflow-resume.test.ts）；命令
@@ -19,6 +19,7 @@ import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 
 // 被 mock 的模块——import 路径与被测源文件的等值实例（对齐 tool-workflow-resume.test.ts）
 import { resumeRun } from "@zhushanwen/subagent-core/orchestration/resume-run.ts";
+import { setModelConfigService, GLOBAL_SLOT_KEYS } from "@zhushanwen/subagent-core";
 
 import { registerWorkflowsCommand } from "../commands.ts";
 
@@ -66,9 +67,26 @@ function makeCtx(mode: "rpc" | "tui"): { ctx: ExtensionCommandContext; notifies:
   return { ctx: ctx as never, notifies };
 }
 
+/** 重置进程级 ModelConfigService 单例槽（model catalog 预检用例的注入/清理，
+ *  Symbol 直写——key 与生产 getModelServiceSlot 的 MODEL_SERVICE_SLOT_KEY 一致）。 */
+function resetModelServiceSlot(): void {
+  const slot = Reflect.get(globalThis, Symbol.for(GLOBAL_SLOT_KEYS.modelService)) as
+    | { current: unknown }
+    | undefined;
+  if (slot) slot.current = null;
+}
+
+/** 注入目录为 entries 的最小 ModelConfigService fake（duck-typed getAvailable）。 */
+function injectModelServiceWith(entries: Array<{ provider: string; id: string }>): void {
+  setModelConfigService({
+    getModelRegistry: () => ({ getAvailable: () => entries }),
+  } as never);
+}
+
 beforeEach(() => {
   vi.mocked(resumeRun).mockReset();
   vi.mocked(resumeRun).mockResolvedValue("wf-x");
+  resetModelServiceSlot();
 });
 
 // ── TUI 模式 ─────────────────────────────────────────────────
@@ -79,17 +97,44 @@ describe("/workflows TUI resume", () => {
     const { ctx, notifies } = makeCtx("tui");
     await cmd.handler("resume wf-x", ctx);
     expect(vi.mocked(resumeRun)).toHaveBeenCalledWith("wf-x", expect.anything());
+    // 无 model 不落键：调用恰为 (runId, deps) 两参（spread 条件反写不会静默通过）
+    expect(vi.mocked(resumeRun).mock.calls[0]).toHaveLength(2);
     expect(notifies).toHaveLength(1);
     expect(notifies[0]!.msg).toContain("resuming");
     expect(notifies[0]!.level).toBe("info");
   });
 
+  it("resume <runId> <model> → resumeRun 第三参 { model } 透传 + notify 带模型", async () => {
+    injectModelServiceWith([{ provider: "p2", id: "m2" }]);
+    const cmd = captureCommand();
+    const { ctx, notifies } = makeCtx("tui");
+    await cmd.handler("resume wf-x p2/m2:high", ctx);
+    expect(vi.mocked(resumeRun)).toHaveBeenCalledWith("wf-x", expect.anything(), {
+      model: "p2/m2:high",
+    });
+    expect(notifies[0]!.msg).toContain("resuming with model p2/m2:high");
+    expect(notifies[0]!.level).toBe("info");
+  });
+
+  it("resume 显式 model 目录查无 → 同步拒单 warning（tool 通道同款 D8 语义，不落覆盖记账）", async () => {
+    injectModelServiceWith([{ provider: "p1", id: "m1" }]);
+    const cmd = captureCommand();
+    const { ctx, notifies } = makeCtx("tui");
+    await cmd.handler("resume wf-x pX/nope", ctx);
+    // 目录查无在 resumeRun 之前拒绝——不产生假成功 notify
+    expect(vi.mocked(resumeRun)).not.toHaveBeenCalled();
+    expect(notifies).toHaveLength(1);
+    expect(notifies[0]!.msg).toContain("Failed to resume workflow wf-x:");
+    expect(notifies[0]!.msg).toContain("pX/nope");
+    expect(notifies[0]!.level).toBe("warning");
+  });
+
   it("resume 缺 runId → Usage warning", async () => {
     const cmd = captureCommand();
     const { ctx, notifies } = makeCtx("tui");
     await cmd.handler("resume", ctx);
     expect(vi.mocked(resumeRun)).not.toHaveBeenCalled();
-    expect(notifies[0]).toMatchObject({ msg: "Usage: /workflows resume <runId>", level: "warning" });
+    expect(notifies[0]).toMatchObject({ msg: "Usage: /workflows resume <runId> [model]", level: "warning" });
   });
 
   it("resumeRun 拒绝 → warning notify（TUI 同款透出）", async () => {

package/src/interface/command/__tests__/subagent-model.test.ts

@@ -0,0 +1,242 @@
+/**
+ * /subagent-model 命令 handler 测试（subagent-model-switch §7.1.1，U6）。
+ *
+ * 覆盖（通道契约：全程不抛 + 一切结果落结果文件）：
+ * - 合法 payload → service.setModel 桩 → 结果文件内容 = 应答（core SetModelReply 原样）；
+ * - service.setModel 抛错 → 错误 envelope 文件且 handler 不抛；
+ * - 非法 JSON（无 requestId）→ 零文件 + handler 不抛（runtime 超时路径承接）；
+ * - 字段校验失败（requestId 在场）→ invalid_payload envelope；
+ * - service 未就绪 → subagent_runtime_not_ready envelope；
+ * - 注册形态：命令名 / TUI 模式指引（内部 RPC 通道，无 TUI 分支）。
+ *
+ * mock 策略：runSubagentModelRpc 依赖注入面直驱（不 mock barrel）；落盘全在 mkdtemp tmp。
+ * 运行：cd extensions/universal/subagent-workflow && npx vitest run src/interface/command/__tests__/subagent-model.test.ts
+ */
+import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+
+import { registerSubagentModelCommand, runSubagentModelRpc } from "../subagent-model.ts";
+import type { SubagentModelCommandDeps } from "../subagent-model.ts";
+
+// ── fixture ──────────────────────────────────────────────────
+
+let root: string;
+
+beforeEach(() => {
+  root = mkdtempSync(join(tmpdir(), "subagent-model-cmd-"));
+});
+
+afterEach(() => {
+  rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
+});
+
+interface StubService { // oe-exempt:20261006:test:测试专用服务桩装配单实现为常态
+  setModel: ReturnType<typeof vi.fn>;
+  chatActions: { getRecordForAction: ReturnType<typeof vi.fn> };
+}
+
+function stubService(): StubService {
+  return {
+    setModel: vi.fn(async () => ({
+      scope: "chat",
+      reply: { kind: "recorded", notice: "已记录，下次执行生效。" },
+    })),
+    chatActions: {
+      getRecordForAction: vi.fn(() => ({ id: "sa-1" }) as never),
+    },
+  };
+}
+
+function deps(service: StubService | null): { deps: SubagentModelCommandDeps; resultsDir: string } {
+  const resultsDir = join(root, "results");
+  return {
+    deps: {
+      getService: () => service as never,
+      resolveAgentDir: () => join(root, "agent"),
+      // rootCwd 作为 enc 编码键——结果目录 = <agentDir>/subagents/<enc(cwd)>/model-switch
+      resolveRootCwd: () => join(root, "proj"),
+    },
+    resultsDir,
+  };
+}
+
+function rpcCtx(mode: "rpc" | "tui" = "rpc"): { ctx: ExtensionCommandContext; notifies: Array<{ msg: string; level: string }> } {
+  const notifies: Array<{ msg: string; level: string }> = [];
+  const ctx = {
+    mode,
+    ui: { notify: (msg: string, level: string) => notifies.push({ msg, level }) },
+    cwd: join(root, "proj"),
+  };
+  return { ctx: ctx as never, notifies };
+}
+
+const VALID_ARGS = JSON.stringify({
+  requestId: "req-abc",
+  recordId: "sa-1",
+  provider: "zai-coding-cn",
+  modelId: "glm-5.3-flash",
+  thinkingLevel: "high",
+});
+
+function resultFile(requestId: string): string {
+  // enc 段镜像 core encodeCwd（布局单源在 path-encoding.ts，测试只按同式派生锚）。
+  const enc = "--" + join(root, "proj").replace(/^[/\\]/, "").replace(/[/\\:]/g, "-") + "--";
+  return join(root, "agent", "subagents", enc, "model-switch", `${requestId}.json`);
+}
+
+// ── 成功路 ───────────────────────────────────────────────────
+
+describe("/subagent-model — 成功路（payload → setModel → 结果文件）", () => {
+  it("合法 payload：setModel 桩收到 target/model/thinkingLevel，结果文件 = 应答原样", async () => {
+    const service = stubService();
+    const { deps: d } = deps(service);
+    const { ctx } = rpcCtx();
+
+    await runSubagentModelRpc(d, VALID_ARGS, ctx);
+
+    expect(service.chatActions.getRecordForAction).toHaveBeenCalledWith("sa-1");
+    expect(service.setModel).toHaveBeenCalledWith(
+      { domain: "chat", record: { id: "sa-1" } },
+      { provider: "zai-coding-cn", modelId: "glm-5.3-flash" },
+      "high",
+    );
+    const raw = readFileSync(resultFile("req-abc"), "utf8");
+    expect(JSON.parse(raw)).toEqual({ scope: "chat", reply: { kind: "recorded", notice: "已记录，下次执行生效。" } });
+  });
+
+  it("runId 目标：workflow-run 域分流（不触 getRecordForAction）", async () => {
+    const service = stubService();
+    const { deps: d } = deps(service);
+    const { ctx } = rpcCtx();
+
+    const args = JSON.stringify({ requestId: "req-run", runId: "wf-1", provider: "p", modelId: "m" });
+    await runSubagentModelRpc(d, args, ctx);
+
+    expect(service.chatActions.getRecordForAction).not.toHaveBeenCalled();
+    expect(service.setModel).toHaveBeenCalledWith({ domain: "workflow-run", runId: "wf-1" }, { provider: "p", modelId: "m" }, undefined);
+  });
+
+  it("handler 不抛（即使 setModel 桩 resolve 失败也不向上传播）", async () => {
+    const service = stubService();
+    service.setModel.mockResolvedValue({ scope: "error", message: "目录无此模型（最接近的候选：X）" });
+    const { deps: d } = deps(service);
+    const { ctx } = rpcCtx();
+
+    await expect(runSubagentModelRpc(d, VALID_ARGS, ctx)).resolves.toBeUndefined();
+    const envelope = JSON.parse(readFileSync(resultFile("req-abc"), "utf8")) as { scope: string };
+    expect(envelope.scope).toBe("error");
+  });
+});
+
+// ── 失败路：envelope 且不抛 ──────────────────────────────────
+
+describe("/subagent-model — 失败路（envelope 落盘 + 全程不抛）", () => {
+  it("service.setModel 抛错：错误 envelope 文件 + handler 不抛", async () => {
+    const service = stubService();
+    service.setModel.mockRejectedValue(Object.assign(new Error("thinking 档位 max 在模型 X 上不可用"), { code: "thinking_level_unavailable" }));
+    const { deps: d } = deps(service);
+    const { ctx } = rpcCtx();
+
+    await expect(runSubagentModelRpc(d, VALID_ARGS, ctx)).resolves.toBeUndefined();
+
+    const envelope = JSON.parse(readFileSync(resultFile("req-abc"), "utf8")) as {
+      error: { code: string; message: string; recovery: string };
+    };
+    expect(envelope.error.code).toBe("thinking_level_unavailable");
+    expect(envelope.error.message).toContain("不可用");
+    expect(envelope.error.recovery).toContain("重试切换");
+  });
+
+  it("getRecordForAction 抛错（目标不存在）：envelope + handler 不抛", async () => {
+    const service = stubService();
+    service.chatActions.getRecordForAction.mockImplementation(() => {
+      throw new Error("record sa-ghost not found");
+    });
+    const { deps: d } = deps(service);
+    const { ctx } = rpcCtx();
+
+    await expect(runSubagentModelRpc(d, VALID_ARGS, ctx)).resolves.toBeUndefined();
+
+    const envelope = JSON.parse(readFileSync(resultFile("req-abc"), "utf8")) as { error: { code: string } };
+    expect(envelope.error.code).toBe("subagent_model_switch_failed");
+  });
+
+  it("非法 JSON（无 requestId）：零文件 + handler 不抛 + warning notify", async () => {
+    const { deps: d } = deps(stubService());
+    const { ctx, notifies } = rpcCtx();
+
+    await expect(runSubagentModelRpc(d, "not-json{", ctx)).resolves.toBeUndefined();
+    expect(existsSync(resultFile("req-abc"))).toBe(false);
+    expect(notifies[0]?.level).toBe("warning");
+  });
+
+  it("字段校验失败（缺 provider）：invalid_payload envelope", async () => {
+    const { deps: d } = deps(stubService());
+    const { ctx } = rpcCtx();
+
+    const args = JSON.stringify({ requestId: "req-bad", recordId: "sa-1", modelId: "m" });
+    await runSubagentModelRpc(d, args, ctx);
+
+    const envelope = JSON.parse(readFileSync(resultFile("req-bad"), "utf8")) as {
+      error: { code: string; message: string };
+    };
+    expect(envelope.error.code).toBe("invalid_payload");
+    expect(envelope.error.message).toContain("provider");
+  });
+
+  it("recordId 与 runId 双给：invalid_payload envelope（wire 契约二选一）", async () => {
+    const { deps: d } = deps(stubService());
+    const { ctx } = rpcCtx();
+
+    const args = JSON.stringify({ requestId: "req-both", recordId: "sa-1", runId: "wf-1", provider: "p", modelId: "m" });
+    await runSubagentModelRpc(d, args, ctx);
+
+    const envelope = JSON.parse(readFileSync(resultFile("req-both"), "utf8")) as { error: { code: string } };
+    expect(envelope.error.code).toBe("invalid_payload");
+  });
+
+  it("service 未就绪（session_start 前）：subagent_runtime_not_ready envelope", async () => {
+    const { deps: d } = deps(null);
+    const { ctx } = rpcCtx();
+
+    await runSubagentModelRpc(d, VALID_ARGS, ctx);
+
+    const envelope = JSON.parse(readFileSync(resultFile("req-abc"), "utf8")) as { error: { code: string } };
+    expect(envelope.error.code).toBe("subagent_runtime_not_ready");
+  });
+});
+
+// ── 注册形态 ─────────────────────────────────────────────────
+
+describe("registerSubagentModelCommand — 注册形态", () => {
+  interface CapturedCommand { // oe-exempt:20261006:test:测试专用命令捕获结构单实现为常态（同 commands-resume.test.ts 先例）
+    name: string;
+    description: string;
+    handler: (args: string, ctx: ExtensionCommandContext) => Promise<void>;
+  }
+
+  function captureCommand(): CapturedCommand {
+    const commands: CapturedCommand[] = [];
+    const api = {
+      registerCommand: (name: string, def: Omit<CapturedCommand, "name">) => {
+        commands.push({ name, ...def });
+      },
+    };
+    registerSubagentModelCommand(api as never);
+    expect(commands).toHaveLength(1);
+    return commands[0]!;
+  }
+
+  it("命令名 = subagent-model；TUI 模式 = 指引提示（内部 RPC 通道无 TUI 分支）", async () => {
+    const cmd = captureCommand();
+    expect(cmd.name).toBe("subagent-model");
+    const { ctx, notifies } = rpcCtx("tui");
+    await cmd.handler(VALID_ARGS, ctx);
+    expect(notifies[0]?.level).toBe("warning");
+    expect(notifies[0]?.msg).toContain("internal taiji GUI channel");
+  });
+});

package/src/interface/command/command-actions.ts

@@ -22,7 +22,7 @@ export type SubagentRpcAction =
 /** /workflows RPC action 判别联合。 */
 export type WorkflowRpcAction =
   | { action: "abort"; runId: string }
-  | { action: "resume"; runId: string }
+  | { action: "resume"; runId: string; model?: string }
   | { action: "lifecycle-missing-id"; verb: "abort" | "resume" }
   | { action: "lifecycle-removed"; verb: "pause" }
   | { action: "noop" };
@@ -128,8 +128,9 @@ export function parseSubagentRpcCommand(argsStr: string): SubagentRpcAction {
  * 支持格式：
  * - `abort <runId>` → { action: "abort", runId }
  * - `abort`（无 runId）→ { action: "lifecycle-missing-id", verb: "abort" }
- * - `resume <runId>` → { action: "resume", runId }（断点续跑——与 TUI verb、
- *   workflow tool action:"resume" 三通道同语义）
+ * - `resume <runId> [model]` → { action: "resume", runId, model? }（断点续跑——与
+ *   TUI verb、workflow tool action:"resume" 三通道同语义；model 可选 canonical ref
+ *   'provider/modelId[:thinkingLevel]'，落统一覆盖记账——F1-26 后续项）
  * - `resume`（无 runId）→ { action: "lifecycle-missing-id", verb: "resume" }
  * - `pause ...`（已移除的 lifecycle verb，带或不带 runId 均同）→
  *   { action: "lifecycle-removed", verb: "pause" }——removed verb 优先于 missing-id 判定
@@ -140,7 +141,7 @@ export function parseWorkflowRpcCommand(argsStr: string): WorkflowRpcAction {
   const args = argsStr.trim().split(/\s+/).filter(Boolean);
   if (args.length === 0) return { action: "noop" };
 
-  const [verb, runId] = args;
+  const [verb, runId, model] = args;
   if (isRemovedLifecycleVerb(verb)) {
     return { action: "lifecycle-removed", verb };
   }
@@ -149,7 +150,7 @@ export function parseWorkflowRpcCommand(argsStr: string): WorkflowRpcAction {
     if (!runId) return { action: "lifecycle-missing-id", verb };
     return verb === "abort"
       ? { action: "abort", runId }
-      : { action: "resume", runId };
+      : { action: "resume", runId, ...(model !== undefined ? { model } : {}) };
   }
   return { action: "noop" };
 }