@stevezhou/sisu 0.1.8 → 0.1.10

package/dist/logo.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "sisuTreeArt", { enumerable: true, get: function
 Object.defineProperty(exports, "sisuTreeLines", { enumerable: true, get: function () { return tree_1.sisuTreeLines; } });
 const mark_2 = require("./mark");
 const mobius_1 = require("./mobius");
+const theme_1 = require("./pager/theme");
 const RESET = '\x1b[0m';
 const INK = '\x1b[38;2;220;214;204m';
 const INK_DIM = '\x1b[38;2;140;132;120m';
@@ -33,24 +34,8 @@ function sisuMobiusArt(columns = 80, phase = 0, color = false) {
 function sisuWordmark() {
     return ['思溯', 'SISU'].join('\n');
 }
-/** Terminal cells, not JS string length — CJK and ∞ must sit on the grid. */
 function displayWidth(text) {
-    let width = 0;
-    for (const ch of stripAnsi(text)) {
-        const code = ch.codePointAt(0) ?? 0;
-        width += isWide(code) ? 2 : 1;
-    }
-    return width;
-}
-function isWide(code) {
-    return ((code >= 0x1100 && code <= 0x115f) ||
-        (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) ||
-        (code >= 0xac00 && code <= 0xd7a3) ||
-        (code >= 0xf900 && code <= 0xfaff) ||
-        (code >= 0xfe10 && code <= 0xfe19) ||
-        (code >= 0xfe30 && code <= 0xfe6f) ||
-        (code >= 0xff00 && code <= 0xff60) ||
-        (code >= 0xffe0 && code <= 0xffe6));
+    return (0, theme_1.visibleWidth)(text);
 }
 function paint(text, prefix, color) {
     if (!color || !text)
@@ -67,7 +52,7 @@ function lockup(color) {
     const inf = infinityMark(color);
     const name = paint('思溯', INK, color);
     const latin = paint('SiSu', INK_DIM, color);
-    return [`${inf}  ${name}`, `   ${latin}`];
+    return [`${inf}  ${name}`, latin];
 }
 function padLeft(text, n) {
     return `${' '.repeat(Math.max(0, n))}${text}`;

package/dist/pager/app.js

@@ -11,18 +11,23 @@ const logo_1 = require("../logo");
 const render_1 = require("./render");
 const ALT_ENTER = '\x1b[?1049h\x1b[?25l';
 const ALT_LEAVE = '\x1b[?1049l\x1b[?25h';
-function formatChromeStatus(email, quota, conversationId) {
+function shortConversationId(id) {
+    const conv = (id || '').trim();
+    if (!conv || conv === 'new')
+        return '';
+    return conv.length > 12 ? conv.slice(0, 8) : conv;
+}
+function formatChromeStatus(email, quota, conversationId = '') {
     const who = (email || '').trim();
+    const conv = shortConversationId(conversationId);
     if (!who) {
-        const conv = (conversationId || '').trim();
-        return conv && conv !== 'new' ? `sisu · not signed in · ${conv}` : 'sisu · not signed in';
+        return conv ? `sisu · not signed in · ${conv}` : 'sisu · not signed in';
     }
     const parts = [who];
     const quotaText = (quota || '').trim();
     if (quotaText && quotaText !== 'quota unavailable')
         parts.push(quotaText);
-    const conv = (conversationId || '').trim();
-    if (conv && conv !== 'new')
+    if (conv)
         parts.push(conv);
     return parts.join(' · ');
 }
@@ -106,7 +111,7 @@ async function runPager(io, transport, options = {}) {
     const paint = (phase = logo_1.SISU_STILL_PHASE) => {
         if (!running)
             return;
-        io.write(`\x1b[H${(0, render_1.renderPager)(state, cols, rows, theme, { phase })}`);
+        io.write(`\x1b[H${(0, render_1.renderPager)(state, cols, rows, theme, { phase })}\x1b[J`);
     };
     const playIntro = async () => {
         const frames = Math.max(2, options.introFrames ?? 32);
@@ -211,24 +216,24 @@ async function runPager(io, transport, options = {}) {
                         paint();
                         return;
                     }
-                    state = pushEntry(state, 'status', 'Opening browser to sign in…');
+                    state = { ...state, statusLine: 'Opening browser to sign in…' };
                     paint();
                     try {
                         const email = await options.login((line) => {
                             if (!running)
                                 return;
-                            state = pushEntry(state, 'status', line);
+                            state = { ...state, statusLine: line };
                             paint();
                         });
                         if (!running)
                             return;
                         chromeEmail = email;
                         state = withChrome(state);
-                        state = pushEntry(state, 'status', `logged in as ${email}`);
                     }
                     catch (err) {
                         if (!running)
                             return;
+                        state = withChrome(state);
                         state = pushEntry(state, 'status', err instanceof Error ? err.message : String(err));
                     }
                     paint();

package/dist/pager/render.js

@@ -7,25 +7,13 @@ const mobius_1 = require("../mobius");
 const model_1 = require("./model");
 const theme_1 = require("./theme");
 Object.defineProperty(exports, "stripAnsi", { enumerable: true, get: function () { return theme_1.stripAnsi; } });
+const text_1 = require("./text");
 const PROMPT_PREFIX = '› ';
 const PROMPT_BOX_ROWS = 2;
 const STATUS_ROWS = 1;
 const MARK_WIDTH = 2;
 function wrapPlain(text, width) {
-    const max = Math.max(1, width);
-    if (!text)
-        return [''];
-    const out = [];
-    for (const paragraph of text.split('\n')) {
-        if (!paragraph) {
-            out.push('');
-            continue;
-        }
-        for (let i = 0; i < paragraph.length; i += max) {
-            out.push(paragraph.slice(i, i + max));
-        }
-    }
-    return out;
+    return (0, text_1.wrapCells)(text, width);
 }
 function lineCount(text) {
     if (!text)
@@ -43,22 +31,25 @@ function paintKind(kind, body, theme) {
         return theme.dim(body);
     return theme.text(body);
 }
-function entryPrefix(kind) {
-    if (kind === 'user')
-        return 'you  ';
-    if (kind === 'tool')
-        return 'tool ';
-    return '';
+function shownText(entry) {
+    if (entry.kind === 'assistant')
+        return (0, text_1.visibleAssistantText)(entry.text);
+    return entry.text;
 }
 function entryBodyLines(entry, wrapWidth) {
+    const text = shownText(entry);
     if (entry.folded) {
-        const n = lineCount(entry.text);
+        const n = lineCount(text);
         const unit = n === 1 ? 'line' : 'lines';
         return wrapPlain(`${entry.kind} · ${n} ${unit}`, wrapWidth);
     }
-    if (!entry.text)
+    if (entry.kind === 'user')
+        return ['You', ...wrapPlain(text || ' ', wrapWidth)];
+    if (entry.kind === 'tool')
+        return wrapPlain(text ? `tool  ${text}` : 'tool', wrapWidth);
+    if (!text)
         return [''];
-    return wrapPlain(`${entryPrefix(entry.kind)}${entry.text}`, wrapWidth);
+    return wrapPlain(text, wrapWidth);
 }
 function layoutScrollback(state, cols, theme) {
     const wrapWidth = Math.max(1, cols - MARK_WIDTH);
@@ -68,6 +59,10 @@ function layoutScrollback(state, cols, theme) {
         const entry = state.entries[i];
         const body = entryBodyLines(entry, wrapWidth);
         const selected = i === state.selected && state.entries.length > 0;
+        if (i > 0) {
+            lines.push('');
+            entryOf.push(i);
+        }
         for (let j = 0; j < body.length; j += 1) {
             const mark = selected && j === 0 ? theme.accent('▸ ') : '  ';
             lines.push(`${mark}${paintKind(entry.kind, body[j], theme)}`);
@@ -156,13 +151,17 @@ function renderPager(state, cols, rows, themeName = 'dark', view = {}) {
     const laid = layoutScrollback(state, width, theme);
     const lastEntry = Math.max(0, state.entries.length - 1);
     const visibleScroll = windowAroundSelected(laid.lines, laid.entryOf, state.selected, scrollBudget, lastEntry);
-    const body = [];
-    body.push(...welcome.slice(0, welcomeTake));
-    while (body.length + visibleScroll.length < welcomeTake + scrollBudget) {
-        body.push('');
-    }
-    body.push(...visibleScroll);
-    body.push(...slash.slice(0, slashTake));
+    const shownWelcome = welcome.slice(0, welcomeTake);
+    const extra = Math.max(0, welcomeTake + scrollBudget - shownWelcome.length - visibleScroll.length);
+    const padTop = isIdleWelcome(state) && visibleScroll.length === 0 ? Math.floor(extra / 2) : 0;
+    const padBot = extra - padTop;
+    const body = [
+        ...Array.from({ length: padTop }, () => ''),
+        ...shownWelcome,
+        ...Array.from({ length: padBot }, () => ''),
+        ...visibleScroll,
+        ...slash.slice(0, slashTake),
+    ];
     const lines = body.map((line) => (0, theme_1.padVisible)(line, width));
     if (statusRows > 0) {
         lines.push((0, theme_1.padVisible)(theme.dim(state.statusLine ?? ''), width));

package/dist/pager/text.js

@@ -0,0 +1,40 @@
+"use strict";
+/** Display-side text: hide model scratch and wrap by terminal cells. */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.visibleAssistantText = visibleAssistantText;
+exports.wrapCells = wrapCells;
+const theme_1 = require("./theme");
+const THINK_BLOCK = /<think\b[^>]*>[\s\S]*?<\/think>/gi;
+const THINK_OPEN = /<think\b[^>]*>[\s\S]*$/i;
+function visibleAssistantText(raw) {
+    let text = String(raw || '');
+    text = text.replace(THINK_BLOCK, '');
+    text = text.replace(THINK_OPEN, '');
+    return text.replace(/^\n+/, '').replace(/\n+$/, '');
+}
+function wrapCells(text, width) {
+    const max = Math.max(1, width);
+    if (!text)
+        return [''];
+    const out = [];
+    for (const paragraph of text.split('\n')) {
+        if (!paragraph) {
+            out.push('');
+            continue;
+        }
+        let line = '';
+        for (const ch of paragraph) {
+            if ((0, theme_1.visibleWidth)(line + ch) > max) {
+                if (line)
+                    out.push(line);
+                line = ch;
+            }
+            else {
+                line += ch;
+            }
+        }
+        if (line)
+            out.push(line);
+    }
+    return out.length ? out : [''];
+}

package/dist/pager/theme.js

@@ -42,8 +42,26 @@ function getTheme(name = 'dark') {
 function stripAnsi(s) {
     return s.replace(/\x1b\[[0-9;]*m/g, '');
 }
+function isWide(code) {
+    return ((code >= 0x1100 && code <= 0x115f) ||
+        (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) ||
+        (code >= 0xac00 && code <= 0xd7a3) ||
+        (code >= 0xf900 && code <= 0xfaff) ||
+        (code >= 0xfe10 && code <= 0xfe19) ||
+        (code >= 0xfe30 && code <= 0xfe6f) ||
+        (code >= 0xff00 && code <= 0xff60) ||
+        (code >= 0xffe0 && code <= 0xffe6));
+}
+function charWidth(ch) {
+    const code = ch.codePointAt(0) ?? 0;
+    return isWide(code) ? 2 : 1;
+}
+/** Terminal cells, not JS string length — CJK is two cells. */
 function visibleWidth(line) {
-    return stripAnsi(line).length;
+    let width = 0;
+    for (const ch of stripAnsi(line))
+        width += charWidth(ch);
+    return width;
 }
 function clipVisible(line, width) {
     if (width <= 0)
@@ -55,23 +73,29 @@ function clipVisible(line, width) {
     const re = /\x1b\[[0-9;]*m/g;
     let last = 0;
     let match = re.exec(line);
-    while (match) {
-        for (let i = last; i < match.index && seen < width; i += 1) {
-            out += line[i];
-            seen += 1;
+    const take = (from, to) => {
+        let i = from;
+        while (i < to && seen < width) {
+            const code = line.charCodeAt(i);
+            const wide = code >= 0xd800 && code <= 0xdbff;
+            const ch = wide ? line.slice(i, i + 2) : line[i];
+            const step = charWidth(ch);
+            if (seen + step > width)
+                break;
+            out += ch;
+            seen += step;
+            i += ch.length;
         }
+    };
+    while (match) {
+        take(last, match.index);
         if (seen >= width)
             break;
         out += match[0];
         last = match.index + match[0].length;
         match = re.exec(line);
     }
-    for (let i = last; i < line.length && seen < width; i += 1) {
-        if (line[i] === '\x1b')
-            break;
-        out += line[i];
-        seen += 1;
-    }
+    take(last, line.length);
     return out + RESET;
 }
 function padVisible(line, cols) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stevezhou/sisu",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "SiSu CLI — one login, cloud quota, local workspace",
   "license": "UNLICENSED",
   "homepage": "https://www.sisu.chat",