@ctrl-spc/cli 1.1.5 → 1.1.7

package/dist/launchd.js

@@ -17,7 +17,20 @@ export function getPlistPath(home = homedir()) {
 export function resolveBinPath(moduleUrl = import.meta.url) {
     return fileURLToPath(new URL('../bin/ctrl-spc.js', moduleUrl));
 }
-export function buildPlist(nodePath, scriptPath, home = homedir()) {
+export function buildDaemonPath(home = homedir(), envPath = process.env.PATH ?? '') {
+    const preferred = [
+        join(home, '.local', 'bin'),
+        '/opt/homebrew/bin',
+        '/usr/local/bin',
+        '/usr/bin',
+        '/bin',
+        '/usr/sbin',
+        '/sbin',
+        '/Applications/Codex.app/Contents/Resources',
+    ];
+    return [...new Set([...preferred, ...envPath.split(':').filter(Boolean)])].join(':');
+}
+export function buildPlist(nodePath, scriptPath, home = homedir(), daemonPath = buildDaemonPath(home)) {
     const { daemonLogPath } = getStatePaths(home);
     return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -35,6 +48,11 @@ export function buildPlist(nodePath, scriptPath, home = homedir()) {
   <true/>
   <key>KeepAlive</key>
   <true/>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>${escapeXml(daemonPath)}</string>
+  </dict>
   <key>StandardErrorPath</key>
   <string>${escapeXml(daemonLogPath)}</string>
   <key>StandardOutPath</key>
@@ -42,17 +60,21 @@ export function buildPlist(nodePath, scriptPath, home = homedir()) {
 </dict>
 </plist>`;
 }
-export async function installDaemon() {
-    const home = homedir();
+function writeDaemonPlist(home = homedir()) {
     const launchAgentsDir = join(home, 'Library', 'LaunchAgents');
     const plistPath = getPlistPath(home);
+    ensureStateDir(home);
+    mkdirSync(launchAgentsDir, { recursive: true });
+    writeFileSync(plistPath, buildPlist(process.execPath, resolveBinPath(), home), 'utf8');
+    return plistPath;
+}
+export async function installDaemon() {
+    const home = homedir();
     const uid = process.getuid?.();
     if (uid === undefined) {
         throw new Error(INSTALL_FAILED_MESSAGE);
     }
-    ensureStateDir(home);
-    mkdirSync(launchAgentsDir, { recursive: true });
-    writeFileSync(plistPath, buildPlist(process.execPath, resolveBinPath(), home), 'utf8');
+    const plistPath = writeDaemonPlist(home);
     const domain = `gui/${uid}`;
     try {
         try {
@@ -95,7 +117,7 @@ export async function restartDaemon(home = homedir(), exec = defaultExec) {
     const uid = process.getuid?.();
     if (uid === undefined)
         throw new Error(RESTART_FAILED_MESSAGE);
-    const plistPath = getPlistPath(home);
+    const plistPath = writeDaemonPlist(home);
     try {
         exec('launchctl', kickstartArgs(uid));
     }

package/dist/spawner.js

@@ -1,4 +1,5 @@
 import { spawn } from 'node:child_process';
+import { PassThrough } from 'node:stream';
 import { assembleCommand, READINESS_REPLY } from './flagAssembler.js';
 // agent_type -> spawn mode is derived, never stored (spec decision 8).
 function isRemote(agentType) {
@@ -97,5 +98,8 @@ 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'] });
-    return { pid: child.pid ?? -1, stdout: child.stdout, kill: () => child.kill() };
+    const stdout = new PassThrough();
+    child.stdout?.pipe(stdout);
+    child.on('error', (err) => stdout.destroy(err));
+    return { pid: child.pid ?? -1, stdout, kill: () => child.kill() };
 }

package/package.json

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