ispbills-icli 1.0.0 → 1.1.0

package/bin/icli.js

@@ -4,7 +4,7 @@ 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 } from '../src/chat.js';
+import { streamChat, printBanner } from '../src/chat.js';
 
 // ─── Parse args ─────────────────────────────────────────────────────────────
 const args = argv.slice(2);
@@ -12,47 +12,54 @@ const cmd  = args[0] ?? '';
 
 // ─── Help ────────────────────────────────────────────────────────────────────
 function printHelp() {
-  console.log(`
-${chalk.bold.cyan('iCli')} — IspBills AI network engineer in your terminal
-${chalk.dim('Powered by iCopilot · github.com/lupael/IspBills')}
-
-${chalk.bold('Usage:')}
-  ${chalk.cyan('icli')}                     Interactive chat (REPL)
-  ${chalk.cyan('icli')} ${chalk.yellow('"your question"')}    Single-shot query, then exit
-  ${chalk.cyan('icli login')}               Authenticate (or re-authenticate)
-  ${chalk.cyan('icli whoami')}              Show current login info
-  ${chalk.cyan('icli --help')}              Show this help
-
-${chalk.bold('Examples:')}
-  ${chalk.dim('$')} icli "is vlan 82 in use?"
-  ${chalk.dim('$')} icli "show all ONUs on olt#1"
-  ${chalk.dim('$')} icli "which customer is using IP 192.168.1.50?"
-  ${chalk.dim('$')} icli                        ${chalk.dim('# start interactive REPL')}
-
-${chalk.bold('Config stored at:')}
-  ${chalk.dim(configPath())}
-`);
+  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');
 }
 
 // ─── Ensure authenticated ────────────────────────────────────────────────────
 async function ensureAuth() {
   let cfg = loadConfig();
   if (!cfg) {
-    console.log(chalk.yellow('No saved login found. Let\'s set up iCli.\n'));
+    console.log(chalk.yellow('\n  No saved login found. Let\'s connect iCli.\n'));
     cfg = await loginFlow();
-    console.log(chalk.green(`\n✓ Logged in as ${cfg.user?.name ?? cfg.user?.email} (${cfg.user?.role ?? 'operator'})`));
-    console.log(chalk.dim(`  Connected to: ${cfg.url}\n`));
+    console.log('\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');
   }
   return cfg;
 }
 
 // ─── Single-shot query ───────────────────────────────────────────────────────
 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');
+
   const messages = [{ role: 'user', content: question }];
   try {
     await streamChat(cfg, messages);
   } catch (e) {
-    console.error(chalk.red('\n✖ ' + e.message));
+    console.error('\n  ' + chalk.red('✖ ' + e.message) + '\n');
     exit(1);
   }
 }
