@ai-zen/cli 1.0.0-alpha.20 → 1.0.0-alpha.22

package/dist/tui/status-segments.js

@@ -0,0 +1,166 @@
+/**
+ * 状态栏的折行 —— 输入是「按优先级排好的信息块」，输出是「确定的若干行」
+ *
+ * 为什么不用 Ink 自己的 wrap：状态栏高度必须是**确定值**，`computeChatLayout` 要靠它
+ * 算出对话区还能占几行（整帧高度恒等于终端行数，输入框才吸得住底）。让 Ink 在渲染时
+ * 折行，行数只有渲染完才知道，布局预算就会算错——轻则顶部留白多一行，重则把输入框
+ * 顶出屏幕。所以这里先在纯逻辑里折好，渲染层只负责按行铺颜色。
+ *
+ * 折行以「块」为单位（见 `packSegments`）：身份、用量、快捷键各是一块，窄屏时整块
+ * 顺延到下一行，而不是把一块劈成两半——也不再用 `justify-content: space-between` 把
+ * 两侧各切一半（左边「思考 高」被吃掉、右边提示只剩半截）。
+ */
+import { clusterWidth, graphemes } from "./text.js";
+function toChars(segments) {
+    const chars = [];
+    for (const segment of segments) {
+        // 按**字素簇**切，不按 code point：`✌️`（VS16）是两个 code point 但占 2 列，
+        // 逐 code point 累加会算成 1 列 → 状态栏行超宽 → Ink 二次折行 → 帧高多一行。
+        for (const ch of graphemes(segment.text)) {
+            chars.push({ ch, color: segment.color, bold: segment.bold, width: clusterWidth(ch) });
+        }
+    }
+    return chars;
+}
+/** 连续同色同粗细的字符合并回一个片段 */
+function toSegments(chars) {
+    const segments = [];
+    for (const char of chars) {
+        const last = segments[segments.length - 1];
+        if (last && last.color === char.color && last.bold === char.bold) {
+            last.text += char.ch;
+        }
+        else {
+            segments.push({ text: char.ch, color: char.color, bold: char.bold });
+        }
+    }
+    return segments;
+}
+/** 行尾空格没有意义（会视觉上「多出一截」），折行前后都裁掉 */
+function trimTail(line) {
+    while (line.length > 0 && line[line.length - 1].ch === " ")
+        line.pop();
+}
+/**
+ * 把片段流按显示宽度折成若干行。
+ *
+ * 断行策略与 `wrapText` 一致：优先在**空格**处断（英文单词不被劈开），没有空格可断
+ * 时按字符硬断（CJK 本来就能任意断行）。折行后的行首空格会被吃掉，避免出现
+ * 「第二行无故缩进两格」。
+ */
+export function wrapSegments(segments, width) {
+    const limit = Math.max(1, width);
+    const chars = toChars(segments);
+    const lines = [];
+    let line = [];
+    let lineWidth = 0;
+    for (let index = 0; index < chars.length; index += 1) {
+        const char = chars[index];
+        // 行已满且下一个正好是空格：直接断行并把这个空格丢掉，而不是往回找上一处空格
+        // （否则会把已经排好的「aaaa bbbb」硬拆成「aaaa」+「bbbb」，白白浪费半行）
+        if (char.ch === " " && lineWidth + char.width > limit && line.length > 0) {
+            trimTail(line);
+            lines.push(line);
+            line = [];
+            lineWidth = 0;
+            continue;
+        }
+        if (lineWidth + char.width > limit && line.length > 0) {
+            // 当前行最后一个空格的位置：能在此断就在此断，把尾巴挪到下一行
+            let spaceAt = -1;
+            for (let i = line.length - 1; i > 0; i -= 1) {
+                if (line[i].ch === " ") {
+                    spaceAt = i;
+                    break;
+                }
+            }
+            if (spaceAt > 0) {
+                const carry = line.slice(spaceAt + 1);
+                line = line.slice(0, spaceAt);
+                trimTail(line);
+                lines.push(line);
+                line = carry;
+                lineWidth = carry.reduce((sum, item) => sum + item.width, 0);
+            }
+            else {
+                trimTail(line);
+                lines.push(line);
+                line = [];
+                lineWidth = 0;
+            }
+        }
+        if (line.length === 0) {
+            if (char.ch === " ")
+                continue; // 行首不吃空格
+            // 行首的孤儿分隔符（`·`）是折行切出来的，留在开头只会变成「· ⚡ 47 tok/s」，
+            // 难看且无意义（换行本身已表达分隔），连同其后的空格一并丢掉。
+            if (char.ch === "·" && index > 0) {
+                while (index + 1 < chars.length && chars[index + 1].ch === " ")
+                    index += 1;
+                continue;
+            }
+        }
+        line.push(char);
+        lineWidth += char.width;
+    }
+    trimTail(line);
+    lines.push(line);
+    return lines.map(toSegments);
+}
+/** 片段流的总显示宽度（宽字符算 2 列） */
+export function segmentsWidth(segments) {
+    let width = 0;
+    for (const segment of segments) {
+        for (const ch of graphemes(segment.text))
+            width += clusterWidth(ch);
+    }
+    return width;
+}
+/**
+ * 以**块**为单位装行：能塞进当前行剩余宽度就并排（用 `separator` 连起来），
+ * 塞不下就整块挪到下一行；只有单块本身就比一整行还宽时，才退化成块内折行
+ * （`wrapSegments`），此时优先在空格 / CJK 边界断，尽量不劈开英文单词。
+ *
+ * 这样「换行时一块占一行」是默认行为：块是原子的排版单位，行的边界只会落在块边界上。
+ */
+export function packSegments(blocks, width, separator = [{ text: " · " }]) {
+    const limit = Math.max(1, width);
+    const separatorWidth = segmentsWidth(separator);
+    const lines = [];
+    let line = [];
+    let lineWidth = 0;
+    const flush = () => {
+        if (line.length === 0)
+            return;
+        lines.push(line);
+        line = [];
+        lineWidth = 0;
+    };
+    for (const block of blocks) {
+        const blockWidth = segmentsWidth(block);
+        if (blockWidth === 0)
+            continue; // 空块（如本轮没有速率）不占位，也不留分隔符
+        if (line.length > 0) {
+            if (lineWidth + separatorWidth + blockWidth <= limit) {
+                line = [...line, ...separator, ...block];
+                lineWidth += separatorWidth + blockWidth;
+                continue;
+            }
+            flush();
+        }
+        if (blockWidth <= limit) {
+            line = [...block];
+            lineWidth = blockWidth;
+            continue;
+        }
+        // 单块超一整行：块内折行兜底，尾巴留在 `line` 上等着接下一块
+        const chunks = wrapSegments(block, limit);
+        const tail = chunks.pop();
+        lines.push(...chunks);
+        line = tail;
+        lineWidth = segmentsWidth(tail);
+    }
+    flush();
+    return lines.length > 0 ? lines : [[]];
+}
+//# sourceMappingURL=status-segments.js.map

