jbai-cli 1.9.6 → 2.1.1

package/README.md

@@ -12,6 +12,14 @@ npm install -g jbai-cli
 
 ## Setup (2 minutes)
 
+`jbai` now opens an interactive control panel by default, so you can manage everything from one place:
+
+```bash
+jbai
+```
+
+It still supports direct commands for scripts and automation (for example `jbai token set`, `jbai test`, `jbai proxy setup`, `jbai install`).
+
 ### Step 1: Get your token
 
 1. Go to [platform.jetbrains.ai](https://platform.jetbrains.ai/) (or [staging](https://platform.stgn.jetbrains.ai/))
@@ -172,39 +180,6 @@ jbai-continue
 jbai-continue -p "explain this function"
 ```
 
-### Handoff to Orca Lab (local)
-```bash
-# Continue a task in Orca Lab via local facade
-jbai handoff --task "continue this work in orca-lab"
-```
-
-### Handoff to Orca Lab (nightly/staging)
-```bash
-export ORCA_LAB_URL="https://orca-lab-nightly.labs.jb.gg"
-export FACADE_JWT_TOKEN="..."        # required for /api/handoff
-export GITHUB_TOKEN="..."            # repo clone during provisioning
-
-jbai handoff --task "add new e2e test" \
-  --repo "https://github.com/JetBrains/jcp-orca-facade.git"
-```
-
-### In-session handoff (interactive tools)
-While running `jbai-codex`, `jbai-claude`, `jbai-gemini`, `jbai-opencode`, `jbai-goose`, or `jbai-continue`:
-- Press `Ctrl+]` to trigger a handoff to Orca Lab.
-- The last prompt you typed is used as the task.
-
-Optional environment variables:
-- `ORCA_LAB_URL` (default: `http://localhost:3000`)
-- `FACADE_JWT_TOKEN` (required for /api/handoff on hosted Orca Lab)
-- `GITHUB_TOKEN` / `GH_TOKEN` (private repos)
-- `JBAI_HANDOFF_TASK` (fallback task if no prompt captured)
-- `JBAI_HANDOFF_REPO` (override repo URL)
-- `JBAI_HANDOFF_REF` (override git ref)
-- `JBAI_HANDOFF_BRANCH` (override working branch)
-- `JBAI_HANDOFF_ENV` (STAGING | PREPROD | PRODUCTION)
-- `JBAI_HANDOFF_MODEL` (Claude model for Orca Lab agent)
-- `JBAI_HANDOFF_OPEN` (set to `false` to avoid opening a browser)
-
 ## Super Mode (Skip Confirmations)
 
 Add `--super` (or `--yolo` or `-s`) to any command to enable maximum permissions:
@@ -231,12 +206,15 @@ jbai-codex --super exec "refactor this code"
 
 Each tool has a sensible default, but you can specify any available model:
 
