release: bump action to 0.1.9

* fix: prevent cross-PR push from subagent-induced branch switch

A workflow_dispatch run for zed-industries/cloud (workflow run 26036155393)
force-pushed the orchestrator's work onto an unrelated engineer's PR branch
(origin/reactivate-pro-plan, PR #2582). The orchestrator's reviewfrog subagent
called checkout_pr({pull_number: 2582}), which (1) moved the shared working
tree to pr-2582 and (2) persisted pushDest pointing at reactivate-pro-plan.
The orchestrator's subsequent commit + push_branch then clobbered the victim
PR. Recovery + disclosure in PR #2584.

Three compounding bugs closed here:

1. checkout_pr dirty-tree guard had a first-call hole: the previous condition
   required ctx.toolState.issueNumber to already be set, so on workflow_dispatch
   runs the first checkout_pr (commonly from a subagent) bypassed the guard
   entirely. Now any PR switch with a dirty tree is refused, including the
   first switch of a run. Idempotent same-PR re-checkouts are still absorbed
   by alreadyOnBranch inside checkoutPrBranch.

2. push_branch trusted sticky pushDest blindly. Added a backstop: refuse
   pushes where the local branch matches /^pr-(\d+)$/ AND pushDest.remoteBranch
   differs from it AND the current run is not scoped to PR N (event.is_pr === true
   && event.issue_number === N). This catches subagent-induced silent branch
   switches even if a future bug reintroduces a first-call hole in fix #1.

3. Build-mode self-review prompt told the orchestrator to ship "the output of
   git diff" to the reviewer. The model in this run synthesized
   git diff main...HEAD, which excludes uncommitted work — and Build self-review
   runs BEFORE the commit, so the reviewer saw an empty diff and thrashed,
   eventually calling checkout_pr on a random PR to find something to look at.
   Prompt now specifies git diff origin/<base-branch> (two-dot, no HEAD),
   which compares the working tree against the remote base.

Refs:
  zed-industries/cloud workflow run 26036155393
  zed-industries/cloud#2582 (victim)
  zed-industries/cloud#2584 (disclosure)

* review: key dirty-tree guard on current branch + drop 'two-dot' misnomer

Address review feedback on PR #796.

1. checkout_pr dirty-tree guard now keys off the live current branch
   (git rev-parse --abbrev-ref HEAD), not ctx.toolState.issueNumber.
   issueNumber is ALSO set by get_issue / get_issue_comments /
   get_issue_events, so a subagent doing get_issue(N) followed by
   checkout_pr(N) on a dirty tree would have bypassed the original guard
   (issueNumber === pull_number). The current branch is the actual
   primitive for "would this call move HEAD" — querying it directly avoids
   correlating on toolState that other tools write to.

2. modes.ts: drop the wrong "two-dot" label on git diff origin/<base>.
   That's the single-rev form, not two-dot. Copilot was right that the
   label was confusing/contradictory with the actually-shown command.

.dockerignore

@@ -0,0 +1,31 @@
+# the Dockerfile only `COPY`s docker-entrypoint.sh, so most of this is
+# defense-in-depth — modern docker BuildKit (default since docker 23)
+# already prunes unreferenced files from the build context. but:
+#  - documents intent for future maintainers who add `COPY . .`
+#  - resurfaces the bytes-saved win if someone disables BuildKit
+#    (DOCKER_BUILDKIT=0) or adopts a builder that doesn't prune
+#  - keeps `docker build` snappy even on cold builders that DO send
+#    everything
+
+# pnpm-managed workspace deps — large and never needed at build time
+node_modules/
+
+# secrets — must never enter an image, even by accident
+.env
+.env.*
+!.env.example
+
+# build outputs
+dist/
+build/
+*.log
+
+# editor / VCS noise
+.DS_Store
+.idea/
+.vscode/
+
+# tests + fixtures we don't need at build time
+coverage/
+test/
+.scripts/

.github/workflows/test.yml

@@ -30,6 +30,7 @@ jobs:
         agent: [claude, opencode]
         test:
           [
+            codex-auth,
             mcpmerge,
             nobash,
             restricted,
@@ -41,6 +42,8 @@ jobs:
         exclude:
           - agent: claude
             test: skill-invoke-opencode
+          - agent: claude
+            test: codex-auth
           - agent: opencode
             test: skill-invoke-claude
     env:
@@ -59,6 +62,13 @@ jobs:
       AWS_REGION: us-east-1
       BEDROCK_MODEL_ID: us.anthropic.claude-opus-4-6-v1
       PULLFROG_MODEL: ${{ vars.PULLFROG_MODEL }}
+      # CI smoke-testing shortcut only — production stores this in Pullfrog's
+      # per-org secret store (Postgres), set via `pullfrog auth codex`. GH
+      # Actions secrets are immutable at runtime so the post-hook can't write
+      # back the rotated refresh token; CI accepts the staleness and we
+      # manually re-provision when smoke tests start failing. Do not copy this
+      # pattern into user-facing workflows. See wiki/codex-auth.md.
+      CODEX_AUTH_JSON: ${{ secrets.CODEX_AUTH_JSON }}
     steps:
       - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v4
@@ -81,6 +91,7 @@ jobs:
       matrix:
         test:
           [
+            byok-no-keys-fallback,
             git-permissions,
             githooks,
             pkg-json-scripts,

Dockerfile

@@ -0,0 +1,78 @@
+# pullfrog GHA-like test container.
+#
+# baked once at image build time, used by `pnpm docker`. all runtime cost
+# (apt-get, useradd, sudoers wiring) is paid here so each `docker` invocation
+# is a single `docker run` with no in-container setup.
+#
+# rebuild is content-hash gated by docker.ts (Dockerfile + docker-entrypoint.sh).
+# bump anything in this file or the entrypoint and the next `pnpm docker` rebuilds.
+
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# core toolset matching what GHA `ubuntu-24.04` runners ship: gh, jq, git,
+# python3, ssh client, plus the compression + build-essential surface that
+# `pnpm install` / `node-gyp` / agent shell calls regularly need. keeps
+# test-time invocations of these tools honest (no "works on the runner,
+# breaks in the local container").
+RUN apt-get update -qq \
+    && apt-get install -qq -y --no-install-recommends \
+        build-essential \
+        ca-certificates \
+        curl \
+        file \
+        git \
+        gnupg \
+        jq \
+        openssh-client \
+        python3 \
+        sudo \
+        unzip \
+        wget \
+        xz-utils \
+    && rm -rf /var/lib/apt/lists/*
+
+# node 24 from nodesource + corepack (provides pnpm without a global install).
+RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
+    && apt-get install -y nodejs \
+    && rm -rf /var/lib/apt/lists/* \
+    && corepack enable
+
+# gh cli (matches GHA pre-installed tooling).
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+        | gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg \
+    && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
+        > /etc/apt/sources.list.d/github-cli.list \
+    && apt-get update -qq \
+    && apt-get install -qq -y gh \
+    && rm -rf /var/lib/apt/lists/*
+
+# ubuntu:24.04 ships a default `ubuntu` user at uid 1000 — remove it so we
+# can place `testuser` at 1000 (the typical macOS dev uid). the entrypoint
+# remaps to the host uid/gid at runtime if they differ.
+RUN userdel -r ubuntu 2>/dev/null || true \
+    && groupadd -g 1000 testuser \
+    && useradd -u 1000 -g 1000 -m -s /bin/bash testuser \
+    && echo "testuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/testuser \
+    && chmod 0440 /etc/sudoers.d/testuser
+
+# layout matching the bind mount + named volume targets in docker.ts.
+RUN mkdir -p /app/action /app/action/node_modules /tmp/home/.config /tmp/home/.cache \
+    && chown -R testuser:testuser /app /tmp/home
+
+# CI=true is critical: `shell.ts` PID-namespace sandbox keys off it. baking
+# it ensures security tests can't pass vacuously because someone forgot the
+# flag.
+ENV HOME=/tmp/home \
+    TMPDIR=/tmp \
+    CI=true \
+    COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+
+COPY docker-entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+WORKDIR /app/action
+ENTRYPOINT ["/entrypoint.sh"]

action.yml

@@ -36,6 +36,11 @@ outputs:
 runs:
   using: "node24"
   main: "entry.ts"
+  # Always-run post step persists best-effort state that must survive
+  # cancellation, timeouts, and unhandled errors in the main step. Today's
+  # only consumer: Codex auth.json refresh write-back. See wiki/codex-auth.md.
+  post: "entryPost.ts"
+  post-if: "always()"
 
 branding:
   icon: "code"

agents/claude.ts

@@ -18,10 +18,16 @@ import { performance } from "node:perf_hooks";
 import { pullfrogMcpName } from "../external.ts";
 import { BEDROCK_MODEL_ID_ENV, isBedrockAnthropicId } from "../models.ts";
 
-import { getIdleMs, markActivity } from "../utils/activity.ts";
+import {
+  getIdleMs,
+  isActivitySuspended,
+  markActivity,
+  resumeActivity,
+  suspendActivity,
+} from "../utils/activity.ts";
 import { formatJsonValue, log } from "../utils/cli.ts";
 import { installFromNpmTarball } from "../utils/install.ts";
-import { detectProviderError } from "../utils/providerErrors.ts";
+import { findProviderErrorMatch } from "../utils/providerErrors.ts";
 import { addSkill, installBundledSkills } from "../utils/skills.ts";
 import {
   DEFAULT_MAX_RETAINED_BYTES,
@@ -33,7 +39,11 @@ import {
 import { ThinkingTimer } from "../utils/timer.ts";
 import type { TodoTracker } from "../utils/todoTracking.ts";
 import { getDevDependencyVersion } from "../utils/version.ts";
-import { buildLearningsReflectionPrompt, runPostRunRetryLoop } from "./postRun.ts";
+import {
+  buildLearningsReflectionPrompt,
+  runPostRunRetryLoop,
+  shouldRunReflection,
+} from "./postRun.ts";
 import { REVIEWER_AGENT_NAME, REVIEWER_SYSTEM_PROMPT } from "./reviewer.ts";
 import { formatWithLabel, ORCHESTRATOR_LABEL, SessionLabeler } from "./sessionLabeler.ts";
 import {
@@ -363,6 +373,13 @@ export async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
           }
         } else if (block.type === "tool_use") {
           const toolName = block.name || "unknown";
+          // suspend the activity watchdog across the tool call. claude's
+          // stdout pipe goes silent while it awaits the synchronous MCP
+          // tools/call HTTP response; without this, long fetches/deepens
+          // (issue #760) trip the spawn-level idle timer at 300s. paired
+          // with resumeActivity() in tool_result below; bounded by the
+          // MAX_TOOL_CALL_SUSPENSION_MS auto-resume in activity.ts.
+          suspendActivity();
           if (params.onToolUse) {
             params.onToolUse({
               toolName,
@@ -439,6 +456,7 @@ export async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
       for (const block of content) {
         if (typeof block === "string") continue;
         if (block.type === "tool_result") {
+          resumeActivity();
           timerFor(label).markToolResult();
 
           const outputContent =
@@ -572,6 +590,7 @@ export async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
       env: params.env,
       activityTimeout: 300_000,
       onActivityTimeout: params.onActivityTimeout,
+      isPausedExternally: isActivitySuspended,
       stdio: ["ignore", "pipe", "pipe"],
       // run claude in its own process group so SIGKILL on activity timeout /
       // outer cancellation reaches any subprocesses it spawns (rg, file
@@ -639,10 +658,10 @@ export async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
         recentStderr.push(trimmed);
         if (recentStderr.length > MAX_STDERR_LINES) recentStderr.shift();
 
-        const providerError = detectProviderError(trimmed);
-        if (providerError) {
-          lastProviderError = providerError;
-          log.info(`» provider error detected (${providerError}): ${trimmed.substring(0, 500)}`);
+        const match = findProviderErrorMatch(trimmed);
+        if (match) {
+          lastProviderError = match.label;
+          log.info(`» provider error detected (${match.label}): ${match.excerpt}`);
         } else {
           log.debug(trimmed);
         }
@@ -798,6 +817,14 @@ const MANAGED_SETTINGS_PATH = `${MANAGED_SETTINGS_DIR}/managed-settings.json`;
 // allowManagedPermissionRulesOnly prevents malicious PRs from adding allow rules that override
 // our deny rules — safe in CI because --dangerously-skip-permissions makes allow/ask irrelevant.
 // allowManagedHooksOnly prevents malicious project hooks from bypassing deny rules.
+// Codex auth.json (Pullfrog-stored ChatGPT subscription credential) lives at
+// `~/.local/share/opencode/auth.json` when the opencode harness materialized
+// it. Claude shouldn't be running OpenAI models — they route to opencode —
+// but defense-in-depth: deny the file regardless. Per Claude Code permissions
+// docs, Read(...) deny ALSO blocks file-reading Bash commands (cat, head,
+// tail, sed) and survives bypassPermissions mode. See wiki/codex-auth.md.
+const CODEX_AUTH_DENY_PATH = "~/.local/share/opencode/auth.json";
+
 const managedSettings = {
   allowManagedPermissionRulesOnly: true,
   allowManagedHooksOnly: true,
@@ -811,11 +838,15 @@ const managedSettings = {
       "Edit(//sys/**)",
       "Glob(//proc/**)",
       "Glob(//sys/**)",
+      `Read(${CODEX_AUTH_DENY_PATH})`,
+      `Grep(${CODEX_AUTH_DENY_PATH})`,
+      `Edit(${CODEX_AUTH_DENY_PATH})`,
+      `Glob(${CODEX_AUTH_DENY_PATH})`,
     ],
   },
   sandbox: {
     filesystem: {
-      denyRead: ["/proc", "/sys"],
+      denyRead: ["/proc", "/sys", CODEX_AUTH_DENY_PATH],
     },
   },
 };
@@ -918,15 +949,34 @@ export const claude = agent({
     // bedrock run; if the user has set the env var manually for some other
     // reason (e.g. always-Bedrock org policy), `...process.env` already
     // carries it through and we don't disturb it.
+    const repoDir = process.cwd();
+
+    // PWD must match the spawn cwd (see opencode_v2.ts for the analogous fix).
+    // claude-code 2.1.x reads `process.env.PWD` and registers it as a "session"
+    // additional-working-directory when it differs from `process.cwd()` (per
+    // the bundled cli.js — `let H=process.env.PWD; if(H && H !== Y7() && ...)
+    // j.set(H, {path: H, source: "session"})`). Inheriting harness PWD via
+    // `...process.env` ends up adding the wrong dir to the agent's allowed
+    // working set under `pnpm runtest` / `pnpm play`, which silently confuses
+    // path-relative tools.
     const env: Record<string, string | undefined> = {
       ...process.env,
       ...homeEnv,
+      PWD: repoDir,
     };
     if (isBedrockRoute) {
       env.CLAUDE_CODE_USE_BEDROCK = "1";
     }
 
-    const repoDir = process.cwd();
+    // claude-code's `Vw()` resolver prefers ANTHROPIC_API_KEY over the OAuth
+    // token when both are set, so we strip the API key to fall through to the
+    // Max-subscription path. bedrock route uses AWS creds and is excluded.
+    if (env.CLAUDE_CODE_OAUTH_TOKEN && !isBedrockRoute && env.ANTHROPIC_API_KEY) {
+      log.debug(
+        "» CLAUDE_CODE_OAUTH_TOKEN present — stripping ANTHROPIC_API_KEY from Claude Code env so the OAuth subscription is used"
+      );
+      delete env.ANTHROPIC_API_KEY;
+    }
 
     log.info(`» effort: ${effort}`);
     log.debug(`» starting Pullfrog (Claude Code): node ${baseArgs.join(" ")}`);
@@ -956,9 +1006,10 @@ export const claude = agent({
       ctx,
       initialResult: result,
       initialUsage: result.usage,
-      reflectionPrompt: ctx.toolState.learningsFilePath
-        ? buildLearningsReflectionPrompt(ctx.toolState.learningsFilePath)
-        : undefined,
+      reflectionPrompt:
+        ctx.toolState.learningsFilePath && shouldRunReflection(ctx.toolState.selectedMode)
+          ? buildLearningsReflectionPrompt(ctx.toolState.learningsFilePath)
+          : undefined,
       canResume: (r) => Boolean(r.sessionId),
       resume: async (c) => {
         const sessionId = c.previousResult.sessionId;

agents/index.ts

@@ -1,5 +1,8 @@
 import { claude } from "./claude.ts";
-import { opencode } from "./opencode.ts";
+// v2 harness — adapted to opencode-ai >=1.14.x SDK-v2 / Effect-ts CLI rewrite.
+// The legacy v1 module (`./opencode.ts`) is kept around for reference + fast
+// revert; the active runner is the v2 module below.
+import { opencode } from "./opencode_v2.ts";
 import type { Agent } from "./shared.ts";
 
 export type { Agent, AgentUsage } from "./shared.ts";

agents/opencode.test.ts

@@ -0,0 +1,34 @@
+import { describe, expect, it } from "vitest";
+import { modelAliases } from "../models.ts";
+import { geminiHighThinkingOverrides } from "./opencode.ts";
+
+describe("geminiHighThinkingOverrides", () => {
+  // Expected truth pulled the same way the helper does — both must derive from
+  // the registry so the test exercises the wiring, not a hand-maintained list.
+  const expectedApiIds = modelAliases
+    .filter((a) => a.provider === "google")
+    .map((a) => a.resolve.replace(/^google\//, ""));
+  const overrides = geminiHighThinkingOverrides();
+
+  it("covers every direct-Google alias in the registry", () => {
+    expect(Object.keys(overrides).sort()).toEqual([...expectedApiIds].sort());
+  });
+
+  it("is non-empty (catches accidental whole-provider removal)", () => {
+    expect(Object.keys(overrides).length).toBeGreaterThan(0);
+  });
+
+  it("strips the `google/` prefix from each resolve to get the bare API id", () => {
+    for (const id of Object.keys(overrides)) {
+      expect(id).not.toMatch(/^google\//);
+    }
+  });
+
+  it("pins every entry to thinkingLevel: high", () => {
+    for (const [id, value] of Object.entries(overrides)) {
+      expect(value, `entry for ${id}`).toEqual({
+        options: { thinkingConfig: { thinkingLevel: "high" } },
+      });
+    }
+  });
+});

agents/opencode.ts

@@ -11,16 +11,24 @@
  * the agent process itself gets full env (needs LLM API keys, PATH, etc.).
  * security is enforced at the tool layer, not the process layer.
  */
-import { execFileSync } from "node:child_process";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { performance } from "node:perf_hooks";
+import * as core from "@actions/core";
 import { pullfrogMcpName } from "../external.ts";
-import { BEDROCK_MODEL_ID_ENV, modelAliases } from "../models.ts";
-import { getIdleMs, markActivity } from "../utils/activity.ts";
+import { BEDROCK_MODEL_ID_ENV } from "../models.ts";
+import type { ToolState } from "../toolState.ts";
+import {
+  getIdleMs,
+  isActivitySuspended,
+  markActivity,
+  resumeActivity,
+  suspendActivity,
+} from "../utils/activity.ts";
+import { type AgentDiagnostic, formatAgentHangBody } from "../utils/agentHangReport.ts";
 import { formatJsonValue, log } from "../utils/cli.ts";
-import { installFromNpmTarball } from "../utils/install.ts";
-import { detectProviderError } from "../utils/providerErrors.ts";
+import { installCodexAuth } from "../utils/codexHome.ts";
+import { findProviderErrorMatch } from "../utils/providerErrors.ts";
 import { addSkill, installBundledSkills } from "../utils/skills.ts";
 import {
   DEFAULT_MAX_RETAINED_BYTES,
@@ -37,8 +45,19 @@ import {
   PULLFROG_OPENCODE_PLUGIN_FILENAME,
   PULLFROG_OPENCODE_PLUGIN_SOURCE,
 } from "./opencodePlugin.ts";
-import { buildLearningsReflectionPrompt, runPostRunRetryLoop } from "./postRun.ts";
-import { REVIEWER_AGENT_NAME, REVIEWER_SYSTEM_PROMPT } from "./reviewer.ts";
+import {
+  autoSelectModel,
+  buildReviewerAgentConfig,
+  geminiHighThinkingOverrides,
+  installOpencodeCli,
+  type OpenCodeConfig,
+} from "./opencodeShared.ts";
+import {
+  buildLearningsReflectionPrompt,
+  runPostRunRetryLoop,
+  shouldRunReflection,
+} from "./postRun.ts";
+import { REVIEWER_AGENT_NAME } from "./reviewer.ts";
 import { formatWithLabel, ORCHESTRATOR_LABEL, SessionLabeler } from "./sessionLabeler.ts";
 import {
   type AgentResult,
@@ -48,29 +67,13 @@ import {
   logTokenTable,
   MAX_STDERR_LINES,
 } from "./shared.ts";
-import { deriveSubagentModels } from "./subagentModels.ts";
 
-async function installOpencodeCli(): Promise<string> {
-  return await installFromNpmTarball({
-    packageName: "opencode-ai",
-    version: getDevDependencyVersion("opencode-ai"),
-    executablePath: "bin/opencode",
-    installDependencies: true,
-  });
-}
+// re-export for the existing test (`./opencode.test.ts`) — once v1 is
+// retired this module collapses and the test imports from opencodeShared.
+export { geminiHighThinkingOverrides } from "./opencodeShared.ts";
 
-// ── config ─────────────────────────────────────────────────────────────────────
-
-type OpenCodeConfig = {
-  mcp?: Record<string, unknown>;
-  permission?: Record<string, unknown>;
-  provider?: Record<string, unknown>;
-  agent?: Record<string, unknown>;
-  experimental?: Record<string, unknown>;
-  model?: string;
-  enabled_providers?: string[];
-  [key: string]: unknown;
-};
+// v1.4-era npm package shipped a per-platform binary directly at this path.
+const installCli = () => installOpencodeCli({ binPath: "bin/opencode" });
 
 // NOTE: OpenCode's per-call `max_tokens` defaults to 32_000. We previously
 // overrode this via `OPENCODE_EXPERIMENTAL_OUTPUT_TOKEN_MAX = 5000` in #616
@@ -92,26 +95,6 @@ type OpenCodeConfig = {
 // top-level `limit.output` config field has no read site (silently dropped
 // on merge in session/llm.ts), so the env var is the only working knob.
 
-/**
- * upstream opencode hardcodes `thinkingLevel: "high"` as the default for every
- * gemini-3 model on the direct google SDK (`provider/transform.ts` `options()`).
- * that adds 30-60s of pre-tool-call TTFT and 5-46s of post-tool jabber per turn,
- * which is overkill for agentic loops where most steps are tool-routing
- * decisions. we override to "medium" for the curated slugs we ship in
- * `action/models.ts`; users who want max quality can still pick the `-high`
- * variant explicitly. flash stays at "medium" too — low-effort flash is
- * visibly worse on harder tasks and the latency savings aren't meaningful
- * (flash is already fast). other gemini-3 ids that exist in models.dev but
- * aren't in our curated alias map keep the upstream `"high"` default.
- *
- * keyed by upstream api id (matches the slugs in `action/models.ts`). the
- * merge order in opencode `session/llm.ts` is `base ← model.options ← agent.options ← variant`,
- * deep-merged — so an explicit `--variant high` still wins, and explicit
- * model.options in a user-provided opencode config would also win.
- */
-const GEMINI_3_DIRECT_THINKING_LEVEL = "medium";
-const GEMINI_3_DIRECT_API_IDS = ["gemini-3.1-pro-preview", "gemini-3-flash-preview"];
-
 function buildSecurityConfig(ctx: AgentRunContext, model: string | undefined): string {
   const config: OpenCodeConfig = {
     permission: {
@@ -131,29 +114,22 @@ function buildSecurityConfig(ctx: AgentRunContext, model: string | undefined): s
       log.info(`» subagent models: reviewfrog=${reviewerModel}`);
       return cfg;
     })(),
-    // opt into opencode's experimental `batch` tool (added in
-    // anomalyco/opencode PR #2983, opt-in via `experimental.batch_tool`). it
-    // exposes a single `batch` tool that runs 1-25 independent tool calls
-    // (read/grep/glob/bash/etc.) concurrently in one assistant turn, which
-    // collapses the dominant grep→20×read pattern into a single round trip.
-    // edits are explicitly disallowed inside the batch upstream. paired with
-    // the "Parallel tool execution" guidance in utils/instructions.ts so the
-    // model actually reaches for it. see wiki/prompt.md.
-    experimental: { batch_tool: true },
-    provider: {
-      google: {
-        models: Object.fromEntries(
-          GEMINI_3_DIRECT_API_IDS.map((id) => [
-            id,
-            {
-              options: {
-                thinkingConfig: { thinkingLevel: GEMINI_3_DIRECT_THINKING_LEVEL },
-              },
-            },
-          ])
-        ),
-      },
-    },
+    // NOTE: `experimental.batch_tool` was enabled in #719 to bundle 1-25
+    // independent tool calls into one round trip, but the batch tool rejects
+    // MCP/"external" tools with `"Tool '<name>' not in registry. External
+    // tools (MCP, environment) cannot be batched - call them directly."`
+    // (anomalyco/opencode PR #2983 design). when a model emits parallel
+    // tool_use blocks containing `pullfrog_*` calls, opencode internally
+    // routes them through batch — they all fail, the model misreads the
+    // error as "the tool doesn't exist", and gives up. caught in CI by
+    // `restricted-opencode` after a `lens:` subagent dispatched parallel
+    // `pullfrog_shell` calls and concluded shell was unavailable.
+    // native parallel tool_use (multiple tool_use blocks per assistant
+    // message) still works without batch_tool for both built-in and MCP
+    // tools, so we lose only the batch wrapper, not parallelism.
+    // gemini-3 thinking pinned to high for review depth; gpt and anthropic
+    // effort set elsewhere (gpt: upstream default, anthropic: --effort flag in claude.ts).
+    provider: { google: { models: geminiHighThinkingOverrides() } },
   };
 
   if (model) {
@@ -168,90 +144,6 @@ function buildSecurityConfig(ctx: AgentRunContext, model: string | undefined): s
   return JSON.stringify(config);
 }
 
-/**
- * Read-only `reviewfrog` subagent for lens-based review.
- *
- * Non-mutative + non-recursive — enforced by the prose system prompt in
- * reviewer.ts.
- *
- * Per-subagent `model:` override is driven by the registry in
- * `action/models.ts` via each alias's `subagentModel` field — see
- * `deriveSubagentModels` for the reverse-lookup. Currently wired:
- * Anthropic opus → sonnet, OpenAI gpt-pro → gpt and gpt → gpt-5.4,
- * Google gemini-pro → gemini-flash. Other providers (xai, deepseek,
- * moonshot) and already-cheap tiers inherit (no override) — either the
- * absolute savings are too small to justify or there's no clean
- * cheaper-but-capable sibling.
- */
-function buildReviewerAgentConfig(orchestratorModel: string | undefined): Record<string, unknown> {
-  const overrides = deriveSubagentModels(orchestratorModel);
-  return {
-    [REVIEWER_AGENT_NAME]: {
-      description:
-        "Read-only review subagent for lens-based code review (correctness, security, billing-subsystem, etc.). " +
-        "Reads only — no writes, no state-changing shell or MCP calls, no nested subagent dispatch.",
-      mode: "subagent",
-      prompt: REVIEWER_SYSTEM_PROMPT,
-      ...(overrides.reviewer !== undefined ? { model: overrides.reviewer } : {}),
-    },
-  };
-}
-
-// ── model auto-select fallback ──────────────────────────────────────────────────
-//
-// steps 1–2 of model resolution (PULLFROG_MODEL env, slug resolution) are handled
-// by resolveModel() in utils/agent.ts before the agent runs. this fallback only
-// handles step 3: auto-select via `opencode models`.
-
-function getOpenCodeModels(cliPath: string): string[] {
-  try {
-    const output = execFileSync(cliPath, ["models"], {
-      encoding: "utf-8",
-      timeout: 30_000,
-      env: process.env,
-    });
-    return output
-      .split("\n")
-      .map((line) => line.trim())
-      .filter(Boolean);
-  } catch (error) {
-    log.debug(
-      `» failed to run \`opencode models\`: ${error instanceof Error ? error.message : String(error)}`
-    );
-    return [];
-  }
-}
-
-const AUTO_SELECT_WARNING =
-  "select a model explicitly in the Pullfrog console (https://pullfrog.com/console) to avoid this.";
-
-function autoSelectModel(cliPath: string): string | undefined {
-  const availableModels = getOpenCodeModels(cliPath);
-  const availableSet = new Set(availableModels);
-  if (availableSet.size > 0) {
-    log.debug(`» opencode models (${availableSet.size}): ${availableModels.join(", ")}`);
-    // skip hidden aliases (internal subagent-tier targets like opencode/gpt-5.4) —
-    // they should never surface as a user-facing orchestrator pick. mirrors the
-    // selectable-list filter in components/ModelSelector.tsx and action/commands/init.ts.
-    const match =
-      modelAliases.find((a) => !a.hidden && a.preferred && availableSet.has(a.resolve)) ??
-      modelAliases.find((a) => !a.hidden && availableSet.has(a.resolve));
-    if (match) {
-      log.info(
-        `» model: ${match.resolve} (auto-selected${match.preferred ? " — preferred" : ""} curated match)`
-      );
-      log.warning(`» model auto-selected. ${AUTO_SELECT_WARNING}`);
-      return match.resolve;
-    }
-    log.info(
-      `» opencode has ${availableSet.size} models but none match curated aliases — letting OpenCode auto-select`
-    );
-  }
-
-  log.warning(`» no model resolved. letting OpenCode auto-select. ${AUTO_SELECT_WARNING}`);
-  return undefined;
-}
-
 // ── NDJSON event types ─────────────────────────────────────────────────────────
 
 interface OpenCodeInitEvent {
@@ -307,6 +199,20 @@ interface OpenCodeStepFinishEvent {
   [key: string]: unknown;
 }
 
+/**
+ * tool-part state, mirroring opencode's `ToolState` (anomalyco/opencode
+ * `session/message-v2.ts`). error parts carry the reason on `error`,
+ * completed parts on `output` — reading the wrong field is what caused
+ * the silent `(no error message)` log in #662.
+ *
+ * Named `ToolPartState` locally (not `ToolState`) so it doesn't shadow the
+ * action-wide `ToolState` imported above.
+ */
+type ToolPartState =
+  | { status: "pending" | "running"; input?: unknown }
+  | { status: "completed"; input?: unknown; output: string }
+  | { status: "error"; input?: unknown; error: string };
+
 interface OpenCodeToolUseEvent {
   type: "tool_use";
   timestamp?: number;
@@ -315,7 +221,7 @@ interface OpenCodeToolUseEvent {
     id?: string;
     callID?: string;
     tool?: string;
-    state?: { status?: string; input?: unknown; output?: string };
+    state?: ToolPartState;
   };
   [key: string]: unknown;
 }
@@ -324,7 +230,7 @@ interface OpenCodeToolResultEvent {
   type: "tool_result";
   timestamp?: number;
   sessionID?: string;
-  part?: { callID?: string; state?: { status?: string; output?: string } };
+  part?: { callID?: string; state?: ToolPartState };
   tool_id?: string;
   status?: "success" | "error";
   output?: string;
@@ -409,6 +315,7 @@ type RunParams = {
   args: string[];
   cwd: string;
   env: Record<string, string | undefined>;
+  toolState: ToolState;
   todoTracker?: TodoTracker | undefined;
   onActivityTimeout?: (() => void) | undefined;
   onToolUse?: ((event: { toolName: string; input: unknown }) => void) | undefined;
@@ -639,6 +546,21 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
         return;
       }
 
+      // suspend the activity watchdog across the tool call (issue #760).
+      // for `task` tool dispatches the injected plugin already reverbs
+      // child.stdout chunks, so this is mostly defense-in-depth there;
+      // for non-task MCP tools (checkout_pr, etc.) the suspend is the
+      // only thing keeping a multi-minute fetch from tripping the 300s
+      // spawn-level idle timer. gate by part status: bus-envelope
+      // re-dispatches at line 915 fire only on terminal statuses
+      // (`completed`/`error`) and never produce a paired `tool_result`,
+      // so suspending on those would leak the watchdog open until the
+      // 15min auto-resume — exactly the issue #12 zombie-run window.
+      const status = event.part?.state?.status;
+      if (status !== "completed" && status !== "error") {
+        suspendActivity();
+      }
+
       // when the orchestrator dispatches a subagent via the `task` tool, push
       // a label for the upcoming child session so its events are attributable.
       // record BEFORE label lookup: this event's session is the parent (whose
@@ -703,11 +625,9 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
       // status="error" through the same `tool_use` event the CLI's run-loop
       // (and our injected plugin for subagent parts) emits — without this
       // branch the only signal in the user's logs is `» <tool>(...)` with
-      // no indication the call failed. error info lives in `state.output`
-      // (an error string set by the tool layer).
+      // no indication the call failed.
       if (event.part?.state?.status === "error") {
-        const errorMsg = event.part.state.output ?? "(no error message)";
-        log.info(withLabel(label, `» tool call failed: ${errorMsg}`));
+        log.info(withLabel(label, `» tool call failed: ${event.part.state.error}`));
       }
 
       // agent's explicit MCP report_progress takes priority over todo tracking
@@ -722,9 +642,16 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
       }
     },
     tool_result: (event: OpenCodeToolResultEvent) => {
+      resumeActivity();
       const toolId = event.part?.callID || event.tool_id;
-      const status = event.part?.state?.status || event.status || "unknown";
-      const output = event.part?.state?.output || event.output;
+      const state = event.part?.state;
+      const status = state?.status ?? event.status ?? "unknown";
+      const payload =
+        state?.status === "completed"
+          ? state.output
+          : state?.status === "error"
+            ? state.error
+            : event.output;
       const label = eventLabel(event);
 
       timerFor(label).markToolResult();
@@ -743,12 +670,12 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
       if (taskDispatchByCallID.size > 0 || pendingTaskDispatches.length > 0) {
         if (toolId && taskDispatchByCallID.has(toolId)) {
           const dispatch = taskDispatchByCallID.get(toolId);
-          if (dispatch) emitSubagentFinished(dispatch, status, output, "exact");
+          if (dispatch) emitSubagentFinished(dispatch, status, payload, "exact");
         } else {
           const callIDIsKnownNonTask = toolId ? knownNonTaskCallIDs.has(toolId) : false;
           if (!callIDIsKnownNonTask && pendingTaskDispatches.length > 0) {
             const dispatch = pendingTaskDispatches[0]!;
-            emitSubagentFinished(dispatch, status, output, "fifo");
+            emitSubagentFinished(dispatch, status, payload, "fifo");
           }
         }
       }
@@ -765,13 +692,8 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
               `» ${params.label} tool_result${stepContext}: id=${toolId}, status=${status}, duration=${Math.round(toolDuration)}ms`
             )
           );
-          if (output) {
-            log.debug(
-              withLabel(
-                label,
-                `  output: ${typeof output === "string" ? output : JSON.stringify(output)}`
-              )
-            );
+          if (payload) {
+            log.debug(withLabel(label, `  output: ${payload}`));
           }
           if (toolDuration > 5000) {
             log.info(
@@ -784,11 +706,9 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
         }
       }
       if (status === "error") {
-        const errorMsg = typeof output === "string" ? output : JSON.stringify(output);
-        log.info(withLabel(label, `» tool call failed: ${errorMsg}`));
-      } else if (output) {
-        const outputStr = typeof output === "string" ? output : JSON.stringify(output);
-        log.debug(withLabel(label, `tool output: ${outputStr}`));
+        log.info(withLabel(label, `» tool call failed: ${payload ?? "(no error message)"}`));
+      } else if (payload) {
+        log.debug(withLabel(label, `tool output: ${payload}`));
       }
     },
     error: (event: OpenCodeErrorEvent) => {
@@ -928,6 +848,19 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
   let lastProviderError: string | null = null;
   let agentErrorEvent: OpenCodeErrorEvent | null = null;
 
+  // shared with main.ts via toolState. updated in place as events stream and
+  // stderr accumulates so the outer activity-timeout catch sees the same
+  // context the harness's own catch path uses to format `result.error`.
+  // recentStderr is shared by reference; the scalar fields are mirrored on
+  // each update below.
+  const diagnostic: AgentDiagnostic = {
+    label: params.label,
+    recentStderr,
+    lastProviderError: undefined,
+    eventCount: 0,
+  };
+  params.toolState.agentDiagnostic = diagnostic;
+
   // capped accumulator for the agent's narration. used as a post-run fallback
   // when `finalOutput` (the orchestrator's final assistant message) is empty.
   // unbounded `output += text` previously grew to ~1 GiB on multi-lens Reviews
@@ -957,13 +890,15 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
       // wrapper would grow unbounded for multi-lens Reviews and previously
       // crashed the wrapper with RangeError at ~1 GiB. see issue #680.
       retain: "none",
-      // NB: we used to pass `isPausedExternally: isSubagentInFlight` to suspend
-      // the activity timer during subagent dispatches. unnecessary now that
-      // our injected plugin (action/agents/opencodePlugin.ts) re-emits
-      // subagent `message.part.updated` events on opencode's stdout — those
-      // arrive at child.stdout here, fire updateActivity(), and reset
-      // lastActivityTime naturally. verified empirically in PR #634
-      // (~3.3 plugin events/sec during a typical subagent run).
+      // suspend the spawn-level idle watchdog across MCP tool calls (issue
+      // #760). bracketed by suspendActivity()/resumeActivity() in the
+      // tool_use/tool_result handlers above, bounded by
+      // MAX_TOOL_CALL_SUSPENSION_MS in activity.ts. the injected plugin
+      // (action/agents/opencodePlugin.ts) re-emits subagent
+      // `message.part.updated` events on opencode's stdout, so subagent
+      // dispatches keep marking child.stdout activity as well — defense
+      // in depth (verified empirically in PR #634, ~3.3 plugin events/sec).
+      isPausedExternally: isActivitySuspended,
       onStdout: async (chunk) => {
         const text = chunk.toString();
         output.append(text);
@@ -986,6 +921,7 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
           }
 
           eventCount++;
+          diagnostic.eventCount = eventCount;
           log.debug(JSON.stringify(event, null, 2));
 
           const timeSinceLastActivity = getIdleMs();
@@ -1024,10 +960,11 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
         recentStderr.push(trimmed);
         if (recentStderr.length > MAX_STDERR_LINES) recentStderr.shift();
 
-        const providerError = detectProviderError(trimmed);
-        if (providerError) {
-          lastProviderError = providerError;
-          log.info(`» provider error detected (${providerError}): ${trimmed.substring(0, 500)}`);
+        const match = findProviderErrorMatch(trimmed);
+        if (match) {
+          lastProviderError = match.label;
+          diagnostic.lastProviderError = match.label;
+          log.info(`» provider error detected (${match.label}): ${match.excerpt}`);
         } else {
           log.debug(trimmed);
         }
@@ -1158,10 +1095,11 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
         `» recent stderr (last ${Math.min(recentStderr.length, 10)} lines):\n${stderrContext}`
       );
 
+    const body = formatAgentHangBody({ diagnostic, isHang: isActivityTimeout, errorMessage });
     return {
       success: false,
       output: finalOutput || output.toString(),
-      error: `${errorMessage} [${diagnosis}]`,
+      error: body ?? `${errorMessage} [${diagnosis}]`,
       usage: buildUsage(),
     };
   }
@@ -1171,9 +1109,9 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
 
 export const opencode = agent({
   name: "opencode",
-  install: installOpencodeCli,
+  install: installCli,
   run: async (ctx) => {
-    const cliPath = await installOpencodeCli();
+    const cliPath = await installCli();
 
     const rawModel = ctx.payload.proxyModel ?? ctx.resolvedModel ?? autoSelectModel(cliPath);
 
@@ -1225,12 +1163,20 @@ export const opencode = agent({
 
     installBundledSkills({ home: homeEnv.HOME });
 
+    // materialize CODEX_AUTH_JSON (Pullfrog-stored Codex subscription
+    // credential) into the runner's REAL $HOME/.local/share/opencode/auth.json
+    // so OpenCode's CodexAuthPlugin picks it up and routes openai requests
+    // through the ChatGPT subscription instead of needing OPENAI_API_KEY.
+    // see action/utils/codexHome.ts and wiki/codex-auth.md.
+    const codexAuth = installCodexAuth();
+
     // base args shared between initial run and continue runs
     const baseArgs = ["run", "--format", "json", "--print-logs"];
 
     // OPENCODE_PERMISSION has absolute highest precedence (merged after managed/MDM configs).
     // external_directory gates ALL native filesystem tools (Read, Write, Edit, Glob, Grep, etc.)
     // for paths outside the project root. last-match-wins: deny everything, then allow /tmp.
+    // auth.json sits under real $HOME (outside /tmp/*), so deny-default protects it.
     const permissionOverride = JSON.stringify({
       external_directory: { "*": "deny", "/tmp/*": "allow" },
     });
@@ -1244,6 +1190,28 @@ export const opencode = agent({
         process.env.GOOGLE_GENERATIVE_AI_API_KEY || process.env.GEMINI_API_KEY,
     };
 
+    if (codexAuth) {
+      // point OpenCode at the real-home XDG dir so it reads auth.json from
+      // where we wrote it (not the tmpdir-redirected default).
+      env.XDG_DATA_HOME = codexAuth.xdgDataHome;
+      // remove OPENAI_API_KEY so OpenCode's provider merge unambiguously
+      // picks the OAuth path. with both set, the merge order in opencode
+      // makes the effective key ambiguous.
+      delete env.OPENAI_API_KEY;
+      // hand the post-hook everything it needs to detect + persist refresh.
+      // post-hook runs in a fresh node process, so we have to ferry apiToken
+      // explicitly — env is preserved across main/post but our run-context
+      // JWT is computed at runtime and not put in env. see action/entryPost.ts.
+      core.saveState(
+        "codex_writeback",
+        JSON.stringify({
+          apiToken: ctx.apiToken,
+          authPath: codexAuth.authPath,
+          originalRefresh: codexAuth.originalRefresh,
+        })
+      );
+    }
+
     const repoDir = process.cwd();
 
     log.debug(`» starting Pullfrog (OpenCode): ${cliPath} ${baseArgs.join(" ")}`);
@@ -1254,6 +1222,7 @@ export const opencode = agent({
       cliPath,
       cwd: repoDir,
       env,
+      toolState: ctx.toolState,
       todoTracker: ctx.todoTracker,
       onActivityTimeout: ctx.onActivityTimeout,
       onToolUse: ctx.onToolUse,
@@ -1273,9 +1242,10 @@ export const opencode = agent({
       ctx,
       initialResult: result,
       initialUsage: result.usage,
-      reflectionPrompt: ctx.toolState.learningsFilePath
-        ? buildLearningsReflectionPrompt(ctx.toolState.learningsFilePath)
-        : undefined,
+      reflectionPrompt:
+        ctx.toolState.learningsFilePath && shouldRunReflection(ctx.toolState.selectedMode)
+          ? buildLearningsReflectionPrompt(ctx.toolState.learningsFilePath)
+          : undefined,
       resume: async (c) =>
         runOpenCode({
           ...runParams,

agents/opencodeShared.ts

@@ -0,0 +1,144 @@
+// Shared helpers for the OpenCode agent harnesses (`./opencode.ts` v1 and
+// `./opencode_v2.ts` v2). Pure config / model-registry / install glue —
+// nothing here touches the NDJSON event loop, which differs between v1 and v2.
+//
+// Once v1 is deleted post-burn-in this module collapses back into v2; until
+// then it keeps both runners synchronized so a config drift can't make v1 a
+// silently-broken fallback.
+
+import { execFileSync } from "node:child_process";
+import { modelAliases } from "../models.ts";
+import { log } from "../utils/cli.ts";
+import { installFromNpmTarball } from "../utils/install.ts";
+import { getDevDependencyVersion } from "../utils/version.ts";
+import { REVIEWER_AGENT_NAME, REVIEWER_SYSTEM_PROMPT } from "./reviewer.ts";
+import { deriveSubagentModels } from "./subagentModels.ts";
+
+// ── config ─────────────────────────────────────────────────────────────────────
+
+export type OpenCodeConfig = {
+  mcp?: Record<string, unknown>;
+  permission?: Record<string, unknown>;
+  provider?: Record<string, unknown>;
+  agent?: Record<string, unknown>;
+  experimental?: Record<string, unknown>;
+  model?: string;
+  enabled_providers?: string[];
+  [key: string]: unknown;
+};
+
+/**
+ * Build the `provider.google.models[id].options` map that pins every direct-Google
+ * Gemini alias to `thinkingLevel: "high"`. Sourced from the model registry so
+ * adding/renaming a Google alias in `action/models.ts` flows through automatically.
+ */
+export function geminiHighThinkingOverrides(): Record<string, { options: object }> {
+  return Object.fromEntries(
+    modelAliases
+      .filter((a) => a.provider === "google")
+      .map((a) => [
+        a.resolve.replace(/^google\//, ""),
+        { options: { thinkingConfig: { thinkingLevel: "high" } } },
+      ])
+  );
+}
+
+/**
+ * Read-only `reviewfrog` subagent for lens-based review. Non-mutative +
+ * non-recursive — enforced by the system prompt in reviewer.ts.
+ *
+ * Per-subagent `model:` override is driven by the registry in
+ * `action/models.ts` via each alias's `subagentModel` field. Currently wired:
+ * Anthropic opus → sonnet, OpenAI gpt-pro → gpt and gpt → gpt-5.4, Google
+ * gemini-pro → gemini-flash. Other providers inherit (no override).
+ */
+export function buildReviewerAgentConfig(
+  orchestratorModel: string | undefined
+): Record<string, unknown> {
+  const overrides = deriveSubagentModels(orchestratorModel);
+  return {
+    [REVIEWER_AGENT_NAME]: {
+      description:
+        "Read-only review subagent for lens-based code review (correctness, security, billing-subsystem, etc.). " +
+        "Reads only — no writes, no state-changing shell or MCP calls, no nested subagent dispatch.",
+      mode: "subagent",
+      prompt: REVIEWER_SYSTEM_PROMPT,
+      ...(overrides.reviewer !== undefined ? { model: overrides.reviewer } : {}),
+    },
+  };
+}
+
+// ── install ────────────────────────────────────────────────────────────────────
+
+/**
+ * Install the opencode-ai npm tarball and return the path to the executable.
+ *
+ * The bin path differs by version: v1.4.x and earlier shipped `bin/opencode`;
+ * v1.14+ renames the platform-specific binary to `bin/opencode.exe` for every
+ * OS via the postinstall script. Callers pass the binPath that matches their
+ * pinned version so a v1↔v2 swap can't silently install the wrong file.
+ */
+export async function installOpencodeCli(params: { binPath: string }): Promise<string> {
+  return await installFromNpmTarball({
+    packageName: "opencode-ai",
+    version: getDevDependencyVersion("opencode-ai"),
+    executablePath: params.binPath,
+    installDependencies: true,
+  });
+}
+
+// ── model auto-select fallback ──────────────────────────────────────────────────
+//
+// steps 1–2 of model resolution (PULLFROG_MODEL env, slug resolution) happen
+// in resolveModel() in utils/agent.ts before the agent runs. this is step 3:
+// auto-select via `opencode models`.
+
+const AUTO_SELECT_WARNING =
+  "select a model explicitly in the Pullfrog console (https://pullfrog.com/console) to avoid this.";
+
+function getOpenCodeModels(cliPath: string): string[] {
+  try {
+    const output = execFileSync(cliPath, ["models"], {
+      encoding: "utf-8",
+      timeout: 30_000,
+      env: process.env,
+    });
+    return output
+      .split("\n")
+      .map((line) => line.trim())
+      .filter(Boolean);
+  } catch (error) {
+    log.debug(
+      `» failed to run \`opencode models\`: ${error instanceof Error ? error.message : String(error)}`
+    );
+    return [];
+  }
+}
+
+export function autoSelectModel(cliPath: string): string | undefined {
+  const availableModels = getOpenCodeModels(cliPath);
+  const availableSet = new Set(availableModels);
+  if (availableSet.size > 0) {
+    log.debug(`» opencode models (${availableSet.size}): ${availableModels.join(", ")}`);
+    // skip hidden aliases (internal subagent-tier targets like
+    // opencode/gpt-5.4) — they should never surface as a user-facing
+    // orchestrator pick. mirrors the selectable-list filter in
+    // components/ModelSelector.tsx and action/commands/init.ts.
+    const match =
+      modelAliases.find((a) => !a.hidden && a.preferred && availableSet.has(a.resolve)) ??
+      modelAliases.find((a) => !a.hidden && availableSet.has(a.resolve));
+    if (match) {
+      log.info(
+        `» model: ${match.resolve} (auto-selected${match.preferred ? " — preferred" : ""} curated match)`
+      );
+      log.warning(`» model auto-selected. ${AUTO_SELECT_WARNING}`);
+      return match.resolve;
+    }
+    log.info(
+      `» opencode has ${availableSet.size} models but none match curated aliases — letting OpenCode auto-select`
+    );
+  }
+
+  log.warning(`» no model resolved. letting OpenCode auto-select. ${AUTO_SELECT_WARNING}`);
+  return undefined;
+}

agents/postRun.test.ts

@@ -6,6 +6,7 @@ function makeToolState(overrides: Partial<ToolState> = {}): ToolState {
   return {
     progressComment: undefined,
     hadProgressComment: true,
+    prepushFailureCount: 0,
     backgroundProcesses: new Map(),
     usageEntries: [],
     ...overrides,

agents/postRun.ts

@@ -158,7 +158,7 @@ export function buildUnsubmittedReviewPrompt(mode: "Review" | "IncrementalReview
     return [
       `MISSING REVIEW OUTPUT — you selected Review mode but stopped without calling \`create_pull_request_review\`. the user has no visible signal that this run produced anything; the progress comment will be deleted on exit and no review will appear on the PR.`,
       "",
-      "call `create_pull_request_review` now with your aggregated review (body + inline comments). pick the tier per the mode prompt — Review mode has no no-submit exit, so even informational `> [!NOTE]` reviews and `No new issues found.` reviews must be submitted (both use `approved: true`). the first call may error once with a diff-coverage nudge — retry the same call to proceed.",
+      "call `create_pull_request_review` now with your aggregated review (body + inline comments). pick the tier per the mode prompt — Review mode has no no-submit exit, so even informational `> ✅ No new issues found.` reviews must be submitted (with `approved: true`). the first call may error once with a diff-coverage nudge — retry the same call to proceed.",
       "",
       "do NOT stop again until `create_pull_request_review` has been called successfully.",
     ].join("\n");
@@ -243,6 +243,24 @@ export function buildPostRunPrompt(issues: PostRunIssues): string {
   return parts.join("\n\n---\n\n");
 }
 
+/**
+ * modes for which the post-run reflection turn is skipped. reflection costs a
+ * full resume turn (~$0.50-0.80 per run on Opus, mostly cache-write) and only
+ * pays for itself when the run actually produced novel, durable findings.
+ *
+ * `IncrementalReview` is the lowest-novelty mode — it's a tight delta review
+ * against an existing PR with the prior summary already loaded as context.
+ * the agent rarely discovers anything generalizable to next runs, so the
+ * reflection turn is dead weight. initial `Review` still touches fresh PR
+ * territory and benefits; `Build` / `Fix` / `AddressReviews` definitely do.
+ */
+const REFLECTION_SKIP_MODES: ReadonlySet<string> = new Set(["IncrementalReview"]);
+
+export function shouldRunReflection(mode: string | undefined): boolean {
+  if (!mode) return true;
+  return !REFLECTION_SKIP_MODES.has(mode);
+}
+
 /**
  * prompt for a dedicated post-run reflection turn nudging the agent to edit
  * the rolling learnings file if it discovered anything worth persisting.
@@ -261,11 +279,18 @@ export function buildPostRunPrompt(issues: PostRunIssues): string {
  * agent has been writing (issue #619 in pullfrog/app). recurring failure
  * modes the framing pushes back on:
  *  - massive multi-paragraph "bullets" that are really mini-articles
- *  - PR-/review-/commit-/date-anchored facts that decay within weeks
- *  - rediscovery of pullfrog-tool quirks that belong in tool descriptions,
- *    not per-repo learnings
+ *  - facts anchored to moving repo state (PR / review / commit / branch
+ *    refs, dates, version pins, line numbers) that decay within weeks
  *  - sections growing into giant flat lists with no internal structure,
  *    forcing future runs to read kilobytes to find one fact
+ *
+ * single litmus delivered in the prompt: "would a future run on this repo
+ * do its work better because this bullet exists?". tool-quirk workarounds
+ * are explicitly allowed when the agent burned calls discovering the
+ * quirk this run — recording the workaround prevents next run from
+ * repeating the waste. tradeoff: the same quirk gets duplicated across
+ * repos, so when a quirk is fixed upstream in tool descriptions the
+ * per-repo bullets go stale and we have no batch-invalidation path.
  */
 export function buildLearningsReflectionPrompt(filePath: string): string {
   return [
@@ -278,18 +303,16 @@ export function buildLearningsReflectionPrompt(filePath: string): string {
     `- **no section over ~300 lines.** when a section is approaching that, split it: introduce \`### \` subsections grouping related bullets, or hoist a coherent group into a new top-level \`## \` section. granular sections mean future runs read targeted line ranges instead of slurping the whole file. this is the most important hygiene rule on long-lived repos.`,
     `- if you find a flat unstructured list (legacy content from before this format), restructure it: read it, group related bullets, rewrite the file with \`## \` / \`### \` headings around them. don't preserve bad structure — fix it.`,
     "",
-    `bullet hygiene:`,
-    `- one fact per line starting with \`- \`. each bullet is ONE specific durable fact, not a paragraph or essay.`,
-    `- aim for ≤ 240 chars per bullet. longer bullets are almost always mixing multiple facts that should be split, or burying the durable claim under PR-specific context that should be cut.`,
-    `- only add bullets when the finding is high-confidence AND broadly useful AND will still be true in 3+ months. skip speculative, one-off, or "maybe" findings.`,
-    `- prune bullets that are clearly wrong, no longer relevant, or low-signal. a focused, accurate file beats a long stale one. compressing two overlapping bullets into one tighter bullet counts as progress.`,
-    `- deduplicate against existing entries (in any section) — if a bullet covers the same fact, update it in place instead of adding a duplicate.`,
+    `the only test: would a future run on this repo do its work better because this bullet exists? useful for future runs in this repo — prevent wasted tool calls, rabbit holes, and mistakes.`,
     "",
-    `do NOT add bullets for:`,
-    `- pullfrog tool quirks (e.g. "\`shell\` timeout is in milliseconds", "\`git\` args must be a JSON array", "\`create_pull_request_review\` drops out-of-hunk comments", "\`push_branch\` may report timeout when push succeeded"). these are universal across repos and belong in the tool descriptions — flag the gap rather than hoarding the workaround per-repo.`,
-    `- references to specific PR numbers, review IDs, commit SHAs, branch names, or person handles ("PR #595 introduced X", "flagged in review 12345", "as of commit abc123"). repo state changes; these decay into noise within weeks.`,
-    `- dated assertions ("as of May 2026", "currently...", "for now..."). if a fact needs a date to be true, it isn't durable enough to belong here.`,
-    `- play-by-play of what THIS run did. learnings are for the NEXT run, not a retrospective.`,
+    `bullet hygiene:`,
+    `- one fact per line starting with \`- \`, ≤ 240 chars.`,
+    `- only add when high-confidence, broadly useful, evergreen.`,
+    `- prune wrong or low-signal bullets; merge overlaps; dedupe across sections.`,
+    "",
+    `don't anchor facts to repo state that will move: PR / review / commit / branch refs, dates, version pins, line numbers. state the rule directly. if it needs the anchor to be load-bearing, it isn't evergreen.`,
+    "",
+    `tool-quirk bullets are fine when you burned calls discovering the quirk and a future run would repeat them. write the workaround, not the war story.`,
     "",
     `if you have nothing substantively new to add AND the existing entries still look healthy and well-structured, leave the file alone — just reply "done" and stop. silence is a valid outcome.`,
   ].join("\n");

agents/shared.ts

@@ -154,6 +154,13 @@ export interface AgentRunContext {
    */
   onActivityTimeout?: (() => void) | undefined;
   onToolUse?: ((event: AgentToolUseEvent) => void) | undefined;
+  /**
+   * Pullfrog API JWT scoped to this run. agents only need this when they
+   * have to write state back to Pullfrog mid-run (today: opencode.ts uses
+   * it to seed the post-hook's writeback envelope for Codex auth refresh).
+   * empty string when the run wasn't context-resolved (e.g. local dry-runs).
+   */
+  apiToken: string;
 }
 
 export interface Agent {

agents/subagentModels.test.ts

@@ -66,20 +66,23 @@ describe("deriveSubagentModels", () => {
     });
   });
 
-  describe("google (gemini) — pro → flash", () => {
-    it("direct google", () => {
+  describe("google (gemini) — inherit (Pro for both orchestrator and lenses)", () => {
+    // pro → flash was a meaningful capability cliff (Flash missed catastrophic
+    // cross-file bugs the v4 e2e test surfaced); Pro is cost-effective enough
+    // to keep on for lenses too. Google has no in-between tier.
+    it("direct google pro inherits", () => {
       expect(deriveSubagentModels("google/gemini-3.1-pro-preview")).toEqual({
-        reviewer: "google/gemini-3-flash-preview",
+        reviewer: undefined,
       });
     });
-    it("opencode-vendored gemini-pro", () => {
+    it("opencode-vendored gemini-pro inherits", () => {
       expect(deriveSubagentModels("opencode/gemini-3.1-pro")).toEqual({
-        reviewer: "opencode/gemini-3-flash",
+        reviewer: undefined,
       });
     });
-    it("openrouter-google-gemini-pro", () => {
+    it("openrouter gemini-pro inherits", () => {
       expect(deriveSubagentModels("openrouter/google/gemini-3.1-pro-preview")).toEqual({
-        reviewer: "openrouter/google/gemini-3-flash-preview",
+        reviewer: undefined,
       });
     });
     it("flash has no downshift", () => {

agents/subagentRegistration.test.ts

@@ -3,7 +3,8 @@ import { join } from "node:path";
 import { describe, expect, it } from "vitest";
 
 const claudeSource = readFileSync(join(__dirname, "claude.ts"), "utf-8");
-const opencodeSource = readFileSync(join(__dirname, "opencode.ts"), "utf-8");
+const opencodeSharedSource = readFileSync(join(__dirname, "opencodeShared.ts"), "utf-8");
+const opencodeV2Source = readFileSync(join(__dirname, "opencode_v2.ts"), "utf-8");
 
 /**
  * The Claude Code `--agents` JSON and OpenCode `agent` config block are the
@@ -25,16 +26,16 @@ describe("subagent registration source asserts", () => {
     });
   });
 
-  describe("opencode.ts buildReviewerAgentConfig", () => {
+  describe("opencodeShared.ts buildReviewerAgentConfig", () => {
     it("registers reviewfrog with mode: subagent", () => {
-      expect(opencodeSource).toMatch(/\[REVIEWER_AGENT_NAME\]:[^}]*mode:\s*"subagent"/s);
+      expect(opencodeSharedSource).toMatch(/\[REVIEWER_AGENT_NAME\]:[^}]*mode:\s*"subagent"/s);
     });
     it("uses deriveSubagentModels for the reviewer model override", () => {
-      expect(opencodeSource).toMatch(/deriveSubagentModels\(/);
-      expect(opencodeSource).toMatch(/overrides\.reviewer/);
+      expect(opencodeSharedSource).toMatch(/deriveSubagentModels\(/);
+      expect(opencodeSharedSource).toMatch(/overrides\.reviewer/);
     });
-    it("passes orchestrator model to buildReviewerAgentConfig", () => {
-      expect(opencodeSource).toMatch(/buildReviewerAgentConfig\(model\)/);
+    it("v2 runner passes orchestrator model to buildReviewerAgentConfig", () => {
+      expect(opencodeV2Source).toMatch(/buildReviewerAgentConfig\(model\)/);
     });
   });
 });

cli.ts

@@ -1,6 +1,7 @@
 import { basename } from "node:path";
 import arg from "arg";
 import pc from "picocolors";
+import { runCli as runAuthCli } from "./commands/auth.ts";
 import { runCli as runGhaCli } from "./commands/gha.ts";
 import { runCli as runInitCli } from "./commands/init.ts";
 
@@ -13,6 +14,7 @@ function printMainUsage(stream: typeof console.log): void {
   stream(`usage: ${PROG} <command>\n`);
   stream("commands:");
   stream("  init        set up pullfrog on the current repository");
+  stream("  auth        manage provider credentials for the current repository");
   stream("");
   stream("global options:");
   stream("  -h, --help      show help");
@@ -85,6 +87,15 @@ async function run(): Promise<void> {
     return;
   }
 
+  if (command === "auth") {
+    await runAuthCli({
+      args: commandArgs,
+      prog: PROG,
+      showHelp: globalParsed["--help"] === true,
+    });
+    return;
+  }
+
   if (globalParsed["--help"]) {
     printMainUsage(console.log);
     process.exit(0);

commands/_shared.ts

@@ -0,0 +1,229 @@
+// shared helpers used by `init` and `auth` subcommands. these were originally
+// inlined in `init.ts`; pulled out so `auth.ts` can reuse them without
+// duplicating gh-auth/pullfrog-api/secret-save logic.
+
+import { execFileSync } from "node:child_process";
+import * as p from "@clack/prompts";
+import pc from "picocolors";
+
+export const PULLFROG_API_URL = (process.env.PULLFROG_API_URL || "https://pullfrog.com").replace(
+  /\/+$/,
+  ""
+);
+
+// active spinner reference so bail/cancel can stop it before exiting. shared
+// across init/auth subcommands via this module's singleton scope; whichever
+// command starts a spinner sets this so handleCancel/bail can clean up.
+let activeSpin: ReturnType<typeof p.spinner> | null = null;
+
+export function setActiveSpin(spin: ReturnType<typeof p.spinner> | null): void {
+  activeSpin = spin;
+}
+
+export function bail(msg: string): never {
+  if (activeSpin) {
+    activeSpin.stop(pc.red("failed"));
+    activeSpin = null;
+  }
+  p.cancel(msg);
+  process.exit(1);
+}
+
+export function handleCancel<T>(value: T | symbol): asserts value is T {
+  if (p.isCancel(value)) {
+    if (activeSpin) {
+      activeSpin.stop(pc.red("canceled."));
+      activeSpin = null;
+    }
+    p.cancel("canceled.");
+    process.exit(0);
+  }
+}
+
+export function getGhToken(): string {
+  let token: string;
+  try {
+    token = execFileSync("gh", ["auth", "token"], { encoding: "utf-8" }).trim();
+  } catch {
+    bail(
+      `gh cli not found or not authenticated.\n` +
+        `  ${pc.dim("install:")} https://cli.github.com\n` +
+        `  ${pc.dim("then:")}    gh auth login`
+    );
+  }
+  if (!token) {
+    bail(
+      `gh cli returned an empty token. try re-authenticating:\n` +
+        `  ${pc.dim("run:")} gh auth login`
+    );
+  }
+  return token;
+}
+
+export function parseGitRemote(): { owner: string; repo: string } {
+  let url: string;
+  try {
+    url = execFileSync("git", ["remote", "get-url", "origin"], { encoding: "utf-8" }).trim();
+  } catch {
+    bail("not a git repository or no 'origin' remote found.");
+  }
+
+  const match = url.match(/github\.com(?::\d+)?[:/]+([^/]+)\/(.+?)(?:\.git)?(?:\/)?$/);
+  if (!match) bail(`could not parse github owner/repo from remote: ${url}`);
+  return { owner: match[1], repo: match[2] };
+}
+
+// ── Pullfrog API ──
+
+type SecretsApiData = {
+  error?: string;
+  appSlug?: string;
+  installationId?: number | null;
+  repositorySelection?: string | null;
+  isOrg?: boolean;
+  accessible?: boolean;
+  repoSecrets?: string[];
+  orgSecrets?: string[];
+  pullfrogSecrets?: string[];
+  repoStatus?: string | null;
+  repoModel?: string | null;
+  hasRuns?: boolean;
+};
+
+type SecretsInfo = {
+  isOrg: boolean;
+  installationId: number | null;
+  secretsAccessible: boolean;
+  repoSecrets: string[];
+  orgSecrets: string[];
+  pullfrogSecrets: string[];
+  model: string | null;
+  hasRuns: boolean;
+};
+
+type InstallationNotFound = {
+  appSlug: string;
+  installationId: number | null;
+  repositorySelection: "all" | "selected" | null;
+  isOrg: boolean;
+};
+
+type StatusResult =
+  | ({ installed: true } & SecretsInfo)
+  | ({ installed: false } & InstallationNotFound);
+
+type ApiResult<T = Record<string, unknown>> = {
+  ok: boolean;
+  status: number;
+  data: T;
+};
+
+async function pullfrogApi<T = Record<string, unknown>>(ctx: {
+  path: string;
+  token: string;
+  method?: string;
+  body?: Record<string, unknown>;
+}): Promise<ApiResult<T>> {
+  const headers: Record<string, string> = { authorization: `Bearer ${ctx.token}` };
+  if (ctx.body) headers["content-type"] = "application/json";
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 30_000);
+  try {
+    const response = await fetch(`${PULLFROG_API_URL}${ctx.path}`, {
+      method: ctx.method || "GET",
+      headers,
+      body: ctx.body ? JSON.stringify(ctx.body) : null,
+      signal: controller.signal,
+    });
+    const data = (await response.json().catch(() => ({}))) as T;
+    return { ok: response.ok, status: response.status, data };
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+export async function fetchStatus(ctx: {
+  token: string;
+  owner: string;
+  repo: string;
+}): Promise<StatusResult> {
+  const result = await pullfrogApi<SecretsApiData>({
+    path: `/api/cli/secrets?owner=${encodeURIComponent(ctx.owner)}&repo=${encodeURIComponent(ctx.repo)}`,
+    token: ctx.token,
+  });
+
+  if (!result.ok) {
+    const errorMsg = result.data.error || "";
+    if (result.status === 401) bail("invalid or expired github token.");
+    if (result.status === 404) {
+      const sel = result.data.repositorySelection;
+      if (!result.data.appSlug) bail("server did not return appSlug");
+      return {
+        installed: false,
+        appSlug: result.data.appSlug,
+        installationId:
+          typeof result.data.installationId === "number" ? result.data.installationId : null,
+        repositorySelection: sel === "all" || sel === "selected" ? sel : null,
+        isOrg: result.data.isOrg === true,
+      };
+    }
+    bail(errorMsg || `secrets check failed (${result.status})`);
+  }
+
+  return {
+    installed: true,
+    isOrg: result.data.isOrg === true,
+    installationId:
+      typeof result.data.installationId === "number" ? result.data.installationId : null,
+    secretsAccessible: result.data.accessible !== false,
+    repoSecrets: result.data.repoSecrets || [],
+    orgSecrets: result.data.orgSecrets || [],
+    pullfrogSecrets: result.data.pullfrogSecrets || [],
+    model: result.data.repoModel ?? null,
+    hasRuns: result.data.hasRuns === true,
+  };
+}
+
+// ── secret save ──
+
+export type SecretScope = "account" | "repo";
+
+type PullfrogSecretResult = { saved: boolean; error: string };
+
+export async function setPullfrogSecret(ctx: {
+  token: string;
+  owner: string;
+  repo: string;
+  name: string;
+  value: string;
+  scope: SecretScope;
+}): Promise<PullfrogSecretResult> {
+  const result = await pullfrogApi<{ success?: boolean; error?: string }>({
+    path: "/api/cli/secrets",
+    token: ctx.token,
+    method: "POST",
+    body: {
+      owner: ctx.owner,
+      repo: ctx.repo,
+      name: ctx.name,
+      value: ctx.value,
+      scope: ctx.scope,
+    },
+  });
+  if (result.ok && result.data.success === true) {
+    return { saved: true, error: "" };
+  }
+  return { saved: false, error: result.data.error || `api returned ${result.status}` };
+}
+
+export async function promptScope(ctx: { owner: string; repo: string }): Promise<SecretScope> {
+  const scope = await p.select<SecretScope>({
+    message: "secret scope",
+    options: [
+      { value: "account", label: `${ctx.owner} organization`, hint: "shared across repos" },
+      { value: "repo", label: `${ctx.owner}/${ctx.repo} only` },
+    ],
+  });
+  handleCancel(scope);
+  return scope;
+}

commands/auth.ts

@@ -0,0 +1,324 @@
+// `pullfrog auth <provider>` — manage credentials for a configured repo
+// without going through the full `init` flow. currently supports:
+//
+//   pullfrog auth codex   mint a Codex subscription credential and save it
+//                         as the `CODEX_AUTH_JSON` Pullfrog secret
+//
+// the `codex` subcommand runs `codex login --device-auth` against an
+// isolated `CODEX_HOME` (so the user's existing ~/.codex/auth.json is never
+// touched), validates the resulting auth.json, and posts it to the Pullfrog
+// secrets API. used both for first-time setup of a Codex subscription on a
+// repo and for rotating a stale credential.
+
+import { spawn } from "node:child_process";
+import * as p from "@clack/prompts";
+import arg from "arg";
+import pc from "picocolors";
+import { mintCodexAuth, refreshCodexAuth } from "../utils/codexAuth.ts";
+import {
+  bail,
+  fetchStatus,
+  getGhToken,
+  handleCancel,
+  PULLFROG_API_URL,
+  parseGitRemote,
+  promptScope,
+  setActiveSpin,
+  setPullfrogSecret,
+} from "./_shared.ts";
+
+const CODEX_AUTH_SECRET = "CODEX_AUTH_JSON";
+
+/** strip CSI ANSI escapes (color, cursor) from a string so callers can re-style
+ * the visible text without inheriting the source's formatting. covers what
+ * Codex emits during device auth (mostly `\x1b[<digits>m` color codes).
+ */
+function stripAnsi(s: string): string {
+  // biome-ignore lint/suspicious/noControlCharactersInRegex: ANSI escapes are control chars by design
+  return s.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
+}
+
+/** matches the Codex device-auth verification URL printed by `codex login
+ * --device-auth`. captures the full URL (with query string) up to whitespace.
+ */
+const CODEX_DEVICE_URL_RE = /https:\/\/auth\.openai\.com\/codex\/device\S*/;
+
+/** best-effort cross-platform "open URL in default browser". swallows
+ * spawn errors and non-zero exits — the user can always copy-paste the URL
+ * Codex already printed. on Linux, falls back to `wslview` when `xdg-open`
+ * is missing (covers WSL where xdg-open isn't installed by default).
+ */
+function openInBrowser(url: string): void {
+  const platform = process.platform;
+  let cmd: string;
+  let args: string[];
+  if (platform === "darwin") {
+    cmd = "open";
+    args = [url];
+  } else if (platform === "win32") {
+    // `start` is a cmd.exe builtin. the empty "" is the window title
+    // (required when the next argument is quoted, which happens for
+    // URLs with `&`).
+    cmd = "cmd.exe";
+    args = ["/c", "start", "", url];
+  } else {
+    cmd = "xdg-open";
+    args = [url];
+  }
+  const child = spawn(cmd, args, { stdio: "ignore", detached: true });
+  child.on("error", () => {
+    if (platform !== "linux") return;
+    const fallback = spawn("wslview", [url], { stdio: "ignore", detached: true });
+    fallback.on("error", () => {});
+    fallback.unref();
+  });
+  child.unref();
+}
+
+interface AuthCliParams {
+  args: string[];
+  prog: string;
+  showHelp?: boolean;
+}
+
+function printAuthUsage(params: { stream: typeof console.log; prog: string }): void {
+  params.stream(`usage: ${params.prog} auth <provider>\n`);
+  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("");
+  params.stream("options:");
+  params.stream("  -h, --help   show help");
+}
+
+function printCodexUsage(params: { stream: typeof console.log; prog: string }): void {
+  params.stream(`usage: ${params.prog} auth codex [options]\n`);
+  params.stream("mint a Codex subscription credential and save it as CODEX_AUTH_JSON.");
+  params.stream("");
+  params.stream("options:");
+  params.stream("  -h, --help   show help");
+}
+
+export async function runCli(params: AuthCliParams): Promise<void> {
+  // route `auth --help` (no subcommand) to top-level usage. when the user
+  // passes `auth codex --help`, we leave the flag in the rest args so the
+  // subcommand's own parser handles it.
+  const firstArg = params.args[0];
+  const helpAtTopLevel =
+    params.showHelp ||
+    params.args.length === 0 ||
+    (params.args.length === 1 && (firstArg === "--help" || firstArg === "-h"));
+  if (helpAtTopLevel) {
+    printAuthUsage({ stream: console.log, prog: params.prog });
+    return;
+  }
+
+  const subcommand = firstArg;
+  const rest = params.args.slice(1);
+
+  if (subcommand === "codex") {
+    await runCodex({ args: rest, prog: params.prog });
+    return;
+  }
+
+  console.error(`unknown auth provider: ${pc.bold(subcommand)}\n`);
+  printAuthUsage({ stream: console.error, prog: params.prog });
+  process.exit(1);
+}
+
+interface CodexCliParams {
+  args: string[];
+  prog: string;
+}
+
+function parseCodexArgs(args: string[]) {
+  return arg(
+    {
+      "--help": Boolean,
+      "-h": "--help",
+    },
+    { argv: args }
+  );
+}
+
+async function runCodex(params: CodexCliParams): Promise<void> {
+  let parsed: ReturnType<typeof parseCodexArgs>;
+  try {
+    parsed = parseCodexArgs(params.args);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`${message}\n`);
+    printCodexUsage({ stream: console.error, prog: params.prog });
+    process.exit(1);
+  }
+
+  if (parsed["--help"]) {
+    printCodexUsage({ stream: console.log, prog: params.prog });
+    return;
+  }
+
+  await runCodexAuth();
+}
+
+async function runCodexAuth(): Promise<void> {
+  p.intro(pc.bgGreen(pc.black(" pullfrog auth codex ")));
+
+  const spin = p.spinner();
+  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 ${pc.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(pc.red("pullfrog app not installed on this repo"));
+      bail(
+        `install pullfrog on ${pc.bold(`${remote.owner}/${remote.repo}`)} before configuring auth.\n` +
+          `  ${pc.dim("run:")} ${pc.cyan(`npx pullfrog init`)}`
+      );
+    }
+    spin.stop(`pullfrog app is installed on ${pc.cyan(`@${remote.owner}`)}`);
+
+    if (status.pullfrogSecrets.includes(CODEX_AUTH_SECRET)) {
+      const overwrite = await p.select({
+        message: `${pc.cyan(CODEX_AUTH_SECRET)} is already configured — overwrite?`,
+        options: [
+          { value: true, label: "overwrite", hint: "rotate to a freshly minted credential" },
+          { value: false, label: "cancel" },
+        ],
+      });
+      handleCancel(overwrite);
+      if (!overwrite) {
+        p.cancel("canceled.");
+        return;
+      }
+    }
+
+    // user-owned repos can only ever be "account" (Pullfrog has no per-repo
+    // store for user accounts), so we never bother prompting. on org-owned
+    // repos, prompt interactively — matches `init`'s behavior.
+    const scope = status.isOrg
+      ? await promptScope({ owner: remote.owner, repo: remote.repo })
+      : "account";
+
+    p.log.info(
+      [
+        `signing in via Codex device authorization. open the URL Codex prints`,
+        `below, enter the one-time code, and approve in your browser.`,
+        ``,
+        `${pc.dim("note:")} if your ChatGPT account doesn't have device-code auth enabled,`,
+        `Codex will exit early. enable it at ${pc.cyan(`https://chatgpt.com/#settings/Security`)}`,
+        `then re-run ${pc.cyan(`${process.env.PULLFROG_BIN_NAME || "pullfrog"} auth codex`)}.`,
+      ].join("\n")
+    );
+
+    // tracks the most recent exit so the retry prompt can tell the user
+    // *why* no auth.json was written (timeout vs. early-exit).
+    let lastTimedOut = false;
+    // gate so we don't re-launch the browser if Codex prints the URL
+    // more than once (e.g. on a retry attempt within the same flow).
+    let hasOpenedDeviceUrl = false;
+    const auth = await mintCodexAuth({
+      childStdio: "pipe",
+      onChildLine: (line) => {
+        // dim Codex's own colored output (URL/code in cyan, boilerplate in
+        // gray) so the user reads it as sub-process noise, not Pullfrog's
+        // own prompts. the rail char matches @clack/prompts so the column
+        // reads as one continuous flow.
+        const stripped = stripAnsi(line);
+        process.stdout.write(`${pc.gray(p.S_BAR)}  ${pc.dim(stripped)}\n`);
+        if (hasOpenedDeviceUrl) return;
+        const match = stripped.match(CODEX_DEVICE_URL_RE);
+        if (!match) return;
+        hasOpenedDeviceUrl = true;
+        const url = match[0];
+        openInBrowser(url);
+        process.stdout.write(
+          `${pc.gray(p.S_BAR)}  ${pc.dim(`» opened ${url} in browser (paste manually if it didn't open)`)}\n`
+        );
+      },
+      onProgress: (event) => {
+        if (event.kind === "start") {
+          lastTimedOut = false;
+          if (event.attempt > 1) p.log.info(`retry attempt ${event.attempt}`);
+          // shell-prompt style header so the user sees what Pullfrog is
+          // about to spawn, with the rail to keep the visual column.
+          process.stdout.write(`${pc.gray(p.S_BAR)}\n`);
+          process.stdout.write(`${pc.gray(p.S_BAR)}  $ codex login --device-auth\n`);
+        }
+        if (event.kind === "exit") {
+          if (event.timedOut) lastTimedOut = true;
+          // trailing blank rail so the next clack prompt isn't crammed
+          // against the last codex output line.
+          process.stdout.write(`${pc.gray(p.S_BAR)}\n`);
+        }
+      },
+      shouldRetry: async () => {
+        const message = lastTimedOut
+          ? "device authorization timed out — retry?"
+          : "no auth.json was written — retry?";
+        const retry = await p.select({
+          message,
+          options: [
+            { value: true, label: "retry", hint: "after enabling device-code auth" },
+            { value: false, label: "cancel" },
+          ],
+        });
+        handleCancel(retry);
+        return retry;
+      },
+    });
+
+    // eager refresh: bump the OAuth chain once before persisting so the
+    // saved token is one Pullfrog has used. otherwise the user's laptop's
+    // codex CLI could refresh first and strand our copy.
+    spin.start("refreshing token");
+    let savable: typeof auth;
+    try {
+      savable = await refreshCodexAuth(auth);
+      spin.stop("refreshed");
+    } catch (err) {
+      spin.stop(pc.yellow("refresh failed — saving minted token as-is"));
+      p.log.warn(err instanceof Error ? err.message : String(err));
+      savable = auth;
+    }
+
+    spin.start(`saving ${pc.cyan(CODEX_AUTH_SECRET)} to Pullfrog`);
+    const result = await setPullfrogSecret({
+      token,
+      owner: remote.owner,
+      repo: remote.repo,
+      name: CODEX_AUTH_SECRET,
+      value: savable.json,
+      scope,
+    });
+    if (!result.saved) {
+      spin.stop(pc.red("could not save secret"));
+      p.log.warn(
+        `${result.error}\n  ${pc.dim("set it manually at:")} ${PULLFROG_API_URL}/console/${remote.owner}`
+      );
+      process.exit(1);
+    }
+    spin.stop(`saved ${pc.cyan(CODEX_AUTH_SECRET)} to Pullfrog (${scope})`);
+
+    setActiveSpin(null);
+    p.outro("done.");
+  } catch (error) {
+    // mirror what `bail` does: stop the spinner with a red "failed" glyph
+    // before clearing it, otherwise an in-flight spinner keeps animating
+    // above the error message we're about to print.
+    spin.stop(pc.red("failed"));
+    setActiveSpin(null);
+    const message = error instanceof Error ? error.message : String(error);
+    p.log.error(message);
+    process.exit(1);
+  }
+}

docker-entrypoint.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+# entrypoint for the pullfrog GHA-like container (see Dockerfile).
+#
+# - remaps `testuser` to the host uid/gid so bind-mounted files keep correct
+#   ownership after writes inside the container
+# - on linux hosts, copies host ssh keys into testuser's $HOME (darwin hosts
+#   forward the ssh-agent socket instead, no copy needed)
+# - installs action workspace deps (volume-cached, ~1.5s warm)
+# - exec's the requested command as testuser; argv is preserved (no nested
+#   `bash -c`, no shell quoting hazards)
+set -euo pipefail
+
+HOST_UID="${HOST_UID:-1000}"
+HOST_GID="${HOST_GID:-1000}"
+
+if [ "$HOST_UID" != "1000" ] || [ "$HOST_GID" != "1000" ]; then
+    groupmod -g "$HOST_GID" testuser 2>/dev/null || true
+    usermod -u "$HOST_UID" -g "$HOST_GID" testuser 2>/dev/null || true
+    # chown top-level dirs only — recursive chown would fail on `:ro` bind
+    # mounts (e.g. macOS known_hosts mounted directly into /tmp/home/.ssh).
+    chown "$HOST_UID:$HOST_GID" /tmp/home /tmp/home/.config /tmp/home/.cache 2>/dev/null || true
+    chown "$HOST_UID:$HOST_GID" /app /app/action /app/action/node_modules 2>/dev/null || true
+fi
+
+# linux hosts: copy host ssh keys into testuser's $HOME (we own this dir,
+# safe to chown). darwin hosts forward the ssh-agent socket instead and
+# bind-mount known_hosts read-only — nothing to do here.
+if [ -d /tmp/.ssh-host ]; then
+    mkdir -p /tmp/home/.ssh
+    cp /tmp/.ssh-host/id_* /tmp/home/.ssh/ 2>/dev/null || true
+    chmod 600 /tmp/home/.ssh/id_* 2>/dev/null || true
+    ssh-keyscan -t ed25519,rsa github.com >> /tmp/home/.ssh/known_hosts 2>/dev/null || true
+    chmod 644 /tmp/home/.ssh/known_hosts 2>/dev/null || true
+    chown -R "$HOST_UID:$HOST_GID" /tmp/home/.ssh 2>/dev/null || true
+    # set GIT_SSH_COMMAND if any private key got copied. don't pin a
+    # specific key with -i — let ssh pick whatever's in /tmp/home/.ssh
+    # (covers id_rsa, id_ed25519, id_ecdsa, etc.).
+    if ls /tmp/home/.ssh/id_* 2>/dev/null | grep -qv '\.pub$'; then
+        export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/tmp/home/.ssh/known_hosts -o StrictHostKeyChecking=no"
+    fi
+fi
+
+# warm the volume-cached node_modules. frozen-lockfile + ignore-scripts keeps
+# this idempotent and fast (~1.5s when nothing changed).
+#
+# the lockfile lives IN the shared node_modules volume so concurrent
+# `pnpm docker` invocations (e.g. `pnpm play:docker` in one terminal and
+# `pnpm runtest:docker` in another) serialize their install instead of racing.
+# `flock -w 120` waits up to 2min before giving up — well under any
+# real-world install time but short enough to surface true deadlocks.
+mkdir -p /app/action/node_modules
+flock -w 120 /app/action/node_modules/.gha-install.lock \
+    sudo -u testuser -E env HOME=/tmp/home \
+        corepack pnpm install --frozen-lockfile --ignore-scripts >/dev/null
+
+# `--shell` drops into an interactive bash for debugging the container.
+if [ "${1:-}" = "--shell" ]; then
+    exec sudo -u testuser -E env HOME=/tmp/home bash
+fi
+
+# exec the command as testuser, preserving env. argv passes through unchanged
+# — no `bash -c` nesting, no quoting required by callers.
+exec sudo -u testuser -E env HOME=/tmp/home "$@"

docker.ts

@@ -0,0 +1,532 @@
+// run any node script inside the pullfrog local docker container that
+// mocks the GHA `ubuntu-24.04` runner environment. NOT a real GitHub
+// Actions runner — for the real thing, see `.github/workflows/*.yml`
+// and `action/commands/gha.ts` (the action's GHA entry point).
+//
+// usage:
+//   pnpm docker <script> [args…]    # run script in container
+//   pnpm docker --shell             # interactive bash (requires TTY)
+//   pnpm docker --build [--no-cache] # force-rebuild image
+//   pnpm docker --clean             # prune orphan images/volumes
+//   pnpm docker --doctor            # versions of every baked tool
+//
+// the action's two main entrypoints default to the host (fast iteration).
+// `:docker` suffix wraps this script:
+//   pnpm play [args…]               # host (this is the fast default)
+//   pnpm play:docker [args…]        # === pnpm docker play.ts [args…]
+//   pnpm runtest [filters…]         # host
+//   pnpm runtest:docker [filters…]  # === pnpm docker test/run.ts [filters…]
+//
+// the container is a baked ubuntu:24.04 image (see Dockerfile) with the
+// same toolset as GHA `ubuntu-24.04` runners. host env passes through
+// verbatim — no allowlist. multi-line values (RSA keys) handled via -e
+// fallback; everything else flows through `--env-file` for cleanliness.
+//
+// host services are reachable at `host.docker.internal:<port>` (works on
+// both linux and macOS — see --add-host below).
+//
+// rebuild is content-hash gated on Dockerfile + docker-entrypoint.sh.
+//
+// design rationale + gaps: wiki/docker.md.
+import { spawnSync } from "node:child_process";
+import { createHash } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { platform, tmpdir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { config } from "dotenv";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const actionDir = __dirname;
+const repoRoot = join(actionDir, "..");
+
+config({ path: join(actionDir, ".env") });
+config({ path: join(repoRoot, ".env") });
+
+// host env vars that would actively conflict with the container's own
+// configuration (paths, identity, shell, and outer-CI workflow-run identifiers
+// that don't apply to whatever repo the harness is acting against). everything
+// else passes through.
+const HOST_ONLY_VARS = new Set([
+  // paths / identity / shell — would clobber the container's testuser setup
+  "PATH",
+  "HOME",
+  "USER",
+  "LOGNAME",
+  "SHELL",
+  "PWD",
+  "OLDPWD",
+  "TMPDIR",
+  "TMP",
+  "TEMP",
+  "DOCKER_HOST",
+  "DOCKER_CONFIG",
+  "_",
+  "SHLVL",
+  "PS1",
+  "PS2",
+  "TERM_PROGRAM",
+  "TERM_PROGRAM_VERSION",
+  "TERM_SESSION_ID",
+  "__CF_USER_TEXT_ENCODING",
+  "XPC_SERVICE_NAME",
+  "XPC_FLAGS",
+  "Apple_PubSub_Socket_Render",
+  "COMMAND_MODE",
+  "COLORTERM",
+  "ITERM_PROFILE",
+  "ITERM_SESSION_ID",
+  // outer-CI workflow-run identifiers — when the test suite runs inside
+  // pullfrog/app's CI, these refer to pullfrog/app's run, NOT the test repo
+  // the harness is acting against (e.g. pullfrog/test-repo). Anything inside
+  // the action that uses them as keys to look up state on the test repo (most
+  // notably `resolveRun()`'s `actions.listJobsForWorkflowRun(...)` call) will
+  // 404. Filtering them here means the action sees them as undefined and
+  // skips the lookup, instead of misdirecting it. `GITHUB_REPOSITORY` and
+  // `GITHUB_TOKEN` are NOT filtered — those are genuinely needed inside.
+  "GITHUB_RUN_ID",
+  "GITHUB_RUN_NUMBER",
+  "GITHUB_RUN_ATTEMPT",
+  "GITHUB_JOB",
+  "GITHUB_WORKFLOW",
+  "GITHUB_ACTION",
+  "GITHUB_REF",
+  "GITHUB_SHA",
+  "GITHUB_HEAD_REF",
+  "GITHUB_BASE_REF",
+  "GITHUB_TRIGGERING_ACTOR",
+]);
+
+type Args = {
+  forceBuild: boolean;
+  noCache: boolean;
+  shell: boolean;
+  clean: boolean;
+  doctor: boolean;
+  passthrough: string[];
+};
+
+/**
+ * parses docker-level flags up to (but not including) the first positional
+ * argument. anything after the first positional, or after a literal `--`,
+ * passes through verbatim to the inner script. this prevents
+ * `pnpm docker test/run.ts --build` from intercepting `--build` as a
+ * docker flag.
+ */
+function parseArgs(argv: string[]): Args {
+  const out: Args = {
+    forceBuild: false,
+    noCache: false,
+    shell: false,
+    clean: false,
+    doctor: false,
+    passthrough: [],
+  };
+  let i = 0;
+  while (i < argv.length) {
+    const a = argv[i];
+    if (a === "--") {
+      out.passthrough.push(...argv.slice(i + 1));
+      return out;
+    }
+    if (a === "--build") out.forceBuild = true;
+    else if (a === "--no-cache") {
+      out.forceBuild = true;
+      out.noCache = true;
+    } else if (a === "--shell") out.shell = true;
+    else if (a === "--clean") out.clean = true;
+    else if (a === "--doctor") out.doctor = true;
+    else if (a === "--help" || a === "-h") {
+      showHelp();
+      process.exit(0);
+    } else {
+      // first positional — script name and everything after passes through.
+      out.passthrough.push(...argv.slice(i));
+      return out;
+    }
+    i++;
+  }
+  return out;
+}
+
+function showHelp(): void {
+  process.stdout.write(`Usage: pnpm docker <script> [args…]
+       pnpm docker --shell
+       pnpm docker --build [--no-cache]
+       pnpm docker --clean
+       pnpm docker --doctor
+
+Run a node script inside the pullfrog local docker container that mocks
+the GHA ubuntu-24.04 runner toolset (gh, jq, python3, sudo, +
+build-essential / wget / xz / file). Host env passes through verbatim.
+The host is reachable from inside the container at host.docker.internal
+(useful for scripts that hit your local dev server).
+
+The action's two main entrypoints have host (fast) and docker variants:
+  pnpm play [args…]               # host — the fast default
+  pnpm play:docker [args…]        # === pnpm docker play.ts [args…]
+  pnpm runtest [filters…]         # host
+  pnpm runtest:docker [filters…]  # === pnpm docker test/run.ts [filters…]
+
+Options:
+  --build      rebuild the current image (otherwise rebuilt automatically
+               when Dockerfile or docker-entrypoint.sh content changes).
+               on its own, builds and exits.
+  --no-cache   pair with --build to also bust docker's layer cache;
+               useful when an apt mirror or base image changed.
+  --shell      drop into an interactive bash inside the container.
+               requires a TTY.
+  --clean      prune orphaned pullfrog-docker:* images and node_modules
+               volumes whose hash doesn't match the current Dockerfile.
+  --doctor     print version info for tools inside the container (node,
+               pnpm, gh, jq, git, python3, ssh, …). useful for diagnosing
+               "works in CI fails locally" or vice versa.
+  -h, --help   show this message.
+
+Pass-through:
+  Anything after the first positional argument (or after a literal \`--\`)
+  goes to the inner script verbatim. so \`pnpm docker test/run.ts --build\`
+  passes \`--build\` to test/run.ts, not to docker.
+
+Examples:
+  pnpm docker play.ts
+  pnpm docker play.ts --raw '{"prompt":"hi"}'
+  pnpm docker test/run.ts smoke
+  pnpm docker --shell
+  pnpm docker --build              # build image, then exit
+  pnpm docker --build --no-cache   # rebuild from scratch
+  pnpm docker --clean              # reclaim disk from old image hashes
+  pnpm docker --doctor             # fidelity audit
+`);
+}
+
+function ensureDocker(): void {
+  if (platform() === "win32") {
+    fail("pnpm docker is not supported on native windows. use wsl2.");
+  }
+  const probe = spawnSync("docker", ["info"], { stdio: "ignore" });
+  if (probe.status !== 0) {
+    fail("docker is not running. start docker desktop and retry.");
+  }
+}
+
+function fail(msg: string): never {
+  process.stderr.write(`error: ${msg}\n`);
+  process.exit(1);
+}
+
+type ImageRef = { tag: string; volumeName: string };
+
+function imageRefFor(ctx: { dockerfile: string; entrypoint: string }): ImageRef {
+  const hash = createHash("sha256")
+    .update(readFileSync(ctx.dockerfile))
+    .update(readFileSync(ctx.entrypoint))
+    .digest("hex")
+    .slice(0, 12);
+  return {
+    tag: `pullfrog-docker:${hash}`,
+    // version the volume by image hash so a stale node_modules cache from
+    // an old image (e.g. different node major) can't poison a new image.
+    volumeName: `pullfrog-docker-node-modules-${hash}`,
+  };
+}
+
+/**
+ * remove pullfrog-docker:* images and pullfrog-docker-node-modules-* volumes
+ * whose hash doesn't match the current Dockerfile + entrypoint. each
+ * Dockerfile/entrypoint edit creates a fresh hash and orphans the prior
+ * pair; without periodic cleanup these accumulate (~600MB image + ~200MB
+ * node_modules each).
+ */
+function cleanOrphans(currentRef: ImageRef): void {
+  const imgList = spawnSync("docker", ["image", "ls", "--format", "{{.Repository}}:{{.Tag}}"], {
+    encoding: "utf8",
+  });
+  const images = (imgList.stdout ?? "")
+    .split("\n")
+    .filter((s) => s.startsWith("pullfrog-docker:") && s !== currentRef.tag);
+  if (images.length > 0) {
+    process.stderr.write(`» removing ${images.length} orphan image(s): ${images.join(", ")}\n`);
+    spawnSync("docker", ["image", "rm", "-f", ...images], { stdio: "inherit" });
+  }
+  const volList = spawnSync("docker", ["volume", "ls", "-q"], { encoding: "utf8" });
+  const volumes = (volList.stdout ?? "")
+    .split("\n")
+    .filter((s) => s.startsWith("pullfrog-docker-node-modules-") && s !== currentRef.volumeName);
+  if (volumes.length > 0) {
+    process.stderr.write(`» removing ${volumes.length} orphan volume(s): ${volumes.join(", ")}\n`);
+    spawnSync("docker", ["volume", "rm", ...volumes], { stdio: "inherit" });
+  }
+  if (images.length === 0 && volumes.length === 0) {
+    process.stderr.write("» no orphans to clean (all matching current image hash)\n");
+  }
+}
+
+function buildImageIfNeeded(ctx: {
+  ref: ImageRef;
+  force: boolean;
+  noCache: boolean;
+  dockerfile: string;
+}): void {
+  if (!ctx.force) {
+    const inspect = spawnSync("docker", ["image", "inspect", ctx.ref.tag], { stdio: "ignore" });
+    if (inspect.status === 0) return;
+  }
+  process.stderr.write(
+    `» building ${ctx.ref.tag}${ctx.noCache ? " (--no-cache)" : ""} (one-time, ~30-60s)…\n`
+  );
+  const buildArgs = ["build", "-t", ctx.ref.tag, "-f", ctx.dockerfile];
+  if (ctx.noCache) buildArgs.push("--no-cache");
+  buildArgs.push(actionDir);
+  const build = spawnSync("docker", buildArgs, { stdio: "inherit" });
+  if (build.status !== 0) {
+    fail("image build failed");
+  }
+}
+
+/**
+ * print versions of every tool we expect to be available, so contributors
+ * can sanity-check fidelity with the GHA `ubuntu-24.04` runner when a test
+ * passes locally but fails in CI (or vice versa).
+ */
+function runDoctor(ref: ImageRef): void {
+  // multi-line bash script; spawnSync passes the whole thing as one argv
+  // entry so there's no nested-shell quoting to worry about, and `do` is
+  // not followed by a stray semicolon.
+  const script = `set +e
+echo '--- container ---'
+grep -E '^(NAME|VERSION)=' /etc/os-release
+echo "arch=$(uname -m)"
+
+echo
+echo '--- runtimes ---'
+echo "node $(node --version)"
+if cd /app/action 2>/dev/null; then
+  echo "pnpm $(corepack pnpm --version)  (corepack-resolved from packageManager)"
+else
+  echo "pnpm $(pnpm --version)  (system fallback — /app/action not mounted?)"
+fi
+python3 --version
+
+echo
+echo '--- tools ---'
+for t in gh jq git ssh curl wget tar gzip xz unzip file make gcc g++ sudo unshare awk sed grep find xargs; do
+  if ! command -v "$t" >/dev/null 2>&1; then
+    printf '  %-10s MISSING\\n' "$t"
+    continue
+  fi
+  case "$t" in
+    ssh|unzip) v=$("$t" -V 2>&1 | head -1) ;;
+    *) v=$("$t" --version 2>&1 | head -1) ;;
+  esac
+  printf '  %-10s %s\\n' "$t" "$v"
+done
+
+echo
+echo '--- env ---'
+echo "CI=$CI HOME=$HOME TMPDIR=$TMPDIR"
+echo "doctor runs as: $(whoami) (uid=$(id -u) gid=$(id -g))"
+echo "tests run as:   testuser (uid remapped to host uid at entrypoint)"
+echo "host.docker.internal -> $(getent hosts host.docker.internal | awk '{print $1}' || echo UNRESOLVED)"
+`;
+  const result = spawnSync(
+    "docker",
+    [
+      "run",
+      "--rm",
+      "-v",
+      `${actionDir}:/app/action:cached`,
+      "--add-host=host.docker.internal:host-gateway",
+      "--entrypoint",
+      "/bin/bash",
+      ref.tag,
+      "-c",
+      script,
+    ],
+    { stdio: "inherit" }
+  );
+  process.exit(result.status ?? 1);
+}
+
+function volumeExists(name: string): boolean {
+  return spawnSync("docker", ["volume", "inspect", name], { stdio: "ignore" }).status === 0;
+}
+
+function initVolumeOwnership(ctx: { ref: ImageRef; uid: number; gid: number }): void {
+  // a fresh named volume is owned by root; chown once on creation. on warm
+  // runs the volume already has the right ownership and `docker run … chown`
+  // is sub-second pure overhead — skip it.
+  if (volumeExists(ctx.ref.volumeName)) return;
+  spawnSync(
+    "docker",
+    [
+      "run",
+      "--rm",
+      "--entrypoint",
+      "chown",
+      "-v",
+      `${ctx.ref.volumeName}:/app/action/node_modules`,
+      ctx.ref.tag,
+      "-R",
+      `${ctx.uid}:${ctx.gid}`,
+      "/app/action/node_modules",
+    ],
+    { stdio: "ignore" }
+  );
+}
+
+type EnvParts = { envFile: string; multiLineFlags: string[] };
+
+function buildEnvParts(env: NodeJS.ProcessEnv): EnvParts {
+  const dir = join(tmpdir(), "pullfrog-docker");
+  mkdirSync(dir, { recursive: true });
+  const envFile = join(dir, `env-${process.pid}-${Date.now()}.list`);
+  const lines: string[] = [];
+  const multiLineFlags: string[] = [];
+  for (const key of Object.keys(env)) {
+    if (HOST_ONLY_VARS.has(key)) continue;
+    const value = env[key];
+    if (value === undefined) continue;
+    // docker --env-file is line-oriented and does not support multi-line
+    // values. fall back to -e for those (RSA keys, multi-line PEMs, etc.).
+    if (value.includes("\n") || value.includes("\r")) {
+      multiLineFlags.push("-e", `${key}=${value}`);
+    } else {
+      lines.push(`${key}=${value}`);
+    }
+  }
+  writeFileSync(envFile, `${lines.join("\n")}\n`, { mode: 0o600 });
+  return { envFile, multiLineFlags };
+}
+
+function buildSshFlags(home: string | undefined): string[] {
+  const flags: string[] = [];
+  if (!home) return flags;
+  if (platform() === "darwin") {
+    const knownHosts = join(home, ".ssh", "known_hosts");
+    if (existsSync(knownHosts)) {
+      flags.push("-v", `${knownHosts}:/tmp/home/.ssh/known_hosts:ro`);
+    }
+    flags.push(
+      "-v",
+      "/run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock",
+      "-e",
+      "SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock"
+    );
+  } else {
+    const sshDir = join(home, ".ssh");
+    if (existsSync(sshDir)) {
+      flags.push("-v", `${sshDir}:/tmp/.ssh-host:ro`);
+    }
+  }
+  return flags;
+}
+
+function main(): void {
+  const args = parseArgs(process.argv.slice(2));
+  ensureDocker();
+
+  const dockerfile = join(actionDir, "Dockerfile");
+  const entrypoint = join(actionDir, "docker-entrypoint.sh");
+  const ref = imageRefFor({ dockerfile, entrypoint });
+
+  if (args.clean) {
+    cleanOrphans(ref);
+    if (!args.shell && !args.doctor && args.passthrough.length === 0 && !args.forceBuild) {
+      process.exit(0);
+    }
+  }
+
+  buildImageIfNeeded({ ref, force: args.forceBuild, noCache: args.noCache, dockerfile });
+
+  if (args.doctor) {
+    runDoctor(ref);
+    // runDoctor exits; unreachable.
+  }
+
+  // standalone `--build`: image's done, nothing to run.
+  if (!args.shell && args.passthrough.length === 0) {
+    if (!args.forceBuild) {
+      showHelp();
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+
+  // node sets isTTY to `true` for a terminal stdin, `undefined` otherwise
+  // (never `false`). check truthiness, not equality.
+  if (args.shell && !process.stdin.isTTY) {
+    fail("--shell needs a TTY (stdin is not a terminal). run from an interactive shell.");
+  }
+
+  const uid = process.getuid?.() ?? 1000;
+  const gid = process.getgid?.() ?? 1000;
+  initVolumeOwnership({ ref, uid, gid });
+
+  const envParts = buildEnvParts(process.env);
+  const sshFlags = buildSshFlags(process.env.HOME);
+
+  const runArgs: string[] = [
+    "run",
+    "--rm",
+    // `--init` uses tini as PID 1, which forwards signals (SIGINT/SIGTERM)
+    // to our entrypoint and reaps zombies. Without it, bash-as-PID-1
+    // swallows Ctrl-C during the pre-exec warmup phase.
+    "--init",
+    args.shell ? "-it" : "-t",
+    "--privileged",
+    // make the host reachable from inside the container at a stable name
+    // (macOS Docker Desktop bakes this in; the flag makes Linux match,
+    // matters when scripts hit local dev servers like API_URL=
+    // http://host.docker.internal:3100).
+    "--add-host=host.docker.internal:host-gateway",
+    "-v",
+    `${actionDir}:/app/action:cached`,
+    "-v",
+    `${ref.volumeName}:/app/action/node_modules`,
+    "-w",
+    "/app/action",
+    "--env-file",
+    envParts.envFile,
+    "-e",
+    `HOST_UID=${uid}`,
+    "-e",
+    `HOST_GID=${gid}`,
+    ...envParts.multiLineFlags,
+    ...sshFlags,
+    ref.tag,
+  ];
+
+  if (args.shell) {
+    runArgs.push("--shell");
+  } else {
+    // resolve script paths relative to actionDir (matches `pnpm -C action`
+    // mental model). absolute paths and bare flags pass through unchanged.
+    const [script, ...rest] = args.passthrough;
+    if (script === undefined) {
+      fail("internal: passthrough empty");
+    }
+    runArgs.push("node", script, ...rest);
+  }
+
+  let exitCode = 1;
+  try {
+    const result = spawnSync("docker", runArgs, { stdio: "inherit" });
+    exitCode = result.status ?? 1;
+  } finally {
+    try {
+      unlinkSync(envParts.envFile);
+    } catch {
+      // best-effort; tmpdir is GC'd by the OS regardless.
+    }
+  }
+  process.exit(exitCode);
+}
+
+const isDirectExecution = process.argv[1]
+  ? import.meta.url === pathToFileURL(resolve(process.argv[1])).href
+  : false;
+
+if (isDirectExecution) {
+  main();
+}

entryPost.ts

@@ -0,0 +1,102 @@
+#!/usr/bin/env node
+//
+// GitHub Actions `post:` entry point. Runs after the main step regardless of
+// exit status (cancellation, timeout, unhandled error) — that's the contract
+// we need for credential persistence: if OpenCode refreshed the Codex
+// auth.json during the run, the refreshed token must land back in Pullfrog
+// even when the main step died unexpectedly.
+//
+// THIS IS WHY `CODEX_AUTH_JSON` HAS TO LIVE IN PULLFROG'S OWN SECRET STORE,
+// NOT IN GITHUB ACTIONS SECRETS. The refresh chain rotates on every use; this
+// hook PUTs the rotated chain back to Pullfrog Postgres so the next run starts
+// from a fresh token. GH Actions secrets are read-only at runtime — there is
+// no API to write them back from inside a job — so a token stashed there
+// silently goes stale on the first refresh and the next run fails. See
+// wiki/codex-auth.md.
+//
+// Today's only job: detect a Codex auth refresh by diffing the on-disk
+// auth.json against the original refresh token (saved to GH Actions state
+// by action/agents/opencode_v2.ts — see also the legacy v1 file kept as
+// reference at action/agents/opencode.ts), convert OpenCode's auth shape
+// back to Codex CLI shape, and PUT it to /api/runtime/secret.
+//
+// Silent no-op when the main step didn't materialize Codex auth (no state
+// saved). Best-effort: failures are logged but never throw — the workflow
+// is already done, and a missed refresh write-back means the user re-runs
+// `pullfrog auth codex` next time the chain breaks.
+
+import { existsSync, readFileSync } from "node:fs";
+import * as core from "@actions/core";
+import { apiFetch } from "./utils/apiFetch.ts";
+import { detectCodexRefresh } from "./utils/codexHome.ts";
+
+async function main(): Promise<void> {
+  const raw = core.getState("codex_writeback");
+  if (!raw) {
+    core.info("codex post-hook: no writeback state — skipping");
+    return;
+  }
+
+  let state: { apiToken: string; authPath: string; originalRefresh: string };
+  try {
+    state = JSON.parse(raw) as typeof state;
+  } catch (err) {
+    core.warning(`codex post-hook: malformed writeback state — ${err}`);
+    return;
+  }
+  if (!state.apiToken || !state.authPath || !state.originalRefresh) {
+    core.warning("codex post-hook: incomplete writeback state — skipping");
+    return;
+  }
+
+  if (!existsSync(state.authPath)) {
+    core.info(`codex post-hook: ${state.authPath} not found — nothing to write back`);
+    return;
+  }
+
+  let authFileContent: string;
+  try {
+    authFileContent = readFileSync(state.authPath, "utf8");
+  } catch (err) {
+    core.warning(`codex post-hook: cannot read ${state.authPath} — ${err}`);
+    return;
+  }
+
+  const refreshedCodexJson = detectCodexRefresh({
+    authFileContent,
+    originalRefresh: state.originalRefresh,
+  });
+  if (!refreshedCodexJson) {
+    core.info("codex post-hook: refresh chain unchanged — no writeback needed");
+    return;
+  }
+
+  try {
+    // route through apiFetch so the Vercel preview-deployment SSO gate gets
+    // the `x-vercel-protection-bypass` header/query (raw fetch silently 401s
+    // against preview envs — production is unaffected but every preview-run
+    // refresh would be lost). see action/utils/apiFetch.ts.
+    const response = await apiFetch({
+      path: "/api/runtime/secret",
+      method: "PUT",
+      headers: {
+        authorization: `Bearer ${state.apiToken}`,
+        "content-type": "application/json",
+      },
+      body: JSON.stringify({ name: "CODEX_AUTH_JSON", value: refreshedCodexJson }),
+    });
+    if (!response.ok) {
+      const body = await response.text().catch(() => "");
+      core.warning(`codex post-hook: writeback returned ${response.status}: ${body}`);
+      return;
+    }
+    core.info("codex post-hook: refreshed CODEX_AUTH_JSON persisted to Pullfrog");
+  } catch (err) {
+    core.warning(`codex post-hook: writeback failed — ${err}`);
+  }
+}
+
+main().catch((err) => {
+  // never throw — post-hook failure must not fail the workflow
+  core.warning(`codex post-hook: unexpected error — ${err}`);
+});

external.ts

@@ -30,6 +30,7 @@ export function formatMcpToolRef(agentId: AgentId, toolName: string): string {
 export type { ModelAlias, ModelProvider, ProviderConfig } from "./models.ts";
 export {
   getModelEnvVars,
+  getModelManagedCredentials,
   getModelProvider,
   getProviderDisplayName,
   modelAliases,

internal/index.ts

@@ -17,6 +17,7 @@ export type {
 } from "../external.ts";
 export {
   getModelEnvVars,
+  getModelManagedCredentials,
   getModelProvider,
   getProviderDisplayName,
   modelAliases,
@@ -44,6 +45,7 @@ export {
   isLeapingIntoActionCommentBody,
   LEAPING_INTO_ACTION_PREFIX,
 } from "../utils/leapingComment.ts";
+export { MAX_LEARNINGS_LENGTH, truncateAtLineBoundary } from "../utils/learningsTruncate.ts";
 export type {
   CreateProgressCommentTarget,
   ProgressComment,

main.ts

@@ -3,12 +3,11 @@
 import { existsSync, readdirSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import * as core from "@actions/core";
-import { deleteProgressComment, reportProgress } from "./mcp/comment.ts";
+import { reportProgress } from "./mcp/comment.ts";
 import { startInstallation } from "./mcp/dependencies.ts";
 import { startMcpHttpServer, type ToolContext } from "./mcp/server.ts";
 import { computeModes } from "./modes.ts";
-import { initToolState, type ToolState } from "./toolState.ts";
+import { initToolState } from "./toolState.ts";
 import {
   type ActivityTimeout,
   createProcessOutputActivityTimeout,
@@ -16,33 +15,33 @@ import {
   DEFAULT_ACTIVITY_TIMEOUT_MS,
 } from "./utils/activity.ts";
 import { resolveAgent, resolveModel } from "./utils/agent.ts";
-import { apiFetch } from "./utils/apiFetch.ts";
-import {
-  formatApiKeyErrorSummary,
-  isApiKeyAuthError,
-  validateAgentApiKey,
-} from "./utils/apiKeys.ts";
-import { isLocalApiUrl } from "./utils/apiUrl.ts";
+import { validateAgentApiKey } from "./utils/apiKeys.ts";
 import { resolveBody } from "./utils/body.ts";
-import { formatUsageSummary, log, writeSummary } from "./utils/cli.ts";
+import { selectFallbackModelIfNeeded } from "./utils/byokFallback.ts";
+import { log } from "./utils/cli.ts";
 import { recordDiffReadFromToolUse } from "./utils/diffCoverage.ts";
-import { reportErrorToComment } from "./utils/errorReport.ts";
 import { onExitSignal } from "./utils/exitHandler.ts";
 import { resolveGit, setGitAuthServer } from "./utils/gitAuth.ts";
 import { startGitAuthServer } from "./utils/gitAuthServer.ts";
 import { createOctokit, writeGitHubUsageSummaryToFile } from "./utils/github.ts";
 import { resolveInstructions } from "./utils/instructions.ts";
-import { readLearningsFile, seedLearningsFile } from "./utils/learnings.ts";
+import { persistLearnings, seedLearningsFile } from "./utils/learnings.ts";
 import { executeLifecycleHook } from "./utils/lifecycle.ts";
 import { normalizeEnv, sanitizeSecret } from "./utils/normalizeEnv.ts";
+import { applyOverrides } from "./utils/overrides.ts";
 import { aggregateUsage, patchWorkflowRunFields } from "./utils/patchWorkflowRunFields.ts";
-import { resolvePayload, resolvePromptInput } from "./utils/payload.ts";
-import { isRouterKeylimitExhaustedError } from "./utils/providerErrors.ts";
-import { readSummaryFile, seedSummaryFile } from "./utils/prSummary.ts";
-import { postReviewCleanup } from "./utils/reviewCleanup.ts";
+import { resolveOutputSchema, resolvePayload, resolvePromptInput } from "./utils/payload.ts";
+import { type OidcCredentials, runProxyResolution } from "./utils/proxy.ts";
+import { fetchPreviousSnapshot, persistSummary, seedSummaryFile } from "./utils/prSummary.ts";
 import { handleAgentResult } from "./utils/run.ts";
-import { type AccountPlan, isInfraCovered } from "./utils/runContext.ts";
 import { resolveRunContextData } from "./utils/runContextData.ts";
+import { renderRunError } from "./utils/runErrorRenderer.ts";
+import {
+  finalizeSuccessRun,
+  persistRunArtifacts,
+  writeRunErrorOutputs,
+} from "./utils/runLifecycle.ts";
+import { logRunStartup } from "./utils/runStartupLog.ts";
 import { setEnvAllowlist } from "./utils/secrets.ts";
 import { createTempDirectory, setupGit } from "./utils/setup.ts";
 import { killTrackedChildren } from "./utils/subprocess.ts";
@@ -61,481 +60,29 @@ export interface MainResult {
   result?: string | undefined;
 }
 
-function resolveOutputSchema(): Record<string, unknown> | undefined {
-  const raw = core.getInput("output_schema");
-  if (!raw) return undefined;
-
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    throw new Error(`invalid output_schema: not valid JSON`);
-  }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error(`invalid output_schema: must be a JSON object`);
-  }
-  log.info("» structured output schema provided — output will be required");
-  return parsed as Record<string, unknown>;
-}
-
-function resolveTimeoutForLog(timeout: string | undefined): string {
-  if (!timeout) return "1h (default)";
-  if (timeout === TIMEOUT_DISABLED) return "none (disabled)";
-  return timeout;
-}
-
-function resolveModelForLog(ctx: {
-  payload: ResolvedPayload;
-  resolvedModel: string | undefined;
-}): string {
-  const envModel = process.env.PULLFROG_MODEL?.trim();
-  if (envModel) return `${envModel} (override via PULLFROG_MODEL)`;
-  if (ctx.payload.proxyModel) return `${ctx.payload.proxyModel} (proxy)`;
-  if (ctx.resolvedModel && ctx.payload.model && ctx.payload.model !== ctx.resolvedModel) {
-    return `${ctx.resolvedModel} (resolved from ${ctx.payload.model})`;
-  }
-  if (ctx.resolvedModel) return ctx.resolvedModel;
-  if (ctx.payload.model) return `${ctx.payload.model} (unresolved)`;
-  return "auto";
-}
-
-function resolveAgentForLog(ctx: { agentName: string; resolvedModel: string | undefined }): string {
-  const envAgent = process.env.PULLFROG_AGENT?.trim();
-  if (envAgent && envAgent === ctx.agentName) {
-    return `${ctx.agentName} (override via PULLFROG_AGENT)`;
-  }
-  if (ctx.agentName === "claude" && ctx.resolvedModel) {
-    return `${ctx.agentName} (auto-selected for ${ctx.resolvedModel})`;
-  }
-  return ctx.agentName;
-}
-
-import type { ResolvedPayload } from "./utils/payload.ts";
-
-interface OidcCredentials {
-  requestUrl: string;
-  requestToken: string;
-}
-
-/**
- * Billing-layer error surfaced from `/api/proxy-token` as a 402. User-actionable
- * — distinct from TransientError (503 / transient sync issue) so the job
- * summary + PR comment can use affirmative "you need to do X" copy rather than
- * the ambiguous "billing error" label that makes transient outages look like
- * the user's fault.
- *
- * `code` is a server-side discriminator: `router_requires_card` (no card + no
- * wallet balance on Router), or null for unclassified. `declineCode` is
- * Stripe's more specific sub-reason on `card_declined` (e.g.
- * `insufficient_funds`, `lost_card`). `needsReauthentication` is the 3DS case
- * broken out for convenience.
- */
-class BillingError extends Error {
-  code: string | null;
-  declineCode: string | null;
-  needsReauthentication: boolean;
-
-  constructor(
-    message: string,
-    opts: {
-      code?: string | null;
-      declineCode?: string | null;
-      needsReauthentication?: boolean;
-    } = {}
-  ) {
-    super(message);
-    this.name = "BillingError";
-    this.code = opts.code ?? null;
-    this.declineCode = opts.declineCode ?? null;
-    this.needsReauthentication = opts.needsReauthentication ?? false;
-  }
-}
-
-/**
- * Transient service failures from `/api/proxy-token` (503: partial OpenRouter
- * usage sync, DB flake, in-flight payment intent). Not the user's fault — the
- * summary uses "temporarily unavailable" framing, and the non-zero exit lets
- * GH Actions apply whatever retry policy the workflow has configured.
- */
-class TransientError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "TransientError";
-  }
-}
-
-/**
- * Deep link into the right console section for the failing account. Anchors
- * are defined in `app/console/[owner]/page.tsx` (`#billing`, `#model-access`).
- * `owner` is the GitHub login of the repo's account — i.e. the org or user
- * that pays for this repo's runs, which is the right scope for billing.
- */
-function billingConsoleUrl(owner: string, anchor: "billing" | "model-access"): string {
-  return `https://pullfrog.com/console/${encodeURIComponent(owner)}#${anchor}`;
-}
-
-/**
- * Render a BillingError as user-facing markdown (shared between GH job summary
- * and the PR progress comment). Goals:
- *
- *   - quiet, not alarmist — bold first line instead of an `### ❌` H3, since
- *     the comment already has Pullfrog branding in the footer
- *   - actionable — every branch ends in a single CTA deep-linked to the
- *     correct section of the owner's console
- *   - honest — say what actually went wrong (card declined vs. balance
- *     empty vs. 3DS required), don't lump them under "billing error"
- *
- * Branches:
- *   - `router_requires_card`: user is on Router mode with no card AND no
- *     wallet balance (signup credit exhausted or not granted). Frame as
- *     "add a card to continue", link to `#model-access` where the Add
- *     Card flow lives.
- *   - `router_balance_exhausted`: user has a card on file but auto-reload is
- *     disabled and they've spent past their $5 overdraft buffer. Frame as
- *     "balance ran out" and surface both remediation paths (top up, or flip
- *     on auto-reload).
- *   - `router_keylimit_exhausted`: OpenRouter rejected mid-run because the
- *     per-run key budget was exhausted while the agent was working. The
- *     wallet is now negative; same remediation as `router_balance_exhausted`
- *     but framed for the after-the-fact case ("this run was cut short").
- *   - `needsReauthentication`: issuer requires 3DS on every off-session
- *     charge. Re-adding the card won't help — the only escape is a manual
- *     top-up where 3DS runs interactively in Stripe Checkout.
- *   - `declineCode` set: Stripe declined a real charge. Show the sub-code
- *     so support can act on it; tell the user we'll retry on next dispatch.
- *   - default: balance hit zero with no in-flight charge (auto-reload off
- *     or amount below threshold). Direct them to top up or enable auto-reload.
- */
-function formatBillingErrorSummary(error: BillingError, owner: string): string {
-  if (error.code === "router_requires_card") {
-    return [
-      "**Add a card to start using Pullfrog Router.**",
-      "",
-      "Router proxies OpenRouter at raw cost — no platform markup. Add a card and we'll auto-reload your wallet so runs keep flowing.",
-      "",
-      `[Add a card →](${billingConsoleUrl(owner, "model-access")})`,
-    ].join("\n");
-  }
-
-  if (error.code === "router_balance_exhausted") {
-    return [
-      "**Your Pullfrog Router balance is exhausted.**",
-      "",
-      "You have a card on file but auto-reload is disabled, so runs paused once your balance went past the overdraft buffer.",
-      "",
-      `[Top up balance →](${billingConsoleUrl(owner, "billing")}) · [Enable auto-reload →](${billingConsoleUrl(owner, "model-access")})`,
-    ].join("\n");
-  }
-
-  if (error.code === "router_keylimit_exhausted") {
-    return [
-      "**This run was cut short — your Pullfrog Router balance ran out mid-run.**",
-      "",
-      "OpenRouter stopped the agent because the per-run budget was exhausted. Your wallet is now negative; top up or enable auto-reload to keep runs flowing.",
-      "",
-      `[Top up balance →](${billingConsoleUrl(owner, "billing")}) · [Enable auto-reload →](${billingConsoleUrl(owner, "model-access")})`,
-    ].join("\n");
-  }
-
-  if (error.needsReauthentication) {
-    const code = error.declineCode ?? "authentication_required";
-    return [
-      `**Your card issuer requires 3D Secure on every charge** (\`${code}\`).`,
-      "",
-      "Pullfrog can't complete a 3DS challenge from inside a workflow. Top up your Router balance once in Stripe Checkout — subsequent runs draw from the prepaid balance without re-triggering 3DS.",
-      "",
-      `[Top up balance →](${billingConsoleUrl(owner, "billing")})`,
-    ].join("\n");
-  }
-
-  if (error.declineCode) {
-    return [
-      `**Your card was declined** (\`${error.declineCode}\`).`,
-      "",
-      "Update your payment method and Pullfrog will retry on the next run.",
-      "",
-      `[Update payment method →](${billingConsoleUrl(owner, "billing")})`,
-    ].join("\n");
-  }
-
-  return [
-    "**Your Pullfrog balance is empty.**",
-    "",
-    "Top up your balance or enable auto-reload to keep runs flowing.",
-    "",
-    `[Manage billing →](${billingConsoleUrl(owner, "billing")})`,
-  ].join("\n");
-}
-
-/**
- * Render a TransientError as user-facing markdown. Distinct framing from
- * BillingError so the user doesn't read an alarm and assume their card
- * failed — this branch is "our fault, retry shortly", not theirs.
- */
-function formatTransientErrorSummary(error: TransientError, owner: string): string {
-  return [
-    "**Pullfrog billing is temporarily unavailable.**",
-    "",
-    error.message,
-    "",
-    `Usually transient — the next dispatch should succeed. If it persists, check [status.pullfrog.com](https://status.pullfrog.com) or [your console](${billingConsoleUrl(owner, "billing")}).`,
-  ].join("\n");
-}
-
-async function mintProxyKey(ctx: {
-  oidcCredentials: OidcCredentials | null;
-  repo: { owner: string; name: string };
-}): Promise<string | null> {
-  try {
-    const headers = await buildProxyTokenHeaders(ctx);
-    if (!headers) return null;
-
-    const response = await apiFetch({
-      path: "/api/proxy-token",
-      method: "POST",
-      headers,
-    });
-
-    if (response.status === 402) {
-      const body = (await response.json().catch(() => null)) as {
-        error?: string;
-        code?: string;
-        declineCode?: string;
-        needsReauthentication?: boolean;
-      } | null;
-      throw new BillingError(body?.error ?? "insufficient balance", {
-        code: body?.code ?? null,
-        declineCode: body?.declineCode ?? null,
-        needsReauthentication: body?.needsReauthentication ?? false,
-      });
-    }
-
-    // 503 = transient sync issue (partial OpenRouter failure, DB flake,
-    // in-flight top-up). Not the user's fault — TransientError renders a
-    // "temporarily unavailable" summary instead of the "billing error"
-    // label that BillingError uses.
-    if (response.status === 503) {
-      const body = (await response.json().catch(() => null)) as { error?: string } | null;
-      throw new TransientError(
-        body?.error ?? "billing service temporarily unavailable — retry shortly"
-      );
-    }
-
-    if (!response.ok) {
-      log.warning(`proxy key mint failed (${response.status})`);
-      return null;
-    }
-
-    const data = (await response.json()) as { key: string };
-    return data.key;
-  } catch (error) {
-    if (error instanceof BillingError) throw error;
-    if (error instanceof TransientError) throw error;
-    log.warning(`proxy key mint error: ${error instanceof Error ? error.message : String(error)}`);
-    return null;
-  } finally {
-    delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
-    delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
-  }
-}
-
-/**
- * choose how to authenticate the `/api/proxy-token` request:
- *
- * - production: mint a fresh OIDC token via `core.getIDToken` and send as
- *   `Authorization: Bearer …` (the server verifies it cryptographically).
- * - local dev (no OIDC + `API_URL` is localhost): send `x-dev-repo:
- *   owner/repo` instead. the server-side route only honors this header
- *   when `NODE_ENV === "development"`, so prod is never reachable through
- *   this branch even if the action is misconfigured.
- *
- * returns null when neither path is available — caller treats as soft skip.
- */
-async function buildProxyTokenHeaders(ctx: {
-  oidcCredentials: OidcCredentials | null;
-  repo: { owner: string; name: string };
-}): Promise<Record<string, string> | null> {
-  if (ctx.oidcCredentials) {
-    process.env.ACTIONS_ID_TOKEN_REQUEST_URL = ctx.oidcCredentials.requestUrl;
-    process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = ctx.oidcCredentials.requestToken;
-    const oidcToken = await core.getIDToken("pullfrog-api");
-    delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
-    delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
-    return { Authorization: `Bearer ${oidcToken}` };
-  }
-  if (isLocalApiUrl()) {
-    log.info(`» proxy: dev bypass (x-dev-repo) for ${ctx.repo.owner}/${ctx.repo.name}`);
-    return { "x-dev-repo": `${ctx.repo.owner}/${ctx.repo.name}` };
-  }
-  return null;
-}
-
-async function resolveProxyModel(ctx: {
-  payload: ResolvedPayload;
-  oss: boolean;
-  plan: AccountPlan;
-  proxyModel?: string | undefined;
-  oidcCredentials: OidcCredentials | null;
-  repo: { owner: string; name: string };
-}): Promise<void> {
-  // env override = BYOK escape hatch, don't proxy
-  if (process.env.PULLFROG_MODEL?.trim()) return;
-
-  const needsProxy = isInfraCovered({ isOss: ctx.oss, plan: ctx.plan }) && ctx.proxyModel;
-  if (!needsProxy) return;
-
-  // dev affordance: when talking to a localhost API, the server-side
-  // x-dev-repo bypass replaces OIDC verification, so a play run can
-  // exercise the proxy/router/oss path without GitHub Actions OIDC.
-  if (!ctx.oidcCredentials && !isLocalApiUrl()) {
-    log.warning("» proxy requested but no OIDC credentials available — skipping");
-    return;
-  }
-
-  const key = await mintProxyKey({ oidcCredentials: ctx.oidcCredentials, repo: ctx.repo });
-  if (!key) return;
-
-  process.env.OPENROUTER_API_KEY = key;
-  core.setSecret(key);
-  ctx.payload.proxyModel = ctx.proxyModel;
-  const label = ctx.oss ? "oss" : "router";
-  log.info(`» proxy: ${label} → ${ctx.proxyModel}`);
-}
-
-/**
- * Fetch the most recent persisted PR summary snapshot for this PR.
- * Returns null on first-time PRs, when summary is disabled, or on any error.
- * Best-effort: a transient API failure should not block the run.
- */
-async function fetchPreviousSnapshot(ctx: ToolContext, prNumber: number): Promise<string | null> {
-  if (!ctx.githubInstallationToken) return null;
-  try {
-    const response = await apiFetch({
-      path: `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/pr/${prNumber}/summary-comment`,
-      method: "GET",
-      headers: { authorization: `Bearer ${ctx.githubInstallationToken}` },
-      signal: AbortSignal.timeout(10_000),
-    });
-    if (!response.ok) return null;
-    const data = (await response.json()) as { snapshot?: string | null };
-    return typeof data.snapshot === "string" && data.snapshot.length > 0 ? data.snapshot : null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Read the agent-edited PR summary tmpfile and persist to `WorkflowRun.summarySnapshot`.
- *
- * Best-effort: any failure is logged and does not affect the run's success
- * status. Skips the PATCH when the file is byte-identical to its seed —
- * persisting the seed verbatim would either re-write what the DB already has
- * (on incremental runs) or serialize the placeholder scaffold (on first
- * runs), neither of which is useful.
- */
-/**
- * Read the agent-edited repo-level learnings tmpfile and PATCH it to
- * `Repo.learnings`.
- *
- * Best-effort: any failure is logged and does not affect the run's success
- * status. Skips the PATCH when the file is byte-trim-identical to its seed —
- * the agent didn't touch it, so writing the same content back would just
- * burn a `LearningsRevision` row and an API round-trip.
- *
- * `model` is forwarded so `LearningsRevision.model` keeps populating; it
- * powers the per-revision attribution badge in the UI history view.
- */
-async function persistLearnings(ctx: ToolContext): Promise<void> {
-  const filePath = ctx.toolState.learningsFilePath;
-  if (!filePath) return;
-  if (ctx.toolState.learningsPersistAttempted) return;
-  ctx.toolState.learningsPersistAttempted = true;
-  const current = await readLearningsFile(filePath);
-  if (current === null) {
-    log.debug(`learnings tmpfile missing or unreadable at ${filePath} — skipping persist`);
-    return;
-  }
-  const seed = ctx.toolState.learningsSeed?.trim() ?? "";
-  if (current === seed) {
-    log.debug("learnings tmpfile unchanged from seed — skipping persist");
-    return;
-  }
-  try {
-    const response = await apiFetch({
-      path: `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/learnings`,
-      method: "PATCH",
-      headers: {
-        authorization: `Bearer ${ctx.apiToken}`,
-        "content-type": "application/json",
-      },
-      body: JSON.stringify({
-        learnings: current,
-        model: ctx.toolState.model,
-      }),
-      signal: AbortSignal.timeout(10_000),
-    });
-    if (!response.ok) {
-      const error = await response.text().catch(() => "(no body)");
-      // promoted from debug → warning: this path means the agent edited the
-      // file (we already short-circuited the unchanged-from-seed case above)
-      // but the PATCH dropped it on the floor. silently losing real work is
-      // worse than the noise of a CI warning.
-      log.warning(`learnings persist failed (${response.status}): ${error}`);
-      return;
-    }
-    log.info("» learnings updated");
-  } catch (err) {
-    log.warning(`learnings persist failed: ${err instanceof Error ? err.message : String(err)}`);
-  }
-}
-
-async function persistSummary(ctx: ToolContext): Promise<void> {
-  const filePath = ctx.toolState.summaryFilePath;
-  if (!filePath) return;
-  // already-completed guard: the error-path call (success path persisted,
-  // then a late step threw) and the SIGINT/SIGTERM handler all funnel
-  // through here; the first one to arrive wins.
-  if (ctx.toolState.summaryPersistAttempted) return;
-  ctx.toolState.summaryPersistAttempted = true;
-  const snapshot = await readSummaryFile(filePath);
-  if (!snapshot) {
-    log.debug(`pr summary tmpfile missing or invalid at ${filePath} — skipping persist`);
-    return;
-  }
-  // soft gate: agent never touched the seeded file. saving the seed back
-  // is a no-op at best (incremental run — DB already has it) and a bug at
-  // worst (first run — serializes the placeholder italics). log a warning
-  // so the failure mode is visible in CI without flipping the run to
-  // failed.
-  const seed = ctx.toolState.summarySeed?.trim();
-  if (seed !== undefined && snapshot === seed) {
-    log.warning(
-      "» pr summary tmpfile unchanged from seed — skipping persist (agent did not edit it)"
-    );
-    return;
-  }
-  await patchWorkflowRunFields(ctx, { summarySnapshot: snapshot }).catch((err) => {
-    log.debug(`pr summary persist failed: ${err instanceof Error ? err.message : String(err)}`);
-  });
-}
-
-// fall back to the agent's final assistant message when the agent never
-// called report_progress (e.g. schedule/workflow_dispatch runs that have no
-// PR/issue context to comment on). lastProgressBody wins when present so we
-// don't double up the progress comment body in the job summary.
-async function writeJobSummary(toolState: ToolState, finalOutput?: string): Promise<void> {
-  const usageSummary = formatUsageSummary(toolState.usageEntries);
-  const body = toolState.lastProgressBody || finalOutput;
-  const summaryParts = [body, usageSummary].filter(Boolean);
-  if (summaryParts.length > 0) {
-    await writeSummary(summaryParts.join("\n\n"));
-  }
-}
-
 export async function main(): Promise<MainResult> {
   // normalize env var names to uppercase (handles case-insensitive workflow files)
   normalizeEnv();
 
+  // apply caller-supplied env overrides — JSON object forwarded as the
+  // UNSAFE_OVERRIDES env var (NOT a `with:` input). gated by `actions:write`
+  // on the repo and refuses integrity-critical names; see utils/overrides.ts
+  // for the deny-list and wiki/e2e-testing.md for usage + threat model.
+  // the `unsafe` prefix is intentional: GH echoes the env-block value in the
+  // step-header log, so the raw JSON is visible to anyone with `actions:read`.
+  const overridesRaw = process.env.UNSAFE_OVERRIDES ?? "";
+  if (overridesRaw.trim()) {
+    const result = applyOverrides({ raw: overridesRaw, env: process.env });
+    if (result.applied.length > 0) {
+      log.info(`» applied ${result.applied.length} env override(s): ${result.applied.join(", ")}`);
+    }
+    if (result.denied.length > 0) {
+      log.warning(
+        `» refused to override ${result.denied.length} protected env var(s): ${result.denied.join(", ")}`
+      );
+    }
+  }
+
   // write usage summary on SIGINT/SIGTERM so the worker can read it after sandbox.exec
   const usageSummaryPath = process.env.PULLFROG_USAGE_SUMMARY_PATH;
   if (usageSummaryPath) {
@@ -610,39 +157,18 @@ export async function main(): Promise<MainResult> {
   }
 
   // Proxy decision: mint an OpenRouter key for OSS repos or managed billing
-  // accounts. BillingError (402) and TransientError (503) both surface here.
-  // Handle explicitly so the user sees an actionable message (job summary +
-  // PR progress comment when one exists) — otherwise the error unwinds past
-  // the main try/catch (which needs toolState) and lands in runMain with only
-  // a generic core.setFailed.
-  try {
-    await resolveProxyModel({
-      payload,
-      oss: runContext.oss,
-      plan: runContext.plan,
-      proxyModel: runContext.proxyModel,
-      oidcCredentials,
-      repo: runContext.repo,
-    });
-  } catch (error) {
-    if (error instanceof BillingError) {
-      const summary = formatBillingErrorSummary(error, runContext.repo.owner);
-      await writeSummary(summary).catch(() => {});
-      // Mirror to the PR progress comment if the trigger created one
-      // (mention / PR event). Without this, auto-reload declines are only
-      // visible in the job summary — users rarely open that, so the agent
-      // just appears to silently stop mid-run.
-      await reportErrorToComment({ toolState, error: summary }).catch(() => {});
-      throw error;
-    }
-    if (error instanceof TransientError) {
-      const summary = formatTransientErrorSummary(error, runContext.repo.owner);
-      await writeSummary(summary).catch(() => {});
-      await reportErrorToComment({ toolState, error: summary }).catch(() => {});
-      throw error;
-    }
-    throw error;
-  }
+  // accounts. BillingError (402) and TransientError (503) get rendered inside
+  // `runProxyResolution` before being rethrown — handled here (not in the
+  // outer catch) because the outer catch needs `toolContext` (not yet built)
+  // for its general-purpose error path.
+  await runProxyResolution({
+    payload,
+    oss: runContext.oss,
+    proxyModel: runContext.proxyModel,
+    oidcCredentials,
+    repo: runContext.repo,
+    toolState,
+  });
 
   // create octokit with MCP token for GitHub API calls
   const octokit = createOctokit(tokenRef.mcpToken);
@@ -678,18 +204,46 @@ export async function main(): Promise<MainResult> {
     await using gitAuthServer = await startGitAuthServer(tmpdir);
     setGitAuthServer(gitAuthServer);
 
-    const resolvedModel = payload.proxyModel ? undefined : resolveModel({ slug: payload.model });
+    const initialResolvedModel = payload.proxyModel
+      ? undefined
+      : resolveModel({ slug: payload.model });
+
+    // BYOK fallback: if the configured model needs a key the runner doesn't
+    // have, swap to a free OpenCode model so the run can still produce
+    // value. Without this, the agent launches with no key, the LLM provider
+    // 401s, and the run dies in seconds with a synthetic "Invalid API key"
+    // — exactly the silent-churn pattern that took out 15 accounts before
+    // this landed. Router/proxy runs are skipped (Pullfrog mints the key);
+    // see `selectFallbackModelIfNeeded` for the full skip set.
+    const fallback = selectFallbackModelIfNeeded({
+      resolvedModel: initialResolvedModel,
+      proxyModel: payload.proxyModel,
+    });
+    // when fallback engages we bypass `resolveModel` for the new slug —
+    // `PULLFROG_MODEL` has higher priority than the slug arg inside that
+    // helper and would otherwise re-override back to the unkeyed model.
+    // the free fallback slug is already a CLI-ready specifier, so using
+    // it verbatim is correct and avoids the override.
+    const effectiveSlug = fallback.fallback ? fallback.to : payload.model;
+    const resolvedModel = fallback.fallback ? fallback.to : initialResolvedModel;
+    if (fallback.fallback) {
+      log.warning(
+        `» fell back from ${fallback.from} to ${fallback.to} — no BYOK key present in runner env. add a provider key in repo secrets to use ${fallback.from} instead.`
+      );
+      toolState.modelFallback = { from: fallback.from };
+    }
+
     const agent = resolveAgent({ model: resolvedModel });
 
     // surface the effective model in comment/review footers. payload.model is
     // just the stored slug (often undefined for router/oss runs that derive
     // the target from proxyModel). matching priority with resolveModelForLog
     // so the "Using `…`" badge reflects what actually ran.
-    toolState.model = payload.proxyModel ?? resolvedModel ?? payload.model;
+    toolState.model = payload.proxyModel ?? resolvedModel ?? effectiveSlug;
 
     validateAgentApiKey({
       agent,
-      model: payload.proxyModel ?? resolvedModel ?? payload.model,
+      model: payload.proxyModel ?? resolvedModel ?? effectiveSlug,
       owner: runContext.repo.owner,
       name: runContext.repo.name,
     });
@@ -763,11 +317,9 @@ export async function main(): Promise<MainResult> {
     // and an unwrapped filesystem failure (ENOSPC, EACCES, hostile sandbox)
     // would unwind into the outer main() catch and flip an otherwise-
     // successful run to "❌ Pullfrog failed" before the agent even starts.
-    // matches `persistLearnings`'s own best-effort contract — learnings
-    // are a peripheral artifact, not a load-bearing capability. on failure
-    // toolState.learningsFilePath stays unset, and downstream consumers
-    // (`persistLearnings`, agent harnesses, `resolveInstructions`) all
-    // treat undefined as "no learnings affordance this run".
+    // on failure toolState.learningsFilePath stays unset, and downstream
+    // consumers (`persistLearnings`, agent harnesses, `resolveInstructions`)
+    // all treat undefined as "no learnings affordance this run".
     try {
       const learningsPath = await seedLearningsFile({
         tmpdir,
@@ -801,9 +353,6 @@ export async function main(): Promise<MainResult> {
       // the post-run retry loop to detect the agent forgetting to edit
       // the file (byte-identical to seed → nudge once via resume turn)
       // and by persistSummary to skip the DB write when nothing changed.
-      // we just wrote the file, so the read shouldn't fail; the catch
-      // leaves summarySeed unset (its default), in which case the unchanged
-      // checks downstream are simply skipped.
       try {
         toolState.summarySeed = await readFile(filePath, "utf8");
       } catch {
@@ -825,14 +374,7 @@ export async function main(): Promise<MainResult> {
 
     startInstallation(toolContext);
 
-    const modelForLog = resolveModelForLog({ payload, resolvedModel });
-    const agentForLog = resolveAgentForLog({ agentName: agent.name, resolvedModel });
-    const timeoutForLog = resolveTimeoutForLog(payload.timeout);
-    log.info(`» model:   ${modelForLog}`);
-    log.info(`» agent:   ${agentForLog}`);
-    log.info(`» push:    ${payload.push}`);
-    log.info(`» shell:   ${payload.shell}`);
-    log.info(`» timeout: ${timeoutForLog}`);
+    logRunStartup({ payload, resolvedModel, agentName: agent.name });
 
     const instructions = resolveInstructions({
       payload,
@@ -937,6 +479,7 @@ export async function main(): Promise<MainResult> {
       todoTracker,
       stopScript: runContext.repoSettings.stopScript,
       toolState,
+      apiToken: runContext.apiToken,
       onActivityTimeout: onInnerActivityTimeout,
       onToolUse: (event) => {
         const wasTracked = recordDiffReadFromToolUse({
@@ -1004,101 +547,13 @@ export async function main(): Promise<MainResult> {
       );
     }
 
-    // post-agent review cleanup: reportReviewNodeId → follow-up re-review dispatch.
-    // runs after the agent exits so ordering is architecturally guaranteed (no LLM involvement).
-    // best-effort: cleanup failures must not turn a successful agent run into a failure.
-    //
-    // note: progress-comment deletion on review submission is owned by
-    // create_pull_request_review (action/mcp/review.ts) and runs atomically
-    // with the submission, so it survives any path out of main (success,
-    // timeout, crash) without relying on cleanup ordering here.
-    if (toolContext) {
-      await postReviewCleanup(toolContext).catch((error) => {
-        log.debug(`post-review cleanup failed: ${error}`);
-      });
-    }
-
-    // read the agent-edited summary tmpfile and persist to the DB. happens
-    // after the agent exits so the file is in its final state.
-    if (toolContext) {
-      await persistSummary(toolContext);
-    }
-
-    // same for the rolling repo-level learnings tmpfile. always seeded, so
-    // always read back; persistLearnings short-circuits when the file is
-    // unchanged from its seed.
-    if (toolContext) {
-      await persistLearnings(toolContext);
-    }
-
-    // when the agent harness returns success=false (e.g. unsubmitted-review
-    // gate exhausted retries, stop-hook persistently failing), surface the
-    // error in the progress comment so the user sees it instead of a
-    // deleted-comment void. mirrors the catch-block error reporting for
-    // thrown errors. runs before the stranded-comment cleanup below so
-    // the comment is still around to update; reportErrorToComment sets
-    // wasUpdated=true and the !result.success guard skips deletion.
-    if (!result.success && toolContext && toolState.progressComment) {
-      const rawError = result.error || "agent run failed";
-      const errorBody = isApiKeyAuthError(rawError)
-        ? formatApiKeyErrorSummary({
-            owner: runContext.repo.owner,
-            name: runContext.repo.name,
-            raw: rawError,
-          })
-        : rawError;
-      await reportErrorToComment({ toolState, error: errorBody }).catch((error) => {
-        log.debug(`failure error report failed: ${error}`);
-      });
-    }
-
-    // clean up stranded progress comments. the comment is stale unless
-    // report_progress wrote a final summary to it — three sub-cases all reduce
-    // to !finalSummaryWritten:
-    // 1. nothing wrote to the comment ("Leaping into action" orphan)
-    // 2. tracker published a checklist but the agent never finalized it
-    // 3. the agent produced a substantive artifact via another MCP write tool
-    //    (create_issue_comment, update_pull_request_body, reply_to_review_comment)
-    //    and skipped report_progress — wasUpdated is true, but the progress
-    //    comment itself was never touched.
-    // create_pull_request_review owns its own deletion (see action/mcp/review.ts),
-    // so progressComment is already null by the time we get here for that path.
-    // uses finalSummaryWritten (not todoTracker.enabled or wasUpdated) so cleanup
-    // survives API failures in report_progress where cancel() ran but the write
-    // didn't succeed, and isn't fooled by writes to *other* artifacts. skipped
-    // entirely on result.success===false: the error message just written above
-    // is the user's only signal that the run happened — deleting it would
-    // restore the same empty-void UX this commit fixes.
-    if (
-      toolContext &&
-      result.success &&
-      toolState.progressComment &&
-      !toolState.finalSummaryWritten
-    ) {
-      await deleteProgressComment(toolContext).catch((error) => {
-        log.debug(`stranded progress comment cleanup failed: ${error}`);
-      });
-    }
-
-    // best-effort: failures writing the actions step summary must not throw
-    // past this point. on the result.success===false branch above we already
-    // wrote `result.error` to the progress comment, and a throw here would
-    // jump to the outer catch which calls reportErrorToComment again with
-    // the (less actionable) writeJobSummary error — silently overwriting the
-    // gate's failure message in the progress comment. the step-summary write
-    // is informational; let it fail silently rather than corrupt user-facing
-    // output.
-    try {
-      await writeJobSummary(toolState, result.output);
-    } catch (error) {
-      log.debug(`job summary write failed: ${error}`);
-    }
-
-    // emit structured output marker for test validation
-    if (toolState.output) {
-      log.info(`::pullfrog-output::${Buffer.from(toolState.output).toString("base64")}`);
-      core.setOutput("result", toolState.output);
-    }
+    // success-path cleanup: postReview → persistSummary → persistLearnings →
+    // failure-error-report → stranded-comment cleanup → job summary → output
+    // marker. each step is best-effort; see `finalizeSuccessRun` for ordering
+    // rationale (notably: progress-comment deletion lives in
+    // create_pull_request_review for review-mode runs, so deletion here
+    // covers the non-review success paths).
+    await finalizeSuccessRun({ toolContext, toolState, result, repo: runContext.repo });
 
     return await handleAgentResult({
       result,
@@ -1112,63 +567,19 @@ export async function main(): Promise<MainResult> {
     killTrackedChildren();
     log.error(errorMessage);
 
-    // Reclassify OpenRouter "key budget exhausted" mid-run errors as
-    // BillingError. The agent runtime surfaces this as a generic APIError,
-    // but it's a Pullfrog billing concern — the user's Router wallet ran
-    // out partway through the run. Route through the same formatBillingErrorSummary
-    // path as proxy-token 402s so the user gets actionable copy + a top-up
-    // CTA on both the job summary and the PR progress comment, instead of
-    // a generic "❌ Pullfrog failed" stack-trace dump.
-    const billingError = isRouterKeylimitExhaustedError(errorMessage)
-      ? new BillingError(errorMessage, { code: "router_keylimit_exhausted" })
-      : null;
+    // classify (BillingError reclassification + hang detection + API-key auth
+    // detection) and render to {summary, comment} markdown bodies.
+    const rendered = renderRunError({
+      errorMessage,
+      repo: runContext.repo,
+      agentDiagnostic: toolState.agentDiagnostic,
+    });
+    await writeRunErrorOutputs({ rendered, toolState });
 
-    const apiKeyErrorSummary =
-      !billingError && isApiKeyAuthError(errorMessage)
-        ? formatApiKeyErrorSummary({
-            owner: runContext.repo.owner,
-            name: runContext.repo.name,
-            raw: errorMessage,
-          })
-        : null;
-
-    // best-effort summary — write the error so it's visible in the Actions summary tab
-    try {
-      const errorSummary = billingError
-        ? formatBillingErrorSummary(billingError, runContext.repo.owner)
-        : (apiKeyErrorSummary ?? `### ❌ Pullfrog failed\n\n\`\`\`\n${errorMessage}\n\`\`\``);
-      const usageSummary = formatUsageSummary(toolState.usageEntries);
-      const parts = [errorSummary, toolState.lastProgressBody, usageSummary].filter(Boolean);
-      await writeSummary(parts.join("\n\n"));
-    } catch {}
-
-    try {
-      const commentBody = billingError
-        ? formatBillingErrorSummary(billingError, runContext.repo.owner)
-        : (apiKeyErrorSummary ?? errorMessage);
-      await reportErrorToComment({ toolState, error: commentBody });
-    } catch {
-      // error reporting failed, but don't let it mask the original error
-    }
-
-    // best-effort review cleanup (e.g., agent timed out after submitting a review)
+    // best-effort cleanup: review dispatch, summary persist, learnings persist.
+    // a partial edit before the crash is still worth keeping.
     if (toolContext) {
-      await postReviewCleanup(toolContext).catch((error) => {
-        log.debug(`post-review cleanup failed: ${error}`);
-      });
-    }
-
-    // best-effort summary persist on the error path: if the agent successfully
-    // edited the summary file before timing out / crashing, those edits are
-    // worth keeping for the next incremental run.
-    if (toolContext) {
-      await persistSummary(toolContext);
-    }
-
-    // same rationale for learnings: a partial edit before a crash is still
-    // worth keeping. persistLearnings is idempotent via learningsPersistAttempted.
-    if (toolContext) {
-      await persistLearnings(toolContext);
+      await persistRunArtifacts(toolContext);
     }
 
     return {

mcp/checkout.ts

@@ -5,7 +5,7 @@ import type { Octokit, RestEndpointMethodTypes } from "@octokit/rest";
 import { type } from "arktype";
 import { log } from "../utils/cli.ts";
 import { countLines, createDiffCoverageState } from "../utils/diffCoverage.ts";
-import { $git } from "../utils/gitAuth.ts";
+import { $git, $gitFetchWithDeepen } from "../utils/gitAuth.ts";
 import { executeLifecycleHook } from "../utils/lifecycle.ts";
 import { computeIncrementalDiff } from "../utils/rangeDiff.ts";
 import { retry } from "../utils/retry.ts";
@@ -259,10 +259,10 @@ async function ensureBeforeShaReachable(params: EnsureBeforeShaParams): Promise<
       sha: params.sha,
       ref: tempBranch,
     });
-    await $git(
-      "fetch",
+    await $gitFetchWithDeepen(
       ["--no-tags", ...(params.isShallow ? ["--depth=1"] : []), "origin", tempBranch],
-      { token: params.gitToken }
+      { token: params.gitToken },
+      `before_sha temp branch ${tempBranch}`
     );
     log.debug(`» fetched before_sha via temp branch ${tempBranch}`);
     return true;
@@ -410,9 +410,17 @@ export async function checkoutPrBranch(
   toolState.checkoutSha = $("git", ["rev-parse", "HEAD"], { log: false }).trim();
   const alreadyOnBranch = toolState.checkoutSha === pr.headSha;
 
-  // fetch base branch so origin/<base> exists for diff operations
+  // fetch base branch so origin/<base> exists for diff operations.
+  // wrap with deepen-retry: on shallow clones (the actions/checkout default
+  // is depth=1), repos with deep PR ancestry can't reach the baseRef tip in
+  // a single round trip, surfacing as `Could not read <sha>` / `remote did
+  // not send all necessary objects` (issue #656).
   log.debug(`» fetching base branch (${pr.baseRef})...`);
-  await $git("fetch", ["--no-tags", "origin", pr.baseRef], { token: gitToken });
+  await $gitFetchWithDeepen(
+    ["--no-tags", "origin", pr.baseRef],
+    { token: gitToken },
+    `base branch ${pr.baseRef}`
+  );
 
   // alreadyOnBranch only matches for repeated checkout_pr calls for the same PR in one session
   // (without the tip moving), or if an external setup already checked out the PR head.
@@ -426,14 +434,21 @@ export async function checkoutPrBranch(
     // -B creates or resets the branch to match origin/baseBranch
     $("git", ["checkout", "-B", pr.baseRef, `origin/${pr.baseRef}`], { log: false });
 
-    // fetch PR branch using pull/{n}/head refspec (works for both fork and same-repo PRs)
+    // fetch PR branch using pull/{n}/head refspec (works for both fork and same-repo PRs).
+    // two transient classes wrap this fetch:
+    //   - shallow-unreachable (`Could not read <sha>` etc.) — handled by the
+    //     inner `$gitFetchWithDeepen` deepen-retry (one shot, see issue #656)
+    //   - pull/N/head webhook race (`couldn't find remote ref pull/N/head`) —
+    //     handled by the outer retry below (see issue #591)
     log.debug(`» fetching PR #${pr.number} (${localBranch})...`);
     await retry(
       async () => {
         try {
-          await $git("fetch", ["--no-tags", "origin", `+pull/${pr.number}/head:${localBranch}`], {
-            token: gitToken,
-          });
+          await $gitFetchWithDeepen(
+            ["--no-tags", "origin", `+pull/${pr.number}/head:${localBranch}`],
+            { token: gitToken },
+            `PR #${pr.number}`
+          );
         } catch (e) {
           // on the webhook race, check whether the PR still matches what we
           // dispatched on. if it's been closed/merged or the head SHA moved,
@@ -588,7 +603,192 @@ export async function checkoutPrBranch(
   return { hookWarning: postCheckoutHook.warning };
 }
 
+/**
+ * dedupes concurrent `checkout_pr` calls for the same PR. agents (notably
+ * Sonnet/Claude) occasionally emit duplicate parallel tool_use blocks for the
+ * same args in one turn; without this, both invocations race
+ * `checkoutPrBranch` against the same `.git/shallow.lock` and one fails with
+ * `File exists` (issue #642). cleared in `finally` so subsequent same-PR
+ * calls re-do the work normally.
+ */
+const inFlightCheckouts = new Map<number, Promise<CheckoutPrResult>>();
+
 export function CheckoutPrTool(ctx: ToolContext) {
+  const runCheckout = async (pull_number: number): Promise<CheckoutPrResult> => {
+    const prResponse = await ctx.octokit.rest.pulls.get({
+      owner: ctx.repo.owner,
+      repo: ctx.repo.name,
+      pull_number,
+    });
+
+    const headRepo = prResponse.data.head.repo;
+    if (!headRepo) {
+      throw new Error(`PR #${pull_number} source repository was deleted`);
+    }
+
+    const pr: PrData = {
+      number: pull_number,
+      headSha: prResponse.data.head.sha,
+      headRef: prResponse.data.head.ref,
+      headRepoFullName: headRepo.full_name,
+      baseRef: prResponse.data.base.ref,
+      baseRepoFullName: prResponse.data.base.repo.full_name,
+      maintainerCanModify: prResponse.data.maintainer_can_modify,
+    };
+
+    const checkoutResult = await checkoutPrBranch(pr, {
+      octokit: ctx.octokit,
+      owner: ctx.repo.owner,
+      name: ctx.repo.name,
+      gitToken: ctx.gitToken,
+      toolState: ctx.toolState,
+      shell: ctx.payload.shell,
+      postCheckoutScript: ctx.postCheckoutScript,
+      beforeSha: ctx.toolState.beforeSha,
+    });
+
+    const tempDir = process.env.PULLFROG_TEMP_DIR;
+    if (!tempDir) {
+      throw new Error(
+        "PULLFROG_TEMP_DIR not set - checkout_pr must run in pullfrog action context"
+      );
+    }
+
+    const headShort = ctx.toolState.checkoutSha!.slice(0, 7);
+
+    // compute incremental diff if we have a beforeSha to compare against
+    let incrementalDiffPath: string | undefined;
+    if (ctx.toolState.beforeSha && ctx.toolState.checkoutSha) {
+      const beforeShort = ctx.toolState.beforeSha.slice(0, 7);
+      const incremental = computeIncrementalDiff({
+        baseBranch: pr.baseRef,
+        beforeSha: ctx.toolState.beforeSha,
+        headSha: ctx.toolState.checkoutSha,
+      });
+      if (incremental) {
+        incrementalDiffPath = join(
+          tempDir,
+          `pr-${pull_number}-${beforeShort}-${headShort}-incremental.diff`
+        );
+        writeFileSync(incrementalDiffPath, incremental);
+        log.info(
+          `» incremental diff computed (${incremental.length} bytes) → ${incrementalDiffPath}`
+        );
+      }
+    }
+
+    // fetch PR files and format with line numbers
+    const formatResult = await fetchAndFormatPrDiff(ctx, pull_number);
+    const diffPreview = formatResult.content.split("\n").slice(0, 100).join("\n");
+    log.debug(`formatted diff preview (first 100 lines):\n${diffPreview}`);
+    const diffPath = join(tempDir, `pr-${pull_number}-${headShort}.diff`);
+    writeFileSync(diffPath, formatResult.content);
+    log.debug(`wrote diff to ${diffPath} (${formatResult.content.length} bytes)`);
+    ctx.toolState.diffCoverage = createDiffCoverageState({
+      diffPath,
+      totalLines: countLines({ content: formatResult.content }),
+      toc: formatResult.toc,
+      previous: ctx.toolState.diffCoverage,
+    });
+    log.debug(
+      `» diff coverage initialized: diffPath=${diffPath}, totalLines=${ctx.toolState.diffCoverage.totalLines}, tocEntries=${ctx.toolState.diffCoverage.tocEntries.length}`
+    );
+
+    // cache commentable-lines snapshot so review-time validation matches what
+    // GitHub will anchor to (commit_id=checkoutSha), even if the PR is updated
+    // between checkout and review.
+    const cached = new Map<string, ReturnType<typeof commentableLinesForFile>>();
+    for (const file of formatResult.files) {
+      cached.set(file.filename, commentableLinesForFile(file.patch));
+    }
+    ctx.toolState.commentableLinesByFile = cached;
+    ctx.toolState.commentableLinesPullNumber = pull_number;
+    ctx.toolState.commentableLinesCheckoutSha = ctx.toolState.checkoutSha;
+
+    const incrementalInstructions = incrementalDiffPath
+      ? ` IMPORTANT: incrementalDiffPath contains ONLY the changes since the last reviewed version ` +
+        `(computed via range-diff). you MUST read incrementalDiffPath FIRST to understand what changed, ` +
+        `then use diffPath for full PR context. do NOT skip the incremental diff.`
+      : "";
+
+    // commit metadata relative to the PR base (e.g. main). use origin/<base>
+    // because the local base ref may not exist after a shallow fetch. cap
+    // the log so a PR with thousands of commits doesn't blow up the tool
+    // response. if the base ref can't be resolved (e.g. shallow fetch that
+    // didn't pull down origin/<base>), degrade gracefully rather than
+    // failing the whole checkout_pr call over metadata.
+    const COMMIT_LOG_MAX = 200;
+    const baseRange = `origin/${pr.baseRef}..HEAD`;
+    let commitCount = 0;
+    let commitLog = "";
+    let commitLogUnavailable = false;
+    try {
+      commitCount = parseInt(
+        $("git", ["rev-list", "--count", baseRange], { log: false }).trim() || "0",
+        10
+      );
+      commitLog = $("git", ["log", "--oneline", `--max-count=${COMMIT_LOG_MAX}`, baseRange], {
+        log: false,
+      });
+    } catch (err) {
+      commitLogUnavailable = true;
+      log.debug(
+        `» unable to compute commit metadata for ${baseRange}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+    const commitLogTruncated = commitCount > COMMIT_LOG_MAX;
+
+    const hookWarningInstructions = checkoutResult.hookWarning
+      ? ` HOOK WARNING: the post-checkout lifecycle hook reported a non-fatal failure (see hookWarning). ` +
+        `decide whether to retry based on the guidance in that field before proceeding.`
+      : "";
+
+    const commitLogInstructions = commitLogUnavailable
+      ? ` NOTE: commit metadata is partial (base ref unreachable, likely a shallow fetch). ` +
+        `commitCount/commitLog may be 0/empty or incomplete; treat them as "unknown" rather than "no commits", ` +
+        `and use \`git log\` directly if you need the full history.`
+      : commitLogTruncated
+        ? ` NOTE: commitLog was capped at ${COMMIT_LOG_MAX} entries out of ${commitCount} commits; ` +
+          `use \`git log\` directly if you need the full history.`
+        : "";
+
+    return {
+      success: true,
+      number: prResponse.data.number,
+      title: prResponse.data.title,
+      body: prResponse.data.body,
+      base: pr.baseRef,
+      localBranch: `pr-${pull_number}`,
+      remoteBranch: `refs/heads/${pr.headRef}`,
+      isFork: pr.headRepoFullName !== pr.baseRepoFullName,
+      maintainerCanModify: pr.maintainerCanModify,
+      url: prResponse.data.html_url,
+      headRepo: pr.headRepoFullName,
+      diffPath,
+      incrementalDiffPath,
+      toc: formatResult.toc,
+      commitCount,
+      commitLog,
+      commitLogTruncated,
+      commitLogUnavailable,
+      hookWarning: checkoutResult.hookWarning,
+      instructions:
+        `the diff file at diffPath contains a table of contents (TOC) at the top listing every changed file with its line range. ` +
+        `use the TOC line ranges as your checklist and read specific files from the diff instead of reading the entire file. ` +
+        `for example, if the TOC says "src/foo.ts → lines 5-42", read lines 5-42 from diffPath to see that file's changes. ` +
+        `review files selectively based on relevance rather than reading everything sequentially. ` +
+        `to inspect the PR's changed files, use diffPath — do NOT run \`git diff <base>..<head>\` to re-derive what's already in diffPath. the formatted diff with line numbers is authoritative. ` +
+        `\`git log\` and \`git diff --stat\` are fine for commit-range overview, and \`git diff\` / \`git diff --cached\` are fine for inspecting *your own* uncommitted changes — but PR review content MUST come from diffPath. ` +
+        `before your review is submitted, a one-time coverage pre-flight may error listing unread TOC regions. ` +
+        `retry the same create_pull_request_review call to proceed — optionally after reading the listed ranges. the pre-flight will not block again this session. ` +
+        `the local branch is 'localBranch' (pr-{number}), not the remote branch name. ` +
+        `when pushing, omit branchName to use the current branch. do not use remoteBranch as a local branch name.` +
+        incrementalInstructions +
+        hookWarningInstructions +
+        commitLogInstructions,
+    } satisfies CheckoutPrResult;
+  };
+
   return tool({
     name: "checkout_pr",
     description:
@@ -599,178 +799,36 @@ export function CheckoutPrTool(ctx: ToolContext) {
       "If the error mentions `.git/shallow.lock: File exists` or `.git/index.lock: File exists`, that's a stale lock from a prior timed-out fetch — remove it via the shell tool (`rm -f .git/shallow.lock .git/index.lock`) and retry.",
     parameters: CheckoutPr,
     execute: execute(async ({ pull_number }) => {
-      const prResponse = await ctx.octokit.rest.pulls.get({
-        owner: ctx.repo.owner,
-        repo: ctx.repo.name,
-        pull_number,
-      });
-
-      const headRepo = prResponse.data.head.repo;
-      if (!headRepo) {
-        throw new Error(`PR #${pull_number} source repository was deleted`);
+      const inFlight = inFlightCheckouts.get(pull_number);
+      if (inFlight) {
+        log.info(`» checkout_pr({pull_number:${pull_number}}) already in flight — sharing result`);
+        return inFlight;
       }
 
-      const pr: PrData = {
-        number: pull_number,
-        headSha: prResponse.data.head.sha,
-        headRef: prResponse.data.head.ref,
-        headRepoFullName: headRepo.full_name,
-        baseRef: prResponse.data.base.ref,
-        baseRepoFullName: prResponse.data.base.repo.full_name,
-        maintainerCanModify: prResponse.data.maintainer_can_modify,
-      };
-
-      const checkoutResult = await checkoutPrBranch(pr, {
-        octokit: ctx.octokit,
-        owner: ctx.repo.owner,
-        name: ctx.repo.name,
-        gitToken: ctx.gitToken,
-        toolState: ctx.toolState,
-        shell: ctx.payload.shell,
-        postCheckoutScript: ctx.postCheckoutScript,
-        beforeSha: ctx.toolState.beforeSha,
-      });
-
-      const tempDir = process.env.PULLFROG_TEMP_DIR;
-      if (!tempDir) {
-        throw new Error(
-          "PULLFROG_TEMP_DIR not set - checkout_pr must run in pullfrog action context"
-        );
-      }
-
-      const headShort = ctx.toolState.checkoutSha!.slice(0, 7);
-
-      // compute incremental diff if we have a beforeSha to compare against
-      let incrementalDiffPath: string | undefined;
-      if (ctx.toolState.beforeSha && ctx.toolState.checkoutSha) {
-        const beforeShort = ctx.toolState.beforeSha.slice(0, 7);
-        const incremental = computeIncrementalDiff({
-          baseBranch: pr.baseRef,
-          beforeSha: ctx.toolState.beforeSha,
-          headSha: ctx.toolState.checkoutSha,
-        });
-        if (incremental) {
-          incrementalDiffPath = join(
-            tempDir,
-            `pr-${pull_number}-${beforeShort}-${headShort}-incremental.diff`
-          );
-          writeFileSync(incrementalDiffPath, incremental);
-          log.info(
-            `» incremental diff computed (${incremental.length} bytes) → ${incrementalDiffPath}`
+      // refuse to clobber an uncommitted tree whenever this call would move
+      // HEAD away from the target pr-N branch. keyed off the live current
+      // branch (not toolState.issueNumber, which is also written by
+      // get_issue / get_issue_comments / get_issue_events and so doesn't
+      // mean "currently checked out"). catches the subagent-sharing-cwd
+      // case from zed-industries/cloud (2026-05-18).
+      const currentBranch = $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false }).trim();
+      if (currentBranch !== `pr-${pull_number}`) {
+        const dirty = $("git", ["status", "--porcelain"], { log: false }).trim();
+        if (dirty) {
+          throw new Error(
+            `cannot checkout PR #${pull_number} while the working tree has uncommitted changes. ` +
+              `commit, push, or discard them before switching. dirty paths:\n${dirty}`
           );
         }
       }
 
-      // fetch PR files and format with line numbers
-      const formatResult = await fetchAndFormatPrDiff(ctx, pull_number);
-      const diffPreview = formatResult.content.split("\n").slice(0, 100).join("\n");
-      log.debug(`formatted diff preview (first 100 lines):\n${diffPreview}`);
-      const diffPath = join(tempDir, `pr-${pull_number}-${headShort}.diff`);
-      writeFileSync(diffPath, formatResult.content);
-      log.debug(`wrote diff to ${diffPath} (${formatResult.content.length} bytes)`);
-      ctx.toolState.diffCoverage = createDiffCoverageState({
-        diffPath,
-        totalLines: countLines({ content: formatResult.content }),
-        toc: formatResult.toc,
-        previous: ctx.toolState.diffCoverage,
-      });
-      log.debug(
-        `» diff coverage initialized: diffPath=${diffPath}, totalLines=${ctx.toolState.diffCoverage.totalLines}, tocEntries=${ctx.toolState.diffCoverage.tocEntries.length}`
-      );
-
-      // cache commentable-lines snapshot so review-time validation matches what
-      // GitHub will anchor to (commit_id=checkoutSha), even if the PR is updated
-      // between checkout and review.
-      const cached = new Map<string, ReturnType<typeof commentableLinesForFile>>();
-      for (const file of formatResult.files) {
-        cached.set(file.filename, commentableLinesForFile(file.patch));
-      }
-      ctx.toolState.commentableLinesByFile = cached;
-      ctx.toolState.commentableLinesPullNumber = pull_number;
-      ctx.toolState.commentableLinesCheckoutSha = ctx.toolState.checkoutSha;
-
-      const incrementalInstructions = incrementalDiffPath
-        ? ` IMPORTANT: incrementalDiffPath contains ONLY the changes since the last reviewed version ` +
-          `(computed via range-diff). you MUST read incrementalDiffPath FIRST to understand what changed, ` +
-          `then use diffPath for full PR context. do NOT skip the incremental diff.`
-        : "";
-
-      // commit metadata relative to the PR base (e.g. main). use origin/<base>
-      // because the local base ref may not exist after a shallow fetch. cap
-      // the log so a PR with thousands of commits doesn't blow up the tool
-      // response. if the base ref can't be resolved (e.g. shallow fetch that
-      // didn't pull down origin/<base>), degrade gracefully rather than
-      // failing the whole checkout_pr call over metadata.
-      const COMMIT_LOG_MAX = 200;
-      const baseRange = `origin/${pr.baseRef}..HEAD`;
-      let commitCount = 0;
-      let commitLog = "";
-      let commitLogUnavailable = false;
+      const promise = runCheckout(pull_number);
+      inFlightCheckouts.set(pull_number, promise);
       try {
-        commitCount = parseInt(
-          $("git", ["rev-list", "--count", baseRange], { log: false }).trim() || "0",
-          10
-        );
-        commitLog = $("git", ["log", "--oneline", `--max-count=${COMMIT_LOG_MAX}`, baseRange], {
-          log: false,
-        });
-      } catch (err) {
-        commitLogUnavailable = true;
-        log.debug(
-          `» unable to compute commit metadata for ${baseRange}: ${err instanceof Error ? err.message : String(err)}`
-        );
+        return await promise;
+      } finally {
+        inFlightCheckouts.delete(pull_number);
       }
-      const commitLogTruncated = commitCount > COMMIT_LOG_MAX;
-
-      const hookWarningInstructions = checkoutResult.hookWarning
-        ? ` HOOK WARNING: the post-checkout lifecycle hook reported a non-fatal failure (see hookWarning). ` +
-          `decide whether to retry based on the guidance in that field before proceeding.`
-        : "";
-
-      const commitLogInstructions = commitLogUnavailable
-        ? ` NOTE: commit metadata is partial (base ref unreachable, likely a shallow fetch). ` +
-          `commitCount/commitLog may be 0/empty or incomplete; treat them as "unknown" rather than "no commits", ` +
-          `and use \`git log\` directly if you need the full history.`
-        : commitLogTruncated
-          ? ` NOTE: commitLog was capped at ${COMMIT_LOG_MAX} entries out of ${commitCount} commits; ` +
-            `use \`git log\` directly if you need the full history.`
-          : "";
-
-      return {
-        success: true,
-        number: prResponse.data.number,
-        title: prResponse.data.title,
-        body: prResponse.data.body,
-        base: pr.baseRef,
-        localBranch: `pr-${pull_number}`,
-        remoteBranch: `refs/heads/${pr.headRef}`,
-        isFork: pr.headRepoFullName !== pr.baseRepoFullName,
-        maintainerCanModify: pr.maintainerCanModify,
-        url: prResponse.data.html_url,
-        headRepo: pr.headRepoFullName,
-        diffPath,
-        incrementalDiffPath,
-        toc: formatResult.toc,
-        commitCount,
-        commitLog,
-        commitLogTruncated,
-        commitLogUnavailable,
-        hookWarning: checkoutResult.hookWarning,
-        instructions:
-          `the diff file at diffPath contains a table of contents (TOC) at the top listing every changed file with its line range. ` +
-          `use the TOC line ranges as your checklist and read specific files from the diff instead of reading the entire file. ` +
-          `for example, if the TOC says "src/foo.ts → lines 5-42", read lines 5-42 from diffPath to see that file's changes. ` +
-          `review files selectively based on relevance rather than reading everything sequentially. ` +
-          `to inspect the PR's changed files, use diffPath — do NOT run \`git diff <base>..<head>\` to re-derive what's already in diffPath. the formatted diff with line numbers is authoritative. ` +
-          `\`git log\` and \`git diff --stat\` are fine for commit-range overview, and \`git diff\` / \`git diff --cached\` are fine for inspecting *your own* uncommitted changes — but PR review content MUST come from diffPath. ` +
-          `before your review is submitted, a one-time coverage pre-flight may error listing unread TOC regions. ` +
-          `retry the same create_pull_request_review call to proceed — optionally after reading the listed ranges. the pre-flight will not block again this session. ` +
-          `the local branch is 'localBranch' (pr-{number}), not the remote branch name. ` +
-          `when pushing, omit branchName to use the current branch. do not use remoteBranch as a local branch name.` +
-          incrementalInstructions +
-          hookWarningInstructions +
-          commitLogInstructions,
-      } satisfies CheckoutPrResult;
     }),
   });
 }

mcp/comment.ts

@@ -33,6 +33,7 @@ function buildCommentFooter(ctx: ToolContext, customParts?: string[]): string {
         : undefined,
     customParts,
     model: ctx.toolState.model,
+    fallbackFrom: ctx.toolState.modelFallback?.from,
   });
 }
 
@@ -67,7 +68,7 @@ export function CreateCommentTool(ctx: ToolContext) {
     description:
       "Create a comment on a GitHub issue or PR. " +
       'Example: `create_issue_comment({ issueNumber: 1234, body: "Thanks for the report." })`. ' +
-      "For progress/plan updates on the current run use report_progress instead. Use type: 'Plan' for plan comments.",
+      "For progress/plan updates on the current run use report_progress instead — plan output (initial post AND revisions) is always posted via report_progress, never via this tool.",
     parameters: Comment,
     execute: execute(async ({ issueNumber, body, type: commentType }) => {
       const bodyWithFooter = addFooter(ctx, body);
@@ -152,7 +153,7 @@ export function EditCommentTool(ctx: ToolContext) {
 export const ReportProgress = type({
   body: type.string.describe("the progress update content to share"),
   "target_plan_comment?": type("boolean").describe(
-    "when true, update the existing plan comment (from select_mode lookup) instead of the progress comment; use when editing an existing plan"
+    "for revising an existing plan comment ONLY. set to true only when the PlanEdit checklist from select_mode tells you to (i.e. a prior plan comment was found for this issue). NEVER set on the initial plan post — the initial plan reuses the run's progress comment and is posted by calling report_progress without this flag."
   ),
 });
 

mcp/git.ts

@@ -2,8 +2,8 @@ import { regex } from "arkregex";
 import { type } from "arktype";
 import type { StoredPushDest } from "../toolState.ts";
 import { log } from "../utils/cli.ts";
-import { $git } from "../utils/gitAuth.ts";
-import { executeLifecycleHook } from "../utils/lifecycle.ts";
+import { $git, $gitFetchWithDeepen } from "../utils/gitAuth.ts";
+import { executeLifecycleHook, type LifecycleHookFailure } from "../utils/lifecycle.ts";
 import { $ } from "../utils/shell.ts";
 import type { ToolContext } from "./server.ts";
 import { execute, tool } from "./shared.ts";
@@ -221,7 +221,7 @@ export function PushBranchTool(ctx: ToolContext) {
       'Example: `push_branch({})` to push the current branch. Example: `push_branch({ branchName: "pr-1" })` to push a specific local branch. ' +
       "If specifying branchName, use the LOCAL branch name (e.g., 'pr-1'), not the remote branch name. " +
       "The correct remote and remote branch are determined automatically from branch config set by checkout_pr. " +
-      "Requires a clean working tree. Runs the repository prepush hook (if configured) before the network push — hook failure means tests/lint or similar in that script failed, not necessarily a Pullfrog timeout. " +
+      "Requires a clean working tree. Runs the repository prepush hook (if configured) — best-effort. If the hook fails, the tool returns the failure output and every subsequent call this run skips the hook. " +
       "Never force push unless explicitly requested. Pushes to the default branch are blocked in restricted mode. " +
       "If the response reports a timeout, the underlying push may have actually succeeded — verify with `git log origin/<branch>` (or this tool with command 'log') before retrying, otherwise you'll push a duplicate.",
     parameters: PushBranch,
@@ -243,13 +243,38 @@ export function PushBranchTool(ctx: ToolContext) {
       if (status) {
         throw new Error(
           `push blocked: working tree is not clean (tracked changes and/or untracked files). commit, discard, or remove stray artifacts before pushing.\n\n` +
-            `git status:\n${status}`
+            `git status:\n${status}` +
+            (ctx.toolState.prepushFailureCount > 0
+              ? "\n\nnote: the prepush hook failed earlier this run — once the working tree is clean, push_branch will skip the hook."
+              : "")
         );
       }
 
       // validate push destination matches expected URL
       const pushDest = validatePushDestination(ctx, branch);
 
+      // backstop against subagent-induced cross-PR clobbers: a subagent
+      // shares cwd + toolState with the orchestrator, so its `checkout_pr(N)`
+      // moves HEAD to pr-N and persists pushDest pointing at the foreign
+      // PR's remote branch. refuse pr-N → origin/<other> pushes unless this
+      // run is itself scoped to PR N (zed-industries/cloud, 2026-05-18).
+      const prBranchMatch = branch.match(/^pr-(\d+)$/);
+      if (prBranchMatch && pushDest.remoteBranch !== branch) {
+        const prNumber = Number(prBranchMatch[1]);
+        const event = ctx.payload.event;
+        const runScoped = event.is_pr === true && event.issue_number === prNumber;
+        if (!runScoped) {
+          throw new Error(
+            `push blocked: local branch '${branch}' would push to '${pushDest.remoteName}/${pushDest.remoteBranch}', ` +
+              `but this run is not scoped to PR #${prNumber}. ` +
+              `the 'pr-${prNumber}' branch was created by a prior checkout_pr call (likely from a subagent — subagents share the working tree and toolState with the orchestrator). ` +
+              `you have probably landed your commit on the wrong branch. ` +
+              `switch to your own feature branch first (e.g. 'git checkout <feature-branch>') and then push. ` +
+              `if the push to PR #${prNumber} is intentional, this run needs to be triggered against that PR.`
+          );
+        }
+      }
+
       // block pushes to default branch in restricted mode
       if (pushPermission === "restricted" && pushDest.remoteBranch === defaultBranch) {
         throw new Error(
@@ -265,27 +290,31 @@ export function PushBranchTool(ctx: ToolContext) {
         ? ["--force", "-u", pushDest.remoteName, refspec]
         : ["-u", pushDest.remoteName, refspec];
 
-      // prepush failure should block the push — a passing hook is the gate
-      // that protects main from bad pushes.
-      const prepushHook = await executeLifecycleHook({
-        event: "prepush",
-        script: ctx.prepushScript,
-      });
-      if (prepushHook.warning) {
-        throw new Error(prepushHook.warning);
-      }
+      const prepushSkipped = ctx.toolState.prepushFailureCount > 0;
+      if (prepushSkipped) {
+        log.info(`» skipping prepush hook (failed earlier this run)`);
+      } else if (ctx.prepushScript) {
+        const prepushHook = await executeLifecycleHook({
+          event: "prepush",
+          script: ctx.prepushScript,
+        });
+        if (prepushHook.failure) {
+          ctx.toolState.prepushFailureCount += 1;
+          throw new Error(buildPrepushFailureMessage(prepushHook.failure, ctx.payload.shell));
+        }
 
-      // re-verify clean working tree after prepush. a hook that writes tracked
-      // files (formatter, type generator, build artifacts) would leave those
-      // changes uncommitted — pushing now would silently drop them, and the
-      // agent would report a "successful push" of code the hook had expected
-      // to be included.
-      const postHookStatus = $("git", ["status", "--porcelain"], { log: false });
-      if (postHookStatus) {
-        throw new Error(
-          `push blocked: the prepush hook modified the working tree. those changes are not included in the push. commit or discard them (or change the hook to not mutate tracked files) before retrying.\n\n` +
-            `git status:\n${postHookStatus}`
-        );
+        // re-verify clean working tree after prepush. a hook that writes tracked
+        // files (formatter, type generator, build artifacts) would leave those
+        // changes uncommitted — pushing now would silently drop them, and the
+        // agent would report a "successful push" of code the hook had expected
+        // to be included.
+        const postHookStatus = $("git", ["status", "--porcelain"], { log: false });
+        if (postHookStatus) {
+          throw new Error(
+            `push blocked: the prepush hook modified the working tree. those changes are not included in the push. commit or discard them (or change the hook to not mutate tracked files) before retrying.\n\n` +
+              `git status:\n${postHookStatus}`
+          );
+        }
       }
 
       log.debug(`pushing ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch}`);
@@ -359,18 +388,50 @@ export function PushBranchTool(ctx: ToolContext) {
         `» pushed branch ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch} (sha ${pushedSha})`
       );
 
+      const baseMsg = `successfully pushed ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch}`;
+      const message = prepushSkipped
+        ? `${baseMsg} (prepush hook skipped — failed earlier this run).`
+        : baseMsg;
+
       return {
         success: true,
         branch,
         remoteBranch: pushDest.remoteBranch,
         remote: pushDest.remoteName,
         force,
-        message: `successfully pushed ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch}`,
+        prepushSkipped,
+        message,
       };
     }),
   });
 }
 
+/** agent-facing prepush failure message: script output + bypass guidance,
+ * with no generic lifecycle retry advice (which would conflict). */
+function buildPrepushFailureMessage(
+  failure: LifecycleHookFailure,
+  shell: ToolContext["payload"]["shell"]
+): string {
+  const header =
+    failure.kind === "exit"
+      ? `prepush hook failed with exit code ${failure.exitCode}.\n\nscript output:\n${failure.output || "(empty)"}`
+      : failure.kind === "timeout"
+        ? `prepush hook timed out — the script is hung or doing too much work.`
+        : `prepush hook failed to spawn: ${failure.spawnError}.`;
+
+  const ifRealBug =
+    shell === "disabled"
+      ? `fix it before pushing again — shell access is disabled in this run, so you can't re-run the hook command yourself.`
+      : `run the hook command yourself via the shell tool to iterate (push_branch will NOT re-run it).`;
+
+  return (
+    `${header}\n\n` +
+    `this repo's prepush hook is best-effort: the next push_branch call will SKIP the hook and proceed. ` +
+    `if the failure is unrelated to your changes (pre-existing breakage, flaky check), just call push_branch again. ` +
+    `if it could be a real bug in your code, ${ifRealBug}`
+  );
+}
+
 // commands that require authentication - redirect to dedicated tools.
 // exported so tests can exercise the same table the runtime uses.
 //
@@ -490,6 +551,30 @@ export function GitTool(ctx: ToolContext) {
         }
       }
 
+      // `git merge-base --is-ancestor` uses exit codes as data: 0 = ancestor,
+      // 1 = not-an-ancestor, >1 = real error. Surface the binary answer
+      // instead of throwing on exit 1. see #766.
+      if (command === "merge-base" && args.includes("--is-ancestor")) {
+        let isAncestor = true;
+        $("git", [command, ...args], {
+          log: false,
+          onError: (r) => {
+            if (r.status === 1) {
+              isAncestor = false;
+              return;
+            }
+            const detail = [r.stderr, r.stdout]
+              .map((s) => s.trim())
+              .filter(Boolean)
+              .join("\n");
+            throw new Error(
+              `git merge-base --is-ancestor failed (exit ${r.status}): ${detail || "Unknown error"}`
+            );
+          },
+        });
+        return { success: true, isAncestor };
+      }
+
       const output = $("git", [command, ...args], { log: false });
       const lineCount = output.split("\n").length;
       if (lineCount > COLLAPSE_THRESHOLD) {
@@ -510,21 +595,6 @@ const GitFetch = type({
   depth: type.number.describe("Fetch depth (for shallow clones)").optional(),
 });
 
-// when an agent-supplied depth is too shallow to reach the merge base, git
-// surfaces "Could not read <sha>" and "remote did not send all necessary
-// objects". detect both wordings so a single deepen retry can recover before
-// the error reaches the agent (issue #564). git emits the full OID via
-// oid_to_hex, so the bound is 40 (SHA-1) or 64 (SHA-256).
-const SHALLOW_UNREACHABLE_PATTERNS: RegExp[] = [
-  /Could not read [a-f0-9]{40,64}/,
-  /remote did not send all necessary objects/,
-];
-
-// large enough to clear the merge base on most real-world PRs without
-// downloading the full history; matches the fallback used by checkoutPrBranch
-// when the compare API is unavailable.
-const DEEPEN_RETRY_DEPTH = 1000;
-
 export function GitFetchTool(ctx: ToolContext) {
   return tool({
     name: "git_fetch",
@@ -538,22 +608,7 @@ export function GitFetchTool(ctx: ToolContext) {
       if (params.depth !== undefined) {
         fetchArgs.push(`--depth=${params.depth}`);
       }
-      try {
-        await $git("fetch", fetchArgs, { token: ctx.gitToken });
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        const isShallowUnreachable = SHALLOW_UNREACHABLE_PATTERNS.some((p) => p.test(msg));
-        const isShallow =
-          isShallowUnreachable &&
-          $("git", ["rev-parse", "--is-shallow-repository"], { log: false }).trim() === "true";
-        if (!isShallow) throw err;
-        log.info(
-          `» git_fetch hit shallow-unreachable error, retrying with --deepen=${DEEPEN_RETRY_DEPTH}`
-        );
-        await $git("fetch", [`--deepen=${DEEPEN_RETRY_DEPTH}`, "--no-tags", "origin", params.ref], {
-          token: ctx.gitToken,
-        });
-      }
+      await $gitFetchWithDeepen(fetchArgs, { token: ctx.gitToken }, "git_fetch");
       return { success: true, ref: params.ref };
     }),
   });

mcp/issueEvents.ts

@@ -27,10 +27,11 @@ export function GetIssueEventsTool(ctx: ToolContext) {
       const relevantEventTypes = new Set(["cross_referenced", "referenced"]);
 
       const parsedEvents = events.flatMap((event) => {
-        // Filter to only events with an 'event' property and relevant types
-        if (!("event" in event) || !relevantEventTypes.has(event.event)) {
-          return [];
-        }
+        // octokit's timeline-event union includes members with `event?:
+        // string`, so `"event" in event` does not narrow it to defined.
+        // require a string before the Set.has() check.
+        if (!("event" in event) || typeof event.event !== "string") return [];
+        if (!relevantEventTypes.has(event.event)) return [];
 
         const baseEvent: Record<string, any> = {
           event: event.event,

mcp/pr.ts

@@ -23,6 +23,7 @@ function buildPrBodyWithFooter(ctx: ToolContext, body: string): string {
       ? { owner: ctx.repo.owner, repo: ctx.repo.name, runId: ctx.runId, jobId: ctx.jobId }
       : undefined,
     model: ctx.toolState.model,
+    fallbackFrom: ctx.toolState.modelFallback?.from,
   });
 
   const bodyWithoutFooter = stripExistingFooter(fixDoubleEscapedString(body));

mcp/review.ts

@@ -316,7 +316,7 @@ export const CreatePullRequestReview = type({
     .optional(),
   approved: type.boolean
     .describe(
-      "Set to true to submit as an approval. Use for both 'no issues found' and informational `> [!NOTE]` reviews where the PR is mergeable as-is and nothing in the body warrants code changes — approving also suppresses the Fix-button footer affordance so users don't dispatch a fix run on non-actionable feedback. Reserve approved: false for `> [!IMPORTANT]` (recommended changes) and `> [!CAUTION]` (critical) reviews. Defaults to false (comment-only review). Rejections are not supported."
+      "Set to true to submit as an approval. Use for `> ✅ No new issues found.` reviews where the PR is mergeable as-is and nothing in the body warrants code changes — approving also suppresses the Fix-button footer affordance so users don't dispatch a fix run on non-actionable feedback. Reserve approved: false for `> ℹ️ ...` (minor suggestions inline), `> [!IMPORTANT]` (recommended changes), and `> [!CAUTION]` (critical) reviews. Defaults to false (comment-only review). Rejections are not supported."
     )
     .optional(),
   commit_id: type.string
@@ -850,8 +850,8 @@ async function createAndSubmitWithFooter(
   // introduce new throw paths. keep the whole body wrapped.
   try {
     // Fix buttons are suppressed on approving reviews — those are mergeable
-    // by definition (either "no issues found" or `> [!NOTE]` informational
-    // observations), so dispatching a fix run would be a UX trap.
+    // by definition (the `> ✅ No new issues found.` tier, with no inline
+    // comments), so dispatching a fix run would be a UX trap.
     const customParts: string[] = [];
     if (!opts.approved) {
       const apiUrl = getApiUrl();
@@ -871,6 +871,7 @@ async function createAndSubmitWithFooter(
         : undefined,
       customParts,
       model: ctx.toolState.model,
+      fallbackFrom: ctx.toolState.modelFallback?.from,
     });
 
     return await ctx.octokit.rest.pulls.submitReview({

mcp/reviewComments.ts

@@ -693,6 +693,8 @@ export function ListPullRequestReviewsTool(ctx: ToolContext) {
           state: review.state,
           user: review.user?.login,
           submitted_at: review.submitted_at,
+          commit_id: review.commit_id,
+          html_url: review.html_url,
         })),
         count: reviews.length,
       };

mcp/server.ts

@@ -63,10 +63,10 @@ export interface ToolContext {
   mcpServerUrl: string;
   tmpdir: string;
   // repo-level OSS flag + account-level billing plan. together they decide
-  // whether pullfrog is paying for marginal infra — see isInfraCovered in
-  // utils/runContext.ts. plan gating for endpoints like the learnings PATCH
-  // is enforced server-side via 402, so we pass plan along mostly for future
-  // use / observability. see wiki/pricing.md.
+  // whether pullfrog is paying for marginal infra — see `isInfraCovered` in
+  // the server's `utils/billing.ts`. plan gating for endpoints like the
+  // learnings PATCH is enforced server-side via 402, so we pass plan along
+  // mostly for future use / observability. see wiki/pricing.md.
   oss: boolean;
   plan: AccountPlan;
   // resolved upstream model specifier (e.g. "google/gemini-3.1-pro-preview").

mcp/shell.ts

@@ -96,6 +96,27 @@ function detectSandboxMethod(): SandboxMethod {
 const PROC_CLEANUP =
   "umount /proc 2>/dev/null; umount /proc 2>/dev/null; mount -t proc proc /proc 2>/dev/null;";
 
+// block container-runtime sockets that would otherwise grant a PID-namespace
+// escape: `docker run --pid=host --privileged busybox cat /proc/<pid>/environ`
+// reads the parent action process's env (which contains user secrets) even
+// though the sandbox itself is unsharing PIDs. GHA `ubuntu-latest` puts the
+// `runner` user in the `docker` group by default, so the socket is reachable
+// without sudo. bind-mounting /dev/null on top inside the sandbox's mount
+// namespace makes the socket unreachable from sandboxed shells without
+// touching the host runner (so it doesn't break user workflow steps that
+// run before/after pullfrog and legitimately need docker). same trick for
+// podman/containerd/cri-o sockets — all silent-fail if the path is missing.
+const SOCKET_CLEANUP = [
+  "/var/run/docker.sock",
+  "/run/docker.sock",
+  "/var/run/podman/podman.sock",
+  "/run/podman/podman.sock",
+  "/run/containerd/containerd.sock",
+  "/var/run/crio/crio.sock",
+]
+  .map((path) => `mount --bind /dev/null ${path} 2>/dev/null;`)
+  .join(" ");
+
 function spawnShell(params: SpawnParams): ChildProcess {
   const spawnOpts = { env: params.env, cwd: params.cwd, stdio: params.stdio, detached: true };
   const sandboxMethod = detectSandboxMethod();
@@ -110,7 +131,14 @@ function spawnShell(params: SpawnParams): ChildProcess {
   if (sandboxMethod === "unshare") {
     return spawn(
       "unshare",
-      ["--pid", "--fork", "--mount-proc", "bash", "-c", `${PROC_CLEANUP} ${params.command}`],
+      [
+        "--pid",
+        "--fork",
+        "--mount-proc",
+        "bash",
+        "-c",
+        `${PROC_CLEANUP} ${SOCKET_CLEANUP} ${params.command}`,
+      ],
       spawnOpts
     );
   }
@@ -143,7 +171,7 @@ function spawnShell(params: SpawnParams): ChildProcess {
         "--mount-proc",
         "bash",
         "-c",
-        `${PROC_CLEANUP} exec su -p -s /bin/bash ${username} -c '${escaped}'`,
+        `${PROC_CLEANUP} ${SOCKET_CLEANUP} exec su -p -s /bin/bash ${username} -c '${escaped}'`,
       ],
       { ...spawnOpts, env: {} }
     );
@@ -176,6 +204,23 @@ function getTempDir(): string {
   return tempDir;
 }
 
+/** chars of shell output kept inline in the agent reply. anything past this
+ * blows the agent's context budget on commands that dump big logs (test
+ * runners, build tools, grep on large trees), so the overflow is spilled
+ * to a tempfile the agent can re-read selectively (cat/tail/grep). */
+export const MAX_OUTPUT_CHARS = 5000;
+
+/** if `output` exceeds `MAX_OUTPUT_CHARS`, persist the full body to a
+ * tempfile and return the last `MAX_OUTPUT_CHARS` prefixed with a sentinel
+ * pointing at the saved path. otherwise return as-is. */
+function capOutput(output: string): string {
+  if (output.length <= MAX_OUTPUT_CHARS) return output;
+  const fullPath = join(getTempDir(), `shell-${randomUUID().slice(0, 8)}.log`);
+  writeFileSync(fullPath, output);
+  const elided = output.length - MAX_OUTPUT_CHARS;
+  return `... [${elided} chars truncated; full output saved to ${fullPath}] ...\n${output.slice(-MAX_OUTPUT_CHARS)}`;
+}
+
 /** detect git as a command invocation (not as part of another word like .gitignore) */
 function isGitCommand(command: string): boolean {
   const trimmed = command.trim();
@@ -196,6 +241,8 @@ Use this tool to:
 - Execute build tools (npm, pnpm, cargo, make, etc.)
 - Run tests and linters
 
+Output is capped at ${MAX_OUTPUT_CHARS} chars: if exceeded, only the tail is returned and the full body is saved to a tempfile (path included in the response). Re-read the tempfile with cat/tail/grep when you need more.
+
 Do NOT use this tool for git commands — use the dedicated git tools instead.`,
     parameters: ShellParams,
     execute: execute(async (params) => {
@@ -301,13 +348,14 @@ Do NOT use this tool for git commands — use the dedicated git tools instead.`,
           : `[timed out after ${timeout}ms]`;
 
       const finalExitCode = exitCode ?? (timedOut ? 124 : -1);
+      const trimmed = output.trim();
       if (finalExitCode !== 0) {
         log.info(`shell command failed with exit code ${finalExitCode}: ${params.command}`);
-        if (output) log.info(`output: ${output.trim()}`);
+        if (trimmed) log.info(`output: ${trimmed}`);
       }
 
       return {
-        output: output.trim(),
+        output: capOutput(trimmed),
         exit_code: finalExitCode,
         timed_out: timedOut,
       };

models.ts

@@ -74,6 +74,11 @@ interface ModelDef {
 export interface ProviderConfig {
   displayName: string;
   envVars: readonly string[];
+  /** credentials authored only via `pullfrog auth <provider>` — never
+   * user-facing in `init`, never documented as a manual GHA secret. counted
+   * for hasAnyKey / log-redaction purposes but excluded from any prompt /
+   * paste flow. CLI-managed magic. see wiki/codex-auth.md. */
+  managedCredentials?: readonly string[];
   models: Record<string, ModelDef>;
 }
 
@@ -110,6 +115,7 @@ export const providers = {
   openai: provider({
     displayName: "OpenAI",
     envVars: ["OPENAI_API_KEY"],
+    managedCredentials: ["CODEX_AUTH_JSON"],
     models: {
       gpt: {
         displayName: "GPT",
@@ -170,11 +176,15 @@ export const providers = {
         resolve: "google/gemini-3.1-pro-preview",
         openRouterResolve: "openrouter/google/gemini-3.1-pro-preview",
         preferred: true,
-        subagentModel: "gemini-flash",
+        // Inherit (subagents stay on Pro). Google has no in-between tier;
+        // dropping to Flash for review work was a meaningful capability cliff
+        // (Flash missed the catastrophic camelCase/snake_case mismatch in
+        // the v4 e2e test). Pro is cost-effective enough to use for both
+        // orchestrator and lenses.
       },
       "gemini-flash": {
         displayName: "Gemini Flash",
-        resolve: "google/gemini-3-flash-preview",
+        resolve: "google/gemini-3.5-flash",
         openRouterResolve: "openrouter/google/gemini-3-flash-preview",
       },
     },
@@ -189,15 +199,22 @@ export const providers = {
         openRouterResolve: "openrouter/x-ai/grok-4.3",
         preferred: true,
       },
+      // legacy aliases — xAI retired the entire fast/code-fast line on
+      // 2026-05-15 (https://docs.x.ai/developers/migration/may-15-deprecation)
+      // and now redirects every deprecated text-model slug to grok-4.3 at
+      // standard pricing. fall back to the live `xai/grok` so the alias
+      // chain resolves to grok-4.3 for both direct-key and OpenRouter users.
       "grok-fast": {
         displayName: "Grok Fast",
         resolve: "xai/grok-4-1-fast",
-        openRouterResolve: "openrouter/x-ai/grok-4.1-fast",
+        openRouterResolve: "openrouter/x-ai/grok-4.3",
+        fallback: "xai/grok",
       },
       "grok-code-fast": {
         displayName: "Grok Code Fast",
         resolve: "xai/grok-code-fast-1",
-        openRouterResolve: "openrouter/x-ai/grok-code-fast-1",
+        openRouterResolve: "openrouter/x-ai/grok-4.3",
+        fallback: "xai/grok",
       },
     },
   }),
@@ -312,7 +329,7 @@ export const providers = {
         displayName: "Gemini Pro",
         resolve: "opencode/gemini-3.1-pro",
         openRouterResolve: "openrouter/google/gemini-3.1-pro-preview",
-        subagentModel: "gemini-flash",
+        // Inherit — see google/gemini-pro for rationale.
       },
       "gemini-flash": {
         displayName: "Gemini Flash",
@@ -425,7 +442,7 @@ export const providers = {
         displayName: "Gemini Pro",
         resolve: "openrouter/google/gemini-3.1-pro-preview",
         openRouterResolve: "openrouter/google/gemini-3.1-pro-preview",
-        subagentModel: "gemini-flash",
+        // Inherit — see google/gemini-pro for rationale.
       },
       "gemini-flash": {
         displayName: "Gemini Flash",
@@ -500,6 +517,16 @@ export function getModelEnvVars(slug: string): string[] {
   return providerConfig.envVars.slice();
 }
 
+/** managed credentials are authored only via `pullfrog auth <provider>` — they
+ * count as "configured" for hasAnyKey-style UI checks but are never offered as
+ * a manual-paste option in `init` or the AgentSettings env-var button row.
+ * see `provider.managedCredentials` and wiki/codex-auth.md. */
+export function getModelManagedCredentials(slug: string): string[] {
+  const parsed = parseModel(slug);
+  const providerConfig = (providers as Record<string, ProviderConfig>)[parsed.provider];
+  return providerConfig?.managedCredentials?.slice() ?? [];
+}
+
 // ── derived flat list ──────────────────────────────────────────────────────────
 
 export const modelAliases: ModelAlias[] = Object.entries(providers).flatMap(

modes.ts

@@ -10,60 +10,154 @@ export interface Mode {
   prompt?: string | undefined;
 }
 
-// Default user-facing summary format embedded in Review mode review bodies.
-// Deliberately scoped to Review (initial PR review). IncrementalReview keeps
-// its own terser bullet-list "Reviewed changes" shape since re-review bodies
-// are deltas, not introductions. Distinct from the agent-internal snapshot
-// (action/utils/prSummary.ts) which has its own stable scaffold and is never
-// shaped by user instructions — see selectMode.ts for the firewall.
+// Default user-facing summary format embedded in BOTH Review and
+// IncrementalReview review bodies. The two modes share the preamble +
+// cross-cutting + nitpicks shape; the only difference is scope (full PR for
+// Review vs delta against the prior pullfrog review for IncrementalReview).
+// Distinct from the agent-internal snapshot (action/utils/prSummary.ts) which
+// has its own stable scaffold and is never shaped by user instructions — see
+// selectMode.ts for the firewall.
 export const PR_SUMMARY_FORMAT = `### Default format
 
-Follow this structure exactly:
+The body has at most three parts in this exact order:
 
-<b>TL;DR</b> — 1-3 sentences on what the PR does and why. Focus on intent, not mechanics.
-NOTE: use HTML bold <b>TL;DR</b>, NOT markdown bold **TL;DR**.
+1. **Reviewed changes preamble** — one bolded inline lead-in describing what was reviewed in this run, a bullet list of the substantive changes, and an HTML comment carrying review metadata for downstream agents.
+2. **Cross-cutting issue sections** (zero or more) — one \`### \` heading per concern, with a human-readable problem write-up and a collapsed \`<details>Technical details</details>\` block underneath.
+3. **\`### ℹ️ Nitpicks\`** at the very bottom (only if there are nits worth surfacing in the body) — a flat bullet list, no technical-details block.
 
-### Key changes
+Inline-vs-body split: concerns that anchor to a specific line go inline (use the \`comments\` parameter). Body \`### \` sections are reserved for concerns that **have no line to anchor to** — typically because the concern is about *absence* (something the diff should have done but didn't), *sequencing* (rollout / deletion / migration order), *design decisions only the human can make*, or *scope questions the diff implicitly raises but doesn't address*. A concern that anchors to a line but has broad implications still goes inline (use the technical-details block there to capture the implications — see Inline technical details below). If you found no non-anchorable concerns, the body has zero \`### \` issue sections — just the preamble + metadata.
 
-- **Short human-readable title** — 1 sentence per change. Write a short prose phrase (title case or sentence case); when you name a file, type, or function, put that name in backticks (e.g. **Add \`TodoTracker\` for live checklists**). A reviewer should understand the full PR from this list alone.
+## 1. Reviewed changes preamble
 
-<sub><b>Summary</b> ｜ {file_count} files ｜ {commit_count} commits ｜ base: \`{base}\` ← \`{head}\`</sub>
-NOTE: the metadata line goes AFTER the bullet list, not before it.
+Open with a single bolded inline lead-in followed immediately by the bullet list (no \`### Key changes\` heading, no \`<b>TL;DR</b>\`):
 
-Then for each key change, a ## section with a short descriptive title that reads like a documentation heading (e.g. ## Live todo checklist tracking).
+\`\`\`
+**Reviewed changes** — one sentence on what was reviewed in this run. For Review (initial), this is what the PR does and why. For IncrementalReview, this is what changed since the prior pullfrog review. Focus on intent, not mechanics.
 
-<br/>
+- **Short human-readable title** — 1 sentence per substantive change. Write a short prose phrase; when you name a file, type, or function, put that name in backticks (e.g. **Add \\\`TodoTracker\\\` for live checklists**). A reviewer should understand the full reviewed scope from this list alone — this IS the dispassionate "what was reviewed and what changed" overview, so cover the substantive changes, not just the loudest ones.
 
-## Example readable section title
+<!--
+Pullfrog review metadata — for any agent (or human-with-agent) reading this
+review. Incorporate the fields below into your understanding of the context
+this review was made in. The findings below were written against
+{head_sha_short}; if new commits have landed on {head_ref} since this review
+was submitted, treat any specific bug, file, or line callout as POTENTIALLY
+STALE — re-diff against {head_sha_short} (or trigger a fresh review) and
+factor commits past {head_sha_short} into your understanding of the current
+state before acting on findings.
 
-> **Before:** [old behavior/state]<br/>**After:** [new behavior/state]
-IMPORTANT: Before and After MUST be on a SINGLE blockquote line with an inline <br/> between them. Two separate \`>\` lines creates a double line break.
+- Mode: Review (initial)   or   IncrementalReview (delta against prior pullfrog review)
+- Files reviewed: {file_count}
+- Commits reviewed: {commit_count}
+- Base: {base_ref} ({base_sha_short})
+- Head: {head_ref} ({head_sha_short})
+- Reviewed commits:
+  - {sha_short} — {commit_subject}
+  - ...
+- Prior pullfrog review: none   or   {prior_sha_short} ({prior_review_html_url})
+- Submitted at: {iso_timestamp}
+-->
+\`\`\`
 
-1-2 sentences of explanation. Break up text with tables, blockquotes, or lists — NEVER 3+ plain paragraphs in a row.
+Pull every metadata field from the \`checkout_pr\` tool's response — file count, commit count, base/head ref + SHA, the commit list. For \`IncrementalReview\` runs, populate \`Prior pullfrog review\` with the prior review's commit_id (short SHA) and \`html_url\` from \`list_pull_request_reviews\`.
 
-If a change warrants deeper explanation, use a blockquoted details/summary framed as a question:
-> <details><summary>How does X work?</summary>
-> Extended explanation here.
-> </details>
+## 2. Cross-cutting issue sections (zero or more)
 
-End each section with a file links trail (3-4 key files max):
-[\`file.ts\`](https://github.com/{owner}/{repo}/pull/{number}/files#diff-{sha256hex_of_filepath}) · ...
+For each cross-cutting concern, one \`### \` section. Use this exact shape:
 
-Single-feature PRs: skip the ## sections. Fold before/after and explanation into the header after key changes.
+\`\`\`
+### {emoji} {short, descriptive title — what's wrong, not what to do}
 
-CRITICAL — GitHub markdown rendering rule:
-GitHub's markdown parser requires a blank line between ALL block-level elements. This includes transitions between: HTML tags (<br/>, <sub>, <details>, <b>, etc.) and markdown syntax (headings, lists, blockquotes, paragraphs). Without a blank line, GitHub treats the following content as a continuation of the HTML block and renders markdown syntax as literal text. ALWAYS separate block-level elements with a blank line.
+{Human-readable problem write-up. Describes the PROBLEM only — what's broken, what the symptom is, what the blast radius is. NO asks, NO suggested fixes, NO "the right thing to do is...". Asks and fixes live in the technical-details block below; the visible part is for the human to *understand* the problem, not to implement it.}
 
-Rules:
-- \`##\` titles and key-change bullet lead-ins are plain-language summaries; backtick only actual code tokens (files, types, functions) where they appear in the title
-- ALL variable names, identifiers, and file names in body text must be in backticks
-- ALL file references MUST link to the PR Files Changed view. Use the \`diff-<hex>\` anchor precomputed next to each filename in the \`checkout_pr\` TOC — do NOT run \`sha256sum\` or any other shell command to compute anchors. NEVER fabricate hex strings. If a file is not in the TOC, omit the \`#diff-\` anchor rather than guessing.
-- Add <br/> before each ## heading for visual spacing. Do NOT use horizontal rules (---)
-- Do NOT include raw diff stats like '+123 / -45' or line counts
-- Do NOT include code blocks or repeat diff contents
-- Do NOT include a changelog section — the key changes list serves this purpose
-- Focus on *intent*, not *what* — the diff already shows what changed
-- Get the file count and commit count from the checkout_pr metadata, not by counting manually`;
+<details><summary>Technical details</summary>
+
+\\\`\\\`\\\`\\\`markdown
+# {title repeated}
+
+## Affected sites
+- {file path:line} — {what's wrong there}
+- ...
+
+## Required outcome
+- {what the fix needs to achieve, not how to achieve it}
+- ...
+
+## Suggested approach (optional)
+{When the fix shape is non-obvious, sketch one or more reasonable directions. Skip when the outcome alone makes the fix obvious.}
+
+## Open questions for the human (optional)
+- {Any decision an implementing agent shouldn't make unilaterally — pricing thresholds, breaking-change policy, naming, scope of follow-up.}
+\\\`\\\`\\\`\\\`
+
+</details>
+\`\`\`
+
+Concrete example of the visible part of a non-anchored section (technical-details block unchanged from the template above):
+
+\`\`\`
+### ℹ️ Legacy \`opencode.ts\` has no documented deletion plan
+
+The v2 harness lands alongside the v1 file and imports one helper from it. Worth a follow-up issue or a TODO so the next maintainer doesn't have to re-derive the cleanup plan.
+\`\`\`
+
+The example's value is its *shape*: a finding about absence (no deletion plan), not a line-anchored bug. Body sections live or die on whether the concern genuinely doesn't fit on a line.
+
+**Heading severity emoji** — every \`### \` heading carries one:
+
+- 🚨 critical — blocks merge (data loss, security, broken core flow)
+- ⚠️ important — must address before merging (regression, missing validation, incorrect behavior)
+- ℹ️ informational — surfaced for awareness; mergeable as-is
+
+**Visible problem write-up rules:**
+
+- **No asks, no suggested fixes** in the visible part. The visible portion describes the problem; the technical-details block describes the fix shape and any open questions. The exception: a fix so self-evident that NOT stating it would be weird (e.g. "the typo is missing an 'r'") — in that case, fold it into the problem statement and skip the suggested-approach block in technical details too.
+- **Never two successive plain paragraphs.** Every transition between block-level elements must alternate prose with structure: paragraph → bullet list → paragraph; paragraph → code fence → bullet list; paragraph → table → paragraph. Two consecutive paragraphs in a row create a wall of text that's impossible to digest. If you catch yourself writing one, find a way to split it: pull a list out of it, drop a 2-3 line code fence between them, or merge them into a single tighter paragraph.
+- **Per-paragraph budget:** ~3 sentences max. Past that, you're explaining where you should be structuring.
+- **Identifier discipline still applies** in the visible part. Lead with behavior in plain English; name an identifier only when it's the subject of the concern or a public surface a reader would recognize. The technical-details block is where dense identifier references belong.
+
+**Technical-details block rules:**
+
+- Wrapped in a 4-backtick markdown fence (\`\\\`\\\`\\\`\\\`markdown ... \\\`\\\`\\\`\\\`\`) so it's visually distinct, one-click copyable, and can contain its own 3-backtick code fences without escape gymnastics. The contents are agent-readable — a fix-agent will pull the body down and use this block as the brief.
+- File paths and \`file:line\` refs are encouraged (and necessary) — the next agent uses these to navigate. Identifier density is fine here.
+- Slightly more verbose than the absolute minimum is OK when it materially helps the next agent: a small code snippet showing the symptom, a short table of mismatched key/column pairs, a one-paragraph "why CI doesn't catch it" note. Skip massive regression-test scaffolding or full route rewrites — the implementing agent writes those.
+- Use the four standard sections (\`Affected sites\`, \`Required outcome\`, optional \`Suggested approach\`, optional \`Open questions for the human\`). Skip the optional sections when they wouldn't add anything.
+
+## Inline technical details
+
+Inline comments are short (~2-3 sentences) by default. When an inline finding has broader implications worth recording for a fix-agent — e.g. a localized bug whose proper fix requires touching several files, or where the right fix depends on a design decision the human needs to make — append a collapsed \`<details><summary>Technical details</summary>\` block to the inline comment's body. Same shape as the body-section technical-details block (4-backtick fenced markdown, \`## Affected sites\` / \`## Required outcome\` / optional \`## Suggested approach\` / optional \`## Open questions for the human\`).
+
+GitHub renders the same markdown parser in inline comments as in the review body, so the collapsed-details affordance works the same way. The visible part of the inline comment stays scannable; the depth is one click away for any agent that needs it.
+
+## 3. \`### ℹ️ Nitpicks\` (optional, last section)
+
+Only when there are nits that for some reason can't be inlined. Filepaths in nit text are fine — these are simple enough that a human or agent reads once and acts. No technical-details block.
+
+\`\`\`
+### ℹ️ Nitpicks
+
+- {nit, with file path inline if useful, ≤ ~200 chars}
+- ...
+\`\`\`
+
+## Inline comment shape
+
+Inline comments use the same severity framing as body \`### \` sections, scaled down for line-anchored use:
+
+- **Lead with a 1-2 sentence problem statement.** The reader is looking at the line in question, so don't restate what the line says — describe what's wrong with it. Optionally prefix the visible line with a severity emoji (🚨 / ⚠️ / ℹ️) when severity isn't obvious from context.
+- **Optional \`<details><summary>Technical details</summary>...</details>\` collapsible** for findings whose technical context (longer file:line references, related-code snippets, suggested approach, regression-risk notes) would overwhelm the human-readable lead-in. Same agent-readable purpose, same 4-backtick fence shape, and same 4-section structure as the body's technical-details block — see *Inline technical details* above. Encouraged whenever the depth helps a downstream fix-agent; don't force one when the inline lead-in already says everything.
+- **Visible portion ≤ 2-3 sentences.** If you find yourself writing more, that's the cue to split the depth into the \`Technical details\` collapsible.
+
+## Body-wide rules
+
+- **Inline-vs-body discipline (repeated for emphasis):** anything that anchors to a specific line goes inline (with a \`<details>Technical details</details>\` block when the implications are broad). The body is for non-anchorable concerns only — absence, sequencing, design decisions, scope questions, architectural risk.
+- **No \`### Issues found\` heading** above the issue sections — each \`### \` heading IS the issue.
+- **Severity emoji on every \`### \` heading** (🚨 / ⚠️ / ℹ️). No emoji on the preamble lead-in or anywhere else.
+- **GitHub block-level rendering**: GitHub's markdown parser requires a blank line between ALL block-level elements (HTML tags like \`<br/>\`, \`<sub>\`, \`<details>\`, \`<b>\` and markdown syntax like headings, lists, blockquotes, code fences, paragraphs). Without a blank line, GitHub treats following content as a continuation of the HTML block and renders markdown syntax as literal text. ALWAYS separate block-level elements with a blank line.
+- **Backtick-wrap** every variable, identifier, or file name when you mention one (in either visible or technical-details portions).
+- **Don't repeat diff content**, don't include raw \`+123 / -45\` stats, don't include a changelog section, don't use horizontal rules (\`---\`).
+- **Pull file/commit counts from \`checkout_pr\` metadata** — never count manually.
+- **Legacy headings REMOVED.** Do not use \`### Key changes\`, \`### Issues found\`, \`<b>TL;DR</b>\`, or \`<sub><b>Summary</b>\`. The new structure subsumes them.`;
 
 export function computeModes(agentId: AgentId): Mode[] {
   const t = (toolName: string) => formatMcpToolRef(agentId, toolName);
@@ -107,7 +201,7 @@ export function computeModes(agentId: AgentId): Mode[] {
 
    Otherwise delegate the \`${REVIEWER_AGENT_NAME}\` subagent to review your diff with fresh eyes against YOUR TASK. The subagent's baked-in system prompt enforces a non-mutative + non-recursive contract: read-only file/search/web tools and read-only MCP queries only; no writes, shell side effects, state-changing MCP calls, or nested subagent dispatch. Enforcement is prose-only — restate the constraint in your dispatch instructions and do not relax it.
 
-   Provide the subagent with YOUR TASK, the output of \`git diff\`, and a tight summary (not raw output) of any lint/typecheck/test failures you fixed during build — what broke, root cause, the fix — so it can check that fixes addressed root causes rather than suppressed symptoms; say "no build-phase failures" if the build path was clean. Instruct it to flag bugs, logic errors, missing edge cases, gaps between request and diff, and unintended changes.
+   Provide the subagent with YOUR TASK, the output of \`git diff origin/<base-branch>\` (single-rev form, no \`HEAD\` — this compares the working tree against the remote base and captures committed + staged + unstaged work; \`main...HEAD\` and \`--cached\` both miss the uncommitted edits Build self-review runs on, since self-review happens BEFORE the commit), and a tight summary (not raw output) of any lint/typecheck/test failures you fixed during build — what broke, root cause, the fix — so it can check that fixes addressed root causes rather than suppressed symptoms; say "no build-phase failures" if the build path was clean. Instruct it to flag bugs, logic errors, missing edge cases, gaps between request and diff, and unintended changes.
 
    Delegation + research discipline (distilled from \`/anneal\` canonical — these are codified learnings from many review rounds, not theoretical best practices):
    - Do NOT summarize what you implemented — that biases the subagent toward validating the shape of your solution rather than questioning it.
@@ -116,7 +210,7 @@ export function computeModes(agentId: AgentId): Mode[] {
    - Do NOT defect-hunt the diff yourself in parallel with the subagent. Your role is dispatch + evaluation; doing the review yourself reintroduces the implementation bias the subagent is meant to mitigate.
    - For diffs that rely on third-party API contracts, SDK semantics, framework directives, or DB engine specifics, instruct the subagent to verify load-bearing claims via web search and quote source URLs rather than trust training data — this is the single most common review-quality failure mode.
 
-   Review the findings, address valid points, and discard nitpicks or false positives. The reviewer is fallible — it biases toward *recommending additions* (defensive checks for impossible cases, extra logging, new abstractions used once, comments restating code, tests asserting tautologies, "just-in-case" guards). For each finding, ask: would applying it leave the code more sound, correct, AND elegant? Two-out-of-three is usually a signal to look harder for a fix that gets all three before settling for one that trades elegance for correctness. Reject bloat-shaped findings without applying them, and after applying the rest re-read your diff and be discerning about what *you just changed*: if any fix turned out to be bloat in context, revert it. The goal is code that is sound and correct *while remaining elegant*; the smallest diff that fixes the real defect almost always wins. Then verify only intended changes are present, no debug artifacts or commented-out code remain, no unrelated files were modified. Commit locally via shell (\`git add . && git commit -m "..."\`).
+   Be **discerning** about what comes back. The reviewer is an AI subagent and is fallible — treat every finding as a hypothesis, not a directive, and **verify each one yourself** against the diff and the code before deciding whether to apply. You are searching for a solution that is **complete, minimal, and elegant** — you may need to think hard to find it. Do not over-engineer, do not be over-defensive, **do not write AI slop**. Reviewers bias toward *recommending additions*, and that bias has a recognizable slop texture: defensive checks for cases that cannot happen, extra logging, new abstractions used once, comments restating code, tests asserting tautologies, "just-in-case" guards, error handlers for cases the type system already rules out. Reject those. For each surviving finding, ask: would applying it leave the code more sound, correct, AND elegant? Two-out-of-three means look harder for a fix that gets all three before settling. After applying the fixes you accept, re-read your diff and be discerning about what *you just changed*: if any fix turned out to be bloat in context, revert it. Then verify only intended changes are present, no debug artifacts or commented-out code remain, no unrelated files were modified. Commit locally via shell (\`git add . && git commit -m "..."\`).
 
 6. **finalize**:
    - confirm a clean working tree, then push via \`${t("push_branch")}\` (see *SYSTEM* Git rules if this fails — prepush errors are usually the repo's tests/lint, not infra timeouts)
@@ -141,7 +235,8 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
 
 4. For each comment:
    - understand the feedback
-   - evaluate whether applying it would leave the code more **sound, correct, AND elegant**. reviewers are fallible and bias toward *recommending additions* (defensive checks for impossible cases, extra abstractions, comments restating obvious code, tests asserting tautologies, "just-in-case" guards). if a request would add bloat — ceremony without commensurate correctness benefit — push back in your reply rather than mechanically applying it. two-out-of-three is usually a signal to look harder for a fix that gets all three before settling.
+   - **verify the finding yourself** against the actual code before deciding whether to apply — every comment (human or agent) is a hypothesis, not a directive. agent reviewers especially are fallible.
+   - you are searching for a solution that is **complete, minimal, and elegant** — you may need to think hard to find it. do not over-engineer, do not be over-defensive, **do not write AI slop**. reviewers bias toward *recommending additions*, and that bias has a recognizable slop texture: defensive checks for impossible cases, extra abstractions used once, comments restating obvious code, tests asserting tautologies, "just-in-case" guards, error handlers for cases the type system already rules out. reject those. evaluate whether applying the finding would leave the code more **sound, correct, AND elegant**; two-out-of-three is a signal to look harder for a fix that gets all three. if a request would add bloat — ceremony without commensurate correctness benefit — push back in your reply rather than mechanically applying it.
    - if the request stands, make the code change using your native tools; otherwise reply explaining why
    - record what was done (or why nothing was done)
 
@@ -149,11 +244,13 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
    - test changes, then review the diff before committing — verify only intended changes are present, no debug artifacts remain, no fix turned out to be bloat in context (revert any that did), and the changes are clean enough that a senior engineer would approve without hesitation
    - commit locally via shell (\`git add . && git commit -m "..."\`)
 
-6. Finalize:
+6. Finalize. Reply + resolve are paired write actions: do BOTH or NEITHER for each thread.
    - confirm a clean working tree, then push via \`${t("push_branch")}\` (same push/prepush guidance as Build mode in *SYSTEM*)
-   - reply to each comment **exactly once** using \`${t("reply_to_review_comment")}\` — do not re-emit the same call (the runtime dedupes identical bodies and the second call is wasted)
-   - resolve addressed threads via \`${t("resolve_review_thread")}\`
-   - call \`${t("report_progress")}\` with a brief summary (or the exact push error if push failed)`,
+   - **if push fails**, call \`${t("report_progress")}\` with the exact error and STOP — do NOT reply or resolve any thread until the fix is live on the remote. Resolving a thread without the fix landing misleads the reviewer.
+   - **on push success**, for each thread you acted on:
+     - reply ONCE via \`${t("reply_to_review_comment")}\`. The \`comment_id\` parameter takes the root comment's numeric \`id=\` (from the first \`comment author=...\` tag in the \`${t("get_review_comments")}\` output) — NOT the \`thread=\` value; that's a separate GraphQL ID used by resolve. The runtime dedupes identical bodies within a session.
+     - **immediately** call \`${t("resolve_review_thread")}\` with that thread's \`thread=\` value as \`thread_id\`. Resolve every thread where you (a) made the requested code change in full — partial fixes leave the thread open — OR (b) replied with a substantive answer the user explicitly asked for. Do NOT resolve threads where you pushed back on the request and the disagreement is unresolved; leave those open for the human to mediate.
+   - call \`${t("report_progress")}\` with a brief summary`,
     },
     // Review and IncrementalReview use a 0-or-2+ lens pattern. The default is
     // 0 lenses (orchestrator handles the review solo). Multi-lens (2+
@@ -170,9 +267,12 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
     // the Review/IncrementalReview lens fan-out where independence between
     // perspectives is what's being purchased.
     //
-    // Deliberate omission vs canonical /anneal: severity categorization in
-    // the final message (the review body has its own CAUTION/IMPORTANT
-    // framing instead of a severity table).
+    // Severity categorization is split across two surfaces: the opening
+    // callout (CAUTION/IMPORTANT/ℹ️/✅) sets the review's overall tier, and
+    // per-bullet emoji prefixes (🚨/⚠️/ℹ️ in PR_SUMMARY_FORMAT) tag
+    // individual points inside summary sections — scoping severity to the
+    // specific bullet rather than the whole section keeps a section that
+    // mixes a 🚨 and an ℹ️ from being mislabeled by either of them.
     {
       name: "Review",
       description:
@@ -259,7 +359,9 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
 
 6. **aggregate & draft**: when the fan-out lands, merge findings; de-dup overlaps (two lenses catching the same issue = higher-confidence signal); trace each finding yourself before accepting it. drop praise, style preferences, speculative/unverified claims, findings about pre-existing code unrelated to the PR (heuristic: if the finding's root cause lives in lines this PR added or modified, it's in scope; otherwise drop unless the PR plausibly introduced or amplified the regression), and anything not actionable. also drop **bloat-shaped findings** — proposed fixes that would add defensive checks for cases that can't happen, abstractions used once, comments restating obvious code, tests asserting tautologies, or "just-in-case" guards. subagents are fallible and bias toward recommending changes; the bar for an actionable inline comment is sound + correct + elegant. recommending a change that improves only one of the three (or worse, degrades elegance to nominally improve correctness) makes the codebase worse, not better.
 
-   for surviving findings, draft inline comments with NEW line numbers from the diff. every comment must be actionable, 2-3 sentences max. use GitHub permalink format for code references. for impact-analysis findings (stale references after rename/remove), report them in the review body ordered by severity (runtime breakage > incorrect docs > stale comments) rather than as inline comments unless they're anchored to a specific line.
+   **Hunt for non-anchored concerns before drafting.** After collecting your anchored findings, deliberately scan for concerns that have no specific line to point at — typically: deletion / cleanup plans for code the diff replaces or shadows; rollout sequencing (what happens to in-flight state during deploy / revert?); coverage gaps the diff implies but doesn't add; scope questions that only the human can answer (e.g. is the legacy path going away or is this a long-term dual track?); architectural risks the diff opens up that aren't a single-line bug. On substantial PRs (migrations, refactors, multi-file rewrites, version bumps that change runtime semantics), at least one such concern almost always exists; if you can't think of any, your bar is probably too high.
+
+   for surviving findings, draft inline comments with NEW line numbers from the diff — attach a \`<details>Technical details</details>\` block to any inline comment whose fix is non-trivial or has cross-file implications (see Inline technical details in the format below). every comment must be actionable, 2-3 sentences max in the visible part. use GitHub permalink format for code references. for impact-analysis findings (stale references after rename/remove), report them in the review body ordered by severity (runtime breakage > incorrect docs > stale comments) rather than as inline comments unless they're anchored to a specific line.
 
 7. **submit**: ALWAYS submit exactly one review via \`${t("create_pull_request_review")}\`. Do NOT call \`report_progress\` — the review is the final record and the progress comment will be cleaned up automatically.
 
@@ -267,12 +369,12 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
 
    The review body is structured as: \`[optional alert blockquote]\` → \`[PR summary using the default format below]\`. Inline comments are passed via the \`comments\` parameter, not in the body.
 
-   GitHub alert blockquotes render at four visual intensities — the callout is what the author sees first, so pick the one that matches what you want them to do:
+   The opening callout is what the author sees first — pick the one that matches what you want them to do. Five tiers, from loudest to friendliest:
 
    - \`[!CAUTION]\` — large red banner. Reads as "this will break something."
    - \`[!IMPORTANT]\` — large purple banner. Reads as "you need to look at this before merging."
-   - \`[!NOTE]\` — small blue inline callout. Reads as "FYI, here's something worth noting."
-   - no callout — plain text. Reads as routine review output.
+   - \`> ℹ️ ...\` — informational blockquote. Reads as "minor suggestions, nothing blocking."
+   - \`> ✅ ...\` — green friendly blockquote. Reads as "no concerns, mergeable."
 
    Two reinforcing levers: callout intensity (above) and \`approved\` (which gates the footer Fix-button affordance — Fix renders on every non-approving review, so \`approved: true\` suppresses it). Wrapping mergeable feedback in \`[!IMPORTANT]\` trains users to click Fix on reviews that don't need fixing. Pick the tier the author's actual next action justifies.
 
@@ -281,25 +383,25 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
    - **must-address non-critical findings** (real consequences if shipped — incorrect behavior in non-critical paths, missing validation on user input, regressions the author should fix before merge):
      \`approved: false\`. Body opens with \`> [!IMPORTANT]\\n> ...\`, followed by the PR summary. Reserve this tier for findings with concrete fallout — do NOT use \`[!IMPORTANT]\` for nits, style preferences, or "consider also" suggestions. Include all inline comments via \`comments\`.
    - **minor suggestions only** (single-line nits, doc/comment polish, defer-able observations, "rough edges"):
-     \`approved: false\`. NO alert blockquote. Body opens directly with the PR summary. Include all inline comments via \`comments\`.
+     \`approved: false\`. Body opens with \`> ℹ️ No critical issues — minor suggestions inline.\\n\\n\` followed by the PR summary. Include all inline comments via \`comments\`. Vary the wording after the emoji to fit the review (e.g. "Minor suggestions only.", "Two rough edges worth a look."), but always keep the ℹ️ prefix and keep it short.
    - **informational observations** (mergeable as-is, nothing actionable — e.g. prior feedback addressed cleanly, surfacing a minor stale doc reference, calling out something noteworthy without recommending a change):
-     \`approved: true\`. Body opens with \`> [!NOTE]\\n> ...\`, followed by the PR summary. Do NOT include inline \`comments\` — \`[!NOTE]\` signals "no action needed", which contradicts an actionable anchor; if a point is concrete enough to anchor to a line, downgrade the whole review to "minor suggestions only" (\`approved: false\`) instead.
+     \`approved: true\`. Body opens with \`> ✅ No new issues found.\\n\\n\` followed by the PR summary. Do NOT include inline \`comments\` — the ✅ signals "no action needed", which contradicts an actionable anchor; if a point is concrete enough to anchor to a line, downgrade the whole review to "minor suggestions only" (\`approved: false\`) instead.
    - **no actionable issues**:
-     \`approved: true\`. Body opens with \`No new issues found.\` followed by the PR summary.
+     \`approved: true\`. Body opens with \`> ✅ No new issues found.\\n\\n\` followed by the PR summary.
 
 ${PR_SUMMARY_FORMAT}`,
     },
-    // IncrementalReview shares Review's 0-or-2+ lens pattern but scopes the
-    // target to the incremental diff. The "issues must be NEW since the last
-    // Pullfrog review" filter lives at aggregation time (step 8), NOT in the
-    // subagent prompt — pushing the filter into
-    // subagents matches the canonical anneal anti-pattern of "list known
-    // pre-existing failures — don't flag these" and suppresses signal on
-    // regressions the new commits amplified. The review body is just
-    // "Reviewed changes" — a separate "Prior review feedback" checklist
-    // would duplicate the rolling PR summary snapshot's record of what
-    // earlier runs already addressed and add noise to the user-facing
-    // body. Same severity-table omission as Review.
+    // IncrementalReview shares Review's 0-or-2+ lens pattern AND its body
+    // format (PR_SUMMARY_FORMAT), scoped to the incremental delta against the
+    // prior pullfrog review. The "issues must be NEW since the last Pullfrog
+    // review" filter lives at aggregation time (step 8), NOT in the subagent
+    // prompt — pushing the filter into subagents matches the canonical anneal
+    // anti-pattern of "list known pre-existing failures — don't flag these"
+    // and suppresses signal on regressions the new commits amplified. A
+    // separate "Prior review feedback" checklist would duplicate the rolling
+    // PR summary snapshot's record of what earlier runs already addressed and
+    // add noise to the user-facing body. Same opening-callout + per-bullet
+    // emoji severity split as Review.
     {
       name: "IncrementalReview",
       description:
@@ -312,7 +414,15 @@ ${PR_SUMMARY_FORMAT}`,
 
 3. **incremental scope**: if \`incrementalDiffPath\` is present, read it to see what changed since the last review. this is a range-diff that isolates the net changes, filtering out base branch noise. if not present, fall back to reviewing the full PR diff and determine what changed since Pullfrog's most recent review.
 
-4. **prior feedback**: fetch previous reviews via \`${t("list_pull_request_reviews")}\`. for the most recent Pullfrog review, call \`${t("get_review_comments")}\` with the review ID to retrieve specific prior line-level feedback. you'll use this to filter your aggregation in step 8 — anything already flagged in a prior review and not changed by the new commits should not be re-raised. you do NOT need to render this in the review body; the rolling PR summary snapshot is the durable record of what's been addressed.
+4. **prior feedback — read AND retire it**: fetch previous reviews via \`${t("list_pull_request_reviews")}\`, then call \`${t("get_review_comments")}\` on each prior Pullfrog review. Each thread renders as a section whose first line is a fenced tag \`comment author=<login> id=<fullDatabaseId> review=<reviewId> thread=<graphqlId>\`; section headers carry \`[RESOLVED]\` / \`[OUTDATED]\` when relevant. For every **open, Pullfrog-originated** thread, decide and act:
+
+   - **Pullfrog-originated** means the FIRST \`comment author=...\` tag in the section is \`author=pullfrog[bot]\`. The \`*\` marker on individual comments is unrelated — it flags whether a comment belongs to the queried review, not whether it is the thread root.
+   - **addressed?** read the file at the thread's anchor and judge whether the substantive concern is now resolved by the new commits. Lines being modified isn't enough: reformatting, renaming, or moving the same code elsewhere doesn't address a concern. If the comment raised multiple distinct concerns, ALL must be addressed. The \`[OUTDATED]\` tag means GitHub moved the anchor (line shift, force-push, rename) — it does NOT mean the concern was addressed; re-read the code at its new location before deciding.
+   - **if addressed**: call \`${t("reply_to_review_comment")}\` with the root tag's numeric \`id=\` as \`comment_id\` (NOT the \`thread=\` value — that's a separate GraphQL ID used only by resolve) and a one-line body (e.g. \`Addressed in <short-sha>.\`), then call \`${t("resolve_review_thread")}\` with the root tag's \`thread=\` value as \`thread_id\`. Do this BEFORE drafting the new review so the GitHub thread state aligns with the new review by the time it lands.
+   - **if uncertain or partially addressed**: leave open. False-positive resolutions erode trust faster than false negatives.
+   - **scope**: only retire Pullfrog-originated threads. Threads from human reviewers belong to those humans to resolve, even if the commit happened to address them.
+
+   The remaining open threads feed step 8's dedup filter — anything already flagged and unchanged by the new commits should not be re-raised. The rolling PR summary snapshot is the durable record of retire activity; you don't need to surface it in the review body.
 
 5. **triage**: orient on the *incremental* changes — domain, seams, external contracts, user-facing surfaces. pull as much context as you need to render a confident review: read related files, grep for callers of changed symbols, check tests that exercise the touched paths. **you are the synthesizer.**
 
@@ -358,22 +468,28 @@ ${PR_SUMMARY_FORMAT}`,
    - do NOT pre-shape their output with a finding schema
    - do NOT mention the other lenses (independence is the point)
 
-8. **aggregate, draft, self-critique**: merge findings (yours + any subagent output if you went multi-lens); de-dup overlaps; trace each finding yourself. drop praise, style preferences, speculative/unverified claims, findings about pre-existing code unrelated to the new commits, anything not actionable, and anything that re-states prior review feedback (heuristic: if the finding's root cause lives in lines the *new commits* added or modified, it's in scope; otherwise drop). also drop **bloat-shaped findings** — proposed fixes that would add defensive checks for cases that can't happen, abstractions used once, comments restating obvious code, tests asserting tautologies, or "just-in-case" guards. subagents are fallible and bias toward recommending changes; the bar for an actionable inline comment is sound + correct + elegant. recommending a change that improves only one of the three (or degrades elegance to nominally improve correctness) makes the codebase worse, not better. To compute "lines the new commits added or modified": if \`incrementalDiffPath\` from step 2 is present, use it directly. Otherwise, take the prior Pullfrog review's \`commit_id\` (returned alongside each entry from \`${t("list_pull_request_reviews")}\` in step 4) and run \`git diff <prior-review-sha>..HEAD\` to isolate the lines added since that review. draft inline comments with NEW line numbers from the full PR diff — every comment must be actionable, 2-3 sentences max.
+8. **aggregate, draft, self-critique**: merge findings (yours + any subagent output if you went multi-lens); de-dup overlaps; trace each finding yourself. drop praise, style preferences, speculative/unverified claims, findings about pre-existing code unrelated to the new commits, anything not actionable, and anything that re-states prior review feedback (heuristic: if the finding's root cause lives in lines the *new commits* added or modified, it's in scope; otherwise drop). also drop **bloat-shaped findings** — proposed fixes that would add defensive checks for cases that can't happen, abstractions used once, comments restating obvious code, tests asserting tautologies, or "just-in-case" guards. subagents are fallible and bias toward recommending changes; the bar for an actionable inline comment is sound + correct + elegant. recommending a change that improves only one of the three (or degrades elegance to nominally improve correctness) makes the codebase worse, not better. To compute "lines the new commits added or modified": if \`incrementalDiffPath\` from step 2 is present, use it directly. Otherwise, take the prior Pullfrog review's \`commit_id\` (returned alongside each entry from \`${t("list_pull_request_reviews")}\` in step 4) and run \`git diff <prior-review-sha>..HEAD\` to isolate the lines added since that review.
 
-9. **build the review body** — a single "Reviewed changes" section: summarize at the logical-change level, not per-file. each bullet starts with a past-tense verb (e.g. \`- Extracted shared CLI runtime into a single module\`, \`- Renamed package to pullfrog\`). avoid file paths unless they add clarity. if the changes can be described in one sentence, use one sentence — no bullets needed. do NOT include a separate "Prior review feedback" checklist; that's tracked in the rolling PR summary snapshot for the next agent run, and surfacing it in the user-facing body is noise (changes that addressed prior feedback are already covered by the Reviewed-changes bullets). in some cases you may receive a complete diff for the whole pull request instead of an incremental one — when this happens, you will need to determine what changes have happened since Pullfrog's most recent review.
+   **Hunt for non-anchored concerns before drafting.** After collecting your anchored findings, deliberately scan for concerns that have no specific line to point at — typically: deletion / cleanup plans for code the new commits replace or shadow; rollout sequencing (what happens to in-flight state during deploy / revert?); coverage gaps the new commits imply but don't add; scope questions that only the human can answer (e.g. is the legacy path going away or is this a long-term dual track?); architectural risks the new commits open up that aren't a single-line bug. On substantial incremental diffs (migrations, refactors, multi-file rewrites, version bumps that change runtime semantics), at least one such concern almost always exists; if you can't think of any, your bar is probably too high.
+
+   draft inline comments with NEW line numbers from the full PR diff — attach a \`<details>Technical details</details>\` block to any inline comment whose fix is non-trivial or has cross-file implications (see Inline technical details in the format below). every comment must be actionable, 2-3 sentences max in the visible part.
+
+9. **build the review body**: use the same default format as Review mode (preamble + optional cross-cutting \`### \` sections + optional \`### ℹ️ Nitpicks\`) — scoped to the **incremental delta**, not the full PR. The "Reviewed changes" bullets describe what changed since the prior pullfrog review (each bullet starts with a past-tense verb, e.g. \`- Extracted shared CLI runtime into a single module\`). Do NOT include a separate "Prior review feedback" checklist — that's tracked in the rolling PR summary snapshot for the next agent run, and surfacing it in the user-facing body is noise (changes that addressed prior feedback are already covered by the Reviewed-changes bullets). In some cases you may receive a complete diff for the whole PR instead of an incremental one; when this happens, determine what changed since Pullfrog's most recent review yourself before drafting bullets.
 
 10. Submit — every run must end with EXACTLY ONE of \`${t("create_pull_request_review")}\` (substantive review) or \`${t("report_progress")}\` (no-review acknowledgement). do NOT call \`create_issue_comment\` for review output.
 
-   Same callout-intensity ladder as Review mode — \`[!CAUTION]\` (large red, "will break") → \`[!IMPORTANT]\` (large purple, "must address before merging") → \`[!NOTE]\` (small blue, "FYI") → no callout (plain text). And the same Fix-button lever: the footer renders a Fix button on every non-approving review, so \`approved: true\` suppresses it. Wrapping mergeable feedback in \`[!IMPORTANT]\` trains users to click Fix on reviews that don't need fixing — pick the tier the author's actual next action justifies.
+   Same callout ladder as Review mode — \`[!CAUTION]\` (red, "will break") → \`[!IMPORTANT]\` (purple, "must address before merging") → \`> ℹ️ ...\` (informational, "minor suggestions only") → \`> ✅ ...\` (green friendly, "no concerns"). Same Fix-button lever: the footer renders a Fix button on every non-approving review, so \`approved: true\` suppresses it. Wrapping mergeable feedback in \`[!IMPORTANT]\` trains users to click Fix on reviews that don't need fixing — pick the tier the author's actual next action justifies.
 
    Follow these rules:
    - note: the first create_pull_request_review submission may error with a one-time diff-coverage nudge listing unread TOC regions. retry the same call to proceed — optionally after reading the listed ranges. the pre-flight will not block again this session.
    - IF NO NEW ISSUES, NON-SUBSTANTIVE CHANGES ONLY (trivial formatting, import reordering, comment tweaks): do NOT submit a review. Instead call \`${t("report_progress")}\` with a 1-2 sentence note explaining no review was warranted (e.g. "No new issues. Changes since last review are formatting-only."). this leaves a visible signal that the run completed.
-   - ELSE IF NEW CRITICAL ISSUES (blocks merge — bugs, security, data loss, broken core flows): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> [!CAUTION]\\n> This PR introduces ...\`, then the Reviewed-changes summary.
-   - ELSE IF NEW MUST-ADDRESS NON-CRITICAL FINDINGS (real consequences if shipped — incorrect behavior, missing validation, regressions the author should fix before merge): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> [!IMPORTANT]\\n> ...\`, then the Reviewed-changes summary. Do NOT use this tier for nits, style preferences, or "consider also" suggestions.
-   - ELSE IF NEW MINOR SUGGESTIONS ONLY (single-line nits, doc/comment polish, defer-able observations, "rough edges"): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens directly with \`Reviewed the following changes:\\n\` (NO alert blockquote), then the Reviewed-changes summary.
-   - ELSE IF INFORMATIONAL OBSERVATIONS (mergeable as-is, but worth surfacing — e.g. prior feedback addressed cleanly with one minor stale doc reference, or a noteworthy positive observation): call \`${t("create_pull_request_review")}\` with \`approved: true\`, NO inline comments, and the review body. body opens with \`> [!NOTE]\\n> ...\` alert, then the Reviewed-changes summary. If a point is concrete enough to anchor to a line, downgrade the whole review to "minor suggestions only" (\`approved: false\`) instead — \`[!NOTE]\` and inline comments don't mix.
-   - ELSE IF NO NEW ISSUES, SUBSTANTIVE CHANGES (new functionality, behavior changes, or fixes to prior review feedback): call \`${t("create_pull_request_review")}\` to create a PR review. If all previous reviews have been properly addressed and no new issues were discovered, you can set \`approved: true\`. body opens with \`No new issues. Reviewed the following changes:\\n\`, then the Reviewed-changes summary.`,
+   - ELSE IF NEW CRITICAL ISSUES (blocks merge — bugs, security, data loss, broken core flows): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> [!CAUTION]\\n> This PR introduces ...\`, followed by the PR summary using the default format below.
+   - ELSE IF NEW MUST-ADDRESS NON-CRITICAL FINDINGS (real consequences if shipped — incorrect behavior, missing validation, regressions the author should fix before merge): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> [!IMPORTANT]\\n> ...\`, followed by the PR summary using the default format below. Do NOT use this tier for nits, style preferences, or "consider also" suggestions.
+   - ELSE IF NEW MINOR SUGGESTIONS ONLY (single-line nits, doc/comment polish, defer-able observations, "rough edges"): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> ℹ️ No critical issues — minor suggestions inline.\\n\\n\` (vary the wording after ℹ️ to fit the review), followed by the PR summary using the default format below.
+   - ELSE IF INFORMATIONAL OBSERVATIONS (mergeable as-is, but worth surfacing — e.g. prior feedback addressed cleanly with one minor stale doc reference, or a noteworthy positive observation): call \`${t("create_pull_request_review")}\` with \`approved: true\`, NO inline comments, and the review body. body opens with \`> ✅ No new issues found.\\n\\n\` (or similar friendly green opener), followed by the PR summary using the default format below. If a point is concrete enough to anchor to a line, downgrade the whole review to "minor suggestions only" (\`approved: false\`) instead — the ✅ signals "no action needed", which contradicts an actionable anchor.
+   - ELSE IF NO NEW ISSUES, SUBSTANTIVE CHANGES (new functionality, behavior changes, or fixes to prior review feedback): call \`${t("create_pull_request_review")}\` to create a PR review. If all previous reviews have been properly addressed and no new issues were discovered, set \`approved: true\`. body opens with \`> ✅ No new issues found.\\n\\n\`, followed by the PR summary using the default format below.
+
+${PR_SUMMARY_FORMAT}`,
     },
     {
       name: "Plan",
@@ -389,7 +505,7 @@ ${PR_SUMMARY_FORMAT}`,
 
 3. Produce a structured, actionable plan with clear milestones.
 
-4. Call \`${t("report_progress")}\` with the plan.`,
+4. Call \`${t("report_progress")}\` with the plan body. Do NOT set \`target_plan_comment\` — that flag is exclusively for revising an existing plan, and \`${t("select_mode")}\` will route you to a separate PlanEdit checklist when a prior plan comment exists for this issue.`,
     },
     {
       name: "Fix",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pullfrog",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "bin": {
     "pullfrog": "dist/cli.mjs",
@@ -16,6 +16,7 @@
     "typecheck": "tsc --noEmit",
     "build": "node esbuild.config.js && tsc -p tsconfig.exports.json",
     "check:entrypoints": "node scripts/check-entrypoint-imports.ts",
+    "docker": "node docker.ts",
     "play": "node play.ts",
     "runtest": "node test/run.ts",
     "scratch": "node scratch.ts",
@@ -49,7 +50,7 @@
     "fastmcp": "^3.34.0",
     "file-type": "^21.3.0",
     "husky": "^9.0.0",
-    "opencode-ai": "1.1.56",
+    "opencode-ai": "1.15.1",
     "package-manager-detector": "^1.6.0",
     "picocolors": "^1.1.1",
     "semver": "^7.7.3",

play.ts

@@ -1,22 +1,28 @@
-import { execSync } from "node:child_process";
-import { mkdtemp } from "node:fs/promises";
-import { devNull, tmpdir } from "node:os";
+// thin CLI for ad-hoc fixture runs against the Pullfrog action.
+//
+// invoke from the repo root:
+//   pnpm play [args…]            # host, in-process — fast iteration (default)
+//   pnpm play:docker [args…]     # local docker container that mocks GHA
+//   pnpm docker play.ts [args…]  # explicit container form (equivalent to `pnpm play:docker`)
+//
+// see wiki/docker.md for when host vs container matters.
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import arg from "arg";
 import { config } from "dotenv";
-import type { AgentResult } from "./agents/shared.ts";
-import { type Inputs, main } from "./main.ts";
+import type { Inputs } from "./main.ts";
 import { defineFixture } from "./test/utils.ts";
 import { log } from "./utils/cli.ts";
-import { runInDocker } from "./utils/docker.ts";
-import { ensureGitHubToken } from "./utils/github.ts";
-import { isInsideDocker } from "./utils/globals.ts";
-import { setupTestRepo } from "./utils/setup.ts";
+import { run } from "./utils/runFixture.ts";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+config();
+config({ path: join(__dirname, "..", ".env") });
 
 /**
- * default play fixture for ad-hoc testing.
- * change this freely without affecting any tests.
+ * default fixture for ad-hoc `pnpm play` runs. change this freely without
+ * affecting any tests — it's only consumed by this script's no-arg path.
  */
 export const playFixture = defineFixture(
   {
@@ -25,85 +31,6 @@ export const playFixture = defineFixture(
   { localOnly: true }
 );
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-// load action's .env file in case it exists for local dev
-config();
-// also load .env from repo root (for monorepo structure)
-config({ path: join(__dirname, "..", ".env") });
-
-export async function run(inputsOrPrompt: Inputs | string): Promise<AgentResult> {
-  await ensureGitHubToken();
-
-  // play.ts is a CI-emulator — isolate it from the developer's user- and
-  // system-scope gitconfig so checks like `validatePushDestination` see the
-  // raw stored remote URL instead of values mutated by `url.*.insteadOf`
-  // rewrites (a common SSH-auth convenience on dev boxes). CI runners have
-  // empty gitconfigs so this is a no-op there; locally it makes `pnpm play`
-  // and real runs produce identical git state. `os.devNull` canonicalizes
-  // the null device across Unix (`/dev/null`) and Windows (`\\.\nul`).
-  process.env.GIT_CONFIG_GLOBAL = devNull;
-  process.env.GIT_CONFIG_SYSTEM = devNull;
-
-  // create unique temp directory path in OS temp location for parallel execution
-  // use a parent dir from mkdtemp, then clone into a 'repo' subdirectory
-  const tempParent = await mkdtemp(join(tmpdir(), "pullfrog-play-"));
-  const tempDir = join(tempParent, "repo");
-  const originalCwd = process.cwd();
-
-  try {
-    setupTestRepo({ tempDir });
-    process.chdir(tempDir);
-
-    // run repo setup commands if provided (for pre-planting test state like symlinks).
-    // this runs AFTER clone but BEFORE the agent, simulating pre-existing repo content.
-    if (process.env.PULLFROG_TEST_REPO_SETUP) {
-      log.info("» running repo setup commands...");
-      execSync(process.env.PULLFROG_TEST_REPO_SETUP, { cwd: tempDir, stdio: "pipe" });
-    }
-
-    // set GITHUB_WORKSPACE to tempDir so main() doesn't try to chdir to the CI checkout path
-    process.env.GITHUB_WORKSPACE = tempDir;
-
-    // allow passing full Inputs object or just a prompt string
-    const inputs: Inputs =
-      typeof inputsOrPrompt === "string" ? { prompt: inputsOrPrompt } : inputsOrPrompt;
-
-    // set INPUT_* env vars for @actions/core.getInput()
-    for (const [key, value] of Object.entries(inputs)) {
-      if (value !== undefined && value !== null) {
-        process.env[`INPUT_${key.toUpperCase()}`] = String(value);
-      }
-    }
-
-    const result: AgentResult = await main();
-
-    process.chdir(originalCwd);
-
-    if (result.success) {
-      log.success("Action completed successfully");
-      return { success: true, output: result.output || undefined, error: undefined };
-    } else {
-      log.error(`Action failed: ${result.error || "Unknown error"}`);
-      return { success: false, error: result.error || undefined, output: undefined };
-    }
-  } catch (err) {
-    const errorMessage = (err as Error).message;
-    log.error(`Error: ${errorMessage}`);
-    return { success: false, error: errorMessage, output: undefined };
-  } finally {
-    // cleanup temp directory - use sudo rm because sandbox isolation may create
-    // files with different ownership that rmSync can't delete
-    process.chdir(originalCwd);
-    try {
-      execSync(`sudo rm -rf "${tempParent}"`, { stdio: "ignore" });
-    } catch {
-      // ignore - cleanup failure is not critical
-    }
-  }
-}
-
 const isDirectExecution = process.argv[1]
   ? import.meta.url === pathToFileURL(resolve(process.argv[1])).href
   : false;
@@ -112,71 +39,40 @@ if (isDirectExecution) {
   const args = arg({
     "--help": Boolean,
     "--raw": String,
-    "--local": Boolean,
     "-h": "--help",
-    "-l": "--local",
   });
 
   if (args["--help"]) {
     log.info(`
-Usage: node play.ts [options]
+Usage: pnpm play         [--raw <input>]   (host, in-process; this entry)
+       pnpm play:docker  [--raw <input>]   (local docker container that mocks GHA)
 
-Test the Pullfrog action with the inline playFixture.
+Run the Pullfrog action against an inline fixture.
 
 Options:
-  --raw [input]           Use raw string as prompt, or JSON object as full fixture
-  --local, -l             Run locally (default: runs in Docker)
-  -h, --help              Show this help message
-
-Environment:
-  PLAY_LOCAL=1            Same as --local
+  --raw <input>    raw string used as the prompt, or JSON object as full fixture
+  -h, --help       show this message
 
 Examples:
-  node play.ts                                              # Run inline playFixture
-  node play.ts --raw "Hello world"                          # Use raw string as prompt
-  node play.ts --raw '{"prompt":"Hello","timeout":"5s"}'    # Use JSON fixture
+  pnpm play
+  pnpm play --raw "Hello world"
+  pnpm play --raw '{"prompt":"Hi","timeout":"5s"}'
     `);
     process.exit(0);
   }
 
-  // default: run in Docker (unless --local, PLAY_LOCAL=1, or already inside Docker)
-  const useLocal = args["--local"] || process.env.PLAY_LOCAL === "1" || isInsideDocker;
-
-  if (!useLocal) {
-    const passArgs = process.argv
-      .slice(2)
-      .map((a) => `'${a.replace(/'/g, "'\\''")}'`)
-      .join(" ");
-    const nodeCmd = `node play.ts ${passArgs}`;
-
-    const volumeName = "pullfrog-action-node-modules";
-
-    const result = runInDocker({
-      actionDir: __dirname,
-      args: process.argv.slice(2),
-      nodeCmd,
-      volumeName,
-      envFilterMode: "passthrough",
-      onStart: () => log.info("» running in Docker container..."),
-    });
-
-    process.exit(result.status ?? 1);
-  }
-
   if (args["--raw"]) {
     const raw = args["--raw"];
-    // try to parse as JSON, otherwise treat as prompt string
     let input: Inputs | string = raw;
     try {
       input = JSON.parse(raw) as Inputs;
     } catch {
-      // not valid JSON, use as prompt string
+      // not valid JSON — treat as a literal prompt string.
     }
     const result = await run(input);
     process.exit(result.success ? 0 : 1);
   }
 
-  // no args - use inline playFixture
   const result = await run(playFixture);
   process.exit(result.success ? 0 : 1);
 }

pnpm-lock.yaml

@@ -84,8 +84,8 @@ importers:
         specifier: ^9.0.0
         version: 9.1.7
       opencode-ai:
-        specifier: 1.1.56
-        version: 1.1.56
+        specifier: 1.15.1
+        version: 1.15.1
       package-manager-detector:
         specifier: ^1.6.0
         version: 1.6.0
@@ -1444,62 +1444,69 @@ packages:
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
-  opencode-ai@1.1.56:
-    resolution: {integrity: sha512-OAF0G/1jVXpOrCh++M5gFEZ0bRLiXOnbxSYMFx5TOoD0OhCjHJS1JlARzaLDAx461qBnn+jocI9BBxD0wwFH3Q==}
+  opencode-ai@1.15.1:
+    resolution: {integrity: sha512-xLb1NuYZcMJ1p33hC/kgTMcJAueACVTfX6ps91a54GOFTM/wFp7br0t2cqHopEU9paqItbAnQwZB573qmPKH6w==}
+    cpu: [arm64, x64]
+    os: [darwin, linux, win32]
     hasBin: true
 
-  opencode-darwin-arm64@1.1.56:
-    resolution: {integrity: sha512-0HqvLm7tcYZr4VJgEzi3Wicia5M9yCX66O7Cv470Qu4+GGbCC2sTTmzQu6pCehSleYgkZsiSBNRcFcW/6F7v0Q==}
+  opencode-darwin-arm64@1.15.1:
+    resolution: {integrity: sha512-eNgIfATsnHcud4Pr58OIR+TJGSsDvWmyNlfSDVVgP92qdnHFdZ5YsHKjcUGmeuuUN+oZwPb/z5nZSrkf+CCB2g==}
     cpu: [arm64]
     os: [darwin]
 
-  opencode-darwin-x64-baseline@1.1.56:
-    resolution: {integrity: sha512-Z9QO9cTC9TnlUxTfEtDbvZbRFxc5Je8rs2Ei0cLH46W9gHGhh1fW4oX64tcrlhF5NUDKJzr/qwdoMfmKkeu53A==}
+  opencode-darwin-x64-baseline@1.15.1:
+    resolution: {integrity: sha512-XDx90Hhj+SPUxu0rqewsNR10JTny7+VE4C5pjWB04I6eoiEuBWy2EMvPXPg2FUA5Suz1PXXJ6yThfRtOxXNHuw==}
     cpu: [x64]
     os: [darwin]
 
-  opencode-darwin-x64@1.1.56:
-    resolution: {integrity: sha512-8ZhNd4sFbDviT1OJs42C35Bx2/z6mkcb7uNhPHX3KKm27KOm7cYjFQa1UTF5or3ZpjkjPQpR/cpo7TELvnnmRA==}
+  opencode-darwin-x64@1.15.1:
+    resolution: {integrity: sha512-tNbzF6n+TczILEqo0adtup1ZXBgAcqftQd11+eQohGxtNAjmD7Z/gCTVpEzh9GlHUPzUEuREZ4gRAbJmPpafBQ==}
     cpu: [x64]
     os: [darwin]
 
-  opencode-linux-arm64-musl@1.1.56:
-    resolution: {integrity: sha512-f30SmYX4xE2fUsnNl66dDX++8iTMI9PLXz7BRHhgXL4XAdMpUUJbOKIsw3ZUB0KWHwjR8cjkEJQOZxR3HPbrZg==}
+  opencode-linux-arm64-musl@1.15.1:
+    resolution: {integrity: sha512-UuoizYN32eTWmQT494bw70Sq4AByS0pGk46Mo/z+KzV+KTQlsDXRQrnKATKYFDqE2T3c1VsPM1KqRV/DqvnXxw==}
     cpu: [arm64]
     os: [linux]
 
-  opencode-linux-arm64@1.1.56:
-    resolution: {integrity: sha512-wEmIEXiEKghurQYgKY5yFUFOmnT/QIlAbYnVeH73gSqOwlYFUUlowXLDJnF+3OGd6m000qalhCxjExL7qKINWw==}
+  opencode-linux-arm64@1.15.1:
+    resolution: {integrity: sha512-MG6tuLZqzDjHGeaotejhYuuv2USR0y3v8N+6g5gWPHScX/iJWkJDMFBeT6+KOV/CWawrGRqZfBDfdJSKirX2LQ==}
     cpu: [arm64]
     os: [linux]
 
-  opencode-linux-x64-baseline-musl@1.1.56:
-    resolution: {integrity: sha512-EC8EGTJCgTZgGIMZdQjOKGXw02+igo0am1Ry6wrPrB0li7XBlYbY6dz8tL3FlknRVMLamtGtb3tXQ6tqbwjX0g==}
+  opencode-linux-x64-baseline-musl@1.15.1:
+    resolution: {integrity: sha512-Is50zWUqa9fIJ+tiDOpxENcgn2XBk0QKNEocbu/x9aOdpfFsHhtxe33zi/+9CNdSr+O/6y9jRAMGn7AirJyZlg==}
     cpu: [x64]
     os: [linux]
 
-  opencode-linux-x64-baseline@1.1.56:
-    resolution: {integrity: sha512-jKOvhkNLcn0h6zmKX+hDdkODijSVDxjAGTZp8BPbJCCJVxnKll9dYfDMTqxi3YN6yXp6sBvyaJT1mcpf8knkeA==}
+  opencode-linux-x64-baseline@1.15.1:
+    resolution: {integrity: sha512-ExKWMk/6ULM9HBda2KKZJNE5Ejzaa51QWpr7+Ljv1AlazxQQZKwJfqcZcSNfk0YsgXDESw2w2dwBmOcMaxQZKA==}
     cpu: [x64]
     os: [linux]
 
-  opencode-linux-x64-musl@1.1.56:
-    resolution: {integrity: sha512-9BFYBPgpY2RrUd7/Ul0VNh+6B9l0FmCNRUV4yYmeFGee9ZDgPem5YGicsKAMQqS/5X0jW3ZWje+KBbBQz4RMwQ==}
+  opencode-linux-x64-musl@1.15.1:
+    resolution: {integrity: sha512-feNjVo7XGjqFHf5lejxuyZIkNi9Yi4B2H3w+p2SF9vcyUdPaJnta2/6Os7Pf8kwElRs6EnWRyUO2JVg4hjAjjg==}
     cpu: [x64]
     os: [linux]
 
-  opencode-linux-x64@1.1.56:
-    resolution: {integrity: sha512-0FP3BzLjn+a9naTtm9hpHibJ+eV1RkI+tItcDQXKwHtvzoBUvytDRP8v6TotEHNtNF0ZLAb3OGurwDIIdtLarg==}
+  opencode-linux-x64@1.15.1:
+    resolution: {integrity: sha512-mKRg+iHdwEYNDS+DYa9VQnN903zlw8FInCQRGpY155aR/AF1r3hIn+7IopOTDAwqkutL9vJWMXELxmNpPdaTQg==}
     cpu: [x64]
     os: [linux]
 
-  opencode-windows-x64-baseline@1.1.56:
-    resolution: {integrity: sha512-zEokdohfoDjWzwULvlSq0Y/tRoVmz2/6GofYO936buPQf09cBcPqpAgLUjZV+pQI0Atyd05YG3BCO4PQxmXzdw==}
+  opencode-windows-arm64@1.15.1:
+    resolution: {integrity: sha512-M3Wz4U+hF8paqrBpOWPqOM16MhDDZsnb0EZc1fFdKMfu1a8g2oR3gtq1heQgUOKd8FHaeDQHvBYOqaaJdoaCmA==}
+    cpu: [arm64]
+    os: [win32]
+
+  opencode-windows-x64-baseline@1.15.1:
+    resolution: {integrity: sha512-sFvI5sY4kijrkIt9qry34aqZASRo9jJKBLm6PH/zZbGdRtvFM32/n+A26Z/NDbowya8fOtj7MX2Ih5DvR9Md1A==}
     cpu: [x64]
     os: [win32]
 
-  opencode-windows-x64@1.1.56:
-    resolution: {integrity: sha512-zm/oaWT5uGrW3DumKRHiqv2L2pKwrTvhsT4XUSfIPLQn5EvrYNU6bh3WFO4v71ZBjSIKx5Q7rEvTEQvFiFEZFQ==}
+  opencode-windows-x64@1.15.1:
+    resolution: {integrity: sha512-MdCBncbhpcImw3zjYBuoI+ZqfMR1uI4mc8KCltwIgI2DrxuOZNe66A/3feOhWd9MQQ2c2PSdyyJfW9PE0FA/Ow==}
     cpu: [x64]
     os: [win32]
 
@@ -3154,51 +3161,55 @@ snapshots:
     dependencies:
       wrappy: 1.0.2
 
-  opencode-ai@1.1.56:
+  opencode-ai@1.15.1:
     optionalDependencies:
-      opencode-darwin-arm64: 1.1.56
-      opencode-darwin-x64: 1.1.56
-      opencode-darwin-x64-baseline: 1.1.56
-      opencode-linux-arm64: 1.1.56
-      opencode-linux-arm64-musl: 1.1.56
-      opencode-linux-x64: 1.1.56
-      opencode-linux-x64-baseline: 1.1.56
-      opencode-linux-x64-baseline-musl: 1.1.56
-      opencode-linux-x64-musl: 1.1.56
-      opencode-windows-x64: 1.1.56
-      opencode-windows-x64-baseline: 1.1.56
+      opencode-darwin-arm64: 1.15.1
+      opencode-darwin-x64: 1.15.1
+      opencode-darwin-x64-baseline: 1.15.1
+      opencode-linux-arm64: 1.15.1
+      opencode-linux-arm64-musl: 1.15.1
+      opencode-linux-x64: 1.15.1
+      opencode-linux-x64-baseline: 1.15.1
+      opencode-linux-x64-baseline-musl: 1.15.1
+      opencode-linux-x64-musl: 1.15.1
+      opencode-windows-arm64: 1.15.1
+      opencode-windows-x64: 1.15.1
+      opencode-windows-x64-baseline: 1.15.1
 
-  opencode-darwin-arm64@1.1.56:
+  opencode-darwin-arm64@1.15.1:
     optional: true
 
-  opencode-darwin-x64-baseline@1.1.56:
+  opencode-darwin-x64-baseline@1.15.1:
     optional: true
 
-  opencode-darwin-x64@1.1.56:
+  opencode-darwin-x64@1.15.1:
     optional: true
 
-  opencode-linux-arm64-musl@1.1.56:
+  opencode-linux-arm64-musl@1.15.1:
     optional: true
 
-  opencode-linux-arm64@1.1.56:
+  opencode-linux-arm64@1.15.1:
     optional: true
 
-  opencode-linux-x64-baseline-musl@1.1.56:
+  opencode-linux-x64-baseline-musl@1.15.1:
     optional: true
 
-  opencode-linux-x64-baseline@1.1.56:
+  opencode-linux-x64-baseline@1.15.1:
     optional: true
 
-  opencode-linux-x64-musl@1.1.56:
+  opencode-linux-x64-musl@1.15.1:
     optional: true
 
-  opencode-linux-x64@1.1.56:
+  opencode-linux-x64@1.15.1:
     optional: true
 
-  opencode-windows-x64-baseline@1.1.56:
+  opencode-windows-arm64@1.15.1:
     optional: true
 
-  opencode-windows-x64@1.1.56:
+  opencode-windows-x64-baseline@1.15.1:
+    optional: true
+
+  opencode-windows-x64@1.15.1:
     optional: true
 
   package-manager-detector@1.6.0: {}

test/agnostic/byokFallback.ts

@@ -0,0 +1,75 @@
+import type { AgentResult, TestRunnerOptions, ValidationCheck } from "../utils.ts";
+import { defineFixture, getAgentOutput } from "../utils.ts";
+
+/**
+ * BYOK-no-keys fallback test — proves that an account configured for a
+ * BYOK model (here: `anthropic/claude-opus`) but with no provider API
+ * keys present in the runner env still gets a successful run by falling
+ * back to a free OpenCode model.
+ *
+ * This was the structural failure that took out 15 accounts post-launch
+ * before the fallback shipped: GH Actions secret references resolved to
+ * empty strings (because the secrets didn't exist), the action launched
+ * Claude Code with no key, the LLM provider 401'd, and the run died in
+ * 20s with a synthesized "Invalid API key" message.
+ *
+ * The env block below empty-strings every known provider key — that's
+ * exactly what GitHub Actions does when a `${{ secrets.X }}` reference
+ * resolves to a missing secret. We verify:
+ *   1. the run succeeded
+ *   2. the fallback log line was emitted (proves the swap happened)
+ */
+const fixture = defineFixture(
+  {
+    prompt: "Reply with exactly the single character: 4",
+    timeout: "5m",
+  },
+  { localOnly: true }
+);
+
+function validator(result: AgentResult): ValidationCheck[] {
+  const output = getAgentOutput(result);
+  const fellBack = /fell back from .* to opencode\/minimax-m2\.5-free/.test(output);
+  return [
+    { name: "run_succeeded", passed: result.success },
+    { name: "fallback_logged", passed: fellBack },
+  ];
+}
+
+export const test: TestRunnerOptions = {
+  name: "byok-no-keys-fallback",
+  fixture,
+  validator,
+  env: {
+    // simulate every BYOK provider's secret being absent — same shape as
+    // a fresh-install account whose user never configured any keys.
+    ANTHROPIC_API_KEY: "",
+    CLAUDE_CODE_OAUTH_TOKEN: "",
+    OPENAI_API_KEY: "",
+    OPENROUTER_API_KEY: "",
+    GEMINI_API_KEY: "",
+    GOOGLE_GENERATIVE_AI_API_KEY: "",
+    XAI_API_KEY: "",
+    DEEPSEEK_API_KEY: "",
+    MOONSHOT_API_KEY: "",
+    OPENCODE_API_KEY: "",
+    AWS_BEARER_TOKEN_BEDROCK: "",
+    AWS_ACCESS_KEY_ID: "",
+    AWS_SECRET_ACCESS_KEY: "",
+    BEDROCK_MODEL_ID: "",
+    // configure a model that requires a BYOK key — the fallback only
+    // engages when there's a configured model whose provider key is
+    // absent, so we have to pin one. anthropic/claude-opus is the
+    // most common first-run choice (it's the catalog "preferred" for
+    // the anthropic provider).
+    PULLFROG_MODEL: "anthropic/claude-opus",
+  },
+  tags: ["agnostic"],
+  coverage: [
+    "action/utils/byokFallback.ts",
+    "action/utils/apiKeys.ts",
+    "action/utils/agent.ts",
+    "action/main.ts",
+    "action/models.ts",
+  ],
+};

test/agnostic/gitHooks.ts

@@ -96,4 +96,10 @@ export const test: TestRunnerOptions = {
   repoSetup,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
   tags: ["agnostic", "security"],
+  coverage: [
+    "action/utils/gitAuth.ts",
+    "action/utils/gitAuthServer.ts",
+    "action/mcp/git.ts",
+    "action/mcp/checkout.ts",
+  ],
 };

test/agnostic/gitPerms.ts

@@ -104,4 +104,12 @@ export const test: TestRunnerOptions = {
   agentEnv,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
   tags: ["agnostic"],
+  coverage: [
+    "action/utils/gitAuth.ts",
+    "action/utils/gitAuthServer.ts",
+    "action/utils/lifecycle.ts",
+    "action/toolState.ts",
+    "action/mcp/git.ts",
+    "action/mcp/checkout.ts",
+  ],
 };

test/agnostic/packageJsonScripts.ts

@@ -92,4 +92,5 @@ export const test: TestRunnerOptions = {
   validator,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
   tags: ["agnostic", "security"],
+  coverage: ["action/mcp/dependencies.ts", "action/utils/install.ts"],
 };

test/agnostic/pushDisabled.ts

@@ -62,4 +62,12 @@ export const test: TestRunnerOptions = {
   agentEnv,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
   tags: ["agnostic"],
+  coverage: [
+    "action/utils/gitAuth.ts",
+    "action/utils/gitAuthServer.ts",
+    "action/utils/lifecycle.ts",
+    "action/toolState.ts",
+    "action/mcp/git.ts",
+    "action/mcp/checkout.ts",
+  ],
 };

test/agnostic/pushEnabled.ts

@@ -18,8 +18,8 @@ const fixture = defineFixture(
 3. Report if it succeeded
 
 ## Test 2: Tag Operations
-1. Create a local tag using the git MCP tool: git tag -a test-tag-enabled -m "test tag"
-2. Try push_tags tool with tag "test-tag-enabled"
+1. Create a local tag using the git MCP tool: git tag -a test-tag-enabled-\${RANDOM} -m "test tag"
+2. Try push_tags tool with the tag you just created
 3. Report if tag push succeeded
 
 ## Test 3: Branch Deletion (cleanup)
@@ -74,4 +74,12 @@ export const test: TestRunnerOptions = {
   validator,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
   tags: ["agnostic"],
+  coverage: [
+    "action/utils/gitAuth.ts",
+    "action/utils/gitAuthServer.ts",
+    "action/utils/lifecycle.ts",
+    "action/toolState.ts",
+    "action/mcp/git.ts",
+    "action/mcp/checkout.ts",
+  ],
 };

test/agnostic/pushRestricted.ts

@@ -67,4 +67,12 @@ export const test: TestRunnerOptions = {
   validator,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
   tags: ["agnostic"],
+  coverage: [
+    "action/utils/gitAuth.ts",
+    "action/utils/gitAuthServer.ts",
+    "action/utils/lifecycle.ts",
+    "action/toolState.ts",
+    "action/mcp/git.ts",
+    "action/mcp/checkout.ts",
+  ],
 };

test/agnostic/timeout.ts

@@ -29,4 +29,11 @@ export const test: TestRunnerOptions = {
   expectFailure: true,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
   tags: ["agnostic"],
+  coverage: [
+    "action/utils/timer.ts",
+    "action/utils/subprocess.ts",
+    "action/utils/exitHandler.ts",
+    "action/utils/activity.ts",
+    "action/mcp/selectMode.ts",
+  ],
 };

test/changed-agents.sh

@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-# determines which agents need testing based on changed files.
-# reads changed file paths from stdin (JSON array or newline-delimited).
-# outputs a JSON array of agent names to stdout.
-#
-# only agents whose harness file changed AND are exported from index.ts are included.
-# shared.ts/index.ts/postRun.ts and other non-harness action changes fall back to opencode as a canary.
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-AGENTS_INDEX="$SCRIPT_DIR/../agents/index.ts"
-
-# build the set of active agents from index.ts imports (portable, no -P)
-active_agents=()
-while IFS= read -r line; do
-  [[ -n "$line" ]] && active_agents+=("$line")
-done < <(sed -n 's/.*from "\.\/\([^"]*\)\.ts".*/\1/p' "$AGENTS_INDEX" | grep -v shared)
-
-# read stdin - auto-detect JSON array vs newline-delimited
-input=$(cat)
-if echo "$input" | jq -e 'type == "array"' > /dev/null 2>&1; then
-  files=$(echo "$input" | jq -r '.[]')
-else
-  files="$input"
-fi
-
-is_active_agent() {
-  local name="$1"
-  for a in "${active_agents[@]}"; do
-    [[ "$a" == "$name" ]] && return 0
-  done
-  return 1
-}
-
-# find which agent harness files changed
-changed_agents=()
-has_non_agent_change=false
-
-while IFS= read -r file; do
-  [[ -z "$file" ]] && continue
-  case "$file" in
-    action/agents/shared.ts|action/agents/index.ts|action/agents/postRun.ts)
-      has_non_agent_change=true
-      ;;
-    action/agents/*.ts)
-      agent_name="$(basename "$file" .ts)"
-      if is_active_agent "$agent_name"; then
-        changed_agents+=("$agent_name")
-      else
-        # legacy/inactive agent file changed — treat as non-agent change
-        has_non_agent_change=true
-      fi
-      ;;
-    action/*)
-      has_non_agent_change=true
-      ;;
-  esac
-done <<< "$files"
-
-# output agents based on change type.
-# non-agent action changes always include opencode as a canary.
-if $has_non_agent_change; then
-  changed_agents+=("opencode")
-fi
-
-if [[ ${#changed_agents[@]} -gt 0 ]]; then
-  printf '%s\n' "${changed_agents[@]}" | sort -u | jq -R . | jq -sc .
-else
-  echo '[]'
-fi

test/ci.test.ts

@@ -1,4 +1,3 @@
-import { execFileSync } from "node:child_process";
 import { readdirSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -16,7 +15,7 @@ type WorkflowJob = {
   "runs-on": string;
   "timeout-minutes"?: number;
   permissions?: WorkflowPermissions;
-  strategy?: { "fail-fast": boolean; matrix: Record<string, string[]> };
+  strategy?: { "fail-fast": boolean; matrix: Record<string, unknown> };
   env?: Record<string, string>;
   steps?: unknown[];
 };
@@ -57,12 +56,14 @@ const expectedAgents = Object.keys(agents).sort();
 const crossagentTests = getTestNamesFromDir("crossagent");
 const agnosticTests = getTestNamesFromDir("agnostic");
 const adhocTests = getTestNamesFromDir("adhoc");
-const dynamicAgentsExpression = "$" + "{{ fromJSON(needs.changes.outputs.agents) }}";
 
-// all provider API key names + GITHUB_TOKEN + model overrides
+// all provider API key names + managed credentials (e.g. Codex auth blob)
+// + GITHUB_TOKEN + model overrides
 const expectedAgentEnvVars = [
   "GITHUB_TOKEN",
-  ...new Set(Object.values(providers).flatMap((p) => [...p.envVars])),
+  ...new Set(
+    Object.values(providers).flatMap((p) => [...p.envVars, ...(p.managedCredentials ?? [])])
+  ),
   "PULLFROG_MODEL",
 ].sort();
 
@@ -83,53 +84,22 @@ describe("ci workflow consistency", () => {
     const rootJob = rootWorkflow.jobs["action-agents"];
     const actionJob = actionWorkflow.jobs.agents;
 
-    it("root agent matrix uses dynamic output from changes job", () => {
-      expect(rootJob.strategy!.matrix.agent).toBe(dynamicAgentsExpression);
-    });
-
-    it("changed-agents.sh falls back to opencode when shared agent code changed", () => {
-      const input = JSON.stringify(["action/agents/shared.ts"]);
-      const output = execFileSync("bash", [join(__dirname, "changed-agents.sh")], {
-        input,
-        encoding: "utf-8",
-      });
-      expect(JSON.parse(output)).toEqual(["opencode"]);
-    });
-
-    it("changed-agents.sh falls back to opencode for non-agent action changes", () => {
-      const output = execFileSync("bash", [join(__dirname, "changed-agents.sh")], {
-        input: JSON.stringify(["action/mcp/server.ts"]),
-        encoding: "utf-8",
-      });
-      expect(JSON.parse(output)).toEqual(["opencode"]);
-    });
-
-    it("changed-agents.sh includes opencode canary alongside changed agents", () => {
-      const output = execFileSync("bash", [join(__dirname, "changed-agents.sh")], {
-        input: JSON.stringify(["action/agents/opencode.ts", "action/mcp/server.ts"]),
-        encoding: "utf-8",
-      });
-      expect(JSON.parse(output)).toEqual(["opencode"]);
-    });
-
-    it("changed-agents.sh treats legacy agent files as non-agent changes", () => {
-      const output = execFileSync("bash", [join(__dirname, "changed-agents.sh")], {
-        input: JSON.stringify(["action/agents/codex.ts", "action/agents/gemini.ts"]),
-        encoding: "utf-8",
-      });
-      expect(JSON.parse(output)).toEqual(["opencode"]);
+    it("root agents matrix is wired to the dynamic matrix output", () => {
+      const include = rootJob.strategy?.matrix.include;
+      expect(typeof include).toBe("string");
+      expect(include as string).toContain("fromJSON(needs.changes.outputs.matrix).agents");
     });
 
     it("action agent matrix matches agents map", () => {
-      expect([...actionJob.strategy!.matrix.agent].sort()).toEqual(expectedAgents);
-    });
-
-    it("root test matrix matches crossagent/ directory", () => {
-      expect([...rootJob.strategy!.matrix.test].sort()).toEqual(crossagentTests);
+      expect((actionJob.strategy?.matrix.agent as string[])?.slice().sort()).toEqual(
+        expectedAgents
+      );
     });
 
     it("action test matrix matches crossagent/ directory", () => {
-      expect([...actionJob.strategy!.matrix.test].sort()).toEqual(crossagentTests);
+      expect((actionJob.strategy?.matrix.test as string[])?.slice().sort()).toEqual(
+        crossagentTests
+      );
     });
 
     it("permissions match between root and action", () => {
@@ -149,8 +119,8 @@ describe("ci workflow consistency", () => {
     });
 
     it("fail-fast is enabled in both", () => {
-      expect(rootJob.strategy!["fail-fast"]).toBe(true);
-      expect(actionJob.strategy!["fail-fast"]).toBe(true);
+      expect(rootJob.strategy?.["fail-fast"]).toBe(true);
+      expect(actionJob.strategy?.["fail-fast"]).toBe(true);
     });
   });
 
@@ -158,12 +128,14 @@ describe("ci workflow consistency", () => {
     const rootJob = rootWorkflow.jobs["action-agnostic"];
     const actionJob = actionWorkflow.jobs.agnostic;
 
-    it("root test matrix matches agnostic/ directory", () => {
-      expect([...rootJob.strategy!.matrix.test].sort()).toEqual(agnosticTests);
+    it("root agnostic matrix is wired to the dynamic matrix output", () => {
+      const include = rootJob.strategy?.matrix.include;
+      expect(typeof include).toBe("string");
+      expect(include as string).toContain("fromJSON(needs.changes.outputs.matrix).agnostic");
     });
 
     it("action test matrix matches agnostic/ directory", () => {
-      expect([...actionJob.strategy!.matrix.test].sort()).toEqual(agnosticTests);
+      expect((actionJob.strategy?.matrix.test as string[])?.slice().sort()).toEqual(agnosticTests);
     });
 
     it("permissions match between root and action", () => {
@@ -183,8 +155,8 @@ describe("ci workflow consistency", () => {
     });
 
     it("fail-fast is enabled in both", () => {
-      expect(rootJob.strategy!["fail-fast"]).toBe(true);
-      expect(actionJob.strategy!["fail-fast"]).toBe(true);
+      expect(rootJob.strategy?.["fail-fast"]).toBe(true);
+      expect(actionJob.strategy?.["fail-fast"]).toBe(true);
     });
   });
 });

test/coverage.ts

@@ -0,0 +1,116 @@
+/**
+ * shared coverage / glob plumbing for the matrix builder.
+ *
+ * every test (`crossagent/`, `agnostic/`) and every provider entry
+ * (`providers.ts`) declares a `coverage` array of repo-relative globs. on a PR
+ * push, the `changes` job feeds the changed-file list into `matrix.ts`, which
+ * intersects each entry's globs against the diff and emits only the entries
+ * that need to run.
+ *
+ * `ALWAYS_RUN_ALL` is the escape hatch: any change to a file matched here
+ * forces the full matrix (every test, every flagship, every alias). it
+ * captures cross-cutting infrastructure where fan-out is unpredictable —
+ * agent loader, MCP server boot, test runner itself. if a per-test glob
+ * goes stale, this list and the on-`main`-full-matrix policy are the safety
+ * nets — there's no completeness lint.
+ *
+ * `coverage` is optional on tests/providers; missing = always run (treat as
+ * "any code change touches me"). default to defensive — opt into precision
+ * by adding globs.
+ */
+
+/** patterns that, when matched by any changed file, force the full matrix. */
+export const ALWAYS_RUN_ALL: string[] = [
+  // agent loader + cross-agent shared code
+  "action/agents/shared.ts",
+  "action/agents/index.ts",
+  "action/agents/postRun.ts",
+  // test harness — changing these can affect every test
+  "action/test/run.ts",
+  "action/test/utils.ts",
+  "action/test/matrix.ts",
+  "action/test/list-aliases.ts",
+  "action/test/coverage.ts",
+  "action/test/providers.ts",
+  // boot + lifecycle
+  "action/main.ts",
+  "action/index.ts",
+  "action/cli.ts",
+  "action/utils/setup.ts",
+  "action/utils/install.ts",
+  "action/utils/runFixture.ts",
+  "action/utils/globals.ts",
+  // local docker container plumbing (changes invalidate every test's environment)
+  "action/Dockerfile",
+  "action/docker-entrypoint.sh",
+  "action/docker.ts",
+  // MCP orchestrator (every test runs through it)
+  "action/mcp/server.ts",
+  "action/mcp/shared.ts",
+  // dependency graph
+  "action/package.json",
+  "action/pnpm-lock.yaml",
+  // workflow itself
+  ".github/workflows/test.yml",
+];
+
+/**
+ * expand a single brace group like `{a,b,c}` into an array of patterns.
+ *
+ * intentionally minimal: nested braces (`{a,{b,c}}`) and escaped braces are
+ * NOT supported — coverage globs in this repo only need flat brace groups
+ * (`{claude,opencode}.ts`). add complexity if a real use case emerges.
+ */
+function expandBraces(pattern: string): string[] {
+  const m = pattern.match(/\{([^{}]+)\}/);
+  if (!m || m.index === undefined) return [pattern];
+  const before = pattern.slice(0, m.index);
+  const after = pattern.slice(m.index + m[0].length);
+  const opts = m[1].split(",");
+  return opts.flatMap((opt) => expandBraces(`${before}${opt}${after}`));
+}
+
+/** convert a glob pattern to a regex anchored at start + end. */
+function globToRegex(pattern: string): RegExp {
+  const DSTAR = "\u0000DSTAR\u0000";
+  let s = pattern.replace(/\*\*/g, DSTAR);
+  s = s.replace(/[.+^$()|[\]\\]/g, "\\$&");
+  s = s.replace(/\*/g, "[^/]*");
+  s = s.replace(/\?/g, "[^/]");
+  s = s.replaceAll(DSTAR, ".*");
+  return new RegExp(`^${s}$`);
+}
+
+/** does any path in `paths` match any glob in `patterns`? */
+export function anyMatch(paths: string[], patterns: string[]): boolean {
+  if (patterns.length === 0) return false;
+  const regexes = patterns.flatMap((p) => expandBraces(p)).map(globToRegex);
+  return paths.some((path) => regexes.some((r) => r.test(path)));
+}
+
+/**
+ * decide whether an entry runs given changed files + its coverage globs.
+ *
+ * three short-circuits:
+ *   1. `full` flag (e.g. main pushes, workflow_dispatch) → always run
+ *   2. any changed file matches `ALWAYS_RUN_ALL` → run everything
+ *   3. coverage missing or empty on the entry → run (defensive default)
+ *
+ * otherwise: run iff any changed file matches the entry's coverage globs.
+ *
+ * `coverage: []` is treated identically to `coverage: undefined` to avoid the
+ * footgun where a future test author intends "skip on PRs" by passing an
+ * empty array — silently skipping CI on every PR is worse than always running.
+ */
+export type ShouldRunInput = {
+  changedFiles: string[];
+  coverage: string[] | undefined;
+  full: boolean;
+};
+
+export function shouldRun(input: ShouldRunInput): boolean {
+  if (input.full) return true;
+  if (anyMatch(input.changedFiles, ALWAYS_RUN_ALL)) return true;
+  if (input.coverage === undefined || input.coverage.length === 0) return true;
+  return anyMatch(input.changedFiles, input.coverage);
+}

test/crossagent/codexAuth.ts

@@ -0,0 +1,110 @@
+import { randomUUID } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { detectCodexRefresh } from "../../utils/codexHome.ts";
+import type { AgentResult, TestRunnerOptions, ValidationCheck } from "../utils.ts";
+import { defineFixture } from "../utils.ts";
+
+/**
+ * codex-auth test — end-to-end Codex ChatGPT-subscription auth smoke.
+ *
+ * Pins openai/gpt-5.5 (in upstream opencode's Codex `ALLOWED_MODELS` allow
+ * list) and runs the full opencode harness against the developer's / CI's
+ * `CODEX_AUTH_JSON`. Exercises:
+ *
+ *   - installCodexAuth() materializes auth.json at $HOME/.local/share/opencode/
+ *     with `expires: 0` (forces refresh on first request).
+ *   - opencode's CodexAuthPlugin routes openai requests through the ChatGPT
+ *     subscription instead of needing OPENAI_API_KEY.
+ *   - the refresh chain advances during the run (proving the refresh path
+ *     works end-to-end against live Codex auth servers).
+ *   - detectCodexRefresh() would surface the rotation to entryPost.ts for
+ *     write-back to Pullfrog's secret store.
+ *
+ * the post-hook itself runs in a separate GHA `post:` step and is not
+ * invoked by `pnpm runtest`. instead, this test asserts the on-disk auth.json
+ * state that the post-hook would consume, which is the genuine integration
+ * boundary (everything past `detectCodexRefresh` is a single fetch + unit-
+ * tested in codexHome.test.ts).
+ *
+ * requires `CODEX_AUTH_JSON` in the environment. dev-local: put it in
+ * `.env`. CI: provisioned as `secrets.CODEX_AUTH_JSON` and forwarded by the
+ * `action-agents` job env block in `.github/workflows/test.yml`.
+ */
+
+const token = randomUUID();
+
+const fixture = defineFixture(
+  {
+    prompt: `Call set_output with exactly this token and nothing else: ${token}`,
+    shell: "restricted",
+    push: "disabled",
+    timeout: "4m",
+  },
+  { localOnly: true }
+);
+
+function parseOriginalRefresh(): string | null {
+  const raw = process.env.CODEX_AUTH_JSON;
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(raw) as { tokens?: { refresh_token?: unknown } };
+    const rt = parsed?.tokens?.refresh_token;
+    return typeof rt === "string" && rt.length > 0 ? rt : null;
+  } catch {
+    return null;
+  }
+}
+
+function validator(result: AgentResult): ValidationCheck[] {
+  const setOutputCalled = result.structuredOutput !== null;
+  const tokenMatches = result.structuredOutput === token;
+
+  // installCodexAuth() emits this log line with the absolute path; we use it
+  // to find the per-test HOME (randomized inside runAgentStreaming).
+  const pathMatch = result.output.match(/installed Codex auth at (\S+)/);
+  const authPath = pathMatch?.[1];
+
+  let authMaterialized = false;
+  let refreshRotated = false;
+
+  if (authPath) {
+    try {
+      const content = readFileSync(authPath, "utf8");
+      authMaterialized = true;
+      const originalRefresh = parseOriginalRefresh();
+      if (originalRefresh) {
+        refreshRotated = detectCodexRefresh({ authFileContent: content, originalRefresh }) !== null;
+      }
+    } catch {
+      // authMaterialized stays false
+    }
+  }
+
+  return [
+    { name: "set_output", passed: setOutputCalled },
+    { name: "token_matches", passed: tokenMatches },
+    { name: "auth_materialized", passed: authMaterialized },
+    { name: "refresh_rotated", passed: refreshRotated },
+  ];
+}
+
+export const test: TestRunnerOptions = {
+  name: "codex-auth",
+  fixture,
+  validator,
+  agents: ["opencode"],
+  env: {
+    PULLFROG_MODEL: "openai/gpt",
+    PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1",
+  },
+  coverage: [
+    "action/utils/codexHome.ts",
+    "action/entryPost.ts",
+    "action/agents/{opencode,opencode_v2}.ts",
+  ],
+  // forks + contributors without the Codex secret skip cleanly rather than
+  // failing on `auth_materialized=✗` and (with fail-fast: true) cascading
+  // cancellation across the rest of the matrix. CI on `pullfrog/app` and
+  // dev-local with `.env` both have the secret and run the test as normal.
+  skipIf: () => (process.env.CODEX_AUTH_JSON ? null : "CODEX_AUTH_JSON unset"),
+};

test/crossagent/mcpmerge.ts

@@ -43,4 +43,6 @@ export const test: TestRunnerOptions = {
   },
   repoSetup:
     'mkdir -p /tmp/pullfrog-mcp-secret && printf "%s" "$PULLFROG_MCP_SECRET" > /tmp/pullfrog-mcp-secret/secret.txt',
+  // any MCP-layer change can affect repo-MCP merging; agents own MCP wiring.
+  coverage: ["action/mcp/**", "action/agents/{claude,opencode,opencode_v2}.ts"],
 };

test/crossagent/nobash.ts

@@ -43,4 +43,5 @@ export const test: TestRunnerOptions = {
   validator,
   agentEnv,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
+  coverage: ["action/mcp/shell.ts", "action/agents/{claude,opencode,opencode_v2}.ts"],
 };

test/crossagent/restricted.ts

@@ -52,4 +52,9 @@ export const test: TestRunnerOptions = {
   validator,
   agentEnv,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
+  coverage: [
+    "action/utils/normalizeEnv.ts",
+    "action/mcp/shell.ts",
+    "action/agents/{claude,opencode,opencode_v2}.ts",
+  ],
 };

test/crossagent/skillInvokeClaude.ts

@@ -44,4 +44,5 @@ export const test: TestRunnerOptions = {
     PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1",
     PULLFROG_MODEL: "anthropic/claude-sonnet-4-6",
   },
+  coverage: ["action/agents/claude.ts"],
 };

test/crossagent/skillInvokeOpencode.ts

@@ -44,4 +44,9 @@ export const test: TestRunnerOptions = {
     PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1",
     PULLFROG_MODEL: "anthropic/claude-sonnet-4-6",
   },
+  coverage: [
+    "action/agents/opencode.ts",
+    "action/agents/opencode_v2.ts",
+    "action/agents/opencodePlugin.ts",
+  ],
 };

test/crossagent/smoke.ts

@@ -2,13 +2,16 @@ import type { AgentResult, TestRunnerOptions, ValidationCheck } from "../utils.t
 import { defineFixture } from "../utils.ts";
 
 /**
- * smoke test - validates agent can connect to API and call MCP tools.
- * verifies set_output tool is called with correct value.
+ * smoke test — validates agent can connect to the API and call MCP tools.
+ *
+ * two tool calls (not one) on purpose: this is the canary that exercises the
+ * 2nd model→agent round-trip across every providers-live flagship. bugs like
+ * the Gemini `thought_signature` echo only fire after the first tool result
+ * comes back. do not collapse to a single tool call.
  */
-
 const fixture = defineFixture(
   {
-    prompt: `Call set_output with "SMOKE TEST PASSED".`,
+    prompt: `First call the git tool with command "status" to confirm the repo is reachable. Then call set_output with exactly the literal string "SMOKE TEST PASSED".`,
   },
   { localOnly: true }
 );
@@ -29,4 +32,7 @@ export const test: TestRunnerOptions = {
   fixture,
   validator,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
+  // canary: any agent harness change runs the smoke. shared MCP set_output
+  // surface is also captured.
+  coverage: ["action/agents/{claude,opencode,opencode_v2}.ts", "action/mcp/output.ts"],
 };

test/crossagent/tokenExfil.ts

@@ -58,4 +58,9 @@ export const test: TestRunnerOptions = {
   validator,
   agentEnv,
   env: { PULLFROG_DISABLE_SECURITY_INSTRUCTIONS: "1" },
+  coverage: [
+    "action/utils/normalizeEnv.ts",
+    "action/mcp/shell.ts",
+    "action/agents/{claude,opencode,opencode_v2}.ts",
+  ],
 };

test/list-aliases.ts

@@ -1,65 +1,45 @@
 /**
  * emits a JSON array of { slug, agent, name } entries for one of two CI matrix
  * jobs. `agent` mirrors the harness the runtime would pick in production
- * (anthropic/* → claude-code, everything else → opencode).
+ * (anthropic/* → claude, everything else → opencode).
  *
- * MODE=aliases (default) — every alias minus pruned passthroughs. consumed by
- *   `models-live`, which runs the cheap top-level CLI smoke per alias
- *   (`action/test/model-smoke.ts`) to validate resolution + auth.
+ * MODE=aliases (default) — every alias. consumed by `models-live`, which runs
+ *   the cheap top-level CLI smoke per alias (`action/test/model-smoke.ts`) to
+ *   validate resolution + auth.
  *
  * MODE=flagships — one standard-tier model per provider. consumed by
  *   `providers-live`, which runs the full harness smoke
  *   (`pnpm runtest smoke <agent>`) to validate provider-class tool-calling
- *   (e.g. Gemini schema sanitizer, OpenAI tool-call format).
+ *   (e.g. Gemini schema sanitizer, OpenAI tool-call format). flagship slugs
+ *   live in `providers.ts` alongside their per-provider coverage globs.
  *
- * passthrough pruning (aliases mode): openrouter/* aliases and keyed opencode/*
- * aliases are routing-layer wrappers around models we already smoke-test
- * directly. running every passthrough burns CI minutes without catching
- * anything new — slug-drift is covered by the `models-catalog` job. one canary
- * per routing layer proves the routing surface (auth, tool-call translation)
- * is alive; set INCLUDE_PASSTHROUGHS=1 to bypass for full validation.
+ * Every keyed alias is smoked — including `openrouter/*` and keyed `opencode/*`
+ * passthroughs. They look like routing-layer wrappers but each one is a
+ * distinct catalog entry on models.dev (under the `openrouter` / `opencode`
+ * provider sections) that can drift independently of the upstream provider
+ * mirror — testing the direct google entry tells you nothing about whether
+ * the openrouter mirror has the same model id. The only entries pruned are
+ * routing slugs (bedrock/byok) whose `resolve` is a sentinel that picks the
+ * actual model id from a per-run env var.
  *
  * usage:
  *   node action/test/list-aliases.ts
  *   MODE=flagships node action/test/list-aliases.ts
  *   MATRIX_FILTER=gemini node action/test/list-aliases.ts
- *   INCLUDE_PASSTHROUGHS=1 node action/test/list-aliases.ts
+ *
+ * NOTE: the per-PR-precision matrix lives in `matrix.ts`, which calls into
+ * this file. raw invocation here emits the unfiltered matrix.
  */
 import { modelAliases } from "../models.ts";
+import { providers } from "./providers.ts";
 
-const ROUTING_CANARIES = new Set(["openrouter/claude-sonnet", "opencode/claude-sonnet"]);
+export type MatrixEntry = {
+  slug: string;
+  agent: string;
+  name: string;
+};
 
-// hand-picked "standard good model" per provider — not the pro/opus tier (too
-// expensive for per-push) and not the free/experimental tier (too flaky). these
-// aliases anchor the harness smoke job that catches provider-class regressions
-// like Gemini schema sanitization or OpenAI tool-call format drift. the
-// assertion below catches slug-drift loudly, but adding a NEW provider without
-// an entry here silently omits it from `providers-live` — see
-// wiki/models-catalog.md "To add a provider".
-const FLAGSHIPS = [
-  "anthropic/claude-sonnet",
-  "openai/gpt",
-  "google/gemini-pro",
-  "xai/grok",
-  "deepseek/deepseek-pro",
-  "moonshotai/kimi-k2",
-  "opencode/big-pickle",
-  "openrouter/claude-sonnet",
-];
-
-function isPrunablePassthrough(alias: (typeof modelAliases)[number]): boolean {
-  if (ROUTING_CANARIES.has(alias.slug)) return false;
-  if (alias.provider === "openrouter") return true;
-  // routing slugs (bedrock/byok) need a per-run env var to pick the actual
-  // model — there's no generic smoke test, so prune from both matrices.
-  if (alias.routing) return true;
-  // opencode FREE models (big-pickle, mimo-v2-pro-free, minimax-m2.5-free)
-  // are unique to opencode and used in prod — keep them. only prune the keyed
-  // mirrors.
-  return alias.provider === "opencode" && !alias.isFree;
-}
-
-function toMatrixEntry(alias: (typeof modelAliases)[number]) {
+function toMatrixEntry(alias: (typeof modelAliases)[number]): MatrixEntry {
   return {
     slug: alias.slug,
     agent: alias.slug.startsWith("anthropic/") ? "claude" : "opencode",
@@ -68,32 +48,41 @@ function toMatrixEntry(alias: (typeof modelAliases)[number]) {
   };
 }
 
-const mode = process.env.MODE === "flagships" ? "flagships" : "aliases";
-const filter = process.env.MATRIX_FILTER?.trim().toLowerCase() ?? "";
-const includePassthroughs = process.env.INCLUDE_PASSTHROUGHS === "1";
-
 const aliasBySlug = new Map(modelAliases.map((a) => [a.slug, a]));
-const matrix = (() => {
-  if (mode === "flagships") {
-    return FLAGSHIPS.map((slug) => {
-      const alias = aliasBySlug.get(slug);
+
+export function buildAliasMatrix(opts: { filter?: string }): MatrixEntry[] {
+  const filter = opts.filter ?? "";
+  return modelAliases
+    .filter((alias) => {
+      if (filter && !alias.slug.toLowerCase().includes(filter)) return false;
+      // routing slugs (bedrock/byok) need a per-run env var to pick the actual
+      // model — there's no generic smoke test.
+      if (alias.routing) return false;
+      return true;
+    })
+    .map(toMatrixEntry);
+}
+
+export function buildFlagshipMatrix(opts: { filter?: string }): MatrixEntry[] {
+  const filter = opts.filter ?? "";
+  return providers
+    .map((p) => {
+      const alias = aliasBySlug.get(p.flagship);
       if (!alias) {
         throw new Error(
-          `list-aliases: flagship "${slug}" missing from modelAliases — update FLAGSHIPS`
+          `list-aliases: flagship "${p.flagship}" missing from modelAliases — update providers.ts`
         );
       }
       return alias;
     })
-      .filter((alias) => !filter || alias.slug.toLowerCase().includes(filter))
-      .map(toMatrixEntry);
-  }
-  return modelAliases
-    .filter((alias) => {
-      if (filter && !alias.slug.toLowerCase().includes(filter)) return false;
-      if (!includePassthroughs && isPrunablePassthrough(alias)) return false;
-      return true;
-    })
+    .filter((alias) => !filter || alias.slug.toLowerCase().includes(filter))
     .map(toMatrixEntry);
-})();
+}
 
-process.stdout.write(JSON.stringify(matrix));
+if (import.meta.url === `file://${process.argv[1]}`) {
+  const mode = process.env.MODE === "flagships" ? "flagships" : "aliases";
+  const filter = process.env.MATRIX_FILTER?.trim().toLowerCase() ?? "";
+  const matrix =
+    mode === "flagships" ? buildFlagshipMatrix({ filter }) : buildAliasMatrix({ filter });
+  process.stdout.write(JSON.stringify(matrix));
+}

test/matrix.ts

@@ -0,0 +1,227 @@
+/**
+ * unified CI matrix builder. emits the four matrices consumed by
+ * `.github/workflows/test.yml`:
+ *
+ *   - agents:    crossagent tests × eligible agents (fan-out)
+ *   - agnostic:  agnostic infrastructure tests (run with opencode)
+ *   - flagships: one harness smoke per provider (providers-live)
+ *   - aliases:   one CLI smoke per model alias (models-live)
+ *
+ * input: a JSON array of repo-relative changed paths on stdin (the
+ * `paths-filter` action's `*_files` output). PR pushes pass the diff;
+ * `main` pushes and `workflow_dispatch` set FULL=1 to skip filtering and
+ * emit every entry.
+ *
+ * each test/provider declares its own `coverage` globs colocated with the
+ * test (`crossagent/`, `agnostic/`) or provider (`providers.ts`). the matrix
+ * builder intersects coverage against the diff. a top-level `ALWAYS_RUN_ALL`
+ * (see `coverage.ts`) bypasses filtering when test-harness or cross-cutting
+ * agent code changes — keeps stale globs from silently skipping critical
+ * tests on test runner / shared.ts churn.
+ *
+ * usage:
+ *   echo '["action/agents/opencode.ts"]' | node action/test/matrix.ts
+ *   FULL=1 node action/test/matrix.ts < /dev/null
+ *   MATRIX_FILTER=gemini FULL=1 node action/test/matrix.ts < /dev/null
+ */
+
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { shouldRun } from "./coverage.ts";
+import { buildAliasMatrix, buildFlagshipMatrix } from "./list-aliases.ts";
+import { providers } from "./providers.ts";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+type AgentEntry = { agent: string; test: string; name: string };
+type AgnosticEntry = { test: string; name: string };
+type SlugEntry = { slug: string; agent: string; name: string };
+
+type MatrixOutput = {
+  agents: AgentEntry[];
+  agnostic: AgnosticEntry[];
+  flagships: SlugEntry[];
+  aliases: SlugEntry[];
+};
+
+/**
+ * extracted test metadata. parsed via regex from the test source — see
+ * `parseTestFile`. dynamic-import is intentionally avoided: the GHA `changes`
+ * job runs without `pnpm install`, and the real test modules transitively
+ * import `@actions/core` etc. parsing keeps `matrix.ts` zero-dep.
+ */
+type ParsedTest = {
+  name: string;
+  agents: string[] | undefined;
+  coverage: string[] | undefined;
+};
+
+const STRING_LITERAL = /"((?:\\.|[^"\\])*)"/g;
+
+function extractStringLiterals(source: string): string[] {
+  const out: string[] = [];
+  STRING_LITERAL.lastIndex = 0;
+  let m: RegExpExecArray | null;
+  // biome-ignore lint/suspicious/noAssignInExpressions: idiomatic regex iteration
+  while ((m = STRING_LITERAL.exec(source))) {
+    out.push(m[1]);
+  }
+  return out;
+}
+
+/**
+ * extract a `key: [...]` array literal of strings from a test object. matches
+ * line-leading indented `key:` to avoid colliding with the same word inside
+ * prompts / template literals.
+ */
+function extractStringArray(source: string, key: string): string[] | undefined {
+  const re = new RegExp(`^\\s+${key}:\\s*\\[([\\s\\S]*?)\\]`, "m");
+  const m = source.match(re);
+  if (!m) return undefined;
+  return extractStringLiterals(m[1]);
+}
+
+function parseTestFile(source: string): ParsedTest | null {
+  // strip line comments — `//` inside string literals is rare in test files,
+  // and the static parser doesn't need to be perfect (defensive default of
+  // "missing coverage = always run" covers parse misses).
+  const stripped = source.replace(/\/\/[^\n]*$/gm, "");
+  const nameMatch = stripped.match(/^\s+name:\s*"([^"]+)"/m);
+  if (!nameMatch) return null;
+  return {
+    name: nameMatch[1],
+    agents: extractStringArray(stripped, "agents"),
+    coverage: extractStringArray(stripped, "coverage"),
+  };
+}
+
+function loadDir(dir: string): ParsedTest[] {
+  const dirPath = join(__dirname, dir);
+  if (!existsSync(dirPath)) return [];
+  const files = readdirSync(dirPath).filter((f) => f.endsWith(".ts"));
+  const out: ParsedTest[] = [];
+  for (const file of files) {
+    const source = readFileSync(join(dirPath, file), "utf8");
+    const parsed = parseTestFile(source);
+    if (parsed) out.push(parsed);
+  }
+  return out;
+}
+
+/**
+ * derive the active agent list from `agents/index.ts` so adding a new harness
+ * file automatically wires it into the matrix. avoids dynamic-import
+ * (transitively pulls `@actions/core` etc. — would explode in the no-install
+ * `changes` job) by regex-parsing the imports the same way `parseTestFile`
+ * handles tests.
+ */
+function loadAgents(): string[] {
+  const indexPath = join(__dirname, "..", "agents", "index.ts");
+  const source = readFileSync(indexPath, "utf8");
+  const out: string[] = [];
+  const re = /^\s*import\s+\{\s*(\w+)\s*\}\s+from\s+"\.\/(\w+)\.ts"/gm;
+  let m: RegExpExecArray | null;
+  // biome-ignore lint/suspicious/noAssignInExpressions: idiomatic regex iteration
+  while ((m = re.exec(source))) {
+    if (m[2] === "shared") continue;
+    out.push(m[1]);
+  }
+  return out.sort();
+}
+
+function readChangedFiles(): string[] {
+  const raw = readFileSync(0, "utf8").trim();
+  if (!raw) return [];
+  const parsed: unknown = JSON.parse(raw);
+  if (!Array.isArray(parsed)) {
+    throw new Error("matrix: stdin must be a JSON array of changed paths");
+  }
+  return parsed.map((p) => {
+    if (typeof p !== "string") {
+      throw new Error(`matrix: non-string entry in changed paths: ${JSON.stringify(p)}`);
+    }
+    return p;
+  });
+}
+
+function buildAgentsMatrix(input: { changedFiles: string[]; full: boolean }): AgentEntry[] {
+  const tests = loadDir("crossagent");
+  const allAgents = loadAgents();
+  const out: AgentEntry[] = [];
+  for (const t of tests) {
+    if (!shouldRun({ changedFiles: input.changedFiles, coverage: t.coverage, full: input.full })) {
+      continue;
+    }
+    const agents = t.agents ?? allAgents;
+    for (const agent of agents) {
+      out.push({ agent, test: t.name, name: `${t.name}-${agent}` });
+    }
+  }
+  return out;
+}
+
+function buildAgnosticMatrix(input: { changedFiles: string[]; full: boolean }): AgnosticEntry[] {
+  const tests = loadDir("agnostic");
+  const out: AgnosticEntry[] = [];
+  for (const t of tests) {
+    if (!shouldRun({ changedFiles: input.changedFiles, coverage: t.coverage, full: input.full })) {
+      continue;
+    }
+    out.push({ test: t.name, name: t.name });
+  }
+  return out;
+}
+
+function buildFlagshipsMatrix(input: {
+  changedFiles: string[];
+  full: boolean;
+  filter: string;
+}): SlugEntry[] {
+  const all = buildFlagshipMatrix({ filter: input.filter });
+  const byName = new Map(providers.map((p) => [p.flagship, p]));
+  return all.filter((entry) => {
+    const provider = byName.get(entry.slug);
+    return shouldRun({
+      changedFiles: input.changedFiles,
+      coverage: provider?.coverage,
+      full: input.full,
+    });
+  });
+}
+
+function buildAliasesMatrix(input: {
+  changedFiles: string[];
+  full: boolean;
+  filter: string;
+}): SlugEntry[] {
+  const all = buildAliasMatrix({ filter: input.filter });
+  const coverageByProvider = new Map(providers.map((p) => [p.name, p.coverage]));
+  return all.filter((entry) => {
+    const provider = entry.slug.split("/")[0];
+    return shouldRun({
+      changedFiles: input.changedFiles,
+      coverage: coverageByProvider.get(provider),
+      full: input.full,
+    });
+  });
+}
+
+function main(): void {
+  const full = process.env.FULL === "1";
+  const filter = process.env.MATRIX_FILTER?.trim().toLowerCase() ?? "";
+  const changedFiles = full ? [] : readChangedFiles();
+
+  const output: MatrixOutput = {
+    agents: buildAgentsMatrix({ changedFiles, full }),
+    agnostic: buildAgnosticMatrix({ changedFiles, full }),
+    flagships: buildFlagshipsMatrix({ changedFiles, full, filter }),
+    aliases: buildAliasesMatrix({ changedFiles, full, filter }),
+  };
+
+  process.stdout.write(JSON.stringify(output));
+}
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+  main();
+}

test/model-smoke.ts

@@ -28,7 +28,12 @@ config({ path: join(import.meta.dirname, "..", "..", ".env") });
 
 const PROMPT = "Reply with exactly OK and nothing else.";
 const MATCH = /\bOK\b/i;
-const TIMEOUT_MS = 60_000;
+// xai is the slowest provider in the matrix — winning xai/grok-4.3 jobs land
+// at 42-67s wall time (vs 23-41s for every other provider), brushing a 60s
+// ceiling and intermittently crossing it. 120s gives ~2x headroom on the
+// slowest provider observed in CI, with no downside on the fast-path
+// providers since the timer only fires on actual hangs.
+const TIMEOUT_MS = 120_000;
 
 function parseSlug(): string {
   const argIdx = process.argv.indexOf("--slug");
@@ -78,7 +83,9 @@ async function plan(slug: string): Promise<Plan> {
   const cliPath = await installFromNpmTarball({
     packageName: "opencode-ai",
     version: getDevDependencyVersion("opencode-ai"),
-    executablePath: "bin/opencode",
+    // v1.14+: postinstall.mjs renames the platform-specific binary to
+    // `bin/opencode.exe` for every OS — see action/agents/opencode_v2.ts.
+    executablePath: "bin/opencode.exe",
     installDependencies: true,
   });
   return {

test/models-catalog.main.test.ts

@@ -1,12 +1,16 @@
 import { describe, expect, it } from "vitest";
 import { modelAliases, resolveDisplayAlias } from "../models.ts";
 
-// ── catalog drift tests — main-only ─────────────────────────────────────────────
+// ── catalog drift tests ─────────────────────────────────────────────────────
 //
 // these tests fetch models.dev and openrouter.ai to verify that every alias in
 // models.ts still corresponds to a live, non-deprecated upstream model. upstream
 // catalog drift (new model ships, old model deprecated, etc.) causes failures
-// that are unrelated to any code change in the PR — so these run only on main.
+// that are unrelated to any code change in a typical PR — so these are gated
+// off for normal PRs and run only on main pushes plus PRs from the
+// `pullfrog/models-bump` branch (the bot-authored bump PR — this test IS the
+// integrity gate for its edits, so it has to run on the PR itself, not just
+// post-merge).
 //
 // the registry is kept in sync with upstreams by the `models-bump` cron
 // (`.github/workflows/models-bump.yml`), which scans models.dev every 12h and
@@ -15,7 +19,6 @@ import { modelAliases, resolveDisplayAlias } from "../models.ts";
 // for that PR — they catch typos, removed models, and openrouter mismatches.
 //
 // run locally with `pnpm test:catalog`.
-// in CI, gated to push events on main.
 
 type ModelsDevModel = {
   name: string;
@@ -47,6 +50,12 @@ describe("models.dev validity", async () => {
     // since there's no models.dev entry to validate against.
     if (alias.routing) continue;
 
+    // aliases with a `fallback` are deprecated entries that legitimately point
+    // at dead resolve targets — the fallback chain redirects callers to a live
+    // model. skip both existence and deprecation checks; the terminal-fallback
+    // is validated separately by the Zen served-list test below.
+    if (alias.fallback) continue;
+
     const parsed = parseResolve(alias.resolve);
 
     it(`${alias.resolve} exists on models.dev`, () => {
@@ -59,13 +68,11 @@ describe("models.dev validity", async () => {
       ).toBeDefined();
     });
 
-    if (!alias.fallback) {
-      it(`${alias.resolve} is not deprecated`, () => {
-        const model = data[parsed.provider]?.models[parsed.modelId];
-        if (!model) return; // covered by existence test above
-        expect(model.status, `${alias.resolve} is deprecated on models.dev`).not.toBe("deprecated");
-      });
-    }
+    it(`${alias.resolve} is not deprecated`, () => {
+      const model = data[parsed.provider]?.models[parsed.modelId];
+      if (!model) return; // covered by existence test above
+      expect(model.status, `${alias.resolve} is deprecated on models.dev`).not.toBe("deprecated");
+    });
   }
 });
 

test/models.test.ts

@@ -5,7 +5,8 @@ import { getModelEnvVars, modelAliases, resolveCliModel, resolveDisplayAlias } f
 //
 // these tests validate our alias data structure without hitting external APIs.
 // network-dependent checks (models.dev / OpenRouter catalog drift, latest-model
-// snapshot) live in models-catalog.main.test.ts and run only on main.
+// snapshot) live in models-catalog.main.test.ts and run on main pushes plus
+// `pullfrog/models-bump` PRs (the bot's bump branch, gated in test.yml).
 
 // models that have no OpenRouter equivalent and require BYOK.
 // add a model here ONLY when it genuinely doesn't exist on both models.dev and OpenRouter.

test/providers.ts

@@ -0,0 +1,89 @@
+/**
+ * provider catalog — the source of truth for `providers-live` (full harness
+ * smoke per provider) and the per-provider coverage globs that scope `models-live`
+ * (per-alias CLI smoke).
+ *
+ * each entry pins one standard-tier flagship slug per provider — not the
+ * pro/opus tier (too expensive for per-push) and not the free/experimental
+ * tier (too flaky). these flagships catch provider-class regressions like
+ * Gemini schema sanitization or OpenAI tool-call format drift that the cheap
+ * per-alias CLI smoke can't see.
+ *
+ * `coverage` lists the source files that, when changed, should rerun this
+ * provider's flagship + every alias of this provider. `action/models.ts` is
+ * included on every entry — touching the resolution table reruns all model
+ * tests (simple model; matches the per-PR-precision answer from planning).
+ *
+ * adding a new provider:
+ *   1. add an entry here with the flagship slug, agent harness, coverage globs
+ *   2. add a row to wiki/models-catalog.md "To add a provider"
+ *   3. CI picks it up automatically — no workflow change
+ */
+
+export type ProviderEntry = {
+  name: string;
+  /** flagship slug for `providers-live` full-harness smoke. */
+  flagship: string;
+  /** harness used by the runtime for this provider's models. */
+  agent: "claude" | "opencode";
+  /** repo-relative globs that invalidate this provider's matrix entries. */
+  coverage: string[];
+};
+
+const SHARED_OPENCODE_COVERAGE = [
+  "action/models.ts",
+  "action/agents/opencode.ts",
+  "action/agents/opencode_v2.ts",
+  "action/agents/opencodePlugin.ts",
+];
+
+export const providers: ProviderEntry[] = [
+  {
+    name: "anthropic",
+    flagship: "anthropic/claude-sonnet",
+    agent: "claude",
+    coverage: ["action/models.ts", "action/agents/claude.ts"],
+  },
+  {
+    name: "openai",
+    flagship: "openai/gpt",
+    agent: "opencode",
+    coverage: SHARED_OPENCODE_COVERAGE,
+  },
+  {
+    name: "google",
+    flagship: "google/gemini-pro",
+    agent: "opencode",
+    coverage: [...SHARED_OPENCODE_COVERAGE, "action/mcp/geminiSanitizer.ts"],
+  },
+  {
+    name: "xai",
+    flagship: "xai/grok",
+    agent: "opencode",
+    coverage: SHARED_OPENCODE_COVERAGE,
+  },
+  {
+    name: "deepseek",
+    flagship: "deepseek/deepseek-pro",
+    agent: "opencode",
+    coverage: SHARED_OPENCODE_COVERAGE,
+  },
+  {
+    name: "moonshotai",
+    flagship: "moonshotai/kimi-k2",
+    agent: "opencode",
+    coverage: SHARED_OPENCODE_COVERAGE,
+  },
+  {
+    name: "opencode",
+    flagship: "opencode/big-pickle",
+    agent: "opencode",
+    coverage: SHARED_OPENCODE_COVERAGE,
+  },
+  {
+    name: "openrouter",
+    flagship: "openrouter/claude-sonnet",
+    agent: "opencode",
+    coverage: SHARED_OPENCODE_COVERAGE,
+  },
+];

test/run.ts

@@ -2,9 +2,6 @@ import { existsSync, readdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { config } from "dotenv";
-import { runInDocker } from "../utils/docker.ts";
-import { ensureGitHubToken } from "../utils/github.ts";
-import { isInsideDocker } from "../utils/globals.ts";
 import { killTrackedChildren, setSignalHandler } from "../utils/subprocess.ts";
 import {
   type AgentResult,
@@ -22,32 +19,33 @@ import {
 /**
  * unified test runner for all agent tests.
  *
- * usage: node test/run.ts [filters...]
+ * invoke from the repo root:
+ *   pnpm runtest [filters…]            # host, in-process — fast iteration (default)
+ *   pnpm runtest:docker [filters…]     # local docker container that mocks GHA
+ *   pnpm docker test/run.ts [filters…] # explicit container form (equivalent to `pnpm runtest:docker`)
  *
  * filters can be test names, tags, or agent names:
- *   node test/run.ts               # run all tests (excludes adhoc-tagged tests)
- *   node test/run.ts smoke         # run tests named "smoke" or tagged "smoke"
- *   node test/run.ts opencode      # run all tests for opencode only
- *   node test/run.ts security      # run all tests tagged "security"
- *   node test/run.ts agnostic      # run all agnostic-tagged tests (with opencode)
- *   node test/run.ts adhoc         # run all adhoc-tagged tests
- *   node test/run.ts smoke opencode # run smoke tests for opencode only
+ *   pnpm runtest                    # run all tests (excludes adhoc-tagged tests)
+ *   pnpm runtest smoke              # run tests named "smoke" or tagged "smoke"
+ *   pnpm runtest opencode           # run all tests for opencode only
+ *   pnpm runtest security           # run all tests tagged "security"
+ *   pnpm runtest agnostic           # run all agnostic-tagged tests (with opencode)
+ *   pnpm runtest adhoc              # run all adhoc-tagged tests
+ *   pnpm runtest smoke opencode     # run smoke tests for opencode only
  *
  * special tags:
  *   - "agnostic": runs with opencode only, excluded when filtering by agent
  *   - "adhoc": excluded from default runs, must be explicitly requested
  *
- * by default, runs in a Docker container for isolation.
+ * see wiki/docker.md for when host vs container matters.
  */
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export const actionDir = join(__dirname, "..");
 
-// load .env files
 config({ path: join(actionDir, ".env") });
 config({ path: join(actionDir, "..", ".env") });
 
-const nodeModulesVolume = "pullfrog-action-test-node-modules";
 const mcpPortBase = 49000;
 let nextMcpPort = mcpPortBase;
 
@@ -57,25 +55,6 @@ function allocateMcpPort(): number {
   return port;
 }
 
-function buildNodeCmd(args: string[]): string {
-  const passArgs = args.map((arg) => `'${arg.replace(/'/g, "'\\''")}'`).join(" ");
-  return `node test/run.ts ${passArgs}`;
-}
-
-// run the test runner inside docker
-function runTestsInDocker(args: string[]): never {
-  const result = runInDocker({
-    actionDir,
-    args,
-    nodeCmd: buildNodeCmd(args),
-    volumeName: nodeModulesVolume,
-    envFilterMode: "allowlist",
-    onStart: () => console.log("» running tests in docker container...\n"),
-  });
-
-  process.exit(result.status ?? 1);
-}
-
 type TestInfo = {
   name: string;
   config: TestRunnerOptions;
@@ -282,6 +261,28 @@ function shouldRetry(result: AgentResult, validation: ValidationResult): RetryDe
 
 async function runTestForAgent(ctx: RunContext): Promise<ValidationResult> {
   const testConfig = ctx.testInfo.config;
+
+  // runtime-evaluated skip: gate on env (e.g. CODEX_AUTH_JSON for codex-auth).
+  // skipped runs short-circuit before any agent spawn AND count as passing so
+  // a missing optional secret doesn't fail-fast cancel the rest of the matrix.
+  const skipReason = testConfig.skipIf?.();
+  if (skipReason) {
+    const prefix = getPrefix({ test: ctx.testInfo.name, agent: ctx.agent });
+    console.log(`${prefix} ⏭  skipped: ${skipReason}`);
+    const skipped: ValidationResult = {
+      test: ctx.testInfo.name,
+      agent: ctx.agent,
+      passed: true,
+      canceled: false,
+      checks: [],
+      output: `skipped: ${skipReason}`,
+      skipped: true,
+      skipReason,
+    };
+    ctx.results.set(getRunKey(ctx.testInfo.name, ctx.agent), skipped);
+    return skipped;
+  }
+
   const env: Record<string, string> = {};
   if (testConfig.env) {
     const entries = Object.entries(testConfig.env);
@@ -393,14 +394,6 @@ async function runTestForAgent(ctx: RunContext): Promise<ValidationResult> {
 async function main(): Promise<void> {
   const args = process.argv.slice(2);
 
-  // run in Docker unless already inside
-  if (!isInsideDocker) {
-    // acquire token for docker if needed
-    await ensureGitHubToken();
-    runTestsInDocker(args);
-  }
-
-  // load all tests
   const allTests = await loadAllTests();
   const parsed = parseArgs(args, allTests);
 

test/utils.ts

@@ -152,6 +152,8 @@ export interface ValidationResult {
   canceled: boolean;
   checks: ValidationCheck[];
   output: string;
+  skipped?: boolean;
+  skipReason?: string;
 }
 
 export type ValidatorFn = (result: AgentResult) => ValidationCheck[];
@@ -328,6 +330,16 @@ export interface TestRunnerOptions {
   //   - "agnostic": runs with opencode only, excluded when filtering by agent
   //   - "adhoc": excluded from default runs, must be explicitly requested
   tags?: TestTag[];
+  // repo-relative globs of source files that, when changed in a PR, should
+  // trigger this test in CI. omit to opt out of filtering (test always runs
+  // — the defensive default). see action/test/coverage.ts.
+  coverage?: string[];
+  /** evaluated at test-runtime (after `pnpm install`, before agent spawn).
+   * return a non-empty reason string to skip the test entirely — the runner
+   * records a passing-with-skipped result so the matrix doesn't fail-fast
+   * cancel the rest of the jobs. used to gate tests on optional secrets
+   * (e.g. codex-auth needs `CODEX_AUTH_JSON`, which forks won't have). */
+  skipIf?: () => string | null;
 }
 
 export type TestTag = "adhoc" | "agnostic" | "security";
@@ -336,8 +348,9 @@ export function printSingleValidation(validation: ValidationResult): void {
   const checksStr = validation.checks.map((c) => `${c.name}=${c.passed ? "✓" : "✗"}`).join(" ");
   const color = AGENT_COLORS[validation.agent] ?? "";
   const canceledNote = validation.canceled ? " (canceled)" : "";
+  const skippedNote = validation.skipped ? ` (skipped: ${validation.skipReason ?? ""})` : "";
   console.log(
-    `\n${color}[${validation.test}][${validation.agent}]${RESET} ${checksStr}${canceledNote}`
+    `\n${color}[${validation.test}][${validation.agent}]${RESET} ${checksStr}${canceledNote}${skippedNote}`
   );
 }
 
@@ -349,8 +362,16 @@ export function printResults(validations: ValidationResult[]): void {
 
   for (const v of validations) {
     const color = AGENT_COLORS[v.agent] ?? "";
-    const status = v.canceled ? "❌ canceled" : v.passed ? "✅ pass" : "❌ fail";
-    const checkCols = v.checks.map((c) => `${c.name}=${c.passed ? "✓" : "✗"}`).join(" ");
+    const status = v.canceled
+      ? "❌ canceled"
+      : v.skipped
+        ? "⏭  skipped"
+        : v.passed
+          ? "✅ pass"
+          : "❌ fail";
+    const checkCols = v.skipped
+      ? `(skipped: ${v.skipReason ?? ""})`
+      : v.checks.map((c) => `${c.name}=${c.passed ? "✓" : "✗"}`).join(" ");
     console.log(
       `${status}  ${v.test.padEnd(12)}  ${color}${v.agent.padEnd(10)}${RESET}  ${checkCols}`
     );
@@ -358,5 +379,7 @@ export function printResults(validations: ValidationResult[]): void {
   console.log("-".repeat(70));
 
   const passed = validations.filter((v) => v.passed);
-  console.log(`\n${passed.length}/${validations.length} passed`);
+  const skipped = validations.filter((v) => v.skipped).length;
+  const skippedNote = skipped > 0 ? ` (${skipped} skipped)` : "";
+  console.log(`\n${passed.length}/${validations.length} passed${skippedNote}`);
 }

toolState.ts

@@ -1,5 +1,6 @@
 import type { AgentUsage } from "./agents/shared.ts";
 import type { PrepResult } from "./prep/types.ts";
+import type { AgentDiagnostic } from "./utils/agentHangReport.ts";
 import { log } from "./utils/cli.ts";
 import type { DiffCoverageState } from "./utils/diffCoverage.ts";
 import {
@@ -88,6 +89,10 @@ export interface ToolState {
   // then from checkoutSha when review.ts detects new commits mid-review
   beforeSha?: string;
   selectedMode?: string;
+  // number of prepush hook failures this run. push_branch runs the hook
+  // while this is 0 and skips it once non-zero; never decremented within
+  // a run.
+  prepushFailureCount: number;
   backgroundProcesses: Map<string, BackgroundProcess>;
   browserDaemon?: BrowserDaemon | undefined;
   review?: {
@@ -155,8 +160,20 @@ export interface ToolState {
   output?: string;
   usageEntries: AgentUsage[];
   model?: string | undefined;
+  // set by main.ts when the BYOK fallback engaged (configured model needed
+  // a provider key the runner didn't have). carried into PR-comment footers
+  // so users can see "Using <free model> (credentials for <configured> not
+  // configured)" rather than just being silently downgraded. literal record
+  // of an event that happened — matches the ToolState design rule.
+  modelFallback?: { from: string } | undefined;
   todoTracker?: TodoTracker | undefined;
   diffCoverage?: DiffCoverageState | undefined;
+  // mutable handle the agent harness writes to as a run progresses (recent
+  // stderr ring buffer reference, last provider-error label, event count).
+  // read by main.ts's outer catch so a watchdog-fired activity timeout still
+  // surfaces the same agent-side context the harness's own catch path returns
+  // via `result.error`. see `utils/agentHangReport.ts`.
+  agentDiagnostic?: AgentDiagnostic | undefined;
 }
 
 interface InitToolStateParams {
@@ -173,6 +190,7 @@ export function initToolState(params: InitToolStateParams): ToolState {
   return {
     progressComment: resolved,
     hadProgressComment: !!resolved,
+    prepushFailureCount: 0,
     backgroundProcesses: new Map(),
     usageEntries: [],
   };

tsconfig.json

@@ -19,7 +19,8 @@
     "forceConsistentCasingInFileNames": true,
     "stripInternal": true,
     "moduleDetection": "force",
-    "useUnknownInCatchVariables": true
+    "useUnknownInCatchVariables": true,
+    "noEmit": true
   },
-  "exclude": []
+  "exclude": ["dist"]
 }

utils/activity.ts

@@ -1,4 +1,5 @@
 import { performance } from "node:perf_hooks";
+import { log } from "./log.ts";
 
 function isMonitorDebugEnabled(): boolean {
   return (
@@ -79,6 +80,19 @@ type WriteFunction = {
 // module-level activity tracking - allows agents to mark activity on any event
 let _lastActivity = performance.now();
 
+/**
+ * upper bound on how long a single tool call can suspend the activity
+ * watchdog. matched against the typical worst-case `checkout_pr`
+ * fetch+deepen on a large monorepo (issue #760: 4-5min) plus generous
+ * headroom for slower MCP tools, while still bounding the worst case if
+ * a tool genuinely hangs and `tool_result` never arrives — auto-resume
+ * fires here and the normal idle clock takes over from a fresh baseline.
+ */
+export const MAX_TOOL_CALL_SUSPENSION_MS = 15 * 60 * 1000;
+
+let _suspendedAt: number | null = null;
+let _suspensionTimer: NodeJS.Timeout | null = null;
+
 /**
  * mark activity to reset the no-output timeout.
  * call this whenever the agent emits any event, even if it isn't logged to stdout.
@@ -88,12 +102,55 @@ export function markActivity(): void {
 }
 
 /**
- * get the time since last activity in milliseconds
+ * get the time since last activity in milliseconds.
+ * returns 0 while the watchdog is suspended (issue #760).
  */
 export function getIdleMs(): number {
+  if (_suspendedAt !== null) return 0;
   return Math.round(performance.now() - _lastActivity);
 }
 
+/**
+ * suspend the activity watchdog while a long-running, in-flight unit of
+ * work is happening (e.g. an MCP `tools/call` that synchronously awaits
+ * a multi-minute git fetch). bracket calls with `resumeActivity()` from
+ * the agent harness's `tool_use` / `tool_result` event handlers.
+ *
+ * - idempotent: nested suspends are no-ops; the first resume wins.
+ * - bounded: auto-resumes after `maxMs` so a buggy tool that never
+ *   produces a `tool_result` can't pin the watchdog open forever.
+ * - safe: only the *agent harness* (claude.ts / opencode.ts) on explicit,
+ *   paired CLI events should call this. NEVER blanket-suspend on internal
+ *   noise — that would resurrect issue #12 zombie runs.
+ */
+export function suspendActivity(maxMs: number = MAX_TOOL_CALL_SUSPENSION_MS): void {
+  if (_suspendedAt !== null) return;
+  _suspendedAt = performance.now();
+  _suspensionTimer = setTimeout(() => {
+    log.warning(`activity watchdog suspended >${Math.round(maxMs / 1000)}s — auto-resuming`);
+    resumeActivity();
+  }, maxMs);
+  _suspensionTimer.unref?.();
+}
+
+/**
+ * resume the activity watchdog. resets the idle baseline so a stale
+ * idle window before the suspend can't immediately re-fire.
+ */
+export function resumeActivity(): void {
+  if (_suspendedAt === null) return;
+  _suspendedAt = null;
+  if (_suspensionTimer) {
+    clearTimeout(_suspensionTimer);
+    _suspensionTimer = null;
+  }
+  _lastActivity = performance.now();
+}
+
+export function isActivitySuspended(): boolean {
+  return _suspendedAt !== null;
+}
+
 function wrapWrite(original: WriteFunction, onActivity: () => void): WriteFunction {
   const wrapped: WriteFunction = (
     chunk: string | Uint8Array,

utils/agentHangReport.ts

@@ -0,0 +1,170 @@
+const MAX_STDERR_BYTES = 3000;
+
+/**
+ * mutable per-run handle the agent harness writes to as a run progresses.
+ * the action's outer try/catch in `main.ts` reads this off `toolState` when
+ * the activity-timeout watchdog wins the race against the harness's own
+ * catch — the bare timer reject reason ("activity timeout: no output for
+ * 302s") tells the user nothing actionable, but `recentStderr` +
+ * `lastProviderError` together usually point straight at the upstream cause.
+ *
+ * `recentStderr` is shared by reference with the harness's bounded ring
+ * buffer, so the diagnostic always reflects the latest captured tail.
+ */
+export type AgentDiagnostic = {
+  /** display label for the agent, e.g. "Pullfrog". used in the headline. */
+  label: string;
+  /** shared reference to the harness's bounded stderr ring buffer. */
+  recentStderr: string[];
+  /** most-recent provider-error label from `detectProviderError`, if any. */
+  lastProviderError: string | undefined;
+  /** count of stdout events successfully parsed before the failure. */
+  eventCount: number;
+};
+
+/**
+ * Build a user-facing markdown body for an agent hang or failure.
+ *
+ * Rendered into both the PR progress comment and the GitHub Actions job
+ * summary. Returns `null` when no diagnostic is available, which signals to
+ * the caller to fall back to its bare-error rendering.
+ *
+ * `errorMessage` is the underlying timer / spawn reject string (e.g.
+ * `activity timeout: no output for 301s`). The idle seconds are parsed out
+ * of it for the hang explanation — total runtime would overstate the stall
+ * for runs that streamed for a long time before going quiet.
+ */
+export function formatAgentHangBody(input: {
+  diagnostic: AgentDiagnostic | undefined;
+  isHang: boolean;
+  errorMessage: string;
+}): string | null {
+  if (!input.diagnostic) return null;
+
+  // billing exhaustion (CreditsError / FreeUsageLimitError / spending cap /
+  // Insufficient balance) is mis-classified as transient by upstream harnesses
+  // and the run only ends when the activity-timeout watchdog fires (see #778).
+  // when we recognise the billing label, replace the generic "stalled — auth
+  // error" headline with a billing-specific CTA that names the actual remedy.
+  if (input.diagnostic.lastProviderError === "provider billing exhausted") {
+    return formatBillingExhaustedBody(input.diagnostic);
+  }
+
+  const verb = input.isHang ? "stalled" : "failed";
+  const cause = input.diagnostic.lastProviderError
+    ? ` — likely cause: \`${input.diagnostic.lastProviderError}\``
+    : "";
+  const headline = `**${input.diagnostic.label} ${verb}**${cause}`;
+
+  const explanation = formatExplanation({
+    isHang: input.isHang,
+    errorMessage: input.errorMessage,
+  });
+  const parts = [headline, "", `${explanation} ${formatEventsPart(input.diagnostic)}`];
+
+  const tail = renderStderrTail(input.diagnostic.recentStderr);
+  if (tail) {
+    // pick a fence longer than any backtick run in the body so a stderr line
+    // containing ``` (provider error JSON occasionally embeds it) can't
+    // terminate the fence early and corrupt the rest of the markdown.
+    const fence = pickFence(tail);
+    parts.push(
+      "",
+      "<details><summary>Recent agent stderr</summary>",
+      "",
+      fence,
+      tail,
+      fence,
+      "",
+      "</details>"
+    );
+  }
+
+  return parts.join("\n");
+}
+
+function formatExplanation(input: { isHang: boolean; errorMessage: string }): string {
+  if (!input.isHang) return `The agent exited unexpectedly: ${input.errorMessage}`;
+  const idleSec = parseIdleSec(input.errorMessage);
+  if (idleSec === undefined) {
+    return "The agent stopped emitting events and was killed by the activity-timeout watchdog.";
+  }
+  return `The agent stopped emitting events for ${idleSec}s and was killed by the activity-timeout watchdog.`;
+}
+
+function parseIdleSec(message: string): number | undefined {
+  const match = /no output for (\d+)s/.exec(message);
+  return match ? Number(match[1]) : undefined;
+}
+
+function formatEventsPart(diagnostic: AgentDiagnostic): string {
+  if (diagnostic.eventCount > 0) {
+    return `${diagnostic.eventCount} events were processed before the failure.`;
+  }
+  // when the provider-error label already names the cause in the headline,
+  // the reachability nudge below contradicts it (e.g. an immediate 401 also
+  // produces zero events but isn't a reachability problem). suppress it.
+  if (diagnostic.lastProviderError) return "No events were emitted before the failure.";
+  return "No events were emitted — check whether the model provider is reachable.";
+}
+
+function renderStderrTail(lines: readonly string[]): string {
+  if (lines.length === 0) return "";
+  const joined = lines.join("\n");
+  if (joined.length <= MAX_STDERR_BYTES) return joined;
+  return `... (older lines truncated)\n${joined.slice(-MAX_STDERR_BYTES)}`;
+}
+
+function pickFence(content: string): string {
+  let max = 0;
+  for (const match of content.matchAll(/`+/g)) {
+    if (match[0].length > max) max = match[0].length;
+  }
+  return "`".repeat(Math.max(3, max + 1));
+}
+
+/**
+ * Pull a billing URL out of the captured stderr if the provider helpfully
+ * embedded one (OpenCode Zen does — Anthropic and Gemini do not). Restricted
+ * to known billing/console hosts so a stray URL elsewhere in the buffer
+ * can't masquerade as the remedy link.
+ */
+function extractBillingUrl(lines: readonly string[]): string | undefined {
+  const urlPattern =
+    /https:\/\/(?:opencode\.ai\/[^\s"]*billing[^\s"]*|console\.anthropic\.com[^\s"]*|console\.cloud\.google\.com[^\s"]*billing[^\s"]*)/i;
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const m = urlPattern.exec(lines[i] ?? "");
+    if (m) return m[0];
+  }
+  return undefined;
+}
+
+function formatBillingExhaustedBody(diagnostic: AgentDiagnostic): string {
+  const headline = `**${diagnostic.label} stopped** — your model provider returned a billing-exhausted response.`;
+
+  const billingUrl = extractBillingUrl(diagnostic.recentStderr);
+  const cta = billingUrl
+    ? `Top up your provider balance, then re-run: [${billingUrl}](${billingUrl})`
+    : "Top up your model-provider balance (or rotate to a key with remaining credits) and re-run.";
+  const explanation =
+    "The agent kept retrying the request because the provider marked the failure as transient. Pullfrog's activity-timeout watchdog ended the run after no further events were emitted.";
+
+  const parts = [headline, "", explanation, "", cta];
+
+  const tail = renderStderrTail(diagnostic.recentStderr);
+  if (tail) {
+    const fence = pickFence(tail);
+    parts.push(
+      "",
+      "<details><summary>Recent agent stderr</summary>",
+      "",
+      fence,
+      tail,
+      fence,
+      "",
+      "</details>"
+    );
+  }
+
+  return parts.join("\n");
+}

utils/apiKeys.test.ts

@@ -15,6 +15,7 @@ const savedEnv = { ...process.env };
 const STRIPPED_PREFIXES_OR_NAMES = [
   /_API_KEY$/,
   /^CLAUDE_CODE_OAUTH_TOKEN$/,
+  /^CODEX_AUTH_JSON$/,
   /^AWS_BEARER_TOKEN_BEDROCK$/,
   /^AWS_ACCESS_KEY_ID$/,
   /^AWS_SECRET_ACCESS_KEY$/,
@@ -171,6 +172,23 @@ describe("isApiKeyAuthError", () => {
     expect(isApiKeyAuthError("401 Invalid authentication")).toBe(true);
   });
 
+  // see #782 — direct-Anthropic 401 shape (revoked / mistyped / rotated
+  // ANTHROPIC_API_KEY) reaches us via Claude CLI as a JSON dump, not as
+  // any of the canonical "Invalid API key" strings. these matchers ensure
+  // the formatted CTA fires instead of the raw 401 JSON blob.
+  it("matches direct-Anthropic 401 shapes", () => {
+    expect(
+      isApiKeyAuthError(
+        'Failed to authenticate. API Error: 401 {"type":"error","error":{"type":"authentication_error","message":"Invalid bearer token"}}'
+      )
+    ).toBe(true);
+    expect(
+      isApiKeyAuthError(
+        "» Pullfrog result error: subtype=success, api_error_status=401, message=Failed to authenticate."
+      )
+    ).toBe(true);
+  });
+
   it("ignores unrelated errors", () => {
     expect(isApiKeyAuthError("git fetch failed")).toBe(false);
     expect(isApiKeyAuthError("")).toBe(false);

utils/apiKeys.ts

@@ -6,7 +6,9 @@ import {
 } from "../models.ts";
 import { getApiUrl } from "./apiUrl.ts";
 
-const knownApiKeys: Set<string> = new Set(Object.values(providers).flatMap((p) => [...p.envVars]));
+const knownApiKeys: Set<string> = new Set(
+  Object.values(providers).flatMap((p) => [...p.envVars, ...(p.managedCredentials ?? [])])
+);
 
 /** marker prefix on the throw message for the catch-side reclassification path */
 const MISSING_KEY_MARKER = "no API key found";
@@ -118,10 +120,14 @@ export function validateAgentApiKey(params: {
 
 /**
  * Detect agent-runtime auth failures that should be reformatted as an actionable
- * key-fix CTA before being shown to the user. Covers the two shapes we see:
+ * key-fix CTA before being shown to the user. Covers the shapes we see:
  *   - missing key (validateAgentApiKey throw): contains MISSING_KEY_MARKER
  *   - revoked / invalid key (Claude CLI 401 surfaced via api_error_status):
  *     "Invalid API key · Fix external API key" + similar provider variants
+ *   - direct-Anthropic 401 (`Failed to authenticate. API Error: 401 ...
+ *     {"type":"error","error":{"type":"authentication_error", ...
+ *     "Invalid bearer token"}}`) emitted by the Claude CLI for revoked /
+ *     mistyped / rotated `ANTHROPIC_API_KEY`. see #782.
  */
 export function isApiKeyAuthError(text: string): boolean {
   if (!text) return false;
@@ -129,7 +135,11 @@ export function isApiKeyAuthError(text: string): boolean {
     text.includes(MISSING_KEY_MARKER) ||
     /Invalid API key/i.test(text) ||
     /\bUser not found\b/i.test(text) ||
-    /\bInvalid authentication\b/i.test(text)
+    /\bInvalid authentication\b/i.test(text) ||
+    /authentication_error/i.test(text) ||
+    /Invalid bearer token/i.test(text) ||
+    /api_error_status\s*=\s*401/i.test(text) ||
+    /API Error:\s*401/i.test(text)
   );
 }
 

utils/billingErrors.ts

@@ -0,0 +1,189 @@
+/**
+ * Billing-error classification + user-facing copy for `/api/proxy-token`
+ * failures and OpenRouter mid-run exhaustion. Two error classes (Billing vs.
+ * Transient) keep the framing honest: a card decline is *not* the same UX as
+ * a 503 from the proxy service. Both originate in `utils/proxy.ts` (mint
+ * failures) and `utils/runErrorRenderer.ts` (mid-run keylimit reclassify).
+ *
+ * Renderers return markdown bodies that are written into both the GitHub
+ * Actions job summary and the PR progress comment.
+ *
+ * Lives outside `main.ts` so adding a new error `code` branch is a one-file
+ * edit that does not retrigger the full LLM CI matrix (`action/main.ts` is
+ * in `action/test/coverage.ts::ALWAYS_RUN_ALL`).
+ */
+
+/**
+ * Billing-layer error surfaced from `/api/proxy-token` as a 402. User-actionable
+ * — distinct from TransientError (503 / transient sync issue) so the job
+ * summary + PR comment can use affirmative "you need to do X" copy rather than
+ * the ambiguous "billing error" label that makes transient outages look like
+ * the user's fault.
+ *
+ * `code` is a server-side discriminator: `router_requires_card` (no card + no
+ * wallet balance on Router), or null for unclassified. `declineCode` is
+ * Stripe's more specific sub-reason on `card_declined` (e.g.
+ * `insufficient_funds`, `lost_card`). `needsReauthentication` is the 3DS case
+ * broken out for convenience.
+ */
+export class BillingError extends Error {
+  code: string | null;
+  declineCode: string | null;
+  needsReauthentication: boolean;
+
+  constructor(
+    message: string,
+    opts: {
+      code?: string | null;
+      declineCode?: string | null;
+      needsReauthentication?: boolean;
+    } = {}
+  ) {
+    super(message);
+    this.name = "BillingError";
+    this.code = opts.code ?? null;
+    this.declineCode = opts.declineCode ?? null;
+    this.needsReauthentication = opts.needsReauthentication ?? false;
+  }
+}
+
+/**
+ * Transient service failures from `/api/proxy-token` (503: partial OpenRouter
+ * usage sync, DB flake, in-flight payment intent). Not the user's fault — the
+ * summary uses "temporarily unavailable" framing, and the non-zero exit lets
+ * GH Actions apply whatever retry policy the workflow has configured.
+ */
+export class TransientError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "TransientError";
+  }
+}
+
+/**
+ * Deep link into the right console section for the failing account. Anchors
+ * are defined in `app/console/[owner]/page.tsx` (`#billing`, `#model-access`).
+ * `owner` is the GitHub login of the repo's account — i.e. the org or user
+ * that pays for this repo's runs, which is the right scope for billing.
+ */
+function billingConsoleUrl(owner: string, anchor: "billing" | "model-access"): string {
+  return `https://pullfrog.com/console/${encodeURIComponent(owner)}#${anchor}`;
+}
+
+/**
+ * Render a BillingError as user-facing markdown (shared between GH job summary
+ * and the PR progress comment). Goals:
+ *
+ *   - quiet, not alarmist — bold first line instead of an `### ❌` H3, since
+ *     the comment already has Pullfrog branding in the footer
+ *   - actionable — every branch ends in a single CTA deep-linked to the
+ *     correct section of the owner's console
+ *   - honest — say what actually went wrong (card declined vs. balance
+ *     empty vs. 3DS required), don't lump them under "billing error"
+ *
+ * Branches:
+ *   - `router_requires_card`: user is on Router mode with no card AND no
+ *     wallet balance (signup credit exhausted or not granted). Frame as
+ *     "add a card to continue", link to `#model-access` where the Add
+ *     Card flow lives.
+ *   - `router_balance_exhausted`: user has a card on file but auto-reload is
+ *     disabled and they've spent past their $5 overdraft buffer. Frame as
+ *     "balance ran out" and surface both remediation paths (top up, or flip
+ *     on auto-reload).
+ *   - `router_keylimit_exhausted`: OpenRouter rejected mid-run because the
+ *     per-run key budget was exhausted while the agent was working. The
+ *     wallet is now negative; same remediation as `router_balance_exhausted`
+ *     but framed for the after-the-fact case ("this run was cut short").
+ *   - `needsReauthentication`: issuer requires 3DS on every off-session
+ *     charge. Re-adding the card won't help — the only escape is a manual
+ *     top-up where 3DS runs interactively in Stripe Checkout.
+ *   - `declineCode` set: Stripe declined a real charge. Show the sub-code
+ *     so support can act on it; tell the user we'll retry on next dispatch.
+ *   - default: balance hit zero with no in-flight charge (auto-reload off
+ *     or amount below threshold). Direct them to top up or enable auto-reload.
+ */
+export function formatBillingErrorSummary(error: BillingError, owner: string): string {
+  if (error.code === "router_requires_card") {
+    return [
+      "**Add a card to start using Pullfrog Router.**",
+      "",
+      "Router proxies OpenRouter at raw cost — no platform markup. Add a card and we'll auto-reload your wallet so runs keep flowing.",
+      "",
+      `[Add a card →](${billingConsoleUrl(owner, "model-access")})`,
+    ].join("\n");
+  }
+
+  if (error.code === "router_balance_exhausted") {
+    return [
+      "**Your Pullfrog Router balance is exhausted.**",
+      "",
+      "You have a card on file but auto-reload is disabled, so runs paused once your balance went past the overdraft buffer.",
+      "",
+      `[Top up balance →](${billingConsoleUrl(owner, "billing")}) · [Enable auto-reload →](${billingConsoleUrl(owner, "model-access")})`,
+    ].join("\n");
+  }
+
+  if (error.code === "router_keylimit_exhausted") {
+    return [
+      "**This run was cut short — your Pullfrog Router balance ran out mid-run.**",
+      "",
+      "OpenRouter stopped the agent because the per-run budget was exhausted. Your wallet is now negative; top up or enable auto-reload to keep runs flowing.",
+      "",
+      `[Top up balance →](${billingConsoleUrl(owner, "billing")}) · [Enable auto-reload →](${billingConsoleUrl(owner, "model-access")})`,
+    ].join("\n");
+  }
+
+  if (error.code === "router_monthly_limit") {
+    return [
+      "**Pullfrog Router hit its monthly spend limit.**",
+      "",
+      "Auto-reloads are paused for the rest of this UTC month. Ask your admin to raise the cap, or wait for it to reset at 00:00 UTC on the 1st.",
+      "",
+      `[Adjust limit →](${billingConsoleUrl(owner, "model-access")})`,
+    ].join("\n");
+  }
+
+  if (error.needsReauthentication) {
+    const code = error.declineCode ?? "authentication_required";
+    return [
+      `**Your card issuer requires 3D Secure on every charge** (\`${code}\`).`,
+      "",
+      "Pullfrog can't complete a 3DS challenge from inside a workflow. Top up your Router balance once in Stripe Checkout — subsequent runs draw from the prepaid balance without re-triggering 3DS.",
+      "",
+      `[Top up balance →](${billingConsoleUrl(owner, "billing")})`,
+    ].join("\n");
+  }
+
+  if (error.declineCode) {
+    return [
+      `**Your card was declined** (\`${error.declineCode}\`).`,
+      "",
+      "Update your payment method and Pullfrog will retry on the next run.",
+      "",
+      `[Update payment method →](${billingConsoleUrl(owner, "billing")})`,
+    ].join("\n");
+  }
+
+  return [
+    "**Your Pullfrog balance is empty.**",
+    "",
+    "Top up your balance or enable auto-reload to keep runs flowing.",
+    "",
+    `[Manage billing →](${billingConsoleUrl(owner, "billing")})`,
+  ].join("\n");
+}
+
+/**
+ * Render a TransientError as user-facing markdown. Distinct framing from
+ * BillingError so the user doesn't read an alarm and assume their card
+ * failed — this branch is "our fault, retry shortly", not theirs.
+ */
+export function formatTransientErrorSummary(error: TransientError, owner: string): string {
+  return [
+    "**Pullfrog billing is temporarily unavailable.**",
+    "",
+    error.message,
+    "",
+    `Usually transient — the next dispatch should succeed. If it persists, check [status.pullfrog.com](https://status.pullfrog.com) or [your console](${billingConsoleUrl(owner, "billing")}).`,
+  ].join("\n");
+}

utils/buildPullfrogFooter.test.ts

@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import { buildPullfrogFooter } from "./buildPullfrogFooter.ts";
+
+describe("buildPullfrogFooter — fallbackFrom annotation", () => {
+  it("renders the provider display name when fallbackFrom is set", () => {
+    const footer = buildPullfrogFooter({
+      model: "opencode/minimax-m2.5-free",
+      fallbackFrom: "anthropic/claude-opus",
+    });
+    expect(footer).toContain(
+      "Using `MiniMax M2.5` (free) (credentials for Anthropic not configured)"
+    );
+  });
+
+  it("works for OpenAI's display name too", () => {
+    const footer = buildPullfrogFooter({
+      model: "opencode/minimax-m2.5-free",
+      fallbackFrom: "openai/gpt",
+    });
+    expect(footer).toContain("(credentials for OpenAI not configured)");
+  });
+
+  it("falls back to the raw provider key when the slug provider is unknown to the catalog", () => {
+    const footer = buildPullfrogFooter({
+      model: "opencode/minimax-m2.5-free",
+      fallbackFrom: "some-unknown/model",
+    });
+    expect(footer).toContain("(credentials for some-unknown not configured)");
+  });
+
+  it("omits the annotation when fallbackFrom is not set", () => {
+    const footer = buildPullfrogFooter({
+      model: "anthropic/claude-opus",
+    });
+    expect(footer).toContain("Using `Claude Opus`");
+    expect(footer).not.toContain("not configured");
+  });
+});

utils/buildPullfrogFooter.ts

@@ -1,4 +1,4 @@
-import { modelAliases, resolveDisplayAlias } from "../models.ts";
+import { getModelProvider, modelAliases, providers, resolveDisplayAlias } from "../models.ts";
 
 export const PULLFROG_DIVIDER = "<!-- PULLFROG_DIVIDER_DO_NOT_REMOVE_PLZ -->";
 
@@ -23,20 +23,41 @@ export interface BuildPullfrogFooterParams {
   customParts?: string[] | undefined;
   /** model slug from payload (e.g., "anthropic/claude-opus"). shown in footer as "Using `Model Name`" */
   model?: string | undefined;
+  /**
+   * When the action engaged the BYOK fallback, this is the slug the user
+   * had configured (e.g. "anthropic/claude-opus") — the footer renders
+   * `Using <free model> (credentials for <configured> not configured)`
+   * so the substitution is visible in PR comments + reviews.
+   */
+  fallbackFrom?: string | undefined;
 }
 
-function formatModelLabel(slug: string): string {
-  // walk the fallback chain so a deprecated stored slug shows the model the
-  // run actually executed against (e.g. "GPT", not "GPT Codex").
+/** Provider display name (e.g. "Anthropic") for the slug, or the raw provider segment as a fallback. */
+function providerDisplayName(slug: string): string {
+  try {
+    const key = getModelProvider(slug);
+    const meta = providers[key as keyof typeof providers];
+    return meta?.displayName ?? key;
+  } catch {
+    // raw IDs without a `/` (Bedrock model IDs) — never reach this function
+    // in practice because the BYOK fallback skips Bedrock, but defensively
+    // return the slug itself rather than throw if it ever does.
+    return slug;
+  }
+}
+
+function formatModelLabel(params: { model: string; fallbackFrom?: string | undefined }): string {
   const alias =
-    resolveDisplayAlias(slug) ??
+    resolveDisplayAlias(params.model) ??
     // reverse-lookup: when the caller passes an effective model (proxy or
     // resolved target like "openrouter/anthropic/claude-opus-4.7") instead of
     // a stored alias slug, find the alias whose resolve target matches so we
     // still render a friendly display name.
-    modelAliases.find((a) => a.resolve === slug || a.openRouterResolve === slug);
-  if (!alias) return `\`${slug}\``;
-  return alias.isFree ? `\`${alias.displayName}\` (free)` : `\`${alias.displayName}\``;
+    modelAliases.find((a) => a.resolve === params.model || a.openRouterResolve === params.model);
+  const displayName = alias?.displayName ?? params.model;
+  const base = alias?.isFree ? `\`${displayName}\` (free)` : `\`${displayName}\``;
+  if (!params.fallbackFrom) return base;
+  return `${base} (credentials for ${providerDisplayName(params.fallbackFrom)} not configured)`;
 }
 
 /**
@@ -64,7 +85,9 @@ export function buildPullfrogFooter(params: BuildPullfrogFooterParams): string {
   }
 
   if (params.model) {
-    parts.push(`Using ${formatModelLabel(params.model)}`);
+    parts.push(
+      `Using ${formatModelLabel({ model: params.model, fallbackFrom: params.fallbackFrom })}`
+    );
   }
 
   const allParts = [...parts, "[𝕏](https://x.com/pullfrogai)"];

utils/byokFallback.test.ts

@@ -0,0 +1,102 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { FREE_FALLBACK_SLUG, selectFallbackModelIfNeeded } from "./byokFallback.ts";
+
+describe("selectFallbackModelIfNeeded", () => {
+  const originalEnv = { ...process.env };
+  const KEYS = [
+    "ANTHROPIC_API_KEY",
+    "CLAUDE_CODE_OAUTH_TOKEN",
+    "OPENAI_API_KEY",
+    "OPENROUTER_API_KEY",
+    "GEMINI_API_KEY",
+    "GOOGLE_GENERATIVE_AI_API_KEY",
+    "XAI_API_KEY",
+    "DEEPSEEK_API_KEY",
+    "MOONSHOT_API_KEY",
+    "OPENCODE_API_KEY",
+  ] as const;
+
+  beforeEach(() => {
+    for (const k of KEYS) delete process.env[k];
+  });
+  afterEach(() => {
+    for (const k of KEYS) {
+      if (originalEnv[k] === undefined) delete process.env[k];
+      else process.env[k] = originalEnv[k];
+    }
+  });
+
+  it("falls back when the resolved model needs a key that isn't set", () => {
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: "anthropic/claude-opus-4-7",
+      proxyModel: undefined,
+    });
+    expect(result).toEqual({
+      fallback: true,
+      from: "anthropic/claude-opus-4-7",
+      to: FREE_FALLBACK_SLUG,
+    });
+  });
+
+  it("does not fall back when the resolved model's key IS set", () => {
+    process.env.ANTHROPIC_API_KEY = "sk-test";
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: "anthropic/claude-opus-4-7",
+      proxyModel: undefined,
+    });
+    expect(result.fallback).toBe(false);
+  });
+
+  it("does not fall back on Router runs (proxyModel set)", () => {
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: undefined,
+      proxyModel: "openrouter/anthropic/claude-opus-4.7",
+    });
+    expect(result.fallback).toBe(false);
+  });
+
+  it("does not fall back when no model is resolved (auto-select path)", () => {
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: undefined,
+      proxyModel: undefined,
+    });
+    expect(result.fallback).toBe(false);
+  });
+
+  it("does not fall back when the resolved model is itself the free fallback", () => {
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: FREE_FALLBACK_SLUG,
+      proxyModel: undefined,
+    });
+    expect(result.fallback).toBe(false);
+  });
+
+  it("does not fall back for Bedrock routing (raw model ID has no slash)", () => {
+    // resolveModel({slug:"bedrock/byok"}) returns the raw BEDROCK_MODEL_ID
+    // value (e.g. "us.anthropic.claude-opus-4-7"), which has no `/`. without
+    // a guard, hasProviderKey → parseModel would throw and crash the action
+    // before validateBedrockSetup can surface its tailored error.
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: "us.anthropic.claude-opus-4-7",
+      proxyModel: undefined,
+    });
+    expect(result.fallback).toBe(false);
+  });
+
+  it("does not fall back for free models that need no key", () => {
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: "opencode/mimo-v2-pro-free",
+      proxyModel: undefined,
+    });
+    expect(result.fallback).toBe(false);
+  });
+
+  it("treats empty-string env vars as missing (matches GH Actions secret-not-found behavior)", () => {
+    process.env.ANTHROPIC_API_KEY = "";
+    const result = selectFallbackModelIfNeeded({
+      resolvedModel: "anthropic/claude-opus-4-7",
+      proxyModel: undefined,
+    });
+    expect(result.fallback).toBe(true);
+  });
+});

utils/byokFallback.ts

@@ -0,0 +1,59 @@
+import { hasProviderKey } from "./apiKeys.ts";
+
+/**
+ * Slug we fall back to when a BYOK-required model is configured but the
+ * runner has no provider key in env. Picked because it's free
+ * (`isFree: true`, `envVars: []` — see `action/models.ts`), stable, and
+ * currently the strongest free OpenCode model in the catalog. If a
+ * smarter free model is added later, update this single constant.
+ *
+ * The slug is intentionally hard-coded and not a config knob — the
+ * fallback is a safety net, not a user-facing preference, and adding a
+ * config surface here would just push the same "what to fall back to"
+ * decision into another setting that goes stale the same way.
+ */
+export const FREE_FALLBACK_SLUG = "opencode/minimax-m2.5-free";
+
+export type FallbackDecision = { fallback: false } | { fallback: true; from: string; to: string };
+
+/**
+ * If the resolved model requires a BYOK key but no provider key is
+ * available in env, return `fallback: true` with a free OpenCode slug
+ * so the run can still succeed. Caller is responsible for swapping the
+ * model state and surfacing the fallback (log line + run summary).
+ *
+ * Gates on `resolvedModel` directly (not the configured slug) so the
+ * decision matches both code paths that reach this point: payload-based
+ * config (`repo.model` from DB) and `PULLFROG_MODEL` env var. Both end
+ * up in `resolvedModel` after `resolveModel()` runs upstream.
+ *
+ * Skip cases:
+ *   - Router / proxy runs (`proxyModel` set): Pullfrog mints the key,
+ *     no BYOK in play — never fall back.
+ *   - No resolved model: keeps the existing auto-select-with-throw
+ *     behavior in `validateAgentApiKey` for the "neither model nor
+ *     key" case (genuine misconfig the user should see).
+ *   - Resolved model is itself the free fallback: avoid suggesting we
+ *     fell back to the model we're already running.
+ *   - Resolved model is a Bedrock raw ID (no `/`): Bedrock has its own
+ *     auth shape (`AWS_BEARER_TOKEN_BEDROCK` + region + model ID), and
+ *     `validateBedrockSetup` already surfaces a tailored error. Skipping
+ *     here also avoids `parseModel`'s slash requirement crashing inside
+ *     `hasProviderKey`.
+ *   - Resolved model has its provider key present: no fallback needed.
+ */
+export function selectFallbackModelIfNeeded(input: {
+  resolvedModel: string | undefined;
+  proxyModel: string | undefined;
+}): FallbackDecision {
+  if (input.proxyModel) return { fallback: false };
+  if (!input.resolvedModel) return { fallback: false };
+  if (input.resolvedModel === FREE_FALLBACK_SLUG) return { fallback: false };
+  if (!input.resolvedModel.includes("/")) return { fallback: false };
+  if (hasProviderKey(input.resolvedModel)) return { fallback: false };
+  return {
+    fallback: true,
+    from: input.resolvedModel,
+    to: FREE_FALLBACK_SLUG,
+  };
+}

utils/codexAuth.ts

@@ -0,0 +1,283 @@
+import { spawn } from "node:child_process";
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+/**
+ * minted Codex subscription credential. raw `auth.json` body that Codex CLI /
+ * OpenCode plugins consume. validated to be `auth_mode: "chatgpt"` with a
+ * refresh token before being returned. caller is responsible for storing it
+ * (typically as the `CODEX_AUTH_JSON` Pullfrog secret).
+ */
+export interface CodexAuth {
+  /** raw JSON body of the minted `auth.json`; safe to persist verbatim. */
+  json: string;
+  /** parsed for caller convenience; mirrors the shape Codex CLI writes. */
+  parsed: CodexAuthJson;
+}
+
+export interface CodexAuthJson {
+  auth_mode: "chatgpt";
+  tokens: {
+    access_token: string;
+    id_token?: string;
+    refresh_token: string;
+    account_id?: string;
+  };
+  last_refresh?: string;
+}
+
+/** OAuth client id Codex CLI and OpenCode both use against `auth.openai.com`.
+ * Same chain — a refresh token minted via `codex login --device-auth` can be
+ * refreshed against this client_id. */
+const CODEX_OAUTH_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
+const CODEX_OAUTH_TOKEN_URL = "https://auth.openai.com/oauth/token";
+
+interface OAuthTokenResponse {
+  access_token: string;
+  refresh_token: string;
+  id_token?: string;
+  expires_in?: number;
+}
+
+/** force one refresh round-trip against the OAuth provider so the saved
+ * credential carries the freshest refresh token. used right after `codex
+ * login --device-auth` and again any time we want to bump the chain before
+ * persisting (avoids the user's laptop refreshing first and burning ours). */
+export async function refreshCodexAuth(auth: CodexAuth): Promise<CodexAuth> {
+  const response = await fetch(CODEX_OAUTH_TOKEN_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      grant_type: "refresh_token",
+      refresh_token: auth.parsed.tokens.refresh_token,
+      client_id: CODEX_OAUTH_CLIENT_ID,
+    }).toString(),
+  });
+  if (!response.ok) {
+    const body = await response.text().catch(() => "");
+    throw new Error(`Codex token refresh failed: ${response.status} ${body}`);
+  }
+  const tokens = (await response.json()) as OAuthTokenResponse;
+  const idToken = tokens.id_token ?? auth.parsed.tokens.id_token;
+  const accountId = auth.parsed.tokens.account_id;
+  const refreshed: CodexAuthJson = {
+    auth_mode: "chatgpt",
+    tokens: {
+      access_token: tokens.access_token,
+      refresh_token: tokens.refresh_token,
+      ...(idToken ? { id_token: idToken } : {}),
+      ...(accountId ? { account_id: accountId } : {}),
+    },
+    last_refresh: new Date().toISOString(),
+  };
+  return { json: `${JSON.stringify(refreshed, null, 2)}\n`, parsed: refreshed };
+}
+
+export type ProgressEvent =
+  | { kind: "start"; attempt: number }
+  | { kind: "exit"; exitCode: number; signal: NodeJS.Signals | null; timedOut: boolean }
+  | { kind: "retry"; reason: "user-request" | "no-auth-written" }
+  | { kind: "cancel" };
+
+interface RunOptions {
+  /** abort the whole flow when true is returned. polled before each retry. */
+  shouldRetry: () => Promise<boolean>;
+  /** observe progress for UI rendering. */
+  onProgress?: (event: ProgressEvent) => void;
+  /**
+   * pass-through control over the child's stdio. `inherit` streams Codex's
+   * own UI directly to the user's terminal. `pipe` is what `pullfrog auth
+   * codex` uses so it can re-render each line with a Pullfrog-styled rail
+   * + dim formatting via `onChildLine`.
+   */
+  childStdio?: "inherit" | "pipe";
+  /**
+   * called once per line of Codex's stdout/stderr when `childStdio` is
+   * "pipe". raw line text is passed through unmodified (including any ANSI
+   * escapes Codex emitted); the caller is responsible for stripping/styling.
+   */
+  onChildLine?: (line: string, stream: "stdout" | "stderr") => void;
+  /** how long a single device-auth attempt is allowed to run. */
+  perAttemptTimeoutMs?: number;
+}
+
+/**
+ * mint a fresh Codex subscription credential by running `codex login
+ * --device-auth` against an isolated `CODEX_HOME`. the user's global
+ * `~/.codex/auth.json` is never touched; on success or failure, the
+ * temporary home is cleaned up.
+ *
+ * the caller controls retry behavior via `shouldRetry`: when device auth
+ * exits without writing `auth.json` (most commonly because the user needed
+ * to enable device-code auth on their ChatGPT account first), the function
+ * invokes `shouldRetry()` to decide whether to spin up another attempt.
+ */
+export async function mintCodexAuth(options: RunOptions): Promise<CodexAuth> {
+  // mkdtempSync already creates the dir with the default 0o700 perms on
+  // posix; an extra mkdirSync would just be ceremony.
+  const codexHome = mkdtempSync(join(tmpdir(), "pullfrog-codex-"));
+  try {
+    // device auth requires file-backed credentials; otherwise Codex routes the
+    // refresh token into the OS keyring and we can't observe / persist it.
+    writeFileSync(join(codexHome, "config.toml"), 'cli_auth_credentials_store = "file"\n', {
+      mode: 0o600,
+    });
+
+    const authPath = join(codexHome, "auth.json");
+    let attempt = 1;
+
+    while (true) {
+      options.onProgress?.({ kind: "start", attempt });
+      const result = await runDeviceAuth({
+        codexHome,
+        timeoutMs: options.perAttemptTimeoutMs ?? 15 * 60 * 1000,
+        childStdio: options.childStdio ?? "inherit",
+        onChildLine: options.onChildLine,
+      });
+      options.onProgress?.({
+        kind: "exit",
+        exitCode: result.exitCode,
+        signal: result.signal,
+        timedOut: result.timedOut,
+      });
+
+      const auth = readAuthIfPresent(authPath);
+      if (auth) return auth;
+
+      if (!(await options.shouldRetry())) {
+        options.onProgress?.({ kind: "cancel" });
+        throw new Error("Codex login did not produce auth.json (no retry requested)");
+      }
+      options.onProgress?.({ kind: "retry", reason: "no-auth-written" });
+      attempt += 1;
+    }
+  } finally {
+    rmSync(codexHome, { recursive: true, force: true });
+  }
+}
+
+interface DeviceAuthResult {
+  exitCode: number;
+  signal: NodeJS.Signals | null;
+  /** true if the attempt was killed by our per-attempt timeout (vs. exited
+   * naturally or was interrupted by the user). lets callers distinguish
+   * "user walked away" from "user closed the device flow early". */
+  timedOut: boolean;
+}
+
+interface DeviceAuthInput {
+  codexHome: string;
+  timeoutMs: number;
+  childStdio: "inherit" | "pipe";
+  onChildLine?: ((line: string, stream: "stdout" | "stderr") => void) | undefined;
+}
+
+/** how long to wait between SIGTERM and SIGKILL when killing a stuck `codex`
+ * subprocess. Codex usually exits cleanly on SIGTERM, but if it ignores it we
+ * don't want the CLI pinned forever. */
+const SIGTERM_GRACE_MS = 5_000;
+
+/** spawn `codex login --device-auth` with stdin closed so Codex doesn't hang
+ * waiting for input. by default inherits stdout/stderr so the user sees the
+ * device URL + one-time code Codex prints; when `pipe`d, lines are forwarded
+ * to `onChildLine` so the caller can re-style them. on per-attempt timeout,
+ * sends SIGTERM and escalates to SIGKILL after a short grace.
+ */
+function runDeviceAuth(input: DeviceAuthInput): Promise<DeviceAuthResult> {
+  return new Promise((resolve, reject) => {
+    const child = spawn("codex", ["login", "--device-auth"], {
+      env: { ...process.env, CODEX_HOME: input.codexHome },
+      stdio: ["ignore", input.childStdio, input.childStdio],
+    });
+
+    if (input.childStdio === "pipe") {
+      const onLine = input.onChildLine ?? (() => {});
+      if (child.stdout) pipeLines(child.stdout, (line) => onLine(line, "stdout"));
+      if (child.stderr) pipeLines(child.stderr, (line) => onLine(line, "stderr"));
+    }
+
+    let killTimer: NodeJS.Timeout | null = null;
+    let timedOut = false;
+    const timeoutTimer = setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+      // give Codex a grace window to exit cleanly on SIGTERM. if it ignores
+      // it, force SIGKILL so we don't pin the CLI on a stuck child.
+      killTimer = setTimeout(() => child.kill("SIGKILL"), SIGTERM_GRACE_MS);
+    }, input.timeoutMs);
+
+    // `spawn` emits 'error' (not 'close') when the binary can't be found
+    // (ENOENT) or otherwise fails to start. without a listener, Node crashes
+    // the process with an unhandled 'error' event.
+    child.on("error", (err) => {
+      clearTimeout(timeoutTimer);
+      if (killTimer) clearTimeout(killTimer);
+      const errno = err as NodeJS.ErrnoException;
+      const message =
+        errno.code === "ENOENT"
+          ? "codex CLI not found on PATH. install it with `npm i -g @openai/codex` or see https://developers.openai.com/codex/cli for other install options."
+          : `failed to spawn codex: ${errno.message}`;
+      reject(new Error(message));
+    });
+
+    child.on("close", (code, signal) => {
+      clearTimeout(timeoutTimer);
+      if (killTimer) clearTimeout(killTimer);
+      resolve({ exitCode: code ?? 1, signal, timedOut });
+    });
+  });
+}
+
+/** byte-stream → newline-delimited line callback. emits any final partial
+ * line on stream end so trailing content (e.g. a prompt with no newline)
+ * still surfaces to the renderer.
+ */
+function pipeLines(stream: NodeJS.ReadableStream, onLine: (line: string) => void): void {
+  let buffer = "";
+  stream.on("data", (chunk: Buffer | string) => {
+    buffer += typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    let idx = buffer.indexOf("\n");
+    while (idx !== -1) {
+      const line = buffer.slice(0, idx).replace(/\r$/, "");
+      buffer = buffer.slice(idx + 1);
+      onLine(line);
+      idx = buffer.indexOf("\n");
+    }
+  });
+  stream.on("end", () => {
+    if (buffer.length > 0) {
+      onLine(buffer);
+      buffer = "";
+    }
+  });
+}
+
+function readAuthIfPresent(authPath: string): CodexAuth | null {
+  let raw: string;
+  try {
+    raw = readFileSync(authPath, "utf8");
+  } catch {
+    return null;
+  }
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (!isCodexAuthJson(parsed)) return null;
+  return { json: raw, parsed };
+}
+
+function isCodexAuthJson(value: unknown): value is CodexAuthJson {
+  if (!value || typeof value !== "object") return false;
+  const v = value as Record<string, unknown>;
+  if (v.auth_mode !== "chatgpt") return false;
+  const tokens = v.tokens;
+  if (!tokens || typeof tokens !== "object") return false;
+  const t = tokens as Record<string, unknown>;
+  if (typeof t.access_token !== "string" || t.access_token.length === 0) return false;
+  if (typeof t.refresh_token !== "string" || t.refresh_token.length === 0) return false;
+  return true;
+}

utils/codexHome.test.ts

@@ -0,0 +1,85 @@
+import { describe, expect, it } from "vitest";
+import { detectCodexRefresh } from "./codexHome.ts";
+
+// installCodexAuth touches the filesystem (mkdir + writeFile) — leaving it
+// untested here per AGENTS.md guidance ("be highly dubious of any test that
+// relies on mocks"). The conversion math is what we actually want to
+// protect; the disk write is one writeFileSync call.
+
+describe("detectCodexRefresh", () => {
+  const original = "rt_original_chain";
+
+  it("returns Codex-shape JSON when openai.refresh advanced", () => {
+    const authFileContent = JSON.stringify({
+      openai: {
+        type: "oauth",
+        refresh: "rt_new_chain",
+        access: "at_new",
+        expires: 9_999_999_999_999,
+        accountId: "acc_123",
+      },
+    });
+    const result = detectCodexRefresh({ authFileContent, originalRefresh: original });
+    expect(result).not.toBeNull();
+    const parsed = JSON.parse(result ?? "{}");
+    expect(parsed.auth_mode).toBe("chatgpt");
+    expect(parsed.tokens.refresh_token).toBe("rt_new_chain");
+    expect(parsed.tokens.access_token).toBe("at_new");
+    expect(parsed.tokens.account_id).toBe("acc_123");
+    expect(typeof parsed.last_refresh).toBe("string");
+  });
+
+  it("omits account_id when accountId is absent from OpenCode shape", () => {
+    const authFileContent = JSON.stringify({
+      openai: {
+        type: "oauth",
+        refresh: "rt_new",
+        access: "at_new",
+        expires: 0,
+      },
+    });
+    const result = detectCodexRefresh({ authFileContent, originalRefresh: original });
+    const parsed = JSON.parse(result ?? "{}");
+    expect("account_id" in parsed.tokens).toBe(false);
+  });
+
+  it("returns null when refresh token unchanged (no rotation happened)", () => {
+    const authFileContent = JSON.stringify({
+      openai: { type: "oauth", refresh: original, access: "at_same", expires: 0 },
+    });
+    expect(detectCodexRefresh({ authFileContent, originalRefresh: original })).toBeNull();
+  });
+
+  it("returns null when openai entry is missing", () => {
+    const authFileContent = JSON.stringify({
+      anthropic: { type: "oauth", refresh: "rt_other", access: "at_other", expires: 0 },
+    });
+    expect(detectCodexRefresh({ authFileContent, originalRefresh: original })).toBeNull();
+  });
+
+  it("returns null when openai is api-key type (no refresh chain)", () => {
+    const authFileContent = JSON.stringify({
+      openai: { type: "api", key: "sk-something" },
+    });
+    expect(detectCodexRefresh({ authFileContent, originalRefresh: original })).toBeNull();
+  });
+
+  it("returns null for malformed JSON", () => {
+    expect(
+      detectCodexRefresh({ authFileContent: "{not json", originalRefresh: original })
+    ).toBeNull();
+  });
+
+  it("returns null for non-object content", () => {
+    expect(
+      detectCodexRefresh({ authFileContent: '"a string"', originalRefresh: original })
+    ).toBeNull();
+  });
+
+  it("returns null when refresh field is missing", () => {
+    const authFileContent = JSON.stringify({
+      openai: { type: "oauth", access: "at_new", expires: 0 },
+    });
+    expect(detectCodexRefresh({ authFileContent, originalRefresh: original })).toBeNull();
+  });
+});

utils/codexHome.ts

@@ -0,0 +1,174 @@
+// Codex-to-OpenCode auth bridging for the action runtime.
+//
+// `pullfrog auth codex` stores a Codex CLI `auth.json` blob in the Pullfrog
+// per-org secret store (production Postgres) — NOT a GitHub Actions secret.
+// This is non-negotiable: the OAuth refresh chain rotates on every use, and
+// `entryPost.ts` writes the rotated chain back via `PUT /api/runtime/secret`
+// after each run. GH Actions secrets are immutable at runtime, so a token
+// stashed there silently expires on the first refresh (~1h). See
+// wiki/codex-auth.md for the full constraint.
+//
+// At runtime, `CODEX_AUTH_JSON` lands in process.env via `runContext.dbSecrets`
+// merged in main.ts — sourced from Pullfrog Postgres through the OIDC-validated
+// run-context endpoint, never from `${{ secrets.CODEX_AUTH_JSON }}` in
+// workflow yaml. This utility:
+//
+//   1. parses + validates that env value
+//   2. converts Codex's shape `{ auth_mode, tokens: { access_token, refresh_token, ... } }`
+//      into OpenCode's shape `{ openai: { type: "oauth", refresh, access, expires, accountId } }`
+//   3. materializes it to disk at the runner's REAL `$HOME/.local/share/opencode/auth.json`
+//      (NOT the per-run tmpdir's HOME)
+//   4. returns the path + the original refresh token so the post-run hook
+//      can detect a refresh and write back to Pullfrog
+//
+// Why real $HOME and not ctx.tmpdir-redirected HOME: the broad
+// `external_directory: { "/tmp/*": "allow" }` rule on OpenCode would expose
+// auth.json to the agent's filesystem tools if the file lived under
+// `ctx.tmpdir` = `/tmp/pullfrog-*`. Real `$HOME/.local/share/opencode/...`
+// falls outside that allow zone, so OpenCode's deny-default protects it
+// without any new permission rules.
+//
+// `expires: 0` forces OpenCode to refresh on first request (we don't trust
+// the in-blob freshness — the saved token was eager-refreshed once at
+// `auth codex` time but may have aged since).
+//
+// See [wiki/codex-auth.md] for the full data-flow picture.
+
+import { mkdirSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { log } from "./cli.ts";
+
+const CODEX_AUTH_ENV = "CODEX_AUTH_JSON";
+
+interface CodexAuthBlob {
+  auth_mode: "chatgpt";
+  tokens: {
+    access_token: string;
+    refresh_token: string;
+    id_token?: string;
+    account_id?: string;
+  };
+  last_refresh?: string;
+}
+
+interface OpenCodeAuthFile {
+  openai: {
+    type: "oauth";
+    refresh: string;
+    access: string;
+    expires: number;
+    accountId?: string;
+  };
+}
+
+export interface InstalledCodexAuth {
+  /** absolute path of the auth.json we wrote — caller passes this to the
+   * post-hook via core.saveState for refresh-detection later. */
+  authPath: string;
+  /** value to set as XDG_DATA_HOME for the OpenCode subprocess. */
+  xdgDataHome: string;
+  /** refresh_token from the env at materialization time. post-hook compares
+   * against the on-disk file after the run to detect whether OpenCode
+   * refreshed during the session. */
+  originalRefresh: string;
+}
+
+/** materialize CODEX_AUTH_JSON from env into a disk path OpenCode reads from.
+ * returns null when the env var is absent, malformed, or wrong auth mode —
+ * caller treats null as "no codex auth, fall through to API key flow". */
+export function installCodexAuth(): InstalledCodexAuth | null {
+  const raw = process.env[CODEX_AUTH_ENV];
+  if (!raw) return null;
+
+  const blob = parseCodexBlob(raw);
+  if (!blob) {
+    log.warning(`» ${CODEX_AUTH_ENV} present but malformed; ignoring`);
+    return null;
+  }
+
+  const xdgDataHome = join(homedir(), ".local", "share");
+  const opencodeDir = join(xdgDataHome, "opencode");
+  const authPath = join(opencodeDir, "auth.json");
+
+  const opencodeAuth: OpenCodeAuthFile = {
+    openai: {
+      type: "oauth",
+      refresh: blob.tokens.refresh_token,
+      access: blob.tokens.access_token,
+      // expires: 0 forces OpenCode's CodexAuthPlugin to refresh on first
+      // request (it checks `expires < Date.now()`). safest default — we
+      // don't carry an `expires_in` from the Codex blob.
+      expires: 0,
+      ...(blob.tokens.account_id ? { accountId: blob.tokens.account_id } : {}),
+    },
+  };
+
+  mkdirSync(opencodeDir, { recursive: true });
+  writeFileSync(authPath, `${JSON.stringify(opencodeAuth, null, 2)}\n`, { mode: 0o600 });
+
+  log.info(`» installed Codex auth at ${authPath}`);
+
+  return { authPath, xdgDataHome, originalRefresh: blob.tokens.refresh_token };
+}
+
+function parseCodexBlob(raw: string): CodexAuthBlob | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object") return null;
+  const v = parsed as Record<string, unknown>;
+  if (v.auth_mode !== "chatgpt") return null;
+  const tokens = v.tokens;
+  if (!tokens || typeof tokens !== "object") return null;
+  const t = tokens as Record<string, unknown>;
+  if (typeof t.access_token !== "string" || t.access_token.length === 0) return null;
+  if (typeof t.refresh_token !== "string" || t.refresh_token.length === 0) return null;
+  return {
+    auth_mode: "chatgpt",
+    tokens: {
+      access_token: t.access_token,
+      refresh_token: t.refresh_token,
+      ...(typeof t.id_token === "string" ? { id_token: t.id_token } : {}),
+      ...(typeof t.account_id === "string" ? { account_id: t.account_id } : {}),
+    },
+    ...(typeof v.last_refresh === "string" ? { last_refresh: v.last_refresh } : {}),
+  };
+}
+
+/** convert an on-disk OpenCode auth.json back to the Codex CLI shape so the
+ * post-hook can write it to the Pullfrog secret store. returns null when the
+ * file's `openai` entry is missing, has the wrong type, or hasn't actually
+ * refreshed (refresh token unchanged from `originalRefresh`). */
+export function detectCodexRefresh(params: {
+  authFileContent: string;
+  originalRefresh: string;
+}): string | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(params.authFileContent);
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object") return null;
+  const oauth = (parsed as Record<string, unknown>).openai;
+  if (!oauth || typeof oauth !== "object") return null;
+  const o = oauth as Record<string, unknown>;
+  if (o.type !== "oauth") return null;
+  if (typeof o.refresh !== "string" || typeof o.access !== "string") return null;
+  if (o.refresh === params.originalRefresh) return null;
+
+  const codexShape: CodexAuthBlob = {
+    auth_mode: "chatgpt",
+    tokens: {
+      access_token: o.access,
+      refresh_token: o.refresh,
+      ...(typeof o.accountId === "string" ? { account_id: o.accountId } : {}),
+    },
+    last_refresh: new Date().toISOString(),
+  };
+  return `${JSON.stringify(codexShape, null, 2)}\n`;
+}

utils/docker.ts

@@ -1,286 +0,0 @@
-/**
- * shared docker utilities for running commands in containers.
- * used by both play.ts (dev) and test/run.ts (CI).
- */
-
-import { type SpawnSyncReturns, spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { platform } from "node:os";
-import { join } from "node:path";
-
-export type DockerRunContext = {
-  actionDir: string;
-  args: string[];
-  platformName: NodeJS.Platform;
-  home: string | undefined;
-  env: NodeJS.ProcessEnv;
-  uid: number;
-  gid: number;
-};
-
-export type SshSetup = {
-  sshFlags: string[];
-  sshSetupCmd: string;
-};
-
-export type DockerRunArgsContext = {
-  ctx: DockerRunContext;
-  envFlags: string[];
-  nodeCmd: string;
-  sshSetup: SshSetup;
-  volumeName: string;
-};
-
-export type VolumeInitContext = {
-  actionDir: string;
-  volumeName: string;
-  uid: number;
-  gid: number;
-};
-
-export function buildDockerRunContext(ctx: {
-  actionDir: string;
-  args: string[];
-}): DockerRunContext {
-  return {
-    actionDir: ctx.actionDir,
-    args: ctx.args,
-    platformName: platform(),
-    home: process.env.HOME,
-    env: process.env,
-    uid: process.getuid?.() ?? 1000,
-    gid: process.getgid?.() ?? 1000,
-  };
-}
-
-export function assertDockerSupported(ctx: DockerRunContext): void {
-  if (ctx.platformName === "win32") {
-    throw new Error("docker mode is not supported on native windows. use wsl2.");
-  }
-}
-
-function buildDarwinSshSetup(ctx: DockerRunContext): SshSetup {
-  const sshFlags: string[] = [];
-  const sshSetupCmd = "";
-  if (ctx.home) {
-    const knownHostsPath = join(ctx.home, ".ssh", "known_hosts");
-    if (existsSync(knownHostsPath)) {
-      sshFlags.push("-v", `${knownHostsPath}:/root/.ssh/known_hosts:ro`);
-    }
-  }
-  sshFlags.push(
-    "-v",
-    "/run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock",
-    "-e",
-    "SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock"
-  );
-  return { sshFlags, sshSetupCmd };
-}
-
-function buildLinuxSshSetup(ctx: DockerRunContext): SshSetup {
-  const sshFlags: string[] = [];
-  let sshSetupCmd = "";
-  if (ctx.home) {
-    const sshDir = join(ctx.home, ".ssh");
-    if (existsSync(sshDir)) {
-      sshFlags.push("-v", `${sshDir}:/tmp/.ssh-host:ro`);
-      sshSetupCmd =
-        "mkdir -p /tmp/home/.ssh && cp /tmp/.ssh-host/id_* /tmp/home/.ssh/ 2>/dev/null; chmod 600 /tmp/home/.ssh/id_* 2>/dev/null; " +
-        "ssh-keyscan -t ed25519,rsa github.com >> /tmp/home/.ssh/known_hosts 2>/dev/null; chmod 644 /tmp/home/.ssh/known_hosts; " +
-        "export GIT_SSH_COMMAND='ssh -i /tmp/home/.ssh/id_rsa -o UserKnownHostsFile=/tmp/home/.ssh/known_hosts -o StrictHostKeyChecking=no'; ";
-    }
-  }
-  return { sshFlags, sshSetupCmd };
-}
-
-export function buildSshSetup(ctx: DockerRunContext): SshSetup {
-  if (ctx.platformName === "darwin") {
-    return buildDarwinSshSetup(ctx);
-  }
-  return buildLinuxSshSetup(ctx);
-}
-
-// allowlist of env vars to pass through to the container for `pnpm runtest`.
-// NOTE: `pnpm play` uses "passthrough" mode and passes ALL env vars.
-// if your env var isn't working with `pnpm runtest`, add it here!
-// see wiki/adversarial.md for documentation.
-const testEnvAllowList = new Set([
-  "CI",
-  "GITHUB_ACTIONS",
-  "PULLFROG_DISABLE_SECURITY_INSTRUCTIONS", // disables security messaging for pentest
-  "GITHUB_TOKEN",
-  "GH_TOKEN",
-  "GITHUB_REPOSITORY",
-  "GITHUB_APP_ID",
-  "GITHUB_PRIVATE_KEY",
-  "OPENAI_API_KEY",
-  "ANTHROPIC_API_KEY",
-  "CLAUDE_CODE_OAUTH_TOKEN",
-  "GEMINI_API_KEY",
-  "GOOGLE_GENERATIVE_AI_API_KEY",
-  "XAI_API_KEY",
-  "DEEPSEEK_API_KEY",
-  "OPENROUTER_API_KEY",
-  "MOONSHOT_API_KEY",
-  "OPENCODE_API_KEY",
-  "PULLFROG_MODEL",
-  "LOG_LEVEL",
-  "DEBUG",
-  "NODE_ENV",
-  "PLAY_LOCAL",
-  "HOME",
-  "USER",
-  "SSH_AUTH_SOCK",
-  "ACTIONS_ID_TOKEN_REQUEST_URL",
-  "ACTIONS_ID_TOKEN_REQUEST_TOKEN",
-  "GITHUB_API_URL",
-  "GITHUB_SERVER_URL",
-  "GITHUB_GRAPHQL_URL",
-  "GITHUB_OUTPUT",
-]);
-
-export type EnvFilterMode = "allowlist" | "passthrough";
-
-export function buildEnvFlags(ctx: DockerRunContext, mode: EnvFilterMode): string[] {
-  const envFlags: string[] = [];
-  const entries = Object.entries(ctx.env);
-
-  for (const entry of entries) {
-    const key = entry[0];
-    const value = entry[1];
-
-    if (value === undefined) continue;
-
-    if (mode === "passthrough" || testEnvAllowList.has(key)) {
-      envFlags.push("-e", `${key}=${value}`);
-    }
-  }
-  return envFlags;
-}
-
-export function initializeNodeModulesVolume(ctx: VolumeInitContext): void {
-  spawnSync(
-    "docker",
-    [
-      "run",
-      "--rm",
-      "-v",
-      `${ctx.volumeName}:/app/action/node_modules`,
-      "node:24",
-      "chown",
-      "-R",
-      `${ctx.uid}:${ctx.gid}`,
-      "/app/action/node_modules",
-    ],
-    { stdio: "ignore", cwd: ctx.actionDir }
-  );
-}
-
-/**
- * escape a string for embedding in a double-quoted shell context.
- * handles: backslash, double quote, dollar sign, backtick.
- */
-function escapeForDoubleQuotes(str: string): string {
-  return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\$/g, "\\$").replace(/`/g, "\\`");
-}
-
-export function buildDockerRunArgs(config: DockerRunArgsContext): string[] {
-  const args: string[] = [
-    "run",
-    "--rm",
-    "-t",
-    "--privileged", // needed for PID namespace isolation (unshare --pid)
-    "-v",
-    `${config.ctx.actionDir}:/app/action:cached`,
-    "-v",
-    `${config.volumeName}:/app/action/node_modules`,
-    "-w",
-    "/app/action",
-  ];
-  args.push(...config.envFlags);
-  args.push(...config.sshSetup.sshFlags);
-
-  // escape nodeCmd for embedding in su -c "..." context
-  const escapedNodeCmd = escapeForDoubleQuotes(config.nodeCmd);
-
-  // run as root initially, setup sudo for a test user, then run tests as that user
-  // this simulates GHA environment where sudo is available
-  const setupCmd = [
-    // install sudo (node:24 is Debian-based) - check if already installed first
-    `which sudo > /dev/null 2>&1 || (apt-get update -qq && apt-get install -qq -y sudo > /dev/null 2>&1)`,
-    // remove any existing user/group with the same uid/gid (e.g. node:24 has "node" at 1000:1000)
-    `existing_user=$(getent passwd ${config.ctx.uid} | cut -d: -f1) && [ -n "$existing_user" ] && [ "$existing_user" != "testuser" ] && userdel "$existing_user" 2>/dev/null || true`,
-    `existing_group=$(getent group ${config.ctx.gid} | cut -d: -f1) && [ -n "$existing_group" ] && [ "$existing_group" != "testuser" ] && groupdel "$existing_group" 2>/dev/null || true`,
-    // create user matching host uid/gid for file permissions
-    `id testuser > /dev/null 2>&1 || (groupadd -g ${config.ctx.gid} testuser 2>/dev/null || true; useradd -u ${config.ctx.uid} -g ${config.ctx.gid} -m -s /bin/bash testuser 2>/dev/null || true)`,
-    // configure passwordless sudo (like GHA runners) - check if already configured
-    `grep -q "testuser ALL" /etc/sudoers 2>/dev/null || echo "testuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers`,
-    // setup directories
-    `mkdir -p /tmp/home/.config /tmp/home/.cache`,
-    `chown -R ${config.ctx.uid}:${config.ctx.gid} /tmp/home /app/action/node_modules`,
-    // install deps as user
-    `su testuser -c "corepack pnpm install --frozen-lockfile --ignore-scripts"`,
-    // run test as user - nodeCmd is escaped for double-quote context
-    `su testuser -c "${escapedNodeCmd}"`,
-  ].join(" && ");
-  args.push(
-    "-e",
-    "COREPACK_ENABLE_DOWNLOAD_PROMPT=0",
-    "-e",
-    "HOME=/tmp/home",
-    "-e",
-    "TMPDIR=/tmp",
-    // always set CI=true in docker to enable sandbox - this is critical for security tests
-    // without this, PID namespace isolation is skipped and tests may pass vacuously
-    "-e",
-    "CI=true",
-    "node:24",
-    "bash",
-    "-c",
-    `${config.sshSetup.sshSetupCmd}${setupCmd}`
-  );
-  return args;
-}
-
-export type RunInDockerOptions = {
-  actionDir: string;
-  args: string[];
-  nodeCmd: string;
-  volumeName: string;
-  envFilterMode: EnvFilterMode;
-  onStart?: () => void;
-};
-
-export function runInDocker(options: RunInDockerOptions): SpawnSyncReturns<Buffer> {
-  const ctx = buildDockerRunContext({
-    actionDir: options.actionDir,
-    args: options.args,
-  });
-  assertDockerSupported(ctx);
-
-  const sshSetup = buildSshSetup(ctx);
-  const envFlags = buildEnvFlags(ctx, options.envFilterMode);
-
-  initializeNodeModulesVolume({
-    actionDir: ctx.actionDir,
-    volumeName: options.volumeName,
-    uid: ctx.uid,
-    gid: ctx.gid,
-  });
-
-  if (options.onStart) {
-    options.onStart();
-  }
-
-  return spawnSync(
-    "docker",
-    buildDockerRunArgs({
-      ctx,
-      envFlags,
-      nodeCmd: options.nodeCmd,
-      sshSetup,
-      volumeName: options.volumeName,
-    }),
-    { stdio: "inherit", cwd: ctx.actionDir }
-  );
-}

utils/errorReport.ts

@@ -1,6 +1,7 @@
 import type { ToolState } from "../toolState.ts";
 import { getApiUrl } from "./apiUrl.ts";
 import { buildPullfrogFooter } from "./buildPullfrogFooter.ts";
+import { log } from "./cli.ts";
 import { createOctokit, parseRepoContext } from "./github.ts";
 import { updateProgressComment } from "./progressComment.ts";
 import { getGitHubInstallationToken } from "./token.ts";
@@ -9,16 +10,20 @@ interface ReportErrorParams {
   toolState: ToolState;
   error: string;
   title?: string;
+  /**
+   * When the run has no pre-existing progress comment to update (silent
+   * IncrementalReview / pull_request_synchronize, mode-less polls), create
+   * a fresh issue comment on `toolState.issueNumber` instead of returning
+   * silently. Used for terminal errors (BillingError, TransientError) where
+   * the GH job summary is the only other surface and most users never open
+   * it. see #775.
+   */
+  createIfMissing?: boolean;
 }
 
 export async function reportErrorToComment(ctx: ReportErrorParams): Promise<void> {
   const formattedError = ctx.title ? `${ctx.title}\n\n${ctx.error}` : ctx.error;
 
-  const comment = ctx.toolState.progressComment;
-  if (!comment) {
-    return;
-  }
-
   const repoContext = parseRepoContext();
   const octokit = createOctokit(getGitHubInstallationToken());
   const runId = process.env.GITHUB_RUN_ID
@@ -38,14 +43,42 @@ export async function reportErrorToComment(ctx: ReportErrorParams): Promise<void
     workflowRun: runId ? { owner: repoContext.owner, repo: repoContext.name, runId } : undefined,
     customParts,
     model: ctx.toolState.model,
+    fallbackFrom: ctx.toolState.modelFallback?.from,
   });
 
-  await updateProgressComment(
-    { octokit, owner: repoContext.owner, repo: repoContext.name },
-    comment,
-    `${formattedError}${footer}`
-  );
+  const body = `${formattedError}${footer}`;
 
-  // mark as updated so exit handler doesn't try to update again
-  ctx.toolState.wasUpdated = true;
+  const comment = ctx.toolState.progressComment;
+  if (comment) {
+    await updateProgressComment(
+      { octokit, owner: repoContext.owner, repo: repoContext.name },
+      comment,
+      body
+    );
+    ctx.toolState.wasUpdated = true;
+    return;
+  }
+
+  // silent triggers (pull_request_synchronize IncrementalReview, etc.)
+  // intentionally have no progress comment. for terminal errors that need
+  // user action — billing exhaustion, transient billing-service outage —
+  // surface a fresh issue comment instead of leaving the GH job summary as
+  // the only signal. see #775.
+  if (!ctx.createIfMissing) return;
+  if (!ctx.toolState.issueNumber) return;
+
+  try {
+    const created = await octokit.rest.issues.createComment({
+      owner: repoContext.owner,
+      repo: repoContext.name,
+      issue_number: ctx.toolState.issueNumber,
+      body,
+    });
+    ctx.toolState.progressComment = { id: created.data.id, type: "issue" };
+    ctx.toolState.wasUpdated = true;
+  } catch (error) {
+    log.warning(
+      `[errorReport] fallback comment create failed: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
 }

utils/gitAuth.ts

@@ -14,6 +14,7 @@ import { readFileSync, realpathSync, unlinkSync } from "node:fs";
 import { log } from "./cli.ts";
 import type { GitAuthServer } from "./gitAuthServer.ts";
 import { filterEnv } from "./secrets.ts";
+import { $ } from "./shell.ts";
 import { spawn } from "./subprocess.ts";
 
 type SafeGitSubcommand = "fetch" | "push";
@@ -181,3 +182,56 @@ export async function $git(
     }
   }
 }
+
+/**
+ * shallow-clone unreachable: when an existing local depth is too shallow for
+ * git to traverse to the requested ref's ancestry, the remote walk fails with
+ * one of these wordings (git emits the full OID via oid_to_hex, so the bound
+ * is 40 for SHA-1 or 64 for SHA-256). detecting both lets a single deepen
+ * retry recover before the error reaches the agent — see issue #564 for the
+ * original `git_fetch` precedent and #656 for the `checkout_pr` follow-up.
+ */
+export const SHALLOW_UNREACHABLE_PATTERNS: RegExp[] = [
+  /Could not read [a-f0-9]{40,64}/,
+  /remote did not send all necessary objects/,
+];
+
+/**
+ * large enough to clear the merge base on most real-world PRs without
+ * downloading the full history; matches the fallback used by
+ * `checkoutPrBranch` when the GitHub compare API is unavailable.
+ */
+export const DEEPEN_RETRY_DEPTH = 1000;
+
+/**
+ * authenticated `git fetch` that recovers from shallow-unreachable errors
+ * by retrying once with `--deepen=1000`. callers pass the same args they
+ * would to `$git("fetch", ...)`; on shallow-unreachable failures in a
+ * shallow repo, the second attempt prepends `--deepen=N` and strips any
+ * caller-supplied `--depth=` (the two flags are mutually exclusive, and
+ * the caller's depth is what got us into this mess).
+ *
+ * non-shallow-unreachable errors and non-shallow repos rethrow unchanged,
+ * so this is safe to wrap any fetch without changing fast-path behavior.
+ */
+export async function $gitFetchWithDeepen(
+  args: string[],
+  options: GitAuthOptions,
+  label?: string
+): Promise<GitResult> {
+  try {
+    return await $git("fetch", args, options);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    const isShallowUnreachable = SHALLOW_UNREACHABLE_PATTERNS.some((p) => p.test(msg));
+    if (!isShallowUnreachable) throw err;
+    const isShallow =
+      $("git", ["rev-parse", "--is-shallow-repository"], { log: false }).trim() === "true";
+    if (!isShallow) throw err;
+    log.info(
+      `» ${label ?? "git fetch"} hit shallow-unreachable error, retrying with --deepen=${DEEPEN_RETRY_DEPTH}`
+    );
+    const retryArgs = args.filter((a) => !a.startsWith("--depth="));
+    return await $git("fetch", [`--deepen=${DEEPEN_RETRY_DEPTH}`, ...retryArgs], options);
+  }
+}

utils/github.ts

@@ -379,10 +379,30 @@ export async function acquireNewToken(opts?: AcquireTokenOptions): Promise<strin
         );
       },
     });
-  } else {
-    // local development via GitHub App
-    return await acquireTokenViaGitHubApp(opts);
   }
+  // running inside GitHub Actions but the OIDC env vars are absent — the
+  // workflow is missing `permissions: id-token: write`. surface an
+  // actionable, customer-facing message; the GitHub-App branch below is
+  // local-dev only. see #739.
+  if (process.env.GITHUB_ACTIONS === "true") {
+    throw new Error(
+      "missing `permissions: id-token: write` on the Pullfrog workflow job.\n" +
+        "\n" +
+        "Pullfrog mints short-lived GitHub App installation tokens via OIDC and\n" +
+        "requires `id-token: write` to be granted at the job level. add the\n" +
+        "following to your workflow yaml:\n" +
+        "\n" +
+        "  jobs:\n" +
+        "    pullfrog:\n" +
+        "      permissions:\n" +
+        "        id-token: write   # mint Pullfrog installation tokens via OIDC\n" +
+        "        contents: read    # for actions/checkout\n" +
+        "\n" +
+        "see https://docs.pullfrog.com/headless-action#required-permissions for the full template."
+    );
+  }
+  // local development via GitHub App
+  return await acquireTokenViaGitHubApp(opts);
 }
 
 export interface RepoContext {

utils/instructions.ts

@@ -269,7 +269,7 @@ Rules:
 - Never push commits directly to the default branch or any protected branch (commonly: main, master, production, develop, staging). Always create a feature branch following the pattern: \`pullfrog/<issue-number>-<kebab-case-description>\` (e.g., \`pullfrog/123-fix-login-bug\`).
 - Never add co-author trailers (e.g., "Co-authored-by" or "Co-Authored-By") to commit messages.
 - Untracked files from tests or tooling (e.g. \`coverage/\`) often remain *after* your last commit and still block \`${t("push_branch")}\` — delete them, extend \`.gitignore\`, or only add files that truly belong in the repo.
-- \`${t("push_branch")}\` runs the repository's optional **prepush** hook before the network push. If the error includes \`lifecycle hook 'prepush' failed\` (with an exit code and script output after it), the hook script exited non-zero (commonly tests or lint). Fix that or change the hook — do not describe it as an infrastructure "timeout" unless the tool output or logs clearly show a timeout.
+- \`${t("push_branch")}\` runs the repository's optional **prepush** hook (commonly tests or lint) — best-effort. On failure the output is returned, the hook is latched off, and every subsequent \`${t("push_branch")}\` call this run skips it. If the failure is unrelated to your changes (pre-existing breakage, env-dependent test, flaky check), just call \`${t("push_branch")}\` again. If it could be a real bug in your code, ${ctx.payload.shell === "disabled" ? `fix it from the failure output (shell is disabled, so you can't re-run the hook)` : `re-run the hook via the shell tool to iterate — \`${t("push_branch")}\` itself won't re-run it`}. Don't describe the failure as an infrastructure "timeout" unless the tool output clearly shows one.
 - If push or PR creation fails, \`${t("report_progress")}\` must summarize using the **actual** error from the tool. Do not substitute vague causes unless they match what failed.
 
 ### GitHub
@@ -297,11 +297,9 @@ For maximum efficiency, whenever you need to perform multiple independent operat
 - listing multiple directories
 - inspecting multiple MCP tools or resources
 
-Do NOT parallelize operations that depend on prior output (e.g. create a file then read it), or ordered stateful mutations. Edits are not parallelizable — sequence those normally.${
-    ctx.agentId === "opencode"
-      ? `\n\nOn OpenCode you also have a \`batch\` tool that bundles 1-25 independent calls into one wrapper call. Reach for it whenever you have >=2 independent calls. Native parallel tool_use and \`batch\` both achieve one round trip instead of N — use whichever your provider supports best.`
-      : `\n\nEmit multiple \`tool_use\` blocks in the same assistant message for independent calls — the runtime executes them concurrently. Do not wait for one tool result before issuing the next independent call.`
-  }
+Do NOT parallelize operations that depend on prior output (e.g. create a file then read it), or ordered stateful mutations. Edits are not parallelizable — sequence those normally.
+
+Emit multiple \`tool_use\` blocks in the same assistant message for independent calls — the runtime executes them concurrently. Do not wait for one tool result before issuing the next independent call.
 
 ### Command execution
 
@@ -319,7 +317,7 @@ When embedding images (e.g. uploaded screenshots) in comments or PR bodies, alwa
 
 **\`report_progress\`**: call this exactly once at the end of every run with a brief final summary (1-3 sentences) unless the mode guidance instructs otherwise. Never call it for intermediate status updates (e.g., "Checking for changes...", "Starting review...") — the task list handles live progress automatically. Calling \`report_progress\` replaces the task list with your summary and preserves the current task list in a collapsible section. Keep the summary concise — do not repeat what the task list already shows. Focus on the outcome (what was accomplished, links to artifacts) rather than listing individual steps. If something failed, include the tool's error text even when that makes the summary longer.
 
-Never use \`create_issue_comment\` for task progress — that creates duplicate comments and leaves the progress comment stuck in its initial state. \`create_issue_comment\` is only for standalone comments unrelated to your current task (e.g., Plan comments).
+Never use \`create_issue_comment\` for task progress — that creates duplicate comments and leaves the progress comment stuck in its initial state. \`create_issue_comment\` is only for standalone comments unrelated to your current task. Plan output (initial post AND revisions) goes through \`report_progress\` — see the Plan mode guidance for details.
 
 ### If you get stuck
 
@@ -399,11 +397,13 @@ export function buildLearningsSection(ctx: {
   headings: LearningsHeading[];
 }): string {
   if (!ctx.filePath) return "";
-  const intro = `Repo-level learnings accumulated by previous agent runs live at \`${ctx.filePath}\`. Use this file as durable context (test commands, conventions, gotchas, architecture notes).`;
+  // intro is neutral about whether content exists so an empty fresh-repo
+  // file doesn't open with "accumulated by previous agent runs" (false).
+  const intro = `The repo-level learnings file at \`${ctx.filePath}\` holds durable context (test commands, conventions, gotchas, architecture notes) maintained across runs.`;
   const tocBody =
     ctx.headings.length === 0
-      ? "(no headings yet — file is empty or a flat list. read the whole file. during the post-run reflection turn, structure it with `## ` / `### ` headings so future runs can read targeted ranges.)"
-      : `Read targeted line ranges via your native file tool — do NOT slurp the whole file. Each range starts at the section heading line, so reading the range gives you heading + body together.\n\n${renderLearningsToc(ctx.headings)}`;
+      ? "(no headings yet — the file is empty or contains a flat list. read the whole file if it has content. during the post-run reflection turn, structure it with `## ` / `### ` headings so future runs can read targeted ranges.)"
+      : `Read targeted line ranges via your native file tool — do NOT slurp the whole file. Each range starts at the section heading line, so reading the range gives you heading + body together. The ranges below are a run-start snapshot: any edit shifts the line numbers of every later section, so re-read the TOC range you need before relying on it.\n\n${renderLearningsToc(ctx.headings)}`;
   return `************* LEARNINGS *************\n\n${intro}\n\n${tocBody}`;
 }
 

utils/learnings.ts

@@ -1,5 +1,11 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import type { ToolContext } from "../mcp/server.ts";
+import { apiFetch } from "./apiFetch.ts";
+import { log } from "./cli.ts";
+import { MAX_LEARNINGS_LENGTH, truncateAtLineBoundary } from "./learningsTruncate.ts";
+
+export { MAX_LEARNINGS_LENGTH, truncateAtLineBoundary };
 
 /**
  * Repo-level learnings — operational facts about a repo (setup steps, test
@@ -31,15 +37,6 @@ import { dirname, join } from "node:path";
 
 export const LEARNINGS_FILE_NAME = "pullfrog-learnings.md";
 
-/** server-side cap mirrors `MAX_LEARNINGS_LENGTH` in
- * `app/api/repo/[owner]/[repo]/learnings/route.ts`. truncating client-side
- * keeps the PATCH from being rejected with a 400. raised from 10k → 100k
- * once the TOC affordance landed: with line-range reads via the
- * server-parsed TOC the agent doesn't ingest the whole file, so the cap
- * can grow to whatever curation discipline allows. 100k holds ~400-500
- * short bullets. */
-const MAX_LEARNINGS_LENGTH = 100_000;
-
 export function learningsFilePath(tmpdir: string): string {
   return join(tmpdir, LEARNINGS_FILE_NAME);
 }
@@ -59,23 +56,6 @@ export async function seedLearningsFile(params: {
   return path;
 }
 
-/** truncate at the last newline boundary before `cap` so we don't leave
- * a partial line at the tail (a half-truncated `## Headi` confuses the
- * server's next-seed TOC parse and shrinks visible structure). falls
- * back to a hard `slice` when the line boundary would discard a large
- * run of content — i.e. when the tail of `head` is one giant line (rare:
- * minified pastes, fenced log dumps). losing a partial last line is
- * preferable to losing kilobytes of body. */
-const TRUNCATION_LINE_BOUNDARY_TOLERANCE = 4096;
-function truncateAtLineBoundary(body: string, cap: number): string {
-  if (body.length <= cap) return body;
-  const head = body.slice(0, cap);
-  const lastNewline = head.lastIndexOf("\n");
-  if (lastNewline <= 0) return head;
-  if (cap - lastNewline > TRUNCATION_LINE_BOUNDARY_TOLERANCE) return head;
-  return head.slice(0, lastNewline);
-}
-
 /** read the agent-edited learnings file. returns null when the file is
  * missing or unreadable (treated as "no change"). caps content at the
  * server's max length to avoid a 400 round-trip. */
@@ -88,3 +68,63 @@ export async function readLearningsFile(path: string): Promise<string | null> {
   }
   return truncateAtLineBoundary(raw.trim(), MAX_LEARNINGS_LENGTH);
 }
+
+/**
+ * Read the agent-edited repo-level learnings tmpfile and PATCH it to
+ * `Repo.learnings`.
+ *
+ * Best-effort: any failure is logged and does not affect the run's success
+ * status. Skips the PATCH when the file is byte-trim-identical to its seed —
+ * the agent didn't touch it, so writing the same content back would just
+ * burn a `LearningsRevision` row and an API round-trip.
+ *
+ * `ctx.toolState.model` is forwarded so `LearningsRevision.model` keeps
+ * populating; it powers the per-revision attribution badge in the UI
+ * history view.
+ *
+ * `learningsPersistAttempted` guards against double-execution between the
+ * normal end-of-run path and the SIGINT/SIGTERM handler.
+ */
+export async function persistLearnings(ctx: ToolContext): Promise<void> {
+  const filePath = ctx.toolState.learningsFilePath;
+  if (!filePath) return;
+  if (ctx.toolState.learningsPersistAttempted) return;
+  ctx.toolState.learningsPersistAttempted = true;
+  const current = await readLearningsFile(filePath);
+  if (current === null) {
+    log.debug(`learnings tmpfile missing or unreadable at ${filePath} — skipping persist`);
+    return;
+  }
+  const seed = ctx.toolState.learningsSeed?.trim() ?? "";
+  if (current === seed) {
+    log.debug("learnings tmpfile unchanged from seed — skipping persist");
+    return;
+  }
+  try {
+    const response = await apiFetch({
+      path: `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/learnings`,
+      method: "PATCH",
+      headers: {
+        authorization: `Bearer ${ctx.apiToken}`,
+        "content-type": "application/json",
+      },
+      body: JSON.stringify({
+        learnings: current,
+        model: ctx.toolState.model,
+      }),
+      signal: AbortSignal.timeout(10_000),
+    });
+    if (!response.ok) {
+      const error = await response.text().catch(() => "(no body)");
+      // promoted from debug → warning: this path means the agent edited the
+      // file (we already short-circuited the unchanged-from-seed case above)
+      // but the PATCH dropped it on the floor. silently losing real work is
+      // worse than the noise of a CI warning.
+      log.warning(`learnings persist failed (${response.status}): ${error}`);
+      return;
+    }
+    log.info("» learnings updated");
+  } catch (err) {
+    log.warning(`learnings persist failed: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}

utils/learningsTocRender.test.ts

@@ -82,6 +82,17 @@ describe("buildLearningsSection", () => {
     expect(out).not.toMatch(/\(L\d+-L\d+\)/);
   });
 
+  it("intro phrasing does not assert prior runs — works for fresh empty repos too", () => {
+    const out = buildLearningsSection({
+      filePath: "/tmp/run-1/pullfrog-learnings.md",
+      headings: [],
+    });
+    // load-bearing: fresh repos have zero previous runs. the prior copy
+    // ("accumulated by previous agent runs") was a lie in that case.
+    expect(out).not.toContain("accumulated by previous agent runs");
+    expect(out).toContain("maintained across runs");
+  });
+
   it("renders the TOC inline with the file path and heading guidance", () => {
     const out = buildLearningsSection({
       filePath: "/tmp/run-1/pullfrog-learnings.md",
@@ -92,6 +103,12 @@ describe("buildLearningsSection", () => {
     expect(out).toContain("- Build & test (L1-L18)");
     expect(out).toContain("- Architecture (L19-L60)");
     expect(out).toContain("Each range starts at the section heading line");
+    // re-read affordance: ranges reflect the run-start snapshot, so the
+    // agent needs an explicit nudge to re-read after any mid-run edits.
+    // mid-run edits shift the line numbers of every later section, not
+    // just the edited one — wording is explicit about that.
+    expect(out).toContain("run-start snapshot");
+    expect(out).toContain("any edit shifts the line numbers of every later section");
     // explicit "no hashes, no backticks" in the rendered list
     expect(out).not.toContain("- `## Build");
     expect(out).not.toContain("`## Build");

utils/learningsTruncate.ts

@@ -0,0 +1,42 @@
+/**
+ * pure string helpers for capping and line-boundary-truncating the
+ * `Repo.learnings` body. lives in its own module (vs alongside
+ * `learnings.ts`) so the proprietary root app can re-export it through
+ * `action/internal/index.ts` without dragging the entire MCP type graph
+ * along — `learnings.ts` imports `ToolContext` for its runtime helpers,
+ * and pulling that into the SDK-facing `internal` barrel expands the
+ * type graph reachable from root `tsc` and `cf-worker-indexing` to every
+ * tool module under `action/mcp/`. keeping these helpers MCP-free is the
+ * cheap structural fix.
+ *
+ * see `action/utils/learnings.ts` for the full learnings-file lifecycle.
+ */
+
+/** maximum size of `Repo.learnings` body in chars. action truncates the
+ * read-back BEFORE the PATCH to avoid sending an oversized payload; the
+ * server applies the same truncation as a defense-in-depth backstop (any
+ * caller that misses the client-side step would otherwise persist a
+ * mid-line tail, breaking the next-run TOC parse).
+ *
+ * raised from 10k → 100k once the TOC affordance landed: with line-range
+ * reads via the server-parsed TOC the agent doesn't ingest the whole
+ * file, so the cap is governed by curation discipline rather than a
+ * tight byte ceiling. 100k holds ~400-500 short bullets. */
+export const MAX_LEARNINGS_LENGTH = 100_000;
+
+/** truncate at the last newline boundary before `cap` so we don't leave
+ * a partial line at the tail (a half-truncated `## Headi` confuses the
+ * server's next-seed TOC parse and shrinks visible structure). falls
+ * back to a hard `slice` when the line boundary would discard a large
+ * run of content — i.e. when the tail of `head` is one giant line (rare:
+ * minified pastes, fenced log dumps). losing a partial last line is
+ * preferable to losing kilobytes of body. */
+const TRUNCATION_LINE_BOUNDARY_TOLERANCE = 4096;
+export function truncateAtLineBoundary(body: string, cap: number): string {
+  if (body.length <= cap) return body;
+  const head = body.slice(0, cap);
+  const lastNewline = head.lastIndexOf("\n");
+  if (lastNewline <= 0) return head;
+  if (cap - lastNewline > TRUNCATION_LINE_BOUNDARY_TOLERANCE) return head;
+  return head.slice(0, lastNewline);
+}

utils/lifecycle.ts

@@ -12,22 +12,37 @@ export interface ExecuteLifecycleHookParams {
   script: string | null;
 }
 
+/** structured failure info — `output` on the `exit` variant is trimmed
+ * stderr, falling back to stdout when stderr is empty. */
+export type LifecycleHookFailure =
+  | { kind: "exit"; exitCode: number; output: string }
+  | { kind: "timeout" }
+  | { kind: "spawn"; spawnError: string };
+
 export interface LifecycleHookResult {
   /**
    * human-readable warning when the hook failed. includes retry guidance:
    * transient spawn/exit errors are worth retrying, timeouts and
    * persistent failures are not. absent when the hook succeeded or was
-   * skipped.
+   * skipped. setup/post-checkout callers surface this verbatim; prepush
+   * builds its own message from `failure` instead.
    */
   warning?: string;
+  /**
+   * structured failure info — undefined when the hook succeeded or was
+   * skipped. lets callers compose their own messaging without parsing the
+   * `warning` string.
+   */
+  failure?: LifecycleHookFailure;
 }
 
 /**
  * execute a lifecycle hook script if one is configured.
  *
  * soft-fails: instead of throwing on hook errors, returns a warning string
- * so callers can choose whether to surface it (mcp tools) or upgrade it to
- * a fatal error (setup/prepush). timeouts are flagged as non-retryable.
+ * (and structured failure info) so callers can choose whether to surface
+ * it (mcp tools) or upgrade it to a fatal error (setup). timeouts are
+ * flagged as non-retryable in the warning text.
  */
 export async function executeLifecycleHook(
   params: ExecuteLifecycleHookParams
@@ -50,6 +65,7 @@ export async function executeLifecycleHook(
     if (result.exitCode !== 0) {
       const output = (result.stderr || result.stdout).trim();
       return {
+        failure: { kind: "exit", output, exitCode: result.exitCode },
         warning:
           `lifecycle hook '${params.event}' failed with exit code ${result.exitCode}. ` +
           `output: ${output || "(empty)"}. ` +
@@ -67,6 +83,7 @@ export async function executeLifecycleHook(
     if (isTimeout) {
       const minutes = Math.round(LIFECYCLE_HOOK_TIMEOUT_MS / 60000);
       return {
+        failure: { kind: "timeout" },
         warning:
           `lifecycle hook '${params.event}' timed out after ${minutes}min. ` +
           `do NOT retry — the script is likely hung or doing too much work. ` +
@@ -75,6 +92,7 @@ export async function executeLifecycleHook(
     }
     const msg = err instanceof Error ? err.message : String(err);
     return {
+      failure: { kind: "spawn", spawnError: msg },
       warning:
         `lifecycle hook '${params.event}' failed to spawn: ${msg}. ` +
         `this is likely a transient failure — retry the operation.`,

utils/overrides.ts

@@ -0,0 +1,98 @@
+/**
+ * Parse + apply the action's `unsafe_overrides` input — a JSON object of env
+ * var overrides that mutate `process.env` at the start of a run. Designed for
+ * e2e testing / debugging from `workflow_dispatch`; only callers with
+ * `actions:write` on the repo can supply it.
+ *
+ * The `unsafe` prefix is load-bearing: GH Actions echoes the value verbatim
+ * in the runner's step-header log, so the raw JSON (including any values
+ * passed in) is visible to anyone with `actions:read` on the calling repo.
+ * Treat the run log as compromised for any value placed in `unsafe_overrides`.
+ */
+
+import * as core from "@actions/core";
+
+/**
+ * Names refused even when present in the input. Overriding these would let a
+ * caller escape pullfrog's scope (GITHUB_TOKEN), break runner internals
+ * (ACTIONS_RUNTIME_*), forge OIDC tokens (ACTIONS_ID_TOKEN_REQUEST_*), or
+ * substitute our server-side auth (PULLFROG_API_SECRET). Customer-facing
+ * provider keys (ANTHROPIC_API_KEY, OPENAI_API_KEY, CLAUDE_CODE_OAUTH_TOKEN,
+ * etc.) are intentionally NOT denied — overriding those is the use case.
+ */
+export const DENIED_OVERRIDE_NAMES: ReadonlySet<string> = new Set([
+  "GITHUB_TOKEN",
+  "GH_TOKEN",
+  "ACTIONS_RUNTIME_TOKEN",
+  "ACTIONS_RUNTIME_URL",
+  "ACTIONS_ID_TOKEN_REQUEST_URL",
+  "ACTIONS_ID_TOKEN_REQUEST_TOKEN",
+  "ACTIONS_CACHE_URL",
+  "PULLFROG_API_SECRET",
+  "VERCEL_AUTOMATION_BYPASS_SECRET",
+]);
+
+export interface ApplyOverridesResult {
+  applied: string[];
+  denied: string[];
+}
+
+/** Parse the JSON input. Returns `{}` for empty/whitespace. Throws on shape errors. */
+export function parseOverrides(raw: string): Record<string, string> {
+  const trimmed = raw.trim();
+  if (!trimmed) return {};
+
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(trimmed);
+  } catch (err) {
+    throw new Error(
+      `invalid UNSAFE_OVERRIDES: not valid JSON (${err instanceof Error ? err.message : String(err)})`
+    );
+  }
+
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(`invalid UNSAFE_OVERRIDES: must be a JSON object`);
+  }
+
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
+    if (typeof value !== "string") {
+      throw new Error(
+        `invalid UNSAFE_OVERRIDES: key "${key}" must have a string value (got ${typeof value})`
+      );
+    }
+    out[key] = value;
+  }
+  return out;
+}
+
+/**
+ * Mutate `params.env` in place with the supplied JSON overrides, skipping any
+ * names in `DENIED_OVERRIDE_NAMES`. Each applied value is registered with
+ * `core.setSecret` so the runner masks it in subsequent log output, and the
+ * raw `UNSAFE_OVERRIDES` env var is deleted so spawned subprocesses don't
+ * inherit the original JSON (which would defeat both the deny-list and the
+ * masking by exposing the values verbatim).
+ *
+ * Returns the applied/denied breakdown so the caller can render an audit log.
+ */
+export function applyOverrides(params: {
+  raw: string;
+  env: NodeJS.ProcessEnv;
+}): ApplyOverridesResult {
+  const overrides = parseOverrides(params.raw);
+  const applied: string[] = [];
+  const denied: string[] = [];
+  for (const [key, value] of Object.entries(overrides)) {
+    if (DENIED_OVERRIDE_NAMES.has(key)) {
+      denied.push(key);
+      continue;
+    }
+    if (value.length > 0) core.setSecret(value);
+    params.env[key] = value;
+    applied.push(key);
+  }
+  delete params.env.UNSAFE_OVERRIDES;
+  return { applied, denied };
+}

utils/payload.ts

@@ -3,6 +3,7 @@ import * as core from "@actions/core";
 import { type } from "arktype";
 import type { AuthorPermission, PayloadEvent } from "../external.ts";
 import packageJson from "../package.json" with { type: "json" };
+import { log } from "./cli.ts";
 import type { RepoSettings } from "./runContext.ts";
 import { validateCompatibility } from "./versioning.ts";
 
@@ -175,3 +176,26 @@ export function resolvePayload(
 }
 
 export type ResolvedPayload = ReturnType<typeof resolvePayload>;
+
+/**
+ * Parse and validate the optional `output_schema` action input. Returns the
+ * parsed object when present, or `undefined` when absent. Throws on invalid
+ * JSON or non-object payloads — these are workflow-author errors that should
+ * surface immediately, not silently degrade to "no schema".
+ */
+export function resolveOutputSchema(): Record<string, unknown> | undefined {
+  const raw = core.getInput("output_schema");
+  if (!raw) return undefined;
+
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw new Error(`invalid output_schema: not valid JSON`);
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(`invalid output_schema: must be a JSON object`);
+  }
+  log.info("» structured output schema provided — output will be required");
+  return parsed as Record<string, unknown>;
+}

utils/prSummary.ts

@@ -1,5 +1,9 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import type { ToolContext } from "../mcp/server.ts";
+import { apiFetch } from "./apiFetch.ts";
+import { log } from "./cli.ts";
+import { patchWorkflowRunFields } from "./patchWorkflowRunFields.ts";
 
 /**
  * The PR-level summary snapshot is a markdown file the agent edits in place
@@ -76,3 +80,68 @@ export async function readSummaryFile(path: string): Promise<string | null> {
   if (trimmed.length > MAX_SNAPSHOT_LENGTH) return trimmed.slice(0, MAX_SNAPSHOT_LENGTH);
   return trimmed;
 }
+
+/**
+ * Fetch the most recent persisted PR summary snapshot for this PR.
+ * Returns null on first-time PRs, when summary is disabled, or on any error.
+ * Best-effort: a transient API failure should not block the run.
+ */
+export async function fetchPreviousSnapshot(
+  ctx: ToolContext,
+  prNumber: number
+): Promise<string | null> {
+  if (!ctx.githubInstallationToken) return null;
+  try {
+    const response = await apiFetch({
+      path: `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/pr/${prNumber}/summary-comment`,
+      method: "GET",
+      headers: { authorization: `Bearer ${ctx.githubInstallationToken}` },
+      signal: AbortSignal.timeout(10_000),
+    });
+    if (!response.ok) return null;
+    const data = (await response.json()) as { snapshot?: string | null };
+    return typeof data.snapshot === "string" && data.snapshot.length > 0 ? data.snapshot : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Read the agent-edited PR summary tmpfile and persist to
+ * `WorkflowRun.summarySnapshot`.
+ *
+ * Best-effort: any failure is logged and does not affect the run's success
+ * status. Skips the PATCH when the file is byte-identical to its seed —
+ * persisting the seed verbatim would either re-write what the DB already has
+ * (on incremental runs) or serialize the placeholder scaffold (on first
+ * runs), neither of which is useful.
+ *
+ * Funnels through both the success path and the SIGINT/SIGTERM handler;
+ * `summaryPersistAttempted` guards against double-execution.
+ */
+export async function persistSummary(ctx: ToolContext): Promise<void> {
+  const filePath = ctx.toolState.summaryFilePath;
+  if (!filePath) return;
+  if (ctx.toolState.summaryPersistAttempted) return;
+  ctx.toolState.summaryPersistAttempted = true;
+  const snapshot = await readSummaryFile(filePath);
+  if (!snapshot) {
+    log.debug(`pr summary tmpfile missing or invalid at ${filePath} — skipping persist`);
+    return;
+  }
+  // soft gate: agent never touched the seeded file. saving the seed back
+  // is a no-op at best (incremental run — DB already has it) and a bug at
+  // worst (first run — serializes the placeholder italics). log a warning
+  // so the failure mode is visible in CI without flipping the run to
+  // failed.
+  const seed = ctx.toolState.summarySeed?.trim();
+  if (seed !== undefined && snapshot === seed) {
+    log.warning(
+      "» pr summary tmpfile unchanged from seed — skipping persist (agent did not edit it)"
+    );
+    return;
+  }
+  await patchWorkflowRunFields(ctx, { summarySnapshot: snapshot }).catch((err) => {
+    log.debug(`pr summary persist failed: ${err instanceof Error ? err.message : String(err)}`);
+  });
+}

utils/providerErrors.test.ts

@@ -1,4 +1,8 @@
-import { detectProviderError, isRouterKeylimitExhaustedError } from "./providerErrors.ts";
+import {
+  detectProviderError,
+  findProviderErrorMatch,
+  isRouterKeylimitExhaustedError,
+} from "./providerErrors.ts";
 
 describe("detectProviderError", () => {
   describe("false positives previously seen in production", () => {
@@ -66,6 +70,41 @@ describe("detectProviderError", () => {
     });
   });
 
+  describe("billing exhaustion", () => {
+    // see #778 — providers return 401 / 429 for billing/quota exhaustion
+    // (OpenCode Zen `CreditsError` / `FreeUsageLimitError`, Gemini
+    // `RESOURCE_EXHAUSTED` + spending cap, "Insufficient balance"). these
+    // are non-retryable; status-code patterns must NOT win and surface the
+    // misleading "auth error (401)" / "rate limited (429)" labels.
+    it("classifies OpenCode Zen CreditsError as billing exhausted, not 401", () => {
+      const stderr = JSON.stringify({
+        statusCode: 401,
+        responseBody:
+          '{"type":"error","error":{"type":"CreditsError","message":"Insufficient balance. Manage your billing here: https://opencode.ai/workspace/x/billing"}}',
+      });
+      expect(detectProviderError(stderr)).toBe("provider billing exhausted");
+    });
+
+    it("classifies OpenCode Zen FreeUsageLimitError as billing exhausted, not 429", () => {
+      const stderr = JSON.stringify({
+        statusCode: 429,
+        responseBody:
+          '{"type":"error","error":{"type":"FreeUsageLimitError","message":"Rate limit exceeded. Please try again later."}}',
+      });
+      expect(detectProviderError(stderr)).toBe("provider billing exhausted");
+    });
+
+    it("classifies Gemini spending-cap RESOURCE_EXHAUSTED as billing exhausted, not 429", () => {
+      const stderr =
+        'statusCode: 429, body: {"code": 429, "status": "RESOURCE_EXHAUSTED", "message": "Your project has exceeded its monthly spending cap..."}';
+      expect(detectProviderError(stderr)).toBe("provider billing exhausted");
+    });
+
+    it("classifies bare 'Insufficient balance' as billing exhausted", () => {
+      expect(detectProviderError("error: Insufficient balance")).toBe("provider billing exhausted");
+    });
+  });
+
   describe("real provider errors", () => {
     it("detects 429 only when adjacent to a status key", () => {
       expect(detectProviderError('{"statusCode": 429}')).toBe("rate limited (429)");
@@ -116,6 +155,64 @@ describe("detectProviderError", () => {
   });
 });
 
+describe("findProviderErrorMatch", () => {
+  // regression for issue #703: when stderr arrives as a multi-KB buffer
+  // (mcp tool-schema dump + the actual error message), the old
+  // `chunk.substring(0, 500)` excerpt showed the head of the buffer
+  // (schema) instead of the matched error text. the windowed excerpt
+  // must center on the matched line.
+  it("excerpt centers on the matched line, not the head of the buffer", () => {
+    const schemaDump =
+      "{".repeat(2000) +
+      '"name":"pullfrog_create_pull_request_review","description":"Submit a review..."';
+    const errorLine = "ERROR 2026-05-13 service=session error=rate_limit_exceeded retry-after=30";
+    const chunk = `${schemaDump}\n${errorLine}\ncaller stack at handler.ts:42`;
+
+    const match = findProviderErrorMatch(chunk);
+    expect(match).not.toBeNull();
+    expect(match?.label).toBe("rate limited");
+    expect(match?.excerpt).toContain("rate_limit_exceeded");
+    expect(match?.excerpt).toContain("retry-after=30");
+    expect(match?.excerpt).not.toContain("pullfrog_create_pull_request_review");
+  });
+
+  it("includes a small surrounding-line window for stack-trace context", () => {
+    const chunk =
+      "» about to call session.processor\n" +
+      "ERROR rate_limit_exceeded for key=abc\n" +
+      "at handler.ts:42\n" +
+      "at runtime.ts:88";
+    const match = findProviderErrorMatch(chunk);
+    expect(match?.excerpt).toContain("about to call session.processor");
+    expect(match?.excerpt).toContain("rate_limit_exceeded");
+    expect(match?.excerpt).toContain("handler.ts:42");
+    expect(match?.excerpt).toContain("runtime.ts:88");
+  });
+
+  it("falls back to the matched line alone when adjacent lines are huge", () => {
+    const giantPrefix = "x".repeat(5000);
+    const errorLine = '"statusCode": 429, "message": "slow down"';
+    const giantSuffix = "y".repeat(5000);
+    const chunk = `${giantPrefix}\n${errorLine}\n${giantSuffix}`;
+
+    const match = findProviderErrorMatch(chunk);
+    expect(match?.label).toBe("rate limited (429)");
+    expect(match?.excerpt).toBe(errorLine);
+  });
+
+  it("head-truncates the matched line if it alone exceeds the byte cap", () => {
+    const padding = "z".repeat(700);
+    const chunk = `${padding} "statusCode": 429 ${padding}`;
+    const match = findProviderErrorMatch(chunk);
+    expect(match?.label).toBe("rate limited (429)");
+    expect(match?.excerpt.length).toBeLessThanOrEqual(600);
+  });
+
+  it("returns null when no pattern matches", () => {
+    expect(findProviderErrorMatch("just some normal log line\nnothing wrong here")).toBeNull();
+  });
+});
+
 describe("isRouterKeylimitExhaustedError", () => {
   it("matches the canonical OpenRouter mid-run error", () => {
     expect(

utils/providerErrors.ts

@@ -6,6 +6,17 @@ type ProviderErrorPattern = { regex: RegExp; label: string };
 const statusKey = `\\b(?:status[_ ]?code|http[_ ]?status|status)["']?\\s*[:=]\\s*["']?`;
 
 const PROVIDER_ERROR_PATTERNS: ProviderErrorPattern[] = [
+  // billing-payload patterns come BEFORE bare status-code patterns. providers
+  // commonly return 401 / 429 for billing/quota exhaustion (OpenCode Zen
+  // `CreditsError` / `FreeUsageLimitError`, Gemini `RESOURCE_EXHAUSTED` +
+  // "spending cap", Anthropic "Insufficient balance"). these are non-retryable
+  // and require user-billing action — distinct from a transient auth error or
+  // rate-limit. status-code patterns would otherwise win and surface
+  // "auth error (401)" / "rate limited (429)" with no billing hint. see #778.
+  { regex: /\bCreditsError\b/, label: "provider billing exhausted" },
+  { regex: /\bFreeUsageLimitError\b/, label: "provider billing exhausted" },
+  { regex: /Insufficient balance/i, label: "provider billing exhausted" },
+  { regex: /spending cap/i, label: "provider billing exhausted" },
   // auth patterns must come BEFORE rate-limit patterns. OpenRouter 401 error
   // payloads carry `x-ratelimit-*` response headers in the dump, and the
   // free-form rate-limit regex below would otherwise win on word-boundary
@@ -41,13 +52,71 @@ const PROVIDER_ERROR_PATTERNS: ProviderErrorPattern[] = [
   { regex: /["']?\blimit\b["']?\s*:\s*0\b/, label: "zero quota" },
 ];
 
-export function detectProviderError(text: string): string | null {
+/**
+ * Result of a provider-error scan: the classification label plus a
+ * human-readable excerpt centered on the matched line. The excerpt is what
+ * gets surfaced in `» provider error detected (...)` log lines — see
+ * `extractExcerpt` for the windowing/byte-cap policy.
+ */
+export type ProviderErrorMatch = {
+  label: string;
+  excerpt: string;
+};
+
+// roughly half a wide terminal line by 4–5 lines of context; large enough
+// to capture a structured error payload (request id, retry-after, model)
+// plus its immediate stack/headers, small enough to not flood the log.
+const EXCERPT_MAX_BYTES = 600;
+const LINES_BEFORE = 1;
+const LINES_AFTER = 2;
+
+export function findProviderErrorMatch(text: string): ProviderErrorMatch | null {
   for (const entry of PROVIDER_ERROR_PATTERNS) {
-    if (entry.regex.test(text)) return entry.label;
+    const m = entry.regex.exec(text);
+    if (!m) continue;
+    return { label: entry.label, excerpt: extractExcerpt(text, m.index) };
   }
   return null;
 }
 
+export function detectProviderError(text: string): string | null {
+  return findProviderErrorMatch(text)?.label ?? null;
+}
+
+/**
+ * Slice a context window around `matchIndex`: the matched line plus
+ * `LINES_BEFORE`/`LINES_AFTER` neighbours. If the windowed slice exceeds
+ * `EXCERPT_MAX_BYTES` (giant adjacent lines, e.g. JSON tool-schema dumps),
+ * fall back to the matched line alone, head-truncated if still too long.
+ * Replaces the old `chunk.substring(0, 500)` head-anchored excerpt which
+ * surfaced whatever happened to be at the front of the stderr buffer
+ * instead of the error itself. See issue #703.
+ */
+function extractExcerpt(text: string, matchIndex: number): string {
+  const lineStart = text.lastIndexOf("\n", matchIndex - 1) + 1;
+  const lineEndRaw = text.indexOf("\n", matchIndex);
+  const lineEnd = lineEndRaw === -1 ? text.length : lineEndRaw;
+
+  let start = lineStart;
+  for (let i = 0; i < LINES_BEFORE && start > 0; i++) {
+    const prev = text.lastIndexOf("\n", start - 2);
+    start = prev < 0 ? 0 : prev + 1;
+  }
+
+  let end = lineEnd;
+  for (let i = 0; i < LINES_AFTER && end < text.length; i++) {
+    const next = text.indexOf("\n", end + 1);
+    end = next < 0 ? text.length : next;
+  }
+
+  let excerpt = text.slice(start, end);
+  if (excerpt.length > EXCERPT_MAX_BYTES) {
+    excerpt = text.slice(lineStart, lineEnd);
+    if (excerpt.length > EXCERPT_MAX_BYTES) excerpt = excerpt.slice(0, EXCERPT_MAX_BYTES);
+  }
+  return excerpt.trim();
+}
+
 /**
  * OpenRouter's response when the per-run key's remaining budget can't cover
  * the agent's `max_tokens` reservation. Distinct from a generic provider error

utils/proxy.ts

@@ -0,0 +1,235 @@
+/**
+ * Mint an OpenRouter proxy key via `/api/proxy-token` and inject it as
+ * `OPENROUTER_API_KEY` for runs that route through Pullfrog Router (managed
+ * billing accounts) or OSS-grant paths.
+ *
+ * Authenticates one of two ways:
+ *   - production: GitHub Actions OIDC token via `core.getIDToken`
+ *   - local dev (`API_URL` is localhost): `x-dev-repo` header bypass
+ *
+ * `runProxyResolution` is the entrypoint `main.ts` calls. It wraps
+ * `resolveProxyModel` and renders the user-facing copy itself (job summary
+ * + PR progress comment) before rethrowing the structured error — handled
+ * here, not in the outer `main()` catch, because `toolContext` doesn't
+ * exist yet at this point in the pipeline.
+ *
+ *   - 402 → `BillingError` (card declined, balance empty, 3DS, etc.)
+ *   - 503 → `TransientError` (transient sync issue — retry next dispatch)
+ */
+
+import * as core from "@actions/core";
+import type { ToolState } from "../toolState.ts";
+import { apiFetch } from "./apiFetch.ts";
+import { isLocalApiUrl } from "./apiUrl.ts";
+import {
+  BillingError,
+  formatBillingErrorSummary,
+  formatTransientErrorSummary,
+  TransientError,
+} from "./billingErrors.ts";
+import { log, writeSummary } from "./cli.ts";
+import { reportErrorToComment } from "./errorReport.ts";
+import type { ResolvedPayload } from "./payload.ts";
+
+export interface OidcCredentials {
+  requestUrl: string;
+  requestToken: string;
+}
+
+async function mintProxyKey(ctx: {
+  oidcCredentials: OidcCredentials | null;
+  repo: { owner: string; name: string };
+}): Promise<string | null> {
+  try {
+    const headers = await buildProxyTokenHeaders(ctx);
+    if (!headers) return null;
+
+    const response = await apiFetch({
+      path: "/api/proxy-token",
+      method: "POST",
+      headers,
+    });
+
+    if (response.status === 402) {
+      const body = (await response.json().catch(() => null)) as {
+        error?: string;
+        code?: string;
+        declineCode?: string;
+        needsReauthentication?: boolean;
+      } | null;
+      throw new BillingError(body?.error ?? "insufficient balance", {
+        code: body?.code ?? null,
+        declineCode: body?.declineCode ?? null,
+        needsReauthentication: body?.needsReauthentication ?? false,
+      });
+    }
+
+    // 503 = transient sync issue (partial OpenRouter failure, DB flake,
+    // in-flight top-up). Not the user's fault — TransientError renders a
+    // "temporarily unavailable" summary instead of the "billing error"
+    // label that BillingError uses.
+    if (response.status === 503) {
+      const body = (await response.json().catch(() => null)) as { error?: string } | null;
+      throw new TransientError(
+        body?.error ?? "billing service temporarily unavailable — retry shortly"
+      );
+    }
+
+    if (!response.ok) {
+      log.warning(`proxy key mint failed (${response.status})`);
+      return null;
+    }
+
+    const data = (await response.json()) as { key: string };
+    return data.key;
+  } catch (error) {
+    if (error instanceof BillingError) throw error;
+    if (error instanceof TransientError) throw error;
+    log.warning(`proxy key mint error: ${error instanceof Error ? error.message : String(error)}`);
+    return null;
+  } finally {
+    delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
+    delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
+  }
+}
+
+/**
+ * choose how to authenticate the `/api/proxy-token` request:
+ *
+ * - production: mint a fresh OIDC token via `core.getIDToken` and send as
+ *   `Authorization: Bearer …` (the server verifies it cryptographically).
+ * - local dev (no OIDC + `API_URL` is localhost): send `x-dev-repo:
+ *   owner/repo` instead. the server-side route only honors this header
+ *   when `NODE_ENV === "development"`, so prod is never reachable through
+ *   this branch even if the action is misconfigured.
+ *
+ * returns null when neither path is available — caller treats as soft skip.
+ */
+async function buildProxyTokenHeaders(ctx: {
+  oidcCredentials: OidcCredentials | null;
+  repo: { owner: string; name: string };
+}): Promise<Record<string, string> | null> {
+  if (ctx.oidcCredentials) {
+    process.env.ACTIONS_ID_TOKEN_REQUEST_URL = ctx.oidcCredentials.requestUrl;
+    process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = ctx.oidcCredentials.requestToken;
+    const oidcToken = await core.getIDToken("pullfrog-api");
+    delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
+    delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
+    return { Authorization: `Bearer ${oidcToken}` };
+  }
+  if (isLocalApiUrl()) {
+    log.info(`» proxy: dev bypass (x-dev-repo) for ${ctx.repo.owner}/${ctx.repo.name}`);
+    return { "x-dev-repo": `${ctx.repo.owner}/${ctx.repo.name}` };
+  }
+  return null;
+}
+
+/**
+ * Decide whether this run needs a minted proxy key and, if so, mint and
+ * inject it as `OPENROUTER_API_KEY`. Mutates `payload.proxyModel` on success.
+ *
+ * `ctx.proxyModel` IS the signal — the server (`run-context/route.ts`) is
+ * the authority on "should this run use the Router". It already knows the
+ * full picture (OSS, plan, wallet balance, modelAccessMode) and only sets
+ * `proxyModel` when the gate passes. The action just trusts that signal
+ * and mints. Re-deriving the gate locally was redundant and was strictly
+ * more restrictive (no balance check), which made signup-credit runs on
+ * no-card private repos silently fall through to BYOK.
+ *
+ * Skipped when:
+ *   - `PULLFROG_MODEL` env override is set (BYOK escape hatch)
+ *   - `proxyModel` is not set on the run context
+ *   - no OIDC credentials available and not talking to a localhost API
+ *
+ * Throws `BillingError` (402) or `TransientError` (503); caller renders.
+ */
+async function resolveProxyModel(ctx: {
+  payload: ResolvedPayload;
+  oss: boolean;
+  proxyModel?: string | undefined;
+  oidcCredentials: OidcCredentials | null;
+  repo: { owner: string; name: string };
+}): Promise<void> {
+  // env override = BYOK escape hatch, don't proxy
+  if (process.env.PULLFROG_MODEL?.trim()) return;
+
+  if (!ctx.proxyModel) return;
+
+  // dev affordance: when talking to a localhost API, the server-side
+  // x-dev-repo bypass replaces OIDC verification, so a play run can
+  // exercise the proxy/router/oss path without GitHub Actions OIDC.
+  if (!ctx.oidcCredentials && !isLocalApiUrl()) {
+    log.warning("» proxy requested but no OIDC credentials available — skipping");
+    return;
+  }
+
+  const key = await mintProxyKey({ oidcCredentials: ctx.oidcCredentials, repo: ctx.repo });
+  if (!key) return;
+
+  process.env.OPENROUTER_API_KEY = key;
+  core.setSecret(key);
+  ctx.payload.proxyModel = ctx.proxyModel;
+  const label = ctx.oss ? "oss" : "router";
+  log.info(`» proxy: ${label} → ${ctx.proxyModel}`);
+}
+
+/**
+ * Run `resolveProxyModel`; if it throws a Billing or Transient error, render
+ * the user-facing summary, mirror it to the PR progress comment, and rethrow.
+ *
+ * The rethrow is intentional: these errors are terminal for the run, and
+ * letting them surface lets `runMain` exit non-zero so GH Actions applies
+ * the workflow's retry policy. We catch them *here* (before the main try)
+ * because the outer catch needs `toolContext` (which isn't built yet) for
+ * its general-purpose rendering path — a BillingError landing in the outer
+ * catch would get rendered with `core.setFailed` only, losing the
+ * actionable copy + the PR-comment mirror.
+ */
+export async function runProxyResolution(ctx: {
+  payload: ResolvedPayload;
+  oss: boolean;
+  proxyModel?: string | undefined;
+  oidcCredentials: OidcCredentials | null;
+  repo: { owner: string; name: string };
+  toolState: ToolState;
+}): Promise<void> {
+  try {
+    await resolveProxyModel({
+      payload: ctx.payload,
+      oss: ctx.oss,
+      proxyModel: ctx.proxyModel,
+      oidcCredentials: ctx.oidcCredentials,
+      repo: ctx.repo,
+    });
+  } catch (error) {
+    if (error instanceof BillingError) {
+      const summary = formatBillingErrorSummary(error, ctx.repo.owner);
+      await writeSummary(summary).catch(() => {});
+      // Mirror to the PR progress comment if the trigger created one (mention /
+      // PR event). When the trigger is silent (IncrementalReview on
+      // pull_request_synchronize), no progress comment exists; fall through to
+      // creating a fresh issue comment so the user actually sees the
+      // billing-exhaustion remediation copy. Without `createIfMissing`,
+      // auto-reload declines on silent triggers are visible only in the GH job
+      // summary, which most users never open — so back-to-back pushes silently
+      // burn through dispatches with no PR-side signal. see #775.
+      await reportErrorToComment({
+        toolState: ctx.toolState,
+        error: summary,
+        createIfMissing: true,
+      }).catch(() => {});
+      throw error;
+    }
+    if (error instanceof TransientError) {
+      const summary = formatTransientErrorSummary(error, ctx.repo.owner);
+      await writeSummary(summary).catch(() => {});
+      await reportErrorToComment({
+        toolState: ctx.toolState,
+        error: summary,
+        createIfMissing: true,
+      }).catch(() => {});
+      throw error;
+    }
+    throw error;
+  }
+}

utils/runContext.ts

@@ -48,15 +48,6 @@ export interface RepoSettings {
  */
 export type AccountPlan = "none" | "payg";
 
-/**
- * "Is Pullfrog absorbing marginal infra cost for this repo?" — composite
- * predicate over the two orthogonal dimensions (repo-level OSS, account-level
- * plan). Mirrors `isInfraCovered` in the server's `utils/billing.ts`.
- */
-export function isInfraCovered(params: { isOss: boolean; plan: AccountPlan }): boolean {
-  return params.isOss || params.plan === "payg";
-}
-
 export interface RunContext {
   settings: RepoSettings;
   apiToken: string;

utils/runErrorRenderer.ts

@@ -0,0 +1,97 @@
+/**
+ * Classify + render the error thrown out of the main run try-block into a
+ * pair of user-facing markdown bodies — one for the GitHub Actions job
+ * summary tab, one for the PR progress comment.
+ *
+ * Four classifications, in priority order:
+ *
+ *   1. `BillingError` — either the proxy-token mint already threw one (402
+ *      handled inline) or the agent runtime surfaced an OpenRouter
+ *      "key budget exhausted" string mid-run. Both render via
+ *      `formatBillingErrorSummary` so the user sees actionable copy.
+ *
+ *   2. Activity-timeout hang — `errorMessage` starts with
+ *      `"activity timeout"` or `"agent still pending"`. The harness keeps
+ *      structured diagnostic state on `toolState.agentDiagnostic`;
+ *      `formatAgentHangBody` renders that as a markdown block.
+ *
+ *   3. API-key auth error — `isApiKeyAuthError` sniffs the raw error string;
+ *      `formatApiKeyErrorSummary` renders provider + console-link copy.
+ *
+ *   4. Default — a generic `❌ Pullfrog failed` block with the raw error
+ *      message in a fenced code block. Same body for both surfaces.
+ *
+ * The hang body and the API-key body diverge between the two surfaces only
+ * in that the job summary wraps them in the `### ❌ Pullfrog failed` H3
+ * banner; the PR comment uses the bare body since it already has Pullfrog
+ * branding in its footer.
+ */
+
+import type { AgentDiagnostic } from "./agentHangReport.ts";
+import { formatAgentHangBody } from "./agentHangReport.ts";
+import { formatApiKeyErrorSummary, isApiKeyAuthError } from "./apiKeys.ts";
+import { BillingError, formatBillingErrorSummary } from "./billingErrors.ts";
+import { isRouterKeylimitExhaustedError } from "./providerErrors.ts";
+
+export type RenderedRunError = {
+  summary: string;
+  comment: string;
+};
+
+export function renderRunError(input: {
+  errorMessage: string;
+  repo: { owner: string; name: string };
+  agentDiagnostic: AgentDiagnostic | undefined;
+}): RenderedRunError {
+  // reclassify mid-run OpenRouter "key budget exhausted" as BillingError so
+  // the user gets the same actionable copy as a /api/proxy-token 402.
+  const billingError = isRouterKeylimitExhaustedError(input.errorMessage)
+    ? new BillingError(input.errorMessage, { code: "router_keylimit_exhausted" })
+    : null;
+
+  if (billingError) {
+    const body = formatBillingErrorSummary(billingError, input.repo.owner);
+    return { summary: body, comment: body };
+  }
+
+  // gated on isHang because the harness sets `agentDiagnostic` on entry, so
+  // any non-hang throw that hits the outer catch (e.g. post-success
+  // output_schema validator, or a late cleanup throw after the run already
+  // succeeded) would otherwise render "Pullfrog failed" with stale event
+  // counts and silently drop the real errorMessage.
+  const isHang =
+    input.errorMessage.startsWith("activity timeout") ||
+    input.errorMessage.startsWith("agent still pending");
+  const hangBody = isHang
+    ? formatAgentHangBody({
+        diagnostic: input.agentDiagnostic,
+        isHang: true,
+        errorMessage: input.errorMessage,
+      })
+    : null;
+
+  const apiKeySource = hangBody ?? input.errorMessage;
+  const apiKeyErrorSummary = isApiKeyAuthError(apiKeySource)
+    ? formatApiKeyErrorSummary({
+        owner: input.repo.owner,
+        name: input.repo.name,
+        raw: apiKeySource,
+      })
+    : null;
+
+  if (apiKeyErrorSummary) {
+    return { summary: apiKeyErrorSummary, comment: apiKeyErrorSummary };
+  }
+
+  if (hangBody) {
+    return {
+      summary: `### ❌ Pullfrog failed\n\n${hangBody}`,
+      comment: hangBody,
+    };
+  }
+
+  return {
+    summary: `### ❌ Pullfrog failed\n\n\`\`\`\n${input.errorMessage}\n\`\`\``,
+    comment: input.errorMessage,
+  };
+}

utils/runFixture.ts

@@ -0,0 +1,76 @@
+// in-process fixture runner used by `play.ts` (and any future host-side
+// runner). does NOT know about Docker — that's `docker.ts`'s job. when run
+// inside the local docker container, this is what executes after the entrypoint.
+import { execSync } from "node:child_process";
+import { mkdtemp } from "node:fs/promises";
+import { devNull, tmpdir } from "node:os";
+import { join } from "node:path";
+import type { AgentResult } from "../agents/shared.ts";
+import { type Inputs, main } from "../main.ts";
+import { log } from "./cli.ts";
+import { ensureGitHubToken } from "./github.ts";
+import { setupTestRepo } from "./setup.ts";
+
+export async function run(inputsOrPrompt: Inputs | string): Promise<AgentResult> {
+  await ensureGitHubToken();
+
+  // play.ts is a CI-emulator — isolate it from the developer's user- and
+  // system-scope gitconfig so checks like `validatePushDestination` see the
+  // raw stored remote URL instead of values mutated by `url.*.insteadOf`
+  // rewrites (a common SSH-auth convenience on dev boxes). CI runners have
+  // empty gitconfigs so this is a no-op there; locally it makes `pnpm play`
+  // and real runs produce identical git state. `os.devNull` canonicalizes
+  // the null device across Unix (`/dev/null`) and Windows (`\\.\nul`).
+  process.env.GIT_CONFIG_GLOBAL = devNull;
+  process.env.GIT_CONFIG_SYSTEM = devNull;
+
+  const tempParent = await mkdtemp(join(tmpdir(), "pullfrog-play-"));
+  const tempDir = join(tempParent, "repo");
+  const originalCwd = process.cwd();
+
+  try {
+    setupTestRepo({ tempDir });
+    process.chdir(tempDir);
+
+    // optional pre-agent setup (e.g. seed symlinks for adversarial fixtures).
+    if (process.env.PULLFROG_TEST_REPO_SETUP) {
+      log.info("» running repo setup commands...");
+      execSync(process.env.PULLFROG_TEST_REPO_SETUP, { cwd: tempDir, stdio: "pipe" });
+    }
+
+    // tell main() to use the cloned tempDir instead of the GHA workspace path.
+    process.env.GITHUB_WORKSPACE = tempDir;
+
+    const inputs: Inputs =
+      typeof inputsOrPrompt === "string" ? { prompt: inputsOrPrompt } : inputsOrPrompt;
+
+    for (const [key, value] of Object.entries(inputs)) {
+      if (value !== undefined && value !== null) {
+        process.env[`INPUT_${key.toUpperCase()}`] = String(value);
+      }
+    }
+
+    const result: AgentResult = await main();
+    process.chdir(originalCwd);
+
+    if (result.success) {
+      log.success("Action completed successfully");
+      return { success: true, output: result.output || undefined, error: undefined };
+    }
+    log.error(`Action failed: ${result.error || "Unknown error"}`);
+    return { success: false, error: result.error || undefined, output: undefined };
+  } catch (err) {
+    const errorMessage = (err as Error).message;
+    log.error(`Error: ${errorMessage}`);
+    return { success: false, error: errorMessage, output: undefined };
+  } finally {
+    process.chdir(originalCwd);
+    // sandbox isolation may create files with non-host ownership; rmSync
+    // can't always delete those, so escalate.
+    try {
+      execSync(`sudo rm -rf "${tempParent}"`, { stdio: "ignore" });
+    } catch {
+      // best-effort cleanup.
+    }
+  }
+}

utils/runLifecycle.ts

@@ -0,0 +1,151 @@
+/**
+ * End-of-run cleanup phases extracted out of `main.ts`. Three shapes:
+ *
+ *   - `persistRunArtifacts`: best-effort post-review cleanup + summary +
+ *     learnings persistence. Shared by both the success path and the
+ *     error-catch path; idempotent (each step has its own guard against
+ *     double-execution).
+ *
+ *   - `finalizeSuccessRun`: success-only — calls `persistRunArtifacts`
+ *     first, then surfaces harness-side failures in the progress comment,
+ *     deletes stranded progress comments, writes the GitHub Actions job
+ *     summary, and emits the structured output marker.
+ *
+ *   - `writeRunErrorOutputs`: error-only — writes the rendered error
+ *     summary to the Actions summary tab and mirrors it to the PR
+ *     progress comment. The catch path calls this and then
+ *     `persistRunArtifacts` separately so the rendered error lands before
+ *     the persistence calls, in case the latter throw.
+ *
+ * All three swallow their own non-fatal errors (`log.debug` or empty
+ * `catch {}`) so a cleanup failure can't flip an already-decided run
+ * outcome.
+ */
+
+import * as core from "@actions/core";
+import type { AgentResult } from "../agents/shared.ts";
+import { deleteProgressComment } from "../mcp/comment.ts";
+import type { ToolContext } from "../mcp/server.ts";
+import type { ToolState } from "../toolState.ts";
+import { formatApiKeyErrorSummary, isApiKeyAuthError } from "./apiKeys.ts";
+import { formatUsageSummary, log, writeSummary } from "./cli.ts";
+import { reportErrorToComment } from "./errorReport.ts";
+import { persistLearnings } from "./learnings.ts";
+import { persistSummary } from "./prSummary.ts";
+import { postReviewCleanup } from "./reviewCleanup.ts";
+import type { RenderedRunError } from "./runErrorRenderer.ts";
+
+/**
+ * Best-effort cleanup shared by both run-end paths:
+ *   1. post-review cleanup (dispatch follow-up re-review on submitted reviews)
+ *   2. persist the agent-edited PR summary tmpfile
+ *   3. persist the agent-edited repo-level learnings tmpfile
+ *
+ * Each step is idempotent and swallows its own errors. Safe to call from
+ * both `main()`'s success path and its catch path.
+ */
+export async function persistRunArtifacts(toolContext: ToolContext): Promise<void> {
+  await postReviewCleanup(toolContext).catch((error) => {
+    log.debug(`post-review cleanup failed: ${error}`);
+  });
+  await persistSummary(toolContext);
+  await persistLearnings(toolContext);
+}
+
+/**
+ * Run the success-path cleanup waterfall:
+ *
+ *   1. shared best-effort cleanup via `persistRunArtifacts`
+ *   2. when the harness returned `success=false` (e.g. unsubmitted-review
+ *      gate exhausted retries, stop-hook persistently failing), surface
+ *      the error in the progress comment so the user sees it instead of a
+ *      deleted-comment void
+ *   3. when the run succeeded and the progress comment was never finalized
+ *      via `report_progress`, delete it (three sub-cases — orphan
+ *      "Leaping into action" comment, abandoned checklist, agent wrote
+ *      a substantive artifact via another MCP write tool but skipped
+ *      report_progress)
+ *   4. write the GitHub Actions step summary (best-effort — a write
+ *      failure must not throw past this point because we'd hit the outer
+ *      catch and clobber any progress comment we just wrote)
+ *   5. emit the structured output marker for tests + workflow consumers
+ */
+export async function finalizeSuccessRun(input: {
+  toolContext: ToolContext;
+  toolState: ToolState;
+  result: AgentResult;
+  repo: { owner: string; name: string };
+}): Promise<void> {
+  await persistRunArtifacts(input.toolContext);
+
+  if (!input.result.success && input.toolState.progressComment) {
+    const rawError = input.result.error || "agent run failed";
+    const errorBody = isApiKeyAuthError(rawError)
+      ? formatApiKeyErrorSummary({
+          owner: input.repo.owner,
+          name: input.repo.name,
+          raw: rawError,
+        })
+      : rawError;
+    await reportErrorToComment({ toolState: input.toolState, error: errorBody }).catch((error) => {
+      log.debug(`failure error report failed: ${error}`);
+    });
+  }
+
+  // create_pull_request_review owns its own deletion (see mcp/review.ts), so
+  // progressComment is already null by the time we get here for that path.
+  // uses finalSummaryWritten (not todoTracker.enabled or wasUpdated) so
+  // cleanup survives API failures in report_progress where cancel() ran but
+  // the write didn't succeed, and isn't fooled by writes to *other* artifacts.
+  if (
+    input.result.success &&
+    input.toolState.progressComment &&
+    !input.toolState.finalSummaryWritten
+  ) {
+    await deleteProgressComment(input.toolContext).catch((error) => {
+      log.debug(`stranded progress comment cleanup failed: ${error}`);
+    });
+  }
+
+  try {
+    const usageSummary = formatUsageSummary(input.toolState.usageEntries);
+    const body = input.toolState.lastProgressBody || input.result.output;
+    const parts = [body, usageSummary].filter(Boolean);
+    if (parts.length > 0) {
+      await writeSummary(parts.join("\n\n"));
+    }
+  } catch (error) {
+    log.debug(`job summary write failed: ${error}`);
+  }
+
+  if (input.toolState.output) {
+    log.info(`::pullfrog-output::${Buffer.from(input.toolState.output).toString("base64")}`);
+    core.setOutput("result", input.toolState.output);
+  }
+}
+
+/**
+ * Write the rendered error to the GitHub Actions job summary tab + mirror
+ * to the PR progress comment when one exists. Catch path only.
+ *
+ * `lastProgressBody` and the usage table are appended to the summary so the
+ * partial work the agent did before failing isn't lost.
+ */
+export async function writeRunErrorOutputs(input: {
+  rendered: RenderedRunError;
+  toolState: ToolState;
+}): Promise<void> {
+  try {
+    const usageSummary = formatUsageSummary(input.toolState.usageEntries);
+    const parts = [input.rendered.summary, input.toolState.lastProgressBody, usageSummary].filter(
+      Boolean
+    );
+    await writeSummary(parts.join("\n\n"));
+  } catch {}
+
+  try {
+    await reportErrorToComment({ toolState: input.toolState, error: input.rendered.comment });
+  } catch {
+    // error reporting failed, but don't let it mask the original error
+  }
+}

utils/runStartupLog.ts

@@ -0,0 +1,61 @@
+/**
+ * Startup log formatting for the resolver pipeline. Computes the
+ * "model / agent / push / shell / timeout" block that main.ts prints
+ * after resolving the agent + model + payload.
+ */
+
+import { log } from "./cli.ts";
+import type { ResolvedPayload } from "./payload.ts";
+import { TIMEOUT_DISABLED } from "./time.ts";
+
+function resolveTimeoutForLog(timeout: string | undefined): string {
+  if (!timeout) return "1h (default)";
+  if (timeout === TIMEOUT_DISABLED) return "none (disabled)";
+  return timeout;
+}
+
+function resolveModelForLog(ctx: {
+  payload: ResolvedPayload;
+  resolvedModel: string | undefined;
+}): string {
+  const envModel = process.env.PULLFROG_MODEL?.trim();
+  if (envModel) return `${envModel} (override via PULLFROG_MODEL)`;
+  if (ctx.payload.proxyModel) return `${ctx.payload.proxyModel} (proxy)`;
+  if (ctx.resolvedModel && ctx.payload.model && ctx.payload.model !== ctx.resolvedModel) {
+    return `${ctx.resolvedModel} (resolved from ${ctx.payload.model})`;
+  }
+  if (ctx.resolvedModel) return ctx.resolvedModel;
+  if (ctx.payload.model) return `${ctx.payload.model} (unresolved)`;
+  return "auto";
+}
+
+function resolveAgentForLog(ctx: { agentName: string; resolvedModel: string | undefined }): string {
+  const envAgent = process.env.PULLFROG_AGENT?.trim();
+  if (envAgent && envAgent === ctx.agentName) {
+    return `${ctx.agentName} (override via PULLFROG_AGENT)`;
+  }
+  if (ctx.agentName === "claude" && ctx.resolvedModel) {
+    return `${ctx.agentName} (auto-selected for ${ctx.resolvedModel})`;
+  }
+  return ctx.agentName;
+}
+
+/**
+ * Emit the startup block ("» model / agent / push / shell / timeout") after
+ * the agent and model are resolved. Single side-effect; no return.
+ */
+export function logRunStartup(ctx: {
+  payload: ResolvedPayload;
+  resolvedModel: string | undefined;
+  agentName: string;
+}): void {
+  log.info(
+    `» model:   ${resolveModelForLog({ payload: ctx.payload, resolvedModel: ctx.resolvedModel })}`
+  );
+  log.info(
+    `» agent:   ${resolveAgentForLog({ agentName: ctx.agentName, resolvedModel: ctx.resolvedModel })}`
+  );
+  log.info(`» push:    ${ctx.payload.push}`);
+  log.info(`» shell:   ${ctx.payload.shell}`);
+  log.info(`» timeout: ${resolveTimeoutForLog(ctx.payload.timeout)}`);
+}

utils/shell.ts

@@ -86,8 +86,16 @@ export function $(cmd: string, args: string[], options?: ShellOptions): string {
       return stdout.trim();
     }
 
+    // many git subcommands write context-bearing diagnostics to stdout, not
+    // stderr (merge conflicts, cherry-pick rejections, diff --exit-code,
+    // ls-files --error-unmatch). Falling back to "Unknown error" robbed the
+    // agent of any signal and forced an extra MCP round-trip. see #766.
+    const detail = [stderr, stdout]
+      .map((s) => s.trim())
+      .filter(Boolean)
+      .join("\n");
     throw new Error(
-      `Command failed with exit code ${errorResult.status}: ${stderr || "Unknown error"}`
+      `Command failed with exit code ${errorResult.status}: ${detail || "Unknown error"}`
     );
   }