@great-arrow/cli 0.10.1 → 0.10.2

package/dist/index.js

@@ -10011,7 +10011,7 @@ async function clearStoredCredential() {
 
 // src/lib/version.ts
 var CLI_PACKAGE_NAME = "@great-arrow/cli";
-var CLI_VERSION = "0.10.1";
+var CLI_VERSION = "0.10.2";
 var GAD_INSTALL_VERSION = "2026.08.08";
 var GAD_INSTALL_MIN_VERSION = "2026.06.22";
 var GAD_INSTALL_HEADER = "X-GAD-Install-Version";
@@ -33393,6 +33393,39 @@ import { readFileSync as readFileSync2 } from "node:fs";
 // src/lib/work-status.ts
 import { execFile as execFile3, execFileSync as execFileSync3 } from "node:child_process";
 
+// ../../src/lib/work-risk/local-git-truth.ts
+function isTimeoutError(error62) {
+  if (!error62 || typeof error62 !== "object") return false;
+  const e = error62;
+  return e.code === "ETIMEDOUT" || e.killed === true || e.signal === "SIGTERM";
+}
+function contentAlreadyOnMain(head, run5) {
+  const cherry = run5(["cherry", "origin/main", head]);
+  if (cherry.status !== 0) return null;
+  if (cherry.stdout.split("\n").some((line) => line.startsWith("+")))
+    return false;
+  const merges = run5(["rev-list", "--merges", `origin/main..${head}`]);
+  if (merges.status !== 0) return null;
+  for (const sha of merges.stdout.split("\n").filter(Boolean)) {
+    const cc = run5(["diff-tree", "--cc", "--no-commit-id", "-p", sha]);
+    if (cc.status !== 0) return null;
+    if (cc.stdout.trim().length > 0) return false;
+  }
+  return true;
+}
+function contentOnMainWithinBudget(branches, run5, budgetMs, now = Date.now) {
+  const deadline = now() + budgetMs;
+  const verdicts = /* @__PURE__ */ new Map();
+  for (const branch of branches) {
+    if (now() >= deadline) {
+      verdicts.set(branch, null);
+      continue;
+    }
+    verdicts.set(branch, contentAlreadyOnMain(branch.head, run5));
+  }
+  return verdicts;
+}
+
 // ../../src/lib/work-risk/push-state.ts
 var REMOTE_BRANCH_REF_PREFIX = "refs/remotes/origin/";
 var REMOTE_BRANCH_TIPS_FORMAT = "%(refname)%09%(objectname)";
@@ -33432,7 +33465,7 @@ function run(command, args, cwd) {
       status: e.status ?? 1,
       stdout: e.stdout ?? "",
       stderr: e.stderr ?? "",
-      timedOut: e.code === "ETIMEDOUT"
+      timedOut: isTimeoutError(err2)
     };
   }
 }
@@ -33441,7 +33474,7 @@ function git(args, cwd) {
 }
 var WORKTREE_STATUS_CONCURRENCY = 8;
 var WORKTREE_STATUS_TIMEOUT_MS = 2e3;
