fix(ui): resolve editor shortcut conflict

Author: benvinegar

src/ui/components/chrome/HelpDialog.tsx

@@ -46,9 +46,8 @@ export function HelpDialog({
         ["1 / 2 / 0", "split / stack / auto"],
         ["s / t", "sidebar / theme"],
         ["a", "toggle AI notes"],
-        ["e", "toggle unchanged context"],
+        ["z", "toggle unchanged context"],
         ["l / w / m", "lines / wrap / metadata"],
-        ["e", "open file in $EDITOR"],
       ],
     },
     {

src/ui/components/ui-components.test.tsx

@@ -1919,8 +1919,8 @@ describe("UI components", () => {
       "1 / 2 / 0       split / stack / auto",
       "s / t           sidebar / theme",
       "a               toggle AI notes",
+      "z               toggle unchanged context",
       "l / w / m       lines / wrap / metadata",
-      "e               open file in $EDITOR",
       "Review",
       "/               focus file filter",
       "c               create review note",
@@ -2368,6 +2368,77 @@ describe("UI components", () => {
     expect(expandableFrame).toContain("▾");
   });
 
+  test("PierreDiffView hides add-note affordances on collapsed and hunk-header rows", async () => {
+    const expandable = createExpandableContextDiffFile("meta-hover", "meta-hover.ts");
+    const file = {
+      ...expandable.file,
+      sourceFetcher: createTestSourceFetcher(() => expandable.after),
+    };
+    const theme = resolveTheme("midnight", null);
+    const setup = await testRender(
+      <PierreDiffView
+        file={file}
+        layout="split"
+        theme={theme}
+        width={120}
+        selectedHunkIndex={0}
+        scrollable={false}
+        onStartUserNoteAtHunk={() => {}}
+        onToggleGap={() => {}}
+      />,
+      { width: 120, height: 40 },
+    );
+
+    try {
+      await act(async () => {
+        await setup.renderOnce();
+      });
+
+      const frame = setup.captureCharFrame();
+      const frameLines = frame.split("\n");
+      const collapsedY = frameLines.findIndex((line) => line.includes("unchanged lines"));
+      const hunkHeaderY = frameLines.findIndex((line) => line.includes("@@"));
+      const codeY = frameLines.findIndex((line) => line.includes("line 5 modified"));
+      expect(collapsedY).toBeGreaterThanOrEqual(0);
+      expect(hunkHeaderY).toBeGreaterThanOrEqual(0);
+      expect(codeY).toBeGreaterThanOrEqual(0);
+
+      await act(async () => {
+        await setup.mockMouse.moveTo(4, collapsedY);
+        await setup.renderOnce();
+      });
+      expect(setup.captureCharFrame()).not.toContain("[+]");
+
+      await act(async () => {
+        await setup.mockMouse.moveTo(4, hunkHeaderY);
+        await setup.renderOnce();
+      });
+      expect(setup.captureCharFrame()).not.toContain("[+]");
+
+      let codeHoverFrame = "";
+      for (const y of [codeY, codeY + 1]) {
+        for (const x of [4, 16, 48, 76]) {
+          await act(async () => {
+            await setup.mockMouse.moveTo(x, y);
+            await setup.renderOnce();
+          });
+          codeHoverFrame = setup.captureCharFrame();
+          if (codeHoverFrame.includes("[+]")) {
+            break;
+          }
+        }
+        if (codeHoverFrame.includes("[+]")) {
+          break;
+        }
+      }
+      expect(codeHoverFrame).toContain("[+]");
+    } finally {
+      await act(async () => {
+        setup.renderer.destroy();
+      });
+    }
+  });
+
   test("PierreDiffView toggles a collapsed gap when clicked", async () => {
     const expandable = createExpandableContextDiffFile("expand-click", "expand-click.ts");
     const file = {

src/ui/diff/PierreDiffView.tsx

@@ -31,8 +31,15 @@ export interface ActiveAddNoteAffordance {
   target?: UserNoteLineTarget;
 }
 
+type AddNoteTargetRow = Extract<DiffRow, { type: "split-line" | "stack-line" }>;
+
+/** Return whether a diff row can be used as an inline user-note target. */
+function isAddNoteTargetRow(row: DiffRow): row is AddNoteTargetRow {
+  return row.type === "split-line" || row.type === "stack-line";
+}
+
 /** Resolve the note insertion target represented by a visible add-note affordance. */
-function addNoteAffordanceForRow(row: DiffRow): ActiveAddNoteAffordance {
+function addNoteAffordanceForRow(row: AddNoteTargetRow): ActiveAddNoteAffordance {
   if (row.type === "split-line") {
     return {
       hunkIndex: row.hunkIndex,
@@ -45,19 +52,15 @@ function addNoteAffordanceForRow(row: DiffRow): ActiveAddNoteAffordance {
     };
   }
 
-  if (row.type === "stack-line") {
-    return {
-      hunkIndex: row.hunkIndex,
-      target:
-        row.cell.newLineNumber !== undefined
-          ? { side: "new", line: row.cell.newLineNumber }
-          : row.cell.oldLineNumber !== undefined
-            ? { side: "old", line: row.cell.oldLineNumber }
-            : undefined,
-    };
-  }
-
-  return { hunkIndex: row.hunkIndex };
+  return {
+    hunkIndex: row.hunkIndex,
+    target:
+      row.cell.newLineNumber !== undefined
+        ? { side: "new", line: row.cell.newLineNumber }
+        : row.cell.oldLineNumber !== undefined
+          ? { side: "old", line: row.cell.oldLineNumber }
+          : undefined,
+  };
 }
 
 /** Render a file diff in split or stack mode, with inline agent notes inserted between diff rows. */
@@ -331,6 +334,10 @@ export function PierreDiffView({
           );
         }
 
+        const addNoteAffordance = isAddNoteTargetRow(plannedRow.row)
+          ? addNoteAffordanceForRow(plannedRow.row)
+          : null;
+
         return (
           <box key={plannedRow.key} id={rowId} style={{ width: "100%", flexDirection: "column" }}>
             <DiffRowView
@@ -347,10 +354,18 @@ export function PierreDiffView({
               copySelectedSide={copySelectedSide}
               anchorId={plannedRow.anchorId}
               noteGuideSide={plannedRow.noteGuideSide}
-              showAddNoteBadge={hoveredRowKey === plannedRow.key && Boolean(onStartUserNoteAtHunk)}
+              showAddNoteBadge={
+                addNoteAffordance !== null &&
+                hoveredRowKey === plannedRow.key &&
+                Boolean(onStartUserNoteAtHunk)
+              }
               onHoverRow={() => {
                 onHover?.();
-                activateHoveredRow(plannedRow.key, addNoteAffordanceForRow(plannedRow.row));
+                if (addNoteAffordance) {
+                  activateHoveredRow(plannedRow.key, addNoteAffordance);
+                } else {
+                  clearHoveredRow();
+                }
               }}
               onStartUserNoteAtHunk={onStartUserNoteAtHunk}
               onToggleGap={gapToggleHandler}

src/ui/diff/renderRows.tsx

@@ -1134,6 +1134,7 @@ function renderHeaderRow(
           backgroundColor: theme.panelAlt,
         }}
         onMouseMove={() => onHoverRow?.(row.key)}
+        onMouseOver={() => onHoverRow?.(row.key)}
         onMouseUp={handleCollapsedClick}
       >
         <text>
@@ -1165,6 +1166,7 @@ function renderHeaderRow(
         backgroundColor: theme.panelAlt,
       }}
       onMouseMove={() => onHoverRow?.(row.key)}
+      onMouseOver={() => onHoverRow?.(row.key)}
     >
       <box
         style={{ width: Math.max(0, width - badgeWidth), height: 1 }}

src/ui/hooks/useAppKeyboardShortcuts.ts

@@ -109,7 +109,6 @@ export function useAppKeyboardShortcuts({
   toggleLineNumbers,
   toggleLineWrap,
   toggleSidebar,
-  triggerEditSelectedFile,
   triggerRefreshCurrentInput,
 }: UseAppKeyboardShortcutsOptions) {
   const activeMenuIdRef = useRef(activeMenuId);
@@ -453,7 +452,7 @@ export function useAppKeyboardShortcuts({
       return;
     }
 
-    if (key.name === "e" || key.sequence === "e") {
+    if (key.name === "z" || key.sequence === "z") {
       runAndCloseMenu(toggleGapForSelectedHunk);
       return;
     }

src/ui/lib/appMenus.ts

@@ -85,7 +85,6 @@ export function buildAppMenus({
     {
       kind: "item",
       label: "Open file in editor",
-      hint: "e",
       action: triggerEditSelectedFile,
     },
   ];

test/pty/ui-integration.test.ts

@@ -274,7 +274,7 @@ describe("live UI integration", () => {
       expect(initial).toContain("▾ 1 unchanged line");
       expect(initial).not.toContain("hiddenLine01");
 
-      await session.press("e");
+      await session.press("z");
       const expanded = await harness.waitForSnapshot(
         session,
         (text) => text.includes("Hide 1 unchanged line") && text.includes("hiddenLine01"),
@@ -283,7 +283,7 @@ describe("live UI integration", () => {
 
       expect(expanded).toContain("hiddenLine01");
 
-      await session.press("e");
+      await session.press("z");
       const collapsed = await harness.waitForSnapshot(
         session,
         (text) => text.includes("▾ 1 unchanged line") && !text.includes("hiddenLine01"),
@@ -1666,7 +1666,7 @@ describe("live UI integration", () => {
       });
 
       expect(initial).toContain("aaa-collapsed.ts");
-      expect(initial).toContain("··· 362 unchanged lines ···");
+      expect(initial).toContain("▾ 362 unchanged lines");
       expect(initial).not.toContain("366 - export const line366 = 366;");
 
       await session.scrollDown(1);
@@ -1708,12 +1708,12 @@ describe("live UI integration", () => {
       const restored = await harness.waitForSnapshot(
         session,
         (text) =>
-          text.includes("··· 362 unchanged lines ···") &&
+          text.includes("▾ 362 unchanged lines") &&
           harness.countMatches(text, /aaa-collapsed\.ts/g) === initialHeaderCount,
         5_000,
       );
 
-      expect(restored).toContain("··· 362 unchanged lines ···");
+      expect(restored).toContain("▾ 362 unchanged lines");
       expect(restored).not.toContain("366 - export const line366 = 366;");
       expect(harness.countMatches(restored, /aaa-collapsed\.ts/g)).toBe(initialHeaderCount);
     } finally {