pair-mode 0.3.3 → 0.4.0

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pair-mode",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "Hold every proposed edit, annotate the diff line by line, and hand the notes back to the agent.",
   "author": {
     "name": "ofrusch",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pair-mode",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "Hold every proposed edit, annotate the diff line by line, and hand the notes back to the agent.",
   "author": {
     "name": "ofrusch",
@@ -8,13 +8,7 @@
   },
   "homepage": "https://github.com/oFrusch/pair-mode#readme",
   "license": "MIT",
-  "keywords": [
-    "code-review",
-    "diff",
-    "hooks",
-    "pair-programming",
-    "terminal"
-  ],
+  "keywords": ["code-review", "diff", "hooks", "pair-programming", "terminal"],
   "hooks": "./hooks/codex.json",
   "skills": "./skills/",
   "interface": {

package/README.md

@@ -1,8 +1,10 @@
-<img src="https://raw.githubusercontent.com/oFrusch/pair-mode/main/docs/images/duck.png" alt="The pair-mode duck" width="120" align="right">
+<p align="center">
+  <img src="https://raw.githubusercontent.com/oFrusch/pair-mode/main/assets/duck-appalled-banner-v2.gif" alt="A duck reacting to a diff full of deletions">
+</p>
 
-# pair mode
+<h1 align="center">pair mode</h1>
 
-#### For when your agent needs a rubber ducky.
+<p align="center"><b>For when your agent needs a rubber ducky.</b></p>
 
 `pair-mode` is a tool that allows you to sit somewhere between being an approval monkey for your agent running in manual mode and just totally vibe coding in auto mode.
 

package/dist/claude-code.js

@@ -9169,13 +9169,14 @@ function detect(preference, adapters = {}) {
 
 // src/transports/pane/pane.ts
 var NAME_BYTES2 = 6;
+var OWNER_ONLY_FILE = 384;
 function splitCommand(value) {
   return value.trim().split(/\s+/).filter((part) => part !== "");
 }
 function tempFile(prefix, suffix, content) {
   const name = `${prefix}${randomBytes3(NAME_BYTES2).toString("hex")}${suffix}`;
   const path = join8(tmpdir2(), name);
-  writeFileSync5(path, content, "utf-8");
+  writeFileSync5(path, content, { encoding: "utf-8", mode: OWNER_ONLY_FILE, flag: "wx" });
   return path;
 }
 function removeTreeQuietly(path) {

package/dist/cli.js

@@ -8579,7 +8579,14 @@ function connect(socketPath) {
   });
 }
 function emptyHandlers() {
-  return { review: [], cancel: [], change: [], bufferedReviews: [], bufferedCancels: [] };
+  return {
+    review: [],
+    cancel: [],
+    change: [],
+    close: [],
+    bufferedReviews: [],
+    bufferedCancels: []
+  };
 }
 function addReviewHandler(handlers, handler) {
   handlers.review.push(handler);
@@ -8592,6 +8599,7 @@ function addCancelHandler(handlers, handler) {
 async function attach(socketPath, client, handlers, onState) {
   const socket = await connect(socketPath);
   const readLines = createLineReader();
+  socket.on("error", () => socket.destroy());
   socket.on("data", (chunk) => {
     readLines(chunk).forEach((line2) => {
       const message = decodeLine(line2);
@@ -8650,6 +8658,9 @@ async function ownerHost(options) {
     onChange(handler) {
       handlers.change.push(handler);
     },
+    // The owner's socket only closes when the server it owns closes, so a handler here would never fire.
+    onClose() {
+    },
     async close() {
       socket.destroy();
       await server.close();
@@ -8663,6 +8674,11 @@ async function viewerHost(options) {
     remote = state;
     handlers.change.forEach((handler) => handler());
   });
+  socket.on("close", () => {
+    remote = null;
+    handlers.change.forEach((handler) => handler());
+    handlers.close.forEach((handler) => handler());
+  });
   return {
     socketPath: options.socketPath,
     owns: false,
@@ -8670,10 +8686,14 @@ async function viewerHost(options) {
       return { clients: remote?.clientCount ?? 0, waiting: remote?.waitingDepth ?? 0 };
     },
     refreshCounts() {
-      socket.write(encode({ type: "status" }));
+      if (!socket.destroyed) {
+        socket.write(encode({ type: "status" }));
+      }
     },
     verdict(id, questions) {
-      socket.write(encode({ type: "verdict", id, questions }));
+      if (!socket.destroyed) {
+        socket.write(encode({ type: "verdict", id, questions }));
+      }
     },
     onReview(handler) {
       addReviewHandler(handlers, handler);
@@ -8684,6 +8704,9 @@ async function viewerHost(options) {
     onChange(handler) {
       handlers.change.push(handler);
     },
+    onClose(handler) {
+      handlers.close.push(handler);
+    },
     close() {
       socket.destroy();
       return Promise.resolve();
@@ -9825,6 +9848,13 @@ function detect(preference, adapters = {}) {
 import { existsSync as existsSync8, readFileSync as readFileSync5, writeFileSync as writeFileSync6, mkdirSync as mkdirSync6, copyFileSync } from "node:fs";
 import { basename as basename5, dirname as dirname7, join as join12, sep as sep2 } from "node:path";
 var HOOK_TIMEOUT_SECONDS = 1800;
+function hookCommand(installRoot2, file) {
+  const path = join12(installRoot2, "dist", file);
+  if (/^[A-Za-z0-9_./-]+$/.test(path)) {
+    return path;
+  }
+  return `'${path.replace(/'/g, "'\\''")}'`;
+}
 function isHookEntry(value) {
   if (!isRecord(value)) {
     return false;
@@ -9915,7 +9945,7 @@ function hasCommand(groups, command) {
 }
 function matchesOurCommand(command) {
   const suffix = sep2 + join12("dist", basename5(command));
-  return (entry) => entry.command === command || entry.command.endsWith(suffix);
+  return (entry) => entry.command === command || entry.command.endsWith(suffix) || entry.command.endsWith(suffix + "'");
 }
 function upsertHookGroup(groups, matcher, command, timeout) {
   const matches = matchesOurCommand(command);
@@ -9984,7 +10014,7 @@ function claudeCodeSettingsPath(homeDir) {
 }
 function registerClaudeCode(homeDir, installRoot2) {
   const path = claudeCodeSettingsPath(homeDir);
-  const command = join12(installRoot2, "dist", "claude-code.js");
+  const command = hookCommand(installRoot2, "claude-code.js");
   return registerPreToolUseHook(path, "Write|Edit|MultiEdit", command, HOOK_TIMEOUT_SECONDS);
 }
 function codexHooksPath(homeDir) {
@@ -9992,7 +10022,7 @@ function codexHooksPath(homeDir) {
 }
 function registerCodex(homeDir, installRoot2) {
   const path = codexHooksPath(homeDir);
-  const command = join12(installRoot2, "dist", "codex.js");
+  const command = hookCommand(installRoot2, "codex.js");
   return registerPreToolUseHook(path, "apply_patch|Edit|Write", command, HOOK_TIMEOUT_SECONDS);
 }
 function findMultiEditMatchers(homeDir) {
@@ -10231,20 +10261,22 @@ function checkCommandOnPath(resolves) {
   };
 }
 function checkClis(home, root) {
-  const claudeCommand = join14(root, "dist", "claude-code.js");
-  const codexCommand = join14(root, "dist", "codex.js");
+  const claudeCommand = hookCommand(root, "claude-code.js");
+  const codexCommand = hookCommand(root, "codex.js");
+  const claudeTarget = join14(root, "dist", "claude-code.js");
+  const codexTarget = join14(root, "dist", "codex.js");
   const opencodeTarget = join14(root, "dist", "opencode.js");
   const piTarget = join14(root, "dist", "pi.js");
   const specs = [
     {
       cli: "claude-code",
       registered: isPreToolUseRegistered(claudeCodeSettingsPath(home), claudeCommand),
-      targetExists: existsSync10(claudeCommand)
+      targetExists: existsSync10(claudeTarget)
     },
     {
       cli: "codex",
       registered: isPreToolUseRegistered(codexHooksPath(home), codexCommand),
-      targetExists: existsSync10(codexCommand)
+      targetExists: existsSync10(codexTarget)
     },
     {
       cli: "opencode",
@@ -12585,6 +12617,7 @@ function splitInput(chunk) {
 
 // src/tui/notes/notes.ts
 import { writeFileSync as writeFileSync7 } from "node:fs";
+var OWNER_ONLY_FILE2 = 384;
 function rangeOf(selection) {
   const reversed = selection.anchorRow > selection.headRow || selection.anchorRow === selection.headRow && selection.anchorColumn > selection.headColumn;
   if (!reversed) {
@@ -12655,7 +12688,10 @@ function toQuestions(notes) {
 }
 function writeResult(path, notes) {
   try {
-    writeFileSync7(path, JSON.stringify({ questions: toQuestions(notes) }, null, 2), "utf-8");
+    writeFileSync7(path, JSON.stringify({ questions: toQuestions(notes) }, null, 2), {
+      encoding: "utf-8",
+      mode: OWNER_ONLY_FILE2
+    });
   } catch {
     return;
   }
@@ -13231,15 +13267,29 @@ async function runWatch(options, config) {
     nudge();
   });
   host.onCancel((id) => {
-    cancelled.add(id);
-    aborts.get(id)?.abort();
-    nudge();
+    const queuedIndex = pending.findIndex((review) => review.id === id);
+    if (queuedIndex !== -1) {
+      pending.splice(queuedIndex, 1);
+      nudge();
+      return;
+    }
+    if (aborts.has(id)) {
+      cancelled.add(id);
+      aborts.get(id)?.abort();
+      nudge();
+    }
   });
   host.onChange(() => {
     if (!busy && !quitting) {
       paintIdle(io, status(), truecolor);
     }
   });
+  host.onClose(() => {
+    quitting = true;
+    aborts.forEach((abort) => abort.abort());
+    errors = [...errors, new Error("the session owner exited")];
+    nudge();
+  });
   while (!quitting) {
     const review = pending.shift();
     if (review === void 0) {
@@ -14437,12 +14487,17 @@ function post(payload) {
     .then((response) => {
       // A refused verdict means another client already answered, so the notes typed here can never land.
       if (!response.ok) {
-        clearReview();
+        if (review !== null && review.id === payload.id) {
+          clearReview();
+        }
         warn("this review was already answered elsewhere - your notes were not sent");
         return;
       }
 
-      clearReview();
+      // Only clear if the server answered this review, not one that arrived via SSE meanwhile.
+      if (review !== null && review.id === payload.id) {
+        clearReview();
+      }
     })
     .catch(() => {
       sendButton.disabled = notes.length === 0;
@@ -14457,10 +14512,16 @@ approveButton.addEventListener("click", () => post({ id: review.id, notes: [] })
 const events = new EventSource("/r/" + token + "/events");
 
 events.addEventListener("review", (event) => {
-  review = JSON.parse(event.data);
-  notes = [];
-  expanded = new Set();
-  hidePopup();
+  const incoming = JSON.parse(event.data);
+
+  // Only reset if it is a different review.
+  if (review === null || review.id !== incoming.id) {
+    notes = [];
+    expanded = new Set();
+    hidePopup();
+  }
+
+  review = incoming;
   render();
 });
 
@@ -14811,12 +14872,12 @@ async function toWebReview(review, config) {
 
 // src/web/watch.ts
 var OWNER_ONLY_DIR3 = 448;
-var OWNER_ONLY_FILE2 = 384;
+var OWNER_ONLY_FILE3 = 384;
 function publishUrl(path, url) {
   mkdirSync7(dirname8(path), { recursive: true, mode: OWNER_ONLY_DIR3 });
   writeFileSync8(path, JSON.stringify({ url, pid: process.pid }) + "\n", {
     encoding: "utf-8",
-    mode: OWNER_ONLY_FILE2
+    mode: OWNER_ONLY_FILE3
   });
 }
 function linkPid(path) {