@herbertgao/pi-extensions 2026.8.4 → 2026.8.5

package/README.md

@@ -11,12 +11,12 @@ pi install npm:@herbertgao/pi-extensions
 The package bundles 11 active `@herbertgao/*` child packages, including `@herbertgao/pi-cc-extensions`, plus the following upstream packages under their original names:
 
 - `@dietrichgebert/ponytail@4.9.0`
-- `@juicesharp/rpiv-ask-user-question@2.4.0`
-- `@narumitw/pi-btw@0.50.0`
+- `@juicesharp/rpiv-ask-user-question@2.5.2`
+- `@narumitw/pi-btw@0.51.0`
 - `@pi-plugins/fast-mode@0.1.9`
-- `pi-mcp-adapter@2.23.0`
+- `pi-mcp-adapter@2.25.0`
 - `pi-footer@0.5.1`
-- `pi-lens@3.8.74`
+- `pi-lens@4.0.0`
 - `pi-web-access@0.22.0`
 - `remote-pi@0.7.0`
 - `@czottmann/pi-automode@1.11.0`

package/node_modules/@herbertgao/pi-cc-extensions/README.en.md

@@ -39,7 +39,7 @@ Run `/reload` after installation.
 | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
 | Claude Code Output     | Tool summaries, expand/collapse, rich edit/write diffs, and `on` / `compact` / `off` modes                                                         | `/ccstyle`  |
 | Fullscreen mode          | Tool card/group click-to-toggle, previews, hover highlight, and a back-to-bottom button | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
-| Settings panel               | `Style / Diff / Thinking / Feature` tabs: startup header toggle and wheel step                                                                    | `/ccstyle`  |
+| Settings panel               | `Style / Diff / Thinking / Feature` tabs with startup, wheel, and optional feature toggles                                                        | `/ccstyle`  |
 | Context inspection           | Usage breakdown and previews for the system prompt, tools, skills, and messages                                                                   | `/context`  |
 | Session/Subagent references           | Search and inject effective context from previous Sessions or existing SubAgents                                                                  | `@` |
 | Theme                        | Bundled CC Dark and CC Light themes                                                                                                               | `/theme`    |
@@ -62,10 +62,18 @@ Run `/reload` after installation.
   "previewLines": 3,                       // thinking preview lines; 0 hides the preview body
   "animationIntervalMs": 90,               // thinking title animation interval in ms
   "showStartupHeader": true,               // custom startup header (logo + tips) toggle
-  "scrollStepLines": 3                     // fullscreen mouse wheel scroll lines
+  "scrollStepLines": 3,                    // fullscreen mouse wheel scroll lines
+  "enableSessionReference": true,          // @ session references
+  "enableSubagentAutocomplete": true,      // @ subagent autocomplete
+  "enableContextCommand": true,            // /context inspection
+  "enableAgentSummary": true,              // per-turn tool summary
+  "enableWorkingMessage": true,            // Working... token/time details
+  "enableAliases": true                    // /clear and /exit aliases
 }
 ```
 
+> **Tip**: set Mermaid diagrams to `final` in `/settings` to avoid redrawing streaming content frame by frame.
+
 ## Local development
 
 ```bash

package/node_modules/@herbertgao/pi-cc-extensions/README.md

@@ -39,7 +39,7 @@ pi install npm:@herbertgao/pi-cc-extensions
 | ---------------------- | ---------------------------------------------------------------------------------------------------------- | ------------- |
 | Claude Code UI | 工具摘要、折叠展开、rich edit/write diff，以及 `on` / `compact` / `off` 三种模式                          | `/ccstyle`  |
 | Fullscreen mode  | 工具卡/group 点击展开与收起、预览、hover 高亮、回到底部按钮 | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
-| 配置面板             | `Style / Diff / Thinking / Feature` 四页签，含启动头开关与滚轮步进                                       | `/ccstyle`  |
+| 配置面板             | `Style / Diff / Thinking / Feature` 四页签，含启动头、滚轮步进及可选功能开关                              | `/ccstyle`  |
 | 上下文检查           | 查看上下文占用，并预览 System prompt、Tools、Skills 和消息内容                                           | `/context`  |
 | Session/Subagent 引用         | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                                                      | `@` |
 | 主题                 | 随包提供内置 CC Dark、CC Light 主题                                                                      | `/theme`    |
