pullfrog 0.1.33 → 0.1.35

package/dist/index.js

@@ -99859,37 +99859,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",
@@ -99902,6 +99905,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",
@@ -100031,28 +100041,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": {
@@ -100067,6 +100078,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",
@@ -100183,29 +100201,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": {
@@ -100220,6 +100243,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",
@@ -100299,6 +100329,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,
@@ -101041,7 +101072,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",
@@ -163558,6 +163589,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;
@@ -164122,28 +164158,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 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) {
@@ -164160,6 +164175,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;
@@ -164170,6 +164199,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,
@@ -164177,6 +164212,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);
@@ -164188,40 +164224,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

package/dist/internal/index.d.ts

@@ -8,7 +8,6 @@ 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

@@ -50,37 +50,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",
@@ -93,6 +96,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",
@@ -222,28 +232,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": {
@@ -258,6 +269,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",
@@ -374,29 +392,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": {
@@ -411,6 +434,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",
@@ -499,6 +529,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,
@@ -1245,26 +1276,6 @@ 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";
@@ -1492,7 +1503,6 @@ export {
   PULLFROG_DIVIDER,
   TIMEOUT_DISABLED,
   buildPullfrogFooter,
-  checkRunsGate,
   createLeapingProgressComment,
   decodeJwtExpMs,
   defaultAutoTier,
@@ -1503,7 +1513,6 @@ export {
   getModelProvider,
   getProgressComment,
   getProviderDisplayName,
-  hasVerifiedCheck,
   isAutoTier,
   isCardGatedModel,
   isLeapingIntoActionCommentBody,

package/dist/models.d.ts

@@ -28,6 +28,9 @@ export interface ModelAlias {
     provider: string;
     /** human-readable name shown in dropdowns */
     displayName: string;
+    /** optional one-line picker sub-label clarifying what the alias is (e.g.
+     * gpt-pro = "Maximum reasoning effort"). undefined for most aliases. */
+    description: string | undefined;
     /** concrete models.dev specifier, e.g. "anthropic/claude-opus-4-6". sentinel for routing entries — never passed to a CLI directly. */
     resolve: string;
     /** full models.dev specifier for the OpenRouter equivalent (undefined for free models and routing entries) */
@@ -48,12 +51,14 @@ export interface ModelAlias {
      * use as its lens-fanout subagent. e.g. claude-opus → "claude-sonnet". */
     subagentModel: string | undefined;
     /** hide from selectable lists (UI dropdowns, CLI pickers). does NOT affect
-     * resolution — for that use `fallback`. used for internal-only tier targets
-     * (e.g. gpt-5.4 as a subagent target without exposing it to users). */
+     * resolution — for that use `fallback`. used to keep a redundant alias out of
+     * pickers (e.g. the free `minimax-m2.5-free` duplicate). */
     hidden: boolean;
 }
 interface ModelDef {
     displayName: string;
+    /** optional one-line picker sub-label (e.g. "Maximum reasoning effort"). */
+    description?: string;
     /** concrete models.dev specifier, e.g. "anthropic/claude-opus-4-6" */
     resolve: string;
     /** full models.dev specifier for the OpenRouter equivalent, e.g. "openrouter/anthropic/claude-opus-4.6" */