diffprism 1.1.0 → 1.3.0

package/README.md

@@ -130,6 +130,8 @@ diffprism hook install              # Add the gate to this repo's pre-commit hoo
 diffprism hook uninstall            # Remove it
 ```
 
+If you ask the agent something while the commit waits, the commit stops and prints each question with the command that answers it (`diffprism reply --session <id> <annotation-id> "…"`). The agent answers, commits again, and the review picks up where it left off — no MCP server needed.
+
 It reviews **staged** changes only, where every other entry point defaults to the whole
 working copy: a commit contains exactly the index, so unstaged edits aren't part of what
 is being approved. By default a staged diff of **120+ changed lines** opens a review; anything smaller
@@ -187,6 +189,7 @@ diffprism server status             # Check server status
 diffprism server stop               # Stop the server
 diffprism hook install              # Gate commits on a review
 diffprism hook uninstall            # Remove the gate
+diffprism reply --session <id> <annotation-id> "…"  # Answer a reviewer's question, as the agent
 diffprism feedback                  # Share feedback as a prefilled GitHub issue
 diffprism feedback --bug            # Report a bug, including the last error
 diffprism teardown                  # Remove configuration
@@ -215,6 +218,26 @@ pnpm run build
 pnpm cli review --staged            # Run CLI from source
 ```
 
+### Dogfooding a checkout
+
+To try unreleased changes in another project without publishing, point your global `diffprism` at a checkout:
+
+```bash
+git clone https://github.com/CodeJonesW/diffprism.git diffprism-dogfood
+cd diffprism-dogfood && pnpm install && pnpm build && npm link
+diffprism --version                 # 1.2.0 (dev build — /path/to/diffprism-dogfood)
+```
+
+Then, for each change you want to try:
+
+```bash
+git fetch && git checkout <branch> && git pull && pnpm build
+```
+
+The next `diffprism` command — a review, the commit gate — replaces the running server with the new build, unless a review is open in it. The dashboard picks up a rebuilt UI on reload. Go back to the release with `npm install -g diffprism@latest`.
+
+A server is only ever replaced by a **newer** build. Claude Code keeps `diffprism serve` running on the build it started with until you restart it, so restart Claude Code to put its MCP tools on the new build too.
+
 ### Project Structure
 
 ```

package/dist/bin.js

@@ -5,7 +5,7 @@ import {
 } from "./chunk-EPU4F7WT.js";
 import {
   demo
-} from "./chunk-FWPE5EA6.js";
+} from "./chunk-7YL3D42S.js";
 import {
   COMMIT_GATE_DIFF_REF,
   DEFAULT_DIFF_REF,
@@ -26,7 +26,7 @@ import {
   recordError,
   startGlobalServer,
   submitReviewToServer
-} from "./chunk-KRHZSUEK.js";
+} from "./chunk-MSNGZDVF.js";
 import {
   getDiff
 } from "./chunk-3GMPE2ZR.js";
@@ -40,6 +40,55 @@ import { Command } from "commander";
 import { execFileSync } from "child_process";
 import fs from "fs";
 import path from "path";
+
+// cli/src/commands/reply.ts
+function replyCommandFor(sessionId, annotationId) {
+  return `diffprism reply --session ${sessionId} ${annotationId} "<your answer>"`;
+}
+async function reply(annotationId, words, flags) {
+  const body = words.join(" ").trim();
+  if (!body) {
+    fail("Nothing to say: pass the reply after the annotation id.");
+    return;
+  }
+  const serverInfo = await isServerAlive();
+  if (!serverInfo) {
+    fail("No DiffPrism server is running, so there is no open review to reply on.");
+    return;
+  }
+  let response;
+  try {
+    response = await fetch(
+      `http://localhost:${serverInfo.httpPort}/api/reviews/${flags.session}/annotations/${annotationId}/replies`,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ author: "agent", agent: flags.agent ?? "agent", body })
+      }
+    );
+  } catch (err) {
+    recordError("reply", err);
+    fail(`Could not reach the DiffPrism server: ${err instanceof Error ? err.message : String(err)}
+${REPORT_HINT}`);
+    return;
+  }
+  const data = await response.json().catch(() => ({}));
+  if (!response.ok) {
+    fail(`Reply not posted: ${data.error ?? `server returned ${response.status}`}`);
+    return;
+  }
+  const where = data.annotation ? ` on ${data.annotation.file}:${data.annotation.line}` : "";
+  console.log(`Replied${where}. It shows in the review now.`);
+  console.log(
+    "The review is still open. Go back to waiting for the decision now: run the same command that opened it again (`git commit` or `diffprism review`). It returns the decision, or the reviewer's next question. Don't ask them in the terminal."
+  );
+}
+function fail(message2) {
+  console.error(message2);
+  process.exit(1);
+}
+
+// cli/src/commands/hook.ts
 var DEFAULT_MIN_LINES = 120;
 var RETRY_ADVICE = "The review stays open in DiffPrism \u2014 once the reviewer decides, run git commit again to pick up the decision. Don't open another review or change the staged files meanwhile.";
 var MARKER_START = "# >>> diffprism >>>";
