pi-cc-extensions 1.0.1 → 1.0.3

package/README.en.md

@@ -45,52 +45,53 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 ```jsonc
 {
   // style
-  "mode": "on", // on / compact / off
-  "excludeRenderers": [], // tools keeping the native renderer; Agent always keeps its dedicated renderer
+  "mode": "on",                            // on / compact / off
+  "excludeRenderers": [],                  // tools keeping the native renderer; Agent always keeps its dedicated renderer
 
   // features
-  "enableSessionReference": true, // @ session references
-  "enableSubagentAutocomplete": true, // @subagent:[name] completion and delegation hints
-  "enableContextCommand": true, // /context usage check
-  "enableAgentSummary": true, // per-turn tool summary
-  "enableWorkingMessage": true, // Working... bottom token/elapsed
-  "enableAliases": true, // /clear, /exit aliases
+  "enableSessionReference": true,          // @ session references
+  "enableSubagentAutocomplete": true,      // @subagent:[name] completion and delegation hints
+  "enableContextCommand": true,            // /context usage check
+  "enableAgentSummary": true,              // per-turn tool summary
+  "enableWorkingMessage": true,            // Working... bottom token/elapsed
+  "enableAliases": true,                   // /clear, /exit aliases
 
   // ui
-  "expandedInputMaxLines": 5, // expanded tool Input lines; overflow shows a footer hint
-  "expandedOutputMaxLines": 10, // expanded tool Output lines; overflow shows a footer hint
-  "expandedPreviewMaxLines": 40, // max lines for expanded TaskList bodies (expanded diffs always show all)
+  "expandedInputMaxLines": 5,              // expanded tool Input lines; overflow shows a footer hint
+  "expandedOutputMaxLines": 10,            // expanded tool Output lines; overflow shows a footer hint
+  "expandedPreviewMaxLines": 40,           // max lines for expanded TaskList bodies (expanded diffs always show all)
   "expandedCardBackground": "userMessageBg", // expanded card background slot: userMessageBg (same as user prompts) / toolPendingBg (neutral) etc.
-  "toolLabelClip": 0, // tool summary path/command clip length; 0 = fit width
-  "showStartupHeader": true, // startup header (logo + tips) toggle
-  "stickyUserMessage": true, // fullscreen: pin a user message's first line once it scrolls off the top edge, until the next one takes over
+  "toolLabelClip": 0,                      // tool summary path/command clip length; 0 = fit width
+  "showStartupHeader": true,               // startup header (logo + tips) toggle
+  "stickyUserMessage": true,               // fullscreen: pin a user message's first line once it scrolls off the top edge, until the next one takes over
 
   // diff
-  "diffViewMode": "auto", // layout: auto / split / unified
-  "diffIndicatorMode": "bars", // change indicators: bars / classic / none
-  "diffSplitMinWidth": 120, // min terminal width for side-by-side columns
-  "editDiffCollapsedLines": 24, // edit collapse lines; 0 = change-count summary only
-  "writeDiffCollapsedLines": 0, // write collapse lines; 0 = creation summary only
-  "diffWordWrap": true, // wrap long diff lines
+  "diffViewMode": "auto",                  // layout: auto / split / unified
+  "diffIndicatorMode": "bars",             // change indicators: bars / classic / none
+  "diffSplitMinWidth": 120,                // min terminal width for side-by-side columns
+  "editDiffCollapsedLines": 24,            // edit collapse lines; 0 = change-count summary only
+  "writeDiffCollapsedLines": 0,            // write collapse lines; 0 = creation summary only
+  "diffWordWrap": true,                    // wrap long diff lines
 
   // thinking
   "useSummaryTitlesAsThinkingTitle": true, // use latest summary as thinking title
-  "previewLines": 3, // preview lines; 0 hides
-  "animationIntervalMs": 90, // title animation interval (ms)
-  "dimThinkingText": false, // dim thinking body text
+  "previewLines": 3,                       // preview lines; 0 hides
+  "animationIntervalMs": 90,               // title animation interval (ms)
+  "dimThinkingText": false,                // dim thinking body text
 
   // footer
-  "enableCustomFooter": true, // custom status bar
-  "footerTokenRate": true, // output rate chip; false hides it
-  "footerTokenRateMode": "average", // average: whole-prompt avg; live: trailing 1s rate
-  "footerCurrency": "USD", // display currency for the footer cost
-  "footerCurrencyRate": null, // display units per 1 cost unit; null changes the symbol only
-  "footerNerdIcons": true, // Nerd Font glyphs for git/cache; false = plain text
-  "footerGitStatsMode": "working", // working (default): uncommitted; branch: cumulative net changes
-  "footerHiddenKeys": [], // hidden plugin chip keys
-  "footerLine1Keys": ["pi-usage"], // line1 plugin chip order; pi-usage is shown by default, data from @narumitw/pi-usage
-  "footerLine2Keys": [], // line2 plugin chip order (after cwd/git)
-  "footerLine3Keys": [], // line3 overflow slot; painted only when a chip is visible
+  "enableCustomFooter": true,              // custom status bar
+  "footerTokenRate": true,                 // output rate chip; false hides it
+  "footerTokenRateMode": "average",        // average: whole-prompt avg; live: trailing 1s rate
+  "footerTokenRateTtft": true,             // append TTFT to the rate chip; false shows tok/s only
+  "footerCurrency": "USD",                 // display currency for the footer cost
+  "footerCurrencyRate": null,              // display units per 1 cost unit; null changes the symbol only
+  "footerNerdIcons": true,                 // Nerd Font glyphs for git/cache; false = plain text
+  "footerGitStatsMode": "working",         // working (default): uncommitted; branch: cumulative net changes
+  "footerHiddenKeys": [],                  // hidden plugin chip keys
+  "footerLine1Keys": ["pi-usage"],         // line1 plugin chip order; pi-usage is shown by default, data from @narumitw/pi-usage
+  "footerLine2Keys": [],                   // line2 plugin chip order (after cwd/git)
+  "footerLine3Keys": [],                   // line3 overflow slot; painted only when a chip is visible
 }
 ```
 
