@vellumai/cli 0.4.19 → 0.4.21

package/package.json

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

package/src/commands/retire.ts

@@ -7,7 +7,7 @@ import { findAssistantByName, removeAssistantEntry } from "../lib/assistant-conf
 import type { AssistantEntry } from "../lib/assistant-config";
 import { retireInstance as retireAwsInstance } from "../lib/aws";
 import { retireInstance as retireGcpInstance } from "../lib/gcp";
-import { stopProcessByPidFile } from "../lib/process";
+import { stopOrphanedDaemonProcesses, stopProcessByPidFile } from "../lib/process";
 import { getArchivePath, getMetadataPath } from "../lib/retire-archive";
 import { exec } from "../lib/step-runner";
 import { openLogFile, closeLogFile, writeToLogFile } from "../lib/xdg-log";
@@ -38,29 +38,20 @@ async function retireLocal(name: string, entry: AssistantEntry): Promise<void> {
   console.log("\u{1F5D1}\ufe0f  Stopping local daemon...\n");
 
   const vellumDir = join(homedir(), ".vellum");
-  const isDesktopApp = !!process.env.VELLUM_DESKTOP_APP;
 
   // Stop daemon via PID file
   const daemonPidFile = join(vellumDir, "vellum.pid");
   const socketFile = join(vellumDir, "vellum.sock");
-  await stopProcessByPidFile(daemonPidFile, "daemon", [socketFile]);
+  const daemonStopped = await stopProcessByPidFile(daemonPidFile, "daemon", [socketFile]);
 
   // Stop gateway via PID file
   const gatewayPidFile = join(vellumDir, "gateway.pid");
   await stopProcessByPidFile(gatewayPidFile, "gateway");
 
-  if (!isDesktopApp) {
-    // Non-desktop: also stop daemon via bunx (fallback)
-    try {
-      const child = spawn("bunx", ["vellum", "daemon", "stop"], {
-        stdio: "inherit",
-      });
-
-      await new Promise<void>((resolve) => {
-        child.on("close", () => resolve());
-        child.on("error", () => resolve());
-      });
-    } catch {}
+  // If the PID file didn't track a running daemon, scan for orphaned
+  // daemon processes that may have been started without writing a PID.
+  if (!daemonStopped) {
+    await stopOrphanedDaemonProcesses();
   }
 
   // Move ~/.vellum out of the way so the path is immediately available for the

package/src/lib/process.ts

@@ -144,3 +144,39 @@ export async function stopProcessByPidFile(
 
   return stopped;
 }
+
+/**
+ * Find and stop any vellum daemon processes that may not be tracked by a PID
+ * file. Scans `ps` output for the `vellum-daemon` binary name.
+ *
+ * Returns true if at least one process was stopped.
+ */
+export async function stopOrphanedDaemonProcesses(): Promise<boolean> {
+  let output: string;
+  try {
+    output = execFileSync("ps", ["-axww", "-o", "pid=,command="], {
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["ignore", "pipe", "ignore"],
+    });
+  } catch {
+    return false;
+  }
+
+  let stopped = false;
+  for (const line of output.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    const spaceIdx = trimmed.indexOf(" ");
+    if (spaceIdx === -1) continue;
+    const pid = parseInt(trimmed.slice(0, spaceIdx), 10);
+    if (isNaN(pid) || pid === process.pid) continue;
+    const cmd = trimmed.slice(spaceIdx + 1);
+
+    if (cmd.includes("vellum-daemon")) {
+      const result = await stopProcess(pid, "orphaned daemon");
+      if (result) stopped = true;
+    }
+  }
+  return stopped;
+}