@paleo/worktree-env 0.7.1 → 0.7.3

package/dist/setup-worktree.js

@@ -66,7 +66,7 @@ export async function runSetupWorktree(config) {
     }
     const { slot } = await runSetup(args, ctx, run, config);
     if (isWaitMode(args)) {
-        await waitForSlot(slot, config);
+        await waitForSlot(slot, config, { printSummary: false });
     }
 }
 async function runSetup(args, ctx, run, config) {
@@ -79,6 +79,7 @@ async function runSetup(args, ctx, run, config) {
         scheme,
     });
     const setupCtx = ensureWorktree(args, ctx, run, config.worktreeDirName);
+    refuseIfFinalizePending(setupCtx, config.registryDir, args.force ?? false);
     const branch = getCurrentBranch(setupCtx.currentWorktree);
     const { port: slot, owner } = resolveAndRegisterSlot({
         slot: args.slot,
@@ -143,6 +144,20 @@ async function runSetup(args, ctx, run, config) {
     closeSync(logFd);
     return { slot };
 }
+function refuseIfFinalizePending(ctx, registryDir, force) {
+    if (force)
+        return;
+    const registry = readSlots(ctx.mainWorktree, registryDir);
+    const resolvedCurrent = resolve(ctx.currentWorktree);
+    const found = Object.entries(registry.slots).find(([, e]) => resolve(e.worktree) === resolvedCurrent && e.status === "pending");
+    if (!found)
+        return;
+    const [slotPort] = found;
+    console.error(`Error: Setup is already in progress for slot ${slotPort}. ` +
+        `Run 'setup-worktree --wait --slot ${slotPort}' to wait for it to finish (or fail), ` +
+        "then retry. Use --force to bypass.");
+    process.exit(1);
+}
 async function runFinalize(args, config) {
     const slot = Number(args.__finalize);
     const ctx = detectWorktree();
@@ -242,10 +257,12 @@ function runInfo(args, config) {
     printWorktreeInfo(config, resolved.slot, ".", { branch: resolved.branch, owner: resolved.owner });
 }
 async function runWait(args, config) {
+    // standalone --wait (no prior setup in this invocation) → print the full summary on success.
     const slot = resolveTargetSlot(args, config);
     await waitForSlot(slot, config);
 }
-async function waitForSlot(slot, config) {
+async function waitForSlot(slot, config, options = {}) {
+    const printSummary = options.printSummary ?? true;
     const ctx = detectWorktree();
     const initial = readSlots(ctx.mainWorktree, config.registryDir).slots[String(slot)];
     if (!initial) {
@@ -262,7 +279,15 @@ async function waitForSlot(slot, config) {
             process.exit(1);
         }
         if (entry.status === "ready") {
-            printWorktreeInfo(config, slot, entry.worktree, { branch: entry.branch, owner: entry.owner });
+            if (printSummary) {
+                printWorktreeInfo(config, slot, entry.worktree, {
+                    branch: entry.branch,
+                    owner: entry.owner,
+                });
+            }
+            else {
+                console.log("Status: ready");
+            }
             return;
         }
         if (entry.status === "failed") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paleo/worktree-env",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Worktree-based concurrent local environment kernel.",
   "keywords": [
     "worktree",