ispbills-icli 1.1.0 → 3.0.0

package/bin/icli.js

@@ -1,174 +1,242 @@
 #!/usr/bin/env node
-import * as readline from 'readline/promises';
+import { createInterface } 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 { streamChat, printBanner } from '../src/chat.js';
+import {
+  streamChat, printBanner, printSlashMenu,
+  SLASH_COMMANDS, slashCompleter, cols,
+} from '../src/chat.js';
+
+// ── Copilot CLI colour tokens ──────────────────────────────────────────────────
+const dim      = chalk.hex('#9198A1');
+const tertiary = chalk.hex('#6e7781');
+const accent   = chalk.hex('#4493F8').bold;
+const rule     = () => chalk.hex('#3D444D')('  ' + '─'.repeat(Math.max(0, cols() - 4)));
 
-// ─── Parse args ─────────────────────────────────────────────────────────────
 const args = argv.slice(2);
 const cmd  = args[0] ?? '';
 
-// ─── Help ────────────────────────────────────────────────────────────────────
+// ── Help ───────────────────────────────────────────────────────────────────────
 function printHelp() {
-  const line = '─'.repeat(58);
-  console.log('\n' + chalk.cyan('  ╭' + line + '╮'));
-  console.log(chalk.cyan('  │  ') + chalk.bold.white('iCli') + chalk.dim('  —  IspBills AI Terminal') + ' '.repeat(28) + chalk.cyan('  │'));
-  console.log(chalk.cyan('  ╰' + line + '╯') + '\n');
-
-  console.log(chalk.bold('  Usage\n'));
-  console.log('  ' + chalk.cyan('icli') + '                     ' + chalk.dim('Interactive REPL'));
-  console.log('  ' + chalk.cyan('icli') + ' ' + chalk.yellow('"your question"') + '    ' + chalk.dim('Single-shot query'));
-  console.log('  ' + chalk.cyan('icli login') + '               ' + chalk.dim('Authenticate'));
-  console.log('  ' + chalk.cyan('icli whoami') + '              ' + chalk.dim('Show current login'));
-  console.log('  ' + chalk.cyan('icli --help') + '              ' + chalk.dim('Show this help'));
-
-  console.log('\n' + chalk.bold('  Examples\n'));
-  console.log('  ' + chalk.dim('$') + ' icli "is vlan 82 in use?"');
-  console.log('  ' + chalk.dim('$') + ' icli "show all ONUs on olt#1"');
-  console.log('  ' + chalk.dim('$') + ' icli "which customer is using IP 192.168.1.50?"');
-  console.log('  ' + chalk.dim('$') + ' icli' + chalk.dim('  # start interactive REPL'));
-
-  console.log('\n' + chalk.bold('  Config\n'));
-  console.log('  ' + chalk.dim(configPath()) + '\n');
+  process.stdout.write('\n');
+  process.stdout.write('  ' + chalk.bold.white('iCli') + dim('  ·  IspBills AI Terminal\n'));
+  process.stdout.write(rule() + '\n\n');
+
+  process.stdout.write(chalk.bold.white('  Usage\n\n'));
+  const cmds = [
+    ['icli',            'Interactive REPL with slash commands'],
+    ['icli "question"', 'Single-shot query then exit'],
+    ['icli login',      'Authenticate to your IspBills instance'],
+    ['icli whoami',     'Show current session info'],
+    ['icli --help',     'Show this help'],
+  ];
+  for (const [c, d] of cmds) {
+    process.stdout.write('  ' + accent(c.padEnd(20)) + dim(d) + '\n');
+  }
+
+  process.stdout.write('\n' + chalk.bold.white('  Slash commands\n\n'));
+  for (const { cmd: c, hint, desc } of SLASH_COMMANDS) {
+    const key = (c + (hint ? ' ' + hint : '')).padEnd(22);
+    process.stdout.write('  ' + accent(key) + dim(desc) + '\n');
+  }
+
+  process.stdout.write('\n' + chalk.bold.white('  Keyboard shortcuts\n\n'));
+  [
+    ['Tab',         'Autocomplete slash commands'],
+    ['↑ / ↓',      'Navigate input history'],
+    ['Ctrl+T',      'Toggle reasoning display'],
+    ['Ctrl+L',      'Clear screen'],
+    ['Ctrl+C',      'Cancel / exit'],
+  ].forEach(([k, d]) => {
+    process.stdout.write('  ' + chalk.yellow(k.padEnd(14)) + dim(d) + '\n');
+  });
+  process.stdout.write('\n');
 }
 
