pi-cc-extensions 1.0.8 → 1.0.9

package/README.en.md

@@ -4,7 +4,7 @@
 
 # pi-cc-extensions
 
-> Claude Code-style TUI output with some personal touches and handy utilities.
+> Claude Code-style TUI output with some personal touches and handy utilities (no extra built-in tools).
 
 ## Preview
 
@@ -34,7 +34,7 @@ Run `/reload` after installation.
 | Context inspection          | Usage breakdown and previews for the system prompt, memory, skills, tools definition, and messages                                           | `/context`                                      |
 | Session/Subagent references | Search and inject effective context from previous Sessions or existing SubAgents                                                             | `@`                                             |
 | Status bar                  | Shows model, context, cache, cost, and git; also works with `@narumitw/pi-usage` for live quota. Git/cache Nerd Font icons can be turned off | `/ccstyle`                                      |
-| Theme                       | Bundled CC Dark and CC Light themes                                                                                                          | `/theme`                                        |
+| Theme                       | Bundled CC Dark and CC Light themes                                                                                                          | `/settings` → Theme                             |
 
 Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-examples-default.md) · [compact](./docs/tool-render-examples-compact.md)
 
@@ -55,7 +55,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "enableAgentSummary": true,              // per-turn tool summary
   "enableWorkingMessage": true,            // Working... bottom token/elapsed
   "enableAliases": true,                   // /clear, /exit aliases
-  "enableMarkdownEnhance": true,             // markdown pass: Mermaid dialects and circled-number conversion; false hands it to other extensions
+  "enableMarkdownEnhance": true,           // markdown pass: Mermaid dialects and circled-number conversion; false hands it to other extensions
   "enableEditorPrefix": true,              // editor ❯ prefix
 
   // ui
@@ -97,12 +97,10 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 ```
 
 > [!TIP]
-> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. An expanded diff always shows every line; when expanded Input/Output exceeds the line cap, the footer `… +N more lines · click to show more` opens a full preview. Click to collapse.
->
-> Both `scrollButtonMode` values show the same `Back to bottom` / `N new message(s)` text: `dock` draws it in a dedicated row, `native` in Pi’s floating overlay.
+> **Fullscreen**: expanded diffs always show every line. When expanded Input/Output exceeds the line cap, the footer shows `… +N more lines`; click for the full preview, click again to collapse.
 
 > [!NOTE]
-> **Mermaid rendering**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or the Mermaid diagrams option in `/settings`. Default `streaming` redraws per frame; `final` renders once at completion.
+> **Mermaid rendering**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or `/settings`. Default `streaming` redraws every frame; `final` renders once.
 
 ## Local development
 

package/README.md

@@ -4,7 +4,7 @@
 
 # pi-cc-extensions
 
-> 类 Claude Code TUI 输出风格，并融入了一些个人喜好，和一些实用小功能。
+> 类 Claude Code TUI 输出风格，并融入了一些个人喜好，和一些实用小功能（无额外内置工具）。
 
 ## 界面预览
 
@@ -34,7 +34,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 | 上下文检查            | 查看上下文占用，并预览 System prompt、Memory、Skills、Tools definition 和消息内容 | `/context`                                      |
 | Session/Subagent 引用 | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                             | `@`                                             |
 | 状态栏                | 显示：模型、上下文、缓存、费用、git并适配 @narumitw/pi-usage 实时显示额度；git/缓存图标可关 Nerd Font | `/ccstyle`                              |
-| 主题                  | 随包提供内置 CC Dark、CC Light 主题                                             | `/theme`                                        |
+| 主题                  | 随包提供内置 CC Dark、CC Light 主题                                             | `/settings` → Theme                             |
 
 `on` / `compact` 两种模式的渲染样例：[默认模式](./docs/tool-render-examples-default.md) · [紧凑模式](./docs/tool-render-examples-compact.md)
 
@@ -55,7 +55,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   "enableAgentSummary": true,              // 每回合工具摘要
   "enableWorkingMessage": true,            // Working... 底部 token/耗时
   "enableAliases": true,                   // /clear、/exit 别名
-  "enableMarkdownEnhance": true,             // markdown 转换：Mermaid 方言渲染、圈数字转半角括号；false 让位给其他扩展
+  "enableMarkdownEnhance": true,           // markdown 转换：Mermaid 方言渲染、圈数字转半角括号；false 让位给其他扩展
   "enableEditorPrefix": true,              // 输入框 ❯ 前缀
 
   // ui
@@ -97,12 +97,10 @@ pi install git:github.com/minuque/pi-cc-extensions
 ```
 
 > [!TIP]
-> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；工具卡展开态 diff 全量显示，Input/Output 超行时末行 `… +N more lines · click to show more` 打开全量预览，单击收起。
->
-> `scrollButtonMode` 两种模式文案相同（`Back to bottom` / `N new message(s)`）：`dock` 画在独占行，`native` 画在 Pi 原生浮层。
+> **全屏模式**：展开态 diff 全量显示。Input/Output 超行时末行给 `… +N more lines`，单击看全量，再击收起。
 
 > [!NOTE]
-> **Mermaid 渲染**：建议把 `markdown.mermaid` 设为 `final`（`~/.pi/agent/settings.json` 或 `/settings` 面板的 Mermaid diagrams 选项）。默认 `streaming` 逐帧重绘，`final` 渲染最终版更稳定。
+> **Mermaid 渲染**：`markdown.mermaid` 建议设为 `final`（`~/.pi/agent/settings.json` 或 `/settings`）。默认 `streaming` 逐帧重绘，`final` 只渲染最终版。
 
 ## 本地开发
 

package/extensions/config/panel.ts

@@ -431,6 +431,11 @@ export async function showCcstylePanel(
 		return;
 	}
 
+	// 编辑器插槽只能在面板关闭后替换：面板自己就挂在 editorContainer 上，面板开着时调
+	// setEditorComponent 会把面板踢出渲染树、done() 再也走不到，`ctx.ui.custom()` 永不落定，
+	// 整个输入管线随之卡死。
+	let editorPrefixChanged = false;
+
 	await ctx.ui.custom((tui: any, theme: any, _keybindings: any, done: () => void) => {
 		const modeSetting = {
 			id: "mode",
@@ -880,8 +885,7 @@ export async function showCcstylePanel(
 				editorPrefixSetting.description = enabled
 					? "Show ❯ before the input line; color follows thinking level / bash mode."
 					: "Plain input line, no ❯ glyph.";
-				if (enabled) applyPromptEditor(ctx);
-				else clearPromptEditor(ctx);
+				editorPrefixChanged = true;
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
@@ -1208,6 +1212,11 @@ export async function showCcstylePanel(
 			},
 		};
 	});
+	// 面板已经卸下，插槽此时替换才不会踢掉对话框。
+	if (editorPrefixChanged) {
+		if (config.enableEditorPrefix) applyPromptEditor(ctx);
+		else clearPromptEditor(ctx);
+	}
 	// 面板卸下后主 transcript 重新挂载；再刷一次，吃掉打开期间扫树失败的切换。
 	hooks.refreshCurrentTranscript(ctx, toolGrouping);
 }

package/extensions/feature/shell/footer.ts

@@ -385,12 +385,24 @@ const createCustomFooterFactory =
 			return 0;
 		};
 
