@xortex/xcode 3.0.8 → 3.1.1

package/bin/xcode

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 /**
  * XCode CLI Entry Point
- *
- * This codebase is built for Bun (bun.sh). If Bun is not installed,
- * this script installs it automatically, then hands off to Bun.
- *
  * Installed via: npm install -g @xortex/xcode
+ *
+ * Bun is installed as part of npm postinstall.
+ * This launcher finds Bun and runs the app with it.
  */
 
-const { execSync, spawnSync } = require('child_process');
+const { execSync } = require('child_process');
 const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
@@ -17,81 +16,26 @@ const os = require('os');
 const projectRoot = path.resolve(__dirname, '..');
 const mainScript = path.join(projectRoot, 'entrypoints', 'cli.tsx');
 
-// ── helpers ──────────────────────────────────────────────────────────────────
+// ── find Bun ──────────────────────────────────────────────────────────────────
 
-function tryExec(cmd) {
-  try { execSync(cmd, { stdio: 'ignore' }); return true; } catch { return false; }
-}
+function findBun() {
+  // 1. Check PATH
+  try {
+    const p = execSync('which bun', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    if (p && fs.existsSync(p)) return p;
+  } catch {}
 
-function bunBinPath() {
-  // Common Bun install locations
+  // 2. Common install locations
   const candidates = [
     path.join(os.homedir(), '.bun', 'bin', 'bun'),
     '/usr/local/bin/bun',
     '/usr/bin/bun',
+    'C:\\Users\\' + (process.env.USERNAME || '') + '\\.bun\\bin\\bun.exe',
   ];
   for (const c of candidates) {
     if (fs.existsSync(c)) return c;
   }
-  // Try PATH
-  try {
-    return execSync('which bun', { encoding: 'utf8' }).trim();
-  } catch {
-    return null;
-  }
-}
-
-function installBun() {
-  console.log('');
-  console.log('📦 XCode requires Bun runtime. Installing Bun now...');
-  console.log('   (This is a one-time setup)');
-  console.log('');
-
-  const platform = os.platform();
-
-  try {
-    if (platform === 'win32') {
-      execSync('powershell -c "irm bun.sh/install.ps1 | iex"', { stdio: 'inherit' });
-    } else {
-      // curl or wget
-      if (tryExec('which curl')) {
-        execSync('curl -fsSL https://bun.sh/install | bash', {
-          stdio: 'inherit',
-          shell: '/bin/bash',
-        });
-      } else if (tryExec('which wget')) {
-        execSync('wget -qO- https://bun.sh/install | bash', {
-          stdio: 'inherit',
-          shell: '/bin/bash',
-        });
-      } else {
-        throw new Error('Neither curl nor wget is available');
-      }
-    }
-
-    console.log('');
-    console.log('✅ Bun installed successfully!');
-    console.log('');
-
-    // Re-source PATH
-    const bunBin = bunBinPath();
-    if (bunBin) return bunBin;
-
-    // Add ~/.bun/bin to PATH for this process
-    const bunBinDir = path.join(os.homedir(), '.bun', 'bin');
-    process.env.PATH = `${bunBinDir}${path.delimiter}${process.env.PATH}`;
-    return path.join(bunBinDir, 'bun');
-
-  } catch (err) {
-    console.error('');
-    console.error('❌ Could not auto-install Bun. Please install it manually:');
-    console.error('');
-    console.error('   curl -fsSL https://bun.sh/install | bash');
-    console.error('');
-    console.error('   Then run: xcode');
-    console.error('');
-    process.exit(1);
-  }
+  return null;
 }
 
 // ── CLI flags ─────────────────────────────────────────────────────────────────
@@ -102,7 +46,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 const args = process.argv.slice(2);
 
 if (args[0] === '--version' || args[0] === '-v' || args[0] === '-V') {
-  console.log('xcode v3.0.8 — AI coding assistant with XMem memory');
+  console.log('xcode v3.1.1 — AI coding assistant with XMem memory');
   process.exit(0);
 }
 
@@ -114,14 +58,14 @@ Usage: xcode [options]
 
 Options:
   -v, --version          Show version
-  -h, --help             Show this help
-  --model <name>         Choose model: gemini-2.5-pro, kimi-k2.5, deepseek-v3.2
-  --openrouter           Force OpenRouter as provider
+  -h, --help             Show help
+  --model <name>         Model: gemini-2.5-pro, kimi-k2.5, deepseek-v3.2, sonnet, opus
+  --openrouter           Use OpenRouter provider
 
 Environment:
   ANTHROPIC_API_KEY      Anthropic API key (for Claude models)
   OPENROUTER_API_KEY     OpenRouter API key (optional, default provided)
-  XMEM_API_URL           XMem server URL (default: http://localhost:8000)
+  XMEM_API_URL           XMem memory server URL (default: http://localhost:8000)
 `);
   process.exit(0);
 }
@@ -132,7 +76,7 @@ if (modelIdx !== -1 && args[modelIdx + 1]) {
   const model = args[modelIdx + 1];
   process.env.ANTHROPIC_MODEL = model;
   const orModels = ['kimi', 'deepseek', 'gemini', 'moonshot', 'google/'];
-  if (orModels.some(m => model.toLowerCase().includes(m.toLowerCase()))) {
+  if (orModels.some(m => model.toLowerCase().includes(m))) {
     process.env.CLAUDE_CODE_USE_OPENROUTER = 'true';
   }
 }
@@ -140,11 +84,20 @@ if (args.includes('--openrouter')) {
   process.env.CLAUDE_CODE_USE_OPENROUTER = 'true';
 }
 
-// ── find / install Bun, then run ──────────────────────────────────────────────
+// ── launch with Bun ───────────────────────────────────────────────────────────
+
+const bun = findBun();
 
-let bun = bunBinPath();
 if (!bun) {
-  bun = installBun();
+  console.error('');
+  console.error('❌ Bun runtime not found.');
+  console.error('');
+  console.error('   Please install Bun and try again:');
+  console.error('   curl -fsSL https://bun.sh/install | bash');
+  console.error('');
+  console.error('   Then restart your terminal and run: xcode');
+  console.error('');
+  process.exit(1);
 }
 
 const child = spawn(bun, ['run', mainScript, ...args], {
@@ -155,11 +108,6 @@ const child = spawn(bun, ['run', mainScript, ...args], {
 
 child.on('exit', code => process.exit(code ?? 0));
 child.on('error', err => {
-  if (err.code === 'ENOENT') {
-    console.error('\n❌ Bun not found at: ' + bun);
-    console.error('Please run: curl -fsSL https://bun.sh/install | bash && xcode');
-  } else {
-    console.error('\n❌ Failed to start XCode:', err.message);
-  }
+  console.error('\n❌ Failed to start XCode:', err.message);
   process.exit(1);
 });