ispbills-icli 5.3.0 → 6.1.0

package/README.md

@@ -47,21 +47,31 @@ icli
 ```
 $ icli
 
-  iCli — IspBills AI terminal
-  Connected to: https://app.myisp.com
+  ██╗ ██████╗ ██████╗ ██████╗ ██╗██╗      ██████╗ ████████╗
+  ██║██╔════╝██╔═══██╗██╔══██╗██║██║     ██╔═══██╗╚══██╔══╝
+  ██║██║     ██║   ██║██████╔╝██║██║     ██║   ██║   ██║
+  ██║╚██████╗╚██████╔╝██║     ██║███████╗╚██████╔╝   ██║
+  ╚═╝ ╚═════╝ ╚═════╝ ╚═╝     ╚═╝╚══════╝ ╚═════╝    ╚═╝
+             iCopilot — network engineer in your terminal
 
-  Type your question. Press Ctrl+C or type "exit" to quit.
+  model IspBills AI  ·  user Admin  ·  role group_admin
+  url   https://app.myisp.com
 
-iCli › is vlan 82 free on all devices?
+  Type a message to start.  /help for commands  ·  Ctrl+C to exit
 
-  › 🧭 Assigning 3 sub-agents…
-  › ✅ [1/3] nas#1: FREE
-  › ✅ [2/3] nas#2: FREE
-  › ✅ [3/3] olt#1: FREE
+  ❯ is vlan 82 free on all devices?
 
-VLAN 82 is free across all 3 reachable devices in your fleet.
+  working
+  ◈ Assigning 3 sub-agents…
+  ✓ [1/3] nas#1: FREE
+  ✓ [2/3] nas#2: FREE
+  ✓ [3/3] olt#1: FREE
 
-iCli › exit
+  VLAN 82 is free across all 3 reachable devices in your fleet.
+
+  IspBills AI  ·  Admin  ·  group_admin
+
+  ❯ /exit
 ```
 
 ### Single-shot query
@@ -70,6 +80,7 @@ iCli › exit
 icli "check uptime on all routers"
 icli "show customers with overdue invoices"
 icli "what is the RX power on olt#1?"
