jbai-cli 1.3.0 → 1.4.0

package/README.md

@@ -89,8 +89,8 @@ jbai-aider --super
 | Claude Code | `--dangerously-skip-permissions` |
 | Codex | `--full-auto` |
 | Aider | `--yes` |
-| Gemini CLI | `--yes` |
-| OpenCode | `--yes` |
+| Gemini CLI | `--yolo` |
+| OpenCode | N/A (run mode is already non-interactive) |
 
 ⚠️ **Use with caution** - super mode allows the AI to make changes without confirmation.
 

package/bin/jbai-aider.js

@@ -1,6 +1,10 @@
 #!/usr/bin/env node
 
 const { spawn } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const yaml = require('yaml');
 const config = require('../lib/config');
 
 const token = config.getToken();
@@ -15,6 +19,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,12 +27,39 @@ const superFlags = ['--super', '--yolo', '-s'];
 const superMode = args.some(a => superFlags.includes(a));
 args = args.filter(a => !superFlags.includes(a));
 
+// Create model settings file with extra headers for JetBrains authentication
+const configDir = path.join(os.homedir(), '.jbai');
+const modelSettingsFile = path.join(configDir, 'aider-model-settings.yml');
+
+// Ensure config directory exists
+if (!fs.existsSync(configDir)) {
+  fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
+}
+
+// Create model settings with extra_headers for authentication
+// Use aider/extra_params for global settings that apply to all models
+const modelSettings = [
+  {
+    name: 'aider/extra_params',
+    extra_params: {
+      extra_headers: {
+        'Grazie-Authenticate-JWT': token
+      }
+    }
+  }
+];
+
+// Write model settings file
+fs.writeFileSync(modelSettingsFile, yaml.stringify(modelSettings), { mode: 0o600 });
+
 // Build aider arguments
