@kelceyp/caw 1.0.13 → 1.0.15

package/dist/caw.js

@@ -10556,6 +10556,63 @@ function checkPrefixWritable() {
   }
 }
 
+// src/server-info.js
+import fs3 from "node:fs";
+import path2 from "node:path";
+import { execSync as execSync2 } from "node:child_process";
+function resolve(overrideBinPath) {
+  let binPath;
+  if (overrideBinPath) {
+    binPath = overrideBinPath;
+  } else {
+    try {
+      binPath = execSync2("which caw-server", { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim();
+    } catch {
+      return null;
+    }
+    if (!binPath)
+      return null;
+  }
+  let realPath;
+  try {
+    realPath = fs3.realpathSync(binPath);
+  } catch {
+    return null;
+  }
+  let dir = path2.dirname(realPath);
+  let packageRoot = null;
+  for (let i = 0;i < 10; i++) {
+    const candidate = path2.join(dir, "package.json");
+    if (fs3.existsSync(candidate)) {
+      try {
+        const pkg = JSON.parse(fs3.readFileSync(candidate, "utf8"));
+        if (pkg.name === "@kelceyp/caw-server") {
+          packageRoot = dir;
+          break;
+        }
+      } catch {}
+    }
+    const parent = path2.dirname(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  if (!packageRoot)
+    return null;
+  const packageJsonPath = path2.join(packageRoot, "package.json");
+  let version;
+  try {
+    const pkg = JSON.parse(fs3.readFileSync(packageJsonPath, "utf8"));
+    version = pkg.version;
+  } catch {
+    return null;
+  }
+  const mainJsPath = path2.join(packageRoot, "dist", "main.js");
+  if (!fs3.existsSync(mainJsPath))
+    return null;
+  return { mainJsPath, version, packageRoot };
+}
+
 // src/commands/start.js
 import fs6 from "node:fs";
 import path5 from "node:path";
@@ -10563,8 +10620,8 @@ import os2 from "node:os";
 import { execSync as execSync4 } from "node:child_process";
 
 // src/config.js
-import fs3 from "node:fs";
-import path2 from "node:path";
+import fs4 from "node:fs";
+import path3 from "node:path";
 var CONFIG_FILENAME = "config.json";
 var PENDING_FILENAME = "config.pending.json";
 var DEFAULTS = Object.freeze({
@@ -10576,23 +10633,23 @@ var DEFAULTS = Object.freeze({
   })
 });
 function configPath(envDir) {
-  return path2.join(envDir, CONFIG_FILENAME);
+  return path3.join(envDir, CONFIG_FILENAME);
 }
 function pendingPath(envDir) {
-  return path2.join(envDir, PENDING_FILENAME);
+  return path3.join(envDir, PENDING_FILENAME);
 }
 function atomicWrite(filePath, data) {
   const tmpPath = filePath + ".tmp";
-  fs3.writeFileSync(tmpPath, JSON.stringify(data, null, 2) + `
+  fs4.writeFileSync(tmpPath, JSON.stringify(data, null, 2) + `
 `);
-  fs3.renameSync(tmpPath, filePath);
+  fs4.renameSync(tmpPath, filePath);
 }
 function readJsonFile(filePath) {
-  const raw = fs3.readFileSync(filePath, "utf8");
+  const raw = fs4.readFileSync(filePath, "utf8");
   try {
     return JSON.parse(raw);
   } catch (e) {
-    throw new Error(`Malformed JSON in ${path2.basename(filePath)}: ${e.message}`);
+    throw new Error(`Malformed JSON in ${path3.basename(filePath)}: ${e.message}`);
   }
 }
 function readConfig(envDir) {
@@ -10614,45 +10671,45 @@ function mergeConfig(envDir) {
   return merged;
 }
 function hasPendingConfig(envDir) {
-  return fs3.existsSync(pendingPath(envDir));
+  return fs4.existsSync(pendingPath(envDir));
 }
 function readPendingConfig(envDir) {
   return readJsonFile(pendingPath(envDir));
 }
 function deletePendingConfig(envDir) {
-  fs3.unlinkSync(pendingPath(envDir));
+  fs4.unlinkSync(pendingPath(envDir));
 }
 
 // src/process-manager.js
-import fs4 from "node:fs";
-import path3 from "node:path";
-import { spawn, execSync as execSync2 } from "node:child_process";
+import fs5 from "node:fs";
+import path4 from "node:path";
+import { spawn, execSync as execSync3 } from "node:child_process";
 var PID_FILENAME = "server.pid";
 var LOG_FILENAME = "server.log";
 function pidFilePath(envDir) {
-  return path3.join(envDir, PID_FILENAME);
+  return path4.join(envDir, PID_FILENAME);
 }
 function logFilePath(envDir) {
-  return path3.join(envDir, LOG_FILENAME);
+  return path4.join(envDir, LOG_FILENAME);
 }
 function readPid(envDir) {
   const filePath = pidFilePath(envDir);
-  if (!fs4.existsSync(filePath))
+  if (!fs5.existsSync(filePath))
     return null;
-  const raw = fs4.readFileSync(filePath, "utf8").trim();
+  const raw = fs5.readFileSync(filePath, "utf8").trim();
   const pid = parseInt(raw, 10);
   if (Number.isNaN(pid))
     return null;
   return pid;
 }
 function writePid(envDir, pid) {
-  fs4.writeFileSync(pidFilePath(envDir), String(pid) + `
+  fs5.writeFileSync(pidFilePath(envDir), String(pid) + `
 `);
 }
 function removePidFile(envDir) {
   const filePath = pidFilePath(envDir);
-  if (fs4.existsSync(filePath))
-    fs4.unlinkSync(filePath);
+  if (fs5.existsSync(filePath))
+    fs5.unlinkSync(filePath);
 }
 function isProcessAlive(pid) {
   try {
@@ -10663,14 +10720,14 @@ function isProcessAlive(pid) {
   }
 }
 function getPm2Name(envDir) {
-  const base = path3.basename(envDir).replace(/^\./, "");
+  const base = path4.basename(envDir).replace(/^\./, "");
   if (base === "caw")
     return "caw";
   return `caw-${base}`;
 }
 function isPm2Installed() {
   try {
-    execSync2("which pm2", { stdio: "ignore" });
+    execSync3("which pm2", { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -10680,7 +10737,7 @@ function createPidManager(envDir) {
   return {
     start(mainJsPath, envVars, nodeArgs = []) {
       const logPath = logFilePath(envDir);
-      const logFd = fs4.openSync(logPath, "a");
+      const logFd = fs5.openSync(logPath, "a");
       const child = spawn(process.execPath, [...nodeArgs, mainJsPath], {
         detached: true,
         stdio: ["ignore", logFd, logFd],
@@ -10688,7 +10745,7 @@ function createPidManager(envDir) {
       });
       writePid(envDir, child.pid);
       child.unref();
-      fs4.closeSync(logFd);
+      fs5.closeSync(logFd);
       return child.pid;
     },
     isRunning() {
@@ -10733,7 +10790,7 @@ function createPidManager(envDir) {
 function createPm2Manager(envDir, checkPm2 = isPm2Installed) {
   const name = getPm2Name(envDir);
   function pm2Exec(args) {
-    return execSync2(`pm2 ${args}`, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
+    return execSync3(`pm2 ${args}`, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
   }
   function stop() {
     if (!checkPm2())
@@ -10760,8 +10817,8 @@ function createPm2Manager(envDir, checkPm2 = isPm2Installed) {
       } catch {}
       const logPath = logFilePath(envDir);
       const envArgs = Object.entries(envVars).map(([k, v]) => `${k}=${v}`).join(" ");
-      const nodeArgsStr = nodeArgs.length > 0 ? ` --node-args="${nodeArgs.map((a) => `\\"${a}\\"`).join(" ")}"` : "";
-      execSync2(`${envArgs} pm2 start ${mainJsPath} --name ${name}${nodeArgsStr} --output ${logPath} --error ${logPath} --merge-logs`, { stdio: "inherit", env: { ...process.env, ...envVars } });
+      const nodeArgsStr = nodeArgs.length > 0 ? ` --node-args="${nodeArgs.join(" ")}"` : "";
+      execSync3(`${envArgs} pm2 start ${mainJsPath} --name ${name}${nodeArgsStr} --output ${logPath} --error ${logPath} --merge-logs`, { stdio: "inherit", env: { ...process.env, ...envVars } });
       return name;
     },
     isRunning() {
@@ -10817,63 +10874,6 @@ async function waitForExit(pm, intervalMs, maxWaitMs) {
   return false;
 }
 
-// src/server-info.js
-import fs5 from "node:fs";
-import path4 from "node:path";
-import { execSync as execSync3 } from "node:child_process";
-function resolve(overrideBinPath) {
-  let binPath;
-  if (overrideBinPath) {
-    binPath = overrideBinPath;
-  } else {
-    try {
-      binPath = execSync3("which caw-server", { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim();
-    } catch {
-      return null;
-    }
-    if (!binPath)
-      return null;
-  }
-  let realPath;
-  try {
-    realPath = fs5.realpathSync(binPath);
-  } catch {
-    return null;
-  }
-  let dir = path4.dirname(realPath);
-  let packageRoot = null;
-  for (let i = 0;i < 10; i++) {
-    const candidate = path4.join(dir, "package.json");
-    if (fs5.existsSync(candidate)) {
-      try {
-        const pkg = JSON.parse(fs5.readFileSync(candidate, "utf8"));
-        if (pkg.name === "@kelceyp/caw-server") {
-          packageRoot = dir;
-          break;
-        }
-      } catch {}
-    }
-    const parent = path4.dirname(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  if (!packageRoot)
-    return null;
-  const packageJsonPath = path4.join(packageRoot, "package.json");
-  let version;
-  try {
-    const pkg = JSON.parse(fs5.readFileSync(packageJsonPath, "utf8"));
-    version = pkg.version;
-  } catch {
-    return null;
-  }
-  const mainJsPath = path4.join(packageRoot, "dist", "main.js");
-  if (!fs5.existsSync(mainJsPath))
-    return null;
-  return { mainJsPath, version, packageRoot };
-}
-
 // src/commands/start.js
 function resolveEnvDir(rawEnvDir) {
   if (rawEnvDir.startsWith("~")) {
@@ -11643,6 +11643,10 @@ if (!globalCheck.ok) {
   console.error(globalCheck.message);
   process.exit(1);
 }
-var LAUNCHER_VERSION = "1.0.12";
-var app = create().name("caw").version(LAUNCHER_VERSION).command(start_default.create()).command(stop_default.create()).command(status_default.create()).command(logs_default.create()).command(upgrade_default.create());
+var LAUNCHER_VERSION = "1.0.15";
+var serverInfo = resolve();
+var serverVersion = serverInfo ? serverInfo.version : "not installed";
+var versionString = `Launcher: ${LAUNCHER_VERSION}
+Server:   ${serverVersion}`;
+var app = create().name("caw").version(versionString).command(start_default.create()).command(stop_default.create()).command(status_default.create()).command(logs_default.create()).command(upgrade_default.create());
 await app.run(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kelceyp/caw",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "CAW launcher — server lifecycle management CLI",
   "type": "module",
   "bin": {