@magclaw/cli-core 0.1.25 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magclaw/cli-core",
-  "version": "0.1.25",
+  "version": "0.1.27",
   "description": "Shared local MagClaw CLI implementation used by daemon and computer packages.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -785,17 +785,66 @@ export function selectRuntimeCommandPath(output, fallback = '', platform = proce
     .sort((left, right) => left.score - right.score || left.index - right.index)[0]?.file || paths[0];
 }
 
+function homeDirForEnv(env = process.env) {
+  return String(env.HOME || env.USERPROFILE || os.homedir() || '').trim();
+}
+
+function uniquePathEntries(entries = []) {
+  const seen = new Set();
+  const result = [];
+  for (const entry of entries) {
+    const value = String(entry || '').trim();
+    if (!value) continue;
+    const key = durablePathKey(value);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    result.push(value);
+  }
+  return result;
+}
+
+export function runtimeSearchPathEntries(env = process.env) {
+  const home = homeDirForEnv(env);
+  const userEntries = home ? [
+    path.join(home, '.local', 'bin'),
+    path.join(home, 'bin'),
+    path.join(home, '.npm-global', 'bin'),
+    path.join(home, '.volta', 'bin'),
+    path.join(home, '.bun', 'bin'),
+    process.platform === 'win32' ? path.join(home, 'AppData', 'Roaming', 'npm') : '',
+  ] : [];
+  const platformEntries = process.platform === 'darwin'
+    ? ['/opt/homebrew/bin', '/opt/homebrew/sbin', '/usr/local/bin', '/usr/local/sbin']
+    : process.platform === 'win32'
+      ? []
+      : ['/usr/local/bin', '/usr/local/sbin'];
+  return uniquePathEntries([
+    ...pathDirs(env),
+    env.NVM_BIN,
+    env.VOLTA_HOME ? path.join(env.VOLTA_HOME, 'bin') : '',
+    env.BUN_INSTALL ? path.join(env.BUN_INSTALL, 'bin') : '',
+    path.dirname(process.execPath),
+    ...userEntries,
+    ...platformEntries,
+  ]);
+}
+
+function runtimeDetectionEnv(env = process.env) {
+  return {
+    ...env,
+    PATH: runtimeSearchPathEntries(env).join(path.delimiter),
+  };
+}
+
 function commandExists(command, env = process.env) {
+  const runtimeEnv = runtimeDetectionEnv(env);
   const checker = process.platform === 'win32' ? 'where' : 'command';
   const args = process.platform === 'win32' ? [command] : ['-v', command];
   const result = process.platform === 'win32'
-    ? commandOutput(checker, args, { env, timeoutMs: 1500 })
-    : commandOutput('/bin/sh', ['-lc', `command -v ${JSON.stringify(command)}`], { env, timeoutMs: 1500 });
+    ? commandOutput(checker, args, { env: runtimeEnv, timeoutMs: 1500 })
+    : commandOutput('/bin/sh', ['-lc', `command -v ${JSON.stringify(command)}`], { env: runtimeEnv, timeoutMs: 1500 });
   if (result.ok) return selectRuntimeCommandPath(result.stdout, command);
-  for (const candidate of [
-    path.join(path.dirname(process.execPath), command),
-    path.join(os.homedir(), '.local', 'bin', command),
-  ]) {
+  for (const candidate of runtimeSearchPathEntries(runtimeEnv).map((dir) => path.join(dir, command))) {
     if (existsSync(candidate)) return candidate;
   }
   return '';
@@ -1046,13 +1095,15 @@ async function tryInstallCliShim(options = {}, env = process.env) {
 }
 
 function runtimeVersion(command, env = process.env) {
-  const result = commandOutput(command, ['--version'], { env, timeoutMs: 3000 });
+  const runtimeEnv = runtimeDetectionEnv(env);
+  const result = commandOutput(command, ['--version'], { env: runtimeEnv, timeoutMs: 3000 });
   if (!result.ok && result.error?.code === 'ENOENT') return '';
   return result.stdout || result.stderr || '';
 }
 
 function codexAppServerCapable(command, env = process.env) {
-  const result = commandOutput(command, ['app-server', '--help'], { env, timeoutMs: 3000 });
+  const runtimeEnv = runtimeDetectionEnv(env);
+  const result = commandOutput(command, ['app-server', '--help'], { env: runtimeEnv, timeoutMs: 3000 });
   if (result.error?.code === 'ENOENT') return false;
   if (result.ok) return true;
   const output = `${result.stdout}\n${result.stderr}`.toLowerCase();
@@ -1060,6 +1111,7 @@ function codexAppServerCapable(command, env = process.env) {
 }
 
 function defaultCodexCommand(env = process.env) {
+  const runtimeEnv = runtimeDetectionEnv(env);
   const macAppBinary = '/Applications/Codex.app/Contents/Resources/codex';
   const candidates = [env.CODEX_PATH, env.MAGCLAW_CODEX_PATH, macAppBinary, 'codex']
     .map((item) => String(item || '').trim())
@@ -1067,9 +1119,9 @@ function defaultCodexCommand(env = process.env) {
   for (const candidate of [...new Set(candidates)]) {
     const command = runtimeCommandHasPathSeparator(candidate)
       ? candidate
-      : commandExists(candidate, env) || candidate;
+      : commandExists(candidate, runtimeEnv) || candidate;
     if (runtimeCommandHasPathSeparator(command) && !existsSync(command)) continue;
-    const result = commandOutput(command, ['--version'], { env, timeoutMs: 3000 });
+    const result = commandOutput(command, ['--version'], { env: runtimeEnv, timeoutMs: 3000 });
     if (result.ok) return command;
   }
   return candidates[0] || 'codex';
@@ -1088,7 +1140,7 @@ function codexRuntimeModels(command, env = process.env) {
     reasoningEffort: ['low', 'medium', 'high', 'xhigh'],
     defaultReasoningEffort: 'medium',
   };
-  const result = commandOutput(command, ['debug', 'models'], { env, timeoutMs: 5000 });
+  const result = commandOutput(command, ['debug', 'models'], { env: runtimeDetectionEnv(env), timeoutMs: 5000 });
   if (!result.ok) return fallback;
   try {
     const data = JSON.parse(result.stdout || '{}');
@@ -1121,14 +1173,15 @@ function codexRuntimeModels(command, env = process.env) {
 }
 
 export async function detectRuntimes(env = process.env) {
-  const codexCommand = defaultCodexCommand(env);
+  const runtimeEnv = runtimeDetectionEnv(env);
+  const codexCommand = defaultCodexCommand(runtimeEnv);
   const candidates = [
     {
       id: 'codex',
       name: 'Codex CLI',
       command: codexCommand,
       createSupported: true,
-      modelsFor: (command) => codexRuntimeModels(command, env),
+      modelsFor: (command) => codexRuntimeModels(command, runtimeEnv),
     },
     {
       id: 'claude-code',
@@ -1180,10 +1233,10 @@ export async function detectRuntimes(env = process.env) {
     },
   ];
   return candidates.map((item) => {
-    const pathValue = runtimeCommandHasPathSeparator(item.command) ? (existsSync(item.command) ? item.command : '') : commandExists(item.command, env);
+    const pathValue = runtimeCommandHasPathSeparator(item.command) ? (existsSync(item.command) ? item.command : '') : commandExists(item.command, runtimeEnv);
     const runtimeCommand = pathValue || item.command;
     const installed = Boolean(pathValue);
-    const version = installed ? runtimeVersion(runtimeCommand, env) : '';
+    const version = installed ? runtimeVersion(runtimeCommand, runtimeEnv) : '';
     const modelInfo = installed && item.modelsFor ? item.modelsFor(runtimeCommand) : {
       models: item.models || [],
       modelNames: (item.models || []).map((model) => ({ slug: model, name: model })),
@@ -1199,7 +1252,7 @@ export async function detectRuntimes(env = process.env) {
       installed,
       version,
       createSupported: item.createSupported !== false,
-      appServer: item.id === 'codex' && installed ? codexAppServerCapable(runtimeCommand, env) : false,
+      appServer: item.id === 'codex' && installed ? codexAppServerCapable(runtimeCommand, runtimeEnv) : false,
       ...modelInfo,
     };
   });
@@ -3520,14 +3573,15 @@ class MagClawDaemon {
     const commandId = String(message.commandId || '').trim();
     const service = await readServiceState(this.paths.profile, this.env);
     const serviceStatus = backgroundServiceStatus(this.paths.profile, this.env);
+    const serviceRunMode = daemonServiceRunMode(service, serviceStatus);
     const packageInfo = runtimePackageInfo(this.env, service);
     const runMode = {
-      mode: service.mode || serviceStatus.mode || 'foreground',
-      background: Boolean(service.background),
-      active: Boolean(serviceStatus.active),
-      label: serviceStatus.label || '',
-      serviceName: serviceStatus.serviceName || '',
-      taskName: serviceStatus.taskName || '',
+      mode: serviceRunMode.mode,
+      background: serviceRunMode.background,
+      active: serviceRunMode.active,
+      label: serviceRunMode.background ? serviceStatus.label || '' : '',
+      serviceName: serviceRunMode.background ? serviceStatus.serviceName || '' : '',
+      taskName: serviceRunMode.background ? serviceStatus.taskName || '' : '',
       packageName: packageInfo.name,
       packageVersion: packageInfo.version,
       packageKind: packageInfo.kind,
@@ -3550,8 +3604,15 @@ class MagClawDaemon {
       service: runMode,
       at: now(),
     });
-    const background = stopBackground(this.paths.profile, this.env, { disable: message.disableBackground !== false });
-    logInfo('daemon', `Close request stopped background service mode=${background.mode || 'foreground'} ok=${Boolean(background.ok)}.`);
+    const shouldStopBackground = Boolean(runMode.background);
+    const background = shouldStopBackground
+      ? stopBackground(this.paths.profile, this.env, { disable: message.disableBackground !== false })
+      : { ok: true, mode: runMode.mode || 'foreground', skipped: true };
+    if (shouldStopBackground) {
+      logInfo('daemon', `Close request stopped background service mode=${background.mode || 'foreground'} ok=${Boolean(background.ok)}.`);
+    } else {
+      logInfo('daemon', 'Foreground close request did not stop background service.');
+    }
     this.close();
     process.exitCode = 0;
     setTimeout(() => process.exit(0), 50).unref?.();
@@ -3562,6 +3623,7 @@ class MagClawDaemon {
     const owner = await ensureMachineFingerprint(this.paths.profile, this.env);
     const service = await readServiceState(this.paths.profile, this.env);
     const serviceStatus = backgroundServiceStatus(this.paths.profile, this.env);
+    const serviceRunMode = daemonServiceRunMode(service, serviceStatus);
     const upgrade = await readUpgradeHandoff(this.paths.profile, this.env);
     const packageInfo = runtimePackageInfo(this.env, service);
     return {
@@ -3581,12 +3643,12 @@ class MagClawDaemon {
       packageBin: packageInfo.bin,
       cliCoreVersion: CLI_CORE_VERSION,
       service: {
-        mode: service.mode || serviceStatus.mode || 'foreground',
-        background: Boolean(service.background),
-        active: Boolean(serviceStatus.active),
-        label: serviceStatus.label || '',
-        serviceName: serviceStatus.serviceName || '',
-        taskName: serviceStatus.taskName || '',
+        mode: serviceRunMode.mode,
+        background: serviceRunMode.background,
+        active: serviceRunMode.active,
+        label: serviceRunMode.background ? serviceStatus.label || '' : '',
+        serviceName: serviceRunMode.background ? serviceStatus.serviceName || '' : '',
+        taskName: serviceRunMode.background ? serviceStatus.taskName || '' : '',
         launcher: service.launcher || '',
         packageSpec: service.packageSpec || packageInfo.spec || '',
         packageName: service.packageName || packageInfo.name,
@@ -4102,6 +4164,7 @@ class MagClawDaemon {
     await this.refreshConfigFromDisk();
     const service = await readServiceState(this.paths.profile, this.env);
     const serviceStatus = backgroundServiceStatus(this.paths.profile, this.env);
+    const serviceRunMode = daemonServiceRunMode(service, serviceStatus);
     const packageInfo = runtimePackageInfo(this.env, service);
     const url = toWebSocketUrl(this.config.serverUrl, {
       ...this.config,
@@ -4111,9 +4174,9 @@ class MagClawDaemon {
       packageSpec: packageInfo.spec,
       packageBin: packageInfo.bin,
       cliCoreVersion: CLI_CORE_VERSION,
-      serviceMode: service.mode || serviceStatus.mode || 'foreground',
-      serviceBackground: Boolean(service.background),
-      serviceActive: Boolean(serviceStatus.active),
+      serviceMode: serviceRunMode.mode,
+      serviceBackground: serviceRunMode.background,
+      serviceActive: serviceRunMode.active,
     });
     const requestModule = url.protocol === 'wss:' ? https : http;
     const requestUrl = new URL(url.href.replace(/^ws/, 'http'));
@@ -4261,6 +4324,10 @@ async function writeLauncher(profile, env = process.env) {
   const npmPath = commandExists('npm', env);
   const nodeDir = path.dirname(process.execPath);
   const npmDir = npmPath ? path.dirname(npmPath) : '';
+  const launchPathEntries = runtimeSearchPathEntries({
+    ...env,
+    PATH: [nodeDir, npmDir, env.PATH || '/usr/bin:/bin:/usr/sbin:/sbin'].filter(Boolean).join(path.delimiter),
+  });
   const commandMode = String(env.MAGCLAW_DAEMON_COMMAND_MODE || '').trim().toLowerCase();
   const useNpmLauncher = Boolean(npmPath) && !['local', 'local-repo', 'repo', 'source'].includes(commandMode);
   const launcher = path.join(paths.runDir, 'launcher.js');
@@ -4312,6 +4379,8 @@ async function writeLauncher(profile, env = process.env) {
     `const useNpmLauncher = ${JSON.stringify(useNpmLauncher)};`,
     `const nodeDir = ${JSON.stringify(nodeDir)};`,
     `const npmDir = ${JSON.stringify(npmDir)};`,
+    `const pathDelimiter = ${JSON.stringify(path.delimiter)};`,
+    `const launchPathEntries = ${JSON.stringify(launchPathEntries)};`,
     `const fallbackBin = ${JSON.stringify(fallbackBin)};`,
     `const profile = ${JSON.stringify(paths.profile)};`,
     `const daemonHome = ${JSON.stringify(daemonRoot(env))};`,
@@ -4334,7 +4403,7 @@ async function writeLauncher(profile, env = process.env) {
     "const args = useNpmLauncher",
     "  ? ['exec', '--yes', '--package', packageSpec, '--', packageBin, 'connect', '--profile', profile]",
     "  : [fallbackBin, 'connect', '--profile', profile];",
-    "const launchPath = [nodeDir, npmDir, process.env.PATH || '/usr/bin:/bin:/usr/sbin:/sbin'].filter(Boolean).join(':');",
+    "const launchPath = [...launchPathEntries, nodeDir, npmDir, process.env.PATH || '/usr/bin:/bin:/usr/sbin:/sbin'].filter(Boolean).join(pathDelimiter);",
     "const childEnv = {",
     "  ...process.env,",
     "  MAGCLAW_DAEMON_HOME: daemonHome,",
@@ -4536,6 +4605,15 @@ function backgroundServiceStatus(profile, env = process.env) {
   return { mode: 'foreground', active: false };
 }
 
+function daemonServiceRunMode(service = {}, serviceStatus = {}) {
+  const background = service.background === true;
+  return {
+    mode: background ? (service.mode || serviceStatus.mode || 'foreground') : 'foreground',
+    background,
+    active: background ? Boolean(serviceStatus.active) : false,
+  };
+}
+
 function launchctlResultIsNotLoaded(result) {
   const detail = String(result?.stderr || result?.stdout || '').toLowerCase();
   return detail.includes('no such process') || detail.includes('could not find service') || detail.includes('not found');
@@ -5270,6 +5348,7 @@ async function runComputerSetup(flags, env = process.env) {
     ...result,
     cli,
     computerId: config.computerId,
+    computerName: config.computerName || config.name || displayName,
     profile: config.profile,
     serverName: config.serverName,
     serverSlug: approved.serverSlug || serverSlug,