@clipboard-health/groundcrew 4.2.4 → 4.3.1

package/README.md

@@ -20,28 +20,17 @@
 $ crew status HRD-446
 groundcrew status HRD-446
 ========================
-ticket: hrd-446
+ticket: hrd-446  in-progress  https://linear.app/example/issue/HRD-446
+title: Add retry logic to the sync job
+run: running; model=claude; updated=2026-05-26T00:01:00.000Z; resumes=0
+workspace: live
 
-Config snapshot
----------------
-projectDir: /dev/workspaces
-repositories: owner/repo
-git: remote=origin; defaultBranch=main
-workspaceKind: auto
-
-Worktree state
---------------
+Worktrees
+---------
 - owner/repo host
   branch: rocky-hrd-446
+  dir: /dev/workspaces/owner/repo-hrd-446
   git: dirty (2 modified, 1 untracked)
-
-Workspace probe
----------------
-live: yes
-
-Last Linear status
-------------------
-In Progress (state.type=started) — Add retry logic to the sync job
 ```
 
 ## Why
@@ -217,9 +206,9 @@ Replace `claude` with the sbx agent for the model and `<projectDir>` with `works
 
 ## Inspecting status
 
-`crew status <TICKET>` prints a read-only snapshot for one ticket: resolved config, matching worktrees, workspace probe result, recorded run state, recent log lines for that ticket, and the latest Linear status. It does not fetch, recover, tear down, resume, or mutate any local/remote state.
+`crew status <TICKET>` prints a read-only snapshot for one ticket: cached title/URL when present, recorded run state, live workspace presence, matching worktrees, git dirtiness, PR links for matching branches, recent log lines when present, and the ticket status from the configured ticket source. It does not recover, tear down, resume, or mutate any local/remote state.
 
-`crew status` with no ticket prints the current inventory: known worktrees with workspace/run-state presence plus live workspaces reported by the configured backend.
+`crew status` with no ticket prints the current inventory: known worktrees with cached ticket metadata, workspace/run-state agreement, attach hints, worktree paths, PR links, and stray sessions reported by the configured backend. Local worktree/session diagnostics are printed before ticket-source fetches complete; when the source fetch succeeds, status also prints slot usage plus Queue/Blocked sections for eligible Todo tickets. If the source fetch fails, Queue shows `unavailable: <reason>` and the slots line is omitted.
 
 Use `crew cleanup <TICKET>` to tear down stale worktrees and `crew resume <TICKET>` to reopen preserved work. Status is intentionally informational only.
 
@@ -233,26 +222,22 @@ Use `crew cleanup <TICKET>` to tear down stale worktrees and `crew resume <TICKE
 ```text
 groundcrew status HRD-442
 =========================
-ticket: hrd-442
+ticket: hrd-442  in-progress  https://linear.app/example/issue/HRD-442
+title: Multi-event extractor: year inference can produce date_start > date_end
+run: running; model=claude; updated=2026-05-26T00:01:00.000Z; resumes=0
+workspace: live
 
-Run state
+Worktrees
 ---------
-running; model=claude; updated=2026-05-26T00:01:00.000Z; resumes=0
-
-Worktree
---------
-- herds-social host
+- herds-social/herds host
   branch: paul-hrd-442
-  dir: /Users/paul/dev/groundcrew-workspaces/herds-social/herds-hrd-442
+  dir: /dev/workspaces/herds-social/herds-hrd-442
   git: dirty (0 modified, 1 untracked)
+  pr: https://github.com/herds-social/herds/pull/224 (open)
 
