@stevezhou/sisu 0.1.7 → 0.1.9

package/dist/logo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sisuTreeLines = exports.sisuTreeArt = exports.sisuMarkLines = exports.sisuMarkArt = void 0;
+exports.SISU_STILL_PHASE = exports.sisuTreeLines = exports.sisuTreeArt = exports.sisuMarkLines = exports.sisuMarkArt = void 0;
 exports.sisuMobiusArt = sisuMobiusArt;
 exports.sisuWordmark = sisuWordmark;
 exports.displayWidth = displayWidth;
@@ -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}`;
@@ -80,7 +65,8 @@ function center(text, width) {
 function centerBlock(lines, width) {
     return lines.map((line) => center(line, width));
 }
-const STILL_PHASE = 0.85;
+exports.SISU_STILL_PHASE = 0.85;
+const STILL_PHASE = exports.SISU_STILL_PHASE;
 /**
  * Möbius splash. `phase` slides the half-twist around the single face.
  * Line count is stable for a given width so the intro can rewrite in place.

package/dist/pager/app.js

@@ -7,10 +7,10 @@ const store_1 = require("../store");
 const input_1 = require("./input");
 const model_1 = require("./model");
 const history_1 = require("./history");
+const logo_1 = require("../logo");
 const render_1 = require("./render");
 const ALT_ENTER = '\x1b[?1049h\x1b[?25l';
 const ALT_LEAVE = '\x1b[?1049l\x1b[?25h';
-const CLEAR_HOME = '\x1b[2J\x1b[H';
 function formatChromeStatus(email, quota, conversationId) {
     const who = (email || '').trim();
     if (!who) {
@@ -103,10 +103,21 @@ async function runPager(io, transport, options = {}) {
     let processing = false;
     const pending = [];
     let unsubscribe = () => undefined;
-    const paint = () => {
+    const paint = (phase = logo_1.SISU_STILL_PHASE) => {
         if (!running)
             return;
-        io.write(`${CLEAR_HOME}${(0, render_1.renderPager)(state, cols, rows, theme)}`);
+        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);
+        const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+        for (let i = 0; i < frames; i += 1) {
+            if (!running)
+                return;
+            const u = i / (frames - 1);
+            paint(logo_1.SISU_STILL_PHASE + u * Math.PI * 2);
+            await sleep(38);
+        }
     };
     let removeTerm = () => undefined;
     let settle;
@@ -123,6 +134,8 @@ async function runPager(io, transport, options = {}) {
     try {
         io.enterRaw();
         io.write(ALT_ENTER);
+        if (options.intro)
+            await playIntro();
         const onTerm = () => finish(0);
         process.on('SIGTERM', onTerm);
         removeTerm = () => {

package/dist/pager/render.js

@@ -106,13 +106,18 @@ function center(text, width, vis = (0, logo_1.displayWidth)(text)) {
     const padLeft = Math.max(0, Math.floor((width - vis) / 2));
     return `${' '.repeat(padLeft)}${text}`;
 }
-function welcomeLines(guest, width, height, _theme) {
+function welcomeLines(guest, width, bodyBudget, phase) {
     const copy = (0, logo_1.sisuWelcomeCopy)(guest, true).map((line) => center(line, width));
-    const ringW = height >= 16 && width >= 48 ? (0, mobius_1.mobiusFrameWidth)(Math.min(width, 72)) : Math.min(width, 44);
-    const ringH = Math.min((0, mobius_1.mobiusFrameHeight)(ringW), Math.max(8, height - 7));
-    const painted = (0, logo_1.sisuMobiusArt)(ringW, 0.85, true).split('\n').slice(0, ringH);
+    const ringRoom = Math.max(0, bodyBudget - copy.length - 1);
+    if (ringRoom < 4 || width < 28)
+        return copy;
+    const ringW = (0, mobius_1.mobiusFrameWidth)(width >= 48 ? Math.min(width, 72) : Math.min(width, 44));
+    const ringH = Math.min((0, mobius_1.mobiusFrameHeight)(ringW), ringRoom);
+    const painted = (0, logo_1.sisuMobiusArt)(ringW, phase, true).split('\n').slice(0, ringH);
     const pad = Math.max(0, Math.floor((width - ringW) / 2));
     const ring = painted.map((line) => `${' '.repeat(pad)}${line}`);
+    if (bodyBudget >= 16)
+        return [...ring, '', ...copy];
     return [...copy, '', ...ring];
 }
 function slashMenuLines(state, theme) {
@@ -130,7 +135,7 @@ function slashMenuLines(state, theme) {
  * Fixed-grid frame: always `rows` lines, each `cols` visible cells.
  * Colors are 24-bit SGR; measure width with stripAnsi / visibleWidth.
  */
-function renderPager(state, cols, rows, themeName = 'dark') {
+function renderPager(state, cols, rows, themeName = 'dark', view = {}) {
     const theme = (0, theme_1.getTheme)(themeName);
     const height = Math.max(0, rows);
     const width = Math.max(0, cols);
@@ -143,19 +148,25 @@ function renderPager(state, cols, rows, themeName = 'dark') {
     const slash = slashMenuLines(state, theme);
     const slashTake = Math.min(slash.length, bodyBudget);
     const guest = !(state.statusLine || '').trim() || (state.statusLine || '').includes('not signed in');
-    const welcome = isIdleWelcome(state) ? welcomeLines(guest, width, height, theme) : [];
+    const welcome = isIdleWelcome(state)
+        ? welcomeLines(guest, width, bodyBudget, view.phase ?? logo_1.SISU_STILL_PHASE)
+        : [];
     const welcomeTake = Math.min(welcome.length, Math.max(0, bodyBudget - slashTake));
     const scrollBudget = bodyBudget - slashTake - welcomeTake;
     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/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/dist/tui.js

@@ -195,17 +195,20 @@ async function runTui(io, deps = {}) {
     const columns = deps.columns ?? process.stdout.columns ?? 80;
     const animate = deps.animate ?? shouldAnimateSplash();
     try {
-        if (animate) {
-            await playTreeIntro(io, {
-                columns,
-                color: deps.color ?? true,
-                sleep: deps.sleep,
-            });
-        }
-        else {
-            io.write(`${(0, logo_1.sisuSplash)(columns, true)}\n`);
-        }
         const account = auth();
+        const usePager = Boolean(deps.pager || shouldUsePager(deps));
+        if (!usePager) {
+            if (animate) {
+                await playTreeIntro(io, {
+                    columns,
+                    color: deps.color ?? true,
+                    sleep: deps.sleep,
+                });
+            }
+            else {
+                io.write(`${(0, logo_1.sisuSplash)(columns, true)}\n`);
+            }
+        }
         const startWebLogin = async (notify) => {
             return webLogin({
                 onStart: (info) => {
@@ -214,13 +217,15 @@ async function runTui(io, deps = {}) {
                 },
             }, http);
         };
-        if (deps.pager || shouldUsePager(deps)) {
+        if (usePager) {
             io.close?.();
             const transport = (0, transport_1.createFastApiTransport)(http);
             return await (deps.pager ?? app_1.runPager)((0, stdio_1.stdioPagerIo)(), transport, {
                 columns,
                 email: account?.email,
                 login: startWebLogin,
+                intro: animate,
+                sleep: deps.sleep,
                 quota: async () => (0, commands_1.formatQuota)(await (0, commands_1.fetchBalance)(http)),
                 status: () => status(http),
                 ls: () => {

package/package.json

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