pullfrog 0.1.32 → 0.1.34

package/dist/index.js

@@ -101041,7 +101041,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.32",
+  version: "0.1.34",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -157622,13 +157622,14 @@ async function approveAfterFix(ctx) {
   });
   if (pr.data.state !== "open") return;
   const headSha = pr.data.head.sha;
+  const selfAuthored = isPullfrog(pr.data.user?.login);
   const summary2 = ctx.toolState.lastProgressBody?.trim();
   const body = "> \u2705 Pullfrog addressed all of its review feedback on this PR.\n\n" + (summary2 || "all Pullfrog-raised review threads are resolved \u2014 no outstanding findings remain.");
   const params = {
     owner: ctx.repo.owner,
     repo: ctx.repo.name,
     pull_number: pullNumber,
-    event: "APPROVE",
+    event: selfAuthored ? "COMMENT" : "APPROVE",
     commit_id: headSha
   };
   const result = await createAndSubmitWithFooter(ctx, params, {
@@ -157800,22 +157801,39 @@ function CreatePullRequestReviewTool(ctx) {
             );
           }
         }
+        const prSnapshot = (await ctx.octokit.rest.pulls.get({
+          owner: ctx.repo.owner,
+          repo: ctx.repo.name,
+          pull_number
+        })).data;
+        const selfAuthored = isPullfrog(prSnapshot.user?.login);
         ctx.toolState.approval = { wouldApprove: approved === true, sha: primary.checkoutSha };
         const skip = reviewSkipDecision({
           approved: approved ?? false,
           requestChanges: request_changes ?? false,
           body,
           hasComments: comments.length > 0,
-          prApproveEnabled: ctx.prApproveEnabled
+          // a self-authored approve downgrades to COMMENT (GitHub blocks a
+          // self-APPROVE), so treat it as non-binding here — an empty self-
+          // approve is then skipped (the verdict is still recorded above)
+          // instead of POSTing an empty COMMENT that GitHub 422s.
+          prApproveEnabled: ctx.prApproveEnabled && !selfAuthored
         });
         if (skip) {
           log.info(`skipping review submission: ${skip.reason}`);
           return { success: true, skipped: true, reason: skip.reason };
         }
         let event = approved ? "APPROVE" : request_changes ? "REQUEST_CHANGES" : "COMMENT";