@@ -62,10 +62,18 @@ pi install npm:@herbertgao/pi-cc-extensions
   "previewLines": 3,                       // thinking 预览行数，0 隐藏预览正文
   "animationIntervalMs": 90,               // thinking 标题动画间隔（毫秒）
   "showStartupHeader": true,               // 自定义启动头（logo + tips）开关
-  "scrollStepLines": 3                     // fullscreen 滚轮滚动步进行数
+  "scrollStepLines": 3,                    // fullscreen 滚轮滚动步进行数
+  "enableSessionReference": true,          // @ session 引用
+  "enableSubagentAutocomplete": true,      // @ subagent 自动补全
+  "enableContextCommand": true,            // /context 上下文检查
+  "enableAgentSummary": true,              // 每回合工具统计摘要
+  "enableWorkingMessage": true,            // Working... token/耗时展示
+  "enableAliases": true                    // /clear、/exit 别名
 }
 ```
 
+> **建议**：在 `/settings` 中将 Mermaid diagrams 设为 `final`，避免流式内容逐帧重绘。
+
 ## 本地开发
 
 ```bash

package/node_modules/@herbertgao/pi-cc-extensions/extensions/config/config.ts

@@ -25,6 +25,12 @@ export type Config = {
 	animationIntervalMs: number;
 	showStartupHeader: boolean;
 	scrollStepLines: number;
+	enableSessionReference: boolean;
+	enableSubagentAutocomplete: boolean;
+	enableContextCommand: boolean;
+	enableAgentSummary: boolean;
+	enableWorkingMessage: boolean;
+	enableAliases: boolean;
 };
 
 const AGENT_DIR = process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi", "agent");
@@ -67,6 +73,12 @@ export const DEFAULT_CONFIG: Config = {
 	animationIntervalMs: 90,
 	showStartupHeader: true,
 	scrollStepLines: 3,
+	enableSessionReference: true,
+	enableSubagentAutocomplete: true,
+	enableContextCommand: true,
+	enableAgentSummary: true,
+	enableWorkingMessage: true,
+	enableAliases: true,
 };
 
 function pickEnum<T extends string>(value: unknown, allowed: readonly T[], fallback: T): T {
@@ -148,6 +160,12 @@ export function normalizeConfig(input: unknown): Config {
 		),
 		showStartupHeader: source.showStartupHeader !== false,
 		scrollStepLines: pickPositiveInt(source.scrollStepLines, DEFAULT_CONFIG.scrollStepLines, 1, 50),
+		enableSessionReference: source.enableSessionReference !== false,
+		enableSubagentAutocomplete: source.enableSubagentAutocomplete !== false,
+		enableContextCommand: source.enableContextCommand !== false,
+		enableAgentSummary: source.enableAgentSummary !== false,
+		enableWorkingMessage: source.enableWorkingMessage !== false,
+		enableAliases: source.enableAliases !== false,
 	};
 }
 
@@ -189,6 +207,12 @@ export function formatConfigStatus(source: Config = config): string {
 		`thinkingAnimation=${source.animationIntervalMs}ms`,
 		`startupHeader=${source.showStartupHeader ? "on" : "off"}`,
 		`scrollStep=${source.scrollStepLines}`,
+		`sessionRef=${source.enableSessionReference ? "on" : "off"}`,
+		`subagentAuto=${source.enableSubagentAutocomplete ? "on" : "off"}`,
+		`context=${source.enableContextCommand ? "on" : "off"}`,
+		`agentSummary=${source.enableAgentSummary ? "on" : "off"}`,
+		`workingMsg=${source.enableWorkingMessage ? "on" : "off"}`,
+		`aliases=${source.enableAliases ? "on" : "off"}`,
 	].join(" · ");
 }
 

package/node_modules/@herbertgao/pi-cc-extensions/extensions/config/panel.ts

@@ -64,6 +64,29 @@ function diffIndicatorDescription(mode: DiffIndicatorMode): string {
 	return "Vertical bar indicators on changed lines (default).";
 }
 