-function gitAsync(args, cwd) {
+function gitAsync(args, cwd, timeoutMs = WORKTREE_STATUS_TIMEOUT_MS) {
   return new Promise((resolve7) => {
     execFile3(
       "git",
@@ -33450,14 +33483,14 @@ function gitAsync(args, cwd) {
         cwd,
         encoding: "utf8",
         maxBuffer: 10 * 1024 * 1024,
-        timeout: WORKTREE_STATUS_TIMEOUT_MS
+        timeout: timeoutMs
       },
       (error62, stdout, stderr) => {
         resolve7({
           status: error62 ? 1 : 0,
           stdout: stdout ?? "",
           stderr: stderr ?? "",
-          timedOut: error62?.code === "ETIMEDOUT"
+          timedOut: isTimeoutError(error62)
         });
       }
     );
@@ -33621,35 +33654,52 @@ async function auditWorktrees(root, localBranches) {
   const branchByHead = new Map(
     localBranches.map((branch) => [branch.head, branch])
   );
-  return mapConcurrent(
-    parseWorktrees(raw),
+  const parsed = parseWorktrees(raw);
+  const statusArgs = ["--no-optional-locks", "status", "--porcelain"];
+  const statuses = await mapConcurrent(
+    parsed,
     WORKTREE_STATUS_CONCURRENCY,
-    async (worktree) => {
-      const status = await gitAsync(
-        ["--no-optional-locks", "status", "--porcelain"],
-        worktree.path
+    (worktree) => gitAsync(statusArgs, worktree.path)
+  );
+  for (const [index, worktree] of parsed.entries()) {
+    if (statuses[index].timedOut)
+      statuses[index] = await gitAsync(
+        statusArgs,
+        worktree.path,
+        LOCAL_COMMAND_TIMEOUT_MS
       );
-      const branch = branchByName.get(worktree.branch) ?? branchByHead.get(worktree.head);
-      const baseAudit = {
-        path: worktree.path,
-        branch: worktree.branch,
-        head: worktree.head,
-        dirty: status.status !== 0 || status.stdout.trim().length > 0,
-        mergedToMain: branch?.mergedToMain ?? false,
-        upstream: branch?.upstream ?? null,
-        upstreamGone: branch?.upstreamGone ?? false,
-        remoteHasHead: branch?.remoteHasHead ?? false,
-        behindMain: branch?.behindMain ?? 0,
-        aheadMain: branch?.aheadMain ?? 0,
-        countsExact: branch?.countsExact ?? false
-      };
-      return { ...baseAudit, classification: classifyWorktree(baseAudit) };
-    }
+  }
+  return parsed.map((worktree, index) => {
+    const status = statuses[index];
+    const branch = branchByName.get(worktree.branch) ?? branchByHead.get(worktree.head);
+    const baseAudit = {
+      path: worktree.path,
+      branch: worktree.branch,
+      head: worktree.head,
+      dirty: status.status !== 0 || status.stdout.trim().length > 0,
+      mergedToMain: branch?.mergedToMain ?? false,
+      upstream: branch?.upstream ?? null,
+      upstreamGone: branch?.upstreamGone ?? false,
+      remoteHasHead: branch?.remoteHasHead ?? false,
+      behindMain: branch?.behindMain ?? 0,
+      aheadMain: branch?.aheadMain ?? 0,
+      countsExact: branch?.countsExact ?? false
+    };
+    return { ...baseAudit, classification: classifyWorktree(baseAudit) };
+  });
+}
+var CONTENT_CHECK_BUDGET_MS = 6e4;
+function auditDetachedLocalBranches(localBranches, checkedOutBranches, root) {
+  const detached = localBranches.filter(
+    ({ branch }) => !checkedOutBranches.has(branch)
   );
-}
-function auditDetachedLocalBranches(localBranches, checkedOutBranches) {
-  return localBranches.filter(({ branch }) => !checkedOutBranches.has(branch)).map(
-    ({
+  const contentOnMain = contentOnMainWithinBudget(
+    detached.filter((b) => !b.mergedToMain && !b.remoteHasHead),
+    (args) => git(args, root),
+    CONTENT_CHECK_BUDGET_MS
+  );
+  return detached.map((detachedBranch) => {
+    const {
       branch,
       head,
       mergedToMain,
@@ -33660,7 +33710,8 @@ function auditDetachedLocalBranches(localBranches, checkedOutBranches) {
       upstreamGone,
       remoteHasHead: remoteHasHead2,
       committedAt
-    }) => ({
+    } = detachedBranch;
+    return {
       branch,
       head,
       mergedToMain,
@@ -33676,9 +33727,10 @@ function auditDetachedLocalBranches(localBranches, checkedOutBranches) {
       remoteHasHead: remoteHasHead2,
       // Without this the grace window read `ageMs = Infinity` for every
       // branch, so a branch was "stranded" from its first second.
-      committedAt
-    })
-  );
+      committedAt,
+      contentOnMain: contentOnMain.get(detachedBranch) ?? null
+    };
+  });
 }
 function auditRemoteBranchesWithoutPullRequests(root, openPullRequests) {
   const openHeads = new Set(openPullRequests.map((pr) => pr.headRefName));
@@ -33772,7 +33824,8 @@ async function collectWorkStatus(opts) {
   );
   const detachedBranches = auditDetachedLocalBranches(
     localBranches,
-    checkedOutBranches
+    checkedOutBranches,
+    root
   );
   const openPullRequestResult = readOpenPullRequests(root);
   if (openPullRequestResult === null)
@@ -56262,7 +56315,7 @@ var hasSearchParameters = (search) => {
 function isHTTPError(error62) {
   return error62 instanceof HTTPError || error62?.name === HTTPError.name;
 }
-function isTimeoutError(error62) {
+function isTimeoutError2(error62) {
   return error62 instanceof TimeoutError || error62?.name === TimeoutError.name;
 }
 
@@ -56468,7 +56521,7 @@ var Ky = class _Ky {
         return this.#calculateDelay();
       }
     }
-    if (isTimeoutError(error62) && !this.#options.retry.retryOnTimeout) {
+    if (isTimeoutError2(error62) && !this.#options.retry.retryOnTimeout) {
       throw error62;
     }
     if (isHTTPError(error62)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@great-arrow/cli",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "GreatArrow.ai CLI tool",
   "type": "module",
   "bin": {