@zhushanwen/pi-subagent-workflow 8.14.7 → 9.0.1

package/src/interface/views/WorkflowsView.ts

@@ -48,6 +48,9 @@ import {
   statusDotStr,
   type ThemeLike,
 } from "../format.ts";
+// [W2/V1 D1 分流表第 9 行] CLI 视图显示换源：投影二值 status（混合判源收拢在
+// displayStatusOf 单点——判源 = core runSummary 投影）。
+import { displayStatusOf } from "../tool-workflow.ts";
 import {
   b,
   dashes,
@@ -186,7 +189,7 @@ export function collectNodeLiveProgress(
  *
  * | 签名字段 | 消费点 |
  * |---|---|
- * | run.state.status | WorkflowsView.ts renderHeader（statusDotStr+statusLabel 同串源）/ detail-content.ts statusLabel（statusDotStr 调用处）/ renderFooter |
+ * | displayStatusOf(run) 投影二值（[W2/V1 D1 第 6 行] 混合判源单点——v2 fold/注册表投影 ∨ v1 聚合读面）| WorkflowsView.ts renderHeader（statusDotStr+statusLabel 同串源）/ detail-content.ts statusLabel（statusDotStr 调用处）/ renderFooter |
  * | 秒桶 Math.floor(now/1000) | renderHeader formatElapsed（现算 elapsed）+ detail-content.ts（now 参与未完成节点 elapsed）|
  * | completed/total（节点 status 推导）| renderHeader |
  * | budget 量化值（tokens round-k + cost toFixed(4)=BUDGET_COST_DECIMALS，与 renderHeader budgetStr 同精度——第 3-4 位小数变化是可见变化）| renderHeader / saveTraceToFile |
@@ -230,7 +233,7 @@ export function computeRenderSignature(
     const l = liveProgress.get(n.stepIndex);
     return `${n.stepIndex}:${n.status}:${n.sessionFile ?? "-"}:${l?.totalTokens ?? -1}:${l?.toolCallCount ?? -1}:${l?.elapsedSeconds ?? -1}:${l?.turns ?? -1}:${l?.eventLog.length ?? -1}:${l?.currentActivity ? `${l.currentActivity.type}:${l.currentActivity.label}` : "-"}:${l?.lastError ?? "-"}`;
   });
-  return [run.state.status, Math.floor(now / SECOND_MS), `${completed}/${traceArr.length}`, budgetPart, errorLogsPart, ...nodeParts].join("|");
+  return [displayStatusOf(run), Math.floor(now / SECOND_MS), `${completed}/${traceArr.length}`, budgetPart, errorLogsPart, ...nodeParts].join("|");
 }
 
 // ── View state ────────────────────────────────────────────────
