@otto-code/cli 0.5.7 → 0.6.0

package/dist/commands/daemon/local-daemon.js

@@ -76,6 +76,45 @@ function buildChildEnv(options) {
     }
     return childEnv;
 }
+// A packaged desktop build runs this CLI on the Electron binary
+// (`process.execPath` is e.g. /opt/Otto/Otto). Spawning the daemon through that
+// binary then needs two things the plain-Node path doesn't:
+//   1. ELECTRON_RUN_AS_NODE=1 — otherwise the binary boots as the Otto GUI/CLI
+//      (commander) and rejects the daemon entry as an "unknown command".
+//   2. The unpacked node-entrypoint-runner — the supervisor entry resolves to a
+//      path inside app.asar, which can't be the direct entry under
+//      ELECTRON_RUN_AS_NODE, so it must be loaded via the runner (mirroring the
+//      desktop daemon-manager: `<runner> node-script <entry>`).
+// Outside a packaged Electron binary (dev, or a plain-node CLI), neither applies
+// and we spawn the entry directly. Returns null when not applicable.
+function resolvePackagedNodeEntrypointRunner(daemonRunnerEntry) {
+    if (!process.versions.electron) {
+        return null;
+    }
+    const marker = `${path.sep}node_modules${path.sep}@otto-code${path.sep}server${path.sep}`;
+    const markerIndex = daemonRunnerEntry.lastIndexOf(marker);
+    if (markerIndex === -1) {
+        return null;
+    }
+    const appRoot = daemonRunnerEntry.slice(0, markerIndex);
+    const runnerPath = path.join(appRoot, "dist", "daemon", "node-entrypoint-runner.js");
+    return existsSync(runnerPath) ? runnerPath : null;
+}
+function buildDaemonSpawnInvocation(daemonRunnerEntry, runnerArgs, childEnv) {
+    const packagedRunner = resolvePackagedNodeEntrypointRunner(daemonRunnerEntry);
+    if (packagedRunner) {
+        return {
+            command: process.execPath,
+            args: [packagedRunner, "node-script", daemonRunnerEntry, ...runnerArgs],
+            env: { ...childEnv, ELECTRON_RUN_AS_NODE: "1" },
+        };
+    }
+    return {
+        command: process.execPath,
+        args: [...process.execArgv, daemonRunnerEntry, ...runnerArgs],
+        env: childEnv,
+    };
+}
 function resolveServerRunnerFromDir(currentDir) {
     const packageJsonPath = path.join(currentDir, "package.json");
     if (!existsSync(packageJsonPath))
@@ -411,10 +450,11 @@ export async function startLocalDaemonDetached(options, runtime = defaultDaemonL
     const childEnv = buildChildEnv(options);
     const ottoHome = runtime.resolveHome(childEnv);
     const logPath = path.join(ottoHome, DAEMON_LOG_FILENAME);
-    const child = runtime.spawnDetached(process.execPath, [...process.execArgv, daemonRunnerEntry, ...buildRunnerArgs(options)], {
+    const invocation = buildDaemonSpawnInvocation(daemonRunnerEntry, buildRunnerArgs(options), childEnv);
+    const child = runtime.spawnDetached(invocation.command, invocation.args, {
         detached: true,
         envMode: "internal",
-        env: childEnv,
+        env: invocation.env,
         stdio: ["ignore", "ignore", "ignore"],
     });
     child.unref();
@@ -459,8 +499,9 @@ export function startLocalDaemonForeground(options, runtime = defaultDaemonLaunc
     }
     const daemonRunnerEntry = runtime.resolveRunnerEntry();
     const childEnv = buildChildEnv(options);
-    const result = runtime.spawnForeground(process.execPath, [...process.execArgv, daemonRunnerEntry, ...buildRunnerArgs(options)], {
-        env: childEnv,
+    const invocation = buildDaemonSpawnInvocation(daemonRunnerEntry, buildRunnerArgs(options), childEnv);
+    const result = runtime.spawnForeground(invocation.command, invocation.args, {
+        env: invocation.env,
         stdio: "inherit",
     });
     if (result.error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otto-code/cli",
-  "version": "0.5.7",
+  "version": "0.6.0",
   "description": "Otto CLI - control your AI coding agents from the command line",
   "bin": {
     "otto": "bin/otto"
@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@otto-code/client": "0.5.7",
-    "@otto-code/protocol": "0.5.7",
-    "@otto-code/server": "0.5.7",
+    "@otto-code/client": "0.6.0",
+    "@otto-code/protocol": "0.6.0",
+    "@otto-code/server": "0.6.0",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",