@@ -57,7 +106,7 @@ async function preCommitHook(flags = {}) {
     );
   } catch (err) {
     recordError("hook pre-commit", err);
-    fail(`Could not read the staged diff: ${message(err)}
+    fail2(`Could not read the staged diff: ${message(err)}
 ${REPORT_HINT}`);
     return;
   }
@@ -88,18 +137,18 @@ ${REPORT_HINT}`);
   } catch (err) {
     stopWaiting();
     if (err instanceof ReviewerAskedError) {
-      printQuestions(err.threads);
-      fail(
-        `Commit blocked: the reviewer asked you something before deciding. Answer each question with the DiffPrism reply tool (session_id: ${err.sessionId}, annotation_id as listed), then run git commit again \u2014 the review stays open and the decision still comes.`
+      printQuestions(err.sessionId, err.threads);
+      fail2(
+        "Commit blocked: the reviewer asked you something before deciding. Answer each question with the command under it \u2014 change the code too if that's what they asked for \u2014 then run git commit again straight away to keep waiting. The review stays open, the reviewer may ask more, and the decision still comes. Don't stop to ask them in the terminal."
       );
       return;
     }
     if (err instanceof ReviewTimeoutError) {
-      fail(`Commit blocked: no decision after ${Math.round(err.waitedMs / 1e3)}s. ${RETRY_ADVICE}`);
+      fail2(`Commit blocked: no decision after ${Math.round(err.waitedMs / 1e3)}s. ${RETRY_ADVICE}`);
       return;
     }
     recordError("hook pre-commit", err);
-    fail(`DiffPrism could not run the review: ${message(err)}
+    fail2(`DiffPrism could not run the review: ${message(err)}
 ${REPORT_HINT}`);
     return;
   }
@@ -116,27 +165,28 @@ ${REPORT_HINT}`);
   }
   if (decision === "changes_requested") {
     printFeedback(review2);
-    fail("Commit blocked: the review requested changes.");
+    fail2("Commit blocked: the review requested changes.");
     return;
   }
   if (decision === "dismissed") {
-    fail("Commit blocked: the review was dismissed without a decision.");
+    fail2("Commit blocked: the review was dismissed without a decision.");
     return;
   }
-  fail(
+  fail2(
     `Commit blocked: no review decision was returned (got ${String(decision)}).`
   );
 }
-function printQuestions(threads) {
+function printQuestions(sessionId, threads) {
   console.error("");
   for (const t of threads) {
     const last = t.replies?.at(-1)?.body ?? t.body;
-    console.error(`  ${t.file}:${t.line}  (annotation_id: ${t.id})`);
+    console.error(`  ${t.file}:${t.line}`);
     for (const line of last.split("\n")) {
       console.error(`    ${line}`);
     }
+    console.error(`  Answer: ${replyCommandFor(sessionId, t.id)}`);
+    console.error("");
   }
-  console.error("");
 }
 function printFeedback(review2) {
   const summary = review2?.summary?.trim();
@@ -277,7 +327,7 @@ function ensureTrailingNewline(text) {
 function message(err) {
   return err instanceof Error ? err.message : String(err);
 }
-function fail(text) {
+function fail2(text) {
   console.error(text);
   process.exit(1);
 }
@@ -320,9 +370,9 @@ async function reviewLocalFlow(diffRef, flags) {
     }));
   } catch (err) {
     if (err instanceof ReviewerAskedError) {
-      printQuestions(err.threads);
+      printQuestions(err.sessionId, err.threads);
       console.error(
-        `The reviewer asked something before deciding. Answer each question with the DiffPrism reply tool (session_id: ${err.sessionId}, annotation_id as listed), then run diffprism review again \u2014 the review stays open.`
+        "The reviewer asked something before deciding. Answer each question with the command under it, then run diffprism review again straight away to keep waiting \u2014 the review stays open, and the reviewer may ask more. Don't stop to ask them in the terminal."
       );
       process.exit(1);
     }
@@ -449,7 +499,7 @@ If the repo has the DiffPrism pre-commit gate installed (\`diffprism hook instal
 - Run \`git commit\` with a shell timeout long enough for someone to read the change \u2014 up to 600000 ms \u2014 not the short default.
 - If the commit is interrupted, or reports no decision, the review is still open. Once the reviewer decides, run the **same** \`git commit\` again: their decision is picked up immediately. Don't change the staged files first \u2014 that makes it a new question.
 - If it's blocked with changes requested, the reviewer's summary and comments are printed. Address them, stage, and commit again.
-- If it's blocked because the reviewer asked something, their questions are printed with an \`annotation_id\` each. Answer each with \`mcp__diffprism__reply\`, then run the same \`git commit\` again \u2014 the review is still open.
+- If it's blocked because the reviewer asked something, each question is printed with the command that answers it \u2014 \`diffprism reply --session <id> <annotation-id> "<your answer>"\`. Run it for each, then run the same \`git commit\` again \u2014 the review is still open.
 
 ## Workflow 3: PR Review
 
@@ -669,7 +719,7 @@ async function setupInteractive(flags) {
 }
 async function runDemo(dev) {
   console.log("");
-  const { demo: demo2 } = await import("./demo-Z2XUXEV3.js");
+  const { demo: demo2 } = await import("./demo-376MCAK4.js");
   await demo2({ dev });
 }
 async function setupBatch(flags) {
@@ -1184,6 +1234,7 @@ hookCmd.command("uninstall").description("Remove the diffprism gate from this re
   uninstallHook();
 });
 program.command("feedback").description("Open a prefilled GitHub issue to share feedback or report a bug \u2014 you review it before anything is sent").option("--bug", "Report a bug, including the last error DiffPrism hit").option("-m, --message <text>", "Start the issue with this text").option("--print", "Print the issue URL instead of opening a browser").action((flags) => feedback(flags));
+program.command("reply <annotation-id> <message...>").description("Answer a reviewer's question on an open review, as the agent").requiredOption("--session <id>", "The review the question is on").option("--agent <name>", "Name shown on the reply", "agent").action((annotationId, message2, flags) => reply(annotationId, message2, flags));
 program.command("serve").description("Start the MCP server for Claude Code integration").action(serve);
 program.command("setup").description("Configure DiffPrism for Claude Code integration").option("--global", "Configure globally (skill + permissions, no git repo required)").option("--force", "Overwrite existing configuration files").option("--dev", "Use Vite dev server").option("--no-demo", "Skip the demo review after setup").action((flags) => {
   setup(flags);

package/dist/{chunk-FWPE5EA6.js → chunk-7YL3D42S.js}

@@ -1,7 +1,7 @@
 import {
   ensureServer,
   submitReviewToServer
-} from "./chunk-KRHZSUEK.js";
+} from "./chunk-MSNGZDVF.js";
 import {
   parseDiff
 } from "./chunk-3GMPE2ZR.js";

package/dist/{chunk-KRHZSUEK.js → chunk-MSNGZDVF.js}

@@ -79,15 +79,13 @@ async function isServerAlive() {
   }
 }
 
-// packages/core/src/diff-scope.ts
-var DEFAULT_DIFF_REF = "working-copy";
-var COMMIT_GATE_DIFF_REF = "staged";
-var DIFF_REF_DESCRIPTION = 'Which changes to review. "working-copy" (the default): everything not yet committed, staged and unstaged shown as separate groups. "staged": only what the next commit would contain. "unstaged": only edits not yet staged. Or a ref range such as "HEAD~3..HEAD" or "main..feature".';
-
 // packages/core/src/build-info.ts
 import fs2 from "fs";
 import path2 from "path";
 import { fileURLToPath } from "url";
+function builtAt() {
+  return true ? 1789607742599 : null;
+}
 function getBuildInfo() {
   let dir = path2.dirname(fileURLToPath(import.meta.url));
   while (dir !== path2.dirname(dir)) {
@@ -112,6 +110,11 @@ function describeVersion(version) {
   return info.dev ? `${version} (dev build \u2014 ${info.root})` : version;
 }
 
+// packages/core/src/diff-scope.ts
+var DEFAULT_DIFF_REF = "working-copy";
+var COMMIT_GATE_DIFF_REF = "staged";
+var DIFF_REF_DESCRIPTION = 'Which changes to review. "working-copy" (the default): everything not yet committed, staged and unstaged shown as separate groups. "staged": only what the next commit would contain. "unstaged": only edits not yet staged. Or a ref range such as "HEAD~3..HEAD" or "main..feature".';
+
 // packages/core/src/feedback.ts
 import fs3 from "fs";
 import os2 from "os";
@@ -119,7 +122,7 @@ import path3 from "path";
 var ISSUES_NEW_URL = "https://github.com/CodeJonesW/diffprism/issues/new";
 var MAX_ERROR_CHARS = 1500;
 function currentVersion() {
-  return true ? "1.1.0" : "0.0.0-dev";
+  return true ? "1.3.0" : "0.0.0-dev";
 }
 function describeEnvironment() {
   return {
@@ -226,7 +229,22 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 async function ensureServer(options = {}) {
   const existing = await isServerAlive();
   if (existing) {
-    return existing;
+    const decision = await decideOnRunningServer(existing, builtAt());
+    if (decision.action === "keep") {
+      return existing;
+    }
+    if (decision.action === "keep-busy") {
+      if (!options.silent) {
+        console.error(
+          `The DiffPrism server (PID ${existing.pid}) runs an older build, but ${decision.openReviews} review${decision.openReviews === 1 ? " is" : "s are"} open in it, so it stays up. Finish or close ${decision.openReviews === 1 ? "it" : "them"} and the next command starts the new build \u2014 or run \`diffprism server stop\`.`
+        );
+      }
+      return existing;
+    }
+    if (!options.silent) {
+      console.error(`Replacing the DiffPrism server (PID ${existing.pid}): it runs an older build than this command.`);
+    }
+    await stopServer(existing);
   }
   const spawnArgs = options.spawnCommand ?? buildDefaultSpawnCommand(options);
   const logDir = path4.join(os3.homedir(), ".diffprism");