+- `jbai-opencode` default: `gpt-5.4` with `xhigh` reasoning (`--variant xhigh`)
+- `jbai-codex` default: `gpt-5.4` with `xhigh` reasoning effort
+
 ```bash
 # Claude with Opus 4.6
 jbai-claude --model claude-opus-4-6
 
-# Codex with GPT-5.3
-jbai-codex --model gpt-5.3-codex-api-preview
+# Codex with GPT-5.4
+jbai-codex --model gpt-5.4
 
 # Goose with GPT-5.2
 jbai-goose run -t "your task" --provider openai --model gpt-5.2-2025-12-11
@@ -262,7 +240,8 @@ jbai-continue  # select model in TUI
 **GPT (OpenAI Chat)** - Default for OpenCode
 | Model | Notes |
 |-------|-------|
-| `gpt-5.2-2025-12-11` | Default, latest |
+| `gpt-5.4` | Default, latest |
+| `gpt-5.2-2025-12-11` | |
 | `gpt-5.2` | Alias |
 | `gpt-5.1-2025-11-13` | |
 | `gpt-5-2025-08-07` | |
@@ -275,7 +254,8 @@ jbai-continue  # select model in TUI
 **Codex (OpenAI Responses)** - Use with Codex CLI: `jbai-codex --model <model>`
 | Model | Notes |
 |-------|-------|
-| `gpt-5.3-codex-api-preview` | Default, latest |
+| `gpt-5.4` | Default, latest |
+| `gpt-5.3-codex-api-preview` | |
 | `gpt-5.2-codex` | Coding-optimized |
 | `gpt-5.2-pro-2025-12-11` | |
 | `gpt-5.1-codex` | |
@@ -295,6 +275,8 @@ jbai-continue  # select model in TUI
 
 | Command | Description |
 |---------|-------------|
+| `jbai` | Open interactive control panel |
+| `jbai menu` | Open interactive control panel |
 | `jbai help` | Show help |
 | `jbai token` | Show token status |
 | `jbai token set` | Set/update token |
@@ -303,13 +285,27 @@ jbai-continue  # select model in TUI
 | `jbai proxy setup` | Setup proxy + configure Codex Desktop |
 | `jbai proxy status` | Check proxy status |
 | `jbai proxy stop` | Stop proxy |
-| `jbai handoff` | Continue a task in Orca Lab |
 | `jbai install` | Install all AI tools |
 | `jbai install claude` | Install specific tool |
 | `jbai doctor` | Check tool installation status |
 | `jbai env staging` | Use staging environment |
 | `jbai env production` | Use production environment |
 
+## Interactive Control Panel
+
+Running `jbai` with no arguments opens a terminal menu with fast access to:
+
+- Token management (show, set, refresh)
+- Environment switching (staging / production)
+- Agent installation
+- Client wiring (`jbai proxy setup` + Codex/Desktop env)
+- Health check (`doctor`)
+- Agent launch (Claude / Codex / OpenCode / Gemini / Goose / Continue)
+- Update / uninstall commands
+- Version info
+
+Use `0` to exit the menu.
+
 ## Installing AI Tools
 
 jbai-cli can install the underlying tools for you:

package/bin/jbai-claude-opus.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'claude',
+  model: 'claude-opus-4-6',
+  label: 'Claude Code + Opus 4.6',
+});

package/bin/jbai-claude-sonnet.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'claude',
+  model: 'claude-sonnet-4-6',
+  label: 'Claude Code + Sonnet 4.6',
+});

package/bin/jbai-claude.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
+const { spawn } = require('child_process');
 const config = require('../lib/config');
 const { isModelsCommand, showModelsForTool } = require('../lib/model-list');
 const { ensureToken } = require('../lib/ensure-token');
@@ -8,15 +8,13 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 
 (async () => {
   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();
+  await ensureToken();
 
   // Check for super mode (--super, --yolo, -s)
   const superFlags = ['--super', '--yolo', '-s'];
@@ -47,19 +45,7 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
   delete env.ANTHROPIC_AUTH_TOKEN;
   delete env.ANTHROPIC_CUSTOM_HEADERS;
 
-  const child = runWithHandoff({
-    command: 'claude',
-    args: finalArgs,
-    env,
-    toolName: 'jbai-claude',
-    handoffDefaults: {
-      enabled: !handoffConfig.disabled,
-      grazieToken: token,
-      grazieEnvironment: config.getEnvironment() === 'production' ? 'PRODUCTION' : 'STAGING',
-      grazieModel: config.MODELS.claude.default,
-      cwd: process.cwd(),
-    },
-  });
+  const child = spawn('claude', finalArgs, { stdio: 'inherit', env });
 
   if (child && typeof child.on === 'function') {
     child.on('error', (err) => {

package/bin/jbai-codex-5.2.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'codex',
+  model: 'gpt-5.2-codex',
+  label: 'Codex + GPT-5.2',
+});

package/bin/jbai-codex-5.3.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'codex',
+  model: 'gpt-5.3-codex',
+  label: 'Codex + GPT-5.3',
+});

package/bin/jbai-codex-5.4.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'codex',
+  model: 'gpt-5.4',
+  label: 'Codex + GPT-5.4',
+});

package/bin/jbai-codex-rockhopper.js

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

package/bin/jbai-codex.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
+const { spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
@@ -13,8 +13,6 @@ const PROXY_PROVIDER = 'jbai-proxy';
 
 (async () => {
   let args = process.argv.slice(2);
-  const handoffConfig = stripHandoffFlag(args);
-  args = handoffConfig.args;
 
   // Check for super mode (--super, --yolo, -s)
   const superFlags = ['--super', '--yolo', '-s'];
@@ -60,12 +58,22 @@ wire_api = "responses"
     console.log(`✅ Added ${PROXY_PROVIDER} provider to Codex config`);
   }
 
-  const hasModel = args.includes('--model');
+  const hasModel = args.includes('--model') || args.includes('-m');
+  const hasReasoningEffort = args.some((arg, idx) => {
+    if (arg === '-c' || arg === '--config') {
+      return String(args[idx + 1] || '').includes('model_reasoning_effort');
+    }
+    return arg.startsWith('-c') && arg.includes('model_reasoning_effort')
+      || arg.startsWith('--config=') && arg.includes('model_reasoning_effort');
+  });
   // 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);
+    if (!hasReasoningEffort) {
+      finalArgs.push('-c', 'model_reasoning_effort="high"');
+    }
   }
 
   // Add super mode flags (full-auto)
@@ -82,19 +90,7 @@ wire_api = "responses"
     JBAI_PROXY_KEY: 'placeholder',  // Proxy handles auth via Grazie JWT
   };
 
-  const child = runWithHandoff({
-    command: 'codex',
-    args: finalArgs,
-    env: childEnv,
-    toolName: 'jbai-codex',
-    handoffDefaults: {
-      enabled: !handoffConfig.disabled,
-      grazieToken: token,
-      grazieEnvironment: environment === 'production' ? 'PRODUCTION' : 'STAGING',
-      grazieModel: config.MODELS.claude.default,
-      cwd: process.cwd(),
-    },
-  });
+  const child = spawn('codex', finalArgs, { stdio: 'inherit', env: childEnv });
 
   if (child && typeof child.on === 'function') {
     child.on('error', (err) => {

package/bin/jbai-continue.js

@@ -7,7 +7,7 @@
  * then launches `cn` (Continue CLI).
  */
 
-const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
+const { spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
@@ -89,8 +89,6 @@ function toYaml(obj, indent = 0) {
 
 (async () => {
   let args = process.argv.slice(2);
-  const handoffConfig = stripHandoffFlag(args);
-  args = handoffConfig.args;
 
   // Check for super mode (--super, --yolo, -s)
   const superFlags = ['--super', '--yolo', '-s'];
@@ -110,7 +108,7 @@ function toYaml(obj, indent = 0) {
     args.splice(modelFlagIdx, 2);
   }
 
-  const token = await ensureToken();
+  await ensureToken();
   const environment = config.getEnvironment();
 
   // Auto-start proxy if not running
@@ -144,19 +142,7 @@ function toYaml(obj, indent = 0) {
     ANTHROPIC_API_KEY: 'placeholder',
   };
 
-  const child = runWithHandoff({
-    command: 'cn',
-    args: finalArgs,
-    env: childEnv,
-    toolName: 'jbai-continue',
-    handoffDefaults: {
-      enabled: !handoffConfig.disabled,
-      grazieToken: token,
-      grazieEnvironment: environment === 'production' ? 'PRODUCTION' : 'STAGING',
-      grazieModel: config.MODELS.claude.default,
-      cwd: process.cwd(),
-    },
-  });
+  const child = spawn('cn', finalArgs, { stdio: 'inherit', env: childEnv });
 
   if (child && typeof child.on === 'function') {
     child.on('error', (err) => {

package/bin/jbai-council.js

@@ -8,7 +8,7 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 const SESSION_NAME = 'jbai-council';
 
 const AGENTS = [
-  { name: 'claude', command: 'jbai-claude', extraArgs: ['--allow-dangerously-skip-permissions'] },
+  { name: 'claude', command: 'jbai-claude', extraArgs: ['--super'] },
   { name: 'codex', command: 'jbai-codex' },
   { name: 'opencode', command: 'jbai-opencode' },
 ];

package/bin/jbai-gemini-3.1.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'gemini',
+  model: 'gemini-3.1-pro-preview',
+  label: 'Gemini + 3.1 Pro Preview',
+});

package/bin/jbai-gemini-supernova.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+require('../lib/shortcut').run({
+  tool: 'gemini',
+  model: 'supernova',
+  label: 'Gemini + Supernova (Google EAP)',
+});

package/bin/jbai-gemini.js

@@ -6,7 +6,7 @@
  * Uses GEMINI_CLI_CUSTOM_HEADERS and GEMINI_BASE_URL for authentication
  */
 
-const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
+const { spawn } = require('child_process');
 const config = require('../lib/config');
 const { isModelsCommand, showModelsForTool } = require('../lib/model-list');
 const { ensureToken } = require('../lib/ensure-token');
@@ -14,15 +14,13 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 
 (async () => {
   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();
+  await ensureToken();
 
   // Check for super mode (--super, --yolo, -s)
   const superFlags = ['--super', '--yolo', '-s'];
@@ -52,19 +50,7 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
   // Remove any existing custom headers that might conflict
   delete env.GEMINI_CLI_CUSTOM_HEADERS;
 
-  const child = runWithHandoff({
-    command: 'gemini',
-    args: finalArgs,
-    env,
-    toolName: 'jbai-gemini',
-    handoffDefaults: {
-      enabled: !handoffConfig.disabled,
-      grazieToken: token,
-      grazieEnvironment: config.getEnvironment() === 'production' ? 'PRODUCTION' : 'STAGING',
-      grazieModel: config.MODELS.claude.default,
-      cwd: process.cwd(),
-    },
-  });
+  const child = spawn('gemini', finalArgs, { stdio: 'inherit', env });
 
   if (child && typeof child.on === 'function') {
     child.on('error', (err) => {

package/bin/jbai-goose.js

@@ -7,7 +7,7 @@
  * Goose uses OPENAI_HOST + OPENAI_API_KEY env vars for the OpenAI provider.
  */
 
-const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
+const { spawn } = require('child_process');
 const config = require('../lib/config');
 const { isModelsCommand, showModelsForTool } = require('../lib/model-list');
 const { ensureToken } = require('../lib/ensure-token');
@@ -15,8 +15,6 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
 
 (async () => {
   let args = process.argv.slice(2);
-  const handoffConfig = stripHandoffFlag(args);
-  args = handoffConfig.args;
 
   // Check for super mode (--super, --yolo, -s)
   const superFlags = ['--super', '--yolo', '-s'];
@@ -28,8 +26,7 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
     return;
   }
 
-  const token = await ensureToken();
-  const environment = config.getEnvironment();
+  await ensureToken();
 
   // Auto-start proxy if not running
   await ensureProxy();
@@ -87,19 +84,7 @@ const { PROXY_PORT, ensureProxy } = require('../lib/proxy');
     ...(superMode ? { GOOSE_MODE: 'auto' } : {}),
   };
 
-  const child = runWithHandoff({
-    command: 'goose',
-    args: finalArgs,
-    env: childEnv,
-    toolName: 'jbai-goose',
-    handoffDefaults: {
-      enabled: !handoffConfig.disabled,
-      grazieToken: token,
-      grazieEnvironment: environment === 'production' ? 'PRODUCTION' : 'STAGING',
-      grazieModel: config.MODELS.claude.default,
-      cwd: process.cwd(),
-    },
-  });
+  const child = spawn('goose', finalArgs, { stdio: 'inherit', env: childEnv });
 
   if (child && typeof child.on === 'function') {
     child.on('error', (err) => {

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { runWithHandoff, stripHandoffFlag } = require('../lib/interactive-handoff');
+const { spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
@@ -59,8 +59,6 @@ function fetchGrazieProfiles(token, environment) {
 
 (async () => {
   let args = process.argv.slice(2);
-  const handoffConfig = stripHandoffFlag(args);
-  args = handoffConfig.args;
 
   // Check for super mode (--super, --yolo, -s)
   const superFlags = ['--super', '--yolo', '-s'];
@@ -95,35 +93,14 @@ function fetchGrazieProfiles(token, environment) {
     fs.mkdirSync(configDir, { recursive: true });
   }
 
-  // Create or update OpenCode config with JetBrains provider
+  // Build a fresh OpenCode config (don't merge with existing to avoid stale/rejected keys)
   const providerName = environment === 'staging' ? 'jbai-staging' : 'jbai';
-  let opencodeConfig = {};
-
-  if (fs.existsSync(configFile)) {
-    try {
-      opencodeConfig = JSON.parse(fs.readFileSync(configFile, 'utf-8'));
-    } catch {
-      opencodeConfig = {};
-    }
-  }
-
-  // Ensure provider section exists
-  if (!opencodeConfig.provider) {
-    opencodeConfig.provider = {};
-  }
+  const opencodeConfig = { provider: {} };
 
   // 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
   opencodeConfig.provider[providerName] = {
@@ -205,25 +182,15 @@ function fetchGrazieProfiles(token, environment) {
   // Use `jbai gemini` instead for Gemini models.
 
   // Enable max permissions for the build agent (allow all tools without asking)
-  if (!opencodeConfig.agent) {
-    opencodeConfig.agent = {};
-  }
-  if (!opencodeConfig.agent.build) {
-    opencodeConfig.agent.build = {};
-  }
-  opencodeConfig.agent.build.permission = 'allow';
+  opencodeConfig.agent = { build: { permission: 'allow' } };
 
   if (!enableClipboard) {
-    if (!opencodeConfig.tools) opencodeConfig.tools = {};
-    opencodeConfig.tools.clipboard = false;
+    opencodeConfig.tools = { clipboard: false };
   }
 
   // Only show JetBrains AI providers in the model picker
   opencodeConfig.enabled_providers = [providerName, anthropicProviderName, grazieOpenAiProviderName];
 
-  // Clean up legacy keys that newer OpenCode versions reject
-  delete opencodeConfig.yolo;
-
   // Write config
   fs.writeFileSync(configFile, JSON.stringify(opencodeConfig, null, 2));
 
@@ -243,19 +210,7 @@ function fetchGrazieProfiles(token, environment) {
     ...process.env
   };
 
-  const child = runWithHandoff({
-    command: 'opencode',
-    args: finalArgs,
-    env: childEnv,
-    toolName: 'jbai-opencode',
-    handoffDefaults: {
-      enabled: !handoffConfig.disabled,
-      grazieToken: token,
-      grazieEnvironment: environment === 'production' ? 'PRODUCTION' : 'STAGING',
-      grazieModel: config.MODELS.claude.default,
-      cwd: process.cwd(),
-    },
-  });
+  const child = spawn('opencode', finalArgs, { stdio: 'inherit', env: childEnv });
 
   if (child && typeof child.on === 'function') {
     child.on('error', (err) => {

package/bin/jbai-proxy.js

@@ -228,6 +228,16 @@ function safeJsonParse(buf) {
   }
 }
 
+function hasVisionInput(payload) {
+  if (!payload || typeof payload !== 'object') return false;
+
+  // Fast path: if request body references standard image keys, treat as vision input.
+  const serialized = JSON.stringify(payload);
+  return serialized.includes('"input_image"')
+    || serialized.includes('"image_url"')
+    || serialized.includes('"image_base64"');
+}
+
 function tokenHash(token) {
   // Cheap, non-cryptographic hash for caching isolation
   let h = 0;
@@ -1109,6 +1119,7 @@ function handleGrazieOpenAIResponses({ req, res, jwt, endpoints, urlPath, startT
 // Codex CLI model picker response (matches chatgpt.com/backend-api/codex/models format)
 function buildCodexModelsResponse() {
   const descriptions = {
+    'gpt-5.4': 'Latest frontier model with strongest coding and reasoning performance.',
     'gpt-5.3-codex': 'Latest GPT-5.3 Codex model. Designed for long-running, detailed software engineering tasks.',
     'gpt-5.3-codex-api-preview': 'GPT-5.3 Codex (api-preview alias).',
     'gpt-5.2-codex': 'Latest frontier agentic coding model.',
@@ -1125,11 +1136,11 @@ function buildCodexModelsResponse() {
     'o3-2025-04-16': 'O3 reasoning model.',
   };
 
-  const models = config.MODELS.codex.available.map((id, i) => ({
+  const models = config.MODELS.codex.available.map((id) => ({
     slug: id,
     name: id,
     description: descriptions[id] || id,
-    default_active: i === 0,
+    default_active: id === config.MODELS.codex.default,
   }));
 
   return { models };
@@ -1290,9 +1301,20 @@ function proxy(req, res) {
         const parsed = JSON.parse(body.toString('utf-8'));
         if (parsed.model && config.MODEL_ALIASES[parsed.model]) {
           const original = parsed.model;
-          parsed.model = config.MODEL_ALIASES[parsed.model];
-          body = Buffer.from(JSON.stringify(parsed), 'utf-8');
-          log(`[alias] Rewrote model "${original}" → "${parsed.model}"`);
+          const alias = config.MODEL_ALIASES[original];
+          const isGpt54CompatAlias = original === 'gpt-5.4' || original === 'openai-gpt-5-4';
+          const shouldRewrite = !isGpt54CompatAlias || config.getEnvironment() === 'staging';
+          if (shouldRewrite) {
+            // On staging, gpt-5.4 is not directly available.
+            // For vision payloads route to a vision-capable GPT-5 model.
+            if (isGpt54CompatAlias && hasVisionInput(parsed)) {
+              parsed.model = 'gpt-5-2025-08-07';
+            } else {
+              parsed.model = alias;
+            }
+            body = Buffer.from(JSON.stringify(parsed), 'utf-8');
+            log(`[alias] Rewrote model "${original}" → "${parsed.model}"`);
+          }
         }
       } catch {
         // Not valid JSON or parse error — forward as-is