@@ -281,7 +284,7 @@ function createInitialState(): ViewState {
 /**
  * 创建 workflow fullscreen view。
  *
- * @param run WorkflowRun 聚合根（读 state.status/spec/trace/meta）
+ * @param run WorkflowRun 聚合根（读 displayStatusOf 投影二值/spec/trace/meta）
  * @param theme ThemeLike（避免直接 import Pi runtime）
  * @param ctx ExtensionContext（调 ui.custom 渲染 + ui.notify 错误反馈）
  * @param actions lifecycle 操作（abort），由调用方注入
@@ -496,7 +499,7 @@ export function createWorkflowsView(
     function handleShortcutKeys(data: string): void {
  // ── Lifecycle shortcuts (no restart per D-9; no pause/resume — one-shot) ──
       if (data === "a") {
-        if (run.state.status === "running") {
+        if (displayStatusOf(run) === "running") {
           void actions.abort(run.runId)
             .then(() => { cache.key = undefined; requestRender(); })
             .catch((err: Error) => ctx.ui.notify(`Abort failed: ${err.message}`, "error"));
@@ -703,7 +706,7 @@ function renderHeader(
   const completed = traceArr.filter((n) => n.status === "completed").length;
   const total = traceArr.length;
   const elapsed = formatElapsed(run.meta.startedAt);
-  const headerRight = `${formatStatusBadge(run.state.status, theme)} · ${completed}/${total} agents · ${elapsed}`;
+  const headerRight = `${formatStatusBadge(displayStatusOf(run), theme)} · ${completed}/${total} agents · ${elapsed}`;
   const budget = run.state.budget;
   const budgetStr = `${Math.round(budget.usedTokens / BUDGET_TOKENS_DIVISOR)}k/${budget.maxTokens ? `${Math.round(budget.maxTokens / BUDGET_TOKENS_DIVISOR)}k` : "∞"} tok · $${budget.usedCost.toFixed(BUDGET_COST_DECIMALS)}`;
 
@@ -746,7 +749,7 @@ function renderFooter(
       ? "↑↓ agent · ⏎ detail"
       : "↑↓ agent · ⏎ prompt · PgUp/PgDn scroll";
   const actionParts: string[] = [];
-  if (run.state.status === "running") {
+  if (displayStatusOf(run) === "running") {
     actionParts.push("a abort");
   }
   actionParts.push("s save");
@@ -1055,7 +1058,7 @@ function saveTraceToFile(run: WorkflowRun, ctx: ExtensionContext): void {
 function traceHeaderLines(run: WorkflowRun): string[] {
   const lines: string[] = [];
   lines.push(`# Workflow Trace: ${run.spec.scriptName} (${run.runId})`, "");
-  lines.push(`Status: ${run.state.status} | Started: ${run.meta.startedAt ?? "-"} | Duration: ${formatElapsed(run.meta.startedAt)}`);
+  lines.push(`Status: ${displayStatusOf(run)} | Started: ${run.meta.startedAt ?? "-"} | Duration: ${formatElapsed(run.meta.startedAt)}`);
   const budget = run.state.budget;
   lines.push(`Budget: ${budget.usedTokens}/${budget.maxTokens ?? "unlimited"} tokens, $${budget.usedCost.toFixed(BUDGET_COST_DECIMALS)}`, "");
   return lines;

package/src/interface/views/__tests__/{WorkflowsView-signature.test.ts → WorkflowsView.test.ts}

@@ -1,5 +1,8 @@
 /**
- * computeRenderSignature（IF11/TC7/DM6）— 渲染签名单测（now 参数化）。
+ * WorkflowsView 纯函数三块合一（同被测文件 views/WorkflowsView.ts 及其 companion
+ * detail-content.ts）：渲染签名 / live 配对 / detail session 路径行，fixture 同族共享。
+ *
+ * ── computeRenderSignature（IF11/TC7/DM6）— 渲染签名单测（now 参数化） ──
  *
  * 契约：tick 条件失效的判据——签名字段集覆盖 header（renderHeader）/节点行
  * （renderLevel1 agent list）/L2 detail（buildDetailContent）当前消费的全部动态
@@ -10,8 +13,7 @@
  * （Map<stepIndex, LiveProgressView>，经 collectNodeLiveProgress 配对注入）——
  * 字段口径不变（totalTokens/toolCallCount/elapsedSeconds/turns/eventLog.length/
  * currentActivity/lastError），本文件用 makeLiveView 直接构造投影驱动「已入字段
- * 变 → 签名变」；投影与旧 projectLiveProgress 的逐字段等价性见
- * record-progress.test.ts（双路径对齐断言）。
+ * 变 → 签名变」。
  *
  * 确定性说明：签名非完全纯——live 投影的 elapsedSeconds 由 projectRecordProgress
  * 内 computeElapsedSeconds 现算（record.endedAt ?? Date.now()）。fake timers 控制
@@ -19,13 +21,16 @@
  */
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 
-import { computeRenderSignature } from "../WorkflowsView.ts";
 import type { LiveProgressView } from "../detail-content.ts";
+import { buildDetailContent } from "../detail-content.ts";
+import type { ThemeLike } from "../../format.ts";
+import { collectNodeLiveProgress, computeRenderSignature } from "../WorkflowsView.ts";
 import type { AgentEventLogEntry } from "@zhushanwen/subagent-core";
 import type { ExecutionTraceNode, WorkerLogEntry } from "@zhushanwen/subagent-core";
+import type { SubagentRecord } from "@zhushanwen/subagent-core";
 import type { WorkflowRun } from "@zhushanwen/subagent-core";
 
-// ── Fixtures（duck typing，对齐 detail-content-session-file.test.ts 先例）──
+// ── Fixtures（duck typing）──
 
 const T0 = 1_700_000_000_000; // 固定 epoch ms
 
@@ -57,7 +62,7 @@ function makeNode(overrides: Partial<ExecutionTraceNode> = {}): ExecutionTraceNo
   };
 }
 
