Pin Ctrl+C arming, ENOENT unlink, and idle attachment clear

Author: TheGreatAxios

src/tui/keybindings.test.ts

@@ -24,6 +24,7 @@ import { openCommandSurface } from "./command-surfaces.js";
 import { focusOwner } from "./focus/focus-state.js";
 import { setChromeZones } from "./shell.js";
 import {
+  addPendingAttachment,
   appendStreamRow,
   applyShellInterrupt,
   createAppShell,
@@ -517,6 +518,16 @@ const PROBES: Readonly<Record<string, { readonly group: Group; readonly probe: P
       shell.session = { ...shell.session, items: [] };
       truncateStreamRows(shell, rowsBefore);
       setShellRunState(shell, "idle");
+
+      addPendingAttachment(shell, {
+        id: "clip",
+        name: "clip.png",
+        contentType: "image/png",
+        data: new Uint8Array([1]),
+        contentHash: "hash-clip",
+      });
+      press(h, chords[0]);
+      expect(shell.pendingAttachments).toHaveLength(0);
     },
   },
 

src/tui/prompt-slash-exit.test.ts

@@ -278,6 +278,10 @@ describe("Ctrl+C exit", () => {
 
   test("idle Ctrl+C with prompt text also drops pending attachments", async () => {
     await withShell(async ({ shell }) => {
+      let exits = 0;
+      setShellExitHandler(shell, () => {
+        exits += 1;
+      });
       addPendingAttachment(shell, pendingImage("clip"));
       shell.prompt.value = "look at this";
       expect(noticeText(shell)).toContain("1 image");
@@ -287,6 +291,10 @@ describe("Ctrl+C exit", () => {
       expect(shell.prompt.value).toBe("");
       expect(shell.pendingAttachments).toHaveLength(0);
       expect(noticeText(shell)).not.toContain("1 image");
+      expect(shell.statusFlash).toBe("press ctrl+c again to exit");
+
+      handleCtrlC(shell, 1);
+      expect(exits).toBe(1);
     });
   });
 
@@ -345,6 +353,39 @@ describe("Ctrl+C exit", () => {
       }
     });
   });
+
+  test("clearPendingAttachments swallows a missing ephemeralPath", async () => {
+    await withShell(async ({ shell }) => {
+      const missing = join(tmpdir(), "ctrlc-attach-missing.png");
+      addPendingAttachment(shell, pendingImage("ours", { ephemeralPath: missing }));
+      expect(() => clearPendingAttachments(shell)).not.toThrow();
+      expect(shell.pendingAttachments).toHaveLength(0);
+    });
+  });
+
+  test("clearPendingAttachments unlinks ephemeralPath on an attachment that also has path", async () => {
+    await withShell(async ({ shell }) => {
+      const dir = mkdtempSync(join(tmpdir(), "ctrlc-attach-both-"));
+      const ephemeral = join(dir, "ours.png");
+      const operator = join(dir, "theirs.png");
+      writeFileSync(ephemeral, "ephemeral-bytes");
+      writeFileSync(operator, "operator-bytes");
+      try {
+        addPendingAttachment(
+          shell,
+          pendingImage("both", { ephemeralPath: ephemeral, path: operator }),
+        );
+
+        clearPendingAttachments(shell);
+
+        expect(shell.pendingAttachments).toHaveLength(0);
+        expect(existsSync(ephemeral)).toBe(false);
+        expect(existsSync(operator)).toBe(true);
+      } finally {
+        rmSync(dir, { recursive: true, force: true });
+      }
+    });
+  });
 });
 
 function pendingImage(id: string, extra?: Partial<PendingImageAttachment>): PendingImageAttachment {