pullfrog 0.1.32 → 0.1.33

package/dist/cli.mjs

@@ -102841,7 +102841,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.32",
+  version: "0.1.33",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -159380,13 +159380,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, {
@@ -159558,22 +159559,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,
@@ -159585,12 +159603,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(
@@ -159658,6 +159671,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(
@@ -165545,6 +165559,7 @@ var defaultSettings = {
   push: "restricted",
   shell: "restricted",
   prApproveEnabled: false,
+  autoMergeEnabled: false,
   signedCommits: false,
   modeInstructions: {},
   learnings: null,
@@ -165865,6 +165880,108 @@ ${genericBody}`,
 // utils/runLifecycle.ts
 var core10 = __toESM(require_core(), 1);
 
+// utils/checksGate.ts
+var OK_CONCLUSIONS = /* @__PURE__ */ new Set(["success", "neutral", "skipped"]);
+var PULLFROG_CHECKS = /* @__PURE__ */ new Set(["pullfrog", "pullfrog-approval"]);
+function checkRunsGate(params) {
+  for (const run4 of params.checkRuns) {
+    if (PULLFROG_CHECKS.has(run4.name.toLowerCase())) continue;
+    if (run4.status !== "completed")
+      return { ok: false, reason: `check "${run4.name}" ${run4.status}` };
+    if (!OK_CONCLUSIONS.has(run4.conclusion ?? "")) {
+      return { ok: false, reason: `check "${run4.name}" concluded ${run4.conclusion}` };
+    }
+  }
+  return { ok: true, reason: "all checks passed" };
+}
+function hasVerifiedCheck(params) {
+  return params.checkRuns.some(
+    (r) => !PULLFROG_CHECKS.has(r.name.toLowerCase()) && r.status === "completed"
+  );
+}
+
+// utils/autoMerge.ts
+var NON_MERGEABLE_STATES = /* @__PURE__ */ new Set(["dirty", "behind", "blocked"]);
+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;
+}
+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 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");
+  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");
+  if (pr.data.mergeable !== true) return skip(`not mergeable (mergeable=${pr.data.mergeable})`);
+  if (pr.data.mergeable_state && NON_MERGEABLE_STATES.has(pr.data.mergeable_state)) {
+    return skip(`mergeable_state=${pr.data.mergeable_state}`);
+  }
+  const checkRuns = await ctx.octokit.paginate(ctx.octokit.rest.checks.listForRef, {
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    ref: headSha,
+    per_page: 100
+  });
+  const gate = checkRunsGate({ checkRuns });
+  if (!gate.ok) return skip(`ci: ${gate.reason}`);
+  if (!hasVerifiedCheck({ checkRuns })) return skip("no completed external check-run to verify");
+  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})`,
+    commit_message: "merged autonomously by Pullfrog after a clean approval."
+  });
+  log.info(
+    `autoMerge: pr=#${pullNumber} approvalSha=${headSha.slice(0, 7)} outstanding=0 \u2192 merged ${merge4.data.sha?.slice(0, 7)}`
+  );
+  await ctx.octokit.rest.issues.createComment({
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    issue_number: pullNumber,
+    body: addFooter(
+      ctx,
+      "> \u2705 Merged autonomously after Pullfrog approved this PR and resolved all of its own review threads."
+    )
+  }).catch((err) => log.debug(`autoMerge comment failed: ${err}`));
+}
+
 // 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) {
@@ -166045,6 +166162,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 });
 }
@@ -166486,6 +166608,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,
@@ -167642,7 +167765,7 @@ async function run2() {
 }
 
 // cli.ts
