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

package/dist/tui/screens/input-row.js

@@ -0,0 +1,67 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * 可测量的输入行 —— 让**渲染器自己**告诉我们虚拟光标在第几列、第几行
+ *
+ * ## 为什么要测量，而不是算
+ *
+ * 真实光标 = (x, y)。y 是行号，不依赖宽度计算；x 取决于「光标前那段文本占几列」。
+ * 而宽度是个陷阱：Ink 排版时用 `string-width`（`ink/build/output.js`），我们手写的
+ * `displayWidth` 与它在若干字符上不一致 —— 实测 `⚡` `✅` `✨` `⭐` 这类 East Asian
+ * Wide 符号（我们算 1、Ink 算 2）、ZWJ 组合 emoji `👨‍👩‍👧`（我们算 8、Ink 算 2）、
+ * keycap `1️⃣`（我们算 3、Ink 算 2）。输入里只要出现这类字符，算出来的 x 就会偏。
+ *
+ * 既然这一行**已经渲染出来了**，最可靠的来源就是渲染器本身：Ink 7 的
+ * `measureElement()` 返回元素的布局坐标 `{ x, y, width, height }`（内部累加所有
+ * 祖先 offset），拿到的就是帧内绝对列 / 行。
+ *
+ * ## 为什么光标块要单独包一个 Box
+ *
+ * `measureElement()` 只能量**有独立布局节点**（yoga node）的元素。把整行写成
+ * 一个 `<Text>` 里嵌套若干片段时，那些片段在排版中被并进父文本节点，对它们调用
+ * `measureElement()` 直接返回 `null`（实测）。所以这里把**光标所在的那个字符**
+ * 单独包进 `<Box ref>`：它成为真实节点，坐标就能被测出来。
+ *
+ * ## 拆行之后怎么保住「一行就是一行」
+ *
+ * 整行拆成多个节点后，原本 `<Text wrap="truncate">` 的整行截断兜底就不存在了：
+ * 一旦内容超宽（例如宽度模型把 `⚡` 算成 1 列而 Ink 按 2 列排），这一行会被顶成
+ * 两行，整帧高度 +1，底部输入框/状态栏会被顶出屏幕。
+ *
+ * 解法是让溢出被**可截断的邻段吸收**：`before` / `after` 两段设为
+ * `flexShrink={1} minWidth={0}` + `wrap="truncate"`，光标块 `flexShrink={0}`。
+ * 实测：容器 40、`before` 60 列时仍是**一行**（行高 1），光标被钳在可用区边缘。
+ *
+ * ## 时序
+ *
+ * `measureElement()` 只能在渲染之后（`useEffect`）调用，而 Ink 的 `setCursorPosition`
+ * 只在 commit 阶段（`useInsertionEffect`）把位置推给渲染器，所以「测量 → 上报」天然
+ * 跨一次 commit：宿主把结果存进 state，下一次 commit 才把硬件光标挪过去（多一趟渲染，
+ * Ink 自带节流，肉眼无感）。因此宿主仍保留手算位置作为**首帧兜底**。
+ */
+import { useEffect, useRef } from "react";
+import { Box, measureElement, Text } from "ink";
+import { theme } from "../theme.js";
+/**
+ * 光标所在的输入行：把光标字符包成可测节点，渲染后上报它的布局坐标。
+ *
+ * 视觉与「整块 `<Text>`」渲染等价（提示符 / 正文 / 反显光标块 / 后续文本），
+ * 区别只是各处成为独立节点，于是可以被 `measureElement()` 量到。
+ */
+export function CursorInputRow({ firstLine, before, at, after, onMeasure }) {
+    const cursorRef = useRef(null);
+    /** 上一次上报的值：相同就不再上报，避免「测量 → setState → 渲染 → 再测量」打转 */
+    const lastKeyRef = useRef(null);
+    useEffect(() => {
+        const node = cursorRef.current;
+        if (!node)
+            return;
+        const { x, y } = measureElement(node);
+        const key = `${x}:${y}`;
+        if (key === lastKeyRef.current)
+            return;
+        lastKeyRef.current = key;
+        onMeasure({ x, y });
+    }, [firstLine, before, at, after, onMeasure]);
+    return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { flexShrink: 0, children: firstLine ? (_jsx(Text, { color: theme.brand[0], bold: true, children: "❯ " })) : (_jsx(Text, { children: "  " })) }), _jsx(Box, { flexShrink: 1, minWidth: 0, children: _jsx(Text, { wrap: "truncate", children: before }) }), _jsx(Box, { ref: cursorRef, flexShrink: 0, children: _jsx(Text, { inverse: true, color: theme.brand[0], children: at }) }), _jsx(Box, { flexShrink: 1, minWidth: 0, children: _jsx(Text, { wrap: "truncate", children: after }) })] }));
+}
+//# sourceMappingURL=input-row.js.map

