@xortex/xcode 3.0.5 → 3.1.0

package/bin/xcode

@@ -1,164 +1,113 @@
 #!/usr/bin/env node
 /**
  * XCode CLI Entry Point
- * 
- * This is the executable that gets installed when users run:
- * - npm install -g @xortex/xcode
- * - Or use the curl installer
+ * 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 } = require('child_process');
 const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
+const os = require('os');
 
-// Get the project root (where this script is located)
 const projectRoot = path.resolve(__dirname, '..');
 const mainScript = path.join(projectRoot, 'entrypoints', 'cli.tsx');
-const bunBundleHook = path.join(projectRoot, 'bun-bundle-hook.js');
 
-// Check if bun is available
-function getRuntime() {
+// ── find Bun ──────────────────────────────────────────────────────────────────
+
+function findBun() {
+  // 1. Check PATH
   try {
-    require('child_process').execSync('bun --version', { stdio: 'ignore' });
-    return 'bun';
-  } catch {
-    try {
-      require('child_process').execSync('node --version', { stdio: 'ignore' });
-      return 'node';
-    } catch {
-      console.error('❌ Error: Neither Bun nor Node.js is installed.');
-      console.error('');
-      console.error('Please install one of the following:');
-      console.error('  • Bun (recommended): curl -fsSL https://bun.sh/install | bash');
-      console.error('  • Node.js: https://nodejs.org/');
-      console.error('');
-      process.exit(1);
-    }
+    const p = execSync('which bun', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    if (p && fs.existsSync(p)) return p;
+  } catch {}
+
+  // 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;
   }
+  return null;
 }
 
-// Set up environment
+// ── CLI flags ─────────────────────────────────────────────────────────────────
+
 process.env.XCODE_CLI = 'true';
 process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
-// Handle special commands
 const args = process.argv.slice(2);
-const command = args[0];
 
-if (command === '--version' || command === '-v') {
-  console.log('xcode v3.0.5 — AI coding assistant with XMem memory');
+if (args[0] === '--version' || args[0] === '-v' || args[0] === '-V') {
+  console.log('xcode v3.1.0 — AI coding assistant with XMem memory');
   process.exit(0);
 }
 
-if (command === '--help' || command === '-h') {
+if (args[0] === '--help' || args[0] === '-h') {
   console.log(`
 XCode - AI-powered coding assistant with XMem memory
 
-Usage: xcode [options] [command]
+Usage: xcode [options]
 
 Options:
-  -v, --version     Show version number
-  -h, --help        Show help
-  --model <model>   Start with specific model (e.g., gemini-2.5-pro, kimi-k2.5)
+  -v, --version          Show version
+  -h, --help             Show help
+  --model <name>         Model: gemini-2.5-pro, kimi-k2.5, deepseek-v3.2, sonnet, opus
+  --openrouter           Use OpenRouter provider
 
-Commands:
-  (none)            Start interactive session
-
-Environment Variables:
-  OPENROUTER_API_KEY      OpenRouter API key (optional, has default)
-  XMEM_API_URL           XMem memory server URL (default: http://localhost:8000)
+Environment:
   ANTHROPIC_API_KEY      Anthropic API key (for Claude models)
-
-Examples:
-  xcode                                    # Start with default model
-  xcode --model gemini-2.5-pro            # Use Gemini via OpenRouter
-  xcode --model kimi-k2.5                 # Use Kimi via OpenRouter
+  OPENROUTER_API_KEY     OpenRouter API key (optional, default provided)
+  XMEM_API_URL           XMem memory server URL (default: http://localhost:8000)
 `);
   process.exit(0);
 }
 
-// Check for model argument
-const modelIndex = args.indexOf('--model');
-if (modelIndex !== -1 && args[modelIndex + 1]) {
-  const model = args[modelIndex + 1];
+// Model / provider flags
+const modelIdx = args.indexOf('--model');
+if (modelIdx !== -1 && args[modelIdx + 1]) {
+  const model = args[modelIdx + 1];
   process.env.ANTHROPIC_MODEL = model;
-  
-  // If using OpenRouter models, auto-enable OpenRouter
-  const openRouterModels = ['kimi', 'deepseek', 'gemini', 'moonshot', 'google/gemini'];
-  if (openRouterModels.some(m => model.toLowerCase().includes(m.toLowerCase()))) {
+  const orModels = ['kimi', 'deepseek', 'gemini', 'moonshot', 'google/'];
+  if (orModels.some(m => model.toLowerCase().includes(m))) {
     process.env.CLAUDE_CODE_USE_OPENROUTER = 'true';
   }
 }
-
-// Check for explicit OpenRouter flag
 if (args.includes('--openrouter')) {
   process.env.CLAUDE_CODE_USE_OPENROUTER = 'true';
 }
 
-// Run the main application
-const runtime = getRuntime();
-
-if (runtime === 'bun') {
-  // Use Bun - it handles TypeScript natively
-  const child = spawn('bun', ['run', mainScript, ...args], {
-    cwd: projectRoot,
-    stdio: 'inherit',
-    env: process.env,
-  });
-  
-  child.on('exit', (code) => {
-    process.exit(code || 0);
-  });
-} else {
-  // Use Node with ts-node or tsx
-  // First check if tsx is installed globally or locally
-  let tsxPath;
-  try {
-    // Try local tsx first
-    tsxPath = require.resolve('tsx/dist/cli.mjs', { paths: [projectRoot] });
-  } catch {
-    try {
-      // Try global tsx
-      tsxPath = require.resolve('tsx/dist/cli.mjs');
-    } catch {
-      // Fallback to npx tsx
-      tsxPath = null;
-    }
-  }
-  
-  let child;
-  const hasHook = fs.existsSync(bunBundleHook);
-
-  if (tsxPath) {
-    // Use direct tsx path with bun:bundle shim
-    const nodeArgs = hasHook ? ['--require', bunBundleHook, tsxPath, mainScript] : [tsxPath, mainScript];
-    child = spawn('node', [...nodeArgs, ...args], {
-      cwd: projectRoot,
-      stdio: 'inherit',
-      env: process.env,
-    });
-  } else {
-    // Fallback to npx
-    const npxArgs = hasHook ? ['--node-options', `--require ${bunBundleHook}`, 'tsx'] : ['tsx'];
-    child = spawn('npx', [...npxArgs, mainScript, ...args], {
-      cwd: projectRoot,
-      stdio: 'inherit',
-      env: process.env,
-    });
-  }
-  
-  child.on('exit', (code) => {
-    process.exit(code || 0);
-  });
-  
-  child.on('error', (err) => {
-    console.error('❌ Failed to start XCode:', err.message);
-    console.error('');
-    console.error('Please ensure tsx is installed:');
-    console.error('  npm install -g tsx');
-    console.error('');
-    console.error('Or use Bun instead:');
-    console.error('  curl -fsSL https://bun.sh/install | bash');
-    process.exit(1);
-  });
+// ── launch with Bun ───────────────────────────────────────────────────────────
+
+const bun = findBun();
+
+if (!bun) {
+  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], {
+  cwd: projectRoot,
+  stdio: 'inherit',
+  env: process.env,
+});
+
+child.on('exit', code => process.exit(code ?? 0));
+child.on('error', err => {
+  console.error('\n❌ Failed to start XCode:', err.message);
+  process.exit(1);
+});