overlord-cli 0.2608231148.0 → 0.2608240740.0

package/dist/index.js

@@ -20809,6 +20809,9 @@ var init_pre_launch = __esm({
 });
 
 // src/terminal-launcher.ts
+function terminalOpenSpawnTimeoutMs(execution) {
+  return execution.terminal ? TERMINAL_OPEN_SPAWN_TIMEOUT_MS : void 0;
+}
 function shellQuote2(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -21126,11 +21129,14 @@ function resolveLaunchExecution({
   });
   return { command: full, args: [], useShell: true, terminal: launcher, display: full };
 }
+var TERMINAL_OPEN_SPAWN_TIMEOUT_MS, TERMINAL_OPEN_SPAWN_KILL_SIGNAL;
 var init_terminal_launcher = __esm({
   "src/terminal-launcher.ts"() {
     "use strict";
     init_project_tmp();
     init_terminal_launch_chord();
+    TERMINAL_OPEN_SPAWN_TIMEOUT_MS = 45e3;
+    TERMINAL_OPEN_SPAWN_KILL_SIGNAL = "SIGKILL";
   }
 });
 
@@ -21142,6 +21148,40 @@ function interactiveLoginShellInvocation(command, configuredShell = process.env.
   const shell = configuredShell?.trim() || "/bin/bash";
   return { command: shell, args: ["-ilc", command] };
 }
