colana 1.0.0-beta.8 → 1.0.0-beta.80

package/bin/admin.js

@@ -156,12 +156,14 @@ async function createKey(flags) {
     console.error(`\n  ${icons.fail} ${c.error}ERROR: --name is required.${c.reset}\n`);
     console.error('  Usage: colana admin create-key --name "Sarah" --type staff [--email x] [--expires 2026-12-31]\n');
     process.exit(1);
+    return;
   }
 
   const validTypes = ['admin', 'staff', 'beta'];
   if (!validTypes.includes(type)) {
     console.error(`\n  ${icons.fail} ${c.error}ERROR: Invalid type "${type}". Must be one of: ${validTypes.join(', ')}${c.reset}\n`);
     process.exit(1);
+    return;
   }
 
   // Prefer server API (avoids sql.js in-memory DB conflict)
@@ -174,6 +176,7 @@ async function createKey(flags) {
     } catch (err) {
       console.error(`\n  ${icons.fail} ${c.error}${err.message}${c.reset} ${c.muted}(via server)${c.reset}\n`);
       process.exit(1);
+      return;
     }
   } else {
     // Fallback: direct DB access (only safe when server is NOT running)
@@ -184,9 +187,16 @@ async function createKey(flags) {
     } catch (err) {
       console.error(`\n  ${icons.fail} ${c.error}${err.message}${c.reset}\n`);
       process.exit(1);
+      return;
     }
   }
 
+  if (!result || !result.name) {
+    console.error(`\n  ${icons.fail} ${c.error}Key generation returned an unexpected response.${c.reset}\n`);
+    process.exit(1);
+    return; // Guard for test environments where process.exit is mocked
+  }
+
   console.log('');
   console.log(`  ${icons.pass} Key generated successfully!`);
   console.log(`  ${c.muted}${'─'.repeat(40)}${c.reset}`);
@@ -219,6 +229,7 @@ async function listKeysCmd(flags) {
     } catch (err) {
       console.error(`\n  ${icons.fail} ${c.error}${err.message}${c.reset} ${c.muted}(via server)${c.reset}\n`);
       process.exit(1);
+      return;
     }
   } else {
     await ensureDb();
@@ -226,7 +237,7 @@ async function listKeysCmd(flags) {
     result = listKeys(filters);
   }
 
-  if (!result.keys.length) {
+  if (!result || !result.keys || !result.keys.length) {
     console.log('\n  No keys found.\n');
     return;
   }
@@ -257,6 +268,7 @@ async function revokeKeyCmd(positional) {
     console.error(`\n  ${icons.fail} ${c.error}ERROR: Key ID is required.${c.reset}\n`);
     console.error('  Usage: colana admin revoke-key <id>\n');
     process.exit(1);
+    return;
   }
 
   // Prefer server API
@@ -269,6 +281,7 @@ async function revokeKeyCmd(positional) {
     } catch (err) {
       console.error(`\n  ${icons.fail} ${c.error}${err.message}${c.reset} ${c.muted}(via server)${c.reset}\n`);
       process.exit(1);
+      return;
     }
   } else {
     await ensureDb();
@@ -279,6 +292,7 @@ async function revokeKeyCmd(positional) {
     } catch (err) {
       console.error(`\n  ${icons.fail} ${c.error}${err.message}${c.reset}\n`);
       process.exit(1);
+      return;
     }
   }
 }
@@ -375,7 +389,11 @@ async function main() {
       console.error(`  ${icons.fail} Unknown command: ${c.value}${command}${c.reset}`);
       console.error(`  ${c.muted}Run "colana admin help" for usage.${c.reset}`);
       process.exit(1);
+      return;
   }
 }
 
-main();
+main().catch((err) => {
+  console.error(`  ${icons.fail} ${c.error}${err.message || err}${c.reset}`);
+  process.exit(1);
+});

package/bin/colana.js

@@ -7,7 +7,7 @@
  * Normal run: start server → open browser
  */
 
-import { execSync, spawn } from 'child_process';
+import { execSync, execFileSync, spawn } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import readline from 'readline';
@@ -125,6 +125,79 @@ function detectProvider(provider) {
   return commandExistsSync(provider.binary);
 }
 
