@vellumai/cli 0.4.20 → 0.4.22

package/package.json

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

package/src/lib/local.ts

@@ -14,7 +14,7 @@ import { dirname, join } from "path";
 import { loadLatestAssistant } from "./assistant-config.js";
 import { GATEWAY_PORT } from "./constants.js";
 import { stopProcessByPidFile } from "./process.js";
-import { openLogFile, closeLogFile } from "./xdg-log.js";
+import { openLogFile, pipeToLogFile } from "./xdg-log.js";
 
 const _require = createRequire(import.meta.url);
 
@@ -513,20 +513,16 @@ export async function startLocalDaemon(): Promise<void> {
         }
       }
 
-      const daemonLogFd = openLogFile("daemon.log");
-      let daemonPid: number | undefined;
-      try {
-        const child = spawn(daemonBinary, [], {
-          cwd: dirname(daemonBinary),
-          detached: true,
-          stdio: ["ignore", daemonLogFd, daemonLogFd],
-          env: daemonEnv,
-        });
-        child.unref();
-        daemonPid = child.pid;
-      } finally {
-        closeLogFile(daemonLogFd);
-      }
+      const daemonLogFd = openLogFile("hatch.log");
+      const child = spawn(daemonBinary, [], {
+        cwd: dirname(daemonBinary),
+        detached: true,
+        stdio: ["ignore", "pipe", "pipe"],
+        env: daemonEnv,
+      });
+      pipeToLogFile(child, daemonLogFd, "daemon");
+      child.unref();
+      const daemonPid = child.pid;
 
       // Write PID file immediately so the health monitor can find the process
       // and concurrent hatch() calls see it as alive.
@@ -691,30 +687,24 @@ export async function startGateway(assistantId?: string): Promise<string> {
       );
     }
 
-    const gatewayLogFd = openLogFile("gateway.log");
-    try {
-      gateway = spawn(gatewayBinary, [], {
-        detached: true,
-        stdio: ["ignore", gatewayLogFd, gatewayLogFd],
-        env: gatewayEnv,
-      });
-    } finally {
-      closeLogFile(gatewayLogFd);
-    }
+    const gatewayLogFd = openLogFile("hatch.log");
+    gateway = spawn(gatewayBinary, [], {
+      detached: true,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: gatewayEnv,
+    });
+    pipeToLogFile(gateway, gatewayLogFd, "gateway");
   } else {
     // Source tree / bunx: resolve the gateway source directory and run via bun.
     const gatewayDir = resolveGatewayDir();
-    const gwLogFd = openLogFile("gateway.log");
-    try {
-      gateway = spawn("bun", ["run", "src/index.ts", "--vellum-gateway"], {
-        cwd: gatewayDir,
-        detached: true,
-        stdio: ["ignore", gwLogFd, gwLogFd],
-        env: gatewayEnv,
-      });
-    } finally {
-      closeLogFile(gwLogFd);
-    }
+    const gwLogFd = openLogFile("hatch.log");
+    gateway = spawn("bun", ["run", "src/index.ts", "--vellum-gateway"], {
+      cwd: gatewayDir,
+      detached: true,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: gatewayEnv,
+    });
+    pipeToLogFile(gateway, gwLogFd, "gateway");
   }
 
   gateway.unref();

package/src/lib/xdg-log.ts

@@ -1,4 +1,5 @@
 import { closeSync, mkdirSync, openSync, writeSync } from "fs";
+import type { ChildProcess } from "child_process";
 import { homedir } from "os";
 import { join } from "path";
 
@@ -35,3 +36,39 @@ export function writeToLogFile(fd: number | "ignore", msg: string): void {
     try { writeSync(fd, msg); } catch { /* best-effort */ }
   }
 }
+
+/** Pipe a child process's stdout/stderr to a shared log file descriptor,
+ *  prefixing each line with a tag (e.g. "[daemon]" or "[gateway]").
+ *  Streams are unref'd so they don't prevent the parent from exiting.
+ *  The fd is closed automatically when both streams end. */
+export function pipeToLogFile(child: ChildProcess, fd: number | "ignore", tag: string): void {
+  if (fd === "ignore") return;
+  const numFd: number = fd;
+  const tagLabel = `[${tag}]`;
+  const streams = [child.stdout, child.stderr].filter(Boolean);
+  let ended = 0;
+
+  function onDone() {
+    ended++;
+    if (ended >= streams.length) {
+      try { closeSync(numFd); } catch { /* best-effort */ }
+    }
+  }
+
+  for (const stream of streams) {
+    if (!stream) continue;
+    (stream as NodeJS.ReadableStream & { unref?: () => void }).unref?.();
+    stream.on("data", (chunk: Buffer) => {
+      const text = chunk.toString();
+      const lines = text.split("\n");
+      for (let i = 0; i < lines.length; i++) {
+        if (i === lines.length - 1 && lines[i] === "") break;
+        const nl = i < lines.length - 1 ? "\n" : "";
+        const prefix = `${new Date().toISOString()} ${tagLabel} `;
+        try { writeSync(numFd, prefix + lines[i] + nl); } catch { /* best-effort */ }
+      }
+    });
+    stream.on("end", onDone);
+    stream.on("error", onDone);
+  }
+}