jbai-cli 1.8.0 → 1.8.2

package/bin/jbai-codex.js

@@ -4,14 +4,45 @@ const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const http = require('http');
 const config = require('../lib/config');
 const { ensureToken } = require('../lib/ensure-token');
 
+const PROXY_PORT = 18080;
+const PROXY_PROVIDER = 'jbai-proxy';
+
+function isProxyRunning() {
+  return new Promise((resolve) => {
+    const req = http.get(`http://127.0.0.1:${PROXY_PORT}/health`, { timeout: 1000 }, (res) => {
+      let body = '';
+      res.on('data', chunk => body += chunk);
+      res.on('end', () => {
+        try {
+          const info = JSON.parse(body);
+          resolve(info.status === 'ok');
+        } catch {
+          resolve(false);
+        }
+      });
+    });
+    req.on('error', () => resolve(false));
+    req.on('timeout', () => { req.destroy(); resolve(false); });
+  });
+}
+
+function startProxy() {
+  const { spawn } = require('child_process');
+  const proxyScript = path.join(__dirname, 'jbai-proxy.js');
+  const child = spawn(process.execPath, [proxyScript, '--port', String(PROXY_PORT), '--_daemon'], {
+    detached: true,
+    stdio: 'ignore',
+  });
+  child.unref();
+}
+
 (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);
@@ -22,6 +53,13 @@ const { ensureToken } = require('../lib/ensure-token');
   const superMode = args.some(a => superFlags.includes(a));
   args = args.filter(a => !superFlags.includes(a));
 
+  // Auto-start proxy if not running (serves /v1/models with our model list)
+  if (!await isProxyRunning()) {
+    startProxy();
+    // Wait briefly for proxy to start
+    await new Promise(r => setTimeout(r, 500));
+  }
+
   // Ensure Codex config exists
   const codexDir = path.join(os.homedir(), '.codex');
   const codexConfig = path.join(codexDir, 'config.toml');
@@ -30,40 +68,28 @@ const { ensureToken } = require('../lib/ensure-token');
     fs.mkdirSync(codexDir, { recursive: true });
   }
 
-  // Check if our provider is configured
+  // Check if our proxy provider is configured
   let configContent = '';
   if (fs.existsSync(codexConfig)) {
     configContent = fs.readFileSync(codexConfig, 'utf-8');
   }
 
-  if (!configContent.includes(`[model_providers.${providerName}]`)) {
+  if (!configContent.includes(`[model_providers.${PROXY_PROVIDER}]`)) {
     const providerConfig = `
-# JetBrains AI (${environment})
-[model_providers.${providerName}]
-name = "JetBrains AI (${environment})"
-base_url = "${endpoints.openai}"
-env_http_headers = { "Grazie-Authenticate-JWT" = "${envVarName}" }
+# JetBrains AI via local proxy (serves model list + auto-injects auth)
+[model_providers.${PROXY_PROVIDER}]
+name = "JetBrains AI (Proxy)"
+base_url = "http://localhost:${PROXY_PORT}/openai/v1"
+env_key = "JBAI_PROXY_KEY"
 wire_api = "responses"
 `;
     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');
+    console.log(`✅ Added ${PROXY_PROVIDER} provider to Codex config`);
   }
 
   const hasModel = args.includes('--model');
-  const finalArgs = ['-c', `model_provider=${providerName}`];
+  // Use proxy provider so Codex fetches /v1/models from our proxy (shows all Grazie models)
+  const finalArgs = ['-c', `model_provider=${PROXY_PROVIDER}`];
 
   if (!hasModel) {
     finalArgs.push('--model', config.MODELS.codex?.default || config.MODELS.openai.default);
@@ -79,7 +105,8 @@ wire_api = "responses"
 
   const childEnv = {
     ...process.env,
-    [envVarName]: token
+    [envVarName]: token,
+    JBAI_PROXY_KEY: 'placeholder',  // Proxy handles auth via Grazie JWT
   };
 
   const child = runWithHandoff({

package/bin/jbai-opencode.js

@@ -114,7 +114,7 @@ const { ensureToken } = require('../lib/ensure-token');
 
   // Check if model specified
   const hasModel = args.includes('--model') || args.includes('-m');
-  let finalArgs = ['--yolo'];
+  let finalArgs = [];
 
   if (!hasModel) {
     // Use provider/model format for OpenCode

package/package.json

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