-var VERSION10 = "0.1.32";
+var VERSION10 = "0.1.33";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);

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.33",
   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(
@@ -163787,6 +163801,7 @@ var defaultSettings = {
   push: "restricted",
   shell: "restricted",
   prApproveEnabled: false,
+  autoMergeEnabled: false,
   signedCommits: false,
   modeInstructions: {},
   learnings: null,
@@ -164107,6 +164122,108 @@ ${genericBody}`,
 // utils/runLifecycle.ts
 var core10 = __toESM(require_core(), 1);
 
+// utils/checksGate.ts
+var OK_CONCLUSIONS = /* @__PURE__ */ new Set(["success", "neutral", "skipped"]);
+var PULLFROG_CHECKS = /* @__PURE__ */ new Set(["pullfrog", "pullfrog-approval"]);
+function checkRunsGate(params) {
+  for (const run of params.checkRuns) {
+    if (PULLFROG_CHECKS.has(run.name.toLowerCase())) continue;
+    if (run.status !== "completed")
+      return { ok: false, reason: `check "${run.name}" ${run.status}` };
+    if (!OK_CONCLUSIONS.has(run.conclusion ?? "")) {
+      return { ok: false, reason: `check "${run.name}" concluded ${run.conclusion}` };
+    }
+  }
+  return { ok: true, reason: "all checks passed" };
+}
+function hasVerifiedCheck(params) {
+  return params.checkRuns.some(
+    (r) => !PULLFROG_CHECKS.has(r.name.toLowerCase()) && r.status === "completed"
+  );
+}
+
+// utils/autoMerge.ts
+var NON_MERGEABLE_STATES = /* @__PURE__ */ new Set(["dirty", "behind", "blocked"]);
+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;
+}
+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 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");
+  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");
+  if (pr.data.mergeable !== true) return skip(`not mergeable (mergeable=${pr.data.mergeable})`);
+  if (pr.data.mergeable_state && NON_MERGEABLE_STATES.has(pr.data.mergeable_state)) {
+    return skip(`mergeable_state=${pr.data.mergeable_state}`);
+  }
+  const checkRuns = await ctx.octokit.paginate(ctx.octokit.rest.checks.listForRef, {
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    ref: headSha,
+    per_page: 100
+  });
+  const gate = checkRunsGate({ checkRuns });
+  if (!gate.ok) return skip(`ci: ${gate.reason}`);
+  if (!hasVerifiedCheck({ checkRuns })) return skip("no completed external check-run to verify");
+  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})`,
+    commit_message: "merged autonomously by Pullfrog after a clean approval."
+  });
+  log.info(
+    `autoMerge: pr=#${pullNumber} approvalSha=${headSha.slice(0, 7)} outstanding=0 \u2192 merged ${merge4.data.sha?.slice(0, 7)}`
+  );
+  await ctx.octokit.rest.issues.createComment({
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    issue_number: pullNumber,
+    body: addFooter(
+      ctx,
+      "> \u2705 Merged autonomously after Pullfrog approved this PR and resolved all of its own review threads."
+    )
+  }).catch((err) => log.debug(`autoMerge comment failed: ${err}`));
+}
+
 // 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 +164404,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 +164850,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/internal/index.d.ts

@@ -8,6 +8,7 @@ export type { Mode } from "../modes.ts";
 export { modes } from "../modes.ts";
 export type { BuildPullfrogFooterParams, WorkflowRunFooterInfo, } from "../utils/buildPullfrogFooter.ts";
 export { buildPullfrogFooter, PULLFROG_DIVIDER, stripExistingFooter, } from "../utils/buildPullfrogFooter.ts";
+export { checkRunsGate, hasVerifiedCheck } from "../utils/checksGate.ts";
 export type { CodexAuthBody } from "../utils/codexOAuth.ts";
 export { decodeJwtExpMs, OAuthInvalidGrantError, parseCodexAuthBody, refreshCodexAuthBody, stringifyCodexAuthBody, } from "../utils/codexOAuth.ts";
 export type { ResourceUsage, UsageSummary } from "../utils/github.ts";

package/dist/internal.js

@@ -1245,6 +1245,26 @@ function stripExistingFooter(body) {
   return body.substring(0, dividerIndex).trimEnd();
 }
 
+// utils/checksGate.ts
+var OK_CONCLUSIONS = /* @__PURE__ */ new Set(["success", "neutral", "skipped"]);
+var PULLFROG_CHECKS = /* @__PURE__ */ new Set(["pullfrog", "pullfrog-approval"]);
+function checkRunsGate(params) {
+  for (const run of params.checkRuns) {
+    if (PULLFROG_CHECKS.has(run.name.toLowerCase())) continue;
+    if (run.status !== "completed")
+      return { ok: false, reason: `check "${run.name}" ${run.status}` };
+    if (!OK_CONCLUSIONS.has(run.conclusion ?? "")) {
+      return { ok: false, reason: `check "${run.name}" concluded ${run.conclusion}` };
+    }
+  }
+  return { ok: true, reason: "all checks passed" };
+}
+function hasVerifiedCheck(params) {
+  return params.checkRuns.some(
+    (r) => !PULLFROG_CHECKS.has(r.name.toLowerCase()) && r.status === "completed"
+  );
+}
+
 // utils/codexOAuth.ts
 var CODEX_OAUTH_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
 var CODEX_OAUTH_TOKEN_URL = "https://auth.openai.com/oauth/token";
