jbai-cli 1.6.0 → 1.8.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 CLI, OpenCode.
+One token, all tools: Claude Code, Codex, Aider, Gemini CLI, OpenCode, **Codex Desktop, Cursor**.
 
 ## Install
 
@@ -41,7 +41,99 @@ Testing JetBrains AI Platform (staging)
 4. Google Proxy (Gemini): ✅ Working
 ```
 
-## Usage
+## Local Proxy (for Codex Desktop, Cursor, and other GUI tools)
+
+jbai-cli includes a **local reverse proxy** that lets any tool with custom base URL support work through JetBrains AI Platform — no per-tool wrappers needed.
+
+### One-liner setup
+
+```bash
+jbai proxy setup
+```
+
+This single command:
+- Starts the proxy on `localhost:18080` (auto-starts on login via launchd)
+- Configures **Codex Desktop** (`~/.codex/config.toml`)
+- Adds the `JBAI_PROXY_KEY` env var to your shell
+
+### How it works
+
+```
+Codex Desktop / Cursor / any tool
+    │  standard OpenAI / Anthropic API calls
+    ▼
+http://localhost:18080
+    │  injects Grazie-Authenticate-JWT header
+    │  routes to correct provider endpoint
+    ▼
+https://api.jetbrains.ai/user/v5/llm/{provider}/v1
+    │
+    ▼
+Actual LLM (GPT, Claude, Gemini)
+```
+
+### Codex Desktop
+
+After `jbai proxy setup`, Codex Desktop works automatically. The setup configures `~/.codex/config.toml` with:
+```toml
+model_provider = "jbai-proxy"
+
+[model_providers.jbai-proxy]
+name = "JetBrains AI (Proxy)"
+base_url = "http://localhost:18080/openai/v1"
+env_key = "JBAI_PROXY_KEY"
+wire_api = "responses"
+```
+
+### Cursor
+
+Cursor requires manual configuration via its UI:
+1. Open **Cursor** → **Settings** (gear icon) → **Models**
+2. Enable **"Override OpenAI Base URL"**
+3. Set:
+   - **Base URL**: `http://localhost:18080/openai/v1`
+   - **API Key**: `placeholder`
+4. Click **Verify**
+
+### Any OpenAI-compatible tool
+
+Point it to the proxy:
+```bash
+export OPENAI_BASE_URL=http://localhost:18080/openai/v1
+export OPENAI_API_KEY=placeholder
+```
+
+For Anthropic-compatible tools:
+```bash
+export ANTHROPIC_BASE_URL=http://localhost:18080/anthropic
+export ANTHROPIC_API_KEY=placeholder
+```
+
+### Proxy commands
+
+| Command | Description |
+|---------|-------------|
+| `jbai proxy setup` | One-liner: configure everything + start |
+| `jbai proxy status` | Check if proxy is running |
+| `jbai proxy stop` | Stop the proxy |
+| `jbai proxy --daemon` | Start proxy in background |
+| `jbai proxy install-service` | Auto-start on login (macOS launchd) |
+| `jbai proxy uninstall-service` | Remove auto-start |
+
+### Proxy routes
+
+| Route | Target |
+|-------|--------|
+| `/openai/v1/*` | Grazie OpenAI endpoint |
+| `/anthropic/v1/*` | Grazie Anthropic endpoint |
+| `/google/v1/*` | Grazie Google endpoint |
+| `/v1/chat/completions` | OpenAI (auto-detect) |
+| `/v1/responses` | OpenAI (auto-detect) |
+| `/v1/messages` | Anthropic (auto-detect) |
+| `/v1/models` | Synthetic model list |
+| `/health` | Proxy status |
+
+## CLI Tool Wrappers
 
 ### Claude Code
 ```bash
@@ -126,8 +218,6 @@ jbai-aider --super
 | 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.
-
 ## Using Different Models
 
 Each tool has a sensible default, but you can specify any available model:
@@ -190,6 +280,9 @@ jbai-aider --model gemini/gemini-2.5-pro
 | `jbai token set` | Set/update token |
 | `jbai test` | Test API connections |
 | `jbai models` | List all models |
+| `jbai proxy setup` | Setup proxy + configure Codex Desktop |
+| `jbai proxy status` | Check proxy status |
+| `jbai proxy stop` | Stop proxy |
 | `jbai handoff` | Continue a task in Orca Lab |
 | `jbai install` | Install all AI tools |
 | `jbai install claude` | Install specific tool |
@@ -257,6 +350,10 @@ jbai-cli uses JetBrains AI Platform's **Guarded Proxy**, which provides API-comp
 
 Your JetBrains AI token authenticates all requests via the `Grazie-Authenticate-JWT` header.
 
+**CLI wrappers** (`jbai-claude`, `jbai-codex`, etc.) set environment variables and launch the underlying tool directly.
+
+**Local proxy** (`jbai proxy`) runs an HTTP server on localhost that forwards requests to Grazie, injecting the JWT header automatically. This enables GUI tools like Codex Desktop and Cursor that don't support custom headers but do support custom base URLs.
+
 ## Troubleshooting
 
 ### "Token expired"
@@ -279,6 +376,21 @@ jbai test
 jbai token
 ```
 