-Workspace
----------
-live: yes
-
-Last Linear status
-------------------
-In Progress (state.type=started) — Multi-event extractor: year inference can produce date_start > date_end
+Recent logs
+-----------
+[10:15:30] Workspace "hrd-442" launched
 ```
 
 </details>
@@ -463,7 +448,7 @@ op run --env-file .env.1password -- crew doctor
 
 ## Troubleshooting
 
-First stop for "what exists locally right now": `crew status <ticket>` shows the ticket's worktrees, workspace presence, run state, logs, and latest Linear status. Use `crew doctor` when you need to verify host setup.
+First stop for "what exists locally right now": `crew status <ticket>` shows the ticket's worktrees, workspace presence, run state, logs, and ticket-source status. Use `crew doctor` when you need to verify host setup.
 
 <details>
 <summary>Safehouse-already-wrapped commands are not re-wrapped</summary>

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;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,KAAK,EAEX,MAAM,wBAAwB,CAAC;AAChC,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,CAAC,UAAU,EAAE;QAClB,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,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAaD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,UAAU,CAiNjE;AAUD,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;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,KAAK,EAEX,MAAM,wBAAwB,CAAC;AAChC,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,CAAC,UAAU,EAAE;QAClB,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,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAaD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,UAAU,CAqNjE;AAUD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,GAAG,MAAM,CAQrE"}

package/dist/commands/dispatcher.js

@@ -60,7 +60,11 @@ export function createDispatcher(deps) {
                     repository: issue.repository,
                     ticket: ticketId,
                     model: issue.model,
-                    details: { title: issue.title, description: issue.description },
+                    details: {
+                        title: issue.title,
+                        description: issue.description,
+                        ...(issue.url === undefined ? {} : { url: issue.url }),
+                    },
                 };
                 await (signal === undefined
                     ? setupWorkspace(config, setupOptions)

package/dist/commands/setupWorkspace.d.ts

@@ -2,6 +2,8 @@ import { type ResolvedConfig } from "../lib/config.ts";
 export interface TicketDetails {
     title: string;
     description: string;
+    /** Direct web URL for the ticket; cached into RunState when present. */
+    url?: string;
 }
 export interface SetupWorkspaceOptions {
     ticket: string;

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

@@ -1 +1 @@
-{"version":3,"file":"setupWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/setupWorkspace.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBnE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,aAAa,CAAC;CACxB;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,CAyGf;AAiHD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CAwCf"}
+{"version":3,"file":"setupWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/setupWorkspace.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBnE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,aAAa,CAAC;CACxB;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,CA6Gf;AAqHD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CA4Cf"}

package/dist/commands/setupWorkspace.js

@@ -102,6 +102,8 @@ export async function setupWorkspace(config, options, runOptions = {}) {
             branchName,
             workspaceName: ticket,
             state: "running",
+            title: ticketDetails.title,
+            ...(ticketDetails.url === undefined ? {} : { url: ticketDetails.url }),
         });
         log(`Workspace "${ticket}" launched (${model})`);
         log(`  Worktree: ${launchDir}`);
@@ -122,6 +124,8 @@ export async function setupWorkspace(config, options, runOptions = {}) {
             workspaceName: ticket,
             state: "failed-to-launch",
             detail: errorMessage(error),
+            title: options.details.title,
+            ...(options.details.url === undefined ? {} : { url: options.details.url }),
         });
         throw error;
     }
@@ -167,7 +171,9 @@ function recordRunStateBestEffort(arguments_) {
                 branchName: arguments_.branchName,
                 workspaceName: arguments_.workspaceName,
                 state: arguments_.state,
+                title: arguments_.title,
                 ...(arguments_.detail === undefined ? {} : { detail: arguments_.detail }),
+                ...(arguments_.url === undefined ? {} : { url: arguments_.url }),
             },
         });
     }
@@ -242,7 +248,11 @@ export async function setupWorkspaceCli(ticket, options = {}) {
         ticket: naturalId,
         repository: resolved.repository,
         model: resolved.model,
-        details: { title: resolved.title, description: resolved.description },
+        details: {
+            title: resolved.title,
+            description: resolved.description,
+            ...(resolved.url === undefined ? {} : { url: resolved.url }),
+        },
     });
     await board.markInProgress(resolved);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMnE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAyLD,wBAAsB,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/F;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7D"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAanE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA6gBD,wBAAsB,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/F;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7D"}

package/dist/commands/status.js

@@ -1,8 +1,10 @@
 import { readFileSync } from "node:fs";
-import { getLinearClient } from "../lib/adapters/linear/client.js";
-import { fetchRawLinearIssue } from "../lib/adapters/linear/fetch.js";
+import { createBoard } from "../lib/board.js";
+import { buildSources, sourcesFromConfig } from "../lib/buildSources.js";
 import { loadConfig } from "../lib/config.js";
+import { findPullRequestsForBranch } from "../lib/pullRequests.js";
 import { readRunState } from "../lib/runState.js";
+import { isGroundcrewIssue, naturalIdFromCanonical, } from "../lib/ticketSource.js";
 import { errorMessage, withLogOutputSuppressed, writeOutput } from "../lib/util.js";
 import { workspaces } from "../lib/workspaces.js";
 import { worktrees } from "../lib/worktrees.js";
@@ -25,16 +27,6 @@ function writeSection(title) {
     writeOutput(title);
     writeOutput("-".repeat(title.length));
 }
-function writeConfigSnapshot(config) {
-    writeSection("Config snapshot");
-    writeOutput(`projectDir: ${config.workspace.projectDir}`);
-    writeOutput(`repositories: ${config.workspace.knownRepositories.join(", ")}`);
-    writeOutput(`git: remote=${config.git.remote}; defaultBranch=${config.git.defaultBranch}`);
-    writeOutput(`workspaceKind: ${config.workspaceKind}`);
-    writeOutput(`local.runner: ${config.local.runner}`);
-    writeOutput(`models: default=${config.models.default}; enabled=${Object.keys(config.models.definitions).join(", ")}`);
-    writeOutput(`logFile: ${config.logging.file}`);
-}
 function formatDirtiness(dirtiness) {
     if (dirtiness.kind === "dirty") {
         return `dirty (${dirtiness.modified} modified, ${dirtiness.untracked} untracked)`;
@@ -42,7 +34,7 @@ function formatDirtiness(dirtiness) {
     return dirtiness.kind;
 }
 async function writeTicketWorktrees(config, ticket) {
-    writeSection("Worktree state");
+    writeSection("Worktrees");
     const entries = worktrees.findByTicket(config, ticket);
     if (entries.length === 0) {
         writeOutput("(none)");
@@ -50,12 +42,21 @@ async function writeTicketWorktrees(config, ticket) {
     }
     for (const entry of entries) {
         // oxlint-disable-next-line no-await-in-loop -- status output is easier to read in worktree order.
-        const dirtiness = await worktrees.probeWorkingTree({ worktreeDir: entry.dir });
+        const dirtiness = await worktrees.probeWorkingTree({
+            worktreeDir: entry.dir,
+        });
+        // oxlint-disable-next-line no-await-in-loop -- one gh lookup per worktree is acceptable; multi-worktree-per-ticket is rare.
+        const prs = await findPullRequestsForBranch({
+            repository: entry.repository,
+            branchName: entry.branchName,
+        });
         writeOutput(`- ${entry.repository} ${entry.kind}`);
-        writeOutput(`  ticket: ${entry.ticket}`);
         writeOutput(`  branch: ${entry.branchName}`);
         writeOutput(`  dir: ${entry.dir}`);
         writeOutput(`  git: ${formatDirtiness(dirtiness)}`);
+        if (prs.length > 0) {
+            writeOutput(`  pr: ${formatPullRequests(prs)}`);
+        }
     }
 }
 function workspaceProbeUnavailableLine(probe) {
@@ -63,13 +64,11 @@ function workspaceProbeUnavailableLine(probe) {
         ? "Workspace probe unavailable"
         : `Workspace probe unavailable: ${errorMessage(probe.error)}`;
 }
-function writeTicketWorkspace(probe, ticket) {
-    writeSection("Workspace probe");
+function ticketWorkspaceText(probe, ticket) {
     if (probe.kind === "unavailable") {
-        writeOutput(workspaceProbeUnavailableLine(probe));
-        return;
+        return workspaceProbeUnavailableLine(probe);
     }
-    writeOutput(`live: ${probe.names.has(ticket) ? "yes" : "no"}`);
+    return probe.names.has(ticket) ? "live" : "not live";
 }
 function formatRunState(state) {
     if (state === undefined) {
@@ -93,15 +92,56 @@ function recentTicketLogLines(config, ticket) {
         .filter((line) => pattern.test(line))
         .slice(-RECENT_LOG_LINE_COUNT);
 }
-async function linearStatus(ticket) {
+async function resolveTicketSource(config, ticket) {
+    const board = await buildBoardForStatus(config);
+    return await withLogOutputSuppressed(async () => await board.resolveOne(ticket));
+}
+async function readTicketSourceStatus(config, ticket) {
     try {
-        const issue = await fetchRawLinearIssue({ client: getLinearClient(), ticket });
-        // `stateType` is "" when Linear returned a stateless ticket; surface that
-        // as "unknown" rather than an empty token.
-        return `${issue.stateName} (state.type=${issue.stateType || "unknown"}) — ${issue.title}`;
+        const issue = await resolveTicketSource(config, ticket);
+        if (issue === undefined) {
+            return { kind: "not-found" };
+        }
+        return { kind: "found", issue };
     }
     catch (error) {
-        return `unavailable: ${errorMessage(error)}`;
+        return { kind: "unavailable", reason: errorMessage(error) };
+    }
+}
+function writeRecentLogs(config, ticket) {
+    const logLines = recentTicketLogLines(config, ticket);
+    if (logLines.length === 0) {
+        return;
+    }
+    writeSection("Recent logs");
+    writeOutput(logLines.join("\n"));
+}
+function formatTicketLine(ticket, runState, sourceStatus) {
+    const parts = [`ticket: ${ticket}`];
+    if (sourceStatus.kind === "found") {
+        parts.push(sourceStatus.issue.status);
+    }
+    const url = sourceStatus.kind === "found" ? (sourceStatus.issue.url ?? runState?.url) : runState?.url;
+    if (url !== undefined) {
+        parts.push(url);
+    }
+    if (sourceStatus.kind === "not-found") {
+        parts.push("source not found");
+    }
+    if (sourceStatus.kind === "unavailable") {
+        parts.push(`source unavailable: ${sourceStatus.reason}`);
+    }
+    return parts.join("  ");
+}
+function writeTicketTitle(runState, sourceStatus) {
+    const cachedTitle = runState?.title;
+    const sourceTitle = sourceStatus.kind === "found" ? sourceStatus.issue.title : undefined;
+    const title = cachedTitle ?? sourceTitle;
+    if (title !== undefined) {
+        writeOutput(`title: ${title}`);
+    }
+    if (cachedTitle !== undefined && sourceTitle !== undefined && cachedTitle !== sourceTitle) {
+        writeOutput(`source title: ${sourceTitle}`);
     }
 }
 async function writeTicketStatus(config, rawTicket) {
@@ -109,26 +149,118 @@ async function writeTicketStatus(config, rawTicket) {
     const displayTicket = ticket.toUpperCase();
     writeOutput(`groundcrew status ${displayTicket}`);
     writeOutput("=".repeat(`groundcrew status ${displayTicket}`.length));
-    writeOutput(`ticket: ${ticket}`);
-    writeConfigSnapshot(config);
+    const runState = readRunState(config, ticket);
+    const [workspaceProbe, sourceStatus] = await Promise.all([
+        withLogOutputSuppressed(async () => await workspaces.probe(config)),
+        readTicketSourceStatus(config, ticket),
+    ]);
+    writeOutput(formatTicketLine(ticket, runState, sourceStatus));
+    writeTicketTitle(runState, sourceStatus);
+    writeOutput(`run: ${formatRunState(runState)}`);
+    writeOutput(`workspace: ${ticketWorkspaceText(workspaceProbe, ticket)}`);
     await writeTicketWorktrees(config, ticket);
-    const workspaceProbe = await withLogOutputSuppressed(async () => await workspaces.probe(config));
-    writeTicketWorkspace(workspaceProbe, ticket);
-    writeSection("Run state");
-    writeOutput(formatRunState(readRunState(config, ticket)));
-    writeSection("Recent logs");
-    const logLines = recentTicketLogLines(config, ticket);
-    writeOutput(logLines.length === 0 ? "(none)" : logLines.join("\n"));
-    writeSection("Last Linear status");
-    writeOutput(await linearStatus(ticket));
+    writeRecentLogs(config, ticket);
+}
+/**
+ * Wall-clock elapsed time since the run was first recorded (RunState.createdAt
+ * is preserved across resume/interrupt). Returns undefined when the row isn't
+ * actively running, when no run state exists, or when the timestamp cannot
+ * be parsed.
+ */
+function runStateDurationMs(runState, now) {
+    if (runState === undefined) {
+        return undefined;
+    }
+    if (runState.state !== "running" && runState.state !== "resumed") {
+        return undefined;
+    }
+    const created = Date.parse(runState.createdAt);
+    if (Number.isNaN(created)) {
+        return undefined;
+    }
+    return now.getTime() - created;
+}
+const MS_PER_MINUTE = 60_000;
+const MS_PER_HOUR = 60 * MS_PER_MINUTE;
+const MS_PER_DAY = 24 * MS_PER_HOUR;
+function formatDuration(ms) {
+    if (ms < MS_PER_MINUTE) {
+        return "<1m";
+    }
+    if (ms < MS_PER_HOUR) {
+        return `${Math.floor(ms / MS_PER_MINUTE)}m`;
+    }
+    if (ms < MS_PER_DAY) {
+        const hours = Math.floor(ms / MS_PER_HOUR);
+        const minutes = Math.floor((ms - hours * MS_PER_HOUR) / MS_PER_MINUTE);
+        return minutes === 0 ? `${hours}h` : `${hours}h ${minutes}m`;
+    }
+    const days = Math.floor(ms / MS_PER_DAY);
+    const hours = Math.floor((ms - days * MS_PER_DAY) / MS_PER_HOUR);
+    return hours === 0 ? `${days}d` : `${days}d ${hours}h`;
 }
-function workspacePresence(probe, ticket) {
+/**
+ * Combined human-readable state for the inventory row. Surfaces RunState
+ * lifecycle and flags the two interesting disagreements with the workspace
+ * probe — `(session dead)` when we recorded a running dispatch but no
+ * session is alive, and `(stray session)` when a session is alive without
+ * any recorded dispatch. `probe.kind === "unavailable"` is treated as
+ * "we don't know" and never produces a suffix. When the row is actively
+ * running, appends the elapsed wall-clock time since dispatch.
+ */
+function inventoryStateText(runState, probe, ticket, now) {
+    const lifecycle = runState?.state ?? "idle";
+    const duration = runStateDurationMs(runState, now);
+    const flags = [];
+    if (probe.kind === "ok") {
+        const sessionLive = probe.names.has(ticket);
+        if (lifecycle === "idle" && sessionLive) {
+            flags.push("stray session");
+        }
+        if ((lifecycle === "running" || lifecycle === "resumed") && !sessionLive) {
+            flags.push("session dead");
+        }
+    }
+    if (duration !== undefined) {
+        flags.push(formatDuration(duration));
+    }
+    return flags.length === 0 ? lifecycle : `${lifecycle} (${flags.join(", ")})`;
+}
+/**
+ * Hint command for inventory rows where the run-state and the workspace
+ * probe disagree. Returned commands are safe defaults; the user is free to
+ * ignore them and use `attach:` + `pr:` to investigate first.
+ *
+ * - Stray session (live session, no run-state record) → `crew cleanup` to
+ *   tear down the orphaned worktree + close the session.
+ * - Session dead (run-state says running/resumed, no live session) →
+ *   `crew resume` to bring the agent back; the worktree is preserved.
+ *
+ * No hint when the probe is unavailable (we genuinely don't know whether
+ * there's a disagreement) or when the row is healthy.
+ */
+function inventoryHint(runState, probe, ticket) {
     if (probe.kind === "unavailable") {
-        return "unknown";
+        return undefined;
+    }
+    const lifecycle = runState?.state ?? "idle";
+    const sessionLive = probe.names.has(ticket);
+    if (lifecycle === "idle" && sessionLive) {
+        return `run 'crew cleanup ${ticket}' to clear this stray session`;
     }
-    return probe.names.has(ticket) ? "yes" : "no";
+    if ((lifecycle === "running" || lifecycle === "resumed") && !sessionLive) {
+        return `run 'crew resume ${ticket}' to bring the session back`;
+    }
+    return undefined;
+}
+const INVENTORY_LABEL_WIDTH = "worktree:".length;
+function inventoryField(label, value) {
+    return `  ${`${label}:`.padEnd(INVENTORY_LABEL_WIDTH)}  ${value}`;
+}
+function formatPullRequests(prs) {
+    return prs.map((pr) => `${pr.url} (${pr.state})`).join(", ");
 }
-function writeInventoryWorktrees(config, probe) {
+async function writeInventoryWorktrees(config, probe) {
     writeSection("Worktrees");
     const entries = worktrees
         .list(config)
@@ -137,31 +269,179 @@ function writeInventoryWorktrees(config, probe) {
         writeOutput("(none)");
         return;
     }
+    const accessHints = await collectAccessHints(config, entries);
+    const pullRequests = await collectPullRequests(entries);
     const runStates = new Map();
-    for (const entry of entries) {
+    const now = new Date();
+    for (const [index, entry] of entries.entries()) {
         if (!runStates.has(entry.ticket)) {
             runStates.set(entry.ticket, readRunState(config, entry.ticket));
         }
         const runState = runStates.get(entry.ticket);
-        writeOutput(`${entry.ticket}  ${entry.repository}  ${entry.kind}  workspace=${workspacePresence(probe, entry.ticket)}  run=${runState?.state ?? "none"}`);
-        writeOutput(`  ${entry.branchName}  ${entry.dir}`);
+        const accessHint = accessHints.get(entry.ticket);
+        // `collectPullRequests` guarantees an entry for every (repo, branch)
+        // pair seen in `entries`; the lookup always returns the array.
+        /* v8 ignore next @preserve -- defensive fallback for a Map key that collectPullRequests always populates */
+        const prs = pullRequests.get(pullRequestKey(entry.repository, entry.branchName)) ?? [];
+        if (index > 0) {
+            writeOutput();
+        }
+        writeOutput(runState?.url === undefined ? entry.ticket : `${entry.ticket}  ${runState.url}`);
+        if (runState?.title !== undefined) {
+            writeOutput(inventoryField("title", runState.title));
+        }
+        writeOutput(inventoryField("state", inventoryStateText(runState, probe, entry.ticket, now)));
+        writeOutput(inventoryField("repo", entry.repository));
+        writeOutput(inventoryField("worktree", entry.dir));
+        if (accessHint !== undefined) {
+            writeOutput(inventoryField("attach", accessHint.command));
+        }
+        if (prs.length > 0) {
+            writeOutput(inventoryField("pr", formatPullRequests(prs)));
+        }
+        const hint = inventoryHint(runState, probe, entry.ticket);
+        if (hint !== undefined) {
+            writeOutput(inventoryField("hint", hint));
+        }
     }
 }
-function writeInventoryWorkspaces(probe) {
-    writeSection("Live workspaces");
+function pullRequestKey(repository, branchName) {
+    return `${repository} ${branchName}`;
+}
+async function collectAccessHints(config, entries) {
+    const uniqueTickets = [...new Set(entries.map((entry) => entry.ticket))];
+    const results = await Promise.allSettled(uniqueTickets.map(async (ticket) => await workspaces.accessHint(config, ticket)));
+    return new Map(uniqueTickets.map((ticket, index) => {
+        const result = results[index];
+        return [ticket, result?.status === "fulfilled" ? result.value : undefined];
+    }));
+}
+async function collectPullRequests(entries) {
+    // Same-(repo, branch) entries collapse to one lookup; later inserts
+    // overwrite earlier ones with the same identifier, which is fine because
+    // gh would return the same PR list for both.
+    const uniqueKeys = new Map();
+    for (const entry of entries) {
+        uniqueKeys.set(pullRequestKey(entry.repository, entry.branchName), {
+            repository: entry.repository,
+            branchName: entry.branchName,
+        });
+    }
+    const results = await Promise.allSettled([...uniqueKeys.entries()].map(async ([key, { repository, branchName }]) => {
+        const prs = await findPullRequestsForBranch({ repository, branchName });
+        return [key, prs];
+    }));
+    return new Map([...uniqueKeys.keys()].map((key, index) => {
+        const result = results[index];
+        return [key, result?.status === "fulfilled" ? result.value[1] : []];
+    }));
+}
+function writeStraySessions(probe, worktreeTickets) {
     if (probe.kind === "unavailable") {
+        // Surface probe failures so the user knows we couldn't classify strays
+        // (silently dropping the section would hide that diagnostic).
+        writeSection("Stray sessions");
         writeOutput(workspaceProbeUnavailableLine(probe));
         return;
     }
-    const names = [...probe.names].toSorted();
-    writeOutput(names.length === 0 ? "(none)" : names.join("\n"));
+    const strays = [...probe.names].filter((name) => !worktreeTickets.has(name)).toSorted();
+    if (strays.length === 0) {
+        return;
+    }
+    writeSection("Stray sessions");
+    writeOutput(strays.join("\n"));
+}
+function isTodoSourceIssue(issue) {
+    return issue.status === "todo";
+}
+function hasOpenBlocker(issue) {
+    return issue.blockers.some((b) => b.status !== "done");
+}
+function describeOpenBlockers(issue) {
+    return issue.blockers
+        .filter((b) => b.status !== "done")
+        .map((b) => `${naturalIdFromCanonical(b.id)} (${b.nativeStatus ?? b.status})`)
+        .join(", ");
+}
+function writeQueueIssue(issue) {
+    const naturalId = naturalIdFromCanonical(issue.id);
+    writeOutput(issue.url === undefined ? naturalId : `${naturalId}  ${issue.url}`);
+    writeOutput(inventoryField("title", issue.title));
+    writeOutput(inventoryField("repo", issue.repository));
+    writeOutput(inventoryField("model", issue.model));
+}
+async function buildBoardForStatus(config) {
+    const sources = await buildSources(sourcesFromConfig(config), { globalConfig: config });
+    return createBoard(sources);
+}
+/**
+ * Single board fetch used by both the slot count header and the
+ * Queue/Blocked sections. `sourcesFromConfig` prepends an implicit Linear
+ * source when none are configured, so we always attempt; failures
+ * (e.g., missing API key) are captured and rendered later as
+ * `unavailable: ...` in the Queue section.
+ */
+async function fetchBoardForStatus(config) {
+    try {
+        const board = await buildBoardForStatus(config);
+        const { issues } = await withLogOutputSuppressed(async () => await board.fetch());
+        return { kind: "ok", issues };
+    }
+    catch (error) {
+        return { kind: "error", error };
+    }
+}
+function writeQueueSections(boardResult) {
+    if (boardResult.kind === "error") {
+        writeSection("Queue");
+        writeOutput(`unavailable: ${errorMessage(boardResult.error)}`);
+        return;
+    }
+    // Only groundcrew-eligible Todos are dispatchable; non-eligible ones lack
+    // a repo or model, so `crew run` would skip them.
+    const todos = boardResult.issues.filter(isTodoSourceIssue).filter(isGroundcrewIssue);
+    const ready = todos.filter((i) => !hasOpenBlocker(i));
+    const blocked = todos.filter(hasOpenBlocker);
+    // Hide the section entirely when nothing's queued and nothing's blocked.
+    if (ready.length > 0) {
+        writeSection("Queue");
+        for (const [index, issue] of ready.entries()) {
+            if (index > 0) {
+                writeOutput();
+            }
+            writeQueueIssue(issue);
+        }
+    }
+    if (blocked.length > 0) {
+        writeSection("Blocked");
+        for (const [index, issue] of blocked.entries()) {
+            if (index > 0) {
+                writeOutput();
+            }
+            writeQueueIssue(issue);
+            writeOutput(inventoryField("blocked by", describeOpenBlockers(issue)));
+        }
+    }
+}
+function inProgressCount(issues) {
+    return issues.filter((issue) => issue.status === "in-progress").length;
 }
 async function writeInventoryStatus(config) {
-    writeOutput("groundcrew status");
-    writeOutput("=================");
+    // Banner ("groundcrew status\n=================") dropped: the command
+    // you just ran already tells you what report you're looking at, and the
+    // section headers (`Worktrees`, `Queue`, etc.) carry the visual anchors.
+    const boardResultPromise = fetchBoardForStatus(config);
     const probe = await withLogOutputSuppressed(async () => await workspaces.probe(config));
-    writeInventoryWorktrees(config, probe);
-    writeInventoryWorkspaces(probe);
+    await writeInventoryWorktrees(config, probe);
+    const worktreeTickets = new Set(worktrees.list(config).map((entry) => entry.ticket));
+    writeStraySessions(probe, worktreeTickets);
+    const boardResult = await boardResultPromise;
+    if (boardResult.kind === "ok") {
+        const used = inProgressCount(boardResult.issues);
+        writeOutput();
+        writeOutput(`slots: ${used}/${config.orchestrator.maximumInProgress} used`);
+    }
+    writeQueueSections(boardResult);
 }
 export async function status(config, options = {}) {
     const ticket = options.ticket?.trim();

package/dist/commands/upgrade.d.ts

@@ -7,6 +7,7 @@ export interface UpgradeCliOptions {
         version: string;
         npmBin: string;
     }) => Promise<NpmRunResult>;
+    readInstalledVersion: (installPath: string) => string | undefined;
 }
 export interface UpgradeInstallDetails {
     installKind: InstallKind;

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

@@ -1 +1 @@
-{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,qBAAqB,CAAC;AAK7B,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACrD,UAAU,EAAE,CAAC,OAAO,EAAE;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAOD,MAAM,MAAM,sBAAsB,GAAG,iBAAiB,GAAG,CAAC,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAiD5F,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EAAE,EACd,YAAY,EAAE,sBAAsB,GACnC,OAAO,CAAC,IAAI,CAAC,CAkBf;AAsCD,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,wBAAwB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAqB5B"}
+{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,qBAAqB,CAAC;AAK7B,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACrD,UAAU,EAAE,CAAC,OAAO,EAAE;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B,oBAAoB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CACnE;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAYD,MAAM,MAAM,sBAAsB,GAAG,iBAAiB,GAAG,CAAC,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAiD5F,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EAAE,EACd,YAAY,EAAE,sBAAsB,GACnC,OAAO,CAAC,IAAI,CAAC,CAkBf;AAmED,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,wBAAwB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAsB5B"}