colana 1.0.0-beta.65 → 1.0.0-beta.67

package/package.json

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

package/server/auto-installer.js

@@ -31,107 +31,155 @@ const MODULE = 'auto-installer';
  * standard binary directories and adds them to the running process's PATH,
  * allowing subsequent commandExistsSync / PTY spawns to find newly installed CLIs.
  *
+ * Windows: npm global dirs, Python scripts dirs, pipx/uv bin dirs, MS Store paths.
+ * macOS: /opt/homebrew/bin (Apple Silicon), /usr/local/bin, ~/.local/bin, npm global.
+ * Linux: /usr/local/bin, ~/.local/bin, ~/.cargo/bin, npm global.
+ *
  * Safe to call multiple times — skips directories already in PATH.
- * Safe to call on non-Windows — returns immediately.
  */
 export function refreshPathAfterInstall() {
-  if (process.platform !== 'win32') return;
+  const isWin = process.platform === 'win32';
+  const separator = isWin ? ';' : ':';
   const additions = [];
-  const currentPath = (process.env.PATH || '').toLowerCase();
+  const currentPath = process.env.PATH || '';
 
   /**
    * Helper: add a directory to PATH if it exists and isn't already present.
+   * Windows: case-insensitive substring check (existing behaviour).
+   * Unix: exact segment match (prevents /usr/local/bin matching /usr/local/bin2).
    * @param {string|undefined} dir
    */
   function addIfMissing(dir) {
     if (!dir) return;
     const trimmed = dir.trim();
-    if (trimmed && !currentPath.includes(trimmed.toLowerCase())) {
-      additions.push(trimmed);
+    if (!trimmed) return;
+    if (isWin) {
+      if (!currentPath.toLowerCase().includes(trimmed.toLowerCase())) {
+        additions.push(trimmed);
+      }
+    } else {
+      const segments = currentPath.split(':');
+      if (!segments.includes(trimmed)) {
+        additions.push(trimmed);
+      }
     }
   }
 
-  // 1. npm global bin directory via `npm config get prefix`
-  //    On Windows, global .cmd wrappers live directly in the prefix dir.
-  let npmPrefix = null;
-  try {
-    npmPrefix = execFileSync('npm', ['config', 'get', 'prefix'], {
-      timeout: 5000, encoding: 'utf-8', shell: true,
-    }).trim();
-    addIfMissing(npmPrefix);
-  } catch { /* npm might not be installed */ }
-
-  // 2. Standard %APPDATA%\npm — the default npm global bin dir on Windows.
-  //    Some Node.js installs (especially MS Store) don't add this to system PATH.
-  //    This is a hard-coded fallback that covers the most common case.
-  const appData = process.env.APPDATA;
-  if (appData) {
-    addIfMissing(`${appData}\\npm`);
-  }
+  if (isWin) {
+    // ——— Windows-specific directories ———
 
-  // 3. %LOCALAPPDATA%\npm — alternate npm global location on some setups
-  const localAppData = process.env.LOCALAPPDATA;
-  if (localAppData) {
-    addIfMissing(`${localAppData}\\npm`);
-  }
+    // 1. npm global bin directory via `npm config get prefix`
+    //    On Windows, global .cmd wrappers live directly in the prefix dir.
+    try {
+      const npmPrefix = execFileSync('npm', ['config', 'get', 'prefix'], {
+        timeout: 5000, encoding: 'utf-8', shell: true,
+      }).trim();
+      addIfMissing(npmPrefix);
+    } catch { /* npm might not be installed */ }
 
-  // 4. Python user scripts directory (for pip --user installs like aider)
-  // Use stdio: ['ignore','pipe','ignore'] to suppress SyntaxError spam from MS Store Python 3.13
-  try {
-    const pyScripts = execFileSync('python', [
-      '-c', "import sysconfig; print(sysconfig.get_path('scripts', 'nt_user'))",
-    ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
-    addIfMissing(pyScripts);
-  } catch { /* python might not be installed */ }
+    // 2. Standard %APPDATA%\npm — the default npm global bin dir on Windows.
+    const appData = process.env.APPDATA;
+    if (appData) {
+      addIfMissing(`${appData}\\npm`);
+    }
 
-  // 5. Python system scripts directory
-  try {
-    const sysScripts = execFileSync('python', [
-      '-c', "import sysconfig; print(sysconfig.get_path('scripts'))",
-    ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
-    addIfMissing(sysScripts);
-  } catch { /* ignore */ }
-
-  // 6. pipx default bin directory (%USERPROFILE%\.local\bin on Windows)
-  const userProfile = process.env.USERPROFILE;
-  if (userProfile) {
-    addIfMissing(`${userProfile}\\.local\\bin`);
-  }
+    // 3. %LOCALAPPDATA%\npm — alternate npm global location on some setups
+    const localAppData = process.env.LOCALAPPDATA;
+    if (localAppData) {
+      addIfMissing(`${localAppData}\\npm`);
+    }
 
-  // 7. uv tool bin directory (%USERPROFILE%\.local\\bin is shared; also check %APPDATA%\uv)
-  if (appData) {
-    addIfMissing(`${appData}\\uv\\bin`);
-  }
+    // 4. Python user scripts directory (for pip --user installs like aider)
+    try {
+      const pyScripts = execFileSync('python', [
+        '-c', "import sysconfig; print(sysconfig.get_path('scripts', 'nt_user'))",
+      ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+      addIfMissing(pyScripts);
+    } catch { /* python might not be installed */ }
 
-  // 8. npm global bin directory via `npm bin -g` — may differ from prefix on some setups
-  //    (e.g. nvm-windows, volta, fnm). This is the most reliable method.
-  try {
-    const npmBin = execFileSync('npm', ['bin', '-g'], {
-      timeout: 5000, encoding: 'utf-8', shell: true,
-    }).trim();
-    addIfMissing(npmBin);
-  } catch { /* ignore */ }
-
-  // 9. MS Store Python user scripts — site.getusersitepackages() returns the real
-  //    sandboxed path (e.g. ...\Packages\PythonSoftwareFoundation...\LocalCache\...),
-  //    unlike sysconfig which may return the standard (wrong) location.
-  try {
-    const msStoreScripts = execFileSync('python', [
-      '-c', "import site, os; print(os.path.normpath(os.path.join(site.getusersitepackages(), '..', 'Scripts')))",
-    ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
-    addIfMissing(msStoreScripts);
-  } catch { /* python might not be MS Store or not installed */ }
+    // 5. Python system scripts directory
+    try {
+      const sysScripts = execFileSync('python', [
+        '-c', "import sysconfig; print(sysconfig.get_path('scripts'))",
+      ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+      addIfMissing(sysScripts);
+    } catch { /* ignore */ }
+
+    // 6. pipx default bin directory (%USERPROFILE%\.local\bin on Windows)
+    const userProfile = process.env.USERPROFILE;
+    if (userProfile) {
+      addIfMissing(`${userProfile}\\.local\\bin`);
+    }
 
-  // 10. Python base Scripts dir (next to python.exe — covers standard python.org installs)
-  try {
-    const pyBaseScripts = execFileSync('python', [
-      '-c', "import sys, os; print(os.path.join(os.path.dirname(sys.executable), 'Scripts'))",
-    ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
-    addIfMissing(pyBaseScripts);
-  } catch { /* ignore */ }
+    // 7. uv tool bin directory
+    if (appData) {
+      addIfMissing(`${appData}\\uv\\bin`);
+    }
+
+    // 8. npm global bin directory via `npm bin -g`
+    try {
+      const npmBin = execFileSync('npm', ['bin', '-g'], {
+        timeout: 5000, encoding: 'utf-8', shell: true,
+      }).trim();
+      addIfMissing(npmBin);
+    } catch { /* ignore */ }
+
+    // 9. MS Store Python user scripts
+    try {
+      const msStoreScripts = execFileSync('python', [
+        '-c', "import site, os; print(os.path.normpath(os.path.join(site.getusersitepackages(), '..', 'Scripts')))",
+      ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+      addIfMissing(msStoreScripts);
+    } catch { /* ignore */ }
+
+    // 10. Python base Scripts dir (next to python.exe)
+    try {
+      const pyBaseScripts = execFileSync('python', [
+        '-c', "import sys, os; print(os.path.join(os.path.dirname(sys.executable), 'Scripts'))",
+      ], { timeout: 5000, encoding: 'utf-8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+      addIfMissing(pyBaseScripts);
+    } catch { /* ignore */ }
+
+  } else {
+    // ——— macOS + Linux directories ———
+    const home = os.homedir();
+
+    // 1. Homebrew (Apple Silicon macOS installs to /opt/homebrew)
+    if (process.platform === 'darwin') {
+      addIfMissing('/opt/homebrew/bin');
+      addIfMissing('/opt/homebrew/sbin');
+    }
+
+    // 2. /usr/local/bin (Homebrew Intel macOS + manual installs on Linux)
+    addIfMissing('/usr/local/bin');
+
+    // 3. ~/.local/bin (pipx, uv, user-installed Python tools)
+    addIfMissing(`${home}/.local/bin`);
+
+    // 4. ~/.cargo/bin (Rust-based tools)
+    addIfMissing(`${home}/.cargo/bin`);
+
+    // 5. npm global bin directory (handles nvm, volta, fnm, Homebrew node)
+    try {
+      const npmBin = execFileSync('npm', ['bin', '-g'], {
+        timeout: 5000, encoding: 'utf-8',
+      }).trim();
+      addIfMissing(npmBin);
+    } catch { /* npm might not be installed */ }
+
+    // 6. npm prefix/bin (alternative layout via nvm, volta, fnm)
+    try {
+      const npmPrefix = execFileSync('npm', ['config', 'get', 'prefix'], {
+        timeout: 5000, encoding: 'utf-8',
+      }).trim();
+      if (npmPrefix) {
+        addIfMissing(`${npmPrefix}/bin`);
+      }
+    } catch { /* ignore */ }
+  }
 
   if (additions.length > 0) {
-    process.env.PATH = additions.join(';') + ';' + process.env.PATH;
+    process.env.PATH = additions.join(separator) + separator + process.env.PATH;
     logger.info(MODULE, 'Refreshed PATH', { added: additions });
   }
 }
@@ -937,7 +985,25 @@ async function runInstallCommand(provider, providerConfig, progress) {
           }
         }
 
-        // Fallback 1: invoke uv via `python -m uv` — bypasses PATH entirely
+        // Fallback 1: Homebrew (macOS or Linuxbrew) — more reliable than pip on Python 3.14+
+        if (!hasUv && process.platform !== 'win32') {
+          try {
+            const brewExists = await commandExistsAsync('brew').then(() => true).catch(() => false);
+            if (brewExists) {
+              progress.log('Trying: brew install uv (Homebrew)...');
+              await runShellCommand('brew', ['install', 'uv'], progress, 180_000);
+              refreshPathAfterInstall();
+              hasUv = await commandExistsAsync('uv').then(() => true).catch(() => false);
+              if (hasUv) {
+                progress.log('uv installed via Homebrew.');
+              }
+            }
+          } catch {
+            progress.log('brew install uv failed or Homebrew not available.');
+          }
+        }
+
+        // Fallback 2: invoke uv via `python -m uv` — bypasses PATH entirely
         // since Python can find its own installed modules regardless of Scripts dir.
         if (!hasUv) {
           progress.log('Trying python -m uv (bypasses PATH)...');
@@ -950,7 +1016,7 @@ async function runInstallCommand(provider, providerConfig, progress) {
           }
         }
 
-        // Fallback 2: direct binary search in known Python Scripts dirs.
+        // Fallback 3: direct binary search in known Python Scripts dirs (Windows only).
         // Uses semicolons (not newlines) for Windows cmd.exe compatibility.
         if (!hasUv && process.platform === 'win32') {
           progress.log('Searching for uv binary in Python Scripts directories...');

package/server/preflight.js

@@ -130,15 +130,14 @@ function checkBinaryInstalled(provider, providerConfig) {
     return { ok: true };
   }
 
-  // Recovery: on Windows, PATH may be stale. Refresh and retry once.
-  if (process.platform === 'win32') {
-    refreshPathAfterInstall();
-    if (commandExistsSync(binary)) {
-      return { ok: true };
-    }
-    if (fallbackBinary && commandExistsSync(fallbackBinary)) {
-      return { ok: true };
-    }
+  // Recovery: PATH may be stale if a CLI was installed after the server started
+  // (e.g. via wizard). Refresh from common tool directories and retry once.
+  refreshPathAfterInstall();
+  if (commandExistsSync(binary)) {
+    return { ok: true };
+  }
+  if (fallbackBinary && commandExistsSync(fallbackBinary)) {
+    return { ok: true };
   }
 
   return {

package/server/pty-manager.js

@@ -21,7 +21,7 @@ import {
 import { getAgentEnv, getSetting, resolveSessionAuthMode } from './settings-store.js';
 import { recordUsageWithSource } from './usage-tracker.js';
 import config from './config.js';
-import { commandExistsSync, resolveNpmGlobalEntryPoint } from './platform.js';
+import { commandExistsSync, getCommandPath, resolveNpmGlobalEntryPoint } from './platform.js';
 import { isGitRepo, getHeadSha, getWorkingTreeStatus } from './git-ops.js';
 import { createCheckpoint } from './checkpoint-store.js';
 import { syncBeforeSpawn } from './context-sync.js';
@@ -349,6 +349,10 @@ function verifyGatewayToken(_port, token) {
  * Records the token, auth method, and timestamp so subsequent startups can verify.
  */
 function writeGatewayMarker(token) {
+  // Cache the token in memory so subsequent sequential calls within this process
+  // can verify against it without re-reading config (which may hold a different,
+  // local token after we adopted a foreign gateway).
+  _activeGatewayToken = token;
   try {
     const dir = path.dirname(GATEWAY_MARKER_PATH);
     if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
@@ -481,6 +485,16 @@ async function killGatewayOnPort(port) {
 // Concurrent callers piggyback on the in-flight promise.
 let _gatewayEnsurePromise = null;
 
+// In-memory cache of the last token written to the gateway marker file.
+// After adopting a foreign gateway token, this prevents subsequent sequential
+// calls from re-triggering the mismatch/kill/adopt cycle (because the local
+// config token differs from the adopted marker token).
+let _activeGatewayToken = null;
+
+/** Test-only: get/reset _activeGatewayToken for test isolation. */
+function _getActiveGatewayToken() { return _activeGatewayToken; }
+function _resetActiveGatewayToken() { _activeGatewayToken = null; }
+
 /**
  * Ensure the OpenClaw gateway daemon is running on the given port.
  * Uses a singleton promise so concurrent callers coalesce into one execution.
@@ -537,7 +551,10 @@ async function _ensureOpenClawGatewayImpl(port) {
       // Fall through to spawn new gateway
     } else {
       // Gateway is listening — check if we spawned it with our current token
-      const tokenValid = verifyGatewayToken(port, gatewayToken);
+      // Use the in-memory cached token if available (set after a previous adoption
+      // in this process), otherwise fall back to the config-derived token.
+      const verifyToken = _activeGatewayToken || gatewayToken;
+      const tokenValid = verifyGatewayToken(port, verifyToken);
       if (tokenValid) {
         console.log('[pty-manager] OpenClaw gateway already running, token valid (marker match)');
         return;
@@ -856,6 +873,17 @@ export async function startPtyAgent(projectId, projectPath, task, options = {})
     }
   }
 
+  // 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`
+  // in a subshell that inherits the refreshed process.env.PATH.
+  if (process.platform !== 'win32') {
+    const fullPath = getCommandPath(binary);
+    if (fullPath) {
+      binary = fullPath;
+    }
+  }
+
   // 1. Create session record with mode='pty'
   const session = createSession({
     projectId,
@@ -2276,6 +2304,10 @@ export {
   extractCodexSessionIdFromRolloutFile as _extractCodexSessionIdFromRolloutFile,
   detectCodexSessionIdFromFilesystem as _detectCodexSessionIdFromFilesystem,
   isValidProviderSessionId as _isValidProviderSessionId,
+  writeGatewayMarker as _writeGatewayMarker,
+  verifyGatewayToken as _verifyGatewayToken,
+  _getActiveGatewayToken,
+  _resetActiveGatewayToken,
 };
 
 /**
@@ -2291,6 +2323,8 @@ export async function restartOpenClawGateway() {
     console.log('[pty-manager] Restarting OpenClaw gateway to reload MCP config...');
     // Clear any in-flight singleton promise so the ensure call below runs fresh
     _gatewayEnsurePromise = null;
+    // Clear cached adopted token so the fresh ensure call re-derives from config
+    _activeGatewayToken = null;
     // Clear marker before kill so ensureOpenClawGateway knows to respawn
     try { fs.unlinkSync(GATEWAY_MARKER_PATH); } catch { /* may not exist */ }
     await killGatewayOnPort(gwPort);
@@ -2317,7 +2351,7 @@ startIdleCleanup();
  * Used by personal-agent-routes to distinguish gateway-level 401 from provider-level 401.
  */
 export function isGatewaySpawnedByColana() {
-  const token = getOrCreateGatewayToken();
+  const token = _activeGatewayToken || getOrCreateGatewayToken();
   return verifyGatewayToken(null, token);
 }