ispbills-icli 8.4.10 → 8.4.11

package/package.json

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

package/src/tui/app.js

@@ -131,41 +131,60 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
   });
 
   // ── Mouse event handling ────────────────────────────────────────────────────
-  // Tab bar occupies row 1 (1-indexed y). Each tab is: 2-char prefix + label
-  // + marginRight=2. paddingX=1 on the outer Box shifts all tabs one column
-  // right, so column 2 is where the first tab starts.
+  // Tab bar x-ranges (1-indexed). Layout: paddingX=1 on the TabBar outer Box
+  // so text starts at column 2. Each tab = 2-char prefix ('  ' or '❯ ') +
+  // label text, followed by marginRight=2 before the next tab.
   const tabClickRanges = useMemo(() => {
-    let x = 2; // paddingX=1 → first content starts at column 2 (1-indexed)
+    let x = 2; // paddingX=1 → first tab starts at column 2
     return TABS.map((label) => {
       const start = x;
-      const w = 2 + label.length; // '  ' or '❯ ' prefix + label chars
-      x += w + 2;                 // +2 for marginRight
+      const w = 2 + label.length; // prefix (2 chars) + label
+      x += w + 2;                 // advance past tab + marginRight=2
       return { start, end: start + w - 1 };
     });
   }, []);
 
   useEffect(() => {
-    const TAB_ROW = 1; // y=1 in SGR coords (first row)
-
     const onMouse = ({ btn, x, y, press }) => {
-      // ── Scroll wheel UP → scroll the terminal viewport to reveal history ──
+      // ── Scroll wheel UP → scroll viewport to reveal history ──────────────
       if (btn === 64) {
         try { process.stdout.write('\x1b[3S'); } catch {}
         return;
       }
-      // ── Scroll wheel DOWN → swallowed (no drifting below live area) ────────
+      // ── Scroll wheel DOWN → swallowed ─────────────────────────────────────
       if (btn === 65) return;
 
-      // ── Left click (btn=0, press) on tab bar row ──────────────────────────
-      if (btn === 0 && press && y === TAB_ROW) {
-        const idx = tabClickRanges.findIndex((r) => x >= r.start && x <= r.end);
-        if (idx >= 0) setActiveTab(idx);
+      // ── Left click → tab bar ─────────────────────────────────────────────
+      // Ink renders INLINE at the bottom of the terminal — NOT at y=1.
+      // SGR y coordinates are 1-indexed from the terminal top.
+      //
+      // Layout rows at idle (bottom-to-top):
+      //   rows    = footer hint
+      //   rows-1  = composer bottom border
+      //   rows-2  = composer input
+      //   rows-3  = composer top border
+      //   rows-4  = blank (marginTop=1 before composer)
+      //   rows-5  = tab separator
+      //   rows-6  = tab labels  ← TAB_ROW at idle
+      //   rows-7  = compact header
+      //
+      // When there is live content of height h between tab separator and
+      // composer, each row shifts up by h: TAB_ROW = rows - 6 - liveH.
+      if (btn === 0 && press) {
+        const liveH = live
+          ? 1 + Math.min((live.status?.length || 0) + (live.text ? 2 : 0) + (!live.text && !live.reply?.steps ? 1 : 0), 12)
+          : 0;
+        const tabRowY = rows - 6 - liveH;
+        if (Math.abs(y - tabRowY) <= 1) {          // ±1 row tolerance
+          const idx = tabClickRanges.findIndex((r) => x >= r.start && x <= r.end);
+          if (idx >= 0) setActiveTab(idx);
+        }
       }
     };
 
     mouseEvents.on('event', onMouse);
     return () => mouseEvents.off('event', onMouse);
-  }, [tabClickRanges]);
+  }, [tabClickRanges, rows, live]);
 
   const setAutopilotMode = useCallback((next) => {
     apRef.current = next;