jbai-cli 1.2.0 → 1.2.4

package/README.md

@@ -175,7 +175,7 @@ jbai doctor
 |------|-----------------|
 | Claude Code | `npm i -g @anthropic-ai/claude-code` |
 | Codex | `npm i -g @openai/codex` |
-| Aider | `pip install aider-chat` |
+| Aider | `pipx install aider-chat` |
 | OpenCode | `go install github.com/opencode-ai/opencode@latest` |
 
 ## 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: 'pipx install aider-chat',
     check: 'aider --version'
   },
   opencode: {

package/lib/config.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jbai-cli",
-  "version": "1.2.0",
+  "version": "1.2.4",
   "description": "CLI wrappers to use AI coding tools (Claude Code, Codex, Aider, OpenCode) with JetBrains AI Platform",
   "keywords": [
     "jetbrains",