-        if ((event === "APPROVE" || event === "REQUEST_CHANGES") && !ctx.prApproveEnabled) {
-          log.info(`prApproveEnabled is disabled \u2014 downgrading ${event} to COMMENT`);
-          event = "COMMENT";
+        if (event === "APPROVE" || event === "REQUEST_CHANGES") {
+          if (!ctx.prApproveEnabled) {
+            log.info(`prApproveEnabled is disabled \u2014 downgrading ${event} to COMMENT`);
+            event = "COMMENT";
+          } else if (selfAuthored) {
+            log.info(
+              `self-authored PR \u2014 downgrading binding ${event} to COMMENT (verdict recorded internally)`
+            );
+            event = "COMMENT";
+          }
         }
         const params = {
           owner: ctx.repo.owner,
@@ -157827,12 +157845,7 @@ function CreatePullRequestReviewTool(ctx) {
         if (commit_id) {
           params.commit_id = commit_id;
         } else {
-          const pr = await ctx.octokit.rest.pulls.get({
-            owner: ctx.repo.owner,
-            repo: ctx.repo.name,
-            pull_number
-          });
-          latestHeadSha = pr.data.head.sha;
+          latestHeadSha = prSnapshot.head.sha;
           params.commit_id = primary.checkoutSha ?? latestHeadSha;
           if (primary.checkoutSha && latestHeadSha !== primary.checkoutSha) {
             log.info(
@@ -157900,6 +157913,7 @@ function CreatePullRequestReviewTool(ctx) {
             }
           )();
         } catch (err) {
+          if (ctx.toolState.approval) ctx.toolState.approval.wouldApprove = false;
           if (isTransientReviewError(err)) {
             const rawMsg2 = err instanceof Error ? err.message : String(err);
             throw new Error(
@@ -163544,6 +163558,11 @@ async function mintProxyKey(ctx) {
         body?.error ?? "billing service temporarily unavailable \u2014 retry shortly"
       );
     }
+    if (response.status === 404) {
+      throw new TransientError(
+        "Pullfrog couldn't match this repository to its account \u2014 it may have just been renamed or transferred. The link refreshes automatically on the next run; if it keeps failing, reinstall the GitHub App on the repo's current owner."
+      );
+    }
     if (!response.ok) {
       log.warning(`proxy key mint failed (${response.status})`);
       return null;
@@ -163787,6 +163806,7 @@ var defaultSettings = {
   push: "restricted",
   shell: "restricted",
   prApproveEnabled: false,
+  autoMergeEnabled: false,
   signedCommits: false,
   modeInstructions: {},
   learnings: null,
@@ -164107,6 +164127,117 @@ ${genericBody}`,
 // utils/runLifecycle.ts
 var core10 = __toESM(require_core(), 1);
 
+// utils/autoMerge.ts
+function hasBlockingHumanReview(reviews) {
+  const latestByReviewer = /* @__PURE__ */ new Map();
+  for (const review of reviews) {
+    const login = review.user?.login;
+    if (!login || isPullfrog(login)) continue;
+    if (review.state === "APPROVED" || review.state === "CHANGES_REQUESTED") {
+      latestByReviewer.set(login, review.state);
+    } else if (review.state === "DISMISSED") {
+      latestByReviewer.delete(login);
+    }
+  }
+  for (const state of latestByReviewer.values()) {
+    if (state === "CHANGES_REQUESTED") return true;
+  }
+  return false;
+}
+var ENABLE_AUTO_MERGE = (
+  /* GraphQL */
+  `
+  mutation ($pullRequestId: ID!, $headSha: GitObjectID!) {
+    enablePullRequestAutoMerge(input: {
+      pullRequestId: $pullRequestId
+      mergeMethod: SQUASH
+      expectedHeadOid: $headSha
+    }) { clientMutationId }
+  }`
+);
+var isAlreadyMergeable = (error49) => error49 instanceof Error && /clean status/i.test(error49.message);
+var isHeadChanged = (error49) => error49 instanceof Error && /head has changed|expected head/i.test(error49.message);
+var isAutoMergeDisallowed = (error49) => error49 instanceof Error && /not allowed/i.test(error49.message);
+async function autoMergeAfterApprove(ctx) {
+  if (!ctx.autoMergeEnabled) return;
+  if (!ctx.prApproveEnabled) return;
+  const approval = ctx.toolState.approval;
+  if (!approval?.wouldApprove) return;
+  const pullNumber = ctx.payload.event.issue_number;
+  if (typeof pullNumber !== "number") return;
+  const skip = (reason) => log.info(
+    `autoMerge: pr=#${pullNumber} approvalSha=${approval.sha?.slice(0, 7)} \u2192 skipped: ${reason}`
+  );
+  const comment = (body) => ctx.octokit.rest.issues.createComment({
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    issue_number: pullNumber,
+    body: addFooter(ctx, body)
+  }).catch((err) => log.debug(`autoMerge comment failed: ${err}`));
+  const pr = await ctx.octokit.rest.pulls.get({
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    pull_number: pullNumber
+  });
+  if (pr.data.state !== "open") return skip("pr not open");
+  if (pr.data.draft) return skip("pr is draft");
+  if (pr.data.auto_merge) return skip("auto-merge already enabled");
+  const headSha = pr.data.head.sha;
+  if (approval.sha !== headSha) return skip(`approval sha != head ${headSha.slice(0, 7)}`);
+  const outstanding = await countOutstandingPullfrogThreads(ctx, pullNumber);
+  if (outstanding > 0) return skip(`${outstanding} unresolved Pullfrog thread(s)`);
+  const reviews = await ctx.octokit.paginate(ctx.octokit.rest.pulls.listReviews, {
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    pull_number: pullNumber,
+    per_page: 100
+  });
+  if (hasBlockingHumanReview(reviews)) return skip("human changes requested");
+  try {
+    await op(
+      () => ctx.octokit.graphql(ENABLE_AUTO_MERGE, {
+        pullRequestId: pr.data.node_id,
+        headSha
+      }),
+      {
+        name: "enablePullRequestAutoMerge",
+        retries: [500, 2e3],
+        bail: (error49) => !isTransientOctokitError(error49)
+      }
+    )();
+    log.info(`autoMerge: pr=#${pullNumber} @ ${headSha.slice(0, 7)} \u2192 native auto-merge enabled`);
+    await comment(
+      "> \u2705 Approved \u2014 auto-merge enabled; GitHub will merge once required checks pass."
+    );
+    return;
+  } catch (error49) {
+    if (isHeadChanged(error49)) return skip("head moved during enable");
+    if (isAutoMergeDisallowed(error49)) {
+      await comment(
+        "> \u26A0\uFE0F Approved, but auto-merge is off for this repo. Enable `Allow auto-merge` in Settings > General > Pull Requests."
+      );
+      return;
+    }
+    if (!isAlreadyMergeable(error49)) throw error49;
+  }
+  const base = await ctx.octokit.rest.repos.getBranch({ owner: ctx.repo.owner, repo: ctx.repo.name, branch: pr.data.base.ref }).catch(() => null);
+  if (!base?.data.protected) return skip("base branch not protected \u2014 refusing CI-ungated merge");
+  const merge4 = await ctx.octokit.rest.pulls.merge({
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    pull_number: pullNumber,
+    sha: headSha,
+    merge_method: "squash",
+    commit_title: `${pr.data.title} (#${pullNumber})`
+  });
+  log.info(
+    `autoMerge: pr=#${pullNumber} @ ${headSha.slice(0, 7)} \u2192 merged directly ${merge4.data.sha?.slice(0, 7)}`
+  );
+  await comment(
+    "> \u2705 Merged autonomously after Pullfrog approved this PR and resolved all of its own review threads."
+  );
+}
+
 // utils/reviewCleanup.ts
 var RE_REVIEW_PREAMBLE = "Incrementally re-review the new commits on this pull request. Use the IncrementalReview mode.";
 async function postReviewCleanup(ctx) {
@@ -164287,6 +164418,11 @@ async function finalizeSuccessRun(input) {
     await approveAfterFix(input.toolContext).catch((error49) => {
       log.debug(`fix auto-approval failed: ${error49}`);
     });
+    await autoMergeAfterApprove(input.toolContext).catch((error49) => {
+      const raced = typeof error49 === "object" && error49 !== null && "status" in error49 && error49.status === 409;
+      if (raced) log.debug(`auto-merge skipped (head moved): ${error49}`);
+      else log.warning(`auto-merge failed: ${error49}`);
+    });
   }
   await reportStatusChecks(input.toolContext, { runSucceeded: input.result.success });
 }
@@ -164728,6 +164864,7 @@ async function main() {
           postCheckoutScript: runContext.repoSettings.postCheckoutScript,
           prepushScript: runContext.repoSettings.prepushScript,
           prApproveEnabled: runContext.repoSettings.prApproveEnabled,
+          autoMergeEnabled: runContext.repoSettings.autoMergeEnabled,
           signedCommits: runContext.repoSettings.signedCommits,
           modeInstructions: runContext.repoSettings.modeInstructions,
           toolState,

package/dist/mcp/server.d.ts

@@ -22,6 +22,7 @@ export interface ToolContext {
     postCheckoutScript: string | null;
     prepushScript: string | null;
     prApproveEnabled: boolean;
+    autoMergeEnabled: boolean;
     signedCommits: boolean;
     modeInstructions: Record<string, string>;
     toolState: ToolState;

package/dist/utils/autoMerge.d.ts

@@ -0,0 +1,28 @@
+import type { ToolContext } from "../mcp/server.ts";
+/**
+ * Run-end lifecycle action: hand any PR this run mechanically approved on its
+ * current head to GitHub's NATIVE auto-merge — Pullfrog acting as a full repo
+ * maintainer, contributor PRs included. There is deliberately NO agent-callable
+ * merge tool — the merge is a deterministic consequence of the recorded approval
+ * verdict, so a prompt-injected agent has no merge surface to reach for.
+ *
+ * Native auto-merge waits for all REQUIRED checks + reviews (un-fakeable by a
+ * fork), respects the human veto via branch protection, and requires branch
+ * protection to exist. We keep only the Pullfrog-specific pre-gates GitHub can't
+ * express: armed toggles, approved-THIS-head, zero outstanding Pullfrog threads,
+ * no human CHANGES_REQUESTED. Best-effort — the caller wraps this in `.catch`,
+ * and a merge/comment failure can never flip the run's outcome.
+ *
+ * The invariant (all must hold):
+ *   1. `ctx.autoMergeEnabled` — the per-repo toggle ANDed with the global
+ *      `isAutonomousMaintenanceEnabled()` kill switch, server-side (run-context).
+ *   2. `ctx.prApproveEnabled` — cannot auto-merge what it may not approve.
+ *   3. this run recorded an APPROVE verdict (`toolState.approval.wouldApprove`).
+ *   4. the PR is open and not a draft.
+ *   5. `toolState.approval.sha === <current head sha>` — approved THIS head.
+ *   6. `countOutstandingPullfrogThreads === 0` — re-queried at merge time.
+ *   7. no un-dismissed human CHANGES_REQUESTED at handoff.
+ * The remaining wait-for-required-checks + wait-for-required-reviews semantics
+ * are GitHub's, via native auto-merge and branch protection.
+ */
+export declare function autoMergeAfterApprove(ctx: ToolContext): Promise<void>;

package/dist/utils/proxy.d.ts

@@ -16,6 +16,7 @@
  *
  *   - 402 → `BillingError` (card declined, balance empty, 3DS, etc.)
  *   - 503 → `TransientError` (transient sync issue — retry next dispatch)
+ *   - 404 → `TransientError` (stale repo↔account link — re-homes on next webhook)
  */
 import type { ToolState } from "../toolState.ts";
 import { type OidcCredentials } from "./github.ts";

package/dist/utils/runContext.d.ts

@@ -31,6 +31,7 @@ export interface RepoSettings {
     push: PushPermission;
     shell: ShellPermission;
     prApproveEnabled: boolean;
+    autoMergeEnabled: boolean;
     signedCommits: boolean;
     modeInstructions: Record<string, string>;
     learnings: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pullfrog",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "type": "module",
   "bin": {
     "pullfrog": "dist/cli.mjs",