diffprism 0.34.1 → 0.35.0

package/dist/mcp-server.js

@@ -1,119 +1,33 @@
 import {
-  analyze,
-  consumeReviewResult,
   createGitHubClient,
-  detectWorktree,
+  ensureServer,
   fetchPullRequest,
   fetchPullRequestDiff,
-  getCurrentBranch,
-  getDiff,
   isServerAlive,
   normalizePr,
   parsePrRef,
-  readReviewResult,
-  readWatchFile,
   resolveGitHubToken,
-  startReview,
-  submitGitHubReview
-} from "./chunk-VASCXEMN.js";
+  submitGitHubReview,
+  submitReviewToServer
+} from "./chunk-LUUR6LNP.js";
+import {
+  getDiff
+} from "./chunk-QGWYCEJN.js";
+import {
+  analyze
+} from "./chunk-DHCVZGHE.js";
+import "./chunk-JSBRDJBE.js";
 
 // packages/mcp-server/src/index.ts
-import fs from "fs";
-import path from "path";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 var lastGlobalSessionId = null;
 var lastGlobalServerInfo = null;
-async function reviewViaGlobalServer(serverInfo, diffRef, options) {
-  const cwd = options.cwd ?? process.cwd();
-  const { diffSet, rawDiff } = getDiff(diffRef, { cwd });
-  const currentBranch = getCurrentBranch({ cwd });
-  if (diffSet.files.length === 0) {
-    return {
-      decision: "approved",
-      comments: [],
-      summary: "No changes to review."
-    };
-  }
-  const briefing = analyze(diffSet);
-  const worktreeInfo = detectWorktree({ cwd });
-  const payload = {
-    reviewId: "",
-    // Server assigns the real ID
-    diffSet,
-    rawDiff,
-    briefing,
-    metadata: {
-      title: options.title,
-      description: options.description,
-      reasoning: options.reasoning,
-      currentBranch,
-      worktree: worktreeInfo.isWorktree ? {
-        isWorktree: true,
-        worktreePath: worktreeInfo.worktreePath,
-        mainWorktreePath: worktreeInfo.mainWorktreePath
-      } : void 0
-    }
-  };
-  const createResponse = await fetch(
-    `http://localhost:${serverInfo.httpPort}/api/reviews`,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ payload, projectPath: cwd, diffRef })
-    }
-  );
-  if (!createResponse.ok) {
-    throw new Error(`Global server returned ${createResponse.status} on create`);
-  }
-  const { sessionId } = await createResponse.json();
-  lastGlobalSessionId = sessionId;
-  lastGlobalServerInfo = serverInfo;
-  if (options.annotations?.length) {
-    for (const ann of options.annotations) {
-      await fetch(
-        `http://localhost:${serverInfo.httpPort}/api/reviews/${sessionId}/annotations`,
-        {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            file: ann.file,
-            line: ann.line,
-            body: ann.body,
-            type: ann.type,
-            confidence: ann.confidence ?? 1,
-            category: ann.category ?? "other",
-            source: {
-              agent: ann.source_agent ?? "unknown",
-              tool: "open_review"
-            }
-          })
-        }
-      );
-    }
-  }
-  const pollIntervalMs = 2e3;
-  const maxWaitMs = 600 * 1e3;
-  const start = Date.now();
-  while (Date.now() - start < maxWaitMs) {
-    const resultResponse = await fetch(
-      `http://localhost:${serverInfo.httpPort}/api/reviews/${sessionId}/result`
-    );
-    if (resultResponse.ok) {
-      const data = await resultResponse.json();
-      if (data.result) {
-        return data.result;
-      }
-    }
-    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
-  }
-  throw new Error("Review timed out waiting for submission.");
-}
 async function startMcpServer() {
   const server = new McpServer({
     name: "diffprism",
-    version: true ? "0.34.1" : "0.0.0-dev"
+    version: true ? "0.35.0" : "0.0.0-dev"
   });
   server.tool(
     "open_review",
@@ -148,36 +62,21 @@ async function startMcpServer() {
     },
     async ({ diff_ref, title, description, reasoning, annotations }) => {
       try {
-        const serverInfo = await isServerAlive();
-        if (serverInfo) {
-          const result2 = await reviewViaGlobalServer(serverInfo, diff_ref, {
+        const serverInfo = await ensureServer({ silent: true });
+        const { result, sessionId } = await submitReviewToServer(
+          serverInfo,
+          diff_ref,
+          {
             title,
             description,
             reasoning,
             cwd: process.cwd(),
-            annotations
-          });
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify(result2, null, 2)
-              }
-            ]
-          };
-        }
-        const isDev = fs.existsSync(
-          path.join(process.cwd(), "packages", "ui", "src", "App.tsx")
+            annotations,
+            diffRef: diff_ref
+          }
         );
-        const result = await startReview({
-          diffRef: diff_ref,
-          title,
-          description,
-          reasoning,
-          cwd: process.cwd(),
-          silent: true,
-          dev: isDev
-        });
+        lastGlobalSessionId = sessionId;
+        lastGlobalServerInfo = serverInfo;
         return {
           content: [
             {
@@ -202,7 +101,7 @@ async function startMcpServer() {
   );
   server.tool(
     "update_review_context",
-    "Push reasoning/context to a running DiffPrism review session. Non-blocking \u2014 returns immediately. Use this when `diffprism watch` or `diffprism server` is running to update the review UI with agent reasoning without opening a new review.",
+    "Push reasoning/context to a running DiffPrism review session. Non-blocking \u2014 returns immediately. Updates the review UI with agent reasoning without opening a new review. Requires a prior `open_review` call in this session.",
     {
       reasoning: z.string().optional().describe("Agent reasoning about the current changes"),
       title: z.string().optional().describe("Updated title for the review"),
@@ -214,42 +113,19 @@ async function startMcpServer() {
         if (reasoning !== void 0) payload.reasoning = reasoning;
         if (title !== void 0) payload.title = title;
         if (description !== void 0) payload.description = description;
-        if (lastGlobalSessionId && lastGlobalServerInfo) {
-          const serverInfo = await isServerAlive();
-          if (serverInfo) {
-            const response2 = await fetch(
-              `http://localhost:${serverInfo.httpPort}/api/reviews/${lastGlobalSessionId}/context`,
-              {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify(payload)
-              }
-            );
-            if (response2.ok) {
-              return {
-                content: [
-                  {
-                    type: "text",
-                    text: "Context updated in DiffPrism global server session."
-                  }
-                ]
-              };
-            }
-          }
-        }
-        const watchInfo = readWatchFile();
-        if (!watchInfo) {
+        const serverInfo = lastGlobalServerInfo ?? await isServerAlive();
+        if (!serverInfo || !lastGlobalSessionId) {
           return {
             content: [
               {
                 type: "text",
-                text: "No DiffPrism session is running. Start one with `diffprism watch` or `diffprism server`."
+                text: "No DiffPrism session is running. Use `open_review` to start a review."
               }
             ]
           };
         }
         const response = await fetch(
-          `http://localhost:${watchInfo.wsPort}/api/context`,
+          `http://localhost:${serverInfo.httpPort}/api/reviews/${lastGlobalSessionId}/context`,
           {
             method: "POST",
             headers: { "Content-Type": "application/json" },
@@ -257,13 +133,13 @@ async function startMcpServer() {
           }
         );
         if (!response.ok) {
-          throw new Error(`Watch server returned ${response.status}`);
+          throw new Error(`Server returned ${response.status}`);
         }
         return {
           content: [
             {
               type: "text",
-              text: "Context updated in DiffPrism watch session."
+              text: "Context updated in DiffPrism session."
             }
           ]
         };
@@ -283,7 +159,7 @@ async function startMcpServer() {
   );
   server.tool(
     "get_review_result",
-    "Fetch the most recent review result from a DiffPrism session. Returns the reviewer's decision and comments if a review has been submitted, or a message indicating no pending result. The result is marked as consumed after retrieval so it won't be returned again. Use wait=true to block until a result is available (recommended after pushing context to a watch session).",
+    "Fetch the most recent review result from a DiffPrism session. Returns the reviewer's decision and comments if a review has been submitted, or a message indicating no pending result. Use wait=true to block until a result is available. Note: `open_review` already blocks and returns the result \u2014 this tool is only needed for advanced workflows where you want to check results separately.",
     {
       wait: z.boolean().optional().describe("If true, poll until a review result is available (blocks up to timeout)"),
       timeout: z.number().optional().describe("Max wait time in seconds when wait=true (default: 300, max: 600)")
@@ -292,80 +168,36 @@ async function startMcpServer() {
       try {
         const maxWaitMs = Math.min(timeout ?? 300, 600) * 1e3;
         const pollIntervalMs = 2e3;
-        if (lastGlobalSessionId && lastGlobalServerInfo) {
-          const serverInfo = await isServerAlive();
-          if (serverInfo) {
-            if (wait) {
-              const start = Date.now();
-              while (Date.now() - start < maxWaitMs) {
-                const response2 = await fetch(
-                  `http://localhost:${serverInfo.httpPort}/api/reviews/${lastGlobalSessionId}/result`
-                );
-                if (response2.ok) {
-                  const data2 = await response2.json();
-                  if (data2.result) {
-                    return {
-                      content: [
-                        {
-                          type: "text",
-                          text: JSON.stringify(data2.result, null, 2)
-                        }
-                      ]
-                    };
-                  }
-                }
-                await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+        const serverInfo = lastGlobalServerInfo ?? await isServerAlive();
+        if (!serverInfo || !lastGlobalSessionId) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: "No DiffPrism session is running. Use `open_review` to start a review."
               }
-              return {
-                content: [
-                  {
-                    type: "text",
-                    text: "No review result received within timeout."
-                  }
-                ]
-              };
-            }
-            const response = await fetch(
+            ]
+          };
+        }
+        if (wait) {
+          const start = Date.now();
+          while (Date.now() - start < maxWaitMs) {
+            const response2 = await fetch(
               `http://localhost:${serverInfo.httpPort}/api/reviews/${lastGlobalSessionId}/result`
             );
-            if (response.ok) {
-              const data2 = await response.json();
-              if (data2.result) {
+            if (response2.ok) {
+              const data = await response2.json();
+              if (data.result) {
                 return {
                   content: [
                     {
                       type: "text",
-                      text: JSON.stringify(data2.result, null, 2)
+                      text: JSON.stringify(data.result, null, 2)
                     }
                   ]
                 };
               }
             }
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: "No pending review result."
-                }
-              ]
-            };
-          }
-        }
-        if (wait) {
-          const start = Date.now();
-          while (Date.now() - start < maxWaitMs) {
-            const data2 = readReviewResult();
-            if (data2) {
-              consumeReviewResult();
-              return {
-                content: [
-                  {
-                    type: "text",
-                    text: JSON.stringify(data2.result, null, 2)
-                  }
-                ]
-              };
-            }
             await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
           }
           return {
@@ -377,23 +209,27 @@ async function startMcpServer() {
             ]
           };
         }
-        const data = readReviewResult();
-        if (!data) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: "No pending review result."
-              }
-            ]
-          };
+        const response = await fetch(
+          `http://localhost:${serverInfo.httpPort}/api/reviews/${lastGlobalSessionId}/result`
+        );
+        if (response.ok) {
+          const data = await response.json();
+          if (data.result) {
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: JSON.stringify(data.result, null, 2)
+                }
+              ]
+            };
+          }
         }
-        consumeReviewResult();
         return {
           content: [
             {
               type: "text",
-              text: JSON.stringify(data.result, null, 2)
+              text: "No pending review result."
             }
           ]
         };
@@ -814,59 +650,18 @@ async function startMcpServer() {
           };
         }
         const { payload } = normalizePr(rawDiff, prMetadata, { title, reasoning });
-        const serverInfo = await isServerAlive();
-        let result;
-        if (serverInfo) {
-          const createResponse = await fetch(
-            `http://localhost:${serverInfo.httpPort}/api/reviews`,
-            {
-              method: "POST",
-              headers: { "Content-Type": "application/json" },
-              body: JSON.stringify({
-                payload,
-                projectPath: `github:${owner}/${repo}`,
-                diffRef: `PR #${number}`
-              })
-            }
-          );
-          if (!createResponse.ok) {
-            throw new Error(`Global server returned ${createResponse.status}`);
-          }
-          const { sessionId } = await createResponse.json();
-          lastGlobalSessionId = sessionId;
-          lastGlobalServerInfo = serverInfo;
-          const pollIntervalMs = 2e3;
-          const maxWaitMs = 600 * 1e3;
-          const start = Date.now();
-          while (Date.now() - start < maxWaitMs) {
-            const resultResponse = await fetch(
-              `http://localhost:${serverInfo.httpPort}/api/reviews/${sessionId}/result`
-            );
-            if (resultResponse.ok) {
-              const data = await resultResponse.json();
-              if (data.result) {
-                result = data.result;
-                break;
-              }
-            }
-            await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+        const serverInfo = await ensureServer({ silent: true });
+        const { result, sessionId } = await submitReviewToServer(
+          serverInfo,
+          `PR #${number}`,
+          {
+            injectedPayload: payload,
+            projectPath: `github:${owner}/${repo}`,
+            diffRef: `PR #${number}`
           }
-          result ??= { decision: "dismissed", comments: [], summary: "Review timed out." };
-        } else {
-          const isDev = fs.existsSync(
-            path.join(process.cwd(), "packages", "ui", "src", "App.tsx")
-          );
-          result = await startReview({
-            diffRef: `PR #${number}`,
-            title: payload.metadata.title,
-            description: payload.metadata.description,
-            reasoning: payload.metadata.reasoning,
-            cwd: process.cwd(),
-            silent: true,
-            dev: isDev,
-            injectedPayload: payload
-          });
-        }
+        );
+        lastGlobalSessionId = sessionId;
+        lastGlobalServerInfo = serverInfo;
         if ((post_to_github || result.postToGithub) && result.decision !== "dismissed") {
           const posted = await submitGitHubReview(client, owner, repo, number, result);
           if (posted) {

package/dist/src-AMCPIYDZ.js

@@ -0,0 +1,19 @@
+import {
+  detectWorktree,
+  getCurrentBranch,
+  getDiff,
+  getGitDiff,
+  listBranches,
+  listCommits,
+  parseDiff
+} from "./chunk-QGWYCEJN.js";
+import "./chunk-JSBRDJBE.js";
+export {
+  detectWorktree,
+  getCurrentBranch,
+  getDiff,
+  getGitDiff,
+  listBranches,
+  listCommits,
+  parseDiff
+};

package/dist/src-JMPTSU3P.js

@@ -0,0 +1,27 @@
+import {
+  analyze,
+  categorizeFiles,
+  computeComplexityScores,
+  computeFileStats,
+  detectAffectedModules,
+  detectAffectedTests,
+  detectNewDependencies,
+  detectPatterns,
+  detectSecurityPatterns,
+  detectTestCoverageGaps,
+  generateSummary
+} from "./chunk-DHCVZGHE.js";
+import "./chunk-JSBRDJBE.js";
+export {
+  analyze,
+  categorizeFiles,
+  computeComplexityScores,
+  computeFileStats,
+  detectAffectedModules,
+  detectAffectedTests,
+  detectNewDependencies,
+  detectPatterns,
+  detectSecurityPatterns,
+  detectTestCoverageGaps,
+  generateSummary
+};

package/package.json

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