jbai-cli 1.1.0 → 1.2.0

package/README.md

@@ -2,7 +2,7 @@
 
 **Use AI coding tools with your JetBrains AI subscription** — no separate API keys needed.
 
-One token, all tools: Claude Code, Codex, Aider, Gemini, OpenCode.
+One token, all tools: Claude Code, Codex, Aider, OpenCode.
 
 ## Install
 
@@ -59,15 +59,9 @@ jbai-codex exec "explain this codebase"
 ### Aider
 ```bash
 jbai-aider
-```
-
-### Gemini
-```bash
-# Interactive chat
-jbai-gemini
 
-# One-shot question
-jbai-gemini "What is Kubernetes?"
+# Use Gemini models with Aider
+jbai-aider --model gemini/gemini-2.5-pro
 ```
 
 ### OpenCode
@@ -110,8 +104,8 @@ jbai-claude --model claude-opus-4-1-20250805
 # Codex with GPT-5
 jbai-codex --model gpt-5-2025-08-07
 
-# Gemini with Pro
-jbai-gemini --model gemini-2.5-pro "Your question"
+# Aider with Gemini Pro
+jbai-aider --model gemini/gemini-2.5-pro
 ```
 
 ### Available Models
@@ -135,10 +129,10 @@ jbai-gemini --model gemini-2.5-pro "Your question"
 | `o3-2025-04-16` | Reasoning |
 | `o3-mini-2025-01-31` | |
 
-**Gemini (Google)**
+**Gemini (Google)** - Use with Aider: `jbai-aider --model gemini/<model>`
 | Model | Notes |
 |-------|-------|
-| `gemini-2.5-flash` | Default, fast |
+| `gemini-2.5-flash` | Fast |
 | `gemini-2.5-pro` | More capable |
 | `gemini-3-pro-preview` | Preview |
 | `gemini-3-flash-preview` | Preview |
@@ -152,12 +146,30 @@ jbai-gemini --model gemini-2.5-pro "Your question"
 | `jbai token set` | Set/update token |
 | `jbai test` | Test API connections |
 | `jbai models` | List all models |
+| `jbai install` | Install all AI tools |
+| `jbai install claude` | Install specific tool |
+| `jbai doctor` | Check tool installation status |
 | `jbai env staging` | Use staging environment |
 | `jbai env production` | Use production environment |
 
-## Prerequisites
+## Installing AI Tools
+
+jbai-cli can install the underlying tools for you:
+
+```bash
+# Install all tools at once
+jbai install
+
+# Install specific tool
+jbai install claude
+jbai install codex
+jbai install aider
+
+# Check what's installed
+jbai doctor
+```
 
-Install the underlying tools you want to use:
+### Manual Installation
 
 | Tool | Install Command |
 |------|-----------------|
@@ -165,7 +177,6 @@ Install the underlying tools you want to use:
 | Codex | `npm i -g @openai/codex` |
 | Aider | `pip install aider-chat` |
 | OpenCode | `go install github.com/opencode-ai/opencode@latest` |
-| Gemini | Built-in, no install needed |
 
 ## Token Management
 

package/bin/jbai-aider.js

@@ -49,7 +49,10 @@ const child = spawn('aider', aiderArgs, {
 
 child.on('error', (err) => {
   if (err.code === 'ENOENT') {
-    console.error('❌ Aider not found. Install: pip install aider-chat');
+    const tool = config.TOOLS.aider;
+    console.error(`❌ ${tool.name} not found.\n`);
+    console.error(`Install with: ${tool.install}`);
+    console.error(`Or run: jbai install aider`);
   } else {
     console.error(`Error: ${err.message}`);
   }

package/bin/jbai-claude.js

@@ -47,7 +47,10 @@ const child = spawn('claude', finalArgs, {
 
 child.on('error', (err) => {
   if (err.code === 'ENOENT') {
-    console.error('❌ Claude Code not found. Install: npm install -g @anthropic-ai/claude-code');
+    const tool = config.TOOLS.claude;
+    console.error(`❌ ${tool.name} not found.\n`);
+    console.error(`Install with: ${tool.install}`);
+    console.error(`Or run: jbai install claude`);
   } else {
     console.error(`Error: ${err.message}`);
   }

package/bin/jbai-codex.js

@@ -82,7 +82,10 @@ const child = spawn('codex', finalArgs, {
 
 child.on('error', (err) => {
   if (err.code === 'ENOENT') {
-    console.error('❌ Codex not found. Install: npm install -g @openai/codex');
+    const tool = config.TOOLS.codex;
+    console.error(`❌ ${tool.name} not found.\n`);
+    console.error(`Install with: ${tool.install}`);
+    console.error(`Or run: jbai install codex`);
   } else {
     console.error(`Error: ${err.message}`);
   }

package/bin/jbai-opencode.js

@@ -48,7 +48,10 @@ const child = spawn('opencode', finalArgs, {
 
 child.on('error', (err) => {
   if (err.code === 'ENOENT') {
-    console.error('❌ OpenCode not found. Install: go install github.com/opencode-ai/opencode@latest');
+    const tool = config.TOOLS.opencode;
+    console.error(`❌ ${tool.name} not found.\n`);
+    console.error(`Install with: ${tool.install}`);
+    console.error(`Or run: jbai install opencode`);
   } else {
     console.error(`Error: ${err.message}`);
   }

package/bin/jbai.js

@@ -1,10 +1,37 @@
 #!/usr/bin/env node
 
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const readline = require('readline');
 const https = require('https');
 const config = require('../lib/config');
 
+const TOOLS = {
+  claude: {
+    name: 'Claude Code',
+    command: 'claude',
+    install: 'npm install -g @anthropic-ai/claude-code',
+    check: 'claude --version'
+  },
+  codex: {
+    name: 'Codex CLI',
+    command: 'codex',
+    install: 'npm install -g @openai/codex',
+    check: 'codex --version'
+  },
+  aider: {
+    name: 'Aider',
+    command: 'aider',
+    install: 'pip install aider-chat',
+    check: 'aider --version'
+  },
+  opencode: {
+    name: 'OpenCode',
+    command: 'opencode',
+    install: 'go install github.com/opencode-ai/opencode@latest',
+    check: 'opencode --version'
+  }
+};
+
 const VERSION = require('../package.json').version;
 
 const HELP = `