@@ -256,6 +274,44 @@ async function ensureServer(options = {}) {
     `DiffPrism server failed to start within ${timeoutMs / 1e3}s. Check logs at ${logPath}`
   );
 }
+async function decideOnRunningServer(server, ownBuiltAt) {
+  if (ownBuiltAt === null) return { action: "keep" };
+  if (server.builtAt !== void 0 && server.builtAt >= ownBuiltAt) return { action: "keep" };
+  const response = await fetch(`http://localhost:${server.httpPort}/api/reviews`);
+  if (!response.ok) {
+    throw new Error(`Could not list reviews on the running DiffPrism server: it returned ${response.status}`);
+  }
+  const { sessions: sessions2 } = await response.json();
+  const openReviews = sessions2.filter((s) => s.status === "pending" || s.status === "in_review").length;
+  return openReviews > 0 ? { action: "keep-busy", openReviews } : { action: "replace" };
+}
+async function stopServer(server, timeoutMs = 5e3) {
+  try {
+    process.kill(server.pid, "SIGTERM");
+  } catch {
+  }
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    if (!isProcessRunning(server.pid)) {
+      if (readServerFile()?.pid === server.pid) {
+        removeServerFile();
+      }
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+  throw new Error(
+    `The old DiffPrism server (PID ${server.pid}) did not stop within ${timeoutMs / 1e3}s. Stop it with \`diffprism server stop\` and try again.`
+  );
+}
+function isProcessRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function buildDefaultSpawnCommand(options) {
   const thisFile = fileURLToPath2(import.meta.url);
   const thisDir = path4.dirname(thisFile);
@@ -1913,6 +1969,10 @@ async function startGlobalServer(options = {}) {
     pid: process.pid,
     startedAt: Date.now()
   };
+  const serverBuiltAt = builtAt();
+  if (serverBuiltAt !== null) {
+    serverInfo.builtAt = serverBuiltAt;
+  }
   writeServerFile(serverInfo);
   if (!silent) {
     console.log(`
@@ -1993,11 +2053,11 @@ function mcpToolPermission(name) {
 export {
   readServerFile,
   isServerAlive,
+  getBuildInfo,
+  describeVersion,
   DEFAULT_DIFF_REF,
   COMMIT_GATE_DIFF_REF,
   DIFF_REF_DESCRIPTION,
-  getBuildInfo,
-  describeVersion,
   currentVersion,
   recordError,
   readLastError,

package/dist/{demo-Z2XUXEV3.js → demo-376MCAK4.js}

@@ -1,7 +1,7 @@
 import {
   demo
-} from "./chunk-FWPE5EA6.js";
-import "./chunk-KRHZSUEK.js";
+} from "./chunk-7YL3D42S.js";
+import "./chunk-MSNGZDVF.js";
 import "./chunk-3GMPE2ZR.js";
 import "./chunk-DHCVZGHE.js";
 import "./chunk-JSBRDJBE.js";

package/dist/mcp-server.js

@@ -14,7 +14,7 @@ import {
   recordError,
   submitReviewToServer,
   waitForDecision
-} from "./chunk-KRHZSUEK.js";
+} from "./chunk-MSNGZDVF.js";
 import {
   getDiff
 } from "./chunk-3GMPE2ZR.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffprism",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "type": "module",
   "description": "Local-first code review tool for agent-generated code changes",
   "bin": {