-		const render = (width: number): string[] => {
+		// 三个会话统计每帧重算会全量遍历 session，长会话把 pi 钉在 100% CPU（issue #80）。
+		// leaf/model/thinking 任一变化立即重算；不变时 1s TTL，流式期间每秒刷新一次。
+		const SESSION_STATS_TTL_MS = 1_000;
+		let statsMemoKey = "";
+		let statsMemoAt = 0;
+		let statsMemo:
+			| { contextUsage: ReturnType<typeof ctx.getContextUsage>; cost: number; cachePct: number }
+			| undefined;
+		const sessionStats = () => {
 			const model = ctx.model;
-			const contextUsage = ctx.getContextUsage();
-			const contextWindow = contextUsage?.contextWindow ?? model?.contextWindow ?? 0;
-			const percent = contextUsage?.percent;
-
+			const key = `${ctx.sessionManager.getLeafId() ?? ""}|${model?.provider}/${model?.id}|${ctx.thinkingLevel ?? ""}`;
+			if (
+				statsMemo &&
+				key === statsMemoKey &&
+				performance.now() - statsMemoAt < SESSION_STATS_TTL_MS
+			) {
+				return statsMemo;
+			}
 			let cost = 0;
 			for (const entry of ctx.sessionManager.getEntries()) {
 				if (entry.type === "message") {
@@ -404,6 +416,17 @@ const createCustomFooterFactory =
 					cost += entry.usage.cost?.total || 0;
 				}
 			}
+			statsMemo = { contextUsage: ctx.getContextUsage(), cost, cachePct: getCachePct() };
+			statsMemoKey = key;
+			statsMemoAt = performance.now();
+			return statsMemo;
+		};
+
+		const render = (width: number): string[] => {
+			const model = ctx.model;
+			const { contextUsage, cost, cachePct } = sessionStats();
+			const contextWindow = contextUsage?.contextWindow ?? model?.contextWindow ?? 0;
+			const percent = contextUsage?.percent;
 
 			// cwd 默认只显示最底层路径（根目录时回退完整路径）
 			const cwdLabel = ctx.cwd.split(/[\\/]/).filter(Boolean).pop() || ctx.cwd;
@@ -430,7 +453,6 @@ const createCustomFooterFactory =
 			const dimPlugin = (text: string) => colorUsageChip(theme, text);
 
 			const pctLabel = percent === null || percent === undefined ? "?" : `${Math.floor(percent)}%`;
-			const cachePct = getCachePct();
 			const glyphs = footerGlyphs(config.footerNerdIcons);
 			const cacheLabel =
 				cachePct > 0 ? `${glyphs.cache ? `${glyphs.cache} ` : ""}${Math.floor(cachePct)}%` : "";

package/extensions/feature/shell/prompt-editor.ts

@@ -59,27 +59,48 @@ const promptEditorFactory: EditorFactory = (tui, theme, keybindings) =>
 let active = false;
 let previousEditorFactory: EditorFactory | undefined;
 
-/** 撤销本扩展占据的插槽；从未占用就不碰插槽。 */
+/**
+ * 撤销本扩展占据的插槽；从未占用就不碰插槽。
+ *
+ * 插槽可能已经被其他扩展包在外层（pi-inline-skills 会把当前工厂再包一层），
+ * 那种结构里无法只拆内层，直接还回占据前的工厂；外层扩展会在下次终端输入时
+ * 自己重新包装，前缀不会因此复活。
+ *
+ * 例外：插槽被 pi 重置回占据前的工厂时（/new、/reload 走 resetExtensionUI），
+ * 我们已经不在槽里，再写一次会把 pi 刚重置的结果又覆盖掉；此时只清状态。
+ */
 function releasePromptEditor(ctx: ExtensionContext): void {
 	if (!active) return;
-	ctx.ui.setEditorComponent(previousEditorFactory);
+	const previous = previousEditorFactory;
 	active = false;
 	previousEditorFactory = undefined;
+	if (ctx.ui.getEditorComponent?.() === previous) return;
+	ctx.ui.setEditorComponent(previous);
 }
 
-/** 应用输入框前缀；enableEditorPrefix=false 时只撤自己装的那层。 */
+/**
+ * 应用输入框前缀；enableEditorPrefix=false 时只撤自己装的那层。
+ *
+ * 只在没有扩展对话框开着时调用：pi 的 setEditorComponent 会清空 editorContainer 并
+ * 抢走焦点，把正在设置面板里的对话框踢出渲染树，对话框的 done() 再也走不到，
+ * `ctx.ui.custom()` 的 Promise 永不落定，后续输入全部卡死。设置面板自己不做替换，
+ * 等 `ctx.ui.custom()` 返回后再调本函数。
+ *
+ * 插槽已经装着本扩展的编辑器时直接返回：重复安装只会重建实例，丢掉撤销栈、
+ * 历史等编辑器状态，还会打断其他扩展包在外层的编辑器。
+ */
 export function applyPromptEditor(ctx: ExtensionContext): void {
 	if (!ctx?.hasUI || typeof ctx.ui?.setEditorComponent !== "function") return;
+	if (!config.enableEditorPrefix) {
+		releasePromptEditor(ctx);
+		return;
+	}
+	const current = ctx.ui.getEditorComponent?.();
+	if (current === promptEditorFactory) return;
 	try {
-		if (!config.enableEditorPrefix) {
-			releasePromptEditor(ctx);
-			return;
-		}
-		if (!active) {
-			// pi 的插槽是硬替换、没有栈，先记住是谁占着，撤销时还回去。
-			previousEditorFactory = ctx.ui.getEditorComponent?.();
-			active = true;
-		}
+		// pi 的插槽是硬替换、没有栈，先记住是谁占着，撤销时还回去。
+		previousEditorFactory = current;
+		active = true;
 		ctx.ui.setEditorComponent(promptEditorFactory);
 	} catch (err) {
 		ctx.ui.notify(

package/extensions/renderer/compact-mode.ts

@@ -1057,6 +1057,14 @@ function compactStopStatusLine(status: string, pad = 0): any {
 /** 展开入口的动作词：我们的 `click to show more`、pi 的 `<key> to expand`（键名可能取不到）。 */
 const EXPAND_ACTION = String.raw`(?:click to show more|(?:[\w/+]+\s+)?to (?:show more|expand))`;
 
+/**
+ * 展开入口只挂在行尾：正则只看行尾这一段，单行代价与行长无关。
+ * 图片负载（kitty 图形数据的 Base64）一行可达数百 KB，整行过正则会拖住渲染帧。
+ */
+const SLOT_HINT_WINDOW = 200;
+/** 窗口里出现这些词才可能有展开入口，其余行（负载、代码）直接放过正则。 */
+const SLOT_HINT_MARKERS = ["to expand", "to show more"];
+
 const SLOT_HINT_PATTERNS: RegExp[] = [
 	// 卡在括号里：`(9 more lines, click to show more)` / `(195 earlier lines, ctrl+o to expand)`，
 	// 只去掉动作词，收尾括号与计数保留。
@@ -1066,13 +1074,18 @@ const SLOT_HINT_PATTERNS: RegExp[] = [
 	new RegExp(String.raw`\s*(?:[•·]\s*)?${EXPAND_ACTION}\s*$`),
 ];
 
-function stripSlotHint(line: string): string {
-	const plain = stripTerminalSequencesPreservingLayout(line);
+/** 导出供单测：窗口边界与键名长度是性能与裁剪行为的关键，需要逐条钉住。 */
+export function stripSlotHint(line: string): string {
+	// 切点可能落在转义序列中间，残片只当作窗口头部文本；两个模式都锚在行尾，不受影响。
+	const head = line.slice(0, Math.max(0, line.length - SLOT_HINT_WINDOW));
+	const tail = line.slice(head.length);
+	const plain = stripTerminalSequencesPreservingLayout(tail);
+	if (!SLOT_HINT_MARKERS.some((marker) => plain.includes(marker))) return line;
 	for (const re of SLOT_HINT_PATTERNS) {
 		const match = re.exec(plain);
 		if (!match) continue;
 		// 删除区间而非截断后拼纯文本：收尾括号留在原样式里（dim），不会掉回默认前景色。
-		return removeStyledRange(line, match.index, match.index + match[0].length);
+		return head + removeStyledRange(tail, match.index, match.index + match[0].length);
 	}
 	return line;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "1.0.8",
+	"version": "1.0.9",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",