jbai-cli 1.1.1 → 1.2.3

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 |
@@ -181,9 +175,8 @@ jbai doctor
 |------|-----------------|
 | Claude Code | `npm i -g @anthropic-ai/claude-code` |
 | Codex | `npm i -g @openai/codex` |
-| Aider | `pip install aider-chat` |
+| Aider | `python3 -m pip install aider-chat` |
 | OpenCode | `go install github.com/opencode-ai/opencode@latest` |
-| Gemini | Built-in, no install needed |
 
 ## Token Management
 

package/bin/jbai-claude.js

@@ -33,13 +33,16 @@ if (superMode) {
 }
 
 // Set environment for Claude Code
+// Only set API_KEY (not AUTH_TOKEN) to avoid conflicts
 const env = {
   ...process.env,
   ANTHROPIC_BASE_URL: endpoints.anthropic,
-  ANTHROPIC_API_KEY: token,
-  ANTHROPIC_AUTH_TOKEN: token
+  ANTHROPIC_API_KEY: token
 };
 
+// Remove any existing auth token that might conflict
+delete env.ANTHROPIC_AUTH_TOKEN;
+
 const child = spawn('claude', finalArgs, {
   stdio: 'inherit',
   env

package/bin/jbai-opencode.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
 
 const { spawn } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 const config = require('../lib/config');
 
 const token = config.getToken();
@@ -15,6 +18,7 @@ if (config.isTokenExpired(token)) {
 }
 
 const endpoints = config.getEndpoints();
+const environment = config.getEnvironment();
 let args = process.argv.slice(2);
 
 // Check for super mode (--super, --yolo, -s)
@@ -22,28 +26,84 @@ const superFlags = ['--super', '--yolo', '-s'];
 const superMode = args.some(a => superFlags.includes(a));
 args = args.filter(a => !superFlags.includes(a));
 
+// Setup OpenCode config with JetBrains provider
+const configDir = path.join(os.homedir(), '.config', 'opencode');
+const configFile = path.join(configDir, 'opencode.json');
+
+if (!fs.existsSync(configDir)) {
+  fs.mkdirSync(configDir, { recursive: true });
+}
+
+// Create or update OpenCode config with JetBrains provider
+const providerName = environment === 'staging' ? 'jbai-staging' : 'jbai';
+let opencodeConfig = {};
+
+if (fs.existsSync(configFile)) {
+  try {
+    opencodeConfig = JSON.parse(fs.readFileSync(configFile, 'utf-8'));
+  } catch {
+    opencodeConfig = {};
+  }
+}
+
+// Ensure provider section exists
+if (!opencodeConfig.provider) {
+  opencodeConfig.provider = {};
+}
+
+// Environment variable name for the token
+const envVarName = environment === 'staging' ? 'GRAZIE_STAGING_TOKEN' : 'GRAZIE_API_TOKEN';
+
+// Add/update JetBrains provider with custom header (using env var reference)
+opencodeConfig.provider[providerName] = {
+  npm: '@ai-sdk/anthropic',
+  name: `JetBrains AI (${environment})`,
+  options: {
+    baseURL: endpoints.anthropic,
+    apiKey: `{env:${envVarName}}`,
+    headers: {
+      'Grazie-Authenticate-JWT': `{env:${envVarName}}`
+    }
+  },
+  models: {}
+};
+
+// Add Claude models
+config.MODELS.claude.available.forEach(model => {
+  opencodeConfig.provider[providerName].models[model] = {
+    name: model
+  };
+});
+
+// Write config
+fs.writeFileSync(configFile, JSON.stringify(opencodeConfig, null, 2));
+
 // Check if model specified
 const hasModel = args.includes('--model') || args.includes('-m');
-let finalArgs = hasModel ? args : ['--model', config.MODELS.claude.default, ...args];
+let finalArgs = [];
+
+if (!hasModel) {
+  // Use provider/model format for OpenCode
+  finalArgs.push('--model', `${providerName}/${config.MODELS.claude.default}`);
+}
 
 // Add super mode flags
 if (superMode) {
-  finalArgs = ['--yes', ...finalArgs];
+  finalArgs.push('--yes');
   console.log('🚀 Super mode: --yes (auto-confirm) enabled');
 }
 
-// Set environment for OpenCode
-const env = {
+finalArgs.push(...args);
+
+// Set the token in environment variable for OpenCode config to reference
+const childEnv = {
   ...process.env,
-  ANTHROPIC_BASE_URL: endpoints.anthropic,
-  ANTHROPIC_API_KEY: token,
-  OPENAI_API_BASE: endpoints.openai,
-  OPENAI_API_KEY: token
+  [envVarName]: token
 };
 
 const child = spawn('opencode', finalArgs, {
   stdio: 'inherit',
-  env
+  env: childEnv
 });
 
 child.on('error', (err) => {

package/bin/jbai.js

@@ -21,7 +21,7 @@ const TOOLS = {
   aider: {
     name: 'Aider',
     command: 'aider',
-    install: 'pip install aider-chat',
+    install: 'python3 -m pip install aider-chat',
     check: 'aider --version'
   },
   opencode: {
@@ -53,7 +53,6 @@ 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:
@@ -279,7 +278,7 @@ function doctor() {
     }
   }
 
-  console.log('\n✅ Gemini       Built-in (no install needed)');
+  console.log('\nTip: For Gemini models, use Aider: jbai-aider --model gemini/gemini-2.5-pro');
 }
 
 async function installTools(toolKey) {

package/lib/config.js

@@ -136,7 +136,7 @@ const TOOLS = {
   aider: {
     name: 'Aider',
     command: 'aider',
-    install: 'pip install aider-chat'
+    install: 'python3 -m pip install aider-chat'
   },
   opencode: {
     name: 'OpenCode',

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "jbai-cli",
-  "version": "1.1.1",
-  "description": "CLI wrappers to use AI coding tools (Claude Code, Codex, Aider, Gemini) with JetBrains AI Platform",
+  "version": "1.2.3",
+  "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();
-  });
-}