@paleo/worktree-env 0.6.0 → 0.6.1

package/README.md

@@ -37,9 +37,12 @@ npm run setup-worktree -- --remove feat/42   # full teardown
 ## API
 
 ```ts
+import { fileURLToPath } from "node:url";
 import { runSetupWorktree, helpers } from "@paleo/worktree-env";
 
 await runSetupWorktree({
+  scriptPath: fileURLToPath(import.meta.url),
+  devServerScript: fileURLToPath(new URL("./dev-server.mjs", import.meta.url)),
   basePort: 8100,
   portNames: ["server", "frontend", "db"],
   sharedDirs: [".local", ".plans"],
@@ -77,6 +80,7 @@ await runDevServer({
   devLimit: 5,
   servers: [
     {
+      kind: "spawn",
       name: "dev",
       exec: { command: "npm", args: ["run", "dev"] },
       port: helpers.readPortFromEnvFile(".env", "PORT"),

package/dist/dev-server.js

@@ -60,8 +60,8 @@ function callbackServersOf(config) {
 async function start(config, mainWorktree, { evict }) {
     const ctx = { cwd: process.cwd() };
     await enforceCap(config, mainWorktree, evict);
-    await checkPortsFree(config.servers);
     checkNoLocalRegistryConflict(config, mainWorktree, ctx.cwd);
+    await checkPortsFree(config.servers);
     const spawnPids = {};
     const startedCallbacks = [];
     try {
@@ -126,6 +126,7 @@ async function rollbackStart(spawnPids, startedCallbacks, ctx) {
         }
     }
     for (const server of [...startedCallbacks].reverse()) {
+        console.log(`Stopping ${server.name}...`);
         try {
             await server.stop(ctx);
         }
@@ -205,6 +206,7 @@ async function stopLocal(config, mainWorktree) {
     }
     const callbacks = callbackServersOf(config);
     for (const server of [...callbacks].reverse()) {
+        console.log(`Stopping ${server.name}...`);
         try {
             await server.stop(ctx);
         }

package/dist/dev-servers-registry.js

@@ -59,6 +59,7 @@ export async function evictOldest(input) {
 }
 async function stopCallbacksForVictim(callbackServers, worktree) {
     for (const server of [...callbackServers].reverse()) {
+        console.log(`  ${server.name} (callback)`);
         try {
             await server.stop({ cwd: worktree });
         }

package/dist/setup-worktree.js

@@ -2,7 +2,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, symlinkSync, writeFileSync, } from "node:fs";
 import { dirname, join, relative, resolve } from "node:path";
 import { isFinalizeMode, isInfoMode, isRemoveMode, isSetOwnerMode, isSetupMode, isWaitMode, parseSetupArgs, printSetupHelp, validateSetupFlags, } from "./cli.js";
-import { removeDevServerEntryByWorktree } from "./dev-servers-registry.js";
+import { findOwnEntry, removeDevServerEntryByWorktree } from "./dev-servers-registry.js";
 import { ConfigError } from "./errors.js";
 import { copyAndPatchFile } from "./helpers.js";
 import { defaultComputePorts, isValidPort, resolvePortScheme } from "./ports.js";
@@ -287,7 +287,13 @@ async function handleRemove(args, ctx, run, config) {
         console.log(`Removed registry entry for branch "${target.branch}" (slot ${target.slotPort}${ownerSuffix}).`);
         return;
     }
-    stopTargetDevServer(config.devServerScript, target.worktreePath, verboseLog);
+    const targetEntry = findOwnEntry(ctx.mainWorktree, config.registryDir, target.worktreePath);
+    if (targetEntry) {
+        stopTargetDevServer(config.devServerScript, target.worktreePath, verboseLog);
+    }
+    else {
+        verboseLog(`No dev-server running in ${target.worktreePath}; skipping --stop.`);
+    }
     if (config.purgeInfrastructure) {
         await config.purgeInfrastructure({
             worktree: target.worktreePath,

package/package.json

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