@paleo/workspace 0.13.0 → 0.14.1

package/README.md

@@ -31,6 +31,8 @@ npm run dev                             # start in the foreground; holds the ter
 npm run dev -- up                       # start in the background (no-op if already running here)
 npm run dev -- up --restart             # stop the dev-server in this worktree if running, then start fresh
 npm run dev -- up --evict               # if devLimit is reached, evict the oldest dev-server and start
+npm run dev -- restart                  # stop the dev-server in this worktree if running, then start in the background
+npm run dev -- status                   # report whether this worktree's dev-server is UP or DOWN
 npm run dev -- list                     # active dev-servers across all worktrees
 npm run dev -- down                     # stop dev server (infrastructure stays up)
 npm run workspace -- remove feat/42     # full teardown

package/dist/cli.d.ts

@@ -13,7 +13,7 @@ export type WorkspaceCommand = {
 } | {
     kind: "list";
 } | {
-    kind: "info";
+    kind: "status";
     slot?: string;
 } | {
     kind: "wait";
@@ -42,11 +42,16 @@ export type DevCommand = {
     kind: "up";
     evict: boolean;
     restart: boolean;
+} | {
+    kind: "restart";
+    evict: boolean;
 } | {
     kind: "down";
     all: boolean;
 } | {
     kind: "list";
+} | {
+    kind: "status";
 } | {
     kind: "help";
 };

package/dist/cli.js

@@ -24,8 +24,8 @@ function parseSubcommand(subcommand, tokens) {
             return parseRemove(tokens);
         case "list":
             return parseList(tokens);
-        case "info":
-            return parseInfo(tokens);
+        case "status":
+            return parseStatus(tokens);
         case "wait":
             return parseWait(tokens);
         case "set-owner":
@@ -94,7 +94,7 @@ function parseList(tokens) {
     rejectPositionals(positionals, "list");
     return { command: { kind: "list" }, verbose: values.verbose ?? false };
 }
-function parseInfo(tokens) {
+function parseStatus(tokens) {
     const { values, positionals } = parseArgs({
         args: tokens,
         options: {
@@ -104,8 +104,8 @@ function parseInfo(tokens) {
         allowPositionals: true,
         strict: true,
     });
-    rejectPositionals(positionals, "info");
-    return { command: { kind: "info", slot: values.slot }, verbose: values.verbose ?? false };
+    rejectPositionals(positionals, "status");
+    return { command: { kind: "status", slot: values.slot }, verbose: values.verbose ?? false };
 }
 function parseWait(tokens) {
     const { values, positionals } = parseArgs({
@@ -173,8 +173,8 @@ export function printWorkspaceHelp() {
         "      Remove a workspace by branch, or the current one when omitted.",
         "  list",
         "      List all registered workspaces (slot, status, branch, path, owner, created).",
-        "  info [-s|--slot <port>]",
-        "      Print a workspace summary (ports, branch, readiness).",
+        "  status [-s|--slot <port>]",
+        "      Print a workspace summary (ports, branch, readiness, dev-server).",
         "  wait [-s|--slot <port>]",
         "      Block until the background finalize reaches READY (exit 0) or FAILED (exit 1).",
         "  set-owner <name>",
@@ -203,10 +203,14 @@ function parseDevSubcommand(subcommand, tokens) {
     switch (subcommand) {
         case "up":
             return parseUp(tokens);
+        case "restart":
+            return parseRestart(tokens);
         case "down":
             return parseDown(tokens);
         case "list":
             return parseDevList(tokens);
+        case "status":
+            return parseDevStatus(tokens);
         default:
             throw new ConfigError(`Unknown command "${subcommand}". Run \`dev --help\`.`);
     }
@@ -229,6 +233,16 @@ function parseEvictRestart(tokens, command) {
     rejectDevPositionals(positionals, command);
     return { evict: values.evict ?? false, restart: values.restart ?? false };
 }
+function parseRestart(tokens) {
+    const { values, positionals } = parseArgs({
+        args: tokens,
+        options: { evict: { type: "boolean" } },
+        allowPositionals: true,
+        strict: true,
+    });
+    rejectDevPositionals(positionals, "dev restart");
+    return { kind: "restart", evict: values.evict ?? false };
+}
 function parseDown(tokens) {
     const { values, positionals } = parseArgs({
         args: tokens,
@@ -249,6 +263,16 @@ function parseDevList(tokens) {
     rejectDevPositionals(positionals, "dev list");
     return { kind: "list" };
 }
+function parseDevStatus(tokens) {
+    const { positionals } = parseArgs({
+        args: tokens,
+        options: {},
+        allowPositionals: true,
+        strict: true,
+    });
+    rejectDevPositionals(positionals, "dev status");
+    return { kind: "status" };
+}
 function rejectDevPositionals(positionals, command) {
     if (positionals.length > 0) {
         throw new ConfigError(`\`${command}\` takes no positional arguments.`);
@@ -263,12 +287,15 @@ export function printDevHelp() {
         "Commands:",
         "  dev               Start in the foreground; holds the terminal, stops on CTRL+C.",
         "  dev up            Start in the background and return once ready.",
+        "  dev restart       Stop this worktree's dev-server if running, then start in the background.",
         "  dev down [--all]  Stop this worktree's dev-server, or every dev-server with --all.",
         "  dev list          List active dev-servers across all worktrees.",
+        "  dev status        Report whether this worktree's dev-server is UP or DOWN.",
         "  dev --help        Show this help message.",
         "",
-        "Options (dev, dev up):",
+        "Options (dev, dev up, dev restart):",
         "  --evict     Evict the oldest dev-server when the cap is reached.",
+        "Options (dev, dev up):",
         "  --restart   If a dev-server is already running here, stop it first, then start.",
     ].join("\n"));
 }

package/dist/dev-server.d.ts

@@ -33,6 +33,12 @@ export interface DevServerSummaryContext {
     }[];
 }
 export declare function runDevServer(config: DevServerConfig): Promise<void>;
+/**
+ * Poll the foreground's own spawn PIDs; when none remain alive, the servers were stopped from
+ * outside this process (`dev down`, `down --all`, eviction, or a manual kill). Fires `onStopped`
+ * once so the foreground can exit instead of hanging on dead servers.
+ */
+export declare function watchForExternalStop(pids: number[], onStopped: () => void, isAlive?: (pid: number) => boolean, intervalMs?: number): NodeJS.Timeout | undefined;
 export type WorktreeReadyCheck = {
     ok: true;
 } | {

package/dist/dev-server.js

@@ -50,6 +50,12 @@ export async function runDevServer(config) {
         case "up":
             await start(config, mainWorktree, { evict: command.evict, restart: command.restart });
             return;
+        case "restart":
+            await start(config, mainWorktree, { evict: command.evict, restart: true });
+            return;
+        case "status":
+            printStatus(config, mainWorktree);
+            return;
         case "foreground":
             await runForeground(config, mainWorktree, {
                 evict: command.evict,
@@ -58,6 +64,16 @@ export async function runDevServer(config) {
             return;
     }
 }
+function printStatus(config, mainWorktree) {
+    const entry = findOwnEntry(mainWorktree, config.registryDir, process.cwd());
+    if (!entry || !Object.values(entry.pids).some(isProcessAlive)) {
+        console.log("Dev-server status: DOWN.");
+        return;
+    }
+    console.log("Dev-server status: UP.");
+    const slot = resolveCurrentSlot(config.basePort, config.registryDir);
+    printStartSummary(config, slot, entry.pids);
+}
 function callbackServersOf(config) {
     return config.servers.filter((s) => s.kind === "callback");
 }
@@ -120,6 +136,13 @@ async function runForeground(config, mainWorktree, options) {
     started = true;
     printStartSummary(config, slot, state.spawnPids);
     tailLogs(config, state.spawnPids);
+    watchForExternalStop(Object.values(state.spawnPids), () => {
+        if (shuttingDown)
+            return;
+        shuttingDown = true;
+        console.log("\nDev-server stopped externally (e.g. `dev down`). Exiting.");
+        process.exit(0);
+    });
     await new Promise(() => { });
 }
 async function shutdownForeground(config, mainWorktree) {
@@ -187,6 +210,7 @@ function printStartSummary(config, slot, spawnPids) {
     }
 }
 const TAIL_INTERVAL_MS = 300;
+const LIVENESS_POLL_MS = 1000;
 function tailLogs(config, spawnPids) {
     const names = Object.keys(spawnPids);
     const prefixed = names.length > 1;
@@ -215,6 +239,22 @@ function followLogFile(path, prefix) {
         process.stdout.write(prefix === "" ? text : text.replace(/^(?=.)/gm, prefix));
     }, TAIL_INTERVAL_MS);
 }
+/**
+ * Poll the foreground's own spawn PIDs; when none remain alive, the servers were stopped from
+ * outside this process (`dev down`, `down --all`, eviction, or a manual kill). Fires `onStopped`
+ * once so the foreground can exit instead of hanging on dead servers.
+ */
+export function watchForExternalStop(pids, onStopped, isAlive = isProcessAlive, intervalMs = LIVENESS_POLL_MS) {
+    if (pids.length === 0)
+        return;
+    const timer = setInterval(() => {
+        if (pids.some(isAlive))
+            return;
+        clearInterval(timer);
+        onStopped();
+    }, intervalMs);
+    return timer;
+}
 async function rollbackStart(spawnPids, startedCallbacks, ctx) {
     console.error("\nStopping dev servers...");
     for (const pid of Object.values(spawnPids)) {

package/dist/workspace.js

@@ -39,8 +39,8 @@ export async function runWorkspace(config) {
         case "wait":
             await runWait(command, config);
             return;
-        case "info":
-            runInfo(command, config);
+        case "status":
+            runStatus(command, config);
             return;
         case "list":
             runList(config);
@@ -272,7 +272,7 @@ function printDevServerBlock(config, mainWorktree, targetWorktree, now) {
         console.log(`    log: ${join(targetWorktree, config.runtimeDir, "logs", `${name}.log`)}`);
     }
 }
-function runInfo(command, config) {
+function runStatus(command, config) {
     if (command.slot !== undefined) {
         const slot = resolveTargetSlot(command.slot, config);
         const ctx = detectWorktree();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paleo/workspace",
-  "version": "0.13.0",
+  "version": "0.14.1",
   "description": "Run multiple git-worktree dev environments side by side.",
   "keywords": [
     "workspace",