@herbertgao/pi-extensions 2026.10.4 → 2026.10.5

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

@@ -6,6 +6,7 @@ import { showMoreHintText } from "./show-more-hint.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 import { getToolMouseTui } from "../mouse/scroll.ts";
 import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
+import { oneLine } from "../../utils/format.ts";
 
 const TOOL_VIEWPORT_WIDTH_RATIO = 0.8;
 /** 宽屏右侧留白上限：比例留白超过这么多列时改用固定留白。 */
@@ -75,10 +76,46 @@ export function countLines(text: string): number {
 		.filter((line) => line.trim().length > 0).length;
 }
 
+/**
+ * 折叠行的结果文案：`N lines returned`（read 说 loaded）、`Done`、失败时首行错误。
+ * 单卡折叠行与工具组的子行共用这一处口径；TaskList 的树形摘要不走这里，由调用方先判。
+ */
+export function collapsedResultSummary(options: {
+	result: any;
+	toolName: string;
+	text: string;
+	isError: boolean;
+}): string {
+	const { result, toolName, text, isError } = options;
+	if (isError) {
+		// 72 与原 result.ts 默认一致，保持错误摘要截断宽度。
+		return text ? oneLine(text, 72) : "Failed";
+	}
+	const outputLines = outputLineCount(result) || countLines(text);
+	if (!outputLines) return "Done";
+	const action = toolName === "read" ? "loaded" : "returned";
+	return `${outputLines} ${outputLines === 1 ? "line" : "lines"} ${action}`;
+}
+
 function hasExpandableResult(text: string): boolean {
 	return countLines(text) > 1;
 }
 
+/**
+ * 工具耗时：不到 1 秒报毫秒，分钟级起带上分/时。
+ * 只报到秒的话，几分钟的长命令会显示成 `300.0s`。
+ */
+export function formatToolDuration(ms: number): string {
+	const seconds = ms / 1000;
+	if (seconds < 1) return `${Math.round(ms)}ms`;
+	if (seconds < 60) return `${seconds.toFixed(1)}s`;
+	const totalSeconds = Math.floor(seconds);
+	const minutes = Math.floor(totalSeconds / 60);
+	const remainder = totalSeconds % 60;
+	if (minutes < 60) return `${minutes}m ${remainder}s`;
+	return `${Math.floor(minutes / 60)}h ${minutes % 60}m ${remainder}s`;
+}
+
 const activeAnimationContexts = new Set<any>();
 let sharedAnimationTimer: ReturnType<typeof setTimeout> | null = null;
 
@@ -135,6 +172,36 @@ export function scheduleAnimation(
 	}
 }
 
+/**
+ * 本回合流式消息里出现过的工具调用。Pi 要等整条 assistant 消息结束才派发执行，
+ * 这段窗口工具行已经在等启动，spinner 该逐帧转。
+ * 恢复或翻历史重建的旧行不在这个集合里，保持静止。
+ */
+const liveToolCalls = new Set<string>();
+
+/** 收下当前流式 assistant 消息里的工具调用 id。 */
+export function noteStreamingToolCalls(message: any): void {
+	const content = Array.isArray(message?.content) ? message.content : [];
+	for (const block of content) {
+		const id = block?.type === "toolCall" ? block.id : undefined;
+		if (typeof id === "string" && id) liveToolCalls.add(id);
+	}
+}
+
+/** 工具收尾后移出等待窗口。 */
+export function retireLiveToolCall(toolCallId: unknown): void {
+	if (typeof toolCallId === "string") liveToolCalls.delete(toolCallId);
+}
+
+export function clearLiveToolCalls(): void {
+	liveToolCalls.clear();
+}
+
+/** 工具行是否处于等待窗口（流式声明中或等待派发）。 */
+export function isLiveToolCall(toolCallId: unknown): boolean {
+	return typeof toolCallId === "string" && liveToolCalls.has(toolCallId);
+}
+
 export function pendingIcon(_name: string): string {
 	return toolLoadingIcon();
 }
@@ -231,7 +298,7 @@ export class ExpandedToolResultText {
 	}
 }
 
-/** 截断体末行 `… +N more lines` 旁的展开提示，点击打开全量预览。 */
+/** 截断体末行 `… N more lines` 旁的展开提示，点击打开全量预览。 */
 export const SHOW_MORE_LABEL = "· click to show more";
 
 export type ToolIoSection = "input" | "output";
@@ -243,14 +310,12 @@ const EXPANDED_TOOL_IO_VIEW_GENERATION = Symbol("ccstyle-expanded-tool-io-view")
 /**
  * Expanded tool body with clear Input / Output sections (Grok Build–style).
  *
- * Visual frame:
- *   ├ Input  click to show more
- *   │ path: src/a.ts
- *   │
- *   └ Output  click to show more
- *     result line…
- *
- * flushLeft=true（仅 mode=on 展开卡）：去掉树线前导空格，由外层 Box(1,1) 提供 1 格 padding。
+ * Visual frame（flushLeft=true：树线的前导空格交给外层 Box(1,1)，├/└ 与标题行的勾同列）：
+ * ├ Input  click to show more
+ * │ path: src/a.ts
+ * │
+ * └ Output  click to show more
+ *   result line…
  *
  * Reused across re-renders via context.lastComponent when possible.
  */
