botapp-cli 0.2.2 → 0.2.3

package/dist/index.js

@@ -1602,7 +1602,7 @@ Invalid ACP stdout: ${line}`;
       clientInfo: {
         name: "botapp-daemon",
         title: "botapp daemon",
-        version: "0.2.2"
+        version: "0.2.3"
       }
     });
     const session = await request2("session/new", {
@@ -1753,9 +1753,9 @@ async function waitForChild(child, timeoutMs, label) {
 // src/commands/launch.ts
 import { Command as Command4 } from "commander";
 import { spawn as spawn4 } from "child_process";
-import { resolve as resolve4, join as join4 } from "path";
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, openSync, unlinkSync, writeFileSync as writeFileSync3, readFileSync as readFileSync4 } from "fs";
-import { homedir as homedir4 } from "os";
+import { resolve as resolve4, join as join5 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, openSync, writeFileSync as writeFileSync3 } from "fs";
+import { homedir as homedir5 } from "os";
 import { createInterface as createInterface3 } from "readline";
 import { hostname } from "os";
 import pc5 from "picocolors";
@@ -2022,6 +2022,41 @@ function openUrl(url) {
   }
 }
 
+// src/commands/daemon-supervisor.ts
+import { existsSync as existsSync5, readFileSync as readFileSync4, unlinkSync } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join4 } from "path";
+function daemonPidFile() {
+  return join4(homedir4(), ".botapp", "daemon.pid");
+}
+function isDaemonRunningLocally(pidFile = daemonPidFile()) {
+  if (!existsSync5(pidFile)) return false;
+  try {
+    const pid = parseInt(readFileSync4(pidFile, "utf-8").trim(), 10);
+    if (!Number.isInteger(pid) || pid <= 0) return false;
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function stopExistingDaemon(pidFile = daemonPidFile()) {
+  try {
+    const pid = parseInt(readFileSync4(pidFile, "utf-8").trim(), 10);
+    if (Number.isInteger(pid) && pid > 0) {
+      try {
+        process.kill(pid, "SIGTERM");
+      } catch {
+      }
+    }
+  } catch {
+  }
+  try {
+    unlinkSync(pidFile);
+  } catch {
+  }
+}
+
 // src/commands/launch.ts
 var DEFAULT_SERVER_URL = "https://api.botapp.ai";
 var DEFAULT_APP_URL = "https://botapp.ai";
@@ -2163,15 +2198,15 @@ async function autoStartDaemon(opts, serverUrl, daemonId) {
 Next: run \`bot daemon run\` to bring this machine online.`));
     return;
   }
-  const dir = join4(homedir4(), ".botapp");
-  const pidFile = join4(dir, "daemon.pid");
-  const logFile = join4(dir, "daemon.log");
+  const dir = join5(homedir5(), ".botapp");
+  const pidFile = join5(dir, "daemon.pid");
+  const logFile = join5(dir, "daemon.log");
   mkdirSync3(dir, { recursive: true });
   if (isDaemonRunningLocally(pidFile)) {
     stopExistingDaemon(pidFile);
   }
   const botBin = process.argv[1];
-  if (!botBin || !existsSync5(botBin)) {
+  if (!botBin || !existsSync6(botBin)) {
     console.log(pc5.yellow(`  Running: cannot resolve \`bot\` binary \u2014 run \`bot daemon run\` manually`));
     return;
   }
@@ -2203,33 +2238,6 @@ Next: run \`bot daemon run\` to bring this machine online.`));
     );
   }
 }
