gbos 1.1.8 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gbos",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "GBOS - Command line interface for GBOS services",
   "main": "src/index.js",
   "bin": {
@@ -39,6 +39,7 @@
   ],
   "dependencies": {
     "commander": "^12.1.0",
-    "pngjs": "^7.0.0"
+    "pngjs": "^7.0.0",
+    "terminal-image": "^4.2.0"
   }
 }

package/src/cli.js

@@ -6,6 +6,7 @@ const program = new Command();
 const authCommand = require('./commands/auth');
 const connectCommand = require('./commands/connect');
 const logoutCommand = require('./commands/logout');
+const logoCommand = require('./commands/logo');
 const config = require('./lib/config');
 
 const VERSION = require('../package.json').version;
@@ -76,12 +77,15 @@ program
       return;
     }
 
+    const userName = session.user_name || session.user_email || `User ${session.user_id}`;
+    const accountName = session.account_name || `Account ${session.account_id}`;
+
     console.log('\n┌─────────────────────────────────────────────────────────────┐');
     console.log('│                      GBOS Status                            │');
     console.log('├─────────────────────────────────────────────────────────────┤');
     console.log(`│  Authenticated: ✓                                          │`);
-    console.log(`│  User ID:       ${String(session.user_id).padEnd(42)}│`);
-    console.log(`│  Account ID:    ${String(session.account_id).padEnd(42)}│`);
+    console.log(`│  User:          ${userName.substring(0, 42).padEnd(42)}│`);
+    console.log(`│  Account:       ${accountName.substring(0, 42).padEnd(42)}│`);
 
     const connection = session.connection;
     if (connection) {
@@ -114,6 +118,11 @@ program
   .option('-a, --all', 'Clear all stored data including machine ID')
   .action(logoutCommand);
 
+program
+  .command('logo')
+  .description('Print the GBOS logo image')
+  .action(logoCommand);
+
 program
   .command('help [command]')
   .description('Display help for a specific command')

package/src/commands/auth.js

@@ -34,9 +34,11 @@ async function authCommand(options) {
   // Check if already authenticated
   if (config.isAuthenticated() && !options.force) {
     const session = config.loadSession();
+    const userName = session.user_name || session.user_email || `User ${session.user_id}`;
+    const accountName = session.account_name || `Account ${session.account_id}`;
     displayMessageBox(
       'Already Authenticated',
-      `User ID: ${session.user_id}, Account ID: ${session.account_id}. Use --force to re-authenticate or "gbos logout" first.`,
+      `${userName} · ${accountName}. Use --force to re-authenticate or "gbos logout" first.`,
       'info'
     );
     return;

package/src/commands/connect.js

@@ -1,45 +1,114 @@
 const api = require('../lib/api');
 const config = require('../lib/config');
 const { checkForUpdates } = require('../lib/version');
-const { displayConnectSuccess, displayMessageBox } = require('../lib/display');
+const { displayConnectSuccess, displayMessageBox, colors } = require('../lib/display');
 const readline = require('readline');
-const path = require('path');
 const { execSync } = require('child_process');
 
-// Simple selection prompt
-async function selectOption(message, options) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
+const ESC = '\x1b';
+const RESET = `${ESC}[0m`;
+const BOLD = `${ESC}[1m`;
+const DIM = `${ESC}[2m`;
+const PURPLE = `${ESC}[38;5;99m`;
+const WHITE = `${ESC}[37m`;
+const CYAN = `${ESC}[36m`;
+
+// Interactive arrow key selector
+async function selectWithArrows(title, options, displayFn) {
+  return new Promise((resolve) => {
+    let selectedIndex = 0;
+    const stdin = process.stdin;
+    const stdout = process.stdout;
+
+    // Save cursor position and hide cursor
+    stdout.write(`${ESC}[?25l`);
+
+    function render() {
+      // Move cursor to start and clear
+      stdout.write(`${ESC}[${options.length + 3}A${ESC}[J`);
 
-  console.log(`\n${message}\n`);
+      console.log(`\n${PURPLE}${title}${RESET}\n`);
 
-  options.forEach((opt, index) => {
-    const status = opt.status ? ` [${opt.status}]` : '';
-    const connected = opt.is_connected ? ' (connected by another user)' : '';
-    console.log(`  ${index + 1}. ${opt.name}${status}${connected}`);
-    if (opt.description) {
-      console.log(`     ${opt.description}`);
+      options.forEach((opt, index) => {
+        const isSelected = index === selectedIndex;
+        const prefix = isSelected ? `${CYAN}❯${RESET}` : ' ';
+        const text = displayFn ? displayFn(opt, isSelected) : opt.name;
+
+        if (isSelected) {
+          console.log(`  ${prefix} ${BOLD}${WHITE}${text}${RESET}`);
+        } else {
+          console.log(`  ${prefix} ${DIM}${text}${RESET}`);
+        }
+      });
+
+      console.log(`\n  ${DIM}↑/↓ to navigate, Enter to select, q to cancel${RESET}`);
     }
-  });
 
-  console.log('');
+    // Initial render
+    console.log(`\n${PURPLE}${title}${RESET}\n`);
+    options.forEach((opt, index) => {
+      const isSelected = index === selectedIndex;
+      const prefix = isSelected ? `${CYAN}❯${RESET}` : ' ';
+      const text = displayFn ? displayFn(opt, isSelected) : opt.name;
 
-  return new Promise((resolve) => {
-    rl.question('Enter number (or q to quit): ', (answer) => {
-      rl.close();
-      if (answer.toLowerCase() === 'q') {
+      if (isSelected) {
+        console.log(`  ${prefix} ${BOLD}${WHITE}${text}${RESET}`);
+      } else {
+        console.log(`  ${prefix} ${DIM}${text}${RESET}`);
+      }
+    });
+    console.log(`\n  ${DIM}↑/↓ to navigate, Enter to select, q to cancel${RESET}`);
+
+    // Enable raw mode
+    if (stdin.isTTY) {
+      stdin.setRawMode(true);
+    }
+    stdin.resume();
+    stdin.setEncoding('utf8');
+
+    function cleanup() {
+      if (stdin.isTTY) {
+        stdin.setRawMode(false);
+      }
+      stdin.removeListener('data', onKeypress);
+      // Show cursor
+      stdout.write(`${ESC}[?25h`);
+    }
+
+    function onKeypress(key) {
+      // Ctrl+C
+      if (key === '\u0003') {
+        cleanup();
+        process.exit();
+      }
+
+      // q or Q to quit
+      if (key === 'q' || key === 'Q') {
+        cleanup();
         resolve(null);
         return;
       }
-      const index = parseInt(answer, 10) - 1;
-      if (index >= 0 && index < options.length) {
-        resolve(options[index]);
-      } else {
-        resolve(null);
+
+      // Enter
+      if (key === '\r' || key === '\n') {
+        cleanup();
+        resolve(options[selectedIndex]);
+        return;
       }
-    });
+
+      // Arrow keys (escape sequences)
+      if (key === `${ESC}[A` || key === 'k') {
+        // Up
+        selectedIndex = selectedIndex > 0 ? selectedIndex - 1 : options.length - 1;
+        render();
+      } else if (key === `${ESC}[B` || key === 'j') {
+        // Down
+        selectedIndex = selectedIndex < options.length - 1 ? selectedIndex + 1 : 0;
+        render();
+      }
+    }
+
+    stdin.on('data', onKeypress);
   });
 }
 
@@ -80,7 +149,7 @@ async function connectCommand(options) {
       return;
     }
 
-    console.log('\nFetching available nodes...\n');
+    console.log('\nFetching available applications...\n');
 
     // Fetch available nodes
     const nodesResponse = await api.listNodes();
@@ -108,47 +177,59 @@ async function connectCommand(options) {
       nodesByApp[appId].nodes.push(node);
     });
 
-    // If multiple applications, let user select one first
-    let selectedApp = null;
     const appIds = Object.keys(nodesByApp);
 
-    if (appIds.length > 1) {
-      const appOptions = appIds.map((appId) => ({
-        id: appId,
-        name: nodesByApp[appId].application?.name || `Application ${appId}`,
-        description: `${nodesByApp[appId].nodes.length} node(s) available`,
-      }));
+    // Build application options
+    const appOptions = appIds.map((appId) => ({
+      id: appId,
+      name: nodesByApp[appId].application?.name || `Application ${appId}`,
+      nodeCount: nodesByApp[appId].nodes.length,
+      application: nodesByApp[appId].application,
+    }));
 
-      selectedApp = await selectOption('Select an application:', appOptions);
+    // Always show application selection (even if only one)
+    const selectedApp = await selectWithArrows(
+      'Select an application:',
+      appOptions,
+      (opt) => `${opt.name} ${DIM}(${opt.nodeCount} node${opt.nodeCount > 1 ? 's' : ''})${RESET}`
+    );
 
-      if (!selectedApp) {
-        console.log('Connection cancelled.\n');
-        return;
-      }
-    } else {
-      selectedApp = { id: appIds[0] };
+    if (!selectedApp) {
+      console.log('\nConnection cancelled.\n');
+      return;
     }
 
     // Get nodes for selected application
     const appNodes = nodesByApp[selectedApp.id].nodes;
     const selectedApplication = nodesByApp[selectedApp.id].application;
 
-    // Let user select a node
+    // Build node options
     const nodeOptions = appNodes.map((node) => ({
       ...node,
-      name: node.name,
-      description: node.node_type || '',
+      displayName: node.name,
+      nodeType: node.node_type || '',
+      isBusy: node.is_connected && node.active_connection,
     }));
 
-    const selectedNode = await selectOption('Select a development node:', nodeOptions);
+    // Select a node
+    const selectedNode = await selectWithArrows(
+      'Select a development node:',
+      nodeOptions,
+      (opt) => {
+        let text = opt.displayName;
+        if (opt.nodeType) text += ` ${DIM}[${opt.nodeType}]${RESET}`;
+        if (opt.isBusy) text += ` ${DIM}(busy)${RESET}`;
+        return text;
+      }
+    );
 
     if (!selectedNode) {
-      console.log('Connection cancelled.\n');
+      console.log('\nConnection cancelled.\n');
       return;
     }
 
     // Check if node is busy
-    if (selectedNode.is_connected && selectedNode.active_connection) {
+    if (selectedNode.isBusy) {
       displayMessageBox(
         'Node Busy',
         `Node "${selectedNode.name}" is already connected by another user. Please select a different node.`,

package/src/commands/logo.js

@@ -0,0 +1,16 @@
+const path = require('path');
+const { displayImage, getTerminalWidth } = require('../lib/display');
+
+async function logoCommand() {
+  const logoPath = path.join(__dirname, '../../images/logo-2.png');
+  const terminalWidth = getTerminalWidth();
+  const targetWidth = Math.min(60, Math.max(30, terminalWidth - 10));
+
+  await displayImage(logoPath, {
+    width: targetWidth,
+    fallbackWidth: 40,
+    fallbackHeight: 12,
+  });
+}
+
+module.exports = logoCommand;

package/src/lib/display.js

@@ -177,6 +177,32 @@ function imageToPixels(imagePath, targetWidth = 24, targetHeight = 5) {
   }
 }
 
+async function displayImage(imagePath, options = {}) {
+  const fallbackWidth = options.fallbackWidth || 40;
+  const fallbackHeight = options.fallbackHeight || 12;
+  const renderOptions = { ...options };
+  delete renderOptions.fallbackWidth;
+  delete renderOptions.fallbackHeight;
+
+  try {
+    const terminalImage = await import('terminal-image');
+    const renderer = terminalImage.default || terminalImage;
+    const output = await renderer.file(imagePath, renderOptions);
+    process.stdout.write(output);
+    if (!output.endsWith('\n')) process.stdout.write('\n');
+    return true;
+  } catch (error) {
+    const fallbackLines = imageToPixels(imagePath, fallbackWidth, fallbackHeight);
+    if (!fallbackLines) {
+      throw error;
+    }
+    console.log('');
+    fallbackLines.forEach((line) => console.log(line));
+    console.log('');
+    return false;
+  }
+}
+
 
 // Fallback compact logo
 const COMPACT_LOGO = [
@@ -187,7 +213,7 @@ const COMPACT_LOGO = [
 
 // Display logo with connection details (Claude Code style - clean, minimal)
 function displayLogoWithDetails(details = null) {
-  const logoPath = path.join(__dirname, '../../images/logo.png');
+  const logoPath = path.join(__dirname, '../../images/logo-2.png');
   const version = require('../../package.json').version;
 
   // Render logo at ~20 chars wide, 5 rows tall (smooth edges)
@@ -226,7 +252,7 @@ function displayLogo() {
 }
 
 function displayAuthSuccess(data) {
-  const logoPath = path.join(__dirname, '../../images/logo.png');
+  const logoPath = path.join(__dirname, '../../images/logo-2.png');
   const version = require('../../package.json').version;
 
   let logoLines = imageToPixels(logoPath, 20, 5);
@@ -300,6 +326,7 @@ module.exports = {
   displayAuthSuccess,
   displayConnectSuccess,
   displayMessageBox,
+  displayImage,
   imageToPixels,
   getTerminalWidth,
 };