jbai-cli 1.9.2 → 2.1.0

package/lib/completions.js

@@ -0,0 +1,258 @@
+/**
+ * Shell completions for jbai-cli.
+ *
+ * `jbai completions`           — print zsh completion script to stdout
+ * `jbai completions --install` — append source line to ~/.zshrc
+ * `jbai completions --bash`    — print bash completion script to stdout
+ */
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const config = require('./config');
+
+// Read bin entries from package.json for the canonical list of commands.
+const pkg = require('../package.json');
+const ALL_BINS = Object.keys(pkg.bin).sort();
+
+// Shortcuts = bins that have a dash after the tool name (jbai-codex-5.3, etc.)
+const TOOLS = ['claude', 'codex', 'gemini', 'opencode', 'goose', 'continue', 'council', 'proxy'];
+
+// jbai subcommands
+const JBAI_SUBCOMMANDS = [
+  'token', 'test', 'handoff', 'env', 'models', 'install', 'doctor',
+  'status', 'proxy', 'help', 'version', 'completions',
+];
+
+const JBAI_TOKEN_SUBCOMMANDS = ['set', 'refresh'];
+const JBAI_ENV_VALUES = ['staging', 'production'];
+const JBAI_MODELS_VALUES = ['all', 'claude', 'codex', 'gemini', 'opencode', 'goose', 'continue'];
+const JBAI_INSTALL_VALUES = ['all', 'claude', 'codex', 'gemini', 'opencode', 'goose', 'continue'];
+const SUPER_FLAGS = ['--super', '--yolo', '-s'];
+const COMMON_FLAGS = ['--model', '--models', '--help'];
+
+// Collect all model names for --model completion
+const ALL_MODELS = [
+  ...config.MODELS.claude.available,
+  ...config.MODELS.openai.available,
+  ...config.MODELS.codex.available,
+  ...config.MODELS.gemini.available,
+  ...config.MODELS.grazie.available,
+];
+// Dedupe
+const UNIQUE_MODELS = [...new Set(ALL_MODELS)].sort();
+
+function generateZsh() {
+  // Group shortcuts by tool for descriptive completions
+  const shortcutDescriptions = {};
+  for (const bin of ALL_BINS) {
+    if (bin === 'jbai' || bin === 'jbai-proxy') continue;
+    // e.g. jbai-codex-rockhopper -> "Codex + Rockhopper Alpha"
+    shortcutDescriptions[bin] = bin;
+  }
+
+  return `#compdef jbai jbai-claude jbai-codex jbai-gemini jbai-opencode jbai-goose jbai-continue jbai-council jbai-proxy jbai-claude-opus jbai-claude-sonnet jbai-codex-5.2 jbai-codex-5.3 jbai-codex-rockhopper jbai-gemini-3.1 jbai-gemini-supernova jbai-opencode-rockhopper jbai-opencode-grok jbai-opencode-deepseek
+# ─── jbai-cli zsh completions (auto-generated) ───
+
+# Complete model names after --model flag
+_jbai_models() {
+  local models=(
+${UNIQUE_MODELS.map(m => `    '${m}'`).join('\n')}
+  )
+  _describe 'model' models
+}
+
+# Main jbai command completions
+_jbai() {
+  local -a subcommands=(
+    'token:Show or manage authentication token'
+    'test:Test API endpoints'
+    'handoff:Continue task in Orca Lab'
+    'env:Switch environment (staging/production)'
+    'models:List available models'
+    'install:Install AI tools'
+    'doctor:Check installed tools'
+    'status:Check installed tools'
+    'proxy:Manage local proxy'
+    'help:Show help'
+    'version:Show version'
+    'completions:Shell completions'
+  )
+
+  if (( CURRENT == 2 )); then
+    _describe 'command' subcommands
+    return
+  fi
+
+  case "\${words[2]}" in
+    token)
+      if (( CURRENT == 3 )); then
+        local -a token_cmds=('set:Set token interactively' 'refresh:Refresh token via API')
+        _describe 'token command' token_cmds
+      fi
+      ;;
+    env)
+      if (( CURRENT == 3 )); then
+        local -a envs=('staging' 'production')
+        _describe 'environment' envs
+      fi
+      ;;
+    models)
+      if (( CURRENT == 3 )); then
+        local -a tools=(${JBAI_MODELS_VALUES.map(v => `'${v}'`).join(' ')})
+        _describe 'tool filter' tools
+      fi
+      ;;
+    install)
+      if (( CURRENT == 3 )); then
+        local -a tools=(${JBAI_INSTALL_VALUES.map(v => `'${v}'`).join(' ')})
+        _describe 'tool' tools
+      fi
+      ;;
+    completions)
+      if (( CURRENT == 3 )); then
+        local -a opts=('--install:Add to ~/.zshrc' '--bash:Print bash completions')
+        _describe 'option' opts
+      fi
+      ;;
+  esac
+}
+
+# Tool wrapper completions (jbai-claude, jbai-codex, etc.)
+_jbai_tool_wrapper() {
+  _arguments -s \\
+    '--model[Model to use]:model:_jbai_models' \\
+    '-m[Model to use]:model:_jbai_models' \\
+    '--super[Enable super/auto mode]' \\
+    '--yolo[Enable super/auto mode]' \\
+    '-s[Enable super/auto mode]' \\
+    '--models[List available models]' \\
+    '--list-models[List available models]' \\
+    '--help[Show help]' \\
+    'models:List available models' \\
+    '*:pass-through:'
+}
+
+# Register completions
+compdef _jbai jbai
+compdef _jbai_tool_wrapper jbai-claude jbai-codex jbai-gemini jbai-opencode jbai-goose jbai-continue
+compdef _jbai_tool_wrapper jbai-claude-opus jbai-claude-sonnet
+compdef _jbai_tool_wrapper jbai-codex-5.2 jbai-codex-5.3 jbai-codex-rockhopper
+compdef _jbai_tool_wrapper jbai-gemini-3.1 jbai-gemini-supernova
+compdef _jbai_tool_wrapper jbai-opencode-rockhopper jbai-opencode-grok jbai-opencode-deepseek
+`;
+}
+
+function generateBash() {
+  return `# ─── jbai-cli bash completions (auto-generated) ───
+
+_jbai_completions() {
+  local cur="\${COMP_WORDS[COMP_CWORD]}"
+  local prev="\${COMP_WORDS[COMP_CWORD-1]}"
+
+  # jbai subcommands
+  if [[ "\${COMP_WORDS[0]}" == "jbai" && \${COMP_CWORD} -eq 1 ]]; then
+    COMPREPLY=( $(compgen -W "${JBAI_SUBCOMMANDS.join(' ')}" -- "$cur") )
+    return
+  fi
+
+  # jbai token <sub>
+  if [[ "\${COMP_WORDS[1]}" == "token" && \${COMP_CWORD} -eq 2 ]]; then
+    COMPREPLY=( $(compgen -W "${JBAI_TOKEN_SUBCOMMANDS.join(' ')}" -- "$cur") )
+    return
+  fi
+
+  # jbai env <value>
+  if [[ "\${COMP_WORDS[1]}" == "env" && \${COMP_CWORD} -eq 2 ]]; then
+    COMPREPLY=( $(compgen -W "${JBAI_ENV_VALUES.join(' ')}" -- "$cur") )
+    return
+  fi
+
+  # jbai models <value>
+  if [[ "\${COMP_WORDS[1]}" == "models" && \${COMP_CWORD} -eq 2 ]]; then
+    COMPREPLY=( $(compgen -W "${JBAI_MODELS_VALUES.join(' ')}" -- "$cur") )
+    return
+  fi
+
+  # jbai install <value>
+  if [[ "\${COMP_WORDS[1]}" == "install" && \${COMP_CWORD} -eq 2 ]]; then
+    COMPREPLY=( $(compgen -W "${JBAI_INSTALL_VALUES.join(' ')}" -- "$cur") )
+    return
+  fi
+
+  # --model completion
+  if [[ "$prev" == "--model" || "$prev" == "-m" ]]; then
+    COMPREPLY=( $(compgen -W "${UNIQUE_MODELS.join(' ')}" -- "$cur") )
+    return
+  fi
+
+  # Generic flags for tool wrappers
+  COMPREPLY=( $(compgen -W "--model --super --yolo --models --help models" -- "$cur") )
+}
+
+_jbai_tool_completions() {
+  local cur="\${COMP_WORDS[COMP_CWORD]}"
+  local prev="\${COMP_WORDS[COMP_CWORD-1]}"
+
+  if [[ "$prev" == "--model" || "$prev" == "-m" ]]; then
+    COMPREPLY=( $(compgen -W "${UNIQUE_MODELS.join(' ')}" -- "$cur") )
+    return
+  fi
+
+  COMPREPLY=( $(compgen -W "--model --super --yolo --models --help models" -- "$cur") )
+}
+
+complete -F _jbai_completions jbai
+complete -F _jbai_tool_completions jbai-claude jbai-codex jbai-gemini jbai-opencode jbai-goose jbai-continue
+complete -F _jbai_tool_completions jbai-claude-opus jbai-claude-sonnet
+complete -F _jbai_tool_completions jbai-codex-5.2 jbai-codex-5.3 jbai-codex-rockhopper
+complete -F _jbai_tool_completions jbai-gemini-3.1 jbai-gemini-supernova
+complete -F _jbai_tool_completions jbai-opencode-rockhopper jbai-opencode-grok jbai-opencode-deepseek
+`;
+}
+
+function getCompletionFilePath() {
+  return path.join(config.CONFIG_DIR, 'completions.zsh');
+}
+
+function installZsh() {
+  const completionFile = getCompletionFilePath();
+  const zshrc = path.join(os.homedir(), '.zshrc');
+
+  // Write completion file
+  config.ensureConfigDir();
+  fs.writeFileSync(completionFile, generateZsh(), { mode: 0o644 });
+  console.log(`Written: ${completionFile}`);
+
+  // Check if already sourced in .zshrc
+  const sourceLine = `[ -f "${completionFile}" ] && source "${completionFile}"`;
+
+  if (fs.existsSync(zshrc)) {
+    const content = fs.readFileSync(zshrc, 'utf-8');
+    if (content.includes('jbai') && content.includes('completions.zsh')) {
+      console.log('Already in ~/.zshrc — updating completion file only');
+      return;
+    }
+  }
+
+  fs.appendFileSync(zshrc, `\n# jbai-cli completions\n${sourceLine}\n`);
+  console.log('Added to ~/.zshrc');
+  console.log('\nRun: source ~/.zshrc   (or open a new terminal)');
+}
+
+function run(args) {
+  if (args.includes('--install')) {
+    installZsh();
+    return;
+  }
+
+  if (args.includes('--bash')) {
+    process.stdout.write(generateBash());
+    return;
+  }
+
+  // Default: print zsh completions to stdout
+  process.stdout.write(generateZsh());
+}
+
+module.exports = { run, generateZsh, generateBash, installZsh, getCompletionFilePath };