package/dist/tui/status-segments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status-segments.js","sourceRoot":"","sources":["../../src/tui/status-segments.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAgBpD,SAAS,OAAO,CAAC,QAAyB;IACxC,MAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,2DAA2D;QAC3D,sDAAsD;QACtD,KAAK,MAAM,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,wBAAwB;AACxB,SAAS,UAAU,CAAC,KAAmB;IACrC,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3C,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACjE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,mCAAmC;AACnC,SAAS,QAAQ,CAAC,IAAkB;IAClC,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,GAAG,EAAE,CAAC;AAC1E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,QAAyB,EAAE,KAAa;IACnE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,KAAK,GAAmB,EAAE,CAAC;IACjC,IAAI,IAAI,GAAiB,EAAE,CAAC;IAC5B,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAE,CAAC;QAC3B,wCAAwC;QACxC,gDAAgD;QAChD,IAAI,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,IAAI,GAAG,EAAE,CAAC;YACV,SAAS,GAAG,CAAC,CAAC;YACd,SAAS;QACX,CAAC;QACD,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtD,iCAAiC;YACjC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC;YACjB,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5C,IAAI,IAAI,CAAC,CAAC,CAAE,CAAC,EAAE,KAAK,GAAG,EAAE,CAAC;oBACxB,OAAO,GAAG,CAAC,CAAC;oBACZ,MAAM;gBACR,CAAC;YACH,CAAC;YACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;gBAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;gBACtC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC9B,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,IAAI,GAAG,KAAK,CAAC;gBACb,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,IAAI,GAAG,EAAE,CAAC;gBACV,SAAS,GAAG,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,IAAI,CAAC,EAAE,KAAK,GAAG;gBAAE,SAAS,CAAC,SAAS;YACxC,+CAA+C;YAC/C,iCAAiC;YACjC,IAAI,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACjC,OAAO,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,CAAE,CAAC,EAAE,KAAK,GAAG;oBAAE,KAAK,IAAI,CAAC,CAAC;gBAC5E,SAAS;YACX,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC;IAC1B,CAAC;IACD,QAAQ,CAAC,IAAI,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjB,OAAO,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAC/B,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,aAAa,CAAC,QAAyB;IACrD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,KAAK,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAC1B,MAAyB,EACzB,KAAa,EACb,YAA6B,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAE9C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACjC,MAAM,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,KAAK,GAAsB,EAAE,CAAC;IACpC,IAAI,IAAI,GAAoB,EAAE,CAAC;IAC/B,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC9B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,GAAG,EAAE,CAAC;QACV,SAAS,GAAG,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,UAAU,KAAK,CAAC;YAAE,SAAS,CAAC,wBAAwB;QACxD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,IAAI,SAAS,GAAG,cAAc,GAAG,UAAU,IAAI,KAAK,EAAE,CAAC;gBACrD,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC;gBACzC,SAAS,IAAI,cAAc,GAAG,UAAU,CAAC;gBACzC,SAAS;YACX,CAAC;YACD,KAAK,EAAE,CAAC;QACV,CAAC;QACD,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;YAClB,SAAS,GAAG,UAAU,CAAC;YACvB,SAAS;QACX,CAAC;QACD,oCAAoC;QACpC,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,EAAG,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACtB,IAAI,GAAG,IAAI,CAAC;QACZ,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IACD,KAAK,EAAE,CAAC;IAER,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACzC,CAAC"}

