@clipboard-health/groundcrew 4.41.0 → 4.43.0

package/README.md

@@ -106,6 +106,8 @@ crew run [--watch]                                       # one-shot or --watch f
 crew start <TASK>                                      # provision + launch one task now
 crew stop <TASK> [--reason <text>]                     # stop workspace, keep worktree
 crew resume <TASK>                                     # reopen a paused task
+crew open <pr> | --branch <name> [--repo <owner/repo>] # iterate on an existing PR or branch
+         [--prompt <text> | --prompt-file <path>] [--task <id>] [--dry-run]
 crew cleanup [--force] <TASK>                          # tear down every worktree for a task
 crew upgrade [<version>]                                 # reinstall crew globally through npm
 ```

package/crew.config.example.ts

@@ -121,6 +121,9 @@ export default {
   //   {
   //     kind: "shell",
   //     name: "jira",
+  //     // Open local task-store directories for read/write inside the
+  //     // safehouse/srt sandbox when this source owns the launched task.
+  //     sandboxWritePaths: ["~/plans"],
   //     commands: {
   //       verify: "jira me",
   //       fetch: "~/.config/groundcrew/jira-fetch.sh",

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAqRA,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCvD"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AA4RA,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCvD"}

package/dist/cli.js

@@ -3,6 +3,7 @@ import { cleanupWorkspaceCli } from "./commands/cleanupWorkspace.js";
 import { doctor } from "./commands/doctor.js";
 import { initConfigCli } from "./commands/init.js";
 import { interruptWorkspaceCli } from "./commands/interruptWorkspace.js";
+import { openWorkspaceCli } from "./commands/openWorkspace.js";
 import { orchestrate } from "./commands/orchestrator.js";
 import { resumeWorkspaceCli } from "./commands/resumeWorkspace.js";
 import { setupWorkspaceCli } from "./commands/setupWorkspace.js";
@@ -169,6 +170,11 @@ const SUBCOMMANDS = {
         usage: "<task>",
         invoke: resumeWorkspaceCli,
     },
+    open: {
+        summary: "Open an existing PR or branch in a new worktree and launch a session",
+        usage: "<pr> | --branch <name> [--repo <owner/repo>] [--agent <agent>] [--prompt <text> | --prompt-file <path>] [--task <id>] [--dry-run]",
+        invoke: openWorkspaceCli,
+    },
     setup: {
         summary: "Removed repository bootstrap command",
         usage: "repos",

package/dist/commands/openWorkspace.d.ts

@@ -0,0 +1,24 @@
+import { type ResolvedConfig } from "../lib/config.ts";
+interface PullRequestInput {
+    kind: "pr";
+    pr: string;
+    repositoryHint?: string;
+}
+interface BranchInput {
+    kind: "branch";
+    branch: string;
+}
+export interface OpenWorkspaceOptions {
+    input: PullRequestInput | BranchInput;
+    repository?: string;
+    agent?: string;
+    /** Resolved prompt text; when undefined the agent opens interactively. */
+    promptText?: string;
+    taskOverride?: string;
+    dryRun?: boolean;
+}
+export declare function openWorkspace(config: ResolvedConfig, options: OpenWorkspaceOptions): Promise<void>;
+export declare function parseOpenWorkspaceArgs(argv: string[]): OpenWorkspaceOptions;
+export declare function openWorkspaceCli(argv: string[]): Promise<void>;
+export {};
+//# sourceMappingURL=openWorkspace.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"openWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/openWorkspace.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AActF,UAAU,gBAAgB;IACxB,IAAI,EAAE,IAAI,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,gBAAgB,GAAG,WAAW,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AA6JD,wBAAsB,aAAa,CACjC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAwGf;AA4ID,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAE3E;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpE"}

package/dist/commands/openWorkspace.js

@@ -0,0 +1,339 @@
+import { existsSync, readFileSync, rmSync } from "node:fs";
+import path from "node:path";
+import { composeAgentLaunch, openAgentWorkspace, prepareAgentLaunch } from "../lib/agentLaunch.js";
+import { loadConfig, repositoryBaseDir } from "../lib/config.js";
+import { resolvePullRequest } from "../lib/pullRequests.js";
+import { resolvePrepareWorktreeCommand } from "../lib/repositoryHooks.js";
+import { recordRunState, readRunState } from "../lib/runState.js";
+import { stageBuildSecrets, stagePromptText, stageWorkspaceLaunchCommand, } from "../lib/stagedLaunch.js";
+import { normalizePlainTaskId } from "../lib/taskId.js";
+import { debug, errorMessage, log, okMark } from "../lib/util.js";
+import { failIfWorkspaceAlreadyLive } from "../lib/workspaceLiveness.js";
+import { resolveLaunchDir, worktrees } from "../lib/worktrees.js";
+const OPEN_USAGE = "Usage: crew open <pr> | --branch <name> [--repo <owner/repo>] [--agent <agent>] [--prompt <text> | --prompt-file <path>] [--task <id>] [--dry-run]";
+const PULL_REQUEST_URL_PATTERN = /^https?:\/\/github\.com\/(?<repository>[^/]+\/[^/]+)\/pull\/(?<pr>\d+)/;
+function parsePullRequestReference(reference) {
+    const groups = PULL_REQUEST_URL_PATTERN.exec(reference)?.groups;
+    if (groups?.["repository"] !== undefined && groups["pr"] !== undefined) {
+        return { repository: groups["repository"], pr: groups["pr"] };
+    }
+    return { pr: reference };
+}
+function slugifyBranch(branch) {
+    return branch
+        .toLowerCase()
+        .replaceAll(/[^a-z0-9]+/g, "-")
+        .replaceAll(/^-+|-+$/g, "");
+}
+function repositoryCloneDir(config, repository) {
+    return path.resolve(repositoryBaseDir(config, repository), repository);
+}
+function assertKnownRepository(config, repository) {
+    if (!config.workspace.knownRepositories.includes(repository)) {
+        throw new Error(`Repository "${repository}" is not in workspace.knownRepositories: ${config.workspace.knownRepositories.join(", ")}`);
+    }
+}
+function repositoryBasename(repository) {
+    const lastSlash = repository.lastIndexOf("/");
+    return lastSlash === -1 ? repository : repository.slice(lastSlash + 1);
+}
+function resolveRepositoryHint(config, repositoryHint) {
+    const normalizedHint = repositoryHint.toLowerCase();
+    const exactMatches = config.workspace.knownRepositories.filter((repository) => repository.toLowerCase() === normalizedHint);
+    const [exactMatch] = exactMatches;
+    if (exactMatches.length === 1 && exactMatch !== undefined) {
+        return exactMatch;
+    }
+    const basename = repositoryBasename(repositoryHint).toLowerCase();
+    const basenameMatches = config.workspace.knownRepositories.filter((repository) => repositoryBasename(repository).toLowerCase() === basename);
+    const [basenameMatch] = basenameMatches;
+    if (basenameMatches.length === 1 && basenameMatch !== undefined) {
+        return basenameMatch;
+    }
+    if (basenameMatches.length > 1) {
+        throw new Error(`Repository hint "${repositoryHint}" matches multiple configured repositories: ${basenameMatches.join(", ")}. Pass --repo <name> to choose one.`);
+    }
+    throw new Error(`Repository hint "${repositoryHint}" does not match workspace.knownRepositories: ${config.workspace.knownRepositories.join(", ")}. Pass --repo <name> to choose one.`);
+}
+function resolveOpenRepository(config, options) {
+    if (options.repository !== undefined) {
+        assertKnownRepository(config, options.repository);
+        return options.repository;
+    }
+    if (options.input.kind === "pr" && options.input.repositoryHint !== undefined) {
+        return resolveRepositoryHint(config, options.input.repositoryHint);
+    }
+    throw new Error(`crew open: --repo <owner/repo> is required\n${OPEN_USAGE}`);
+}
+function failIfAlreadyTracked(config, task, repository) {
+    const hasWorktree = worktrees
+        .findByTask(config, task)
+        .some((entry) => entry.repository === repository);
+    if (hasWorktree || readRunState(config, task) !== undefined) {
+        throw new Error(`Task ${task} already has a worktree or run state. Use 'crew resume ${task}' to continue it, or 'crew status ${task}' to inspect it.`);
+    }
+}
+async function resolveTarget(config, options, repository) {
+    if (options.input.kind === "branch") {
+        const { branch } = options.input;
+        return {
+            branch,
+            title: branch,
+            task: normalizePlainTaskId(options.taskOverride ?? slugifyBranch(branch)),
+        };
+    }
+    const pullRequest = await resolvePullRequest({
+        repoDir: repositoryCloneDir(config, repository),
+        pr: options.input.pr,
+    });
+    if (pullRequest.isCrossRepository) {
+        throw new Error(`PR #${pullRequest.number} is from a fork (cross-repository); crew open cannot fetch fork branches. Check the branch out locally, then run crew open --branch <name> --repo ${repository}.`);
+    }
+    return {
+        branch: pullRequest.branch,
+        title: pullRequest.title,
+        task: normalizePlainTaskId(options.taskOverride ?? `pr-${pullRequest.number}`),
+        url: pullRequest.url,
+    };
+}
+async function rollback(arguments_) {
+    log(`Open failed; rolling back worktree ${arguments_.entry.repository}-${arguments_.entry.task}...`);
+    try {
+        await worktrees.teardown(arguments_.config, [arguments_.entry], { force: true });
+    }
+    catch (error) {
+        log(`Worktree teardown failed during rollback: ${errorMessage(error)}`);
+    }
+    for (const dir of [arguments_.promptDir, arguments_.srtSettingsDir]) {
+        if (dir !== undefined) {
+            try {
+                rmSync(dir, { recursive: true, force: true });
+            }
+            catch {
+                // already gone
+            }
+        }
+    }
+}
+export async function openWorkspace(config, options) {
+    const repository = resolveOpenRepository(config, options);
+    const repoDir = repositoryCloneDir(config, repository);
+    if (!existsSync(repoDir)) {
+        throw new Error(`Repository not found: ${repoDir}`);
+    }
+    const target = await resolveTarget(config, options, repository);
+    await failIfWorkspaceAlreadyLive(config, target.task, "opening");
+    failIfAlreadyTracked(config, target.task, repository);
+    const agent = options.agent ?? config.agents.default;
+    const definition = config.agents.definitions[agent];
+    if (definition === undefined) {
+        throw new Error(`Unknown agent: ${agent}`);
+    }
+    if (options.dryRun === true) {
+        log(`[dry-run] Would open ${target.task} on branch ${target.branch} in ${repository} (${agent})`);
+        return;
+    }
+    const { runner, networkEgress, sandboxName, workspaceKind, ensureReady } = await prepareAgentLaunch({
+        config,
+        agent,
+        definition,
+        purpose: "runs",
+    });
+    await ensureReady();
+    const created = await worktrees.open(config, {
+        repository,
+        task: target.task,
+        branch: target.branch,
+    });
+    const launchDir = resolveLaunchDir(config, repository, created.dir);
+    const omitPromptArgument = options.promptText === undefined;
+    const stagedPrompt = stagePromptText({
+        prefix: "groundcrew-open",
+        task: target.task,
+        text: options.promptText ?? "",
+    });
+    let srtSettingsDir;
+    try {
+        const prepareWorktreeCommand = resolvePrepareWorktreeCommand({
+            worktreeDir: launchDir,
+            defaultHooks: config.defaults.hooks,
+        });
+        const secretsFile = prepareWorktreeCommand === undefined ? undefined : stageBuildSecrets(stagedPrompt.directory);
+        let launchCommand;
+        ({ launchCommand, srtSettingsDir } = composeAgentLaunch({
+            runner,
+            networkEgress,
+            task: target.task,
+            definition,
+            promptFile: stagedPrompt.file,
+            worktreeDir: created.dir,
+            workingDir: launchDir,
+            secretsFile,
+            prepareWorktreeCommand,
+            sandboxName,
+            workspaceKind,
+            omitPromptArgument,
+        }));
+        const launchCmd = stageWorkspaceLaunchCommand(stagedPrompt.directory, launchCommand);
+        await openAgentWorkspace({
+            config,
+            name: target.task,
+            cwd: launchDir,
+            command: launchCmd,
+            agent,
+            color: definition.color,
+        });
+    }
+    catch (error) {
+        await rollback({ config, entry: created, promptDir: stagedPrompt.directory, srtSettingsDir });
+        throw error;
+    }
+    recordRunState({
+        config,
+        state: {
+            task: target.task,
+            repository,
+            agent,
+            worktreeDir: created.dir,
+            branchName: target.branch,
+            workspaceName: target.task,
+            state: "running",
+            title: target.title,
+            adoptedBranch: true,
+            ...(target.url === undefined ? {} : { url: target.url }),
+        },
+    });
+    log(`${okMark()} "${target.task}" opened on branch ${target.branch} (${agent})`);
+    debug(`  Worktree: ${launchDir}`);
+    if (omitPromptArgument) {
+        debug("  Launched interactively (no prompt).");
+    }
+}
+function readValue(argv, index, flag) {
+    const value = argv[index + 1];
+    if (value === undefined || value.startsWith("-")) {
+        throw new Error(`crew open: ${flag} requires a value\n${OPEN_USAGE}`);
+    }
+    return value;
+}
+function parseArguments(argv) {
+    const parsed = { dryRun: false };
+    for (let index = 0; index < argv.length; index += 1) {
+        const argument = argv[index];
+        /* v8 ignore next @preserve -- loop bound guarantees argv[index] is defined; the guard narrows the type */
+        if (argument === undefined) {
+            continue;
+        }
+        switch (argument) {
+            case "--repo": {
+                parsed.repository = readValue(argv, index, "--repo");
+                index += 1;
+                break;
+            }
+            case "--agent": {
+                parsed.agent = readValue(argv, index, "--agent");
+                index += 1;
+                break;
+            }
+            case "--prompt": {
+                parsed.promptText = readValue(argv, index, "--prompt");
+                index += 1;
+                break;
+            }
+            case "--prompt-file": {
+                parsed.promptFile = readValue(argv, index, "--prompt-file");
+                index += 1;
+                break;
+            }
+            case "--branch": {
+                parsed.branch = readValue(argv, index, "--branch");
+                index += 1;
+                break;
+            }
+            case "--task": {
+                parsed.task = readValue(argv, index, "--task");
+                index += 1;
+                break;
+            }
+            case "--dry-run": {
+                parsed.dryRun = true;
+                break;
+            }
+            default: {
+                if (argument.startsWith("-")) {
+                    throw new Error(`crew open: unknown option: ${argument}\n${OPEN_USAGE}`);
+                }
+                if (parsed.positional !== undefined) {
+                    throw new Error(`crew open: unexpected extra argument: ${argument}\n${OPEN_USAGE}`);
+                }
+                parsed.positional = argument;
+            }
+        }
+    }
+    return parsed;
+}
+function resolvePromptText(parsed) {
+    if (parsed.promptText !== undefined && parsed.promptFile !== undefined) {
+        throw new Error(`crew open: --prompt and --prompt-file are mutually exclusive\n${OPEN_USAGE}`);
+    }
+    if (parsed.promptText !== undefined) {
+        return parsed.promptText;
+    }
+    if (parsed.promptFile !== undefined) {
+        try {
+            return readFileSync(parsed.promptFile, "utf8");
+        }
+        catch (error) {
+            throw new Error(`crew open: could not read --prompt-file ${parsed.promptFile}`, {
+                cause: error,
+            });
+        }
+    }
+    return undefined;
+}
+function toOpenWorkspaceOptions(parsed) {
+    if (parsed.branch !== undefined && parsed.positional !== undefined) {
+        throw new Error(`crew open: pass either a PR or --branch, not both\n${OPEN_USAGE}`);
+    }
+    const promptText = resolvePromptText(parsed);
+    const common = {
+        ...(parsed.agent === undefined ? {} : { agent: parsed.agent }),
+        ...(promptText === undefined ? {} : { promptText }),
+        ...(parsed.task === undefined ? {} : { taskOverride: parsed.task }),
+        dryRun: parsed.dryRun,
+    };
+    if (parsed.branch !== undefined) {
+        if (parsed.repository === undefined) {
+            throw new Error(`crew open: --branch requires --repo <owner/repo>\n${OPEN_USAGE}`);
+        }
+        return {
+            input: { kind: "branch", branch: parsed.branch },
+            repository: parsed.repository,
+            ...common,
+        };
+    }
+    if (parsed.positional === undefined) {
+        throw new Error(`crew open: a PR (number or URL) or --branch is required\n${OPEN_USAGE}`);
+    }
+    const reference = parsePullRequestReference(parsed.positional);
+    if (parsed.repository === undefined && reference.repository === undefined) {
+        throw new Error(`crew open: --repo <owner/repo> is required when the PR is given by number\n${OPEN_USAGE}`);
+    }
+    return {
+        input: {
+            kind: "pr",
+            pr: reference.pr,
+            ...(reference.repository === undefined ? {} : { repositoryHint: reference.repository }),
+        },
+        ...(parsed.repository === undefined ? {} : { repository: parsed.repository }),
+        ...common,
+    };
+}
+export function parseOpenWorkspaceArgs(argv) {
+    return toOpenWorkspaceOptions(parseArguments(argv));
+}
+export async function openWorkspaceCli(argv) {
+    const options = parseOpenWorkspaceArgs(argv);
+    const config = await loadConfig();
+    await openWorkspace(config, options);
+}

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

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/commands/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoEH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAiBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgE7E"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/commands/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoEH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAiBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE7E"}

