ispbills-icli 8.7.7 → 8.7.9

package/package.json

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

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());
@@ -437,7 +439,7 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
   const [deviceError, setDeviceError] = useState(null);
   const chipsRows = (!busy && chips.length && !choice && !search && !sessionPicker && !diffState) ? 1 : 0;
   const composerRows = 2;
-  const chromeRows = 2 + composerRows + 1 + chipsRows + 2; // +2 for two footer rows
+  const chromeRows = 2 + composerRows + 1 + chipsRows + 1; // tabBar + composer + sep + chips + 1 footer row
   const viewportRows = Math.max(3, rows - chromeRows);
   const scrollPage = Math.max(4, viewportRows - 2);
 
@@ -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 iCopilot 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.');
       }
@@ -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 iCopilot 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) {
@@ -2124,23 +2133,23 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
   const tokenCount = approxTokens(convo.current);
   const tokenLabel = contextUsageLabel(tokenCount);
   const modelLabel = streamerMode ? '' : shortModel(model || modelRef.current || 'server default');
-  // §8: progressive path shortening — reserve space for right section
-  const footerRightEstLen = (modelLabel.length || 0) + (tokenLabel.length || 0) + 8;
+  // §8: single footer row (GH Copilot CLI style) — cwd·branch on left, mode·model·tokens on right
+  const modeLabel = mode === 'autopilot' ? 'AUTOPILOT' : mode === 'plan' ? 'PLAN' : null;
+  const footerRightEstLen = (modeLabel ? modeLabel.length + 3 : 0) + (modelLabel.length || 0) + (tokenLabel.length || 0) + 8;
   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 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
+  const footerLeft = busy
     ? `${glyphs.spinner} Working\u2026`
     : hint
     ? hint
-    : activeTab !== 'session'
-    ? `Enter → Session  ${midDot()}  r refresh  ${midDot()}  Tab next tab  ${midDot()}  1-9 insert command`
-    : `? help  ${midDot()}  / commands  ${midDot()}  @ mention  ${midDot()}  \u2191\u2193 history  ${midDot()}  Tab mode`;
-  const footerStatusColor = busy ? C.warning : hint ? C.accent : C.brand;
-  const footerStatusRight = busy ? `Ctrl+C cancel` : mode === 'autopilot' ? 'AUTOPILOT' : mode === 'plan' ? 'PLAN' : '';
-  const footerStatusRightColor = busy ? C.warning : mode === 'autopilot' ? C.warning : mode === 'plan' ? C.accent : C.muted;
+    : [cwd, branch ? `${glyphs.gitBranch}${branch}` : null].filter(Boolean).join(midDot());
+  const footerLeftColor = busy ? C.warning : hint ? C.accent : C.muted;
+  const footerRight = busy
+    ? `Ctrl+C cancel`
+    : streamerMode
+    ? ''
+    : [modeLabel, modelLabel, tokenLabel].filter(Boolean).join(midDot());
+  const footerRightColor = busy ? C.warning : mode === 'autopilot' ? C.warning : mode === 'plan' ? C.accent : C.muted;
   const composerMode = shellMode ? 'shell' : mode;
 
   // ── Viewport slicing ───────────────────────────────────────────────────────
@@ -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}
@@ -2166,9 +2175,8 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, sh
 
   const scrollPct = maxScrollRef.current > 0 ? Math.round((scrollOffset / maxScrollRef.current) * 100) : 100;
   const scrollIndicator = hasAbove
-    ? html`<${Box} paddingX=${1} justifyContent="space-between" width=${cols}>
-        <${Text} color=${C.muted} dimColor>${glyphs.up} ${aboveCount} above ${midDot()} PgUp/PgDn ${midDot()} scroll<//>
-        <${Text} color=${C.muted} dimColor>${scrollPct}%<//>
+    ? html`<${Box} paddingX=${1} justifyContent="flex-end" width=${cols}>
+        <${Text} color=${C.muted} dimColor>${glyphs.up} ${aboveCount} above ${midDot()} ${scrollPct}%<//>
       <//>`
     : null;
 
@@ -2185,7 +2193,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 iCopilot what stands out about ${diffState.commentInput.file}:${diffState.commentInput.lineNumber || '?'}`}
               note=${diffState.commentInput.content}
               sel=${0}
               allowText=${true}
@@ -2258,18 +2266,12 @@ 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}<//>
-          <//>
-          <${Text} color=${footerStatusRightColor} bold wrap="truncate-end">${footerStatusRight}<//>
-        <//>
-
-        <${Box} paddingX=${1} width=${cols}>
-          <${Box} flexGrow=${1}>
-            <${Text} color=${C.muted} dimColor wrap="truncate-end">${footerLeft}<//>
+            <${Text} color=${footerLeftColor} bold=${busy} dimColor=${!busy && !hint} wrap="truncate-end">${footerLeft}<//>
           <//>
-          <${Text} color=${C.muted} dimColor wrap="truncate-end">${footerInfoRight}<//>
+          <${Text} color=${footerRightColor} bold=${mode === 'autopilot' || mode === 'plan'} dimColor=${!busy && !modeLabel} wrap="truncate-end">${footerRight}<//>
         <//>
       <//>
     <//>`;

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}
               <//>
             <//>`;
@@ -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>iCopilot${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)'}<//>
       <//>
     <//>`;
 }
@@ -386,6 +393,7 @@ export function StatusLines({ lines = [], busy = false, navigable = false }) {
   if (!lines.length) return null;
   const lastIdx = lines.length - 1;
 
+
   return html`
     <${Box} flexDirection="column" marginTop=${1}>
       ${lines.map((line, i) => {
@@ -654,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);
@@ -676,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 iCopilot 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.