@@ -281,8 +346,10 @@ export class ExpandedToolIoView {
 		  }
 		| undefined;
 
-	/** flushLeft：贴左渲染（mode=on 展开卡）；默认 false 保留前导空格（compact 等共用路径）。 */
+	/** flushLeft：贴左渲染（外层 Box 负责 1 格 pad）；默认 false 保留 1 格前导空格。 */
 	private flushLeft: boolean;
+	/** 尾部附注（shell 的耗时）。挂到 Output 的 show-more 行上，没有那一行时单独成行。 */
+	private footer: string | undefined;
 
 	constructor(
 		theme: any,
@@ -398,6 +465,13 @@ export class ExpandedToolIoView {
 		this.invalidate();
 	}
 
+	/** 尾部附注（耗时等）。挂在 show-more 行上；无 show-more 行时单独成行。 */
+	setFooter(text: string | undefined): void {
+		if (this.footer === text) return;
+		this.footer = text;
+		this.invalidate();
+	}
+
 	getHoveredSection(): ToolIoSection | null {
 		return this.hoveredSection;
 	}
@@ -405,7 +479,7 @@ export class ExpandedToolIoView {
 	/** True when the plain truncation footer carries show-more. Input 续行带 │，Output 不带。 */
 	matchShowMoreLine(plainLine: string): ToolIoSection | null {
 		const line = plainLine.replace(/\x1b\[[0-9;]*m/g, "");
-		if (!line.includes(` · ${showMoreHintText()}`) || !/\+\d+ more lines/.test(line)) return null;
+		if (!line.includes(` · ${showMoreHintText()}`) || !/\d+ more lines/.test(line)) return null;
 		if (this.truncated.input && line.includes("│")) return "input";
 		if (this.truncated.output) return "output";
 		return null;
@@ -442,7 +516,7 @@ export class ExpandedToolIoView {
 
 		const theme = this.theme;
 		const safeWidth = Math.max(1, Math.floor(width));
-		// flushLeft：贴左（外层 Box 负责 1 格 pad）；否则保留 1 格前导空格（compact 共用）
+		// flushLeft：贴左（外层 Box 负责 1 格 pad）；否则保留 1 格前导空格
 		const lead = this.flushLeft ? "" : " ";
 		const rail = `${lead}│ `;
 		const railWidth = visibleWidth(rail);
@@ -474,7 +548,14 @@ export class ExpandedToolIoView {
 
 		const pushBody = (
 			body: string,
-			opts: { input?: boolean; limit: number; continued?: boolean; section: ToolIoSection },
+			opts: {
+				input?: boolean;
+				limit: number;
+				continued?: boolean;
+				section: ToolIoSection;
+				/** 挂在 show-more 行上的附注（shell 耗时），插在展开提示前。 */
+				footerNote?: string;
+			},
 		): boolean /* truncated */ => {
 			const raw = body.replace(/\t/g, "   ").replace(/\n+$/, "");
 			if (!raw.trim()) {
@@ -502,6 +583,8 @@ export class ExpandedToolIoView {
 			if (truncated) {
 				const hidden = Math.max(0, wrapped.length - visible.length);
 				if (hidden > 0) {
+					// 省略号已经表达了「还有」，计数前不再加 +。
+					const note = opts.footerNote ? theme.fg("dim", ` · ${opts.footerNote}`) : "";
 					// hover 只高亮文字，圆点保持 dim（与 group hint 一致）。
 					const more =
 						theme.fg("dim", " ·") +
@@ -509,7 +592,7 @@ export class ExpandedToolIoView {
 							this.hoveredSection === opts.section ? "text" : "dim",
 							` ${showMoreHintText()}`,
 						);
-					pushRailLine(theme.fg("dim", `… +${hidden} more lines`) + more, opts.continued);
+					pushRailLine(theme.fg("dim", `… ${hidden} more lines`) + note + more, opts.continued);
 					this.showMoreHeaderRows[opts.section] = lines.length - 1;
 				}
 			}
@@ -556,6 +639,7 @@ export class ExpandedToolIoView {
 				limit: this.maxOutputLines,
 				continued: false,
 				section: "output",
+				footerNote: this.footer,
 			});
 		} else {
 			this.truncated.output = outputWouldTruncate;
@@ -564,9 +648,16 @@ export class ExpandedToolIoView {
 				limit: this.maxOutputLines,
 				continued: false,
 				section: "output",
+				footerNote: this.footer,
 			});
 		}
 
+		// 耗时挂在 Output 的 show-more 行上（与折叠态一样，提示留在行尾）；
+		// 没截断就没有那一行，才单独成行。放在最后追加，前面记下的行号不受影响。
+		if (this.footer && this.showMoreHeaderRows.output === undefined) {
+			pushRailLine(theme.fg("muted", this.footer), false);
+		}
+
 		this.cachedWidth = width;
 		this.cachedLines = lines;
 		return withIoViewMarkers(this, lines);
@@ -830,7 +921,7 @@ export function renderExpandedToolResult(
 	lastComponent?: unknown,
 	args?: unknown,
 	context?: any,
-	/** mode=on 展开卡贴左；compact 等保持默认前导空格 */
+	/** 贴左渲染：树线的前导空格交给外层 Box(1,1) */
 	flushLeft = false,
 ): ExpandedToolIoView | ExpandedToolResultText | Text {
 	const { text: inputBody, codeBlock } = formatToolInputBody(args);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/utils/format.ts

@@ -1,6 +1,15 @@
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { sanitizeToolResultText } from "./tool-result-sanitize.ts";
 
+/** token/计数缩写：<1k 原数，<1M 用 k，≥1M 用 M。footer 与 working message 共用。 */
+export function formatTokenCount(value: number): string {
+	if (value < 1000) return `${value}`;
+	if (value < 10_000) return `${(value / 1000).toFixed(1)}k`;
+	if (value < 1_000_000) return `${Math.round(value / 1000)}k`;
+	if (value < 10_000_000) return `${(value / 1_000_000).toFixed(1)}M`;
+	return `${Math.round(value / 1_000_000)}M`;
+}
+
 /** 毫秒 → "1h 2m 3s"/"2m 3s"/"3s"；低于 1 秒返回 ""（省略）。 */
 export function formatDuration(ms: number): string {
 	const totalSec = Math.floor(ms / 1000);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/utils/patch-keys.ts

@@ -43,6 +43,11 @@ export const TOOL_GROUPING_GENERATION_KEY = Symbol.for("pi.ccstyle.tool-grouping
 // ── regular 主屏渲染补丁 ──
 export const MAIN_SCREEN_DO_RENDER_PATCH = Symbol.for("pi.ccstyle.main-screen-do-render-patch");
 
+// ── fullscreen 粘性用户消息头 ──
+export const STICKY_PROMPT_MARKER_PATCH = Symbol.for("pi.ccstyle.sticky-prompt-marker-patch");
+export const STICKY_PROMPT_FRAME_PATCH = Symbol.for("pi.ccstyle.sticky-prompt-frame-patch");
+export const STICKY_PROMPT_STATE_SLOT = Symbol.for("pi.ccstyle.sticky-prompt-state");
+
 // ── 鼠标交互 ──
 export const TOOL_MOUSE_OWNER_KEY = Symbol.for("pi.ccstyle.tool-mouse-owner");
 export const TOOL_MOUSE_TUI_SLOT = Symbol.for("pi.ccstyle.tool-mouse-tui");

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

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-cc-extensions",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "license": "MIT",
   "description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
   "type": "module",
@@ -71,9 +71,9 @@
   },
   "x-upstream": {
     "package": "pi-cc-extensions",
-    "version": "0.9.10",
-    "reviewedVersion": "0.9.12",
+    "version": "1.0.1",
+    "reviewedVersion": "1.0.1",
     "repository": "https://github.com/minuque/pi-cc-extensions",
-    "commit": "2b72669cafefe0771b2e3e63b0db5c478314d2d4"
+    "commit": "0188b76f2597772bea3b42075857e030d9a89666"
   }
 }

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

@@ -18,7 +18,7 @@
 		"red": "#fb7185",
 		"yellow": "#facc15",
 		"orange": "#fb923c",
-		"text": "#f5f5f5",
+		"text": "#e4e4e7",
 		"muted": "#a1a1aa",
 		"dim": "#71717a",
 		"selectedBg": "#252035",

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

@@ -18,7 +18,7 @@
 		"red": "#dc2626",
 		"yellow": "#a16207",
 		"orange": "#c2410c",
-		"text": "#242127",
+		"text": "#282530",
 		"muted": "#625f68",
 		"dim": "#76717d",
 		"selectedBg": "#e3e8f5",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-extensions",
-  "version": "2026.10.4",
+  "version": "2026.10.5",
   "description": "Aggregate installer for HerbertGao-maintained Pi extensions.",
   "keywords": [
     "extensions",
@@ -40,7 +40,7 @@
     "@dietrichgebert/ponytail": "5.1.0",
     "@herbertgao/pi-agency": "0.1.0",
     "@herbertgao/pi-bark": "0.2.0",
-    "@herbertgao/pi-cc-extensions": "0.11.1",
+    "@herbertgao/pi-cc-extensions": "0.12.0",
     "@herbertgao/pi-subagents": "0.19.0",
     "@herbertgao/sol-pi": "0.4.0",
     "@juicesharp/rpiv-ask-user-question": "2.12.0",