@commandgarden/cli 1.0.1 → 1.1.0

package/dist/main.js

@@ -8,6 +8,8 @@ var __export = (target, all) => {
 // src/main.ts
 import { Command } from "commander";
 import { join as join3, dirname } from "path";
+import { existsSync as existsSync4 } from "fs";
+import { createRequire } from "module";
 import { homedir } from "os";
 import { fileURLToPath } from "url";
 
@@ -4872,7 +4874,7 @@ async function executeConfigSet(client, key, value) {
 
 // src/commands/gui-cmd.ts
 import { spawn as spawn2 } from "child_process";
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync2, existsSync as existsSync3, unlinkSync as unlinkSync2, mkdirSync as mkdirSync2 } from "fs";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync2, existsSync as existsSync3, unlinkSync as unlinkSync2, mkdirSync as mkdirSync2, openSync, closeSync } from "fs";
 import { join as join2 } from "path";
 import { exec } from "child_process";
 import { parse as parseYaml2 } from "yaml";
@@ -4907,35 +4909,33 @@ async function executeGuiStart(baseUrl, cgHome, appScript, opts) {
   }
   mkdirSync2(cgHome, { recursive: true });
   if (opts.background) {
-    const child2 = spawn2("node", [appScript], { detached: true, stdio: "ignore" });
+    const logPath = join2(cgHome, "app.log");
+    const logFd = openSync(logPath, "a");
+    const child2 = spawn2("node", [appScript], { detached: true, stdio: ["ignore", logFd, logFd] });
+    closeSync(logFd);
     if (child2.pid) writeFileSync2(pidPath, String(child2.pid));
     child2.unref();
     if (!opts.noOpen) {
       const appUrl = `http://127.0.0.1:${appPort}`;
-      for (let i = 0; i < 20; i++) {
-        try {
-          await fetch(appUrl);
-          break;
+      const ready = await waitForServer(appUrl, child2);
+      if (ready) {
+        openBrowser(appUrl);
+      } else {
+        if (child2.pid) try {
+          process.kill(child2.pid, "SIGTERM");
         } catch {
         }
-        await new Promise((r) => setTimeout(r, 250));
+        if (existsSync3(pidPath)) unlinkSync2(pidPath);
+        return `GUI failed to start. Check ${logPath} for errors.`;
       }
-      openBrowser(appUrl);
     }
     return `GUI started (PID: ${child2.pid ?? "unknown"}).`;
   }
   const child = spawn2("node", [appScript], { stdio: "inherit" });
   if (!opts.noOpen) {
     const appUrl = `http://127.0.0.1:${appPort}`;
-    for (let i = 0; i < 20; i++) {
-      try {
-        await fetch(appUrl);
-        break;
-      } catch {
-      }
-      await new Promise((r) => setTimeout(r, 250));
-    }
-    openBrowser(appUrl);
+    const ready = await waitForServer(appUrl, child);
+    if (ready) openBrowser(appUrl);
   }
   await new Promise((resolve) => child.on("exit", () => resolve()));
   return "GUI stopped.";
@@ -4964,6 +4964,22 @@ function executeGuiStatus(cgHome) {
     return "GUI: not running (stale PID file).";
   }
 }
+async function waitForServer(url, child) {
+  for (let i = 0; i < 40; i++) {
+    try {
+      if (child.pid) process.kill(child.pid, 0);
+    } catch {
+      return false;
+    }
+    try {
+      await fetch(url);
+      return true;
+    } catch {
+    }
+    await new Promise((r) => setTimeout(r, 500));
+  }
+  return false;
+}
 function openBrowser(url) {
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   exec(`${cmd} ${url}`);
@@ -4995,8 +5011,32 @@ async function executeDown(cgHome) {
 // src/main.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
-var DAEMON_SCRIPT = join3(__dirname, "..", "..", "daemon", "dist", "main.js");
-var APP_SCRIPT = join3(__dirname, "..", "..", "app", "dist", "server", "main.js");
+function resolveScript(relativePath, packageName, entryPoint) {
+  const relative = join3(__dirname, relativePath);
+  if (existsSync4(relative)) return relative;
+  try {
+    const require2 = createRequire(import.meta.url);
+    const pkgJsonPath = require2.resolve(`${packageName}/package.json`);
+    const resolved = join3(dirname(pkgJsonPath), entryPoint);
+    if (existsSync4(resolved)) return resolved;
+  } catch {
+  }
+  console.error(`Cannot find ${packageName} entry point.`);
+  console.error(`Looked at:
+  - ${relative}`);
+  console.error(`
+If @commandgarden/cli is installed globally, also run:`);
+  console.error(`  cd <monorepo>/commandGarden/${packageName.split("/").pop()} && npm link`);
+  process.exit(1);
+}
+var _daemonScript;
+function getDaemonScript() {
+  return _daemonScript ??= resolveScript("../../daemon/dist/main.js", "@commandgarden/daemon", "dist/main.js");
+}
+var _appScript;
+function getAppScript() {
+  return _appScript ??= resolveScript("../../app/dist/server/main.js", "@commandgarden/app", "dist/server/main.js");
+}
 var CG_HOME = join3(homedir(), ".commandgarden");
 var TOKEN_PATH = join3(CG_HOME, "session-token");
 var CONFIG_PATH = join3(CG_HOME, "config.yaml");
@@ -5033,7 +5073,7 @@ daemon.command("status").description("Check daemon status").action(async () => {
   console.log(await executeDaemonStatus(BASE_URL));
 });
 daemon.command("start").description("Start the daemon in background").action(async () => {
-  console.log(await executeDaemonStart(BASE_URL, CG_HOME, DAEMON_SCRIPT));
+  console.log(await executeDaemonStart(BASE_URL, CG_HOME, getDaemonScript()));
 });
 daemon.command("stop").description("Stop the daemon").action(async () => {
   console.log(await executeDaemonStop(CG_HOME));
@@ -5070,7 +5110,7 @@ config.command("set <key> <value>").description("Set a configuration value (e.g.
 });
 var gui = program.command("gui").description("Manage the GUI app server");
 gui.command("start", { isDefault: true }).description("Start the GUI (foreground by default)").option("-b, --background", "Run in background").option("--no-open", "Do not open browser").action(async (opts) => {
-  console.log(await executeGuiStart(BASE_URL, CG_HOME, APP_SCRIPT, {
+  console.log(await executeGuiStart(BASE_URL, CG_HOME, getAppScript(), {
     background: opts.background,
     noOpen: opts.open === false,
     configPath: CONFIG_PATH
@@ -5083,7 +5123,7 @@ gui.command("status").description("Check GUI status").action(() => {
   console.log(executeGuiStatus(CG_HOME));
 });
 program.command("up").description("Start daemon + GUI, open browser").action(async () => {
-  console.log(await executeUp(BASE_URL, CG_HOME, DAEMON_SCRIPT, APP_SCRIPT, CONFIG_PATH));
+  console.log(await executeUp(BASE_URL, CG_HOME, getDaemonScript(), getAppScript(), CONFIG_PATH));
 });
 program.command("down").description("Stop GUI + daemon").action(async () => {
   console.log(await executeDown(CG_HOME));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commandgarden/cli",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Enterprise browser automation CLI",
   "type": "module",
   "license": "MIT",