-function isDaemonRunningLocally(pidFile) {
-  if (!existsSync5(pidFile)) return false;
-  try {
-    const pid = parseInt(readFileSync4(pidFile, "utf-8").trim(), 10);
-    if (!Number.isInteger(pid) || pid <= 0) return false;
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function stopExistingDaemon(pidFile) {
-  try {
-    const pid = parseInt(readFileSync4(pidFile, "utf-8").trim(), 10);
-    if (Number.isInteger(pid) && pid > 0) {
-      try {
-        process.kill(pid, "SIGTERM");
-      } catch {
-      }
-    }
-  } catch {
-  }
-  try {
-    unlinkSync(pidFile);
-  } catch {
-  }
-}
 async function isDaemonOnline(serverUrl, daemonId) {
   try {
     const res = await fetch(`${serverUrl}/api/daemons`, {
@@ -2330,7 +2338,7 @@ function findServerEntry2() {
     resolve4(process.cwd(), "../../packages/server/src/index.ts")
   ];
   for (const c of candidates) {
-    if (existsSync5(c)) return c;
+    if (existsSync6(c)) return c;
   }
   return null;
 }
@@ -2533,20 +2541,20 @@ var loginCommand = new Command7("login").description("Login to a botapp server")
 // src/commands/install.ts
 import { Command as Command8 } from "commander";
 import { resolve as resolve5, basename } from "path";
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, symlinkSync, cpSync, readFileSync as readFileSync5 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join5 } from "path";
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, symlinkSync, cpSync, readFileSync as readFileSync5 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join6 } from "path";
 import pc9 from "picocolors";
-var APPS_DIR = join5(homedir5(), ".botapp", "apps");
+var APPS_DIR = join6(homedir6(), ".botapp", "apps");
 var installCommand = new Command8("install").description("Install an app from a local path").argument("<path>", "Path to the app directory").option("--dev", "Install in dev mode (symlink)").action(async (appPath, opts) => {
   const absPath = resolve5(appPath);
-  if (!existsSync6(absPath)) {
+  if (!existsSync7(absPath)) {
     console.error(pc9.red(`Path not found: ${absPath}`));
     process.exitCode = 1;
     return;
   }
-  const manifestPath = join5(absPath, "botapp.app.json");
-  if (!existsSync6(manifestPath)) {
+  const manifestPath = join6(absPath, "botapp.app.json");
+  if (!existsSync7(manifestPath)) {
     console.error(pc9.red(`No botapp.app.json found in ${absPath}`));
     process.exitCode = 1;
     return;
@@ -2560,9 +2568,9 @@ var installCommand = new Command8("install").description("Install an app from a
     return;
   }
   const appName = manifest.name || basename(absPath);
-  const targetDir = join5(APPS_DIR, appName);
+  const targetDir = join6(APPS_DIR, appName);
   mkdirSync4(APPS_DIR, { recursive: true });
-  if (existsSync6(targetDir)) {
+  if (existsSync7(targetDir)) {
     console.log(pc9.yellow(`App "${appName}" is already installed. Reinstalling...`));
     const { rmSync: rmSync2 } = await import("fs");
     rmSync2(targetDir, { recursive: true, force: true });
@@ -2581,14 +2589,14 @@ var installCommand = new Command8("install").description("Install an app from a
 
 // src/commands/uninstall.ts
 import { Command as Command9 } from "commander";
-import { existsSync as existsSync7, rmSync } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join6 } from "path";
+import { existsSync as existsSync8, rmSync } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join7 } from "path";
 import pc10 from "picocolors";
-var APPS_DIR2 = join6(homedir6(), ".botapp", "apps");
+var APPS_DIR2 = join7(homedir7(), ".botapp", "apps");
 var uninstallCommand = new Command9("uninstall").description("Uninstall an app").argument("<name>", "App name to uninstall").action(async (name) => {
-  const targetDir = join6(APPS_DIR2, name);
-  if (!existsSync7(targetDir)) {
+  const targetDir = join7(APPS_DIR2, name);
+  if (!existsSync8(targetDir)) {
     console.error(pc10.red(`App "${name}" is not installed`));
     process.exitCode = 1;
     return;
@@ -2600,21 +2608,21 @@ var uninstallCommand = new Command9("uninstall").description("Uninstall an app")
 
 // src/commands/dev.ts
 import { Command as Command10 } from "commander";
-import { resolve as resolve6, basename as basename2, join as join7 } from "path";
-import { existsSync as existsSync8, mkdirSync as mkdirSync5, symlinkSync as symlinkSync2, readFileSync as readFileSync6, lstatSync } from "fs";
-import { homedir as homedir7 } from "os";
+import { resolve as resolve6, basename as basename2, join as join8 } from "path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync5, symlinkSync as symlinkSync2, readFileSync as readFileSync6, lstatSync } from "fs";
+import { homedir as homedir8 } from "os";
 import { spawn as spawn5 } from "child_process";
 import pc11 from "picocolors";
-var APPS_DIR3 = join7(homedir7(), ".botapp", "apps");
+var APPS_DIR3 = join8(homedir8(), ".botapp", "apps");
 var devCommand = new Command10("dev").description("Start development mode for an app").argument("[path]", "Path to the app directory", ".").option("-p, --port <port>", "Server port", "7100").action(async (appPath, opts) => {
   const absPath = resolve6(appPath);
-  if (!existsSync8(absPath)) {
+  if (!existsSync9(absPath)) {
     console.error(pc11.red(`Path not found: ${absPath}`));
     process.exitCode = 1;
     return;
   }
-  const manifestPath = join7(absPath, "botapp.app.json");
-  if (!existsSync8(manifestPath)) {
+  const manifestPath = join8(absPath, "botapp.app.json");
+  if (!existsSync9(manifestPath)) {
     console.error(pc11.red(`No botapp.app.json found in ${absPath}`));
     process.exitCode = 1;
     return;
@@ -2628,9 +2636,9 @@ var devCommand = new Command10("dev").description("Start development mode for an
     return;
   }
   const appName = manifest.name || basename2(absPath);
-  const targetDir = join7(APPS_DIR3, appName);
+  const targetDir = join8(APPS_DIR3, appName);
   mkdirSync5(APPS_DIR3, { recursive: true });
-  if (!existsSync8(targetDir)) {
+  if (!existsSync9(targetDir)) {
     symlinkSync2(absPath, targetDir, "dir");
     console.log(pc11.blue(`Linked ${pc11.bold(appName)} \u2192 ${pc11.dim(absPath)}`));
   } else {
@@ -2681,7 +2689,7 @@ function findServerEntry3() {
     resolve6(process.cwd(), "../server/src/index.ts")
   ];
   for (const c of candidates) {
-    if (existsSync8(c)) return c;
+    if (existsSync9(c)) return c;
   }
   return null;
 }
@@ -2915,13 +2923,13 @@ All agents:`);
 
 // src/commands/register.ts
 import { Command as Command14 } from "commander";
-import { readFileSync as readFileSync7, existsSync as existsSync9 } from "fs";
+import { readFileSync as readFileSync7, existsSync as existsSync10 } from "fs";
 import pc15 from "picocolors";
 var registerCommand = new Command14("register").description("Register an external app via HTTP bridge manifest").argument("<manifest>", "Path to YAML manifest file").option("--adapter <url>", "Override base URL from manifest").action(async (manifestPath, opts, cmd) => {
   const globalOpts = cmd.parent?.opts() ?? {};
   const serverUrl = resolveServerUrl(globalOpts.server);
   const token = resolveToken(globalOpts.token);
-  if (!existsSync9(manifestPath)) {
+  if (!existsSync10(manifestPath)) {
     console.error(pc15.red(`Error: Manifest not found: ${manifestPath}`));
     process.exitCode = 1;
     return;
@@ -2958,13 +2966,13 @@ var registerCommand = new Command14("register").description("Register an externa
 
 // src/commands/wrap.ts
 import { Command as Command15 } from "commander";
-import { readFileSync as readFileSync8, existsSync as existsSync10 } from "fs";
+import { readFileSync as readFileSync8, existsSync as existsSync11 } from "fs";
 import pc16 from "picocolors";
 var wrapCommand = new Command15("wrap").description("Register CLI tool as app commands via YAML manifest").argument("<manifest>", "Path to CLI wrapper YAML manifest").action(async (manifestPath, _opts, cmd) => {
   const globalOpts = cmd.parent?.opts() ?? {};
   const serverUrl = resolveServerUrl(globalOpts.server);
   const token = resolveToken(globalOpts.token);
-  if (!existsSync10(manifestPath)) {
+  if (!existsSync11(manifestPath)) {
     console.error(pc16.red(`Error: Manifest not found: ${manifestPath}`));
     process.exitCode = 1;
     return;
@@ -3220,6 +3228,10 @@ var pairingCommand = new Command18("pairing").alias("pair").description("Pair th
       process.exitCode = 1;
       return;
     }
+    const stoppedExistingDaemon = isDaemonRunningLocally();
+    if (stoppedExistingDaemon) {
+      stopExistingDaemon();
+    }
     const savedProfile = saveDaemonProfile({
       server: serverUrl,
       daemonId: data.daemon.id,
@@ -3230,6 +3242,9 @@ var pairingCommand = new Command18("pairing").alias("pair").description("Pair th
     console.log(`  ID:      ${data.daemon.id}`);
     console.log(`  Server:  ${serverUrl}`);
     console.log(`  Profile: ${savedProfile.alias}`);
+    if (stoppedExistingDaemon) {
+      console.log(pc19.dim("  Note:    stopped the existing background daemon (was holding the old token)."));
+    }
     if (opts.run) {
       await runDaemonConnectionLoop(savedProfile);
       return;
@@ -3339,7 +3354,7 @@ function updateCommandFor(manager) {
 }
 
 // src/index.ts
-var version = "0.2.2";
+var version = "0.2.3";
 var program = new Command20().name("bot").description("botapp CLI \u2014 operate apps from the command line").version(version).enablePositionalOptions(true).option("--json", "Output as JSON").option("-s, --server <url>", "Server URL override").option("-t, --token <token>", "Auth token override").option("-v, --verbose", "Verbose output");
 program.addCommand(launchCommand);
 program.addCommand(runCommand);