package/dist/tui/screens/input-row.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"input-row.js","sourceRoot":"","sources":["../../../src/tui/screens/input-row.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAmB,MAAM,KAAK,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAqBpC;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAuB;IAC7F,MAAM,SAAS,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAClD,qDAAqD;IACrD,MAAM,UAAU,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IAE/C,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,GAAG,KAAK,UAAU,CAAC,OAAO;YAAE,OAAO;QACvC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC;QACzB,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAE9C,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,aACtB,KAAC,GAAG,IAAC,UAAU,EAAE,CAAC,YACf,SAAS,CAAC,CAAC,CAAC,CACX,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,kBAC9B,IAAI,GACA,CACR,CAAC,CAAC,CAAC,CACF,KAAC,IAAI,cAAE,IAAI,GAAQ,CACpB,GACG,EAEN,KAAC,GAAG,IAAC,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,YAC7B,KAAC,IAAI,IAAC,IAAI,EAAC,UAAU,YAAE,MAAM,GAAQ,GACjC,EACN,KAAC,GAAG,IAAC,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,YAChC,KAAC,IAAI,IAAC,OAAO,QAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,YAChC,EAAE,GACE,GACH,EACN,KAAC,GAAG,IAAC,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,YAC7B,KAAC,IAAI,IAAC,IAAI,EAAC,UAAU,YAAE,KAAK,GAAQ,GAChC,IACF,CACP,CAAC;AACJ,CAAC"}

package/dist/tui/screens/input.d.ts

