@zhushanwen/pi-canvas 0.4.2 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-canvas",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Problem-solving canvas toolface for pi: six deferred canvas_* tools bridging the agent to the taiji runtime CanvasService via the CANVAS_MARKER select channel (problem-solve-canvas)",
   "type": "module",
   "main": "index.ts",
@@ -55,10 +55,10 @@
     "vitest": "^4.1.8"
   },
   "dependencies": {
+    "@zhushanwen/extension-protocol": "0.24.0",
     "@zhushanwen/pi-ext-guards": "0.5.0",
-    "@zhushanwen/extension-protocol": "0.23.0",
     "@zhushanwen/pi-extension-logger": "0.6.2",
-    "@zhushanwen/subagent-core": "2.0.0"
+    "@zhushanwen/subagent-core": "2.1.0"
   },
   "scripts": {
     "typecheck": "npx tsc --noEmit",

package/src/__tests__/render.test.ts

@@ -64,5 +64,8 @@ describe("renderCanvasToolResult", () => {
     const sample = { content: [{ type: "text", text: "raw" }], details: { summary: 'Entered canvas "n"' } };
     expect(render(enter.renderResult, sample)).toContain('Entered canvas "n"');
     expect(render(list.renderResult, sample)).toContain('Entered canvas "n"');
-  });
+  }, 30_000);
+  // ↑ timeout：harness 动态 import 重初始化（六工具注册链）裸跑已 ~4s，插桩（coverage）
+  //   口径超 vitest 默认 5s 预算——纯耗时贴边，非断言回归；DOWNSTREAM 联动门禁把本包
+  //   带进插桩跑后暴露（#52 先例：门禁拦的基线测试债分支内当场修复）。
 });

package/src/__tests__/review.test.ts

@@ -251,8 +251,9 @@ describe("runReviewRound（编排主体）", () => {
     });
     expect(outcome.round).toBe(1);
     expect(capturedTask).toContain("R1 全面审查");
-    // 全 clean 轮：零条目不写回（append 不被调用）
-    expect(append.calls).toHaveLength(0);
+    // 零发现轮也写回（空 entries 的 review-append）：写回本身是「本轮 run 已完成」的
+    // 落盘事实（runtime lastRunRound），缺它轮次永不推进、maxRounds 预算不消耗
+    expect(append.calls).toEqual([{ canvasId: "c1", round: 1, entries: [] }]);
   });
 
   it("R2 run（runtime 已推进 round=2）→ 报告标 R2，scope 收窄 + 上轮处置表进 task", async () => {
@@ -281,7 +282,30 @@ describe("runReviewRound（编排主体）", () => {
     expect(capturedTask).toContain("R2 复审");
     expect(capturedTask).toContain("只审处置表");
     expect(capturedTask).toContain("[rv-1]");
-    expect(append.calls).toHaveLength(0);
+    expect(append.calls).toEqual([{ canvasId: "c1", round: 2, entries: [] }]);
+  });
+
+  it("全 dropped（reviewer 条目全畸形被丢弃）→ 同样以空 entries 写回（零发现轮 = 完成轮，事实照常落盘）", async () => {
+    const append = makeAppend();
+    const dispatch: ReviewerDispatchPort = {
+      executeAndAwait: async () => ({
+        parsedOutput: {
+          entries: [
+            { id: "rv-x", dimension: "style", severity: "must-fix", targetId: "n1", note: "词表外维度" },
+            "not-an-object",
+          ],
+        },
+      }),
+    };
+    const outcome = await runReviewRound({
+      state: makeState(),
+      dispatch,
+      appendWriteBack: append.append,
+    });
+    expect(outcome.appended).toBe(0);
+    expect(outcome.dropped).toBe(2);
+    expect(outcome.summary).toContain("写回 0 条");
+    expect(append.calls).toEqual([{ canvasId: "c1", round: 1, entries: [] }]);
   });
 
   it("reviewer 执行失败（error 信封）→ 显式 throw（review_dispatch_failed + 恢复动作）", async () => {

package/src/render.ts

@@ -5,19 +5,12 @@
  */
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
-import { firstContentText } from "@zhushanwen/extension-protocol";
-
-/** pi toolResult 通用形状（AgentToolResult 的结构最小面，renderResult 入参收窄用）。 */
-interface ToolResultShape { // oe-exempt:20261017:framework:details 数据形状窄 view（单实现消费，非抽象接口）
-  content: Array<{ type: string; text?: string }>;
-  details?: { summary?: unknown };
-}
+import { readDetailsSummary, resultContentText } from "@zhushanwen/extension-protocol";
 
 export function renderCanvasToolResult(result: unknown, options: { expanded: boolean }, theme: Theme): Text {
-  const r = result as ToolResultShape;
-  const summary = r.details?.summary;
-  if (options.expanded === false && typeof summary === "string" && summary !== "") {
+  const summary = readDetailsSummary(result);
+  if (options.expanded === false && summary !== undefined) {
     return new Text(theme.fg("dim", summary), 0, 0);
   }
-  return new Text(firstContentText(r), 0, 0);
+  return new Text(resultContentText(result), 0, 0);
 }

package/src/review.ts

@@ -125,8 +125,9 @@ export function isCanvasStateReply(v: unknown): v is CanvasState {
 }
 
 /** 本轮审查轮次：run 链路的 read 发生在 review-request 之后，review.round 已是本轮
- * 轮次（runtime 侧一轮 = 一循环：当前轮无报告条目时再发起不推进轮次——GUI 双跳的
- * 第二跳与重发都不虚增轮次）；从未审查（read 无 review 聚合）= R1。 */
+ * 轮次（runtime 侧一轮 = 一循环：当前轮无报告写回时再发起不推进轮次——GUI 双跳的
+ * 第二跳与重发都不虚增轮次；零发现轮的写回也算完成）；从未审查（read 无 review
+ * 聚合）= R1。 */
 export function currentReviewRound(state: CanvasState): number {
   return state.review?.round ?? 1;
 }
@@ -218,9 +219,10 @@ export async function runReviewRound(input: {
     );
   }
   const { entries, dropped } = collectValidEntries(input.state.canvasId, round, result.parsedOutput ?? result.content);
-  if (entries.length > 0) {
-    await input.appendWriteBack({ canvasId: input.state.canvasId, round, entries });
-  }
+  // 零发现轮也写回（空 entries 的 review-append）：写回本身就是「本轮 run 已完成」的
+  // 落盘事实（runtime 侧落 review.lastRunRound），跳过会使零发现轮永不推进轮次、
+  // maxRounds 预算永不消耗（max-rounds 停回保护对该形态失灵）。
+  await input.appendWriteBack({ canvasId: input.state.canvasId, round, entries });
   const parsedSummary = recordOf(result.parsedOutput)?.summary;
   const summary =
     (typeof parsedSummary === "string" ? parsedSummary : "") ||