@clipboard-health/groundcrew 4.52.9 → 4.52.11

package/dist/commands/prStageSync.d.ts

@@ -1,12 +1,23 @@
 /**
  * Per-tick sync that paints each tracked task's cmux sidebar with its ticket
- * id, and — when `cmux.prStages.enabled` — its pull request's review stage
+ * id, and — when `cmux.prStages.enabled` — its pull requests' review stages
  * and gating labels too. Replaces the standalone `crew-pr-stages` bash
  * poller: same stage/ticket derivation rules (`../lib/prStageRules.ts`),
- * same status-key contract the installed sidebar reads, but PRs are
- * resolved from the task's own worktree branch
- * (`findPullRequestsForBranchOrThrow`) instead of cmux's own git-branch PR
- * detection.
+ * same status-key contract the installed sidebar reads, but a task's PRs are
+ * discovered from its worktree branch plus every branch stacked off it
+ * (`listPullRequestsForRepositoryOrThrow` + `selectTaskPullRequests`)
+ * instead of cmux's own single-branch PR detection. That repository-wide
+ * list is bounded and author-scoped (`--author @me`, 100 PRs), so a task
+ * whose PR falls outside it is recovered by a per-task exact-branch fallback
+ * (`findTaskPullRequestsForBranchOrThrow`) — see
+ * `resolveTaskPullRequestsByWorkspace` for the two-tier lookup.
+ *
+ * A task can have several shown PRs (an unsplit branch, or a stack of
+ * follow-up PRs chained by base branch). `crew_stage`/`crew_labels` describe
+ * only the single most urgent one (`selectDrivingPullRequest`) — the
+ * "stage-driving" PR a right-click label toggle acts on — while the
+ * `crew_prs` status carries every shown PR so the sidebar can render one row
+ * per PR. See `contrib/cmux/README.md` for the full status-key contract.
  *
  * `crew_ticket` is written for every matched cmux task workspace regardless
  * of the `cmux.prStages.enabled` opt-in, since a custom sidebar may read it
@@ -25,13 +36,23 @@ import { type CmuxWorkspaceSummary } from "../lib/cmuxAdapter.ts";
 import { type CmuxStatusWrite } from "../lib/cmuxStatusFields.ts";
 import type { ResolvedConfig } from "../lib/config.ts";
 import { type PullRequestDetail } from "../lib/pullRequestDetails.ts";
-import { type PullRequestSummary } from "../lib/pullRequests.ts";
+import { type TaskPullRequest } from "../lib/pullRequests.ts";
 import type { WorktreeEntry } from "../lib/worktrees.ts";
-export type FindPullRequests = (arguments_: {
+/** One `gh pr list` call per repository per tick; matched tasks sharing a repository share its result. */
+export type ListPullRequestsForRepository = (arguments_: {
+    cwd: string;
+    signal?: AbortSignal;
+}) => Promise<readonly TaskPullRequest[]>;
+/**
+ * Per-task fallback used only when a matched task's branch (and its stack)
+ * are absent from the repository-wide list — e.g. the task's PR is older
+ * than that list's 100-PR window. One call per such task, not per tick.
+ */
+export type FindPullRequestsForBranch = (arguments_: {
     cwd: string;
     branchName: string;
     signal?: AbortSignal;
-}) => Promise<readonly PullRequestSummary[]>;
+}) => Promise<readonly TaskPullRequest[]>;
 export type FetchPullRequestDetails = (arguments_: {
     urls: readonly string[];
     signal?: AbortSignal;
@@ -42,7 +63,8 @@ export type WriteCmuxStatus = (workspaceId: string, write: CmuxStatusWrite, sign
 export type IsCmuxAdapterActive = (signal?: AbortSignal) => Promise<boolean>;
 export interface PrStageSyncDeps {
     config: ResolvedConfig;
-    findPullRequests: FindPullRequests;
+    listPullRequests: ListPullRequestsForRepository;
+    findPullRequestsForBranch: FindPullRequestsForBranch;
     fetchPullRequestDetails: FetchPullRequestDetails;
     listCmuxWorkspaces: ListCmuxWorkspaces;
     readCmuxStatus: ReadCmuxStatus;

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

@@ -1 +1 @@
-{"version":3,"file":"prStageSync.d.ts","sourceRoot":"","sources":["../../src/commands/prStageSync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,KAAK,oBAAoB,EAA8B,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EACL,KAAK,eAAe,EAKrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAA2B,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAoC,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AASnG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAczD,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,MAAM,MAAM,uBAAuB,GAAG,CAAC,UAAU,EAAE;IACjD,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAAC;AAE1D,MAAM,MAAM,kBAAkB,GAAG,CAC/B,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,oBAAoB,EAAE,GAAG,SAAS,CAAC,CAAC;AACjD,MAAM,MAAM,cAAc,GAAG,CAC3B,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAClC,MAAM,MAAM,eAAe,GAAG,CAC5B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,IAAI,CAAC,CAAC;AACnB,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE7E,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,cAAc,CAAC;IACvB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C;AAED,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,4GAA4G;IAC5G,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,OAAO,EAAE,CAAC,UAAU,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,yGAAyG;IACzG,QAAQ,EAAE,CAAC,UAAU,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D;AAED,mGAAmG;AACnG,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,cAAc,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,OAAO,CAAC,CAUlB;AA2QD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,WAAW,CA0KpE;AAED,8EAA8E;AAC9E,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,eAAe,CAU7E"}
+{"version":3,"file":"prStageSync.d.ts","sourceRoot":"","sources":["../../src/commands/prStageSync.ts"],"names":[],"mappings":"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"}

package/dist/commands/prStageSync.js

@@ -1,12 +1,23 @@
 /**
  * Per-tick sync that paints each tracked task's cmux sidebar with its ticket
- * id, and — when `cmux.prStages.enabled` — its pull request's review stage
+ * id, and — when `cmux.prStages.enabled` — its pull requests' review stages
  * and gating labels too. Replaces the standalone `crew-pr-stages` bash
  * poller: same stage/ticket derivation rules (`../lib/prStageRules.ts`),
- * same status-key contract the installed sidebar reads, but PRs are
- * resolved from the task's own worktree branch
- * (`findPullRequestsForBranchOrThrow`) instead of cmux's own git-branch PR
- * detection.
+ * same status-key contract the installed sidebar reads, but a task's PRs are
+ * discovered from its worktree branch plus every branch stacked off it
+ * (`listPullRequestsForRepositoryOrThrow` + `selectTaskPullRequests`)
+ * instead of cmux's own single-branch PR detection. That repository-wide
+ * list is bounded and author-scoped (`--author @me`, 100 PRs), so a task
+ * whose PR falls outside it is recovered by a per-task exact-branch fallback
+ * (`findTaskPullRequestsForBranchOrThrow`) — see
+ * `resolveTaskPullRequestsByWorkspace` for the two-tier lookup.
+ *
+ * A task can have several shown PRs (an unsplit branch, or a stack of
+ * follow-up PRs chained by base branch). `crew_stage`/`crew_labels` describe
+ * only the single most urgent one (`selectDrivingPullRequest`) — the
+ * "stage-driving" PR a right-click label toggle acts on — while the
+ * `crew_prs` status carries every shown PR so the sidebar can render one row
+ * per PR. See `contrib/cmux/README.md` for the full status-key contract.
  *
  * `crew_ticket` is written for every matched cmux task workspace regardless
  * of the `cmux.prStages.enabled` opt-in, since a custom sidebar may read it
@@ -22,11 +33,11 @@
  * workspace must never break the watch loop or starve the other steps.
  */
 import { listCmuxWorkspaceSummaries } from "../lib/cmuxAdapter.js";
-import { readCmuxStatus, TICKET_KEY, TICKET_PRIORITY, writeCmuxStatus, } from "../lib/cmuxStatusFields.js";
+import { PULL_REQUESTS_KEY, PULL_REQUESTS_PRIORITY, readCmuxStatus, TICKET_KEY, TICKET_PRIORITY, writeCmuxStatus, } from "../lib/cmuxStatusFields.js";
 import { detectHostCapabilities } from "../lib/host.js";
 import { fetchPullRequestDetails } from "../lib/pullRequestDetails.js";
-import { findPullRequestsForBranchOrThrow } from "../lib/pullRequests.js";
-import { deriveTicket, derivePrStage, managedLabelsField, } from "../lib/prStageRules.js";
+import { findTaskPullRequestsForBranchOrThrow, listPullRequestsForRepositoryOrThrow, } from "../lib/pullRequests.js";
+import { deriveTicket, derivePrStage, encodePrStatuses, managedLabelsField, PR_STAGE_URGENCY_ORDER, selectTaskPullRequests, } from "../lib/prStageRules.js";
 import { debug, errorMessage, logEvent, readEnvironmentVariable } from "../lib/util.js";
 import { resolveWorkspaceKind } from "../lib/workspaces.js";
 import { effectiveBranchName } from "../lib/worktreeRunState.js";
@@ -70,13 +81,6 @@ function matchWorkspacesToTasks(workspaces, worktreeEntries) {
     }
     return matches;
 }
-/** One PR to track per workspace: prefer a live one, then whichever terminal state, else whatever gh returned first. */
-function selectTrackedPullRequest(pullRequests) {
-    return (pullRequests.find((pr) => pr.state === "open") ??
-        pullRequests.find((pr) => pr.state === "merged") ??
-        pullRequests.find((pr) => pr.state === "closed") ??
-        pullRequests[0]);
-}
 function newCounters() {
     return { written: 0, cleared: 0, skipped: 0 };
 }
@@ -118,55 +122,68 @@ async function writeTicketField(arguments_) {
         counters,
     });
 }
+/** The single most urgent PR among a task's shown PRs, per `PR_STAGE_URGENCY_ORDER` — never empty, since `staged` is only built from a non-empty pull-request list. */
+function selectDrivingPullRequest(staged) {
+    return staged.reduce((best, candidate) => PR_STAGE_URGENCY_ORDER.indexOf(candidate.stage) < PR_STAGE_URGENCY_ORDER.indexOf(best.stage)
+        ? candidate
+        : best);
+}
+async function clearPullRequestFields(arguments_) {
+    const { workspaceId, current, deps, signal, counters } = arguments_;
+    for (const { key, priority } of [
+        { key: STAGE_KEY, priority: STAGE_PRIORITY },
+        { key: LABELS_KEY, priority: LABELS_PRIORITY },
+        { key: PULL_REQUESTS_KEY, priority: PULL_REQUESTS_PRIORITY },
+    ]) {
+        // oxlint-disable-next-line no-await-in-loop -- three related status writes for one workspace; sequential keeps them from interleaving with another workspace's
+        await applyField({
+            workspaceId,
+            key,
+            priority,
+            current: current.get(key) ?? "",
+            desired: "",
+            signal,
+            writeStatus: deps.writeCmuxStatus,
+            counters,
+        });
+    }
+}
 /**
- * Stage and labels are cleared only when the branch is confirmed to have no
- * PR; when discovery itself failed (network/auth error) or a PR exists but
- * its detail couldn't be (re)confirmed this tick (a failed or partial
- * GraphQL batch), they are left exactly as they were — never guessed, never
- * cleared.
+ * Stage, labels, and the PR list are cleared only when the task is confirmed
+ * to have no shown PR; when discovery itself failed (network/auth error) or
+ * a shown PR's detail couldn't be (re)confirmed this tick (a failed or
+ * partial GraphQL batch), all three are left exactly as they were — never
+ * guessed, never cleared.
  */
 async function syncWorkspace(arguments_) {
-    const { match, labelNames, pullRequest, pullRequestLookupFailed, detail, deps, signal, counters, } = arguments_;
+    const { match, labelNames, pullRequests, pullRequestLookupFailed, detailsByUrl, deps, signal, counters, } = arguments_;
     const { workspace } = match;
     const current = await deps.readCmuxStatus(workspace.id, signal);
     await writeTicketField({ workspace, current, deps, signal, counters });
     if (pullRequestLookupFailed) {
-        counters.skipped += 2;
+        counters.skipped += 3;
         return;
     }
-    if (pullRequest === undefined) {
-        await applyField({
-            workspaceId: workspace.id,
-            key: STAGE_KEY,
-            priority: STAGE_PRIORITY,
-            current: current.get(STAGE_KEY) ?? "",
-            desired: "",
-            signal,
-            writeStatus: deps.writeCmuxStatus,
-            counters,
-        });
-        await applyField({
-            workspaceId: workspace.id,
-            key: LABELS_KEY,
-            priority: LABELS_PRIORITY,
-            current: current.get(LABELS_KEY) ?? "",
-            desired: "",
-            signal,
-            writeStatus: deps.writeCmuxStatus,
-            counters,
-        });
+    if (pullRequests.length === 0) {
+        await clearPullRequestFields({ workspaceId: workspace.id, current, deps, signal, counters });
         return;
     }
-    if (detail === undefined) {
-        counters.skipped += 2;
-        return;
+    const staged = [];
+    for (const pullRequest of pullRequests) {
+        const detail = detailsByUrl.get(pullRequest.url);
+        if (detail === undefined) {
+            counters.skipped += 3;
+            return;
+        }
+        staged.push({ pullRequest, detail, stage: derivePrStage(detail, labelNames) });
     }
+    const driving = selectDrivingPullRequest(staged);
     await applyField({
         workspaceId: workspace.id,
         key: STAGE_KEY,
         priority: STAGE_PRIORITY,
         current: current.get(STAGE_KEY) ?? "",
-        desired: derivePrStage(detail, labelNames),
+        desired: driving.stage,
         signal,
         writeStatus: deps.writeCmuxStatus,
         counters,
@@ -176,30 +193,93 @@ async function syncWorkspace(arguments_) {
         key: LABELS_KEY,
         priority: LABELS_PRIORITY,
         current: current.get(LABELS_KEY) ?? "",
-        desired: managedLabelsField(detail.labels, labelNames),
+        desired: managedLabelsField(driving.detail.labels, labelNames),
+        signal,
+        writeStatus: deps.writeCmuxStatus,
+        counters,
+    });
+    await applyField({
+        workspaceId: workspace.id,
+        key: PULL_REQUESTS_KEY,
+        priority: PULL_REQUESTS_PRIORITY,
+        current: current.get(PULL_REQUESTS_KEY) ?? "",
+        desired: encodePrStatuses(staged.map((entry) => ({
+            number: entry.pullRequest.number,
+            stage: entry.stage,
+            url: entry.pullRequest.url,
+        }))),
         signal,
         writeStatus: deps.writeCmuxStatus,
         counters,
     });
 }
-async function resolvePullRequestsByWorkspace(arguments_) {
-    const { matches, config, findPullRequests, signal } = arguments_;
+/**
+ * One `gh pr list` call per distinct repository among the matched
+ * workspaces, not one per workspace: every matched task sharing a
+ * repository reuses that single repository-wide list, filtered client-side
+ * (`selectTaskPullRequests`) down to each task's own branch and its stack.
+ *
+ * That repository-wide list is bounded (100 PRs, `--author @me`), so a task
+ * whose PR is older than the window — or for any other reason absent from
+ * it — would otherwise read as "no PR" and get its stage/labels/PR list
+ * cleared. When a matched task's filtered result is empty, this falls back
+ * to one exact-branch `gh pr list --head` lookup for that task alone
+ * (`findPullRequestsForBranch`), the same lookup `pr-stage-sync` used before
+ * stack discovery existed. A fallback failure is treated exactly like a
+ * repository-list failure — the workspace is marked failed so its fields are
+ * left untouched rather than cleared — never silently treated as "no PR".
+ */
+async function resolveTaskPullRequestsByWorkspace(arguments_) {
+    const { matches, config, listPullRequests, findPullRequestsForBranch, signal } = arguments_;
     const byWorkspace = new Map();
     const failedWorkspaceIds = new Set();
+    const representativeByRepository = new Map();
+    for (const match of matches) {
+        if (!representativeByRepository.has(match.entry.repository)) {
+            representativeByRepository.set(match.entry.repository, match);
+        }
+    }
+    const pullRequestsByRepository = new Map();
+    const failedRepositories = new Set();
+    for (const [repository, representative] of representativeByRepository) {
+        try {
+            // oxlint-disable-next-line no-await-in-loop -- one gh lookup per repository, shared by every matched task in it
+            const pullRequests = await listPullRequests({
+                cwd: representative.entry.dir,
+                ...(signal === undefined ? {} : { signal }),
+            });
+            pullRequestsByRepository.set(repository, pullRequests);
+        }
+        catch (error) {
+            debug(`pr-stage-sync: PR list failed for repository ${repository}: ${errorMessage(error)}`);
+            failedRepositories.add(repository);
+        }
+    }
     for (const match of matches) {
-        // oxlint-disable-next-line no-await-in-loop -- one gh lookup per matched workspace; mirrors reviewer.ts's sequential PR lookups
-        const branchName = await effectiveBranchName({ config, entry: match.entry });
+        if (failedRepositories.has(match.entry.repository)) {
+            failedWorkspaceIds.add(match.workspace.id);
+            continue;
+        }
+        // oxlint-disable-next-line no-await-in-loop -- one branch resolution per matched workspace; mirrors the per-repository gh lookup above
+        const taskBranch = await effectiveBranchName({ config, entry: match.entry });
+        /* v8 ignore next @preserve -- every non-failed repository was populated in the loop above, since every match's repository is added to representativeByRepository first */
+        const repositoryPullRequests = pullRequestsByRepository.get(match.entry.repository) ?? [];
+        const discovered = selectTaskPullRequests(repositoryPullRequests, taskBranch);
+        if (discovered.length > 0) {
+            byWorkspace.set(match.workspace.id, discovered);
+            continue;
+        }
         try {
-            // oxlint-disable-next-line no-await-in-loop -- see above
-            const pullRequests = await findPullRequests({
+            // oxlint-disable-next-line no-await-in-loop -- one exact-branch fallback call per task whose PR fell outside the repository-wide window; sequential keeps it from interleaving with another task's status writes
+            const fallbackPullRequests = await findPullRequestsForBranch({
                 cwd: match.entry.dir,
-                branchName,
+                branchName: taskBranch,
                 ...(signal === undefined ? {} : { signal }),
             });
-            byWorkspace.set(match.workspace.id, selectTrackedPullRequest(pullRequests));
+            byWorkspace.set(match.workspace.id, selectTaskPullRequests(fallbackPullRequests, taskBranch));
         }
         catch (error) {
-            debug(`pr-stage-sync: PR lookup failed for ${match.entry.task}: ${errorMessage(error)}`);
+            debug(`pr-stage-sync: exact-branch PR fallback failed for ${match.entry.task}: ${errorMessage(error)}`);
             failedWorkspaceIds.add(match.workspace.id);
         }
     }
@@ -294,10 +374,11 @@ export function createPrStageSync(deps) {
                 return;
             }
             const matches = matchWorkspacesToTasks(workspaces, worktreeEntries);
-            const { byWorkspace: pullRequestByWorkspace, failedWorkspaceIds } = await resolvePullRequestsByWorkspace({
+            const { byWorkspace: pullRequestsByWorkspace, failedWorkspaceIds } = await resolveTaskPullRequestsByWorkspace({
                 matches,
                 config,
-                findPullRequests: deps.findPullRequests,
+                listPullRequests: deps.listPullRequests,
+                findPullRequestsForBranch: deps.findPullRequestsForBranch,
                 signal,
             });
             if (failedWorkspaceIds.size > 0) {
@@ -305,7 +386,7 @@ export function createPrStageSync(deps) {
                 reason = "pull_request_lookup_failed";
             }
             const urls = [
-                ...new Set([...pullRequestByWorkspace.values()].flatMap((pr) => (pr === undefined ? [] : [pr.url]))),
+                ...new Set([...pullRequestsByWorkspace.values()].flatMap((prs) => prs.map((pr) => pr.url))),
             ];
             let details = new Map();
             if (urls.length > 0) {
@@ -322,16 +403,15 @@ export function createPrStageSync(deps) {
                 }
             }
             for (const match of matches) {
-                const pullRequest = pullRequestByWorkspace.get(match.workspace.id);
-                const detail = pullRequest === undefined ? undefined : details.get(pullRequest.url);
+                const pullRequests = pullRequestsByWorkspace.get(match.workspace.id) ?? [];
                 try {
                     // oxlint-disable-next-line no-await-in-loop -- sequential per workspace so one workspace's status calls never interleave with another's
                     await syncWorkspace({
                         match,
                         labelNames: config.cmux.prStages.labels,
-                        pullRequest,
+                        pullRequests,
                         pullRequestLookupFailed: failedWorkspaceIds.has(match.workspace.id),
-                        detail,
+                        detailsByUrl: details,
                         deps,
                         signal,
                         counters,
@@ -387,7 +467,8 @@ export function createPrStageSync(deps) {
 export function createPrStageSyncDeps(config) {
     return {
         config,
-        findPullRequests: findPullRequestsForBranchOrThrow,
+        listPullRequests: listPullRequestsForRepositoryOrThrow,
+        findPullRequestsForBranch: findTaskPullRequestsForBranchOrThrow,
         fetchPullRequestDetails,
         listCmuxWorkspaces: listCmuxWorkspaceSummaries,
         readCmuxStatus,

package/dist/lib/cmuxStatusFields.d.ts

@@ -14,6 +14,15 @@
  */
 export declare const TICKET_KEY = "crew_ticket";
 export declare const TICKET_PRIORITY = -11;
+/**
+ * Every shown PR for the task, encoded by `prStageRules.ts#encodePrStatuses`
+ * so the cmux sidebar can render one line per PR without re-deriving stage
+ * from scratch per row. Written by `prStageSync.ts` alongside `crew_stage`
+ * (which carries just the single most urgent stage across these PRs) and
+ * `crew_labels` (which describes the same most-urgent, "stage-driving" PR).
+ */
+export declare const PULL_REQUESTS_KEY = "crew_prs";
+export declare const PULL_REQUESTS_PRIORITY = -14;
 export interface CmuxStatusWrite {
     key: string;
     priority: number;

package/dist/lib/cmuxStatusFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmuxStatusFields.d.ts","sourceRoot":"","sources":["../../src/lib/cmuxStatusFields.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH;;;;;GAKG;AACH,eAAO,MAAM,UAAU,gBAAgB,CAAC;AACxC,eAAO,MAAM,eAAe,MAAM,CAAC;AAEnC,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxE;AAED,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAO9B;AAED,kEAAkE;AAClE,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAsBf"}
+{"version":3,"file":"cmuxStatusFields.d.ts","sourceRoot":"","sources":["../../src/lib/cmuxStatusFields.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH;;;;;GAKG;AACH,eAAO,MAAM,UAAU,gBAAgB,CAAC;AACxC,eAAO,MAAM,eAAe,MAAM,CAAC;AAEnC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAE1C,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxE;AAED,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAO9B;AAED,kEAAkE;AAClE,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAsBf"}

package/dist/lib/cmuxStatusFields.js

@@ -15,6 +15,15 @@ import { runWorkspaceCommand } from "./workspaceAdapter.js";
  */
 export const TICKET_KEY = "crew_ticket";
 export const TICKET_PRIORITY = -11;
+/**
+ * Every shown PR for the task, encoded by `prStageRules.ts#encodePrStatuses`
+ * so the cmux sidebar can render one line per PR without re-deriving stage
+ * from scratch per row. Written by `prStageSync.ts` alongside `crew_stage`
+ * (which carries just the single most urgent stage across these PRs) and
+ * `crew_labels` (which describes the same most-urgent, "stage-driving" PR).
+ */
+export const PULL_REQUESTS_KEY = "crew_prs";
+export const PULL_REQUESTS_PRIORITY = -14;
 /**
  * Parses `cmux list-status`'s `key=value [attr=val ...]` lines into a
  * key -> value map. A value is the token immediately after `=`, up to the

package/dist/lib/prStageRules.d.ts

@@ -30,6 +30,56 @@ export interface PrStageLabelNames {
 export declare function derivePrStage(input: PrStageInput, labelNames: PrStageLabelNames): PrStage;
 /** The managed-label subset of a PR's labels, sorted and comma-joined — the `crew_labels` sidebar value. */
 export declare function managedLabelsField(labels: readonly string[], labelNames: PrStageLabelNames): string;
+/**
+ * Most urgent to least urgent, mirroring the sidebar's section order
+ * (`contrib/cmux/groundcrew.swift`) for the stages this module derives —
+ * `merged`/`closed` sit last since a shown closed PR only appears when the
+ * task has no open or merged PR, and a shown merged PR only appears
+ * alongside PRs this urgent or less. Defined once here so `prStageSync.ts`
+ * (picking the task's single most urgent stage across its shown PRs) and any
+ * other ranking need share the same order instead of re-deriving it.
+ */
+export declare const PR_STAGE_URGENCY_ORDER: readonly PrStage[];
+/** The most urgent stage present in `stages`, per `PR_STAGE_URGENCY_ORDER`. */
+export declare function mostUrgentStage(stages: readonly PrStage[]): PrStage | undefined;
+export interface TaskPullRequestRef {
+    headRefName: string;
+    baseRefName: string;
+}
+/** A task's PRs: its exact branch, plus every branch stacked off it (`<taskBranch>-*`). */
+export declare function isTaskBranch(headRefName: string, taskBranch: string): boolean;
+/**
+ * Which of a task's matched pull requests the sidebar shows: every open or
+ * merged one, falling back to closed ones only when none are open or
+ * merged — a closed PR superseded by a later stack split is noise once the
+ * replacement stack exists, but is the only signal left once it's all that
+ * remains.
+ */
+export declare function selectShownPullRequests<T extends {
+    state: string;
+}>(pullRequests: readonly T[]): T[];
+/**
+ * Orders a task's shown PRs bottom-of-stack to top when they chain cleanly
+ * through baseRefName -> headRefName (each PR's base is either outside the
+ * shown set — the bottom — or exactly one other shown PR's head, and no two
+ * PRs share a base); falls back to ascending PR number for anything that
+ * doesn't form that single linear chain (a fork, a gap, or a cycle).
+ */
+export declare function orderPullRequestStack<T extends TaskPullRequestRef & {
+    number: number;
+}>(pullRequests: readonly T[]): T[];
+/** Shown PRs for a task, in display order: `selectShownPullRequests` then `orderPullRequestStack`. */
+export declare function selectTaskPullRequests<T extends TaskPullRequestRef & {
+    number: number;
+    state: string;
+}>(pullRequests: readonly T[], taskBranch: string): T[];
+export interface PrStatusEntry {
+    number: number;
+    stage: PrStage;
+    url: string;
+}
+/** The `crew_prs` sidebar value: `<number>,<stage>,<url>` entries joined by `;`. */
+export declare function encodePrStatuses(entries: readonly PrStatusEntry[]): string;
 export interface TicketDerivationInput {
     title?: string | null;
     currentDirectory?: string | null;

package/dist/lib/prStageRules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prStageRules.d.ts","sourceRoot":"","sources":["../../src/lib/prStageRules.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,MAAM,yBAAyB,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAErE,MAAM,MAAM,yBAAyB,GAAG,UAAU,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,IAAI,CAAC;AAEpG,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,yBAAyB,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,cAAc,EAAE,yBAAyB,CAAC;IAC1C,2FAA2F;IAC3F,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,QAAA,MAAM,SAAS,YACb,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,CACL,CAAC;AAEX,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAKD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CA0BzF;AAED,4GAA4G;AAC5G,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,UAAU,EAAE,iBAAiB,GAC5B,MAAM,CAMR;AAmDD,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,KAAK,EAAE,qBAAqB,GAAG,MAAM,GAAG,SAAS,CAE7E"}
+{"version":3,"file":"prStageRules.d.ts","sourceRoot":"","sources":["../../src/lib/prStageRules.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,MAAM,yBAAyB,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAErE,MAAM,MAAM,yBAAyB,GAAG,UAAU,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,IAAI,CAAC;AAEpG,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,yBAAyB,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,cAAc,EAAE,yBAAyB,CAAC;IAC1C,2FAA2F;IAC3F,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,QAAA,MAAM,SAAS,YACb,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,CACL,CAAC;AAEX,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAKD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CA0BzF;AAED,4GAA4G;AAC5G,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,UAAU,EAAE,iBAAiB,GAC5B,MAAM,CAMR;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,EAAE,SAAS,OAAO,EAUpD,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,GAAG,SAAS,CAE/E;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,2FAA2F;AAC3F,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EACjE,YAAY,EAAE,SAAS,CAAC,EAAE,GACzB,CAAC,EAAE,CAML;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACrF,YAAY,EAAE,SAAS,CAAC,EAAE,GACzB,CAAC,EAAE,CAiCL;AAED,sGAAsG;AACtG,wBAAgB,sBAAsB,CACpC,CAAC,SAAS,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAChE,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAGrD;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAKD,oFAAoF;AACpF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG,MAAM,CAI1E;AAmDD,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,KAAK,EAAE,qBAAqB,GAAG,MAAM,GAAG,SAAS,CAE7E"}

package/dist/lib/prStageRules.js

@@ -59,6 +59,100 @@ export function managedLabelsField(labels, labelNames) {
         .toSorted((a, b) => a.localeCompare(b))
         .join(",");
 }
+/**
+ * Most urgent to least urgent, mirroring the sidebar's section order
+ * (`contrib/cmux/groundcrew.swift`) for the stages this module derives —
+ * `merged`/`closed` sit last since a shown closed PR only appears when the
+ * task has no open or merged PR, and a shown merged PR only appears
+ * alongside PRs this urgent or less. Defined once here so `prStageSync.ts`
+ * (picking the task's single most urgent stage across its shown PRs) and any
+ * other ranking need share the same order instead of re-deriving it.
+ */
+export const PR_STAGE_URGENCY_ORDER = [
+    "my_review",
+    "ci_failing",
+    "changes_requested",
+    "needs_testing",
+    "ready_to_merge",
+    "ci_running",
+    "peer_review",
+    "merged",
+    "closed",
+];
+/** The most urgent stage present in `stages`, per `PR_STAGE_URGENCY_ORDER`. */
+export function mostUrgentStage(stages) {
+    return PR_STAGE_URGENCY_ORDER.find((stage) => stages.includes(stage));
+}
+/** A task's PRs: its exact branch, plus every branch stacked off it (`<taskBranch>-*`). */
+export function isTaskBranch(headRefName, taskBranch) {
+    return headRefName === taskBranch || headRefName.startsWith(`${taskBranch}-`);
+}
+/**
+ * Which of a task's matched pull requests the sidebar shows: every open or
+ * merged one, falling back to closed ones only when none are open or
+ * merged — a closed PR superseded by a later stack split is noise once the
+ * replacement stack exists, but is the only signal left once it's all that
+ * remains.
+ */
+export function selectShownPullRequests(pullRequests) {
+    const openOrMerged = pullRequests.filter((pr) => pr.state === "open" || pr.state === "merged");
+    if (openOrMerged.length > 0) {
+        return openOrMerged;
+    }
+    return pullRequests.filter((pr) => pr.state === "closed");
+}
+/**
+ * Orders a task's shown PRs bottom-of-stack to top when they chain cleanly
+ * through baseRefName -> headRefName (each PR's base is either outside the
+ * shown set — the bottom — or exactly one other shown PR's head, and no two
+ * PRs share a base); falls back to ascending PR number for anything that
+ * doesn't form that single linear chain (a fork, a gap, or a cycle).
+ */
+export function orderPullRequestStack(pullRequests) {
+    if (pullRequests.length <= 1) {
+        return [...pullRequests];
+    }
+    const byHead = new Map(pullRequests.map((pr) => [pr.headRefName, pr]));
+    const childByParentHead = new Map();
+    const roots = [];
+    for (const pr of pullRequests) {
+        const parent = byHead.get(pr.baseRefName);
+        if (parent === undefined) {
+            roots.push(pr);
+            continue;
+        }
+        if (childByParentHead.has(parent.headRefName)) {
+            return pullRequests.toSorted((a, b) => a.number - b.number);
+        }
+        childByParentHead.set(parent.headRefName, pr);
+    }
+    if (roots.length !== 1) {
+        return pullRequests.toSorted((a, b) => a.number - b.number);
+    }
+    const ordered = [];
+    let current = roots[0];
+    while (current !== undefined) {
+        ordered.push(current);
+        current = childByParentHead.get(current.headRefName);
+    }
+    if (ordered.length !== pullRequests.length) {
+        return pullRequests.toSorted((a, b) => a.number - b.number);
+    }
+    return ordered;
+}
+/** Shown PRs for a task, in display order: `selectShownPullRequests` then `orderPullRequestStack`. */
+export function selectTaskPullRequests(pullRequests, taskBranch) {
+    const matched = pullRequests.filter((pr) => isTaskBranch(pr.headRefName, taskBranch));
+    return orderPullRequestStack(selectShownPullRequests(matched));
+}
+const PR_ENTRY_SEPARATOR = ";";
+const PR_FIELD_SEPARATOR = ",";
+/** The `crew_prs` sidebar value: `<number>,<stage>,<url>` entries joined by `;`. */
+export function encodePrStatuses(entries) {
+    return entries
+        .map((entry) => [entry.number, entry.stage, entry.url].join(PR_FIELD_SEPARATOR))
+        .join(PR_ENTRY_SEPARATOR);
+}
 const TICKET_PREFIX_RE = /^[A-Za-z]+$/;
 const TICKET_NUMBER_RE = /^[0-9]+$/;
 const TICKET_PREFIX_MAX_LENGTH = 5;

package/dist/lib/pullRequests.d.ts

@@ -59,11 +59,60 @@ interface ResolvePullRequestArgs {
 export declare function resolvePullRequest(arguments_: ResolvePullRequestArgs): Promise<ResolvedPullRequest>;
 export declare function findPullRequestsForBranch(arguments_: LookupArgs): Promise<readonly PullRequestSummary[]>;
 /**
- * Same lookup as `findPullRequestsForBranch`, but lets failures propagate
- * instead of degrading to "no PR info". `pr-stage-sync` needs to tell "the
- * branch truly has no PR" apart from "couldn't confirm this tick" so a flaky
- * `gh` call never clears a saved stage or label.
+ * A repository's full open/merged/closed PR list, with the head/base branch
+ * names `pr-stage-sync` needs for stack discovery (a task's PRs are its exact
+ * branch plus everything stacked off it) and stack ordering. Unlike
+ * `findPullRequestsForBranch`, this isn't filtered server-side by `--head` —
+ * `gh` has no "head starts with" filter — so the task-branch match happens
+ * client-side (`prStageRules.ts#selectTaskPullRequests`) against one list
+ * fetched per repository per tick, not one `gh` call per task.
  */
-export declare function findPullRequestsForBranchOrThrow(arguments_: LookupArgs): Promise<readonly PullRequestSummary[]>;
+export interface TaskPullRequest {
+    url: string;
+    number: number;
+    /** Lowercased lifecycle: "open" | "merged" | "closed". */
+    state: string;
+    title: string;
+    headRefName: string;
+    baseRefName: string;
+}
+interface ListPullRequestsForRepositoryArgs {
+    /** Any worktree dir for the repository; `gh` resolves the GitHub repo from its git remote. */
+    cwd: string;
+    signal?: AbortSignal;
+}
+/**
+ * Lists every open/merged/closed PR for the repository `cwd` belongs to, in
+ * one `gh pr list` call. Lets failures propagate — `pr-stage-sync` needs to
+ * tell "the repository truly has no matching PR" apart from "couldn't
+ * confirm this tick" so a flaky `gh` call never clears a saved stage.
+ *
+ * Scoped to `--author @me`: groundcrew runs under the operator's own `gh`
+ * identity, which is who every agent-created PR is authored by, so this
+ * keeps the 100-PR window to PRs that can plausibly be a tracked task's
+ * rather than spending it on the rest of the repository's traffic. A task
+ * whose PR still falls outside that window — or isn't under the operator's
+ * identity for some other reason — is recovered by the exact-branch fallback
+ * in `findTaskPullRequestsForBranchOrThrow`, not by widening this call.
+ */
+export declare function listPullRequestsForRepositoryOrThrow(arguments_: ListPullRequestsForRepositoryArgs): Promise<readonly TaskPullRequest[]>;
+interface FindTaskPullRequestsForBranchArgs {
+    /** Worktree directory; `gh` resolves the GitHub repo from its git remote. */
+    cwd: string;
+    /** Exact head branch name to filter PRs by (no prefix/stack matching — that needs the repository-wide list). */
+    branchName: string;
+    signal?: AbortSignal;
+}
+/**
+ * Exact-branch fallback for when a task's PR fell outside the repository-wide
+ * list's 100-PR window (`listPullRequestsForRepositoryOrThrow`): the same
+ * `gh pr list --head <branch>` lookup `pr-stage-sync` used before stack
+ * discovery existed, reshaped to the `TaskPullRequest` fields so its result
+ * composes with `prStageRules.ts#selectTaskPullRequests` like the
+ * repository-wide list does. Lets failures propagate, same as
+ * `listPullRequestsForRepositoryOrThrow` and for the same reason: a flaky
+ * `gh` call must read as "couldn't confirm this tick", not "no PR".
+ */
+export declare function findTaskPullRequestsForBranchOrThrow(arguments_: FindTaskPullRequestsForBranchArgs): Promise<readonly TaskPullRequest[]>;
 export {};
 //# sourceMappingURL=pullRequests.d.ts.map

package/dist/lib/pullRequests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pullRequests.d.ts","sourceRoot":"","sources":["../../src/lib/pullRequests.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AASD,UAAU,UAAU;IAClB,6EAA6E;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAgDD,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,6DAA6D;IAC7D,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,UAAU,sBAAsB;IAC9B,yFAAyF;IACzF,OAAO,EAAE,MAAM,CAAC;IAChB,iDAAiD;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA2BD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAsC9B;AA0BD,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAWxC;AAED;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAExC"}
+{"version":3,"file":"pullRequests.d.ts","sourceRoot":"","sources":["../../src/lib/pullRequests.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AASD,UAAU,UAAU;IAClB,6EAA6E;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAgDD,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,6DAA6D;IAC7D,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,UAAU,sBAAsB;IAC9B,yFAAyF;IACzF,OAAO,EAAE,MAAM,CAAC;IAChB,iDAAiD;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA2BD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAsC9B;AA0BD,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAWxC;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAwDD,UAAU,iCAAiC;IACzC,8FAA8F;IAC9F,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,oCAAoC,CACxD,UAAU,EAAE,iCAAiC,GAC5C,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAoBrC;AAED,UAAU,iCAAiC;IACzC,6EAA6E;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,gHAAgH;IAChH,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;;;;;;;;GASG;AACH,wBAAsB,oCAAoC,CACxD,UAAU,EAAE,iCAAiC,GAC5C,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAoBrC"}

package/dist/lib/pullRequests.js

@@ -144,12 +144,102 @@ export async function findPullRequestsForBranch(arguments_) {
         return [];
     }
 }
+const GH_PR_LIST_TASK_DISCOVERY_LIMIT = 100;
+function isRawTaskPullRequest(value) {
+    if (typeof value !== "object" || value === null) {
+        return false;
+    }
+    // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- narrowing untyped JSON.parse output to a record so we can probe its keys
+    const record = value;
+    return (typeof record["url"] === "string" &&
+        typeof record["number"] === "number" &&
+        typeof record["state"] === "string" &&
+        typeof record["title"] === "string" &&
+        typeof record["headRefName"] === "string" &&
+        typeof record["baseRefName"] === "string");
+}
+function parseTaskPullRequests(output) {
+    let parsed;
+    try {
+        parsed = JSON.parse(output);
+    }
+    catch {
+        return [];
+    }
+    if (!Array.isArray(parsed)) {
+        return [];
+    }
+    const summaries = [];
+    for (const entry of parsed) {
+        if (!isRawTaskPullRequest(entry)) {
+            continue;
+        }
+        summaries.push({
+            url: entry.url,
+            number: entry.number,
+            state: STATE_MAP[entry.state] ?? entry.state.toLowerCase(),
+            title: entry.title,
+            headRefName: entry.headRefName,
+            baseRefName: entry.baseRefName,
+        });
+    }
+    return summaries;
+}
+/**
+ * Lists every open/merged/closed PR for the repository `cwd` belongs to, in
+ * one `gh pr list` call. Lets failures propagate — `pr-stage-sync` needs to
+ * tell "the repository truly has no matching PR" apart from "couldn't
+ * confirm this tick" so a flaky `gh` call never clears a saved stage.
+ *
+ * Scoped to `--author @me`: groundcrew runs under the operator's own `gh`
+ * identity, which is who every agent-created PR is authored by, so this
+ * keeps the 100-PR window to PRs that can plausibly be a tracked task's
+ * rather than spending it on the rest of the repository's traffic. A task
+ * whose PR still falls outside that window — or isn't under the operator's
+ * identity for some other reason — is recovered by the exact-branch fallback
+ * in `findTaskPullRequestsForBranchOrThrow`, not by widening this call.
+ */
+export async function listPullRequestsForRepositoryOrThrow(arguments_) {
+    const { cwd, signal } = arguments_;
+    const options = signal === undefined ? { cwd } : { cwd, signal };
+    const output = await runCommandAsync("gh", [
+        "pr",
+        "list",
+        "--state",
+        "all",
+        "--author",
+        "@me",
+        "--limit",
+        String(GH_PR_LIST_TASK_DISCOVERY_LIMIT),
+        "--json",
+        "url,number,state,title,headRefName,baseRefName",
+    ], options);
+    return parseTaskPullRequests(output);
+}
 /**
- * Same lookup as `findPullRequestsForBranch`, but lets failures propagate
- * instead of degrading to "no PR info". `pr-stage-sync` needs to tell "the
- * branch truly has no PR" apart from "couldn't confirm this tick" so a flaky
- * `gh` call never clears a saved stage or label.
+ * Exact-branch fallback for when a task's PR fell outside the repository-wide
+ * list's 100-PR window (`listPullRequestsForRepositoryOrThrow`): the same
+ * `gh pr list --head <branch>` lookup `pr-stage-sync` used before stack
+ * discovery existed, reshaped to the `TaskPullRequest` fields so its result
+ * composes with `prStageRules.ts#selectTaskPullRequests` like the
+ * repository-wide list does. Lets failures propagate, same as
+ * `listPullRequestsForRepositoryOrThrow` and for the same reason: a flaky
+ * `gh` call must read as "couldn't confirm this tick", not "no PR".
  */
-export async function findPullRequestsForBranchOrThrow(arguments_) {
-    return await listPullRequestsForBranch(arguments_);
+export async function findTaskPullRequestsForBranchOrThrow(arguments_) {
+    const { cwd, branchName, signal } = arguments_;
+    const options = signal === undefined ? { cwd } : { cwd, signal };
+    const output = await runCommandAsync("gh", [
+        "pr",
+        "list",
+        "--head",
+        branchName,
+        "--state",
+        "all",
+        "--limit",
+        String(GH_PR_LIST_LIMIT),
+        "--json",
+        "url,number,state,title,headRefName,baseRefName",
+    ], options);
+    return parseTaskPullRequests(output);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/groundcrew",
-  "version": "4.52.9",
+  "version": "4.52.11",
   "description": "Linear-driven orchestrator that launches AI coding agents in git worktrees, with workspace lifecycle and usage tracking.",
   "keywords": [
     "agent",
@@ -62,8 +62,8 @@
     "lint": "oxlint --config config/oxlint.config.ts --deny-warnings --ignore-pattern 'v2/**'",
     "markdown:lint": "markdownlint-cli2 --config config/markdownlint-cli2.jsonc",
     "prepack": "node --run build",
-    "prepare": "husky",
-    "sync-ai-rules": "node ./node_modules/@clipboard-health/ai-rules/scripts/sync.js common",
+    "prepare": "husky && node --run sync-ai-rules",
+    "sync-ai-rules": "npm exec --yes --package=@clipboard-health/engineering-practices@latest -- engineering-practices-sync common || true",
     "syncpack:lint": "syncpack lint --config config/syncpack.config.ts",
     "test": "vitest run --coverage",
     "verify": "node scripts/verifyAll.mts"
@@ -77,12 +77,11 @@
     "zod": "4.6.5"
   },
   "devDependencies": {
-    "@clipboard-health/ai-rules": "2.50.17",
     "@clipboard-health/oxlint-config": "1.14.3",
     "@nx/js": "23.1.0",
     "@tsconfig/node24": "24.0.5",
     "@tsconfig/strictest": "2.0.8",
-    "@types/node": "26.6.3",
+    "@types/node": "26.6.4",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
     "@vitest/coverage-v8": "5.0.3",
     "dependency-cruiser": "18.5.0",
@@ -96,7 +95,7 @@
     "oxlint": "1.78.0",
     "oxlint-tsgolint": "7.0.2003",
     "syncpack": "15.3.3",
-    "vite": "8.3.1",
+    "vite": "8.3.2",
     "vitest": "5.0.3"
   },
   "engines": {