@vellumai/cli 0.3.2 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "CLI tools for vellum-assistant",
   "type": "module",
   "exports": {

package/src/commands/hatch.ts

@@ -1,8 +1,10 @@
 import { randomBytes } from "crypto";
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs";
-import { createRequire } from "module";
+import { existsSync, unlinkSync, writeFileSync } from "fs";
 import { homedir, tmpdir, userInfo } from "os";
-import { dirname, join } from "path";
+import { join } from "path";
+
+// Direct import — bun embeds this at compile time so it works in compiled binaries.
+import cliPkg from "../../package.json";
 
 import { buildOpenclawStartupScript } from "../adapters/openclaw";
 import { loadAllAssistants, saveAssistantEntry } from "../lib/assistant-config";
@@ -569,27 +571,7 @@ async function hatchLocal(species: Species, name: string | null, daemonOnly: boo
 }
 
 function getCliVersion(): string {
-  // Strategy 1: createRequire — works in Bun dev (source tree).
-  try {
-    const require = createRequire(import.meta.url);
-    const pkg = require("../../package.json") as { version?: string };
-    if (pkg.version) return pkg.version;
-  } catch {
-    // Fall through to next strategy.
-  }
-
-  // Strategy 2: Read package.json adjacent to the compiled binary.
-  try {
-    const binPkg = join(dirname(process.execPath), "package.json");
-    if (existsSync(binPkg)) {
-      const pkg = JSON.parse(readFileSync(binPkg, "utf-8")) as { version?: string };
-      if (pkg.version) return pkg.version;
-    }
-  } catch {
-    // Fall through.
-  }
-
-  return "unknown";
+  return cliPkg.version ?? "unknown";
 }
 
 export async function hatch(): Promise<void> {

package/src/index.ts

@@ -1,5 +1,8 @@
 #!/usr/bin/env bun
 
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+import { spawn } from "node:child_process";
 import { client } from "./commands/client";
 import { hatch } from "./commands/hatch";
 import { ps } from "./commands/ps";
@@ -23,7 +26,7 @@ async function main() {
   const commandName = args[0];
 
   if (!commandName || commandName === "--help" || commandName === "-h") {
-    console.log("Usage: vellum-cli <command> [options]");
+    console.log("Usage: vellum <command> [options]");
     console.log("");
     console.log("Commands:");
     console.log("  client   Connect to a hatched assistant");
@@ -38,9 +41,30 @@ async function main() {
   const command = commands[commandName as CommandName];
 
   if (!command) {
-    console.error(`Error: Unknown command '${commandName}'`);
-    console.error("Run 'vellum-cli --help' for usage information.");
-    process.exit(1);
+    try {
+      const require = createRequire(import.meta.url);
+      const assistantPkgPath = require.resolve(
+        "@vellumai/assistant/package.json"
+      );
+      const assistantEntry = join(
+        dirname(assistantPkgPath),
+        "src",
+        "index.ts"
+      );
+      const child = spawn("bun", ["run", assistantEntry, ...args], {
+        stdio: "inherit",
+      });
+      child.on("exit", (code) => {
+        process.exit(code ?? 1);
+      });
+    } catch {
+      console.error(`Unknown command: ${commandName}`);
+      console.error(
+        "Install the full stack with: bun install -g vellum"
+      );
+      process.exit(1);
+    }
+    return;
   }
 
   try {

package/src/lib/local.ts

@@ -294,7 +294,7 @@ export async function startGateway(): Promise<string> {
   }
 
   console.log("🌐 Starting gateway...");
-  const gatewayDir = resolveGatewayDir();
+
   // Only auto-configure default routing when the workspace has exactly one
   // assistant.  In multi-assistant deployments, falling back to "default"
   // would silently deliver unmapped Telegram chats to whichever assistant was
@@ -331,12 +331,34 @@ export async function startGateway(): Promise<string> {
     console.log(`   Ingress URL: ${ingressPublicBaseUrl}`);
   }
 
-  const gateway = spawn("bun", ["run", "src/index.ts"], {
-    cwd: gatewayDir,
-    detached: true,
-    stdio: "ignore",
-    env: gatewayEnv,
-  });
+  let gateway;
+
+  if (process.env.VELLUM_DESKTOP_APP) {
+    // Desktop app: spawn the compiled gateway binary directly (mirrors daemon pattern).
+    const gatewayBinary = join(dirname(process.execPath), "vellum-gateway");
+    if (!existsSync(gatewayBinary)) {
+      throw new Error(
+        `vellum-gateway binary not found at ${gatewayBinary}.\n` +
+          "  Ensure the gateway binary is bundled alongside the CLI in the app bundle.",
+      );
+    }
+
+    gateway = spawn(gatewayBinary, [], {
+      detached: true,
+      stdio: "ignore",
+      env: gatewayEnv,
+    });
+  } else {
+    // Source tree / bunx: resolve the gateway source directory and run via bun.
+    const gatewayDir = resolveGatewayDir();
+    gateway = spawn("bun", ["run", "src/index.ts"], {
+      cwd: gatewayDir,
+      detached: true,
+      stdio: "ignore",
+      env: gatewayEnv,
+    });
+  }
+
   gateway.unref();
 
   if (gateway.pid) {