@paleo/worktree-env 0.7.0 → 0.7.2

package/dist/setup-worktree.d.ts

@@ -51,6 +51,9 @@ export interface SetupWorktreeConfig {
      * the worktree — this callback will be invoked again with the same context. Re-runs must not
      * error on pre-existing state (created directories, started containers, ran migrations,
      * installed deps, etc.).
+     *
+     * Runs in a detached child whose stdout/stderr are already redirected to
+     * `<runtimeDir>/wt-setup.log`. `console.log` and child-process `stdio: "inherit"` land there.
      */
     finalizeWorktree: (ctx: SetupContext) => Promise<void> | void;
     /**

package/dist/setup-worktree.js

@@ -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,
@@ -88,6 +89,7 @@ async function runSetup(args, ctx, run, config) {
         scheme,
         branch,
         requestedOwner: args.owner,
+        isMainWorktree: setupCtx.isMainWorktree,
     });
     const ports = portsFn(slot);
     const runtimeDir = join(setupCtx.currentWorktree, config.runtimeDir);
@@ -142,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();
@@ -208,8 +224,7 @@ function printWorktreeInfo(config, slot, worktreeForLog, fallback) {
     const ports = resolvePortsFn(config)(slot);
     const branch = entry?.branch ?? fallback.branch;
     const owner = entry?.owner ?? fallback.owner;
-    // Main worktree has no slot entry by design — treat it as ready when the registry has no row.
-    const slotStatus = entry?.status ?? (ctx.isMainWorktree ? "ready" : "pending");
+    const slotStatus = entry?.status ?? "pending";
     const logHint = ` (tail ${join(worktreeForLog, config.runtimeDir, "wt-setup.log")})`;
     const display = slotStatus === "ready"
         ? "ready"

package/dist/slots.d.ts

@@ -30,6 +30,8 @@ export interface RegisterSlotInput {
     scheme: PortScheme;
     branch: string;
     requestedOwner?: string;
+    /** When `true`, the slot is forced to `scheme.basePort` regardless of `slot` arg. */
+    isMainWorktree: boolean;
 }
 export declare function resolveAndRegisterSlot(input: RegisterSlotInput): {
     port: number;

package/dist/slots.js

@@ -104,6 +104,8 @@ export function handleSetOwner(input) {
 }
 function pickSlotPort(args, registry) {
     const resolvedCurrent = resolve(args.currentWorktree);
+    if (args.isMainWorktree)
+        return args.scheme.basePort;
     if (args.slot !== undefined) {
         const port = Number(args.slot);
         if (!isValidPort(port, args.scheme)) {

package/dist/worktree.js

@@ -17,12 +17,7 @@ export function enforceWorktreeMode(args, ctx) {
             process.exit(1);
         }
     }
-    else if (args.here) {
-        if (ctx.isMainWorktree) {
-            console.error("Error: --here must be run from a linked worktree, not from the main worktree.");
-            process.exit(1);
-        }
-    }
+    // --here runs in any worktree: linked worktree (retry path) or main (initial bootstrap).
 }
 export function useExistingBranch(branch, ctx, run, dirNameFn = defaultWorktreeDirName) {
     if (!branchExists(branch)) {

package/package.json

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