package/dist/tui/text.d.ts

@@ -4,11 +4,14 @@
  * 从 `screens.tsx` 中抽出，供对话屏、凭据设置屏、配置中心共用，
  * 避免 `screens.tsx ↔ config-wizard.tsx` 相互 import 形成循环依赖。
  */
-/** 终端显示宽度（宽字符计 2，组合字符计 0） */
+/** 终端显示宽度（按字素簇，与 Ink 的排版完全一致） */
 export declare function displayWidth(text: string): number;
+/** 单个字素簇的显示宽度（结果带缓存） */
+export declare function clusterWidth(cluster: string): number;
+export declare function graphemes(text: string): string[];
 /**
  * 按显示宽度把文本折成多行（保留显式换行）。
- * 拉丁文优先在空格处断行，CJK / 超长词按字符硬断；保证每行显示宽度 ≤ limit。
+ * 拉丁文优先在空格处断行，CJK / 超长词按**字素簇**硬断；保证每行显示宽度 ≤ limit。
  */
 export declare function wrapText(text: string, limit: number): string[];
 /** 带光标位置的输入区折行结果 */
@@ -17,12 +20,12 @@ export interface InputLayout {
     lines: string[];
     /** 光标所在行（0 起始） */
     cursorRow: number;
-    /** 光标在该行内的字符偏移（code point 计） */
+    /** 光标在该行内的字符偏移（**字素簇**计，不是 code point） */
     cursorCol: number;
 }
 /**
- * 把输入文本按显示宽度折行，并定位光标（`cursor` 为字符索引，以 code point 计）。
- * 折行采用逐字符硬断（不做空格优先），以保证光标映射精确、支持跨行编辑。
+ * 把输入文本按显示宽度折行，并定位光标（`cursor` 为**字素簇**索引）。
+ * 折行采用逐簇硬断（不做空格优先），以保证光标映射精确、支持跨行编辑。
  */
 export declare function layoutInput(text: string, cursor: number, width: number): InputLayout;
 /** 单行输入左侧留白：Box paddingX(1) + 提示符 `❯ `（宽 2） */