@@ -60,41 +67,54 @@ async function singleShot(cfg, question) {
 // ─── Interactive REPL ────────────────────────────────────────────────────────
 async function interactiveRepl(cfg) {
   const history = [];
+
+  printBanner(cfg);
+
   const rl = readline.createInterface({
     input, output,
-    prompt: chalk.cyan('iCli') + chalk.dim(' › '),
+    prompt: chalk.cyan('  You  ') + chalk.white(''),
   });
 
-  console.log(
-    chalk.bold.cyan('\n  iCli') + chalk.dim(' — IspBills AI terminal\n') +
-    chalk.dim(`  Connected to: ${cfg.url}`) + '\n' +
-    chalk.dim('  Type your question. Press Ctrl+C or type "exit" to quit.\n')
-  );
   rl.prompt();
 
   rl.on('line', async (line) => {
     const q = line.trim();
     if (!q) { rl.prompt(); return; }
-    if (q === 'exit' || q === 'quit') { rl.close(); return; }
-    if (q === 'clear') { console.clear(); rl.prompt(); return; }
+
+    if (q === 'exit' || q === 'quit') {
+      console.log(chalk.dim('\n  Goodbye.\n'));
+      rl.close();
+      exit(0);
+    }
+    if (q === 'clear') { console.clear(); printBanner(cfg); rl.prompt(); return; }
     if (q === 'history') {
-      history.forEach((m, i) => {
-        if (m.role === 'user') console.log(chalk.dim(`  ${i}: `) + m.content.slice(0, 80));
+      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 === 'help') { printHelp(); rl.prompt(); return; }
 
     rl.pause();
     history.push({ role: 'user', content: q });
 
+    // Show iCopilot label before streaming response
+    process.stdout.write('  ' + chalk.dim('─'.repeat(58)) + '\n');
+    process.stdout.write('  ' + chalk.bold.cyan('iCopilot') + '\n');
+
     try {
       const answer = await streamChat(cfg, [...history]);
       if (answer) history.push({ role: 'assistant', content: answer });
     } catch (e) {
-      console.error(chalk.red('\n✖ ' + e.message + '\n'));
+      console.error('\n  ' + chalk.red('✖ ' + e.message) + '\n');
     }
 
+    // Prompt for next message with label
+    process.stdout.write('  ' + chalk.dim('─'.repeat(58)) + '\n');
+    rl.setPrompt(chalk.cyan('  You  ') + chalk.white(''));
     rl.resume();
     rl.prompt();
   });
@@ -113,18 +133,26 @@ async function main() {
 
   if (cmd === 'login') {
     const cfg = await loginFlow();
-    console.log(chalk.green(`\n✓ Logged in as ${cfg.user?.name ?? cfg.user?.email} (${cfg.user?.role})`));
-    console.log(chalk.dim(`  Config saved to: ${configPath()}\n`));
+    console.log('\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');
     return;
   }
 
   if (cmd === 'whoami') {
     const cfg = loadConfig();
-    if (!cfg) { console.log(chalk.yellow('Not logged in. Run `icli login`.')); return; }
-    console.log(`\n${chalk.bold('URL:')}   ${cfg.url}`);
-    console.log(`${chalk.bold('Name:')}  ${cfg.user?.name ?? '—'}`);
-    console.log(`${chalk.bold('Email:')} ${cfg.user?.email ?? '—'}`);
-    console.log(`${chalk.bold('Role:')}  ${cfg.user?.role ?? '—'}\n`);
+    if (!cfg) {
+      console.log('\n  ' + chalk.yellow('Not logged in.') + ' Run ' + chalk.cyan('icli login') + '\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');
     return;
   }
 
@@ -140,4 +168,7 @@ async function main() {
   await interactiveRepl(cfg);
 }
 
-main().catch(e => { console.error(chalk.red('✖ ' + e.message)); exit(1); });
+main().catch(e => {
+  console.error('\n  ' + chalk.red('✖ ' + e.message) + '\n');
+  exit(1);
+});

package/package.json

@@ -1,11 +1,18 @@
 {
   "name": "ispbills-icli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "iCli — IspBills AI network engineer in your terminal",
-  "keywords": ["ispbills", "network", "isp", "ai", "cli", "noc"],
+  "keywords": [
+    "ispbills",
+    "network",
+    "isp",
+    "ai",
+    "cli",
+    "noc"
+  ],
   "license": "MIT",
   "bin": {
-    "icli": "./bin/icli.js"
+    "icli": "bin/icli.js"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -17,6 +24,9 @@
     "README.md"
   ],
   "dependencies": {
-    "chalk": "^5.3.0"
+    "chalk": "^5.3.0",
+    "marked": "^15.0.12",
+    "marked-terminal": "^7.3.0",
+    "ora": "^9.4.1"
   }
 }

package/src/auth.js

@@ -7,11 +7,14 @@ export async function loginFlow(existingUrl = '') {
 
   console.log('\n🔌 iCli — IspBills AI terminal\n');
 
+  const DEFAULT_URL = 'https://app.ispbills.com';
   let url = existingUrl;
   if (!url) {
-    url = (await rl.question('IspBills instance URL (e.g. https://app.myisp.com): ')).trim();
+    const input_url = (await rl.question(`IspBills instance URL [${DEFAULT_URL}]: `)).trim();
+    url = input_url || DEFAULT_URL;
   }
   url = url.replace(/\/$/, '');
+  if (!/^https?:\/\//i.test(url)) url = 'https://' + url;
 
   const email    = (await rl.question('Email: ')).trim();
   const password = await rl.question('Password: ');

package/src/chat.js

@@ -1,7 +1,30 @@
 import chalk from 'chalk';
+import ora from 'ora';
+import { marked } from 'marked';
+import TerminalRenderer from 'marked-terminal';
 import { refreshToken } from './auth.js';
 
-const SPINNER_FRAMES = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
+// Configure markdown renderer
+marked.setOptions({ renderer: new TerminalRenderer({
+  firstHeading: chalk.bold.cyan,
+  heading:      chalk.bold.cyan,
+  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),
+}) });
+
+function renderMarkdown(text) {
+  try {
+    return marked(text).trimEnd();
+  } catch {
+    return text;
+  }
+}
 
 /**
  * Stream a single chat turn to stdout.
@@ -14,7 +37,6 @@ const SPINNER_FRAMES = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','
  */
 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`, {
@@ -48,55 +70,44 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     throw new Error(`AI request failed (HTTP ${res.status}): ${txt.slice(0, 200)}`);
   }
 
-  // ── Render state ────────────────────────────────────────────────────────
-  let spinTimer    = null;
-  let spinIdx      = 0;
-  let thinkingLine = false;
-  let reasonBuf    = '';
-  let statusBuf    = '';
-  let answerBuf    = '';
-  let lastWasNewline = true;
-
-  function clearSpinner() {
-    if (spinTimer) { clearInterval(spinTimer); spinTimer = null; }
-    if (thinkingLine) {
-      process.stdout.write('\r\x1b[K');   // clear the thinking line
-      thinkingLine = false;
-    }
-  }
+  // ── Spinner ──────────────────────────────────────────────────────────────
+  const spinner = ora({
+    text:    chalk.dim('Thinking…'),
+    color:   'cyan',
+    spinner: 'dots',
+    prefixText: ' ',
+  });
 
-  function startSpinner() {
-    if (!showThinking) return;
-    thinkingLine = true;
-    spinTimer = setInterval(() => {
-      const f = SPINNER_FRAMES[spinIdx++ % SPINNER_FRAMES.length];
-      process.stdout.write(`\r${chalk.blue(f)} ${chalk.dim('Thinking…')}`);
-    }, 80);
+  let reasonBuf   = '';
+  let answerBuf   = '';
+  let rawAnswer   = '';
+  let finalResult = null;
+
+  function stopSpinner() {
+    if (spinner.isSpinning) spinner.stop();
   }
 
   function printStatus(line) {
-    clearSpinner();
+    stopSpinner();
     process.stdout.write(chalk.magenta('  › ') + chalk.dim(line) + '\n');
-    lastWasNewline = true;
-    if (showThinking) startSpinner();
-  }
-
-  function printReasoning(delta) {
-    // Reasoning streams as a running line; collapse to a single dim block.
-    reasonBuf += delta;
+    if (showThinking) spinner.start();
   }
 
   function flushReasoning() {
-    if (!reasonBuf) return;
-    clearSpinner();
-    const lines = reasonBuf.trim().split('\n');
-    process.stdout.write(chalk.dim('  ┆ ' + lines.join('\n  ┆ ')) + '\n');
+    if (!reasonBuf.trim()) return;
+    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 = '';
-    lastWasNewline = true;
   }
 
   function parseStreamText(raw) {
-    const m = raw.match(/"text"\s*:\s*"((?:[^"\\]|\\.)*)$/);
+    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')
@@ -104,17 +115,15 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
   }
 
   // ── SSE reader ───────────────────────────────────────────────────────────
-  if (showThinking) startSpinner();
+  if (showThinking) spinner.start();
 
   const decoder = new TextDecoder();
   let sseBuffer = '';
-  let finalResult = null;
-  let rawAnswer  = '';
 
   for await (const chunk of res.body) {
     sseBuffer += decoder.decode(chunk, { stream: true });
     const lines = sseBuffer.split('\n');
-    sseBuffer = lines.pop();          // keep incomplete line in buffer
+    sseBuffer = lines.pop();
 
     for (const line of lines) {
       const trimmed = line.replace(/\r$/, '');
@@ -124,15 +133,12 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
 
       if (ev.status_delta !== undefined) {
         printStatus(ev.status_delta);
-
       } else if (ev.reason_delta !== undefined) {
-        printReasoning(ev.reason_delta);
-
+        reasonBuf += ev.reason_delta;
       } else if (ev.delta !== undefined) {
         rawAnswer += ev.delta;
         const txt = parseStreamText(rawAnswer);
         if (txt !== null) answerBuf = txt;
-
       } else if (ev.done) {
         finalResult = ev.result;
       }
@@ -140,42 +146,72 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
   }
 
   // ── Final render ─────────────────────────────────────────────────────────
-  clearSpinner();
+  stopSpinner();
   flushReasoning();
 
-  const reply   = finalResult?.reply  ?? {};
+  const reply     = finalResult?.reply ?? {};
   const replyType = reply.type ?? 'message';
 
+  process.stdout.write('\n' + chalk.dim('  ' + '─'.repeat(58)) + '\n\n');
+
   if (replyType === 'message') {
     const text = reply.text || answerBuf || '(no response)';
-    if (!lastWasNewline) process.stdout.write('\n');
-    process.stdout.write('\n' + chalk.white(text) + '\n\n');
+    const rendered = renderMarkdown(text);
+    const indented = rendered.split('\n').map(l => '  ' + l).join('\n');
+    process.stdout.write(indented + '\n\n');
     return text;
 
   } else if (replyType === 'plan') {
-    process.stdout.write('\n');
-    process.stdout.write(chalk.bold.cyan('📋 Plan: ') + chalk.cyan(reply.summary || '') + '\n');
+    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') : '';
-      process.stdout.write(
-        `  ${chalk.dim(String(i + 1) + '.')} ${chalk.yellow(step.cmd || '')}${risk}\n`
-      );
-      if (step.purpose) process.stdout.write(chalk.dim(`     ${step.purpose}\n`));
+      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('\n');
     return reply.summary || '';
 
   } else if (replyType === 'connect') {
     const dev = reply.device ?? {};
-    process.stdout.write('\n');
     process.stdout.write(
-      chalk.bold.green('🔌 Connect: ') +
-      chalk.green(`${dev.kind ?? '?'}#${dev.id ?? '?'} ${dev.name ?? ''} (${dev.host ?? ''})`) + '\n'
+      '  ' + chalk.bold.green('🔌 ') +
+      chalk.bold.green(`${dev.kind ?? '?'}#${dev.id ?? '?'}`) +
+      chalk.white(` ${dev.name ?? ''} `) +
+      chalk.dim(`(${dev.host ?? ''})`) + '\n'
     );
-    if (reply.note) process.stdout.write(chalk.dim('   ' + reply.note) + '\n');
+    if (reply.note) process.stdout.write(chalk.dim('  ' + reply.note) + '\n');
     process.stdout.write('\n');
     return reply.note || '';
   }
 
   return answerBuf;
 }
+
+/** Print a styled welcome banner. */
+export function printBanner(cfg) {
+  const line = '─'.repeat(58);
+  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');
+  }
+  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');
+}