+// Note: --no-stream is required because JetBrains proxy has stream_options issues
 const hasModel = args.includes('--model');
 const aiderArgs = [
   '--openai-api-base', endpoints.openai,
   '--openai-api-key', 'placeholder',
-  '--extra-headers', JSON.stringify({ 'Grazie-Authenticate-JWT': token })
+  '--model-settings-file', modelSettingsFile,
+  '--no-stream'
 ];
 
 if (!hasModel) {

package/bin/jbai-gemini.js

@@ -32,10 +32,10 @@ args = args.filter(a => !superFlags.includes(a));
 const hasModel = args.includes('--model') || args.includes('-m');
 let finalArgs = hasModel ? args : ['--model', config.MODELS.gemini.default, ...args];
 
-// Add super mode flags (auto-confirm)
+// Add super mode flags (auto-confirm) - Gemini uses --yolo
 if (superMode) {
-  finalArgs = ['--yes', ...finalArgs];
-  console.log('🚀 Super mode: --yes (auto-confirm) enabled');
+  finalArgs = ['--yolo', ...finalArgs];
+  console.log('🚀 Super mode: --yolo (auto-confirm) enabled');
 }
 
 // Set environment for Gemini CLI

package/bin/jbai-opencode.js

@@ -54,12 +54,14 @@ if (!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)
+// Provider names for OpenAI and Anthropic
+const anthropicProviderName = environment === 'staging' ? 'jbai-anthropic-staging' : 'jbai-anthropic';
+
+// Add/update JetBrains OpenAI provider with custom header (using env var reference)
 // Use openai-compatible SDK which properly sends custom headers
-// Point to OpenAI endpoint for compatibility
 opencodeConfig.provider[providerName] = {
   npm: '@ai-sdk/openai-compatible',
-  name: `JetBrains AI (${environment})`,
+  name: `JetBrains AI OpenAI (${environment})`,
   options: {
     baseURL: endpoints.openai,
     apiKey: `{env:${envVarName}}`,
@@ -70,15 +72,48 @@ opencodeConfig.provider[providerName] = {
   models: {}
 };
 
-// Add OpenAI models (since we use openai-compatible SDK)
-// Set context and output limits to avoid "max_tokens too large" errors
+// Add OpenAI models
 config.MODELS.openai.available.forEach(model => {
   opencodeConfig.provider[providerName].models[model] = {
     name: model,
-    limit: {
-      context: 128000,
-      output: 8192
+    limit: { context: 128000, output: 8192 }
+  };
+});
+
+// Add other provider models (DeepSeek, Mistral, Qwen, XAI, Meta) via OpenAI endpoint
+const otherModels = [
+  ...config.MODELS.other.deepseek,
+  ...config.MODELS.other.mistral,
+  ...config.MODELS.other.qwen,
+  ...config.MODELS.other.xai,
+  ...config.MODELS.other.meta
+];
+otherModels.forEach(model => {
+  opencodeConfig.provider[providerName].models[model] = {
+    name: model,
+    limit: { context: 128000, output: 8192 }
+  };
+});
+
+// Add JetBrains Anthropic provider for Claude models
+opencodeConfig.provider[anthropicProviderName] = {
+  npm: '@ai-sdk/anthropic',
+  name: `JetBrains AI Anthropic (${environment})`,
+  options: {
+    baseURL: endpoints.anthropic,
+    apiKey: `{env:${envVarName}}`,
+    headers: {
+      'Grazie-Authenticate-JWT': `{env:${envVarName}}`
     }
+  },
+  models: {}
+};
+
+// Add Claude models to Anthropic provider
+config.MODELS.claude.available.forEach(model => {
+  opencodeConfig.provider[anthropicProviderName].models[model] = {
+    name: model,
+    limit: { context: 200000, output: 8192 }
   };
 });
 
@@ -94,10 +129,9 @@ if (!hasModel) {
   finalArgs.push('--model', `${providerName}/${config.MODELS.openai.default}`);
 }
 
-// Add super mode flags
+// Note: OpenCode run is already non-interactive, no super mode needed
 if (superMode) {
-  finalArgs.push('--yes');
-  console.log('🚀 Super mode: --yes (auto-confirm) enabled');
+  console.log('ℹ️  OpenCode run is already non-interactive (no super mode flag needed)');
 }
 
 finalArgs.push(...args);

package/bin/jbai.js

@@ -219,25 +219,51 @@ function httpPost(url, body, headers) {
 }
 
 function showModels() {
-  console.log('Available Models:\n');
+  console.log('Available Models via JetBrains AI Platform (Grazie):\n');
 
-  console.log('Claude (Anthropic):');
-  config.MODELS.claude.available.forEach((m, i) => {
+  console.log('Claude (Anthropic) - jbai-claude:');
+  config.MODELS.claude.available.forEach((m) => {
     const def = m === config.MODELS.claude.default ? ' (default)' : '';
     console.log(`  - ${m}${def}`);
   });
 
-  console.log('\nGPT (OpenAI):');
-  config.MODELS.openai.available.forEach((m, i) => {
+  console.log('\nGPT (OpenAI) - jbai-codex, jbai-aider:');
+  config.MODELS.openai.available.forEach((m) => {
     const def = m === config.MODELS.openai.default ? ' (default)' : '';
     console.log(`  - ${m}${def}`);
   });
 
-  console.log('\nGemini (Google):');
-  config.MODELS.gemini.available.forEach((m, i) => {
+  console.log('\nGemini (Google) - jbai-gemini:');
+  config.MODELS.gemini.available.forEach((m) => {
     const def = m === config.MODELS.gemini.default ? ' (default)' : '';
     console.log(`  - ${m}${def}`);
   });
+
+  console.log('\nDeepSeek - jbai-aider, jbai-opencode:');
+  config.MODELS.other.deepseek.forEach((m) => console.log(`  - ${m}`));
+
+  console.log('\nMistral - jbai-aider, jbai-opencode:');
+  config.MODELS.other.mistral.forEach((m) => console.log(`  - ${m}`));
+
+  console.log('\nQwen - jbai-aider, jbai-opencode:');
+  config.MODELS.other.qwen.forEach((m) => console.log(`  - ${m}`));
+
+  console.log('\nXAI (Grok) - jbai-aider, jbai-opencode:');
+  config.MODELS.other.xai.forEach((m) => console.log(`  - ${m}`));
+
+  console.log('\nMeta (Llama) - jbai-aider, jbai-opencode:');
+  config.MODELS.other.meta.forEach((m) => console.log(`  - ${m}`));
+
+  // Count total
+  const total = config.MODELS.claude.available.length +
+    config.MODELS.openai.available.length +
+    config.MODELS.gemini.available.length +
+    config.MODELS.other.deepseek.length +
+    config.MODELS.other.mistral.length +
+    config.MODELS.other.qwen.length +
+    config.MODELS.other.xai.length +
+    config.MODELS.other.meta.length;
+  console.log(`\nTotal: ${total} models`);
 }
 
 function setEnvironment(env) {

package/lib/config.js

@@ -12,6 +12,7 @@ const ENDPOINTS = {
     openai: 'https://api.stgn.jetbrains.ai/user/v5/llm/openai/v1',
     anthropic: 'https://api.stgn.jetbrains.ai/user/v5/llm/anthropic/v1',
     google: 'https://api.stgn.jetbrains.ai/user/v5/llm/google/v1/vertex',
+    profiles: 'https://api.stgn.jetbrains.ai/user/v5/llm/profiles',
     tokenUrl: 'https://platform.stgn.jetbrains.ai/'
   },
   production: {
@@ -19,43 +20,99 @@ const ENDPOINTS = {
     openai: 'https://api.jetbrains.ai/user/v5/llm/openai/v1',
     anthropic: 'https://api.jetbrains.ai/user/v5/llm/anthropic/v1',
     google: 'https://api.jetbrains.ai/user/v5/llm/google/v1/vertex',
+    profiles: 'https://api.jetbrains.ai/user/v5/llm/profiles',
     tokenUrl: 'https://platform.jetbrains.ai/'
   }
 };
 
+// All models available from JetBrains AI Platform (Grazie)
+// Model names are mapped to SDK-compatible format
 const MODELS = {
   claude: {
     default: 'claude-sonnet-4-5-20250929',
     available: [
+      // Claude 4.x series (latest)
+      'claude-opus-4-5-20250929',
       'claude-sonnet-4-5-20250929',
+      'claude-haiku-4-5-20250929',
       'claude-opus-4-1-20250805',
+      'claude-opus-4-20250514',
       'claude-sonnet-4-20250514',
+      // Claude 3.x series
       'claude-3-7-sonnet-20250219',
-      'claude-3-5-haiku-20241022'
+      'claude-3-5-sonnet-20241022',
+      'claude-3-5-haiku-20241022',
+      'claude-3-haiku-20240307'
     ]
   },
   openai: {
-    default: 'gpt-4o-2024-11-20',
+    default: 'gpt-4o',
     available: [
-      'gpt-4o-2024-11-20',
-      'gpt-5-2025-08-07',
-      'gpt-5.1-2025-11-13',
-      'gpt-5-mini-2025-08-07',
-      'o3-2025-04-16',
-      'o3-mini-2025-01-31'
+      // GPT-5.x series (latest)
+      'gpt-5',
+      'gpt-5.1',
+      'gpt-5.2',
+      'gpt-5-mini',
+      'gpt-5-nano',
+      'gpt-5-codex',
+      'gpt-5.1-codex',
+      'gpt-5.1-codex-max',
+      'gpt-5.1-codex-mini',
+      'gpt-5.2-codex',
+      'gpt-5.2-pro',
+      // GPT-4.x series
+      'gpt-4.1',
+      'gpt-4.1-mini',
+      'gpt-4.1-nano',
+      'gpt-4o',
+      'gpt-4o-mini',
+      'gpt-4-turbo',
+      'gpt-4',
+      // O-series (reasoning)
+      'o1',
+      'o3',
+      'o3-mini',
+      'o4-mini'
     ]
   },
   gemini: {
     default: 'gemini-2.5-flash',
     available: [
-      'gemini-2.5-flash',
+      // Gemini 3.x (latest)
+      'gemini-3.0-pro',
+      'gemini-3.0-flash',
+      // Gemini 2.x
       'gemini-2.5-pro',
-      'gemini-3-pro-preview',
-      'gemini-3-flash-preview'
+      'gemini-2.5-flash',
+      'gemini-2.5-flash-lite',
+      'gemini-2.0-flash',
+      'gemini-2.0-flash-lite'
     ]
+  },
+  // Other providers available via Grazie
+  other: {
+    deepseek: ['deepseek-r1'],
+    mistral: ['mistral-large', 'mistral-small', 'mistral-codestral', 'mistral-open-7b', 'mixtral-open-8x7b', 'mixtral-open-8x22b'],
+    qwen: ['qwen-max', 'qwen-max-longcontext', 'qwen-plus', 'qwen-turbo'],
+    xai: ['xai-grok-4', 'xai-grok-4-fast', 'xai-grok-4-1-fast', 'xai-grok-code-fast-1'],
+    meta: ['grazie-chat-llama-v3-8b-instruct']
   }
 };
 
+// All models for tools that support multiple providers (like Aider, OpenCode)
+const ALL_MODELS = {
+  openai: MODELS.openai.available,
+  anthropic: MODELS.claude.available,
+  gemini: MODELS.gemini.available,
+  other: [
+    ...MODELS.other.deepseek,
+    ...MODELS.other.mistral,
+    ...MODELS.other.qwen,
+    ...MODELS.other.xai,
+    ...MODELS.other.meta
+  ]
+};
+
 function ensureConfigDir() {
   if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
@@ -136,7 +193,7 @@ const TOOLS = {
   aider: {
     name: 'Aider',
     command: 'aider',
-    install: 'pipx install aider-chat'
+    install: 'brew install aider'
   },
   gemini: {
     name: 'Gemini CLI',
@@ -156,6 +213,7 @@ module.exports = {
   CONFIG_FILE,
   ENDPOINTS,
   MODELS,
+  ALL_MODELS,
   TOOLS,
   ensureConfigDir,
   getToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jbai-cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "CLI wrappers to use AI coding tools (Claude Code, Codex, Aider, Gemini CLI, OpenCode) with JetBrains AI Platform",
   "keywords": [
     "jetbrains",
@@ -41,6 +41,9 @@
   "engines": {
     "node": ">=18.0.0"
   },
+  "dependencies": {
+    "yaml": "^2.7.1"
+  },
   "scripts": {
     "postinstall": "node lib/postinstall.js",
     "test": "node bin/jbai.js test"