pullfrog 0.1.7 → 0.1.8

package/dist/index.js

@@ -142414,7 +142414,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.7",
+  version: "0.1.8",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -142882,6 +142882,51 @@ function readNumber(params) {
 import { execSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { readFileSync as readFileSync2, realpathSync, unlinkSync } from "node:fs";
+
+// utils/shell.ts
+import { spawnSync as spawnSync2 } from "node:child_process";
+function $(cmd, args2, options) {
+  const encoding = options?.encoding ?? "utf-8";
+  const env2 = resolveEnv(options?.env);
+  const result = spawnSync2(cmd, args2, {
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding,
+    cwd: options?.cwd,
+    env: env2
+  });
+  const stdout = result.stdout ?? "";
+  const stderr = result.stderr ?? "";
+  if (options?.log !== false) {
+    const canWriteToStdout = process.stdout.isTTY === true;
+    if (stdout) {
+      if (canWriteToStdout) {
+        process.stdout.write(stdout);
+      } else {
+        process.stderr.write(stdout);
+      }
+    }
+    if (stderr) {
+      process.stderr.write(stderr);
+    }
+  }
+  if (result.status !== 0) {
+    const errorResult = {
+      status: result.status ?? -1,
+      stdout,
+      stderr
+    };
+    if (options?.onError) {
+      options.onError(errorResult);
+      return stdout.trim();
+    }
+    throw new Error(
+      `Command failed with exit code ${errorResult.status}: ${stderr || "Unknown error"}`
+    );
+  }
+  return stdout.trim();
+}
+
+// utils/gitAuth.ts
 var gitBinary;
 function hashFile(path3) {
   return createHash("sha256").update(readFileSync2(path3)).digest("hex");
@@ -142973,6 +143018,27 @@ ${stdout}` : stderr || stdout || "(no output)";
     }
   }
 }
+var SHALLOW_UNREACHABLE_PATTERNS = [
+  /Could not read [a-f0-9]{40,64}/,
+  /remote did not send all necessary objects/
+];
+var DEEPEN_RETRY_DEPTH = 1e3;
+async function $gitFetchWithDeepen(args2, options, label) {
+  try {
+    return await $git("fetch", args2, options);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    const isShallowUnreachable = SHALLOW_UNREACHABLE_PATTERNS.some((p) => p.test(msg));
+    if (!isShallowUnreachable) throw err;
+    const isShallow = $("git", ["rev-parse", "--is-shallow-repository"], { log: false }).trim() === "true";
+    if (!isShallow) throw err;
+    log.info(
+      `\xBB ${label ?? "git fetch"} hit shallow-unreachable error, retrying with --deepen=${DEEPEN_RETRY_DEPTH}`
+    );
+    const retryArgs = args2.filter((a) => !a.startsWith("--depth="));
+    return await $git("fetch", [`--deepen=${DEEPEN_RETRY_DEPTH}`, ...retryArgs], options);
+  }
+}
 
 // lifecycle.ts
 var LIFECYCLE_HOOK_TIMEOUT_MS = 6e5;
@@ -143014,49 +143080,6 @@ async function executeLifecycleHook(params) {
   }
 }
 
-// utils/shell.ts
-import { spawnSync as spawnSync2 } from "node:child_process";
-function $(cmd, args2, options) {
-  const encoding = options?.encoding ?? "utf-8";
-  const env2 = resolveEnv(options?.env);
-  const result = spawnSync2(cmd, args2, {
-    stdio: ["ignore", "pipe", "pipe"],
-    encoding,
-    cwd: options?.cwd,
-    env: env2
-  });
-  const stdout = result.stdout ?? "";
-  const stderr = result.stderr ?? "";
-  if (options?.log !== false) {
-    const canWriteToStdout = process.stdout.isTTY === true;
-    if (stdout) {
-      if (canWriteToStdout) {
-        process.stdout.write(stdout);
-      } else {
-        process.stderr.write(stdout);
-      }
-    }
-    if (stderr) {
-      process.stderr.write(stderr);
-    }
-  }
-  if (result.status !== 0) {
-    const errorResult = {
-      status: result.status ?? -1,
-      stdout,
-      stderr
-    };
-    if (options?.onError) {
-      options.onError(errorResult);
-      return stdout.trim();
-    }
-    throw new Error(
-      `Command failed with exit code ${errorResult.status}: ${stderr || "Unknown error"}`
-    );
-  }
-  return stdout.trim();
-}
-
 // utils/rangeDiff.ts
 function computeIncrementalDiff(params) {
   try {
@@ -143451,11 +143474,6 @@ var GitFetch = type({
   ref: type.string.describe("Ref to fetch: branch name, tag, or 'pull/N/head' for PRs"),
   depth: type.number.describe("Fetch depth (for shallow clones)").optional()
 });
-var SHALLOW_UNREACHABLE_PATTERNS = [
-  /Could not read [a-f0-9]{40,64}/,
-  /remote did not send all necessary objects/
-];
-var DEEPEN_RETRY_DEPTH = 1e3;
 function GitFetchTool(ctx) {
   return tool({
     name: "git_fetch",
@@ -143467,20 +143485,7 @@ function GitFetchTool(ctx) {
       if (params.depth !== void 0) {
         fetchArgs.push(`--depth=${params.depth}`);
       }
-      try {
-        await $git("fetch", fetchArgs, { token: ctx.gitToken });
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        const isShallowUnreachable = SHALLOW_UNREACHABLE_PATTERNS.some((p) => p.test(msg));
-        const isShallow = isShallowUnreachable && $("git", ["rev-parse", "--is-shallow-repository"], { log: false }).trim() === "true";
-        if (!isShallow) throw err;
-        log.info(
-          `\xBB git_fetch hit shallow-unreachable error, retrying with --deepen=${DEEPEN_RETRY_DEPTH}`
-        );
-        await $git("fetch", [`--deepen=${DEEPEN_RETRY_DEPTH}`, "--no-tags", "origin", params.ref], {
-          token: ctx.gitToken
-        });
-      }
+      await $gitFetchWithDeepen(fetchArgs, { token: ctx.gitToken }, "git_fetch");
       return { success: true, ref: params.ref };
     })
   });
@@ -144204,10 +144209,10 @@ async function ensureBeforeShaReachable(params) {
         sha: params.sha,
         ref: tempBranch
       }), true);
-      await $git(
-        "fetch",
+      await $gitFetchWithDeepen(
         ["--no-tags", ...params.isShallow ? ["--depth=1"] : [], "origin", tempBranch],
-        { token: params.gitToken }
+        { token: params.gitToken },
+        `before_sha temp branch ${tempBranch}`
       );
       log.debug(`\xBB fetched before_sha via temp branch ${tempBranch}`);
       return true;
@@ -144283,16 +144288,22 @@ async function checkoutPrBranch(pr, params) {
   toolState.checkoutSha = $("git", ["rev-parse", "HEAD"], { log: false }).trim();
   const alreadyOnBranch = toolState.checkoutSha === pr.headSha;
   log.debug(`\xBB fetching base branch (${pr.baseRef})...`);
-  await $git("fetch", ["--no-tags", "origin", pr.baseRef], { token: gitToken });
+  await $gitFetchWithDeepen(
+    ["--no-tags", "origin", pr.baseRef],
+    { token: gitToken },
+    `base branch ${pr.baseRef}`
+  );
   if (!alreadyOnBranch) {
     $("git", ["checkout", "-B", pr.baseRef, `origin/${pr.baseRef}`], { log: false });
     log.debug(`\xBB fetching PR #${pr.number} (${localBranch})...`);
     await retry(
       async () => {
         try {
-          await $git("fetch", ["--no-tags", "origin", `+pull/${pr.number}/head:${localBranch}`], {
-            token: gitToken
-          });
+          await $gitFetchWithDeepen(
+            ["--no-tags", "origin", `+pull/${pr.number}/head:${localBranch}`],
+            { token: gitToken },
+            `PR #${pr.number}`
+          );
         } catch (e) {
           const msg = e instanceof Error ? e.message : String(e);
           if (PULL_REF_MISSING_PATTERN.test(msg)) {
@@ -144393,134 +144404,159 @@ async function checkoutPrBranch(pr, params) {
   });
   return { hookWarning: postCheckoutHook.warning };
 }
+var inFlightCheckouts = /* @__PURE__ */ new Map();
 function CheckoutPrTool(ctx) {
+  const runCheckout = async (pull_number) => {
+    const prResponse = await ctx.octokit.rest.pulls.get({
+      owner: ctx.repo.owner,
+      repo: ctx.repo.name,
+      pull_number
+    });
+    const headRepo = prResponse.data.head.repo;
+    if (!headRepo) {
+      throw new Error(`PR #${pull_number} source repository was deleted`);
+    }
+    const pr = {
+      number: pull_number,
+      headSha: prResponse.data.head.sha,
+      headRef: prResponse.data.head.ref,
+      headRepoFullName: headRepo.full_name,
+      baseRef: prResponse.data.base.ref,
+      baseRepoFullName: prResponse.data.base.repo.full_name,
+      maintainerCanModify: prResponse.data.maintainer_can_modify
+    };
+    const checkoutResult = await checkoutPrBranch(pr, {
+      octokit: ctx.octokit,
+      owner: ctx.repo.owner,
+      name: ctx.repo.name,
+      gitToken: ctx.gitToken,
+      toolState: ctx.toolState,
+      shell: ctx.payload.shell,
+      postCheckoutScript: ctx.postCheckoutScript,
+      beforeSha: ctx.toolState.beforeSha
+    });
+    const tempDir = process.env.PULLFROG_TEMP_DIR;
+    if (!tempDir) {
+      throw new Error(
+        "PULLFROG_TEMP_DIR not set - checkout_pr must run in pullfrog action context"
+      );
+    }
+    const headShort = ctx.toolState.checkoutSha.slice(0, 7);
+    let incrementalDiffPath;
+    if (ctx.toolState.beforeSha && ctx.toolState.checkoutSha) {
+      const beforeShort = ctx.toolState.beforeSha.slice(0, 7);
+      const incremental = computeIncrementalDiff({
+        baseBranch: pr.baseRef,
+        beforeSha: ctx.toolState.beforeSha,
+        headSha: ctx.toolState.checkoutSha
+      });
+      if (incremental) {
+        incrementalDiffPath = join3(
+          tempDir,
+          `pr-${pull_number}-${beforeShort}-${headShort}-incremental.diff`
+        );
+        writeFileSync(incrementalDiffPath, incremental);
+        log.info(
+          `\xBB incremental diff computed (${incremental.length} bytes) \u2192 ${incrementalDiffPath}`
+        );
+      }
+    }
+    const formatResult = await fetchAndFormatPrDiff(ctx, pull_number);
+    const diffPreview = formatResult.content.split("\n").slice(0, 100).join("\n");
+    log.debug(`formatted diff preview (first 100 lines):
+${diffPreview}`);
+    const diffPath = join3(tempDir, `pr-${pull_number}-${headShort}.diff`);
+    writeFileSync(diffPath, formatResult.content);
+    log.debug(`wrote diff to ${diffPath} (${formatResult.content.length} bytes)`);
+    ctx.toolState.diffCoverage = createDiffCoverageState({
+      diffPath,
+      totalLines: countLines({ content: formatResult.content }),
+      toc: formatResult.toc,
+      previous: ctx.toolState.diffCoverage
+    });
+    log.debug(
+      `\xBB diff coverage initialized: diffPath=${diffPath}, totalLines=${ctx.toolState.diffCoverage.totalLines}, tocEntries=${ctx.toolState.diffCoverage.tocEntries.length}`
+    );
+    const cached4 = /* @__PURE__ */ new Map();
+    for (const file2 of formatResult.files) {
+      cached4.set(file2.filename, commentableLinesForFile(file2.patch));
+    }
+    ctx.toolState.commentableLinesByFile = cached4;
+    ctx.toolState.commentableLinesPullNumber = pull_number;
+    ctx.toolState.commentableLinesCheckoutSha = ctx.toolState.checkoutSha;
+    const incrementalInstructions = incrementalDiffPath ? ` IMPORTANT: incrementalDiffPath contains ONLY the changes since the last reviewed version (computed via range-diff). you MUST read incrementalDiffPath FIRST to understand what changed, then use diffPath for full PR context. do NOT skip the incremental diff.` : "";
+    const COMMIT_LOG_MAX = 200;
+    const baseRange = `origin/${pr.baseRef}..HEAD`;
+    let commitCount = 0;
+    let commitLog = "";
+    let commitLogUnavailable = false;
+    try {
+      commitCount = parseInt(
+        $("git", ["rev-list", "--count", baseRange], { log: false }).trim() || "0",
+        10
+      );
+      commitLog = $("git", ["log", "--oneline", `--max-count=${COMMIT_LOG_MAX}`, baseRange], {
+        log: false
+      });
+    } catch (err) {
+      commitLogUnavailable = true;
+      log.debug(
+        `\xBB unable to compute commit metadata for ${baseRange}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+    const commitLogTruncated = commitCount > COMMIT_LOG_MAX;
+    const hookWarningInstructions = checkoutResult.hookWarning ? ` HOOK WARNING: the post-checkout lifecycle hook reported a non-fatal failure (see hookWarning). decide whether to retry based on the guidance in that field before proceeding.` : "";
+    const commitLogInstructions = commitLogUnavailable ? ` NOTE: commit metadata is partial (base ref unreachable, likely a shallow fetch). commitCount/commitLog may be 0/empty or incomplete; treat them as "unknown" rather than "no commits", and use \`git log\` directly if you need the full history.` : commitLogTruncated ? ` NOTE: commitLog was capped at ${COMMIT_LOG_MAX} entries out of ${commitCount} commits; use \`git log\` directly if you need the full history.` : "";
+    return {
+      success: true,
+      number: prResponse.data.number,
+      title: prResponse.data.title,
+      body: prResponse.data.body,
+      base: pr.baseRef,
+      localBranch: `pr-${pull_number}`,
+      remoteBranch: `refs/heads/${pr.headRef}`,
+      isFork: pr.headRepoFullName !== pr.baseRepoFullName,
+      maintainerCanModify: pr.maintainerCanModify,
+      url: prResponse.data.html_url,
+      headRepo: pr.headRepoFullName,
+      diffPath,
+      incrementalDiffPath,
+      toc: formatResult.toc,
+      commitCount,
+      commitLog,
+      commitLogTruncated,
+      commitLogUnavailable,
+      hookWarning: checkoutResult.hookWarning,
+      instructions: `the diff file at diffPath contains a table of contents (TOC) at the top listing every changed file with its line range. use the TOC line ranges as your checklist and read specific files from the diff instead of reading the entire file. for example, if the TOC says "src/foo.ts \u2192 lines 5-42", read lines 5-42 from diffPath to see that file's changes. review files selectively based on relevance rather than reading everything sequentially. to inspect the PR's changed files, use diffPath \u2014 do NOT run \`git diff <base>..<head>\` to re-derive what's already in diffPath. the formatted diff with line numbers is authoritative. \`git log\` and \`git diff --stat\` are fine for commit-range overview, and \`git diff\` / \`git diff --cached\` are fine for inspecting *your own* uncommitted changes \u2014 but PR review content MUST come from diffPath. before your review is submitted, a one-time coverage pre-flight may error listing unread TOC regions. retry the same create_pull_request_review call to proceed \u2014 optionally after reading the listed ranges. the pre-flight will not block again this session. the local branch is 'localBranch' (pr-{number}), not the remote branch name. when pushing, omit branchName to use the current branch. do not use remoteBranch as a local branch name.` + incrementalInstructions + hookWarningInstructions + commitLogInstructions
+    };
+  };
   return tool({
     name: "checkout_pr",
     description: "Checkout a pull request branch locally. This fetches the PR branch and sets up push configuration for fork PRs. Returns diffPath pointing to the formatted diff file. Example: `checkout_pr({ pull_number: 1234 })`. Transient fetch timeouts are common \u2014 retry the same call up to a few times before treating the failure as terminal. If the error mentions `.git/shallow.lock: File exists` or `.git/index.lock: File exists`, that's a stale lock from a prior timed-out fetch \u2014 remove it via the shell tool (`rm -f .git/shallow.lock .git/index.lock`) and retry.",
     parameters: CheckoutPr,
     execute: execute(async ({ pull_number }) => {
-      const prResponse = await ctx.octokit.rest.pulls.get({
-        owner: ctx.repo.owner,
-        repo: ctx.repo.name,
-        pull_number
-      });
-      const headRepo = prResponse.data.head.repo;
-      if (!headRepo) {
-        throw new Error(`PR #${pull_number} source repository was deleted`);
-      }
-      const pr = {
-        number: pull_number,
-        headSha: prResponse.data.head.sha,
-        headRef: prResponse.data.head.ref,
-        headRepoFullName: headRepo.full_name,
-        baseRef: prResponse.data.base.ref,
-        baseRepoFullName: prResponse.data.base.repo.full_name,
-        maintainerCanModify: prResponse.data.maintainer_can_modify
-      };
-      const checkoutResult = await checkoutPrBranch(pr, {
-        octokit: ctx.octokit,
-        owner: ctx.repo.owner,
-        name: ctx.repo.name,
-        gitToken: ctx.gitToken,
-        toolState: ctx.toolState,
-        shell: ctx.payload.shell,
-        postCheckoutScript: ctx.postCheckoutScript,
-        beforeSha: ctx.toolState.beforeSha
-      });
-      const tempDir = process.env.PULLFROG_TEMP_DIR;
-      if (!tempDir) {
-        throw new Error(
-          "PULLFROG_TEMP_DIR not set - checkout_pr must run in pullfrog action context"
-        );
-      }
-      const headShort = ctx.toolState.checkoutSha.slice(0, 7);
-      let incrementalDiffPath;
-      if (ctx.toolState.beforeSha && ctx.toolState.checkoutSha) {
-        const beforeShort = ctx.toolState.beforeSha.slice(0, 7);
-        const incremental = computeIncrementalDiff({
-          baseBranch: pr.baseRef,
-          beforeSha: ctx.toolState.beforeSha,
-          headSha: ctx.toolState.checkoutSha
-        });
-        if (incremental) {
-          incrementalDiffPath = join3(
-            tempDir,
-            `pr-${pull_number}-${beforeShort}-${headShort}-incremental.diff`
-          );
-          writeFileSync(incrementalDiffPath, incremental);
-          log.info(
-            `\xBB incremental diff computed (${incremental.length} bytes) \u2192 ${incrementalDiffPath}`
+      const inFlight = inFlightCheckouts.get(pull_number);
+      if (inFlight) {
+        log.info(`\xBB checkout_pr({pull_number:${pull_number}}) already in flight \u2014 sharing result`);
+        return inFlight;
+      }
+      const current = ctx.toolState.issueNumber;
+      if (current !== void 0 && current !== pull_number) {
+        const dirty = $("git", ["status", "--porcelain"], { log: false }).trim();
+        if (dirty) {
+          throw new Error(
+            `cannot checkout PR #${pull_number} while the working tree has uncommitted changes. commit, push, or discard them before switching. dirty paths:
+${dirty}`
           );
         }
       }
-      const formatResult = await fetchAndFormatPrDiff(ctx, pull_number);
-      const diffPreview = formatResult.content.split("\n").slice(0, 100).join("\n");
-      log.debug(`formatted diff preview (first 100 lines):
-${diffPreview}`);
-      const diffPath = join3(tempDir, `pr-${pull_number}-${headShort}.diff`);
-      writeFileSync(diffPath, formatResult.content);
-      log.debug(`wrote diff to ${diffPath} (${formatResult.content.length} bytes)`);
-      ctx.toolState.diffCoverage = createDiffCoverageState({
-        diffPath,
-        totalLines: countLines({ content: formatResult.content }),
-        toc: formatResult.toc,
-        previous: ctx.toolState.diffCoverage
-      });
-      log.debug(
-        `\xBB diff coverage initialized: diffPath=${diffPath}, totalLines=${ctx.toolState.diffCoverage.totalLines}, tocEntries=${ctx.toolState.diffCoverage.tocEntries.length}`
-      );
-      const cached4 = /* @__PURE__ */ new Map();
-      for (const file2 of formatResult.files) {
-        cached4.set(file2.filename, commentableLinesForFile(file2.patch));
-      }
-      ctx.toolState.commentableLinesByFile = cached4;
-      ctx.toolState.commentableLinesPullNumber = pull_number;
-      ctx.toolState.commentableLinesCheckoutSha = ctx.toolState.checkoutSha;
-      const incrementalInstructions = incrementalDiffPath ? ` IMPORTANT: incrementalDiffPath contains ONLY the changes since the last reviewed version (computed via range-diff). you MUST read incrementalDiffPath FIRST to understand what changed, then use diffPath for full PR context. do NOT skip the incremental diff.` : "";
-      const COMMIT_LOG_MAX = 200;
-      const baseRange = `origin/${pr.baseRef}..HEAD`;
-      let commitCount = 0;
-      let commitLog = "";
-      let commitLogUnavailable = false;
+      const promise2 = runCheckout(pull_number);
+      inFlightCheckouts.set(pull_number, promise2);
       try {
-        commitCount = parseInt(
-          $("git", ["rev-list", "--count", baseRange], { log: false }).trim() || "0",
-          10
-        );
-        commitLog = $("git", ["log", "--oneline", `--max-count=${COMMIT_LOG_MAX}`, baseRange], {
-          log: false
-        });
-      } catch (err) {
-        commitLogUnavailable = true;
-        log.debug(
-          `\xBB unable to compute commit metadata for ${baseRange}: ${err instanceof Error ? err.message : String(err)}`
-        );
+        return await promise2;
+      } finally {
+        inFlightCheckouts.delete(pull_number);
       }
-      const commitLogTruncated = commitCount > COMMIT_LOG_MAX;
-      const hookWarningInstructions = checkoutResult.hookWarning ? ` HOOK WARNING: the post-checkout lifecycle hook reported a non-fatal failure (see hookWarning). decide whether to retry based on the guidance in that field before proceeding.` : "";
-      const commitLogInstructions = commitLogUnavailable ? ` NOTE: commit metadata is partial (base ref unreachable, likely a shallow fetch). commitCount/commitLog may be 0/empty or incomplete; treat them as "unknown" rather than "no commits", and use \`git log\` directly if you need the full history.` : commitLogTruncated ? ` NOTE: commitLog was capped at ${COMMIT_LOG_MAX} entries out of ${commitCount} commits; use \`git log\` directly if you need the full history.` : "";
-      return {
-        success: true,
-        number: prResponse.data.number,
-        title: prResponse.data.title,
-        body: prResponse.data.body,
-        base: pr.baseRef,
-        localBranch: `pr-${pull_number}`,
-        remoteBranch: `refs/heads/${pr.headRef}`,
-        isFork: pr.headRepoFullName !== pr.baseRepoFullName,
-        maintainerCanModify: pr.maintainerCanModify,
-        url: prResponse.data.html_url,
-        headRepo: pr.headRepoFullName,
-        diffPath,
-        incrementalDiffPath,
-        toc: formatResult.toc,
-        commitCount,
-        commitLog,
-        commitLogTruncated,
-        commitLogUnavailable,
-        hookWarning: checkoutResult.hookWarning,
-        instructions: `the diff file at diffPath contains a table of contents (TOC) at the top listing every changed file with its line range. use the TOC line ranges as your checklist and read specific files from the diff instead of reading the entire file. for example, if the TOC says "src/foo.ts \u2192 lines 5-42", read lines 5-42 from diffPath to see that file's changes. review files selectively based on relevance rather than reading everything sequentially. to inspect the PR's changed files, use diffPath \u2014 do NOT run \`git diff <base>..<head>\` to re-derive what's already in diffPath. the formatted diff with line numbers is authoritative. \`git log\` and \`git diff --stat\` are fine for commit-range overview, and \`git diff\` / \`git diff --cached\` are fine for inspecting *your own* uncommitted changes \u2014 but PR review content MUST come from diffPath. before your review is submitted, a one-time coverage pre-flight may error listing unread TOC regions. retry the same create_pull_request_review call to proceed \u2014 optionally after reading the listed ranges. the pre-flight will not block again this session. the local branch is 'localBranch' (pr-{number}), not the remote branch name. when pushing, omit branchName to use the current branch. do not use remoteBranch as a local branch name.` + incrementalInstructions + hookWarningInstructions + commitLogInstructions
-      };
     })
   });
 }
@@ -145916,6 +145952,15 @@ function getTempDir() {
   }
   return tempDir;
 }
+var MAX_OUTPUT_CHARS = 5e3;
+function capOutput(output) {
+  if (output.length <= MAX_OUTPUT_CHARS) return output;
+  const fullPath = join7(getTempDir(), `shell-${randomUUID2().slice(0, 8)}.log`);
+  writeFileSync5(fullPath, output);
+  const elided = output.length - MAX_OUTPUT_CHARS;
+  return `... [${elided} chars truncated; full output saved to ${fullPath}] ...
+${output.slice(-MAX_OUTPUT_CHARS)}`;
+}
 function isGitCommand(command) {
   const trimmed = command.trim();
   if (trimmed === "git" || trimmed.startsWith("git ")) return true;
@@ -145934,6 +145979,8 @@ Use this tool to:
 - Execute build tools (npm, pnpm, cargo, make, etc.)
 - Run tests and linters
 
+Output is capped at ${MAX_OUTPUT_CHARS} chars: if exceeded, only the tail is returned and the full body is saved to a tempfile (path included in the response). Re-read the tempfile with cat/tail/grep when you need more.
+
 Do NOT use this tool for git commands \u2014 use the dedicated git tools instead.`,
     parameters: ShellParams,
     execute: execute(async (params) => {
@@ -146024,12 +146071,13 @@ ${stderr}` : stderr : stdout;
         output = output ? `${output}
 [timed out after ${timeout}ms]` : `[timed out after ${timeout}ms]`;
       const finalExitCode = exitCode ?? (timedOut ? 124 : -1);
+      const trimmed = output.trim();
       if (finalExitCode !== 0) {
         log.info(`shell command failed with exit code ${finalExitCode}: ${params.command}`);
-        if (output) log.info(`output: ${output.trim()}`);
+        if (trimmed) log.info(`output: ${trimmed}`);
       }
       return {
-        output: output.trim(),
+        output: capOutput(trimmed),
         exit_code: finalExitCode,
         timed_out: timedOut
       };
@@ -146902,12 +146950,38 @@ var PROVIDER_ERROR_PATTERNS = [
   // around `limit` rejects keys like `time_limit` or `field_limit`.
   { regex: /["']?\blimit\b["']?\s*:\s*0\b/, label: "zero quota" }
 ];
-function detectProviderError(text) {
+var EXCERPT_MAX_BYTES = 600;
+var LINES_BEFORE = 1;
+var LINES_AFTER = 2;
+function findProviderErrorMatch(text) {
   for (const entry of PROVIDER_ERROR_PATTERNS) {
-    if (entry.regex.test(text)) return entry.label;
+    const m = entry.regex.exec(text);
+    if (!m) continue;
+    return { label: entry.label, excerpt: extractExcerpt(text, m.index) };
   }
   return null;
 }
+function extractExcerpt(text, matchIndex) {
+  const lineStart = text.lastIndexOf("\n", matchIndex - 1) + 1;
+  const lineEndRaw = text.indexOf("\n", matchIndex);
+  const lineEnd = lineEndRaw === -1 ? text.length : lineEndRaw;
+  let start = lineStart;
+  for (let i = 0; i < LINES_BEFORE && start > 0; i++) {
+    const prev = text.lastIndexOf("\n", start - 2);
+    start = prev < 0 ? 0 : prev + 1;
+  }
+  let end = lineEnd;
+  for (let i = 0; i < LINES_AFTER && end < text.length; i++) {
+    const next2 = text.indexOf("\n", end + 1);
+    end = next2 < 0 ? text.length : next2;
+  }
+  let excerpt = text.slice(start, end);
+  if (excerpt.length > EXCERPT_MAX_BYTES) {
+    excerpt = text.slice(lineStart, lineEnd);
+    if (excerpt.length > EXCERPT_MAX_BYTES) excerpt = excerpt.slice(0, EXCERPT_MAX_BYTES);
+  }
+  return excerpt.trim();
+}
 var ROUTER_KEYLIMIT_EXHAUSTED_PATTERN = /requires more credits.*?fewer max_tokens|requested up to \d+ tokens.*?can only afford/is;
 function isRouterKeylimitExhaustedError(text) {
   return ROUTER_KEYLIMIT_EXHAUSTED_PATTERN.test(text);
@@ -147612,10 +147686,10 @@ async function runClaude(params) {
         if (!trimmed) return;
         recentStderr.push(trimmed);
         if (recentStderr.length > MAX_STDERR_LINES) recentStderr.shift();
-        const providerError = detectProviderError(trimmed);
-        if (providerError) {
-          lastProviderError = providerError;
-          log.info(`\xBB provider error detected (${providerError}): ${trimmed.substring(0, 500)}`);
+        const match3 = findProviderErrorMatch(trimmed);
+        if (match3) {
+          lastProviderError = match3.label;
+          log.info(`\xBB provider error detected (${match3.label}): ${match3.excerpt}`);
         } else {
           log.debug(trimmed);
         }
@@ -147833,6 +147907,68 @@ import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync8 } from "node:f
 import { join as join11 } from "node:path";
 import { performance as performance7 } from "node:perf_hooks";
 
+// utils/agentHangReport.ts
+var MAX_STDERR_BYTES = 3e3;
+function formatAgentHangBody(input) {
+  if (!input.diagnostic) return null;
+  const verb = input.isHang ? "stalled" : "failed";
+  const cause = input.diagnostic.lastProviderError ? ` \u2014 likely cause: \`${input.diagnostic.lastProviderError}\`` : "";
+  const headline = `**${input.diagnostic.label} ${verb}**${cause}`;
+  const explanation = formatExplanation({
+    isHang: input.isHang,
+    errorMessage: input.errorMessage
+  });
+  const parts = [headline, "", `${explanation} ${formatEventsPart(input.diagnostic)}`];
+  const tail = renderStderrTail(input.diagnostic.recentStderr);
+  if (tail) {
+    const fence = pickFence(tail);
+    parts.push(
+      "",
+      "<details><summary>Recent agent stderr</summary>",
+      "",
+      fence,
+      tail,
+      fence,
+      "",
+      "</details>"
+    );
+  }
+  return parts.join("\n");
+}
+function formatExplanation(input) {
+  if (!input.isHang) return `The agent exited unexpectedly: ${input.errorMessage}`;
+  const idleSec = parseIdleSec(input.errorMessage);
+  if (idleSec === void 0) {
+    return "The agent stopped emitting events and was killed by the activity-timeout watchdog.";
+  }
+  return `The agent stopped emitting events for ${idleSec}s and was killed by the activity-timeout watchdog.`;
+}
+function parseIdleSec(message) {
+  const match3 = /no output for (\d+)s/.exec(message);
+  return match3 ? Number(match3[1]) : void 0;
+}
+function formatEventsPart(diagnostic) {
+  if (diagnostic.eventCount > 0) {
+    return `${diagnostic.eventCount} events were processed before the failure.`;
+  }
+  if (diagnostic.lastProviderError) return "No events were emitted before the failure.";
+  return "No events were emitted \u2014 check whether the model provider is reachable.";
+}
+function renderStderrTail(lines) {
+  if (lines.length === 0) return "";
+  const joined = lines.join("\n");
+  if (joined.length <= MAX_STDERR_BYTES) return joined;
+  return `... (older lines truncated)
+${joined.slice(-MAX_STDERR_BYTES)}`;
+}
+function pickFence(content) {
+  let max = 0;
+  for (const match3 of content.matchAll(/`+/g)) {
+    if (match3[0].length > max) max = match3[0].length;
+  }
+  return "`".repeat(Math.max(3, max + 1));
+}
+
 // agents/opencodePlugin.ts
 var PULLFROG_BUS_EVENT_TYPE = "pullfrog_bus_event";
 var PULLFROG_OPENCODE_PLUGIN_FILENAME = "pullfrog-events.ts";
@@ -148225,8 +148361,7 @@ async function runOpenCode(params) {
         log.debug(withLabel(label, `  output: ${event.part.state.output}`));
       }
       if (event.part?.state?.status === "error") {
-        const errorMsg = event.part.state.output ?? "(no error message)";
-        log.info(withLabel(label, `\xBB tool call failed: ${errorMsg}`));
+        log.info(withLabel(label, `\xBB tool call failed: ${event.part.state.error}`));
       }
       if (toolName.includes("report_progress") && params.todoTracker) {
         log.debug("\xBB report_progress detected, disabling todo tracking");
@@ -148238,19 +148373,20 @@ async function runOpenCode(params) {
     },
     tool_result: (event) => {
       const toolId = event.part?.callID || event.tool_id;
-      const status = event.part?.state?.status || event.status || "unknown";
-      const output2 = event.part?.state?.output || event.output;
+      const state = event.part?.state;
+      const status = state?.status ?? event.status ?? "unknown";
+      const payload = state?.status === "completed" ? state.output : state?.status === "error" ? state.error : event.output;
       const label = eventLabel(event);
       timerFor(label).markToolResult();
       if (taskDispatchByCallID.size > 0 || pendingTaskDispatches.length > 0) {
         if (toolId && taskDispatchByCallID.has(toolId)) {
           const dispatch = taskDispatchByCallID.get(toolId);
-          if (dispatch) emitSubagentFinished(dispatch, status, output2, "exact");
+          if (dispatch) emitSubagentFinished(dispatch, status, payload, "exact");
         } else {
           const callIDIsKnownNonTask = toolId ? knownNonTaskCallIDs.has(toolId) : false;
           if (!callIDIsKnownNonTask && pendingTaskDispatches.length > 0) {
             const dispatch = pendingTaskDispatches[0];
-            emitSubagentFinished(dispatch, status, output2, "fifo");
+            emitSubagentFinished(dispatch, status, payload, "fifo");
           }
         }
       }
@@ -148266,13 +148402,8 @@ async function runOpenCode(params) {
               `\xBB ${params.label} tool_result${stepContext}: id=${toolId}, status=${status}, duration=${Math.round(toolDuration)}ms`
             )
           );
-          if (output2) {
-            log.debug(
-              withLabel(
-                label,
-                `  output: ${typeof output2 === "string" ? output2 : JSON.stringify(output2)}`
-              )
-            );
+          if (payload) {
+            log.debug(withLabel(label, `  output: ${payload}`));
           }
           if (toolDuration > 5e3) {
             log.info(
@@ -148285,11 +148416,9 @@ async function runOpenCode(params) {
         }
       }
       if (status === "error") {
-        const errorMsg = typeof output2 === "string" ? output2 : JSON.stringify(output2);
-        log.info(withLabel(label, `\xBB tool call failed: ${errorMsg}`));
-      } else if (output2) {
-        const outputStr = typeof output2 === "string" ? output2 : JSON.stringify(output2);
-        log.debug(withLabel(label, `tool output: ${outputStr}`));
+        log.info(withLabel(label, `\xBB tool call failed: ${payload ?? "(no error message)"}`));
+      } else if (payload) {
+        log.debug(withLabel(label, `tool output: ${payload}`));
       }
     },
     error: (event) => {
@@ -148366,6 +148495,13 @@ async function runOpenCode(params) {
   const recentStderr = [];
   let lastProviderError = null;
   let agentErrorEvent = null;
+  const diagnostic = {
+    label: params.label,
+    recentStderr,
+    lastProviderError: void 0,
+    eventCount: 0
+  };
+  params.toolState.agentDiagnostic = diagnostic;
   const output = new TailBuffer(DEFAULT_MAX_RETAINED_BYTES);
   let stdoutBuffer = "";
   try {
@@ -148414,6 +148550,7 @@ async function runOpenCode(params) {
             continue;
           }
           eventCount++;
+          diagnostic.eventCount = eventCount;
           log.debug(JSON.stringify(event, null, 2));
           const timeSinceLastActivity = getIdleMs();
           if (timeSinceLastActivity > 1e4) {
@@ -148445,10 +148582,11 @@ async function runOpenCode(params) {
         if (!trimmed) return;
         recentStderr.push(trimmed);
         if (recentStderr.length > MAX_STDERR_LINES) recentStderr.shift();
-        const providerError = detectProviderError(trimmed);
-        if (providerError) {
-          lastProviderError = providerError;
-          log.info(`\xBB provider error detected (${providerError}): ${trimmed.substring(0, 500)}`);
+        const match3 = findProviderErrorMatch(trimmed);
+        if (match3) {
+          lastProviderError = match3.label;
+          diagnostic.lastProviderError = match3.label;
+          log.info(`\xBB provider error detected (${match3.label}): ${match3.excerpt}`);
         } else {
           log.debug(trimmed);
         }
@@ -148538,10 +148676,11 @@ ${stderrContext}`);
         `\xBB recent stderr (last ${Math.min(recentStderr.length, 10)} lines):
 ${stderrContext}`
       );
+    const body = formatAgentHangBody({ diagnostic, isHang: isActivityTimeout, errorMessage });
     return {
       success: false,
       output: finalOutput || output.toString(),
-      error: `${errorMessage} [${diagnosis}]`,
+      error: body ?? `${errorMessage} [${diagnosis}]`,
       usage: buildUsage()
     };
   }
@@ -148593,6 +148732,7 @@ var opencode = agent({
       cliPath,
       cwd: repoDir,
       env: env2,
+      toolState: ctx.toolState,
       todoTracker: ctx.todoTracker,
       onActivityTimeout: ctx.onActivityTimeout,
       onToolUse: ctx.onToolUse
@@ -154764,24 +154904,29 @@ ${instructions.user}` : null,
       killTrackedChildren();
       log.error(errorMessage);
       const billingError = isRouterKeylimitExhaustedError(errorMessage) ? new BillingError(errorMessage, { code: "router_keylimit_exhausted" }) : null;
-      const apiKeyErrorSummary = !billingError && isApiKeyAuthError(errorMessage) ? formatApiKeyErrorSummary({
+      const isHang = errorMessage.startsWith("activity timeout") || errorMessage.startsWith("agent still pending");
+      const hangBody = isHang ? formatAgentHangBody({ diagnostic: toolState.agentDiagnostic, isHang: true, errorMessage }) : null;
+      const apiKeySource = hangBody ?? errorMessage;
+      const apiKeyErrorSummary = !billingError && isApiKeyAuthError(apiKeySource) ? formatApiKeyErrorSummary({
         owner: runContext.repo.owner,
         name: runContext.repo.name,
-        raw: errorMessage
+        raw: apiKeySource
       }) : null;
       try {
-        const errorSummary = billingError ? formatBillingErrorSummary(billingError, runContext.repo.owner) : apiKeyErrorSummary ?? `### \u274C Pullfrog failed
+        const errorSummary = billingError ? formatBillingErrorSummary(billingError, runContext.repo.owner) : apiKeyErrorSummary ?? (hangBody ? `### \u274C Pullfrog failed
+
+${hangBody}` : `### \u274C Pullfrog failed
 
 \`\`\`
 ${errorMessage}
-\`\`\``;
+\`\`\``);
         const usageSummary = formatUsageSummary(toolState.usageEntries);
         const parts = [errorSummary, toolState.lastProgressBody, usageSummary].filter(Boolean);
         await writeSummary(parts.join("\n\n"));
       } catch {
       }
       try {
-        const commentBody = billingError ? formatBillingErrorSummary(billingError, runContext.repo.owner) : apiKeyErrorSummary ?? errorMessage;
+        const commentBody = billingError ? formatBillingErrorSummary(billingError, runContext.repo.owner) : apiKeyErrorSummary ?? hangBody ?? errorMessage;
         await reportErrorToComment({ toolState, error: commentBody });
       } catch {
       }