pi-cc-extensions 1.0.0 → 1.0.2

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

@@ -5,43 +5,28 @@ import {
 	getToolMouseTui,
 	isFullscreenAtBottom,
 } from "../../renderer/mouse/scroll.ts";
-import { formatDuration } from "../../utils/format.ts";
+import { formatDuration, formatTokenCount } from "../../utils/format.ts";
+import {
+	resetTokenRate,
+	carryTokenRate,
+	pauseTokenRate,
+	resumeTokenRate,
+	markFirstToken,
+	sampleTokenDelta,
+	recordProviderUsage,
+	startMessageSegment,
+	totalTokens,
+} from "./token-rate.ts";
 
 const REFRESH_INTERVAL_MS = 1_000;
 /** Elapsed time is only shown once the turn has run this long. */
 const SHOW_TIMER_AFTER_MS = 3_000;
 
-function formatCount(value: number): string {
-	return new Intl.NumberFormat("en-US").format(value);
-}
-
-type ContentBlock = {
-	type?: unknown;
-	text?: unknown;
-	thinkingSignature?: { body?: unknown };
-};
-
 type StreamMessage = {
 	content?: unknown;
 	usage?: { output?: unknown };
 };
 
-/** 每个 content index 的可见文本/思考长度；无对应块的 index 保持稀疏洞。 */
-function textBlockLengths(message: StreamMessage): number[] {
-	const content = message.content;
-	if (!Array.isArray(content)) return [];
-	const lengths: number[] = [];
-	for (let index = 0; index < content.length; index++) {
-		const block = content[index] as ContentBlock;
-		if (block?.type === "text" && typeof block.text === "string") {
-			lengths[index] = block.text.length;
-		} else if (block?.type === "thinking" && block.thinkingSignature?.body) {
-			lengths[index] = (block.thinkingSignature.body as string).length;
-		}
-	}
-	return lengths;
-}
-
 function outputUsage(message: StreamMessage): number {
 	const value = Number(message?.usage?.output);
 	return Number.isFinite(value) && value > 0 ? Math.round(value) : 0;
@@ -55,39 +40,24 @@ type WorkingUi = {
  * Extend Pi's footer working row while preserving its spinner and "Working...":
  * `⠋ Working... (↓ 1,234 tokens · 12s)`
  *
- * Live tokens use the same chars/4 estimate as pi-claude-code-ui, then switch to
- * provider `usage.output` whenever the stream exposes an actual count.
- */
+ * token 数直接读 token-rate 的累计（估算 → provider usage 同源），不再本地重数。 */
 export default function (pi: ExtensionAPI): void {
 	let turnActive = false;
 	let agentStartTime = 0;
 	let turnStartTime = 0;
-	let responseLength = 0;
-	let responseTextBlockLengths: number[] = [];
-	let providerOutputTokens = 0;
+	/** 当前用户指令的起点；工具调用后的 turn 复用它，直到下一条指令。 */
+	let rateRunStartTime = 0;
 	let refreshTimer: ReturnType<typeof setTimeout> | null = null;
 	let lastMessage: string | null = null;
 	let activeCtx: { ui: WorkingUi | undefined; hasUI: boolean } | null = null;
 
 	function tokenCount(): number {
-		return providerOutputTokens || Math.max(0, Math.round(responseLength / 4));
-	}
-
-	function setTextBlockLength(index: number, length: number): void {
-		const previous = responseTextBlockLengths[index] ?? 0;
-		responseTextBlockLengths[index] = Math.max(0, length);
-		responseLength = Math.max(0, responseLength + responseTextBlockLengths[index] - previous);
-	}
-
-	function resetResponseTracking(message?: StreamMessage): void {
-		responseTextBlockLengths = message ? textBlockLengths(message) : [];
-		responseLength = responseTextBlockLengths.reduce((sum, length) => sum + length, 0);
-		providerOutputTokens = message ? outputUsage(message) : 0;
+		return totalTokens();
 	}
 
 	function updateProviderUsage(message: StreamMessage): void {
 		const output = outputUsage(message);
-		if (output > 0) providerOutputTokens = output;
+		if (output > 0) recordProviderUsage(output);
 	}
 
 	/**
@@ -103,7 +73,7 @@ export default function (pi: ExtensionAPI): void {
 	function buildWorkingMessage(): string {
 		const parts: string[] = [];
 		const tokens = tokenCount();
-		if (tokens > 0) parts.push(`↓ ${formatCount(tokens)} tokens`);
+		if (tokens > 0) parts.push(`↓ ${formatTokenCount(tokens)} tokens`);
 		// compact 活动回合且已滚出摘要行：直接用摘要行文案（自带回合时长，不叠 agent 计时）。
 		const compactStatus = compactMirrorText();
 		if (compactStatus) return [compactStatus, ...parts].join(" · ");
@@ -179,7 +149,7 @@ export default function (pi: ExtensionAPI): void {
 		stopRefreshLoop();
 		agentStartTime = 0;
 		turnStartTime = 0;
-		resetResponseTracking();
+		// 不重置 token-rate：footer 定格显示上一回合速率
 		restoreDefaultWorkingMessage();
 	}
 
@@ -187,12 +157,19 @@ export default function (pi: ExtensionAPI): void {
 		if (!agentStartTime) agentStartTime = Date.now();
 	});
 
-	pi.on("turn_start", async (_event, ctx) => {
+	pi.on("turn_start", async (event, ctx) => {
 		turnActive = true;
 		activeCtx = ctx;
-		turnStartTime = Date.now();
+		// 事件时间戳在 handler 之前产生；用 Date.now() 会和紧随的采样落在同一毫秒，分母变成 0。
+		turnStartTime = event?.timestamp || Date.now();
 		if (!agentStartTime) agentStartTime = turnStartTime;
-		resetResponseTracking();
+		// 工具调用后的 turn 属于同一条用户指令：计时、TTFT 与累计 token 保持到下一条指令。
+		// 速率起点用本指令第一个 turn 的时间戳；before_agent_start 只当指令 id。
+		if (rateRunStartTime !== agentStartTime) {
+			rateRunStartTime = agentStartTime;
+			resetTokenRate(turnStartTime);
+		}
+		startMessageSegment(turnStartTime);
 		syncWorkingMessage(true);
 		scheduleRefreshTick();
 	});
@@ -203,24 +180,25 @@ export default function (pi: ExtensionAPI): void {
 		if (!evt) return;
 
 		if (evt.type === "start") {
-			resetResponseTracking(evt.partial);
-		} else if (evt.type === "thinking_start" || evt.type === "text_start") {
-			setTextBlockLength(evt.contentIndex, 0);
+			// 新 assistant 消息起点：速率分段已在 turn_start 处理。
+		} else if (
+			evt.type === "thinking_start" ||
+			evt.type === "text_start" ||
+			evt.type === "toolcall_start"
+		) {
+			// TTFT 的首块含 toolcall_start：模型直接发起 tool call（thinking/text 省略）时也算首 token。
+			// 分段锚点只在 turn_start 重置。这里再重置会把累计 usage.output 当成新的首报。
+			markFirstToken();
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "thinking_delta" || evt.type === "text_delta") {
-			const add = typeof evt.delta === "string" ? evt.delta.length : 0;
-			setTextBlockLength(evt.contentIndex, (responseTextBlockLengths[evt.contentIndex] ?? 0) + add);
+			if (typeof evt.delta === "string") sampleTokenDelta(evt.delta);
 			updateProviderUsage(evt.partial);
-		} else if (evt.type === "text_end") {
-			setTextBlockLength(
-				evt.contentIndex,
-				typeof evt.content === "string" ? evt.content.length : 0,
-			);
+		} else if (evt.type === "text_end" || evt.type === "thinking_end") {
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "done") {
-			resetResponseTracking(evt.message);
+			updateProviderUsage(evt.message);
 		} else if (evt.type === "error") {
-			resetResponseTracking(evt.error);
+			updateProviderUsage(evt.error);
 		} else {
 			updateProviderUsage(evt.partial);
 		}
@@ -229,11 +207,20 @@ export default function (pi: ExtensionAPI): void {
 		scheduleRefreshTick();
 	});
 
+	pi.on("tool_execution_start", async () => {
+		pauseTokenRate();
+	});
+
+	pi.on("tool_execution_end", async () => {
+		resumeTokenRate();
+	});
+
 	pi.on("turn_end", async (_event, ctx) => {
 		turnActive = false;
 		activeCtx = ctx;
 		stopRefreshLoop();
-		resetResponseTracking();
+		// 本段 token 结转进累计，下一段 turn 继续累加；此处不清速率。
+		carryTokenRate();
 		// No completion message: return immediately to Pi's default idle state.
 		restoreDefaultWorkingMessage();
 	});

package/extensions/renderer/compact-mode.ts

@@ -42,7 +42,7 @@ import { toolLoadingIcon } from "../utils/tool-loading-icon.ts";
 import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
 import { refreshTranscriptComponent } from "./transcript-refresh.ts";
 import { getMessageDisplayTheme } from "./tool/message-display.ts";
-import { showMoreHintText } from "./tool/show-more-hint.ts";
+import { showMoreHintText } from "./tool/names.ts";
 import {
 	countEditDiffStats,
 	countWriteDiffStats,
@@ -53,13 +53,11 @@ import { displayConfigCacheKey } from "./tool/diff/diff-component.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
 import { getToolMouseTui } from "./mouse/scroll.ts";
-import {
-	insetComponent,
-	isLiveToolCall,
-	renderExpandedToolResult,
-	scheduleAnimation,
-} from "./tool/result.ts";
+import { insetComponent } from "./tool/result.ts";
+import { isLiveToolCall, scheduleAnimation } from "./tool/tool-state.ts";
+import { renderExpandedToolResult } from "./tool/tool-io.ts";
 import { paddedBackgroundRow } from "./tool/grouping.ts";
+import { styleChangeCounts } from "./tool/ccstyle-tool.ts";
 import { formatDisplayPath } from "./tool/names.ts";
 import {
 	hasVisibleText,
@@ -663,31 +661,37 @@ export function markCompactRoundToolExpanded(tool: any): void {
 	roundToolExpansion?.markUserExpanded(tool);
 }
 
-/** 面板展开前的视口位置：收起时还原，避免面板撑高后收起导致视口错位。 */
-const panelViewportBeforeExpand = new WeakMap<
-	object,
-	{ scrollTop: number; followingEnd: boolean }
->();
+/**
+ * 展开面板前的分隔空行与面板绑成一体：挂在同一尾行上，才不会被拆到
+ * anchor 正文之后（面板挂回合尾行，空行却留在消息里）。
+ * 带 childAtRow 返回 null：拆分判据认它为面板成员，行命中落空时归外层面板。
+ */
+function panelBoundSpacer(): any {
+	return {
+		render: () => [""],
+		childAtRow: () => null,
+		invalidate() {},
+	};
+}
+
+/** 面板展开前的视口标记：收起时需要重钉视口的卡。 */
+const panelViewportBeforeExpand = new WeakSet<object>();
 
 function capturePanelViewport(card: any): void {
-	if (!card || panelViewportBeforeExpand.has(card)) return;
-	const view = getToolMouseTui()?.getPrimaryScrollView?.();
-	if (!view || typeof view.scrollTop !== "number" || typeof view.scrollTo !== "function") return;
-	panelViewportBeforeExpand.set(card, {
-		scrollTop: view.scrollTop,
-		followingEnd: view.isFollowingEnd !== false,
-	});
+	if (!card) return;
+	panelViewportBeforeExpand.add(card);
 }
 
 function restorePanelViewport(card: any): void {
-	const snapshot = panelViewportBeforeExpand.get(card);
-	if (!snapshot) return;
-	panelViewportBeforeExpand.delete(card);
+	if (!panelViewportBeforeExpand.delete(card)) return;
 	const view = getToolMouseTui()?.getPrimaryScrollView?.();
 	if (!view) return;
-	// 展开前就在底部：交回官方 follow；否则回到展开前的滚动偏移。
-	if (snapshot.followingEnd && typeof view.scrollToEnd === "function") view.scrollToEnd();
-	else if (typeof view.scrollTo === "function") view.scrollTo(snapshot.scrollTop);
+	// 不用展开前的快照：展开期间用户可能滚进面板里，回跳旧位置才是"跳"。
+	// 面板在摘要行之下，收起只删它以下的行，保持当前 scrollTop 摘要行原地不动；
+	// clamp 后落在新底时 scrollTo 会自动恢复 followingEnd（并清 followSuppressedAtEnd）。
+	if (typeof view.scrollTo === "function" && typeof view.scrollTop === "number") {
+		view.scrollTo(view.scrollTop);
+	}
 }
 
 function compactEditWriteLine(
@@ -724,8 +728,13 @@ function compactEditWriteLine(
 						)
 					: undefined;
 		if (stats) {
-			statsText = ` (+${stats.added} -${stats.removed})`;
-			statsStyled = ` ${theme.fg("dim", "(")}${theme.fg("success", `+${stats.added}`)} ${theme.fg("error", `-${stats.removed}`)}${theme.fg("dim", ")")}`;
+			const counts = styleChangeCounts(
+				(color, text) => theme.fg(color, text),
+				stats.added,
+				stats.removed,
+			);
+			statsText = counts.text;
+			statsStyled = counts.styled;
 		}
 	}
 	// 展开卡 Box(1,1) 已 pad；折叠行自己留 1 格前导空格
@@ -1828,7 +1837,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				} else {
 					// 面板上沿留 1 行卡外空行：面板底色与 userMessage 同色，
 					// 贴在一起会看成一个块；卡内顶部再加 1 行 padding 保持上下对称。
-					anchorChildren.push(new Spacer(1));
+					// 空行必须与面板同进退（childAtRow 参与面板拆分），用 panelBoundSpacer。
+					anchorChildren.push(panelBoundSpacer());
 					anchorChildren.push(
 						compactRoundCard(
 							cardItems,