ispbills-icli 8.7.0 → 8.7.1

package/package.json

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

package/src/tui/app.js

@@ -434,7 +434,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
   const [diffState, setDiffState] = useState(null);
   const chipsRows = (!busy && chips.length && !choice && !search && !sessionPicker && !diffState) ? 1 : 0;
   const composerRows = 2;
-  const chromeRows = 2 + composerRows + 1 + chipsRows + 1;
+  const chromeRows = 2 + composerRows + 1 + chipsRows + 2; // +2 for two footer rows
   const viewportRows = Math.max(3, rows - chromeRows);
   const scrollPage = Math.max(4, viewportRows - 2);
 
@@ -2090,11 +2090,15 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
   const cwdMaxLen = Math.max(12, cols - footerRightEstLen - (branch ? branch.length + 6 : 0) - 4);
   const cwd = shortenPath(process.cwd(), cwdMaxLen);
   const footerLeft = [cwd, branch ? `${glyphs.gitBranch}${branch}` : null].filter(Boolean).join(midDot());
-  const footerRight = hint
+  const footerInfoRight = streamerMode ? '' : [modelLabel, tokenLabel].filter(Boolean).join(midDot());
+  // Status row: working indicator when busy, key hints when idle, hint message when set
+  const footerStatusLeft = busy
+    ? `${glyphs.spinner} Working\u2026`
+    : hint
     ? hint
-    : streamerMode
-    ? ''
-    : [modelLabel, tokenLabel].filter(Boolean).join(midDot());
+    : `? help ${midDot()} / commands ${midDot()} \u2191\u2193 history ${midDot()} Tab mode`;
+  const footerStatusColor = busy ? C.warning : hint ? C.warning : C.muted;
+  const footerStatusRight = busy ? `Ctrl+C to cancel` : '';
   const composerMode = shellMode ? 'shell' : mode;
 
   // ── Viewport slicing ───────────────────────────────────────────────────────
@@ -2210,9 +2214,16 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
 
         <${Box} paddingX=${1} width=${cols}>
           <${Box} flexGrow=${1}>
-            <${Text} color=${C.muted} wrap="truncate-end">${footerLeft}<//>
+            <${Text} color=${footerStatusColor} wrap="truncate-end">${footerStatusLeft}<//>
           <//>
-          <${Text} color=${hint ? C.warning : C.muted} wrap="truncate-end">${footerRight}<//>
+          <${Text} color=${footerStatusColor} dimColor wrap="truncate-end">${footerStatusRight}<//>
+        <//>
+
+        <${Box} paddingX=${1} width=${cols}>
+          <${Box} flexGrow=${1}>
+            <${Text} color=${C.muted} dimColor wrap="truncate-end">${footerLeft}<//>
+          <//>
+          <${Text} color=${C.muted} dimColor wrap="truncate-end">${footerInfoRight}<//>
         <//>
       <//>
     <//>`;

package/src/tui/mouse.js

@@ -1,5 +1,4 @@
 import { useEffect, useRef } from './dom.js';
-import { useStdin } from 'ink';
 
 function parseMouseData(chunk, emit) {
   let i = 0;
@@ -28,15 +27,16 @@ function parseMouseData(chunk, emit) {
   return '';
 }
 
+// Read directly from process.stdin (before Ink's filtered stream) so we see
+// the raw mouse escape sequences that the filter strips out in run.js.
 export function useMouse(handler, enabled = true) {
-  const { stdin } = useStdin();
   const handlerRef = useRef(handler);
   const bufferRef = useRef('');
 
   handlerRef.current = handler;
 
   useEffect(() => {
-    if (!enabled || !stdin) return;
+    if (!enabled) return;
 
     try { process.stdout.write('\x1b[?1000h\x1b[?1006h'); } catch {}
 
@@ -47,11 +47,11 @@ export function useMouse(handler, enabled = true) {
       });
     };
 
-    stdin.on('data', onData);
+    process.stdin.on('data', onData);
     return () => {
-      stdin.off('data', onData);
+      process.stdin.off('data', onData);
       bufferRef.current = '';
       try { process.stdout.write('\x1b[?1000l\x1b[?1006l'); } catch {}
     };
-  }, [enabled, stdin]);
+  }, [enabled]);
 }

