jbai-cli 1.9.2 → 2.1.0

package/bin/jbai-gemini.js

@@ -8,15 +8,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('gemini', 'Available Grazie models for jbai-gemini:');
+    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));
@@ -32,15 +39,19 @@ const { ensureToken } = require('../lib/ensure-token');
     console.log('🚀 Super mode: --yolo (auto-confirm) enabled');
   }
 
-  // Set environment for Gemini CLI
-  // Uses GEMINI_CLI_CUSTOM_HEADERS for auth (supported since Nov 2025)
+  // Auto-start proxy if not running (serves /google/v1/models with only Grazie Gemini models)
+  await ensureProxy();
+
+  // Route through proxy — it handles JWT injection and serves provider-filtered model list
   const env = {
     ...process.env,
-    GEMINI_BASE_URL: endpoints.google,
+    GEMINI_BASE_URL: `http://127.0.0.1:${PROXY_PORT}/google`,
     GEMINI_API_KEY: 'placeholder',
-    GEMINI_CLI_CUSTOM_HEADERS: `Grazie-Authenticate-JWT: ${token}`
   };
 
+  // Remove any existing custom headers that might conflict
+  delete env.GEMINI_CLI_CUSTOM_HEADERS;
+
   const child = runWithHandoff({
     command: 'gemini',
     args: finalArgs,

package/bin/jbai-goose.js

@@ -8,45 +8,12 @@
  */
 
 const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
-const path = require('path');
-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 = 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();
-}
+const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 
 (async () => {
-  const token = await ensureToken();
-  const environment = config.getEnvironment();
   let args = process.argv.slice(2);
   const handoffConfig = stripHandoffFlag(args);
   args = handoffConfig.args;
@@ -56,12 +23,17 @@ function startProxy() {
   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('goose', 'Available Grazie models for jbai-goose:');
+    return;
   }
 
+  const token = await ensureToken();
+  const environment = config.getEnvironment();
+
+  // Auto-start proxy if not running
+  await ensureProxy();
+
   // Determine if this is a "run" or "session" command
   const isRun = args[0] === 'run';
   const isSession = args[0] === 'session' || args.length === 0;

package/bin/jbai-opencode-deepseek.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'opencode',
+  model: 'deepseek-r1',
+  label: 'OpenCode + DeepSeek R1',
+});

package/bin/jbai-opencode-grok.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'opencode',
+  model: 'xai-grok-4',
+  label: 'OpenCode + Grok 4 (xAI)',
+});

package/bin/jbai-opencode-rockhopper.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'opencode',
+  model: 'rockhopper-alpha',
+  label: 'OpenCode + Rockhopper Alpha (OpenAI EAP)',
+});

package/bin/jbai-opencode.js

@@ -4,13 +4,60 @@ const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const https = require('https');
 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');
+
+function fetchGrazieProfiles(token, environment) {
+  return new Promise((resolve, reject) => {
+    const endpoints = config.getEndpoints();
+    const url = new URL(endpoints.profiles);
+
+    const req = https.request({
+      hostname: url.hostname,
+      port: 443,
+      path: url.pathname + url.search,
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'Grazie-Authenticate-JWT': token,
+        'Grazie-Agent': JSON.stringify({ name: 'jbai-opencode', version: '1.0', env: environment }),
+      },
+    }, (res) => {
+      const chunks = [];
+      res.on('data', (c) => chunks.push(c));
+      res.on('end', () => {
+        if (res.statusCode !== 200) {
+          reject(new Error(`Failed to fetch profiles (HTTP ${res.statusCode})`));
+          return;
+        }
+
+        let parsed;
+        try {
+          parsed = JSON.parse(Buffer.concat(chunks).toString('utf-8'));
+        } catch {
+          reject(new Error('Failed to parse profiles response'));
+          return;
+        }
+
+        const profiles = Array.isArray(parsed) ? parsed : (parsed && Array.isArray(parsed.profiles) ? parsed.profiles : null);
+        if (!profiles) {
+          reject(new Error('Unexpected profiles response shape'));
+          return;
+        }
+
+        resolve(profiles);
+      });
+    });
+
+    req.on('error', reject);
+    req.end();
+  });
+}
 
 (async () => {
-  const token = await ensureToken();
-  const endpoints = config.getEndpoints();
-  const environment = config.getEnvironment();
   let args = process.argv.slice(2);
   const handoffConfig = stripHandoffFlag(args);
   args = handoffConfig.args;
@@ -20,6 +67,26 @@ const { ensureToken } = require('../lib/ensure-token');
   const superMode = args.some(a => superFlags.includes(a));
   args = args.filter(a => !superFlags.includes(a));
 
+  // OpenCode may try to read the clipboard tool even for simple prompts.
+  // If the clipboard currently contains an image, OpenCode requires the selected
+  // model to support image input; many text-only models will fail with:
+  //   Cannot read "clipboard" (this model does not support image input)
+  // Disable clipboard tool by default for more predictable behavior.
+  // Set JBAI_OPENCODE_ENABLE_CLIPBOARD=1 to keep clipboard enabled.
+  const enableClipboard = process.env.JBAI_OPENCODE_ENABLE_CLIPBOARD === '1';
+
+  if (isModelsCommand(args)) {
+    showModelsForTool('opencode', 'Available Grazie models for jbai-opencode:');
+    return;
+  }
+
+  const token = await ensureToken();
+  const environment = config.getEnvironment();
+  const proxyBase = `http://127.0.0.1:${PROXY_PORT}`;
+
+  // Auto-start proxy if not running
+  await ensureProxy();
+
   // Setup OpenCode config with JetBrains provider
   const configDir = path.join(os.homedir(), '.config', 'opencode');
   const configFile = path.join(configDir, 'opencode.json');
@@ -45,11 +112,17 @@ const { ensureToken } = require('../lib/ensure-token');
     opencodeConfig.provider = {};
   }
 
-  // Environment variable name for the token
-  const envVarName = environment === 'staging' ? 'GRAZIE_STAGING_TOKEN' : 'GRAZIE_API_TOKEN';
-
   // Provider names for OpenAI and Anthropic
   const anthropicProviderName = environment === 'staging' ? 'jbai-anthropic-staging' : 'jbai-anthropic';
+  const grazieOpenAiProviderName = environment === 'staging' ? 'jbai-grazie-openai-staging' : 'jbai-grazie-openai';
+
+  // Remove any providers outside our Grazie set for this tool
+  const allowedProviders = new Set([providerName, anthropicProviderName, grazieOpenAiProviderName]);
+  for (const key of Object.keys(opencodeConfig.provider)) {
+    if (!allowedProviders.has(key)) {
+      delete opencodeConfig.provider[key];
+    }
+  }
 
   // Add/update JetBrains OpenAI provider with custom header (using env var reference)
   // Use OpenAI SDK to support max_completion_tokens for GPT-5.x
@@ -57,11 +130,8 @@ const { ensureToken } = require('../lib/ensure-token');
     npm: '@ai-sdk/openai',
     name: `JetBrains AI OpenAI (${environment})`,
     options: {
-      baseURL: endpoints.openai,
-      apiKey: `{env:${envVarName}}`,
-      headers: {
-        'Grazie-Authenticate-JWT': `{env:${envVarName}}`
-      }
+      baseURL: `${proxyBase}/openai/v1`,
+      apiKey: 'placeholder',
     },
     models: {}
   };
