jbai-cli 1.9.1 → 1.9.6

package/lib/config.js

@@ -53,7 +53,7 @@ const MODELS = {
     default: 'gpt-5.2-2025-12-11',
     available: [
       // GPT-5.x series (latest) - require date-versioned names
-      // NOTE: gpt-5.3-codex-api-preview is Responses-API-only → use via jbai codex
+      'gpt-5.3-codex',
       'gpt-5.2-2025-12-11',
       'gpt-5.2',
       'gpt-5.1-2025-11-13',
@@ -81,9 +81,10 @@ const MODELS = {
   // Codex CLI uses OpenAI models via the "responses" API (wire_api = "responses")
   // Includes chat-capable models PLUS codex-only models (responses API only)
   codex: {
-    default: 'gpt-5.3-codex-api-preview',
+    default: 'gpt-5.3-codex',
     available: [
       // Codex-specific models (responses API only, NOT available via chat/completions)
+      'gpt-5.3-codex',
       'gpt-5.3-codex-api-preview',
       // GPT-5.x chat models (also work via responses API)
       'gpt-5.2-2025-12-11',
@@ -115,17 +116,48 @@ const MODELS = {
       'gemini-2.0-flash-001',
       'gemini-2.0-flash-lite-001'
     ]
+  },
+  // Grazie native Chat API models — accessible via /grazie-openai/v1 translation layer.
+  // Full list is dynamic (fetched from /user/v5/llm/profiles), this is a static fallback.
+  grazie: {
+    default: 'google-gemini-3-0-flash',
+    available: [
+      // Google
+      'google-gemini-3-1-pro',
+      'google-gemini-3-0-flash',
+      'google-chat-gemini-pro-2.5',
+      'google-gemini-2.5-flash',
+      // DeepSeek
+      'deepseek-r1',
+      'deepseek-chat-v3',
+      // Mistral
+      'mistral-large',
+      'mistral-small',
+      // xAI / Grok
+      'xai-grok-4',
+      'xai-grok-4-1-fast',
+      'xai-grok-3',
+      // Qwen
+      'qwen-max',
+      'qwen-plus',
+      // Meta (via OpenRouter)
+      'openrouter-meta-llama-4-maverick',
+      'openrouter-meta-llama-4-scout',
+    ]
   }
-  // NOTE: Other providers (DeepSeek, Mistral, Qwen, XAI, Meta, Grok) are available
-  // via Grazie native Chat API but NOT via the OpenAI-compatible proxy.
-  // They are not supported by CLI tools that use OpenAI API format.
+};
+
+// Model aliases: some CLI tools send short names that Grazie doesn't recognise yet.
+// Map them to the Grazie-accepted equivalents so the proxy can rewrite on the fly.
+const MODEL_ALIASES = {
 };
 
 // All models for tools that support multiple providers (OpenCode, Codex)
 const ALL_MODELS = {
   openai: MODELS.openai.available,
   anthropic: MODELS.claude.available,
-  gemini: MODELS.gemini.available
+  gemini: MODELS.gemini.available,
+  grazie: MODELS.grazie.available
 };
 
 function ensureConfigDir() {
@@ -315,6 +347,7 @@ module.exports = {
   CONFIG_FILE,
   ENDPOINTS,
   MODELS,
+  MODEL_ALIASES,
   ALL_MODELS,
   TOOLS,
   ensureConfigDir,

package/lib/model-list.js

@@ -0,0 +1,117 @@
+const config = require('./config');
+
+function formatModels(models, defaultModel) {
+  return models.map((m) => {
+    const def = m === defaultModel ? ' (default)' : '';
+    return `  - ${m}${def}`;
+  }).join('\n');
+}
+
+function printGroups(groups) {
+  for (const group of groups) {
+    console.log(`${group.title}:`);
+    console.log(formatModels(group.models, group.defaultModel));
+    console.log('');
+  }
+}
+
+function getGroupsForTool(tool) {
+  switch (tool) {
+    case 'claude':
+      return [
+        {
+          title: 'Claude (Anthropic)',
+          models: config.MODELS.claude.available,
+          defaultModel: config.MODELS.claude.default,
+        },
+      ];
+    case 'codex':
+      return [
+        {
+          title: 'Codex (OpenAI Responses)',
+          models: config.MODELS.codex.available,
+          defaultModel: config.MODELS.codex.default,
+        },
+      ];
+    case 'gemini':
+      return [
+        {
+          title: 'Gemini (Google)',
+          models: config.MODELS.gemini.available,
+          defaultModel: config.MODELS.gemini.default,
+        },
+      ];
+    case 'opencode':
+    case 'goose':
+    case 'continue':
+      return [
+        {
+          title: 'Claude (Anthropic)',
+          models: config.MODELS.claude.available,
+          defaultModel: config.MODELS.claude.default,
+        },
+        {
+          title: 'GPT (OpenAI Chat)',
+          models: config.MODELS.openai.available,
+          defaultModel: config.MODELS.openai.default,
+        },
+        {
+          title: 'Grazie Native Chat (Google, DeepSeek, Mistral, xAI, Qwen, etc.)',
+          models: config.MODELS.grazie.available,
+          defaultModel: config.MODELS.grazie.default,
+        },
+      ];
+    case 'all':
+    default:
+      return [
+        {
+          title: 'Claude (Anthropic)',
+          models: config.MODELS.claude.available,
+          defaultModel: config.MODELS.claude.default,
+        },
+        {
+          title: 'GPT (OpenAI Chat)',
+          models: config.MODELS.openai.available,
+          defaultModel: config.MODELS.openai.default,
+        },
+        {
+          title: 'Codex (OpenAI Responses)',
+          models: config.MODELS.codex.available,
+          defaultModel: config.MODELS.codex.default,
+        },
+        {
+          title: 'Gemini (Google)',
+          models: config.MODELS.gemini.available,
+          defaultModel: config.MODELS.gemini.default,
+        },
+        {
+          title: 'Grazie Native Chat (Google, DeepSeek, Mistral, xAI, Qwen, etc.)',
+          models: config.MODELS.grazie.available,
+          defaultModel: config.MODELS.grazie.default,
+        },
+      ];
+  }
+}
+
+function showModelsForTool(tool, heading) {
+  const title = heading || 'Available Grazie models:';
+  console.log(`${title}\n`);
+  const groups = getGroupsForTool(tool);
+  printGroups(groups);
+}
+
+function isModelsCommand(args, { allowCommand = true } = {}) {
+  if (args.includes('--models') || args.includes('--list-models')) {
+    return true;
+  }
+  if (allowCommand && args[0] === 'models') {
+    return true;
+  }
+  return false;
+}
+
+module.exports = {
+  getGroupsForTool,
+  isModelsCommand,
+  showModelsForTool,
+};

package/lib/proxy.js

@@ -0,0 +1,46 @@
+const http = require('http');
+const { spawn } = require('child_process');
+const path = require('path');
+
+const PROXY_PORT = 18080;
+
+function isProxyRunning(port = PROXY_PORT) {
+  return new Promise((resolve) => {
+    const req = http.get(`http://127.0.0.1:${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(port = PROXY_PORT) {
+  const proxyScript = path.join(__dirname, '..', 'bin', 'jbai-proxy.js');
+  const child = spawn(process.execPath, [proxyScript, '--port', String(port), '--_daemon'], {
+    detached: true,
+    stdio: 'ignore',
+  });
+  child.unref();
+}
+
+async function ensureProxy(port = PROXY_PORT) {
+  if (await isProxyRunning(port)) return;
+  startProxy(port);
+  // Poll until proxy is ready (up to 5 seconds)
+  for (let i = 0; i < 20; i++) {
+    await new Promise(r => setTimeout(r, 250));
+    if (await isProxyRunning(port)) return;
+  }
+  // Proxy didn't start in time — proceed anyway, wrappers will fail with clear errors
+}
+
+module.exports = { PROXY_PORT, isProxyRunning, startProxy, ensureProxy };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jbai-cli",
-  "version": "1.9.1",
+  "version": "1.9.6",
   "description": "CLI wrappers to use AI coding tools (Claude Code, Codex, Gemini CLI, OpenCode, Goose, Continue) with JetBrains AI Platform",
   "keywords": [
     "jetbrains",
@@ -34,7 +34,8 @@
     "jbai-gemini": "bin/jbai-gemini.js",
     "jbai-opencode": "bin/jbai-opencode.js",
     "jbai-goose": "bin/jbai-goose.js",
-    "jbai-continue": "bin/jbai-continue.js"
+    "jbai-continue": "bin/jbai-continue.js",
+    "jbai-council": "bin/jbai-council.js"
   },
   "files": [
     "bin/",