pullfrog 0.1.103 → 0.1.104

package/dist/cli.mjs

@@ -112919,7 +112919,7 @@ var import_picocolors = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.103",
+  version: "0.1.104",
   cliContractVersion: "1",
   type: "module",
   bin: {
@@ -193647,14 +193647,18 @@ async function runGitLines(args2) {
 // utils/rangeDiff.ts
 function computeIncrementalDiff(params) {
   try {
+    const tips = [`origin/${params.baseBranch}`, ...params.formerBaseTips];
+    const oldBase = versionBase({ sha: params.beforeSha, tips });
+    const newBase = versionBase({ sha: params.headSha, tips });
     const raw2 = $(
       "sh",
       [
         "-c",
-        'old_base=$(git merge-base "$1" "origin/$2") && new_base=$(git merge-base "$3" "origin/$2") && git range-diff --no-color --creation-factor=1000 "$old_base..$(git commit-tree "$1^{tree}" -p "$old_base" -m x)" "$new_base..$(git commit-tree "$3^{tree}" -p "$new_base" -m x)"',
+        'git range-diff --no-color --creation-factor=1000 "$1..$(git commit-tree "$2^{tree}" -p "$1" -m x)" "$3..$(git commit-tree "$4^{tree}" -p "$3" -m x)"',
         "--",
+        oldBase,
         params.beforeSha,
-        params.baseBranch,
+        newBase,
         params.headSha
       ],
       { log: false }
@@ -193667,6 +193671,27 @@ function computeIncrementalDiff(params) {
     return { status: "unavailable", reason };
   }
 }
+function git(args2) {
+  return $("git", args2, { log: false }).trim();
+}
+function versionBase(params) {
+  let best;
+  for (const tip of params.tips) {
+    let sha;
+    try {
+      sha = git(["merge-base", params.sha, tip]);
+    } catch {
+      continue;
+    }
+    const commits = Number(git(["rev-list", "--count", `${sha}..${params.sha}`]));
+    if (!best || commits < best.commits) best = { tip, sha, commits };
+  }
+  if (!best) throw new Error(`no merge base between ${params.sha} and the base branch`);
+  if (best.tip !== params.tips[0]) {
+    log2.info(`\xBB incremental diff: ${params.sha.slice(0, 7)} sits on former base tip ${best.tip}`);
+  }
+  return best.sha;
+}
 function isDiffPrefix(ch) {
   return ch === " " || ch === "+" || ch === "-";
 }
@@ -193694,14 +193719,28 @@ function postProcessRangeDiff(raw2, contextLines = 3) {
     if (lastHunkHdr?.seq === line.seq) hunkHdrEmitted = true;
   }
   function flushBefore() {
-    if (lastOuterHdr && !outerHdrEmitted) emit2(lastOuterHdr);
-    if (lastFileHdr && !fileHdrEmitted) emit2(lastFileHdr);
-    if (lastHunkHdr && !hunkHdrEmitted) emit2(lastHunkHdr);
-    for (const line of beforeBuf) {
-      if (line.seq > lastEmittedSeq) emit2(line);
+    const headers = [
+      outerHdrEmitted ? null : lastOuterHdr,
+      fileHdrEmitted ? null : lastFileHdr,
+      hunkHdrEmitted ? null : lastHunkHdr
+    ].filter((line) => line !== null);
+    const pending = [...headers, ...beforeBuf.filter((line) => line.seq > lastEmittedSeq)].sort(
+      (a2, b) => a2.seq - b.seq
+    );
+    for (const [i2, line] of pending.entries()) {
+      if (pending[i2 - 1]?.seq !== line.seq) emit2(line);
     }
     beforeBuf.length = 0;
   }
+  function isFileHeader(pos) {
+    return raw2.startsWith("## ", pos) && !raw2.startsWith("## Commit message", pos);
+  }
+  function markFileHeader(line, emitted) {
+    lastFileHdr = line;
+    fileHdrEmitted = emitted;
+    lastHunkHdr = null;
+    hunkHdrEmitted = true;
+  }
   let cursor3 = 0;
   while (cursor3 < raw2.length) {
     const eol = raw2.indexOf("\n", cursor3);
@@ -193711,7 +193750,8 @@ function postProcessRangeDiff(raw2, contextLines = 3) {
       continue;
     }
     if (raw2.startsWith("    @@", cursor3)) {
-      lastOuterHdr = { prefix: "", from: cursor3 + 4, to: lineEnd, seq };
+      const label = raw2.slice(cursor3 + 4, lineEnd);
+      lastOuterHdr = label === "@@ Metadata" || label === "@@ Commit message" ? null : { prefix: "", from: cursor3 + 4, to: lineEnd, seq };
       outerHdrEmitted = false;
       lastFileHdr = null;
       fileHdrEmitted = true;
@@ -193732,13 +193772,13 @@ function postProcessRangeDiff(raw2, contextLines = 3) {
         } else if (isDiffPrefix(raw2[contentPos])) {
           isChange = isOuterChange;
           line = { prefix, from: contentPos + 1, to: lineEnd, seq };
+          if (raw2[contentPos] === " " && isFileHeader(contentPos + 1)) {
+            markFileHeader(line, isChange);
+          }
         } else {
           line = { prefix, from: contentPos, to: lineEnd, seq };
-          if (raw2.startsWith("## ", contentPos) && !raw2.startsWith("## Commit message", contentPos)) {
-            lastFileHdr = line;
-            fileHdrEmitted = false;
-            lastHunkHdr = null;
-            hunkHdrEmitted = true;
+          if (isFileHeader(contentPos)) {
+            markFileHeader(line, false);
           } else if (raw2.startsWith("@@", contentPos) && !raw2.startsWith("@@ Metadata", contentPos)) {
             lastHunkHdr = line;
             hunkHdrEmitted = false;
@@ -199731,6 +199771,7 @@ var STRING_KEYS = [
   "prNodeId",
   "issueNodeId",
   "reviewNodeId",
+  "reviewedCommitSha",
   "planCommentNodeId",
   "summarySnapshot",
   "model",
@@ -200895,7 +200936,10 @@ async function createAndSubmitWithFooter(ctx, params, opts) {
   }
 }
 async function reportReviewNodeId(ctx, params) {
-  await patchWorkflowRunFields(ctx, { reviewNodeId: params.nodeId });
+  await patchWorkflowRunFields(ctx, {
+    reviewNodeId: params.nodeId,
+    reviewedCommitSha: params.reviewedSha
+  });
 }
 
 // utils/setup.ts
@@ -201489,6 +201533,34 @@ function describeHead(h2) {
   if (h2.kind === "branch") return `branch \`${h2.name}\``;
   return `detached HEAD \`${h2.sha}\``;
 }
+var FORMER_BASE_TIPS_QUERY = `
+  query ($owner: String!, $repo: String!, $number: Int!) {
+    repository(owner: $owner, name: $repo) {
+      pullRequest(number: $number) {
+        timelineItems(itemTypes: [BASE_REF_FORCE_PUSHED_EVENT], last: 100) {
+          nodes { ... on BaseRefForcePushedEvent { beforeCommit { oid } } }
+        }
+      }
+    }
+  }
+`;
+async function getFormerBaseTips(ctx, pullNumber) {
+  try {
+    const response = await ctx.octokit.graphql(FORMER_BASE_TIPS_QUERY, {
+      owner: ctx.repo.owner,
+      repo: ctx.repo.name,
+      number: pullNumber
+    });
+    return response.repository.pullRequest.timelineItems.nodes.flatMap(
+      (node3) => node3.beforeCommit ? [node3.beforeCommit.oid] : []
+    );
+  } catch (error63) {
+    log2.warning(
+      `\xBB former base tips unavailable: ${error63 instanceof Error ? error63.message : String(error63)}`
+    );
+    return [];
+  }
+}
 function CheckoutPrTool(ctx) {
   const runCheckout = async (pull_number, signal) => {
     const prResponse = await ctx.octokit.rest.pulls.get({
@@ -201541,7 +201613,8 @@ function CheckoutPrTool(ctx) {
       const incremental = computeIncrementalDiff({
         baseBranch: pr.baseRef,
         beforeSha: primary.beforeSha,
-        headSha: checkoutSha
+        headSha: checkoutSha,
+        formerBaseTips: await getFormerBaseTips(ctx, pull_number)
       });
       if (incremental.status === "ok") {
         incrementalDiffPath = join17(
@@ -208136,7 +208209,7 @@ async function postReviewCleanup(ctx) {
   if (!review) {
     const checkoutSha = primaryRepoState(ctx.toolState).checkoutSha;
     if (ctx.toolState.selectedMode === "IncrementalReview" && checkoutSha) {
-      await patchWorkflowRunFields(ctx, { reviewSkipped: true });
+      await patchWorkflowRunFields(ctx, { reviewSkipped: true, reviewedCommitSha: checkoutSha });
       await bestEffort(
         () => dispatchFollowUpReReview(ctx, checkoutSha),
         "follow-up re-review dispatch"
@@ -208145,7 +208218,7 @@ async function postReviewCleanup(ctx) {
     return;
   }
   delete ctx.toolState.review;
-  await bestEffort(() => reportReviewNodeId(ctx, { nodeId: review.nodeId }), "reportReviewNodeId");
+  await bestEffort(() => reportReviewNodeId(ctx, review), "reportReviewNodeId");
   if (review.reviewedSha) {
     await bestEffort(
       () => dispatchFollowUpReReview(ctx, review.reviewedSha),
@@ -209915,7 +209988,7 @@ function resolveTarget2(repo) {
   return { owner: match3[1], repo: match3[2] };
 }
 function cliVersion() {
-  const parts = /^(\d+)\.(\d+)\.(\d+)$/.exec("0.1.103");
+  const parts = /^(\d+)\.(\d+)\.(\d+)$/.exec("0.1.104");
   if (!parts) return "0.0.0";
   return `${Number(parts[1])}.${Number(parts[2])}.${Number(parts[3])}`;
 }
@@ -210082,7 +210155,7 @@ async function runCli8(input2) {
 }
 
 // cli.ts
-var VERSION10 = "0.1.103";
+var VERSION10 = "0.1.104";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);

package/dist/index.js

@@ -112141,7 +112141,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.103",
+  version: "0.1.104",
   cliContractVersion: "1",
   type: "module",
   bin: {
@@ -190129,14 +190129,18 @@ async function runGitLines(args2) {
 // utils/rangeDiff.ts
 function computeIncrementalDiff(params) {
   try {
+    const tips = [`origin/${params.baseBranch}`, ...params.formerBaseTips];
+    const oldBase = versionBase({ sha: params.beforeSha, tips });
+    const newBase = versionBase({ sha: params.headSha, tips });
     const raw2 = $(
       "sh",
       [
         "-c",
-        'old_base=$(git merge-base "$1" "origin/$2") && new_base=$(git merge-base "$3" "origin/$2") && git range-diff --no-color --creation-factor=1000 "$old_base..$(git commit-tree "$1^{tree}" -p "$old_base" -m x)" "$new_base..$(git commit-tree "$3^{tree}" -p "$new_base" -m x)"',
+        'git range-diff --no-color --creation-factor=1000 "$1..$(git commit-tree "$2^{tree}" -p "$1" -m x)" "$3..$(git commit-tree "$4^{tree}" -p "$3" -m x)"',
         "--",
+        oldBase,
         params.beforeSha,
-        params.baseBranch,
+        newBase,
         params.headSha
       ],
       { log: false }
@@ -190149,6 +190153,27 @@ function computeIncrementalDiff(params) {
     return { status: "unavailable", reason };
   }
 }
+function git(args2) {
+  return $("git", args2, { log: false }).trim();
+}
+function versionBase(params) {
+  let best;
+  for (const tip of params.tips) {
+    let sha;
+    try {
+      sha = git(["merge-base", params.sha, tip]);
+    } catch {
+      continue;
+    }
+    const commits = Number(git(["rev-list", "--count", `${sha}..${params.sha}`]));
+    if (!best || commits < best.commits) best = { tip, sha, commits };
+  }
+  if (!best) throw new Error(`no merge base between ${params.sha} and the base branch`);
+  if (best.tip !== params.tips[0]) {
+    log.info(`\xBB incremental diff: ${params.sha.slice(0, 7)} sits on former base tip ${best.tip}`);
+  }
+  return best.sha;
+}
 function isDiffPrefix(ch) {
   return ch === " " || ch === "+" || ch === "-";
 }
@@ -190176,14 +190201,28 @@ function postProcessRangeDiff(raw2, contextLines = 3) {
     if (lastHunkHdr?.seq === line.seq) hunkHdrEmitted = true;
   }
   function flushBefore() {
-    if (lastOuterHdr && !outerHdrEmitted) emit(lastOuterHdr);
-    if (lastFileHdr && !fileHdrEmitted) emit(lastFileHdr);
-    if (lastHunkHdr && !hunkHdrEmitted) emit(lastHunkHdr);
-    for (const line of beforeBuf) {
-      if (line.seq > lastEmittedSeq) emit(line);
+    const headers = [
+      outerHdrEmitted ? null : lastOuterHdr,
+      fileHdrEmitted ? null : lastFileHdr,
+      hunkHdrEmitted ? null : lastHunkHdr
+    ].filter((line) => line !== null);
+    const pending = [...headers, ...beforeBuf.filter((line) => line.seq > lastEmittedSeq)].sort(
+      (a, b) => a.seq - b.seq
+    );
+    for (const [i, line] of pending.entries()) {
+      if (pending[i - 1]?.seq !== line.seq) emit(line);
     }
     beforeBuf.length = 0;
   }
+  function isFileHeader(pos) {
+    return raw2.startsWith("## ", pos) && !raw2.startsWith("## Commit message", pos);
+  }
+  function markFileHeader(line, emitted) {
+    lastFileHdr = line;
+    fileHdrEmitted = emitted;
+    lastHunkHdr = null;
+    hunkHdrEmitted = true;
+  }
   let cursor = 0;
   while (cursor < raw2.length) {
     const eol = raw2.indexOf("\n", cursor);
@@ -190193,7 +190232,8 @@ function postProcessRangeDiff(raw2, contextLines = 3) {
       continue;
     }
     if (raw2.startsWith("    @@", cursor)) {
-      lastOuterHdr = { prefix: "", from: cursor + 4, to: lineEnd, seq };
+      const label = raw2.slice(cursor + 4, lineEnd);
+      lastOuterHdr = label === "@@ Metadata" || label === "@@ Commit message" ? null : { prefix: "", from: cursor + 4, to: lineEnd, seq };
       outerHdrEmitted = false;
       lastFileHdr = null;
       fileHdrEmitted = true;
@@ -190214,13 +190254,13 @@ function postProcessRangeDiff(raw2, contextLines = 3) {
         } else if (isDiffPrefix(raw2[contentPos])) {
           isChange = isOuterChange;
           line = { prefix, from: contentPos + 1, to: lineEnd, seq };
+          if (raw2[contentPos] === " " && isFileHeader(contentPos + 1)) {
+            markFileHeader(line, isChange);
+          }
         } else {
           line = { prefix, from: contentPos, to: lineEnd, seq };
-          if (raw2.startsWith("## ", contentPos) && !raw2.startsWith("## Commit message", contentPos)) {
-            lastFileHdr = line;
-            fileHdrEmitted = false;
-            lastHunkHdr = null;
-            hunkHdrEmitted = true;
+          if (isFileHeader(contentPos)) {
+            markFileHeader(line, false);
           } else if (raw2.startsWith("@@", contentPos) && !raw2.startsWith("@@ Metadata", contentPos)) {
             lastHunkHdr = line;
             hunkHdrEmitted = false;
@@ -196213,6 +196253,7 @@ var STRING_KEYS = [
   "prNodeId",
   "issueNodeId",
   "reviewNodeId",
+  "reviewedCommitSha",
   "planCommentNodeId",
   "summarySnapshot",
   "model",
@@ -197377,7 +197418,10 @@ async function createAndSubmitWithFooter(ctx, params, opts) {
   }
 }
 async function reportReviewNodeId(ctx, params) {
-  await patchWorkflowRunFields(ctx, { reviewNodeId: params.nodeId });
+  await patchWorkflowRunFields(ctx, {
+    reviewNodeId: params.nodeId,
+    reviewedCommitSha: params.reviewedSha
+  });
 }
 
 // utils/setup.ts
@@ -197971,6 +198015,34 @@ function describeHead(h) {
   if (h.kind === "branch") return `branch \`${h.name}\``;
   return `detached HEAD \`${h.sha}\``;
 }
+var FORMER_BASE_TIPS_QUERY = `
+  query ($owner: String!, $repo: String!, $number: Int!) {
+    repository(owner: $owner, name: $repo) {
+      pullRequest(number: $number) {
+        timelineItems(itemTypes: [BASE_REF_FORCE_PUSHED_EVENT], last: 100) {
+          nodes { ... on BaseRefForcePushedEvent { beforeCommit { oid } } }
+        }
+      }
+    }
+  }
+`;
+async function getFormerBaseTips(ctx, pullNumber) {
+  try {
+    const response = await ctx.octokit.graphql(FORMER_BASE_TIPS_QUERY, {
+      owner: ctx.repo.owner,
+      repo: ctx.repo.name,
+      number: pullNumber
+    });
+    return response.repository.pullRequest.timelineItems.nodes.flatMap(
+      (node3) => node3.beforeCommit ? [node3.beforeCommit.oid] : []
+    );
+  } catch (error63) {
+    log.warning(
+      `\xBB former base tips unavailable: ${error63 instanceof Error ? error63.message : String(error63)}`
+    );
+    return [];
+  }
+}
 function CheckoutPrTool(ctx) {
   const runCheckout = async (pull_number, signal) => {
     const prResponse = await ctx.octokit.rest.pulls.get({
@@ -198023,7 +198095,8 @@ function CheckoutPrTool(ctx) {
       const incremental = computeIncrementalDiff({
         baseBranch: pr.baseRef,
         beforeSha: primary.beforeSha,
-        headSha: checkoutSha
+        headSha: checkoutSha,
+        formerBaseTips: await getFormerBaseTips(ctx, pull_number)
       });
       if (incremental.status === "ok") {
         incrementalDiffPath = join16(
@@ -204661,7 +204734,7 @@ async function postReviewCleanup(ctx) {
   if (!review) {
     const checkoutSha = primaryRepoState(ctx.toolState).checkoutSha;
     if (ctx.toolState.selectedMode === "IncrementalReview" && checkoutSha) {
-      await patchWorkflowRunFields(ctx, { reviewSkipped: true });
+      await patchWorkflowRunFields(ctx, { reviewSkipped: true, reviewedCommitSha: checkoutSha });
       await bestEffort(
         () => dispatchFollowUpReReview(ctx, checkoutSha),
         "follow-up re-review dispatch"
@@ -204670,7 +204743,7 @@ async function postReviewCleanup(ctx) {
     return;
   }
   delete ctx.toolState.review;
-  await bestEffort(() => reportReviewNodeId(ctx, { nodeId: review.nodeId }), "reportReviewNodeId");
+  await bestEffort(() => reportReviewNodeId(ctx, review), "reportReviewNodeId");
   if (review.reviewedSha) {
     await bestEffort(
       () => dispatchFollowUpReReview(ctx, review.reviewedSha),

package/dist/internal.js

@@ -8,7 +8,7 @@ var __export = (target, all) => {
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.103",
+  version: "0.1.104",
   cliContractVersion: "1",
   type: "module",
   bin: {

package/dist/mcp/review.d.ts

@@ -263,4 +263,5 @@ export declare function createAndSubmitWithFooter(ctx: ToolContext, params: Rest
  */
 export declare function reportReviewNodeId(ctx: ToolContext, params: {
     nodeId: string;
+    reviewedSha: string | undefined;
 }): Promise<void>;

package/dist/utils/patchWorkflowRunFields.d.ts

@@ -4,6 +4,8 @@ import type { ToolContext } from "../mcp/server.ts";
  * String-valued PATCH fields (all serialized identically on the wire):
  *  - artifact node IDs (`*NodeId`, `summarySnapshot`) — PATCHed incrementally
  *    by MCP tools as GitHub entities are created during the run.
+ *  - `reviewedCommitSha` — the PR head a review covered, sent with `reviewNodeId`
+ *    or `reviewSkipped`; the next re-review's delta starts there.
  *  - `model` — the resolved/effective model the run actually ran on (proxy spec
  *    for router/oss, post-fallback slug otherwise; NOT the configured
  *    `Repo.model` slug), PATCHed once at end-of-run so per-model cost analytics
@@ -13,7 +15,7 @@ import type { ToolContext } from "../mcp/server.ts";
  * workflow can start the action several times in one run, and the server keeps
  * one row per start, keyed by `START_KEY`, and sums them onto the run.
  */
-declare const STRING_KEYS: readonly ["prNodeId", "issueNodeId", "reviewNodeId", "planCommentNodeId", "summarySnapshot", "model", "agent", "credential"];
+declare const STRING_KEYS: readonly ["prNodeId", "issueNodeId", "reviewNodeId", "reviewedCommitSha", "planCommentNodeId", "summarySnapshot", "model", "agent", "credential"];
 /**
  * Number-valued usage fields — aggregated across all agent calls and PATCHed
  * once at end-of-run. Token counts are Int4 on the DB side (ample for any
@@ -23,7 +25,7 @@ declare const STRING_KEYS: readonly ["prNodeId", "issueNodeId", "reviewNodeId",
 declare const NUMBER_KEYS: readonly ["inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens", "costUsd"];
 /** one-way flags, only ever sent as `true`. Keep in sync with `BOOLEAN_FIELDS` in the server route. */
 declare const FLAG_KEYS: readonly ["reviewSkipped"];
-export type WorkflowRunPatch = Partial<Record<(typeof STRING_KEYS)[number], string>> & Partial<Record<(typeof NUMBER_KEYS)[number], number>> & Partial<Record<(typeof FLAG_KEYS)[number], true>> & {
+export type WorkflowRunPatch = Partial<Record<(typeof STRING_KEYS)[number], string | undefined>> & Partial<Record<(typeof NUMBER_KEYS)[number], number>> & Partial<Record<(typeof FLAG_KEYS)[number], true>> & {
     succeeded?: boolean;
 };
 /** PATCH workflow-run fields (Pullfrog JWT, not GitHub). */

package/dist/utils/rangeDiff.d.ts

@@ -2,6 +2,8 @@ type ComputeIncrementalDiffParams = {
     baseBranch: string;
     beforeSha: string;
     headSha: string;
+    /** tips the base branch was force-pushed away from, which either version may still be built on */
+    formerBaseTips: string[];
 };
 /**
  * computes the incremental diff between two versions of a PR using range-diff

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pullfrog",
-  "version": "0.1.103",
+  "version": "0.1.104",
   "cliContractVersion": "1",
   "type": "module",
   "bin": {