+function featureToggleSetting(
+	id: string,
+	label: string,
+	onDescription: string,
+	offDescription: string,
+	current: boolean,
+) {
+	const setting = {
+		id,
+		label,
+		description: current ? onDescription : offDescription,
+		currentValue: current ? "on" : "off",
+		values: ["on", "off"],
+	};
+	return {
+		setting,
+		apply(on: boolean): void {
+			setting.currentValue = on ? "on" : "off";
+			setting.description = on ? onDescription : offDescription;
+		},
+	};
+}
+
 function buildExcludeRenderersSubmenu(
 	onClose: () => void,
 	onLiveChange: () => void,
@@ -333,8 +356,66 @@ export async function showCcstylePanel(
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
 				buildNumberInputSubmenu(theme, scrollStepSetting, closeSubmenu),
 		};
+		const sessionReferenceToggle = featureToggleSetting(
+			"enableSessionReference",
+			"Session reference",
+			"@ session mentions search and inject referenced context after restart.",
+			"Session reference disabled.",
+			config.enableSessionReference,
+		);
+		const subagentAutocompleteToggle = featureToggleSetting(
+			"enableSubagentAutocomplete",
+			"Subagent autocomplete",
+			"@ subagent mentions suggest agents and delegation instructions after restart.",
+			"Subagent autocomplete disabled.",
+			config.enableSubagentAutocomplete,
+		);
+		const contextCommandToggle = featureToggleSetting(
+			"enableContextCommand",
+			"Context usage",
+			"/context shows context-window distribution after restart.",
+			"Context command disabled.",
+			config.enableContextCommand,
+		);
+		const agentSummaryToggle = featureToggleSetting(
+			"enableAgentSummary",
+			"Agent summary",
+			"Append per-round tool stats after each agent turn after restart.",
+			"Agent summary disabled.",
+			config.enableAgentSummary,
+		);
+		const workingMessageToggle = featureToggleSetting(
+			"enableWorkingMessage",
+			"Working message",
+			"Extend Working... with token count and elapsed time after restart.",
+			"Native Working... footer only.",
+			config.enableWorkingMessage,
+		);
+		const aliasesToggle = featureToggleSetting(
+			"enableAliases",
+			"Aliases",
+			"/clear and /exit aliases enabled after restart.",
+			"Aliases disabled.",
+			config.enableAliases,
+		);
+		const featureToggles: Record<string, { apply: (on: boolean) => void }> = {
+			enableSessionReference: sessionReferenceToggle,
+			enableSubagentAutocomplete: subagentAutocompleteToggle,
+			enableContextCommand: contextCommandToggle,
+			enableAgentSummary: agentSummaryToggle,
+			enableWorkingMessage: workingMessageToggle,
+			enableAliases: aliasesToggle,
+		};
 
 		const onSettingChange = (id: string, value: string) => {
+			const featureToggle = featureToggles[id];
+			if (featureToggle) {
+				(config as unknown as Record<string, boolean>)[id] = value === "on";
+				featureToggle.apply(value === "on");
+				saveConfig();
+				ctx.ui.notify(`Updated ${id}: ${value} (next restart)`, "info");
+				return;
+			}
 			switch (id) {
 				case "mode": {
 					// 选项值带 Experimental 标记，选择后还原为真实 mode 值。
@@ -450,7 +531,16 @@ export async function showCcstylePanel(
 			{
 				id: "feature",
 				label: "Feature",
-				items: [startupHeaderSetting, scrollStepSetting],
+				items: [
+					startupHeaderSetting,
+					scrollStepSetting,
+					sessionReferenceToggle.setting,
+					subagentAutocompleteToggle.setting,
+					contextCommandToggle.setting,
+					agentSummaryToggle.setting,
+					workingMessageToggle.setting,
+					aliasesToggle.setting,
+				],
 			},
 		];
 

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/compact-thinking.ts

@@ -94,7 +94,7 @@ type AssistantInternals = {
 };
 
 type PatchedPrototype = typeof AssistantMessageComponent.prototype & {
-	updateContent: (message: AssistantMessage) => void;
+	updateContent: (message: AssistantMessage, isStreaming?: boolean) => void;
 };
 
 // 配置由 claude-code-style 管控（installCompactThinking 注入初始值，
@@ -334,9 +334,13 @@ function compactThinking(pi: ExtensionAPI) {
 		);
 	}
 
-	prototype.updateContent = function patchedUpdateContent(message: AssistantMessage) {
+	prototype.updateContent = function patchedUpdateContent(
+		message: AssistantMessage,
+		isStreaming?: boolean,
+	) {
 		const component = this as AssistantMessageComponentLike;
 		const self = this as unknown as AssistantInternals;
+		self.isStreaming = isStreaming ?? self.isStreaming;
 		self.lastMessage = message;
 		latestComponent = component;
 		latestComponentTimestamp = message.timestamp;
@@ -344,7 +348,7 @@ function compactThinking(pi: ExtensionAPI) {
 		// Visible mode is intentionally untouched: Shift+Tab restores Pi's exact
 		// built-in Thinking Markdown renderer, including every OpenAI summary stage.
 		if (!self.hideThinkingBlock) {
-			originalUpdateContent.call(this, message);
+			originalUpdateContent.call(this, message, self.isStreaming);
 			return;
 		}
 

package/node_modules/@herbertgao/pi-cc-extensions/extensions/index.ts

@@ -1,4 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { config } from "./config/config.ts";
 
 // shell
 import piAliases from "./feature/shell/aliases.ts";
@@ -21,9 +22,9 @@ import markdownEnhance from "./renderer/markdown-enhance.ts";
 
 export default function (pi: ExtensionAPI): void {
 	// shell chrome
-	piAliases(pi);
+	if (config.enableAliases) piAliases(pi);
 	piStartupHeader(pi);
-	workingMessage(pi);
+	if (config.enableWorkingMessage) workingMessage(pi);
 
 	// Renderer 必须先注册 lifecycle handler，shutdown 时才能先解开外层 compact
 	// patch；bridge 让稍后安装的 thinking controller 仍可直接供 renderer query。
@@ -42,8 +43,8 @@ export default function (pi: ExtensionAPI): void {
 	compactThinking = installCompactThinking(pi, getCompactThinkingConfig());
 
 	// features
-	context(pi);
-	sessionReference(pi);
-	agentAutocomplete(pi);
-	agentSummary(pi);
+	if (config.enableContextCommand) context(pi);
+	if (config.enableSessionReference) sessionReference(pi);
+	if (config.enableSubagentAutocomplete) agentAutocomplete(pi);
+	if (config.enableAgentSummary) agentSummary(pi);
 }

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/compact-mode.ts

@@ -769,13 +769,13 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		dispose: () => {},
 	};
 
-	const passThroughAssistant = (component: any, message: any): any => {
+	const passThroughAssistant = (component: any, message: any, isStreaming?: boolean): any => {
 		const self = component as any;
 		if (self[ASSISTANT_REENTRY_KEY] === patch)
-			return patch.assistantNative.call(component, message);
+			return patch.assistantNative.call(component, message, isStreaming);
 		self[ASSISTANT_REENTRY_KEY] = patch;
 		try {
-			return patch.assistantOriginal.call(component, message);
+			return patch.assistantOriginal.call(component, message, isStreaming);
 		} finally {
 			delete self[ASSISTANT_REENTRY_KEY];
 		}
@@ -845,12 +845,20 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		if (render) renderRound(round);
 	};
 
-	const renderAssistantWithoutThinking = (component: any, message: any): any => {
+	const renderAssistantWithoutThinking = (
+		component: any,
+		message: any,
+		isStreaming?: boolean,
+	): any => {
 		const content = Array.isArray(message?.content) ? message.content : [];
-		const result = passThroughAssistant(component, {
-			...message,
-			content: content.filter((item: any) => item?.type !== "thinking"),
-		});
+		const result = passThroughAssistant(
+			component,
+			{
+				...message,
+				content: content.filter((item: any) => item?.type !== "thinking"),
+			},
+			isStreaming,
+		);
 		component.lastMessage = message;
 		return result;
 	};
@@ -980,18 +988,19 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		stopRoundTick();
 	};
 
-	patch.assistantInstalled = function (this: any, message: any) {
+	patch.assistantInstalled = function (this: any, message: any, isStreaming?: boolean) {
 		const self = this as any;
+		if (isStreaming !== undefined) self.isStreaming = isStreaming;
 		if (self[ASSISTANT_REENTRY_KEY] === patch) {
-			return patch.assistantNative.call(this, message);
+			return patch.assistantNative.call(this, message, isStreaming);
 		}
 		self.lastMessage = message;
 		trackedAssistantComponents.add(this);
 		if (!patch.active || config.mode !== "compact") {
-			return passThroughAssistant(this, message);
+			return passThroughAssistant(this, message, isStreaming);
 		}
 		if (!self.contentContainer || typeof self.contentContainer.clear !== "function") {
-			return passThroughAssistant(this, message);
+			return passThroughAssistant(this, message, isStreaming);
 		}
 
 		const content = Array.isArray(message?.content) ? message.content : [];

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/default-mode.ts

@@ -158,11 +158,10 @@ function singleToolCallSummary(
 	const name = toolName.toLowerCase();
 	const value = (fallback: string, ...keys: string[]) => {
 		const found = keys.map((key) => args[key]).find((item) => typeof item === "string" && item);
-		// 与多 tool 摘要对齐：从头截断，上限 96 字符（tool-grouping oneLine 默认值）。
-		return `${title} ${oneLine(found || fallback, 96)}`;
+		return `${title} ${oneLine(found || fallback)}`;
 	};
 	if (AGENT_FAMILY_TOOL_NAMES.has(toolName) && args.agent_id) {
-		return { main: `${title} ${oneLine(args.agent_id, 96)}`, detail: "" };
+		return { main: `${title} ${oneLine(args.agent_id)}`, detail: "" };
 	}
 	// Agents 走 ccstyle wrapper；Agent 保留专用渲染器。
 	if (name === "agents") {
@@ -203,7 +202,7 @@ function singleToolCallSummary(
 			args.limit !== undefined ? `limit=${args.limit}` : "",
 		].filter(Boolean);
 		return {
-			main: `${title}${args.path ? ` ${oneLine(args.path, 96)}` : ""}`,
+			main: `${title}${args.path ? ` ${oneLine(args.path)}` : ""}`,
 			detail: details.length ? ` (${details.join(", ")})` : "",
 		};
 	}
@@ -223,7 +222,7 @@ function singleToolCallSummary(
 	return {
 		main:
 			preferred !== undefined && preferred !== null && typeof preferred !== "object"
-				? `${title} ${oneLine(preferred, 96)}`
+				? `${title} ${oneLine(preferred)}`
 				: title,
 		detail: "",
 	};

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/markdown-enhance.ts

@@ -55,9 +55,8 @@ const ADMONITION_STYLE: Record<string, { icon: string; label: string }> = {
 };
 
 /**
- * 把 > [!TYPE] 及其后续 > 行转成两列表格（图标标签列 + 内容列），视觉上成提示框。
- * 表格 cell 内不支持换行（<br> 显示为字面量），多行内容用空格合并。
- * 返回 null 表示该行不是提示框。
+ * 把 > [!TYPE] 及其后续 > 行转成带加粗标签的引用块，视觉上成提示框。
+ * 多行内容用空格合并为一行。返回 null 表示该行不是提示框。
  */
 function renderAdmonition(lines: string[], i: number): { output: string[]; next: number } | null {
 	const m = lines[i].match(ADMONITION);
@@ -70,11 +69,9 @@ function renderAdmonition(lines: string[], i: number): { output: string[]; next:
 		j++;
 	}
 	while (body.length > 0 && body[body.length - 1].trim() === "") body.pop();
-	// 内容里的 | 转义，避免拆出额外表格列
-	const content = body.join(" ").trim().replace(/\|/g, "\\|");
-	// 表格后补空行，防止紧接的段落被解析为表格数据行
+	const content = body.join(" ").trim();
 	return {
-		output: [`| ${style.icon} ${style.label} | ${content} |`, "|---|---|", ""],
+		output: [`> **${style.icon} ${style.label}**${content ? ` ${content}` : ""}`, ""],
 		next: j,
 	};
 }
@@ -330,7 +327,7 @@ function renderDiagrams(
 	return out.join("\n");
 }
 
-/** GitHub 风格提示框 → 两列表格（跳过代码块）。 */
+/** GitHub 风格提示框 → 加粗标签引用块（跳过代码块）。 */
 function renderAdmonitions(markdown: string): string {
 	const lines = markdown.split("\n");
 	const out: string[] = [];

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/grouping.ts

@@ -96,7 +96,7 @@ function visibleLines(lines: string[]): string[] {
 
 function stripLeadingStatusIcon(line: string): string {
 	return line.replace(
-		/^((?:\x1b\[[0-9;]*m|[ \t]|[├└│─])*)(?:\x1b\[[0-9;]*m)*(?:[✓✗●○■⬤•·])(?:\x1b\[[0-9;]*m)*\s+/,
+		/^((?:\x1b\[[0-9;]*m|[ \t]|[├└│─])*)(?:\x1b\[[0-9;]*m)*(?:[✓✗●○■⬤•·⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏])(?:\x1b\[[0-9;]*m)*\s+/,
 		"$1",
 	);
 }
@@ -127,6 +127,10 @@ function stripLeadingSpaces(line: string, count: number): string {
 }
 
 /** 生成一行铺满 width 的 slot 背景行；bgAnsiOverride 可替换背景 ANSI（用于提亮等）。 */
+function panelInnerWidth(width: number): number {
+	return Math.max(0, Math.floor(width) - 2);
+}
+
 export function paddedBackgroundRow(
 	theme: any,
 	slot: string,
@@ -134,9 +138,12 @@ export function paddedBackgroundRow(
 	width: number,
 	bgAnsiOverride?: string,
 ): string {
-	const innerWidth = Math.max(0, width - 2);
+	const safeWidth = Math.max(0, Math.floor(width));
+	const leftPadding = safeWidth > 0 ? " " : "";
+	const rightPadding = safeWidth > 1 ? " " : "";
+	const innerWidth = panelInnerWidth(width);
 	const clipped = truncateToWidth(stripBackgroundAnsi(content), innerWidth, "");
-	const row = ` ${clipped}${" ".repeat(Math.max(0, innerWidth - visibleWidth(clipped)))} `;
+	const row = `${leftPadding}${clipped}${" ".repeat(Math.max(0, innerWidth - visibleWidth(clipped)))}${rightPadding}`;
 	const bgAnsi =
 		bgAnsiOverride ||
 		(typeof theme?.bg === "function"
@@ -147,11 +154,10 @@ export function paddedBackgroundRow(
 	return `${bgAnsi}${stable}\x1b[49m`;
 }
 
-function oneLine(value: unknown, max = 96): string {
-	const text = sanitizeToolResultText(String(value ?? ""), 4096)
+function oneLine(value: unknown): string {
+	return sanitizeToolResultText(String(value ?? ""), 4096)
 		.replace(/\s+/g, " ")
 		.trim();
-	return text.length > max ? `${text.slice(0, max - 1)}…` : text;
 }
 
 function humanizeToolName(name: string): string {
@@ -264,6 +270,10 @@ function toolNameList(tools: any[]): string {
 
 let nextGroupId = 1;
 
+function groupChildWidth(width: number): number {
+	return Math.max(1, panelInnerWidth(width));
+}
+
 export class ToolGroupComponent extends Container {
 	readonly toolCallId = `ccstyle-tool-group-${nextGroupId++}`;
 	readonly toolName = "Tool group";
@@ -311,7 +321,7 @@ export class ToolGroupComponent extends Container {
 
 	/**
 	 * 展开时按局部行定位内部组件（null = 行属于 group 自身：空行/头行/尾行）。
-	 * 行数计算与 render 保持一致：宽度 width-2 + 空行过滤。
+	 * 行数计算与 render 保持一致：预留背景 padding、分支和状态前缀后再过滤空行。
 	 */
 	childAtRow(localRow: number, width: number): { component: any; row: number } | null {
 		if (!this._expanded || localRow < 2) return null;
@@ -319,7 +329,7 @@ export class ToolGroupComponent extends Container {
 		for (const tool of this.children) {
 			let lines: string[] = [];
 			try {
-				const rendered = tool.render?.(Math.max(1, width - 2));
+				const rendered = tool.render?.(groupChildWidth(width));
 				if (Array.isArray(rendered)) lines = visibleLines(rendered.map((line) => String(line)));
 			} catch {
 				lines = [];
@@ -386,7 +396,7 @@ export class ToolGroupComponent extends Container {
 				);
 				continue;
 			}
-			const rendered = visibleLines(tool.render(Math.max(1, width - 2)));
+			const rendered = visibleLines(tool.render(groupChildWidth(width)));
 			if (rendered.length) {
 				rendered[0] = stripLeadingStatusIcon(rendered[0])
 					.replace(/^ +/, "")
@@ -434,7 +444,7 @@ function ungroup(patch: Patch): void {
 	}
 }
 
-function normalizeGroup(patch: Patch, group: ToolGroupComponent): void {
+function normalizeGroup(group: ToolGroupComponent): void {
 	if (group.children.length > 1) return;
 	const parent = (group as any)[PARENT_KEY];
 	const index = parent?.children?.indexOf(group) ?? -1;
@@ -565,12 +575,12 @@ export function installToolGrouping(getEnabled: () => boolean): ToolGroupingHook
 			const group = component?.[PARENT_KEY];
 			if (group instanceof ToolGroupComponent && (group as any)[PARENT_KEY] === this) {
 				group.removeTool(component);
-				normalizeGroup(patch, group);
+				normalizeGroup(group);
 				return;
 			}
 			const result = patch.original.removeChild.call(this, component);
 			if (component?.[PARENT_KEY] === this) delete component[PARENT_KEY];
-			if (this instanceof ToolGroupComponent) normalizeGroup(patch, this);
+			if (this instanceof ToolGroupComponent) normalizeGroup(this);
 			if (component instanceof ToolGroupComponent) {
 				for (const tool of component.releaseTools()) delete tool[PARENT_KEY];
 			}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/result.ts

@@ -5,10 +5,8 @@ import { showMoreHintText } from "../show-more-hint.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
 
-const TOOL_VIEWPORT_WIDTH_RATIO = 0.8;
-
 export function toolViewportWidth(width: number): number {
-	return Math.max(1, Math.floor(width * TOOL_VIEWPORT_WIDTH_RATIO));
+	return Math.max(1, Math.floor(width));
 }
 
 /** 与默认工具结果相同的一级缩进包装。 */
@@ -23,7 +21,7 @@ export function insetComponent(component: any): any {
 	};
 }
 
-export function oneLine(value: unknown, max = 72): string {
+export function oneLine(value: unknown, max = 4096): string {
 	const text = sanitizeToolResultText(String(value ?? ""))
 		.replace(/\s+/g, " ")
 		.trim();

package/node_modules/@herbertgao/pi-cc-extensions/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@herbertgao/pi-cc-extensions",
-	"version": "0.8.53",
+	"version": "0.8.54",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",
@@ -69,8 +69,8 @@
 	},
 	"x-upstream": {
 		"package": "pi-cc-extensions",
-		"version": "0.8.54",
+		"version": "0.8.56",
 		"repository": "https://github.com/minuque/pi-cc-extensions",
-		"commit": "8372ecaff7f079ab4452db47328c3238620a4885"
+		"commit": "6d83911f78628167b3ddb6e2e45787b829b54f55"
 	}
 }

package/node_modules/@herbertgao/pi-subagents/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.15.4
+
+### Patch Changes
+
+- [#45](https://github.com/HerbertGao/pi-extensions/pull/45) [`97bad4e`](https://github.com/HerbertGao/pi-extensions/commit/97bad4e05f7398d9910786e8d614ffd4943cac8c) Thanks [@HerbertGao](https://github.com/HerbertGao)! - Link persisted subagent sessions to their parent Pi session and advance the reviewed upstream baseline to 0.15.1.
+
+- [#52](https://github.com/HerbertGao/pi-extensions/pull/52) [`b12ab55`](https://github.com/HerbertGao/pi-extensions/commit/b12ab5597059ff2020e2108f8e8de85ce64e49c7) Thanks [@HerbertGao](https://github.com/HerbertGao)! - Sync the applicable pi-subagents 0.16.0 fixes and advance the reviewed upstream baseline to bcbd602.
+
 ## 0.15.3
 
 ### Patch Changes

package/node_modules/@herbertgao/pi-subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-subagents",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Claude Code-style autonomous subagents for Pi, with HerbertGao-maintained UI extensions.",
   "keywords": [
     "agent",
@@ -40,13 +40,17 @@
   "scripts": {
     "lint": "biome check src/ test/",
     "typecheck": "tsc --noEmit",
-    "test": "vitest run"
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
     "@sinclair/typebox": "^0.34.49",
     "croner": "^10.0.1",
     "nanoid": "^5.0.0"
   },
+  "devDependencies": {
+    "@vitest/coverage-istanbul": "^4.1.10"
+  },
   "peerDependencies": {
     "@earendil-works/pi-ai": ">=0.80.0",
     "@earendil-works/pi-coding-agent": ">=0.80.0",
@@ -64,8 +68,8 @@
   },
   "x-upstream": {
     "package": "@tintinweb/pi-subagents",
-    "version": "0.15.0",
+    "version": "0.16.0",
     "repository": "https://github.com/tintinweb/pi-subagents",
-    "commit": "c83dd82"
+    "commit": "bcbd602"
   }
 }