@clipboard-health/groundcrew 4.43.0 → 4.43.2

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,CAqJf;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,CA+If;AA8MD,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

@@ -12,7 +12,7 @@ import { taskSourceWritePathsForCompletion } from "../lib/taskSourceFilesystem.j
 import { naturalIdFromCanonical } from "../lib/taskSource.js";
 import { debug, errorMessage, log, okMark } from "../lib/util.js";
 import { workspaces } from "../lib/workspaces.js";
-import { isWorktreeAlreadyExistsError, resolveLaunchDir, worktrees, } from "../lib/worktrees.js";
+import { resolveLaunchDir, WorktreeAlreadyExistsError, worktrees, } from "../lib/worktrees.js";
 function stagePrompt(input) {
     return stagePromptFromTemplate({
         config: input.config,
@@ -41,17 +41,23 @@ export async function setupWorkspace(config, options, runOptions = {}) {
         purpose: "runs",
         ...(signal === undefined ? {} : { signal }),
     });
+    await preflightProvisioningGate({ config, options, signal });
     const spec = { repository, task };
-    let created;
     const createdPromise = signal === undefined ? worktrees.create(config, spec) : worktrees.create(config, spec, signal);
     const readinessPromise = startLaunchReadiness(ensureReady);
+    let created;
     try {
         created = await createdPromise;
     }
     catch (error) {
-        if (isWorktreeAlreadyExistsError(error)) {
-            await logAccessHintForExistingWorkspace({ config, task, signal });
-        }
+        // Roll the pre-flight `provisioning` row forward; the outer catch only
+        // fires post-create and the dispatcher just logs and moves on.
+        recordFailedToLaunch({
+            config,
+            options,
+            paths: worktrees.predictedEntry(config, repository, task),
+            error,
+        });
         throw error;
     }
     const { branchName, dir: worktreeDir } = created;
@@ -149,23 +155,61 @@ export async function setupWorkspace(config, options, runOptions = {}) {
     }
     catch (error) {
         await rollbackWorktree({ config, entry: created, promptDir, srtSettingsDir });
-        recordRunStateBestEffort({
-            config,
-            task,
-            repository,
-            agent,
-            worktreeDir,
-            branchName,
-            workspaceName: task,
-            state: "failed-to-launch",
-            detail: errorMessage(error),
-            title: options.details.title,
-            completionTaskId: options.completionTaskId ?? task,
-            ...(options.details.url === undefined ? {} : { url: options.details.url }),
-        });
+        recordFailedToLaunch({ config, options, paths: { worktreeDir, branchName }, error });
         throw error;
     }
 }
+/**
+ * Bail out before any state-write when the worktree already exists, then
+ * record a "provisioning" row so `crew status` can surface the in-flight
+ * worktree create instead of falling back to "idle". The dispatcher
+ * serializes setupWorkspace calls per host, so the race against a parallel
+ * worktrees.create() can't realistically fire here — `worktrees.create()`
+ * still defends against it internally.
+ */
+async function preflightProvisioningGate(arguments_) {
+    const { config, options, signal } = arguments_;
+    const { task, repository, agent } = options;
+    const existing = worktrees
+        .findByTask(config, task)
+        .find((entry) => entry.repository === repository);
+    if (existing !== undefined) {
+        await logAccessHintForExistingWorkspace({ config, task, signal });
+        throw new WorktreeAlreadyExistsError(existing.dir);
+    }
+    const predicted = worktrees.predictedEntry(config, repository, task);
+    recordRunStateBestEffort({
+        config,
+        task,
+        repository,
+        agent,
+        worktreeDir: predicted.worktreeDir,
+        branchName: predicted.branchName,
+        workspaceName: task,
+        state: "provisioning",
+        title: options.details.title,
+        completionTaskId: options.completionTaskId ?? task,
+        ...(options.details.url === undefined ? {} : { url: options.details.url }),
+    });
+}
+function recordFailedToLaunch(arguments_) {
+    const { config, options, paths, error } = arguments_;
+    const { task, repository, agent } = options;
+    recordRunStateBestEffort({
+        config,
+        task,
+        repository,
+        agent,
+        worktreeDir: paths.worktreeDir,
+        branchName: paths.branchName,
+        workspaceName: task,
+        state: "failed-to-launch",
+        detail: errorMessage(error),
+        title: options.details.title,
+        completionTaskId: options.completionTaskId ?? task,
+        ...(options.details.url === undefined ? {} : { url: options.details.url }),
+    });
+}
 async function startLaunchReadiness(ensureReady) {
     try {
         await ensureReady();

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;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"}
+{"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;AAyrBD,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

@@ -405,11 +405,14 @@ async function collectPullRequests(entries) {
         return [dir, result?.status === "fulfilled" ? result.value[1] : []];
     }));
 }
+const ORPHANED_SESSIONS_HEADER = "Orphaned sessions (no matching worktree)";
+const ORPHANED_SESSIONS_ACTION = "What to do: run 'crew stop <task>' to close the session, or 'tmux kill-session -t <task>' if no run-state exists.";
 function writeStraySessions(probe, worktreeTasks) {
     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");
+        // Surface probe failures so the user knows we couldn't classify orphans
+        // (silently dropping the section would hide that diagnostic). The action
+        // hint is omitted here — there's no row to act on.
+        writeSection(ORPHANED_SESSIONS_HEADER);
         writeOutput(workspaceProbeUnavailableLine(probe));
         return;
     }
@@ -417,7 +420,8 @@ function writeStraySessions(probe, worktreeTasks) {
     if (strays.length === 0) {
         return;
     }
-    writeSection("Stray sessions");
+    writeSection(ORPHANED_SESSIONS_HEADER);
+    writeOutput(ORPHANED_SESSIONS_ACTION);
     writeOutput(strays.join("\n"));
 }
 function isTodoSourceIssue(issue) {
@@ -543,6 +547,8 @@ function writeInProgressIssue(issue) {
         writeOutput(inventoryField("repo", issue.repository));
     }
 }
+const SLOT_HOLDERS_HEADER = "Slot holders with no local worktree";
+const SLOT_HOLDERS_ACTION = "What to do: transition the ticket off 'in-progress' on the board, or run 'crew run <task>' to recreate the worktree locally.";
 function writeInProgressWithoutWorktree(boardResult, worktreeTasks) {
     if (boardResult.kind !== "ok") {
         return;
@@ -551,7 +557,8 @@ function writeInProgressWithoutWorktree(boardResult, worktreeTasks) {
     if (issues.length === 0) {
         return;
     }
-    writeSection("In progress (no local worktree)");
+    writeSection(SLOT_HOLDERS_HEADER);
+    writeOutput(SLOT_HOLDERS_ACTION);
     for (const [index, issue] of issues.entries()) {
         if (index > 0) {
             writeOutput();

package/dist/lib/runState.d.ts

@@ -1,5 +1,5 @@
 import type { ResolvedConfig } from "./config.ts";
-export type RunLifecycleState = "running" | "interrupted" | "resumed" | "failed-to-launch";
+export type RunLifecycleState = "provisioning" | "running" | "interrupted" | "resumed" | "failed-to-launch";
 export interface RunState {
     task: string;
     repository: string;

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

@@ -1 +1 @@
-{"version":3,"file":"runState.d.ts","sourceRoot":"","sources":["../../src/lib/runState.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,GAAG,SAAS,GAAG,kBAAkB,CAAC;AAE3F,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAAC,CAAC,GAAG;QACrD,KAAK,EAAE,iBAAiB,CAAC;KAC1B,CAAC;CACH;AAQD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG,MAAM,CAEjF;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1F;AAyFD,wBAAgB,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAYvF;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,QAAQ,CA8BnE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,QAAQ,GAAG,SAAS,CAc/E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAEzE"}
+{"version":3,"file":"runState.d.ts","sourceRoot":"","sources":["../../src/lib/runState.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,MAAM,MAAM,iBAAiB,GACzB,cAAc,GACd,SAAS,GACT,aAAa,GACb,SAAS,GACT,kBAAkB,CAAC;AAEvB,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAAC,CAAC,GAAG;QACrD,KAAK,EAAE,iBAAiB,CAAC;KAC1B,CAAC;CACH;AAQD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG,MAAM,CAEjF;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1F;AA0FD,wBAAgB,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAYvF;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,QAAQ,CA8BnE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,QAAQ,GAAG,SAAS,CAc/E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAEzE"}

package/dist/lib/runState.js

@@ -22,7 +22,8 @@ function stringField(value, key) {
     return typeof field === "string" && field.length > 0 ? field : undefined;
 }
 function isRunLifecycleState(value) {
-    return (value === "running" ||
+    return (value === "provisioning" ||
+        value === "running" ||
         value === "interrupted" ||
         value === "resumed" ||
         value === "failed-to-launch");

package/dist/lib/worktrees.d.ts

@@ -15,7 +15,6 @@ export declare class WorktreeAlreadyExistsError extends Error {
     readonly dir: string;
     constructor(dir: string);
 }
-export declare function isWorktreeAlreadyExistsError(error: unknown): error is WorktreeAlreadyExistsError;
 export interface WorktreeEntry {
     repository: string;
     /** Source task id, lowercased — e.g. "team-220" or "gc-20260608-001". */
@@ -61,6 +60,11 @@ export type WorktreeDirtiness = {
 };
 declare function list(config: ResolvedConfig): WorktreeEntry[];
 declare function findByTask(config: ResolvedConfig, task: string): WorktreeEntry[];
+export interface PredictedWorktreeEntry {
+    branchName: string;
+    worktreeDir: string;
+}
+declare function predictedEntry(config: ResolvedConfig, repository: string, task: string): PredictedWorktreeEntry;
 declare function create(config: ResolvedConfig, spec: WorktreeSpec, signal?: AbortSignal): Promise<WorktreeEntry>;
 declare function open(config: ResolvedConfig, spec: WorktreeOpenSpec, signal?: AbortSignal): Promise<WorktreeEntry>;
 declare function remove(config: ResolvedConfig, entry: WorktreeEntry, options?: {
@@ -95,6 +99,7 @@ export declare const worktrees: {
     open: typeof open;
     list: typeof list;
     findByTask: typeof findByTask;
+    predictedEntry: typeof predictedEntry;
     remove: typeof remove;
     teardown: typeof teardown;
     branchNameForTask: typeof branchNameForTask;

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

@@ -1 +1 @@
-{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/lib/worktrees.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/lib/worktrees.ts"],"names":[],"mappings":"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"}

package/dist/lib/worktrees.js

@@ -28,9 +28,6 @@ export class WorktreeAlreadyExistsError extends Error {
         this.name = "WorktreeAlreadyExistsError";
     }
 }
-export function isWorktreeAlreadyExistsError(error) {
-    return error instanceof WorktreeAlreadyExistsError;
-}
 function branchPrefix(config) {
     const fromConfig = config.git.branchPrefix;
     if (fromConfig !== undefined) {
@@ -192,17 +189,37 @@ async function createWorktree(config, spec, signal) {
     const base = basePaths(config, spec.repository, spec.task);
     const recipe = recipeFor(config, spec.repository);
     if (recipe.provision === undefined) {
-        const defaultBranch = await resolveDefaultBranch({
-            repoDir: base.repoDir,
-            remote: config.git.remote,
-            fallback: config.git.defaultBranch,
-            ...signalProperty(signal),
-        });
-        const baseRef = `${config.git.remote}/${defaultBranch}`;
-        debug(`Fetching ${baseRef} in ${spec.repository}...`);
-        await runLongGitCommand(["-C", base.repoDir, "fetch", config.git.remote, defaultBranch], signal);
-        debug(`Creating worktree ${spec.repository}-${spec.task} (branch ${base.branchName} from ${baseRef})...`);
-        await runLongGitCommand(["-C", base.repoDir, "worktree", "add", "-b", base.branchName, base.hostWorktreeDir, baseRef], signal);
+        // A prior run can leave the `<prefix>-<task>` branch behind after its
+        // worktree directory is gone — teardown deletes the branch only
+        // best-effort, and operators sometimes remove the directory by hand.
+        // Attaching the surviving branch reuses its work instead of crashing on
+        // `git worktree add -b <existing branch>`.
+        if (await localBranchExists(base.repoDir, base.branchName, signal)) {
+            debug(`Branch ${base.branchName} already exists; attaching it to worktree ${spec.repository}-${spec.task}...`);
+            await runLongGitCommand(["-C", base.repoDir, "worktree", "add", base.hostWorktreeDir, base.branchName], signal);
+        }
+        else {
+            const defaultBranch = await resolveDefaultBranch({
+                repoDir: base.repoDir,
+                remote: config.git.remote,
+                fallback: config.git.defaultBranch,
+                ...signalProperty(signal),
+            });
+            const baseRef = `${config.git.remote}/${defaultBranch}`;
+            debug(`Fetching ${baseRef} in ${spec.repository}...`);
+            await runLongGitCommand(["-C", base.repoDir, "fetch", config.git.remote, defaultBranch], signal);
+            debug(`Creating worktree ${spec.repository}-${spec.task} (branch ${base.branchName} from ${baseRef})...`);
+            await runLongGitCommand([
+                "-C",
+                base.repoDir,
+                "worktree",
+                "add",
+                "-b",
+                base.branchName,
+                base.hostWorktreeDir,
+                baseRef,
+            ], signal);
+        }
     }
     else {
         const command = applySubstitutions(recipe.provision.create, provisionerSubstitutions(config, {
@@ -532,6 +549,13 @@ function list(config) {
 function findByTask(config, task) {
     return list(config).filter((entry) => entry.task === task);
 }
+// Deterministic preview of where worktree create() would land. Lets callers
+// record run state (e.g. "provisioning") before the worktree exists on disk,
+// without duplicating the path-derivation rules in basePaths().
+function predictedEntry(config, repository, task) {
+    const { branchName, hostWorktreeDir } = basePaths(config, repository, task);
+    return { branchName, worktreeDir: hostWorktreeDir };
+}
 // Shared by create() and open(): reject a duplicate worktree for the same
 // task+repo before building, then assert the configured workdir materialized,
 // rolling the worktree back if it did not. The build callback owns the git
@@ -631,6 +655,7 @@ export const worktrees = {
     open,
     list,
     findByTask,
+    predictedEntry,
     remove,
     teardown,
     branchNameForTask,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/groundcrew",
-  "version": "4.43.0",
+  "version": "4.43.2",
   "description": "Linear-driven orchestrator that launches AI coding agents in git worktrees, with workspace lifecycle and usage tracking.",
   "keywords": [
     "agent",
@@ -83,12 +83,12 @@
     "@tsconfig/node24": "24.0.4",
     "@tsconfig/strictest": "2.0.8",
     "@types/node": "25.9.3",
-    "@typescript/native-preview": "7.0.0-dev.20260608.1",
+    "@typescript/native-preview": "7.0.0-dev.20260612.1",
     "@vitest/coverage-v8": "4.1.8",
     "cspell": "10.0.1",
     "dependency-cruiser": "17.4.3",
     "husky": "9.1.7",
-    "jscpd": "5.0.5",
+    "jscpd": "5.0.9",
     "knip": "6.15.0",
     "lint-staged": "17.0.7",
     "markdownlint-cli2": "0.22.1",