ispbills-icli 8.4.11 → 8.4.13

package/src/tui/composer.js

@@ -20,7 +20,7 @@ const MENTIONS = [
   { tag: '@mac',      desc: 'A MAC address' },
 ];
 
-export function Composer({ onSubmit, busy, width = 80, prefill = null, onPrefillConsumed = null }) {
+export function Composer({ onSubmit, busy, width = 80 }) {
   const [value, setValue] = useState('');
   const [cursor, setCursor] = useState(0);
   const [history, setHistory] = useState([]);
@@ -40,18 +40,6 @@ export function Composer({ onSubmit, busy, width = 80, prefill = null, onPrefill
     lastMut.current = kind;
   };
 
-  // When app.js injects a /paste prefill, load it into the input box once.
-  useEffect(() => {
-    if (!prefill) return;
-    setValue(prefill);
-    setCursor(prefill.length);
-    undoRef.current = []; redoRef.current = []; lastMut.current = '';
-    onPrefillConsumed?.();
-  }, [prefill]); // eslint-disable-line react-hooks/exhaustive-deps
-
-  // Ctrl+S stash: save the current prompt to restore later (GitHub Copilot CLI parity).
-  const stashRef = useRef('');
-
   // Bracketed-paste assembly. A right-click / Cmd+V paste is wrapped by the
   // terminal in \x1b[200~ … \x1b[201~ and can arrive split across several
   // reads, so we buffer until the end marker before inserting.
@@ -155,18 +143,6 @@ export function Composer({ onSubmit, busy, width = 80, prefill = null, onPrefill
       return;
     }
 
-    // ── Ctrl+S: stash / pop prompt (GitHub Copilot CLI parity) ──
-    if (key.ctrl && input === 's') {
-      if (value) {
-        stashRef.current = value;
-        setValue(''); setCursor(0);
-      } else if (stashRef.current) {
-        const v = stashRef.current; stashRef.current = '';
-        setText(v, v.length);
-      }
-      return;
-    }
-
     // ── Menu / history navigation ──
     if (key.upArrow) {
       if (menuOpen) { setSel((i) => Math.max(0, i - 1)); return; }
@@ -239,15 +215,6 @@ export function Composer({ onSubmit, busy, width = 80, prefill = null, onPrefill
   const sugTok = menuOpen && matches[sel] ? (slashMode ? matches[sel].cmd : matches[sel].tag) : '';
   const ghost = sugTok && sugTok.startsWith(token) && cursor >= value.length ? sugTok.slice(token.length) : '';
 
-  // ── Shell mode: prefix '!' triggers yellow $ prompt + orange border ──
-  const shellMode = value.startsWith('!') && !menuOpen;
-  const borderColor = busy ? C.gray : shellMode ? C.orange : C.accent;
-  const promptGlyph = shellMode ? '$ ' : glyphs.prompt + ' ';
-  const promptColor = busy ? C.gray : shellMode ? C.orange : C.accent;
-
-  // Number of lines in the buffer (for the line-count badge).
-  const lineCount = value.split('\n').length;
-
   return html`
     <${Box} flexDirection="column" width=${width}>
       ${menuOpen
@@ -273,18 +240,16 @@ export function Composer({ onSubmit, busy, width = 80, prefill = null, onPrefill
           <//>`
         : null}
 
-      <${Box} width=${width} borderStyle=${borderStyle()} borderColor=${borderColor} paddingX=${1}>
-        <${Text} color=${promptColor}>${promptGlyph}<//>
+      <${Box} width=${width} borderStyle=${borderStyle()} borderColor=${busy ? C.gray : C.accent} paddingX=${1}>
+        <${Text} color=${busy ? C.gray : C.accent}>${glyphs.prompt} <//>
         ${empty
           ? html`<${Box} flexGrow=${1}>
               <${Text} color=${C.gray} inverse> <//>
-              <${Text} color=${C.gray}>${busy ? 'Working…' : 'How can I help with your network?  · /help · ! shell'}<//>
+              <${Text} color=${C.gray}>${busy ? 'Working…' : 'Ask about your network, or type / for commands'}<//>
             <//>`
           : html`<${Box} flexGrow=${1}>
               <${Text}>${before}<//><${Text} inverse>${at}<//><${Text}>${after}<//><${Text} color=${C.gray}>${ghost}<//>
             <//>`}
-        ${lineCount > 1
-          ? html`<${Text} dimColor> ${lineCount}L<//>` : null}
       <//>
     <//>`;
 }

package/src/tui/markdown.js

@@ -90,30 +90,14 @@ function renderTable(header, rows) {
 export function Markdown({ content = '' }) {
   const rows = [];
   let inCode = false;
-  let codeLines = [];
   const lines = String(content).replace(/\s+$/, '').split('\n');
 
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i].replace(/\t/g, '  ');
 
-    // Fenced code block — collect all lines then render as a left-bordered block.
-    if (line.trim().startsWith('```')) {
-      if (!inCode) {
-        inCode = true;
-        codeLines = [];
-      } else {
-        inCode = false;
-        const captured = codeLines;
-        rows.push(html`
-          <${Box} key=${k()} flexDirection="column" marginY=${1}
-            borderStyle=${asciiSafe() ? 'single' : 'single'} borderColor=${C.gray}
-            borderTop=${false} borderRight=${false} borderBottom=${false} paddingLeft=${1}>
-            ${captured.map((cl, ci) => html`<${Text} key=${k()} color=${C.green}>${cl}<//>` )}
-          <//>`);
-      }
-      continue;
-    }
-    if (inCode) { codeLines.push(line); continue; }
+    // Fenced code block.
+    if (line.trim().startsWith('```')) { inCode = !inCode; continue; }
+    if (inCode) { rows.push(html`<${Text} key=${k()} color=${C.green}>  ${line}<//>`); continue; }
 
     // GFM table: header row + separator + body rows.
     if (isTableRow(line) && i + 1 < lines.length && isTableSep(lines[i + 1])) {

package/src/tui/run.js

@@ -3,32 +3,19 @@
 // once at the top and scrolls away, and the terminal's native scrollback keeps
 // the full conversation history. Completed transcript items are flushed to the
 // scrollback by Ink's <Static>; only the live area + input re-render in place.
-//
-// Mouse support: SGR mouse tracking is enabled so that:
-//  • Left-clicks on the tab bar switch tabs.
-//  • Scroll-wheel UP scrolls the terminal's native scrollback (history).
-//  • Scroll-wheel DOWN is swallowed — no drifting below the live area.
 import { html } from './dom.js';
 import { render } from 'ink';
 import { App } from './app.js';
-import { patchStdinMouse, enableMouse, disableMouse } from './mouse.js';
 
 export async function runTui(cfg, opts = {}) {
-  const { display = {}, onExternal, initialQuestion, version = '', resumeSession = null } = opts;
+  const { display = {}, onExternal, initialQuestion } = opts;
   let externalAction;
 
-  // Patch stdin.read() to strip mouse sequences before Ink sees them,
-  // then enable SGR mouse tracking so the terminal sends us those events.
-  const unpatchMouse = patchStdinMouse(process.stdin);
-  enableMouse();
-
   const instance = render(
     html`<${App}
       cfg=${cfg}
       display=${display}
       initialQuestion=${initialQuestion}
-      version=${version}
-      resumeSession=${resumeSession}
       onExternal=${(a) => { externalAction = a; onExternal?.(a); }}
     />`,
     { exitOnCtrlC: false },
@@ -36,8 +23,5 @@ export async function runTui(cfg, opts = {}) {
 
   await instance.waitUntilExit();
 
-  disableMouse();
-  unpatchMouse();
-
   return externalAction;
 }

package/src/tui/theme.js

@@ -5,36 +5,18 @@ import { glyphs, asciiSafe } from '../ui.js';
 
 export { glyphs, asciiSafe };
 
-// Soft-blue brand accent (approx. xterm-256 colour 111) — matches Copilot CLI.
+// Soft-blue brand accent (approx. xterm-256 colour 111).
 export const ACCENT = '#87afff';
-
-// Semantic color palette. Where possible mirror Copilot CLI conventions:
-// - accent/cyan for interactive / in-flight elements
-// - green for success / completed
-// - red for errors / destructive
-// - yellow for warnings / caution / autopilot
-// - magenta for reasoning/thinking
-// - gray / dimColor for secondary / completed-dim text
 export const C = {
-  accent:  ACCENT,
-  gray:    'gray',
-  white:   'white',
-  cyan:    'cyan',
-  green:   'green',
-  yellow:  'yellow',
-  red:     'red',
+  accent: ACCENT,
+  gray: 'gray',
+  white: 'white',
+  cyan: 'cyan',
+  green: 'green',
+  yellow: 'yellow',
+  red: 'red',
   magenta: 'magenta',
-  blue:    'blue',
-  orange:  '#ffb86c',  // shell mode / caution
-  purple:  '#d097ff',  // sub-agent / agent role
-};
-
-// Copilot-style task status glyphs (Unicode only; fall back handled per use-site).
-// ● filled  = step completed   ◐ half = step in-progress   ○ empty = pending
-export const SG = {
-  filled:  '●',   // U+25CF  completed
-  half:    '◐',   // U+25D0  in-progress (used alongside spinner)
-  empty:   '○',   // U+25CB  pending
+  blue: 'blue',
 };
 
 // ink-spinner uses cli-spinners; 'line' is pure ASCII (|/-\), 'dots' is braille.
@@ -48,9 +30,9 @@ export function borderStyle() {
   return asciiSafe() ? 'single' : 'round';
 }
 
-// Middle-dot separator.  Copilot CLI uses a single space each side.
+// Middle-dot separator, ASCII-safe on classic Windows consoles.
 export function midDot() {
-  return asciiSafe() ? ' - ' : ' · ';
+  return asciiSafe() ? ' - ' : '  ·  ';
 }
 
 // Em-dash, ASCII-safe on classic Windows consoles.

package/src/resume.js

@@ -1,30 +0,0 @@
-/**
- * Temporary session persistence for the /update hot-reload flow.
- *
- * Before updating, icli serialises the live conversation to a JSON file in
- * /tmp so the new binary can resume right where the user left off.
- */
-import { writeFileSync, readFileSync, existsSync, unlinkSync } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
-
-const PREFIX = 'icli-resume-';
-
-/** Write a resume file and return its path. */
-export function saveResume(convo, plain, items = []) {
-  const path = join(tmpdir(), `${PREFIX}${Date.now()}.json`);
-  writeFileSync(path, JSON.stringify({ convo, plain, items, savedAt: new Date().toISOString() }), 'utf8');
-  return path;
-}
-
-/** Load and delete a resume file. Returns { convo, plain, items } or null. */
-export function loadResume(path) {
-  if (!path || !existsSync(path)) return null;
-  try {
-    const data = JSON.parse(readFileSync(path, 'utf8'));
-    try { unlinkSync(path); } catch { /* best-effort delete */ }
-    return { convo: data.convo || [], plain: data.plain || [], items: data.items || [] };
-  } catch {
-    return null;
-  }
-}

package/src/shell.js

@@ -1,18 +0,0 @@
-import { exec } from 'child_process';
-
-/**
- * Run a shell command and capture combined stdout/stderr.
- * Returns { ok, stdout, stderr, exitCode }.
- */
-export function runShell(cmd, timeout = 30_000) {
-  return new Promise((resolve) => {
-    exec(cmd, { timeout, maxBuffer: 512 * 1024, shell: true }, (err, stdout, stderr) => {
-      resolve({
-        ok: !err || err.code === 0,
-        stdout: (stdout || '').trim(),
-        stderr: (stderr || '').trim(),
-        exitCode: err?.code ?? 0,
-      });
-    });
-  });
-}

package/src/tui/mouse.js

@@ -1,68 +0,0 @@
-// Mouse event support for the iCli TUI.
-// Patches process.stdin.read() to intercept SGR mouse escape sequences before
-// Ink's input parser sees them, routing them to a shared EventEmitter instead.
-// This prevents mouse sequences from appearing as garbage in the composer.
-//
-// SGR mouse format: \x1b[<{btn};{x};{y}M  (button press)
-//                   \x1b[<{btn};{x};{y}m  (button release)
-//
-// Button codes of interest:
-//   0  = left click press/release
-//   64 = scroll wheel up
-//   65 = scroll wheel down
-import { EventEmitter } from 'events';
-
-const MOUSE_SGR = /\x1b\[<(\d+);(\d+);(\d+)([Mm])/g;
-
-// Shared event emitter — app.js subscribes to 'event'.
-export const mouseEvents = new EventEmitter();
-mouseEvents.setMaxListeners(20);
-
-/**
- * Patch stdin.read() to intercept and strip mouse sequences.
- * Returns an unpatch function to restore the original.
- */
-export function patchStdinMouse(stdin) {
-  if (!stdin || typeof stdin.read !== 'function') return () => {};
-  const origRead = stdin.read.bind(stdin);
-
-  stdin.read = function (size) {
-    const data = origRead(size);
-    if (!data) return data;
-    const str = data.toString('utf8');
-
-    // Emit each mouse event found in the chunk.
-    MOUSE_SGR.lastIndex = 0;
-    let m;
-    while ((m = MOUSE_SGR.exec(str)) !== null) {
-      mouseEvents.emit('event', {
-        btn: parseInt(m[1], 10),
-        x:   parseInt(m[2], 10),
-        y:   parseInt(m[3], 10),
-        press: m[4] === 'M',
-      });
-    }
-
-    // Strip ALL mouse sequences so Ink never sees them.
-    const filtered = str.replace(/\x1b\[<\d+;\d+;\d+[Mm]/g, '');
-    return filtered ? Buffer.from(filtered, 'utf8') : null;
-  };
-
-  return function unpatch() {
-    stdin.read = origRead;
-  };
-}
-
-/** Enable SGR mouse button + scroll-wheel tracking. */
-export function enableMouse() {
-  try {
-    process.stdout.write('\x1b[?1000h\x1b[?1006h');
-  } catch {}
-}
-
-/** Disable SGR mouse tracking (restore normal terminal mouse behaviour). */
-export function disableMouse() {
-  try {
-    process.stdout.write('\x1b[?1000l\x1b[?1006l');
-  } catch {}
-}

package/src/version-check.js

@@ -1,43 +0,0 @@
-/**
- * Background version check against npm registry.
- * Caches the result in the session so we only hit npm once per run.
- * Resolves to { latest, isNewer } or null on any error (network, etc.).
- */
-
-const PKG_NAME = 'ispbills-icli';
-const REGISTRY  = `https://registry.npmjs.org/${PKG_NAME}/latest`;
-
-/** Parse a semver string into [major, minor, patch] ints. */
-function parse(v) {
-  const parts = String(v || '').replace(/[^0-9.]/g, '').split('.').map(Number);
-  return [parts[0] || 0, parts[1] || 0, parts[2] || 0];
-}
-
-/** Returns true when `remote` is strictly newer than `current`. */
-function isNewer(current, remote) {
-  const [cMaj, cMin, cPat] = parse(current);
-  const [rMaj, rMin, rPat] = parse(remote);
-  if (rMaj !== cMaj) return rMaj > cMaj;
-  if (rMin !== cMin) return rMin > cMin;
-  return rPat > cPat;
-}
-
-/**
- * Check npm for a newer version of ispbills-icli.
- * Resolves to { latest: string, isNewer: boolean } or null.
- */
-export async function checkLatestVersion(currentVersion) {
-  try {
-    const ctrl = new AbortController();
-    const timer = setTimeout(() => ctrl.abort(), 5000);
-    const res = await fetch(REGISTRY, { signal: ctrl.signal });
-    clearTimeout(timer);
-    if (!res.ok) return null;
-    const data = await res.json();
-    const latest = data.version;
-    if (!latest) return null;
-    return { latest, isNewer: isNewer(currentVersion, latest) };
-  } catch {
-    return null;
-  }
-}