+/**
+ * Detect the system Python version. Returns { major, minor } or null.
+ */
+function detectPythonVersion() {
+  for (const bin of ['python3', 'python']) {
+    try {
+      const out = execFileSync(bin, ['--version'], {
+        timeout: 5000, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'],
+      }).trim();
+      const match = out.match(/Python\s+(\d+)\.(\d+)/);
+      if (match) return { major: parseInt(match[1]), minor: parseInt(match[2]) };
+    } catch { /* try next */ }
+  }
+  return null;
+}
+
+/**
+ * Return platform-specific numbered next-steps for a failed install.
+ * @param {object} provider - Provider object from CLI_PROVIDERS
+ * @param {string} [hint] - Optional hint about why it failed
+ * @returns {string[]} Steps array
+ */
+function getCliNextSteps(provider, hint = '') {
+  const h = hint.toLowerCase();
+  const platform = process.platform;
+
+  // Build tools failures (npm providers)
+  if (provider.runtime === 'npm' && (h.includes('gyp') || h.includes('msbuild') || h.includes('native') || h.includes('build tools'))) {
+    if (platform === 'win32') {
+      return [
+        'Open PowerShell as Administrator (right-click > "Run as administrator")',
+        `Run: ${c.cmd}winget install Microsoft.VisualStudio.2022.BuildTools --override "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --passive --norestart" --accept-source-agreements --accept-package-agreements${c.reset}`,
+        'Wait for the install to complete (2-5 minutes)',
+        'Close and reopen your terminal',
+        `Run: ${c.cmd}${provider.installCmd}${c.reset}`,
+      ];
+    }
+    if (platform === 'darwin') {
+      return [
+        `Run: ${c.cmd}xcode-select --install${c.reset}`,
+        'Complete the system dialog that appears',
+        `Run: ${c.cmd}${provider.installCmd}${c.reset}`,
+      ];
+    }
+    return [
+      `Run: ${c.cmd}sudo apt update && sudo apt install -y build-essential python3${c.reset}`,
+      `Run: ${c.cmd}${provider.installCmd}${c.reset}`,
+    ];
+  }
+
+  // Python version issues (aider)
+  if (provider.runtime === 'pipx' && (h.includes('python') || h.includes('setuptools'))) {
+    if (platform === 'win32') {
+      return [
+        `Run: ${c.cmd}pip install uv${c.reset}`,
+        `Run: ${c.cmd}uv tool install --python python3.12 aider-chat${c.reset}`,
+        'Close and reopen your terminal',
+      ];
+    }
+    return [
+      `Run: ${c.cmd}pip install uv${c.reset}   (or: ${c.cmd}brew install uv${c.reset})`,
+      `Run: ${c.cmd}uv tool install --python python3.12 aider-chat${c.reset}`,
+      'Restart your terminal',
+    ];
+  }
+
+  // Generic fallback
+  return [
+    `Run: ${c.cmd}${provider.installCmd}${c.reset}`,
+    'If that fails, check the error output above for details',
+  ];
+}
+
 const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 const ask = (q) => new Promise(r => rl.question(q, r));
 
@@ -136,12 +209,63 @@ function runInstall(cmd) {
     const proc = spawn(parts[0], parts.slice(1), {
       stdio: 'inherit',
       env: { ...process.env },
+      ...(process.platform === 'win32' && { shell: true }),
+    });
+    proc.on('close', (code) => resolve(code === 0));
+    proc.on('error', () => resolve(false));
+  });
+}
+
+/**
+ * Spawn a binary with an explicit args array (needed when arguments contain spaces,
+ * e.g. winget --override "..." where the value must stay as one argument).
+ */
+function runInstallArgs(binary, args) {
+  return new Promise((resolve) => {
+    // No shell: true here — winget/xcode-select are real executables, not .cmd files.
+    // shell: true would cause cmd.exe to split quoted --override values into separate args.
+    const proc = spawn(binary, args, {
+      stdio: 'inherit',
+      env: { ...process.env },
     });
     proc.on('close', (code) => resolve(code === 0));
     proc.on('error', () => resolve(false));
   });
 }
 
+/**
+ * Attempt to auto-install C/C++ build tools needed for native npm modules.
+ * Returns true if tools were installed (or install was triggered), false otherwise.
+ */
+async function tryInstallBuildTools() {
+  const platform = process.platform;
+
+  if (platform === 'win32') {
+    // Try winget (available on Windows 10 21H2+ / Windows 11)
+    if (commandExistsSync('winget')) {
+      print(`    ${c.muted}Installing Visual Studio Build Tools via winget...${c.reset}`);
+      const ok = await runInstallArgs('winget', [
+        'install', 'Microsoft.VisualStudio.2022.BuildTools',
+        '--override', '--add Microsoft.VisualStudio.Workload.VCTools --passive --norestart',
+        '--accept-source-agreements', '--accept-package-agreements',
+      ]);
+      return ok;
+    }
+    return false;
+  }
+
+  if (platform === 'darwin') {
+    print(`    ${c.muted}Installing Xcode Command Line Tools...${c.reset}`);
+    // xcode-select --install opens a system dialog; returns non-zero if already installed
+    const ok = await runInstallArgs('xcode-select', ['--install']);
+    // Even if xcode-select exits non-zero (already installed), the tools may be present
+    return ok;
+  }
+
+  // Linux — requires sudo, skip auto-install
+  return false;
+}
+
 // ---------------------------------------------------------------------------
 // Doctor Checks (standalone + used by wizard)
 // ---------------------------------------------------------------------------
@@ -387,37 +511,87 @@ async function installProvider(provider) {
     }
   }
 