package/dist/tui/text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAyBH,6BAA6B;AAC7B,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQjD;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CA8B9D;AAID,oBAAoB;AACpB,MAAM,WAAW,WAAW;IAC1B,sBAAsB;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,kBAAkB;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAgDpF;AAED,+CAA+C;AAC/C,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAOzD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAY3D;AAID;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA0BH,iCAAiC;AACjC,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGjD;AAED,wBAAwB;AACxB,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQpD;AAuCD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAOhD;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CA8B9D;AAID,oBAAoB;AACpB,MAAM,WAAW,WAAW;IAC1B,sBAAsB;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,kBAAkB;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAgDpF;AAED,+CAA+C;AAC/C,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAOzD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAY3D;AAID;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMjD"}

package/dist/tui/text.js

@@ -4,38 +4,94 @@
  * 从 `screens.tsx` 中抽出，供对话屏、凭据设置屏、配置中心共用，
  * 避免 `screens.tsx ↔ config-wizard.tsx` 相互 import 形成循环依赖。
  */
+import stringWidth from "string-width";
 import { isMouseSequence } from "./mouse.js";
 // ==================== 显示宽度 ====================
-/** 是否宽字符（CJK / 全角 / 常见 Emoji），占 2 列 */
-function isWide(cp) {
-    return ((cp >= 0x1100 && cp <= 0x115f) ||
-        (cp >= 0x2e80 && cp <= 0x303e) ||
-        (cp >= 0x3041 && cp <= 0x33ff) ||
-        (cp >= 0x3400 && cp <= 0x4dbf) ||
-        (cp >= 0x4e00 && cp <= 0x9fff) ||
-        (cp >= 0xa000 && cp <= 0xa4cf) ||
-        (cp >= 0xac00 && cp <= 0xd7a3) ||
-        (cp >= 0xf900 && cp <= 0xfaff) ||
-        (cp >= 0xfe30 && cp <= 0xfe6f) ||
-        (cp >= 0xff00 && cp <= 0xff60) ||
-        (cp >= 0xffe0 && cp <= 0xffe6) ||
-        (cp >= 0x1f300 && cp <= 0x1faff) ||
-        (cp >= 0x20000 && cp <= 0x3fffd));
-}
-/** 终端显示宽度（宽字符计 2，组合字符计 0） */
+//
+// 宽度计算直接交给 `string-width` —— **Ink 排版时用的就是它**
+//（`ink/build/output.js` 第一行 `import stringWidth from 'string-width'`）。
+//
+// 曾经这里手写了一张 `isWide` 区间表，逐 code point 累加。结果是两把尺子：
+//   - `⚡` `✅` `✨` `⭐` 这类 East Asian Wide 符号我们算 1 列、Ink 算 2 列；
+//   - `👨‍👩‍👧` 逐 code point 累加得 8 列，实际只占 2 列；
+//   - `✌️`（VS16 序列）与 `🇨🇳`（国旗对）同样对不上。
+// 于是一切依赖宽度的东西（折行、状态栏装行、光标列号）都差一截，还靠
+// 「预留 1 列余量」硬顶。现在两边用同一把尺子，这类偏差从根上没了。
+//
+// 仍然需要 `graphemes()`：`string-width` 只管宽度，不管「光标该以什么为单位移动」。
+/**
+ * 单簇宽度缓存 —— `string-width` 内部要跑 emoji / EAW 正则，而折行是每帧热路径；
+ * 字素簇的种类远少于出现次数，缓存后几乎零成本。
+ */
+const clusterWidthCache = new Map();
+const CLUSTER_CACHE_LIMIT = 4096;
+/** 终端显示宽度（按字素簇，与 Ink 的排版完全一致） */
 export function displayWidth(text) {
-    let width = 0;
-    for (const ch of text) {
-        const cp = ch.codePointAt(0);
-        if (cp >= 0x0300 && cp <= 0x036f)
-            continue; // 组合附加符号
-        width += isWide(cp) ? 2 : 1;
-    }
+    if (text === "")
+        return 0;
+    return stringWidth(text);
+}
+/** 单个字素簇的显示宽度（结果带缓存） */
+export function clusterWidth(cluster) {
+    if (cluster === "")
+        return 0;
+    const cached = clusterWidthCache.get(cluster);
+    if (cached !== undefined)
+        return cached;
+    const width = stringWidth(cluster);
+    if (clusterWidthCache.size >= CLUSTER_CACHE_LIMIT)
+        clusterWidthCache.clear();
+    clusterWidthCache.set(cluster, width);
     return width;
 }
