ispbills-icli 4.0.5 → 5.0.0

package/bin/icli.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { createInterface } from 'readline';
+import { createInterface, emitKeypressEvents } from 'readline';
 import { stdin as input, stdout as output, argv, exit } from 'process';
 import chalk from 'chalk';
 import { loadConfig, configPath } from '../src/config.js';
 import { loginFlow } from '../src/auth.js';
-import { inner, onResize, boxTop, boxBot, boxMid, boxRow } from '../src/layout.js';
+import { inner, onResize, boxTop, boxBot, boxMid, boxRow, bottomPalette } from '../src/layout.js';
 import {
   streamChat, printBanner, printSlashMenu, printUserBox,
   SLASH_COMMANDS, slashCompleter,
@@ -25,6 +25,13 @@ const P = {
 const args = argv.slice(2);
 const cmd  = args[0] ?? '';
 
+// ── Session context (shown in top bar) ─────────────────────────────────────────
+const ctx = {
+  device:   '',
+  aiMode:   'MANUAL',   // 'AUTOPILOT ON' | 'MANUAL'
+  operator: '',
+};
+
 // ── Help ───────────────────────────────────────────────────────────────────────
 function printHelp() {
   process.stdout.write('\n');
@@ -52,19 +59,23 @@ function printHelp() {
   }
 
   process.stdout.write(boxMid(P.border) + '\n');
-  process.stdout.write(boxRow(P.bold('Keyboard shortcuts'), P.border) + '\n');
+  process.stdout.write(boxRow(P.bold('Function key shortcuts'), P.border) + '\n');
   process.stdout.write(boxRow('', P.border) + '\n');
   [
-    ['Tab',       'Autocomplete slash commands'],
-    ['↑ / ↓',    'Navigate input history'],
-    ['Ctrl+T',    'Toggle reasoning display'],
-    ['Ctrl+L',    'Clear screen'],
-    ['Ctrl+C',    'Cancel / exit'],
+    ['F1',      'Open documentation'],
+    ['F2',      'Show conversation history'],
+    ['F3',      'Rollback last AI action'],
+    ['F4',      'Run bulk device sweep'],
+    ['Tab',     'Autocomplete slash commands'],
+    ['↑ / ↓',  'Navigate input history'],
+    ['Ctrl+L',  'Clear screen'],
+    ['Ctrl+C',  'Cancel / exit'],
   ].forEach(([k, d]) =>
     process.stdout.write(boxRow(P.warn(k.padEnd(14)) + P.dim(d), P.border) + '\n')
   );
   process.stdout.write(boxRow('', P.border) + '\n');
-  process.stdout.write(boxBot(P.border) + '\n\n');
+  process.stdout.write(boxBot(P.border) + '\n');
+  process.stdout.write(bottomPalette() + '\n\n');
 }
 
 // ── Auth ───────────────────────────────────────────────────────────────────────
@@ -108,11 +119,16 @@ async function singleShot(cfg, question) {
 
 // ── REPL ───────────────────────────────────────────────────────────────────────
 async function interactiveRepl(cfg) {
-  const history       = [];
-  let   showReasoning = true;
-  const PROMPT        = () => '  ' + P.accentD('❯') + ' ';
+  const history = [];
+  const PROMPT  = () => '  ' + P.accentD('❯') + ' ';
+
+  let isProcessing = false;
+
+  // Populate operator from cfg
+  if (cfg.user?.name) ctx.operator = cfg.user.name;
+  if (cfg.user?.role) ctx.aiMode  = cfg.user.role === 'noc' ? 'AUTOPILOT ON' : 'MANUAL';
 
-  printBanner(cfg);
+  printBanner(cfg, {}, ctx);
 
   const rl = createInterface({
     input, output,
@@ -122,6 +138,74 @@ async function interactiveRepl(cfg) {
   });
 
   onResize(() => rl.setPrompt(PROMPT()));
+
+  // ── F-key handling via keypress events ───────────────────────────────────────
+  emitKeypressEvents(process.stdin);
+
+  process.stdin.on('keypress', async (_ch, key) => {
+    if (!key || rl.closed || isProcessing) return;
+
+    if (key.name === 'f1') {
+      process.stdout.write('\n');
+      printHelp();
+      rl.prompt();
+      return;
+    }
+
+    if (key.name === 'f2') {
+      // Show history
+      const turns = history.filter(m => m.role === 'user');
+      process.stdout.write('\n');
+      if (!turns.length) {
+        process.stdout.write(P.muted('  No history yet.\n\n'));
+      } else {
+        process.stdout.write(boxTop('History', P.border) + '\n');
+        turns.forEach((m, i) =>
+          process.stdout.write(
+            boxRow(P.dim(String(i + 1).padStart(2) + '.') + ' ' +
+              chalk.white(m.content.replace(/\s+/g, ' ').slice(0, inner() - 5)), P.border) + '\n',
+        );
+        process.stdout.write(boxBot(P.border) + '\n\n');
+      }
+      rl.prompt();
+      return;
+    }
+
+    if (key.name === 'f3') {
+      rl.pause();
+      const q = 'rollback the last change you made';
+      process.stdout.write('\n  ' + P.muted('→ ') + P.dim(q) + '\n');
+      printUserBox(q);
+      history.push({ role: 'user', content: q });
+      try {
+        const answer = await streamChat(cfg, [...history]);
+        if (answer) history.push({ role: 'assistant', content: answer });
+      } catch (e) {
+        process.stdout.write('\n  ' + P.err('✖ ') + chalk.white(e.message) + '\n\n');
+      }
+      rl.resume();
+      rl.prompt();
+      return;
+    }
+
+    if (key.name === 'f4') {
+      rl.pause();
+      const q = 'run a bulk sweep of all devices and report status';
+      process.stdout.write('\n  ' + P.muted('→ ') + P.dim(q) + '\n');
+      printUserBox(q);
+      history.push({ role: 'user', content: q });
+      try {
+        const answer = await streamChat(cfg, [...history]);
+        if (answer) history.push({ role: 'assistant', content: answer });
+      } catch (e) {
+        process.stdout.write('\n  ' + P.err('✖ ') + chalk.white(e.message) + '\n\n');
+      }
+      rl.resume();
+      rl.prompt();
+      return;
+    }
+  });
+
   rl.prompt();
 
   rl.on('line', async (line) => {
@@ -132,7 +216,10 @@ async function interactiveRepl(cfg) {
       process.stdout.write(P.muted('\n  Goodbye.\n\n')); rl.close(); exit(0);
     }
     if (q === '/clear' || q === 'clear') {
-      process.stdout.write('\x1Bc'); printBanner(cfg); rl.prompt(); return;
+      process.stdout.write('\x1Bc');
+      printBanner(cfg, {}, ctx);
+      rl.prompt();
+      return;
     }
     if (q === '/help' || q === 'help') { printHelp(); rl.prompt(); return; }
     if (q === '/history' || q === 'history') {
@@ -162,12 +249,10 @@ async function interactiveRepl(cfg) {
 
     rl.pause();
     history.push({ role: 'user', content: question });
-
-    // User message box
     printUserBox(question);
 
     try {
-      const answer = await streamChat(cfg, [...history], {}, { thinking: showReasoning });
+      const answer = await streamChat(cfg, [...history]);
       if (answer) history.push({ role: 'assistant', content: answer });
     } catch (e) {
       process.stdout.write('\n  ' + P.err('✖ ') + chalk.white(e.message) + '\n\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ispbills-icli",
-  "version": "4.0.5",
+  "version": "5.0.0",
   "description": "iCli — IspBills AI network engineer in your terminal",
   "keywords": [
     "ispbills",

package/src/chat.js

@@ -5,7 +5,7 @@ import TerminalRenderer from 'marked-terminal';
 import { refreshToken } from './auth.js';
 import { cols, inner, visLen, padRight, stripAnsi,
          boxTop, boxMid, boxBot, boxTopOpen, boxBotOpen,
-         boxRow, boxLine } from './layout.js';
+         boxRow, boxLine, bottomPalette, topBar } from './layout.js';
 
 // ── Gemini-style palette ───────────────────────────────────────────────────────
 const P = {
@@ -21,6 +21,7 @@ const P = {
   warn:      chalk.yellow,
   cyan:      chalk.cyan,
   reasoning: chalk.hex('#9198A1').italic,
+  pill:      chalk.bgHex('#1a2b47').hex('#8AB4F8'),
 };
 
 // ── Markdown ───────────────────────────────────────────────────────────────────
@@ -36,11 +37,9 @@ const termRenderer = new TerminalRenderer({
   link:         (_h, _t, t) => chalk.hex('#58a6ff').underline(t || _h),
 });
 
-// Override listitem on the instance — the options.listitem is a chalk color, not a renderer fn
 const _origListitem = termRenderer.listitem.bind(termRenderer);
 termRenderer.listitem = function(item) {
   const raw = _origListitem(item);
-  // Replace the default '  * ' or '  - ' bullet with our accent '·'
   return raw.replace(/^\s*[*\-]\s/, (m) => m.replace(/[*\-]/, P.accent('·')));
 };
 
@@ -68,13 +67,21 @@ const shortModel = (m) =>
   m.replace('openai/', '').replace(/^claude-/, '').replace(/^gpt-/, 'gpt-');
 
 // ── Banner ────────────────────────────────────────────────────────────────────
-export function printBanner(cfg, meta = {}) {
+export function printBanner(cfg, meta = {}, ctx = {}) {
   const model = meta.model ? shortModel(meta.model) : (cfg?._model ?? null);
 
   process.stdout.write('\n');
   process.stdout.write(boxTop('iCopilot', P.border) + '\n');
-  process.stdout.write(boxRow(P.dim('Gemini-style terminal mode'), P.border) + '\n');
-  process.stdout.write(boxMid(P.border) + '\n');
+
+  // Context bar (device · aiMode · operator) — delegates to topBar() in layout.js
+  const { device = '', aiMode = 'MANUAL', operator = '' } = ctx;
+  if (device || aiMode !== 'MANUAL' || operator) {
+    process.stdout.write(topBar(ctx) + '\n');
+    process.stdout.write(boxMid(P.border) + '\n');
+  } else {
+    process.stdout.write(boxRow(P.dim('Gemini-style terminal  ·  iCopilot AI'), P.border) + '\n');
+    process.stdout.write(boxMid(P.border) + '\n');
+  }
 
   const row1parts = [];
   if (model)           row1parts.push(P.dim('model ') + P.white(model));
@@ -98,7 +105,8 @@ export function printBanner(cfg, meta = {}) {
     P.accentB('Ctrl+C') + P.muted(' exit'),
   ].join(P.muted('    '));
   process.stdout.write(boxRow(hints, P.border) + '\n');
-  process.stdout.write(boxBot(P.border) + '\n\n');
+  process.stdout.write(boxBot(P.border) + '\n');
+  process.stdout.write(bottomPalette() + '\n\n');
 }
 
 // ── Slash commands ─────────────────────────────────────────────────────────────
@@ -138,7 +146,6 @@ export function slashCompleter(line) {
 export function printUserBox(question) {
   process.stdout.write('\n');
   process.stdout.write(boxTop('You', P.border) + '\n');
-  // Word-wrap the question to fit inside the box
   const maxW  = inner();
   const words = question.split(' ');
   let   line  = '';
@@ -155,8 +162,14 @@ export function printUserBox(question) {
 }
 
 // ── streamChat ────────────────────────────────────────────────────────────────
-export async function streamChat(cfg, messages, context = {}, opts = {}) {
-  const showThinking = opts.thinking !== false;
+/**
+ * Stream a chat request.  Reasoning and plan always flow inline — no keys to toggle.
+ *
+ * @param {object}  cfg       Loaded config (url, token, …)
+ * @param {Array}   messages  Conversation history
+ * @param {object}  [context] Extra context passed to server
+ */
+export async function streamChat(cfg, messages, context = {}) {
   const body = JSON.stringify({ messages, context });
 
   async function doFetch(token) {
@@ -165,7 +178,7 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
       headers: {
         'Content-Type':  'application/json',
         'Accept':        'text/event-stream',
-        'Authorization': `Bearer ${token}`,
+        'Authorization': 'Bearer ' + token,
       },
       body,
     });
@@ -184,7 +197,7 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
   }
 
   // ── Streaming state ─────────────────────────────────────────────────────────
-  let boxOpen       = false;   // have we printed ╭─ iCopilot ?
+  let boxOpen       = false;
   let reasoningOpen = false;
   let answerBuf     = '';
   let rawAnswer     = '';
@@ -196,38 +209,42 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     process.stdout.write('\n' + boxTopOpen('iCopilot', P.border) + '\n');
   }
 
+  // Gemini-style thinking pill spinner
   const spinner = ora({
-    text:       P.dim('Thinking…'),
+    text:       P.accent('Thinking…'),
     color:      'blue',
-    spinner:    'dots',
-    prefixText: P.border('│') + ' ',
+    spinner:    { interval: 80, frames: ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'] },
+    prefixText: P.border('│') + '  ' + P.pill(' ◆ '),
   });
 
   const stopSpinner = () => { if (spinner.isSpinning) spinner.stop(); };
 
+  // ── Reasoning section (always streams inline) ───────────────────────────────
   function openReasoning() {
     if (reasoningOpen) return;
     stopSpinner();
     reasoningOpen = true;
-    process.stdout.write(boxLine(P.dim('reasoning'), P.border) + '\n');
-    process.stdout.write(boxLine(P.border('│ '), P.border));
+    process.stdout.write(boxLine('', P.border) + '\n');
+    process.stdout.write(boxLine(P.accentB('◆ ') + P.dim('Reasoning'), P.border) + '\n');
+    process.stdout.write(boxLine(P.border('  │ '), P.border));
   }
 
   function writeReasonDelta(delta) {
-    if (!reasoningOpen) return;
+    if (!reasoningOpen) openReasoning();
     const parts = delta.split('\n');
     for (let i = 0; i < parts.length; i++) {
-      if (i > 0) process.stdout.write('\n' + boxLine(P.border('│ '), P.border));
+      if (i > 0) process.stdout.write('\n' + boxLine(P.border('  │'), P.border));
       if (parts[i]) process.stdout.write(P.reasoning(parts[i]));
     }
   }
 
   function closeReasoning() {
     if (!reasoningOpen) return;
-    process.stdout.write('\n');
+    process.stdout.write('\n' + boxLine('', P.border) + '\n');
     reasoningOpen = false;
   }
 
+  // ── Status delta ────────────────────────────────────────────────────────────
   function printStatus(line) {
     ensureBoxOpen();
     if (reasoningOpen) closeReasoning();
@@ -236,7 +253,8 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     const text   = line.trimStart();
     const indent = /^[\s·•⌁]/.test(line) ? '  ' : '';
     process.stdout.write(boxLine(indent + icon + ' ' + P.dim(text), P.border) + '\n');
-    if (showThinking) spinner.start();
+    // Restart spinner after each status line
+    spinner.start();
   }
 
   function parseStreamText(raw) {
@@ -247,7 +265,8 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
   }
 
   // ── SSE reader ─────────────────────────────────────────────────────────────
-  if (showThinking) { ensureBoxOpen(); spinner.start(); }
+  ensureBoxOpen();
+  spinner.start();
 
   const decoder = new TextDecoder();
   let sseBuffer = '';
@@ -266,7 +285,6 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
         printStatus(ev.status_delta);
       } else if (ev.reason_delta !== undefined) {
         ensureBoxOpen();
-        if (!reasoningOpen) openReasoning();
         writeReasonDelta(ev.reason_delta);
       } else if (ev.delta !== undefined) {
         if (reasoningOpen) closeReasoning();
@@ -291,7 +309,6 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
 
   if (meta.model && cfg) cfg._model = shortModel(meta.model);
 
-  // Blank separator before content
   process.stdout.write(boxLine('', P.border) + '\n');
 
   if (replyType === 'message') {
@@ -302,36 +319,59 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     }
 
   } else if (replyType === 'plan') {
-    process.stdout.write(boxLine(P.bold('Plan'), P.border) + '\n');
-    if (reply.summary) process.stdout.write(boxLine(P.dim(reply.summary), P.border) + '\n');
+    // Plan always rendered inline — no toggle key
+    process.stdout.write(boxLine(P.accentB('◆ ') + P.bold('Plan'), P.border) + '\n');
+    if (reply.summary) {
+      process.stdout.write(boxLine(P.dim(reply.summary), P.border) + '\n');
+    }
     process.stdout.write(boxLine('', P.border) + '\n');
-    (reply.steps || []).forEach((s, i) => {
-      const risk = s.risk === 'high'   ? P.err(' ⚠ high risk') :
-                   s.risk === 'medium' ? P.warn(' ⚡') : '';
-      process.stdout.write(boxLine(`${P.dim(String(i+1)+'.')}  ${P.warn(s.cmd || '')}${risk}`, P.border) + '\n');
-      if (s.purpose) process.stdout.write(boxLine('     ' + P.muted(s.purpose), P.border) + '\n');
+
+    const steps = reply.steps || [];
+    steps.forEach((s, i) => {
+      const isLast = i === steps.length - 1;
+      const prefix = isLast ? '└─ ' : '├─ ';
+      const risk   = s.risk === 'high'   ? ' ' + P.err('⚠ high risk') :
+                     s.risk === 'medium' ? ' ' + P.warn('⚡') : '';
+      process.stdout.write(
+        boxLine(
+          P.border('  ' + prefix) + P.dim(String(i + 1) + '.') + '  ' + P.warn(s.cmd || '') + risk,
+          P.border,
+        ) + '\n',
+      );
+      if (s.purpose) {
+        process.stdout.write(boxLine('         ' + P.muted(s.purpose), P.border) + '\n');
+      }
     });
+
     process.stdout.write(boxLine('', P.border) + '\n');
-    process.stdout.write(boxLine(P.dim('Type ') + P.white('apply fix') + P.dim(' to confirm.'), P.border) + '\n');
+    process.stdout.write(
+      boxLine(P.dim('Type ') + P.white('apply fix') + P.dim(' to confirm.'), P.border) + '\n',
+    );
 
   } else if (replyType === 'connect') {
     const dev = reply.device ?? {};
     process.stdout.write(
-      boxLine(P.ok('🔌 ') + P.bold(`${dev.kind ?? '?'}#${dev.id ?? '?'}`) +
-        ' ' + P.white(dev.name ?? '') + ' ' + P.dim(`(${dev.host ?? ''})`), P.border) + '\n'
+      boxLine(
+        P.ok('🔌 ') + P.bold(`${dev.kind ?? '?'}#${dev.id ?? '?'}`) +
+        ' ' + P.white(dev.name ?? '') + ' ' + P.dim(`(${dev.host ?? ''})`),
+        P.border,
+      ) + '\n',
     );
     if (reply.note) process.stdout.write(boxLine(P.dim(reply.note), P.border) + '\n');
   }
 
-  // Blank + footer line inside box
+  // Footer inside box
   process.stdout.write(boxLine('', P.border) + '\n');
   const foot = [meta.model ? shortModel(meta.model) : null, meta.user, meta.role].filter(Boolean);
   if (foot.length) {
     process.stdout.write(boxLine(P.muted(foot.join(' · ')), P.border) + '\n');
   }
 
-  // Close the box
-  process.stdout.write(boxBotOpen(P.border) + '\n\n');
+  // Close the open box
+  process.stdout.write(boxBotOpen(P.border) + '\n');
+
+  // Bottom palette after every AI reply
+  process.stdout.write(bottomPalette() + '\n\n');
 
   return reply.text || answerBuf || '';
 }

package/src/layout.js

@@ -1,4 +1,5 @@
 import { execSync } from 'node:child_process';
+import chalk from 'chalk';
 
 // ── Terminal width ─────────────────────────────────────────────────────────────
 let cachedCols = 0;
@@ -152,3 +153,57 @@ export function boxRow(content, borderFn) {
 export function boxLine(content, borderFn) {
   return borderFn('│') + '  ' + content;
 }
+
+// ── Top context bar ───────────────────────────────────────────────────────────
+/**
+ * Renders a single full-width bar:
+ *   │  ● device · host      ◆ AUTOPILOT ON      operator: admin  │
+ *
+ * @param {{ device?: string, aiMode?: 'AUTOPILOT ON'|'MANUAL', operator?: string }} ctx
+ */
+export function topBar({ device = '', aiMode = 'MANUAL', operator = '' } = {}) {
+  const w = cols();
+
+  const lRaw = device   ? `● ${device}`           : '';
+  const cRaw = aiMode === 'AUTOPILOT ON' ? '◆ AUTOPILOT ON' : '◇ AI  MANUAL';
+  const rRaw = operator ? `operator: ${operator}`  : '';
+
+  const lC = lRaw ? chalk.hex('#8AB4F8').bold(lRaw)   : '';
+  const cC = aiMode === 'AUTOPILOT ON'
+    ? chalk.green.bold(cRaw)
+    : chalk.yellow(cRaw);
+  const rC = rRaw ? chalk.hex('#9AA0A6')(rRaw) : '';
+
+  // avail = w - 2 borders - 2 side padding spaces
+  const avail = w - 4;
+  const lv = [...lRaw].length;
+  const cv = [...cRaw].length;
+  const rv = [...rRaw].length;
+
+  const remaining = avail - lv - cv - rv;
+  const g1 = remaining > 0 ? Math.floor(remaining / 2) : 0;
+  const g2 = remaining > 0 ? remaining - g1 : 0;
+
+  return chalk.hex('#303134')('│') + ' ' +
+    lC + ' '.repeat(g1) + cC + ' '.repeat(g2) + rC + ' ' +
+    chalk.hex('#303134')('│');
+}
+
+// ── Bottom command palette ────────────────────────────────────────────────────
+/**
+ * Returns a single-line bottom palette string (no trailing newline).
+ * Caller is responsible for writing '\n'.
+ */
+export function bottomPalette() {
+  const accent = chalk.hex('#8AB4F8').bold;
+  const desc   = chalk.hex('#80868B');
+  const sep    = chalk.hex('#303134')('  ·  ');
+  const items  = [
+    accent('F1') + desc(' Docs'),
+    accent('F2') + desc(' Logs'),
+    accent('F3') + desc(' Rollback'),
+    accent('F4') + desc(' Bulk Sweep'),
+    accent('Ctrl+C') + desc(' Exit'),
+  ];
+  return '  ' + items.join(sep);
+}