@lightcone-ai/daemon 0.23.7 → 0.23.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightcone-ai/daemon",
-  "version": "0.23.7",
+  "version": "0.23.9",
   "type": "module",
   "main": "src/index.js",
   "bin": {

package/src/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { spawn } from 'node:child_process';
-import { createWriteStream, existsSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
+import { closeSync, existsSync, openSync, readFileSync, readSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import os from 'node:os';
 import path from 'node:path';
@@ -20,9 +20,9 @@ function parseArgs(raw) {
   const opts = { _: [] };
   for (let i = 0; i < raw.length; i += 1) {
     const arg = raw[i];
-    if (arg.startsWith('--')) {
+    if (arg.startsWith('-') && arg !== '-') {
       const next = raw[i + 1];
-      if (next && !next.startsWith('--')) {
+      if (next !== undefined && !next.startsWith('-')) {
         opts[arg] = next;
         i += 1;
       } else {
@@ -45,7 +45,7 @@ function printUsage() {
   lightcone daemon status
   lightcone status
   lightcone doctor [--json]
-  lightcone logs [--lines 100]
+  lightcone logs [--lines 100] [-f|--follow]
 
 Notes:
   Use --code for normal onboarding, or --api-key for advanced/server installs.`);
@@ -121,16 +121,24 @@ function startDaemon({ foreground = false } = {}) {
   }
 
   const logPath = resolveDaemonLogPath();
-  const out = createWriteStream(logPath, { flags: 'a' });
-  const child = spawn(process.execPath, args, {
-    detached: true,
-    stdio: ['ignore', out, out],
-    env: {
-      ...process.env,
-      SERVER_URL: config.serverUrl,
-      MACHINE_API_KEY: config.machineApiKey,
-    },
-  });
+  // Open the log file synchronously and pass its numeric fd: a lazily-opened
+  // WriteStream still has fd=null when spawn() runs, which Node rejects as
+  // invalid stdio. The child inherits a dup, so the parent closes its copy.
+  const logFd = openSync(logPath, 'a');
+  let child;
+  try {
+    child = spawn(process.execPath, args, {
+      detached: true,
+      stdio: ['ignore', logFd, logFd],
+      env: {
+        ...process.env,
+        SERVER_URL: config.serverUrl,
+        MACHINE_API_KEY: config.machineApiKey,
+      },
+    });
+  } finally {
+    closeSync(logFd);
+  }
   child.unref();
   writeFileSync(resolveDaemonPidPath(), `${child.pid}\n`, 'utf8');
   console.log(`Daemon started pid=${child.pid}`);
@@ -165,6 +173,35 @@ function tailLogs(lines = 100) {
   console.log(raw.split(/\r?\n/).slice(-(Number.isFinite(count) && count > 0 ? count : 100)).join('\n'));
 }
 
+function followLogs(lines = 100) {
+  const logPath = resolveDaemonLogPath();
+  if (existsSync(logPath)) {
+    tailLogs(lines);
+  } else {
+    console.log(`Waiting for ${logPath} to appear ... (Ctrl+C to stop)`);
+  }
+  let offset = existsSync(logPath) ? statSync(logPath).size : 0;
+  setInterval(() => {
+    try {
+      if (!existsSync(logPath)) return;
+      const size = statSync(logPath).size;
+      if (size < offset) offset = 0; // truncated or rotated
+      if (size <= offset) return;
+      const fd = openSync(logPath, 'r');
+      try {
+        const buf = Buffer.alloc(size - offset);
+        readSync(fd, buf, 0, buf.length, offset);
+        process.stdout.write(buf.toString('utf8'));
+      } finally {
+        closeSync(fd);
+      }
+      offset = size;
+    } catch {
+      // transient fs errors during rotation — retry on next tick
+    }
+  }, 500);
+}
+
 async function main() {
   const opts = parseArgs(process.argv.slice(2));
   const [command, subcommand] = opts._;
@@ -226,7 +263,8 @@ async function main() {
   }
 
   if (command === 'logs') {
-    tailLogs(opts['--lines']);
+    if (opts['-f'] || opts['--follow']) followLogs(opts['--lines']);
+    else tailLogs(opts['--lines']);
     return;
   }
 

package/src/publish-job-runner.js

@@ -267,8 +267,11 @@ export function workspacePathFromMediaPath(filePath, workspaceId) {
   const virtualMatch = normalized.match(/^\/agent-workspace\/([^/]+)\/workspace\/(.+)$/);
   if (virtualMatch) return { workspaceId: virtualMatch[1], relPath: virtualMatch[2] };
 
+  // The workspace UUID may be followed by an optional per-agent dir segment
+  // — the daemon lays artifacts out under /workspace/<wsId>/<agentId>/artifacts/…
+  // — so strip it and keep the shared workspace relPath for materialization.
   const hostMatch = normalized.match(
-    /\/workspace\/([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})\/((?:artifacts|notes|tmp)\/.+)$/i
+    /\/workspace\/([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})\/(?:[0-9a-f-]{36}\/)?((?:artifacts|notes|tmp)\/.+)$/i
   );
   if (hostMatch) {
     return { workspaceId: hostMatch[1], relPath: hostMatch[2] };