@@ -2,11 +2,21 @@
 export declare function inputLines(text: string, columns: number): string[];
 /**
  * 计算终端硬件光标坐标（相对 Ink 输出原点），用于让 IME（输入法）候选框
- * 跟随编辑光标。x 为列、y 为行。
+ * 跟随编辑光标。x 为列、y 为行（0 起始，从整帧第一行算起）。
+ *
+ * y 必须把输入行**上方渲染的全部行**算进去，顺序与 `chat.tsx` 的渲染顺序严格一致：
+ *
+ *   对话区（`layout.lines`）→ 通知栏（`noticeLines`）→ 斜杠菜单（`hints`）→ 分隔线 → 输入行
+ *
+ * 漏算任何一段，硬件光标就会整体偏移那么多行（Ink 的 `moveUp = 总行数 − y`，
+ * 所以 y 少几行，光标就高几行）。历史上「通知栏」就被漏过：`/help` 这类多行通知
+ * 一出现，IME 候选框会浮到输入行上方好几行。
  */
 export declare function computeInputCursorPosition(input: {
     /** 对话区行数（输入区之前的行偏移基数） */
     transcriptLines: number;
+    /** 通知栏行数（位于对话区与斜杠菜单之间；不传视为 0） */
+    noticeCount?: number;
     /** 斜杠命令菜单行数 */
     hintCount: number;
     /** 光标在输入框内的行 / 列（列以 code point 计） */
@@ -26,4 +36,39 @@ export declare function isWordChar(ch: string): boolean;
 export declare function wordLeft(text: string, cursor: number): number;
 /** 向右跨词后的光标位置（跳过单词与分隔符，停在词尾） */
 export declare function wordRight(text: string, cursor: number): number;
+/**
+ * 向左删一个词（Ctrl+W / Alt+Backspace）：删掉光标前的分隔符与单词。
+ * 返回删除后的文本与光标位置 —— 光标原地不动，只是前面的内容被吃掉。
+ */
+export declare function deleteWordLeft(text: string, cursor: number): {
+    text: string;
+    cursor: number;
+};
+/**
+ * 向右删一个词（Alt+D / Ctrl+Delete）：删掉光标后的分隔符与单词。
+ * 光标不动，后面的内容被吃掉。
+ */
+export declare function deleteWordRight(text: string, cursor: number): {
+    text: string;
+    cursor: number;
+};
+/**
+ * 删到行首（Ctrl+U）：删掉光标到本行开头（不含换行符）的内容。
+ *
+ * 语义与 readline 的 unix-line-discard / 主流 TUI 保持一致。注意 macOS 上
+ * iTerm2 与 Terminal.app 会把 `Cmd+Backspace` 映射成 `Ctrl+U` —— 若此处做成
+ * 「清空整个输入框」，Mac 用户按 ⌘⌫ 会丢掉全部草稿（多行输入时尤其致命）。
+ */
+export declare function deleteToLineStart(text: string, cursor: number): {
+    text: string;
+    cursor: number;
+};
+/**
+ * 删到行尾（Ctrl+K）：删掉光标到本行末尾（不含换行符）的内容；
+ * 若光标已在行尾，则连该换行符一起删掉（与 readline 的 kill-line 一致）。
+ */
+export declare function deleteToLineEnd(text: string, cursor: number): {
+    text: string;
+    cursor: number;
+};
 //# sourceMappingURL=input.d.ts.map

package/dist/tui/screens/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/input.ts"],"names":[],"mappings":"AAKA,2CAA2C;AAC3C,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAIlE;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,yBAAyB;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAS3B;AAID,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAK9C;AAED,gCAAgC;AAChC,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED,gCAAgC;AAChC,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAM9D"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/input.ts"],"names":[],"mappings":"AAMA,2CAA2C;AAC3C,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAIlE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,yBAAyB;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,iCAAiC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAS3B;AAID,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAK9C;AAED,gCAAgC;AAChC,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED,gCAAgC;AAChC,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAM9D;AASD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAQ7F;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAQ9F;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAShG;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAU9F"}

package/dist/tui/screens/input.js

@@ -1,24 +1,33 @@
 // 由 src/tui/screens.tsx 拆分而来 —— 输入区折行 / 硬件光标 / 跨词移动
