ispbills-icli 8.4.12 → 8.4.13

package/bin/icli.js

@@ -315,33 +315,13 @@ async function main() {
   // plain readline REPL when stdout/stdin is not a TTY (pipes, dumb terminals).
   if (output.isTTY && input.isTTY) {
     const { runTui } = await import('../src/tui/run.js');
-    const { loadResume } = await import('../src/resume.js');
-
-    // Hot-reload resume: if started with --resume <file>, restore the saved session.
-    const resumeFile = flag('--resume');
-    const resumeSession = loadResume(resumeFile);
-
-    const action = await runTui(cfg, { display, version: pkgVersion(), resumeSession });
-
-    const actionName = typeof action === 'string' ? action : action?.action;
-    if (actionName === 'logout') {
+    const action = await runTui(cfg, { display });
+    if (action === 'logout') {
       const cleared = clearConfig();
       console.log(`\n  ${cleared ? GREEN + glyphs.check + RESET + ' Logged out — credentials cleared.' : YELLOW + 'Already logged out.' + RESET}`);
       console.log(`  ${DIM}Run ${RESET}${ACCENT}icli login${RESET}${DIM} to sign in again.${RESET}\n`);
-    } else if (actionName === 'update') {
-      const ok = selfUpdate();
-      if (ok && action?.resumeFile) {
-        // Re-exec with the new binary, passing --resume so the session is restored.
-        const { execFileSync } = await import('child_process');
-        const newBin = process.argv[1]; // same script path — npm replaced the file in-place
-        const baseArgs = process.argv.slice(2).filter((a) => a !== '--resume' && a !== action.resumeFile);
-        process.stdout.write(`\n  ${ACCENT}Reloading iCli with your session restored…${RESET}\n\n`);
-        try {
-          execFileSync(process.execPath, [newBin, ...baseArgs, '--resume', action.resumeFile], {
-            stdio: 'inherit',
-          });
-        } catch { /* user Ctrl+C'd the resumed session — that's fine */ }
-      }
+    } else if (action === 'update') {
+      selfUpdate();
     }
     return;
   }

package/package.json

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

package/src/banner.js

@@ -22,7 +22,6 @@ const LOGO_WIDTH = Math.max(...LOGO.map((l) => l.length));
 export function printBanner(cfg = {}, opts = {}) {
   const width = cols();
   const model = opts.model || cfg._model || 'IspBills AI';
-  const version = opts.version || '';
 
   console.log();
   if (width >= LOGO_WIDTH) {
@@ -37,11 +36,10 @@ export function printBanner(cfg = {}, opts = {}) {
   parts.push(`${DIM}model${RESET} ${CYAN}${shortModel(model)}${RESET}`);
   if (cfg.user?.name) parts.push(`${DIM}user${RESET} ${WHITE}${cfg.user.name}${RESET}`);
   if (cfg.user?.role) parts.push(`${DIM}role${RESET} ${WHITE}${cfg.user.role}${RESET}`);
-  if (version) parts.push(`${DIM}v${RESET} ${WHITE}${version}${RESET}`);
   console.log('  ' + parts.join(`  ${GRAY}·${RESET}  `));
   if (cfg.url) console.log(`  ${DIM}url${RESET}   ${ACCENT}${cfg.url}${RESET}`);
   console.log();
-  console.log(`  ${DIM}Type a message to start.  ${RESET}${ACCENT}/help${RESET}${DIM} for commands  ·  ${RESET}${ACCENT}!cmd${RESET}${DIM} to run shell  ·  ${RESET}${ACCENT}Ctrl+C${RESET}${DIM} to exit${RESET}`);
+  console.log(`  ${DIM}Type a message to start.  ${RESET}${ACCENT}/help${RESET}${DIM} for commands  ·  ${RESET}${ACCENT}Ctrl+C${RESET}${DIM} to exit${RESET}`);
   console.log();
   hr();
   console.log();

package/src/client.js

@@ -1,5 +1,4 @@
 import { refreshToken } from './auth.js';
-import { logStream } from './logger.js';
 
 /**
  * Incrementally extract the answer text from the raw JSON the backend streams
@@ -161,10 +160,5 @@ export async function streamChat(cfg, messages, options = {}) {
   // committed answer below what the operator already saw stream by.
   const finalText = reply.text || '';
   const text = finalText.length >= answerText.length ? finalText : answerText;
-
-  // Log prompt + reply to ~/.config/ispbills-icli/logs/<user>/stream.log
-  const prompt = [...messages].reverse().find((m) => m.role === 'user')?.content ?? '';
-  logStream(cfg, prompt, text);
-
   return { reply, text, meta };
 }

package/src/clipboard.js

@@ -1,7 +1,7 @@
 // Cross-platform "copy to system clipboard" helper. Best-effort: resolves to
 // false (rather than throwing) when no clipboard tool is available so the TUI
 // can show a friendly notice.
-import { spawn, execFile } from 'child_process';
+import { spawn } from 'child_process';
 
 function candidates() {
   if (process.platform === 'darwin') return [['pbcopy', []]];
@@ -40,37 +40,3 @@ export async function copyToClipboard(text) {
   }
   return null;
 }
-
-// ── Read from clipboard ─────────────────────────────────────────────────────
-
-function readCandidates() {
-  if (process.platform === 'darwin') return [['pbpaste', []]];
-  if (process.platform === 'win32')  return [['powershell', ['-noprofile', '-command', 'Get-Clipboard']]];
-  return [
-    ['wl-paste', ['--no-newline']],
-    ['xclip', ['-selection', 'clipboard', '-o']],
-    ['xsel', ['--clipboard', '--output']],
-  ];
-}
-
-/**
- * Read text from the system clipboard.
- * Returns the clipboard string on success, or null when no tool is available
- * or the clipboard is empty.
- */
-export function readFromClipboard() {
-  return new Promise((resolve) => {
-    const cands = readCandidates();
-    let i = 0;
-    function tryNext() {
-      if (i >= cands.length) { resolve(null); return; }
-      const [cmd, args] = cands[i++];
-      execFile(cmd, args, { timeout: 3000, maxBuffer: 1024 * 512 }, (err, stdout) => {
-        if (err) { tryNext(); return; }
-        const text = stdout.trimEnd();
-        resolve(text || null);
-      });
-    }
-    tryNext();
-  });
-}

package/src/commands.js

@@ -52,12 +52,9 @@ export const SLASH_COMMANDS = [
   { cmd: '/copy',       hint: '',            desc: 'Copy the last AI answer to the clipboard', group: 'Memory', local: true },
 
   // ── Session & app ──
-  { cmd: '/usage',      hint: '',            desc: 'Show conversation stats (turns, ~tokens, model)', group: 'Session', local: true },
   { cmd: '/autopilot',  hint: '',            desc: 'Toggle autopilot (auto-apply fixes)',     group: 'Session', local: true },
   { cmd: '/model',      hint: '[name]',      desc: 'Show or set the AI model',                group: 'Session', local: true },
   { cmd: '/reasoning',  hint: '',            desc: 'Toggle reasoning display (Ctrl+T)',       group: 'Session', local: true },
-  { cmd: '/paste',      hint: '',            desc: 'Paste multiline text from clipboard into input', group: 'Session', local: true },
-  { cmd: '/about',      hint: '',            desc: 'About iCopilot — version, server, user',  group: 'Session', local: true },
   { cmd: '/new',        hint: '',            desc: 'Start a fresh conversation',              group: 'Session', local: true },
   { cmd: '/history',    hint: '',            desc: 'Show conversation history',               group: 'Session', local: true },
   { cmd: '/clear',      hint: '',            desc: 'Clear the screen',                        group: 'Session', local: true },

package/src/tui/app.js

@@ -8,8 +8,7 @@ import { Box, Text, Static, useStdout, useApp, useInput } from 'ink';
 import { C, glyphs, midDot, dash } from './theme.js';
 import {
   Banner, UserMessage, AssistantMessage, StatusLines, Reasoning,
-  Plan, Connect, Notice, Thinking, Choice, ShellInput, ShellOut,
-  TabBar, MonitoringView, IssuesView, GistsView,
+  Plan, Connect, Notice, Thinking, Choice,
 } from './components.js';
 import { Composer } from './composer.js';
 import { streamChat } from '../client.js';
@@ -17,19 +16,9 @@ import { slashToQuestion, SLASH_COMMANDS } from '../commands.js';
 import { saveConfig } from '../config.js';
 import { shortModel } from '../ui.js';
 import { loadNotes, addNote, forgetNote, memoryPreamble } from '../memory.js';
-import { copyToClipboard, readFromClipboard } from '../clipboard.js';
+import { copyToClipboard } from '../clipboard.js';
 import { createGist } from '../gist.js';
 import { git as gitCmd, commitBackup } from '../gitrepo.js';
-import { runShell } from '../shell.js';
-import { checkLatestVersion } from '../version-check.js';
-import { saveResume } from '../resume.js';
-import { basename } from 'path';
-
-// CWD basename — computed once at startup (before any cd).
-const APP_CWD = basename(process.cwd());
-
-// Tab identifiers (order = display order).
-export const TABS = ['Session', 'Monitoring', 'Issues', 'Gists'];
 
 // Split a command argument string into argv, honouring "quoted" segments.
 function splitArgs(s) {
@@ -58,7 +47,7 @@ function useTerminalSize() {
 let itemId = 0;
 const nextId = () => ++itemId;
 
-export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, version = '', resumeSession = null }) {
+export function App({ cfg, display = {}, onExternal, onExit, initialQuestion }) {
   const { exit } = useApp();
   const { cols, rows } = useTerminalSize();
 
@@ -72,9 +61,6 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
   const [startedAt, setStartedAt] = useState(0);
   const [choice, setChoice] = useState(null); // { title, note, options, allowText, sel, text, focusText, onPick }
   const [clearEpoch, setClearEpoch] = useState(0); // bump to remount <Static> on /clear /new
-  const [prefillText, setPrefillText] = useState(null); // clipboard paste → pre-fills Composer
-  const [activeTab, setActiveTab] = useState(0);        // 0=Session 1=Monitoring 2=Issues 3=Gists
-  const [latestVersion, setLatestVersion] = useState(null); // { latest, isNewer } from npm
 
   const convo = useRef([]);      // [{role, content}] for the backend
   const plain = useRef([]);      // plain-text transcript for exit reprint
@@ -84,7 +70,6 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
   const modelRef = useRef(cfg._model); // preferred model to request
   const lastAnswerRef = useRef('');    // most recent assistant answer (for /copy, /gist)
   const choiceActionRef = useRef(null); // action to run when a non-AI Choice is picked
-  const issuesRef = useRef([]);        // AI-flagged issues accumulated across session
 
   // Enable terminal bracketed-paste so multi-line pastes (mouse right-click or
   // Cmd/Ctrl+V) arrive wrapped in markers as one block — the Composer inserts
@@ -94,35 +79,6 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
     return () => { try { process.stdout.write('\x1b[?2004l'); } catch {} };
   }, []);
 
-  // Background version check — runs once after mount, non-blocking.
-  useEffect(() => {
-    if (!version || version === 'unknown') return;
-    checkLatestVersion(version).then((result) => {
-      if (result?.isNewer) setLatestVersion(result);
-    });
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
-  // Restore session after a hot-reload /update.
-  useEffect(() => {
-    if (!resumeSession) return;
-    convo.current = resumeSession.convo || [];
-    plain.current = resumeSession.plain || [];
-    // Re-hydrate items list from plain text so the user sees their history.
-    if (resumeSession.items?.length) {
-      setItems(resumeSession.items.map((it) => ({ id: nextId(), ...it })));
-    }
-    push({ type: 'notice', text: `${glyphs.check} Session restored after update — conversation history preserved.`, color: C.green });
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
-  // Tab switching: Ctrl+1/2/3/4.
-  useInput((input, key) => {
-    if (!key.ctrl) return;
-    if (input === '1') { setActiveTab(0); return; }
-    if (input === '2') { setActiveTab(1); return; }
-    if (input === '3') { setActiveTab(2); return; }
-    if (input === '4') { setActiveTab(3); return; }
-  });
-
   const setAutopilotMode = useCallback((next) => {
     apRef.current = next;
     setAutopilot(next);
@@ -285,22 +241,6 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
     if (!q) return;
     setHint('');
 
-    // ── ! shell command execution (GitHub Copilot CLI parity) ──────────────
-    if (q.startsWith('!')) {
-      const cmd = q.slice(1).trim();
-      if (!cmd) return;
-      push({ type: 'shell_in', cmd });
-      log(`$ ${cmd}`);
-      runShell(cmd).then((result) => {
-        const out = [result.stdout, result.stderr].filter(Boolean).join('\n').trim();
-        push({ type: 'shell_out', ok: result.ok, output: out || `(exit code ${result.exitCode})` });
-        if (out) log(out);
-      }).catch((e) => {
-        push({ type: 'notice', text: `${glyphs.cross} Shell error: ${e.message}`, color: C.red });
-      });
-      return;
-    }
-
     if (q === '/exit' || q === 'exit' || q === 'quit') { doExit(); return; }
     if (q === '/clear') { clearAll(); return; }
     if (q === '/new') {
@@ -350,31 +290,8 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
       push({ type: 'notice', text: us.length ? us.map((m, i) => `  ${i + 1}. ${m.content.slice(0, 80)}`).join('\n') : 'No history yet.' });
       return;
     }
-    if (q === '/usage') {
-      const total = convo.current.length;
-      const userTurns = convo.current.filter((m) => m.role === 'user').length;
-      const chars = convo.current.reduce((acc, m) => acc + m.content.length, 0);
-      const approxTokens = Math.round(chars / 4);
-      const lines = [
-        `Conversation stats:`,
-        `  turns       ${userTurns}`,
-        `  messages    ${total}`,
-        `  ~tokens     ${approxTokens.toLocaleString()} (estimated)`,
-        `  ~chars      ${chars.toLocaleString()}`,
-        `  model       ${model || cfg._model || 'server default'}`,
-        `  cwd         ${APP_CWD}`,
-      ];
-      push({ type: 'notice', text: lines.join('\n'), color: C.cyan });
-      return;
-    }
     if (q === '/logout') { onExternal?.('logout'); doExit(); return; }
-    if (q === '/update') {
-      // Save current conversation so the new binary can resume it.
-      const resumeFile = saveResume(convo.current, plain.current, items);
-      onExternal?.({ action: 'update', resumeFile });
-      doExit();
-      return;
-    }
+    if (q === '/update') { onExternal?.('update'); doExit(); return; }
 
     // ── Memory ──
     if (q === '/remember' || q.startsWith('/remember ')) {
@@ -402,39 +319,8 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
     }
 
     // ── Clipboard ──
-    // ── /about ─────────────────────────────────────────────────────────────
-    if (q === '/about') {
-      const lines = [
-        `iCopilot CLI  v${version || '?'}`,
-        `Server  ${cfg.url || '(unknown)'}`,
-        `User    ${cfg.user?.name || '—'}  (${cfg.user?.role || '—'})`,
-        `Model   ${shortModel(model || cfg._model || '—')}`,
-        '',
-        'Type /help for all commands · Ctrl+C to exit',
-        'npm: ispbills-icli · github: lupael/IspBills',
-      ];
-      push({ type: 'notice', text: lines.join('\n'), color: C.accent });
-      return;
-    }
-
-    // ── /paste ─────────────────────────────────────────────────────────────
-    if (q === '/paste') {
-      push({ type: 'notice', text: `${glyphs.arrow} Reading clipboard…`, color: C.gray });
-      readFromClipboard().then((text) => {
-        if (!text) {
-          push({ type: 'notice', text: `${glyphs.cross} Clipboard is empty or no clipboard tool found.\nInstall xclip / wl-clipboard (Linux), or use macOS/Windows.`, color: C.red });
-          return;
-        }
-        const lines = text.split('\n').length;
-        push({ type: 'notice',
-          text: `${glyphs.check} Pasted ${lines} line${lines !== 1 ? 's' : ''} (${text.length} chars) into the input box — review and press Enter to send.`,
-          color: C.green });
-        setPrefillText(text);
-      });
-      return;
-    }
-
-    if (q === '/copy') {      const ans = lastAnswerRef.current;
+    if (q === '/copy') {
+      const ans = lastAnswerRef.current;
       if (!ans) { push({ type: 'notice', text: 'Nothing to copy yet — ask something first.', color: C.gray }); return; }
       copyToClipboard(ans).then((tool) => push({ type: 'notice',
         text: tool ? `${glyphs.check} Copied last answer (${ans.length} chars) to the clipboard.`
@@ -568,21 +454,13 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
       case 'connect': return html`<${Connect} key=${it.id} reply=${it.reply} />`;
       case 'activity': return html`<${StatusLines} key=${it.id} lines=${it.status} busy=${false} />`;
       case 'notice': return html`<${Notice} key=${it.id} text=${it.text} color=${it.color} />`;
-      case 'shell_in': return html`<${ShellInput} key=${it.id} cmd=${it.cmd} />`;
-      case 'shell_out': return html`<${ShellOut} key=${it.id} ok=${it.ok} output=${it.output} />`;
       default: return null;
     }
   };
 
-  const ctx = [model ? shortModel(model) : null, APP_CWD, cfg.user?.name, cfg.user?.role].filter(Boolean).join(midDot());
-  // Footer: left = session context (dimmed), right = hint or key-hints.
-  // Autopilot mode turns the right side yellow.
-  const footerHint = hint
-    ? hint
-    : autopilot
-    ? `${glyphs.bolt} autopilot ON${midDot()}/help${midDot()}Shift+Tab off${midDot()}Ctrl+C exit`
-    : `/help${midDot()}Shift+Tab autopilot${midDot()}Ctrl+C exit`;
-  const footerColor = hint ? C.yellow : autopilot ? C.yellow : void 0;
+  const ctx = [model ? shortModel(model) : null, cfg.user?.name, cfg.user?.role].filter(Boolean).join(midDot());
+  const modeTag = autopilot ? `${glyphs.bolt} autopilot ${midDot()} ` : '';
+  const footerRight = hint || `${modeTag}/help ${midDot()} Shift+Tab autopilot ${midDot()} Ctrl+C exit`;
   const compact = cols < 60;
 
   // The banner is the first <Static> item so it prints once at the very top and
@@ -593,53 +471,31 @@ export function App({ cfg, display = {}, onExternal, onExit, initialQuestion, ve
 
   return html`
     <${Box} flexDirection="column" width=${cols}>
-      ${/* Tab bar — always pinned above content */null}
-      <${TabBar} tabs=${TABS} active=${activeTab} onSelect=${setActiveTab} width=${cols} />
+      <${Static} key=${clearEpoch} items=${staticItems}>
+        ${(it) => it.type === 'banner'
+          ? html`<${Box} key=${it.id} flexDirection="column" alignItems="center" marginBottom=${1}>
+              <${Banner} cfg=${cfg} model=${model} width=${cols} compact=${compact} />
+            <//>`
+          : renderItem(it)}
+      <//>
 
-      ${activeTab === 0
+      ${live
         ? html`<${Box} flexDirection="column">
-            <${Static} key=${clearEpoch} items=${staticItems}>
-              ${(it) => it.type === 'banner'
-                ? html`<${Box} key=${it.id} flexDirection="column" alignItems="center" marginBottom=${1}>
-                    <${Banner} cfg=${cfg} model=${model} width=${cols} compact=${compact} version=${version} cwd=${APP_CWD} />
-                  <//>`
-                : renderItem(it)}
-            <//>
-            ${live
-              ? html`<${Box} flexDirection="column">
-                  <${StatusLines} lines=${live.status} busy=${busy} />
-                  ${showReasoning && live.reasoning ? html`<${Reasoning} text=${live.reasoning} />` : null}
-                  ${live.reply?.steps ? html`<${Plan} reply=${live.reply} live=${true} />` : null}
-                  ${live.text
-                    ? html`<${Box} marginTop=${live.status.length ? 0 : 1}>
-                        <${AssistantMessage} text=${live.text} streaming=${true} />
-                      <//>`  : null}
-                  ${!live.text && !live.reply?.steps
-                    ? html`<${Thinking}
-                        label=${live.status.length ? 'Working' : 'Thinking'}
-                        startedAt=${startedAt} />`
-                    : null}
-                <//>`
-              : null}
+            <${StatusLines} lines=${live.status} busy=${busy} />
+            ${showReasoning && live.reasoning ? html`<${Reasoning} text=${live.reasoning} />` : null}
+            ${live.reply?.steps ? html`<${Plan} reply=${live.reply} live=${true} />` : null}
+            ${live.text ? html`<${Box} marginTop=${1}><${AssistantMessage} text=${live.text} /><//>` : null}
+            <${Thinking} label=${live.reply ? 'Planning' : live.text ? 'Responding' : 'Working'} startedAt=${startedAt} />
           <//>`
         : null}
-      ${activeTab === 1 ? html`<${MonitoringView} cfg=${cfg} />` : null}
-      ${activeTab === 2 ? html`<${IssuesView} issues=${issuesRef.current} />` : null}
-      ${activeTab === 3 ? html`<${GistsView} cfg=${cfg} />` : null}
 
       <${Box} flexDirection="column" marginTop=${1}>
-        ${activeTab === 0
-          ? (choice
-            ? html`<${Choice} ...${choice} />`
-            : html`<${Composer} onSubmit=${onSubmit} busy=${busy} width=${cols} prefill=${prefillText} onPrefillConsumed=${() => setPrefillText(null)} />`)
-          : html`<${Box} paddingX=${1}><${Text} dimColor>Ctrl+1 for Session  ·  Ctrl+2/3/4 for other tabs<//>  <//>` }
+        ${choice
+          ? html`<${Choice} ...${choice} />`
+          : html`<${Composer} onSubmit=${onSubmit} busy=${busy} width=${cols} />`}
         <${Box} paddingX=${1} width=${cols}>
-          <${Box} flexGrow=${1}>
-            <${Text} dimColor wrap="truncate-end">${ctx}<//>
-          <//>
-          ${latestVersion?.isNewer
-            ? html`<${Text} color=${C.yellow} wrap="truncate-end">🔔 v${latestVersion.latest} available — /update<//>` 
-            : html`<${Text} color=${footerColor} dimColor=${!footerColor} wrap="truncate-end">${footerHint}<//>` }
+          <${Box} flexGrow=${1}><${Text} color=${C.gray} wrap="truncate-end">${ctx}<//><//>
+          <${Text} color=${hint || autopilot ? C.yellow : C.gray} wrap="truncate-end">${footerRight}<//>
         <//>
       <//>
     <//>`;