ispbills-icli 4.0.3 → 4.0.5

package/bin/icli.js

@@ -4,18 +4,18 @@ 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 { cols, inner, onResize, boxTop, boxBot, boxMid, boxRow, boxTopOpen, boxBotOpen } from '../src/layout.js';
+import { inner, onResize, boxTop, boxBot, boxMid, boxRow } from '../src/layout.js';
 import {
   streamChat, printBanner, printSlashMenu, printUserBox,
   SLASH_COMMANDS, slashCompleter,
 } from '../src/chat.js';
 
 const P = {
-  border:  chalk.hex('#3D444D'),
-  dim:     chalk.hex('#9198A1'),
-  muted:   chalk.hex('#6e7781'),
-  accent:  chalk.hex('#4493F8').bold,
-  accentD: chalk.hex('#4493F8'),
+  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,

package/package.json

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

package/src/chat.js

@@ -7,13 +7,13 @@ import { cols, inner, visLen, padRight, stripAnsi,
          boxTop, boxMid, boxBot, boxTopOpen, boxBotOpen,
          boxRow, boxLine } from './layout.js';
 
-// ── Copilot CLI palette ────────────────────────────────────────────────────────
+// ── Gemini-style palette ───────────────────────────────────────────────────────
 const P = {
-  border:    chalk.hex('#3D444D'),
-  dim:       chalk.hex('#9198A1'),
-  muted:     chalk.hex('#6e7781'),
-  accent:    chalk.hex('#4493F8'),
-  accentB:   chalk.hex('#4493F8').bold,
+  border:    chalk.hex('#303134'),
+  dim:       chalk.hex('#9AA0A6'),
+  muted:     chalk.hex('#80868B'),
+  accent:    chalk.hex('#8AB4F8'),
+  accentB:   chalk.hex('#8AB4F8').bold,
   white:     chalk.white,
   bold:      chalk.bold.white,
   ok:        chalk.green,
@@ -70,21 +70,12 @@ const shortModel = (m) =>
 // ── Banner ────────────────────────────────────────────────────────────────────
 export function printBanner(cfg, meta = {}) {
   const model = meta.model ? shortModel(meta.model) : (cfg?._model ?? null);
-  const w     = cols();
 
   process.stdout.write('\n');
-
-  // Top border
-  process.stdout.write(boxTop('', P.border) + '\n');
-
-  // Title row
-  const title = P.bold('iCopilot') + P.dim('  ·  IspBills AI Network Engineer');
-  process.stdout.write(boxRow(title, P.border) + '\n');
-
-  // Divider
+  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');
 
-  // Session info rows
   const row1parts = [];
   if (model)           row1parts.push(P.dim('model ') + P.white(model));
   if (cfg?.user?.name) row1parts.push(P.dim('user ')  + P.white(cfg.user.name));
@@ -98,10 +89,8 @@ export function printBanner(cfg, meta = {}) {
     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 = [
     P.accentB('/') + P.muted(' commands'),
     P.accentB('Tab') + P.muted(' autocomplete'),
@@ -109,8 +98,6 @@ export function printBanner(cfg, meta = {}) {
     P.accentB('Ctrl+C') + P.muted(' exit'),
   ].join(P.muted('    '));
   process.stdout.write(boxRow(hints, P.border) + '\n');
-
-  // Bottom border
   process.stdout.write(boxBot(P.border) + '\n\n');
 }
 
@@ -130,7 +117,7 @@ export const SLASH_COMMANDS = [
 
 export function printSlashMenu() {
   process.stdout.write('\n');
-  process.stdout.write(boxTop('Commands', P.border) + '\n');
+  process.stdout.write(boxTop('Slash 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);
@@ -150,21 +137,21 @@ export function slashCompleter(line) {
 // ── User message box ───────────────────────────────────────────────────────────
 export function printUserBox(question) {
   process.stdout.write('\n');
-  process.stdout.write(boxTop('You', P.accentB) + '\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  = '';
   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.border) + '\n');
       line = word;
     } else {
       line = line ? line + ' ' + word : word;
     }
   }
-  if (line) process.stdout.write(boxRow(P.white(line), P.accentB) + '\n');
-  process.stdout.write(boxBot(P.accentB) + '\n');
+  if (line) process.stdout.write(boxRow(P.white(line), P.border) + '\n');
+  process.stdout.write(boxBot(P.border) + '\n');
 }
 
 // ── streamChat ────────────────────────────────────────────────────────────────
@@ -203,19 +190,17 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
   let rawAnswer     = '';
   let finalResult   = null;
 
-  // Open the iCopilot response box
   function ensureBoxOpen() {
     if (boxOpen) return;
     boxOpen = true;
     process.stdout.write('\n' + boxTopOpen('iCopilot', P.border) + '\n');
   }
 
-  // Ora spinner — sits on a │  prefixed line
   const spinner = ora({
     text:       P.dim('Thinking…'),
     color:      'blue',
     spinner:    'dots',
-    prefixText: P.border('│') + '  ',
+    prefixText: P.border('│') + ' ',
   });
 
   const stopSpinner = () => { if (spinner.isSpinning) spinner.stop(); };
@@ -224,8 +209,7 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
     if (reasoningOpen) return;
     stopSpinner();
     reasoningOpen = true;
-    process.stdout.write(boxLine('', P.border) + '\n');
-    process.stdout.write(boxLine(P.dim('╌ Reasoning ') + P.border('╌'.repeat(Math.max(0, inner() - 14))), P.border) + '\n');
+    process.stdout.write(boxLine(P.dim('reasoning'), P.border) + '\n');
     process.stdout.write(boxLine(P.border('│ '), P.border));
   }
 
@@ -240,7 +224,7 @@ export async function streamChat(cfg, messages, context = {}, opts = {}) {
 
   function closeReasoning() {
     if (!reasoningOpen) return;
-    process.stdout.write('\n' + boxLine('', P.border) + '\n');
+    process.stdout.write('\n');
     reasoningOpen = false;
   }
 

package/src/layout.js

@@ -1,16 +1,95 @@
+import { execSync } from 'node:child_process';
+
 // ── Terminal width ─────────────────────────────────────────────────────────────
+let cachedCols = 0;
+let lastProbeAt = 0;
+let fallbackCols = 0;
+
+function toPosInt(v) {
+  const n = Number.parseInt(String(v ?? ''), 10);
+  return Number.isFinite(n) && n > 0 ? n : 0;
+}
+
+function streamCols(stream) {
+  const direct = toPosInt(stream?.columns);
+  if (direct) return direct;
+
+  if (typeof stream?.getWindowSize === 'function') {
+    try {
+      const win = stream.getWindowSize();
+      const fromWin = Array.isArray(win) ? toPosInt(win[0]) : toPosInt(win?.columns);
+      if (fromWin) return fromWin;
+    } catch {}
+  }
+
+  return 0;
+}
+
+function probeFallbackCols() {
+  if (fallbackCols > 0) return fallbackCols;
+
+  const candidates = [];
+
+  try {
+    candidates.push(toPosInt(execSync('tput cols', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim()));
+  } catch {}
+
+  try {
+    const stty = execSync('stty size 2>/dev/null', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+    const parts = stty.split(/\s+/);
+    candidates.push(toPosInt(parts[1]));
+  } catch {}
+
+  try {
+    const mode = execSync('mode con', { stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+    const m = mode.match(/Columns:\s*(\d+)/i);
+    candidates.push(toPosInt(m?.[1]));
+  } catch {}
+
+  fallbackCols = Math.max(0, ...candidates.filter(Boolean));
+  return fallbackCols;
+}
+
 export function termCols() {
-  if (process.stdout.isTTY  && process.stdout.columns  > 0) return process.stdout.columns;
-  if (process.stderr.isTTY  && process.stderr.columns  > 0) return process.stderr.columns;
-  const env = parseInt(process.env.COLUMNS || process.env.TERM_WIDTH || '0');
-  if (env > 0) return env;
-  return 80;
+  const now = Date.now();
+  if (cachedCols > 0 && now - lastProbeAt < 250) return cachedCols;
+
+  const envCols = toPosInt(process.env.COLUMNS || process.env.TERM_WIDTH);
+  if (envCols) {
+    cachedCols = envCols;
+    lastProbeAt = now;
+    return envCols;
+  }
+
+  const stdoutCols = streamCols(process.stdout);
+  if (stdoutCols) {
+    cachedCols = stdoutCols;
+    lastProbeAt = now;
+    return stdoutCols;
+  }
+
+  const stderrCols = streamCols(process.stderr);
+  if (stderrCols) {
+    cachedCols = stderrCols;
+    lastProbeAt = now;
+    return stderrCols;
+  }
+
+  const probed = probeFallbackCols();
+  cachedCols = probed || 120;
+  lastProbeAt = now;
+  return cachedCols;
 }
 export const cols    = () => Math.max(40, termCols());
 export const inner   = () => cols() - 4;           // usable width inside │  …  │
 export const onResize = (cb) => {
-  process.stdout.on('resize', cb);
-  process.stderr.on('resize', cb);
+  const wrapped = () => {
+    cachedCols = 0;
+    fallbackCols = 0;
+    cb();
+  };
+  process.stdout.on('resize', wrapped);
+  process.stderr.on('resize', wrapped);
 };
 
 // ── ANSI-aware string helpers ─────────────────────────────────────────────────