@vellumai/cli 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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 { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs";
+import { createRequire } from "module";
 import { tmpdir, userInfo } from "os";
 import { dirname, join } from "path";
 
@@ -17,11 +18,13 @@ import {
 } from "../lib/constants";
 import type { RemoteHost, Species } from "../lib/constants";
 import type { FirewallRuleSpec } from "../lib/gcp";
-import { getActiveProject, instanceExists, syncFirewallRules } from "../lib/gcp";
+import { fetchAndDisplayStartupLogs, getActiveProject, instanceExists, syncFirewallRules } from "../lib/gcp";
 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,
@@ -105,7 +108,7 @@ set -e
 
 ${timestampRedirect}
 
-trap 'EXIT_CODE=\$?; if [ \$EXIT_CODE -ne 0 ]; then echo "Startup script failed with exit code \$EXIT_CODE" > /var/log/startup-error; fi' EXIT
+trap 'EXIT_CODE=\$?; if [ \$EXIT_CODE -ne 0 ]; then echo "Startup script failed with exit code \$EXIT_CODE at line \$LINENO" > /var/log/startup-error; echo "Last 20 log lines:" >> /var/log/startup-error; tail -20 /var/log/startup-script.log >> /var/log/startup-error 2>/dev/null || true; fi' EXIT
 ${userSetup}
 ANTHROPIC_API_KEY=${anthropicApiKey}
 GATEWAY_RUNTIME_PROXY_ENABLED=true
@@ -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"
@@ -131,8 +135,11 @@ CONFIG_EOF
 ${ownershipFixup}
 
 export VELLUM_SSH_USER="\$SSH_USER"
+echo "Downloading install script from ${platformUrl}/install.sh..."
 curl -fsSL ${platformUrl}/install.sh -o ${INSTALL_SCRIPT_REMOTE_PATH}
+echo "Install script downloaded (\$(wc -c < ${INSTALL_SCRIPT_REMOTE_PATH}) bytes)"
 chmod +x ${INSTALL_SCRIPT_REMOTE_PATH}
+echo "Running install script..."
 source ${INSTALL_SCRIPT_REMOTE_PATH}
 `;
 }
@@ -192,6 +199,7 @@ export interface PollResult {
   lastLine: string | null;
   done: boolean;
   failed: boolean;
+  errorContent: string;
 }
 
 async function pollInstance(
@@ -223,7 +231,7 @@ async function pollInstance(
     const output = await execOutput("gcloud", args);
     const sepIdx = output.indexOf("===HATCH_SEP===");
     if (sepIdx === -1) {
-      return { lastLine: output.trim() || null, done: false, failed: false };
+      return { lastLine: output.trim() || null, done: false, failed: false, errorContent: "" };
     }
     const errIdx = output.indexOf("===HATCH_ERR===");
     const lastLine = output.substring(0, sepIdx).trim() || null;
@@ -233,9 +241,9 @@ async function pollInstance(
       errIdx === -1 ? "" : output.substring(errIdx + "===HATCH_ERR===".length).trim();
     const done = lastLine !== null && status !== "active" && status !== "activating";
     const failed = errorContent.length > 0 || status === "failed";
-    return { lastLine, done, failed };
+    return { lastLine, done, failed, errorContent };
   } catch {
-    return { lastLine: null, done: false, failed: false };
+    return { lastLine: null, done: false, failed: false, errorContent: "" };
   }
 }
 
@@ -322,17 +330,23 @@ async function recoverFromCurlFailure(
   await exec("gcloud", sshArgs);
 }
 
+export interface WatchHatchingResult {
+  success: boolean;
+  errorContent: string;
+}
+
 export async function watchHatching(
   pollFn: () => Promise<PollResult>,
   instanceName: string,
   startTime: number,
   species: Species,
-): Promise<boolean> {
+): Promise<WatchHatchingResult> {
   let spinnerIdx = 0;
   let lastLogLine: string | null = null;
   let linesDrawn = 0;
   let finished = false;
   let failed = false;
+  let lastErrorContent = "";
   let pollInFlight = false;
   let nextPollAt = Date.now() + 15000;
 
@@ -382,6 +396,9 @@ export async function watchHatching(
       if (result.lastLine) {
         lastLogLine = result.lastLine;
       }
+      if (result.errorContent) {
+        lastErrorContent = result.errorContent;
+      }
       if (result.done) {
         finished = true;
         failed = result.failed;
@@ -392,12 +409,12 @@ export async function watchHatching(
     }
   }
 
-  return new Promise<boolean>((resolve) => {
+  return new Promise<WatchHatchingResult>((resolve) => {
     const interval = setInterval(() => {
       if (finished) {
         draw();
         clearInterval(interval);
-        resolve(!failed);
+        resolve({ success: !failed, errorContent: lastErrorContent });
         return;
       }
 
@@ -408,7 +425,7 @@ export async function watchHatching(
         console.log(`   ⏰ Timed out after ${formatElapsed(elapsed)}. Instance is still running.`);
         console.log(`   Monitor with: vel logs ${instanceName}`);
         console.log("");
-        resolve(true);
+        resolve({ success: true, errorContent: lastErrorContent });
         return;
       }
 
@@ -485,7 +502,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);
 
@@ -570,25 +587,32 @@ async function hatchGcp(
       console.log("   Press Ctrl+C to detach (instance will keep running)");
       console.log("");
 
-      const success = await watchHatching(
+      const result = await watchHatching(
         () => pollInstance(instanceName, project, zone, account),
         instanceName,
         startTime,
         species,
       );
 
-      if (!success) {
+      if (!result.success) {
+        console.log("");
+        if (result.errorContent) {
+          console.log("📋 Startup error:");
+          console.log(`   ${result.errorContent}`);
+          console.log("");
+        }
+
+        await fetchAndDisplayStartupLogs(instanceName, project, zone, account);
+
         if (
           species === "vellum" &&
           (await checkCurlFailure(instanceName, project, zone, account))
         ) {
-          console.log("");
           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 {
-          console.log("");
           process.exit(1);
         }
       }
@@ -650,7 +674,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);
 
@@ -715,6 +739,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()}`;
 
@@ -777,24 +817,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 = {
@@ -815,7 +850,20 @@ async function hatchLocal(species: Species, name: string | null): Promise<void>
   console.log("");
 }
 
+function getCliVersion(): string {
+  try {
+    const pkgPath = join(import.meta.dir, "..", "package.json");
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    return pkg.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+
 export async function hatch(): Promise<void> {
+  const cliVersion = getCliVersion();
+  console.log(`@vellumai/cli v${cliVersion}`);
+
   const { species, detached, name, remote } = parseArgs();
 
   if (remote === "local") {

package/src/lib/aws.ts

@@ -338,7 +338,7 @@ async function pollAwsInstance(
     const output = await awsSshExec(ip, keyPath, remoteCmd);
     const sepIdx = output.indexOf("===HATCH_SEP===");
     if (sepIdx === -1) {
-      return { lastLine: output.trim() || null, done: false, failed: false };
+      return { lastLine: output.trim() || null, done: false, failed: false, errorContent: "" };
     }
     const errIdx = output.indexOf("===HATCH_ERR===");
     const lastLine = output.substring(0, sepIdx).trim() || null;
@@ -348,9 +348,9 @@ async function pollAwsInstance(
       errIdx === -1 ? "" : output.substring(errIdx + "===HATCH_ERR===".length).trim();
     const done = lastLine !== null && status !== "running" && status !== "pending";
     const failed = errorContent.length > 0 || status === "error";
-    return { lastLine, done, failed };
+    return { lastLine, done, failed, errorContent };
   } catch {
-    return { lastLine: null, done: false, failed: false };
+    return { lastLine: null, done: false, failed: false, errorContent: "" };
   }
 }
 
@@ -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);
 
@@ -488,15 +488,20 @@ export async function hatchAws(
 
       if (externalIp) {
         const ip = externalIp;
-        const success = await watchHatching(
+        const result = await watchHatching(
           () => pollAwsInstance(ip, keyPath),
           instanceName,
           startTime,
           species,
         );
 
-        if (!success) {
+        if (!result.success) {
           console.log("");
+          if (result.errorContent) {
+            console.log("📋 Startup error:");
+            console.log(`   ${result.errorContent}`);
+            console.log("");
+          }
           process.exit(1);
         }
       } else {

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 {
@@ -274,6 +274,45 @@ export async function sshCommand(
   ]);
 }
 
+export async function fetchAndDisplayStartupLogs(
+  instanceName: string,
+  project: string,
+  zone: string,
+  account?: string,
+): Promise<void> {
+  try {
+    const remoteCmd =
+      'echo "=== Last 50 lines of /var/log/startup-script.log ==="; ' +
+      "tail -50 /var/log/startup-script.log 2>/dev/null || echo '(no startup log found)'; " +
+      'echo ""; ' +
+      'echo "=== /var/log/startup-error ==="; ' +
+      "cat /var/log/startup-error 2>/dev/null || echo '(no error file found)'";
+    const args = [
+      "compute",
+      "ssh",
+      instanceName,
+      `--project=${project}`,
+      `--zone=${zone}`,
+      "--quiet",
+      "--ssh-flag=-o StrictHostKeyChecking=no",
+      "--ssh-flag=-o UserKnownHostsFile=/dev/null",
+      "--ssh-flag=-o ConnectTimeout=10",
+      "--ssh-flag=-o LogLevel=ERROR",
+      `--command=${remoteCmd}`,
+    ];
+    if (account) args.push(`--account=${account}`);
+    const output = await execOutput("gcloud", args);
+    console.log("📋 Startup logs from instance:");
+    for (const line of output.split("\n")) {
+      console.log(`   ${line}`);
+    }
+    console.log("");
+  } catch {
+    console.log("⚠️  Could not retrieve startup logs from instance");
+    console.log("");
+  }
+}
+
 export async function retireInstance(
   name: string,
   project: string,

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

@@ -1,8 +1,7 @@
 import { join } from "path";
 
-const serverSource = await Bun.file(join(import.meta.dir, "..", "adapters", "openclaw-http-server.ts")).text();
-
-export function buildOpenclawRuntimeServer(): string {
+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'