@esso0428/pi-subagents 0.15.9 → 0.15.10

package/src/ui/conversation-viewer.ts

@@ -62,6 +62,7 @@ export class ConversationViewer implements Component {
   private lastInnerW = 0;
   private closed = false;
   private stopArmed = false;
+  private hoveredClose = false;
   private keys: ViewerKeys;
   private composer: Input | undefined;
   private searchMode = false;
@@ -135,11 +136,11 @@ export class ConversationViewer implements Component {
         this.timeline.toggleFocusedTool();
         return;
       }
-      if (this.canSteer()) {
-        this.stopArmed = false;
-        this.openComposer();
-        return;
-      }
+    }
+    if (data === "e" && this.canSteer()) {
+      this.stopArmed = false;
+      this.openComposer();
+      return;
     }
     if (matchesKey(data, "x")) {
       if (this.isStoppable()) {
@@ -210,9 +211,35 @@ export class ConversationViewer implements Component {
     void maxScroll;
   }
 
-  handleMouse(event: TuiMouseEvent): { handled?: boolean; render?: boolean } | undefined {
-    if (this.composer || this.searchMode) return undefined;
+  handleMouse(event: TuiMouseEvent): { handled?: boolean; capture?: boolean; render?: boolean } | undefined {
     const innerW = Math.max(1, this.lastInnerW || event.width - 4);
+    const closeHit = this.isCloseButtonHit(event.x, event.y, innerW);
+    if (event.type === "move") {
+      const closeChanged = closeHit !== this.hoveredClose;
+      this.hoveredClose = closeHit;
+      if (this.composer || this.searchMode) {
+        return closeChanged ? { handled: true, render: true } : undefined;
+      }
+      const contentLines = this.buildContentLines(innerW);
+      const viewportHeight = this.viewportHeight();
+      const maxScroll = Math.max(0, contentLines.length - viewportHeight);
+      const visibleStart = Math.min(this.scrollOffset, maxScroll);
+      const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
+      const contentY = event.y - contentOrigin + visibleStart;
+      // Forward moves outside the content too so a previously hovered tool
+      // hint is cleared when the pointer returns to the header/footer.
+      const timelineResult = this.timeline.handleMouse({ ...event, y: contentY });
+      return timelineResult ?? (closeChanged ? { handled: true, render: true } : undefined);
+    }
+    if (closeHit && event.button === "left") {
+      if (event.type === "press") return { handled: true, capture: true, render: false };
+      if (event.type === "click") {
+        this.closed = true;
+        this.done(undefined);
+        return { handled: true, render: false };
+      }
+    }
+    if (this.composer || this.searchMode) return undefined;
     const contentLines = this.buildContentLines(innerW);
     const viewportHeight = this.viewportHeight();
     const maxScroll = Math.max(0, contentLines.length - viewportHeight);
@@ -231,13 +258,16 @@ export class ConversationViewer implements Component {
     if (contentY < 0 || contentY >= contentLines.length) return undefined;
     const result = this.timeline.handleMouse({ ...event, y: contentY });
     if (result?.handled) {
-      const focusedTool = this.timeline.getFocusedToolCallId();
-      const refreshed = this.timeline.getSnapshot();
-      const selected = refreshed.messageBlocks.findIndex((block) => block.toolCallId === focusedTool);
-      if (selected >= 0) this.selectedMessageIdx = selected;
-      this.cacheVersion++;
-      this.invalidate();
-      this.tui.requestRender();
+      if (event.type === "click") {
+        const focusedTool = this.timeline.getFocusedToolCallId();
+        const refreshed = this.timeline.getSnapshot();
+        const selected = refreshed.messageBlocks.findIndex((block) => block.toolCallId === focusedTool);
+        if (selected >= 0) this.selectedMessageIdx = selected;
+        this.cacheVersion++;
+        this.invalidate();
+        this.tui.requestRender();
+      }
+      return result;
     }
     return result;
   }
@@ -268,7 +298,12 @@ export class ConversationViewer implements Component {
       const percent = getSessionContextPercent(this.activity?.session);
       headerParts.push(formatSessionTokens(tokens, percent, th, this.record.compactionCount));
     }
-    lines.push(row(`${statusIcon} ${th.bold(name)}${modeTag}  ${th.fg("muted", this.record.description)} ${th.fg("dim", "·")} ${fgPreservingNestedStyles(th, "dim", headerParts.join(" · "))}`));
+    const headerText = `${statusIcon} ${th.bold(name)}${modeTag}  ${th.fg("muted", this.record.description)} ${th.fg("dim", "·")} ${fgPreservingNestedStyles(th, "dim", headerParts.join(" · "))}`;
+    const closeLabel = this.hoveredClose ? th.fg("text", th.bold("[esc]")) : th.fg("dim", "[esc]");
+    const closeWidth = visibleWidth(closeLabel);
+    const headerLeft = truncateToWidth(headerText, Math.max(0, innerW - closeWidth - 1), "", true);
+    const headerGap = Math.max(1, innerW - visibleWidth(headerLeft) - closeWidth);
+    lines.push(row(headerLeft + " ".repeat(headerGap) + closeLabel));
     const invocationLine = this.invocationLine();
     if (invocationLine) lines.push(row(invocationLine));
     lines.push(hrMid);
@@ -322,7 +357,7 @@ export class ConversationViewer implements Component {
       lines.push(row(truncateToWidth(th.fg("accent", query) + th.fg("dim", matchCount) + hints, innerW, "...", true)));
     } else {
       const actions: string[] = [];
-      if (this.canSteer()) actions.push(th.fg("dim", "Enter steer"));
+      if (this.canSteer()) actions.push(th.fg("dim", "e steer"));
       if (this.isStoppable()) actions.push(this.stopArmed ? th.fg("error", "x again to STOP") : th.fg("dim", "x stop"));
       const editHint = this.isLive() ? " O" : "";
       const shortcutHints = [
@@ -354,6 +389,13 @@ export class ConversationViewer implements Component {
     return lines;
   }
 
+  private isCloseButtonHit(x: number, y: number, innerW: number): boolean {
+    if (y !== 1) return false;
+    const labelWidth = visibleWidth("[esc]");
+    const labelStart = 2 + Math.max(0, innerW - labelWidth);
+    return x >= labelStart && x < 2 + innerW;
+  }
+
   invalidate(): void {
     this.cachedWidth = 0;
     this.cachedLines = [];
@@ -429,7 +471,10 @@ export class ConversationViewer implements Component {
   }
 
   private activeHeaderLine(): number {
-    return this.cachedMessageStarts[this.currentMessageIndex()] ?? -1;
+    const block = this.cachedMessageBlocks[this.currentMessageIndex()];
+    return block?.role === "user" || block?.role === "assistant"
+      ? this.cachedMessageStarts[this.currentMessageIndex()] ?? -1
+      : -1;
   }
 
   private currentBlock(): ConversationBlock | undefined {

package/src/write-execution.ts

@@ -9,6 +9,8 @@ export const MAX_COMPARABLE_WRITE_BYTES = 512_000;
 export const MAX_WRITE_METADATA_ENTRIES = 100;
 
 export interface DurableWriteDetails {
+  /** Persisted so history can distinguish create vs overwrite without file access. */
+  fileExistedBeforeWrite?: boolean;
   diff?: string;
   patch?: string;
   firstChangedLine?: number;
@@ -106,7 +108,10 @@ function durableDetails(
   content: string,
 ): DurableWriteDetails {
   if (metadata.diffUnavailableReason) {
-    return { diffUnavailableReason: metadata.diffUnavailableReason };
+    return {
+      fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
+      diffUnavailableReason: metadata.diffUnavailableReason,
+    };
   }
   const previousContent = metadata.previousContent ?? "";
   const diffResult = generateDiffString(previousContent, content);
@@ -116,6 +121,7 @@ function durableDetails(
     return { diffUnavailableReason: `durable diff exceeds ${MAX_DURABLE_DIFF_BYTES} bytes` };
   }
   return {
+    fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
     diff: diffResult.diff,
     patch,
     firstChangedLine: diffResult.firstChangedLine,

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

@@ -66,6 +66,19 @@ describe("viewer-local ccstyle diff renderer", () => {
     expect(rendered).not.toContain("later");
   });
 
+  it("labels persisted overwrites correctly without reading the current file", () => {
+    const component = renderRichToolResult("write", {
+      content: [{ type: "text", text: "Successfully wrote" }],
+      details: {
+        diff: "-1 old\n+1 new",
+        patch: "--- file.txt\n+++ file.txt\n@@ -1,1 +1,1 @@\n-old\n+new\n",
+      },
+    }, { expanded: false }, theme, { args: { path: "file.txt", content: "new\n" } });
+
+    expect(component?.render(100).join("\\n")).toContain("overwritten");
+    expect(component?.render(100).join("\\n")).toContain("click to show more");
+  });
+
   it("returns an explicit unavailable row instead of an empty success card", () => {
     const component = renderRichToolResult("write", {
       content: [{ type: "text", text: "Successfully wrote" }],

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

@@ -83,8 +83,13 @@ describe("ConversationViewer", () => {
     );
     const liveFooter = live.render(120).join("\n");
     expect(liveFooter).toContain("j/k scroll · J/K messages · g/G   t   M o O   /n N   q");
-    expect(liveFooter).toContain("Enter steer");
+    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(),
@@ -147,7 +152,9 @@ describe("ConversationViewer", () => {
       vi.fn(),
     );
 
-    expect(viewer.render(120).join("\n")).not.toContain("six");
+    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");
   });
@@ -209,7 +216,7 @@ describe("ConversationViewer", () => {
     expect((viewer as any).scrollOffset).toBeLessThan(before);
   });
 
-  it("toggles mouse expansion only on the normalized click event", () => {
+  it("expands on the first click and collapses only on the second click", () => {
     const viewer = new ConversationViewer(
       tui(),
       createStaticConversationSource([
@@ -222,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 };
-    expect(viewer.handleMouse({ ...mouse, type: "press", y: 5 } as any)?.handled).toBe(true);
+    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");