pullfrog 0.1.17 → 0.1.18

package/dist/cli.mjs

@@ -101880,7 +101880,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.17",
+  version: "0.1.18",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -108084,7 +108084,7 @@ function newTurn() {
   };
 }
 async function consumeEvents(ctx, signal) {
-  const result = await ctx.client.event.subscribe();
+  const result = await ctx.client.event.subscribe({}, { signal });
   for await (const event of result.stream) {
     if (signal.aborted) break;
     ctx.eventCount += 1;
@@ -151963,6 +151963,30 @@ function classifyPushError(msg) {
   return "unknown";
 }
 var TRANSIENT_RETRY_DELAYS_MS = [2e3, 5e3];
+async function pushWithRetry(args2, token) {
+  let lastErr;
+  for (let attempt = 0; attempt <= TRANSIENT_RETRY_DELAYS_MS.length; attempt++) {
+    try {
+      await $git("push", args2, { token });
+      if (attempt > 0) log.info(`push succeeded on attempt ${attempt + 1}`);
+      return;
+    } catch (err) {
+      lastErr = err;
+      const msg = err instanceof Error ? err.message : String(err);
+      if (classifyPushError(msg) === "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 lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+}
 function PushBranchTool(ctx) {
   const defaultBranch = ctx.repo.data.default_branch || "main";
   const pushPermission = ctx.payload.push;
@@ -152030,48 +152054,23 @@ ${postHookStatus}`
       if (force) {
         log.warning(`force pushing - this will overwrite remote history`);
       }
-      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).
+      try {
+        await pushWithRetry(pushArgs, ctx.gitToken);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        if (classifyPushError(msg) === "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;
+          );
         }
-      }
-      if (!pushed) {
-        throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+        throw err;
       }
       const pushedSha = $2("git", ["rev-parse", "HEAD"], { log: false }).trim();
       log.info(
@@ -152314,9 +152313,7 @@ function DeleteBranchTool(ctx) {
           `Blocked: cannot delete the default branch '${defaultBranch}'. If you really need to delete or rename it, do it manually via the repository settings.`
         );
       }
-      await $git("push", ["origin", "--delete", `refs/heads/${params.branchName}`], {
-        token: ctx.gitToken
-      });
+      await pushWithRetry(["origin", "--delete", `refs/heads/${params.branchName}`], ctx.gitToken);
       log.info(`\xBB deleted branch ${params.branchName}`);
       return { success: true, deleted: params.branchName };
     })
@@ -152340,9 +152337,7 @@ function PushTagsTool(ctx) {
       }
       validateTagName(params.tag);
       const pushArgs = [...params.force ? ["-f"] : [], "origin", `refs/tags/${params.tag}`];
-      await $git("push", pushArgs, {
-        token: ctx.gitToken
-      });
+      await pushWithRetry(pushArgs, ctx.gitToken);
       log.info(`\xBB pushed tag ${params.tag}`);
       return { success: true, tag: params.tag };
     })
@@ -161267,6 +161262,13 @@ function formatGenericFailure(errorMessage) {
     "```"
   ].join("\n");
 }
+function formatMinimalFailureComment(repo) {
+  const runId = process.env.GITHUB_RUN_ID;
+  if (!runId) return "**Run failed.**";
+  const server = process.env.GITHUB_SERVER_URL ?? "https://github.com";
+  const url4 = `${server}/${repo.owner}/${repo.name}/actions/runs/${runId}`;
+  return `**Run failed.** [View the logs \u2192](${url4})`;
+}
 var PROVIDER_BILLING_URLS = {
   deepseek: "https://platform.deepseek.com/top_up",
   anthropic: "https://console.anthropic.com/settings/billing",
@@ -161340,11 +161342,12 @@ ${body}`, comment: body };
     return { summary: body, comment: body };
   }
   if (hangBody) {
+    const isBillingExhausted = input.agentDiagnostic?.lastProviderError === "provider billing exhausted";
     return {
       summary: `### \u274C Pullfrog failed
 
 ${hangBody}`,
-      comment: hangBody
+      comment: isBillingExhausted ? hangBody : formatMinimalFailureComment(input.repo)
     };
   }
   const genericBody = formatGenericFailure(input.errorMessage);
@@ -161352,7 +161355,7 @@ ${hangBody}`,
     summary: `### \u274C Pullfrog failed
 
 ${genericBody}`,
-    comment: genericBody
+    comment: formatMinimalFailureComment(input.repo)
   };
 }
 
@@ -163002,7 +163005,7 @@ async function run2() {
 }
 
 // cli.ts
-var VERSION10 = "0.1.17";
+var VERSION10 = "0.1.18";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);

package/dist/index.js

@@ -100080,7 +100080,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.17",
+  version: "0.1.18",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -106326,7 +106326,7 @@ function newTurn() {
   };
 }
 async function consumeEvents(ctx, signal) {
-  const result = await ctx.client.event.subscribe();
+  const result = await ctx.client.event.subscribe({}, { signal });
   for await (const event of result.stream) {
     if (signal.aborted) break;
     ctx.eventCount += 1;
@@ -150205,6 +150205,30 @@ function classifyPushError(msg) {
   return "unknown";
 }
 var TRANSIENT_RETRY_DELAYS_MS = [2e3, 5e3];
+async function pushWithRetry(args2, token) {
+  let lastErr;
+  for (let attempt = 0; attempt <= TRANSIENT_RETRY_DELAYS_MS.length; attempt++) {
+    try {
+      await $git("push", args2, { token });
+      if (attempt > 0) log.info(`push succeeded on attempt ${attempt + 1}`);
+      return;
+    } catch (err) {
+      lastErr = err;
+      const msg = err instanceof Error ? err.message : String(err);
+      if (classifyPushError(msg) === "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 lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+}
 function PushBranchTool(ctx) {
   const defaultBranch = ctx.repo.data.default_branch || "main";
   const pushPermission = ctx.payload.push;
@@ -150272,48 +150296,23 @@ ${postHookStatus}`
       if (force) {
         log.warning(`force pushing - this will overwrite remote history`);
       }
-      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).
+      try {
+        await pushWithRetry(pushArgs, ctx.gitToken);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        if (classifyPushError(msg) === "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;
+          );
         }
-      }
-      if (!pushed) {
-        throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+        throw err;
       }
       const pushedSha = $("git", ["rev-parse", "HEAD"], { log: false }).trim();
       log.info(
@@ -150556,9 +150555,7 @@ function DeleteBranchTool(ctx) {
           `Blocked: cannot delete the default branch '${defaultBranch}'. If you really need to delete or rename it, do it manually via the repository settings.`
         );
       }
-      await $git("push", ["origin", "--delete", `refs/heads/${params.branchName}`], {
-        token: ctx.gitToken
-      });
+      await pushWithRetry(["origin", "--delete", `refs/heads/${params.branchName}`], ctx.gitToken);
       log.info(`\xBB deleted branch ${params.branchName}`);
       return { success: true, deleted: params.branchName };
     })
@@ -150582,9 +150579,7 @@ function PushTagsTool(ctx) {
       }
       validateTagName(params.tag);
       const pushArgs = [...params.force ? ["-f"] : [], "origin", `refs/tags/${params.tag}`];
-      await $git("push", pushArgs, {
-        token: ctx.gitToken
-      });
+      await pushWithRetry(pushArgs, ctx.gitToken);
       log.info(`\xBB pushed tag ${params.tag}`);
       return { success: true, tag: params.tag };
     })
@@ -159509,6 +159504,13 @@ function formatGenericFailure(errorMessage) {
     "```"
   ].join("\n");
 }
+function formatMinimalFailureComment(repo) {
+  const runId = process.env.GITHUB_RUN_ID;
+  if (!runId) return "**Run failed.**";
+  const server = process.env.GITHUB_SERVER_URL ?? "https://github.com";
+  const url4 = `${server}/${repo.owner}/${repo.name}/actions/runs/${runId}`;
+  return `**Run failed.** [View the logs \u2192](${url4})`;
+}
 var PROVIDER_BILLING_URLS = {
   deepseek: "https://platform.deepseek.com/top_up",
   anthropic: "https://console.anthropic.com/settings/billing",
@@ -159582,11 +159584,12 @@ ${body}`, comment: body };
     return { summary: body, comment: body };
   }
   if (hangBody) {
+    const isBillingExhausted = input.agentDiagnostic?.lastProviderError === "provider billing exhausted";
     return {
       summary: `### \u274C Pullfrog failed
 
 ${hangBody}`,
-      comment: hangBody
+      comment: isBillingExhausted ? hangBody : formatMinimalFailureComment(input.repo)
     };
   }
   const genericBody = formatGenericFailure(input.errorMessage);
@@ -159594,7 +159597,7 @@ ${hangBody}`,
     summary: `### \u274C Pullfrog failed
 
 ${genericBody}`,
-    comment: genericBody
+    comment: formatMinimalFailureComment(input.repo)
   };
 }
 

package/dist/utils/runErrorRenderer.d.ts

@@ -30,18 +30,24 @@
  *   5. Activity-timeout hang — `errorMessage` starts with
  *      `"activity timeout"` or `"agent still pending"` AND none of the
  *      above matched. The harness keeps structured diagnostic state on
- *      `toolState.agentDiagnostic`; `formatAgentHangBody` renders that as
- *      a markdown block.
- *
- *   6. Default — a plain-English lead sentence explaining the run failed,
- *      followed by the raw error message in a fenced code block (so the user
- *      never sees a bare internal string). The job summary adds the
- *      `### ❌ Pullfrog failed` banner on top of the same body.
- *
- * 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.
+ *      `toolState.agentDiagnostic`; `formatAgentHangBody` renders that into
+ *      the job summary. The PR comment instead collapses to a one-line
+ *      `**Run failed.** [View the logs →]` — the watchdog jargon, event
+ *      counts, and benign stderr tail are operator-grade detail that only
+ *      alarm the average user. The one exception is a hang masking billing
+ *      exhaustion (#778), where `formatAgentHangBody` emits an actionable
+ *      top-up CTA that the comment keeps verbatim.
+ *
+ *   6. Default — the job summary gets a plain-English lead sentence plus the
+ *      raw error in a fenced code block under the `### ❌ Pullfrog failed`
+ *      banner; the PR comment collapses to the same one-line logs link as
+ *      the hang case, since the raw internal string helps nobody on the PR.
+ *
+ * Net: the actionable classifications (billing, API-key, model-not-found)
+ * render identical bodies on both surfaces; the non-actionable ones (hang,
+ * generic) keep the forensics in the Actions job summary and show a calm
+ * one-liner in the PR comment, whose footer already carries Pullfrog
+ * branding + rerun links.
  */
 import type { AgentDiagnostic } from "./agentHangReport.ts";
 export type RenderedRunError = {

package/package.json

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