@vendian/cli 0.0.38 → 0.0.40

package/cli-wrapper.mjs

@@ -491,6 +491,29 @@ function spawnForward(command, args, options = {}) {
     });
   });
 }
+function childProcessIsRunning(child) {
+  return Boolean(child) && child.exitCode == null && child.signalCode == null;
+}
+function killProcessTree(child, {
+  platform = process.platform,
+  signal = "SIGTERM",
+  spawnSyncFn = spawnSync
+} = {}) {
+  if (!childProcessIsRunning(child)) return false;
+  if (platform === "win32") {
+    try {
+      spawnSyncFn("taskkill", ["/F", "/T", "/PID", String(child.pid)], { stdio: "ignore" });
+    } catch {
+    }
+    return true;
+  }
+  try {
+    child.kill(signal);
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/python.js
 import fs2 from "node:fs";
@@ -2381,7 +2404,7 @@ function buildLocalServeEventStreamArgs({ agentsDir: agentsDir2 = "./agents", co
 }
 
 // src/version.js
-var CLI_VERSION = true ? "0.0.38" : process.env.npm_package_version || "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.40" : process.env.npm_package_version || "0.0.0-dev";
 
 // src/dev-server.js
 var __dirname = path8.dirname(fileURLToPath(import.meta.url));
@@ -2392,6 +2415,7 @@ var serveState = initialServeState();
 var serveLogs = [];
 var logStore = null;
 var agentsDir = "";
+var activeServeAgentsDir = "";
 var collectionId = "";
 async function startDevServer({
   port = 3859,
@@ -2439,8 +2463,8 @@ async function startDevServer({
 }
 function shutdown(server) {
   console.log("\n  \x1B[90mShutting down...\x1B[0m");
-  if (serveChild && !serveChild.killed) {
-    serveChild.kill("SIGTERM");
+  if (childProcessIsRunning(serveChild)) {
+    killProcessTree(serveChild, { signal: "SIGTERM" });
   }
   server.close();
   process.exit(0);
@@ -2529,10 +2553,11 @@ async function handleApi(req, res, pathname, parsed) {
   }
 }
 function apiStatus(req, res) {
-  const serving = serveChild !== null && !serveChild.killed;
+  const serving = childProcessIsRunning(serveChild);
   jsonResponse(res, {
     serving,
     agentsDir,
+    serveAgentsDir: serving ? activeServeAgentsDir || agentsDir : "",
     collectionId,
     connected: serveState.connected,
     activity: serveState.activity,
@@ -2542,7 +2567,7 @@ function apiStatus(req, res) {
   });
 }
 function apiServeState(req, res) {
-  const serving = serveChild !== null && !serveChild.killed;
+  const serving = childProcessIsRunning(serveChild);
   const agentStatuses = serveState.agents.map((agent) => {
     const relPath = agent.relativePath || ".";
     const runtime = agentRuntimeStatus(agent, serveState.agentRunState);
@@ -2593,6 +2618,8 @@ function apiServeState(req, res) {
   activity.sort((a, b) => (a.timestamp || "").localeCompare(b.timestamp || ""));
   jsonResponse(res, {
     serving,
+    agentsDir,
+    serveAgentsDir: serving ? activeServeAgentsDir || agentsDir : "",
     connected: serveState.connected,
     stopped: serveState.stopped,
     activity: serveState.activity,
@@ -2706,8 +2733,15 @@ function resolveServeStartTarget(body = {}, current = {}) {
   }
   return { ok: true, agentsDir: targetDir, collectionId: targetCollection };
 }
+function devServerStateAfterServeStart(current = {}, target = {}) {
+  return {
+    agentsDir: current.agentsDir || "",
+    activeServeAgentsDir: target.agentsDir || current.agentsDir || "",
+    collectionId: target.collectionId || current.collectionId || ""
+  };
+}
 async function apiServeStart(req, res, body) {
-  if (serveChild && !serveChild.killed) {
+  if (childProcessIsRunning(serveChild)) {
     return jsonResponse(res, { ok: false, error: "Already serving" });
   }
   const target = resolveServeStartTarget(body, { agentsDir, collectionId });
@@ -2721,11 +2755,13 @@ async function apiServeStart(req, res, body) {
       buildLocalServeEventStreamArgs({ agentsDir: targetDir, collectionId: targetCollection }),
       { onProgress: null }
     );
-    agentsDir = targetDir;
-    collectionId = targetCollection;
+    const nextState = devServerStateAfterServeStart({ agentsDir, collectionId }, target);
+    agentsDir = nextState.agentsDir;
+    activeServeAgentsDir = nextState.activeServeAgentsDir;
+    collectionId = nextState.collectionId;
     serveState = initialServeState();
     serveLogs = [];
-    logStore = createServeLogStore({ agentsDir: targetDir, collectionId: targetCollection });
+    logStore = createServeLogStore({ agentsDir: activeServeAgentsDir, collectionId });
     serveChild = spawn3(invocation.command, invocation.args, {
       env: invocation.env,
       stdio: ["ignore", "pipe", "pipe"],
@@ -2765,6 +2801,7 @@ async function apiServeStart(req, res, body) {
       serveState = { ...serveState, stopped: true, connected: false };
       serveLogs.push(`[process] Exited code=${code} signal=${signal || "none"}`);
       serveChild = null;
+      activeServeAgentsDir = "";
       try {
         logStore?.compact();
       } catch {
@@ -2776,13 +2813,15 @@ async function apiServeStart(req, res, body) {
   }
 }
 function apiServeStop(req, res) {
-  if (!serveChild || serveChild.killed) {
+  if (!childProcessIsRunning(serveChild)) {
+    activeServeAgentsDir = "";
     return jsonResponse(res, { ok: true, wasRunning: false });
   }
-  serveChild.kill("SIGTERM");
+  const stoppingChild = serveChild;
+  killProcessTree(stoppingChild, { signal: "SIGTERM" });
   setTimeout(() => {
-    if (serveChild && !serveChild.killed) {
-      serveChild.kill("SIGKILL");
+    if (childProcessIsRunning(stoppingChild)) {
+      killProcessTree(stoppingChild, { signal: "SIGKILL" });
     }
   }, 3e3);
   jsonResponse(res, { ok: true, wasRunning: true });
@@ -2959,7 +2998,6 @@ function openUrl(url) {
 // src/tui.js
 init_constants();
 init_auth();
-import { spawnSync as spawnSync4 } from "node:child_process";
 import fs12 from "node:fs";
 import path9 from "node:path";
 import readline from "node:readline";
@@ -3670,7 +3708,7 @@ async function runServeDashboard({ env, platform, agentsDir: agentsDir2, collect
         stopSignalAttempt += 1;
         const signal = stopSignalForAttempt(stopSignalAttempt);
         if (process.platform === "win32") {
-          killProcessTree(child);
+          killProcessTree2(child);
         } else {
           try {
             child.kill(signal);
@@ -3692,7 +3730,7 @@ async function runServeDashboard({ env, platform, agentsDir: agentsDir2, collect
       clearTimeout(ctrlCArmTimer);
       ctrlCArmed = false;
       if (process.platform === "win32") {
-        killProcessTree(child);
+        killProcessTree2(child);
       } else {
         try {
           child.kill(stopSignalForAttempt(stopSignalAttempt));
@@ -3706,9 +3744,13 @@ async function runServeDashboard({ env, platform, agentsDir: agentsDir2, collect
         if (!key) return;
         if (key.ctrl && key.name === "c") {
           if (ctrlCArmed) {
-            try {
-              child?.kill("SIGINT");
-            } catch (error) {
+            if (process.platform === "win32") {
+              killProcessTree2(child);
+            } else {
+              try {
+                child?.kill("SIGINT");
+              } catch (error) {
+              }
             }
             finish("exit");
             return;
@@ -3947,19 +3989,8 @@ function stopSignalForAttempt(attempt = 0) {
   if (attempt === 1) return "SIGTERM";
   return "SIGKILL";
 }
-function killProcessTree(child) {
-  if (!child || child.exitCode != null || child.signalCode != null) return;
-  if (process.platform === "win32") {
-    try {
-      spawnSync4("taskkill", ["/F", "/T", "/PID", String(child.pid)], { stdio: "ignore" });
-    } catch {
-    }
-  } else {
-    try {
-      child.kill("SIGTERM");
-    } catch {
-    }
-  }
+function killProcessTree2(child) {
+  killProcessTree(child, { signal: "SIGTERM" });
 }
 function helpText() {
   return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendian/cli",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "Public Vendian CLI bootstrapper and launcher",
   "license": "UNLICENSED",
   "private": false,