@@ -1472,6 +1492,7 @@ export {
   PULLFROG_DIVIDER,
   TIMEOUT_DISABLED,
   buildPullfrogFooter,
+  checkRunsGate,
   createLeapingProgressComment,
   decodeJwtExpMs,
   defaultAutoTier,
@@ -1482,6 +1503,7 @@ export {
   getModelProvider,
   getProgressComment,
   getProviderDisplayName,
+  hasVerifiedCheck,
   isAutoTier,
   isCardGatedModel,
   isLeapingIntoActionCommentBody,

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,37 @@
+import type { ToolContext } from "../mcp/server.ts";
+/**
+ * Run-end lifecycle action: merge ANY open PR that this run mechanically
+ * approved on its current head — Pullfrog acting as a full repo maintainer,
+ * contributor PRs included, not just merging its own work. There is deliberately
+ * NO agent-callable merge tool — the merge is a pure, deterministic consequence
+ * of the runtime observing a clean approved state, so a prompt-injected agent has
+ * no merge surface to reach for. Every clause is fail-closed and re-verified
+ * against GitHub's own state at merge time; any failure logs why and returns
+ * without merging. Best-effort — the caller wraps this in a `.catch`, and a
+ * merge/comment failure can never flip the run's outcome.
+ *
+ * There is NO self-authorship restriction: the approval verdict IS the trust
+ * decision (Pullfrog reviewed it and would approve), exactly like a human
+ * maintainer merging a contributor PR. The population of mergeable PRs is bounded
+ * upstream by the review triggers (`prCreated` / `prCreatedAllowNonCollaborator`)
+ * — Pullfrog can only merge what it was configured to review + approve — and the
+ * whole capability is opt-in per repo (clause 1). The remaining clauses are the
+ * maintainer's controls.
+ *
+ * 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`) —
+ *      Pullfrog's review is the merge decision.
+ *   4. the PR is open and not a draft.
+ *   5. `toolState.approval.sha === <current head sha>` — approved THIS head, so a
+ *      commit pushed after the review can't ride the approval in (409-safe below).
+ *   6. `countOutstandingPullfrogThreads === 0` — re-queried at merge time.
+ *   7. no un-dismissed human CHANGES_REQUESTED — the human veto always wins.
+ *   8. GitHub reports the PR mergeable and not blocked/dirty/behind.
+ *   9. every external check-run/commit-status on the head is complete and
+ *      non-failing (`checkRunsGate`) — red or in-flight CI never auto-merges,
+ *      even on a repo without branch protection.
+ */
+export declare function autoMergeAfterApprove(ctx: ToolContext): Promise<void>;

package/dist/utils/checksGate.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Shared, dependency-free CI green/red predicate — the single source of truth for
+ * "given these check-runs, is this PR head safe to merge?". Consumed by the
+ * auto-merge path: `autoMerge.ts` gates the PR head at merge time, and the
+ * `pr-merge-completion` webhook re-checks it before dispatching a slow-CI re-wake.
+ * A red or in-flight sha never merges, and a sha with no confirmable green
+ * check-run is treated as unverified (refused, not merged blind).
+ *
+ * Gates on the Checks API only. The Pullfrog App deliberately holds no `statuses`
+ * permission (requesting it would force re-approval on every install — see
+ * wiki/app-permissions.md), so the legacy Commit Statuses API is unreadable
+ * (`listCommitStatusesForRef` 403s). Modern CI (GitHub Actions, etc.) reports via
+ * check-runs; a repo relying on the legacy Statuses API is covered by branch
+ * protection instead — a failing required status makes `mergeable_state` `blocked`,
+ * which the merge invariant already refuses (`NON_MERGEABLE_STATES`).
+ */
+export type CheckRun = {
+    name: string;
+    status: string;
+    conclusion: string | null;
+};
+/**
+ * Refuse if any external check-run is incomplete (queued/in_progress) or concluded
+ * anything other than success/neutral/skipped. Fail-closed on unknown/absent
+ * conclusions. Pure so the pass/fail logic is inspectable directly.
+ */
+export declare function checkRunsGate(params: {
+    checkRuns: CheckRun[];
+}): {
+    ok: boolean;
+    reason: string;
+};
+/**
+ * true when the head has ≥1 CONCLUDED non-failing EXTERNAL check-run — CI
+ * positively ran, not merely "no red was seen". paired with `checkRunsGate.ok`
+ * (any completed check is non-failing), this == "≥1 concluded non-failing check".
+ * the merge requires it: a head with ZERO check-runs passes
+ * `checkRunsGate` (nothing red) but has no verification, and since the app can't
+ * read legacy commit statuses, "zero check-runs" is indistinguishable from "green
+ * Actions but a red CircleCI status" — so we only act on a head we can positively
+ * confirm is green. Pullfrog's own verdict checks don't count as external CI.
+ */
+export declare function hasVerifiedCheck(params: {
+    checkRuns: CheckRun[];
+}): boolean;

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.33",
   "type": "module",
   "bin": {
     "pullfrog": "dist/cli.mjs",