-// ─── Ensure authenticated ────────────────────────────────────────────────────
+// ── Auth ───────────────────────────────────────────────────────────────────────
 async function ensureAuth() {
   let cfg = loadConfig();
   if (!cfg) {
-    console.log(chalk.yellow('\n  No saved login found. Let\'s connect iCli.\n'));
+    process.stdout.write(chalk.yellow('\n  No saved credentials. Setting up iCli.\n\n'));
     cfg = await loginFlow();
-    console.log('\n  ' + chalk.green('✓') + ' Logged in as ' +
+    process.stdout.write(
+      '\n  ' + chalk.green('✓') + ' Logged in as ' +
       chalk.white(cfg.user?.name ?? cfg.user?.email) +
-      chalk.dim(' · ' + (cfg.user?.role ?? 'operator')));
-    console.log('  ' + chalk.dim('Connected to: ') + chalk.cyan(cfg.url) + '\n');
+      dim(' · ' + (cfg.user?.role ?? 'operator')) + '\n\n'
+    );
   }
   return cfg;
 }
 
-// ─── Single-shot query ───────────────────────────────────────────────────────
+// ── 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;
+  }
+}
+
+// ── Single-shot ────────────────────────────────────────────────────────────────
 async function singleShot(cfg, question) {
-  // Show the user's own message
-  process.stdout.write('\n  ' + chalk.cyan('You  ') + chalk.white(question) + '\n');
-  process.stdout.write('  ' + chalk.dim('─'.repeat(58)) + '\n');
-  process.stdout.write('  ' + chalk.bold.cyan('iCopilot') + '\n');
+  // Copilot CLI style: role label then content, separated by blank lines
+  process.stdout.write('\n  ' + chalk.hex('#4493F8').bold('You') + '\n');
+  process.stdout.write('  ' + chalk.white(question) + '\n\n');
+  process.stdout.write(rule() + '\n\n');
+  process.stdout.write('  ' + chalk.bold.white('iCopilot') + '\n');
 
-  const messages = [{ role: 'user', content: question }];
   try {
-    await streamChat(cfg, messages);
+    await streamChat(cfg, [{ role: 'user', content: question }]);
   } catch (e) {
-    console.error('\n  ' + chalk.red('✖ ' + e.message) + '\n');
+    process.stdout.write('\n  ' + chalk.red('✖ ') + chalk.white(e.message) + '\n\n');
     exit(1);
   }
 }
 
