@vellumai/cli 0.4.42 → 0.4.43

package/src/commands/ps.ts

@@ -3,7 +3,6 @@ import { homedir } from "os";
 import { join } from "path";
 
 import {
-  defaultLocalResources,
   findAssistantByName,
   getActiveAssistant,
   loadAllAssistants,
@@ -178,45 +177,65 @@ interface DetectedProcess {
   pid: string | null;
   port: number;
   running: boolean;
+  watch: boolean;
+}
+
+async function isWatchMode(pid: string): Promise<boolean> {
+  try {
+    const args = await execOutput("ps", ["-p", pid, "-o", "args="]);
+    return args.includes("--watch");
+  } catch {
+    return false;
+  }
 }
 
 async function detectProcess(spec: ProcessSpec): Promise<DetectedProcess> {
   // Tier 1: pgrep by process title
   const pids = await pgrepExact(spec.pgrepName);
   if (pids.length > 0) {
-    return { name: spec.name, pid: pids[0], port: spec.port, running: true };
+    const watch = await isWatchMode(pids[0]);
+    return { name: spec.name, pid: pids[0], port: spec.port, running: true, watch };
   }
 
   // Tier 2: TCP port probe (skip for processes without a port)
   const listening = spec.port > 0 && (await probePort(spec.port));
   if (listening) {
     const filePid = readPidFile(spec.pidFile);
+    const watch = filePid ? await isWatchMode(filePid) : false;
     return {
       name: spec.name,
       pid: filePid,
       port: spec.port,
       running: true,
+      watch,
     };
   }
 
   // Tier 3: PID file fallback
   const filePid = readPidFile(spec.pidFile);
   if (filePid && isProcessAlive(filePid)) {
-    return { name: spec.name, pid: filePid, port: spec.port, running: true };
+    const watch = await isWatchMode(filePid);
+    return { name: spec.name, pid: filePid, port: spec.port, running: true, watch };
   }
 
-  return { name: spec.name, pid: null, port: spec.port, running: false };
+  return { name: spec.name, pid: null, port: spec.port, running: false, watch: false };
 }
 
 function formatDetectionInfo(proc: DetectedProcess): string {
   const parts: string[] = [];
   if (proc.pid) parts.push(`PID ${proc.pid}`);
   if (proc.port > 0) parts.push(`port ${proc.port}`);
+  if (proc.watch) parts.push("watch");
   return parts.join(" | ");
 }
 
 async function getLocalProcesses(entry: AssistantEntry): Promise<TableRow[]> {
-  const resources = entry.resources ?? defaultLocalResources();
+  if (!entry.resources) {
+    throw new Error(
+      `Local assistant '${entry.assistantId}' is missing resource configuration. Re-hatch to fix.`,
+    );
+  }
+  const resources = entry.resources;
   const vellumDir = join(resources.instanceDir, ".vellum");
 
   const specs: ProcessSpec[] = [
@@ -409,9 +428,7 @@ async function listAllAssistants(): Promise<void> {
       // process isn't running, the assistant is sleeping — skip the
       // network health check to avoid a misleading "unreachable" status.
       let health: { status: string; detail: string | null };
-      const resources =
-        a.resources ??
-        (a.cloud === "local" ? defaultLocalResources() : undefined);
+      const resources = a.resources;
       if (a.cloud === "local" && resources) {
         const pid = readPidFile(resources.pidFile);
         const alive = pid !== null && isProcessAlive(pid);

package/src/commands/recover.ts

@@ -37,7 +37,17 @@ export async function recover(): Promise<void> {
     process.exit(1);
   }
 
-  // 2. Check ~/.vellum doesn't already exist
+  // 2. Read and validate metadata before any side effects
+  const entry: AssistantEntry = JSON.parse(readFileSync(metadataPath, "utf-8"));
+  if (!entry.resources) {
+    throw new Error(
+      `Retired assistant '${name}' is missing resource configuration. ` +
+        `Fix the archive metadata at ${metadataPath} and retry, ` +
+        `or run 'vellum hatch' to re-provision with proper resource allocation.`,
+    );
+  }
+
+  // 3. Check ~/.vellum doesn't already exist
   const vellumDir = join(homedir(), ".vellum");
   if (existsSync(vellumDir)) {
     console.error(
@@ -46,21 +56,20 @@ export async function recover(): Promise<void> {
     process.exit(1);
   }
 
-  // 3. Extract archive
+  // 4. Extract archive
   await exec("tar", ["xzf", archivePath, "-C", homedir()]);
 
-  // 4. Restore lockfile entry
-  const entry: AssistantEntry = JSON.parse(readFileSync(metadataPath, "utf-8"));
+  // 5. Restore lockfile entry
   saveAssistantEntry(entry);
 
-  // 5. Clean up archive
+  // 6. Clean up archive
   unlinkSync(archivePath);
   unlinkSync(metadataPath);
 
-  // 6. Start daemon + gateway (same as wake)
-  await startLocalDaemon();
+  // 7. Start daemon + gateway (same as wake)
+  await startLocalDaemon(false, entry.resources);
   if (!process.env.VELLUM_DESKTOP_APP) {
-    await startGateway();
+    await startGateway(undefined, false, entry.resources);
   }
 
   console.log(`✅ Recovered assistant '${name}'.`);

package/src/commands/retire.ts

@@ -4,13 +4,13 @@ import { homedir } from "os";
 import { basename, dirname, join } from "path";
 
 import {
-  defaultLocalResources,
   findAssistantByName,
   loadAllAssistants,
   removeAssistantEntry,
 } from "../lib/assistant-config";
 import type { AssistantEntry } from "../lib/assistant-config";
 import { retireInstance as retireAwsInstance } from "../lib/aws";
+import { retireDocker } from "../lib/docker";
 import { retireInstance as retireGcpInstance } from "../lib/gcp";
 import {
   stopOrphanedDaemonProcesses,
@@ -45,22 +45,20 @@ function extractHostFromUrl(url: string): string {
 async function retireLocal(name: string, entry: AssistantEntry): Promise<void> {
   console.log("\u{1F5D1}\ufe0f  Stopping local assistant...\n");
 
-  // Use entry resources when available; for legacy entries, derive paths
-  // from baseDataDir (which may differ from homedir if BASE_DATA_DIR was set).
-  const resources = entry.resources ?? defaultLocalResources();
-  const legacyDir = entry.baseDataDir;
-  const vellumDir = legacyDir ?? join(resources.instanceDir, ".vellum");
+  if (!entry.resources) {
+    throw new Error(
+      `Local assistant '${name}' is missing resource configuration. Re-hatch to fix.`,
+    );
+  }
+  const resources = entry.resources;
+  const vellumDir = join(resources.instanceDir, ".vellum");
 
   // Check whether another local assistant shares the same data directory.
-  // Legacy entries without `resources` all resolve to ~/.vellum/ — if we
-  // blindly kill processes and archive the directory, we'd destroy the
-  // other assistant's running daemon and data.
   const otherSharesDir = loadAllAssistants().some((other) => {
     if (other.cloud !== "local") return false;
     if (other.assistantId === name) return false;
-    const otherVellumDir =
-      other.baseDataDir ??
-      join((other.resources ?? defaultLocalResources()).instanceDir, ".vellum");
+    if (!other.resources) return false;
+    const otherVellumDir = join(other.resources.instanceDir, ".vellum");
     return otherVellumDir === vellumDir;
   });
 
@@ -72,17 +70,8 @@ async function retireLocal(name: string, entry: AssistantEntry): Promise<void> {
     return;
   }
 
-  // Stop daemon via PID file — prefer resources paths, but for legacy entries
-  // with a custom baseDataDir, derive from that directory instead.
-  const daemonPidFile = legacyDir
-    ? join(legacyDir, "vellum.pid")
-    : resources.pidFile;
-  const socketFile = legacyDir
-    ? join(legacyDir, "vellum.sock")
-    : resources.socketPath;
-  const daemonStopped = await stopProcessByPidFile(daemonPidFile, "daemon", [
-    socketFile,
-  ]);
+  const daemonPidFile = resources.pidFile;
+  const daemonStopped = await stopProcessByPidFile(daemonPidFile, "daemon");
 
   // Stop gateway via PID file — use a longer timeout because the gateway has a
   // configurable drain window (GATEWAY_SHUTDOWN_DRAIN_MS, default 5s) before it exits.
@@ -286,6 +275,8 @@ async function retireInner(): Promise<void> {
       process.exit(1);
     }
     await retireAwsInstance(name, region, source);
+  } else if (cloud === "docker") {
+    await retireDocker(name);
   } else if (cloud === "local") {
     await retireLocal(name, entry);
   } else if (cloud === "custom") {

package/src/commands/sleep.ts

@@ -1,15 +1,50 @@
+import { existsSync, readFileSync } from "fs";
 import { join } from "path";
 
-import {
-  defaultLocalResources,
-  resolveTargetAssistant,
-} from "../lib/assistant-config.js";
-import { stopProcessByPidFile } from "../lib/process";
+import { resolveTargetAssistant } from "../lib/assistant-config.js";
+import type { AssistantEntry } from "../lib/assistant-config.js";
+import { isProcessAlive, stopProcessByPidFile } from "../lib/process";
+
+const ACTIVE_CALL_LEASES_FILE = "active-call-leases.json";
+
+type ActiveCallLease = {
+  callSessionId: string;
+};
+
+function getAssistantRootDir(entry: AssistantEntry): string {
+  if (!entry.resources) {
+    throw new Error(
+      `Local assistant '${entry.assistantId}' is missing resource configuration. Re-hatch to fix.`,
+    );
+  }
+  return join(entry.resources.instanceDir, ".vellum");
+}
+
+function readActiveCallLeases(vellumDir: string): ActiveCallLease[] {
+  const path = join(vellumDir, ACTIVE_CALL_LEASES_FILE);
+  if (!existsSync(path)) {
+    return [];
+  }
+
+  const raw = JSON.parse(readFileSync(path, "utf-8")) as {
+    version?: number;
+    leases?: Array<{ callSessionId?: unknown }>;
+  };
+  if (raw.version !== 1 || !Array.isArray(raw.leases)) {
+    throw new Error(`Invalid active call lease file at ${path}`);
+  }
+
+  return raw.leases.filter(
+    (lease): lease is ActiveCallLease =>
+      typeof lease?.callSessionId === "string" &&
+      lease.callSessionId.length > 0,
+  );
+}
 
 export async function sleep(): Promise<void> {
   const args = process.argv.slice(3);
   if (args.includes("--help") || args.includes("-h")) {
-    console.log("Usage: vellum sleep [<name>]");
+    console.log("Usage: vellum sleep [<name>] [--force]");
     console.log("");
     console.log("Stop the assistant and gateway processes.");
     console.log("");
@@ -17,9 +52,15 @@ export async function sleep(): Promise<void> {
     console.log(
       "  <name>    Name of the assistant to stop (default: active or only local)",
     );
+    console.log("");
+    console.log("Options:");
+    console.log(
+      "  --force   Stop the assistant even if a phone call keepalive lease is active",
+    );
     process.exit(0);
   }
 
+  const force = args.includes("--force");
   const nameArg = args.find((a) => !a.startsWith("-"));
   const entry = resolveTargetAssistant(nameArg);
 
@@ -30,18 +71,49 @@ export async function sleep(): Promise<void> {
     process.exit(1);
   }
 
-  const resources = entry.resources ?? defaultLocalResources();
-
-  const daemonPidFile = resources.pidFile;
-  const socketFile = resources.socketPath;
-  const vellumDir = join(resources.instanceDir, ".vellum");
+  if (!entry.resources) {
+    console.error(
+      `Error: Local assistant '${entry.assistantId}' is missing resource configuration. Re-hatch to fix.`,
+    );
+    process.exit(1);
+  }
+  const resources = entry.resources;
+  const assistantPidFile = resources.pidFile;
+  const vellumDir = getAssistantRootDir(entry);
   const gatewayPidFile = join(vellumDir, "gateway.pid");
 
-  // Stop daemon
-  const daemonStopped = await stopProcessByPidFile(daemonPidFile, "daemon", [
-    socketFile,
-  ]);
-  if (!daemonStopped) {
+  if (!force) {
+    const assistantAlive = isProcessAlive(assistantPidFile).alive;
+    if (assistantAlive) {
+      try {
+        const activeCallLeases = readActiveCallLeases(vellumDir);
+        if (activeCallLeases.length > 0) {
+          const activeIds = activeCallLeases.map(
+            (lease) => lease.callSessionId,
+          );
+          console.error(
+            `Error: assistant is staying awake for active phone calls (${activeIds.join(
+              ", ",
+            )}). Use 'vellum sleep --force' to stop it anyway.`,
+          );
+          process.exit(1);
+        }
+      } catch (err) {
+        console.error(
+          `Error: ${
+            err instanceof Error ? err.message : String(err)
+          }. Use 'vellum sleep --force' to override if you want to stop the assistant anyway.`,
+        );
+        process.exit(1);
+      }
+    }
+  }
+
+  const assistantStopped = await stopProcessByPidFile(
+    assistantPidFile,
+    "assistant",
+  );
+  if (!assistantStopped) {
     console.log("Assistant is not running.");
   } else {
     console.log("Assistant stopped.");

package/src/commands/wake.ts

@@ -1,10 +1,7 @@
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
 
-import {
-  defaultLocalResources,
-  resolveTargetAssistant,
-} from "../lib/assistant-config.js";
+import { resolveTargetAssistant } from "../lib/assistant-config.js";
 import { isProcessAlive, stopProcessByPidFile } from "../lib/process";
 import { startLocalDaemon, startGateway } from "../lib/local";
 
@@ -38,10 +35,15 @@ export async function wake(): Promise<void> {
     process.exit(1);
   }
 
-  const resources = entry.resources ?? defaultLocalResources();
+  if (!entry.resources) {
+    console.error(
+      `Error: Local assistant '${entry.assistantId}' is missing resource configuration. Re-hatch to fix.`,
+    );
+    process.exit(1);
+  }
+  const resources = entry.resources;
 
   const pidFile = resources.pidFile;
-  const socketFile = resources.socketPath;
 
   // Check if daemon is already running
   let daemonRunning = false;
@@ -57,7 +59,7 @@ export async function wake(): Promise<void> {
           console.log(
             `Assistant running (pid ${pid}) — restarting in watch mode...`,
           );
-          await stopProcessByPidFile(pidFile, "assistant", [socketFile]);
+          await stopProcessByPidFile(pidFile, "assistant");
           daemonRunning = false;
         } else {
           console.log(`Assistant already running (pid ${pid}).`);