@vicvic-im/agent-bot 0.1.1 → 0.1.3

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,17 +333,38 @@ 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);
 
 // src/agents/types.ts
 var EMPTY_USAGE = { used: 0, size: 0, cost: null };
 
+// src/version.ts
+var VBOT_VERSION = "0.1.3";
+
 // src/agents/acp.ts
 var AgentAbortError = class extends Error {
   constructor() {
@@ -360,6 +381,14 @@ var AgentStartError = class extends Error {
   stderr;
 };
 var STDERR_LIMIT = 4e3;
+function flattenSelectOptions(options) {
+  return options.flatMap(
+    (entry) => "group" in entry ? entry.options.map((option) => ({ value: option.value, label: option.name })) : [{ value: entry.value, label: entry.name }]
+  );
+}
+function isModelOption(option) {
+  return option.type === "select" && (option.category === "model" || option.id === "model");
+}
 var AcpAgent = class {
   constructor(name, config) {
     this.name = name;
@@ -389,6 +418,14 @@ var AcpAgent = class {
   sessionId() {
     return this.session;
   }
+  currentModel() {
+    const option = this.configOptions.find(isModelOption);
+    if (!option || option.type !== "select") return null;
+    const value = String(option.currentValue);
+    const options = flattenSelectOptions(option.options);
+    const label = options.find((entry) => entry.value === value)?.label ?? value;
+    return { value, label, options };
+  }
   resetSession() {
     this.session = null;
   }
@@ -404,7 +441,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"]
@@ -456,7 +493,7 @@ var AcpAgent = class {
       const init = await this.ctx.request(acp.methods.agent.initialize, {
         protocolVersion: 1,
         clientCapabilities: {},
-        clientInfo: { name: "vbot", version: "0.1.0" }
+        clientInfo: { name: "vbot", version: VBOT_VERSION }
       });
       this.initCaps = init.agentCapabilities;
     } catch (error) {
@@ -543,7 +580,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();
       }
@@ -575,15 +612,14 @@ var AcpAgent = class {
       this.pendingModel = model;
       return true;
     }
-    const option = this.configOptions.find(
-      (entry2) => entry2.type === "select" && (entry2.id === "model" || entry2.category === "model")
-    );
+    const option = this.configOptions.find(isModelOption);
     if (!option) return false;
-    await this.ctx.request(acp.methods.agent.session.setConfigOption, {
+    const response = await this.ctx.request(acp.methods.agent.session.setConfigOption, {
       sessionId: this.session,
       configId: option.id,
       value: model
     });
+    if (response?.configOptions?.length) this.configOptions = response.configOptions;
     this.pendingModel = null;
     return true;
   }
@@ -602,8 +638,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);
@@ -719,21 +755,29 @@ var BotQueue = class {
   }
 };
 
-// src/version.ts
-var VBOT_VERSION = "0.1.1";
-
 // src/core/dispatcher.ts
-var HELP_TEXT = `Available commands:
-/new \u2014 Start a new session
-/stop \u2014 Abort the current request
-/status \u2014 Show agent, session and queue status
-/agent [name] \u2014 Show or switch agent backend
-/model [name] \u2014 Show or switch model
-/cost \u2014 Show context usage and cost
-/version \u2014 Show vbot version
-/help \u2014 Show this help
-
-Other /commands are sent to the agent as prompts.`;
+var import_node_os2 = require("os");
+var HELP_ROWS = [
+  ["/new", "Start a new session"],
+  ["/stop", "Abort the current request"],
+  ["/status", "Show agent, session and queue status"],
+  ["/agent [name]", "Show or switch agent backend"],
+  ["/model [name]", "Show or switch model"],
+  ["/cost", "Show context usage and cost"],
+  ["/version", "Show vbot version"],
+  ["/help", "Show this help"]
+];
+var HELP_FOOTER = "Other /commands are sent to the agent as prompts.";
+var NEW_BUSY_TEXT = "Cannot reset the session while a request is running. Use /stop first.";
+var MODEL_BUSY_TEXT = "Cannot switch model while a request is running. Use /stop first.";
+var HELP_TEXT = [
+  table(
+    ["Command", "Description"],
+    HELP_ROWS.map(([command, description]) => [command, description])
+  ),
+  "",
+  HELP_FOOTER
+].join("\n");
 function createDispatcher(runtime) {
   return (text, reply) => {
     const send = (message) => {
@@ -747,11 +791,57 @@ function createDispatcher(runtime) {
     });
   };
 }
+function escapeCell(value) {
+  return value.replace(/\|/g, "\\|").replace(/\r?\n/g, " ");
+}
+function table(headers, rows) {
+  const head = `| ${headers.map(escapeCell).join(" | ")} |`;
+  const separator = `| ${headers.map(() => "---").join(" | ")} |`;
+  const body = rows.map((row) => `| ${row.map(escapeCell).join(" | ")} |`);
+  return [head, separator, ...body].join("\n");
+}
+function formatNumber(value) {
+  if (!Number.isFinite(value)) return String(value);
+  const negative = value < 0;
+  const digits = Math.abs(Math.trunc(value)).toString();
+  let out = "";
+  for (let i = 0; i < digits.length; i += 1) {
+    if (i > 0 && (digits.length - i) % 3 === 0) out += ",";
+    out += digits[i];
+  }
+  return negative ? "-" + out : out;
+}
+function percentOf(used, size) {
+  if (size <= 0) return null;
+  return `${(used / size * 100).toFixed(1)}%`;
+}
+function usageText(runtime) {
+  const { used, size } = runtime.state().usage;
+  if (size <= 0) return "not reported";
+  const base = `${formatNumber(used)} / ${formatNumber(size)}`;
+  const percent = percentOf(used, size);
+  return percent ? `${base} (${percent})` : base;
+}
+function compactPath(path) {
+  const home = (0, import_node_os2.homedir)();
+  if (!home) return path;
+  if (path === home) return "~";
+  const prefix = home + "/";
+  if (path.startsWith(prefix)) return "~" + path.slice(home.length);
+  return path;
+}
+function modelText(runtime) {
+  const current = runtime.agent().currentModel();
+  if (current) return current.label;
+  const configured = runtime.config().agent.model;
+  if (configured) return `${configured} (configured, not applied yet)`;
+  return "unknown (session not started)";
+}
 function handleSlashCommand(runtime, text, send) {
   const [rawCommand, ...args] = text.split(/\s+/);
   switch (rawCommand.toLowerCase()) {
     case "/new":
-      handleNew(runtime, send);
+      void handleNew(runtime, send);
       return null;
     case "/stop":
       handleStop(runtime, send);
@@ -763,7 +853,7 @@ function handleSlashCommand(runtime, text, send) {
       handleAgent(runtime, args, send);
       return null;
     case "/model":
-      handleModel(runtime, args, send);
+      void handleModel(runtime, args, send);
       return null;
     case "/cost":
       send(costText(runtime));
@@ -778,12 +868,18 @@ function handleSlashCommand(runtime, text, send) {
       return text.slice(1);
   }
 }
-function handleNew(runtime, send) {
-  runtime.agent().resetSession();
-  const state = runtime.state();
-  state.acpSessionId = null;
-  state.usage = { used: 0, size: 0, cost: null };
-  runtime.saveState();
+async function handleNew(runtime, send) {
+  if (runtime.queue().status().busy) {
+    send(NEW_BUSY_TEXT);
+    return;
+  }
+  await runtime.serialize(async () => {
+    runtime.agent().resetSession();
+    const state = runtime.state();
+    state.acpSessionId = null;
+    state.usage = { used: 0, size: 0, cost: null };
+    runtime.saveState();
+  });
   send("Session reset. Starting a new conversation.");
 }
 function handleStop(runtime, send) {
@@ -799,12 +895,18 @@ function handleStop(runtime, send) {
 }
 function handleAgent(runtime, args, send) {
   const name = args.join(" ").trim();
+  const current = runtime.config().agent.name;
   if (!name) {
-    const current = runtime.config().agent.name;
-    const list = AGENT_NAMES.map((entry2) => `${entry2 === current ? "*" : " "} ${entry2}`).join("\n");
-    send(`Current agent: ${current}
-Available agents:
-${list}`);
+    send(
+      table(
+        ["Agent", "Backend", ""],
+        AGENT_NAMES.map((entry) => [
+          entry,
+          AGENTS[entry].label,
+          entry === current ? "\u2190 current" : ""
+        ])
+      )
+    );
     return;
   }
   if (!isAgentName(name)) {
@@ -820,56 +922,95 @@ ${list}`);
     (error) => send(`Error: ${error instanceof Error ? error.message : String(error)}`)
   );
 }
-function handleModel(runtime, args, send) {
+async function handleModel(runtime, args, send) {
   const model = args.join(" ").trim();
   if (!model) {
-    send(`Current model: ${runtime.config().agent.model ?? "default"}`);
+    send(modelReport(runtime));
+    return;
+  }
+  if (runtime.queue().status().busy) {
+    send(MODEL_BUSY_TEXT);
     return;
   }
   const config = runtime.config();
   const hadSession = runtime.agent().sessionId() !== null;
-  config.agent.model = model;
-  runtime.saveConfig();
-  runtime.agent().setModel(model).then((supported) => {
-    if (!supported) {
-      send(
-        `Model saved: ${model}. This agent does not expose a runtime model option; it will be used on the next session if supported.`
-      );
-      return;
-    }
+  const supported = await runtime.serialize(async () => {
+    const accepted = await runtime.agent().setModel(model);
+    config.agent.model = model;
+    runtime.saveConfig();
+    return accepted;
+  });
+  const applied = runtime.agent().currentModel()?.label ?? model;
+  if (!supported) {
     send(
-      hadSession ? `Model switched to: ${model}` : `Model set to: ${model}. It will apply when the session starts.`
+      `Model saved: ${model}. This agent does not expose a runtime model option; it will be used on the next session if supported.`
     );
-  }).catch(
-    (error) => send(`Error: ${error instanceof Error ? error.message : String(error)}`)
+    return;
+  }
+  send(
+    hadSession ? `Model switched to: ${applied}` : `Model set to: ${applied}. It will apply when the session starts.`
   );
 }
+function modelReport(runtime) {
+  const current = runtime.agent().currentModel();
+  if (!current) {
+    const configured = runtime.config().agent.model;
+    const hint = configured ? `Configured: ${configured}
+
+The agent has not reported a model yet; it becomes visible after the first message.` : "This agent does not expose a runtime model option, or the session has not started.";
+    return `Current: unknown
+
+${hint}`;
+  }
+  const lines = [`Current: ${current.label}`];
+  if (current.options.length > 0) {
+    lines.push(
+      "",
+      table(
+        ["Model", ""],
+        current.options.map((option) => [
+          option.label,
+          option.value === current.value ? "\u2190 current" : ""
+        ])
+      )
+    );
+  }
+  lines.push("", "Switch: /model <name>");
+  return lines.join("\n");
+}
 function statusText(runtime) {
   const config = runtime.config();
   const agent = runtime.agent();
   const state = runtime.state();
   const queue = runtime.queue().status();
-  const lines = [
-    `Agent: ${config.agent.name} (${AGENTS[config.agent.name].label})`,
-    `Session: ${agent.sessionId() ?? "none"}`,
-    `Work dir: ${config.agent.cwd}`,
-    `Model: ${config.agent.model ?? "default"}`,
-    `Status: ${queue.busy ? "busy" : "idle"}`,
-    `Queue: ${queue.queued}`,
-    `Usage: ${state.usage.used}/${state.usage.size} tokens`,
-    `Capabilities: ${capabilitiesText(agent.capabilities())}`
+  const { used, size } = state.usage;
+  const summary = [
+    `**${config.agent.name}**`,
+    queue.busy ? "busy" : "idle",
+    size > 0 ? `${formatNumber(used)} / ${formatNumber(size)}` : null
+  ].filter(Boolean).join(" \xB7 ");
+  const rows = [
+    ["Agent", `${config.agent.name} (${AGENTS[config.agent.name].label})`],
+    ["Session", agent.sessionId() ?? "none"],
+    ["Work dir", compactPath(config.agent.cwd)],
+    ["Model", modelText(runtime)],
+    ["Status", queue.busy ? "busy" : "idle"],
+    ["Queue", String(queue.queued)],
+    ["Usage", usageText(runtime)],
+    ["Capabilities", capabilitiesText(agent.capabilities())]
   ];
-  return lines.join("\n");
+  return [summary, "", table(["Field", "Value"], rows)].join("\n");
 }
 function costText(runtime) {
   const usage = runtime.state().usage;
-  const context = `Context: ${usage.used}/${usage.size} tokens`;
-  if (!usage.cost) {
-    return `${context}
-Cost: this agent does not report cost.`;
-  }
-  return `${context}
-Cost: ${usage.cost.amount} ${usage.cost.currency}`;
+  const cost = usage.cost ? `${usage.cost.amount} ${usage.cost.currency}` : "not reported by this agent";
+  return table(
+    ["Field", "Value"],
+    [
+      ["Context", usageText(runtime)],
+      ["Cost", cost]
+    ]
+  );
 }
 function capabilitiesText(caps) {
   const enabled = [
@@ -924,10 +1065,10 @@ var import_node_path5 = require("path");
 // src/core/state.ts
 var import_node_crypto = require("crypto");
 var import_node_fs4 = require("fs");
-var import_node_os2 = require("os");
+var import_node_os3 = require("os");
 var import_node_path4 = require("path");
 function vbotHome() {
-  return process.env.VBOT_HOME?.trim() || (0, import_node_path4.join)((0, import_node_os2.homedir)(), ".vbot");
+  return process.env.VBOT_HOME?.trim() || (0, import_node_path4.join)((0, import_node_os3.homedir)(), ".vbot");
 }
 function stateDir() {
   return (0, import_node_path4.join)(vbotHome(), "state");
@@ -1085,10 +1226,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();
       });
     });
   }
@@ -1256,13 +1397,17 @@ async function startBot(configPath) {
     saveConfig: () => saveConfig(config, configPath)
   };
   holder.queue = new BotQueue((item, signal) => gate(() => processPrompt(ctx, item, signal)));
-  const runtime = createRuntime(ctx, (name) => {
-    if (switching) return Promise.reject(new Error("Agent switch already in progress."));
-    switching = true;
-    return gate(() => switchAgent(ctx, name)).finally(() => {
-      switching = false;
-    });
-  });
+  const runtime = createRuntime(
+    ctx,
+    (task) => gate(task),
+    (name) => {
+      if (switching) return Promise.reject(new Error("Agent switch already in progress."));
+      switching = true;
+      return gate(() => switchAgent(ctx, name)).finally(() => {
+        switching = false;
+      });
+    }
+  );
   const dispatch = createDispatcher(runtime);
   let notifySignal = () => void 0;
   const wire = new VicvicWire({
@@ -1323,7 +1468,7 @@ async function runBot(configPath) {
   const bot = await startBot(configPath);
   await bot.finished;
 }
-function createRuntime(ctx, switchAgent2) {
+function createRuntime(ctx, gate, switchAgent2) {
   return {
     config: () => ctx.config,
     agent: () => ctx.getAgent(),
@@ -1331,6 +1476,7 @@ function createRuntime(ctx, switchAgent2) {
     state: () => ctx.state,
     saveState: () => ctx.saveState(),
     saveConfig: () => ctx.saveConfig(),
+    serialize: (task) => gate(task),
     switchAgent: switchAgent2
   };
 }
@@ -1382,35 +1528,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 +1559,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;
   }