-// ─── Interactive REPL ────────────────────────────────────────────────────────
+// ── REPL ───────────────────────────────────────────────────────────────────────
 async function interactiveRepl(cfg) {
-  const history = [];
+  const history       = [];
+  let   showReasoning = true;
 
   printBanner(cfg);
 
-  const rl = readline.createInterface({
+  // Copilot CLI uses `> ` style prompt
+  const PROMPT = '  ' + chalk.hex('#4493F8').bold('>') + ' ';
+
+  const rl = createInterface({
     input, output,
-    prompt: chalk.cyan('  You  ') + chalk.white(''),
+    prompt:    PROMPT,
+    completer: slashCompleter,
+    terminal:  true,
   });
 
+  process.stdout.on('resize', () => rl.setPrompt(PROMPT));
+
   rl.prompt();
 
   rl.on('line', async (line) => {
     const q = line.trim();
     if (!q) { rl.prompt(); return; }
 
-    if (q === 'exit' || q === 'quit') {
-      console.log(chalk.dim('\n  Goodbye.\n'));
-      rl.close();
-      exit(0);
+    // ── Built-in commands ──────────────────────────────────────────────────
+    if (q === '/exit' || q === 'exit' || q === 'quit') {
+      process.stdout.write(tertiary('\n  Goodbye.\n\n')); rl.close(); exit(0);
     }
-    if (q === 'clear') { console.clear(); printBanner(cfg); rl.prompt(); return; }
-    if (q === 'history') {
-      console.log('');
-      history.filter(m => m.role === 'user').forEach((m, i) => {
-        console.log('  ' + chalk.dim(String(i + 1) + '.') + ' ' + m.content.slice(0, 80));
-      });
-      console.log('');
-      rl.prompt();
-      return;
+    if (q === '/clear' || q === 'clear') {
+      process.stdout.write('\x1Bc'); printBanner(cfg); rl.prompt(); return;
+    }
+    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(tertiary('\n  No history yet.\n\n'));
+      } else {
+        process.stdout.write('\n');
+        turns.forEach((m, i) =>
+          process.stdout.write('  ' + dim(String(i+1).padStart(2)+'.') + ' ' + chalk.white(m.content.slice(0, cols()-8)) + '\n')
+        );
+        process.stdout.write('\n');
+      }
+      rl.prompt(); return;
+    }
+    if (q === '/') { printSlashMenu(); rl.prompt(); return; }
+
+    // ── Resolve slash command ──────────────────────────────────────────────
+    let question = q;
+    if (q.startsWith('/')) {
+      const resolved = slashToQuestion(q);
+      if (resolved) {
+        question = resolved;
+        process.stdout.write('  ' + tertiary('→ ') + dim(question) + '\n');
+      }
     }
-    if (q === 'help') { printHelp(); rl.prompt(); return; }
 
     rl.pause();
-    history.push({ role: 'user', content: q });
+    history.push({ role: 'user', content: question });
 
-    // Show iCopilot label before streaming response
-    process.stdout.write('  ' + chalk.dim('─'.repeat(58)) + '\n');
-    process.stdout.write('  ' + chalk.bold.cyan('iCopilot') + '\n');
+    // Role separator — Copilot CLI style blank-line + label pattern
+    process.stdout.write('\n' + rule() + '\n\n');
+    process.stdout.write('  ' + chalk.bold.white('iCopilot') + '\n');
 
     try {
-      const answer = await streamChat(cfg, [...history]);
+      const answer = await streamChat(cfg, [...history], {}, { thinking: showReasoning });
       if (answer) history.push({ role: 'assistant', content: answer });
     } catch (e) {
-      console.error('\n  ' + chalk.red('✖ ' + e.message) + '\n');
+      process.stdout.write('\n  ' + chalk.red('✖ ') + chalk.white(e.message) + '\n\n');
     }
 
-    // Prompt for next message with label
-    process.stdout.write('  ' + chalk.dim('─'.repeat(58)) + '\n');
-    rl.setPrompt(chalk.cyan('  You  ') + chalk.white(''));
+    process.stdout.write(rule() + '\n\n');
     rl.resume();
     rl.prompt();
   });
 
-  rl.on('close', () => {
-    console.log(chalk.dim('\n  Goodbye.\n'));
-    exit(0);
-  });
+  // Ctrl+T toggles reasoning (matches Copilot CLI Ctrl+T)
+  if (input.setRawMode) {
+    process.stdin.on('keypress', (str, key) => {
+      if (key?.ctrl && key?.name === 't') {
+        showReasoning = !showReasoning;
+        process.stdout.write(tertiary(`\n  Reasoning ${showReasoning ? 'on' : 'off'}\n\n`));
+        rl.prompt();
+      }
+    });
+  }
+
+  rl.on('close', () => { process.stdout.write(tertiary('\n  Goodbye.\n\n')); exit(0); });
 }
 
-// ─── Main ────────────────────────────────────────────────────────────────────
+// ── Main ───────────────────────────────────────────────────────────────────────
 async function main() {
-  if (cmd === '--help' || cmd === '-h' || cmd === 'help') {
-    printHelp(); return;
-  }
+  if (cmd === '--help' || cmd === '-h' || cmd === 'help') { printHelp(); return; }
 
   if (cmd === 'login') {
     const cfg = await loginFlow();
-    console.log('\n  ' + chalk.green('✓') + ' Logged in as ' +
+    process.stdout.write(
+      '\n  ' + chalk.green('✓') + ' Logged in as ' +
       chalk.white(cfg.user?.name ?? cfg.user?.email) +
-      chalk.dim(' · ' + (cfg.user?.role ?? 'operator')));
-    console.log('  ' + chalk.dim('Config saved: ') + chalk.dim(configPath()) + '\n');
+      dim(' · ' + (cfg.user?.role ?? 'operator')) + '\n'
+    );
+    process.stdout.write('  ' + dim('Config: ' + configPath()) + '\n\n');
     return;
   }
 
   if (cmd === 'whoami') {
     const cfg = loadConfig();
     if (!cfg) {
-      console.log('\n  ' + chalk.yellow('Not logged in.') + ' Run ' + chalk.cyan('icli login') + '\n');
+      process.stdout.write('\n  ' + chalk.yellow('Not logged in.') + ' Run ' + accent('icli login') + '\n\n');
       return;
     }
-    const line = '─'.repeat(58);
-    console.log('\n' + chalk.dim('  ' + line));
-    console.log('  ' + chalk.dim('URL   ') + chalk.cyan(cfg.url));
-    console.log('  ' + chalk.dim('Name  ') + chalk.white(cfg.user?.name ?? '—'));
-    console.log('  ' + chalk.dim('Email ') + chalk.white(cfg.user?.email ?? '—'));
-    console.log('  ' + chalk.dim('Role  ') + chalk.white(cfg.user?.role ?? '—'));
-    console.log(chalk.dim('  ' + line) + '\n');
+    process.stdout.write('\n' + rule() + '\n');
+    [
+      ['url',   cfg.url],
+      ['name',  cfg.user?.name],
+      ['email', cfg.user?.email],
+      ['role',  cfg.user?.role],
+    ].forEach(([k, v]) => {
+      if (v) process.stdout.write('  ' + dim(k.padEnd(7)) + chalk.white(v) + '\n');
+    });
+    process.stdout.write(rule() + '\n\n');
     return;
   }
 
   const cfg = await ensureAuth();
 
-  // Single-shot: icli "question here"
   if (cmd && !cmd.startsWith('-')) {
     await singleShot(cfg, args.join(' '));
     return;
   }
 
-  // Interactive REPL
   await interactiveRepl(cfg);
 }
 
 main().catch(e => {
-  console.error('\n  ' + chalk.red('✖ ' + e.message) + '\n');
+  process.stdout.write('\n  ' + chalk.red('✖ ') + chalk.white(e.message) + '\n\n');
   exit(1);
 });

package/package.json

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

package/src/chat.js

@@ -4,119 +4,209 @@ import { marked } from 'marked';
 import TerminalRenderer from 'marked-terminal';
 import { refreshToken } from './auth.js';
 
-// Configure markdown renderer
+// ── Copilot CLI colour palette (matched from app.js theme tokens) ─────────────
+const C = {
+  textPrimary:    chalk.white,
+  textSecondary:  chalk.hex('#9198A1'),
+  textTertiary:   chalk.hex('#6e7781'),
+  accent:         chalk.hex('#4493F8'),
+  border:         chalk.hex('#3D444D'),
+  userLabel:      chalk.hex('#4493F8').bold,    // same as selected/accent
+  assistantLabel: chalk.white.bold,
+  statusOk:       chalk.green,
+  statusErr:      chalk.red,
+  statusWarn:     chalk.yellow,
+  code:           chalk.hex('#79c0ff'),          // syntaxString dark
+  codeBg:         chalk.bgHex('#161b22').hex('#c9d1d9'),
+};
+
+// ── Layout ────────────────────────────────────────────────────────────────────
+export const cols = () => Math.min((process.stdout.columns || 80), 88);
+const rule = (ch = '─') => C.border('  ' + ch.repeat(Math.max(0, cols() - 4)));
+
+// ── Markdown (matched to Copilot CLI syntax colours) ──────────────────────────
 marked.setOptions({ renderer: new TerminalRenderer({
-  firstHeading: chalk.bold.cyan,
-  heading:      chalk.bold.cyan,
+  firstHeading: chalk.bold.white,
+  heading:      chalk.bold.white,
   strong:       chalk.bold.white,
-  em:           chalk.italic.dim,
-  codespan:     (code) => chalk.bgGray.white(` ${code} `),
-  code:         (code) => code.split('\n').map(l => chalk.green('  ' + l)).join('\n'),
-  blockquote:   chalk.dim,
-  listitem:     (text) => `  ${chalk.cyan('•')} ${text}`,
-  hr:           () => chalk.dim('  ' + '─'.repeat(56)) + '\n',
-  link:         (_href, _title, text) => chalk.cyan.underline(text || _href),
+  em:           chalk.italic.hex('#9198A1'),
+  codespan:     (t) => chalk.bgHex('#161b22').hex('#c9d1d9')(` ${t} `),
+  code:         (t) => '\n' + t.split('\n').map(l => '    ' + chalk.hex('#c9d1d9')(l)).join('\n') + '\n',
+  blockquote:   (t) => C.textSecondary('  ▌ ' + t.trim()),
+  listitem:     (t) => `  ${C.accent('·')} ${t.trimEnd()}`,
+  hr:           () => rule() + '\n',
+  link:         (_h, _t, t) => chalk.hex('#58a6ff').underline(t || _h),
 }) });
 
 function renderMarkdown(text) {
-  try {
-    return marked(text).trimEnd();
-  } catch {
-    return text;
+  try { return marked(text).trimEnd(); } catch { return text; }
+}
+
+// ── Status icon (same pattern, cleaner) ───────────────────────────────────────
+function statusIcon(line) {
+  const l = line.toLowerCase();
+  if (/unreachable|skip|fail|error/.test(l))        return C.statusErr('✗');
+  if (/done|success|found|complet|online/.test(l))  return C.statusOk('✓');
+  if (/batch|sub.?agent|fleet|parallel/.test(l))    return C.accent('◈');
+  if (/\[\d+\/\d+\]/.test(l))                       return C.accent('◉');
+  if (/probe|reachab|ping/.test(l))                 return C.statusWarn('◎');
+  if (/read|fetch|get|query/.test(l))               return C.textSecondary('↓');
+  if (/connect|ssh|telnet|api/.test(l))             return C.accent('⇢');
+  if (/⌁/.test(line))                               return C.border('⌁');
+  return C.border('›');
+}
+
+// ── Banner (Copilot CLI style: label · info · shortcuts) ─────────────────────
+export function printBanner(cfg, meta = {}) {
+  const model = meta.model ? shortModel(meta.model) : (cfg?._model ?? null);
+  process.stdout.write('\n');
+
+  // Title row — bold label, dim subtitle
+  process.stdout.write(
+    '  ' + chalk.bold.white('iCopilot') +
+    C.textSecondary('  ·  IspBills AI Network Engineer') + '\n'
+  );
+
+  // Session info row (model · user · role) — matches Copilot CLI footer format
+  const parts = [];
+  if (model)           parts.push(C.textSecondary('model ') + chalk.white(model));
+  if (cfg?.user?.name) parts.push(C.textSecondary('user ')  + chalk.white(cfg.user.name));
+  if (cfg?.user?.role) parts.push(C.textSecondary('role ')  + chalk.white(cfg.user.role));
+  if (cfg?.url)        parts.push(C.textSecondary('url ')   + C.accent(cfg.url));
+  if (parts.length) {
+    process.stdout.write('  ' + parts.join(C.textSecondary('  ·  ')) + '\n');
   }
+
+  // Hint row — matches Copilot CLI shortcut hints
+  process.stdout.write(
+    C.textTertiary('  /  commands    Tab  autocomplete    ↑↓  history    Ctrl+C  exit') + '\n'
+  );
+  process.stdout.write(rule() + '\n\n');
+}
+
+function shortModel(m) {
+  return m.replace('openai/', '').replace(/^claude-/, '').replace(/^gpt-/, 'gpt-');
 }
 
-/**
- * Stream a single chat turn to stdout.
- *
- * @param {object}   cfg       - { url, token, refresh_token, user }
- * @param {Array}    messages  - [{ role, content }]
- * @param {object}   [context] - optional device context
- * @param {object}   [opts]    - { thinking: bool }
- * @returns {string} The final answer text
- */
+// ── Slash commands ─────────────────────────────────────────────────────────────
+export const SLASH_COMMANDS = [
+  { cmd: '/check',    hint: '[device]',  desc: 'Run diagnostics on a device'  },
+  { cmd: '/vlan',     hint: '[id]',      desc: 'Check VLAN usage'             },
+  { cmd: '/onu',      hint: '[id]',      desc: 'Show ONU status and signal'   },
+  { cmd: '/customer', hint: '[name/IP]', desc: 'Look up a customer'           },
+  { cmd: '/ping',     hint: '[host]',    desc: 'Ping a host'                  },
+  { cmd: '/online',   hint: '',          desc: 'List online sessions'         },
+  { cmd: '/history',  hint: '',          desc: 'Show conversation history'    },
+  { cmd: '/clear',    hint: '',          desc: 'Clear the screen'             },
+  { cmd: '/help',     hint: '',          desc: 'Show help'                    },
+  { cmd: '/exit',     hint: '',          desc: 'Exit iCli'                    },
+];
+
+export function printSlashMenu() {
+  process.stdout.write('\n');
+  process.stdout.write(chalk.bold.white('  Commands') + C.textTertiary('  (Tab to autocomplete)\n\n'));
+  for (const { cmd: c, hint, desc } of SLASH_COMMANDS) {
+    const key = (c + (hint ? ' ' + hint : '')).padEnd(22);
+    process.stdout.write('  ' + C.accent(key) + C.textSecondary(desc) + '\n');
+  }
+  process.stdout.write('\n');
+}
+
+export function slashCompleter(line) {
+  if (line.startsWith('/')) {
+    const hits = SLASH_COMMANDS.map(s => s.cmd + ' ').filter(s => s.startsWith(line));
+    return [hits.length ? hits : SLASH_COMMANDS.map(s => s.cmd + ' '), line];
+  }
+  return [[], line];
+}
+
+// ── streamChat ────────────────────────────────────────────────────────────────
 export async function streamChat(cfg, messages, context = {}, opts = {}) {
   const showThinking = opts.thinking !== false;
   const body = JSON.stringify({ messages, context });
 
-  let res = await fetch(`${cfg.url}/api/v1/ai/chat/stream`, {
-    method:  'POST',
-    headers: {
-      'Content-Type':  'application/json',
-      'Accept':        'text/event-stream',
-      'Authorization': `Bearer ${cfg.token}`,
-    },
-    body,
-  });
-
-  // Token expired — try refresh once
-  if (res.status === 401 && cfg.refresh_token) {
-    const updated = await refreshToken(cfg);
-    if (!updated) throw new Error('Session expired. Run `icli login` to re-authenticate.');
-    Object.assign(cfg, updated);
-    res = await fetch(`${cfg.url}/api/v1/ai/chat/stream`, {
-      method:  'POST',
+  async function doFetch(token) {
+    return fetch(`${cfg.url}/api/v1/ai/chat/stream`, {
+      method: 'POST',
       headers: {
         'Content-Type':  'application/json',
         'Accept':        'text/event-stream',
-        'Authorization': `Bearer ${cfg.token}`,
+        'Authorization': `Bearer ${token}`,
       },
       body,
     });
   }
 
+  let res = await doFetch(cfg.token);
+  if (res.status === 401 && cfg.refresh_token) {
+    const updated = await refreshToken(cfg);
+    if (!updated) throw new Error('Session expired. Run `icli login`.');
+    Object.assign(cfg, updated);
+    res = await doFetch(cfg.token);
+  }
   if (!res.ok) {
     const txt = await res.text().catch(() => '');
     throw new Error(`AI request failed (HTTP ${res.status}): ${txt.slice(0, 200)}`);
   }
 
-  // ── Spinner ──────────────────────────────────────────────────────────────
+  // ── Render state ───────────────────────────────────────────────────────────
+  let reasoningOpen = false;    // true while inside a live reasoning block
+  let answerBuf     = '';
+  let rawAnswer     = '';
+  let finalResult   = null;
+
   const spinner = ora({
-    text:    chalk.dim('Thinking…'),
-    color:   'cyan',
-    spinner: 'dots',
-    prefixText: ' ',
+    text:       C.textSecondary('Thinking…'),
+    color:      'blue',
+    spinner:    'dots',
+    prefixText: '  ',
   });
 
-  let reasonBuf   = '';
-  let answerBuf   = '';
-  let rawAnswer   = '';
-  let finalResult = null;
+  const stopSpinner = () => { if (spinner.isSpinning) spinner.stop(); };
 
-  function stopSpinner() {
-    if (spinner.isSpinning) spinner.stop();
+  function openReasoning() {
+    if (reasoningOpen) return;
+    stopSpinner();
+    reasoningOpen = true;
+    // Copilot CLI style: label then indented content
+    process.stdout.write('\n  ' + C.textSecondary('Reasoning') + '\n');
+    process.stdout.write(C.border('  │ '));
   }
 
-  function printStatus(line) {
-    stopSpinner();
-    process.stdout.write(chalk.magenta('  › ') + chalk.dim(line) + '\n');
-    if (showThinking) spinner.start();
+  function writeReasonDelta(delta) {
+    if (!reasoningOpen) return;
+    const parts = delta.split('\n');
+    for (let i = 0; i < parts.length; i++) {
+      if (i > 0) process.stdout.write('\n' + C.border('  │ '));
+      if (parts[i]) process.stdout.write(C.textSecondary(parts[i]));
+    }
+  }
+
+  function closeReasoning() {
+    if (!reasoningOpen) return;
+    process.stdout.write('\n\n');
+    reasoningOpen = false;
   }
 
-  function flushReasoning() {
-    if (!reasonBuf.trim()) return;
+  function printStatus(line) {
+    if (reasoningOpen) closeReasoning();
     stopSpinner();
-    const lines = reasonBuf.trim().split('\n').filter(Boolean);
-    process.stdout.write('\n');
-    process.stdout.write(chalk.dim('  ┌─ Reasoning ' + '─'.repeat(44)) + '\n');
-    for (const l of lines) {
-      process.stdout.write(chalk.dim('  │ ') + chalk.dim.italic(l) + '\n');
-    }
-    process.stdout.write(chalk.dim('  └' + '─'.repeat(57)) + '\n');
-    reasonBuf = '';
+    const icon   = statusIcon(line);
+    const text   = line.trimStart();
+    const indent = /^[\s·•⌁]/.test(line) ? '    ' : '  ';
+    process.stdout.write(indent + icon + ' ' + C.textSecondary(text) + '\n');
+    if (showThinking) spinner.start();
   }
 
   function parseStreamText(raw) {
     const m = raw.match(/"text"\s*:\s*"((?:[^"\\]|\\.)*)/);
     if (!m) return raw.trimStart().startsWith('{') ? null : raw;
-    return m[1]
-      .replace(/\\n/g, '\n').replace(/\\t/g, '\t')
-      .replace(/\\r/g, '').replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+    return m[1].replace(/\\n/g,'\n').replace(/\\t/g,'\t')
+               .replace(/\\r/g,'').replace(/\\"/g,'"').replace(/\\\\/g,'\\');
   }
 
-  // ── SSE reader ───────────────────────────────────────────────────────────
+  // ── SSE reader ─────────────────────────────────────────────────────────────
   if (showThinking) spinner.start();
-
   const decoder = new TextDecoder();
   let sseBuffer = '';
 
@@ -126,16 +216,18 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     sseBuffer = lines.pop();
 
     for (const line of lines) {
-      const trimmed = line.replace(/\r$/, '');
-      if (!trimmed.startsWith('data: ')) continue;
-      let ev;
-      try { ev = JSON.parse(trimmed.slice(6)); } catch { continue; }
+      const t = line.replace(/\r$/, '');
+      if (!t.startsWith('data: ')) continue;
+      let ev; try { ev = JSON.parse(t.slice(6)); } catch { continue; }
 
       if (ev.status_delta !== undefined) {
         printStatus(ev.status_delta);
       } else if (ev.reason_delta !== undefined) {
-        reasonBuf += ev.reason_delta;
+        if (!reasoningOpen) openReasoning();       // re-open after STATUS closes it
+        writeReasonDelta(ev.reason_delta);
       } else if (ev.delta !== undefined) {
+        if (reasoningOpen) closeReasoning();
+        stopSpinner();
         rawAnswer += ev.delta;
         const txt = parseStreamText(rawAnswer);
         if (txt !== null) answerBuf = txt;
@@ -145,73 +237,56 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     }
   }
 
-  // ── Final render ─────────────────────────────────────────────────────────
+  // ── Final render ───────────────────────────────────────────────────────────
   stopSpinner();
-  flushReasoning();
+  if (reasoningOpen) closeReasoning();
 
   const reply     = finalResult?.reply ?? {};
   const replyType = reply.type ?? 'message';
+  const meta      = finalResult?._meta ?? {};
 
-  process.stdout.write('\n' + chalk.dim('  ' + '─'.repeat(58)) + '\n\n');
+  // Save model to cfg for banner re-use
+  if (meta.model && cfg) cfg._model = shortModel(meta.model);
+
+  // Content separator (same as Copilot CLI visual spacing)
+  process.stdout.write('\n');
 
   if (replyType === 'message') {
     const text = reply.text || answerBuf || '(no response)';
-    const rendered = renderMarkdown(text);
-    const indented = rendered.split('\n').map(l => '  ' + l).join('\n');
-    process.stdout.write(indented + '\n\n');
-    return text;
+    process.stdout.write(renderMarkdown(text).split('\n').map(l => '  ' + l).join('\n') + '\n');
 
   } else if (replyType === 'plan') {
-    process.stdout.write('  ' + chalk.bold.cyan('📋 ') + chalk.bold.white(reply.summary || 'Plan') + '\n\n');
-    (reply.steps || []).forEach((step, i) => {
-      const risk = step.risk === 'high' ? chalk.red('  ⚠ high risk') : '';
-      process.stdout.write(`  ${chalk.cyan(String(i + 1) + '.')} ${chalk.yellow(step.cmd || '')}${risk}\n`);
-      if (step.purpose) process.stdout.write(chalk.dim(`      ${step.purpose}\n`));
-    });
+    process.stdout.write('  ' + chalk.bold.white('Plan') + '\n');
+    if (reply.summary) process.stdout.write('  ' + C.textSecondary(reply.summary) + '\n');
     process.stdout.write('\n');
-    return reply.summary || '';
+    (reply.steps || []).forEach((s, i) => {
+      const risk = s.risk === 'high'   ? C.statusErr(' ⚠ high risk') :
+                   s.risk === 'medium' ? C.statusWarn(' ⚡') : '';
+      process.stdout.write(`  ${C.textSecondary(String(i+1)+'.')}  ${chalk.yellow(s.cmd || '')}${risk}\n`);
+      if (s.purpose) process.stdout.write(C.textTertiary(`       ${s.purpose}\n`));
+    });
+    process.stdout.write('\n' + C.textSecondary('  Reply ') + chalk.white('apply fix') + C.textSecondary(' to confirm.\n'));
 
   } else if (replyType === 'connect') {
     const dev = reply.device ?? {};
     process.stdout.write(
-      '  ' + chalk.bold.green('🔌 ') +
-      chalk.bold.green(`${dev.kind ?? '?'}#${dev.id ?? '?'}`) +
-      chalk.white(` ${dev.name ?? ''} `) +
-      chalk.dim(`(${dev.host ?? ''})`) + '\n'
+      '  ' + C.statusOk('🔌 ') +
+      chalk.bold.white(`${dev.kind ?? '?'}#${dev.id ?? '?'}`) + ' ' +
+      chalk.white(dev.name ?? '') + ' ' +
+      C.textSecondary(`(${dev.host ?? ''})`) + '\n'
     );
-    if (reply.note) process.stdout.write(chalk.dim('  ' + reply.note) + '\n');
-    process.stdout.write('\n');
-    return reply.note || '';
+    if (reply.note) process.stdout.write(C.textSecondary('  ' + reply.note) + '\n');
   }
 
-  return answerBuf;
-}
-
-/** Print a styled welcome banner. */
-export function printBanner(cfg) {
-  const line = '─'.repeat(58);
+  // ── Footer — matches Copilot CLI status bar format: model · user · ... ──────
   process.stdout.write('\n');
-  process.stdout.write(chalk.cyan('  ╭' + line + '╮') + '\n');
-  process.stdout.write(
-    chalk.cyan('  │  ') +
-    chalk.bold.white('iCopilot') +
-    chalk.dim('  ·  IspBills AI Network Engineer') +
-    ' '.repeat(13) +
-    chalk.cyan('  │') + '\n'
-  );
-  process.stdout.write(chalk.cyan('  ╰' + line + '╯') + '\n\n');
-
-  if (cfg?.url) {
-    process.stdout.write(chalk.dim('  Connected ') + chalk.cyan(cfg.url) + '\n');
+  const footParts = [];
+  if (meta.model) footParts.push(shortModel(meta.model));
+  if (meta.user)  footParts.push(meta.user);
+  if (meta.role)  footParts.push(meta.role);
+  if (footParts.length) {
+    process.stdout.write(C.textTertiary('  ' + footParts.join(' · ')) + '\n');
   }
-  if (cfg?.user?.name || cfg?.user?.email) {
-    process.stdout.write(
-      chalk.dim('  Logged in ') +
-      chalk.white(cfg.user.name || cfg.user.email) +
-      chalk.dim(' · ' + (cfg.user.role ?? 'operator')) + '\n'
-    );
-  }
-  process.stdout.write('\n');
-  process.stdout.write(chalk.dim('  Type your question and press Enter. Type "exit" to quit.\n'));
-  process.stdout.write(chalk.dim('  ' + line) + '\n\n');
+
+  return reply.text || answerBuf || '';
 }