ispbills-icli 8.7.6 → 8.7.8

package/package.json

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

package/src/banner.js

@@ -13,7 +13,7 @@ const LOGO = [
 const LOGO_WIDTH = Math.max(...LOGO.map((l) => l.length));
 
 /**
- * Full iCopilot banner. On narrow terminals falls back to a compact header.
+ * Full iPolot banner. On narrow terminals falls back to a compact header.
  * A full-width rule frames the header so it uses the whole window.
  *
  * @param {object} cfg   Loaded config ({ url, user, _model }).
@@ -26,9 +26,9 @@ export function printBanner(cfg = {}, opts = {}) {
   console.log();
   if (width >= LOGO_WIDTH) {
     for (const line of LOGO) console.log(ACCENT + BOLD + line + RESET);
-    console.log(`             ${DIM}iCopilot — network engineer in your terminal${RESET}`);
+    console.log(`             ${DIM}iPolot — network engineer in your terminal${RESET}`);
   } else {
-    console.log(` ${BOLD}iCopilot${RESET} ${DIM}— IspBills AI terminal${RESET}`);
+    console.log(` ${BOLD}iPolot${RESET} ${DIM}— IspBills AI terminal${RESET}`);
   }
   console.log();
 

package/src/commands.js

@@ -88,7 +88,7 @@ export const SLASH_COMMANDS = [
   { cmd: '/list-dirs',        hint: '',              desc: 'Show all allowed directories',        group: 'Permissions', local: true },
   { cmd: '/sandbox',          hint: '[enable|disable]', desc: 'Enable/disable local sandboxing', group: 'Permissions', local: true },
   { cmd: '/experimental',     hint: '[on|off|show]', desc: 'Toggle experimental features',       group: 'Permissions', local: true },
-  { cmd: '/init',             hint: '',              desc: 'Initialize Copilot instructions for this repo', group: 'Permissions', local: true },
+  { cmd: '/init',             hint: '',              desc: 'Initialize .github/copilot-instructions.md for this repo', group: 'Permissions', local: true },
 
   // ── Agents & models ──
   { cmd: '/agent',         hint: '',          desc: 'Browse and select agents',               group: 'Agents', local: true },
@@ -121,9 +121,9 @@ export const SLASH_COMMANDS = [
   { cmd: '/bug',           hint: '',         desc: 'Report a bug (alias for /feedback)',      group: 'Help', local: true },
   { cmd: '/update',        hint: '',         desc: 'Update iCli to the latest version',       group: 'Help', local: true },
   { cmd: '/downgrade',     hint: 'VERSION',  desc: 'Roll back to a specific CLI version',     group: 'Help', local: true },
-  { cmd: '/app',           hint: '',         desc: 'Launch the GitHub Copilot desktop app',   group: 'Help', local: true },
+  { cmd: '/app',           hint: '',         desc: 'Show instructions to open the iPolot web app',     group: 'Help', local: true },
   { cmd: '/user',          hint: '',         desc: 'Manage GitHub user list',                 group: 'Help', local: true },
-  { cmd: '/login',         hint: '',         desc: 'Log in to Copilot',                       group: 'Help', local: true },
+  { cmd: '/login',         hint: '',         desc: 'Log in to iPolot',                        group: 'Help', local: true },
   { cmd: '/whoami',        hint: '',         desc: 'Show current user info',                  group: 'Help', local: true },
   { cmd: '/clikit',        hint: '[component]', desc: 'Preview CLI UI components',           group: 'Help', local: true },
   { cmd: '/extensions',    hint: '[manage|mode]', desc: 'Manage CLI extensions',             group: 'Help', local: true },

package/src/tui/app.js

@@ -69,6 +69,8 @@ function approxTokens(messages) {
 
 const TOKEN_LIMIT = 100000;
 const SESSION_SORTS = ['relevance', 'created', 'name', 'last used'];
+const TOOL_APPROVAL_ONCE = 'yes, proceed with this tool call';
+const TOOL_APPROVAL_SESSION = '__session_allow__';
 
 function sessionAutoName(messages = []) {
   const firstUser = messages.find((m) => m?.role === 'user' && String(m.content || '').trim());
@@ -899,9 +901,9 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
         const toolArgs = reply.toolCall?.args || reply.toolCall?.command || '';
         const toolDesc = toolArgs ? `${toolName}: ${toolArgs}` : (reply.note || toolName);
         choiceActionRef.current = (value) => {
-          if (value === '__session_allow__') {
+          if (value === TOOL_APPROVAL_SESSION) {
             cfg.allowedTools = [...(cfg.allowedTools || []), toolName];
-            runTurn('yes, proceed with this tool call');
+            runTurn(TOOL_APPROVAL_ONCE);
             return;
           }
           if (value != null) runTurn(String(value));
@@ -912,9 +914,9 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
           sel: 0, text: '', focusText: false, allowText: true,
           isToolApproval: true,
           options: [
-            { label: '1. Yes', value: 'yes, proceed with this tool call' },
-            { label: '2. Yes, and approve shell for the rest of the session', value: '__session_allow__' },
-            { label: '3. No, and tell Copilot what to do differently (Esc)', value: null },
+            { label: '1. Yes', value: TOOL_APPROVAL_ONCE },
+            { label: `2. Yes, and approve ${toolName} for the rest of the session`, value: TOOL_APPROVAL_SESSION },
+            { label: '3. No, and tell iPolot what to do differently (Esc)', value: null },
           ],
         });
       } else if (type === 'prompt' || type === 'choice') {
@@ -1449,7 +1451,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
     if (q === '/init') {
       const fp = resolve(process.cwd(), '.github/copilot-instructions.md');
       if (existsSync(fp)) {
-        pushNotice(`Copilot instructions already exist at ${shortenPath(fp)}. Edit it directly.`);
+        pushNotice(`.github/copilot-instructions.md already exists at ${shortenPath(fp)}. Edit it directly.`);
       } else {
         runTurn('Create a .github/copilot-instructions.md file for this repository with sensible defaults for an ISP NOC tool.');
       }
@@ -1683,7 +1685,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
       return;
     }
     if (q === '/app') {
-      pushNotice('iCopilot web app — open your IspBills instance in the browser with /o or by typing the URL.', C.muted);
+      pushNotice('iPolot web app — open your IspBills instance in the browser with /o or by typing the URL.', C.muted);
       return;
     }
     if (q === '/user' || q.startsWith('/user ')) {
@@ -1774,7 +1776,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
     if (value == null) {
       if (currentChoice?.isToolApproval || /⚙ Tool request|tool request|approval|shell:/i.test(`${currentChoice?.title || ''} ${currentChoice?.note || ''}`)) {
         setChoice({
-          title: 'Tell Copilot what to do differently:',
+          title: 'Tell iPolot what to do differently:',
           note: '',
           sel: 0,
           text: '',
@@ -1836,6 +1838,13 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
     if (!choice) return;
     if (sessionPicker || diffState) return;
     if (key.escape || (key.ctrl && input === 'c')) { setChoice(null); return; }
+    if (choice.isToolApproval && !choice.focusText) {
+      const yesValue = choice.options.find((o) => o?.value === TOOL_APPROVAL_ONCE)?.value;
+      const alwaysValue = choice.options.find((o) => o?.value === TOOL_APPROVAL_SESSION)?.value;
+      if (input === 'y') { pickChoice(yesValue); return; }
+      if (input === 'a') { pickChoice(alwaysValue); return; }
+      if (input === 'n') { pickChoice(null); return; }
+    }
     if (key.tab && choice.allowText) { setChoice((c) => ({ ...c, focusText: !c.focusText })); return; }
     if (key.upArrow) { setChoice((c) => ({ ...c, focusText: false, sel: Math.max(0, c.sel - 1) })); return; }
     if (key.downArrow) {
@@ -2156,7 +2165,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
 
   const liveArea = live
     ? html`<${Box} flexDirection="column">
-        <${StatusLines} lines=${live.status} busy=${busy} />
+        <${StatusLines} lines=${live.status} busy=${busy} cols=${cols} />
         ${live.reasoning ? html`<${Reasoning} text=${live.reasoning} show=${showReasoning} />` : null}
         ${live.text ? html`<${AssistantMessage} text=${live.text} cols=${cols} ts=${startedAt || Date.now()} streaming=${true} />` : null}
         ${live.reply?.steps ? html`<${Plan} reply=${live.reply} live=${true} />` : null}
@@ -2185,7 +2194,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
         />
         ${diffState.commentInput
           ? html`<${Choice}
-              title=${`Tell Copilot what stands out about ${diffState.commentInput.file}:${diffState.commentInput.lineNumber || '?'}`}
+              title=${`Tell iPolot what stands out about ${diffState.commentInput.file}:${diffState.commentInput.lineNumber || '?'}`}
               note=${diffState.commentInput.content}
               sel=${0}
               allowText=${true}
@@ -2258,6 +2267,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
               clearToken=${composerClearToken}
             />`}
 
+        <${Text} color=${C.separator}>${'─'.repeat(Math.max(1, cols))}<//>
         <${Box} paddingX=${1} width=${cols}>
           <${Box} flexGrow=${1}>
             <${Text} color=${footerStatusColor} bold=${busy} wrap="truncate-end">${footerStatusLeft}<//>

package/src/tui/components.js

@@ -124,7 +124,7 @@ export function TabBar({ active = 'session', cols = 80 }) {
           const label = ` ${i + 1} ${tab.label} `.padEnd(TAB_W);
           return html`
             <${Box} key=${tab.id} width=${TAB_W}>
-              <${Text} bold=${on} color=${on ? 'cyan' : 'white'} dimColor=${!on} inverse=${on}>
+              <${Text} bold=${on} color=${on ? C.brand : C.muted} dimColor=${!on} inverse=${on}>
                 ${label}
               <//>
             <//>`;
@@ -168,7 +168,7 @@ export function Banner({ cfg = {}, model, width = 80, compact = false, streamerM
   if (compact) {
     return html`
       <${Box} marginBottom=${1}>
-        <${Text} color=${C.accent} bold>${glyphs.ring} iCopilot <//>
+        <${Text} color=${C.accent} bold>${glyphs.ring} iPolot <//>
         <${Text} color=${C.muted}>${midDot()}<//>
         <${Text} color=${C.muted}>${m}<//>
         ${cfg.user?.name ? html`<${Text} color=${C.muted}>${midDot()}<//>` : null}
@@ -183,7 +183,7 @@ export function Banner({ cfg = {}, model, width = 80, compact = false, streamerM
       <//>
 
       <${Box} marginTop=${1} justifyContent="center">
-        <${Text} color=${C.accent} bold>${glyphs.ring} iCopilot<//>
+        <${Text} color=${C.accent} bold>${glyphs.ring} iPolot<//>
         <${Text} color=${C.muted}>  ${dash()}  IspBills network engineer in your terminal<//>
       <//>
 
@@ -229,8 +229,9 @@ export function UserMessage({ text, cols = 80, ts }) {
   const stamp = ts ? new Date(ts).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' }) : '';
   return html`
     <${Box} flexDirection="column" marginBottom=${1}>
+      <${Sep} cols=${cols} />
       <${Box} flexDirection="row" justifyContent="space-between" width=${cols} paddingX=${1}>
-        <${Text} bold color="cyan">You<//>
+        <${Text} bold color=${C.brand}>You<//>
         <${Text} color=${C.muted}>${stamp}<//>
       <//>
       <${Box} paddingX=${1} marginLeft=${2} flexWrap="wrap">
@@ -264,12 +265,14 @@ function StreamingText({ text = '' }) {
 
 export function AssistantMessage({ text, cols = 80, ts, label, streaming = false }) {
   const stamp = ts ? new Date(ts).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' }) : '';
-  const speakerLabel = streaming ? 'iCopilot ●' : 'iCopilot';
   const bodyWidth = Math.min(cols, 100);
   return html`
     <${Box} flexDirection="column" marginBottom=${1}>
+      <${Sep} cols=${cols} />
       <${Box} flexDirection="row" justifyContent="space-between" width=${cols} paddingX=${1}>
-        <${Text} bold color=${C.success}>${speakerLabel}<//>
+        <${Box}>
+          <${Text} color=${C.accent} bold>${glyphs.copilotDot} <//><${Text} bold>iPolot${streaming ? ' ●' : ''}<//>
+        <//>
         <${Text} color=${C.muted}>${stamp}<//>
       <//>
       <${Box} paddingX=${1} marginLeft=${2} flexDirection="column" width=${bodyWidth}>
@@ -279,18 +282,22 @@ export function AssistantMessage({ text, cols = 80, ts, label, streaming = false
 }
 
 export function ShellOutput({ command, output, cols = 80, ts, code = 0 }) {
+  const ok = code === 0;
+  const tone = ok ? C.success : C.error;
   return html`
     <${Box} flexDirection="column" marginTop=${1}>
+      <${Sep} cols=${cols} />
       <${SpeakerLine}
         label=${"$ Shell"}
-        color=${code === 0 ? C.warning : C.error}
+        color=${tone}
         cols=${cols}
         ts=${ts}
-        rightLabel=${code === 0 ? '' : `exit ${code}`}
+        rightLabel=${ok ? '' : `exit ${code}`}
       />
       <${Box} paddingX=${1} flexDirection="column">
         <${Text} color=${C.warning}>$ ${command}<//>
-        <${Text}>${output || '(no output)'}<//>
+        <${Text} color=${tone}>${ok ? glyphs.check : `${glyphs.cross} exit ${code}` }<//>
+        <${Text} color=${ok ? C.white : tone}>${output || '(no output)'}<//>
       <//>
     <//>`;
 }
@@ -299,8 +306,9 @@ const SUBAGENT = /^\s*[✓✗x]?\s*\[(\d+)\/(\d+)\]\s*(.+?)\s*[:：]\s*(.+?)\s*$
 const LEAD_EMOJI = /^\s*([\u{1F000}-\u{1FAFF}\u{2600}-\u{27BF}\u{2B00}-\u{2BFF}\u{2190}-\u{21FF}\u{FE0F}\u{2049}\u{203C}]+)\s*/u;
 
 /**
- * Classify a status line string into op type, type tag, and display parts.
- * Returns { opType: 'read'|'edit'|'step'|'other', typeTag, verb, action, subject, done, ok }
+ * Classify a status line into op type, a dim type-tag, and display parts.
+ * Tag is metadata only (file ext, device protocol, service) — never colored.
+ * Op type drives color: read=green, edit=red, step=blue.
  */
 function parseToolLine(lineStr) {
   const s = String(lineStr).trim();
@@ -313,177 +321,164 @@ function parseToolLine(lineStr) {
   const ci   = body.indexOf(':');
   const action  = (ci > -1 ? body.slice(0, ci) : body).trim();
   const subject = (ci > -1 ? body.slice(ci + 1) : '').trim();
-  const combined = action + ' ' + subject;
+  const aL = action.toLowerCase();
+  const sL = subject.toLowerCase();
 
-  // ── Op type ──────────────────────────────────────────────────────────────
+  // ── Op type + descriptive verb (from action keywords) ────────────────────
   let opType = 'other';
   let verb   = '';
-  if (/search|lookup|look.?up|reading|read|fetch|check|analys|correlat|simulat|predict|searching|looking|checking|analysing|correlating|predicting|simulating|retrieve/i.test(action)) {
-    opType = 'read';  verb = 'Read';
-  } else if (/edit|write|save|saving|generat|rollback|running on|exec|apply|creat|update/i.test(action)) {
-    opType = 'edit';  verb = 'Edit';
-  } else if (/assign|spawn|sub.?agent|delegat|step|next/i.test(action)) {
-    opType = 'step';  verb = 'Step';
-  }
-
-  // ── Type tag from subject/action ─────────────────────────────────────────
+  if      (/running on\b/i.test(aL))                                    { opType = 'edit'; verb = 'Exec'; }
+  else if (/\b(save|saving|generat|rollback|write|creat|update|apply)\b/i.test(aL)) { opType = 'edit'; verb = aL.includes('save') || aL.includes('saving') ? 'Save' : aL.includes('generat') ? 'Generate' : aL.includes('rollback') ? 'Rollback' : 'Edit'; }
+  else if (/\b(search|searching)\b/i.test(aL))                          { opType = 'read'; verb = 'Search'; }
+  else if (/\b(lookup|look.?up|looking)\b/i.test(aL))                   { opType = 'read'; verb = 'Lookup'; }
+  else if (/\b(check|checking|analys|correlat|simulat|predict|retrieve)\b/i.test(aL)) { opType = 'read'; verb = 'Check'; }
+  else if (/\b(fetch|reading|read)\b/i.test(aL))                        { opType = 'read'; verb = 'Read'; }
+  else if (/\b(assign|spawn|sub.?agent|delegat)\b/i.test(aL))           { opType = 'step'; verb = 'Spawn'; }
+
+  // ── Type tag — ONLY from explicit context; never inherit device from subject ──
+  // Tag identifies the protocol/format involved, not the device mentioned.
   let typeTag = '';
-  const hay = combined.toLowerCase();
-  if      (/\.(js|jsx|mjs|cjs)\b/.test(hay))                           typeTag = 'JS';
-  else if (/\.(ts|tsx)\b/.test(hay))                                    typeTag = 'TS';
-  else if (/\.php\b/.test(hay))                                         typeTag = 'PHP';
-  else if (/\.py\b/.test(hay))                                          typeTag = 'PY';
-  else if (/\.(rb)\b/.test(hay))                                        typeTag = 'RB';
-  else if (/\.(go)\b/.test(hay))                                        typeTag = 'GO';
-  else if (/\.(sh|bash)\b/.test(hay))                                   typeTag = 'SH';
-  else if (/nas#|mikrotik|routeros|\/export|\/ip |\/ppp|\/interface|\/system|\/queue/.test(hay)) typeTag = 'ROS';
-  else if (/olt#|optical|onu|gpon|epon/.test(hay))                      typeTag = 'OLT';
-  else if (/github/.test(hay))                                          typeTag = 'GIT';
-  else if (/http|url|web page|web search/.test(hay))                    typeTag = 'WEB';
-  else if (/customer|subscriber|user/.test(hay))                        typeTag = 'CRM';
-  else if (/firmware|version|upgrade/.test(hay))                        typeTag = 'FW';
-  else if (/sub.?agent|specialist|role/.test(hay))                      typeTag = 'AI';
-  else if (/shell|command|script/.test(hay))                            typeTag = 'SH';
-  else if (/checkpoint|backup|config/.test(hay))                        typeTag = 'CFG';
-  else if (/docs|documentation/.test(hay))                              typeTag = 'DOC';
-  else if (/signal|optical|dbm/.test(hay))                              typeTag = 'OPT';
-
-  return { opType, typeTag, verb, action, subject, done, ok, full: s };
+  // File extensions in subject or action (most specific)
+  const allText = aL + ' ' + sL;
+  if      (/\.(js|jsx|mjs|cjs)\b/.test(allText))   typeTag = 'JS';
+  else if (/\.(ts|tsx)\b/.test(allText))            typeTag = 'TS';
+  else if (/\.php\b/.test(allText))                 typeTag = 'PHP';
+  else if (/\.py\b/.test(allText))                  typeTag = 'PY';
+  else if (/\.(rb)\b/.test(allText))                typeTag = 'RB';
+  else if (/\.(go)\b/.test(allText))                typeTag = 'GO';
+  else if (/\.(sh|bash)\b/.test(allText))           typeTag = 'SH';
+  // Device protocol — ONLY when action is a device exec ("running on")
+  else if (/running on/i.test(aL)) {
+    if      (/nas#|mikrotik|\/export|\/ip |\/ppp|\/interface|\/system|\/queue|\/routing/.test(allText)) typeTag = 'ROS';
+    else if (/olt#|gpon|epon|optical/.test(allText)) typeTag = 'OLT';
+    else typeTag = 'DEV';
+  }
+  // Action-based tags
+  else if (/github/i.test(aL))                      typeTag = 'GIT';
+  else if (/web|url|page|http/i.test(aL))           typeTag = 'WEB';
+  else if (/customer|subscriber/i.test(aL))         typeTag = 'CRM';
+  else if (/firmware|version/i.test(aL))            typeTag = 'FW';
+  else if (/sub.?agent|specialist|assign/i.test(aL)) typeTag = 'AI';
+  else if (/shell|command/i.test(aL))               typeTag = 'SH';
+  else if (/checkpoint|backup/i.test(aL))           typeTag = 'CFG';
+  else if (/config/i.test(aL))                      typeTag = 'CFG';
+  else if (/docs|documentation/i.test(aL))          typeTag = 'DOC';
+  else if (/signal|optical|dbm/i.test(aL))          typeTag = 'OPT';
+  else if (/device|router|nas|olt/i.test(aL))       typeTag = 'DEV';
+
+  // Display text: verb + detail
+  // When action has no colon split, subject is empty — show trimmed action as detail
+  const display = subject || action;
+
+  return { opType, typeTag, verb, action, subject, display, done, ok, full: s };
 }
 
 export function StatusLines({ lines = [], busy = false, navigable = false }) {
   const [sel, setSel] = useState(-1);
   const [expanded, setExpanded] = useState(new Set());
 
-  // Reset selection when lines change
-  useEffect(() => {
-    setSel(-1);
-    setExpanded(new Set());
-  }, [lines.length]);
+  useEffect(() => { setSel(-1); setExpanded(new Set()); }, [lines.length]);
 
   useInput((input, key) => {
     if (!navigable) return;
-    if (key.upArrow || input === 'k') {
-      setSel((i) => Math.max(0, (i < 0 ? lines.length - 1 : i) - 1));
-      return;
-    }
-    if (key.downArrow || input === 'j') {
-      setSel((i) => Math.min(lines.length - 1, (i < 0 ? -1 : i) + 1));
-      return;
-    }
+    if (key.upArrow   || input === 'k') { setSel((i) => Math.max(0, (i < 0 ? lines.length - 1 : i) - 1)); return; }
+    if (key.downArrow || input === 'j') { setSel((i) => Math.min(lines.length - 1, (i < 0 ? -1 : i) + 1)); return; }
     if ((key.return || input === ' ') && sel >= 0) {
-      setExpanded((prev) => {
-        const next = new Set(prev);
-        next.has(sel) ? next.delete(sel) : next.add(sel);
-        return next;
-      });
+      setExpanded((prev) => { const n = new Set(prev); n.has(sel) ? n.delete(sel) : n.add(sel); return n; });
       return;
     }
-    // Esc clears selection
     if (key.escape) { setSel(-1); return; }
   });
 
   if (!lines.length) return null;
   const lastIdx = lines.length - 1;
 
+
   return html`
     <${Box} flexDirection="column" marginTop=${1}>
       ${lines.map((line, i) => {
-        const lineStr = String(line);
+        const lineStr  = String(line);
         const isRunning = busy && i === lastIdx;
-        const isSel = navigable && sel === i;
-        const isExp = expanded.has(i);
+        const isSel    = navigable && sel === i;
+        const isExp    = expanded.has(i);
 
-        // ── Sub-agent tree line ────────────────────────────────────────────
+        // ── Sub-agent tree line ─────────────────────────────────────────
         const sm = lineStr.match(SUBAGENT);
         if (sm) {
           const [, idx, total, host, result] = sm;
           const isCompleted = /^\s*[✓✗x]/.test(lineStr);
-          const running = busy && !isCompleted;
+          const running     = busy && !isCompleted;
           const good = !/fail|error|down|offline|unreachable|timeout|deny/i.test(result);
           const branch = Number(idx) === Number(total) ? glyphs.branchEnd : glyphs.branchMid;
-          const hostTrunc = host.length > 22 ? host.slice(0, 20) + '…' : host;
-          const resultTrunc = result.length > 30 ? result.slice(0, 28) + '…' : result;
           return html`
-            <${Box} key=${'s' + i} flexDirection="column">
-              <${Box}>
-                <${Text} color=${C.muted}>  <//>
-                <${Text} color=${C.accent}>${branch} <//>
-                <${Text} color=${C.muted}>${idx}/${total} <//>
-                <${Text} color=${C.white} bold>${hostTrunc}<//>
-                <${Text} color=${C.muted}> ${dash()} <//>
-                ${running
-                  ? html`<${Text} color=${C.warning}><${Spinner} type=${spinnerType()} /><//>  <${Text} color=${C.muted}>running<//>`
-                  : html`<${Text} color=${good ? C.success : C.error} bold>${good ? glyphs.check : glyphs.cross} ${resultTrunc}<//>`}
-              <//>
+            <${Box} key=${`sa${i}`}>
+              <${Text} color=${C.muted}>  <//>
+              <${Text} color=${C.accent}>${branch} <//>
+              <${Text} color=${C.muted}>${idx}/${total} <//>
+              <${Text} color=${C.white} bold>${host.slice(0, 20)}<//>
+              <${Text} color=${C.muted}> ${dash()} <//>
+              ${running
+                ? html`<${Text} color=${C.warning}><${Spinner} type=${spinnerType()} /><//>  <${Text} color=${C.muted}>running<//>`
+                : html`<${Text} color=${good ? C.success : C.error} bold>${good ? glyphs.check : glyphs.cross} ${result.slice(0, 32)}<///>`}
             <//>`;
         }
 
-        // ── Regular tool status line ───────────────────────────────────────
-        const { opType, typeTag, verb, action, subject, done, ok } = parseToolLine(lineStr);
+        // ── Regular tool status line ────────────────────────────────────
+        const { opType, typeTag, verb, display, done, ok, full } = parseToolLine(lineStr);
 
         const opColor = opType === 'read' ? C.success
-          : opType === 'edit' ? C.error
-          : opType === 'step' ? C.brand
+          : opType === 'edit'             ? C.error
+          : opType === 'step'             ? C.brand
           : C.muted;
 
-        // Dot glyph (colored bullet)
-        const dot = '●';
+        // Type tag: always dim/muted — it's just metadata, never colored
+        const tag = typeTag ? typeTag.slice(0, 3).padEnd(3) : '   ';
 
-        // Type tag display (fixed 3-char width)
-        const tag = (typeTag || '···').slice(0, 3).padEnd(3);
+        // Verb label: padded to 8 chars for alignment
+        const verbLabel = (verb || 'Run').slice(0, 8).padEnd(8);
 
-        // Subject truncation
-        const subjectTrunc = subject.length > 36 ? subject.slice(0, 34) + '…' : subject;
-        const actionTrunc  = action.length > 28  ? action.slice(0, 26) + '…'  : action;
+        // Detail text: as much as fits
+        const detail = display.length > 52 ? display.slice(0, 50) + '…' : display;
 
-        // Status indicator on the right
+        // Status icon
         const statusIcon = isRunning
           ? html`<${Text} color=${C.warning}><${Spinner} type=${spinnerType()} /><//>`
-          : done && ok  ? html`<${Text} color=${C.success}> ${glyphs.check}<//>` 
-          : done && !ok ? html`<${Text} color=${C.error}> ${glyphs.cross}<//>` 
+          : (done && ok)  ? html`<${Text} color=${C.success}> ${glyphs.check}<//>` 
+          : (done && !ok) ? html`<${Text} color=${C.error}> ${glyphs.cross}<//>` 
           : null;
 
-        // Expand toggle hint for navigable lines
-        const expHint = navigable && isSel
-          ? html`<${Text} color=${C.muted} dimColor>  [${isExp ? '−' : '+'}]<//>` : null;
-
         return html`
-          <${Box} key=${'s' + i} flexDirection="column">
-            <!-- Main line -->
-            <${Box} backgroundColor=${isSel ? '#1a1a2e' : undefined}>
+          <${Box} key=${`sl${i}`} flexDirection="column">
+            <${Box}>
               <${Text} color=${C.muted}>  <//>
-              <${Text} color=${opColor} dimColor>${tag}<//>
-              <${Text} color=${C.muted}> <//>
-              <${Text} color=${opColor}>${dot} <//>
-              <${Text} color=${opColor} bold=${opType === 'read'}>${verb || action.slice(0, 12)}<//>
-              ${subject
-                ? html`<${Text} color=${C.white} bold=${opType === 'read'}>  ${subjectTrunc.slice(0, 40)}<//>` 
-                : html`<${Text} color=${C.muted} bold=${opType === 'read'}>  ${actionTrunc}<//>` }
+              <!-- Type tag: dim neutral — NOT colored by op type -->
+              <${Text} color=${C.muted} dimColor>${tag}<//>
+              <${Text} color=${C.muted}>  <//>
+              <!-- Colored dot — the ONLY colored part -->
+              <${Text} color=${opColor}>● <//>
+              <!-- Verb: bold for reads, normal otherwise -->
+              <${Text} color=${C.white} bold=${opType === 'read'}>${verbLabel}<//>
+              <!-- Detail: plain white -->
+              <${Text} color=${C.white} dimColor> ${detail}<//> 
               ${statusIcon}
-              ${expHint}
+              ${isSel ? html`<${Text} color=${C.muted} dimColor>  [${isExp ? '−' : '+'}]<//>` : null}
             <//>
-
-            <!-- Expanded detail -->
             ${isExp ? html`
-              <${Box} flexDirection="column" marginLeft=${4}>
-                <${Text} color=${C.separator}>${'┌' + '─'.repeat(50)}<//>
-                <${Box}>
-                  <${Text} color=${C.separator}>│ <//>
-                  <${Text} color=${C.muted} italic>${lineStr.slice(0, 120)}<//>
+              <${Box} flexDirection="column" paddingLeft=${8}>
+                <${Text} color=${C.separator}>${'┌' + '─'.repeat(48)}<//>
+                <${Box}><${Text} color=${C.separator}>│ <//>
+                  <${Text} color=${C.muted}>${full.slice(0, 100)}<//>
                 <//>
-                ${subject.length > 40 ? html`
-                  <${Box}>
-                    <${Text} color=${C.separator}>│ <//>
-                    <${Text} color=${C.muted} italic>${subject.slice(40)}<//>
-                  <//>` : null}
-                <${Text} color=${C.separator}>${'└' + '─'.repeat(50)}<//>
+                ${full.length > 100 ? html`<${Box}><${Text} color=${C.separator}>│ <//>
+                  <${Text} color=${C.muted}>${full.slice(100, 200)}<//>
+                <//>` : null}
+                <${Text} color=${C.separator}>${'└' + '─'.repeat(48)}<//>
               <//>` : null}
           <//>`;
       })}
       ${navigable && lines.length > 1
         ? html`<${Box} paddingLeft=${2} marginTop=${0}>
-            <${Text} color=${C.muted} dimColor>j/k navigate  ${midDot()}  Enter expand  ${midDot()}  Esc dismiss<//>
+            <${Text} color=${C.muted} dimColor>j/k select  Enter expand  Esc dismiss<//>
           <//>` 
         : null}
     <//>`;
@@ -667,15 +662,17 @@ export function Thinking({ label = 'Working', startedAt }) {
 }
 
 export function Choice({ title, note, options = [], sel = 0, allowText = false, text = '', focusText = false, isToolApproval = false, cols = 80 }) {
-  // §13: tool approval uses exact spec format with Sep-style header
+  // §13: tool approval uses separator-line style matching TUI.md spec exactly
   if (isToolApproval) {
     return html`
       <${Box} flexDirection="column" marginTop=${1}>
-        <${Box} paddingX=${2} marginTop=${1}>
-          <${Text} color=${C.accent} bold>${glyphs.bolt} Tool request<//>
+        <${Sep} cols=${cols} />
+        <${Box} paddingX=${1} marginBottom=${1}>
+          <${Text} color=${C.accent} bold>${glyphs.settings} Tool request<//>
         <//>
-        ${note ? html`<${Box} paddingX=${2} marginTop=${1}><${Text} color=${C.muted}>${note}<//><//>` : null}
-        <${Box} flexDirection="column" marginTop=${1} paddingX=${2}>
+        <${Sep} cols=${cols} />
+        ${note ? html`<${Box} paddingX=${1} marginTop=${1} marginBottom=${1}><${Text} color=${C.white}>${note}<//><//>` : null}
+        <${Box} flexDirection="column" marginTop=${1} paddingX=${1}>
           ${options.map((o, i) => {
             const on = !focusText && i === sel;
             const label = o.label ?? o.value ?? String(o);
@@ -689,13 +686,13 @@ export function Choice({ title, note, options = [], sel = 0, allowText = false,
           ${allowText
             ? html`<${Box} key="freetext" marginTop=${1}>
                 <${Text} color=${focusText ? C.accent : C.muted}>${focusText ? glyphs.prompt + ' ' : '  '}<//>
-                <${Text} color=${C.muted}>Tell Copilot what to do differently: <//>
+                <${Text} color=${C.muted}>Tell iPolot what to do differently: <//>
                 <${Text} color=${C.white}>${text}<//>${focusText ? html`<${Text} inverse> <//>` : null}
               <//>` 
             : null}
         <//>
-        <${Box} marginTop=${1} paddingX=${2}>
-          <${Text} color=${C.muted}>${glyphs.up}${glyphs.down} choose ${midDot()}Enter confirm ${midDot()}Esc cancel<//>
+        <${Box} marginTop=${1} paddingX=${1}>
+          <${Text} color=${C.muted}>y / a / n  ${midDot()}  ${glyphs.up}${glyphs.down} move  ${midDot()}  Enter confirm  ${midDot()}  Esc cancel<//>
         <//>
       <//>`;
   }

package/src/tui/composer.js

@@ -512,7 +512,7 @@ export function Composer({
           <//>`
         : null}
 
-      <${Text} color=${C.muted}>${'═'.repeat(Math.max(1, width))}<//>
+      <${Text} color=${C.accent}>${'_'.repeat(Math.max(1, width))}<//>
 
       <${Box} width=${width} paddingX=${1} justifyContent="space-between">
         <${Box} flexGrow=${1}>

package/src/tui/run.js

@@ -93,7 +93,7 @@ function exitAltScreen() {
   altScreenActive = false;
 }
 
-// iCopilot wordmark in block letters
+// iPolot wordmark in block letters
 const LOGO = [
   ' ██╗ ██████╗ ██████╗ ██████╗ ██╗██╗      ██████╗ ████████╗',
   ' ██║██╔════╝██╔═══██╗██╔══██╗██║██║     ██╔═══██╗╚══██╔══╝',
@@ -145,8 +145,8 @@ async function animateSplash(cfg = {}) {
   const R    = '\x1b[0m';
 
   const hr = `${SEP}${'─'.repeat(cols)}${R}`;
-  const subtitle = `${ACC}◈ iCopilot${R}  ${DIM}IspBills network engineer in your terminal${R}`;
-  const subtitleLen = 10 + 2 + 46; // approx visual length
+  const subtitle = `${ACC}◈ iPolot${R}  ${DIM}IspBills network engineer in your terminal${R}`;
+  const subtitleLen = subtitle.replace(/\x1b\[[0-9;]*m/g, '').length;
   const subPad = ' '.repeat(Math.max(0, Math.floor((cols - subtitleLen) / 2)));
 
   process.stdout.write(`\n${hr}\n`);

package/src/tui/theme.js

@@ -46,6 +46,7 @@ const ASCII_EXTRA = {
   chip:       '|',    // chip separator
   expand:     '+',    // expand indicator
   collapse:   '-',    // collapse indicator
+  settings:   '#',   // tool-approval header (ASCII safe)
 };
 const UNICODE_EXTRA = {
   copilotDot: '◈',      // spec §6: ◈ Copilot speaker label (◈ in accent/purple)
@@ -56,6 +57,7 @@ const UNICODE_EXTRA = {
   chip:       '·',
   expand:     '▸',
   collapse:   '▾',
+  settings:   '⚙',    // spec §13: tool request header glyph
 };
 
 // Merged glyph proxy: own extras first, then ui.js base glyphs.