@esso0428/pi-subagents 0.15.13 → 0.15.15

package/test/ui/conversation-viewer.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
+import type { TuiMouseEvent } from "@earendil-works/pi-tui";
 import { ConversationViewer, createStaticConversationSource } from "../../src/ui/conversation-viewer.js";
 
 const theme = {
@@ -28,6 +29,28 @@ function tui() {
   } as any;
 }
 
+function mouse(type: TuiMouseEvent["type"], y: number, overrides: Partial<TuiMouseEvent> = {}): TuiMouseEvent {
+  return {
+    type,
+    button: "left",
+    x: 2,
+    y,
+    screenX: 2,
+    screenY: y,
+    width: 120,
+    height: 30,
+    shift: false,
+    alt: false,
+    ctrl: false,
+    ...overrides,
+  };
+}
+
+// The test record has the default invocation row, so timeline line 0 is viewer row 4.
+function viewerY(timelineLine: number): number {
+  return 4 + timelineLine;
+}
+
 describe("ConversationViewer", () => {
   it("renders assistant fenced code through the Markdown renderer", () => {
     const ui = tui();
@@ -85,8 +108,6 @@ describe("ConversationViewer", () => {
     expect(liveFooter).toContain("j/k scroll · J/K messages · [/] tools · w preview · g/G   t   M o O   /n N   q");
     expect(liveFooter).toContain("e steer");
     expect(liveFooter).toContain("x stop");
-    live.handleInput("\r");
-    expect(live.render(120).join("\n")).not.toContain("Enter send");
     live.handleInput("e");
     expect(live.render(120).join("\n")).toContain("Enter send");
     live.handleInput("\x1b");
@@ -152,78 +173,62 @@ describe("ConversationViewer", () => {
       vi.fn(),
     );
 
-    const initial = viewer.render(120).join("\n");
-    expect(initial).not.toContain("six");
-    expect(initial).not.toContain("READ");
+    expect(viewer.render(120).join("\n")).not.toContain("six");
+    viewer.handleInput("\t");
     viewer.handleInput("\r");
     expect(viewer.render(120).join("\n")).toContain("six");
   });
 
-  it("keeps J/K on user and assistant blocks while j/k remain line scrolling", () => {
+  it("toggles mouse expansion only on the normalized click event", () => {
     const viewer = new ConversationViewer(
       tui(),
       createStaticConversationSource([
-        { role: "assistant", content: [{ type: "text", text: "first" }, { type: "toolCall", name: "read", arguments: { path: "x" } }] },
-        { role: "toolResult", toolName: "read", content: [{ type: "text", text: "tool output" }] },
-        { role: "assistant", content: [{ type: "text", text: "second" }] },
+        { role: "assistant", content: [{ type: "toolCall", name: "read", arguments: { path: "x" } }] },
+        { role: "toolResult", toolName: "read", content: [{ type: "text", text: "one\ntwo\nthree\nfour\nfive\nsix" }] },
       ] as any),
       record(),
       undefined,
       theme,
       vi.fn(),
     );
-    viewer.render(120);
-    viewer.handleInput("J");
-    expect((viewer as any).currentBlock().role).toBe("assistant");
-    expect((viewer as any).currentBlock().markdown).toBe("second");
-    viewer.handleInput("K");
-    expect((viewer as any).currentBlock().markdown).toBe("first");
+    expect(viewer.render(120).join("\n")).not.toContain("six");
+    const span = (viewer as any).timeline.getSnapshot().toolSpans[0];
+    expect(span.clickStartLine).toEqual(expect.any(Number));
+    const hintY = viewerY(span.clickStartLine);
+    expect(viewer.handleMouse(mouse("press", hintY))?.handled).toBe(true);
+    expect(viewer.render(120).join("\n")).not.toContain("six");
+    viewer.handleMouse(mouse("click", hintY, { clickCount: 1 }));
+    expect(viewer.render(120).join("\n")).toContain("six");
   });
 
-  it("focuses nearby tools with [ and ] without changing line-scroll keys", () => {
+  it("focuses USER and ASSISTANT blocks from their rendered spans", () => {
     const viewer = new ConversationViewer(
       tui(),
       createStaticConversationSource([
-        { role: "assistant", content: [{ type: "toolCall", name: "read", arguments: { path: "first" } }] },
-        { role: "toolResult", toolName: "read", content: [{ type: "text", text: "first output" }] },
-        { role: "assistant", content: [{ type: "text", text: "between" }, { type: "toolCall", name: "read", arguments: { path: "second" } }] },
-        { role: "toolResult", toolName: "read", content: [{ type: "text", text: "second output" }] },
+        { role: "user", content: "user text" },
+        { role: "assistant", content: [{ type: "text", text: "assistant text" }] },
       ] as any),
       record(),
       undefined,
       theme,
       vi.fn(),
     );
-    viewer.render(120);
-    const timeline = (viewer as any).timeline;
-    const ids = timeline.getSnapshot().interactiveToolIds;
-    expect(ids).toHaveLength(2);
 
-    viewer.handleInput("]");
-    expect(timeline.getFocusedToolCallId()).toBe(ids[0]);
     viewer.render(120);
-    expect((viewer as any).currentBlock().toolCallId).toBe(ids[0]);
-    viewer.handleInput("]");
-    expect(timeline.getFocusedToolCallId()).toBe(ids[1]);
-    viewer.render(120);
-    expect((viewer as any).currentBlock().toolCallId).toBe(ids[1]);
-    viewer.handleInput("[");
-    expect(timeline.getFocusedToolCallId()).toBe(ids[0]);
+    const timeline = (viewer as any).timeline;
+    const spans = timeline.getSnapshot().blockSpans;
+    expect(spans).toHaveLength(2);
+    viewer.handleMouse(mouse("click", viewerY(spans[1].startLine), { clickCount: 1 }));
+    expect((viewer as any).selectedMessageIdx).toBe(1);
+    expect(timeline.getFocusedToolCallId()).toBeUndefined();
+    viewer.handleMouse(mouse("click", viewerY(spans[0].startLine), { clickCount: 1 }));
+    expect((viewer as any).selectedMessageIdx).toBe(0);
+    expect(timeline.getFocusedToolCallId()).toBeUndefined();
   });
 
-  it("opens a complete read-only tool preview with w for the focused tool", () => {
-    const ui = tui();
-    const custom = vi.fn((factory: any) => {
-      const preview = factory(ui, theme, undefined, vi.fn());
-      const rendered = preview.render(100).join("\\n");
-      expect(rendered).toContain("Input");
-      expect(rendered).toContain("Output");
-      expect(rendered).toContain("one");
-      expect(rendered).toContain("six");
-      return Promise.resolve(undefined);
-    });
+  it("focuses normal tool rows without expanding, while hint clicks expand", () => {
     const viewer = new ConversationViewer(
-      ui,
+      tui(),
       createStaticConversationSource([
         { role: "assistant", content: [{ type: "toolCall", name: "read", arguments: { path: "x" } }] },
         { role: "toolResult", toolName: "read", content: [{ type: "text", text: "one\ntwo\nthree\nfour\nfive\nsix" }] },
@@ -232,81 +237,92 @@ describe("ConversationViewer", () => {
       undefined,
       theme,
       vi.fn(),
-      undefined,
-      undefined,
-      undefined,
-      { pi: {} as any, ctx: { ui: { custom } } as any, readOnly: true },
     );
-    viewer.render(120);
-    viewer.handleInput("]");
-    viewer.handleInput("w");
-    expect(custom).toHaveBeenCalledWith(expect.any(Function), expect.objectContaining({ overlay: true }));
+
+    expect(viewer.render(120).join("\n")).not.toContain("six");
+    const timeline = (viewer as any).timeline;
+    const initialSpan = timeline.getSnapshot().toolSpans[0];
+    const toolId = initialSpan.toolCallId;
+    const hintLine = initialSpan.clickStartLine as number;
+    const normalOutputLine = hintLine - 1;
+
+    const press = viewer.handleMouse(mouse("press", viewerY(hintLine)));
+    expect(press).toMatchObject({ handled: true, capture: true });
+    expect(timeline.getFocusedToolCallId()).toBeUndefined();
+    expect(viewer.render(120).join("\n")).not.toContain("six");
+
+    viewer.handleMouse(mouse("click", viewerY(normalOutputLine), { clickCount: 1 }));
+    expect(timeline.getFocusedToolCallId()).toBe(toolId);
+    expect((viewer as any).selectedMessageIdx).toBe(initialSpan.blockIndex);
+    expect(viewer.render(120).join("\n")).not.toContain("six");
+
+    const collapsedSpan = timeline.getSnapshot().toolSpans[0];
+    viewer.handleMouse(mouse("click", viewerY(collapsedSpan.clickStartLine as number), { clickCount: 1 }));
+    expect(timeline.getFocusedToolCallId()).toBe(toolId);
+    expect(viewer.render(120).join("\n")).toContain("six");
   });
 
-  it("uses a distinct focus rail for tool cards", () => {
-    const railTheme = {
-      fg: (name: string, text: string) => `<${name}>${text}</${name}>`,
-      bold: (text: string) => `<bold>${text}</bold>`,
-    };
+  it("synchronizes J/K message focus and anchors [/] around the selected message", () => {
     const viewer = new ConversationViewer(
       tui(),
       createStaticConversationSource([
-        { role: "assistant", content: [{ type: "toolCall", name: "read", arguments: { path: "x" } }] },
-        { role: "toolResult", toolName: "read", content: [{ type: "text", text: "done" }] },
+        { role: "user", content: "user one" },
+        { role: "assistant", content: [{ type: "text", text: "assistant one" }] },
+        { role: "assistant", content: [{ type: "toolCall", id: "tool-1", name: "read", arguments: { path: "one" } }] },
+        { role: "toolResult", toolCallId: "tool-1", toolName: "read", content: [{ type: "text", text: "one" }] },
+        { role: "assistant", content: [{ type: "text", text: "assistant two" }] },
+        { role: "assistant", content: [{ type: "toolCall", id: "tool-2", name: "read", arguments: { path: "two" } }] },
+        { role: "toolResult", toolCallId: "tool-2", toolName: "read", content: [{ type: "text", text: "two" }] },
       ] as any),
       record(),
       undefined,
-      railTheme,
-      vi.fn(),
-    );
-    expect(viewer.render(120).join("\\n")).toContain("<toolTitle>▌</toolTitle>");
-  });
-
-  it("scrolls the transcript with a normalized mouse wheel event", () => {
-    const longText = Array.from({ length: 80 }, (_, index) => `line-${index}`).join("\n");
-    const viewer = new ConversationViewer(
-      tui(),
-      createStaticConversationSource([{ role: "assistant", content: [{ type: "text", text: longText }] }] as any),
-      record(),
-      undefined,
       theme,
       vi.fn(),
     );
+
     viewer.render(120);
-    const before = (viewer as any).scrollOffset;
-    const event = { type: "wheel", button: "none", x: 2, y: 5, screenX: 2, screenY: 5, width: 120, height: 30, shift: false, alt: false, ctrl: false, wheelDelta: -3 };
-    expect(viewer.handleMouse(event as any)?.handled).toBe(true);
-    expect((viewer as any).scrollOffset).toBeLessThan(before);
+    const timeline = (viewer as any).timeline;
+    const snapshot = timeline.getSnapshot();
+    viewer.handleInput("]");
+    expect((viewer as any).selectedMessageIdx).toBe(snapshot.toolSpans[0].blockIndex);
+    expect(timeline.getFocusedToolCallId()).toBe("tool-1");
+
+    viewer.handleInput("J");
+    expect((viewer as any).selectedMessageIdx).toBe(3);
+    expect(timeline.getFocusedToolCallId()).toBeUndefined();
+    viewer.handleInput("]");
+    expect((viewer as any).selectedMessageIdx).toBe(snapshot.toolSpans[1].blockIndex);
+    expect(timeline.getFocusedToolCallId()).toBe("tool-2");
+
+    viewer.handleInput("K");
+    expect((viewer as any).selectedMessageIdx).toBe(3);
+    expect(timeline.getFocusedToolCallId()).toBeUndefined();
+    viewer.handleInput("[");
+    expect((viewer as any).selectedMessageIdx).toBe(snapshot.toolSpans[0].blockIndex);
+    expect(timeline.getFocusedToolCallId()).toBe("tool-1");
   });
 
-  it("expands on the first click and collapses only on the second click", () => {
-    const viewer = new ConversationViewer(
-      tui(),
-      createStaticConversationSource([
-        { role: "assistant", content: [{ type: "toolCall", name: "read", arguments: { path: "x" } }] },
-        { role: "toolResult", toolName: "read", content: [{ type: "text", text: "one\ntwo\nthree\nfour\nfive\nsix" }] },
-      ] as any),
-      record(),
-      undefined,
-      theme,
-      vi.fn(),
-    );
-    expect(viewer.render(120).join("\n")).not.toContain("six");
-    const span = (viewer as any).timeline.getSnapshot().toolSpans[0];
-    expect(span.clickStartLine).toEqual(expect.any(Number));
-    const hintY = 4 + span.clickStartLine;
-    const mouse = { button: "left", x: 1, screenX: 1, screenY: hintY, width: 120, height: 30, shift: false, alt: false, ctrl: false };
-    expect(viewer.handleMouse({ ...mouse, type: "press", y: hintY } as any)?.handled).toBe(true);
-    expect(viewer.render(120).join("\n")).not.toContain("six");
-    viewer.handleMouse({ ...mouse, type: "click", y: hintY, clickCount: 1 } as any);
-    expect(viewer.render(120).join("\n")).toContain("six");
-    viewer.handleMouse({ ...mouse, type: "click", y: hintY, clickCount: 1 } as any);
-    expect(viewer.render(120).join("\n")).toContain("six");
-    viewer.handleMouse({ ...mouse, type: "click", y: hintY, clickCount: 2 } as any);
-    expect(viewer.render(120).join("\n")).not.toContain("six");
+  it("uses the first or last tool for initial [/], before an explicit focus exists", () => {
+    const source = createStaticConversationSource([
+      { role: "assistant", content: [{ type: "toolCall", id: "tool-1", name: "read", arguments: { path: "one" } }] },
+      { role: "toolResult", toolCallId: "tool-1", toolName: "read", content: [{ type: "text", text: "one" }] },
+      { role: "assistant", content: [{ type: "toolCall", id: "tool-2", name: "read", arguments: { path: "two" } }] },
+      { role: "toolResult", toolCallId: "tool-2", toolName: "read", content: [{ type: "text", text: "two" }] },
+    ] as any);
+    const makeViewer = () => new ConversationViewer(tui(), source, record(), undefined, theme, vi.fn());
+
+    const left = makeViewer();
+    left.render(120);
+    left.handleInput("[");
+    expect((left as any).timeline.getFocusedToolCallId()).toBe("tool-2");
+
+    const right = makeViewer();
+    right.render(120);
+    right.handleInput("]");
+    expect((right as any).timeline.getFocusedToolCallId()).toBe("tool-1");
   });
 
-  it("highlights the tool hint on hover and closes from the viewer [esc] button", () => {
+  it("highlights the collapsed tool hint and the viewer close control independently", () => {
     const semanticTheme = {
       fg: (name: string, text: string) => `<${name}>${text}</${name}>`,
       bold: (text: string) => `<bold>${text}</bold>`,
@@ -325,21 +341,74 @@ describe("ConversationViewer", () => {
     );
     const initial = viewer.render(120).join("\n");
     const span = (viewer as any).timeline.getSnapshot().toolSpans[0];
-    expect(span.clickStartLine).toEqual(expect.any(Number));
-    const hintY = 4 + span.clickStartLine;
+    const hintY = viewerY(span.clickStartLine);
     expect(initial).not.toContain("<text>click to show more</text>");
-    viewer.handleMouse({ type: "move", button: "none", x: 2, y: hintY, screenX: 2, screenY: hintY, width: 120, height: 30, shift: false, alt: false, ctrl: false } as any);
+    viewer.handleMouse(mouse("move", hintY, { button: "none" }));
     expect(viewer.render(120).join("\n")).toContain("<text>click to show more</text>");
-
-    expect(viewer.render(120).join("\n")).toContain("[esc]");
-    viewer.handleMouse({ type: "move", button: "none", x: 114, y: 1, screenX: 114, screenY: 1, width: 120, height: 30, shift: false, alt: false, ctrl: false } as any);
+    viewer.handleMouse(mouse("move", 1, { button: "none", x: 114, screenX: 114, screenY: 1 }));
     expect(viewer.render(120).join("\n")).toContain("<text><bold>[esc]</bold></text>");
-    const close = { button: "left", x: 114, screenX: 114, screenY: 1, y: 1, width: 120, height: 30, shift: false, alt: false, ctrl: false };
-    expect(viewer.handleMouse({ ...close, type: "press" } as any)?.handled).toBe(true);
-    expect(viewer.handleMouse({ ...close, type: "click", clickCount: 1 } as any)?.handled).toBe(true);
+    expect(viewer.handleMouse(mouse("press", 1, { x: 114, screenX: 114 }))?.handled).toBe(true);
+    expect(viewer.handleMouse(mouse("click", 1, { x: 114, screenX: 114, clickCount: 1 }))?.handled).toBe(true);
     expect(done).toHaveBeenCalledTimes(1);
   });
 
+  it("focuses nearby tools with [ and ] and opens a complete read-only preview with w", () => {
+    const ui = tui();
+    let preview: any;
+    const previewDone = vi.fn();
+    const custom = vi.fn((factory: any) => {
+      preview = factory(ui, theme, undefined, previewDone);
+      const initial = preview.render(100).join("\\n");
+      expect(initial).toContain("Input");
+      expect(initial).toContain("Output");
+      expect(initial).toContain("line 1");
+      expect(initial).not.toContain("line 40");
+      preview.handleInput("G");
+      expect(preview.render(100).join("\\n")).toContain("line 40");
+      preview.handleInput("k");
+      preview.handleInput("j");
+      preview.handleInput("g");
+      preview.handleInput("g");
+      expect(preview.render(100).join("\\n")).toContain("line 1");
+      preview.handleInput("q");
+      expect(previewDone).toHaveBeenCalledTimes(1);
+      return Promise.resolve(undefined);
+    });
+    const viewer = new ConversationViewer(
+      ui,
+      createStaticConversationSource([
+        { role: "assistant", content: [{ type: "toolCall", name: "read", arguments: { path: "first" } }] },
+        { role: "toolResult", toolName: "read", content: [{ type: "text", text: Array.from({ length: 40 }, (_, index) => `line ${index + 1}`).join("\n") }] },
+        { role: "assistant", content: [{ type: "toolCall", name: "read", arguments: { path: "second" } }] },
+        { role: "toolResult", toolName: "read", content: [{ type: "text", text: "second output" }] },
+      ] as any),
+      record(),
+      undefined,
+      theme,
+      vi.fn(),
+      undefined,
+      undefined,
+      undefined,
+      { pi: {} as any, ctx: { ui: { custom } } as any, readOnly: true },
+    );
+    viewer.render(120);
+    const timeline = (viewer as any).timeline;
+    const ids = timeline.getSnapshot().interactiveToolIds;
+    viewer.handleInput("]");
+    expect(timeline.getFocusedToolCallId()).toBe(ids[0]);
+    viewer.render(120);
+    viewer.handleInput("w");
+    expect(custom).toHaveBeenCalledWith(expect.any(Function), expect.objectContaining({ overlay: true }));
+    preview.handleInput("G");
+    preview.handleInput("g");
+    preview.handleInput("g");
+    preview.handleInput("q");
+    viewer.handleInput("]");
+    expect(timeline.getFocusedToolCallId()).toBe(ids[1]);
+    viewer.handleInput("[");
+    expect(timeline.getFocusedToolCallId()).toBe(ids[0]);
+  });
+
   it("keeps historical viewers read-only and closes on Escape", () => {
     const ui = tui();
     const steer = vi.fn();

package/test/write-execution.test.ts

@@ -31,7 +31,6 @@ describe("executeWriteWithMetadata", () => {
 
     expect(await readFile(join(cwd, "nested/file.txt"), "utf8")).toBe("new\n");
     expect(result.content[0]?.text).toContain("Successfully wrote to nested/file.txt");
-    expect(result.details?.fileExistedBeforeWrite).toBe(false);
     expect(result.details?.diff).toContain("+1 new");
     expect(result.details?.patch).toContain("+new");
     expect(store.get("call-new")?.diff).toBe(result.details?.diff);
@@ -49,7 +48,6 @@ describe("executeWriteWithMetadata", () => {
 
     await writeFile(join(cwd, "file.txt"), "later\n", "utf8");
 
-    expect(persisted.fileExistedBeforeWrite).toBe(true);
     expect(persisted.diff).toContain("-1 old");
     expect(persisted.diff).toContain("+1 new");
     expect(persisted.patch).toContain("-old");

package/.pi/tasks/tasks-01a09263-0ac6-77be-97f5-664b3ffea76b.json

@@ -1,53 +0,0 @@
-{
-  "nextId": 4,
-  "tasks": [
-    {
-      "id": "1",
-      "subject": "Analyze viewer interaction boundaries",
-      "description": "Inspect current ConversationViewer/ConversationTimeline/tool renderer and Pi mouse semantics. Identify the smallest safe design for press/release/click, viewer-local hover target styling, clickable [esc], and complete expanded output. Read-only; do not edit.",
-      "status": "in_progress",
-      "activeForm": "Analyzing viewer interaction boundaries",
-      "metadata": {
-        "agentType": "oracle"
-      },
-      "blocks": [],
-      "blockedBy": [],
-      "createdAt": 1789162453256,
-      "updatedAt": 1789162461551,
-      "owner": "orchestrator"
-    },
-    {
-      "id": "2",
-      "subject": "Implement viewer mouse behavior",
-      "description": "After inspecting current source, implement the requested ConversationViewer behavior in source and focused regression tests: press/release never toggle, click-target expansion/collapse, hover styling, clickable top-right [esc], Esc key close, complete expanded output with usable scrolling, preserving Enter and J/K/j/k. Modify source/tests only; do not run git/npm install/npm publish.",
-      "status": "in_progress",
-      "activeForm": "Implementing viewer mouse behavior",
-      "metadata": {
-        "agentType": "fixer"
-      },
-      "blocks": [
-        "3"
-      ],
-      "blockedBy": [],
-      "createdAt": 1789162453263,
-      "updatedAt": 1789162461564,
-      "owner": "orchestrator"
-    },
-    {
-      "id": "3",
-      "subject": "Validate viewer regressions",
-      "description": "Run the focused ConversationViewer test command after implementation, inspect changed source/tests for correctness and scope, and report failures or evidence. Do not run git/npm install/npm publish.",
-      "status": "pending",
-      "activeForm": "Validating viewer regressions",
-      "metadata": {
-        "agentType": "build"
-      },
-      "blocks": [],
-      "blockedBy": [
-        "2"
-      ],
-      "createdAt": 1789162453268,
-      "updatedAt": 1789162461564
-    }
-  ]
-}

package/.pi/workflows/index.json

@@ -1,5 +0,0 @@
-{
-  "schemaVersion": 1,
-  "updatedAt": "2026-09-11T21:34:35.211Z",
-  "runs": []
-}