@@ -17,13 +44,15 @@ COMMANDS:
   jbai test            Test all API endpoints
   jbai env [staging|production]  Switch environment
   jbai models          List available models
+  jbai install         Install all AI tools (claude, codex, aider)
+  jbai install claude  Install specific tool
+  jbai doctor          Check which tools are installed
   jbai help            Show this help
 
 TOOL WRAPPERS:
   jbai-claude   Launch Claude Code with JetBrains AI
   jbai-codex    Launch Codex CLI with JetBrains AI
   jbai-aider    Launch Aider with JetBrains AI
-  jbai-gemini   Launch Gemini with JetBrains AI
   jbai-opencode Launch OpenCode with JetBrains AI
 
 SUPER MODE:
@@ -218,6 +247,131 @@ function setEnvironment(env) {
   console.log(`   Token URL: ${config.ENDPOINTS[env].tokenUrl}`);
 }
 
+function isToolInstalled(toolKey) {
+  const tool = TOOLS[toolKey];
+  if (!tool) return false;
+  try {
+    execSync(`which ${tool.command}`, { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function doctor() {
+  console.log('Tool Status:\n');
+
+  const token = config.getToken();
+  console.log(`Token: ${token ? '✅ Set' : '❌ Not set'}`);
+  if (token) {
+    console.log(`Environment: ${config.getEnvironment()}`);
+    console.log(`Expired: ${config.isTokenExpired(token) ? '⚠️  Yes' : '✅ No'}`);
+  }
+  console.log('');
+
+  for (const [key, tool] of Object.entries(TOOLS)) {
+    const installed = isToolInstalled(key);
+    const status = installed ? '✅' : '❌';
+    console.log(`${status} ${tool.name.padEnd(12)} ${installed ? 'Installed' : 'Not installed'}`);
+    if (!installed) {
+      console.log(`   Install: ${tool.install}`);
+    }
+  }
+
+  console.log('\nTip: For Gemini models, use Aider: jbai-aider --model gemini/gemini-2.5-pro');
+}
+
+async function installTools(toolKey) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  const askConfirm = (question) => new Promise(resolve => {
+    rl.question(question, answer => resolve(answer.toLowerCase() === 'y' || answer === ''));
+  });
+
+  if (toolKey && toolKey !== 'all') {
+    // Install specific tool
+    const tool = TOOLS[toolKey];
+    if (!tool) {
+      console.log(`Unknown tool: ${toolKey}`);
+      console.log(`Available: ${Object.keys(TOOLS).join(', ')}`);
+      rl.close();
+      return;
+    }
+
+    if (isToolInstalled(toolKey)) {
+      console.log(`✅ ${tool.name} is already installed`);
+      rl.close();
+      return;
+    }
+
+    console.log(`Installing ${tool.name}...`);
+    console.log(`Running: ${tool.install}\n`);
+
+    try {
+      execSync(tool.install, { stdio: 'inherit' });
+      console.log(`\n✅ ${tool.name} installed successfully`);
+    } catch (e) {
+      console.log(`\n❌ Failed to install ${tool.name}`);
+    }
+    rl.close();
+    return;
+  }
+
+  // Install all tools
+  console.log('This will install the following tools:\n');
+
+  const toInstall = [];
+  for (const [key, tool] of Object.entries(TOOLS)) {
+    const installed = isToolInstalled(key);
+    if (installed) {
+      console.log(`✅ ${tool.name} - already installed`);
+    } else {
+      console.log(`📦 ${tool.name} - will install`);
+      console.log(`   ${tool.install}`);
+      toInstall.push({ key, tool });
+    }
+  }
+
+  if (toInstall.length === 0) {
+    console.log('\n✅ All tools are already installed!');
+    rl.close();
+    return;
+  }
+
+  console.log('');
+  const confirm = await askConfirm(`Install ${toInstall.length} tool(s)? [Y/n] `);
+
+  if (!confirm) {
+    console.log('Cancelled');
+    rl.close();
+    return;
+  }
+
+  for (const { key, tool } of toInstall) {
+    console.log(`\n📦 Installing ${tool.name}...`);
+    console.log(`Running: ${tool.install}\n`);
+
+    try {
+      execSync(tool.install, { stdio: 'inherit' });
+      console.log(`✅ ${tool.name} installed`);
+    } catch (e) {
+      console.log(`❌ Failed to install ${tool.name}`);
+      const skip = await askConfirm('Continue with other tools? [Y/n] ');
+      if (!skip) {
+        rl.close();
+        return;
+      }
+    }
+  }
+
+  rl.close();
+  console.log('\n✅ Installation complete!');
+  console.log('Run: jbai doctor  to verify');
+}
+
 // Main
 const [,, command, ...args] = process.argv;
 
@@ -238,6 +392,13 @@ switch (command) {
   case 'env':
     setEnvironment(args[0]);
     break;
+  case 'install':
+    installTools(args[0]);
+    break;
+  case 'doctor':
+  case 'status':
+    doctor();
+    break;
   case 'help':
   case '--help':
   case '-h':

package/lib/config.js

@@ -122,12 +122,36 @@ function isTokenExpired(token) {
   return expiry < new Date();
 }
 
+const TOOLS = {
+  claude: {
+    name: 'Claude Code',
+    command: 'claude',
+    install: 'npm install -g @anthropic-ai/claude-code'
+  },
+  codex: {
+    name: 'Codex CLI',
+    command: 'codex',
+    install: 'npm install -g @openai/codex'
+  },
+  aider: {
+    name: 'Aider',
+    command: 'aider',
+    install: 'pip install aider-chat'
+  },
+  opencode: {
+    name: 'OpenCode',
+    command: 'opencode',
+    install: 'go install github.com/opencode-ai/opencode@latest'
+  }
+};
+
 module.exports = {
   CONFIG_DIR,
   TOKEN_FILE,
   CONFIG_FILE,
   ENDPOINTS,
   MODELS,
+  TOOLS,
   ensureConfigDir,
   getToken,
   setToken,

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "jbai-cli",
-  "version": "1.1.0",
-  "description": "CLI wrappers to use AI coding tools (Claude Code, Codex, Aider, Gemini) with JetBrains AI Platform",
+  "version": "1.2.0",
+  "description": "CLI wrappers to use AI coding tools (Claude Code, Codex, Aider, OpenCode) with JetBrains AI Platform",
   "keywords": [
     "jetbrains",
     "ai",
     "claude",
     "codex",
     "aider",
-    "gemini",
+    "opencode",
     "cli",
     "openai",
     "anthropic"
@@ -28,7 +28,6 @@
     "jbai-claude": "./bin/jbai-claude.js",
     "jbai-codex": "./bin/jbai-codex.js",
     "jbai-aider": "./bin/jbai-aider.js",
-    "jbai-gemini": "./bin/jbai-gemini.js",
     "jbai-opencode": "./bin/jbai-opencode.js"
   },
   "files": [

package/bin/jbai-gemini.js

@@ -1,136 +0,0 @@
-#!/usr/bin/env node
-
-const https = require('https');
-const readline = require('readline');
-const config = require('../lib/config');
-
-const token = config.getToken();
-if (!token) {
-  console.error('❌ No token found. Run: jbai token set');
-  process.exit(1);
-}
-
-if (config.isTokenExpired(token)) {
-  console.error('⚠️  Token expired. Run: jbai token refresh');
-  process.exit(1);
-}
-
-const endpoints = config.getEndpoints();
-const args = process.argv.slice(2);
-
-// Get model from args or use default
-let model = config.MODELS.gemini.default;
-const modelIdx = args.indexOf('--model');
-if (modelIdx !== -1 && args[modelIdx + 1]) {
-  model = args[modelIdx + 1];
-}
-
-// If prompt provided as argument, run one-shot
-const prompt = args.filter((a, i) =>
-  a !== '--model' && (modelIdx === -1 || i !== modelIdx + 1)
-).join(' ');
-
-if (prompt) {
-  runPrompt(prompt, model);
-} else {
-  runInteractive(model);
-}
-
-async function runPrompt(prompt, model) {
-  const url = `${endpoints.google}/v1/projects/default/locations/default/publishers/google/models/${model}:generateContent`;
-
-  try {
-    const result = await httpPost(url, {
-      contents: [{ role: 'user', parts: [{ text: prompt }] }]
-    }, { 'Grazie-Authenticate-JWT': token });
-
-    if (result.candidates && result.candidates[0]) {
-      console.log(result.candidates[0].content.parts[0].text);
-    } else if (result.error) {
-      console.error(`Error: ${result.error.message}`);
-    }
-  } catch (e) {
-    console.error(`Error: ${e.message}`);
-  }
-}
-
-async function runInteractive(model) {
-  console.log(`Gemini Interactive (${model})`);
-  console.log('Type your message, press Enter to send. Ctrl+C to exit.\n');
-
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-
-  const history = [];
-
-  const askQuestion = () => {
-    rl.question('You: ', async (input) => {
-      if (!input.trim()) {
-        askQuestion();
-        return;
-      }
-
-      history.push({ role: 'user', parts: [{ text: input }] });
-
-      const url = `${endpoints.google}/v1/projects/default/locations/default/publishers/google/models/${model}:generateContent`;
-
-      try {
-        const result = await httpPost(url, { contents: history }, { 'Grazie-Authenticate-JWT': token });
-
-        if (result.candidates && result.candidates[0]) {
-          const response = result.candidates[0].content.parts[0].text;
-          history.push({ role: 'model', parts: [{ text: response }] });
-          console.log(`\nGemini: ${response}\n`);
-        } else if (result.error) {
-          console.error(`Error: ${result.error.message}\n`);
-        }
-      } catch (e) {
-        console.error(`Error: ${e.message}\n`);
-      }
-
-      askQuestion();
-    });
-  };
-
-  rl.on('close', () => {
-    console.log('\nGoodbye!');
-    process.exit(0);
-  });
-
-  askQuestion();
-}
-
-function httpPost(url, body, headers) {
-  return new Promise((resolve, reject) => {
-    const urlObj = new URL(url);
-    const data = JSON.stringify(body);
-
-    const req = https.request({
-      hostname: urlObj.hostname,
-      port: 443,
-      path: urlObj.pathname,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(data),
-        ...headers
-      }
-    }, (res) => {
-      let body = '';
-      res.on('data', chunk => body += chunk);
-      res.on('end', () => {
-        try {
-          resolve(JSON.parse(body));
-        } catch {
-          reject(new Error('Invalid response'));
-        }
-      });
-    });
-
-    req.on('error', reject);
-    req.write(data);
-    req.end();
-  });
-}