ispbills-icli 4.0.0 → 4.0.3

package/bin/icli.js

@@ -31,7 +31,7 @@ function printHelp() {
   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.bold('Usage'), P.border) + '\n');
   process.stdout.write(boxRow('', P.border) + '\n');
   [
     ['icli',            'Interactive REPL with slash commands'],
@@ -40,19 +40,19 @@ function printHelp() {
     ['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')
+    process.stdout.write(boxRow(P.accent(c.padEnd(20)) + P.dim(d), P.border) + '\n')
   );
 
   process.stdout.write(boxMid(P.border) + '\n');
-  process.stdout.write(boxRow('  ' + P.bold('Slash commands'), P.border) + '\n');
+  process.stdout.write(boxRow(P.bold('Slash commands'), P.border) + '\n');
   process.stdout.write(boxRow('', P.border) + '\n');
   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');
+    process.stdout.write(boxRow(P.accent(key) + P.dim(desc), P.border) + '\n');
   }
 
   process.stdout.write(boxMid(P.border) + '\n');
-  process.stdout.write(boxRow('  ' + P.bold('Keyboard shortcuts'), P.border) + '\n');
+  process.stdout.write(boxRow(P.bold('Keyboard shortcuts'), P.border) + '\n');
   process.stdout.write(boxRow('', P.border) + '\n');
   [
     ['Tab',       'Autocomplete slash commands'],
@@ -61,7 +61,7 @@ function printHelp() {
     ['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.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');
@@ -142,8 +142,8 @@ async function interactiveRepl(cfg) {
       } 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() - 8)), P.border) + '\n')
+          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');
       }
