pullfrog 0.1.59 → 0.1.60

package/dist/agents/shared.d.ts

@@ -120,6 +120,13 @@ export interface AgentRunContext {
      * server) so lingering SSE reconnects don't keep the outer timer alive.
      */
     onActivityTimeout?: (() => void) | undefined;
+    /**
+     * called when an aborted turn actually comes back and the harness intends to
+     * keep going. stands down the safety-net timer `onActivityTimeout` armed, so
+     * it only ever guards the window where an abort might have been ignored
+     * rather than force-exiting a run mid-salvage. see #1085.
+     */
+    onTurnRecovered?: (() => void) | undefined;
     onToolUse?: ((event: AgentToolUseEvent) => void) | undefined;
     /**
      * Pullfrog API JWT scoped to this run. agents only need this when they

package/dist/cli.mjs

@@ -106587,6 +106587,11 @@ var DEFAULT_ACTIVITY_TIMEOUT_MS = 3e5;
 var AGENT_ACTIVITY_TIMEOUT_MS = 9e5;
 var AGENT_FIRST_EVENT_TIMEOUT_MS = 12e4;
 var DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5e3;
+function watchdogBudgetMs(compiled, envVar) {
+  const raw2 = Number(process.env[envVar]);
+  if (!Number.isFinite(raw2) || raw2 <= 0) return compiled;
+  return Math.min(compiled, raw2);
+}
 var DEBUG_TS_PREFIX = /^(?:\[\d{4}-\d{2}-\d{2}T[^\]]+\]\s+)?/.source;
 var ACTIVITY_NOISE_PATTERNS = [
   new RegExp(`${DEBUG_TS_PREFIX}\\[mcp-proxy\\]`),
@@ -107350,7 +107355,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.59",
+  version: "0.1.60",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -109459,7 +109464,7 @@ var claude = agent({
       if ((isBedrockRoute || isVertexRoute2) && specifier && effort.alias?.effort) {
         applyHostedEffortCapabilities({ env: env2, modelId: specifier, levels: effort.alias.effort });
       }
-      if (env2.CLAUDE_CODE_OAUTH_TOKEN && !isBedrockRoute && env2.ANTHROPIC_API_KEY) {
+      if (env2.CLAUDE_CODE_OAUTH_TOKEN && !isBedrockRoute && !isVertexRoute2 && !env2.ANTHROPIC_BASE_URL && !env2.ANTHROPIC_AUTH_TOKEN && env2.ANTHROPIC_API_KEY) {
         const preflight = await preflightClaudeSubscription({
           token: env2.CLAUDE_CODE_OAUTH_TOKEN,
           model
@@ -116277,6 +116282,7 @@ function processTerminalToolPart(ctx, part, label, isOrchestrator) {
   const callLine = inputFormatted !== "{}" ? `\xBB ${toolName}(${inputFormatted})` : `\xBB ${toolName}()`;
   log2.info(withLabel(label, callLine));
   if (isOrchestrator) ctx.loggedToolCallIDs.add(toolId);
+  if (isOrchestrator && toolName.startsWith("pullfrog_")) ctx.mcpToolCalls++;
   if (state.status === "completed") {
     log2.debug(withLabel(label, `  output: ${state.output}`));
   } else {
@@ -116515,21 +116521,28 @@ function formatConfigError(name, data) {
   ).join("");
   return `${name}${detail}${bullets}`;
 }
+var WATCHDOG_SALVAGE_PROMPT = "Your previous turn was cut off mid-response by a provider stall. Nothing you had not already submitted through a tool was saved. Continue from where you stopped and submit your work now \u2014 do not restart your analysis.";
 function startInnerActivityWatchdog(params) {
   let fired = false;
+  let everFired = false;
   const id = setInterval(() => {
     if (fired) return;
     const idleMs = performance7.now() - params.ctx.lastEventAt;
-    const budgetMs = params.ctx.sawModelOutput ? params.timeoutMs : AGENT_FIRST_EVENT_TIMEOUT_MS;
+    const compiledMs = params.ctx.sawModelOutput ? params.timeoutMs : AGENT_FIRST_EVENT_TIMEOUT_MS;
+    const budgetMs = everFired ? compiledMs : watchdogBudgetMs(
+      compiledMs,
+      params.ctx.sawModelOutput ? "PULLFROG_E2E_ACTIVITY_TIMEOUT_MS" : "PULLFROG_E2E_FIRST_EVENT_TIMEOUT_MS"
+    );
     if (idleMs <= budgetMs) return;
     fired = true;
+    everFired = true;
     const idleSec = Math.round(idleMs / 1e3);
     params.ctx.diagnostic.idleSec = idleSec;
     params.ctx.diagnostic.sawModelOutput = params.ctx.sawModelOutput;
     log2.info(
       params.ctx.sawModelOutput ? `\xBB no opencode events for ${idleSec}s \u2014 aborting in-flight prompt and notifying harness` : `\xBB no opencode events for ${idleSec}s \u2014 the provider never returned a first token; aborting in-flight prompt and notifying harness`
     );
-    params.abortController.abort();
+    params.abortTurn();
     try {
       params.ctx.onActivityTimeout?.();
     } catch (err) {
@@ -116539,7 +116552,22 @@ function startInnerActivityWatchdog(params) {
     }
   }, 5e3);
   id.unref?.();
-  return { stop: () => clearInterval(id) };
+  return {
+    stop: () => clearInterval(id),
+    /**
+     * Start a turn's idle budget from now. The clock must be reset with the
+     * latch: `lastEventAt` only advances on model output, so a turn following a
+     * stall would inherit the full stalled interval and be aborted on the very
+     * next 5s tick — killing the salvage before the provider could answer. It
+     * is the right semantics for an ordinary resume too, whose budget should
+     * not be pre-spent by the post-run gate checks that ran between turns.
+     */
+    armForTurn: () => {
+      fired = false;
+      params.ctx.lastEventAt = performance7.now();
+    },
+    firedThisTurn: () => fired
+  };
 }
 var opencode = agent({
   name: "opencode",
@@ -116651,6 +116679,7 @@ var opencode = agent({
         variant: effort.rung,
         todoTracker: ctx.todoTracker,
         onActivityTimeout: ctx.onActivityTimeout,
+        onTurnRecovered: ctx.onTurnRecovered,
         onToolUse: ctx.onToolUse,
         currentTurn: null,
         eventCount: 0,
@@ -116659,6 +116688,7 @@ var opencode = agent({
         promptMessageID: void 0,
         taskDispatchByCallID: /* @__PURE__ */ new Map(),
         loggedToolCallIDs: /* @__PURE__ */ new Set(),
+        mcpToolCalls: 0,
         recentStderr: server.recentStderr,
         diagnostic: {
           label: "Pullfrog",
@@ -116682,9 +116712,14 @@ var opencode = agent({
           }
         }
       });
-      const abortController = new AbortController();
-      const eventLoopPromise = consumeEvents(runnerCtx, abortController.signal).catch((err) => {
-        if (!abortController.signal.aborted) {
+      const runController = new AbortController();
+      let turnController = new AbortController();
+      const nextTurnSignal = () => {
+        turnController = new AbortController();
+        return AbortSignal.any([runController.signal, turnController.signal]);
+      };
+      const eventLoopPromise = consumeEvents(runnerCtx, runController.signal).catch((err) => {
+        if (!runController.signal.aborted) {
           log2.warning(
             `\xBB opencode event subscription ended: ${err instanceof Error ? err.message : String(err)}`
           );
@@ -116700,31 +116735,48 @@ var opencode = agent({
         // a long synchronous tool call (no part.updated while it runs) can't
         // false-positive it.
         timeoutMs: AGENT_ACTIVITY_TIMEOUT_MS,
-        abortController
+        abortTurn: () => turnController.abort()
       });
       const sdkModel = parseModel2(model);
+      let salvagesLeft = 1;
+      const runTurn = async (text) => {
+        const attempt = (prompt) => {
+          watchdog.armForTurn();
+          return runTurnGuarded(
+            runnerCtx,
+            () => runPromptTurn(runnerCtx, { text: prompt, model: sdkModel, signal: nextTurnSignal() })
+          );
+        };
+        const standDownIfRecovered = (turn) => {
+          if (watchdog.firedThisTurn() && turn.success) ctx.onTurnRecovered?.();
+          return turn;
+        };
+        const result = await attempt(text);
+        if (!watchdog.firedThisTurn()) return result;
+        if (result.success) return standDownIfRecovered(result);
+        if (salvagesLeft <= 0) return result;
+        salvagesLeft--;
+        ctx.onTurnRecovered?.();
+        log2.info("\xBB activity watchdog cut the turn off \u2014 re-prompting once on the same session");
+        const mcpCallsBefore = runnerCtx.mcpToolCalls;
+        const salvaged = await attempt(WATCHDOG_SALVAGE_PROMPT);
+        const usage = mergeAgentUsage(result.usage, salvaged.usage);
+        if (runnerCtx.mcpToolCalls === mcpCallsBefore) {
+          log2.info(
+            "\xBB salvage turn reached no Pullfrog tool \u2014 keeping the activity-timeout failure"
+          );
+          return { ...result, usage };
+        }
+        return standDownIfRecovered({ ...salvaged, usage });
+      };
       try {
-        const initial = await runTurnGuarded(
-          runnerCtx,
-          () => runPromptTurn(runnerCtx, {
-            text: ctx.instructions.full,
-            model: sdkModel,
-            signal: abortController.signal
-          })
-        );
+        const initial = await runTurn(ctx.instructions.full);
         const result = await runPostRunRetryLoop({
           ctx,
           initialResult: initial,
           initialUsage: initial.usage,
           reflectionPrompt: buildReflectionPrompt(ctx.toolState),
-          resume: async (c2) => runTurnGuarded(
-            runnerCtx,
-            () => runPromptTurn(runnerCtx, {
-              text: c2.prompt,
-              model: sdkModel,
-              signal: abortController.signal
-            })
-          )
+          resume: async (c2) => runTurn(c2.prompt)
         });
         if (result.success) {
           await ctx.todoTracker?.flush();
@@ -116734,7 +116786,7 @@ var opencode = agent({
         return result;
       } finally {
         watchdog.stop();
-        abortController.abort();
+        runController.abort();
         await eventLoopPromise.catch(() => {
         });
       }
@@ -194525,7 +194577,7 @@ function hasEnvVar2(name) {
   return typeof val === "string" && val.length > 0;
 }
 function hasClaudeCodeAuth() {
-  return hasEnvVar2("CLAUDE_CODE_OAUTH_TOKEN") || hasEnvVar2("ANTHROPIC_API_KEY");
+  return hasEnvVar2("CLAUDE_CODE_OAUTH_TOKEN") || hasEnvVar2("ANTHROPIC_API_KEY") || hasEnvVar2("ANTHROPIC_AUTH_TOKEN");
 }
 function hasCodexAuth() {
   return hasEnvVar2("CODEX_AUTH_JSON") || hasEnvVar2("OPENAI_API_KEY");
@@ -194618,8 +194670,11 @@ function resolveAgent(ctx) {
     } catch {
     }
   }
-  if (!ctx.model && ctx.codexAgent && hasCodexAuth() && !hasClaudeCodeAuth()) {
-    return agents.codex;
+  if (!ctx.model) {
+    if (hasEnvVar2("ANTHROPIC_AUTH_TOKEN") && !hasEnvVar2("ANTHROPIC_API_KEY") && !hasEnvVar2("CLAUDE_CODE_OAUTH_TOKEN")) {
+      return agents.claude;
+    }
+    if (ctx.codexAgent && hasCodexAuth() && !hasClaudeCodeAuth()) return agents.codex;
   }
   return agents.opencode;
 }
@@ -194805,7 +194860,7 @@ function hasSingleProviderAuth(agentName) {
   if (agentName === "codex") {
     return hasEnvVar3("OPENAI_API_KEY") || hasEnvVar3("CODEX_AUTH_JSON");
   }
-  return hasEnvVar3("ANTHROPIC_API_KEY") || hasEnvVar3("CLAUDE_CODE_OAUTH_TOKEN");
+  return hasEnvVar3("ANTHROPIC_API_KEY") || hasEnvVar3("ANTHROPIC_AUTH_TOKEN") || hasEnvVar3("CLAUDE_CODE_OAUTH_TOKEN");
 }
 function validateAgentApiKey(params) {
   if (params.model) {
@@ -195137,7 +195192,8 @@ var PROBES = {
     request: (value2) => ({
       url: "https://api.anthropic.com/v1/models",
       headers: { "x-api-key": value2, "anthropic-version": "2023-06-01" }
-    })
+    }),
+    hostConfigurable: true
   },
   OPENROUTER_API_KEY: {
     request: (value2) => ({
@@ -195186,12 +195242,18 @@ function hasEnvVar4(name) {
   const value2 = process.env[name];
   return typeof value2 === "string" && value2.length > 0;
 }
+var HOST_OVERRIDES = {
+  ANTHROPIC_API_KEY: "ANTHROPIC_BASE_URL",
+  CLAUDE_CODE_OAUTH_TOKEN: "ANTHROPIC_BASE_URL"
+};
 function envVarsFor(model) {
   return model.includes("/") ? getModelEnvVars(model) : [];
 }
 async function checkOne(params) {
   const value2 = process.env[params.envVar];
   if (!value2) return null;
+  const hostOverride = HOST_OVERRIDES[params.envVar];
+  if (hostOverride && hasEnvVar4(hostOverride)) return null;
   if (params.envVar === "CLAUDE_CODE_OAUTH_TOKEN") {
     const preflight = await preflightClaudeSubscription({
       token: value2,
@@ -198424,16 +198486,14 @@ ${instructions.user}` : null,
         const onInnerActivityTimeout = () => {
           if (innerTimeoutFired) return;
           innerTimeoutFired = true;
-          log2.info(
-            "\xBB inner activity timeout fired \u2014 stopping MCP server and starting 5min safety-net timer"
-          );
-          mcpHttpServer[Symbol.asyncDispose]().catch((err) => {
-            log2.debug(
-              `mcp server stop after inner kill failed: ${err instanceof Error ? err.message : String(err)}`
-            );
-          });
+          log2.info("\xBB inner activity timeout fired \u2014 starting 5min safety-net timer");
           safetyNetTimer = setTimeout(
             () => {
+              mcpHttpServer[Symbol.asyncDispose]().catch((err) => {
+                log2.debug(
+                  `mcp server stop after inner kill failed: ${err instanceof Error ? err.message : String(err)}`
+                );
+              });
               activityTimeout?.forceReject(
                 "agent still pending 5min after inner activity kill \u2014 forcing exit"
               );
@@ -198442,6 +198502,13 @@ ${instructions.user}` : null,
           );
           safetyNetTimer.unref?.();
         };
+        const onTurnRecovered = () => {
+          if (!innerTimeoutFired) return;
+          innerTimeoutFired = false;
+          if (safetyNetTimer) clearTimeout(safetyNetTimer);
+          safetyNetTimer = void 0;
+          log2.info("\xBB inner activity safety net stood down \u2014 turn recovered");
+        };
         const agentPromise = agent2.run({
           payload,
           resolvedModel,
@@ -198462,6 +198529,7 @@ ${instructions.user}` : null,
           toolState,
           apiToken: runContext.apiToken,
           onActivityTimeout: onInnerActivityTimeout,
+          onTurnRecovered,
           onToolUse: (event) => {
             const wasTracked = recordDiffReadFromToolUse({
               state: primaryRepoState(toolState).diffCoverage,
@@ -198735,34 +198803,6 @@ var PULLFROG_API_URL2 = (process.env.PULLFROG_API_URL || "https://pullfrog.com")
 function link(text, url4) {
   return `\x1B]8;;${url4}\x07${text}\x1B]8;;\x07`;
 }
-function buildProviders() {
-  return Object.entries(providers).filter(([key]) => key !== "opencode" && key !== "openrouter").map(([key, config3]) => {
-    const aliases = modelAliases.filter(
-      (a2) => a2.provider === key && !a2.fallback && !a2.routing && !a2.hidden
-    );
-    const recommended = aliases.find((a2) => a2.preferred);
-    const sorted = [...aliases].sort((a2, b) => {
-      if (a2.preferred && !b.preferred) return -1;
-      if (!a2.preferred && b.preferred) return 1;
-      return 0;
-    });
-    return {
-      id: key,
-      name: config3.displayName,
-      envVars: config3.envVars,
-      models: sorted.map((a2) => ({
-        value: a2.slug,
-        label: a2.displayName,
-        hint: a2 === recommended ? "recommended" : void 0
-      }))
-    };
-  }).filter((p) => p.models.length > 0);
-}
-var CLI_PROVIDERS = buildProviders();
-function resolveModelProvider(slug2) {
-  const providerId = slug2.split("/")[0];
-  return CLI_PROVIDERS.find((p) => p.id === providerId) ?? null;
-}
 var activeSpin2 = null;
 function bail2(msg) {
   if (activeSpin2) {
@@ -198847,15 +198887,11 @@ function openBrowser(url4) {
   }
 }
 async function pullfrogApi2(ctx) {
-  const headers = { authorization: `Bearer ${ctx.token}` };
-  if (ctx.body) headers["content-type"] = "application/json";
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), 3e4);
   try {
     const response = await fetch(`${PULLFROG_API_URL2}${ctx.path}`, {
-      method: ctx.method || "GET",
-      headers,
-      body: ctx.body ? JSON.stringify(ctx.body) : null,
+      headers: { authorization: `Bearer ${ctx.token}` },
       signal: controller.signal
     });
     const data = await response.json().catch(() => ({}));
@@ -198883,406 +198919,27 @@ async function fetchStatus2(ctx) {
         isOrg: result.data.isOrg === true
       };
     }
-    bail2(errorMsg || `secrets check failed (${result.status})`);
+    bail2(errorMsg || `installation 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
-  };
-}
-async function createSession(ctx) {
-  try {
-    const result = await pullfrogApi2({
-      path: "/api/cli/session",
-      token: ctx.token,
-      method: "POST",
-      body: { owner: ctx.owner.toLowerCase(), repo: ctx.repo.toLowerCase() }
-    });
-    if (!result.ok || !result.data.id) return null;
-    return result.data.id;
-  } catch {
-    return null;
-  }
-}
-async function pollSession(ctx) {
-  const result = await pullfrogApi2({
-    path: `/api/cli/session/${ctx.sessionId}`,
-    token: ctx.token
-  });
-  if (result.status === 410) return "expired";
-  if (!result.ok) return "pending";
-  return result.data.installed === true ? "installed" : "pending";
-}
-function cleanupSession(ctx) {
-  void pullfrogApi2({
-    path: `/api/cli/session/${ctx.sessionId}`,
-    token: ctx.token,
-    method: "DELETE"
-  }).catch(() => {
-  });
-}
-var SESSION_POLL_MS = 750;
-var FALLBACK_POLL_MS = 5e3;
-var HINT_AFTER_MS = 1e4;
-var TIMEOUT_MS = 3 * 60 * 1e3;
-function listenForKey(key) {
-  let triggered = false;
-  const onData = (data) => {
-    if (data.toString().toLowerCase() === key) triggered = true;
-  };
-  process.stdin.setRawMode?.(true);
-  process.stdin.resume();
-  process.stdin.on("data", onData);
-  return {
-    consume() {
-      if (!triggered) return false;
-      triggered = false;
-      return true;
-    },
-    stop() {
-      process.stdin.removeListener("data", onData);
-      process.stdin.setRawMode?.(false);
-      process.stdin.pause();
-    }
+    installationId: typeof result.data.installationId === "number" ? result.data.installationId : null
   };
 }
 function installationConfigUrl(ctx) {
   return ctx.isOrg ? `https://github.com/organizations/${ctx.owner}/settings/installations/${ctx.installationId}` : `https://github.com/settings/installations/${ctx.installationId}`;
 }
-async function ensureInstallation(ctx) {
-  activeSpin2.start("checking pullfrog app installation");
-  const initial = await fetchStatus2(ctx);
-  if (initial.installed) {
-    activeSpin2.stop(`pullfrog app is installed on ${import_picocolors3.default.cyan(`@${ctx.owner}`)}`);
-    if (initial.installationId) {
-      const configUrl = installationConfigUrl({
-        owner: ctx.owner,
-        installationId: initial.installationId,
-        isOrg: initial.isOrg
-      });
-      process.stdout.write(`${import_picocolors3.default.gray(S_BAR)}    ${link(import_picocolors3.default.dim(configUrl), configUrl)}
-`);
-    }
-    return initial;
-  }
-  const sessionId = await createSession(ctx);
-  if (initial.installationId) {
-    const repoRef = import_picocolors3.default.bold(`${ctx.owner}/${ctx.repo}`);
-    const configUrl = installationConfigUrl({
-      owner: ctx.owner,
-      installationId: initial.installationId,
-      isOrg: initial.isOrg
-    });
-    activeSpin2.stop(`pullfrog is installed on selected repos, but ${repoRef} is not included.`);
-    log.info(
-      `add it under "Repository access" on the installation config page.
-  ${import_picocolors3.default.dim(configUrl)}`
-    );
-    const openIt = await confirm({ message: "open browser?", active: "yes", inactive: "no" });
-    handleCancel2(openIt);
-    if (openIt) openBrowser(configUrl);
-  } else {
-    activeSpin2.stop("pullfrog app not installed");
-    const installUrl = `https://github.com/apps/${initial.appSlug}/installations/select_target?state=cli`;
-    log.info(`opening browser to install...
-  ${import_picocolors3.default.dim(installUrl)}`);
-    openBrowser(installUrl);
-  }
-  const isRepoAccessUpdate = !!initial.installationId;
-  const baseMsg = isRepoAccessUpdate ? "once you've added the repo, onboarding will proceed automatically" : "once you've installed the app, onboarding will proceed automatically";
-  activeSpin2.start(baseMsg);
-  let activeSessionId = sessionId;
-  let pollMs = activeSessionId ? SESSION_POLL_MS : FALLBACK_POLL_MS;
-  const listener = listenForKey("r");
-  const startedAt = Date.now();
-  let hintShown = false;
-  try {
-    while (Date.now() - startedAt < TIMEOUT_MS) {
-      await new Promise((r2) => setTimeout(r2, pollMs));
-      if (!hintShown && Date.now() - startedAt > HINT_AFTER_MS) {
-        activeSpin2.message(`${baseMsg} ${import_picocolors3.default.dim("(press r to recheck manually)")}`);
-        hintShown = true;
-      }
-      const doneMsg = isRepoAccessUpdate ? "repo access confirmed" : "pullfrog app installed";
-      if (listener.consume()) {
-        activeSpin2.message("rechecking via GitHub API");
-        try {
-          const status = await fetchStatus2(ctx);
-          if (status.installed) {
-            if (activeSessionId) cleanupSession({ token: ctx.token, sessionId: activeSessionId });
-            activeSpin2.stop(doneMsg);
-            return status;
-          }
-        } catch {
-        }
-        activeSpin2.message(`${baseMsg} ${import_picocolors3.default.dim("(press r to recheck manually)")}`);
-        continue;
-      }
-      if (activeSessionId) {
-        try {
-          const result = await pollSession({ token: ctx.token, sessionId: activeSessionId });
-          if (result === "expired") {
-            activeSessionId = null;
-            pollMs = FALLBACK_POLL_MS;
-            continue;
-          }
-          if (result === "installed") {
-            const status = await fetchStatus2(ctx);
-            if (status.installed) {
-              cleanupSession({ token: ctx.token, sessionId: activeSessionId });
-              activeSpin2.stop(doneMsg);
-              return status;
-            }
-          }
-        } catch {
-        }
-      } else {
-        try {
-          const status = await fetchStatus2(ctx);
-          if (status.installed) {
-            activeSpin2.stop(doneMsg);
-            return status;
-          }
-        } catch {
-        }
-      }
-    }
-  } finally {
-    listener.stop();
-  }
-  if (activeSessionId) cleanupSession({ token: ctx.token, sessionId: activeSessionId });
-  bail2(
-    isRepoAccessUpdate ? `timed out waiting for repo access.
-  ${import_picocolors3.default.dim("add the repo, then re-run:")} npx pullfrog init` : `timed out waiting for app installation.
-  ${import_picocolors3.default.dim("if your org requires admin approval, ask an admin to approve,")}
-  ${import_picocolors3.default.dim("then re-run:")} npx pullfrog init`
-  );
+function consoleUrl(ctx) {
+  return `${PULLFROG_API_URL2}/console/${ctx.owner}?repo=${encodeURIComponent(ctx.repo)}`;
 }
-function setGhSecret(ctx) {
-  let orgFailed = false;
-  if (ctx.org) {
-    try {
-      execFileSync8("gh", ["secret", "set", ctx.name, "--org", ctx.org, "--visibility", "all"], {
-        input: ctx.value,
-        stdio: ["pipe", "ignore", "pipe"],
-        encoding: "utf-8"
-      });
-      return { saved: true, orgFailed: false };
-    } catch {
-      orgFailed = true;
-    }
-  }
-  try {
-    execFileSync8("gh", ["secret", "set", ctx.name, "--repo", ctx.repoSlug], {
-      input: ctx.value,
-      stdio: ["pipe", "ignore", "pipe"],
-      encoding: "utf-8"
-    });
-    return { saved: true, orgFailed };
-  } catch {
-    return { saved: false, orgFailed };
-  }
+function installUrl(ctx) {
+  const state = encodeURIComponent(`cli:${ctx.owner}/${ctx.repo}`);
+  return `https://github.com/apps/${ctx.appSlug}/installations/select_target?state=${state}`;
 }
-async function setPullfrogSecret2(ctx) {
-  const result = await pullfrogApi2({
-    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}` };
-}
-async function promptScope2(ctx) {
-  const scope2 = await select({
-    message: "secret scope",
-    options: [
-      { value: "account", label: `${ctx.owner} organization`, hint: "shared across repos" },
-      { value: "repo", label: `${ctx.owner}/${ctx.repo} only` }
-    ]
-  });
-  handleCancel2(scope2);
-  return scope2;
-}
-async function handleSecret(ctx) {
-  const repoSecretsUrl = `https://github.com/${ctx.owner}/${ctx.repo}/settings/secrets/actions`;
-  const matches = [];
-  for (const v of ctx.provider.envVars) {
-    if (ctx.secrets.pullfrogSecrets.includes(v)) matches.push({ name: v, source: "pullfrog" });
-    else if (ctx.secrets.secretsAccessible && ctx.secrets.orgSecrets.includes(v))
-      matches.push({ name: v, source: "org secret" });
-    else if (ctx.secrets.secretsAccessible && ctx.secrets.repoSecrets.includes(v))
-      matches.push({ name: v, source: "repo secret" });
-  }
-  if (matches.length > 0) {
-    activeSpin2.start("");
-    activeSpin2.stop("secrets already configured");
-    for (const m of matches) {
-      process.stdout.write(
-        `${import_picocolors3.default.gray(S_BAR)}    ${import_picocolors3.default.cyan(m.name)} ${import_picocolors3.default.dim(`(${m.source})`)}
-`
-      );
-    }
-    return;
-  }
-  if (!ctx.secrets.secretsAccessible) {
-    log.info(`could not verify GitHub secrets (app lacks permission)`);
-  }
-  const hasOAuthOption = ctx.provider.envVars.includes("CLAUDE_CODE_OAUTH_TOKEN");
-  let envVar = ctx.provider.envVars[0];
-  if (hasOAuthOption) {
-    const authMethod = await select({
-      message: "which credential do you want to use?",
-      options: [
-        {
-          value: "oauth",
-          label: "Claude Code OAuth token",
-          hint: `run ${import_picocolors3.default.cyan("claude setup-token")} \u2014 works with Pro/Max subscriptions`
-        },
-        {
-          value: "api",
-          label: "Anthropic API key",
-          hint: "from console.anthropic.com"
-        }
-      ]
-    });
-    handleCancel2(authMethod);
-    if (authMethod === "oauth") envVar = "CLAUDE_CODE_OAUTH_TOKEN";
-  }
-  const method = await select({
-    message: `where should ${import_picocolors3.default.cyan(envVar)} be stored?`,
-    options: [
-      {
-        value: "pullfrog",
-        label: "Pullfrog",
-        hint: "recommended \u2014 auto-injected, no workflow changes"
-      },
-      {
-        value: "github",
-        label: "GitHub Actions secret",
-        hint: "requires env block in pullfrog.yml"
-      }
-    ]
-  });
-  handleCancel2(method);
-  const pasteLabel = envVar === "CLAUDE_CODE_OAUTH_TOKEN" ? "OAuth token" : `${ctx.provider.name} API key`;
-  const apiKey = await password({
-    message: `paste your ${pasteLabel} ${import_picocolors3.default.dim("(Enter to skip)")}`,
-    mask: "*",
-    validate: () => void 0
-  });
-  handleCancel2(apiKey);
-  if (!apiKey) {
-    log.info(
-      `skipped \u2014 set it manually at:
-  ${import_picocolors3.default.dim(method === "pullfrog" ? `${PULLFROG_API_URL2}/console/${ctx.owner}` : repoSecretsUrl)}`
-    );
-    return;
-  }
-  if (method === "pullfrog") {
-    const scope2 = ctx.secrets.isOrg ? await promptScope2(ctx) : "account";
-    const target = describeSecretTarget({ owner: ctx.owner, repo: ctx.repo, scope: scope2 });
-    activeSpin2.start(`saving ${import_picocolors3.default.cyan(envVar)} to ${target}`);
-    let saveResult;
-    try {
-      saveResult = await setPullfrogSecret2({
-        token: ctx.token,
-        owner: ctx.owner,
-        repo: ctx.repo,
-        name: envVar,
-        value: apiKey,
-        scope: scope2
-      });
-    } catch (error52) {
-      activeSpin2.stop(import_picocolors3.default.red("could not save secret"));
-      log.warn(
-        `${error52 instanceof Error ? error52.message : "network error"}
-  set it manually at: ${import_picocolors3.default.dim(`${PULLFROG_API_URL2}/console/${ctx.owner}`)}`
-      );
-      return;
-    }
-    if (saveResult.saved) {
-      activeSpin2.stop(`saved ${import_picocolors3.default.cyan(envVar)} to ${target}`);
-    } else {
-      activeSpin2.stop(import_picocolors3.default.red("could not save secret"));
-      log.warn(
-        `${saveResult.error}
-  set it manually at: ${import_picocolors3.default.dim(`${PULLFROG_API_URL2}/console/${ctx.owner}`)}`
-      );
-    }
-    return;
-  }
-  let org = null;
-  if (ctx.secrets.isOrg) {
-    const scope2 = await promptScope2(ctx);
-    org = scope2 === "account" ? ctx.owner : null;
-  }
-  const secretsUrl = org ? `https://github.com/organizations/${org}/settings/secrets/actions` : repoSecretsUrl;
-  activeSpin2.start(`saving ${envVar}`);
-  const secretResult = setGhSecret({
-    name: envVar,
-    value: apiKey,
-    org,
-    repoSlug: `${ctx.owner}/${ctx.repo}`
-  });
-  if (secretResult.saved) {
-    activeSpin2.stop(
-      `saved ${import_picocolors3.default.cyan(envVar)} to ${org && !secretResult.orgFailed ? `${import_picocolors3.default.dim(ctx.owner)} org secret` : "GitHub Actions secret"}`
-    );
-    if (secretResult.orgFailed) {
-      log.warn("org secret failed (admin access required) \u2014 saved as repo secret instead");
-    }
-  } else {
-    activeSpin2.stop(import_picocolors3.default.red("could not set secret"));
-    log.warn(`set it manually at:
-  ${import_picocolors3.default.dim(secretsUrl)}`);
-  }
-}
-async function promptTestRun(ctx) {
-  const proceed = await select({
-    message: "test your installation?",
-    options: [
-      { value: true, label: "yes", hint: "dispatches a test run in your GitHub Actions" },
-      { value: false, label: "skip" }
-    ]
-  });
-  handleCancel2(proceed);
-  if (!proceed) return;
-  activeSpin2.start("dispatching test run");
-  const result = await pullfrogApi2({
-    path: "/api/cli/dispatch",
-    token: ctx.token,
-    method: "POST",
-    body: { owner: ctx.owner, repo: ctx.repo, prompt: "Tell me a joke" }
-  });
-  if (!result.ok) {
-    activeSpin2.stop(import_picocolors3.default.red("could not dispatch"));
-    log.warn(result.data.error || `dispatch failed (${result.status})`);
-    return;
-  }
-  activeSpin2.stop("dispatched test run");
-  if (result.data.url) {
-    process.stdout.write(
-      `${import_picocolors3.default.gray(S_BAR)}    ${link(import_picocolors3.default.dim(result.data.url), result.data.url)}
-`
-    );
-    openBrowser(result.data.url);
-  }
+function printLink(url4) {
+  process.stdout.write(`${import_picocolors3.default.gray(S_BAR)}    ${link(import_picocolors3.default.dim(url4), url4)}
+`);
 }
 async function main2() {
   intro(import_picocolors3.default.bgGreen(import_picocolors3.default.black(" pullfrog ")));
@@ -199304,98 +198961,58 @@ async function main2() {
   spin.start("detecting repository");
   const remote = parseGitRemote2();
   spin.stop(`detected repo ${import_picocolors3.default.cyan(`${remote.owner}/${remote.repo}`)}`);
-  const secrets = await ensureInstallation({ token, owner: remote.owner, repo: remote.repo });
-  let model;
-  let provider2;
-  if (secrets.model) {
-    model = secrets.model;
-    const resolved = resolveModelProvider(secrets.model);
-    if (!resolved) bail2(`unknown model provider: ${secrets.model}`);
-    provider2 = resolved;
-    const displayAlias = resolveDisplayAlias(secrets.model);
-    const label = displayAlias ? displayAlias.displayName : secrets.model;
+  spin.start("checking pullfrog app installation");
+  const status = await fetchStatus2({ token, owner: remote.owner, repo: remote.repo });
+  const handoff = consoleUrl({ owner: remote.owner, repo: remote.repo });
+  if (status.installed) {
+    spin.stop(`pullfrog app is installed on ${import_picocolors3.default.cyan(`@${remote.owner}`)}`);
     spin.start("");
-    spin.stop(`using model ${import_picocolors3.default.cyan(label)}`);
-  } else {
-    const providerId = await select({
-      message: "select your preferred model provider",
-      options: CLI_PROVIDERS.map((cp) => ({
-        value: cp.id,
-        label: cp.name
-      }))
-    });
-    handleCancel2(providerId);
-    const found = CLI_PROVIDERS.find((cp) => cp.id === providerId);
-    if (!found) bail2(`unknown provider: ${providerId}`);
-    provider2 = found;
-    if (provider2.models.length === 1) {
-      model = provider2.models[0].value;
-      spin.start("");
-      spin.stop(`using ${import_picocolors3.default.bold(provider2.models[0].label)}`);
-    } else {
-      const recommendedModel = provider2.models.find((m) => m.hint === "recommended");
-      const options = provider2.models.map((m) => {
-        if (m.hint) return { value: m.value, label: m.label, hint: m.hint };
-        return { value: m.value, label: m.label };
-      });
-      const selected = await select(
-        recommendedModel ? { message: "select model", initialValue: recommendedModel.value, options } : { message: "select model", options }
-      );
-      handleCancel2(selected);
-      model = selected;
-    }
-  }
-  await handleSecret({ token, owner: remote.owner, repo: remote.repo, provider: provider2, secrets });
-  spin.start("creating pullfrog.yml workflow");
-  const result = await pullfrogApi2({
-    path: "/api/cli/setup",
-    token,
-    method: "POST",
-    body: { owner: remote.owner, repo: remote.repo, model }
-  });
-  if (!result.ok) {
-    bail2(result.data.error || `api returned ${result.status}`);
-  }
-  let skipTestRun = false;
-  if (result.data.already_existed) {
-    spin.stop("pullfrog.yml already exists");
-  } else if (result.data.pull_request_url) {
-    spin.stop("opened pull request with pullfrog.yml");
-    process.stdout.write(
-      `${import_picocolors3.default.gray(S_BAR)}    ${link(import_picocolors3.default.dim(result.data.pull_request_url), result.data.pull_request_url)}
-`
+    spin.stop("opening your dashboard");
+    printLink(handoff);
+    openBrowser(handoff);
+    activeSpin2 = null;
+    outro(
+      `finish setup in your browser \u2014 ${import_picocolors3.default.cyan(`${remote.owner}/${remote.repo}`)} is ready.`
     );
-    openBrowser(result.data.pull_request_url);
-    const merged = await select({
-      message: "merge the PR to activate pullfrog, then continue",
-      options: [
-        { value: true, label: "continue", hint: "PR has been merged" },
-        { value: false, label: "skip" }
-      ]
+    return;
+  }
+  if (status.installationId) {
+    const repoRef = import_picocolors3.default.bold(`${remote.owner}/${remote.repo}`);
+    const configUrl = installationConfigUrl({
+      owner: remote.owner,
+      installationId: status.installationId,
+      isOrg: status.isOrg
     });
-    handleCancel2(merged);
-    if (!merged) skipTestRun = true;
-  } else {
-    const short = result.data.hash?.slice(0, 7);
-    spin.stop(
-      short ? `committed pullfrog.yml to repo ${import_picocolors3.default.dim(short)}` : "committed pullfrog.yml to repo"
+    spin.stop(`pullfrog is installed on selected repos, but ${repoRef} is not included.`);
+    log.info(
+      `add it under "Repository access" on the installation config page.
+  ${import_picocolors3.default.dim(configUrl)}`
     );
+    const openIt = await confirm({ message: "open browser?", active: "yes", inactive: "no" });
+    handleCancel2(openIt);
+    if (openIt) openBrowser(configUrl);
+    log.info("once the repo is added, finish setup at:");
+    printLink(handoff);
+    activeSpin2 = null;
+    outro("done.");
+    return;
   }
-  if (!skipTestRun && !secrets.hasRuns) {
-    await promptTestRun({ token, owner: remote.owner, repo: remote.repo });
-  }
-  const consoleUrl = `${PULLFROG_API_URL2}/console/${remote.owner}/${remote.repo}`;
-  spin.start("");
-  spin.stop("repo is configurable via the Pullfrog dashboard");
-  process.stdout.write(`${import_picocolors3.default.gray(S_BAR)}    ${link(import_picocolors3.default.dim(consoleUrl), consoleUrl)}
-`);
+  spin.stop("pullfrog app not installed");
+  const install = installUrl({
+    appSlug: status.appSlug,
+    owner: remote.owner,
+    repo: remote.repo
+  });
+  log.info("opening browser to install...");
+  printLink(install);
+  openBrowser(install);
   activeSpin2 = null;
-  outro("done.");
+  outro("GitHub will drop you at your dashboard to finish setup.");
 }
 function printInitUsage(params) {
   params.stream(`usage: ${params.prog} init
 `);
-  params.stream("set up pullfrog on the current repository.");
+  params.stream("install pullfrog on the current repository and open its dashboard.");
   params.stream("");
   params.stream("options:");
   params.stream("  -h, --help   show help");
@@ -199567,7 +199184,7 @@ async function runCli4(input) {
 }
 
 // cli.ts
-var VERSION10 = "0.1.59";
+var VERSION10 = "0.1.60";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);
@@ -199575,7 +199192,7 @@ function printMainUsage(stream) {
   stream(`usage: ${PROG} <command>
 `);
   stream("commands:");
-  stream("  init        set up pullfrog on the current repository");
+  stream("  init        install pullfrog on the current repository and open its dashboard");
   stream("  auth        manage provider credentials for the current repository");
   stream("  watch       stream a PR's activity as one JSON line per event");
   stream("");

package/dist/index.js

@@ -104420,6 +104420,11 @@ var DEFAULT_ACTIVITY_TIMEOUT_MS = 3e5;
 var AGENT_ACTIVITY_TIMEOUT_MS = 9e5;
 var AGENT_FIRST_EVENT_TIMEOUT_MS = 12e4;
 var DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5e3;
+function watchdogBudgetMs(compiled, envVar) {
+  const raw2 = Number(process.env[envVar]);
+  if (!Number.isFinite(raw2) || raw2 <= 0) return compiled;
+  return Math.min(compiled, raw2);
+}
 var DEBUG_TS_PREFIX = /^(?:\[\d{4}-\d{2}-\d{2}T[^\]]+\]\s+)?/.source;
 var ACTIVITY_NOISE_PATTERNS = [
   new RegExp(`${DEBUG_TS_PREFIX}\\[mcp-proxy\\]`),
@@ -105183,7 +105188,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.59",
+  version: "0.1.60",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -107292,7 +107297,7 @@ var claude = agent({
       if ((isBedrockRoute || isVertexRoute2) && specifier && effort.alias?.effort) {
         applyHostedEffortCapabilities({ env: env2, modelId: specifier, levels: effort.alias.effort });
       }
-      if (env2.CLAUDE_CODE_OAUTH_TOKEN && !isBedrockRoute && env2.ANTHROPIC_API_KEY) {
+      if (env2.CLAUDE_CODE_OAUTH_TOKEN && !isBedrockRoute && !isVertexRoute2 && !env2.ANTHROPIC_BASE_URL && !env2.ANTHROPIC_AUTH_TOKEN && env2.ANTHROPIC_API_KEY) {
         const preflight = await preflightClaudeSubscription({
           token: env2.CLAUDE_CODE_OAUTH_TOKEN,
           model
@@ -114157,6 +114162,7 @@ function processTerminalToolPart(ctx, part, label, isOrchestrator) {
   const callLine = inputFormatted !== "{}" ? `\xBB ${toolName}(${inputFormatted})` : `\xBB ${toolName}()`;
   log.info(withLabel(label, callLine));
   if (isOrchestrator) ctx.loggedToolCallIDs.add(toolId);
+  if (isOrchestrator && toolName.startsWith("pullfrog_")) ctx.mcpToolCalls++;
   if (state.status === "completed") {
     log.debug(withLabel(label, `  output: ${state.output}`));
   } else {
@@ -114395,21 +114401,28 @@ function formatConfigError(name, data) {
   ).join("");
   return `${name}${detail}${bullets}`;
 }
+var WATCHDOG_SALVAGE_PROMPT = "Your previous turn was cut off mid-response by a provider stall. Nothing you had not already submitted through a tool was saved. Continue from where you stopped and submit your work now \u2014 do not restart your analysis.";
 function startInnerActivityWatchdog(params) {
   let fired = false;
+  let everFired = false;
   const id = setInterval(() => {
     if (fired) return;
     const idleMs = performance7.now() - params.ctx.lastEventAt;
-    const budgetMs = params.ctx.sawModelOutput ? params.timeoutMs : AGENT_FIRST_EVENT_TIMEOUT_MS;
+    const compiledMs = params.ctx.sawModelOutput ? params.timeoutMs : AGENT_FIRST_EVENT_TIMEOUT_MS;
+    const budgetMs = everFired ? compiledMs : watchdogBudgetMs(
+      compiledMs,
+      params.ctx.sawModelOutput ? "PULLFROG_E2E_ACTIVITY_TIMEOUT_MS" : "PULLFROG_E2E_FIRST_EVENT_TIMEOUT_MS"
+    );
     if (idleMs <= budgetMs) return;
     fired = true;
+    everFired = true;
     const idleSec = Math.round(idleMs / 1e3);
     params.ctx.diagnostic.idleSec = idleSec;
     params.ctx.diagnostic.sawModelOutput = params.ctx.sawModelOutput;
     log.info(
       params.ctx.sawModelOutput ? `\xBB no opencode events for ${idleSec}s \u2014 aborting in-flight prompt and notifying harness` : `\xBB no opencode events for ${idleSec}s \u2014 the provider never returned a first token; aborting in-flight prompt and notifying harness`
     );
-    params.abortController.abort();
+    params.abortTurn();
     try {
       params.ctx.onActivityTimeout?.();
     } catch (err) {
@@ -114419,7 +114432,22 @@ function startInnerActivityWatchdog(params) {
     }
   }, 5e3);
   id.unref?.();
-  return { stop: () => clearInterval(id) };
+  return {
+    stop: () => clearInterval(id),
+    /**
+     * Start a turn's idle budget from now. The clock must be reset with the
+     * latch: `lastEventAt` only advances on model output, so a turn following a
+     * stall would inherit the full stalled interval and be aborted on the very
+     * next 5s tick — killing the salvage before the provider could answer. It
+     * is the right semantics for an ordinary resume too, whose budget should
+     * not be pre-spent by the post-run gate checks that ran between turns.
+     */
+    armForTurn: () => {
+      fired = false;
+      params.ctx.lastEventAt = performance7.now();
+    },
+    firedThisTurn: () => fired
+  };
 }
 var opencode = agent({
   name: "opencode",
@@ -114531,6 +114559,7 @@ var opencode = agent({
         variant: effort.rung,
         todoTracker: ctx.todoTracker,
         onActivityTimeout: ctx.onActivityTimeout,
+        onTurnRecovered: ctx.onTurnRecovered,
         onToolUse: ctx.onToolUse,
         currentTurn: null,
         eventCount: 0,
@@ -114539,6 +114568,7 @@ var opencode = agent({
         promptMessageID: void 0,
         taskDispatchByCallID: /* @__PURE__ */ new Map(),
         loggedToolCallIDs: /* @__PURE__ */ new Set(),
+        mcpToolCalls: 0,
         recentStderr: server.recentStderr,
         diagnostic: {
           label: "Pullfrog",
@@ -114562,9 +114592,14 @@ var opencode = agent({
           }
         }
       });
-      const abortController = new AbortController();
-      const eventLoopPromise = consumeEvents(runnerCtx, abortController.signal).catch((err) => {
-        if (!abortController.signal.aborted) {
+      const runController = new AbortController();
+      let turnController = new AbortController();
+      const nextTurnSignal = () => {
+        turnController = new AbortController();
+        return AbortSignal.any([runController.signal, turnController.signal]);
+      };
+      const eventLoopPromise = consumeEvents(runnerCtx, runController.signal).catch((err) => {
+        if (!runController.signal.aborted) {
           log.warning(
             `\xBB opencode event subscription ended: ${err instanceof Error ? err.message : String(err)}`
           );
@@ -114580,31 +114615,48 @@ var opencode = agent({
         // a long synchronous tool call (no part.updated while it runs) can't
         // false-positive it.
         timeoutMs: AGENT_ACTIVITY_TIMEOUT_MS,
-        abortController
+        abortTurn: () => turnController.abort()
       });
       const sdkModel = parseModel2(model);
+      let salvagesLeft = 1;
+      const runTurn = async (text) => {
+        const attempt = (prompt) => {
+          watchdog.armForTurn();
+          return runTurnGuarded(
+            runnerCtx,
+            () => runPromptTurn(runnerCtx, { text: prompt, model: sdkModel, signal: nextTurnSignal() })
+          );
+        };
+        const standDownIfRecovered = (turn) => {
+          if (watchdog.firedThisTurn() && turn.success) ctx.onTurnRecovered?.();
+          return turn;
+        };
+        const result = await attempt(text);
+        if (!watchdog.firedThisTurn()) return result;
+        if (result.success) return standDownIfRecovered(result);
+        if (salvagesLeft <= 0) return result;
+        salvagesLeft--;
+        ctx.onTurnRecovered?.();
+        log.info("\xBB activity watchdog cut the turn off \u2014 re-prompting once on the same session");
+        const mcpCallsBefore = runnerCtx.mcpToolCalls;
+        const salvaged = await attempt(WATCHDOG_SALVAGE_PROMPT);
+        const usage = mergeAgentUsage(result.usage, salvaged.usage);
+        if (runnerCtx.mcpToolCalls === mcpCallsBefore) {
+          log.info(
+            "\xBB salvage turn reached no Pullfrog tool \u2014 keeping the activity-timeout failure"
+          );
+          return { ...result, usage };
+        }
+        return standDownIfRecovered({ ...salvaged, usage });
+      };
       try {
-        const initial = await runTurnGuarded(
-          runnerCtx,
-          () => runPromptTurn(runnerCtx, {
-            text: ctx.instructions.full,
-            model: sdkModel,
-            signal: abortController.signal
-          })
-        );
+        const initial = await runTurn(ctx.instructions.full);
         const result = await runPostRunRetryLoop({
           ctx,
           initialResult: initial,
           initialUsage: initial.usage,
           reflectionPrompt: buildReflectionPrompt(ctx.toolState),
-          resume: async (c) => runTurnGuarded(
-            runnerCtx,
-            () => runPromptTurn(runnerCtx, {
-              text: c.prompt,
-              model: sdkModel,
-              signal: abortController.signal
-            })
-          )
+          resume: async (c) => runTurn(c.prompt)
         });
         if (result.success) {
           await ctx.todoTracker?.flush();
@@ -114614,7 +114666,7 @@ var opencode = agent({
         return result;
       } finally {
         watchdog.stop();
-        abortController.abort();
+        runController.abort();
         await eventLoopPromise.catch(() => {
         });
       }
@@ -192405,7 +192457,7 @@ function hasEnvVar2(name) {
   return typeof val === "string" && val.length > 0;
 }
 function hasClaudeCodeAuth() {
-  return hasEnvVar2("CLAUDE_CODE_OAUTH_TOKEN") || hasEnvVar2("ANTHROPIC_API_KEY");
+  return hasEnvVar2("CLAUDE_CODE_OAUTH_TOKEN") || hasEnvVar2("ANTHROPIC_API_KEY") || hasEnvVar2("ANTHROPIC_AUTH_TOKEN");
 }
 function hasCodexAuth() {
   return hasEnvVar2("CODEX_AUTH_JSON") || hasEnvVar2("OPENAI_API_KEY");
@@ -192498,8 +192550,11 @@ function resolveAgent(ctx) {
     } catch {
     }
   }
-  if (!ctx.model && ctx.codexAgent && hasCodexAuth() && !hasClaudeCodeAuth()) {
-    return agents.codex;
+  if (!ctx.model) {
+    if (hasEnvVar2("ANTHROPIC_AUTH_TOKEN") && !hasEnvVar2("ANTHROPIC_API_KEY") && !hasEnvVar2("CLAUDE_CODE_OAUTH_TOKEN")) {
+      return agents.claude;
+    }
+    if (ctx.codexAgent && hasCodexAuth() && !hasClaudeCodeAuth()) return agents.codex;
   }
   return agents.opencode;
 }
@@ -192685,7 +192740,7 @@ function hasSingleProviderAuth(agentName) {
   if (agentName === "codex") {
     return hasEnvVar3("OPENAI_API_KEY") || hasEnvVar3("CODEX_AUTH_JSON");
   }
-  return hasEnvVar3("ANTHROPIC_API_KEY") || hasEnvVar3("CLAUDE_CODE_OAUTH_TOKEN");
+  return hasEnvVar3("ANTHROPIC_API_KEY") || hasEnvVar3("ANTHROPIC_AUTH_TOKEN") || hasEnvVar3("CLAUDE_CODE_OAUTH_TOKEN");
 }
 function validateAgentApiKey(params) {
   if (params.model) {
@@ -193017,7 +193072,8 @@ var PROBES = {
     request: (value2) => ({
       url: "https://api.anthropic.com/v1/models",
       headers: { "x-api-key": value2, "anthropic-version": "2023-06-01" }
-    })
+    }),
+    hostConfigurable: true
   },
   OPENROUTER_API_KEY: {
     request: (value2) => ({
@@ -193066,12 +193122,18 @@ function hasEnvVar4(name) {
   const value2 = process.env[name];
   return typeof value2 === "string" && value2.length > 0;
 }
+var HOST_OVERRIDES = {
+  ANTHROPIC_API_KEY: "ANTHROPIC_BASE_URL",
+  CLAUDE_CODE_OAUTH_TOKEN: "ANTHROPIC_BASE_URL"
+};
 function envVarsFor(model) {
   return model.includes("/") ? getModelEnvVars(model) : [];
 }
 async function checkOne(params) {
   const value2 = process.env[params.envVar];
   if (!value2) return null;
+  const hostOverride = HOST_OVERRIDES[params.envVar];
+  if (hostOverride && hasEnvVar4(hostOverride)) return null;
   if (params.envVar === "CLAUDE_CODE_OAUTH_TOKEN") {
     const preflight = await preflightClaudeSubscription({
       token: value2,
@@ -196304,16 +196366,14 @@ ${instructions.user}` : null,
         const onInnerActivityTimeout = () => {
           if (innerTimeoutFired) return;
           innerTimeoutFired = true;
-          log.info(
-            "\xBB inner activity timeout fired \u2014 stopping MCP server and starting 5min safety-net timer"
-          );
-          mcpHttpServer[Symbol.asyncDispose]().catch((err) => {
-            log.debug(
-              `mcp server stop after inner kill failed: ${err instanceof Error ? err.message : String(err)}`
-            );
-          });
+          log.info("\xBB inner activity timeout fired \u2014 starting 5min safety-net timer");
           safetyNetTimer = setTimeout(
             () => {
+              mcpHttpServer[Symbol.asyncDispose]().catch((err) => {
+                log.debug(
+                  `mcp server stop after inner kill failed: ${err instanceof Error ? err.message : String(err)}`
+                );
+              });
               activityTimeout?.forceReject(
                 "agent still pending 5min after inner activity kill \u2014 forcing exit"
               );
@@ -196322,6 +196382,13 @@ ${instructions.user}` : null,
           );
           safetyNetTimer.unref?.();
         };
+        const onTurnRecovered = () => {
+          if (!innerTimeoutFired) return;
+          innerTimeoutFired = false;
+          if (safetyNetTimer) clearTimeout(safetyNetTimer);
+          safetyNetTimer = void 0;
+          log.info("\xBB inner activity safety net stood down \u2014 turn recovered");
+        };
         const agentPromise = agent2.run({
           payload,
           resolvedModel,
@@ -196342,6 +196409,7 @@ ${instructions.user}` : null,
           toolState,
           apiToken: runContext.apiToken,
           onActivityTimeout: onInnerActivityTimeout,
+          onTurnRecovered,
           onToolUse: (event) => {
             const wasTracked = recordDiffReadFromToolUse({
               state: primaryRepoState(toolState).diffCoverage,

package/dist/internal.js

@@ -777,9 +777,16 @@ function getModelManagedCredentials(slug) {
   const providerConfig = providers[parsed.provider];
   return providerConfig?.managedCredentials?.slice() ?? [];
 }
+var HARNESS_ONLY_CREDENTIALS = {
+  anthropic: ["ANTHROPIC_AUTH_TOKEN"]
+};
 function modelHasStoredAuth(params) {
   const slug = resolveDisplayAlias(params.model)?.slug ?? params.model;
-  const authVars = [...getModelEnvVars(slug), ...getModelManagedCredentials(slug)];
+  const authVars = [
+    ...getModelEnvVars(slug),
+    ...getModelManagedCredentials(slug),
+    ...HARNESS_ONLY_CREDENTIALS[getModelProvider(slug)] ?? []
+  ];
   return authVars.some((v) => params.secretNames.includes(v));
 }
 var modelAliases = Object.entries(providers).flatMap(
@@ -1542,7 +1549,8 @@ var PROBES = {
     request: (value) => ({
       url: "https://api.anthropic.com/v1/models",
       headers: { "x-api-key": value, "anthropic-version": "2023-06-01" }
-    })
+    }),
+    hostConfigurable: true
   },
   OPENROUTER_API_KEY: {
     request: (value) => ({
@@ -1565,7 +1573,9 @@ async function verifyClaudeSubscription(value) {
   return preflight.status === 401 ? "dead" : "alive";
 }
 function isCredentialProbeable(envVar) {
-  return envVar === "CLAUDE_CODE_OAUTH_TOKEN" || envVar in PROBES;
+  if (envVar === "CLAUDE_CODE_OAUTH_TOKEN") return true;
+  const probe = PROBES[envVar];
+  return probe !== void 0 && !probe.hostConfigurable;
 }
 async function verifyCredential(params) {
   const value = params.value.trim();

package/dist/utils/activity.d.ts

@@ -50,6 +50,18 @@ export declare const AGENT_ACTIVITY_TIMEOUT_MS = 900000;
  */
 export declare const AGENT_FIRST_EVENT_TIMEOUT_MS = 120000;
 export declare const DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5000;
+/**
+ * E2E affordance: shorten a watchdog budget for one dispatch, so the stall path
+ * can be exercised on demand. A real provider stall is not provocable, which is
+ * how #1085 shipped three escalations deep with its salvage branch never once
+ * run end to end.
+ *
+ * **Shorten-only, deliberately.** The value is clamped to the compiled budget,
+ * so an override can make the watchdog stricter but can never relax or disable
+ * it. That keeps this unable to manufacture the zombie run the watchdog exists
+ * to prevent, even if a customer sets it in their own workflow env.
+ */
+export declare function watchdogBudgetMs(compiled: number, envVar: string): number;
 export declare const ACTIVITY_NOISE_PATTERNS: readonly RegExp[];
 export declare function isActivityNoise(chunk: string | Uint8Array): boolean;
 type ActivityTimeoutContext = {

package/dist/utils/credentialCheck.d.ts

@@ -7,7 +7,13 @@
  * provider outage rewrite a working account's configuration.
  */
 export type CredentialVerdict = "alive" | "dead" | "unknown";
-/** whether asking the provider about this credential would tell us anything. */
+/**
+ * Whether asking the provider about this credential would tell us anything —
+ * the paste-time gate, where the caller stores a secret and cannot see the run
+ * env. A `hostConfigurable` credential is excluded here and stays probeable at
+ * run time, because only the runner knows whether a gateway is in play: the
+ * base URL usually lives in the workflow file, which the console never reads.
+ */
 export declare function isCredentialProbeable(envVar: string): boolean;
 /**
  * Ask the provider whether it still accepts this credential. Used at the two

package/package.json

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