+function spawnSyncOptionsForLaunch({
+  cwd,
+  env,
+  timeoutMs
+}) {
+  return {
+    cwd,
+    env,
+    stdio: "inherit",
+    ...timeoutMs === void 0 ? {} : { timeout: timeoutMs, killSignal: TERMINAL_OPEN_SPAWN_KILL_SIGNAL }
+  };
+}
+function isSpawnSyncTimedOut(result) {
+  return result.error?.code === "ETIMEDOUT";
+}
+function terminalOpenTimeoutMessage({
+  terminal,
+  timeoutMs
+}) {
+  const seconds = Math.round(timeoutMs / 1e3);
+  return `osascript/Apple Event timed out after ${seconds}s while opening ${terminal}. The execution request failed so the runner can keep claiming. ${terminal} may still open after this timeout (orphan window).`;
+}
+function throwIfTerminalOpenTimedOut({
+  result,
+  execution
+}) {
+  if (!execution.terminal || !isSpawnSyncTimedOut(result)) return;
+  throw new Error(
+    terminalOpenTimeoutMessage({
+      terminal: execution.terminal,
+      timeoutMs: TERMINAL_OPEN_SPAWN_TIMEOUT_MS
+    })
+  );
+}
 function overlordLaunchEnv({
   backendUrl,
   missionId,
@@ -21573,16 +21613,15 @@ async function launchAgent({
     };
   }
   const { execution } = plan;
-  const shellInvocation = execution.useShell ? interactiveLoginShellInvocation(execution.command) : null;
-  const result = shellInvocation ? spawnSync3(shellInvocation.command, shellInvocation.args, {
-    cwd: options.workingDirectory,
-    env,
-    stdio: "inherit"
-  }) : spawnSync3(execution.command, execution.args, {
+  const timeoutMs = terminalOpenSpawnTimeoutMs(execution);
+  const spawnOptions = spawnSyncOptionsForLaunch({
     cwd: options.workingDirectory,
     env,
-    stdio: "inherit"
+    timeoutMs
   });
+  const shellInvocation = execution.useShell ? interactiveLoginShellInvocation(execution.command) : null;
+  const result = shellInvocation ? spawnSync3(shellInvocation.command, shellInvocation.args, spawnOptions) : spawnSync3(execution.command, execution.args, spawnOptions);
+  throwIfTerminalOpenTimedOut({ result, execution });
   return {
     plan,
     status: result.status,
@@ -22795,13 +22834,66 @@ function resolveOvldInvocation(argv = process.argv, execPath = process.execPath)
   }
   return { program: execPath, args: ["runner", "supervise"] };
 }
+function composeRunnerServicePath({
+  homeDir = os5.homedir()
+} = {}) {
+  const localBin = path33.join(homeDir, ".local", "bin");
+  const dirs = [...RUNNER_SERVICE_PATH_PREFIX_DIRS, localBin, ...RUNNER_SERVICE_SYSTEM_PATH_DIRS];
+  return [...new Set(dirs)].join(":");
+}
+function parseLaunchdProcessType(plist) {
+  const match = /<key>ProcessType<\/key>\s*<string>([^<]*)<\/string>/.exec(plist);
+  return match?.[1] ?? null;
+}
+function parseLaunchdEnvPath(plist) {
+  const match = /<key>PATH<\/key>\s*<string>([^<]*)<\/string>/.exec(plist);
+  return match?.[1] ?? null;
+}
+function inspectInstalledLaunchdPlist(plistPath) {
+  if (!existsSync28(plistPath)) return { processType: null, path: null };
+  try {
+    const plist = readFileSync19(plistPath, "utf8");
+    return {
+      processType: parseLaunchdProcessType(plist),
+      path: parseLaunchdEnvPath(plist)
+    };
+  } catch {
+    return { processType: null, path: null };
+  }
+}
+function runnerServiceReinstallHint({
+  installed,
+  publisher,
+  processType,
+  path: path36
+}) {
+  if (!installed) return null;
+  const hints = [];
+  if (publisher === "node") {
+    hints.push(
+      'This service is registered under "Node.js Foundation" because it runs the plain node binary. Reinstall it from the Overlord desktop app (or with the desktop app present) to re-register it under "Overlord".'
+    );
+  }
+  if (processType && processType !== LAUNCHD_PROCESS_TYPE) {
+    hints.push(
+      `This LaunchAgent is ProcessType=${processType}. App auto-update respawns the supervisor but does not rewrite ProcessType, so Apple Events to Terminal/iTerm stay App-Napped. Reinstall with \`ovld runner service install\` (or Desktop \u2192 Reinstall service) to switch to ${LAUNCHD_PROCESS_TYPE}.`
+    );
+  }
+  if (path36 !== void 0 && path36 !== composeRunnerServicePath()) {
+    hints.push(
+      "This LaunchAgent PATH is not the deterministic prefix (`/opt/homebrew/bin:/usr/local/bin:$HOME/.local/bin` plus system dirs). App auto-update respawns the supervisor but does not rewrite PATH, so Latch/`open`/agent binaries spawned by the service may be missing. Reinstall with `ovld runner service install` (or Desktop \u2192 Reinstall service) to apply it."
+    );
+  }
+  return hints.length > 0 ? hints.join(" ") : null;
+}
 function buildRunnerServiceEnv({
   backendUrl,
   overlordHome,
-  runAsElectronNode
+  runAsElectronNode,
+  homeDir
 }) {
   const env = {
-    PATH: process.env.PATH?.trim() || "/usr/local/bin:/usr/bin:/bin"
+    PATH: composeRunnerServicePath({ homeDir })
   };
   if (!isLoopbackBackendUrl(backendUrl)) env.OVERLORD_BACKEND_URL = backendUrl;
   const home = overlordHome?.trim() || process.env.OVLD_HOME?.trim();
@@ -22848,7 +22940,7 @@ ${envEntries}
   <key>StandardErrorPath</key>
   <string>${xmlEscape(path33.join(logDir, "runner-service.err.log"))}</string>
   <key>ProcessType</key>
-  <string>Background</string>
+  <string>${LAUNCHD_PROCESS_TYPE}</string>
 </dict>
 </plist>
 `;
@@ -22913,7 +23005,7 @@ function resolveServiceManager(platform2 = process.platform) {
   if (platform2 === "linux") return new SystemdUserManager();
   return null;
 }
-var execFileAsync, RUNNER_SERVICE_STATE_FILENAME, LAUNCHD_LABEL, SYSTEMD_UNIT_NAME, FALLBACK_POLL_INTERVAL_MS, LaunchdManager, SystemdUserManager;
+var execFileAsync, RUNNER_SERVICE_STATE_FILENAME, LAUNCHD_LABEL, SYSTEMD_UNIT_NAME, FALLBACK_POLL_INTERVAL_MS, LAUNCHD_PROCESS_TYPE, RUNNER_SERVICE_SYSTEM_PATH_DIRS, RUNNER_SERVICE_PATH_PREFIX_DIRS, LaunchdManager, SystemdUserManager;
 var init_runner_service = __esm({
   "src/runner-service.ts"() {
     "use strict";
@@ -22923,6 +23015,9 @@ var init_runner_service = __esm({
     LAUNCHD_LABEL = "io.overlord.runner";
     SYSTEMD_UNIT_NAME = "overlord-runner";
     FALLBACK_POLL_INTERVAL_MS = 5e3;
+    LAUNCHD_PROCESS_TYPE = "Interactive";
+    RUNNER_SERVICE_SYSTEM_PATH_DIRS = ["/usr/bin", "/bin", "/usr/sbin", "/sbin"];
+    RUNNER_SERVICE_PATH_PREFIX_DIRS = ["/opt/homebrew/bin", "/usr/local/bin"];
     LaunchdManager = class {
       kind = "launchd";
       identifier = LAUNCHD_LABEL;
@@ -24821,7 +24916,14 @@ async function runRunnerServiceCommand({
     const runState = await manager.status();
     const state = readRunnerServiceState();
     const publisher = process.platform !== "darwin" || !state.execProgram ? "unknown" : state.execProgram.includes(".app/Contents/MacOS/") ? "overlord" : "node";
-    const reinstallHint = runState.installed && publisher === "node" ? 'This service is registered under "Node.js Foundation" because it runs the plain node binary. Reinstall it from the Overlord desktop app (or with the desktop app present) to re-register it under "Overlord".' : null;
+    const inspected = manager.kind === "launchd" && runState.installed ? inspectInstalledLaunchdPlist(manager.unitPath()) : null;
+    const processType = inspected?.processType ?? null;
+    const reinstallHint = runnerServiceReinstallHint({
+      installed: runState.installed,
+      publisher,
+      processType,
+      ...inspected ? { path: inspected.path } : {}
+    });
     const payload = {
       supported: true,
       kind: manager.kind,
@@ -24837,6 +24939,8 @@ async function runRunnerServiceCommand({
       lastError: state.lastError,
       currentPollIntervalMs: state.currentPollIntervalMs,
       publisher,
+      processType,
+      path: inspected?.path ?? null,
       reinstallHint
     };
     if (json) printJson(payload);
@@ -24846,6 +24950,7 @@ async function runRunnerServiceCommand({
         Installed: runState.installed ? "yes" : "no",
         Running: runState.running,
         Publisher: publisher === "unknown" ? "(unknown)" : publisher,
+        ...processType ? { "Process type": processType } : {},
         Backend: state.backendUrl ?? "(unknown)",
         "Last heartbeat": state.lastHeartbeatAt ?? "(never)",
         "Last launched": state.lastLaunchedAt ?? "(never)",
@@ -24881,7 +24986,7 @@ Note: ${reinstallHint}`);
     if (json) printJson({ started: autoStart, ...runState });
     else
       console.log(
-        `Persistent runner installed (${manager.kind}) and ${autoStart ? "started" : "not started"}.`
+        `Persistent runner installed (${manager.kind}) and ${autoStart ? "started" : "not started"}.` + (manager.kind === "launchd" ? " Re-running install rewrites the LaunchAgent (ProcessType Interactive and PATH prefix); app auto-update respawns the process but does not rewrite the plist." : "")
       );
     return;
   }