+### Proxy not working
+```bash
+# Check proxy status
+jbai proxy status
+
+# Check proxy health
+curl http://localhost:18080/health
+
+# Check logs
+cat ~/.jbai/proxy.log
+
+# Restart proxy
+jbai proxy stop && jbai proxy --daemon
+```
+
 ### Wrong environment
 ```bash
 # Staging token won't work with production

package/bin/jbai-claude.js

@@ -2,76 +2,69 @@
 
 const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
 const config = require('../lib/config');
+const { ensureToken } = require('../lib/ensure-token');
 
-const token = config.getToken();
-if (!token) {
-  console.error('❌ No token found. Run: jbai token set');
-  process.exit(1);
-}
+(async () => {
+  const token = await ensureToken();
+  const endpoints = config.getEndpoints();
+  let args = process.argv.slice(2);
+  const handoffConfig = stripHandoffFlag(args);
+  args = handoffConfig.args;
 
-if (config.isTokenExpired(token)) {
-  console.error('⚠️  Token expired. Run: jbai token refresh');
-  process.exit(1);
-}
+  // Check for super mode (--super, --yolo, -s)
+  const superFlags = ['--super', '--yolo', '-s'];
+  const superMode = args.some(a => superFlags.includes(a));
+  args = args.filter(a => !superFlags.includes(a));
 
-const endpoints = config.getEndpoints();
-let args = process.argv.slice(2);
-const handoffConfig = stripHandoffFlag(args);
-args = handoffConfig.args;
+  // Check if model specified
+  const hasModel = args.includes('--model') || args.includes('-m');
+  let finalArgs = hasModel ? args : ['--model', config.MODELS.claude.default, ...args];
 
-// Check for super mode (--super, --yolo, -s)
-const superFlags = ['--super', '--yolo', '-s'];
-const superMode = args.some(a => superFlags.includes(a));
-args = args.filter(a => !superFlags.includes(a));
+  // Add super mode flags
+  if (superMode) {
+    finalArgs = ['--dangerously-skip-permissions', ...finalArgs];
+    console.log('🚀 Super mode: --dangerously-skip-permissions enabled');
+  }
 
-// Check if model specified
-const hasModel = args.includes('--model') || args.includes('-m');
-let finalArgs = hasModel ? args : ['--model', config.MODELS.claude.default, ...args];
+  // Set environment for Claude Code
+  // Use ANTHROPIC_CUSTOM_HEADERS for the Grazie auth header
+  // Remove /v1 from endpoint - Claude Code adds it automatically
+  const baseUrl = endpoints.anthropic.replace(/\/v1$/, '');
+  const env = {
+    ...process.env,
+    ANTHROPIC_BASE_URL: baseUrl,
+    ANTHROPIC_API_KEY: 'placeholder',
+    ANTHROPIC_CUSTOM_HEADERS: `Grazie-Authenticate-JWT: ${token}`
+  };
 
-// Add super mode flags
-if (superMode) {
-  finalArgs = ['--dangerously-skip-permissions', ...finalArgs];
-  console.log('🚀 Super mode: --dangerously-skip-permissions enabled');
-}
+  // Remove any existing auth token that might conflict
+  delete env.ANTHROPIC_AUTH_TOKEN;
 
-// Set environment for Claude Code
-// Use ANTHROPIC_CUSTOM_HEADERS for the Grazie auth header
-// Remove /v1 from endpoint - Claude Code adds it automatically
-const baseUrl = endpoints.anthropic.replace(/\/v1$/, '');
-const env = {
-  ...process.env,
-  ANTHROPIC_BASE_URL: baseUrl,
-  ANTHROPIC_API_KEY: 'placeholder',
-  ANTHROPIC_CUSTOM_HEADERS: `Grazie-Authenticate-JWT: ${token}`
-};
-
-// Remove any existing auth token that might conflict
-delete env.ANTHROPIC_AUTH_TOKEN;
-
-const child = runWithHandoff({
-  command: 'claude',
-  args: finalArgs,
-  env,
-  toolName: 'jbai-claude',
-  handoffDefaults: {
-    enabled: !handoffConfig.disabled,
-    grazieToken: token,
-    grazieEnvironment: config.getEnvironment() === 'production' ? 'PRODUCTION' : 'STAGING',
-    grazieModel: config.MODELS.claude.default,
-    cwd: process.cwd(),
-  },
-});
-
-if (child && typeof child.on === 'function') {
-  child.on('error', (err) => {
-    if (err.code === 'ENOENT') {
-      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}`);
-    }
-    process.exit(1);
+  const child = runWithHandoff({
+    command: 'claude',
+    args: finalArgs,
+    env,
+    toolName: 'jbai-claude',
+    handoffDefaults: {
+      enabled: !handoffConfig.disabled,
+      grazieToken: token,
+      grazieEnvironment: config.getEnvironment() === 'production' ? 'PRODUCTION' : 'STAGING',
+      grazieModel: config.MODELS.claude.default,
+      cwd: process.cwd(),
+    },
   });