@@ -116,7 +117,6 @@ pi -e .              # one run, does not edit settings.json
 
 | Extension                | Purpose                                                     |
 | ------------------------ | ----------------------------------------------------------- |
-| `npm:@ff-labs/pi-fff`    | FFF-powered fuzzy file and content search (fffind / ffgrep) |
 | `npm:pi-web-access`      | Web search, URL fetching, GitHub cloning, PDF/video parsing |
 | `npm:@narumitw/pi-usage` | Current-account usage for Codex / Copilot / OpenRouter      |
 

package/README.md

@@ -81,8 +81,9 @@ pi install git:github.com/minuque/pi-cc-extensions
 
   // footer
   "enableCustomFooter": true,              // 自定义状态栏
-  "footerTokenRate": true,                  // 输出速率芯片；false 隐藏
-  "footerTokenRateMode": "average",         // average：整段指令平均（avg）；live：最近 1 秒瞬时（live）
+  "footerTokenRate": true,                 // 输出速率芯片；false 隐藏
+  "footerTokenRateMode": "average",        // average：整段指令平均（avg）；live：最近 1 秒瞬时（live）
+  "footerTokenRateTtft": true,             // 速率芯片是否带 TTFT；false 只显示 tok/s
   "footerCurrency": "USD",                 // 底栏费用的显示币种
   "footerCurrencyRate": null,              // 1 单位费用换成多少显示币种；null 只换符号、不乘倍率
   "footerNerdIcons": true,                 // git/缓存用 Nerd Font 图标；false 为纯文本
@@ -116,7 +117,6 @@ pi -e .              # 只跑一次，不改 settings.json
 
 | 扩展                                     | 用途                                             |
 | ---------------------------------------- | ------------------------------------------------ |
-| `npm:@ff-labs/pi-fff`                    | 模糊文件与内容检索（fffind / ffgrep）            |
 | `npm:pi-web-access`                      | 网页搜索、URL 抓取、GitHub 克隆、PDF/视频解析    |
 | `npm:@narumitw/pi-usage`                 | 查看当前账号用量（Codex / Copilot / OpenRouter） |
 

package/extensions/config/config.ts

