colana 1.0.0-beta.67 → 1.0.0-beta.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "colana",
-  "version": "1.0.0-beta.67",
+  "version": "1.0.0-beta.69",
   "description": "Agent-First. Multiplied. Multi-agent command center for AI coding agents.",
   "type": "module",
   "main": "server/index.js",

package/server/pty-manager.js

@@ -873,6 +873,9 @@ export async function startPtyAgent(projectId, projectPath, task, options = {})
     }
   }
 
+  // Save bare binary name before full-path resolution (needed for spawn retry)
+  const bareBinary = binary;
+
   // On macOS/Linux, resolve the binary to a full path. node-pty's posix_spawnp
   // uses the spawned env's PATH, which may be stale if the CLI was installed
   // after the server started (e.g. via wizard). getCommandPath() calls `which`
@@ -1161,13 +1164,42 @@ export async function startPtyAgent(projectId, projectPath, task, options = {})
     binary = process.env.COMSPEC || 'cmd.exe';
   }
 
-  const shell = ptySpawnFn(binary, args, {
+  const spawnOpts = {
     name: 'xterm-256color',
     cols: options.cols || config.ptyDefaultCols,
     rows: options.rows || config.ptyDefaultRows,
     cwd: effectiveCwd,
-    env: spawnEnv
-  });
+    env: spawnEnv,
+  };
+
+  let shell;
+  try {
+    shell = ptySpawnFn(binary, args, spawnOpts);
+  } catch (spawnErr) {
+    // Windows uses cmd.exe wrapper (set above) — no retry needed
+    if (process.platform === 'win32') throw spawnErr;
+
+    // macOS/Linux: posix_spawnp can fail with full paths to npm-installed CLIs
+    // (symlinks to Node.js scripts with shebangs). Retry with progressively
+    // simpler strategies: bare binary name (uses spawnEnv PATH), then /bin/sh -c
+    // wrapper (shell handles shebang/symlink resolution natively).
+    const retries = [];
+    if (binary !== bareBinary) {
+      retries.push({ bin: bareBinary, a: args, label: `bare name '${bareBinary}'` });
+    }
+    const escaped = [bareBinary, ...args].map(s => `'${s.replace(/'/g, "'\\''")}'`).join(' ');
+    retries.push({ bin: '/bin/sh', a: ['-c', escaped], label: '/bin/sh -c wrapper' });
+
+    for (const r of retries) {
+      try {
+        console.warn(`[pty-manager] posix_spawnp failed with '${binary}', retrying with ${r.label}`);
+        shell = ptySpawnFn(r.bin, r.a, spawnOpts);
+        break;
+      } catch { /* try next strategy */ }
+    }
+
+    if (!shell) throw spawnErr; // All retries failed — throw original error
+  }
 
   // 4. Create PtySession, wire events
   const ptySession = new PtySession(session.id, shell, {