@vellumai/cli 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "CLI tools for vellum-assistant",
   "type": "module",
   "bin": {

package/src/adapters/openclaw.ts

@@ -1,15 +1,15 @@
 import { GATEWAY_PORT } from "../lib/constants";
 import { buildOpenclawRuntimeServer } from "../lib/openclaw-runtime-server";
 
-export function buildOpenclawStartupScript(
+export async function buildOpenclawStartupScript(
   bearerToken: string,
   sshUser: string,
   anthropicApiKey: string,
   timestampRedirect: string,
   userSetup: string,
   ownershipFixup: string,
-): string {
-  const runtimeServer = buildOpenclawRuntimeServer();
+): Promise<string> {
+  const runtimeServer = await buildOpenclawRuntimeServer();
 
   return `#!/bin/bash
 set -e

package/src/commands/hatch.ts

@@ -1,6 +1,7 @@
 import { spawn } from "child_process";
 import { randomBytes } from "crypto";
 import { existsSync, unlinkSync, writeFileSync } from "fs";
+import { createRequire } from "module";
 import { tmpdir, userInfo } from "os";
 import { dirname, join } from "path";
 
@@ -22,6 +23,8 @@ import { buildInterfacesSeed } from "../lib/interfaces-seed";
 import { generateRandomSuffix } from "../lib/random-name";
 import { exec, execOutput } from "../lib/step-runner";
 
+const _require = createRequire(import.meta.url);
+
 const INSTALL_SCRIPT_REMOTE_PATH = "/tmp/vellum-install.sh";
 const INSTALL_SCRIPT_PATH = join(import.meta.dir, "..", "adapters", "install.sh");
 const MACHINE_TYPE = "e2-standard-4"; // 4 vCPUs, 16 GB memory
@@ -76,19 +79,19 @@ chown -R "$SSH_USER:$SSH_USER" "$SSH_USER_HOME" 2>/dev/null || true
 `;
 }
 
-export function buildStartupScript(
+export async function buildStartupScript(
   species: Species,
   bearerToken: string,
   sshUser: string,
   anthropicApiKey: string,
-): string {
+): Promise<string> {
   const platformUrl = process.env.VELLUM_ASSISTANT_PLATFORM_URL ?? "https://assistant.vellum.ai";
   const timestampRedirect = buildTimestampRedirect();
   const userSetup = buildUserSetup(sshUser);
   const ownershipFixup = buildOwnershipFixup();
 
   if (species === "openclaw") {
-    return buildOpenclawStartupScript(
+    return await buildOpenclawStartupScript(
       bearerToken,
       sshUser,
       anthropicApiKey,
@@ -117,6 +120,7 @@ ANTHROPIC_API_KEY=\$ANTHROPIC_API_KEY
 GATEWAY_RUNTIME_PROXY_ENABLED=\$GATEWAY_RUNTIME_PROXY_ENABLED
 RUNTIME_PROXY_BEARER_TOKEN=\$RUNTIME_PROXY_BEARER_TOKEN
 INTERFACES_SEED_DIR=\$INTERFACES_SEED_DIR
+RUNTIME_HTTP_PORT=7821
 DOTENV_EOF
 
 mkdir -p "\$HOME/.vellum/workspace"
@@ -485,7 +489,7 @@ async function hatchGcp(
       console.error("Error: ANTHROPIC_API_KEY environment variable is not set.");
       process.exit(1);
     }
-    const startupScript = buildStartupScript(species, bearerToken, sshUser, anthropicApiKey);
+    const startupScript = await buildStartupScript(species, bearerToken, sshUser, anthropicApiKey);
     const startupScriptPath = join(tmpdir(), `${instanceName}-startup.sh`);
     writeFileSync(startupScriptPath, startupScript);
 
@@ -583,7 +587,8 @@ async function hatchGcp(
           (await checkCurlFailure(instanceName, project, zone, account))
         ) {
           console.log("");
-          console.log("🔄 Detected install script curl failure, attempting recovery...");
+          const installScriptUrl = `${process.env.VELLUM_ASSISTANT_PLATFORM_URL ?? "https://assistant.vellum.ai"}/install.sh`;
+          console.log(`🔄 Detected install script curl failure for ${installScriptUrl}, attempting recovery...`);
           await recoverFromCurlFailure(instanceName, project, zone, sshUser, account);
           console.log("✅ Recovery successful!");
         } else {
@@ -649,7 +654,7 @@ async function hatchCustom(
       process.exit(1);
     }
 
-    const startupScript = buildStartupScript(species, bearerToken, sshUser, anthropicApiKey);
+    const startupScript = await buildStartupScript(species, bearerToken, sshUser, anthropicApiKey);
     const startupScriptPath = join(tmpdir(), `${instanceName}-startup.sh`);
     writeFileSync(startupScriptPath, startupScript);
 
@@ -714,6 +719,22 @@ async function hatchCustom(
   }
 }
 
+function resolveGatewayDir(): string {
+  const sourceDir = join(import.meta.dir, "..", "..", "..", "gateway");
+  if (existsSync(sourceDir)) {
+    return sourceDir;
+  }
+
+  try {
+    const pkgPath = _require.resolve("@vellumai/vellum-gateway/package.json");
+    return dirname(pkgPath);
+  } catch {
+    throw new Error(
+      "Gateway not found. Ensure @vellumai/vellum-gateway is installed or run from the source tree.",
+    );
+  }
+}
+
 async function hatchLocal(species: Species, name: string | null): Promise<void> {
   const instanceName = name ?? `${species}-${generateRandomSuffix()}`;
 
@@ -722,9 +743,9 @@ async function hatchLocal(species: Species, name: string | null): Promise<void>
   console.log("");
 
   console.log("🔨 Starting local daemon...");
-  const daemonBinary = join(dirname(process.execPath), "vellum-daemon");
 
-  if (existsSync(daemonBinary)) {
+  if (process.env.VELLUM_DESKTOP_APP) {
+    const daemonBinary = join(dirname(process.execPath), "vellum-daemon");
     const child = spawn(daemonBinary, [], {
       detached: true,
       stdio: "ignore",
@@ -748,7 +769,17 @@ async function hatchLocal(species: Species, name: string | null): Promise<void>
       console.warn("⚠️  Daemon socket did not appear within 10s — continuing anyway");
     }
   } else {
-    const child = spawn("bunx", ["vellum", "daemon", "start"], {
+    const assistantDir = join(import.meta.dir, "..", "..", "..", "assistant");
+    const assistantIndex = join(assistantDir, "src", "index.ts");
+
+    if (!existsSync(assistantIndex)) {
+      throw new Error(
+        "vellum-daemon binary not found and assistant source not available.\n" +
+          "  Ensure the daemon binary is bundled alongside the CLI, or run from the source tree.",
+      );
+    }
+
+    const child = spawn("bun", ["run", assistantIndex, "daemon", "start"], {
       stdio: "inherit",
       env: { ...process.env },
     });
@@ -766,24 +797,19 @@ async function hatchLocal(species: Species, name: string | null): Promise<void>
   }
 
   console.log("🌐 Starting gateway...");
-  const gatewayDir = join(import.meta.dir, "..", "..", "..", "gateway");
-  if (!existsSync(gatewayDir)) {
-    console.warn("⚠️  Gateway directory not found at", gatewayDir);
-    console.warn('   Gateway will not be started\n');
-  } else {
-    const gateway = spawn("bun", ["run", "src/index.ts"], {
-      cwd: gatewayDir,
-      detached: true,
-      stdio: "ignore",
-      env: {
-        ...process.env,
-        GATEWAY_RUNTIME_PROXY_ENABLED: "true",
-        GATEWAY_RUNTIME_PROXY_REQUIRE_AUTH: "false",
-      },
-    });
-    gateway.unref();
-    console.log("✅ Gateway started\n");
-  }
+  const gatewayDir = resolveGatewayDir();
+  const gateway = spawn("bun", ["run", "src/index.ts"], {
+    cwd: gatewayDir,
+    detached: true,
+    stdio: "ignore",
+    env: {
+      ...process.env,
+      GATEWAY_RUNTIME_PROXY_ENABLED: "true",
+      GATEWAY_RUNTIME_PROXY_REQUIRE_AUTH: "false",
+    },
+  });
+  gateway.unref();
+  console.log("✅ Gateway started\n");
 
   const runtimeUrl = `http://localhost:${GATEWAY_PORT}`;
   const localEntry: AssistantEntry = {

package/src/lib/aws.ts

@@ -420,7 +420,7 @@ export async function hatchAws(
     console.log("\u{1F50D} Finding latest Debian AMI...");
     const amiId = await getLatestDebianAmi(region);
 
-    const startupScript = buildStartupScript(species, bearerToken, sshUser, anthropicApiKey);
+    const startupScript = await buildStartupScript(species, bearerToken, sshUser, anthropicApiKey);
     const startupScriptPath = join(tmpdir(), `${instanceName}-startup.sh`);
     writeFileSync(startupScriptPath, startupScript);
 

package/src/lib/gcp.ts

@@ -139,15 +139,14 @@ export async function syncFirewallRules(
       "firewall-rules",
       "list",
       `--project=${project}`,
-      `--filter=targetTags:${tag}`,
-      "--format=value(name)",
+      "--format=json(name,targetTags)",
     ];
     if (account) listArgs.push(`--account=${account}`);
     const output = await execOutput("gcloud", listArgs);
-    existingNames = output
-      .split("\n")
-      .map((s) => s.trim())
-      .filter(Boolean);
+    const allRules = JSON.parse(output) as Array<{ name: string; targetTags?: string[] }>;
+    existingNames = allRules
+      .filter((r) => r.targetTags?.includes(tag))
+      .map((r) => r.name);
   } catch {
     existingNames = [];
   }
@@ -190,10 +189,11 @@ export async function fetchFirewallRules(
     "firewall-rules",
     "list",
     `--project=${project}`,
-    `--filter=targetTags:${tag}`,
     "--format=json",
   ]);
-  return output;
+  const rules = JSON.parse(output) as Array<{ targetTags?: string[] }>;
+  const filtered = rules.filter((r) => r.targetTags?.includes(tag));
+  return JSON.stringify(filtered, null, 2);
 }
 
 export interface GcpInstance {

package/src/lib/interfaces-seed.ts

@@ -1,20 +1,16 @@
-import { readFileSync } from "fs";
 import { join } from "path";
 
-const COMPONENTS_DIR = join(import.meta.dir, "..", "components");
-const CONSTANTS_PATH = join(import.meta.dir, "constants.ts");
+const constantsSource = await Bun.file(join(import.meta.dir, "constants.ts")).text();
+const defaultMainScreenSource = await Bun.file(join(import.meta.dir, "..", "components", "DefaultMainScreen.tsx")).text();
 
 function inlineLocalImports(source: string): string {
-  const constantsSource = readFileSync(CONSTANTS_PATH, "utf-8");
-
   return source
     .replace(/import\s*\{[^}]*\}\s*from\s*["'][^"']*\/constants["'];?\s*\n/, constantsSource + "\n")
     .replace(/import\s*\{[^}]*\}\s*from\s*["']path["'];?\s*\n/, "");
 }
 
 export function buildInterfacesSeed(): string {
-  const rawSource = readFileSync(join(COMPONENTS_DIR, "DefaultMainScreen.tsx"), "utf-8");
-  const mainWindowSource = inlineLocalImports(rawSource);
+  const mainWindowSource = inlineLocalImports(defaultMainScreenSource);
 
   return `
 INTERFACES_SEED_DIR="/tmp/interfaces-seed"

package/src/lib/openclaw-runtime-server.ts

@@ -1,10 +1,7 @@
-import { readFileSync } from "fs";
 import { join } from "path";
 
-const ADAPTER_PATH = join(import.meta.dir, "..", "adapters", "openclaw-http-server.ts");
-
-export function buildOpenclawRuntimeServer(): string {
-  const serverSource = readFileSync(ADAPTER_PATH, "utf-8");
+export async function buildOpenclawRuntimeServer(): Promise<string> {
+  const serverSource = await Bun.file(join(import.meta.dir, "..", "adapters", "openclaw-http-server.ts")).text();
 
   return `
 cat > /opt/openclaw-runtime-server.ts << 'RUNTIME_SERVER_EOF'