pi-cc-extensions 1.0.10 → 1.0.11

package/README.en.md

@@ -91,7 +91,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "footerGitStatsMode": "working",         // working (default): uncommitted; branch: cumulative net changes
   "footerHiddenKeys": [],                  // hidden chip keys
   "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "pi-usage"], // chip order per line; builtins and plugins share one layout
-  "footerLine2Keys": ["cwd", "git"],        // cwd: directory and session; git: branch and changes. Either can move to any line
+  "footerLine2Keys": ["cwd", "git"],       // cwd: directory and session; git: branch and changes. Either can move to any line
   "footerLine3Keys": [],                   // painted only when a chip is visible
 }
 ```

package/README.md

@@ -91,7 +91,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   "footerGitStatsMode": "working",         // working（默认）：未提交改动；branch：分支累计净改动
   "footerHiddenKeys": [],                  // 隐藏的芯片 key
   "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "pi-usage"], // 每行芯片顺序；内置项与插件同一套排布
-  "footerLine2Keys": ["cwd", "git"],        // cwd：目录和会话名；git：分支和改动。可换到任意行
+  "footerLine2Keys": ["cwd", "git"],       // cwd：目录和会话名；git：分支和改动。可换到任意行
   "footerLine3Keys": []                    // 有可见芯片才占行
 }
 ```

package/extensions/feature/context.ts

@@ -887,27 +887,44 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 											return theme.style("█".repeat(Math.max(0, cells)), { fg: part.color });
 										})
 										.join("");
+									const amountCells = allParts.map((part) => {
+										const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
+										const tokens = formatTokens(part.tokens).padStart(7);
+										const percent = `${pct.toFixed(1).padStart(5)}%`;
+										return { tokens, percent, plain: `${tokens}  ${percent}` };
+									});
+									// 数字列整体贴右：label 最多占到「行宽 - 数字列宽 - 前缀 - 边距」为止。
+									const amountWidth = Math.max(
+										...amountCells.map((cell) => visibleWidth(cell.plain)),
+									);
 									const labelWidth = Math.min(
 										24,
 										Math.max(...allParts.map((part) => part.label.length)),
+										Math.max(1, inner - amountWidth - 5),
 									);
 									const selectedLabel = visiblePreviews[selectedPreviewIndex]?.label;
-									const partRows = allParts.map((part) => {
-										const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
+									const partRows = allParts.map((part, index) => {
 										const swatch = theme.style("■", { fg: part.color });
 										const label = part.label.padEnd(labelWidth);
-										const amount = `${formatTokens(part.tokens).padStart(7)}  ${pct.toFixed(1).padStart(5)}%`;
+										const amount = amountCells[index];
 										const selected = part.label === selectedLabel;
 										const hoverLabel = visiblePreviews.find((p) => p.key === hoveredKey)?.label;
 										const prefix = selected ? "› " : "  ";
-										const row = padLine(`${prefix}${swatch} ${label} ${amount}`, inner);
+										const left = `${prefix}${swatch} ${label}`;
+										const gap = Math.max(
+											1,
+											inner - 1 - visibleWidth(left) - visibleWidth(amount?.plain ?? ""),
+										);
+										// token 数字用次级色，百分比保持正文色以保留可读的主指标。
+										const right = `${theme.fg("dim", amount?.tokens ?? "")}  ${amount?.percent ?? ""}`;
+										const row = padLine(`${left}${" ".repeat(gap)}${right}`, inner);
 										if (selected) return theme.bg("selectedBg", row);
 										return part.label === hoverLabel ? theme.bg("customMessageBg", row) : row;
 									});
 									const border = (text: string) => theme.fg("border", text);
 									const lines = [
 										border(`╭${"─".repeat(inner)}╮`),
-										`${border("│")}${padLine(` ${title}  ${theme.fg("muted", subtitle)}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
+										`${border("│")}${padLine(` ${title}  ${theme.fg("dim", subtitle)}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
 										`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
 										`${border("│")}${padLine(` ${segments}`, inner)}${border("│")}`,
 										`${border("│")}${" ".repeat(inner)}${border("│")}`,

package/extensions/renderer/compact-mode.ts

@@ -64,6 +64,7 @@ import { paddedBackgroundRow } from "./tool/grouping.ts";
 import { styleChangeCounts } from "./tool/ccstyle-tool.ts";
 import { formatDisplayPath } from "./tool/names.ts";
 import {
+	contentRowRange,
 	hasVisibleText,
 	removeStyledRange,
 	stripBackgroundAnsi,
@@ -372,7 +373,7 @@ function editWriteExpandedCard(theme: any, component: any): any {
 /** compact 展开面板：外卡片保持展开卡背景；展开的 thinking 另包一层更深的
  *  内卡（自身 Box 背景与外卡同色，不区分会糊在一起），工具卡直接铺在外卡背景上。
  *  每个子卡前面补 1 行分隔（上一条已经是空行时不再补），子卡自带的首尾空行会被裁掉，
- *  避免与外卡/内卡 padding 叠出双空行。
+ *  避免与外卡/内卡 padding 叠出双空行（内联图片的占位行不裁，见 contentRowRange）。
  *  hits：子卡的行区间与命中目标（thinking 命中自身，工具命中 tool 组件），
  *  供展开后点击 hint。未开启 toolHits 时不映射工具，点击仍归外层面板。
  *  live=true：live 槽位用，不铺底色也不留上下空行，首行紧跟 `↳`、其余行缩进对齐
@@ -434,14 +435,8 @@ function layoutExpandedToolCard(
 		const painted = paints?.[childIndex];
 		const childLines = Array.isArray(painted) ? painted : child.render(innerWidth);
 		const innerCard = !live && isThinkingPreview(child) && child.expanded === true;
-		let first = -1;
-		let last = -1;
-		for (let i = 0; i < childLines.length; i++) {
-			if (hasVisibleText(childLines[i])) {
-				if (first < 0) first = i;
-				last = i;
-			}
-		}
+		// 内联图片按 placement 把范围撑开：锚点前后的空行是图片占的位置，不能当首尾空行裁。
+		const { first, last } = contentRowRange(childLines);
 		if (first < 0) {
 			if (live) continue;
 			for (const line of childLines) {
@@ -603,16 +598,20 @@ export type CompactModeHooks = {
 	/** 重新渲染包含指定 toolCallId 的 assistant 消息（思考收尾时刷新）。 */
 	refreshToolCallMessage(toolCallId: string | undefined): void;
 	/**
-	 * 收尾 resume 重放留下的活动回合。重放是同步的，回合之间靠下一条消息收口，
-	 * 只有最后一条没有后续消息，会停在 Running。
+	 * 会话已空闲时收尾末尾回合。回放/切换样式/重载重建之后，末尾那条消息
+	 * 后面没有消息来收口；活性只问会话，不从消息形状推断。
 	 */
-	settleReplayedRound(): void;
+	settleIdleRound(): void;
+	/** agent 这轮跑完：收尾仍在 live 的末尾回合，别让它一直挂着 Running。 */
+	settleFinishedRound(): void;
 	shutdown(): void;
 };
 
 type CompactModeInstallDeps = {
 	query?: CompactThinkingQuery;
 	writeMetadata: WriteExecutionMetadataStore;
+	/** 会话是否空闲；测试注入用，正式路径取 ctx.isIdle。 */
+	isIdle?: () => boolean;
 };
 
 type CompactModePatch = {
@@ -1233,8 +1232,18 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	const liveSlotToolIds = new Set<string>();
 	const pendingFoldRounds = new Set<CompactRound>();
 	let uiRef: { requestRender?: (force?: boolean) => void } | undefined;
+	let idleRef: (() => boolean) | undefined = deps.isIdle;
 	let roundTickTimer: ReturnType<typeof setInterval> | undefined;
 
+	/** 会话是否空闲：回合活性的事实来源，取不到就当没空闲（宁可保留 Running）。 */
+	const sessionIdle = (): boolean => {
+		try {
+			return idleRef?.() === true;
+		} catch {
+			return false;
+		}
+	};
+
 	const roundWallMs = (round: CompactRound): number => {
 		const end = round.active ? Date.now() : (round.endedAt ?? Date.now());
 		return Math.max(1, end - round.startedAt);
@@ -2172,6 +2181,19 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 	};
 
+	/**
+	 * 会话已空闲时收尾末尾回合。重建 pass 内仍按顺序并回合（同一 turn 的多条
+	 * 消息要合成一条摘要），只在 pass 结束时对账：会话没在跑，末尾那条就不会
+	 * 再长出内容，停在 Running 是假的。
+	 */
+	const settleTrailingRound = (): void => {
+		if (!sessionIdle()) return;
+		const round = activeRound;
+		if (!round) return;
+		finalizeRound(round);
+		renderRound(round);
+	};
+
 	patch.assistantInstalled = function (this: any, message: any, isStreaming?: boolean) {
 		const self = this as any;
 		// 同 compact-thinking：isStreaming 丢失 → mermaid 流式误渲染来回闪。
@@ -2423,6 +2445,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		sync(ctx: any) {
 			if (!patch.active) return;
 			uiRef = ctx?.ui;
+			if (typeof ctx?.isIdle === "function") idleRef = () => ctx.isIdle() === true;
 			resetRounds();
 			// 始终保持补丁在链上：mode=on/off 走 passThrough，仍写入 lastMessage
 			// 与 tracked 集合，这样 /ccstyle 切回 compact 时不必 /reload。
@@ -2431,6 +2454,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			else hoveredAssistantComponent = undefined;
 			refreshTrackedComponents();
 			sweepOrphanTails();
+			settleTrailingRound();
 		},
 		refresh() {
 			if (!patch.active) return;
@@ -2439,6 +2463,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			if (config.mode !== "compact") hoveredAssistantComponent = undefined;
 			refreshTrackedComponents();
 			sweepOrphanTails();
+			settleTrailingRound();
 		},
 		assertOwnership() {
 			if (!patch.active) return;
@@ -2459,11 +2484,16 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				}
 			}
 		},
-		settleReplayedRound() {
+		settleIdleRound() {
+			if (!patch.active || config.mode !== "compact") return;
+			settleTrailingRound();
+		},
+		settleFinishedRound() {
 			if (!patch.active || config.mode !== "compact") return;
 			const round = activeRound;
 			if (!round) return;
-			finalizeRound(round); // clears activeRound — capture it first
+			// 走静默期：摘要行当场翻成 Ran for，槽位卡多留一拍再收拢。
+			endRound(round, true);
 			renderRound(round);
 		},
 		shutdown() {

package/extensions/renderer/index.ts

@@ -258,10 +258,9 @@ export default function (
 		syncCompactMode(ctx);
 		// compact-thinking 的 session_start 处理在本 handler 之后执行（在其之上再装
 		// 一层 updateContent）；延迟再同步一次，保证 compact 补丁最终位于外层。
+		// 历史回放也在这之后跑完：sync 末尾按 ctx.isIdle() 收尾末尾回合，
+		// 它没有后续消息，不收就会停在 Running。
 		setTimeout(() => syncCompactMode(ctx), 0);
-		// 历史回放发生在 session_start 之后，延迟到回放结束再收尾最后一个回合，
-		// 否则它没有后续消息，摘要行会停在 Running。
-		setTimeout(() => compactModeHooks?.settleReplayedRound(), 0);
 		scheduleSessionRender(() => {
 			hooks.toolGrouping.refresh(getToolMouseTui());
 			// /reload、/resume 在 session_start 之前就重建了 transcript：已挂载的通知卡换上本插件的渲染器。
@@ -303,6 +302,8 @@ export default function (
 
 	pi.on("agent_end", async () => {
 		clearLiveToolCalls();
+		// 这轮跑完：末尾回合没有正文收口（纯工具回合）就一直挂着 Running。
+		compactModeHooks?.settleFinishedRound();
 	});
 
 	pi.on("session_shutdown", async () => {

package/extensions/renderer/tool/grouping.ts

@@ -24,7 +24,13 @@ import {
 import { getToolMouseTui } from "../mouse/scroll.ts";
 import { mcpToolTitle } from "./mcp-title.ts";
 import { collapseHintText, isToolTuiFullscreen, showMoreHintText } from "./names.ts";
-import { stripAnsi, stripBackgroundAnsi, stripLeadingStatusIcon } from "../../utils/ansi-text.ts";
+import {
+	contentRowRange,
+	imagePlacement,
+	stripAnsi,
+	stripBackgroundAnsi,
+	stripLeadingStatusIcon,
+} from "../../utils/ansi-text.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
 import {
 	fitToolCallSummary,
@@ -193,8 +199,22 @@ function requestAnimationRender(patch: Patch): void {
 	getToolMouseTui()?.requestRender?.();
 }
 
+/** 丢掉空白行；内联图片锚点行与它占用的空行要留着，否则终端里图片盖住后续行。 */
 function visibleLines(lines: string[]): string[] {
-	return lines.filter((line) => stripAnsi(line).trim());
+	const keep = new Set<number>();
+	for (let index = 0; index < lines.length; index++) {
+		const placement = imagePlacement(lines[index]);
+		if (!placement) {
+			if (stripAnsi(lines[index]).trim()) keep.add(index);
+			continue;
+		}
+		const start = placement.grows === "up" ? index - placement.rows + 1 : index;
+		const end = placement.grows === "down" ? index + placement.rows - 1 : index;
+		for (let row = Math.max(0, start); row <= Math.min(lines.length - 1, end); row++) {
+			keep.add(row);
+		}
+	}
+	return lines.filter((_line, index) => keep.has(index));
 }
 
 function stripLeadingSpaces(line: string, count: number): string {
@@ -388,12 +408,11 @@ function collapsedGroupLine(
 	return truncateToWidth(`${prefix}${item.summary(room, theme)}`, rowWidth, "");
 }
 
-/** 展开面板里一项占的行：最后一项不留尾部空行（面板自带底部留白）。 */
+/** 末项结尾的尾随空行不计入卡高（内联图片的占位行除外，见 contentRowRange）。 */
 function panelRows(rows: string[], last: boolean): string[] {
 	if (!last) return rows;
-	let end = rows.length;
-	while (end > 1 && !stripAnsi(rows[end - 1]).trim()) end--;
-	return end === rows.length ? rows : rows.slice(0, end);
+	const end = Math.max(1, contentRowRange(rows).last + 1);
+	return end >= rows.length ? rows : rows.slice(0, end);
 }
 
 type GroupHeaderCounts = { pending: number; success: number; error: number };

package/extensions/utils/ansi-text.ts

@@ -33,6 +33,56 @@ export function hasVisibleText(line: string): boolean {
 	return line.replace(CSI_SEQUENCE_RE, "").replace(OSC_SEQUENCE_STRICT_RE, "").trim().length > 0;
 }
 
+const KITTY_IMAGE_PREFIX = "\x1b_G";
+const ITERM2_IMAGE_PREFIX = "\x1b]1337;File=";
+
+/** 行内是否带内联图片序列（kitty APC 或 iTerm2 OSC 1337）。 */
+export function isImageLine(line: string): boolean {
+	return line.includes(KITTY_IMAGE_PREFIX) || line.includes(ITERM2_IMAGE_PREFIX);
+}
+
+/**
+ * 内联图片在终端里占用的行数，以及它相对锚点行的铺开方向。
+ * kitty 的锚点在首行、向下铺（`r=N`）；iTerm2 的锚点在末行、先上移再画（`\x1b[NA`）。
+ */
+export function imagePlacement(line: string): { rows: number; grows: "down" | "up" } | undefined {
+	const kittyControls = /\x1b_G([^;]*);/.exec(line)?.[1];
+	if (kittyControls !== undefined) {
+		const rows = Number(/(?:^|,)r=(\d+)/.exec(kittyControls)?.[1]);
+		return { rows: rows >= 1 ? rows : 1, grows: "down" };
+	}
+	if (line.includes(ITERM2_IMAGE_PREFIX)) {
+		const up = Number(/\x1b\[(\d+)A/.exec(line)?.[1]);
+		return { rows: up >= 1 ? up + 1 : 1, grows: "up" };
+	}
+	return undefined;
+}
+
+/**
+ * 行区里必须保留的范围（首行/末行下标；没有内容时 first 为 -1）。
+ * 内联图片的行要按 placement 整体算进来：锚点前后那些空行是图片自己占的位置，
+ * 当首尾空行裁掉后终端里图片照样铺开，后面画的内容会被盖住。
+ */
+export function contentRowRange(rows: string[]): { first: number; last: number } {
+	let first = -1;
+	let last = -1;
+	const keep = (start: number, end: number) => {
+		const boundedStart = Math.max(0, start);
+		first = first < 0 ? boundedStart : Math.min(first, boundedStart);
+		last = Math.max(last, Math.min(rows.length - 1, end));
+	};
+	for (let index = 0; index < rows.length; index++) {
+		const placement = imagePlacement(rows[index]);
+		if (placement) {
+			if (placement.grows === "down") keep(index, index + placement.rows - 1);
+			else keep(index - placement.rows + 1, index);
+			continue;
+		}
+		if (hasVisibleText(rows[index])) keep(index, index);
+	}
+	return { first, last };
+}
+
 /** 剥离背景色 ANSI（用于重新铺背景行）。 */
 export function stripBackgroundAnsi(line: string): string {
 	return line.replace(/\x1b\[(?:4[0-9]|10[0-7]|48(?:(?:;|:)[0-9]+)+|49)m/g, "");

package/package.json

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