+/**
+ * 把一个字符串切成**字素簇**（用户感知的「一个字符」）。
+ *
+ * 为什么不能按 code point 切：`✌️` 是 `U+270C U+FE0F` 两个 code point、`👨‍👩‍👧` 是
+ * 五个、`🇨🇳` 是两个区域指示符——它们都是**一个**字素簇。按 code point 切会让光标
+ * 停在簇中间（例如停在 `✌` 与 `U+FE0F` 之间），后果是：
+ *   - 反显光标变成在反显一个变体选择符 —— 屏幕上什么都不显示（实测：Ink 的输出里
+ *     整个反显段直接消失）；
+ *   - 退格只删掉半个 emoji，留下一个孤立的 `U+FE0F`；
+ *   - 光标列号也会因为「半个簇」的宽度而算错。
+ *
+ * 用 `Intl.Segmenter`（Node 内置，无需依赖）；环境不支持时退回 code point 切分。
+ */
+const segmenter = typeof Intl !== "undefined" && typeof Intl.Segmenter === "function"
+    ? new Intl.Segmenter("zh", { granularity: "grapheme" })
+    : null;
+/**
+ * 「可能出现多个 code point 合为一簇」的码位集合。命中才需要 `Intl.Segmenter`。
+ *
+ * 折行是每帧热路径，而 `Segmenter.segment()` 比直接遍历慢一个数量级；但绝大多数
+ * 文本（ASCII / CJK / 代码）每一簇就是一个 code point，根本不需要分词器。
+ * 实测一帧 60 行中文：663 µs → 52 µs。
+ *
+ * 命中条件必须**宁可误报不可漏报**（误报只是走慢路径，漏报会切错字）：
+ *   - `\u{10000}-\u{10FFFF}`：astral 平面（emoji、区域指示符、肤色修饰符、
+ *     tag 序列、扩展汉字）。注意**不能**写 `\uD800-\uDFFF`：`u` 模式下那是
+ *     「孤立代理项」，合法的 astral 字符（已合成为一个码位）反而匹配不到；
+ *   - `\u000D`：CRLF 是一个字素簇（`\r\n` 两个 code point）；
+ *   - `\u200C` `\u200D`：ZWNJ / ZWJ（连字与 emoji 家族连接）；
+ *   - `\u1100-\u11FF`：韩文组合字母（`\u1100\u1161\u11A8` 三簇合一）；
+ *   - `\p{M}`：所有组合附加符（拉丁、天城文、阿拉伯文、键帽 U+20E3、
+ *     变体选择符 U+FE00-FE0F …）。这一条覆盖不了用枚举列全，必须用 Unicode 属性。
+ */
+const NEEDS_SEGMENTER = /[\u{10000}-\u{10FFFF}\u000D\u200C\u200D\u1100-\u11FF\p{M}]/u;
+export function graphemes(text) {
+    if (text === "")
+        return [];
+    // 每簇就是一个 code point 的普通文本：直接切，省掉整个分词器
+    if (!segmenter || !NEEDS_SEGMENTER.test(text))
+        return Array.from(text);
+    const out = [];
+    for (const part of segmenter.segment(text))
+        out.push(part.segment);
+    return out;
+}
 /**
  * 按显示宽度把文本折成多行（保留显式换行）。
- * 拉丁文优先在空格处断行，CJK / 超长词按字符硬断；保证每行显示宽度 ≤ limit。
+ * 拉丁文优先在空格处断行，CJK / 超长词按**字素簇**硬断；保证每行显示宽度 ≤ limit。
  */
 export function wrapText(text, limit) {
     const width = Math.max(1, limit);
@@ -47,8 +103,8 @@ export function wrapText(text, limit) {
         }
         let line = "";
         let lineWidth = 0;
-        for (const ch of raw) {
-            const w = displayWidth(ch);
+        for (const ch of graphemes(raw)) {
+            const w = clusterWidth(ch);
             if (lineWidth + w > width && line !== "") {
                 const space = line.lastIndexOf(" ");
                 if (space > 0) {
@@ -70,12 +126,12 @@ export function wrapText(text, limit) {
     return out.length > 0 ? out : [""];
 }
 /**
- * 把输入文本按显示宽度折行，并定位光标（`cursor` 为字符索引，以 code point 计）。
- * 折行采用逐字符硬断（不做空格优先），以保证光标映射精确、支持跨行编辑。
+ * 把输入文本按显示宽度折行，并定位光标（`cursor` 为**字素簇**索引）。
+ * 折行采用逐簇硬断（不做空格优先），以保证光标映射精确、支持跨行编辑。
  */
 export function layoutInput(text, cursor, width) {
     const limit = Math.max(1, width);
-    const chars = Array.from(text);
+    const chars = graphemes(text);
     const pos = Math.max(0, Math.min(cursor, chars.length));
     const lines = [];
     let line = "";
@@ -85,7 +141,7 @@ export function layoutInput(text, cursor, width) {
     let cursorRow = 0;
     let cursorCol = 0;
     let processed = 0;
-    // 记录「处理完 processed 个字符后」的光标位置；processed === pos 即为光标处
+    // 记录「处理完 processed 个簇后」的光标位置；processed === pos 即为光标处
     const mark = () => {
         if (processed === pos) {
             cursorRow = row;
@@ -104,7 +160,7 @@ export function layoutInput(text, cursor, width) {
             mark();
             continue;
         }
-        const w = displayWidth(ch);
+        const w = clusterWidth(ch);
         if (col > 0 && lineWidth + w > limit) {
             lines.push(line);
             line = "";
@@ -161,8 +217,8 @@ export function clipWidth(text, max) {
         return text;
     let out = "";
     let width = 0;
-    for (const ch of text) {
-        const w = displayWidth(ch);
+    for (const ch of graphemes(text)) {
+        const w = clusterWidth(ch);
         if (width + w > limit - 1)
             break; // 预留 1 列给省略号
         out += ch;
@@ -200,6 +256,10 @@ export function bottomPadding(terminalRows, contentLines) {
  * 该提示是喂给模型的上下文，不该显示给用户。
  */
 export function stripCwdNote(text) {
-    return text.replace(/\n+(?:\[工作目录变更\]\n)?当前工作目录: [^\n]*$/, "");
+    // 两代格式都要认：新（英文 + system-injected 标记）与旧存档里的中文格式。
+    // 旧格式不认会把磁盘上已有会话的 cwd 笔记渲染出来。
+    return text
+        .replace(/\n+\[system-injected: [^\]\n]*\]\nCurrent working directory: [^\n]*$/, "")
+        .replace(/\n+(?:\[工作目录变更\]\n)?当前工作目录: [^\n]*$/, "");
 }
 //# sourceMappingURL=text.js.map

package/dist/tui/text.js.map

@@ -1 +1 @@
-{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"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"}

package/dist/tui/token-rate.d.ts

@@ -0,0 +1,83 @@
+/**
+ * 生成过程的 token 速率统计 —— 纯逻辑，不依赖 React / Ink / SDK
+ *
+ * 需求是「每秒接收多少 token」，而 SDK 只在**每个请求的最后一个 chunk** 才给出
+ * `usage`（`stream_options.include_usage`），拿不到逐 token 的用量。所以这里分两路：
+ *
+ *   - **实时速率**：按增量字符估算 token，用 2 秒滑动窗口算（`live`）。它必须靠估算，
+ *     否则要等一整轮结束才有数字，就谈不上「实时」；
+ *   - **本轮平均**：一轮结束时优先用真实 `completion_tokens`（累加多轮工具调用），
+ *     除以「首字 → 末字」的时间跨度（`average`）。这段时间不含开头的等待首字。
+ *
+ * 两者口径不同，展示上也分开（生成中显示实时，结束后显示本轮平均）——把估算值
+ * 和精确值混成一个数字才是真的误导。
+ */
+/** 实时速率的滑动窗口：取值越小越「跳」，越大越迟钝 */
+export declare const LIVE_WINDOW_MS = 2000;
+/** 计算速率的最小时间跨度：太短会把「首包爆发」放大成离谱的高速率 */
+export declare const MIN_SPAN_MS = 400;
+/**
+ * 按字符估算 token 数（浮点，调用方决定何时取整）。
+ *
+ * 权重取值依据：中文/全角约 0.7 token 一个字（DeepSeek / GLM 系分词器实测区间
+ * 0.6~0.8），其余非空白字符约 0.25（≈4 字符一个 token），空白约 0.1（多半与前词
+ * 合并，但不为零）。这是**估算**，用于实时速率；精确值一律以 `usage` 为准。
+ */
+export declare function estimateTokens(text: string): number;
+/**
+ * 从流式 chunk 里取出「本次新增的输出文本」：正文 + 思考 + 工具参数。
+ *
+ * 三者都是模型实打实吐出来的 token，只统计正文会低估（尤其推理模型的思考段）。
+ */
+export declare function deltaText(chunk: any): string;
+/** 一次快照：生成中看 `live`，结束后看 `average` */
+export interface RateSample {
+    /** 实时速率（token/秒，最近窗口估算）；无数据时为 null */
+    live: number | null;
+    /** 本轮平均速率（token/秒，优先真实 usage）；一轮未结束时为 null */
+    average: number | null;
+    /** 本轮是否仍在生成 */
+    running: boolean;
+}
+/** 无数据的快照（状态栏据此不显示速率段） */
+export declare const IDLE_RATE: RateSample;
+/**
+ * 速率统计器。
+ *
+ * 生命周期由调用方驱动：`begin()`（一轮开始）→ 若干个 `addDelta()` / `addExact()`
+ * → `finish()`（一轮结束）。时间一律可注入，便于单测不依赖真实时钟。
+ */
+export declare class TokenRateMeter {
+    private samples;
+    /** 估算的累计输出 token */
+    private estimated;
+    /** 真实 `completion_tokens` 累加（多轮工具调用逐轮相加） */
+    private exact;
+    private startedAt;
+    private firstOutputAt;
+    private lastOutputAt;
+    private finished;
+    private averageValue;
+    /** 一轮开始：清空上一轮的所有状态 */
+    begin(now?: number): void;
+    /** 收到一段增量文本：累加估算 token 并打点 */
+    addDelta(text: string, now?: number): void;
+    /** 收到真实用量（流末 chunk 的 `usage.completion_tokens`），多轮累加 */
+    addExact(completionTokens: number | undefined | null): void;
+    /**
+     * 一轮结束：算本轮平均速率。
+     *
+     * 分子优先用真实 `completion_tokens`；分母是「首字 → 末字」的跨度，即真正在接收
+     * 内容的那段时间 —— 不含开头的排队等首字，也避免把整轮的思考停顿算成慢。
+     */
+    finish(now?: number): void;
+    /** 当前快照（供状态栏直接渲染） */
+    snapshot(now?: number): RateSample;
+    /** 清空（退出 / 重建会话时调用） */
+    reset(): void;
+    /** 最近窗口的估算速率；窗口内没动静时返回 0（停顿本来就该显示 0，而不是上一秒的高值） */
+    private liveRate;
+    /** 丢掉窗口外的采样（保留一个窗口起点之前的锚点，用于算基准值） */
+    private trim;
+}
+//# sourceMappingURL=token-rate.d.ts.map

package/dist/tui/token-rate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token-rate.d.ts","sourceRoot":"","sources":["../../src/tui/token-rate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,+BAA+B;AAC/B,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,sCAAsC;AACtC,eAAO,MAAM,WAAW,MAAM,CAAC;AAK/B;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQnD;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAqB5C;AAED,sCAAsC;AACtC,MAAM,WAAW,UAAU;IACzB,sCAAsC;IACtC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,8CAA8C;IAC9C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,0BAA0B;AAC1B,eAAO,MAAM,SAAS,EAAE,UAA0D,CAAC;AASnF;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAgB;IAC/B,oBAAoB;IACpB,OAAO,CAAC,SAAS,CAAK;IACtB,4CAA4C;IAC5C,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAuB;IAE3C,sBAAsB;IACtB,KAAK,CAAC,GAAG,GAAE,MAAmB,GAAG,IAAI;IAWrC,8BAA8B;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI;IAWtD,wDAAwD;IACxD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI;IAM3D;;;;;OAKG;IACH,MAAM,CAAC,GAAG,GAAE,MAAmB,GAAG,IAAI;IAatC,qBAAqB;IACrB,QAAQ,CAAC,GAAG,GAAE,MAAmB,GAAG,UAAU;IAM9C,uBAAuB;IACvB,KAAK,IAAI,IAAI;IAWb,kDAAkD;IAClD,OAAO,CAAC,QAAQ;IAkBhB,qCAAqC;IACrC,OAAO,CAAC,IAAI;CASb"}