pullfrog 0.1.33 → 0.1.35

package/dist/cli.mjs

@@ -96,7 +96,7 @@ var require_arg = __commonJS({
         Object.setPrototypeOf(this, _ArgError.prototype);
       }
     };
-    function arg5(opts, {
+    function arg6(opts, {
       argv = process.argv.slice(2),
       permissive = false,
       stopAtPositional = false
@@ -171,15 +171,15 @@ var require_arg = __commonJS({
         if (wholeArg.length > 1 && wholeArg[0] === "-") {
           const separatedArguments = wholeArg[1] === "-" || wholeArg.length === 2 ? [wholeArg] : wholeArg.slice(1).split("").map((a) => `-${a}`);
           for (let j3 = 0; j3 < separatedArguments.length; j3++) {
-            const arg6 = separatedArguments[j3];
-            const [originalArgName, argStr] = arg6[1] === "-" ? arg6.split(/=(.*)/, 2) : [arg6, void 0];
+            const arg7 = separatedArguments[j3];
+            const [originalArgName, argStr] = arg7[1] === "-" ? arg7.split(/=(.*)/, 2) : [arg7, void 0];
             let argName = originalArgName;
             while (argName in aliases) {
               argName = aliases[argName];
             }
             if (!(argName in handlers2)) {
               if (permissive) {
-                result._.push(arg6);
+                result._.push(arg7);
                 continue;
               } else {
                 throw new ArgError(
@@ -218,13 +218,13 @@ var require_arg = __commonJS({
       }
       return result;
     }
-    arg5.flag = (fn2) => {
+    arg6.flag = (fn2) => {
       fn2[flagSymbol] = true;
       return fn2;
     };
-    arg5.COUNT = arg5.flag((v, name, existingCount) => (existingCount || 0) + 1);
-    arg5.ArgError = ArgError;
-    module.exports = arg5;
+    arg6.COUNT = arg6.flag((v, name, existingCount) => (existingCount || 0) + 1);
+    arg6.ArgError = ArgError;
+    module.exports = arg6;
   }
 });
 
@@ -19353,11 +19353,11 @@ var require_toolrunner = __commonJS({
         const upperToolPath = this.toolPath.toUpperCase();
         return this._endsWith(upperToolPath, ".CMD") || this._endsWith(upperToolPath, ".BAT");
       }
-      _windowsQuoteCmdArg(arg5) {
+      _windowsQuoteCmdArg(arg6) {
         if (!this._isCmdFile()) {
-          return this._uvQuoteCmdArg(arg5);
+          return this._uvQuoteCmdArg(arg6);
         }
-        if (!arg5) {
+        if (!arg6) {
           return '""';
         }
         const cmdSpecialChars = [
@@ -19385,22 +19385,22 @@ var require_toolrunner = __commonJS({
           '"'
         ];
         let needsQuotes = false;
-        for (const char of arg5) {
+        for (const char of arg6) {
           if (cmdSpecialChars.some((x) => x === char)) {
             needsQuotes = true;
             break;
           }
         }
         if (!needsQuotes) {
-          return arg5;
+          return arg6;
         }
         let reverse = '"';
         let quoteHit = true;
-        for (let i = arg5.length; i > 0; i--) {
-          reverse += arg5[i - 1];
-          if (quoteHit && arg5[i - 1] === "\\") {
+        for (let i = arg6.length; i > 0; i--) {
+          reverse += arg6[i - 1];
+          if (quoteHit && arg6[i - 1] === "\\") {
             reverse += "\\";
-          } else if (arg5[i - 1] === '"') {
+          } else if (arg6[i - 1] === '"') {
             quoteHit = true;
             reverse += '"';
           } else {
@@ -19410,23 +19410,23 @@ var require_toolrunner = __commonJS({
         reverse += '"';
         return reverse.split("").reverse().join("");
       }
-      _uvQuoteCmdArg(arg5) {
-        if (!arg5) {
+      _uvQuoteCmdArg(arg6) {
+        if (!arg6) {
           return '""';
         }
-        if (!arg5.includes(" ") && !arg5.includes("	") && !arg5.includes('"')) {
-          return arg5;
+        if (!arg6.includes(" ") && !arg6.includes("	") && !arg6.includes('"')) {
+          return arg6;
         }
-        if (!arg5.includes('"') && !arg5.includes("\\")) {
-          return `"${arg5}"`;
+        if (!arg6.includes('"') && !arg6.includes("\\")) {
+          return `"${arg6}"`;
         }
         let reverse = '"';
         let quoteHit = true;
-        for (let i = arg5.length; i > 0; i--) {
-          reverse += arg5[i - 1];
-          if (quoteHit && arg5[i - 1] === "\\") {
+        for (let i = arg6.length; i > 0; i--) {
+          reverse += arg6[i - 1];
+          if (quoteHit && arg6[i - 1] === "\\") {
             reverse += "\\";
-          } else if (arg5[i - 1] === '"') {
+          } else if (arg6[i - 1] === '"') {
             quoteHit = true;
             reverse += "\\";
           } else {
@@ -19480,8 +19480,8 @@ var require_toolrunner = __commonJS({
           return new Promise((resolve3, reject) => __awaiter(this, void 0, void 0, function* () {
             this._debug(`exec tool: ${this.toolPath}`);
             this._debug("arguments:");
-            for (const arg5 of this.args) {
-              this._debug(`   ${arg5}`);
+            for (const arg6 of this.args) {
+              this._debug(`   ${arg6}`);
             }
             const optionsNonNull = this._cloneExecOptions(this.options);
             if (!optionsNonNull.silent && optionsNonNull.outStream) {
@@ -19578,12 +19578,12 @@ var require_toolrunner = __commonJS({
       const args2 = [];
       let inQuotes = false;
       let escaped = false;
-      let arg5 = "";
+      let arg6 = "";
       function append2(c2) {
         if (escaped && c2 !== '"') {
-          arg5 += "\\";
+          arg6 += "\\";
         }
-        arg5 += c2;
+        arg6 += c2;
         escaped = false;
       }
       for (let i = 0; i < argString.length; i++) {
@@ -19605,16 +19605,16 @@ var require_toolrunner = __commonJS({
           continue;
         }
         if (c2 === " " && !inQuotes) {
-          if (arg5.length > 0) {
-            args2.push(arg5);
-            arg5 = "";
+          if (arg6.length > 0) {
+            args2.push(arg6);
+            arg6 = "";
           }
           continue;
         }
         append2(c2);
       }
-      if (arg5.length > 0) {
-        args2.push(arg5.trim());
+      if (arg6.length > 0) {
+        args2.push(arg6.trim());
       }
       return args2;
     }
@@ -28041,20 +28041,20 @@ var require_escape = __commonJS({
   "node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/escape.js"(exports, module) {
     "use strict";
     var metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
-    function escapeCommand(arg5) {
-      arg5 = arg5.replace(metaCharsRegExp, "^$1");
-      return arg5;
-    }
-    function escapeArgument(arg5, doubleEscapeMetaChars) {
-      arg5 = `${arg5}`;
-      arg5 = arg5.replace(/(?=(\\+?)?)\1"/g, '$1$1\\"');
-      arg5 = arg5.replace(/(?=(\\+?)?)\1$/, "$1$1");
-      arg5 = `"${arg5}"`;
-      arg5 = arg5.replace(metaCharsRegExp, "^$1");
+    function escapeCommand(arg6) {
+      arg6 = arg6.replace(metaCharsRegExp, "^$1");
+      return arg6;
+    }
+    function escapeArgument(arg6, doubleEscapeMetaChars) {
+      arg6 = `${arg6}`;
+      arg6 = arg6.replace(/(?=(\\+?)?)\1"/g, '$1$1\\"');
+      arg6 = arg6.replace(/(?=(\\+?)?)\1$/, "$1$1");
+      arg6 = `"${arg6}"`;
+      arg6 = arg6.replace(metaCharsRegExp, "^$1");
       if (doubleEscapeMetaChars) {
-        arg5 = arg5.replace(metaCharsRegExp, "^$1");
+        arg6 = arg6.replace(metaCharsRegExp, "^$1");
       }
-      return arg5;
+      return arg6;
     }
     module.exports.command = escapeCommand;
     module.exports.argument = escapeArgument;
@@ -28142,7 +28142,7 @@ var require_parse3 = __commonJS({
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
         parsed2.command = path4.normalize(parsed2.command);
         parsed2.command = escape2.command(parsed2.command);
-        parsed2.args = parsed2.args.map((arg5) => escape2.argument(arg5, needsDoubleEscapeMetaChars));
+        parsed2.args = parsed2.args.map((arg6) => escape2.argument(arg6, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed2.command].concat(parsed2.args).join(" ");
         parsed2.args = ["/d", "/s", "/c", `"${shellCommand}"`];
         parsed2.command = process.env.comspec || "cmd.exe";
@@ -28430,10 +28430,10 @@ var require_timers2 = __commonJS({
        * before the specified function or code is executed.
        * @param {*} arg
        */
-      constructor(callback, delay2, arg5) {
+      constructor(callback, delay2, arg6) {
         this._onTimeout = callback;
         this._idleTimeout = delay2;
-        this._timerArg = arg5;
+        this._timerArg = arg6;
         this.refresh();
       }
       /**
@@ -28477,8 +28477,8 @@ var require_timers2 = __commonJS({
        * when the timer expires.
        * @returns {NodeJS.Timeout|FastTimer}
        */
-      setTimeout(callback, delay2, arg5) {
-        return delay2 <= RESOLUTION_MS ? setTimeout(callback, delay2, arg5) : new FastTimer(callback, delay2, arg5);
+      setTimeout(callback, delay2, arg6) {
+        return delay2 <= RESOLUTION_MS ? setTimeout(callback, delay2, arg6) : new FastTimer(callback, delay2, arg6);
       },
       /**
        * The clearTimeout method cancels an instantiated Timer previously created
@@ -28504,8 +28504,8 @@ var require_timers2 = __commonJS({
        * when the timer expires.
        * @returns {FastTimer}
        */
-      setFastTimeout(callback, delay2, arg5) {
-        return new FastTimer(callback, delay2, arg5);
+      setFastTimeout(callback, delay2, arg6) {
+        return new FastTimer(callback, delay2, arg6);
       },
       /**
        * The clearTimeout method cancels an instantiated FastTimer previously
@@ -55420,9 +55420,9 @@ var init_types = __esm({
         const { status, ctx } = this._processInputParams(input);
         const effect = this._def.effect || null;
         const checkCtx = {
-          addIssue: (arg5) => {
-            addIssueToContext(ctx, arg5);
-            if (arg5.fatal) {
+          addIssue: (arg6) => {
+            addIssueToContext(ctx, arg6);
+            if (arg6.fatal) {
               status.abort();
             } else {
               status.dirty();
@@ -57613,13 +57613,13 @@ var init_doc = __esm({
         fn2(this);
         this.indent -= 1;
       }
-      write(arg5) {
-        if (typeof arg5 === "function") {
-          arg5(this, { execution: "sync" });
-          arg5(this, { execution: "async" });
+      write(arg6) {
+        if (typeof arg6 === "function") {
+          arg6(this, { execution: "sync" });
+          arg6(this, { execution: "async" });
           return;
         }
-        const content = arg5;
+        const content = arg6;
         const lines = content.split("\n").filter((x) => x);
         const minIndent = Math.min(...lines.map((x) => x.length - x.trimStart().length));
         const dedented = lines.map((x) => x.slice(minIndent)).map((x) => " ".repeat(this.indent * 2) + x);
@@ -69675,13 +69675,13 @@ var require_code = __commonJS({
       return new _Code(expr);
     }
     exports.str = str;
-    function addCodeArg(code, arg5) {
-      if (arg5 instanceof _Code)
-        code.push(...arg5._items);
-      else if (arg5 instanceof Name)
-        code.push(arg5);
+    function addCodeArg(code, arg6) {
+      if (arg6 instanceof _Code)
+        code.push(...arg6._items);
+      else if (arg6 instanceof Name)
+        code.push(arg6);
       else
-        code.push(interpolate(arg5));
+        code.push(interpolate(arg6));
     }
     exports.addCodeArg = addCodeArg;
     function optimize(expr) {
@@ -81022,8 +81022,8 @@ var require_select = __commonJS({
         return selectors[":is"](sel);
       },
       ":nth-match": function(param, last) {
-        var args2 = param.split(/\s*,\s*/), arg5 = args2.shift(), test = compileGroup(args2.join(","));
-        return nth(arg5, test, last);
+        var args2 = param.split(/\s*,\s*/), arg6 = args2.shift(), test = compileGroup(args2.join(","));
+        return nth(arg6, test, last);
       },
       ":nth-last-match": function(param) {
         return selectors[":nth-match"](param, true);
@@ -100072,8 +100072,8 @@ var init_file_type = __esm({
 });
 
 // cli.ts
-var import_arg4 = __toESM(require_arg(), 1);
-var import_picocolors4 = __toESM(require_picocolors(), 1);
+var import_arg5 = __toESM(require_arg(), 1);
+var import_picocolors5 = __toESM(require_picocolors(), 1);
 import { basename as basename2 } from "node:path";
 
 // commands/auth.ts
@@ -101370,6 +101370,8 @@ async function promptScope(ctx) {
 
 // commands/auth.ts
 var CODEX_AUTH_SECRET = "CODEX_AUTH_JSON";
+var CLAUDE_OAUTH_SECRET = "CLAUDE_CODE_OAUTH_TOKEN";
+var CLAUDE_OAUTH_TOKEN_PREFIX = "sk-ant-oat";
 function stripAnsi(s) {
   return s.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
 }
@@ -101404,7 +101406,8 @@ function printAuthUsage(params) {
   params.stream("manage provider credentials for the current repository.");
   params.stream("");
   params.stream("providers:");
-  params.stream("  codex   mint a Codex (ChatGPT) subscription credential");
+  params.stream("  codex    mint a Codex (ChatGPT) subscription credential");
+  params.stream("  claude   save a Claude Code subscription OAuth token");
   params.stream("");
   params.stream("options:");
   params.stream("  -h, --help   show help");
@@ -101417,6 +101420,14 @@ function printCodexUsage(params) {
   params.stream("options:");
   params.stream("  -h, --help   show help");
 }
+function printClaudeUsage(params) {
+  params.stream(`usage: ${params.prog} auth claude [options]
+`);
+  params.stream("save a Claude Code subscription OAuth token as CLAUDE_CODE_OAUTH_TOKEN.");
+  params.stream("");
+  params.stream("options:");
+  params.stream("  -h, --help   show help");
+}
 async function runCli(params) {
   const firstArg = params.args[0];
   const helpAtTopLevel = params.showHelp || params.args.length === 0 || params.args.length === 1 && (firstArg === "--help" || firstArg === "-h");
@@ -101430,6 +101441,10 @@ async function runCli(params) {
     await runCodex({ args: rest, prog: params.prog });
     return;
   }
+  if (subcommand === "claude") {
+    await runClaude({ args: rest, prog: params.prog });
+    return;
+  }
   console.error(`unknown auth provider: ${import_picocolors2.default.bold(subcommand)}
 `);
   printAuthUsage({ stream: console.error, prog: params.prog });
@@ -101592,6 +101607,120 @@ async function runCodexAuth() {
     process.exit(1);
   }
 }
+function parseClaudeArgs(args2) {
+  return (0, import_arg.default)(
+    {
+      "--help": Boolean,
+      "-h": "--help"
+    },
+    { argv: args2 }
+  );
+}
+async function runClaude(params) {
+  let parsed2;
+  try {
+    parsed2 = parseClaudeArgs(params.args);
+  } catch (error49) {
+    const message = error49 instanceof Error ? error49.message : String(error49);
+    console.error(`${message}
+`);
+    printClaudeUsage({ stream: console.error, prog: params.prog });
+    process.exit(1);
+  }
+  if (parsed2["--help"]) {
+    printClaudeUsage({ stream: console.log, prog: params.prog });
+    return;
+  }
+  await runClaudeAuth();
+}
+async function runClaudeAuth() {
+  mt(import_picocolors2.default.bgGreen(import_picocolors2.default.black(" pullfrog auth claude ")));
+  const spin = fe();
+  setActiveSpin(spin);
+  try {
+    spin.start("authenticating with github");
+    const token = getGhToken();
+    spin.stop("github authenticated");
+    spin.start("detecting repository");
+    const remote = parseGitRemote();
+    spin.stop(`detected repo ${import_picocolors2.default.cyan(`${remote.owner}/${remote.repo}`)}`);
+    spin.start("checking pullfrog app installation");
+    const status = await fetchStatus({ token, owner: remote.owner, repo: remote.repo });
+    if (!status.installed) {
+      spin.stop(import_picocolors2.default.red("pullfrog app not installed on this repo"));
+      bail(
+        `install pullfrog on ${import_picocolors2.default.bold(`${remote.owner}/${remote.repo}`)} before configuring auth.
+  ${import_picocolors2.default.dim("run:")} ${import_picocolors2.default.cyan(`npx pullfrog init`)}`
+      );
+    }
+    spin.stop(`pullfrog app is installed on ${import_picocolors2.default.cyan(`@${remote.owner}`)}`);
+    if (status.pullfrogSecrets.includes(CLAUDE_OAUTH_SECRET)) {
+      const overwrite = await _t({
+        message: `${import_picocolors2.default.cyan(CLAUDE_OAUTH_SECRET)} is already configured \u2014 overwrite?`,
+        options: [
+          { value: true, label: "overwrite", hint: "replace with a freshly minted token" },
+          { value: false, label: "cancel" }
+        ]
+      });
+      handleCancel(overwrite);
+      if (!overwrite) {
+        pt("canceled.");
+        return;
+      }
+    }
+    const scope2 = status.isOrg ? await promptScope({ owner: remote.owner, repo: remote.repo }) : "account";
+    O2.info(
+      [
+        `mint a long-lived Claude Code OAuth token, then paste it below.`,
+        ``,
+        `${import_picocolors2.default.dim("run:")} ${import_picocolors2.default.cyan("claude setup-token")}`,
+        `it opens your browser, works with Pro/Max subscriptions, and prints a`,
+        `token starting with ${import_picocolors2.default.cyan("sk-ant-oat\u2026")}. copy that token.`
+      ].join("\n")
+    );
+    const oauthToken = await bt({
+      message: `paste your Claude Code OAuth token ${import_picocolors2.default.dim("(Enter to cancel)")}`,
+      mask: "*"
+    });
+    handleCancel(oauthToken);
+    if (!oauthToken) {
+      pt("canceled.");
+      return;
+    }
+    const value2 = oauthToken.trim();
+    if (!value2.startsWith(CLAUDE_OAUTH_TOKEN_PREFIX)) {
+      O2.warn(
+        `that doesn't look like a ${import_picocolors2.default.cyan("claude setup-token")} token (expected ${import_picocolors2.default.cyan(`${CLAUDE_OAUTH_TOKEN_PREFIX}\u2026`)}). saving it anyway.`
+      );
+    }
+    spin.start(`saving ${import_picocolors2.default.cyan(CLAUDE_OAUTH_SECRET)} to Pullfrog`);
+    const result = await setPullfrogSecret({
+      token,
+      owner: remote.owner,
+      repo: remote.repo,
+      name: CLAUDE_OAUTH_SECRET,
+      value: value2,
+      scope: scope2
+    });
+    if (!result.saved) {
+      spin.stop(import_picocolors2.default.red("could not save secret"));
+      O2.warn(
+        `${result.error}
+  ${import_picocolors2.default.dim("set it manually at:")} ${PULLFROG_API_URL}/console/${remote.owner}`
+      );
+      process.exit(1);
+    }
+    spin.stop(`saved ${import_picocolors2.default.cyan(CLAUDE_OAUTH_SECRET)} to Pullfrog (${scope2})`);
+    setActiveSpin(null);
+    gt("done.");
+  } catch (error49) {
+    spin.stop(import_picocolors2.default.red("failed"));
+    setActiveSpin(null);
+    const message = error49 instanceof Error ? error49.message : String(error49);
+    O2.error(message);
+    process.exit(1);
+  }
+}
 
 // commands/gha.ts
 var core11 = __toESM(require_core(), 1);
@@ -101659,37 +101788,40 @@ var providers = {
     managedCredentials: ["CODEX_AUTH_JSON"],
     models: {
       gpt: {
-        displayName: "GPT",
-        resolve: "openai/gpt-5.5",
-        openRouterResolve: "openrouter/openai/gpt-5.5",
+        displayName: "GPT Sol",
+        resolve: "openai/gpt-5.6-sol",
+        openRouterResolve: "openrouter/openai/gpt-5.6-sol",
         preferred: true,
-        subagentModel: "gpt-5.4"
+        subagentModel: "gpt-terra"
       },
+      // Sol served at reasoning.mode=pro — same $/token as Sol, just more tokens
+      // burned; not a pricier premium tier. models.dev has no -pro id, so direct-key
+      // (BYOK) resolves to plain Sol; only the Router/OpenRouter path gets sol-pro.
       "gpt-pro": {
-        displayName: "GPT Pro",
-        resolve: "openai/gpt-5.5-pro",
-        openRouterResolve: "openrouter/openai/gpt-5.5-pro",
+        displayName: "GPT Sol Pro",
+        description: "Maximum reasoning effort",
+        resolve: "openai/gpt-5.6-sol",
+        openRouterResolve: "openrouter/openai/gpt-5.6-sol-pro",
         subagentModel: "gpt"
       },
-      // hidden subagent target — `gpt` lenses run against this. surfacing
-      // it in the picker would just confuse users (it's the prior-flagship,
-      // and they already have `gpt` and `gpt-mini` to choose from).
-      "gpt-5.4": {
-        displayName: "GPT 5.4",
-        resolve: "openai/gpt-5.4",
-        openRouterResolve: "openrouter/openai/gpt-5.4",
-        hidden: true
+      // gpt-5.6's balanced mid-tier (Sol/Terra/Luna are durable capability tiers,
+      // not version bumps). selectable on its own and doubles as `gpt`'s cheaper
+      // lens-fanout subagent — replaces the old hidden gpt-5.4 subagent target.
+      "gpt-terra": {
+        displayName: "GPT Terra",
+        resolve: "openai/gpt-5.6-terra",
+        openRouterResolve: "openrouter/openai/gpt-5.6-terra"
       },
       "gpt-mini": {
-        displayName: "GPT Mini",
-        resolve: "openai/gpt-5.4-mini",
-        openRouterResolve: "openrouter/openai/gpt-5.4-mini"
+        displayName: "GPT Luna",
+        resolve: "openai/gpt-5.6-luna",
+        openRouterResolve: "openrouter/openai/gpt-5.6-luna"
       },
       // legacy aliases — openai unified the codex line into the main GPT family
       // and is shutting down every "-codex" snapshot on 2026-07-23. transparently
       // upgrade existing users via the fallback chain. UI display sites resolve
       // to the terminal alias's label (so dropdown trigger + PR footers show
-      // "GPT" / "GPT Mini", not the historical name).
+      // "GPT Sol" / "GPT Luna", not the historical name).
       "gpt-codex": {
         displayName: "GPT Codex",
         resolve: "openai/gpt-5.3-codex",
@@ -101702,6 +101834,13 @@ var providers = {
         openRouterResolve: "openrouter/openai/gpt-5.1-codex-mini",
         fallback: "openai/gpt-mini"
       },
+      // dropped hidden subagent tier — folds stored pins forward to gpt (Sol).
+      "gpt-5.4": {
+        displayName: "GPT 5.4",
+        resolve: "openai/gpt-5.4",
+        openRouterResolve: "openrouter/openai/gpt-5.4",
+        fallback: "openai/gpt"
+      },
       o3: {
         displayName: "O3",
         resolve: "openai/o3",
@@ -101831,28 +101970,29 @@ var providers = {
         openRouterResolve: "openrouter/anthropic/claude-haiku-4.5"
       },
       gpt: {
-        displayName: "GPT",
-        resolve: "opencode/gpt-5.5",
-        openRouterResolve: "openrouter/openai/gpt-5.5",
-        subagentModel: "gpt-5.4"
+        displayName: "GPT Sol",
+        resolve: "opencode/gpt-5.6-sol",
+        openRouterResolve: "openrouter/openai/gpt-5.6-sol",
+        subagentModel: "gpt-terra"
       },
+      // see openai/gpt-pro — Zen has no -pro id, so direct resolves to plain Sol.
       "gpt-pro": {
-        displayName: "GPT Pro",
-        resolve: "opencode/gpt-5.5-pro",
-        openRouterResolve: "openrouter/openai/gpt-5.5-pro",
+        displayName: "GPT Sol Pro",
+        description: "Maximum reasoning effort",
+        resolve: "opencode/gpt-5.6-sol",
+        openRouterResolve: "openrouter/openai/gpt-5.6-sol-pro",
         subagentModel: "gpt"
       },
-      // hidden subagent target — see openai provider above for context.
-      "gpt-5.4": {
-        displayName: "GPT 5.4",
-        resolve: "opencode/gpt-5.4",
-        openRouterResolve: "openrouter/openai/gpt-5.4",
-        hidden: true
+      // gpt-5.6 balanced mid-tier — selectable + `gpt`'s subagent. see openai above.
+      "gpt-terra": {
+        displayName: "GPT Terra",
+        resolve: "opencode/gpt-5.6-terra",
+        openRouterResolve: "openrouter/openai/gpt-5.6-terra"
       },
       "gpt-mini": {
-        displayName: "GPT Mini",
-        resolve: "opencode/gpt-5.4-mini",
-        openRouterResolve: "openrouter/openai/gpt-5.4-mini"
+        displayName: "GPT Luna",
+        resolve: "opencode/gpt-5.6-luna",
+        openRouterResolve: "openrouter/openai/gpt-5.6-luna"
       },
       // legacy aliases — see openai provider above for context.
       "gpt-codex": {
@@ -101867,6 +102007,13 @@ var providers = {
         openRouterResolve: "openrouter/openai/gpt-5.1-codex-mini",
         fallback: "opencode/gpt-mini"
       },
+      // dropped hidden subagent tier — folds stored pins forward to gpt (Sol).
+      "gpt-5.4": {
+        displayName: "GPT 5.4",
+        resolve: "opencode/gpt-5.4",
+        openRouterResolve: "openrouter/openai/gpt-5.4",
+        fallback: "opencode/gpt"
+      },
       "gemini-pro": {
         displayName: "Gemini Pro",
         resolve: "opencode/gemini-3.1-pro",
@@ -101983,29 +102130,34 @@ var providers = {
         resolve: "openrouter/~anthropic/claude-haiku-latest",
         openRouterResolve: "openrouter/~anthropic/claude-haiku-latest"
       },
+      // pinned to the explicit gpt-5.6 tiers (not the ~openai/gpt-latest rolling
+      // alias): after the Sol/Terra/Luna rename, ~gpt-mini-latest no longer maps
+      // to Luna, so rolling aliases would silently diverge `gpt`/`gpt-mini` from
+      // the chosen tiers across funding paths.
       gpt: {
-        displayName: "GPT",
-        resolve: "openrouter/~openai/gpt-latest",
-        openRouterResolve: "openrouter/~openai/gpt-latest",
-        subagentModel: "gpt-5.4"
+        displayName: "GPT Sol",
+        resolve: "openrouter/openai/gpt-5.6-sol",
+        openRouterResolve: "openrouter/openai/gpt-5.6-sol",
+        subagentModel: "gpt-terra"
       },
+      // see openai/gpt-pro. openrouter serves sol-pro directly on both routes.
       "gpt-pro": {
-        displayName: "GPT Pro",
-        resolve: "openrouter/openai/gpt-5.5-pro",
-        openRouterResolve: "openrouter/openai/gpt-5.5-pro",
+        displayName: "GPT Sol Pro",
+        description: "Maximum reasoning effort",
+        resolve: "openrouter/openai/gpt-5.6-sol-pro",
+        openRouterResolve: "openrouter/openai/gpt-5.6-sol-pro",
         subagentModel: "gpt"
       },
-      // hidden subagent target — see openai provider above for context.
-      "gpt-5.4": {
-        displayName: "GPT 5.4",
-        resolve: "openrouter/openai/gpt-5.4",
-        openRouterResolve: "openrouter/openai/gpt-5.4",
-        hidden: true
+      // gpt-5.6 balanced mid-tier — selectable + `gpt`'s subagent. see openai above.
+      "gpt-terra": {
+        displayName: "GPT Terra",
+        resolve: "openrouter/openai/gpt-5.6-terra",
+        openRouterResolve: "openrouter/openai/gpt-5.6-terra"
       },
       "gpt-mini": {
-        displayName: "GPT Mini",
-        resolve: "openrouter/~openai/gpt-mini-latest",
-        openRouterResolve: "openrouter/~openai/gpt-mini-latest"
+        displayName: "GPT Luna",
+        resolve: "openrouter/openai/gpt-5.6-luna",
+        openRouterResolve: "openrouter/openai/gpt-5.6-luna"
       },
       // legacy aliases — see openai provider for context.
       "gpt-codex": {
@@ -102020,6 +102172,13 @@ var providers = {
         openRouterResolve: "openrouter/openai/gpt-5.1-codex-mini",
         fallback: "openrouter/gpt-mini"
       },
+      // dropped hidden subagent tier — folds stored pins forward to gpt (Sol).
+      "gpt-5.4": {
+        displayName: "GPT 5.4",
+        resolve: "openrouter/openai/gpt-5.4",
+        openRouterResolve: "openrouter/openai/gpt-5.4",
+        fallback: "openrouter/gpt"
+      },
       "o4-mini": {
         displayName: "O4 Mini",
         resolve: "openrouter/openai/o4-mini",
@@ -102099,6 +102258,7 @@ var modelAliases = Object.entries(providers).flatMap(
     slug: `${providerKey}/${modelId}`,
     provider: providerKey,
     displayName: def.displayName,
+    description: def.description,
     resolve: def.resolve,
     openRouterResolve: def.openRouterResolve,
     preferred: def.preferred ?? false,
@@ -102439,11 +102599,11 @@ function ts() {
   return isDebugEnabled() ? `[${(/* @__PURE__ */ new Date()).toISOString()}] ` : "";
 }
 function formatArgs(args2) {
-  return args2.map((arg5) => {
-    if (typeof arg5 === "string") return arg5;
-    if (arg5 instanceof Error) return `${arg5.message}
-${arg5.stack}`;
-    return JSON.stringify(arg5);
+  return args2.map((arg6) => {
+    if (typeof arg6 === "string") return arg6;
+    if (arg6 instanceof Error) return `${arg6.message}
+${arg6.stack}`;
+    return JSON.stringify(arg6);
   }).join(" ");
 }
 function startGroup2(name) {
@@ -102841,7 +103001,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.33",
+  version: "0.1.35",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -104598,7 +104758,7 @@ function tailLines2(text, maxCodeUnits) {
   const firstNewline = tail.indexOf("\n");
   return firstNewline > 0 && firstNewline < tail.length - 1 ? tail.slice(firstNewline + 1) : tail;
 }
-async function runClaude(params) {
+async function runClaude2(params) {
   const startTime = performance5.now();
   let eventCount = 0;
   const labeler = new SessionLabeler();
@@ -105124,7 +105284,7 @@ var claude = agent({
       log.debug(`\xBB starting Pullfrog (Claude Code): ${cliPath} ${baseArgs.join(" ")}`);
       log.debug(`\xBB working directory: ${repoDir}`);
       const gateServer = __using(_stack, await startGateServer(ctx), true);
-      const result = await runClaude({
+      const result = await runClaude2({
         label: "Pullfrog",
         cmd: cliPath,
         cwd: repoDir,
@@ -105940,7 +106100,7 @@ var buildClientParams = (args2, fields) => {
   };
   const map2 = buildKeyMap(fields);
   let config3;
-  for (const [index, arg5] of args2.entries()) {
+  for (const [index, arg6] of args2.entries()) {
     if (fields[index]) {
       config3 = fields[index];
     }
@@ -105953,13 +106113,13 @@ var buildClientParams = (args2, fields) => {
         const name = field.map || config3.key;
         if (field.in) {
           ;
-          params[field.in][name] = arg5;
+          params[field.in][name] = arg6;
         }
       } else {
-        params.body = arg5;
+        params.body = arg6;
       }
     } else {
-      for (const [key, value2] of Object.entries(arg5 ?? {})) {
+      for (const [key, value2] of Object.entries(arg6 ?? {})) {
         const field = map2.get(key);
         if (field) {
           if (field.in) {
@@ -111617,12 +111777,12 @@ var CompiledFunction = class extends CastableBase {
   constructor(...args2) {
     super();
     this.argNames = args2;
-    for (const arg5 of args2) {
-      if (arg5 in this) {
-        throw new Error(`Arg name '${arg5}' would overwrite an existing property on FunctionBody`);
+    for (const arg6 of args2) {
+      if (arg6 in this) {
+        throw new Error(`Arg name '${arg6}' would overwrite an existing property on FunctionBody`);
       }
       ;
-      this[arg5] = arg5;
+      this[arg6] = arg6;
     }
   }
   indentation = 0;
@@ -111707,12 +111867,12 @@ var NodeCompiler = class extends CompiledFunction {
     this.optimistic = ctx.optimistic === true;
   }
   invoke(node2, opts) {
-    const arg5 = opts?.arg ?? this.data;
+    const arg6 = opts?.arg ?? this.data;
     const requiresContext = typeof node2 === "string" ? true : this.requiresContextFor(node2);
     const id = typeof node2 === "string" ? node2 : node2.id;
     if (requiresContext)
-      return `${this.referenceToId(id, opts)}(${arg5}, ${this.ctx})`;
-    return `${this.referenceToId(id, opts)}(${arg5})`;
+      return `${this.referenceToId(id, opts)}(${arg6}, ${this.ctx})`;
+    return `${this.referenceToId(id, opts)}(${arg6})`;
   }
   referenceToId(id, opts) {
     const invokedKind = opts?.kind ?? this.traversalKind;
@@ -112673,8 +112833,8 @@ var ZodType2 = /* @__PURE__ */ $constructor("ZodType", (inst, def) => {
   inst.nullish = () => optional(nullable(inst));
   inst.nonoptional = (params) => nonoptional(inst, params);
   inst.array = () => array(inst);
-  inst.or = (arg5) => union([inst, arg5]);
-  inst.and = (arg5) => intersection(inst, arg5);
+  inst.or = (arg6) => union([inst, arg6]);
+  inst.and = (arg6) => intersection(inst, arg6);
   inst.transform = (tx) => pipe(inst, transform(tx));
   inst.default = (def2) => _default2(inst, def2);
   inst.prefault = (def2) => prefault(inst, def2);
@@ -119734,10 +119894,10 @@ var Context = class {
     }
     return Object.fromEntries(this.#var);
   }
-  #newResponse(data, arg5, headers) {
+  #newResponse(data, arg6, headers) {
     const responseHeaders = this.#res ? new Headers(this.#res.headers) : this.#preparedHeaders ?? new Headers();
-    if (typeof arg5 === "object" && "headers" in arg5) {
-      const argHeaders = arg5.headers instanceof Headers ? arg5.headers : new Headers(arg5.headers);
+    if (typeof arg6 === "object" && "headers" in arg6) {
+      const argHeaders = arg6.headers instanceof Headers ? arg6.headers : new Headers(arg6.headers);
       for (const [key, value2] of argHeaders) {
         if (key.toLowerCase() === "set-cookie") {
           responseHeaders.append(key, value2);
@@ -119758,7 +119918,7 @@ var Context = class {
         }
       }
     }
-    const status = typeof arg5 === "number" ? arg5 : arg5?.status ?? this.#status;
+    const status = typeof arg6 === "number" ? arg6 : arg6?.status ?? this.#status;
     return createResponseInstance(data, { status, headers: responseHeaders });
   }
   newResponse = (...args2) => this.#newResponse(...args2);
@@ -119783,7 +119943,7 @@ var Context = class {
    * })
    * ```
    */
-  body = (data, arg5, headers) => this.#newResponse(data, arg5, headers);
+  body = (data, arg6, headers) => this.#newResponse(data, arg6, headers);
   /**
    * `.text()` can render text as `Content-Type:text/plain`.
    *
@@ -119796,10 +119956,10 @@ var Context = class {
    * })
    * ```
    */
-  text = (text, arg5, headers) => {
-    return !this.#preparedHeaders && !this.#status && !arg5 && !headers && !this.finalized ? new Response(text) : this.#newResponse(
+  text = (text, arg6, headers) => {
+    return !this.#preparedHeaders && !this.#status && !arg6 && !headers && !this.finalized ? new Response(text) : this.#newResponse(
       text,
-      arg5,
+      arg6,
       setDefaultContentType(TEXT_PLAIN, headers)
     );
   };
@@ -119815,15 +119975,15 @@ var Context = class {
    * })
    * ```
    */
-  json = (object5, arg5, headers) => {
+  json = (object5, arg6, headers) => {
     return this.#newResponse(
       JSON.stringify(object5),
-      arg5,
+      arg6,
       setDefaultContentType("application/json", headers)
     );
   };
-  html = (html, arg5, headers) => {
-    const res = (html2) => this.#newResponse(html2, arg5, setDefaultContentType("text/html; charset=UTF-8", headers));
+  html = (html, arg6, headers) => {
+    const res = (html2) => this.#newResponse(html2, arg6, setDefaultContentType("text/html; charset=UTF-8", headers));
     return typeof html === "object" ? resolveCallback(html, HtmlEscapedCallbackPhase.Stringify, false, {}).then(res) : res(html);
   };
   /**
@@ -121892,13 +122052,13 @@ var Doc2 = class {
     fn2(this);
     this.indent -= 1;
   }
-  write(arg5) {
-    if (typeof arg5 === "function") {
-      arg5(this, { execution: "sync" });
-      arg5(this, { execution: "async" });
+  write(arg6) {
+    if (typeof arg6 === "function") {
+      arg6(this, { execution: "sync" });
+      arg6(this, { execution: "async" });
       return;
     }
-    const lines = arg5.split("\n").filter((x) => x);
+    const lines = arg6.split("\n").filter((x) => x);
     const minIndent = Math.min(...lines.map((x) => x.length - x.trimStart().length));
     const dedented = lines.map((x) => x.slice(minIndent)).map((x) => " ".repeat(this.indent * 2) + x);
     for (const line$1 of dedented) this.content.push(line$1);
@@ -123569,8 +123729,8 @@ var ZodType3 = /* @__PURE__ */ $constructor2("ZodType", (inst, def$30) => {
   inst.nullish = () => optional2(nullable2(inst));
   inst.nonoptional = (params) => nonoptional2(inst, params);
   inst.array = () => array2(inst);
-  inst.or = (arg5) => union2([inst, arg5]);
-  inst.and = (arg5) => intersection2(inst, arg5);
+  inst.or = (arg6) => union2([inst, arg6]);
+  inst.and = (arg6) => intersection2(inst, arg6);
   inst.transform = (tx) => pipe2(inst, transform2(tx));
   inst.default = (def$31) => _default3(inst, def$31);
   inst.prefault = (def$31) => prefault2(inst, def$31);
@@ -125362,14 +125522,14 @@ var require_http_errors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
     var status$1 = 500;
     var props = {};
     for (var i$3 = 0; i$3 < arguments.length; i$3++) {
-      var arg5 = arguments[i$3];
-      var type2 = typeof arg5;
-      if (type2 === "object" && arg5 instanceof Error) {
-        err = arg5;
+      var arg6 = arguments[i$3];
+      var type2 = typeof arg6;
+      if (type2 === "object" && arg6 instanceof Error) {
+        err = arg6;
         status$1 = err.status || err.statusCode || status$1;
-      } else if (type2 === "number" && i$3 === 0) status$1 = arg5;
-      else if (type2 === "string") msg = arg5;
-      else if (type2 === "object") props = arg5;
+      } else if (type2 === "number" && i$3 === 0) status$1 = arg6;
+      else if (type2 === "string") msg = arg6;
+      else if (type2 === "object") props = arg6;
       else throw new TypeError("argument #" + (i$3 + 1) + " unsupported type " + type2);
     }
     if (typeof status$1 === "number" && (status$1 < 400 || status$1 >= 600)) deprecate("non-error status code; use only 4xx or 5xx status codes");
@@ -135563,10 +135723,10 @@ var require_code$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
     return new _Code(expr);
   }
   exports.str = str;
-  function addCodeArg(code, arg5) {
-    if (arg5 instanceof _Code) code.push(...arg5._items);
-    else if (arg5 instanceof Name) code.push(arg5);
-    else code.push(interpolate(arg5));
+  function addCodeArg(code, arg6) {
+    if (arg6 instanceof _Code) code.push(...arg6._items);
+    else if (arg6 instanceof Name) code.push(arg6);
+    else code.push(interpolate(arg6));
   }
   exports.addCodeArg = addCodeArg;
   function optimize(expr) {
@@ -142500,11 +142660,11 @@ ${error49 instanceof Error ? error49.stack : JSON.stringify(error49)}`
         );
       }
       const args2 = request2.params.arguments;
-      for (const arg5 of prompt.arguments ?? []) {
-        if (arg5.required && !(args2 && arg5.name in args2)) {
+      for (const arg6 of prompt.arguments ?? []) {
+        if (arg6.required && !(args2 && arg6.name in args2)) {
           throw new McpError(
             ErrorCode.InvalidRequest,
-            `Prompt '${request2.params.name}' requires argument '${arg5.name}': ${arg5.description || "No description provided"}`
+            `Prompt '${request2.params.name}' requires argument '${arg6.name}': ${arg6.description || "No description provided"}`
           );
         }
       }
@@ -143722,7 +143882,7 @@ var FastMCP = class extends FastMCPEventEmitter {
   #parseRuntimeConfig(overrides) {
     const args2 = process.argv.slice(2);
     const getArg = (name) => {
-      const index = args2.findIndex((arg5) => arg5 === `--${name}`);
+      const index = args2.findIndex((arg6) => arg6 === `--${name}`);
       return index !== -1 && index + 1 < args2.length ? args2[index + 1] : void 0;
     };
     const transportArg = getArg("transport");
@@ -145097,11 +145257,11 @@ var GenericRoot = class extends Callable {
   constructor(paramDefs, bodyDef, $3, arg$, hkt) {
     super((...args2) => {
       const argNodes = flatMorph(this.names, (i, name) => {
-        const arg5 = this.arg$.parse(args2[i]);
-        if (!arg5.extends(this.constraints[i])) {
-          throwParseError(writeUnsatisfiedParameterConstraintMessage(name, this.constraints[i].expression, arg5.expression));
+        const arg6 = this.arg$.parse(args2[i]);
+        if (!arg6.extends(this.constraints[i])) {
+          throwParseError(writeUnsatisfiedParameterConstraintMessage(name, this.constraints[i].expression, arg6.expression));
         }
-        return [name, arg5];
+        return [name, arg6];
       });
       if (this.defIsLazy()) {
         const def = this.bodyDef(argNodes);
@@ -145149,7 +145309,7 @@ var GenericRoot = class extends Callable {
     return this.baseInstantiation.internal.references;
   }
 };
-var writeUnsatisfiedParameterConstraintMessage = (name, constraint, arg5) => `${name} must be assignable to ${constraint} (was ${arg5})`;
+var writeUnsatisfiedParameterConstraintMessage = (name, constraint, arg6) => `${name} must be assignable to ${constraint} (was ${arg6})`;
 
 // node_modules/.pnpm/@ark+schema@0.56.0/node_modules/@ark/schema/out/predicate.js
 var implementation = implementNode({
@@ -149647,7 +149807,7 @@ var _parseGenericArgs = (name, g, s, argNodes) => {
   argNodes.push(argState.root);
   if (argState.finalizer === ">") {
     if (argNodes.length !== g.params.length) {
-      return s.error(writeInvalidGenericArgCountMessage(name, g.names, argNodes.map((arg5) => arg5.expression)));
+      return s.error(writeInvalidGenericArgCountMessage(name, g.names, argNodes.map((arg6) => arg6.expression)));
     }
     return argNodes;
   }
@@ -149676,10 +149836,10 @@ var parseGenericInstantiation = (name, g, s) => {
 var unenclosedToNode = (s, token) => maybeParseReference(s, token) ?? maybeParseUnenclosedLiteral(s, token) ?? s.error(token === "" ? s.scanner.lookahead === "#" ? writePrefixedPrivateReferenceMessage(s.shiftedBy(1).scanner.shiftUntilLookahead(terminatingChars)) : writeMissingOperandMessage(s) : writeUnresolvableMessage(token));
 var maybeParseReference = (s, token) => {
   if (s.ctx.args?.[token]) {
-    const arg5 = s.ctx.args[token];
-    if (typeof arg5 !== "string")
-      return arg5;
-    return s.ctx.$.node("alias", { reference: arg5 }, { prereduced: true });
+    const arg6 = s.ctx.args[token];
+    if (typeof arg6 !== "string")
+      return arg6;
+    return s.ctx.$.node("alias", { reference: arg6 }, { prereduced: true });
   }
   const resolution = s.ctx.$.maybeResolve(token);
   if (hasArkKind(resolution, "root"))
@@ -158379,13 +158539,13 @@ function GitTool(ctx) {
         if (blocked) {
           throw new Error(blocked);
         }
-        for (const arg5 of args2) {
+        for (const arg6 of args2) {
           const isBlocked = NOSHELL_BLOCKED_ARGS.some(
-            (flag) => arg5 === flag || arg5.startsWith(flag + "=")
+            (flag) => arg6 === flag || arg6.startsWith(flag + "=")
           );
           if (isBlocked) {
             throw new Error(
-              `Blocked: '${arg5}' flag can execute arbitrary code and is not allowed.`
+              `Blocked: '${arg6}' flag can execute arbitrary code and is not allowed.`
             );
           }
         }
@@ -165316,6 +165476,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;
@@ -165880,28 +166045,7 @@ ${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) {
@@ -165918,6 +166062,20 @@ function hasBlockingHumanReview(reviews) {
   }
   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;
@@ -165928,6 +166086,12 @@ async function autoMergeAfterApprove(ctx) {
   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,
@@ -165935,6 +166099,7 @@ async function autoMergeAfterApprove(ctx) {
   });
   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);
@@ -165946,40 +166111,49 @@ async function autoMergeAfterApprove(ctx) {
     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}`);
+  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 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 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})`,
-    commit_message: "merged autonomously by Pullfrog after a clean approval."
+    commit_title: `${pr.data.title} (#${pullNumber})`
   });
   log.info(
-    `autoMerge: pr=#${pullNumber} approvalSha=${headSha.slice(0, 7)} outstanding=0 \u2192 merged ${merge4.data.sha?.slice(0, 7)}`
+    `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."
   );
-  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
@@ -167764,8 +167938,122 @@ async function run2() {
   }
 }
 
+// commands/watch.ts
+var import_arg4 = __toESM(require_arg(), 1);
+var import_picocolors4 = __toESM(require_picocolors(), 1);
+var REQUEST_TIMEOUT_MS = 35e3;
+function parseWatchArgs(args2) {
+  return (0, import_arg4.default)(
+    {
+      "--pr": Number,
+      "--pretty": Boolean,
+      "--since": String,
+      "--help": Boolean,
+      "-h": "--help",
+      "-p": "--pretty"
+    },
+    { argv: args2 }
+  );
+}
+function printUsage(prog, stream) {
+  stream(`usage: ${prog} watch [<owner>/<repo>] --pr <number> [options]
+`);
+  stream("subscribe to a PR's activity and print one JSON line per event.\n");
+  stream("arguments:");
+  stream("  <owner>/<repo>   target repo (defaults to the current git remote)");
+  stream("");
+  stream("options:");
+  stream("  --pr <number>    pull request number to watch (required)");
+  stream("  --since <cursor> resume from a cursor emitted by a prior event");
+  stream("  -p, --pretty     human-readable output instead of JSON lines");
+  stream("  -h, --help       show help");
+}
+function resolveRepo(positional) {
+  if (!positional) return parseGitRemote();
+  const match3 = positional.match(/^([^/\s]+)\/([^/\s]+)$/);
+  if (!match3) bail(`invalid repo "${positional}" \u2014 expected <owner>/<repo>`);
+  return { owner: match3[1], repo: match3[2] };
+}
+async function pollOnce(ctx) {
+  const params = new URLSearchParams({
+    owner: ctx.owner,
+    repo: ctx.repo,
+    pr: String(ctx.pr)
+  });
+  if (ctx.cursor !== void 0) params.set("since", ctx.cursor);
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+  try {
+    const response = await fetch(`${PULLFROG_API_URL}/api/cli/pr-events?${params}`, {
+      headers: { authorization: `Bearer ${ctx.token}` },
+      signal: controller.signal
+    });
+    if (response.status === 401 || response.status === 403) {
+      bail("invalid or expired github token \u2014 run `gh auth login`.");
+    }
+    if (response.status === 404) {
+      bail(`repository ${ctx.owner}/${ctx.repo} not found or Pullfrog not installed on it.`);
+    }
+    if (!response.ok) {
+      throw new Error(`pr-events returned ${response.status}`);
+    }
+    return await response.json();
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+function formatPretty(event) {
+  const time4 = new Date(event.createdAt).toLocaleTimeString();
+  const action = typeof event.data.action === "string" ? event.data.action : "";
+  const actor = typeof event.data.author === "string" ? event.data.author : typeof event.data.reviewer === "string" ? event.data.reviewer : "";
+  const detail = [action, actor && import_picocolors4.default.dim(`by ${actor}`)].filter(Boolean).join(" ");
+  return `${import_picocolors4.default.dim(time4)} ${import_picocolors4.default.cyan(event.kind)} ${import_picocolors4.default.bold(`#${event.pr}`)} ${detail}`.trimEnd();
+}
+async function runCli4(input) {
+  let parsed2;
+  try {
+    parsed2 = parseWatchArgs(input.args);
+  } catch (error49) {
+    console.error(`${error49 instanceof Error ? error49.message : String(error49)}
+`);
+    printUsage(input.prog, console.error);
+    process.exit(1);
+  }
+  if (input.showHelp || parsed2["--help"]) {
+    printUsage(input.prog, console.log);
+    process.exit(0);
+  }
+  const target = resolveRepo(parsed2._[0]);
+  const pr = parsed2["--pr"];
+  if (pr === void 0 || !Number.isInteger(pr) || pr <= 0) {
+    bail("--pr <number> is required");
+  }
+  const token = getGhToken();
+  const pretty = parsed2["--pretty"] === true;
+  let cursor = parsed2["--since"];
+  const poll = op(pollOnce, {
+    name: "pr-events poll",
+    retries: [1e3, 2e3, 5e3, 1e4, 15e3]
+  });
+  for (; ; ) {
+    try {
+      const result = await poll({ owner: target.owner, repo: target.repo, pr, token, cursor });
+      cursor = result.cursor;
+      for (const event of result.events) {
+        process.stdout.write(pretty ? `${formatPretty(event)}
+` : `${JSON.stringify(event)}
+`);
+      }
+    } catch (error49) {
+      const message = error49 instanceof Error ? error49.message : String(error49);
+      console.error(import_picocolors4.default.dim(`watch: ${message} \u2014 retrying in 30s`));
+      await new Promise((resolve3) => setTimeout(resolve3, 3e4));
+    }
+  }
+}
+
 // cli.ts
-var VERSION10 = "0.1.33";
+var VERSION10 = "0.1.35";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);
@@ -167775,13 +168063,14 @@ function printMainUsage(stream) {
   stream("commands:");
   stream("  init        set up pullfrog on the current repository");
   stream("  auth        manage provider credentials for the current repository");
+  stream("  watch       stream a PR's activity as one JSON line per event");
   stream("");
   stream("global options:");
   stream("  -h, --help      show help");
   stream("  -v, --version   show version");
 }
 function parseGlobalArgs(args2) {
-  return (0, import_arg4.default)(
+  return (0, import_arg5.default)(
     {
       "--help": Boolean,
       "--version": Boolean,
@@ -167816,7 +168105,7 @@ async function run3() {
   const commandArgs = globalParsed._.slice(1);
   if (!command) {
     if (globalParsed["--help"]) {
-      console.log(`${import_picocolors4.default.bold("pullfrog")} v${VERSION10}
+      console.log(`${import_picocolors5.default.bold("pullfrog")} v${VERSION10}
 `);
       printMainUsage(console.log);
       process.exit(0);
@@ -167848,11 +168137,19 @@ async function run3() {
     });
     return;
   }
+  if (command === "watch") {
+    await runCli4({
+      args: commandArgs,
+      prog: PROG,
+      showHelp: globalParsed["--help"] === true
+    });
+    return;
+  }
   if (globalParsed["--help"]) {
     printMainUsage(console.log);
     process.exit(0);
   }
-  console.error(`unknown command: ${import_picocolors4.default.bold(command)}
+  console.error(`unknown command: ${import_picocolors5.default.bold(command)}
 `);
   printMainUsage(console.error);
   process.exit(1);
@@ -167861,7 +168158,7 @@ try {
   await run3();
 } catch (error49) {
   const message = error49 instanceof Error ? error49.message : String(error49);
-  console.error(import_picocolors4.default.red(message));
+  console.error(import_picocolors5.default.red(message));
   process.exit(1);
 }
 /*! Bundled license information: