pi-cc-extensions 0.9.12 → 1.0.1

package/extensions/renderer/tool/diff/diff-renderer.ts

@@ -20,4 +20,8 @@ export { shouldHighlightCodeBlock } from "./diff-highlight.ts";
 export type { DisplayConfigInput } from "./diff-component.ts";
 export { isRichDiffComponent } from "./diff-component.ts";
 export { countEditDiffStats, renderEditDiffResult } from "./diff-edit-render.ts";
-export { countWriteDiffStats, renderWriteDiffResult } from "./diff-write-render.ts";
+export {
+	countWriteDiffStats,
+	renderWriteDiffResult,
+	writeStatsInCollapsedBody,
+} from "./diff-write-render.ts";

package/extensions/renderer/tool/diff/diff-write-render.ts

@@ -1,4 +1,5 @@
 import { Text, truncateToWidth, visibleWidth, type Component } from "@earendil-works/pi-tui";
+import type { ToolDisplayConfig } from "../../../config/config.ts";
 import { sanitizeToolResultText } from "../../../utils/tool-result-sanitize.ts";
 import { showMoreHintText } from "../show-more-hint.ts";
 import { splitWriteContentLines } from "./diff-text.ts";
@@ -54,6 +55,7 @@ import {
 	buildDiffSummaryText,
 	normalizeDiffRenderWidth,
 	resolveDiffPresentationMode,
+	styleDiffSummaryLine,
 	type DiffPresentationMode,
 } from "./diff-presentation.ts";
 
@@ -290,13 +292,14 @@ function renderWriteOverwriteGuardRows(
 	return renderSingleDiffRow(buildWriteOverwriteGuardText(guard, width), "warning", width, theme);
 }
 
