@clipboard-health/groundcrew 4.52.12 → 4.53.1

package/README.md

@@ -32,7 +32,7 @@ Groundcrew watches assigned tasks, creates isolated worktrees, launches agent CL
 
 `crew doctor` checks all of these, so you can install as you go.
 
-- **Node 24.14.1:** [nvm](https://github.com/nvm-sh/nvm): `nvm install 24.14.1`.
+- **Node 24.22.1:** [nvm](https://github.com/nvm-sh/nvm): `nvm install 24.22.1`.
 - **git:** e.g., `brew install git`, `apt install git`.
 - **A terminal multiplexer:** [tmux](https://github.com/tmux/tmux/wiki/Installing) (cross-platform), [cmux](https://cmux.com/) (macOS), or [zellij](https://zellij.dev/).
 - **An agent CLI:** [Claude Code](https://code.claude.com/docs/en/quickstart), [Codex](https://developers.openai.com/codex/quickstart?setup=cli), the [Cursor CLI](https://docs.cursor.com/en/cli/overview) (`cursor-agent`, for the `cursor` and `cursor-grok` presets), and/or [Pi](https://pi.dev/).

package/crew.config.example.ts

@@ -149,6 +149,15 @@ export default {
   //
   // git: { remote: "origin", defaultBranch: "main" },
   //
+  // Stacked PRs: when a Todo task is blocked only by unresolved same-repo
+  // blockers that form a single chain, dispatch it as a child stacked on
+  // the chain tip's branch instead of waiting for the blockers to merge.
+  // Off by default.
+  // Config is cached per process, so a running `crew run --watch` needs a
+  // restart before it picks this up. Opt an individual task out with the
+  // `groundcrew-no-stack` Linear label.
+  // git: { stacking: true },
+  //
   // orchestrator: {
   //   maximumInProgress: 4,
   //   pollIntervalMilliseconds: 120_000,

package/dist/commands/cleanupWorkspace.js

@@ -54,7 +54,7 @@ function isWorkspaceInUse(probe, task) {
 }
 async function teardownEntries(config, entries, force) {
     const result = await worktrees.teardown(config, entries, { force });
-    recordCleanedUpRuns(config, result.removed);
+    await recordCleanedUpRuns(config, result.removed);
     logTeardown(result);
     if (result.failures.length > 0) {
         throw result.failures[0]?.error;

package/dist/commands/dispatcher.d.ts

@@ -11,9 +11,12 @@ import type { ResolvedConfig } from "../lib/config.ts";
 import { type BoardState, type Issue } from "../lib/taskSource.ts";
 import type { UsageByAgent } from "../lib/usage.ts";
 import type { WorktreeEntry } from "../lib/worktrees.ts";
+import { type EligibilityDeps } from "./eligibility.ts";
 interface DispatcherDeps {
     config: ResolvedConfig;
     board: Board;
+    /** Injection point for the stacking decision's run-state read and git probe; defaults to the real implementations. */
+    eligibilityDeps?: EligibilityDeps;
 }
 export interface Dispatcher {
     runOnce: (arguments_: {

package/dist/commands/dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/commands/dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,KAAK,EAEX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWzD,UAAU,cAAc;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,CAAC,UAAU,EAAE;QACpB,KAAK,EAAE,UAAU,CAAC;QAClB,eAAe,EAAE,SAAS,aAAa,EAAE,CAAC;QAC1C,+FAA+F;QAC/F,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB;;;;WAIG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB;AAiCD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,UAAU,CA8OjE;AA8BD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,GAAG,MAAM,CAQrE"}
+{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/commands/dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,KAAK,EAEX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAML,KAAK,eAAe,EAGrB,MAAM,kBAAkB,CAAC;AAG1B,UAAU,cAAc;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,sHAAsH;IACtH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,CAAC,UAAU,EAAE;QACpB,KAAK,EAAE,UAAU,CAAC;QAClB,eAAe,EAAE,SAAS,aAAa,EAAE,CAAC;QAC1C,+FAA+F;QAC/F,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB;;;;WAIG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB;AAuCD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,UAAU,CAwPjE;AA8BD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,GAAG,MAAM,CAQrE"}

package/dist/commands/dispatcher.js

@@ -12,8 +12,13 @@ import { sourceSupportsMarkDone } from "../lib/sourceCapabilities.js";
 import { isGroundcrewIssue, naturalIdFromCanonical, } from "../lib/taskSource.js";
 import { errorMessage, failMark, log, logEvent, styleWarning } from "../lib/util.js";
 import { workspaces } from "../lib/workspaces.js";
-import { classifyBlockers, classifyEligibility, classifyUsageExhaustion, } from "./eligibility.js";
+import { classifyBlockers, classifyEligibility, classifyUsageExhaustion, defaultEligibilityDeps, } from "./eligibility.js";
 import { setupWorkspace } from "./setupWorkspace.js";
+function logStackDispatch(input) {
+    const logContext = { flow: "stack-dispatch", ...input };
+    log("Dispatching stacked task on its parent's branch");
+    logEvent("dispatch", { ...logContext, outcome: "stacking" });
+}
 function logSkip(verdict) {
     log(verdict.message);
     logEvent("dispatch", {
@@ -36,7 +41,7 @@ function logMissingRepositorySkip(issue, agent, knownRepositories) {
     });
 }
 export function createDispatcher(deps) {
-    const { config, board } = deps;
+    const { config, board, eligibilityDeps = defaultEligibilityDeps } = deps;
     const rawSources = sourcesFromConfig(config);
     function buildExhaustedSet(usage) {
         const exhausted = new Set();
@@ -47,7 +52,7 @@ export function createDispatcher(deps) {
         return exhausted;
     }
     async function startEligibleIssue(start, dryRun, signal) {
-        const { issue, recovery } = start;
+        const { issue, recovery, baseBranch, parentTask } = start;
         const taskId = naturalIdFromCanonical(issue.id);
         if (start.resolvedFromAny) {
             log(`Resolved agent-any for ${taskId} → ${issue.agent}`);
@@ -71,6 +76,9 @@ export function createDispatcher(deps) {
                 log(`Worktree and workspace already exist for ${taskId}; resuming with markInProgress`);
             }
             else {
+                if (baseBranch !== undefined && parentTask !== undefined) {
+                    logStackDispatch({ task: taskId, parentTask, baseBranch });
+                }
                 const setupOptions = {
                     repository: issue.repository,
                     task: taskId,
@@ -83,6 +91,8 @@ export function createDispatcher(deps) {
                     ...(issue.worktreePreparation === undefined
                         ? {}
                         : { worktreePreparation: issue.worktreePreparation }),
+                    ...(baseBranch === undefined ? {} : { baseBranch }),
+                    ...(parentTask === undefined ? {} : { parentTask }),
                     details: {
                         title: issue.title,
                         description: issue.description,
@@ -159,7 +169,7 @@ export function createDispatcher(deps) {
         }
         // Run the blocker pre-pass first so an all-blocked board short-circuits
         // before the codexbar HTTP call and the cmux/tmux shell-out fire.
-        const { unblocked, skips: blockerSkips } = classifyBlockers(todo);
+        const { unblocked, stackDecisions, skips: blockerSkips, } = await classifyBlockers(todo, config, eligibilityDeps);
         for (const skip of blockerSkips) {
             logSkip(skip);
         }
@@ -207,6 +217,7 @@ export function createDispatcher(deps) {
         const verdicts = classifyEligibility({
             config,
             unblocked: dispatchableUnblocked,
+            stackDecisions,
             worktreeEntries,
             workspaceProbe,
             usage: fetchedUsage,

package/dist/commands/eligibility.d.ts

@@ -1,23 +1,35 @@
 /**
  * Pure eligibility classifier — takes the per-iteration board snapshot plus
  * derived state (worktrees, live workspaces, usage, slot count) and returns
- * a verdict per Todo task. No logging, no Linear calls, no shell-outs.
+ * a verdict per Todo task. No logging, no Linear calls, no shell-outs of its
+ * own: the one exception is the stacking decision in `classifyBlockers`,
+ * which reads the blocker's run state and probes its branch's availability.
+ * Both effects are routed through the injectable `EligibilityDeps` so
+ * callers can fake them the way the rest of the codebase fakes git.
+ * `probeParentBranch` also logs at WARN on a persistent `ls-remote` failure —
+ * the one logging exception, kept because a silent auth failure would
+ * otherwise hide forever behind the optimistic "unpushed, retry" verdict.
  *
  * The Dispatcher consumes the verdict list to drive logging and side
  * effects.
  */
 import { type ResolvedConfig } from "../lib/config.ts";
+import { type RunState } from "../lib/runState.ts";
 import { type GroundcrewIssue } from "../lib/taskSource.ts";
 import type { UsageByAgent } from "../lib/usage.ts";
 import type { WorkspaceProbe } from "../lib/workspaces.ts";
-import type { WorktreeEntry } from "../lib/worktrees.ts";
-type SkipReason = "blocked" | "blockers_paginated" | "agent_any_capacity" | "agent_exhausted" | "workspace_list_unavailable" | "workspace_missing";
+import { type WorktreeEntry } from "../lib/worktrees.ts";
+type SkipReason = "blocked" | "blockers_paginated" | "agent_any_capacity" | "agent_exhausted" | "workspace_list_unavailable" | "workspace_missing" | "stack_multiple_blockers" | "stack_parent_unknown" | "stack_parent_unpushed" | "stack_cross_repo_blocker" | "stack_provisioned_repo" | "stack_opted_out";
 export interface StartVerdict {
     kind: "start";
     issue: GroundcrewIssue;
     recovery: boolean;
     /** Set when the verdict resolved an `agent-any` label to a concrete agent. */
     resolvedFromAny: boolean;
+    /** Parent branch this task's worktree and PR should be based on, when stacked. */
+    baseBranch?: string;
+    /** Natural (unprefixed) id of the blocker task this task is stacked on. */
+    parentTask?: string;
 }
 export interface SkipVerdict {
     kind: "skip";
@@ -26,7 +38,7 @@ export interface SkipVerdict {
     message: string;
     /** Stable kebab-case enum surfaced as `logEvent.reason`. */
     eventReason: SkipReason;
-    /** Set for `blocked` and `blockers_paginated`. */
+    /** Set for `blocked`, `blockers_paginated`, and every `stack_*` reason. */
     blockers?: string[];
     /**
      * Set when the skip event should carry the resolved agent (i.e. the
@@ -37,6 +49,39 @@ export interface SkipVerdict {
     agent?: string;
 }
 type Verdict = StartVerdict | SkipVerdict;
+/** A stacking decision for a single blocked issue: where its branch and PR should be based. */
+interface StackDecision {
+    baseBranch: string;
+    parentTask: string;
+}
+/**
+ * Result of probing a parent branch's availability for stacking (spec
+ * section 8's error table):
+ *
+ * - `"pushed"`: `git ls-remote` finds the branch on the remote.
+ * - `"unpushed"`: the branch may still show up — either `ls-remote` came
+ *   back empty but a local branch of the same name exists (the parent's
+ *   agent hasn't pushed yet), or the `ls-remote` probe itself failed
+ *   (network/auth). Both retry next tick under the same optimistic reason.
+ * - `"unknown"`: the branch is missing both locally and on the remote, so it
+ *   will never appear (deleted, or the parent's run-state file is stale).
+ */
+type BranchAvailability = "pushed" | "unpushed" | "unknown";
+/**
+ * Side-effecting boundary for the stacking decision — the only I/O
+ * `classifyBlockers` performs. Production uses the real run-state reader and
+ * a `git ls-remote`/local-branch probe; tests substitute fakes instead of
+ * mocking modules.
+ */
+export interface EligibilityDeps {
+    readParentRunState: (config: ResolvedConfig, task: string) => RunState | undefined;
+    probeParentBranch: (arguments_: {
+        repoDir: string;
+        remote: string;
+        branch: string;
+    }) => Promise<BranchAvailability>;
+}
+export declare const defaultEligibilityDeps: EligibilityDeps;
 export type AgentUsageExhaustion = {
     kind: "unavailable";
     agent: string;
@@ -63,6 +108,8 @@ export interface ClassifyArguments {
      * when every Todo is blocked.
      */
     unblocked: readonly GroundcrewIssue[];
+    /** Stacking decisions from `classifyBlockers`, keyed by `issue.id`. Defaults to empty (no stacking). */
+    stackDecisions?: ReadonlyMap<string, StackDecision>;
     worktreeEntries: readonly WorktreeEntry[];
     workspaceProbe: WorkspaceProbe;
     usage: UsageByAgent;
@@ -72,8 +119,10 @@ export interface ClassifyArguments {
     slots: number;
     dryRun: boolean;
 }
-interface BlockerClassification {
+export interface BlockerClassification {
     unblocked: GroundcrewIssue[];
+    /** Stacking decisions for issues in `unblocked` that stack on a parent, keyed by `issue.id`. */
+    stackDecisions: ReadonlyMap<string, StackDecision>;
     skips: SkipVerdict[];
 }
 /**
@@ -87,12 +136,14 @@ interface BlockerClassification {
 export declare function pickBestAgent(config: ResolvedConfig, usage: UsageByAgent, exhausted: Set<string>): string | undefined;
 export declare function classifyUsageExhaustion(config: ResolvedConfig, usage: UsageByAgent): AgentUsageExhaustion[];
 /**
- * Cheap pre-pass — partitions Todo into unblocked issues and blocker
+ * Cheap pre-pass — partitions Todo into unblocked issues (including those
+ * stacking on a single unresolved blocker, per `stackDecisions`) and blocker
  * skip verdicts. Runs before the dispatcher fetches usage or probes the
  * workspace adapter, so a board where every Todo is blocked short-circuits
- * without paying for either.
+ * without paying for either. `config.git.stacking` off reproduces today's
+ * behavior exactly and performs no run-state reads or git calls.
  */
-export declare function classifyBlockers(todo: readonly GroundcrewIssue[]): BlockerClassification;
+export declare function classifyBlockers(todo: readonly GroundcrewIssue[], config: ResolvedConfig, deps?: EligibilityDeps): Promise<BlockerClassification>;
 /**
  * Eligibility verdicts for already-unblocked Todo issues — handles
  * agent-any resolution, session exhaustion, worktree/workspace recovery,

package/dist/commands/eligibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eligibility.d.ts","sourceRoot":"","sources":["../../src/commands/eligibility.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAa,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAwC,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAOzD,KAAK,UAAU,GACX,SAAS,GACT,oBAAoB,GACpB,oBAAoB,GACpB,iBAAiB,GACjB,4BAA4B,GAC5B,mBAAmB,CAAC;AAExB,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,8EAA8E;IAC9E,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,eAAe,CAAC;IACvB,sBAAsB;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,WAAW,EAAE,UAAU,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,KAAK,OAAO,GAAG,YAAY,GAAG,WAAW,CAAC;AAE1C,MAAM,MAAM,oBAAoB,GAC5B;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,cAAc,CAAC;IACvB;;;;;OAKG;IACH,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IACtC,eAAe,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC;IACpB,oDAAoD;IACpD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,qBAAqB;IAC7B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB;AAgCD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GACrB,MAAM,GAAG,SAAS,CAkBpB;AAaD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,YAAY,GAClB,oBAAoB,EAAE,CA2CxB;AA6CD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,eAAe,EAAE,GAAG,qBAAqB,CAYxF;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,EAAE,CAgE5E"}
+{"version":3,"file":"eligibility.d.ts","sourceRoot":"","sources":["../../src/commands/eligibility.ts"],"names":[],"mappings":"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"}

package/dist/commands/eligibility.js

@@ -1,21 +1,184 @@
 /**
  * Pure eligibility classifier — takes the per-iteration board snapshot plus
  * derived state (worktrees, live workspaces, usage, slot count) and returns
- * a verdict per Todo task. No logging, no Linear calls, no shell-outs.
+ * a verdict per Todo task. No logging, no Linear calls, no shell-outs of its
+ * own: the one exception is the stacking decision in `classifyBlockers`,
+ * which reads the blocker's run state and probes its branch's availability.
+ * Both effects are routed through the injectable `EligibilityDeps` so
+ * callers can fake them the way the rest of the codebase fakes git.
+ * `probeParentBranch` also logs at WARN on a persistent `ls-remote` failure —
+ * the one logging exception, kept because a silent auth failure would
+ * otherwise hide forever behind the optimistic "unpushed, retry" verdict.
  *
  * The Dispatcher consumes the verdict list to drive logging and side
  * effects.
  */
+import { runCommandAsync } from "../lib/commandRunner.js";
 import { AGENT_ANY } from "../lib/config.js";
+import { readRunState } from "../lib/runState.js";
 import { naturalIdFromCanonical } from "../lib/taskSource.js";
+import { errorMessage, log, memoizeAsync } from "../lib/util.js";
+import { localBranchExists, resolveRepoDir } from "../lib/worktrees.js";
 const PERCENT_FRACTION_DIVISOR = 100;
 const DAYS_PER_WEEK = 7;
 const MINUTES_PER_DAY = 24 * 60;
 const MINUTES_PER_WEEK = DAYS_PER_WEEK * MINUTES_PER_DAY;
+async function isBranchOnRemote(arguments_) {
+    try {
+        const output = await runCommandAsync("git", [
+            "-C",
+            arguments_.repoDir,
+            "ls-remote",
+            "--heads",
+            arguments_.remote,
+            `refs/heads/${arguments_.branch}`,
+        ]);
+        return output.length > 0;
+    }
+    catch (error) {
+        // Network/auth failures are common and expected (retried next tick), but
+        // silent forever would hide a persistent auth failure. WARN once per
+        // branch per tick — probeParentBranch is memoized per branch within a
+        // single classifyBlockers call, so this can't spam.
+        log(`Stack parent branch probe failed for ${arguments_.branch}; treating as unpushed and retrying next tick: ${errorMessage(error)}`);
+        return undefined;
+    }
+}
+async function probeParentBranch(arguments_) {
+    const onRemote = await isBranchOnRemote(arguments_);
+    if (onRemote === true) {
+        return "pushed";
+    }
+    if (onRemote === undefined) {
+        return "unpushed";
+    }
+    return (await localBranchExists(arguments_.repoDir, arguments_.branch)) ? "unpushed" : "unknown";
+}
+/**
+ * Memoizes `probeParentBranch` by branch for the lifetime of a single
+ * `classifyBlockers` call, so N siblings blocked by the same parent do one
+ * `git ls-remote` probe instead of N. Wrapping happens fresh per call — the
+ * cache must never survive past one dispatcher tick, or a since-pushed
+ * branch could keep reading as unpushed.
+ */
+function memoizedProbeParentBranch(probeParentBranchDep) {
+    const cache = new Map();
+    return async (arguments_) => await memoizeAsync(cache, arguments_.branch, async () => await probeParentBranchDep(arguments_));
+}
+export const defaultEligibilityDeps = {
+    readParentRunState: readRunState,
+    probeParentBranch,
+};
 function blockerSummary(blocker) {
     return `${blocker.id}:${blocker.status}`;
 }
-function blockerVerdictFor(issue) {
+function stackSkip(issue, blockers, eventReason, message) {
+    return {
+        kind: "skip",
+        issue,
+        message,
+        eventReason,
+        blockers: blockers.map(blockerSummary),
+    };
+}
+function normalizedTaskId(task) {
+    return task.toLowerCase();
+}
+function readBlockerRunStates(blockers, config, deps) {
+    return new Map(blockers.map((blocker) => {
+        const task = naturalIdFromCanonical(blocker.id);
+        return [normalizedTaskId(task), deps.readParentRunState(config, task)];
+    }));
+}
+/**
+ * Every task reachable from `start` by following `parentTask` links, read
+ * lazily so intermediate ancestors that are not themselves blockers (already
+ * merged, or never blocking this issue) still connect the chain. The visited
+ * set is the cycle guard.
+ */
+function stackAncestorsOf(start, runStates, config, deps) {
+    const ancestors = new Set();
+    let current = runStates.get(start);
+    while (current?.parentTask !== undefined) {
+        const parent = normalizedTaskId(current.parentTask);
+        if (ancestors.has(parent) || parent === start) {
+            break;
+        }
+        ancestors.add(parent);
+        current = runStates.has(parent)
+            ? runStates.get(parent)
+            : deps.readParentRunState(config, current.parentTask);
+    }
+    return ancestors;
+}
+/**
+ * With several unresolved blockers, the child can still stack when they form
+ * a chain: exactly one blocker (the tip) has every other blocker among its
+ * stack ancestors, so its branch already carries all of their work. Siblings
+ * off the default branch have no single base and yield `undefined`.
+ */
+function chainTipOf(blockers, runStates, config, deps) {
+    const candidates = blockers.map((blocker) => ({
+        blocker,
+        task: normalizedTaskId(naturalIdFromCanonical(blocker.id)),
+    }));
+    const tips = candidates.filter(({ task }) => {
+        const ancestors = stackAncestorsOf(task, runStates, config, deps);
+        return candidates.every((other) => other.task === task || ancestors.has(other.task));
+    });
+    const [tip, ...rest] = tips;
+    return rest.length === 0 ? tip?.blocker : undefined;
+}
+/**
+ * The stacking check from the stacked-PRs design (spec section 1). Cheap,
+ * dependency-free checks (provisioner, opt-out label) run before the
+ * run-state reads, which run before the `git ls-remote` probe, so a task that
+ * fails early never pays for the network call. Multiple unresolved blockers
+ * stack only when they form a chain (see `chainTipOf`).
+ */
+async function stackDecisionFor(issue, unresolved, config, deps) {
+    const repositoryEntry = config.workspace.repositories.find((entry) => entry.name === issue.repository);
+    if (repositoryEntry?.provision !== undefined) {
+        return stackSkip(issue, unresolved, "stack_provisioned_repo", `Skipping ${issue.id}: stacking is refused for scripted-provisioner repositories`);
+    }
+    if (issue.stacking === "opted-out") {
+        return stackSkip(issue, unresolved, "stack_opted_out", `Skipping ${issue.id}: opted out of stacking via the groundcrew-no-stack label`);
+    }
+    const runStates = readBlockerRunStates(unresolved, config, deps);
+    const foreign = unresolved.filter((blocker) => {
+        const repository = runStates.get(normalizedTaskId(naturalIdFromCanonical(blocker.id)))?.repository;
+        return repository !== undefined && repository !== issue.repository;
+    });
+    if (foreign.length > 0) {
+        return stackSkip(issue, unresolved, "stack_cross_repo_blocker", `Skipping ${issue.id}: blocked by ${foreign.map(blockerSummary).join(", ")} in another repository; a branch cannot stack across repositories`);
+    }
+    const [singleBlocker] = unresolved;
+    const blocker = unresolved.length === 1 ? singleBlocker : chainTipOf(unresolved, runStates, config, deps);
+    if (blocker === undefined) {
+        return stackSkip(issue, unresolved, "stack_multiple_blockers", `Skipping ${issue.id}: blocked by ${unresolved.map(blockerSummary).join(", ")}, which do not form a single stack`);
+    }
+    return await stackOntoBlocker(issue, blocker, runStates, config, deps);
+}
+async function stackOntoBlocker(issue, blocker, runStates, config, deps) {
+    const parentTask = naturalIdFromCanonical(blocker.id);
+    const parentRunState = runStates.get(normalizedTaskId(parentTask));
+    if (parentRunState === undefined) {
+        return stackSkip(issue, [blocker], "stack_parent_unknown", `Skipping ${issue.id}: blocker ${parentTask} has no run state in repository ${issue.repository}`);
+    }
+    const availability = await deps.probeParentBranch({
+        repoDir: resolveRepoDir(config, issue.repository),
+        remote: config.git.remote,
+        branch: parentRunState.branchName,
+    });
+    if (availability === "unknown") {
+        return stackSkip(issue, [blocker], "stack_parent_unknown", `Skipping ${issue.id}: blocker ${parentTask}'s branch ${parentRunState.branchName} is missing locally and on the remote`);
+    }
+    if (availability === "unpushed") {
+        return stackSkip(issue, [blocker], "stack_parent_unpushed", `Skipping ${issue.id}: blocker ${parentTask}'s branch isn't pushed yet`);
+    }
+    return { kind: "stack", issue, baseBranch: parentRunState.branchName, parentTask };
+}
+async function blockerVerdictFor(issue, config, deps) {
     if (issue.hasMoreBlockers) {
         const blockers = issue.blockers.map(blockerSummary);
         return {
@@ -30,6 +193,9 @@ function blockerVerdictFor(issue) {
     if (unresolved.length === 0) {
         return undefined;
     }
+    if (config.git.stacking === true) {
+        return await stackDecisionFor(issue, unresolved, config, deps);
+    }
     const blockers = unresolved.map(blockerSummary);
     return {
         kind: "skip",
@@ -145,24 +311,39 @@ function classifyRecovery(arguments_) {
     return { kind: "go", recovery: true };
 }
 /**
- * Cheap pre-pass — partitions Todo into unblocked issues and blocker
+ * Cheap pre-pass — partitions Todo into unblocked issues (including those
+ * stacking on a single unresolved blocker, per `stackDecisions`) and blocker
  * skip verdicts. Runs before the dispatcher fetches usage or probes the
  * workspace adapter, so a board where every Todo is blocked short-circuits
- * without paying for either.
+ * without paying for either. `config.git.stacking` off reproduces today's
+ * behavior exactly and performs no run-state reads or git calls.
  */
-export function classifyBlockers(todo) {
+export async function classifyBlockers(todo, config, deps = defaultEligibilityDeps) {
     const unblocked = [];
     const skips = [];
+    const stackDecisions = new Map();
+    const memoizedDeps = {
+        ...deps,
+        probeParentBranch: memoizedProbeParentBranch(deps.probeParentBranch),
+    };
     for (const issue of todo) {
-        const verdict = blockerVerdictFor(issue);
+        // oxlint-disable-next-line no-await-in-loop -- one blocker check at a time mirrors the dispatcher's own "one workspace at a time" git serialization
+        const verdict = await blockerVerdictFor(issue, config, memoizedDeps);
         if (verdict === undefined) {
             unblocked.push(issue);
         }
+        else if (verdict.kind === "stack") {
+            unblocked.push(issue);
+            stackDecisions.set(issue.id, {
+                baseBranch: verdict.baseBranch,
+                parentTask: verdict.parentTask,
+            });
+        }
         else {
             skips.push(verdict);
         }
     }
-    return { unblocked, skips };
+    return { unblocked, stackDecisions, skips };
 }
 /**
  * Eligibility verdicts for already-unblocked Todo issues — handles
@@ -171,7 +352,7 @@ export function classifyBlockers(todo) {
  * the snapshots in.
  */
 export function classifyEligibility(arguments_) {
-    const { config, unblocked, worktreeEntries, workspaceProbe, usage, exhausted, slots, dryRun } = arguments_;
+    const { config, unblocked, stackDecisions = new Map(), worktreeEntries, workspaceProbe, usage, exhausted, slots, dryRun, } = arguments_;
     const verdicts = [];
     let started = 0;
     for (const original of unblocked) {
@@ -217,11 +398,15 @@ export function classifyEligibility(arguments_) {
             verdicts.push({ ...recovery, agent: resolved.agent });
             continue;
         }
+        const stackDecision = stackDecisions.get(resolved.id);
         verdicts.push({
             kind: "start",
             issue: resolved,
             recovery: recovery.recovery,
             resolvedFromAny,
+            ...(stackDecision === undefined
+                ? {}
+                : { baseBranch: stackDecision.baseBranch, parentTask: stackDecision.parentTask }),
         });
         started += 1;
     }

package/dist/commands/resumeWorkspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resumeWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/resumeWorkspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoC,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAwBzF,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAoMD,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAiIf;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtE"}
+{"version":3,"file":"resumeWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/resumeWorkspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoC,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAwBzF,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAuMD,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAmIf;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtE"}

package/dist/commands/resumeWorkspace.js

@@ -90,6 +90,7 @@ async function contextFromState(config, task, state, worktree) {
         }),
         ...(state.reason === undefined ? {} : { reason: state.reason }),
         resumeCount: state.resumeCount,
+        ...(state.baseBranch === undefined ? {} : { baseBranch: state.baseBranch }),
     };
 }
 function taskUsesLinearSource(arguments_) {
@@ -222,6 +223,8 @@ export async function resumeWorkspace(config, options) {
             workerEnvironment: workerEnvironmentForTask({
                 taskId: context.completionTaskId,
                 markDoneSupported: context.completionMarkDoneSupported,
+                remote: config.git.remote,
+                ...(context.baseBranch === undefined ? {} : { baseBranch: context.baseBranch }),
             }),
             taskSourceWritePaths,
             safehouse: config.local.safehouse,

package/dist/commands/reviewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reviewer.d.ts","sourceRoot":"","sources":["../../src/commands/reviewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EACL,KAAK,UAAU,EAIhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAK,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAAC;AAE7C,UAAU,YAAY;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAED,sEAAsE;AACtE,UAAU,eAAe;IACvB,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD;AA+CD,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,QAAQ,CAiJ3D"}
+{"version":3,"file":"reviewer.d.ts","sourceRoot":"","sources":["../../src/commands/reviewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EACL,KAAK,UAAU,EAIhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKzD;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAK,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAAC;AAE7C,UAAU,YAAY;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAED,sEAAsE;AACtE,UAAU,eAAe;IACvB,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD;AA+CD,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,QAAQ,CA+J3D"}

package/dist/commands/reviewer.js

@@ -27,6 +27,7 @@
 import { naturalIdFromCanonical, } from "../lib/taskSource.js";
 import { debug, errorMessage, log, logEvent } from "../lib/util.js";
 import { effectiveBranchName } from "../lib/worktreeRunState.js";
+import { createStackRetarget } from "./stackRetarget.js";
 import { reapWorktrees } from "./teardownReporter.js";
 // Maps a worktree's PRs to the transition its task should make. A merged PR
 // means the work landed → done; an open PR on an in-progress task means it's
@@ -58,8 +59,21 @@ function matchingWorktreeEntries(arguments_) {
 }
 export function createReviewer(deps) {
     const { board, config, findPullRequests } = deps;
+    const stackRetarget = createStackRetarget({ findPullRequests });
     async function runOnce(arguments_) {
         const { state, worktreeEntries, dryRun, signal } = arguments_;
+        // Independent of the in-progress/in-review candidate scan below: a
+        // stacked task's baseBranch correction must not wait on there being an
+        // ordinary transition to make this tick.
+        if (config !== undefined) {
+            await stackRetarget.runOnce({
+                config,
+                state,
+                worktreeEntries,
+                dryRun,
+                ...(signal === undefined ? {} : { signal }),
+            });
+        }
         const candidates = state.issues.filter((issue) => issue.status === "in-progress" || issue.status === "in-review");
         if (candidates.length === 0) {
             return;

package/dist/commands/setupWorkspace.d.ts

@@ -16,6 +16,10 @@ export interface SetupWorkspaceOptions {
     agent: string;
     /** Set to `skip` to bypass configured prepareWorktree hooks. */
     worktreePreparation?: WorktreePreparation;
+    /** Parent branch this task's worktree and PR are based on, when stacked. */
+    baseBranch?: string;
+    /** Canonical id of the blocker task this task is stacked on. */
+    parentTask?: string;
     details: TaskDetails;
 }
 export interface SetupWorkspaceRunOptions {

package/dist/commands/setupWorkspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/setupWorkspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBnE,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAWxF,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,6FAA6F;IAC7F,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAuBD,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,EAC9B,UAAU,GAAE,wBAA6B,GACxC,OAAO,CAAC,IAAI,CAAC,CA8Jf;AAiOD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CAyDf"}
+{"version":3,"file":"setupWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/setupWorkspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBnE,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAWxF,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,6FAA6F;IAC7F,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAuBD,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,EAC9B,UAAU,GAAE,wBAA6B,GACxC,OAAO,CAAC,IAAI,CAAC,CA0Jf;AA2RD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CAyDf"}