-import { displayWidth, layoutInput, INPUT_PREFIX_WIDTH } from "../text.js";
+import { displayWidth, graphemes, layoutInput, INPUT_PREFIX_WIDTH } from "../text.js";
+import { t } from "../../i18n/index.js";
 // ==================== 对话屏布局（吸底）====================
 /** 输入区文本折行（不含提示符 `❯ `，交由渲染层补齐）；空输入用占位提示 */
 export function inputLines(text, columns) {
     const width = Math.max(4, columns - 4);
-    const body = text.length > 0 ? text : "输入消息，/ 查看命令…";
+    const body = text.length > 0 ? text : t("input.placeholder");
     return layoutInput(body, 0, width).lines;
 }
 /**
  * 计算终端硬件光标坐标（相对 Ink 输出原点），用于让 IME（输入法）候选框
- * 跟随编辑光标。x 为列、y 为行。
+ * 跟随编辑光标。x 为列、y 为行（0 起始，从整帧第一行算起）。
+ *
+ * y 必须把输入行**上方渲染的全部行**算进去，顺序与 `chat.tsx` 的渲染顺序严格一致：
+ *
+ *   对话区（`layout.lines`）→ 通知栏（`noticeLines`）→ 斜杠菜单（`hints`）→ 分隔线 → 输入行
+ *
+ * 漏算任何一段，硬件光标就会整体偏移那么多行（Ink 的 `moveUp = 总行数 − y`，
+ * 所以 y 少几行，光标就高几行）。历史上「通知栏」就被漏过：`/help` 这类多行通知
+ * 一出现，IME 候选框会浮到输入行上方好几行。
  */
 export function computeInputCursorPosition(input) {
     const before = input.placeholder
         ? ""
-        : Array.from(input.lineText).slice(0, input.cursorCol).join("");
+        : graphemes(input.lineText).slice(0, input.cursorCol).join("");
     return {
         x: INPUT_PREFIX_WIDTH + displayWidth(before),
-        // 对话区 + 斜杠菜单 + 分隔线 + 输入行内偏移
-        y: input.transcriptLines + input.hintCount + 1 + input.cursorRow,
+        // 对话区 + 通知栏 + 斜杠菜单 + 分隔线 + 输入行内偏移
+        y: input.transcriptLines + (input.noticeCount ?? 0) + input.hintCount + 1 + input.cursorRow,
     };
 }
 // ==================== 跨词移动（Ctrl/Alt + ← →）====================
