jbai-cli 2.1.0 → 2.1.1

package/bin/jbai.js

@@ -7,7 +7,6 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const config = require('../lib/config');
-const { createHandoff } = require('../lib/handoff');
 const { getGroupsForTool, showModelsForTool } = require('../lib/model-list');
 const completions = require('../lib/completions');
 
@@ -50,18 +49,31 @@ const TOOLS = {
   }
 };
 
+const MENU_WRAPPERS = {
+  claude: 'jbai-claude.js',
+  codex: 'jbai-codex.js',
+  opencode: 'jbai-opencode.js',
+  gemini: 'jbai-gemini.js',
+  goose: 'jbai-goose.js',
+  continue: 'jbai-continue.js',
+};
+
+const CLI_PACKAGE = 'jbai-cli';
+const NPM_BIN = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+
 const VERSION = require('../package.json').version;
 
 const HELP = `
 jbai-cli v${VERSION} - JetBrains AI Platform CLI Tools
 
+Launch 'jbai' with no arguments to open the interactive terminal control panel.
+
 COMMANDS:
   jbai token           Show token status
   jbai token set       Set token interactively
   jbai token refresh          Auto-refresh token via API
   jbai token refresh <token>  Set new token (saves to ~/.jbai/token + ~/.zshrc)
   jbai test            Test API endpoints (incl. Codex /responses)
-  jbai handoff         Continue task in Orca Lab
   jbai env [staging|production]  Switch environment
   jbai models [tool]   List Grazie models (all|claude|codex|gemini|opencode|goose|continue)
   jbai install         Install all AI tools (claude, codex, gemini, opencode, goose, continue)
@@ -70,6 +82,7 @@ COMMANDS:
   jbai completions     Print zsh completions to stdout
   jbai completions --install   Add completions to ~/.zshrc
   jbai completions --bash      Print bash completions
+  jbai menu                   Open interactive control panel
   jbai help            Show this help
 
 PROXY (for Codex Desktop, Cursor, etc.):
@@ -88,6 +101,7 @@ TOOL WRAPPERS:
 MODEL SHORTCUTS (super mode by default):
   jbai-claude-opus              Claude Code + Opus 4.6
   jbai-claude-sonnet            Claude Code + Sonnet 4.6
+  jbai-codex-5.4                Codex + GPT-5.4
   jbai-codex-5.3                Codex + GPT-5.3
   jbai-codex-5.2                Codex + GPT-5.2
   jbai-codex-rockhopper         Codex + Rockhopper Alpha (OpenAI EAP)
@@ -112,7 +126,6 @@ EXAMPLES:
   jbai-gemini-supernova             # Gemini with Supernova (super mode)
   jbai-council                      # Launch all 3 agents in tmux
   jbai-council --super              # All agents in super mode
-  jbai handoff --task "fix lint"    # Handoff task to Orca Lab
 
 TOKEN:
   Get token: ${config.getEndpoints().tokenUrl}
@@ -524,139 +537,318 @@ async function installTools(toolKey) {
   console.log('Run: jbai doctor  to verify');
 }
 
-const HANDOFF_HELP = `
-jbai handoff - Continue a task in Orca Lab
-
-Usage:
-  jbai handoff --task "your task"
-  jbai handoff "your task"
-
-Options:
-  --task, -t            Task description (or pass as positional)
-  --repo, -r            Git repo URL (defaults to origin remote)
-  --ref                 Git ref (defaults to current branch)
-  --branch, -b          Working branch name for the agent
-  --model, -m           Claude model (default: ${config.MODELS.claude.default})
-  --grazie-env, -e      STAGING | PREPROD | PRODUCTION
-  --grazie-token        Override Grazie token (default: ~/.jbai/token)
-  --git-token, -g       GitHub token (default: GITHUB_TOKEN/GH_TOKEN)
-  --facade-token, -f    Facade JWT token (default: FACADE_JWT_TOKEN)
-  --orca-url, -o        Orca Lab URL (default: http://localhost:3000)
-  --no-open             Do not open the Orca Lab URL
-  --no-auto-start       Do not auto-start the agent task
-  --help                Show this help
-`;
+function ask(question) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
 
-function parseArgs(argv) {
-  const opts = {};
-  const rest = [];
-  const shortMap = {
-    t: 'task',
-    r: 'repo',
-    b: 'branch',
-    m: 'model',
-    e: 'grazie-env',
-    g: 'git-token',
-    f: 'facade-token',
-    o: 'orca-url',
-    h: 'help'
-  };
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve((answer || '').trim());
+    });
+  });
+}
+
+function waitForEnter() {
+  return ask('\nPress Enter to continue...');
+}
+
+function runNodeScript(scriptName, args = []) {
+  return new Promise((resolve) => {
+    const scriptPath = path.join(__dirname, scriptName);
+    const child = spawn(process.execPath, [scriptPath, ...args], {
+      stdio: 'inherit'
+    });
 
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i];
-    if (arg === '--') {
-      rest.push(...argv.slice(i + 1));
-      break;
+    child.on('close', (code) => resolve(code || 0));
+    child.on('error', (error) => {
+      console.error(`Unable to run ${scriptName}: ${error.message}`);
+      resolve(1);
+    });
+  });
+}
+
+function runCommand(command, args = []) {
+  return new Promise((resolve) => {
+    const child = spawn(command, args, {
+      stdio: 'inherit',
+      shell: false
+    });
+
+    child.on('close', (code) => resolve(code || 0));
+    child.on('error', (error) => {
+      console.error(`Command failed: ${command} ${args.join(' ')}`);
+      console.error(error.message);
+      resolve(1);
+    });
+  });
+}
+
+async function launchAgent(tool) {
+  const script = MENU_WRAPPERS[tool];
+  if (!script) {
+    console.log(`Unsupported agent: ${tool}`);
+    return;
+  }
+
+  if (!isToolInstalled(tool)) {
+    console.log(`❌ ${TOOLS[tool].name} is not installed.`);
+    const installNow = (await ask(`Install ${TOOLS[tool].name} now? [y/N]: `)).toLowerCase() === 'y';
+    if (!installNow) {
+      return;
     }
-    if (arg.startsWith('--')) {
-      if (arg === '--no-open') {
-        opts.open = false;
-        continue;
-      }
-      if (arg === '--no-auto-start') {
-        opts.autoStart = false;
-        continue;
-      }
-      const key = arg.slice(2);
-      const next = argv[i + 1];
-      if (next && !next.startsWith('-')) {
-        opts[key] = next;
-        i++;
-      } else {
-        opts[key] = true;
-      }
+
+    await installTools(tool);
+    if (!isToolInstalled(tool)) {
+      return;
+    }
+  }
+
+  await runNodeScript(script);
+}
+
+async function setupClients() {
+  const installed = Object.keys(TOOLS).filter(isToolInstalled);
+  if (installed.length === 0) {
+    console.log('No tools installed yet. Install a tool first, then wire it up.');
+    return;
+  }
+
+  const code = await runNodeScript('jbai-proxy.js', ['setup']);
+  if (code !== 0) {
+    console.log('Client setup reported issues. Fix the errors above and try again.');
+    return;
+  }
+
+  console.log('\nClient wiring complete.');
+  console.log('- Codex Desktop: config.toml updated');
+  console.log('- Shell env: JBAI_PROXY_KEY added');
+  console.log('- Proxy: started + launch settings configured');
+}
+
+async function updateCli() {
+  const confirm = (await ask('Update jbai-cli to latest from npm? [Y/n]: ')).toLowerCase();
+  if (confirm && confirm !== 'y' && confirm !== '') {
+    return;
+  }
+
+  const code = await runCommand(NPM_BIN, ['install', '-g', `${CLI_PACKAGE}@latest`]);
+  if (code === 0) {
+    console.log('✅ Update completed. Restart terminal to load updated binary.');
+  } else {
+    console.log('❌ Update failed. Check npm output and try again.');
+  }
+}
+
+async function uninstallCli() {
+  const confirm = (await ask(`This will uninstall ${CLI_PACKAGE} and close this app. Continue? [y/N]: `)).toLowerCase();
+  if (confirm !== 'y') {
+    return;
+  }
+
+  const code = await runCommand(NPM_BIN, ['uninstall', '-g', CLI_PACKAGE]);
+  if (code === 0) {
+    console.log('✅ jbai-cli removed.');
+    process.exit(0);
+  }
+  console.log('❌ Uninstall failed. Check npm output and try again.');
+}
+
+function environmentLabel() {
+  return config.getEnvironment() === 'production' ? 'PRODUCTION' : 'STAGING';
+}
+
+async function runTokenMenu() {
+  while (true) {
+    const action = (await ask(`\nToken Management\n1) Show status\n2) Set token\n3) Refresh token\n0) Back\n\nSelect: `)).toLowerCase();
+
+    if (action === '0' || action === 'b' || action === 'back') {
+      return;
+    }
+
+    if (action === '1') {
+      showTokenStatus();
+      await waitForEnter();
       continue;
     }
-    if (arg.startsWith('-') && arg.length === 2) {
-      const short = arg.slice(1);
-      const key = shortMap[short];
-      if (!key) {
-        rest.push(arg);
-        continue;
-      }
-      const next = argv[i + 1];
-      if (next && !next.startsWith('-')) {
-        opts[key] = next;
-        i++;
-      } else {
-        opts[key] = true;
-      }
+
+    if (action === '2') {
+      await setToken();
+      await waitForEnter();
+      continue;
+    }
+
+    if (action === '3') {
+      await refreshTokenCommand();
+      await waitForEnter();
+      continue;
+    }
+
+    console.log('Invalid selection.');
+  }
+}
+
+async function runSettingsMenu() {
+  while (true) {
+    const action = (await ask(`\nSettings\n1) Show environment (${environmentLabel()})\n2) Switch to staging\n3) Switch to production\n0) Back\n\nSelect: `)).toLowerCase();
+
+    if (action === '0' || action === 'b' || action === 'back') {
+      return;
+    }
+
+    if (action === '1') {
+      console.log(`Current environment: ${environmentLabel()}`);
+      console.log(`Token URL: ${config.getEndpoints().tokenUrl}`);
+      await waitForEnter();
+      continue;
+    }
+
+    if (action === '2') {
+      setEnvironment('staging');
+      await waitForEnter();
+      continue;
+    }
+
+    if (action === '3') {
+      setEnvironment('production');
+      await waitForEnter();
       continue;
     }
-    rest.push(arg);
+
+    console.log('Invalid selection.');
   }
+}
+
+async function runAgentMenu() {
+  const action = (await ask(`\nStart Agent\n1) Claude\n2) Codex\n3) OpenCode\n4) Gemini\n5) Goose\n6) Continue\n0) Back\n\nSelect: `)).toLowerCase();
+
+  const map = {
+    '1': 'claude',
+    '2': 'codex',
+    '3': 'opencode',
+    '4': 'gemini',
+    '5': 'goose',
+    '6': 'continue'
+  };
 
-  return { opts, rest };
+  if (action === '0' || action === 'b' || action === 'back') {
+    return;
+  }
+
+  const tool = map[action];
+  if (!tool) {
+    console.log('Invalid selection.');
+    await waitForEnter();
+    return;
+  }
+
+  console.log(`\nStarting ${TOOLS[tool].name}...\n`);
+  await launchAgent(tool);
 }
 
-function readStdin() {
-  return new Promise((resolve) => {
-    let data = '';
-    process.stdin.setEncoding('utf8');
-    process.stdin.on('data', (chunk) => data += chunk);
-    process.stdin.on('end', () => resolve(data));
-    process.stdin.on('error', () => resolve(''));
+async function runInstallMenu() {
+  const missing = Object.entries(TOOLS).filter(([key]) => !isToolInstalled(key));
+  if (missing.length === 0) {
+    console.log('✅ All agents are already installed.');
+    await waitForEnter();
+    return;
+  }
+
+  const choices = [];
+  missing.forEach(([key], index) => {
+    choices.push(`${index + 1}) ${TOOLS[key].name}`);
   });
-}
 
-async function handoffToOrca(rawArgs) {
-  const { opts, rest } = parseArgs(rawArgs);
-  if (opts.help) {
-    console.log(HANDOFF_HELP);
+  const action = (await ask(`\nInstall Agents\n${choices.join('\n')}\nA) Install all missing\n0) Back\n\nSelect: `)).toLowerCase();
+
+  if (action === '0' || action === 'b' || action === 'back') {
     return;
   }
 
-  let task = opts.task || rest.join(' ').trim();
-  if (!task && !process.stdin.isTTY) {
-    task = (await readStdin()).trim();
+  if (action === 'a') {
+    await installTools();
+    await waitForEnter();
+    return;
   }
-  if (!task) {
-    console.log(HANDOFF_HELP);
-    process.exit(1);
+
+  const index = parseInt(action, 10);
+  if (!Number.isInteger(index) || index < 1 || index > missing.length) {
+    console.log('Invalid selection.');
+    return;
   }
 
-  try {
-    const result = await createHandoff({
-      task,
-      repoUrl: opts.repo,
-      ref: opts.ref,
-      branchName: opts.branch,
-      gitToken: opts['git-token'] || opts.gitToken,
-      facadeToken: opts['facade-token'] || opts.facadeToken,
-      orcaUrl: opts['orca-url'] || opts.orcaUrl,
-      grazieToken: opts['grazie-token'] || opts.grazieToken,
-      grazieEnvironment: opts['grazie-env'] || opts.grazieEnv,
-      grazieModel: opts.model,
-      autoStart: opts.autoStart !== false,
-      shouldOpen: opts.open !== false,
-      source: 'jbai-cli',
-    });
-    console.log('✅ Handoff created');
-    console.log(`Environment: ${result.environmentId}`);
-    console.log(`Open: ${result.environmentUrl}`);
-  } catch (error) {
-    console.error(`❌ ${error instanceof Error ? error.message : 'Handoff failed'}`);
-    process.exit(1);
+  const tool = missing[index - 1][0];
+  await installTools(tool);
+  await waitForEnter();
+}
+
+async function runStandaloneMenu() {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    console.log('Interactive mode requires a TTY terminal. Run: jbai help');
+    return;
+  }
+
+  while (true) {
+    const action = (await ask(`\n┌─ jbai control panel\n│1) Token management\n│2) Settings (environment)\n│3) Install agents\n│4) Wire configured clients\n│5) Doctor (health + install status)\n│6) Start agent chat\n│7) Update jbai-cli\n│8) Uninstall jbai-cli\n│9) Version\n│0) Exit\n└─ Select: `)).toLowerCase();
+
+    if (action === '0' || action === 'q' || action === 'exit') {
+      return;
+    }
+
+    if (action === '1') {
+      await runTokenMenu();
+      continue;
+    }
+
+    if (action === '2') {
+      await runSettingsMenu();
+      continue;
+    }
+
+    if (action === '3') {
+      await runInstallMenu();
+      continue;
+    }
+
+    if (action === '4') {
+      await setupClients();
+      await waitForEnter();
+      continue;
+    }
+
+    if (action === '5') {
+      doctor();
+      await waitForEnter();
+      continue;
+    }
+
+    if (action === '6') {
+      await runAgentMenu();
+      continue;
+    }
+
+    if (action === '7') {
+      await updateCli();
+      await waitForEnter();
+      continue;
+    }
+
+    if (action === '8') {
+      await uninstallCli();
+      continue;
+    }
+
+    if (action === '9') {
+      console.log(`jbai-cli v${VERSION}`);
+      console.log(`Node: ${process.version}`);
+      console.log(`Environment: ${environmentLabel()}`);
+      await waitForEnter();
+      continue;
+    }
+
+    console.log('Invalid selection.');
   }
 }
 
@@ -676,9 +868,6 @@ switch (command) {
   case 'test':
     testEndpoints();
     break;
-  case 'handoff':
-    handoffToOrca(args);
-    break;
   case 'models':
     if (args[0]) {
       const allowed = new Set(['all', 'claude', 'codex', 'gemini', 'opencode', 'goose', 'continue']);
@@ -712,9 +901,14 @@ switch (command) {
   case 'help':
   case '--help':
   case '-h':
-  case undefined:
     console.log(HELP);
     break;
+  case 'menu':
+    runStandaloneMenu();
+    break;
+  case undefined:
+    runStandaloneMenu();
+    break;
   case 'version':
   case '--version':
   case '-v':

package/lib/completions.js

@@ -15,12 +15,9 @@ const config = require('./config');
 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',
+  'menu', 'token', 'test', 'env', 'models', 'install', 'doctor',
   'status', 'proxy', 'help', 'version', 'completions',
 ];
 
@@ -51,7 +48,7 @@ function generateZsh() {
     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
+  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-5.4 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
@@ -65,9 +62,9 @@ ${UNIQUE_MODELS.map(m => `    '${m}'`).join('\n')}
 # Main jbai command completions
 _jbai() {
   local -a subcommands=(
+    'menu:Open interactive control panel'
     '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'
@@ -137,7 +134,7 @@ _jbai_tool_wrapper() {
 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-codex-5.2 jbai-codex-5.3 jbai-codex-5.4 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
 `;
@@ -205,7 +202,7 @@ _jbai_tool_completions() {
 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-codex-5.2 jbai-codex-5.3 jbai-codex-5.4 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
 `;