package/src/tui/run.js

@@ -1,9 +1,58 @@
 // Ink render entrypoint. Runs the TUI in a full-screen ALT-SCREEN viewport.
 import { html } from './dom.js';
 import { render } from 'ink';
+import { Transform } from 'stream';
 import { App } from './app.js';
 import { saveConfig } from '../config.js';
 
+// ── Mouse sequence filter ────────────────────────────────────────────────────
+// Strips SGR (\x1b[<N;N;N[Mm]) and X10 (\x1b[M + 3 bytes) mouse escape
+// sequences from the stdin stream before Ink sees it. Without this, unrecognised
+// CSI sequences leak into the composer as raw characters when clicking/scrolling.
+// mouse.js reads from process.stdin directly (before this filter) to get events.
+class MouseFilterTransform extends Transform {
+  constructor() {
+    super();
+    this.isTTY = process.stdin.isTTY;
+    this.setRawMode = process.stdin.setRawMode
+      ? (mode) => process.stdin.setRawMode(mode)
+      : undefined;
+    this._buf = '';
+  }
+
+  _transform(chunk, _enc, cb) {
+    const text = Buffer.isBuffer(chunk) ? chunk.toString('latin1') : String(chunk);
+    this._buf += text;
+    let out = '';
+    let i = 0;
+    while (i < this._buf.length) {
+      // SGR mouse: \x1b[<N;N;N[Mm]
+      if (this._buf[i] === '\x1b' && this._buf[i + 1] === '[' && this._buf[i + 2] === '<') {
+        const rest = this._buf.slice(i);
+        const m = rest.match(/^\x1b\[<\d+;\d+;\d+[Mm]/);
+        if (m) { i += m[0].length; continue; }
+        if (rest.length < 32) break; // incomplete – wait for more bytes
+        out += this._buf[i++]; // give up, pass through
+        continue;
+      }
+      // X10 mouse: \x1b[M + 3 bytes
+      if (this._buf[i] === '\x1b' && this._buf[i + 1] === '[' && this._buf[i + 2] === 'M') {
+        if (i + 6 <= this._buf.length) { i += 6; continue; }
+        break; // incomplete
+      }
+      out += this._buf[i++];
+    }
+    this._buf = this._buf.slice(i);
+    if (out) this.push(out);
+    cb();
+  }
+
+  _flush(cb) {
+    if (this._buf) { this.push(this._buf); this._buf = ''; }
+    cb();
+  }
+}
+
 // ── Alt-screen management ────────────────────────────────────────────────────
 // Switch to the alternate terminal buffer so the TUI owns the full viewport and
 // nothing leaks into the user's native scrollback. Must run BEFORE Ink renders.
@@ -124,6 +173,11 @@ export async function runTui(cfg, opts = {}) {
     try { saveConfig(cfg); } catch {}
   }
 
+  // Pipe raw stdin through the mouse filter so Ink never sees mouse escape
+  // sequences. mouse.js reads from process.stdin directly to capture events.
+  const mouseFilter = new MouseFilterTransform();
+  process.stdin.pipe(mouseFilter);
+
   const instance = render(
     html`<${App}
       cfg=${cfg}
@@ -134,7 +188,7 @@ export async function runTui(cfg, opts = {}) {
       resumeMode=${resumeMode}
       onExternal=${(a) => { externalAction = a; onExternal?.(a); }}
     />`,
-    { exitOnCtrlC: false },
+    { exitOnCtrlC: false, stdin: mouseFilter },
   );
 
   try {