@@ -33,7 +42,7 @@ export function isWordChar(ch) {
 }
 /** 向左跨词后的光标位置（跳过分隔符与单词，停在词首） */
 export function wordLeft(text, cursor) {
-    const chars = Array.from(text);
+    const chars = graphemes(text);
     let i = Math.max(0, Math.min(cursor, chars.length));
     while (i > 0 && !isWordChar(chars[i - 1]))
         i -= 1;
@@ -43,7 +52,7 @@ export function wordLeft(text, cursor) {
 }
 /** 向右跨词后的光标位置（跳过单词与分隔符，停在词尾） */
 export function wordRight(text, cursor) {
-    const chars = Array.from(text);
+    const chars = graphemes(text);
     let i = Math.max(0, Math.min(cursor, chars.length));
     while (i < chars.length && !isWordChar(chars[i]))
         i += 1;
@@ -51,4 +60,70 @@ export function wordRight(text, cursor) {
         i += 1;
     return i;
 }
+// ==================== 按词删除（Ctrl+W / Alt+Backspace、Alt+D / Ctrl+Delete）====================
+/** 光标钳制到 [0, len]（按 code point 计） */
+function clampCursor(chars, cursor) {
+    return Math.max(0, Math.min(cursor, chars.length));
+}
+/**
+ * 向左删一个词（Ctrl+W / Alt+Backspace）：删掉光标前的分隔符与单词。
+ * 返回删除后的文本与光标位置 —— 光标原地不动，只是前面的内容被吃掉。
+ */
+export function deleteWordLeft(text, cursor) {
+    const chars = graphemes(text);
+    const cp = clampCursor(chars, cursor);
+    const from = wordLeft(text, cp);
+    return {
+        text: chars.slice(0, from).join("") + chars.slice(cp).join(""),
+        cursor: from,
+    };
+}
+/**
+ * 向右删一个词（Alt+D / Ctrl+Delete）：删掉光标后的分隔符与单词。
+ * 光标不动，后面的内容被吃掉。
+ */
+export function deleteWordRight(text, cursor) {
+    const chars = graphemes(text);
+    const cp = clampCursor(chars, cursor);
+    const to = wordRight(text, cp);
+    return {
+        text: chars.slice(0, cp).join("") + chars.slice(to).join(""),
+        cursor: cp,
+    };
+}
+/**
+ * 删到行首（Ctrl+U）：删掉光标到本行开头（不含换行符）的内容。
+ *
+ * 语义与 readline 的 unix-line-discard / 主流 TUI 保持一致。注意 macOS 上
+ * iTerm2 与 Terminal.app 会把 `Cmd+Backspace` 映射成 `Ctrl+U` —— 若此处做成
+ * 「清空整个输入框」，Mac 用户按 ⌘⌫ 会丢掉全部草稿（多行输入时尤其致命）。
+ */
+export function deleteToLineStart(text, cursor) {
+    const chars = graphemes(text);
+    const cp = clampCursor(chars, cursor);
+    let from = cp;
+    while (from > 0 && chars[from - 1] !== "\n")
+        from -= 1;
+    return {
+        text: chars.slice(0, from).join("") + chars.slice(cp).join(""),
+        cursor: from,
+    };
+}
+/**
+ * 删到行尾（Ctrl+K）：删掉光标到本行末尾（不含换行符）的内容；
+ * 若光标已在行尾，则连该换行符一起删掉（与 readline 的 kill-line 一致）。
+ */
+export function deleteToLineEnd(text, cursor) {
+    const chars = graphemes(text);
+    const cp = clampCursor(chars, cursor);
+    let to = cp;
+    while (to < chars.length && chars[to] !== "\n")
+        to += 1;
+    if (to === cp && chars[cp] === "\n")
+        to += 1;
+    return {
+        text: chars.slice(0, cp).join("") + chars.slice(to).join(""),
+        cursor: cp,
+    };
+}
 //# sourceMappingURL=input.js.map

package/dist/tui/screens/input.js.map

@@ -1 +1 @@
-{"version":3,"file":"input.js","sourceRoot":"","sources":["../../../src/tui/screens/input.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE3E,qDAAqD;AAErD,2CAA2C;AAC3C,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,OAAe;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC;IACrD,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC;AAC3C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAY1C;IACC,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW;QAC9B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClE,OAAO;QACL,CAAC,EAAE,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC;QAC5C,4BAA4B;QAC5B,CAAC,EAAE,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,SAAS;KACjE,CAAC;AACJ,CAAC;AAED,gEAAgE;AAEhE,wDAAwD;AACxD,MAAM,UAAU,UAAU,CAAC,EAAU;IACnC,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IACtB,MAAM,IAAI,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC;IAChC,IAAI,IAAI,GAAG,GAAG;QAAE,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,QAAQ,CAAC,IAAY,EAAE,MAAc;IACnD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAAE,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAAE,CAAC,IAAI,CAAC,CAAC;IACjD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,MAAc;IACpD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAAE,CAAC,IAAI,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAAE,CAAC,IAAI,CAAC,CAAC;IACxD,OAAO,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"input.js","sourceRoot":"","sources":["../../../src/tui/screens/input.ts"],"names":[],"mappings":"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"}

package/dist/tui/screens/layout.d.ts

@@ -1,20 +1,30 @@
-import { RLine, Block, LiveAssistant } from "./lines.js";
+import { RLine } from "./lines.js";
 /** 确认框固定高度（外 marginTop 1 + 上下边框 2 + 问题 1 + marginTop 1 + 选项 1） */
 export declare const CONFIRM_LINES = 6;
+/** 底部状态栏行数下限：模型/Agent 一行 + 用量与速率一行（宽度不够时会折成更多行，
+ *  实际值由 `statusBarRows()` 量出后传入 `computeChatLayout({ statusBarLines })`） */
+export declare const STATUS_BAR_LINES = 2;
 /** 选择覆盖层高度（相对条目数） */
 export declare function pickerLines(itemCount: number): number;
 export interface ChatLayoutInput {
     columns: number;
     rows: number;
-    blocks: Block[];
-    live: LiveAssistant | null;
+    /** 已折行的对话行（由 messages-view 依 agent.messages 产出） */
+    transcript: RLine[];
     input: string;
     busy: boolean;
     hintCount: number;
+    /** 通知栏行数（notice / error 独立栏位），缺省 0 */
+    noticeCount?: number;
     overlay: "none" | "confirm" | "picker";
     pickerItems: number;
     /** 视口顶部行索引（相对整个对话行）；null / undefined = 贴底（自动跟随最新） */
     viewTop?: number | null;
+    /**
+     * 状态栏实际占据的行数（由 `statusBarRows()` 实测得出 —— 它会随终端宽度折行）。
+     * 缺省用 `STATUS_BAR_LINES`。
+     */
+    statusBarLines?: number;
 }
 export interface ChatLayout {
     /** 对话区（含顶部补齐空行），行数恒为 `rows - bottomLines` */
@@ -30,6 +40,14 @@ export interface ChatLayout {
     /** 是否处于滚动状态（视口未贴底，下方仍有更新的内容） */
     scrolled: boolean;
 }
+/**
+ * 把「想要的视口顶部」钳制成合法值：下限 0、上限 `totalLines - budget`。
+ *
+ * 返回 `null` 表示**已贴底**（视口顶恰好等于最大顶，或内容不足一屏）—— 调用方据此
+ * 清掉滚动状态，让视口重新跟随最新内容。所有滚动动作（翻页 / 按行 / 鼠标滚轮）都
+ * 走这一个函数，越界方向自然被吃掉，不会出现「滚过头回不来」。
+ */
+export declare function clampViewTop(totalLines: number, budget: number, nextTop: number): number | null;
 /**
  * 计算对话屏布局：底部区域高度固定后，把「对话行」按视口截取到可用高度，顶部用空行
  * 补齐 —— 使整帧高度恒等于传入的 `rows`（调用方以 `usableFrameRows()` 预留末行），

package/dist/tui/screens/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/layout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAA6B,MAAM,YAAY,CAAC;AAGpF,kEAAkE;AAClE,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B,qBAAqB;AACrB,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,6CAA6C;IAC7C,KAAK,EAAE,KAAK,EAAE,CAAC;IACf,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,uBAAuB;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU,CA4BpE"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/layout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGnC,kEAAkE;AAClE,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B;4EAC4E;AAC5E,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,qBAAqB;AACrB,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,6CAA6C;IAC7C,KAAK,EAAE,KAAK,EAAE,CAAC;IACf,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,uBAAuB;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI/F;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU,CA4BpE"}

package/dist/tui/screens/layout.js

@@ -1,12 +1,25 @@
-// 由 src/tui/screens.tsx 拆分而来 —— 吸底布局 computeChatLayout + 覆盖层高度
-import { blockToLines, liveToLines } from "./lines.js";
 import { inputLines } from "./input.js";
 /** 确认框固定高度（外 marginTop 1 + 上下边框 2 + 问题 1 + marginTop 1 + 选项 1） */
 export const CONFIRM_LINES = 6;
+/** 底部状态栏行数下限：模型/Agent 一行 + 用量与速率一行（宽度不够时会折成更多行，
+ *  实际值由 `statusBarRows()` 量出后传入 `computeChatLayout({ statusBarLines })`） */
+export const STATUS_BAR_LINES = 2;
 /** 选择覆盖层高度（相对条目数） */
 export function pickerLines(itemCount) {
     return 7 + itemCount;
 }
+/**
+ * 把「想要的视口顶部」钳制成合法值：下限 0、上限 `totalLines - budget`。
+ *
+ * 返回 `null` 表示**已贴底**（视口顶恰好等于最大顶，或内容不足一屏）—— 调用方据此
+ * 清掉滚动状态，让视口重新跟随最新内容。所有滚动动作（翻页 / 按行 / 鼠标滚轮）都
+ * 走这一个函数，越界方向自然被吃掉，不会出现「滚过头回不来」。
+ */
+export function clampViewTop(totalLines, budget, nextTop) {
+    const maxTop = Math.max(0, totalLines - budget);
+    const clamped = Math.max(0, Math.min(maxTop, nextTop));
+    return clamped >= maxTop ? null : clamped;
+}
 /**
  * 计算对话屏布局：底部区域高度固定后，把「对话行」按视口截取到可用高度，顶部用空行
  * 补齐 —— 使整帧高度恒等于传入的 `rows`（调用方以 `usableFrameRows()` 预留末行），
@@ -16,20 +29,18 @@ export function pickerLines(itemCount) {
  * 传入具体值时按 [0, totalLines - budget] 钳制，用于「应用内翻页」回看更早的历史。
  */
 export function computeChatLayout(input) {
-    const transcript = [];
-    for (const block of input.blocks)
-        transcript.push(...blockToLines(block, input.columns));
-    if (input.live)
-        transcript.push(...liveToLines(input.live, input.columns));
+    const transcript = input.transcript;
     const inputHeight = input.busy ? 1 : inputLines(input.input, input.columns).length;
     const overlayHeight = input.overlay === "confirm"
         ? CONFIRM_LINES
         : input.overlay === "picker"
             ? pickerLines(input.pickerItems)
             : 0;
+    const noticeCount = input.noticeCount ?? 0;
+    const statusBarLines = Math.max(1, input.statusBarLines ?? STATUS_BAR_LINES);
     const bottomLines = input.overlay === "none"
-        ? 1 /* 分隔线 */ + input.hintCount + inputHeight + 1 /* 状态栏 */
-        : overlayHeight + 1 /* 状态栏 */;
+        ? noticeCount /* 通知栏 */ + 1 /* 分隔线 */ + input.hintCount + inputHeight + statusBarLines
+        : overlayHeight + statusBarLines;
     const budget = Math.max(0, input.rows - bottomLines);
     const totalLines = transcript.length;
     const maxTop = Math.max(0, totalLines - budget);

package/dist/tui/screens/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../../src/tui/screens/layout.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,OAAO,EAA+B,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,kEAAkE;AAClE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC;AAC/B,qBAAqB;AACrB,MAAM,UAAU,WAAW,CAAC,SAAiB;IAC3C,OAAO,CAAC,GAAG,SAAS,CAAC;AACvB,CAAC;AA+BD;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAsB;IACtD,MAAM,UAAU,GAAY,EAAE,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM;QAAE,UAAU,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACzF,IAAI,KAAK,CAAC,IAAI;QAAE,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAE3E,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IACnF,MAAM,aAAa,GACjB,KAAK,CAAC,OAAO,KAAK,SAAS;QACzB,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ;YAC1B,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC;IACV,MAAM,WAAW,GACf,KAAK,CAAC,OAAO,KAAK,MAAM;QACtB,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,GAAG,WAAW,GAAG,CAAC,CAAC,SAAS;QAC3D,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC;IAElC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,WAAW,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,KAAK,GAAY;QACrB,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,KAAc,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACnG,GAAG,SAAS;KACb,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAAC;AAC1F,CAAC"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../../src/tui/screens/layout.ts"],"names":[],"mappings":"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"}

package/dist/tui/screens/lines.d.ts

@@ -14,58 +14,29 @@ export interface RLine {
     /** 着色分段；`text` 恒为这些分段的纯文本拼接（便于测试与裁剪） */
     spans?: Span[];
 }
-export interface ToolLine {
-    name: string;
-    args: string;
-}
-export type Block = {
-    id: number;
-    kind: "user";
-    text: string;
-} | {
-    id: number;
-    kind: "assistant";
-    reasoning: string;
-    content: string;
-    tools: ToolLine[];
-} | {
-    id: number;
-    kind: "notice";
-    tone: "info" | "error";
-    text: string;
-};
-export interface LiveAssistant {
-    reasoning: string;
-    content: string;
-    tools: ToolLine[];
-    sub: string | null;
-    /**
-     * 本轮（一次 API 请求）工具调用在 `tools` 中的起始下标。
-     *
-     * AI 一轮回复里可并行调用多个工具，且**工具执行后会在同一轮对话内继续下一轮**
-     * （每次请求 SDK 都 `emit("open")`）；每轮的 `tool_calls.index` 都会从 `0` 重新
-     * 计数。用它分段，避免新一轮与上一轮同 index 的工具调用被拼到同一行
-     * （如 `read` + `edit` → `readedit`）。
-     */
-    roundBase?: number;
-}
 /** 缩进 2 列后的可用文本宽度 */
 export declare function innerWidth(columns: number): number;
 export declare function indentLines(kind: LineKind, key: string, text: string, width: number): RLine[];
 /** 按显示宽度把分段裁成**严格单行**，超出补省略号（用于工具调用行） */
 export declare function clipSpans(spans: Span[], max: number): Span[];
+/** 由分段拼出 RLine（`text` = 分段纯文本拼接） */
+export declare function spanLine(key: string, kind: LineKind, spans: Span[]): RLine;
 /**
  * 工具调用行的分段：`  ⚙ name(args)`，参数按 **JSON** 高亮。
  * 无参数时省略括号；调用方用 `clipSpans` 裁成严格单行。
  */
 export declare function toolSpans(name: string, args: string): Span[];
 /**
- * 正文 / 思考内容 → 预折行；**围栏代码块**（` ```lang `）按语言高亮，其余按普通文本折行。
- * 围栏行本身不显示（见 `splitFences`）。
+ * 正文 / 思考内容 → 预折行。
+ *
+ * - **普通文本段**按 **markdown 源码着色**（`highlightCode(text, "markdown")`）：
+ *   AI 回答本身就是 markdown，交给 highlight.js 的 markdown 词法上色，标记符（`#`/`**`/`` ` `` 等）
+ *   原样保留、只染色（不做语义渲染）；
+ * - **围栏代码块**按标注语言做语法高亮，并**保留围栏行**（` ```lang ` 与 ` ``` `，
+ *   以低调的暗灰渲染），不丢弃 —— 便于一眼看出代码块边界与语言。
+ *   未标注 / 未知语言则不着色。
+ *
+ * 正文段用**空格优先**折行，代码段逐字符硬断。
  */
 export declare function contentLines(kind: LineKind, key: string, text: string, width: number): RLine[];
-/** 单个对话块 → 若干预折行 */
-export declare function blockToLines(block: Block, columns: number): RLine[];
-/** 流式中的 AI 块 → 若干预折行（与完成态一致：前置一个空行隔开上文） */
-export declare function liveToLines(live: LiveAssistant, columns: number): RLine[];
 //# sourceMappingURL=lines.d.ts.map

package/dist/tui/screens/lines.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lines.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/lines.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,QAAQ,GAChB,KAAK,GACL,aAAa,GACb,WAAW,GACX,WAAW,GACX,WAAW,GACX,MAAM,GACN,SAAS,GACT,QAAQ,GACR,OAAO,CAAC;AAEZ,gDAAgD;AAChD,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,KAAK,GACb;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;CAAE,GACxF;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzE,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAqB;AACrB,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,CAE7F;AA2DD,yCAAyC;AACzC,wBAAgB,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,CAsB5D;AAOD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,CAS5D;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,CAiB9F;AAED,oBAAoB;AACpB,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,CAoCnE;AAED,2CAA2C;AAC3C,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,CAqBzE"}
+{"version":3,"file":"lines.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/lines.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,QAAQ,GAChB,KAAK,GACL,aAAa,GACb,WAAW,GACX,WAAW,GACX,WAAW,GACX,MAAM,GACN,SAAS,GACT,QAAQ,GACR,OAAO,CAAC;AAEZ,gDAAgD;AAChD,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;CAChB;AAED,qBAAqB;AACrB,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,CAE7F;AAuHD,yCAAyC;AACzC,wBAAgB,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,CAsB5D;AAED,oCAAoC;AACpC,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAE1E;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,CAS5D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,CAsB9F"}