+icli --reasoning "audit the config on olt#1"   # stream reasoning inline
 ```
 
 ### Commands
@@ -79,9 +90,35 @@ icli "what is the RX power on olt#1?"
 | `icli` | Start interactive REPL |
 | `icli "question"` | Single question, then exit |
 | `icli login` | Re-authenticate (or switch instance) |
+| `icli logout` | Log out and clear saved credentials |
+| `icli update` | Update iCli to the latest version |
 | `icli whoami` | Show current login info |
 | `icli --help` | Show help |
 
+### Flags
+
+| Flag | Description |
+|---|---|
+| `--reasoning` | Stream the model's reasoning inline |
+| `--loader-style STYLE` | Thinking indicator: `spinner` (default), `gradient`, or `minimal` |
+
+### Slash commands & keys (REPL)
+
+Inside the REPL, type `/` to see the menu. Shortcuts:
+
+| Slash | Description |
+|---|---|
+| `/check`, `/vlan`, `/onu`, `/customer`, `/ping`, `/online` | Common NOC queries |
+| `/new` | Start a fresh conversation |
+| `/history` | Show conversation history |
+| `/clear` | Clear the screen |
+| `/update` | Update iCli |
+| `/logout` | Log out |
+| `/help` | Show help |
+| `/exit` | Quit |
+
+Function keys: **F1** help · **F2** history · **F3** rollback last action · **F4** bulk device sweep. **Tab** autocompletes slash commands; **↑/↓** navigate input history.
+
 ---
 
 ## What iCli can do
@@ -93,7 +130,10 @@ iCli connects to the same AI engine as the in-browser terminal:
 - **Customer lookup** — find customers by name, IP, MAC, username, or invoice  
 - **Config audits** — review running config and get concrete suggestions  
 - **Web search** — looks up vendor CLI docs when it needs to  
-- **Streaming output** — answers stream token-by-token with a live thinking indicator  
+- **Streaming output** — answers stream live with a thinking indicator, reasoning, and step-by-step server progress  
+- **Plans & connect cards** — proposed fixes render as a reviewable plan (`apply fix` to confirm); device connections show as a connect card  
+- **Zero dependencies** — pure Node.js (built-ins only), so it installs instantly and runs the same on Windows, macOS, and Linux  
+- **Terminal-aware rendering** — full-width separators, and automatic ASCII-safe glyphs on classic Windows consoles (`cmd.exe` / legacy PowerShell) so nothing shows as broken boxes  
 
 ---
 

package/bin/icli.js

@@ -5,18 +5,58 @@ import { spawnSync } from 'child_process';
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
-import chalk from 'chalk';
+
 import { loadConfig, configPath, clearConfig } from '../src/config.js';
 import { loginFlow } from '../src/auth.js';
-import { inner, onResize, boxTop, boxBot, boxMid, boxRow, bottomPalette } from '../src/layout.js';
+import { streamChat } from '../src/client.js';
+import { TuiRenderer } from '../src/renderer.js';
+import { Loader } from '../src/loader.js';
+import { printBanner } from '../src/banner.js';
+import {
+  SLASH_COMMANDS, slashCompleter, slashToQuestion, printSlashMenu, printHistory,
+} from '../src/commands.js';
 import {
-  streamChat, printBanner, printSlashMenu, printUserBox,
-  SLASH_COMMANDS, slashCompleter,
-} from '../src/chat.js';
+  RESET, BOLD, DIM, GRAY, WHITE, ACCENT, GREEN, YELLOW, RED, CYAN, rule, glyphs,
+} from '../src/ui.js';
 
 const PKG_NAME = 'ispbills-icli';
 
-/** Read this CLI's installed version from its package.json. */
+// ── Flags ────────────────────────────────────────────────────────────────────
+const rawArgs = argv.slice(2);
+
+// Flags that consume the following token as their value.
+const VALUE_FLAGS = new Set(['--loader-style']);
+
+function has(name) {
+  return rawArgs.includes(name);
+}
+function flag(name) {
+  const i = rawArgs.indexOf(name);
+  return i !== -1 && i + 1 < rawArgs.length ? rawArgs[i + 1] : undefined;
+}
+
+// Positional args = everything that is not a flag or a flag's value.
+const positional = [];
+for (let i = 0; i < rawArgs.length; i++) {
+  const a = rawArgs[i];
+  if (a.startsWith('-')) {
+    if (VALUE_FLAGS.has(a)) i++; // skip this flag's value
+    continue;
+  }
+  positional.push(a);
+}
+
+const cmd = positional[0] ?? '';
+
+const display = {
+  reasoning: has('--reasoning'),
+  loader: {
+    text: 'Thinking',
+    style: flag('--loader-style') || 'spinner',
+  },
+};
+
+// ── Version / self-update ──────────────────────────────────────────────────────
 function pkgVersion() {
   try {
     const p = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
@@ -26,15 +66,10 @@ function pkgVersion() {
   }
 }
 
-/**
- * Self-update: install the latest published version globally via npm.
- * Returns true on success. The running process keeps the old code until the
- * next launch, so callers should tell the user to restart.
- */
-function selfUpdate(P) {
+function selfUpdate() {
   const cur = pkgVersion();
-  process.stdout.write('\n  ' + P.dim('Current version: ') + chalk.white(cur) + '\n');
-  process.stdout.write('  ' + P.muted('Updating ' + PKG_NAME + ' to the latest version…') + '\n\n');
+  process.stdout.write(`\n  ${DIM}Current version: ${RESET}${WHITE}${cur}${RESET}\n`);
+  process.stdout.write(`  ${GRAY}Updating ${PKG_NAME} to the latest version…${RESET}\n\n`);
 
   const npm = platform === 'win32' ? 'npm.cmd' : 'npm';
   const res = spawnSync(npm, ['install', '-g', `${PKG_NAME}@latest`], {
@@ -43,46 +78,19 @@ function selfUpdate(P) {
   });
 
   if (res.status === 0) {
-    process.stdout.write('\n  ' + P.ok('✓') + ' iCli updated. ' +
-      P.dim('Restart iCli to use the new version.') + '\n\n');
+    process.stdout.write(`\n  ${GREEN}${glyphs.check}${RESET} iCli updated. ${DIM}Restart iCli to use the new version.${RESET}\n\n`);
     return true;
   }
-  process.stdout.write('\n  ' + P.err('✖') + ' Update failed. Try manually:\n');
-  process.stdout.write('    ' + P.accent(`npm install -g ${PKG_NAME}@latest`) + '\n');
-  process.stdout.write('  ' + P.dim('On some systems this needs elevated privileges (sudo / Administrator).') + '\n\n');
+  process.stdout.write(`\n  ${RED}${glyphs.cross}${RESET} Update failed. Try manually:\n`);
+  process.stdout.write(`    ${ACCENT}npm install -g ${PKG_NAME}@latest${RESET}\n`);
+  process.stdout.write(`  ${DIM}On some systems this needs elevated privileges (sudo / Administrator).${RESET}\n\n`);
   return false;
 }
 
-const P = {
-  border:  chalk.hex('#303134'),
-  dim:     chalk.hex('#9AA0A6'),
-  muted:   chalk.hex('#80868B'),
-  accent:  chalk.hex('#8AB4F8').bold,
-  accentD: chalk.hex('#8AB4F8'),
-  bold:    chalk.bold.white,
-  ok:      chalk.green,
-  warn:    chalk.yellow,
-  err:     chalk.red,
-};
-
-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');
-  process.stdout.write(boxTop('iCli  ·  Help', P.border) + '\n');
-
-  process.stdout.write(boxRow('', P.border) + '\n');
-  process.stdout.write(boxRow(P.bold('Usage'), P.border) + '\n');
-  process.stdout.write(boxRow('', P.border) + '\n');
+  console.log(`\n  ${BOLD}iCli — IspBills AI in your terminal${RESET}\n`);
+  console.log(`  ${BOLD}Usage${RESET}`);
   [
     ['icli',            'Interactive REPL with slash commands'],
     ['icli "question"', 'Single-shot query then exit'],
@@ -91,163 +99,116 @@ function printHelp() {
     ['icli update',     'Update iCli to the latest version'],
     ['icli whoami',     'Show current session info'],
     ['icli --help',     'Show this help'],
-  ].forEach(([c, d]) =>
-    process.stdout.write(boxRow(P.accent(c.padEnd(20)) + P.dim(d), P.border) + '\n')
-  );
+  ].forEach(([c, d]) => console.log(`  ${ACCENT}${c.padEnd(20)}${RESET}${DIM}${d}${RESET}`));
+
+  console.log(`\n  ${BOLD}Flags${RESET}`);
+  [
+    ['--reasoning',            'Stream the model\'s reasoning inline'],
+    ['--loader-style STYLE',   'spinner | gradient | minimal'],
+  ].forEach(([c, d]) => console.log(`  ${ACCENT}${c.padEnd(24)}${RESET}${DIM}${d}${RESET}`));
 
-  process.stdout.write(boxMid(P.border) + '\n');
-  process.stdout.write(boxRow(P.bold('Slash commands'), P.border) + '\n');
-  process.stdout.write(boxRow('', P.border) + '\n');
+  console.log(`\n  ${BOLD}Slash commands${RESET}`);
   for (const { cmd: c, hint, desc } of SLASH_COMMANDS) {
-    const key = (c + (hint ? ' '+hint : '')).padEnd(22);
-    process.stdout.write(boxRow(P.accent(key) + P.dim(desc), P.border) + '\n');
+    const key = (c + (hint ? ' ' + hint : '')).padEnd(20);
+    console.log(`  ${ACCENT}${key}${RESET}${DIM}${desc}${RESET}`);
   }
 
-  process.stdout.write(boxMid(P.border) + '\n');
-  process.stdout.write(boxRow(P.bold('Function key shortcuts'), P.border) + '\n');
-  process.stdout.write(boxRow('', P.border) + '\n');
+  console.log(`\n  ${BOLD}Function keys${RESET}`);
   [
-    ['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');
-  process.stdout.write(bottomPalette() + '\n\n');
+    ['F1', 'Show help'],
+    ['F2', 'Show conversation history'],
+    ['F3', 'Rollback last AI action'],
+    ['F4', 'Run bulk device sweep'],
+    ['Tab', 'Autocomplete slash commands'],
+    ['↑ / ↓', 'Navigate input history'],
+    ['Ctrl+C', 'Cancel / exit'],
+  ].forEach(([k, d]) => console.log(`  ${YELLOW}${k.padEnd(10)}${RESET}${DIM}${d}${RESET}`));
+  console.log();
 }
 
 // ── Auth ───────────────────────────────────────────────────────────────────────
 async function ensureAuth() {
   let cfg = loadConfig();
   if (!cfg) {
-    process.stdout.write(P.warn('\n  No saved credentials. Setting up iCli.\n\n'));
+    process.stdout.write(`\n  ${YELLOW}No saved credentials. Setting up iCli.${RESET}\n\n`);
     cfg = await loginFlow();
-    process.stdout.write('\n  ' + P.ok('✓') + ' Logged in as ' +
-      chalk.white(cfg.user?.name ?? cfg.user?.email) +
-      P.dim(' · ' + (cfg.user?.role ?? 'operator')) + '\n\n');
+    process.stdout.write(`\n  ${GREEN}${glyphs.check}${RESET} Logged in as ${WHITE}${cfg.user?.name ?? cfg.user?.email}${RESET}` +
+      `${DIM} · ${cfg.user?.role ?? 'operator'}${RESET}\n\n`);
   }
   return cfg;
 }
 
-// ── Slash → question ───────────────────────────────────────────────────────────
-function slashToQuestion(line) {
-  const [sc, ...rest] = line.trim().split(/\s+/);
-  const arg = rest.join(' ');
-  switch (sc) {
-    case '/check':    return arg ? `run diagnostics on ${arg}` : 'check status of all devices';
-    case '/vlan':     return arg ? `is vlan ${arg} in use or free?` : 'list all vlans in use';
-    case '/onu':      return arg ? `show ONU ${arg} status and signal level` : 'list all ONUs';
-    case '/customer': return arg ? `look up customer ${arg}` : 'show recent customers';
-    case '/ping':     return arg ? `ping ${arg} through the network` : 'which devices are reachable?';
-    case '/online':   return 'list currently online PPPoE sessions';
-    default:          return null;
+// ── One conversation turn ───────────────────────────────────────────────────────
+async function runTurn(cfg, history, renderer, loader, question, { echo = false } = {}) {
+  if (echo) console.log(`\n  ${GRAY}${glyphs.prompt}${RESET} ${DIM}${question}${RESET}`);
+  history.push({ role: 'user', content: question });
+
+  const abort = new AbortController();
+  const onSigint = () => abort.abort();
+  process.once('SIGINT', onSigint);
+
+  console.log();
+  loader.start();
+  let stopped = false;
+  const stopOnce = () => { if (!stopped) { loader.stop(); stopped = true; } };
+
+  try {
+    const { reply, text, meta } = await streamChat(cfg, [...history], {
+      signal: abort.signal,
+      onEvent: (ev) => { stopOnce(); renderer.handle(ev); },
+    });
+    stopOnce();
+    if (meta.model) cfg._model = meta.model;
+    renderer.renderReply(reply, meta);
+    if (text) history.push({ role: 'assistant', content: text });
+    console.log();
+  } catch (e) {
+    stopOnce();
+    renderer.endStreaming();
+    if (abort.signal.aborted) {
+      console.log(`\n  ${DIM}Interrupted.${RESET}\n`);
+    } else {
+      console.log(`\n  ${RED}${glyphs.cross}${RESET} ${WHITE}${e.message}${RESET}\n`);
+    }
+  } finally {
+    process.removeListener('SIGINT', onSigint);
   }
 }
 
 // ── Single-shot ────────────────────────────────────────────────────────────────
 async function singleShot(cfg, question) {
-  printUserBox(question);
-  try {
-    await streamChat(cfg, [{ role: 'user', content: question }]);
-  } catch (e) {
-    process.stdout.write('\n  ' + P.err('✖ ') + chalk.white(e.message) + '\n\n');
-    exit(1);
-  }
+  const renderer = new TuiRenderer({ display });
+  const loader = new Loader(display.loader);
+  await runTurn(cfg, [], renderer, loader, question, { echo: true });
 }
 
-// ── REPL ───────────────────────────────────────────────────────────────────────
+// ── Interactive REPL ─────────────────────────────────────────────────────────────
 async function interactiveRepl(cfg) {
   const history = [];
-  const PROMPT  = () => '  ' + P.accentD('❯') + ' ';
+  const renderer = new TuiRenderer({ display });
+  const loader = new Loader(display.loader);
+  const PROMPT = () => `  ${ACCENT}${glyphs.prompt}${RESET} `;
+  let busy = false;
 
-  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, {}, ctx);
+  printBanner(cfg, { model: cfg._model });
 
   const rl = createInterface({
-    input, output,
-    prompt:    PROMPT(),
-    completer: slashCompleter,
-    terminal:  true,
+    input, output, prompt: PROMPT(), completer: slashCompleter, terminal: true,
   });
 
-  onResize(() => rl.setPrompt(PROMPT()));
-
-  // ── F-key handling via keypress events ───────────────────────────────────────
+  // F-key shortcuts
   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;
+    if (!key || rl.closed || busy) return;
+    if (key.name === 'f1') { printHelp(); rl.prompt(); return; }
+    if (key.name === 'f2') { printHistory(history); rl.prompt(); return; }
+    if (key.name === 'f3' || key.name === 'f4') {
+      const q = key.name === 'f3'
+        ? 'rollback the last change you made'
+        : 'run a bulk sweep of all devices and report status';
+      busy = true; rl.pause();
+      await runTurn(cfg, history, renderer, loader, q, { echo: true });
+      busy = false; rl.resume(); rl.prompt();
     }
   });
 
@@ -257,130 +218,93 @@ async function interactiveRepl(cfg) {
     const q = line.trim();
     if (!q) { rl.prompt(); return; }
 
+    // Locally-handled commands
     if (q === '/exit' || q === 'exit' || q === 'quit') {
-      process.stdout.write(P.muted('\n  Goodbye.\n\n')); rl.close(); exit(0);
+      console.log(`\n  ${DIM}Goodbye.${RESET}\n`); rl.close(); return;
     }
     if (q === '/clear' || q === 'clear') {
-      process.stdout.write('\x1Bc');
-      printBanner(cfg, {}, ctx);
-      rl.prompt();
-      return;
+      process.stdout.write('\x1Bc'); printBanner(cfg, { model: cfg._model }); rl.prompt(); return;
     }
+    if (q === '/new') {
+      history.length = 0;
+      console.log(`\n  ${GREEN}${glyphs.check}${RESET} ${DIM}New conversation started.${RESET}\n`); rl.prompt(); return;
+    }
+    if (q === '/help' || q === 'help') { printHelp(); rl.prompt(); return; }
+    if (q === '/history' || q === 'history') { printHistory(history); rl.prompt(); return; }
+    if (q === '/') { printSlashMenu(); rl.prompt(); return; }
     if (q === '/update' || q === 'update') {
-      rl.pause();
-      selfUpdate(P);
-      rl.resume();
-      rl.prompt();
-      return;
+      rl.pause(); selfUpdate(); rl.resume(); rl.prompt(); return;
     }
     if (q === '/logout' || q === 'logout') {
       const cleared = clearConfig();
-      process.stdout.write('\n  ' + (cleared ? P.ok('✓') + ' Logged out — credentials cleared.'
-        : P.warn('Already logged out.')) +
-        '\n  ' + P.dim('Run ') + P.accent('icli login') + P.dim(' to sign in again.') + '\n\n');
-      rl.close();
-      exit(0);
-    }
-    if (q === '/help' || q === 'help') { printHelp(); rl.prompt(); return; }
-    if (q === '/history' || q === 'history') {
-      const turns = history.filter(m => m.role === 'user');
-      if (!turns.length) {
-        process.stdout.write(P.muted('\n  No history yet.\n\n'));
-      } else {
-        process.stdout.write('\n' + boxTop('History', P.border) + '\n');
-        turns.forEach((m, i) =>
-          process.stdout.write(boxRow(P.dim(String(i+1).padStart(2)+'.') + ' ' +
-            chalk.white(m.content.slice(0, inner() - 5)), P.border) + '\n')
-        );
-        process.stdout.write(boxBot(P.border) + '\n\n');
-      }
-      rl.prompt(); return;
+      console.log(`\n  ${cleared ? GREEN + glyphs.check + RESET + ' Logged out — credentials cleared.' : YELLOW + 'Already logged out.' + RESET}`);
+      console.log(`  ${DIM}Run ${RESET}${ACCENT}icli login${RESET}${DIM} to sign in again.${RESET}\n`);
+      rl.close(); return;
     }
-    if (q === '/') { printSlashMenu(); rl.prompt(); return; }
 
+    // AI shortcut → question, else pass through verbatim
     let question = q;
     if (q.startsWith('/')) {
       const resolved = slashToQuestion(q);
-      if (resolved) {
-        question = resolved;
-        process.stdout.write('  ' + P.muted('→ ') + P.dim(question) + '\n');
-      }
-    }
-
-    rl.pause();
-    history.push({ role: 'user', content: question });
-    printUserBox(question);
-
-    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');
+      if (resolved) question = resolved;
+      else { console.log(`\n  ${DIM}Unknown command: ${q}. Type ${RESET}${ACCENT}/help${RESET}${DIM}.${RESET}\n`); rl.prompt(); return; }
     }
 
-    rl.resume();
-    rl.prompt();
+    busy = true; rl.pause();
+    await runTurn(cfg, history, renderer, loader, question, { echo: q.startsWith('/') });
+    busy = false; rl.resume(); rl.prompt();
   });
 
-  rl.on('close', () => { process.stdout.write(P.muted('\n  Goodbye.\n\n')); exit(0); });
+  rl.on('close', () => { console.log(`\n  ${DIM}Goodbye.${RESET}\n`); exit(0); });
 }
 
-// ── Main ───────────────────────────────────────────────────────────────────────
+// ── Main ─────────────────────────────────────────────────────────────────────────
 async function main() {
   if (cmd === '--help' || cmd === '-h' || cmd === 'help') { printHelp(); return; }
 
   if (cmd === 'login') {
     const cfg = await loginFlow();
-    process.stdout.write('\n  ' + P.ok('✓') + ' Logged in as ' +
-      chalk.white(cfg.user?.name ?? cfg.user?.email) +
-      P.dim(' · ' + (cfg.user?.role ?? 'operator')) + '\n');
-    process.stdout.write('  ' + P.dim('Config: ' + configPath()) + '\n\n');
+    console.log(`\n  ${GREEN}${glyphs.check}${RESET} Logged in as ${WHITE}${cfg.user?.name ?? cfg.user?.email}${RESET}${DIM} · ${cfg.user?.role ?? 'operator'}${RESET}`);
+    console.log(`  ${DIM}Config: ${configPath()}${RESET}\n`);
     return;
   }
 
-  if (cmd === 'update') {
-    const ok = selfUpdate(P);
-    exit(ok ? 0 : 1);
-  }
+  if (cmd === 'update') { exit(selfUpdate() ? 0 : 1); }
 
   if (cmd === 'logout') {
     const cleared = clearConfig();
     if (cleared) {
-      process.stdout.write('\n  ' + P.ok('✓') + ' Logged out — credentials cleared.\n');
-      process.stdout.write('  ' + P.dim('Run ') + P.accent('icli login') + P.dim(' to sign in again.') + '\n\n');
+      console.log(`\n  ${GREEN}${glyphs.check}${RESET} Logged out — credentials cleared.`);
+      console.log(`  ${DIM}Run ${RESET}${ACCENT}icli login${RESET}${DIM} to sign in again.${RESET}\n`);
     } else {
-      process.stdout.write('\n  ' + P.warn('Not logged in.') + ' Nothing to clear.\n\n');
+      console.log(`\n  ${YELLOW}Not logged in.${RESET} Nothing to clear.\n`);
     }
     return;
   }
 
   if (cmd === 'whoami') {
     const cfg = loadConfig();
-    if (!cfg) {
-      process.stdout.write('\n  ' + P.warn('Not logged in.') + ' Run ' + P.accent('icli login') + '\n\n');
-      return;
-    }
-    process.stdout.write('\n' + boxTop('Session', P.border) + '\n');
+    if (!cfg) { console.log(`\n  ${YELLOW}Not logged in.${RESET} Run ${ACCENT}icli login${RESET}\n`); return; }
+    console.log(`\n  ${BOLD}Session${RESET}`);
     [['url', cfg.url], ['name', cfg.user?.name], ['email', cfg.user?.email], ['role', cfg.user?.role]]
       .filter(([, v]) => v)
-      .forEach(([k, v]) =>
-        process.stdout.write(boxRow(P.dim(k.padEnd(7)) + chalk.white(v), P.border) + '\n')
-      );
-    process.stdout.write(boxBot(P.border) + '\n\n');
+      .forEach(([k, v]) => console.log(`  ${DIM}${k.padEnd(7)}${RESET}${WHITE}${v}${RESET}`));
+    console.log();
     return;
   }
 
   const cfg = await ensureAuth();
 
-  if (cmd && !cmd.startsWith('-')) {
-    await singleShot(cfg, args.join(' '));
+  // Single-shot: any positional (non-flag) args form the question.
+  if (positional.length) {
+    await singleShot(cfg, positional.join(' '));
     return;
   }
 
   await interactiveRepl(cfg);
 }
 
-main().catch(e => {
-  process.stdout.write('\n  ' + P.err('✖ ') + chalk.white(e.message) + '\n\n');
+main().catch((e) => {
+  console.log(`\n  ${RED}${glyphs.cross}${RESET} ${WHITE}${e.message}${RESET}\n`);
   exit(1);
 });