@vicvic-im/agent-bot 0.1.0 → 0.1.2

package/dist/cli.cjs

@@ -24,8 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/cli.ts
-var import_node_child_process2 = require("child_process");
-var import_node_fs5 = require("fs");
+var import_node_child_process3 = require("child_process");
 var import_node_path6 = require("path");
 var import_commander = require("commander");
 var import_picocolors2 = __toESM(require("picocolors"), 1);
@@ -137,11 +136,11 @@ function parseEnv(value) {
   if (value === void 0 || value === null) return void 0;
   const record = asRecord(value, "agent.env");
   const env = {};
-  for (const [key, entry2] of Object.entries(record)) {
-    if (typeof entry2 !== "string") {
+  for (const [key, entry] of Object.entries(record)) {
+    if (typeof entry !== "string") {
       throw new ConfigError(`Invalid "agent.env.${key}": expected a string`);
     }
-    env[key] = entry2;
+    env[key] = entry;
   }
   return env;
 }
@@ -185,7 +184,7 @@ function parseAgent(root, configDir) {
   return {
     name: agentName,
     command: optionalString(agentRaw.command, "agent.command"),
-    args: Array.isArray(argsRaw) ? argsRaw.map((entry2) => String(entry2)) : void 0,
+    args: Array.isArray(argsRaw) ? argsRaw.map((entry) => String(entry)) : void 0,
     cwd,
     model: optionalString(agentRaw.model, "agent.model") ?? null,
     env: parseEnv(agentRaw.env)
@@ -314,11 +313,49 @@ async function ensureConfig(explicit) {
   return { config, path: target };
 }
 
-// src/server.ts
-var import_node_path5 = require("path");
+// src/core/cli-path.ts
+var import_node_fs3 = require("fs");
+var import_node_path3 = require("path");
+function resolveServerEntry(cliPath2) {
+  const real = (0, import_node_fs3.realpathSync)(cliPath2);
+  const candidate = (0, import_node_path3.join)((0, import_node_path3.dirname)(real), "bin-server.js");
+  if (!(0, import_node_fs3.existsSync)(candidate)) {
+    throw new Error(`Server bundle not found at ${candidate}. Reinstall @vicvic-im/agent-bot.`);
+  }
+  return candidate;
+}
+function readPackageVersion(cliPath2) {
+  try {
+    const raw = (0, import_node_fs3.readFileSync)((0, import_node_path3.join)((0, import_node_path3.dirname)((0, import_node_fs3.realpathSync)(cliPath2)), "..", "package.json"), "utf8");
+    return JSON.parse(raw).version ?? "0.1.0";
+  } catch {
+    return "0.1.0";
+  }
+}
 
-// src/agents/acp.ts
+// src/core/pm2.ts
 var import_node_child_process = require("child_process");
+var ENV_BIN = "/usr/bin/env";
+function hasPm2(exec = import_node_child_process.execFileSync) {
+  try {
+    exec(ENV_BIN, ["pm2", "--version"], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function ensurePm2(exec = import_node_child_process.execFileSync) {
+  if (hasPm2(exec)) return true;
+  try {
+    exec(ENV_BIN, ["npm", "i", "-g", "pm2"], { stdio: "inherit" });
+    return hasPm2(exec);
+  } catch {
+    return false;
+  }
+}
+
+// src/agents/acp.ts
+var import_node_child_process2 = require("child_process");
 var import_node_stream = require("stream");
 var acp = __toESM(require("@agentclientprotocol/sdk"), 1);
 
@@ -385,7 +422,7 @@ var AcpAgent = class {
     const definition = definitionOf(this.name);
     const command = this.config.command ?? definition.command.command;
     const args = this.config.args ?? definition.command.args;
-    const child = (0, import_node_child_process.spawn)(command, args, {
+    const child = (0, import_node_child_process2.spawn)(command, args, {
       cwd: this.config.cwd,
       env: { ...process.env, ...this.config.env },
       stdio: ["pipe", "pipe", "pipe"]
@@ -524,7 +561,7 @@ var AcpAgent = class {
       );
       pending.catch(() => void 0);
       const response = await Promise.race([pending, aborted]);
-      await new Promise((resolve5) => setImmediate(resolve5));
+      await new Promise((resolve4) => setImmediate(resolve4));
       if (response.stopReason === "cancelled" || request.signal.aborted) {
         throw new AgentAbortError();
       }
@@ -557,7 +594,7 @@ var AcpAgent = class {
       return true;
     }
     const option = this.configOptions.find(
-      (entry2) => entry2.type === "select" && (entry2.id === "model" || entry2.category === "model")
+      (entry) => entry.type === "select" && (entry.id === "model" || entry.category === "model")
     );
     if (!option) return false;
     await this.ctx.request(acp.methods.agent.session.setConfigOption, {
@@ -583,8 +620,8 @@ var AcpAgent = class {
     } catch {
     }
     if (!child || child.exitCode !== null) return;
-    const exited = new Promise((resolve5) => {
-      child.once("exit", () => resolve5());
+    const exited = new Promise((resolve4) => {
+      child.once("exit", () => resolve4());
     });
     child.kill("SIGTERM");
     const timer = setTimeout(() => child.kill("SIGKILL"), 3e3);
@@ -701,7 +738,7 @@ var BotQueue = class {
 };
 
 // src/version.ts
-var VBOT_VERSION = "0.1.0";
+var VBOT_VERSION = "0.1.2";
 
 // src/core/dispatcher.ts
 var HELP_TEXT = `Available commands:
@@ -782,7 +819,7 @@ function handleAgent(runtime, args, send) {
   const name = args.join(" ").trim();
   if (!name) {
     const current = runtime.config().agent.name;
-    const list = AGENT_NAMES.map((entry2) => `${entry2 === current ? "*" : " "} ${entry2}`).join("\n");
+    const list = AGENT_NAMES.map((entry) => `${entry === current ? "*" : " "} ${entry}`).join("\n");
     send(`Current agent: ${current}
 Available agents:
 ${list}`);
@@ -899,25 +936,25 @@ async function switchAgent(ctx, name) {
 }
 
 // src/core/lock.ts
-var import_node_fs4 = require("fs");
-var import_node_path4 = require("path");
+var import_node_fs5 = require("fs");
+var import_node_path5 = require("path");
 
 // src/core/state.ts
 var import_node_crypto = require("crypto");
-var import_node_fs3 = require("fs");
+var import_node_fs4 = require("fs");
 var import_node_os2 = require("os");
-var import_node_path3 = require("path");
+var import_node_path4 = require("path");
 function vbotHome() {
-  return process.env.VBOT_HOME?.trim() || (0, import_node_path3.join)((0, import_node_os2.homedir)(), ".vbot");
+  return process.env.VBOT_HOME?.trim() || (0, import_node_path4.join)((0, import_node_os2.homedir)(), ".vbot");
 }
 function stateDir() {
-  return (0, import_node_path3.join)(vbotHome(), "state");
+  return (0, import_node_path4.join)(vbotHome(), "state");
 }
 function tokenHash(token) {
   return (0, import_node_crypto.createHash)("sha256").update(token).digest("hex").slice(0, 16);
 }
 function statePath(token) {
-  return (0, import_node_path3.join)(stateDir(), `${tokenHash(token)}.json`);
+  return (0, import_node_path4.join)(stateDir(), `${tokenHash(token)}.json`);
 }
 function emptyState(token, agent, cwd) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -933,9 +970,9 @@ function emptyState(token, agent, cwd) {
 }
 function loadState(token) {
   const path = statePath(token);
-  if (!(0, import_node_fs3.existsSync)(path)) return null;
+  if (!(0, import_node_fs4.existsSync)(path)) return null;
   try {
-    const parsed = JSON.parse((0, import_node_fs3.readFileSync)(path, "utf8"));
+    const parsed = JSON.parse((0, import_node_fs4.readFileSync)(path, "utf8"));
     if (typeof parsed.acpSessionId !== "string" && parsed.acpSessionId !== null) return null;
     if (typeof parsed.agent !== "string") return null;
     return {
@@ -953,12 +990,12 @@ function loadState(token) {
 }
 function saveState(state) {
   const dir = stateDir();
-  (0, import_node_fs3.mkdirSync)(dir, { recursive: true });
-  const path = (0, import_node_path3.join)(dir, `${state.tokenHash}.json`);
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
+  const path = (0, import_node_path4.join)(dir, `${state.tokenHash}.json`);
   const tmp = `${path}.${process.pid}.tmp`;
-  (0, import_node_fs3.writeFileSync)(tmp, `${JSON.stringify(state, null, 2)}
+  (0, import_node_fs4.writeFileSync)(tmp, `${JSON.stringify(state, null, 2)}
 `, { mode: 384 });
-  (0, import_node_fs3.renameSync)(tmp, path);
+  (0, import_node_fs4.renameSync)(tmp, path);
 }
 
 // src/core/lock.ts
@@ -968,10 +1005,10 @@ var LockError = class extends Error {
     this.name = "LockError";
   }
 };
-var lockPath = (token) => (0, import_node_path4.join)(stateDir(), `${tokenHash(token)}.lock`);
+var lockPath = (token) => (0, import_node_path5.join)(stateDir(), `${tokenHash(token)}.lock`);
 function readPid(path) {
   try {
-    const pid = Number.parseInt((0, import_node_fs4.readFileSync)(path, "utf8").trim(), 10);
+    const pid = Number.parseInt((0, import_node_fs5.readFileSync)(path, "utf8").trim(), 10);
     return Number.isFinite(pid) && pid > 0 ? pid : null;
   } catch {
     return null;
@@ -986,13 +1023,13 @@ function isAlive(pid) {
   }
 }
 function acquireLock(token) {
-  (0, import_node_fs4.mkdirSync)(stateDir(), { recursive: true });
+  (0, import_node_fs5.mkdirSync)(stateDir(), { recursive: true });
   const path = lockPath(token);
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
-      const fd = (0, import_node_fs4.openSync)(path, "wx");
-      (0, import_node_fs4.writeSync)(fd, String(process.pid));
-      (0, import_node_fs4.closeSync)(fd);
+      const fd = (0, import_node_fs5.openSync)(path, "wx");
+      (0, import_node_fs5.writeSync)(fd, String(process.pid));
+      (0, import_node_fs5.closeSync)(fd);
       return () => releaseLock(token);
     } catch (error) {
       if (!(error instanceof Error) || !("code" in error) || error.code !== "EEXIST") {
@@ -1003,7 +1040,7 @@ function acquireLock(token) {
         throw new LockError(`This bot is already running in another vbot process (pid ${pid}).`);
       }
       try {
-        (0, import_node_fs4.unlinkSync)(path);
+        (0, import_node_fs5.unlinkSync)(path);
       } catch {
       }
     }
@@ -1012,11 +1049,11 @@ function acquireLock(token) {
 }
 function releaseLock(token) {
   const path = lockPath(token);
-  if (!(0, import_node_fs4.existsSync)(path)) return;
+  if (!(0, import_node_fs5.existsSync)(path)) return;
   const pid = readPid(path);
   if (pid !== process.pid) return;
   try {
-    (0, import_node_fs4.unlinkSync)(path);
+    (0, import_node_fs5.unlinkSync)(path);
   } catch {
   }
 }
@@ -1066,10 +1103,10 @@ var VicvicWire = class {
     if (!socket || socket.readyState !== import_ws.default.OPEN) {
       throw new Error("Bot connection is not open");
     }
-    await new Promise((resolve5, reject) => {
+    await new Promise((resolve4, reject) => {
       socket.send(JSON.stringify({ type: "reply", msgUid, text }), (error) => {
         if (error) reject(error);
-        else resolve5();
+        else resolve4();
       });
     });
   }
@@ -1363,35 +1400,14 @@ ${error.stderr}`);
   console.error("[server] agent run failed:", error);
   replySafe(reply, `Error: ${error instanceof Error ? error.message : String(error)}`);
 }
-var entry = process.argv[1] ?? "";
-if (/(^|[\\/])server\.(js|cjs|ts)$/.test(entry)) {
-  const configPath = process.argv[2];
-  if (!configPath) {
-    console.error("Usage: server.js <config-path>");
-    process.exit(1);
-  }
-  runBot((0, import_node_path5.resolve)(configPath)).catch((error) => {
-    console.error(error instanceof Error ? error.message : String(error));
-    const expected = error instanceof ConfigError || error instanceof LockError;
-    process.exit(expected ? 2 : 1);
-  });
-}
 
 // src/cli.ts
 function processName(cwd) {
   return `vbot-${(0, import_node_path6.basename)((0, import_node_path6.resolve)(cwd)).replace(/[^a-zA-Z0-9._-]+/g, "-")}`;
 }
-var ENV_BIN = "/usr/bin/env";
-function hasPm2() {
-  try {
-    (0, import_node_child_process2.execFileSync)(ENV_BIN, ["pm2", "--version"], { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
-  }
-}
+var ENV_BIN2 = "/usr/bin/env";
 function pm2(args, capture = false) {
-  return (0, import_node_child_process2.execFileSync)(ENV_BIN, ["pm2", ...args], {
+  return (0, import_node_child_process3.execFileSync)(ENV_BIN2, ["pm2", ...args], {
     stdio: capture ? "pipe" : "inherit",
     encoding: "utf8"
   });
@@ -1406,33 +1422,23 @@ function resolveName(configPath) {
     return "vbot";
   }
 }
-function serverEntry() {
-  const cliPath = process.argv[1];
-  if (!cliPath) throw new Error("Cannot resolve vbot entry; run the installed binary.");
-  const candidate = (0, import_node_path6.join)((0, import_node_path6.dirname)(cliPath), "server.js");
-  if (!(0, import_node_fs5.existsSync)(candidate)) {
-    throw new Error(`Server bundle not found at ${candidate}. Run "pnpm build" first.`);
-  }
-  return candidate;
+function cliPath() {
+  const path = process.argv[1];
+  if (!path) throw new Error("Cannot resolve vbot entry; run the installed binary.");
+  return path;
 }
 var program = new import_commander.Command();
-program.name("vbot").description("Connect local coding agents to vicvic.im").version(readVersion());
-function readVersion() {
-  try {
-    const raw = (0, import_node_fs5.readFileSync)((0, import_node_path6.join)((0, import_node_path6.dirname)(process.argv[1] ?? ""), "..", "package.json"), "utf8");
-    return JSON.parse(raw).version ?? "0.1.0";
-  } catch {
-    return "0.1.0";
-  }
-}
+program.name("vbot").description("Connect local coding agents to vicvic.im").version(readPackageVersion(cliPath()));
 program.command("start").description("Start vbot (prompts for config on first run)").option("--foreground", "run in the foreground instead of pm2").option("-c, --config <path>", "config file path").action(async (options) => {
   const { path } = await ensureConfig(options.config);
-  if (options.foreground || !hasPm2()) {
-    if (!options.foreground) {
-      console.log(
-        import_picocolors2.default.yellow("pm2 not found; running in the foreground. Install pm2 for background mode.")
-      );
-    }
+  if (options.foreground) {
+    await runBot(path);
+    return;
+  }
+  if (!hasPm2()) console.log(import_picocolors2.default.yellow("pm2 not found, installing globally..."));
+  if (!ensurePm2()) {
+    console.error(import_picocolors2.default.red("Failed to install pm2. Please install manually: npm i -g pm2"));
+    console.log(import_picocolors2.default.yellow("Running in the foreground instead."));
     await runBot(path);
     return;
   }
@@ -1443,7 +1449,7 @@ program.command("start").description("Start vbot (prompts for config on first ru
   } catch {
     pm2([
       "start",
-      serverEntry(),
+      resolveServerEntry(cliPath()),
       "--name",
       name,
       "--stop-exit-codes",