package/lib/config.js

@@ -35,6 +35,7 @@ const MODELS = {
     available: [
       // Claude 4.6 series (latest)
       'claude-opus-4-6',
+      'claude-sonnet-4-6',
       // Claude 4.5 series
       'claude-opus-4-5-20251101',
       'claude-sonnet-4-5-20250929',
@@ -53,7 +54,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 / gpt-5.3-codex-api-preview are 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',
@@ -83,9 +84,11 @@ const MODELS = {
   codex: {
     default: 'gpt-5.3-codex',
     available: [
+      // Hidden/EAP models (JB internal NDA)
+      'rockhopper-alpha',
+      'gpt-5.3-codex-api-preview',
       // 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',
       'gpt-5.2',
@@ -105,6 +108,9 @@ const MODELS = {
   gemini: {
     default: 'gemini-2.5-flash',
     available: [
+      // Hidden/EAP models (JB internal NDA)
+      'supernova',
+      'gemini-3.1-pro-preview',
       // Gemini 3.x (preview)
       'gemini-3-pro-preview',
       'gemini-3-flash-preview',
@@ -116,23 +122,55 @@ 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-gemini-3-0-pro-snowball',
+      'google-chat-gemini-pro-2.5',
+      'google-gemini-2.5-flash',
+      // DeepSeek
+      'deepseek-r1',
+      'openrouter-deepseek-v3-2',
+      // Mistral
+      'mistral-large',
+      'mistral-small',
+      'openrouter-mistral-large-2512',
+      // xAI / Grok
+      'xai-grok-4',
+      'xai-grok-4-1-fast',
+      'xai-grok-code-fast-1',
+      // Qwen
+      'qwen-max',
+      'qwen-plus',
+      // Kimi
+      'openrouter-kimi-k2-5',
+      'openrouter-kimi-k2-thinking',
+      // MiniMax
+      'openrouter-minimax-m2-1',
+      // ZhipuAI
+      'openrouter-zhipuai-glm-4-7',
+      'openrouter-zhipuai-glm-4-7-flash',
+    ]
   }
-  // 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: new Codex CLI sends short names that Grazie doesn't recognise yet.
+// 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 = {
-  'gpt-5.3-codex': 'gpt-5.3-codex-api-preview',
 };
 
 // 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() {

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/postinstall.js

@@ -46,5 +46,8 @@ Next steps:
    $ jbai-goose      # Goose (Block)
    $ jbai-continue   # Continue CLI
 
+4. Enable tab completions:
+   $ jbai completions --install
+
 Run 'jbai help' for more options.
 `);

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/lib/shortcut.js

@@ -0,0 +1,47 @@
+/**
+ * Shared logic for per-model shortcut scripts.
+ *
+ * Each shortcut (e.g. jbai-codex-rockhopper) is a thin wrapper that calls
+ * the base tool wrapper (jbai-codex, jbai-claude, …) with a fixed model
+ * and super mode enabled by default.
+ *
+ * Usage in a shortcut script:
+ *   require('../lib/shortcut').run({
+ *     tool: 'codex',          // base wrapper to delegate to
+ *     model: 'rockhopper-alpha',
+ *     label: 'Rockhopper Alpha',
+ *   });
+ */
+
+const { spawn } = require('child_process');
+const path = require('path');
+
+function run({ tool, model, label }) {
+  const args = process.argv.slice(2);
+
+  // Already force super mode + the pinned model
+  const extraArgs = ['--super', '--model', model];
+
+  // If user already passed --model, skip our default
+  if (args.includes('--model') || args.includes('-m')) {
+    extraArgs.splice(extraArgs.indexOf('--model'), 2);
+  }
+
+  const wrapperScript = path.join(__dirname, '..', 'bin', `jbai-${tool}.js`);
+  const finalArgs = [wrapperScript, ...extraArgs, ...args];
+
+  console.log(`⚡ ${label || model} (super mode)`);
+
+  const child = spawn(process.execPath, finalArgs, {
+    stdio: 'inherit',
+    env: process.env,
+  });
+
+  child.on('exit', (code) => process.exit(code || 0));
+  child.on('error', (err) => {
+    console.error(`Error: ${err.message}`);
+    process.exit(1);
+  });
+}
+
+module.exports = { run };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jbai-cli",
-  "version": "1.9.2",
+  "version": "2.1.0",
   "description": "CLI wrappers to use AI coding tools (Claude Code, Codex, Gemini CLI, OpenCode, Goose, Continue) with JetBrains AI Platform",
   "keywords": [
     "jetbrains",
@@ -30,11 +30,22 @@
     "jbai": "bin/jbai.js",
     "jbai-proxy": "bin/jbai-proxy.js",
     "jbai-claude": "bin/jbai-claude.js",
+    "jbai-claude-opus": "bin/jbai-claude-opus.js",
+    "jbai-claude-sonnet": "bin/jbai-claude-sonnet.js",
     "jbai-codex": "bin/jbai-codex.js",
+    "jbai-codex-5.2": "bin/jbai-codex-5.2.js",
+    "jbai-codex-5.3": "bin/jbai-codex-5.3.js",
+    "jbai-codex-rockhopper": "bin/jbai-codex-rockhopper.js",
     "jbai-gemini": "bin/jbai-gemini.js",
+    "jbai-gemini-3.1": "bin/jbai-gemini-3.1.js",
+    "jbai-gemini-supernova": "bin/jbai-gemini-supernova.js",
     "jbai-opencode": "bin/jbai-opencode.js",
+    "jbai-opencode-rockhopper": "bin/jbai-opencode-rockhopper.js",
+    "jbai-opencode-grok": "bin/jbai-opencode-grok.js",
+    "jbai-opencode-deepseek": "bin/jbai-opencode-deepseek.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/",