pullfrog 0.0.203 → 0.0.204

package/dist/cli.mjs

@@ -108099,14 +108099,14 @@ var providers = {
     models: {
       grok: {
         displayName: "Grok",
-        resolve: "xai/grok-4",
-        openRouterResolve: "openrouter/x-ai/grok-4",
+        resolve: "xai/grok-4.3",
+        openRouterResolve: "openrouter/x-ai/grok-4.3",
         preferred: true
       },
       "grok-fast": {
         displayName: "Grok Fast",
-        resolve: "xai/grok-4-fast",
-        openRouterResolve: "openrouter/x-ai/grok-4-fast"
+        resolve: "xai/grok-4-1-fast",
+        openRouterResolve: "openrouter/x-ai/grok-4.1-fast"
       },
       "grok-code-fast": {
         displayName: "Grok Code Fast",
@@ -108313,8 +108313,8 @@ var providers = {
       },
       grok: {
         displayName: "Grok",
-        resolve: "openrouter/x-ai/grok-4",
-        openRouterResolve: "openrouter/x-ai/grok-4"
+        resolve: "openrouter/x-ai/grok-4.3",
+        openRouterResolve: "openrouter/x-ai/grok-4.3"
       },
       "deepseek-pro": {
         displayName: "DeepSeek Pro",
@@ -108583,6 +108583,109 @@ function aggregateUsage(entries) {
   return out;
 }
 
+// utils/progressComment.ts
+function parseProgressComment(raw2) {
+  if (!raw2?.id) return void 0;
+  const id = parseInt(raw2.id, 10);
+  if (Number.isNaN(id) || id <= 0) return void 0;
+  return { id, type: raw2.type };
+}
+async function getProgressComment(ctx, comment) {
+  const result = await (comment.type === "review" ? ctx.octokit.rest.pulls.getReviewComment({
+    owner: ctx.owner,
+    repo: ctx.repo,
+    comment_id: comment.id
+  }) : ctx.octokit.rest.issues.getComment({
+    owner: ctx.owner,
+    repo: ctx.repo,
+    comment_id: comment.id
+  }));
+  return {
+    id: result.data.id,
+    body: result.data.body ?? void 0,
+    html_url: result.data.html_url
+  };
+}
+async function updateProgressComment(ctx, comment, body) {
+  const result = await (comment.type === "review" ? ctx.octokit.rest.pulls.updateReviewComment({
+    owner: ctx.owner,
+    repo: ctx.repo,
+    comment_id: comment.id,
+    body
+  }) : ctx.octokit.rest.issues.updateComment({
+    owner: ctx.owner,
+    repo: ctx.repo,
+    comment_id: comment.id,
+    body
+  }));
+  return {
+    id: result.data.id,
+    body: result.data.body ?? void 0,
+    html_url: result.data.html_url,
+    node_id: result.data.node_id
+  };
+}
+async function deleteProgressCommentApi(ctx, comment) {
+  if (comment.type === "review") {
+    await ctx.octokit.rest.pulls.deleteReviewComment({
+      owner: ctx.owner,
+      repo: ctx.repo,
+      comment_id: comment.id
+    });
+    return;
+  }
+  await ctx.octokit.rest.issues.deleteComment({
+    owner: ctx.owner,
+    repo: ctx.repo,
+    comment_id: comment.id
+  });
+}
+async function createLeapingProgressComment(ctx, target, body) {
+  if (target.kind === "reviewReply") {
+    try {
+      const result2 = await ctx.octokit.rest.pulls.createReplyForReviewComment({
+        owner: ctx.owner,
+        repo: ctx.repo,
+        pull_number: target.pullNumber,
+        comment_id: target.replyToCommentId,
+        body
+      });
+      return {
+        comment: { id: result2.data.id, type: "review" },
+        body: result2.data.body ?? void 0,
+        html_url: result2.data.html_url
+      };
+    } catch (error49) {
+      console.warn(
+        `[progressComment] review reply failed (parent ${target.replyToCommentId} on PR #${target.pullNumber}), falling back to issue comment:`,
+        error49
+      );
+      const fallback = await ctx.octokit.rest.issues.createComment({
+        owner: ctx.owner,
+        repo: ctx.repo,
+        issue_number: target.pullNumber,
+        body
+      });
+      return {
+        comment: { id: fallback.data.id, type: "issue" },
+        body: fallback.data.body ?? void 0,
+        html_url: fallback.data.html_url
+      };
+    }
+  }
+  const result = await ctx.octokit.rest.issues.createComment({
+    owner: ctx.owner,
+    repo: ctx.repo,
+    issue_number: target.issueNumber,
+    body
+  });
+  return {
+    comment: { id: result.data.id, type: "issue" },
+    body: result.data.body ?? void 0,
+    html_url: result.data.html_url
+  };
+}
+
 // node_modules/.pnpm/@toon-format+toon@1.4.0/node_modules/@toon-format/toon/dist/index.mjs
 var LIST_ITEM_MARKER = "-";
 var LIST_ITEM_PREFIX = "- ";
@@ -109249,6 +109352,7 @@ async function reportProgress(ctx, params) {
   }
   const issueNumber = ctx.payload.event.issue_number ?? ctx.toolState.issueNumber;
   const isPlanMode = ctx.toolState.selectedMode === "Plan";
+  const apiCtx = { octokit: ctx.octokit, owner: ctx.repo.owner, repo: ctx.repo.name };
   if (target_plan_comment === true && ctx.toolState.existingPlanCommentId === void 0) {
     log.warning("target_plan_comment requested but no existingPlanCommentId in tool state");
   }
@@ -109258,86 +109362,74 @@ async function reportProgress(ctx, params) {
     const bodyWithoutFooter = stripExistingFooter(body);
     const footer = buildCommentFooter(ctx, customParts);
     const bodyWithFooter = `${bodyWithoutFooter}${footer}`;
-    const result2 = await ctx.octokit.rest.issues.updateComment({
-      owner: ctx.repo.owner,
-      repo: ctx.repo.name,
-      comment_id: commentId,
-      body: bodyWithFooter
-    });
+    const result = await updateProgressComment(
+      apiCtx,
+      { id: commentId, type: "issue" },
+      bodyWithFooter
+    );
     ctx.toolState.wasUpdated = true;
-    if (isPlanMode && result2.data.node_id) {
-      await patchWorkflowRunFields(ctx, { planCommentNodeId: result2.data.node_id });
+    if (isPlanMode && result.node_id) {
+      await patchWorkflowRunFields(ctx, { planCommentNodeId: result.node_id });
     }
     return {
-      commentId: result2.data.id,
-      url: result2.data.html_url,
-      body: result2.data.body || "",
+      commentId: result.id,
+      url: result.html_url,
+      body: result.body || "",
       action: "updated"
     };
   }
-  const existingCommentId = ctx.toolState.progressCommentId;
-  if (existingCommentId) {
-    const customParts = isPlanMode && issueNumber !== void 0 ? [buildImplementPlanLink(ctx, issueNumber, existingCommentId)] : void 0;
+  const existingComment = ctx.toolState.progressComment;
+  if (existingComment) {
+    const customParts = isPlanMode && issueNumber !== void 0 ? [buildImplementPlanLink(ctx, issueNumber, existingComment.id)] : void 0;
     const bodyWithoutFooter = stripExistingFooter(body);
     const footer = buildCommentFooter(ctx, customParts);
     const bodyWithFooter = `${bodyWithoutFooter}${footer}`;
-    const result2 = await ctx.octokit.rest.issues.updateComment({
-      owner: ctx.repo.owner,
-      repo: ctx.repo.name,
-      comment_id: existingCommentId,
-      body: bodyWithFooter
-    });
+    const result = await updateProgressComment(apiCtx, existingComment, bodyWithFooter);
     ctx.toolState.wasUpdated = true;
-    if (isPlanMode && result2.data.node_id) {
-      await patchWorkflowRunFields(ctx, { planCommentNodeId: result2.data.node_id });
+    if (isPlanMode && result.node_id) {
+      await patchWorkflowRunFields(ctx, { planCommentNodeId: result.node_id });
     }
     return {
-      commentId: result2.data.id,
-      url: result2.data.html_url,
-      body: result2.data.body || "",
+      commentId: result.id,
+      url: result.html_url,
+      body: result.body || "",
       action: "updated"
     };
   }
-  if (existingCommentId === null) {
+  if (existingComment === null) {
     return { body, action: "skipped" };
   }
   if (issueNumber === void 0) {
     return { body, action: "skipped" };
   }
   const initialBody = addFooter(ctx, body);
-  const result = await ctx.octokit.rest.issues.createComment({
-    owner: ctx.repo.owner,
-    repo: ctx.repo.name,
-    issue_number: issueNumber,
-    body: initialBody
-  });
-  ctx.toolState.progressCommentId = result.data.id;
+  const created = await createLeapingProgressComment(
+    apiCtx,
+    { kind: "issue", issueNumber },
+    initialBody
+  );
+  ctx.toolState.progressComment = created.comment;
   ctx.toolState.wasUpdated = true;
   if (isPlanMode) {
-    const customParts = [buildImplementPlanLink(ctx, issueNumber, result.data.id)];
+    const customParts = [buildImplementPlanLink(ctx, issueNumber, created.comment.id)];
     const bodyWithoutFooter = stripExistingFooter(body);
     const footer = buildCommentFooter(ctx, customParts);
     const bodyWithPlanLink = `${bodyWithoutFooter}${footer}`;
-    const updateResult = await ctx.octokit.rest.issues.updateComment({
-      owner: ctx.repo.owner,
-      repo: ctx.repo.name,
-      comment_id: result.data.id,
-      body: bodyWithPlanLink
-    });
-    if (updateResult.data.node_id) {
-      await patchWorkflowRunFields(ctx, { planCommentNodeId: updateResult.data.node_id });
+    const updateResult = await updateProgressComment(apiCtx, created.comment, bodyWithPlanLink);
+    if (updateResult.node_id) {
+      await patchWorkflowRunFields(ctx, { planCommentNodeId: updateResult.node_id });
     }
     return {
-      commentId: updateResult.data.id,
-      url: updateResult.data.html_url,
-      body: updateResult.data.body || "",
+      commentId: updateResult.id,
+      url: updateResult.html_url,
+      body: updateResult.body || "",
       action: "created"
     };
   }
   return {
-    commentId: result.data.id,
-    url: result.data.html_url,
-    body: result.data.body || "",
+    commentId: created.comment.id,
+    url: created.html_url,
+    body: created.body || "",
     action: "created"
   };
 }
@@ -109382,23 +109474,22 @@ ${collapsible}`;
   });
 }
 async function deleteProgressComment(ctx) {
-  const existingCommentId = ctx.toolState.progressCommentId;
-  if (!existingCommentId) {
+  const existing = ctx.toolState.progressComment;
+  if (!existing) {
     return false;
   }
   try {
-    await ctx.octokit.rest.issues.deleteComment({
-      owner: ctx.repo.owner,
-      repo: ctx.repo.name,
-      comment_id: existingCommentId
-    });
+    await deleteProgressCommentApi(
+      { octokit: ctx.octokit, owner: ctx.repo.owner, repo: ctx.repo.name },
+      existing
+    );
   } catch (error49) {
     if (error49 instanceof Error && error49.message.includes("Not Found")) {
     } else {
       throw error49;
     }
   }
-  ctx.toolState.progressCommentId = null;
+  ctx.toolState.progressComment = null;
   return true;
 }
 var ReplyToReviewComment = type({
@@ -142479,7 +142570,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.0.203",
+  version: "0.0.204",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -143016,8 +143107,13 @@ async function $git(subcommand, args2, options) {
     }
     if (result.exitCode !== 0) {
       const stderr = result.stderr.trim();
-      log.info(`git ${subcommand} failed: ${stderr}`);
-      throw new Error(`git ${subcommand} failed: ${stderr}`);
+      const stdout = result.stdout.trim();
+      const detail = stderr && stdout ? `${stderr}
+--- stdout ---
+${stdout}` : stderr || stdout || "(no output)";
+      const message = `git ${subcommand} failed (exit ${result.exitCode}): ${detail}`;
+      log.info(message);
+      throw new Error(message);
     }
     return {
       stdout: result.stdout.trim(),
@@ -143294,6 +143390,34 @@ var PushBranch = type({
   branchName: type.string.describe("The branch name to push (defaults to current branch)").optional(),
   force: type.boolean.describe("Force push (use with caution)").default(false)
 });
+var CONCURRENT_PUSH_PATTERNS = ["fetch first", "non-fast-forward", "cannot lock ref"];
+var TRANSIENT_PATTERNS = [
+  /RPC failed/i,
+  /early EOF/,
+  /the remote end hung up unexpectedly/,
+  /Connection reset/i,
+  /Could not resolve host/i,
+  /Operation timed out/i,
+  /HTTP\/2 stream \d+ was not closed cleanly/i,
+  /unexpected disconnect while reading sideband packet/i,
+  // libcurl HTTP 5xx surfaced by git over https. matches both the
+  // libcurl-style "The requested URL returned error: 502" and the more
+  // recent "HTTP 502" wording. most 4xx is intentionally excluded —
+  // 401/403/404 indicate auth/permission problems that are not
+  // retry-safe — but 429 (rate-limited / abuse detection) IS retry-safe
+  // and GitHub occasionally surfaces it on git push, so it's included
+  // explicitly below.
+  /HTTP 5\d\d/,
+  /returned error: 5\d\d/i,
+  /HTTP 429/,
+  /returned error: 429/i
+];
+function classifyPushError(msg) {
+  if (CONCURRENT_PUSH_PATTERNS.some((p2) => msg.includes(p2))) return "concurrent-push";
+  if (TRANSIENT_PATTERNS.some((p2) => p2.test(msg))) return "transient";
+  return "unknown";
+}
+var TRANSIENT_RETRY_DELAYS_MS = [2e3, 5e3];
 function PushBranchTool(ctx) {
   const defaultBranch = ctx.repo.data.default_branch || "main";
   const pushPermission = ctx.payload.push;
@@ -143344,25 +143468,48 @@ ${postHookStatus}`
       if (force) {
         log.warning(`force pushing - this will overwrite remote history`);
       }
-      try {
-        await $git("push", pushArgs, {
-          token: ctx.gitToken
-        });
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (msg.includes("fetch first") || msg.includes("non-fast-forward")) {
-          const integrateStep = ctx.payload.shell === "disabled" ? `2. use the git tool to merge the remote branch into yours: git({ command: "merge", args: ["origin/${pushDest.remoteBranch}"] })` : `2. use the git tool to rebase or merge your changes on top: git({ command: "merge", args: ["origin/${pushDest.remoteBranch}"] }) (or 'rebase')`;
-          throw new Error(
-            `push rejected: the remote branch '${pushDest.remoteBranch}' has new commits you don't have locally.
+      let lastErr;
+      let pushed = false;
+      for (let attempt = 0; attempt <= TRANSIENT_RETRY_DELAYS_MS.length; attempt++) {
+        try {
+          await $git("push", pushArgs, {
+            token: ctx.gitToken
+          });
+          if (attempt > 0) {
+            log.info(`push succeeded on attempt ${attempt + 1}`);
+          }
+          pushed = true;
+          break;
+        } catch (err) {
+          lastErr = err;
+          const msg = err instanceof Error ? err.message : String(err);
+          const kind = classifyPushError(msg);
+          if (kind === "concurrent-push") {
+            const integrateStep = ctx.payload.shell === "disabled" ? `2. use the git tool to merge the remote branch into yours: git({ command: "merge", args: ["origin/${pushDest.remoteBranch}"] })` : `2. use the git tool to rebase or merge your changes on top: git({ command: "merge", args: ["origin/${pushDest.remoteBranch}"] }) (or 'rebase')`;
+            throw new Error(
+              `push rejected: the remote branch '${pushDest.remoteBranch}' has new commits you don't have locally (often a concurrent push to the same branch).
 
 to resolve this:
 1. use git_fetch to fetch the remote branch: git_fetch({ ref: "${pushDest.remoteBranch}" })
 ${integrateStep}
 3. resolve any merge conflicts if needed
 4. retry push_branch`
-          );
+            );
+          }
+          if (kind === "transient" && attempt < TRANSIENT_RETRY_DELAYS_MS.length) {
+            const baseDelay = TRANSIENT_RETRY_DELAYS_MS[attempt] ?? 5e3;
+            const delay2 = Math.round(baseDelay * (0.75 + Math.random() * 0.5));
+            log.info(
+              `push attempt ${attempt + 1} failed (transient), retrying in ${delay2}ms: ${msg.slice(0, 300)}`
+            );
+            await new Promise((r) => setTimeout(r, delay2));
+            continue;
+          }
+          throw err;
         }
-        throw err;
+      }
+      if (!pushed) {
+        throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
       }
       return {
         success: true,
@@ -145416,35 +145563,20 @@ async function getReviewThreads(input) {
   const username = input.approvedBy;
   return threadsForReview.filter((thread) => threadHasThumbsUpFrom(thread, username));
 }
-async function getReviewData(input) {
-  const [review, threads] = await Promise.all([
-    input.octokit.rest.pulls.getReview({
-      owner: input.owner,
-      repo: input.name,
-      pull_number: input.pullNumber,
-      review_id: input.reviewId
-    }),
-    getReviewThreads(input)
-  ]);
-  const rawReviewBody = review.data.body;
+function formatReviewData(input) {
+  const rawReviewBody = input.review.body;
   const reviewBody = rawReviewBody ? stripExistingFooter(rawReviewBody) : "";
-  const reviewer = review.data.user?.login ?? "unknown";
-  if (threads.length === 0 && !reviewBody) return void 0;
+  const reviewer = input.review.user?.login ?? "unknown";
+  if (input.threads.length === 0 && !reviewBody) return void 0;
   let threadBlocks = [];
-  if (threads.length > 0) {
-    const prFiles = await input.octokit.paginate(input.octokit.rest.pulls.listFiles, {
-      owner: input.owner,
-      repo: input.name,
-      pull_number: input.pullNumber,
-      per_page: 100
-    });
+  if (input.threads.length > 0) {
     const filePatchMap = /* @__PURE__ */ new Map();
-    for (const file2 of prFiles) {
+    for (const file2 of input.prFiles) {
       if (file2.patch) {
         filePatchMap.set(file2.filename, parseFilePatches(file2.patch));
       }
     }
-    threadBlocks = buildThreadBlocks(threads, filePatchMap, input.reviewId);
+    threadBlocks = buildThreadBlocks(input.threads, filePatchMap, input.reviewId);
   }
   const formatted = formatReviewThreads(threadBlocks, {
     pullNumber: input.pullNumber,
@@ -145454,6 +145586,30 @@ async function getReviewData(input) {
   });
   return { threadBlocks, reviewer, formatted };
 }
+async function getReviewData(input) {
+  const [review, threads] = await Promise.all([
+    input.octokit.rest.pulls.getReview({
+      owner: input.owner,
+      repo: input.name,
+      pull_number: input.pullNumber,
+      review_id: input.reviewId
+    }),
+    getReviewThreads(input)
+  ]);
+  const prFiles = threads.length > 0 ? await input.octokit.paginate(input.octokit.rest.pulls.listFiles, {
+    owner: input.owner,
+    repo: input.name,
+    pull_number: input.pullNumber,
+    per_page: 100
+  }) : [];
+  return formatReviewData({
+    review: review.data,
+    threads,
+    prFiles,
+    pullNumber: input.pullNumber,
+    reviewId: input.reviewId
+  });
+}
 function GetReviewCommentsTool(ctx) {
   return tool({
     name: "get_review_comments",
@@ -146470,14 +146626,13 @@ function UploadFileTool(ctx) {
 
 // mcp/server.ts
 function initToolState(params) {
-  const parsed2 = params.progressCommentId ? parseInt(params.progressCommentId, 10) : NaN;
-  const resolvedId = Number.isNaN(parsed2) || parsed2 <= 0 ? void 0 : parsed2;
-  if (resolvedId) {
-    log.info(`\xBB using pre-created progress comment: ${resolvedId}`);
+  const resolved = parseProgressComment(params.progressComment);
+  if (resolved) {
+    log.info(`\xBB using pre-created progress comment: ${resolved.id} (${resolved.type})`);
   }
   return {
-    progressCommentId: resolvedId,
-    hadProgressComment: !!resolvedId,
+    progressComment: resolved,
+    hadProgressComment: !!resolved,
     backgroundProcesses: /* @__PURE__ */ new Map(),
     usageEntries: []
   };
@@ -152214,8 +152369,8 @@ async function reportErrorToComment(ctx) {
   const formattedError = ctx.title ? `${ctx.title}
 
 ${ctx.error}` : ctx.error;
-  const commentId = ctx.toolState.progressCommentId;
-  if (!commentId) {
+  const comment = ctx.toolState.progressComment;
+  if (!comment) {
     return;
   }
   const repoContext = parseRepoContext();
@@ -152234,12 +152389,11 @@ ${ctx.error}` : ctx.error;
     customParts,
     model: ctx.toolState.model
   });
-  await octokit.rest.issues.updateComment({
-    owner: repoContext.owner,
-    repo: repoContext.name,
-    comment_id: commentId,
-    body: `${formattedError}${footer}`
-  });
+  await updateProgressComment(
+    { octokit, owner: repoContext.owner, repo: repoContext.name },
+    comment,
+    `${formattedError}${footer}`
+  );
   ctx.toolState.wasUpdated = true;
 }
 
@@ -152739,7 +152893,10 @@ var JsonPayload = type({
   "eventInstructions?": "string",
   "event?": "object",
   "timeout?": "string | undefined",
-  "progressCommentId?": "string | undefined"
+  "progressComment?": type({
+    id: "string",
+    type: "'issue' | 'review'"
+  }).or("undefined")
 });
 var COLLABORATOR_PERMISSIONS = ["admin", "maintain", "write"];
 function isCollaborator(event) {
@@ -152821,7 +152978,7 @@ function resolvePayload(resolvedPromptInput, repoSettings) {
     event,
     timeout: inputs.timeout ?? jsonPayload?.timeout,
     cwd: resolveCwd(inputs.cwd),
-    progressCommentId: jsonPayload?.progressCommentId,
+    progressComment: jsonPayload?.progressComment,
     // permissions: inputs > repoSettings > fallbacks
     push: inputs.push ?? repoSettings.push ?? "restricted",
     shell: resolvedShell,
@@ -152929,10 +153086,10 @@ async function handleAgentResult(ctx) {
   };
 }
 
-// utils/runContextData.ts
-var core5 = __toESM(require_core(), 1);
-
 // utils/runContext.ts
+function isInfraCovered(params) {
+  return params.isOss || params.plan === "payg";
+}
 var defaultSettings = {
   model: null,
   modes: [],
@@ -152950,7 +153107,8 @@ var defaultSettings = {
 var defaultRunContext = {
   settings: defaultSettings,
   apiToken: "",
-  oss: false
+  oss: false,
+  plan: "none"
 };
 async function fetchRunContext(params) {
   const timeoutMs = 3e4;
@@ -152989,6 +153147,7 @@ async function fetchRunContext(params) {
       },
       apiToken: data.apiToken,
       oss: data.oss ?? false,
+      plan: data.plan ?? "none",
       proxyModel: data.proxyModel,
       dbSecrets: data.dbSecrets
     };
@@ -152999,6 +153158,7 @@ async function fetchRunContext(params) {
 }
 
 // utils/runContextData.ts
+var core5 = __toESM(require_core(), 1);
 async function resolveRunContextData(params) {
   log.info(`\xBB running Pullfrog v${package_default.version}...`);
   const repoContext = parseRepoContext();
@@ -153020,6 +153180,7 @@ async function resolveRunContextData(params) {
     repoSettings: runContext.settings,
     apiToken: runContext.apiToken,
     oss: runContext.oss,
+    plan: runContext.plan,
     proxyModel: runContext.proxyModel,
     dbSecrets: runContext.dbSecrets
   };
@@ -153346,6 +153507,59 @@ function resolveAgentForLog(ctx) {
   }
   return ctx.agentName;
 }
+var BillingError = class extends Error {
+  code;
+  declineCode;
+  needsReauthentication;
+  constructor(message, opts = {}) {
+    super(message);
+    this.name = "BillingError";
+    this.code = opts.code ?? null;
+    this.declineCode = opts.declineCode ?? null;
+    this.needsReauthentication = opts.needsReauthentication ?? false;
+  }
+};
+var TransientError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "TransientError";
+  }
+};
+function formatBillingErrorSummary(error49) {
+  if (error49.code === "router_requires_card") {
+    return [
+      "### \u26D4 Pullfrog Router requires a card",
+      "",
+      "This run was going to use Pullfrog Router, which bills at raw OpenRouter cost and needs a card on file. Runs won't proceed until a card is added.",
+      "",
+      "[Add a card \u2192](https://pullfrog.com/console#model-access) \u2014 your first $20 of Router usage is free."
+    ].join("\n");
+  }
+  if (error49.needsReauthentication) {
+    return [
+      "### \u274C Pullfrog billing error \u2014 card requires 3DS on every charge",
+      "",
+      `Your card issuer requires a 3D Secure challenge on each off-session charge (\`${error49.declineCode ?? "authentication_required"}\`), which we can't run from the agent. Top up your Router credit balance manually \u2014 3DS runs interactively in Stripe Checkout, and subsequent runs draw from the prepaid balance without triggering another off-session charge.`,
+      "",
+      "[Top up your Router credit balance \u2192](https://pullfrog.com/console)"
+    ].join("\n");
+  }
+  const codeSuffix = error49.declineCode ? ` (\`${error49.declineCode}\`)` : "";
+  return `### \u274C Pullfrog billing error
+
+${error49.message}${codeSuffix}
+
+[Manage billing \u2192](https://pullfrog.com/console)`;
+}
+function formatTransientErrorSummary(error49) {
+  return [
+    "### \u26A0\uFE0F Pullfrog temporarily unavailable",
+    "",
+    error49.message,
+    "",
+    "This is typically transient \u2014 the next dispatch should succeed. If it persists, check [status.pullfrog.com](https://status.pullfrog.com)."
+  ].join("\n");
+}
 async function mintProxyKey(ctx) {
   try {
     process.env.ACTIONS_ID_TOKEN_REQUEST_URL = ctx.oidcCredentials.requestUrl;
@@ -153358,6 +153572,20 @@ async function mintProxyKey(ctx) {
       method: "POST",
       headers: { Authorization: `Bearer ${oidcToken}` }
     });
+    if (response.status === 402) {
+      const body = await response.json().catch(() => null);
+      throw new BillingError(body?.error ?? "insufficient balance", {
+        code: body?.code ?? null,
+        declineCode: body?.declineCode ?? null,
+        needsReauthentication: body?.needsReauthentication ?? false
+      });
+    }
+    if (response.status === 503) {
+      const body = await response.json().catch(() => null);
+      throw new TransientError(
+        body?.error ?? "billing service temporarily unavailable \u2014 retry shortly"
+      );
+    }
     if (!response.ok) {
       log.warning(`proxy key mint failed (${response.status})`);
       return null;
@@ -153365,6 +153593,8 @@ async function mintProxyKey(ctx) {
     const data = await response.json();
     return data.key;
   } catch (error49) {
+    if (error49 instanceof BillingError) throw error49;
+    if (error49 instanceof TransientError) throw error49;
     log.warning(`proxy key mint error: ${error49 instanceof Error ? error49.message : String(error49)}`);
     return null;
   } finally {
@@ -153374,19 +153604,19 @@ async function mintProxyKey(ctx) {
 }
 async function resolveProxyModel(ctx) {
   if (process.env.PULLFROG_MODEL?.trim()) return;
-  if (ctx.oss && ctx.proxyModel) {
-    if (!ctx.oidcCredentials) {
-      log.warning("\xBB oss repo but no OIDC credentials available \u2014 skipping proxy");
-      return;
-    }
-    const key = await mintProxyKey({ oidcCredentials: ctx.oidcCredentials });
-    if (!key) return;
-    process.env.OPENROUTER_API_KEY = key;
-    core6.setSecret(key);
-    ctx.payload.proxyModel = ctx.proxyModel;
-    log.info(`\xBB proxy: oss \u2192 ${ctx.proxyModel}`);
+  const needsProxy = isInfraCovered({ isOss: ctx.oss, plan: ctx.plan }) && ctx.proxyModel;
+  if (!needsProxy) return;
+  if (!ctx.oidcCredentials) {
+    log.warning("\xBB proxy requested but no OIDC credentials available \u2014 skipping");
     return;
   }
+  const key = await mintProxyKey({ oidcCredentials: ctx.oidcCredentials });
+  if (!key) return;
+  process.env.OPENROUTER_API_KEY = key;
+  core6.setSecret(key);
+  ctx.payload.proxyModel = ctx.proxyModel;
+  const label = ctx.oss ? "oss" : "router";
+  log.info(`\xBB proxy: ${label} \u2192 ${ctx.proxyModel}`);
 }
 async function writeJobSummary(toolState) {
   const usageSummary = formatUsageSummary(toolState.usageEntries);
@@ -153408,7 +153638,7 @@ async function main() {
     let safetyNetTimer;
     const resolvedPromptInput = resolvePromptInput();
     const toolState = initToolState({
-      progressCommentId: typeof resolvedPromptInput !== "string" ? resolvedPromptInput.progressCommentId : void 0
+      progressComment: typeof resolvedPromptInput !== "string" ? resolvedPromptInput.progressComment : void 0
     });
     resolveGit();
     const jobToken = getJobToken();
@@ -153442,12 +153672,33 @@ async function main() {
       delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
       delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
     }
-    await resolveProxyModel({
-      payload,
-      oss: runContext.oss,
-      proxyModel: runContext.proxyModel,
-      oidcCredentials
-    });
+    try {
+      await resolveProxyModel({
+        payload,
+        oss: runContext.oss,
+        plan: runContext.plan,
+        proxyModel: runContext.proxyModel,
+        oidcCredentials
+      });
+    } catch (error49) {
+      if (error49 instanceof BillingError) {
+        const summary2 = formatBillingErrorSummary(error49);
+        await writeSummary(summary2).catch(() => {
+        });
+        await reportErrorToComment({ toolState, error: summary2 }).catch(() => {
+        });
+        throw error49;
+      }
+      if (error49 instanceof TransientError) {
+        const summary2 = formatTransientErrorSummary(error49);
+        await writeSummary(summary2).catch(() => {
+        });
+        await reportErrorToComment({ toolState, error: summary2 }).catch(() => {
+        });
+        throw error49;
+      }
+      throw error49;
+    }
     const octokit = createOctokit(tokenRef.mcpToken);
     const runInfo = await resolveRun({ octokit });
     let toolContext;
@@ -153521,6 +153772,8 @@ async function main() {
           jobId: runInfo.jobId,
           mcpServerUrl: "",
           tmpdir: tmpdir3,
+          oss: runContext.oss,
+          plan: runContext.plan,
           resolvedModel
         };
         const mcpHttpServer = __using(_stack, await startMcpHttpServer(toolContext, { outputSchema }), true);
@@ -153584,6 +153837,9 @@ ${instructions.user}` : null,
           }
         });
         toolState.todoTracker = todoTracker;
+        onExitSignal(() => {
+          todoTracker?.cancel();
+        });
         let innerTimeoutFired = false;
         const onInnerActivityTimeout = () => {
           if (innerTimeoutFired) return;
@@ -153669,7 +153925,7 @@ ${instructions.user}` : null,
           });
         }
         const trackerWasLastWriter = todoTracker?.hasPublished && !toolState.finalSummaryWritten;
-        if (toolContext && toolState.progressCommentId && (!toolState.wasUpdated || trackerWasLastWriter)) {
+        if (toolContext && toolState.progressComment && (!toolState.wasUpdated || trackerWasLastWriter)) {
           await deleteProgressComment(toolContext).catch((error49) => {
             log.debug(`stranded progress comment cleanup failed: ${error49}`);
           });
@@ -153777,32 +154033,36 @@ The workflow encountered an error before any progress could be reported.`;
   return `${errorMessage}${footer}`;
 }
 async function validateStuckProgressComment(ctx) {
-  if (!ctx.promptInput?.progressCommentId) {
-    log.info("[post] no progressCommentId in prompt input, skipping cleanup");
+  const promptComment = ctx.promptInput?.progressComment;
+  if (!promptComment) {
+    log.info("[post] no progressComment in prompt input, skipping cleanup");
+    return null;
+  }
+  const comment = parseProgressComment(promptComment);
+  if (!comment) {
+    log.info(`[post] progressComment.id is not a positive integer: ${promptComment.id}`);
     return null;
   }
-  const commentId = parseInt(ctx.promptInput.progressCommentId, 10);
-  log.info(`[post] validating progressCommentId from prompt input: ${commentId}`);
+  log.info(`[post] validating progressComment from prompt input: ${comment.id} (${comment.type})`);
   try {
-    const commentResult = await ctx.octokit.rest.issues.getComment({
-      owner: ctx.repoContext.owner,
-      repo: ctx.repoContext.name,
-      comment_id: commentId
-    });
-    const body = commentResult.data.body ?? "";
+    const fetched = await getProgressComment(
+      { octokit: ctx.octokit, owner: ctx.repoContext.owner, repo: ctx.repoContext.name },
+      comment
+    );
+    const body = fetched.body ?? "";
     if (isLeapingIntoActionCommentBody(body)) {
-      log.info(`[post] comment ${commentId} is stuck on "Leaping into action"`);
-      return commentId;
+      log.info(`[post] comment ${comment.id} is stuck on "Leaping into action"`);
+      return comment;
     }
     if (/^- \[[ x]\] |^- \*\*→\*\* |^- ~~/.test(body)) {
-      log.info(`[post] comment ${commentId} is stuck on a todo checklist`);
-      return commentId;
+      log.info(`[post] comment ${comment.id} is stuck on a todo checklist`);
+      return comment;
     }
-    log.info(`[post] comment ${commentId} is not stuck (already updated or different content)`);
+    log.info(`[post] comment ${comment.id} is not stuck (already updated or different content)`);
     return null;
   } catch (error49) {
     const errorMessage = error49 instanceof Error ? error49.message : String(error49);
-    log.info(`[post] failed to get comment ${commentId}: ${errorMessage}`);
+    log.info(`[post] failed to get comment ${comment.id}: ${errorMessage}`);
     return null;
   }
 }
@@ -153853,26 +154113,56 @@ async function runPostCleanup() {
   const repoContext = parseRepoContext();
   const octokit = createOctokit(token);
   const ctx = { repoContext, octokit, runId, promptInput };
-  const commentId = await validateStuckProgressComment(ctx);
-  if (!commentId) return log.info("\xBB [post] no stuck progress comment to update, skipping cleanup");
-  log.info(`\xBB [post] validated stuck comment: ${commentId}, updating with error message`);
+  const stuck = await validateStuckProgressComment(ctx);
+  if (!stuck) return log.info("\xBB [post] no stuck progress comment to update, skipping cleanup");
+  log.info(
+    `\xBB [post] validated stuck comment: ${stuck.id} (${stuck.type}), updating with error message`
+  );
   try {
     const body = buildErrorCommentBody(
       ctx,
       SHOULD_CHECK_REASON ? await getIsCancelled(ctx) : false
     );
-    await ctx.octokit.rest.issues.updateComment({
-      owner: ctx.repoContext.owner,
-      repo: ctx.repoContext.name,
-      comment_id: commentId,
-      body
-    });
-    log.info("\xBB [post] successfully updated progress comment");
+    await writeAndVerify(ctx, stuck, body);
   } catch (error49) {
     const errorMessage = error49 instanceof Error ? error49.message : String(error49);
     log.info(`[post] failed to update comment: ${errorMessage}`);
   }
 }
+var VERIFY_DELAY_MS = 3e3;
+var MAX_WRITE_ATTEMPTS = 3;
+async function writeAndVerify(ctx, comment, body) {
+  const apiCtx = {
+    octokit: ctx.octokit,
+    owner: ctx.repoContext.owner,
+    repo: ctx.repoContext.name
+  };
+  for (let attempt = 1; attempt <= MAX_WRITE_ATTEMPTS; attempt++) {
+    await updateProgressComment(apiCtx, comment, body);
+    await new Promise((resolve3) => setTimeout(resolve3, VERIFY_DELAY_MS));
+    let fetched;
+    try {
+      fetched = await getProgressComment(apiCtx, comment);
+    } catch (error49) {
+      log.warning(
+        `[post] verify GET failed after attempt ${attempt} \u2014 trusting our PUT landed: ${error49 instanceof Error ? error49.message : String(error49)}`
+      );
+      return;
+    }
+    if (fetched.body === body) {
+      log.info(
+        `\xBB [post] successfully updated progress comment (attempt ${attempt}/${MAX_WRITE_ATTEMPTS})`
+      );
+      return;
+    }
+    log.info(
+      `[post] body was overwritten after our write (attempt ${attempt}/${MAX_WRITE_ATTEMPTS}), retrying`
+    );
+  }
+  log.warning(
+    `[post] gave up after ${MAX_WRITE_ATTEMPTS} attempts \u2014 comment may be stale (in-flight writes from the cancelled run kept clobbering us)`
+  );
+}
 
 // commands/gha.ts
 process.env.PATH = `${dirname4(process.execPath)}:${process.env.PATH}`;
@@ -155659,7 +155949,7 @@ async function run2() {
 }
 
 // cli.ts
-var VERSION10 = "0.0.203";
+var VERSION10 = "0.0.204";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);