-}
+
+  if (child && typeof child.on === 'function') {
+    child.on('error', (err) => {
+      if (err.code === 'ENOENT') {
+        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}`);
+      }
+      process.exit(1);
+    });
+  }
+})();

package/bin/jbai-codex.js

@@ -5,47 +5,39 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 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 environment = config.getEnvironment();
-const providerName = environment === 'staging' ? 'jbai-staging' : 'jbai';
-const envVarName = environment === 'staging' ? 'GRAZIE_STAGING_TOKEN' : 'GRAZIE_API_TOKEN';
-let args = process.argv.slice(2);
-const handoffConfig = stripHandoffFlag(args);
-args = handoffConfig.args;
-
-// Check for super mode (--super, --yolo, -s)
-const superFlags = ['--super', '--yolo', '-s'];
-const superMode = args.some(a => superFlags.includes(a));
-args = args.filter(a => !superFlags.includes(a));
-
-// Ensure Codex config exists
-const codexDir = path.join(os.homedir(), '.codex');
-const codexConfig = path.join(codexDir, 'config.toml');
-
-if (!fs.existsSync(codexDir)) {
-  fs.mkdirSync(codexDir, { recursive: true });
-}
-
-// Check if our provider is configured
-let configContent = '';
-if (fs.existsSync(codexConfig)) {
-  configContent = fs.readFileSync(codexConfig, 'utf-8');
-}
-
-if (!configContent.includes(`[model_providers.${providerName}]`)) {
-  const providerConfig = `
+const { ensureToken } = require('../lib/ensure-token');
+
+(async () => {
+  const token = await ensureToken();
+  const endpoints = config.getEndpoints();
+  const environment = config.getEnvironment();
+  const providerName = environment === 'staging' ? 'jbai-staging' : 'jbai';
+  const envVarName = environment === 'staging' ? 'GRAZIE_STAGING_TOKEN' : 'GRAZIE_API_TOKEN';
+  let args = process.argv.slice(2);
+  const handoffConfig = stripHandoffFlag(args);
+  args = handoffConfig.args;
+
+  // Check for super mode (--super, --yolo, -s)
+  const superFlags = ['--super', '--yolo', '-s'];
+  const superMode = args.some(a => superFlags.includes(a));
+  args = args.filter(a => !superFlags.includes(a));
+
+  // Ensure Codex config exists
+  const codexDir = path.join(os.homedir(), '.codex');
+  const codexConfig = path.join(codexDir, 'config.toml');
+
+  if (!fs.existsSync(codexDir)) {
+    fs.mkdirSync(codexDir, { recursive: true });
+  }
+
+  // Check if our provider is configured
+  let configContent = '';
+  if (fs.existsSync(codexConfig)) {
+    configContent = fs.readFileSync(codexConfig, 'utf-8');
+  }
+
+  if (!configContent.includes(`[model_providers.${providerName}]`)) {
+    const providerConfig = `
 # JetBrains AI (${environment})
 [model_providers.${providerName}]
 name = "JetBrains AI (${environment})"
@@ -53,54 +45,68 @@ base_url = "${endpoints.openai}"
 env_http_headers = { "Grazie-Authenticate-JWT" = "${envVarName}" }
 wire_api = "responses"
 `;
-  fs.appendFileSync(codexConfig, providerConfig);
-  console.log(`✅ Added ${providerName} provider to Codex config`);
-}
-
-const hasModel = args.includes('--model');
-const finalArgs = ['-c', `model_provider=${providerName}`];
-
-if (!hasModel) {
-  finalArgs.push('--model', config.MODELS.codex?.default || config.MODELS.openai.default);
-}
-
-// Add super mode flags (full-auto)
-if (superMode) {
-  finalArgs.push('--full-auto');
-  console.log('🚀 Super mode: --full-auto enabled');
-}
-
-finalArgs.push(...args);
-
-const childEnv = {
-  ...process.env,
-  [envVarName]: token
-};
-
-const child = runWithHandoff({
-  command: 'codex',
-  args: finalArgs,
-  env: childEnv,
-  toolName: 'jbai-codex',
-  handoffDefaults: {
-    enabled: !handoffConfig.disabled,
-    grazieToken: token,
-    grazieEnvironment: environment === 'production' ? 'PRODUCTION' : 'STAGING',
-    grazieModel: config.MODELS.claude.default,
-    cwd: process.cwd(),
-  },
-});
-
-if (child && typeof child.on === 'function') {
-  child.on('error', (err) => {
-    if (err.code === 'ENOENT') {
-      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}`);
-    }
-    process.exit(1);
+    fs.appendFileSync(codexConfig, providerConfig);
+    console.log(`✅ Added ${providerName} provider to Codex config`);
+  }
+
+  // Point Codex model picker to our proxy (serves our model list instead of chatgpt.com)
+  const proxyModelUrl = 'http://localhost:18080/';
+  if (!configContent.includes('chatgpt_base_url')) {
+    fs.appendFileSync(codexConfig, `\nchatgpt_base_url = "${proxyModelUrl}"\n`);
+    console.log('✅ Set chatgpt_base_url to jbai-proxy for model picker');
+  } else if (!configContent.includes(proxyModelUrl)) {
+    // Update existing chatgpt_base_url
+    configContent = fs.readFileSync(codexConfig, 'utf-8');
+    const updated = configContent.replace(/^chatgpt_base_url\s*=\s*"[^"]*"/m, `chatgpt_base_url = "${proxyModelUrl}"`);
+    fs.writeFileSync(codexConfig, updated);
+    console.log('✅ Updated chatgpt_base_url to jbai-proxy');
+  }
+
+  const hasModel = args.includes('--model');
+  const finalArgs = ['-c', `model_provider=${providerName}`];
+
+  if (!hasModel) {
+    finalArgs.push('--model', config.MODELS.codex?.default || config.MODELS.openai.default);
+  }
+
+  // Add super mode flags (full-auto)
+  if (superMode) {
+    finalArgs.push('--full-auto');
+    console.log('🚀 Super mode: --full-auto enabled');
+  }
+
+  finalArgs.push(...args);
+
+  const childEnv = {
+    ...process.env,
+    [envVarName]: token
+  };
+
+  const child = runWithHandoff({
+    command: 'codex',
+    args: finalArgs,
+    env: childEnv,
+    toolName: 'jbai-codex',
+    handoffDefaults: {
+      enabled: !handoffConfig.disabled,
+      grazieToken: token,
+      grazieEnvironment: environment === 'production' ? 'PRODUCTION' : 'STAGING',
+      grazieModel: config.MODELS.claude.default,
+      cwd: process.cwd(),
+    },
   });
-}
+
+  if (child && typeof child.on === 'function') {
+    child.on('error', (err) => {
+      if (err.code === 'ENOENT') {
+        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}`);
+      }
+      process.exit(1);
+    });
+  }
+})();

package/bin/jbai-gemini.js

@@ -8,70 +8,63 @@
 
 const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
 const config = require('../lib/config');
+const { ensureToken } = require('../lib/ensure-token');
 
-const token = config.getToken();
-if (!token) {
-  console.error('❌ No token found. Run: jbai token set');
-  process.exit(1);
-}
+(async () => {
+  const token = await ensureToken();
+  const endpoints = config.getEndpoints();
+  let args = process.argv.slice(2);
+  const handoffConfig = stripHandoffFlag(args);
+  args = handoffConfig.args;
 
-if (config.isTokenExpired(token)) {
-  console.error('⚠️  Token expired. Run: jbai token refresh');
-  process.exit(1);
-}
+  // Check for super mode (--super, --yolo, -s)
+  const superFlags = ['--super', '--yolo', '-s'];
+  const superMode = args.some(a => superFlags.includes(a));
+  args = args.filter(a => !superFlags.includes(a));
 
-const endpoints = config.getEndpoints();
-let args = process.argv.slice(2);
-const handoffConfig = stripHandoffFlag(args);
-args = handoffConfig.args;
+  // Check if model specified
+  const hasModel = args.includes('--model') || args.includes('-m');
+  let finalArgs = hasModel ? args : ['--model', config.MODELS.gemini.default, ...args];
 
-// Check for super mode (--super, --yolo, -s)
-const superFlags = ['--super', '--yolo', '-s'];
-const superMode = args.some(a => superFlags.includes(a));
-args = args.filter(a => !superFlags.includes(a));
+  // Add super mode flags (auto-confirm) - Gemini uses --yolo
+  if (superMode) {
+    finalArgs = ['--yolo', ...finalArgs];
+    console.log('🚀 Super mode: --yolo (auto-confirm) enabled');
+  }
 
-// Check if model specified
-const hasModel = args.includes('--model') || args.includes('-m');
-let finalArgs = hasModel ? args : ['--model', config.MODELS.gemini.default, ...args];
+  // Set environment for Gemini CLI
+  // Uses GEMINI_CLI_CUSTOM_HEADERS for auth (supported since Nov 2025)
+  const env = {
+    ...process.env,
+    GEMINI_BASE_URL: endpoints.google,
+    GEMINI_API_KEY: 'placeholder',
+    GEMINI_CLI_CUSTOM_HEADERS: `Grazie-Authenticate-JWT: ${token}`
+  };
 
-// Add super mode flags (auto-confirm) - Gemini uses --yolo
-if (superMode) {
-  finalArgs = ['--yolo', ...finalArgs];
-  console.log('🚀 Super mode: --yolo (auto-confirm) enabled');
-}
-
-// Set environment for Gemini CLI
-// Uses GEMINI_CLI_CUSTOM_HEADERS for auth (supported since Nov 2025)
-const env = {
-  ...process.env,
-  GEMINI_BASE_URL: endpoints.google,
-  GEMINI_API_KEY: 'placeholder',
-  GEMINI_CLI_CUSTOM_HEADERS: `Grazie-Authenticate-JWT: ${token}`
-};
-
-const child = runWithHandoff({
-  command: 'gemini',
-  args: finalArgs,
-  env,
-  toolName: 'jbai-gemini',
-  handoffDefaults: {
-    enabled: !handoffConfig.disabled,
-    grazieToken: token,
-    grazieEnvironment: config.getEnvironment() === 'production' ? 'PRODUCTION' : 'STAGING',
-    grazieModel: config.MODELS.claude.default,
-    cwd: process.cwd(),
-  },
-});
-
-if (child && typeof child.on === 'function') {
-  child.on('error', (err) => {
-    if (err.code === 'ENOENT') {
-      console.error(`❌ Gemini CLI not found.\n`);
-      console.error(`Install with: npm install -g @google/gemini-cli`);
-      console.error(`Or run: jbai install gemini`);
-    } else {
-      console.error(`Error: ${err.message}`);
-    }
-    process.exit(1);
+  const child = runWithHandoff({
+    command: 'gemini',
+    args: finalArgs,
+    env,
+    toolName: 'jbai-gemini',
+    handoffDefaults: {
+      enabled: !handoffConfig.disabled,
+      grazieToken: token,
+      grazieEnvironment: config.getEnvironment() === 'production' ? 'PRODUCTION' : 'STAGING',
+      grazieModel: config.MODELS.claude.default,
+      cwd: process.cwd(),
+    },
   });
-}
+
+  if (child && typeof child.on === 'function') {
+    child.on('error', (err) => {
+      if (err.code === 'ENOENT') {
+        console.error(`❌ Gemini CLI not found.\n`);
+        console.error(`Install with: npm install -g @google/gemini-cli`);
+        console.error(`Or run: jbai install gemini`);
+      } else {
+        console.error(`Error: ${err.message}`);
+      }
+      process.exit(1);
+    });
+  }
+})();