@vellumai/cli 0.1.2 → 0.1.4

package/package.json

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

package/src/commands/hatch.ts

@@ -2,7 +2,7 @@ import { spawn } from "child_process";
 import { randomBytes } from "crypto";
 import { existsSync, unlinkSync, writeFileSync } from "fs";
 import { tmpdir, userInfo } from "os";
-import { join } from "path";
+import { dirname, join } from "path";
 
 import { buildOpenclawStartupScript } from "../adapters/openclaw";
 import { saveAssistantEntry } from "../lib/assistant-config";
@@ -583,7 +583,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 {
@@ -722,21 +723,58 @@ async function hatchLocal(species: Species, name: string | null): Promise<void>
   console.log("");
 
   console.log("🔨 Starting local daemon...");
-  const child = spawn("bunx", ["vellum", "daemon", "start"], {
-    stdio: "inherit",
-    env: { ...process.env },
-  });
 
-  await new Promise<void>((resolve, reject) => {
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(new Error(`Daemon start exited with code ${code}`));
+  if (process.env.VELLUM_DESKTOP_APP) {
+    const daemonBinary = join(dirname(process.execPath), "vellum-daemon");
+    const child = spawn(daemonBinary, [], {
+      detached: true,
+      stdio: "ignore",
+      env: { ...process.env },
+    });
+    child.unref();
+
+    const homeDir = process.env.HOME ?? userInfo().homedir;
+    const socketPath = join(homeDir, ".vellum", "vellum.sock");
+    const maxWait = 10000;
+    const pollInterval = 100;
+    let waited = 0;
+    while (waited < maxWait) {
+      if (existsSync(socketPath)) {
+        break;
       }
+      await new Promise((r) => setTimeout(r, pollInterval));
+      waited += pollInterval;
+    }
+    if (!existsSync(socketPath)) {
+      console.warn("⚠️  Daemon socket did not appear within 10s — continuing anyway");
+    }
+  } else {
+    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 },
     });
-    child.on("error", reject);
-  });
+
+    await new Promise<void>((resolve, reject) => {
+      child.on("close", (code) => {
+        if (code === 0) {
+          resolve();
+        } else {
+          reject(new Error(`Daemon start exited with code ${code}`));
+        }
+      });
+      child.on("error", reject);
+    });
+  }
 
   console.log("🌐 Starting gateway...");
   const gatewayDir = join(import.meta.dir, "..", "..", "..", "gateway");

package/src/commands/retire.ts

@@ -92,12 +92,22 @@ async function retireCustom(entry: AssistantEntry): Promise<void> {
   console.log(`\u2705 Custom instance retired.`);
 }
 
+function parseSource(): string | undefined {
+  const args = process.argv.slice(4);
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === "--source" && args[i + 1]) {
+      return args[i + 1];
+    }
+  }
+  return undefined;
+}
+
 export async function retire(): Promise<void> {
   const name = process.argv[3];
 
   if (!name) {
     console.error("Error: Instance name is required.");
-    console.error("Usage: vellum-cli retire <name>");
+    console.error("Usage: vellum-cli retire <name> [--source <source>]");
     process.exit(1);
   }
 
@@ -108,6 +118,7 @@ export async function retire(): Promise<void> {
     process.exit(1);
   }
 
+  const source = parseSource();
   const cloud = resolveCloud(entry);
 
   if (cloud === "gcp") {
@@ -117,14 +128,14 @@ export async function retire(): Promise<void> {
       console.error("Error: GCP project and zone not found in assistant config.");
       process.exit(1);
     }
-    await retireGcpInstance(name, project, zone);
+    await retireGcpInstance(name, project, zone, source);
   } else if (cloud === "aws") {
     const region = entry.region;
     if (!region) {
       console.error("Error: AWS region not found in assistant config.");
       process.exit(1);
     }
-    await retireAwsInstance(name, region);
+    await retireAwsInstance(name, region, source);
   } else if (cloud === "local") {
     await retireLocal();
   } else if (cloud === "custom") {

package/src/lib/aws.ts

@@ -547,6 +547,7 @@ async function getInstanceIdByName(
 export async function retireInstance(
   name: string,
   region: string,
+  source?: string,
 ): Promise<void> {
   const instanceId = await getInstanceIdByName(name, region);
   if (!instanceId) {
@@ -556,6 +557,23 @@ export async function retireInstance(
     return;
   }
 
+  if (source) {
+    try {
+      await exec("aws", [
+        "ec2",
+        "create-tags",
+        "--resources",
+        instanceId,
+        "--tags",
+        `Key=retired-by,Value=${source}`,
+        "--region",
+        region,
+      ]);
+    } catch {
+      console.warn(`\u26a0\ufe0f  Could not tag instance before termination`);
+    }
+  }
+
   console.log(`\u{1F5D1}\ufe0f  Terminating AWS instance ${name} (${instanceId})\n`);
 
   const child = spawnChild(

package/src/lib/gcp.ts

@@ -278,6 +278,7 @@ export async function retireInstance(
   name: string,
   project: string,
   zone: string,
+  source?: string,
 ): Promise<void> {
   const exists = await instanceExists(name, project, zone);
   if (!exists) {
@@ -287,6 +288,22 @@ export async function retireInstance(
     return;
   }
 
+  if (source) {
+    try {
+      await exec("gcloud", [
+        "compute",
+        "instances",
+        "add-labels",
+        name,
+        `--project=${project}`,
+        `--zone=${zone}`,
+        `--labels=retired-by=${source}`,
+      ]);
+    } catch {
+      console.warn(`\u26a0\ufe0f  Could not label instance before deletion`);
+    }
+  }
+
   console.log(`\u{1F5D1}\ufe0f  Deleting GCP instance ${name}\n`);
 
   const child = spawn(

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