-/** Folded write with `writeDiffCollapsedLines: 0`: `↳ created · click to show more`. */
+/** Folded write with `writeDiffCollapsedLines: 0`: `↳ diff +A -D · created · click to show more`. */
 function renderWriteCollapsedHintLine(
 	wasOverwrite: boolean,
 	width: number,
 	theme: DiffTheme,
 	hovered: boolean,
 	headerLabel?: string,
+	stats?: { added: number; removed: number },
 ): string[] {
 	const safeWidth = normalizeDiffRenderWidth(width);
 	if (safeWidth === 0) {
@@ -304,7 +307,20 @@ function renderWriteCollapsedHintLine(
 	}
 	const actionLabel = headerLabel?.trim() || (wasOverwrite ? "overwritten" : "created");
 	const clickLabel = showMoreHintText();
-	const candidates = [`↳ ${actionLabel} · ${clickLabel}`, `↳ ${actionLabel}`, actionLabel, "…"];
+	const counts = stats ? `+${stats.added} -${stats.removed}` : "";
+	const candidates = stats
+		? [
+				`↳ diff ${counts} · ${actionLabel} · ${clickLabel}`,
+				`↳ diff ${counts} · ${clickLabel}`,
+				`↳ diff ${counts} · ${actionLabel}`,
+				`↳ diff ${counts}`,
+				`↳ ${counts} · ${clickLabel}`,
+				`↳ ${actionLabel} · ${clickLabel}`,
+				`↳ ${actionLabel}`,
+				actionLabel,
+				"…",
+			]
+		: [`↳ ${actionLabel} · ${clickLabel}`, `↳ ${actionLabel}`, actionLabel, "…"];
 	let text = candidates[candidates.length - 1] ?? "…";
 	for (const candidate of candidates) {
 		if (visibleWidth(candidate) <= safeWidth) {
@@ -315,16 +331,21 @@ function renderWriteCollapsedHintLine(
 	if (visibleWidth(text) > safeWidth) {
 		text = truncateToWidth(text, safeWidth, "");
 	}
-	const clickIndex = text.lastIndexOf(clickLabel);
-	const styled =
-		hovered && clickIndex >= 0
-			? theme.fg("muted", text.slice(0, clickIndex)) +
-				theme.fg("text", clickLabel) +
-				theme.fg("muted", text.slice(clickIndex + clickLabel.length))
-			: theme.fg("muted", text);
+	const styled = styleDiffSummaryLine(text, stats, clickLabel, theme, hovered);
 	return [clampDiffLineToWidth(styled, safeWidth)];
 }
 
+/**
+ * 折叠 0 行预览时计数由正文那行显示（`↳ diff +A -D · created · click to show more`），
+ * 标题不再重复。compact 与 default 两个模式的写标题共用这条口径。
+ */
+export function writeStatsInCollapsedBody(
+	expanded: boolean,
+	display: Pick<ToolDisplayConfig, "writeDiffCollapsedLines">,
+): boolean {
+	return !expanded && resolveWriteCollapsedLimit(display) === 0;
+}
+
 /**
  * write 变更行统计（compact 单行用）：复用当前 write diff 算法。
  * 新文件 = 全部新内容为 added；覆盖已有文件用 LCS 精确统计。
@@ -413,6 +434,10 @@ export function renderWriteDiffResult(
 			const hint = cache.getHintLine();
 			return hint !== undefined && normalizeCollapsedHintLine(plainLine) === hint;
 		},
+		/** 折叠 0 行预览时正文那行自带 +A -D：标题不再重复计数。 */
+		bodyShowsStats(): boolean {
+			return writeStatsInCollapsedBody(options.expanded, resolveLiveDisplayConfig(config));
+		},
 		render(width: number): string[] {
 			// Live config: panel can change indicator/wrap/limits after this component is created.
 			const live = resolveLiveDisplayConfig(config);
@@ -445,6 +470,7 @@ export function renderWriteDiffResult(
 					theme,
 					hovered,
 					options.headerLabel,
+					countWriteDiffStats(content, options.previousContent, options.fileExistedBeforeWrite),
 				);
 				return cache.set(
 					safeWidth,

package/extensions/renderer/tool/grouping.ts

@@ -8,6 +8,12 @@ import {
 } from "@earendil-works/pi-tui";
 import { config } from "../../config/config.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
+import {
+	ASK_USER_QUESTION_TOOL_NAME,
+	askUserAnswerText,
+	askUserAnswers,
+	type AskUserAnswer,
+} from "./ask-user-question.ts";
 import {
 	CODEMODE_TOOL_NAME,
 	codemodeCalls,
@@ -23,10 +29,16 @@ import {
 	fitToolCallSummary,
 	humanizeToolLabel,
 	renderToolSummary,
+	SHELL_TOOL_NAMES,
 	toolCallSummary,
 	type ToolCallSummary,
 } from "./names.ts";
-import { toolViewportWidth } from "./result.ts";
+import {
+	formatToolDuration,
+	headTruncateToWidth,
+	isLiveToolCall,
+	toolViewportWidth,
+} from "./result.ts";
 import {
 	patchRegistry,
 	TOOL_GROUPING_GENERATION_KEY as GENERATION_KEY,
@@ -108,6 +120,12 @@ function statusIcon(value: ToolStatus): string {
 	return toolLoadingIcon();
 }
 
+/** 等待窗口或运行中的行：spinner 逐帧变化，分组卡要跟着跳帧。 */
+function isAnimatingTool(tool: any): boolean {
+	if (status(tool) !== "pending") return false;
+	return Boolean(tool?.executionStarted) || isLiveToolCall(tool?.toolCallId);
+}
+
 function scheduleGroupAnimation(patch: Patch): void {
 	if (patch.animationTimer || !patch.active) return;
 	patch.animationTimer = setTimeout(() => {
@@ -115,11 +133,7 @@ function scheduleGroupAnimation(patch: Patch): void {
 		if (!patch.active) return;
 		let needsRender = false;
 		for (const group of patch.groups) {
-			if (
-				(group.children as any[]).some(
-					(tool) => tool?.executionStarted && status(tool) === "pending",
-				)
-			) {
+			if ((group.children as any[]).some(isAnimatingTool)) {
 				group.invalidate();
 				// 分组卡不是 ToolExecutionComponent：它的 invalidate() 不会请求渲染，
 				// 不补这一步 spinner 只在别人渲染时才跳帧（并行工具下表现为卡顿/冻结）。
@@ -203,6 +217,39 @@ function toolSummary(tool: any): ToolCallSummary {
  * codemode 的折叠行：有结果就报该次调用的统计（与单卡汇总行同一套口径），
  * 免得一张卡里几行长代码预览互相看不出区别。还没结果时退回代码预览。
  */
+/**
+ * ask_user_question 的折叠行：有结果就报「问题 -> 回答」，
+ * 多题压成一行并标注剩余条数。还没结果时退回问题预览。
+ */
+function askUserResultSummary(tool: any): ToolCallSummary | undefined {
+	if (toolName(tool) !== ASK_USER_QUESTION_TOOL_NAME || !tool?.result) return undefined;
+	const answers = askUserAnswers(tool.result)
+		.map((answer: AskUserAnswer, index: number) => ({ answer, index }))
+		.sort((left, right) => {
+			const leftIndex = Number(left.answer.questionIndex);
+			const rightIndex = Number(right.answer.questionIndex);
+			const leftMissing = !Number.isFinite(leftIndex);
+			const rightMissing = !Number.isFinite(rightIndex);
+			if (leftMissing || rightMissing) {
+				if (leftMissing !== rightMissing) return leftMissing ? 1 : -1;
+				return left.index - right.index;
+			}
+			return leftIndex - rightIndex;
+		})
+		.map((entry) => entry.answer);
+	if (answers.length === 0) {
+		const label = tool.result?.details?.cancelled === true ? "Declined" : "Done";
+		return { main: `${toolTitle(tool)} ${label}`, detail: "" };
+	}
+	const first = answers[0]!;
+	const question = String(first.question ?? "").trim() || "Question";
+	const more = answers.length > 1 ? ` (+${answers.length - 1})` : "";
+	return {
+		main: `${toolTitle(tool)} ${question} -> ${askUserAnswerText(first)}${more}`,
+		detail: "",
+	};
+}
+
 function codemodeResultSummary(tool: any): ToolCallSummary | undefined {
 	if (toolName(tool) !== CODEMODE_TOOL_NAME || !tool?.result) return undefined;
 	const parts = codemodeSummaryParts(
@@ -213,10 +260,36 @@ function codemodeResultSummary(tool: any): ToolCallSummary | undefined {
 	return { main: `${toolTitle(tool)} ${parts.join(" · ")}`, detail: "" };
 }
 
+/**
+ * 组内 shell 行的尾巴：只报耗时（`· 12.4s`）。输出和错误正文都在展开后看；
+ * 失败靠行首的 ✗，组头另有 failed 计数。
+ * 耗时取 pi 记在结果上的 durationMs（单卡渲染上下文里的同一个值），运行中还拿不到就不报。
+ */
+function shellResultTail(
+	tool: any,
+	fg: (color: string, text: string) => string,
+	toolStatus: ToolStatus,
+): string {
+	if (!SHELL_TOOL_NAMES.has(toolName(tool)) || toolStatus === "pending" || !tool?.result) return "";
+	const durationMs = tool.result?.durationMs;
+	const duration =
+		typeof durationMs === "number" && Number.isFinite(durationMs) && durationMs >= 0
+			? formatToolDuration(durationMs)
+			: "";
+	return duration ? ` ${fg("dim", `· ${duration}`)}` : "";
+}
+
+/**
+ * 组头的工具列表：名称用与单组标题、子行同一套人性化写法，次数一律带上（各跑一次也报 ×1）。
+ * 同名（同显示标题）的合并成一项，避免 `MCP call×1, MCP call×1` 这种重复。
+ */
 function toolNameList(tools: any[]): string {
 	const counts = new Map<string, number>();
-	for (const tool of tools) counts.set(toolName(tool), (counts.get(toolName(tool)) ?? 0) + 1);
-	return [...counts].map(([name, count]) => `${name}${count > 1 ? `×${count}` : ""}`).join(", ");
+	for (const tool of tools) {
+		const label = toolTitle(tool);
+		counts.set(label, (counts.get(label) ?? 0) + 1);
+	}
+	return [...counts].map(([label, count]) => `${label}×${count}`).join(", ");
 }
 
 let nextGroupId = 1;
@@ -389,23 +462,23 @@ export class ToolGroupComponent extends Container {
 		const names = new Set(this.children.map(toolName));
 		const label = names.size === 1 ? toolTitle(this.children[0]) : "Multiple Tools";
 		const overall: ToolStatus = counts.error ? "error" : counts.pending ? "pending" : "success";
-		if (
-			(this.children as any[]).some((tool) => tool?.executionStarted && status(tool) === "pending")
-		)
-			scheduleGroupAnimation(this.patch);
+		if ((this.children as any[]).some(isAnimatingTool)) scheduleGroupAnimation(this.patch);
 		const overallColor = overall === "pending" ? "accent" : overall;
-		const nameList = names.size > 1 ? ` ${fg("dim", `· ${toolNameList(this.children)}`)}` : "";
 		// 圆点保持 dim；hover 只高亮可点击文字。
 		const hintText = this._expanded ? collapseHintText() : showMoreHintText();
 		const hint = `${fg("dim", "·")} ${fg(this.hintHovered ? "text" : "dim", hintText)}`;
-		const lines = [
-			"",
-			truncateToWidth(
-				` ${fg(overallColor, "●")} ${label}: ${countText}${nameList} ${hint}`,
-				toolViewportWidth(width),
-				"…",
-			),
-		];
+		const rowWidth = toolViewportWidth(width);
+		// 工具列表让位给展开提示：提示被截断的话，鼠标层要在行尾找 `click to show more`
+		// 就找不到，整张卡在窄宽度下点不开。名字截断后子行里仍能看全。
+		const head = ` ${fg(overallColor, "●")} ${label}: ${countText}`;
+		const tail = ` ${hint}`;
+		const listRoom = rowWidth - visibleWidth(head) - visibleWidth(tail) - 3;
+		// 连一个工具名都放不下就不放列表：退化成 `· …` 只会把行撑爆。
+		const nameList =
+			names.size > 1 && listRoom >= 4
+				? ` ${fg("dim", `· ${headTruncateToWidth(toolNameList(this.children), listRoom)}`)}`
+				: "";
+		const lines = ["", truncateToWidth(`${head}${nameList}${tail}`, rowWidth, "")];
 		const total = this.children.length;
 		const childPaints = this._expanded
 			? (this.children as any[]).map((tool) => tool.render?.(Math.max(1, width - 2)))
@@ -433,15 +506,20 @@ export class ToolGroupComponent extends Container {
 			const branch = index === total - 1 ? "└" : "├";
 			const continuation = index === total - 1 ? "  " : "│ ";
 			if (!this._expanded) {
-				const summary = codemodeResultSummary(tool) ?? toolSummary(tool);
+				const summary =
+					askUserResultSummary(tool) ?? codemodeResultSummary(tool) ?? toolSummary(tool);
 				const prefix = ` ${fg("dim", branch)} ${fg(color, statusIcon(toolStatus))} `;
 				const detail = fg("dim", summary.detail);
+				const result = shellResultTail(tool, fg, toolStatus);
 				// 与单工具卡标题同宽，宽屏右侧留白一致
 				const rowWidth = toolViewportWidth(width);
-				const mainWidth = Math.max(0, rowWidth - visibleWidth(prefix) - visibleWidth(detail));
+				const mainWidth = Math.max(
+					0,
+					rowWidth - visibleWidth(prefix) - visibleWidth(detail) - visibleWidth(result),
+				);
 				lines.push(
 					truncateToWidth(
-						`${prefix}${renderToolSummary(summary, mainWidth, fg)}${detail}`,
+						`${prefix}${renderToolSummary(summary, mainWidth, fg)}${detail}${result}`,
 						rowWidth,
 						"",
 					),

package/extensions/renderer/tool/names.ts

@@ -157,7 +157,7 @@ function pathSummary(
 }
 
 /** 入参是 shell 命令的工具。 */
-const SHELL_TOOL_NAMES = new Set(["bash", "powershell", "pwsh", "sh", "zsh", "cmd"]);
+export const SHELL_TOOL_NAMES = new Set(["bash", "powershell", "pwsh", "sh", "zsh", "cmd"]);
 
 /** 内置检索工具：pattern 缺失（无效调用）时保留 "…" 占位。 */
 const SEARCH_TOOL_NAMES = new Set(["grep", "find"]);

package/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/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/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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.9.12",
+	"version": "1.0.1",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",
@@ -65,9 +65,6 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.5",
-		"@earendil-works/pi-ai": "0.99.1",
-		"@earendil-works/pi-coding-agent": "0.99.1",
-		"@earendil-works/pi-tui": "0.99.1",
 		"@types/node": "^26.1.1",
 		"typescript": "^5.9.3"
 	}

package/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/themes/cc-light.json

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