@esso0428/pi-subagents 0.15.8 → 0.15.10

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

@@ -82,9 +82,14 @@ describe("ConversationViewer", () => {
       { pi: {} as any, ctx: {} as any, readOnly: false },
     );
     const liveFooter = live.render(120).join("\n");
-    expect(liveFooter).toContain("j/k · J/K · g/G   t   M o O   /n N   q");
-    expect(liveFooter).toContain("Enter steer");
+    expect(liveFooter).toContain("j/k scroll · J/K messages · 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");
 
     const history = new ConversationViewer(
       tui(),
@@ -99,7 +104,7 @@ describe("ConversationViewer", () => {
       { pi: {} as any, ctx: {} as any, readOnly: true },
     );
     const historyFooter = history.render(120).join("\n");
-    expect(historyFooter).toContain("j/k · J/K · g/G   t   M o   /n N   q");
+    expect(historyFooter).toContain("j/k scroll · J/K messages · g/G   t   M o   /n N   q");
     expect(historyFooter).not.toContain("M o O");
   });
 
@@ -147,13 +152,71 @@ describe("ConversationViewer", () => {
       vi.fn(),
     );
 
-    expect(viewer.render(120).join("\n")).not.toContain("six");
-    viewer.handleInput("\t");
+    const initial = viewer.render(120).join("\n");
+    expect(initial).not.toContain("six");
+    expect(initial).not.toContain("READ");
     viewer.handleInput("\r");
     expect(viewer.render(120).join("\n")).toContain("six");
   });
 
-  it("toggles mouse expansion only on the normalized click event", () => {
+  it("keeps J/K on user and assistant blocks while j/k remain line scrolling", () => {
+    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" }] },
+      ] 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");
+  });
+
+  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>`,
+    };
+    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" }] },
+      ] 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);
+  });
+
+  it("expands on the first click and collapses only on the second click", () => {
     const viewer = new ConversationViewer(
       tui(),
       createStaticConversationSource([
@@ -166,11 +229,52 @@ describe("ConversationViewer", () => {
       vi.fn(),
     );
     expect(viewer.render(120).join("\n")).not.toContain("six");
-    const mouse = { button: "left", x: 1, screenX: 1, screenY: 5, width: 120, height: 30, shift: false, alt: false, ctrl: false };
-    viewer.handleMouse({ ...mouse, type: "press", y: 5 } as any);
+    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: 5 } as any);
+    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("highlights the tool hint on hover and closes from the viewer [esc] button", () => {
+    const semanticTheme = {
+      fg: (name: string, text: string) => `<${name}>${text}</${name}>`,
+      bold: (text: string) => `<bold>${text}</bold>`,
+    };
+    const done = vi.fn();
+    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,
+      semanticTheme,
+      done,
+    );
+    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;
+    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);
+    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);
+    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(done).toHaveBeenCalledTimes(1);
   });
 
   it("keeps historical viewers read-only and closes on Escape", () => {

package/test/write-execution.test.ts

@@ -31,6 +31,7 @@ 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);
@@ -48,6 +49,7 @@ 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");