@@ -203,7 +203,7 @@ async function main() {
     [['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(boxRow(P.dim(k.padEnd(7)) + chalk.white(v), P.border) + '\n')
       );
     process.stdout.write(boxBot(P.border) + '\n\n');
     return;

package/package.json

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

package/src/chat.js

@@ -24,18 +24,27 @@ const P = {
 };
 
 // ── Markdown ───────────────────────────────────────────────────────────────────
-marked.setOptions({ renderer: new TerminalRenderer({
+const termRenderer = new TerminalRenderer({
   firstHeading: chalk.bold.white,
   heading:      chalk.bold.white,
   strong:       chalk.bold.white,
   em:           chalk.italic.hex('#9198A1'),
   codespan:     (t) => chalk.bgHex('#161b22').hex('#c9d1d9')(` ${t} `),
   code:         (t) => '\n' + t.split('\n').map(l => '    ' + chalk.hex('#a5d6ff')(l)).join('\n') + '\n',
-  blockquote:   (t) => P.dim('  ▌ ') + P.dim(t.trim()),
-  listitem:     (t) => `  ${P.accent('·')} ${t.trimEnd()}`,
+  blockquote:   (t) => P.dim('▌ ') + P.dim(t.trim()) + '\n',
   hr:           () => P.border('─'.repeat(inner())) + '\n',
   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('·')));
+};
+
+marked.setOptions({ renderer: termRenderer });
 
 function renderMarkdown(text) {
   try { return marked(text).trimEnd(); } catch { return text; }
@@ -69,7 +78,7 @@ export function printBanner(cfg, meta = {}) {
   process.stdout.write(boxTop('', P.border) + '\n');
 
   // Title row
-  const title = P.bold('  iCopilot') + P.dim('  ·  IspBills AI Network Engineer');
+  const title = P.bold('iCopilot') + P.dim('  ·  IspBills AI Network Engineer');
   process.stdout.write(boxRow(title, P.border) + '\n');
 
   // Divider
@@ -81,19 +90,19 @@ export function printBanner(cfg, meta = {}) {
   if (cfg?.user?.name) row1parts.push(P.dim('user ')  + P.white(cfg.user.name));
   if (cfg?.user?.role) row1parts.push(P.dim('role ')  + P.white(cfg.user.role));
   if (row1parts.length) {
-    process.stdout.write(boxRow('  ' + row1parts.join(P.dim('  ·  ')), P.border) + '\n');
+    process.stdout.write(boxRow(row1parts.join(P.dim('  ·  ')), P.border) + '\n');
   }
   if (cfg?.url) {
-    const maxUrl = inner() - 8;
+    const maxUrl = inner() - 6;
     const url    = cfg.url.length > maxUrl ? cfg.url.slice(0, maxUrl - 1) + '…' : cfg.url;
-    process.stdout.write(boxRow('  ' + P.dim('url  ') + P.accent(url), P.border) + '\n');
+    process.stdout.write(boxRow(P.dim('url  ') + P.accent(url), P.border) + '\n');
   }
 
   // Divider
   process.stdout.write(boxMid(P.border) + '\n');
 
   // Hints row
-  const hints = '  ' + [
+  const hints = [
     P.accentB('/') + P.muted(' commands'),
     P.accentB('Tab') + P.muted(' autocomplete'),
     P.accentB('↑↓') + P.muted(' history'),
@@ -124,7 +133,7 @@ export function printSlashMenu() {
   process.stdout.write(boxTop('Commands', P.border) + '\n');
   for (const { cmd: c, hint, desc } of SLASH_COMMANDS) {
     const key  = P.accentB(c) + (hint ? P.dim(' ' + hint) : '');
-    const line = '  ' + padRight(key, 22) + '  ' + P.dim(desc);
+    const line = padRight(key, 22) + '  ' + P.dim(desc);
     process.stdout.write(boxRow(line, P.border) + '\n');
   }
   process.stdout.write(boxBot(P.border) + '\n\n');
@@ -143,18 +152,18 @@ export function printUserBox(question) {
   process.stdout.write('\n');
   process.stdout.write(boxTop('You', P.accentB) + '\n');
   // Word-wrap the question to fit inside the box
-  const maxW  = inner() - 2;
+  const maxW  = inner();
   const words = question.split(' ');
   let   line  = '';
   for (const word of words) {
     if (line.length + word.length + 1 > maxW && line) {
-      process.stdout.write(boxRow('  ' + P.white(line), P.accentB) + '\n');
+      process.stdout.write(boxRow(P.white(line), P.accentB) + '\n');
       line = word;
     } else {
       line = line ? line + ' ' + word : word;
     }
   }
-  if (line) process.stdout.write(boxRow('  ' + P.white(line), P.accentB) + '\n');
+  if (line) process.stdout.write(boxRow(P.white(line), P.accentB) + '\n');
   process.stdout.write(boxBot(P.accentB) + '\n');
 }
 
@@ -216,15 +225,15 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     stopSpinner();
     reasoningOpen = true;
     process.stdout.write(boxLine('', P.border) + '\n');
-    process.stdout.write(boxLine(P.dim('  ╌ Reasoning ') + P.border('╌'.repeat(Math.max(0, inner() - 16))), P.border) + '\n');
-    process.stdout.write(boxLine(P.border('  │ '), P.border));
+    process.stdout.write(boxLine(P.dim('╌ Reasoning ') + P.border('╌'.repeat(Math.max(0, inner() - 14))), P.border) + '\n');
+    process.stdout.write(boxLine(P.border('│ '), P.border));
   }
 
   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' + 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]));
     }
   }
@@ -241,7 +250,7 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     stopSpinner();
     const icon   = statusIcon(line);
     const text   = line.trimStart();
-    const indent = /^[\s·•⌁]/.test(line) ? '    ' : '  ';
+    const indent = /^[\s·•⌁]/.test(line) ? '  ' : '';
     process.stdout.write(boxLine(indent + icon + ' ' + P.dim(text), P.border) + '\n');
     if (showThinking) spinner.start();
   }
@@ -304,38 +313,37 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
   if (replyType === 'message') {
     const text     = reply.text || answerBuf || '(no response)';
     const rendered = renderMarkdown(text);
-    // Render each markdown line with │ prefix
     for (const l of rendered.split('\n')) {
-      process.stdout.write(boxLine('  ' + l, P.border) + '\n');
+      process.stdout.write(boxLine(l, P.border) + '\n');
     }
 
   } 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');
+    process.stdout.write(boxLine(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');
+      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');
     });
     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 ?? '?'}`) +
+      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');
+    if (reply.note) process.stdout.write(boxLine(P.dim(reply.note), P.border) + '\n');
   }
 
   // Blank + footer line 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');
+    process.stdout.write(boxLine(P.muted(foot.join(' · ')), P.border) + '\n');
   }
 
   // Close the box

package/src/layout.js

@@ -23,12 +23,17 @@ export const padRight   = (s, n) => s + ' '.repeat(Math.max(0, n - visLen(s)));
 // draw(color, char, n)  — repeat char n times with color
 const rep = (ch, n) => ch.repeat(Math.max(0, n));
 
-/** Full top border:   ╭─ [label] ──────────────╮ */
+/** Full top border:   ╭─ [label] ──────────────╮
+ *  ╭  (1) + ─ (1) + lbl (lbl.len) + dash + ╮ (1) = w
+ *  → dash = w - 3 - lbl.length              */
 export function boxTop(label, borderFn) {
-  const w    = cols();
-  const lbl  = label ? ` ${label} ` : '';
-  const dash = rep('─', Math.max(0, w - 2 - lbl.length));
-  return borderFn(`╭${lbl.length ? '─' + lbl : ''}${dash}╮`);
+  const w   = cols();
+  const lbl = label ? ` ${label} ` : '';
+  if (lbl.length) {
+    const dash = rep('─', Math.max(0, w - 3 - lbl.length));
+    return borderFn(`╭─${lbl}${dash}╮`);
+  }
+  return borderFn('╭' + rep('─', w - 2) + '╮');
 }
 
 /** Divider inside box: ├────────────────────────┤ */
@@ -42,11 +47,11 @@ export function boxBot(borderFn) {
 }
 
 /** Open top border (no right cap — for streaming sections):
- *  ╭─ [label] ────────── */
+ *  ╭─ [label] ────────────────────────────── */
 export function boxTopOpen(label, borderFn) {
   const w   = cols();
   const lbl = label ? ` ${label} ` : '';
-  const dash = rep('─', Math.max(0, w - 1 - lbl.length));
+  const dash = rep('─', Math.max(0, w - 2 - lbl.length));
   return borderFn(`╭─${lbl}${dash}`);
 }
 
@@ -56,11 +61,12 @@ export function boxBotOpen(borderFn) {
 }
 
 /** One content row with left border and padded right border:
- *  │  [content]           │ */
+ *  │  [content]                │
+ *  1 + 2 + visLen(content) + pad + 1 = cols()  → pad = cols()-4-visLen(content) */
 export function boxRow(content, borderFn) {
-  const w    = cols();
-  const pad  = Math.max(0, w - 4 - visLen(content));
-  return borderFn('│') + '  ' + content + ' '.repeat(pad) + ' ' + borderFn('│');
+  const w   = cols();
+  const pad = Math.max(1, w - 4 - visLen(content));
+  return borderFn('│') + '  ' + content + ' '.repeat(pad) + borderFn('│');
 }
 
 /** Left-border only line (for streaming):  │  [content] */