@vicvic-im/agent-bot 0.1.1 → 0.1.2

package/dist/cli.cjs

@@ -24,8 +24,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/cli.ts
-var import_node_child_process2 = require("child_process");
-var import_node_path7 = require("path");
+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);
 
@@ -136,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;
 }
@@ -184,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)
@@ -318,7 +318,7 @@ 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), "server.js");
+  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.`);
   }
@@ -333,11 +333,29 @@ function readPackageVersion(cliPath2) {
   }
 }
 
-// src/server.ts
-var import_node_path6 = require("path");
+// 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_process = require("child_process");
+var import_node_child_process2 = require("child_process");
 var import_node_stream = require("stream");
 var acp = __toESM(require("@agentclientprotocol/sdk"), 1);
 
@@ -404,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"]
@@ -543,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();
       }
@@ -576,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, {
@@ -602,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);
@@ -720,7 +738,7 @@ var BotQueue = class {
 };
 
 // src/version.ts
-var VBOT_VERSION = "0.1.1";
+var VBOT_VERSION = "0.1.2";
 
 // src/core/dispatcher.ts
 var HELP_TEXT = `Available commands:
@@ -801,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}`);
@@ -1085,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();
       });
     });
   }
@@ -1382,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_path6.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_path7.basename)((0, import_node_path7.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;
-  }
+  return `vbot-${(0, import_node_path6.basename)((0, import_node_path6.resolve)(cwd)).replace(/[^a-zA-Z0-9._-]+/g, "-")}`;
 }
+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"
   });
@@ -1434,12 +1431,14 @@ var program = new import_commander.Command();
 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;
   }