-interface RunShape {
+type RunShape = {
   status?: string;
   budget?: { usedTokens: number; maxTokens?: number; usedCost: number };
   nodes?: ExecutionTraceNode[];
@@ -65,7 +70,17 @@ interface RunShape {
 }
 
 function makeRun(shape: RunShape = {}): WorkflowRun {
+  return makeRunWithId(`wf-sig-${signatureRunSeq++}`, shape);
+}
+
+/** [W2/V1] runId 唯一化 + spec 最小面（displayStatusOf → core runSummary 投影
+ *  读 runId/spec.scriptName——签名测试的 mock 需携带该最小字段集）。 */
+let signatureRunSeq = 0;
+function makeRunWithId(runId: string, shape: RunShape): WorkflowRun {
   return {
+    runId,
+    spec: { scriptName: "sig-wf" },
+    meta: { startedAt: "2026-09-27T00:00:00.000Z" },
     state: {
       status: shape.status ?? "running",
       budget: shape.budget ?? { usedTokens: 0, maxTokens: 200_000, usedCost: 0 },
@@ -84,6 +99,35 @@ function runWithLive(nodeOverrides: Partial<ExecutionTraceNode>, live: LiveProgr
   };
 }
 
+/** plain theme: 着色方法直接返回原文，无 ANSI 色码——测试断言纯文本。
+ *  bg/underline 为宽 ThemeLike 接口的 no-op 实现（workflow 渲染面只用 fg/bold）。 */
+const plainTheme: ThemeLike = {
+  bg: (_color: string, text: string) => text,
+  fg: (_tag: string, text: string) => text,
+  bold: (text: string) => text,
+  underline: (text: string) => text,
+};
+
+/** collectNodeLiveProgress 配对用 run：只含 trace 节点面（task/status/startedAt）。 */
+function makeRunShape(nodes: { stepIndex: number; task: string; status: string; startedAt: string }[]): WorkflowRun {
+  return {
+    state: { trace: { toArray: () => nodes } },
+  } as unknown as WorkflowRun;
+}
+
+function makeSub(over: Partial<SubagentRecord> = {}): SubagentRecord {
+  return {
+    id: "sa-match",
+    task: "调研 A",
+    status: "running",
+    startedAt: T0,
+    turns: 0,
+    totalTokens: 0,
+    eventLog: [],
+    ...over,
+  } as SubagentRecord;
+}
+
 beforeEach(() => {
   vi.useFakeTimers();
   vi.setSystemTime(T0);
@@ -220,17 +264,35 @@ describe("computeRenderSignature — 节点级字段（store record 投影）",
 });
 
 describe("computeRenderSignature — 多节点与无 live 终态", () => {
-  it("多节点逐一拼接（节点序参与签名）", () => {
+  it("多节点：live 投影按 stepIndex 配对生效（live 值出现 / 消失 / 挂到另一节点 → 签名变）", () => {
+    // 对比式断言：同一 run 换 live 投影驱动签名变化——词法格式串是内部表示非契约，
+    // 不作为主证明（结构快照见下一条）。
     const run = makeRun({
       nodes: [
         makeNode({ stepIndex: 0, status: "completed" }),
         makeNode({ stepIndex: 1, status: "running" }),
       ],
     });
-    const live = new Map([[1, makeLiveView({ totalTokens: 500 })]]);
-    const sig = computeRenderSignature(run, live, T0);
-    expect(sig).toContain("0:completed:-:-1:-1:-1:-1:-1:-:-");
-    expect(sig).toContain("1:running:-:500:0:5:0:0:-:-");
+    const noLive = new Map<number, LiveProgressView>();
+    const liveOnNode1 = new Map<number, LiveProgressView>([[1, makeLiveView({ totalTokens: 500 })]]);
+    const liveOnNode0 = new Map<number, LiveProgressView>([[0, makeLiveView({ totalTokens: 500 })]]);
+
+    const base = computeRenderSignature(run, noLive, T0);
+    // live 值出现（挂到节点 1）→ 签名变
+    expect(computeRenderSignature(run, liveOnNode1, T0)).not.toBe(base);
+    // 同值 live 挂到另一节点 → 签名也变（配对按 stepIndex 生效，非全局均摊）
+    expect(computeRenderSignature(run, liveOnNode0, T0)).not.toBe(computeRenderSignature(run, liveOnNode1, T0));
+    // live 值消失 → 签名回落基线
+    expect(computeRenderSignature(run, noLive, T0)).toBe(base);
+  });
+
+  // 结构快照（不承担主证明）：签名段集 = run 级五段 + 每节点一段；
+  // 段内词法编码是内部表示，不锁定。
+  it("多节点结构快照：两节点 run 签名共 7 段（run 级 5 + 节点 2）", () => {
+    const run = makeRun({
+      nodes: [makeNode({ stepIndex: 0 }), makeNode({ stepIndex: 1 })],
+    });
+    expect(computeRenderSignature(run, new Map(), T0).split("|")).toHaveLength(7);
   });
 
   it("节点重排（trace 数组序对调，stepIndex 维度）→ 签名变", () => {
@@ -249,3 +311,85 @@ describe("computeRenderSignature — 多节点与无 live 终态", () => {
     expect(sig.split("|")).toHaveLength(5);
   });
 });
+
+// ── collectNodeLiveProgress 配对（[H2 W3] store record live 进度配对） ──
+//
+// 配对规则：task 标签匹配 + startedAt 最近邻 + 贪心唯一；终态 node 不配；
+// 无匹配 record（重试间隙）返回空。
+// SubagentRecord 投影面（eventLog/turns/totalTokens 等）的投影恒等由 core 侧
+// record-store 测试锁定，此处消费投影面。
+
+describe("collectNodeLiveProgress 配对", () => {
+  it("task 全等匹配：running node ↔ running record，投影挂到 stepIndex", () => {
+    const run = makeRunShape([{ stepIndex: 0, task: "调研 A", status: "running", startedAt: new Date(T0).toISOString() }]);
+    const live = collectNodeLiveProgress(run, [makeSub({ totalTokens: 42 })]);
+    expect(live.get(0)?.totalTokens).toBe(42);
+  });
+
+  it("多候选（parallel 同 prompt）取 startedAt 最近邻，贪心一一不重复消费", () => {
+    const run = makeRunShape([
+      { stepIndex: 0, task: "调研 A", status: "running", startedAt: new Date(T0).toISOString() },
+      { stepIndex: 1, task: "调研 A", status: "running", startedAt: new Date(T0 + 5000).toISOString() },
+    ]);
+    const near0 = makeSub({ id: "sa-near0", startedAt: T0 + 10, totalTokens: 100 });
+    const near1 = makeSub({ id: "sa-near1", startedAt: T0 + 5010, totalTokens: 200 });
+    const live = collectNodeLiveProgress(run, [near1, near0]);
+    expect(live.get(0)?.totalTokens).toBe(100); // node0(startedAt=T0) 最近 = near0
+    expect(live.get(1)?.totalTokens).toBe(200); // node1(T0+5s) 最近 = near1
+  });
+
+  it("终态 node 不配对；task 不匹配（不同 prompt）不配对", () => {
+    const run = makeRunShape([
+      { stepIndex: 0, task: "调研 A", status: "completed", startedAt: new Date(T0).toISOString() },
+      { stepIndex: 1, task: "写总结", status: "running", startedAt: new Date(T0).toISOString() },
+    ]);
+    const live = collectNodeLiveProgress(run, [makeSub({ task: "调研 A", totalTokens: 99 })]);
+    expect(live.size).toBe(0); // node0 终态跳过；node1 task 不匹配
+  });
+
+  it("重试间隙（无 running record）→ 空 map（views 走终态 fallback 渲染）", () => {
+    const run = makeRunShape([{ stepIndex: 0, task: "调研 A", status: "running", startedAt: new Date(T0).toISOString() }]);
+    const live = collectNodeLiveProgress(run, [makeSub({ status: "closed" })]);
+    expect(live.size).toBe(0);
+  });
+});
+
+// ── buildDetailContent session 路径行渲染 ──
+//
+// TUI 渲染测试：buildDetailContent 在 agent 终态时渲染 session: 路径行。
+//
+// 防的 bug：node.sessionFile 有值但 TUI detail 不显示——用户在交互面板里
+// 看不到 agent 的 session jsonl 路径，无法定位文件做后续查看。
+
+describe("buildDetailContent session 路径行渲染", () => {
+  it("node.sessionFile 有值 → 详情末尾渲染 session: <路径>", () => {
+    const sessionPath = "/abs/.pi/agent/subagents/enc/sessions/2026-07-15T_session-abc.jsonl";
+    const node = makeNode({
+      status: "completed",
+      sessionFile: sessionPath,
+      result: { content: "done" },
+    });
+    const lines = buildDetailContent(node, { promptExpanded: false }, makeRun(), plainTheme, 120, Date.now());
+    const sessionLine = lines.find((l) => l.includes("session:"));
+    expect(sessionLine).toBeDefined();
+    expect(sessionLine).toContain(sessionPath);
+  });
+
+  it("node.sessionFile undefined（窗口期）→ 不渲染 session: 行", () => {
+    const node = makeNode({ status: "completed", sessionFile: undefined, result: { content: "done" } });
+    const lines = buildDetailContent(node, { promptExpanded: false }, makeRun(), plainTheme, 120, Date.now());
+    const sessionLine = lines.find((l) => l.includes("session:"));
+    expect(sessionLine).toBeUndefined();
+  });
+
+  it("长路径截断到 mainWidth（防溢出）", () => {
+    const longPath = "/very/long/path/" + "x".repeat(200) + "/session.jsonl";
+    const node = makeNode({ status: "completed", sessionFile: longPath, result: { content: "done" } });
+    const narrowWidth = 60;
+    const lines = buildDetailContent(node, { promptExpanded: false }, makeRun(), plainTheme, narrowWidth, Date.now());
+    const sessionLine = lines.find((l) => l.includes("session:"));
+    expect(sessionLine).toBeDefined();
+    // 截断后行宽不超过 mainWidth + 边框余量
+    expect(sessionLine!.length).toBeLessThanOrEqual(narrowWidth);
+  });
+});

package/src/interface/views/detail-content.ts

@@ -45,9 +45,8 @@ const DETAIL_LEN_PROBE_WIDTH = 9999;
 // ── [H2 W3] store record 的 live 进度投影（设计 D2：进度源从 node.live 切 store）──
 
 /**
- * running record 的实时进度投影——消费面七字段口径与旧 projectLiveProgress(node.live)
- * 逐字段对齐（totalTokens / 工具计数 / elapsedSeconds / turns / eventLog /
- * currentActivity / lastError）。
+ * running record 的实时进度投影（totalTokens / 工具计数 / elapsedSeconds / turns /
+ * eventLog / currentActivity / lastError）。
  */
 export interface LiveProgressView {
   totalTokens: number;
@@ -60,8 +59,7 @@ export interface LiveProgressView {
 }
 
 /**
- * SubagentRecord（store 查询投影）→ LiveProgressView。与旧路径
- * projectLiveProgress(node.live) 的字段等价性（构造性论证，S1 等价表依据）：
+ * SubagentRecord（store 查询投影）→ LiveProgressView。字段口径（S1 等价表）：
  *   - totalTokens / turns：recordToSubagent 直读 record.totalTokens / turnCount，同源；
  *   - toolCallCount：eventLog 里 tool_start 计数——getEventLog 对每个 toolCall 恰产
  *     一条 tool_start，与 getAllToolCalls(record).length 恒等；