+  // Aider: detect Python 3.13+ and use uv with Python 3.12 pin
+  let installCmd = provider.installCmd;
+  let fallbackCmd = provider.fallbackCmd;
+  let failureHint = '';
+
+  if (provider.binary === 'aider') {
+    const pyVer = detectPythonVersion();
+    if (pyVer && pyVer.major >= 3 && pyVer.minor >= 13) {
+      print(`    ${c.muted}Python ${pyVer.major}.${pyVer.minor} detected — aider requires Python 3.10-3.12${c.reset}`);
+      print(`    ${c.muted}Using uv to install with Python 3.12...${c.reset}`);
+      failureHint = 'python 3.13';
+
+      // Try installing uv first if not available
+      let hasUv = commandExistsSync('uv');
+      if (!hasUv) {
+        print(`    ${c.muted}Installing uv (universal Python package manager)...${c.reset}`);
+        hasUv = await runInstall('pip install uv');
+        if (!hasUv) hasUv = await runInstall('pip3 install uv');
+      }
+
+      if (hasUv) {
+        installCmd = 'uv tool install --python python3.12 aider-chat';
+        fallbackCmd = null;
+      } else {
+        print(`    ${icons.fail} ${c.error}Could not install uv.${c.reset}`);
+        printNextSteps(provider, 'python setuptools');
+        return;
+      }
+    }
+  }
+
   print(`    Installing ${provider.name}...`);
-  let success = await runInstall(provider.installCmd);
+  let success = await runInstall(installCmd);
 
-  if (!success && provider.fallbackCmd) {
-    print(`    Trying fallback: ${provider.fallbackCmd}...`);
-    success = await runInstall(provider.fallbackCmd);
+  if (!success && fallbackCmd) {
+    print(`    Trying fallback: ${fallbackCmd}...`);
+    success = await runInstall(fallbackCmd);
   }
 
   if (success) {
     print(`    ${icons.pass} ${provider.name} installed`);
   } else {
-    print(`    ${icons.fail} ${c.error}Installation failed.${c.reset}`);
-    // Platform-specific hints for native module failures (npm packages may need C/C++ build tools)
+    // For npm packages, try auto-installing build tools and retrying
     if (provider.runtime === 'npm') {
-      const platform = process.platform;
-      if (platform === 'win32') {
-        print(`       ${c.muted}If you see build/compile errors, install Visual Studio Build Tools:${c.reset}`);
-        print(`       ${c.url}https://aka.ms/vs/17/release/vs_BuildTools.exe${c.reset}`);
-        print(`       ${c.muted}Select "Desktop development with C++" workload.${c.reset}`);
-      } else if (platform === 'darwin') {
-        print(`       ${c.muted}If you see build errors, ensure Xcode CLT is installed:${c.reset}`);
-        print(`       ${c.cmd}xcode-select --install${c.reset}`);
-      } else {
-        print(`       ${c.muted}If you see build errors, ensure build tools are installed:${c.reset}`);
-        print(`       ${c.cmd}sudo apt install python3 build-essential${c.reset}`);
+      print(`    ${c.muted}Build tools may be needed. Attempting automatic install...${c.reset}`);
+      const toolsInstalled = await tryInstallBuildTools();
+
+      if (toolsInstalled) {
+        print(`    ${c.muted}Retrying ${provider.name} install...${c.reset}`);
+        success = await runInstall(installCmd);
       }
+
+      if (success) {
+        print(`    ${icons.pass} ${provider.name} installed`);
+        return;
+      }
+
+      failureHint = failureHint || 'build tools';
     }
-    print(`       ${c.muted}Or install manually:${c.reset} ${provider.installCmd}`);
+
+    // Enterprise-grade: show numbered next-steps
+    print(`    ${icons.fail} ${c.error}Installation failed.${c.reset}`);
+    printNextSteps(provider, failureHint);
   }
 }
 
+/**
+ * Print numbered next-steps for a failed install.
+ * @param {object} provider - CLI_PROVIDERS entry
+ * @param {string} [hint] - Failure hint
+ */
+function printNextSteps(provider, hint = '') {
+  const steps = getCliNextSteps(provider, hint);
+  print('');
+  print(`    ${c.heading}Next steps to resolve:${c.reset}`);
+  steps.forEach((step, i) => {
+    print(`    ${c.muted}${i + 1}.${c.reset} ${step}`);
+  });
+  print('');
+}
+
 // ---------------------------------------------------------------------------
 // Start Server
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "colana",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.80",
   "description": "Agent-First. Multiplied. Multi-agent command center for AI coding agents.",
   "type": "module",
   "main": "server/index.js",
@@ -86,8 +86,15 @@
   ],
   "license": "SEE LICENSE IN LICENSE",
   "private": false,
-  "os": ["linux", "darwin", "win32"],
-  "cpu": ["x64", "arm64"],
+  "os": [
+    "linux",
+    "darwin",
+    "win32"
+  ],
+  "cpu": [
+    "x64",
+    "arm64"
+  ],
   "devDependencies": {
     "@playwright/test": "^1.58.2",
     "@vitest/coverage-v8": "^4.0.18",