package/dist/commands/orchestrator.js

@@ -94,6 +94,7 @@ export async function orchestrate(options) {
     const cleaner = createCleaner({ config });
     const reviewer = createReviewer({
         board,
+        config,
         findPullRequests: findPullRequestsForBranch,
     });
     const dispatcher = createDispatcher({ config, board });

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,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBnE,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAqJD,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA0Ff;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,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBnE,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AA2ID,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA4Ff;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtE"}

package/dist/commands/resumeWorkspace.js

@@ -10,7 +10,7 @@ import { removeStagedPrompt, stageBuildSecrets, stagePromptText, stageWorkspaceL
 import { taskSourceWritePathsForCompletion } from "../lib/taskSourceFilesystem.js";
 import { naturalIdFromCanonical, toCanonicalId } from "../lib/taskSource.js";
 import { errorMessage, log } from "../lib/util.js";
-import { workspaces } from "../lib/workspaces.js";
+import { failIfWorkspaceAlreadyLive } from "../lib/workspaceLiveness.js";
 import { resolveLaunchDir, worktrees } from "../lib/worktrees.js";
 function parseArguments(argv) {
     const [task, ...extras] = argv;
@@ -60,7 +60,10 @@ async function contextFromState(config, task, state, worktree) {
         task,
         repository: state.repository,
         agent: state.agent,
-        worktree,
+        // Prefer the branch recorded in run state: `crew open` worktrees check out
+        // an existing PR branch that diverges from the `<prefix>-<task>` name the
+        // worktree-dir scan derives, and run state is the source of truth for it.
+        worktree: { ...worktree, branchName: state.branchName },
         title: details?.title ?? task.toUpperCase(),
         description: details?.description ?? "",
         completionTaskId,
@@ -113,25 +116,15 @@ function renderResumePrompt(context) {
         "Run the repository's documented verification before stopping, then leave the branch ready or open a PR when possible.",
     ].join("\n");
 }
-async function failIfWorkspaceAlreadyLive(config, task) {
-    const probe = await workspaces.probe(config);
-    if (probe.kind === "unavailable") {
-        const detail = probe.error === undefined ? "" : `: ${errorMessage(probe.error)}`;
-        throw new Error(`Could not verify whether workspace for ${task} is already live${detail}. Retry or inspect the workspace backend manually before resuming.`);
-    }
-    if (probe.names.has(task)) {
-        throw new Error(`Workspace for ${task} is already live; attach to it instead of resuming.`);
-    }
-}
 export async function resumeWorkspace(config, options) {
     const task = options.task.toLowerCase();
-    await failIfWorkspaceAlreadyLive(config, task);
+    await failIfWorkspaceAlreadyLive(config, task, "resuming");
     const context = await buildResumeContext(config, task);
     const definition = config.agents.definitions[context.agent];
     if (definition === undefined) {
         throw new Error(`Unknown agent: ${context.agent}`);
     }
-    const { runner, sandboxName, workspaceKind, ensureReady } = await prepareAgentLaunch({
+    const { runner, networkEgress, sandboxName, workspaceKind, ensureReady } = await prepareAgentLaunch({
         config,
         agent: context.agent,
         definition,
@@ -162,6 +155,7 @@ export async function resumeWorkspace(config, options) {
             : undefined;
         ({ launchCommand, srtSettingsDir } = composeAgentLaunch({
             runner,
+            networkEgress,
             task,
             definition,
             promptFile: stagedPrompt.file,

package/dist/commands/reviewer.d.ts

@@ -22,6 +22,7 @@
  * `Cleaner`.
  */
 import type { Board } from "../lib/board.ts";
+import type { ResolvedConfig } from "../lib/config.ts";
 import type { PullRequestSummary } from "../lib/pullRequests.ts";
 import { type BoardState } from "../lib/taskSource.ts";
 import type { WorktreeEntry } from "../lib/worktrees.ts";
@@ -39,6 +40,7 @@ export type FindPullRequests = (arguments_: {
 interface ReviewerDeps {
     board: Board;
     findPullRequests: FindPullRequests;
+    config?: ResolvedConfig;
 }
 /** Per-tick inputs, mirroring the other orchestrator steps' shape. */
 interface ReviewArguments {

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

@@ -1 +1 @@
-{"version":3,"file":"reviewer.d.ts","sourceRoot":"","sources":["../../src/commands/reviewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,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;AAEzD;;;;;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;CACpC;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,CAwH3D"}
+{"version":3,"file":"reviewer.d.ts","sourceRoot":"","sources":["../../src/commands/reviewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;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;AAGzD;;;;;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,CA8H3D"}

package/dist/commands/reviewer.js

@@ -23,6 +23,7 @@
  */
 import { naturalIdFromCanonical, } from "../lib/taskSource.js";
 import { debug, errorMessage, log, logEvent } from "../lib/util.js";
+import { effectiveBranchName } from "../lib/worktreeRunState.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
 // up for review. `merged` wins over `open`. An open PR on an already in-review
@@ -52,7 +53,7 @@ function matchingWorktreeEntries(arguments_) {
     return worktreeEntries.filter((entry) => entry.task === task && entry.repository === issue.repository);
 }
 export function createReviewer(deps) {
-    const { board, findPullRequests } = deps;
+    const { board, config, findPullRequests } = deps;
     async function runOnce(arguments_) {
         const { state, worktreeEntries, dryRun, signal } = arguments_;
         const candidates = state.issues.filter((issue) => issue.status === "in-progress" || issue.status === "in-review");
@@ -65,6 +66,7 @@ export function createReviewer(deps) {
                 issue,
                 worktreeEntries,
                 dryRun,
+                ...(config === undefined ? {} : { config }),
                 ...(signal === undefined ? {} : { signal }),
             });
         }
@@ -74,10 +76,13 @@ export function createReviewer(deps) {
     // Unsupported writebacks are skipped without claiming success and may retry
     // on later ticks.
     async function advanceIfReviewable(arguments_) {
-        const { issue, worktreeEntries, dryRun, signal } = arguments_;
+        const { issue, worktreeEntries, dryRun, config: reviewerConfig, signal } = arguments_;
         const task = naturalIdFromCanonical(issue.id);
         const entries = matchingWorktreeEntries({ issue, worktreeEntries, task });
         for (const entry of entries) {
+            const branchName = reviewerConfig === undefined
+                ? entry.branchName
+                : effectiveBranchName({ config: reviewerConfig, entry });
             // The injected lookup is contracted never to reject (failures resolve to
             // []), but we still guard it so one bad lookup can never abort the tick
             // and starve the other candidates. A failure means "can't tell yet" →
@@ -87,12 +92,12 @@ export function createReviewer(deps) {
                 // oxlint-disable-next-line no-await-in-loop -- a task almost always has one worktree; sequential lookups are fine.
                 pullRequests = await findPullRequests({
                     cwd: entry.dir,
-                    branchName: entry.branchName,
+                    branchName,
                     ...(signal === undefined ? {} : { signal }),
                 });
             }
             catch (error) {
-                debug(`PR lookup failed for ${task} (${entry.branchName}): ${errorMessage(error)}`);
+                debug(`PR lookup failed for ${task} (${branchName}): ${errorMessage(error)}`);
                 continue;
             }
             const transition = intendedTransition(pullRequests, issue.status);

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;AAyBnE,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,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,CAmJf;AAgJD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CAkDf"}
+{"version":3,"file":"setupWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/setupWorkspace.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAyBnE,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,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,CAqJf;AAgJD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CAkDf"}

package/dist/commands/setupWorkspace.js

@@ -34,7 +34,7 @@ export async function setupWorkspace(config, options, runOptions = {}) {
     if (!definition) {
         throw new Error(`Unknown agent: ${agent}`);
     }
-    const { runner, sandboxName, workspaceKind, ensureReady } = await prepareAgentLaunch({
+    const { runner, networkEgress, sandboxName, workspaceKind, ensureReady } = await prepareAgentLaunch({
         config,
         agent,
         definition,
@@ -99,6 +99,7 @@ export async function setupWorkspace(config, options, runOptions = {}) {
             : undefined;
         const { launchCommand, srtSettingsDir: stagedSrtSettingsDir } = composeAgentLaunch({
             runner,
+            networkEgress,
             task,
             definition,
             promptFile: stagedPrompt.file,

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;AAcnE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAkqBD,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;AAenE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA8qBD,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

@@ -8,6 +8,7 @@ import { isGroundcrewIssue, naturalIdFromCanonical, } from "../lib/taskSource.js
 import { errorMessage, withLogOutputSuppressed, writeOutput } from "../lib/util.js";
 import { workspaces } from "../lib/workspaces.js";
 import { worktrees } from "../lib/worktrees.js";
+import { effectiveBranchNameFromRunState } from "../lib/worktreeRunState.js";
 const RECENT_LOG_LINE_COUNT = 10;
 function escapeRegExp(value) {
     return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw `\$&`);
@@ -40,7 +41,9 @@ async function writeTaskWorktrees(config, task) {
         writeOutput("(none)");
         return;
     }
+    const runState = readRunState(config, task);
     for (const entry of entries) {
+        const branchName = effectiveBranchNameFromRunState({ entry, runState });
         // 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,
@@ -48,10 +51,10 @@ async function writeTaskWorktrees(config, task) {
         // oxlint-disable-next-line no-await-in-loop -- one gh lookup per worktree is acceptable; multi-worktree-per-task is rare.
         const prs = await findPullRequestsForBranch({
             cwd: entry.dir,
-            branchName: entry.branchName,
+            branchName,
         });
         writeOutput(`- ${entry.repository} ${entry.kind}`);
-        writeOutput(`  branch: ${entry.branchName}`);
+        writeOutput(`  branch: ${branchName}`);
         writeOutput(`  dir: ${entry.dir}`);
         writeOutput(`  git: ${formatDirtiness(dirtiness)}`);
         if (prs.length > 0) {
@@ -325,14 +328,22 @@ async function writeInventoryWorktrees(config, probe, statusByTask) {
         writeOutput("(none)");
         return;
     }
-    const accessHints = await collectAccessHints(config, entries);
-    const pullRequests = await collectPullRequests(entries);
     const runStates = new Map();
-    const now = new Date();
-    for (const [index, entry] of entries.entries()) {
+    for (const entry of entries) {
         if (!runStates.has(entry.task)) {
             runStates.set(entry.task, readRunState(config, entry.task));
         }
+    }
+    const accessHints = await collectAccessHints(config, entries);
+    const pullRequests = await collectPullRequests(entries.map((entry) => ({
+        dir: entry.dir,
+        branchName: effectiveBranchNameFromRunState({
+            entry,
+            runState: runStates.get(entry.task),
+        }),
+    })));
+    const now = new Date();
+    for (const [index, entry] of entries.entries()) {
         const runState = runStates.get(entry.task);
         const accessHint = accessHints.get(entry.task);
         // `collectPullRequests` guarantees an entry for every worktree dir seen