@ctrl-spc/cli 1.1.8 → 1.1.10

package/dist/launchd.js

@@ -126,11 +126,17 @@ export async function restartDaemon(home = homedir(), exec = defaultExec) {
         throw new Error(RESTART_FAILED_MESSAGE);
     const plistPath = writeDaemonPlist(home);
     try {
+        exec('launchctl', bootoutArgs(uid, plistPath));
+    }
+    catch {
+        // Already stopped or not loaded; bootstrap below covers both cases.
+    }
+    try {
+        exec('launchctl', bootstrapArgs(uid, plistPath));
         exec('launchctl', kickstartArgs(uid));
     }
     catch {
         try {
-            exec('launchctl', bootstrapArgs(uid, plistPath));
             exec('launchctl', kickstartArgs(uid));
         }
         catch {

package/dist/spawner.js

@@ -6,26 +6,31 @@ function isRemote(agentType) {
     return agentType === 'claude-code' || agentType === 'codex';
 }
 export function makeSpawner(deps) {
-    const timeoutMs = deps.readinessTimeoutMs ?? 10_000;
+    const timeoutMs = deps.readinessTimeoutMs ?? 45_000;
     const backoffMs = deps.retryBackoffMs ?? 30_000;
     const lastAttempt = new Map(); // requestId -> timestamp; in-memory back-off
     async function awaitReadiness(handle) {
         return new Promise((resolve) => {
             let buf = '';
+            let errBuf = '';
             let done = false;
-            const finish = (ok) => { if (!done) {
-                done = true;
-                clearTimeout(timer);
-                resolve(ok);
-            } };
+            const finish = (ready) => {
+                if (!done) {
+                    done = true;
+                    clearTimeout(timer);
+                    resolve({ ready, stdout: buf, stderr: errBuf });
+                }
+            };
             const timer = setTimeout(() => finish(false), timeoutMs);
             handle.stdout.on('data', (chunk) => {
                 buf += chunk.toString();
                 if (buf.includes(READINESS_REPLY))
                     finish(true);
             });
+            handle.stderr?.on('data', (chunk) => { errBuf += chunk.toString(); });
             handle.stdout.on('end', () => finish(buf.includes(READINESS_REPLY)));
             handle.stdout.on('error', () => finish(false));
+            handle.stderr?.on('error', () => { });
         });
     }
     async function resolveLocalPath(projectId) {
@@ -66,10 +71,10 @@ export function makeSpawner(deps) {
         }
         const { cmd, args } = assembleCommand(row);
         const handle = deps.spawnAgent(cmd, args, cwd);
-        const ready = await awaitReadiness(handle);
-        if (!ready) {
+        const result = await awaitReadiness(handle);
+        if (!result.ready) {
             handle.kill();
-            deps.log(`Readiness gate failed for ${row.id}; will retry`);
+            deps.log(`Readiness gate failed for ${row.id}; will retry. stdout=${quoteSnippet(result.stdout)} stderr=${quoteSnippet(result.stderr)}`);
             return;
         }
         await fulfil(row, handle.pid);
@@ -97,9 +102,18 @@ export function makeSpawner(deps) {
 }
 // Real spawn handle backed by node:child_process, used by the daemon (not in unit tests).
 export function nodeSpawnAgent(cmd, args, cwd) {
-    const child = spawn(cmd, args, { cwd, stdio: ['ignore', 'pipe', 'ignore'] });
+    const child = spawn(cmd, args, { cwd, stdio: ['ignore', 'pipe', 'pipe'] });
     const stdout = new PassThrough();
+    const stderr = new PassThrough();
     child.stdout?.pipe(stdout);
-    child.on('error', (err) => stdout.destroy(err));
-    return { pid: child.pid ?? -1, stdout, kill: () => child.kill() };
+    child.stderr?.pipe(stderr);
+    child.on('error', (err) => {
+        stdout.destroy(err);
+        stderr.end();
+    });
+    return { pid: child.pid ?? -1, stdout, stderr, kill: () => child.kill() };
+}
+function quoteSnippet(value) {
+    const trimmed = value.replace(/\s+/g, ' ').trim().slice(0, 500);
+    return JSON.stringify(trimmed);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl-spc/cli",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "Control Space CLI - machine setup and background daemon",
   "type": "module",
   "files": [