@@ -84,11 +154,8 @@ const { ensureToken } = require('../lib/ensure-token');
     npm: '@ai-sdk/anthropic',
     name: `JetBrains AI Anthropic (${environment})`,
     options: {
-      baseURL: endpoints.anthropic,
-      apiKey: `{env:${envVarName}}`,
-      headers: {
-        'Grazie-Authenticate-JWT': `{env:${envVarName}}`
-      }
+      baseURL: `${proxyBase}/anthropic/v1`,
+      apiKey: 'placeholder',
     },
     models: {}
   };
@@ -101,6 +168,37 @@ const { ensureToken } = require('../lib/ensure-token');
     };
   });
 
+  // Add Grazie-native models via an OpenAI-compatible adapter (all providers)
+  // This makes non-OpenAI/Anthropic models visible to OpenCode.
+  // Note: tool/function calling support depends on Grazie chat capabilities.
+  opencodeConfig.provider[grazieOpenAiProviderName] = {
+    npm: '@ai-sdk/openai',
+    name: `JetBrains AI Grazie Chat (${environment})`,
+    options: {
+      baseURL: `${proxyBase}/grazie-openai/v1`,
+      apiKey: 'placeholder',
+    },
+    models: {}
+  };
+
+  try {
+    const profiles = await fetchGrazieProfiles(token, environment);
+    for (const p of profiles) {
+      if (!p || !p.id || p.deprecated) continue;
+      if (Array.isArray(p.features) && !p.features.includes('Chat')) continue;
+
+      const context = Number.isInteger(p.contextLimit) && p.contextLimit > 0 ? p.contextLimit : 128000;
+      const output = Number.isInteger(p.maxOutputTokens) && p.maxOutputTokens > 0 ? p.maxOutputTokens : 8192;
+
+      opencodeConfig.provider[grazieOpenAiProviderName].models[p.id] = {
+        name: p.id,
+        limit: { context, output }
+      };
+    }
+  } catch {
+    // If profiles can't be fetched, keep provider but without models.
+  }
+
   // NOTE: Gemini models are NOT available via Grazie OpenAI-compatible proxy.
   // The /user/v5/llm/google/v1/vertex endpoint only works with native Google API
   // format (used by jbai-gemini), not OpenAI chat/completions format.
@@ -115,8 +213,13 @@ const { ensureToken } = require('../lib/ensure-token');
   }
   opencodeConfig.agent.build.permission = 'allow';
 
+  if (!enableClipboard) {
+    if (!opencodeConfig.tools) opencodeConfig.tools = {};
+    opencodeConfig.tools.clipboard = false;
+  }
+
   // Only show JetBrains AI providers in the model picker
-  opencodeConfig.enabled_providers = [providerName, anthropicProviderName];
+  opencodeConfig.enabled_providers = [providerName, anthropicProviderName, grazieOpenAiProviderName];
 
   // Clean up legacy keys that newer OpenCode versions reject
   delete opencodeConfig.yolo;
@@ -135,10 +238,9 @@ const { ensureToken } = require('../lib/ensure-token');
 
   finalArgs.push(...args);
 
-  // Set the token in environment variable for OpenCode config to reference
+  // No extra env needed: token is written into the config for this run
   const childEnv = {
-    ...process.env,
-    [envVarName]: token
+    ...process.env
   };
 
   const child = runWithHandoff({