@@ -79,6 +79,8 @@ export type Config = {
 	footerTokenRate: boolean;
 	/** average：整段指令墙钟平均；live：最近 1 秒瞬时速率，空档回退平均。 */
 	footerTokenRateMode: FooterTokenRateMode;
+	/** 速率芯片是否带 TTFT。关则只显示速率。 */
+	footerTokenRateTtft: boolean;
 	/** ISO 4217 显示币种。USD 时不换算。 */
 	footerCurrency: string;
 	/** 1 单位费用对应的显示币种数量。null 只换符号、不乘倍率。 */
@@ -171,6 +173,7 @@ export const DEFAULT_CONFIG: Config = {
 	enableCustomFooter: true,
 	footerTokenRate: true,
 	footerTokenRateMode: "average",
+	footerTokenRateTtft: true,
 	footerCurrency: "USD",
 	footerCurrencyRate: null,
 	footerNerdIcons: true,
@@ -307,6 +310,7 @@ export function normalizeConfig(input: unknown): Config {
 			FOOTER_TOKEN_RATE_MODES,
 			DEFAULT_CONFIG.footerTokenRateMode,
 		),
+		footerTokenRateTtft: source.footerTokenRateTtft !== false,
 		footerCurrency: normalizeCurrency(source.footerCurrency),
 		footerCurrencyRate: normalizeFooterCurrencyRate(source.footerCurrencyRate),
 		footerNerdIcons: source.footerNerdIcons !== false,
@@ -372,6 +376,7 @@ export function formatConfigStatus(source: Config = config): string {
 		`footer=${source.enableCustomFooter ? "on" : "off"}`,
 		`footerTokenRate=${source.footerTokenRate ? "on" : "off"}`,
 		`footerTokenRateMode=${source.footerTokenRateMode}`,
+		`footerTokenRateTtft=${source.footerTokenRateTtft ? "on" : "off"}`,
 		`footerCurrency=${source.footerCurrency}`,
 		`footerRate=${source.footerCurrencyRate ?? "-"}`,
 		`footerIcons=${source.footerNerdIcons ? "nerd" : "plain"}`,

package/extensions/config/panel.ts

@@ -101,6 +101,12 @@ function footerTokenRateModeDescription(mode: FooterTokenRateMode): string {
 		: "Average over the whole user prompt (avg), including tool waits. Stays until the next prompt.";
 }
 
+function footerTokenRateTtftDescription(enabled: boolean): string {
+	return enabled
+		? "Append time to first token, e.g. (TTFT: 812ms) or (TTFT: 1.2s). Turn off to show the rate only."
+		: "Time to first token hidden. The rate chip shows tok/s only.";
+}
+
 function footerGitStatsDescription(mode: FooterGitStatsMode): string {
 	return mode === "branch"
 		? "Net changes since the merge base, including uncommitted edits. Base: origin/HEAD, then local main/master. Untracked files excluded; unavailable stats hidden."
@@ -758,6 +764,13 @@ export async function showCcstylePanel(
 			currentValue: config.footerTokenRateMode,
 			values: FOOTER_TOKEN_RATE_MODES,
 		};
+		const footerTokenRateTtftSetting = {
+			id: "footerTokenRateTtft",
+			label: "Token rate TTFT",
+			description: footerTokenRateTtftDescription(config.footerTokenRateTtft),
+			currentValue: config.footerTokenRateTtft ? "on" : "off",
+			values: ["on", "off"],
+		};
 		const pluginChipsSetting = {
 			id: "footerPluginChips",
 			label: "Plugin chips",
@@ -847,6 +860,14 @@ export async function showCcstylePanel(
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
+			if (id === "footerTokenRateTtft") {
+				const enabled = value === "on";
+				updateConfig({ footerTokenRateTtft: enabled });
+				footerTokenRateTtftSetting.currentValue = enabled ? "on" : "off";
+				footerTokenRateTtftSetting.description = footerTokenRateTtftDescription(enabled);
+				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
+				return;
+			}
 			if (id === "footerNerdIcons") {
 				const enabled = value === "on";
 				updateConfig({ footerNerdIcons: enabled });
@@ -1067,6 +1088,7 @@ export async function showCcstylePanel(
 					customFooterSetting,
 					footerTokenRateSetting,
 					footerTokenRateModeSetting,
+					footerTokenRateTtftSetting,
 					footerCurrencySetting,
 					footerCurrencyRateSetting,
 					footerNerdIconsSetting,

package/extensions/feature/compact-thinking.ts

@@ -20,7 +20,7 @@ import {
 import { Box, Markdown, Spacer, Text, type Component } from "@earendil-works/pi-tui";
 // 展开卡背景是 ccstyle 的渲染约定，不随上游 CompactThinkingConfig 走，直接读全局配置。
 import { config as styleConfig } from "../config/config.ts";
-import { isToolTuiFullscreen } from "../renderer/tool/show-more-hint.ts";
+import { isToolTuiFullscreen } from "../renderer/tool/names.ts";
 import {
 	animateCompactThinkingText,
 	formatThoughtDuration,

package/extensions/feature/context.ts

@@ -3,6 +3,7 @@ import {
 	type ExtensionAPI,
 	type ExtensionCommandContext,
 	type ToolInfo,
+	copyToClipboard,
 	estimateTokens,
 	formatSkillsForPrompt,
 	getMarkdownTheme,
@@ -54,6 +55,30 @@ export function escCloseHitbox(bounds: DialogBounds): {
 	};
 }
 
+const COPY_LABEL = "[copy]";
+const ESC_LABEL = "[esc]";
+
+/** 测试可替换；生产使用 pi 的剪贴板实现。 */
+let copyTextImpl: (text: string) => Promise<void> = (text) => copyToClipboard(text);
+
+export function setPreviewCopyImpl(impl: ((text: string) => Promise<void>) | null): void {
+	copyTextImpl = impl ?? ((text) => copyToClipboard(text));
+}
+
+/** 1-based terminal hitbox of the [copy] button, one space left of [esc] on the same title row. */
+export function copyButtonHitbox(bounds: DialogBounds): {
+	row: number;
+	startCol: number;
+	endCol: number;
+} {
+	const esc = escCloseHitbox(bounds);
+	return {
+		row: esc.row,
+		startCol: esc.startCol - visibleWidth(COPY_LABEL) - 1,
+		endCol: esc.startCol - 2,
+	};
+}
+
 let activeContextOverlays = 0;
 
 /** fullscreen 输入包装用于把鼠标事件继续传给当前 context 主弹框或文本预览 overlay。 */
@@ -81,7 +106,9 @@ export async function showTextPreview(
 				let pageSize = 1;
 				let totalLines = 1;
 				let escHovered = false;
+				let copyHovered = false;
 				let escHitbox: { row: number; startCol: number; endCol: number } | undefined;
+				let copyHitbox: { row: number; startCol: number; endCol: number } | undefined;
 				let scrollbarHitbox:
 					| {
 							col: number;
@@ -108,6 +135,24 @@ export async function showTextPreview(
 					tui.requestRender();
 				};
 
+				const setCopyHovered = (hovered: boolean): void => {
+					if (hovered === copyHovered) return;
+					copyHovered = hovered;
+					tui.requestRender();
+				};
+
+				const copyPreview = (): void => {
+					void copyTextImpl(content)
+						.then(() => {
+							const flash = (tui as { flash?: (message: string) => void }).flash;
+							if (typeof flash === "function") flash("Copied!");
+							else ctx.ui.notify("Copied preview to clipboard", "info");
+						})
+						.catch((error: unknown) => {
+							ctx.ui.notify(error instanceof Error ? error.message : "Copy failed", "error");
+						});
+				};
+
 				const dragScrollbarTo = (mouseRow: number): void => {
 					if (!scrollbarHitbox || scrollbarDragOffset === null) return;
 					const trackSize = scrollbarHitbox.endRow - scrollbarHitbox.startRow + 1;
@@ -151,7 +196,14 @@ export async function showTextPreview(
 									mouse.col >= escHitbox.startCol &&
 									mouse.col <= escHitbox.endCol,
 							);
+							const overCopy = Boolean(
+								copyHitbox &&
+									mouse.row === copyHitbox.row &&
+									mouse.col >= copyHitbox.startCol &&
+									mouse.col <= copyHitbox.endCol,
+							);
 							setEscHovered(overEsc);
+							setCopyHovered(overCopy);
 							const button = mouseBaseButton(mouse.code);
 							const motion = (mouse.code & 32) !== 0;
 							if (button === 0 && !motion) {
@@ -159,6 +211,10 @@ export async function showTextPreview(
 									done(undefined);
 									return;
 								}
+								if (overCopy) {
+									copyPreview();
+									return;
+								}
 								if (
 									scrollbarHitbox &&
 									mouse.col === scrollbarHitbox.col &&
@@ -187,7 +243,7 @@ export async function showTextPreview(
 
 					render(width: number) {
 						const inner = Math.max(1, width - 2);
-						const escWidth = visibleWidth("[esc]");
+						const actionsWidth = visibleWidth(`${COPY_LABEL} ${ESC_LABEL}`);
 						const bodyInner = Math.max(1, inner - 1);
 						const bodyWidth = Math.max(1, bodyInner - 1);
 						const terminalHeight = Math.max(1, tui.terminal.rows);
@@ -205,6 +261,7 @@ export async function showTextPreview(
 						const overlayTop = 2 + Math.floor((availableHeight - viewportHeight) / 2);
 						const overlayLeft = Math.floor((Math.max(1, tui.terminal.columns) - width) / 2);
 						escHitbox = escCloseHitbox({ left: overlayLeft, top: overlayTop, width });
+						copyHitbox = copyButtonHitbox({ left: overlayLeft, top: overlayTop, width });
 						const visible = wrapped.slice(scrollOffset, scrollOffset + pageSize);
 						const border = (text: string) => theme.fg("border", text);
 						const scrollable = totalLines > pageSize;
@@ -237,11 +294,11 @@ export async function showTextPreview(
 						});
 						const start = totalLines === 0 ? 0 : scrollOffset + 1;
 						const end = Math.min(totalLines, scrollOffset + pageSize);
-						const status = `${start}-${end} / ${totalLines} lines · ↑↓ PgUp/PgDn Home/End · [esc] close`;
+						const status = `${start}-${end} / ${totalLines} lines · ↑↓ PgUp/PgDn Home/End · [copy] · [esc] close`;
 
 						return [
 							border(`╭${"─".repeat(inner)}╮`),
-							`${border("│")}${padLine(` ${theme.bold(theme.fg("accent", title))}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
+							`${border("│")}${padLine(` ${theme.bold(theme.fg("accent", title))}`, inner - actionsWidth)}${theme.fg(copyHovered ? "text" : "muted", COPY_LABEL)} ${theme.fg(escHovered ? "text" : "muted", ESC_LABEL)}${border("│")}`,
 							`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
 							...bodyRows,
 							`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
@@ -273,6 +330,27 @@ const tokenEstimate = (value: unknown): number => {
 	return Math.max(0, Math.ceil(text.length / 4));
 };
 
+/** system 消息对请求的贡献：正文 + 各 section 文本 + 声明的工具 schema，与 pi 的 estimateTokens 同口径。 */
+function systemMessageTokens(message: {
+	content?: unknown;
+	sections?: Record<string, string | null> | null;
+	toolsAdded?: unknown;
+	toolsRemoved?: unknown;
+}): number {
+	let chars = typeof message.content === "string" ? message.content.length : 0;
+	for (const section of Object.values(message.sections ?? {})) {
+		if (typeof section === "string") chars += section.length;
+	}
+	if (message.toolsAdded) chars += JSON.stringify(message.toolsAdded).length;
+	if (message.toolsRemoved) chars += JSON.stringify(message.toolsRemoved).length;
+	return Math.ceil(chars / 4);
+}
+
+/** prompt 组装会把 CRLF 归一成 LF，匹配前对齐行尾。 */
+function normalizeLineEndings(text: string): string {
+	return text.replace(/\r\n?/g, "\n");
+}
+
 /** 只统计确实嵌进 system prompt 的片段，避免源文件预览把占用加两遍。 */
 function embeddedTokens(prompt: string, chunk: string): number {
 	if (!chunk || !prompt.includes(chunk)) return 0;
@@ -348,24 +426,24 @@ export function collectContextBreakdown(
 	allTools: ToolInfo[],
 ): ContextBreakdown {
 	const options = (ctx.getSystemPromptOptions?.() ?? {}) as BuildSystemPromptOptions;
-	const systemPrompt = typeof ctx.getSystemPrompt === "function" ? ctx.getSystemPrompt() : "";
 	const selectedTools = new Set(options.selectedTools ?? ["read", "bash", "edit", "write"]);
 	const toolDefinitionPreview: string[] = [];
 	const toolResultPreview: string[] = [];
 	const contextPreview: string[] = [];
+	const systemPromptPreview: string[] = [];
 	let toolDefinitionTokens = 0;
 	let toolResultTokens = 0;
 	let contextTokens = 0;
+	let systemTokens = 0;
 
 	const memoryPreview: string[] = [];
-	let memoryTokens = 0;
-	for (const file of options.contextFiles ?? []) {
-		memoryTokens += embeddedTokens(systemPrompt, file.content);
+	const contextFiles = options.contextFiles ?? [];
+	for (const file of contextFiles) {
 		memoryPreview.push(`## ${file.path}\n\n${previewValue(file.content)}`);
 	}
 
-	const skillsText = formatSkillsForPrompt(options.skills ?? []).trim();
-	const skillsTokens = embeddedTokens(systemPrompt, skillsText);
+	const skills = options.skills ?? [];
+	const skillsText = formatSkillsForPrompt(skills).trim();
 
 	for (const tool of allTools) {
 		if (!selectedTools.has(tool.name)) continue;
@@ -378,21 +456,51 @@ export function collectContextBreakdown(
 		toolDefinitionPreview.push(`## Definition: ${tool.name}\n\n${previewValue(definition)}`);
 	}
 
-	for (const entry of ctx.sessionManager.buildContextEntries()) {
-		if (entry.type === "message") {
-			const message = entry.message;
-			if (message.role === "assistant") {
+	let memoryTokens = 0;
+	let skillsTokens = 0;
+	for (const projected of ctx.sessionManager.buildSessionProjection().entries) {
+		const source = projected.sourceEntry;
+		for (const message of projected.messages) {
+			if (message.role === "system") {
+				systemTokens += systemMessageTokens(message);
+				// Memory / skills 按投影中的实际 section 文本切分，与 system prompt 增量互补、不重不漏。
+				const sections = (message.sections ?? {}) as Record<string, string | null>;
+				const projectContext =
+					typeof sections.project_context === "string"
+						? normalizeLineEndings(sections.project_context)
+						: "";
+				for (const file of contextFiles) {
+					const chunk = `<project_instructions path="${file.path}">\n${normalizeLineEndings(file.content)}\n</project_instructions>`;
+					memoryTokens += embeddedTokens(projectContext, chunk);
+					systemTokens -= embeddedTokens(projectContext, chunk);
+				}
+				const skillsSection =
+					typeof sections.skills === "string" ? normalizeLineEndings(sections.skills) : "";
+				skillsTokens += embeddedTokens(skillsSection, skillsText);
+				systemTokens -= embeddedTokens(skillsSection, skillsText);
+				systemPromptPreview.push(
+					(source.type === "compaction"
+						? "## System prompt snapshot at compaction\n\n"
+						: "## System prompt update\n\n") +
+						previewValue({
+							content: message.content,
+							sections: message.sections,
+							toolsAdded: (message.toolsAdded ?? []).map((tool: { name?: string }) => tool?.name),
+							toolsRemoved: (message.toolsRemoved ?? []).map(
+								(tool: { name?: string }) => tool?.name,
+							),
+						}),
+				);
+			} else if (message.role === "assistant") {
+				contextTokens += estimateTokens(message);
 				for (const block of message.content) {
 					if (block.type === "toolCall") {
-						contextTokens += tokenEstimate(block.name) + tokenEstimate(block.arguments);
 						contextPreview.push(
 							`## Assistant tool call: ${block.name}\n\n${previewValue(block.arguments)}`,
 						);
 					} else if (block.type === "text") {
-						contextTokens += tokenEstimate(block.text);
 						contextPreview.push(`## Assistant\n\n${block.text}`);
 					} else if (block.type === "thinking") {
-						contextTokens += tokenEstimate(block.thinking);
 						contextPreview.push(`## Assistant thinking\n\n${block.thinking}`);
 					}
 				}
@@ -402,8 +510,8 @@ export function collectContextBreakdown(
 					`## Result: ${message.toolName}\n\n${previewValue(message.content)}`,
 				);
 			} else if (message.role === "bashExecution") {
-				toolResultTokens += estimateTokens(message);
-				toolResultPreview.push(
+				contextTokens += estimateTokens(message);
+				contextPreview.push(
 					`## Bash\n\nCommand:\n\n${previewValue(message.command)}\n\nOutput:\n\n${previewValue(message.output)}`,
 				);
 			} else if (message.role === "branchSummary" || message.role === "compactionSummary") {
@@ -413,18 +521,10 @@ export function collectContextBreakdown(
 				contextTokens += estimateTokens(message);
 				contextPreview.push(`## ${message.role}\n\n${previewValue(message.content)}`);
 			}
-		} else if (entry.type === "compaction" || entry.type === "branch_summary") {
-			contextTokens += tokenEstimate(entry.summary);
-			contextPreview.push(
-				`## ${entry.type === "compaction" ? "Compaction" : "Branch summary"}\n\n${entry.summary}`,
-			);
-		} else if (entry.type === "custom_message") {
-			contextTokens += tokenEstimate(entry.content);
-			contextPreview.push(`## Custom: ${entry.customType}\n\n${previewValue(entry.content)}`);
 		}
 	}
 
-	const systemTokens = Math.max(0, tokenEstimate(systemPrompt) - memoryTokens - skillsTokens);
+	systemTokens = Math.max(0, systemTokens);
 	return {
 		parts: [
 			{ label: "System prompt", tokens: systemTokens, color: "accent" },
@@ -435,7 +535,10 @@ export function collectContextBreakdown(
 			{ label: "Context", tokens: contextTokens, color: "warning" },
 		] satisfies ContextPart[],
 		previews: {
-			systemPrompt: systemPrompt || "No system prompt.",
+			systemPrompt:
+				systemPromptPreview.join("\n\n") ||
+				(typeof ctx.getSystemPrompt === "function" ? ctx.getSystemPrompt() : "") ||
+				"No system prompt.",
 			memoryFiles: memoryPreview.join("\n\n") || "No memory files in context.",
 			skills: skillsText || "No skills in context.",
 			tools: toolDefinitionPreview.join("\n\n") || "No active tool definitions.",

package/extensions/feature/reference/index.ts

@@ -432,6 +432,8 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.on("before_agent_start", async (event, ctx) => {
+		// Pi 1.2.0 custom events have no prompt. Older hosts omit messageType.
+		if (!("prompt" in event)) return;
 		const referenceIds = extractSessionReferenceIds(event.prompt);
 		if (referenceIds.length === 0) return;
 

package/extensions/feature/reference/subagent.ts

@@ -26,8 +26,9 @@ const MENTION_PATTERN = /(?:^|[\t ])@([^\s@]*)$/;
 const SUBAGENT_REFERENCE_PATTERN = /(?:^|\s)@subagent:\[([^\]]+)](?![\w-])/g;
 
 function getAgentDir(): string {
+	// PI_CODING_AGENT_DIR 本身就是 agent 目录（默认 ~/.pi/agent），不是家目录。
 	const override = process.env.PI_CODING_AGENT_DIR;
-	return join(override ? override : homedir(), ".pi", "agent", "agents");
+	return join(override ? override : join(homedir(), ".pi", "agent"), "agents");
 }
 
 function parseFrontmatter(content: string): Record<string, string> {
@@ -207,6 +208,8 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 
 	// Inject as a request message, not systemPrompt, so the cached prefix stays stable.
 	pi.on("before_agent_start", async (event, _ctx) => {
+		// Pi 1.2.0 custom events have no prompt. Older hosts omit messageType.
+		if (!("prompt" in event)) return;
 		const agents = getAgents();
 		if (agents.length === 0) return;
 

package/extensions/feature/shell/footer.ts

@@ -53,13 +53,16 @@ export function footerGlyphs(nerdIcons: boolean): { git: string; cache: string;
 		: { git: "", cache: "", mcp: "" };
 }
 
-/** 思考等级的填充圆标：等级越高填得越满。 */
+/**
+ * 思考等级的填充圆标：等级越高填得越满。
+ * 全部取自同一圆径的几何圆，避开占位虚线圆和偏小的半圆。
+ */
 const EFFORT_SYMBOL: Record<string, string> = {
-	minimal: "\u25cc",
-	low: "\u25cb",
+	minimal: "\u25cb",
+	low: "\u25ce",
 	medium: "\u25d4",
-	high: "\u25d1",
-	xhigh: "\u25d5",
+	high: "\u25d5",
+	xhigh: "\u25c9",
 	max: "\u25cf",
 };
 
@@ -72,7 +75,7 @@ export function modelChip(
 ): string {
 	const symbol = EFFORT_SYMBOL[level];
 	if (!symbol) return theme.fg("accent", modelLabel);
-	return `${theme.fg("accent", modelLabel)} ${thinkingColor(symbol)} ${theme.fg("dim", level)}`;
+	return `${theme.fg("accent", modelLabel)} ${thinkingColor(`${symbol} ${level}`)}`;
 }
 
 /** git 状态符号按职能分色：冲突/落后 error，修改 warning，未跟踪 muted，领先 success。 */
@@ -441,6 +444,7 @@ const createCustomFooterFactory =
 						displayTokenRate(config.footerTokenRateMode),
 						currentTtftMs(),
 						config.footerTokenRateMode,
+						config.footerTokenRateTtft,
 					)
 				: "";
 			const rateChip = rateLabel ? theme.fg("dim", rateLabel) : "";

package/extensions/feature/shell/token-rate.ts

@@ -182,11 +182,23 @@ export function currentTtftMs(): number {
 	return Math.max(0, firstTokenAt - runStartTime);
 }
 
-/** `avg 1.2k tok/s (TTFT: 812ms)`；无数据显示空串，未出首 token 时无括号段。 */
-export function formatTokenRate(rate: number, ttftMs = 0, mode: TokenRateMode = "average"): string {
+/** 不足 1 秒用毫秒，否则用一位小数的秒。 */
+export function formatTtft(ttftMs: number): string {
+	if (ttftMs < 1000) return `${Math.round(ttftMs)}ms`;
+	return `${(ttftMs / 1000).toFixed(1)}s`;
+}
+
+/** `avg 1.2k tok/s (TTFT: 812ms)`；无数据显示空串，未出首 token 或 showTtft 为 false 时无括号段。 */
+export function formatTokenRate(
+	rate: number,
+	ttftMs = 0,
+	mode: TokenRateMode = "average",
+	showTtft = true,
+): string {
 	if (!Number.isFinite(rate) || rate <= 0) return "";
 	const value = rate >= 1000 ? `${(rate / 1000).toFixed(1)}k` : `${Math.round(rate)}`;
-	const ttft = Number.isFinite(ttftMs) && ttftMs > 0 ? ` (TTFT: ${Math.round(ttftMs)}ms)` : "";
+	const ttft =
+		showTtft && Number.isFinite(ttftMs) && ttftMs > 0 ? ` (TTFT: ${formatTtft(ttftMs)})` : "";
 	const label = mode === "live" ? "live" : "avg";
 	return `${label} ${value} tok/s${ttft}`;
 }

package/extensions/feature/shell/working-message.ts

@@ -1,10 +1,4 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { getCompactRunStatusText } from "../../renderer/compact-mode.ts";
-import {
-	fullscreenLazyTui,
-	getToolMouseTui,
-	isFullscreenAtBottom,
-} from "../../renderer/mouse/scroll.ts";
 import { formatDuration, formatTokenCount } from "../../utils/format.ts";
 import {
 	resetTokenRate,
@@ -60,23 +54,10 @@ export default function (pi: ExtensionAPI): void {
 		if (output > 0) recordProviderUsage(output);
 	}
 
-	/**
-	 * 摘要行滚出视口才镜像：仅 fullscreen 且已离开 transcript 底部。
-	 * regular 没有“离开底部”信号（transcript 在终端回滚区），保持 Pi 默认文案。
-	 */
-	function compactMirrorText(): string | undefined {
-		const tui = getToolMouseTui();
-		if (!tui || !fullscreenLazyTui(tui) || isFullscreenAtBottom(tui)) return undefined;
-		return getCompactRunStatusText();
-	}
-
 	function buildWorkingMessage(): string {
 		const parts: string[] = [];
 		const tokens = tokenCount();
 		if (tokens > 0) parts.push(`↓ ${formatTokenCount(tokens)} tokens`);
-		// compact 活动回合且已滚出摘要行：直接用摘要行文案（自带回合时长，不叠 agent 计时）。
-		const compactStatus = compactMirrorText();
-		if (compactStatus) return [compactStatus, ...parts].join(" · ");
 		const elapsed = Date.now() - (agentStartTime || turnStartTime);
 		if (elapsed >= SHOW_TIMER_AFTER_MS || tokens > 0) {
 			// formatDuration 低于 1 秒返回 ""，此处回退 "0s" 保持计时器连续跳动。
@@ -186,9 +167,9 @@ export default function (pi: ExtensionAPI): void {
 			evt.type === "text_start" ||
 			evt.type === "toolcall_start"
 		) {
-			// TTFT 的首块含 toolcall_start：模型直接发起 tool call（thinking/text 省略）时也算首 token
+			// TTFT 的首块含 toolcall_start：模型直接发起 tool call（thinking/text 省略）时也算首 token。
+			// 分段锚点只在 turn_start 重置。这里再重置会把累计 usage.output 当成新的首报。
 			markFirstToken();
-			startMessageSegment();
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "thinking_delta" || evt.type === "text_delta") {
 			if (typeof evt.delta === "string") sampleTokenDelta(evt.delta);