jbai-cli 1.9.1 → 1.9.6

package/README.md

@@ -299,7 +299,7 @@ jbai-continue  # select model in TUI
 | `jbai token` | Show token status |
 | `jbai token set` | Set/update token |
 | `jbai test` | Test API connections |
-| `jbai models` | List all models |
+| `jbai models [tool]` | List Grazie models |
 | `jbai proxy setup` | Setup proxy + configure Codex Desktop |
 | `jbai proxy status` | Check proxy status |
 | `jbai proxy stop` | Stop proxy |

package/bin/jbai-claude.js

@@ -2,15 +2,22 @@
 
 const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
 const config = require('../lib/config');
+const { isModelsCommand, showModelsForTool } = require('../lib/model-list');
 const { ensureToken } = require('../lib/ensure-token');
+const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 
 (async () => {
-  const token = await ensureToken();
-  const endpoints = config.getEndpoints();
   let args = process.argv.slice(2);
   const handoffConfig = stripHandoffFlag(args);
   args = handoffConfig.args;
 
+  if (isModelsCommand(args)) {
+    showModelsForTool('claude', 'Available Grazie models for jbai-claude:');
+    return;
+  }
+
+  const token = await ensureToken();
+
   // Check for super mode (--super, --yolo, -s)
   const superFlags = ['--super', '--yolo', '-s'];
   const superMode = args.some(a => superFlags.includes(a));
@@ -26,19 +33,19 @@ const { ensureToken } = require('../lib/ensure-token');
     console.log('🚀 Super mode: --dangerously-skip-permissions enabled');
   }
 
-  // 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$/, '');
+  // Auto-start proxy if not running (serves /anthropic/v1/models with only Grazie Claude models)
+  await ensureProxy();
+
+  // Route through proxy — it handles JWT injection and serves provider-filtered model list
   const env = {
     ...process.env,
-    ANTHROPIC_BASE_URL: baseUrl,
+    ANTHROPIC_BASE_URL: `http://127.0.0.1:${PROXY_PORT}/anthropic`,
     ANTHROPIC_API_KEY: 'placeholder',
-    ANTHROPIC_CUSTOM_HEADERS: `Grazie-Authenticate-JWT: ${token}`
   };
 
-  // Remove any existing auth token that might conflict
+  // Remove any existing auth token/headers that might conflict
   delete env.ANTHROPIC_AUTH_TOKEN;
+  delete env.ANTHROPIC_CUSTOM_HEADERS;
 
   const child = runWithHandoff({
     command: 'claude',

package/bin/jbai-codex.js

@@ -4,46 +4,14 @@ 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 { isModelsCommand, showModelsForTool } = require('../lib/model-list');
 const { ensureToken } = require('../lib/ensure-token');
+const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 
-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 environment = config.getEnvironment();
-  const envVarName = environment === 'staging' ? 'GRAZIE_STAGING_TOKEN' : 'GRAZIE_API_TOKEN';
   let args = process.argv.slice(2);
   const handoffConfig = stripHandoffFlag(args);
   args = handoffConfig.args;
@@ -53,13 +21,18 @@ function startProxy() {
   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));
+  if (isModelsCommand(args)) {
+    showModelsForTool('codex', 'Available Grazie models for jbai-codex:');
+    return;
   }
 
+  const token = await ensureToken();
+  const environment = config.getEnvironment();
+  const envVarName = environment === 'staging' ? 'GRAZIE_STAGING_TOKEN' : 'GRAZIE_API_TOKEN';
+
+  // Auto-start proxy if not running (serves /v1/models with our model list)
+  await ensureProxy();
+
   // Ensure Codex config exists
   const codexDir = path.join(os.homedir(), '.codex');
   const codexConfig = path.join(codexDir, 'config.toml');

package/bin/jbai-continue.js

@@ -11,48 +11,19 @@ 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 { isModelsCommand, showModelsForTool } = require('../lib/model-list');
 const { ensureToken } = require('../lib/ensure-token');
+const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 
-const PROXY_PORT = 18080;
-
-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();
-}
-
-function buildContinueConfig() {
+function buildContinueConfig(requestedModel) {
   const proxyBase = `http://127.0.0.1:${PROXY_PORT}`;
   const models = [];
+  const targetModel = requestedModel || config.MODELS.claude.default;
 
   // Add Claude models first (default provider)
   config.MODELS.claude.available.forEach(model => {
-    const isDefault = model === config.MODELS.claude.default;
+    const isDefault = model === targetModel;
     models.push({
       name: isDefault ? `${model} (default)` : model,
       provider: 'anthropic',
@@ -65,8 +36,9 @@ function buildContinueConfig() {
 
   // Add OpenAI models via proxy
   config.MODELS.openai.available.forEach(model => {
+    const isDefault = model === targetModel;
     models.push({
-      name: model,
+      name: isDefault ? `${model} (default)` : model,
       provider: 'openai',
       model,
       apiBase: `${proxyBase}/openai/v1`,
@@ -75,7 +47,8 @@ function buildContinueConfig() {
     });
   });
 
-  const defaultModel = `${config.MODELS.claude.default} (default)`;
+  const defaultEntry = models.find(m => m.model === targetModel);
+  const defaultModel = defaultEntry ? defaultEntry.name : `${config.MODELS.claude.default} (default)`;
 
   return {
     name: 'JetBrains AI',
@@ -115,8 +88,6 @@ function toYaml(obj, indent = 0) {
 }
 
 (async () => {
-  const token = await ensureToken();
-  const environment = config.getEnvironment();
   let args = process.argv.slice(2);
   const handoffConfig = stripHandoffFlag(args);
   args = handoffConfig.args;
@@ -126,12 +97,25 @@ function toYaml(obj, indent = 0) {
   const superMode = args.some(a => superFlags.includes(a));
   args = args.filter(a => !superFlags.includes(a));
 
-  // Auto-start proxy if not running
-  if (!await isProxyRunning()) {
-    startProxy();
-    await new Promise(r => setTimeout(r, 500));
+  if (isModelsCommand(args)) {
+    showModelsForTool('continue', 'Available Grazie models for jbai-continue:');
+    return;
   }
 
+  // Extract --model/-m from args (Continue CLI uses a different --model semantics)
+  let requestedModel = null;
+  const modelFlagIdx = args.findIndex(a => a === '--model' || a === '-m');
+  if (modelFlagIdx >= 0) {
+    requestedModel = args[modelFlagIdx + 1] || null;
+    args.splice(modelFlagIdx, 2);
+  }
+
+  const token = await ensureToken();
+  const environment = config.getEnvironment();
+
+  // Auto-start proxy if not running
+  await ensureProxy();
+
   // Write Continue config
   const configDir = path.join(os.homedir(), '.continue');
   const configFile = path.join(configDir, 'config.yaml');
@@ -140,7 +124,7 @@ function toYaml(obj, indent = 0) {
     fs.mkdirSync(configDir, { recursive: true });
   }
 
-  const continueConfig = buildContinueConfig();
+  const continueConfig = buildContinueConfig(requestedModel);
   const yaml = `# Auto-generated by jbai-cli — do not edit manually\n${toYaml(continueConfig)}`;
   fs.writeFileSync(configFile, yaml);