pi-cc-extensions 0.9.6 → 0.9.8

package/extensions/renderer/default-mode.ts

@@ -100,6 +100,8 @@ type ToolExpandedBackgroundPatch = {
 	dispose: () => void;
 };
 
+/** rich diff 的两个入口（本处与 compact 的 paintCompactEditWrite）都靠 renderRichToolResult
+ * 返回 undefined 让位，这里只判断模式与工具名，避免多一个可能与让位不一致的 gate。 */
 export function shouldRenderRichDiff(
 	mode: CompactStyleMode,
 	toolName: string,

package/extensions/renderer/index.ts

@@ -12,7 +12,7 @@ import {
 	installToolExpandedBackground,
 	type DefaultModeHooks,
 } from "./default-mode.ts";
-import { isLazyProxyTui } from "../utils/fullscreen-detect.ts";
+import { installMainScreenDoRenderPatch, isLazyProxyTui } from "../utils/fullscreen-detect.ts";
 import { showCcstylePanel } from "../config/panel.ts";
 import {
 	config,
@@ -30,7 +30,7 @@ import {
 	teardownToolMouseInteraction,
 	TOOL_MOUSE_DISABLE,
 } from "./mouse/interaction.ts";
-import { getToolMouseTui } from "./mouse/scroll.ts";
+import { getToolMouseTui, noteNewTranscriptItem } from "./mouse/scroll.ts";
 import { setHoveredToolGroup, setHoveredToolIo } from "./mouse/hover.ts";
 import { clearAllAnimations } from "./tool/result.ts";
 import { installWriteOverride, WriteExecutionMetadataStore } from "./tool/diff/index.ts";
@@ -116,6 +116,8 @@ export default function (
 		// 渲染层（工具样式/分组）是原型与组件级 patch，fullscreen 官方布局
 		// 同样渲染这些组件，因此两种模式都安装。
 		if (installation) return installation;
+		// regular 主屏的差分渲染补丁：视口上方变化不再触发清回滚的 fullRender。
+		installMainScreenDoRenderPatch();
 		const defaultMode = installDefaultMode(writeExecutionMetadata);
 		const toolGrouping = installToolGrouping(() => config.mode === "on");
 		const compactMode = installCompactMode({
@@ -189,6 +191,13 @@ export default function (
 		}
 	});
 
+	// 回到底部按钮的累计计数：离开底部期间每落一块内容 +1。
+	pi.on("message_start", async (event) => {
+		const role = event.message?.role;
+		// toolResult 不单独成块（渲染在工具卡内），跳过以免与工具卡重复计数。
+		if (role === "user" || role === "assistant" || role === "custom") noteNewTranscriptItem();
+	});
+
 	pi.on("tool_execution_end", async (event) => {
 		if (config.mode !== "compact") return;
 		// Agent 等工具收尾后延迟刷新，让 compact-thinking 先落最终态。
@@ -199,10 +208,18 @@ export default function (
 	});
 
 	pi.on("session_start", async (event, ctx) => {
-		// 延迟到 session_start 注册 write override：加载阶段 getAllTools 不可用且其他扩展
-		// 尚未注册工具，无法检测外部 write 所有者（如 pi-spark），直接注册会与对方撞名。
-		// session_start 时所有扩展已加载完毕，installWriteOverride 内部会检测并让位。
-		installWriteOverride(pi, writeExecutionMetadata);
+		// 延后一拍再确认 write 归属：其他扩展同样在各自的 session_start 里注册工具，
+		// 本 handler 执行时可能还看不到对方，此时注册会与对方撞名（注册表先到先得），
+		// 对方的 write 会被静默丢弃。等所有 session_start 跑完，检测结果才是权威的。
+		setTimeout(() => {
+			installWriteOverride(pi, writeExecutionMetadata, (owner) => {
+				// 冲突可见：对方接管 write 后本插件不再提供富 diff。
+				ctx.ui?.notify?.(
+					`ccstyle: write 工具已被 ${owner.path || owner.source} 占用，富 diff 已让位`,
+					"warning",
+				);
+			});
+		}, 0);
 		const hooks = ensureTuiInstallation(ctx);
 		// 鼠标交互独立于渲染层：fullscreen 渲染层让位（hooks undefined）但
 		// 工具点击/回到底部适配仍需安装；保持在渲染层安装之后以维持原顺序。
@@ -243,6 +260,7 @@ export default function (
 
 	pi.on("tool_execution_start", async (_event, ctx) => {
 		installation?.toolGrouping.setTheme(ctx.ui.theme);
+		noteNewTranscriptItem();
 	});
 
 	pi.on("session_shutdown", async () => {

package/extensions/renderer/mouse/scroll.ts

@@ -27,12 +27,19 @@ export function setToolMouseTui(tui: any): void {
 	patchRegistry.install(TOOL_MOUSE_TUI_SLOT, tui);
 }
 
-type ScrollButtonState = { visible: boolean; hovered: boolean; widget: any };
+type ScrollButtonState = {
+	visible: boolean;
+	hovered: boolean;
+	widget: any;
+	/** 按钮可见期间新落的 transcript 块数（消息 + 工具卡）。 */
+	newCount: number;
+};
 function scrollButtonState(): ScrollButtonState {
 	return patchRegistry.ensure(SCROLL_BUTTON_STATE_SLOT, () => ({
 		visible: false,
 		hovered: false,
 		widget: null,
+		newCount: 0,
 	}));
 }
 export function getScrollButtonVisible(): boolean {
@@ -44,8 +51,32 @@ export function getScrollButtonHovered(): boolean {
 export function getScrollButtonWidget(): any {
 	return scrollButtonState().widget;
 }
+export function getScrollButtonNewCount(): number {
+	return scrollButtonState().newCount;
+}
 export function setScrollButtonVisible(visible: boolean): void {
-	scrollButtonState().visible = visible;
+	const state = scrollButtonState();
+	state.visible = visible;
+	// 计数只在离开底部期间有效：跟随输出即清零，文案回到 Back to bottom。
+	if (!visible) state.newCount = 0;
+}
+
+/**
+ * 记账一块新落进 transcript 的内容（用户/助手消息、工具卡）。
+ * 仅在按钮可见（已滚动离开底部）时累加，并请求重绘让按钮文案立即更新。
+ */
+export function noteNewTranscriptItem(): void {
+	const state = scrollButtonState();
+	const tui = getToolMouseTui();
+	if (!state.visible || !tui) return;
+	// 提交新消息时官方可能直接跳回底部（不经过滚动输入）：先按实时跟随状态校正，
+	// 否则跟随期间的内容会被当成“离开底部时的新消息”计入。
+	if (isAtTranscriptBottom(tui)) {
+		hideScrollButton(tui);
+		return;
+	}
+	state.newCount += 1;
+	tui.requestRender?.();
 }
 
 /** 返回是否发生变化（调用方据此决定是否需要重渲染）。 */
@@ -64,6 +95,7 @@ export function resetScrollButtonState(): void {
 	scrollButtonState().visible = false;
 	scrollButtonState().hovered = false;
 	scrollButtonState().widget = null;
+	scrollButtonState().newCount = 0;
 	scrollButtonSyncScheduled = false;
 }
 
@@ -206,12 +238,19 @@ export function updateScrollButtonFromInput(tui: any, data: string): void {
 	if (matchesKey(data, "enter") || matchesKey(data, "return")) hideScrollButton(tui);
 }
 
+/** 无新内容时提示原文案；有新内容时换成累计条数。 */
+function scrollButtonText(): string {
+	const count = getScrollButtonNewCount();
+	const shortcut = formatShortcut(SCROLL_BOTTOM_SHORTCUT);
+	if (count <= 0) return `Back to bottom · ${shortcut}`;
+	return `${count} new message${count === 1 ? "" : "s"} · ${shortcut}`;
+}
+
 export function renderScrollButton(width: number, theme: any): string[] {
 	if (!getScrollButtonVisible() || !fullscreenLazyTui(getToolMouseTui())) return [];
-	const shortcut = formatShortcut(SCROLL_BOTTOM_SHORTCUT);
 	const label = theme.fg(
 		getScrollButtonHovered() ? "text" : "accent",
-		`[ ↓ Back to bottom · ${shortcut} ]`,
+		`[ ↓ ${scrollButtonText()} ]`,
 	);
 	const leftPad = Math.max(0, Math.floor((width - visibleWidth(label)) / 2));
 	return [`${" ".repeat(leftPad)}${truncateToWidth(label, width, "…")}`];

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

@@ -6,6 +6,7 @@ import {
 	type DisplayConfigInput,
 } from "./diff-renderer.ts";
 import { DEFAULT_TOOL_DISPLAY_CONFIG } from "../../../config/config.ts";
+import { patchRegistry, WRITE_OWNERSHIP_SLOT } from "../../../utils/patch-keys.ts";
 import { executeWriteWithMetadata, WriteExecutionMetadataStore } from "./write-execution.ts";
 
 function resultText(result: any): string {
@@ -59,6 +60,8 @@ export function renderRichToolResult(
 		);
 	}
 	if (toolName !== "write") return undefined;
+	// 让位点：write 归其他扩展时不提供富 diff，交回普通结果行。
+	if (!ownsWriteTool()) return undefined;
 
 	const metadata = writeMetadata.get(context?.toolCallId);
 	if (!metadata) {
@@ -83,23 +86,57 @@ export function renderRichToolResult(
 	);
 }
 
-function hasExternalWriteOwner(pi: ExtensionAPI): boolean {
+/** write 被其他扩展占用时的来源，用于提示冲突。 */
+export type ExternalWriteOwner = { source: string; path: string };
+
+type WriteOwnershipState = {
+	/** write 是否由本插件执行；undefined 表示尚未确认，按拥有处理以保持既有行为。 */
+	owned?: boolean;
+};
+
+function writeOwnership(): WriteOwnershipState {
+	return patchRegistry.ensure<WriteOwnershipState>(WRITE_OWNERSHIP_SLOT, () => ({}));
+}
+
+/**
+ * write 是否由本插件执行。只有注册过 write override 才有执行元数据，
+ * 否则渲染层要放行给普通结果行，避免每张卡降级成 "diff unavailable"。
+ */
+export function ownsWriteTool(): boolean {
+	return writeOwnership().owned !== false;
+}
+
+/** 当前占用 write 的其他扩展；builtin 或未注册时返回 undefined。 */
+function findExternalWriteOwner(pi: ExtensionAPI): ExternalWriteOwner | undefined {
 	try {
-		const tools = pi.getAllTools();
-		const write = tools.find((tool: any) => tool?.name === "write") as any;
-		const source = write?.sourceInfo?.source;
-		return Boolean(write && typeof source === "string" && source !== "builtin");
+		const tools = pi.getAllTools() as any[];
+		const write = tools?.find((tool: any) => tool?.name === "write") as any;
+		const sourceInfo = write?.sourceInfo;
+		const source = sourceInfo?.source;
+		if (!write || typeof source !== "string" || source === "builtin") return undefined;
+		return { source, path: typeof sourceInfo?.path === "string" ? sourceInfo.path : "" };
 	} catch {
-		// getAllTools is unavailable before the extension runtime is bound.
-		return false;
+		// getAllTools 在扩展运行时绑定前不可用。
+		return undefined;
 	}
 }
 
 export function installWriteOverride(
 	pi: ExtensionAPI,
 	store = new WriteExecutionMetadataStore(),
+	/** write 已被其他扩展占用时回调一次，调用方据此提示冲突。 */
+	onExternalOwner?: (owner: ExternalWriteOwner) => void,
 ): WriteExecutionMetadataStore {
-	if (typeof (pi as any).registerTool !== "function" || hasExternalWriteOwner(pi)) return store;
+	if (typeof (pi as any).registerTool !== "function") return store;
+	const state = writeOwnership();
+	const external = findExternalWriteOwner(pi);
+	if (external) {
+		// 让位：执行与 diff 都归对方，渲染层据 owned=false 走普通结果行。
+		state.owned = false;
+		onExternalOwner?.(external);
+		return store;
+	}
+	state.owned = true;
 	const nativeWrite = createWriteToolDefinition(process.cwd()) as any;
 	pi.registerTool({
 		...nativeWrite,

package/extensions/renderer/tool/names.ts

@@ -62,8 +62,8 @@ export type ToolCallSummary = {
 };
 
 function pathApi(value: string) {
-	if (win32.isAbsolute(value)) return win32;
 	if (posix.isAbsolute(value)) return posix;
+	if (win32.isAbsolute(value)) return win32;
 	return undefined;
 }
 

package/extensions/utils/ansi-text.ts

@@ -45,3 +45,32 @@ export function stripLeadingStatusIcon(line: string): string {
 		"$1",
 	);
 }
+
+/** 终端序列零宽（不计入 plain 下标），与 stripAnsi/stripTerminalSequencesPreservingLayout 一致。 */
+const ANY_SEQUENCE_RE = new RegExp(`${CSI_SEQUENCE_RE.source}|${OSC_SEQUENCE_RE.source}`, "g");
+
+/** 只保留 [start, end) 之外的字符（base 为 text 首字符在 plain 串中的下标）。 */
+function keepOutsideRange(text: string, base: number, start: number, end: number): string {
+	if (base + text.length <= start || base >= end) return text;
+	return text.slice(0, Math.max(0, start - base)) + text.slice(Math.max(0, end - base));
+}
+
+/**
+ * 删除 plain 区间 [start, end) 的字符，保留其余字符的 ANSI 样式。
+ * 区间内的终端序列原样保留，因此区间后的字符（如收尾括号）沿用前文颜色，
+ * 不会像截断后拼纯文本那样掉回终端默认前景色。
+ */
+export function removeStyledRange(styled: string, start: number, end: number): string {
+	if (end <= start) return styled;
+	let plain = 0;
+	let cursor = 0;
+	let out = "";
+	for (const match of styled.matchAll(ANY_SEQUENCE_RE)) {
+		const text = styled.slice(cursor, match.index);
+		out += keepOutsideRange(text, plain, start, end);
+		plain += text.length;
+		out += match[0];
+		cursor = match.index + match[0].length;
+	}
+	return out + keepOutsideRange(styled.slice(cursor), plain, start, end);
+}

package/extensions/utils/fullscreen-detect.ts

@@ -1,3 +1,6 @@
+import { TuiMainScreen } from "@earendil-works/pi-tui";
+import { MAIN_SCREEN_DO_RENDER_PATCH, patchRegistry } from "./patch-keys.ts";
+
 /**
  * 官方 0.84+ 的 tui 引用是惰性 Proxy（createInteractiveTuiReference）：
  * 函数属性每次 get 都返回新包装，执行时才解析到当前实现。
@@ -9,3 +12,51 @@ export function isLazyProxyTui(tui: any): boolean {
 	const probe = tui.requestRender;
 	return typeof probe === "function" && probe !== tui.requestRender;
 }
+
+type MainScreenDoRenderPatch = {
+	active: boolean;
+	original: (lines: string[]) => string[];
+	installed: (lines: string[]) => string[];
+};
+
+/**
+ * regular（TuiMainScreen）模式的 doRender 走差分绘制：一旦第一个变化行落在
+ * previousViewportTop 之上（终端写不进 scrollback 的区域），只能
+ * fullRender(true)——\x1b[2J\x1b[H\x1b[3J 清屏并清掉整段 scrollback。
+ * compact 直播式回合的摘要行动画与流式正文渲染在回合工具卡/diff 面板上方；
+ * diff 面板一落地把下方内容撑过屏高，之后每帧重绘都命中该分支：scrollback
+ * 被反复清空，滚动条回弹、视口钉住，直到输出结束才恢复。
+ *
+ * 视口上方的行本就无法重写，只剩「清回滚重打」与「scrollback 保留旧文本」
+ * 两条路。这里选后者：applyLineResets 是差分比较前最后一个拿到整帧的环节，
+ * 把 previousLines 的视口上方前缀直接对齐新帧，差分只看到可写区域，照常增量
+ * 绘制。代价仅是 scrollback 里那几行停留在最后一次实际写入的内容。
+ */
+export function installMainScreenDoRenderPatch(): void {
+	const prototype = TuiMainScreen.prototype as any;
+	if (typeof prototype?.applyLineResets !== "function") return;
+	const previous = patchRegistry.get<MainScreenDoRenderPatch>(MAIN_SCREEN_DO_RENDER_PATCH);
+	if (previous) previous.active = false;
+	const original =
+		previous && prototype.applyLineResets === previous.installed
+			? previous.original
+			: prototype.applyLineResets;
+	const patch: MainScreenDoRenderPatch = {
+		active: true,
+		original,
+		installed(this: any, lines: string[]) {
+			const result = original.call(this, lines);
+			if (!patch.active) return result;
+			const prev = this.previousLines;
+			if (!Array.isArray(prev)) return result;
+			const top = Math.min(
+				Math.max(0, Math.floor(Number(this.previousViewportTop) || 0)),
+				result.length,
+			);
+			for (let i = 0; i < top; i++) prev[i] = result[i];
+			return result;
+		},
+	};
+	prototype.applyLineResets = patch.installed;
+	patchRegistry.install(MAIN_SCREEN_DO_RENDER_PATCH, patch);
+}

package/extensions/utils/patch-keys.ts

@@ -29,6 +29,8 @@ export const COMPONENT_TOOL_RENDER_MODE = Symbol.for("pi.ccstyle.component-tool-
 export const TOOL_EXPANDED_BACKGROUND_PATCH = Symbol.for(
 	"pi.ccstyle.tool-expanded-background-patch",
 );
+// write 归属：注册期确认一次，渲染期据此决定是否提供 rich diff。
+export const WRITE_OWNERSHIP_SLOT = Symbol.for("pi.ccstyle.write-ownership");
 
 // ── 消息组件补丁 ──
 export const MESSAGE_DISPLAY_PATCH = Symbol.for("pi.ccstyle.message-display-patch");
@@ -38,6 +40,9 @@ export const TOOL_GROUPING_PATCH_KEY = Symbol.for("pi.ccstyle.tool-grouping-patc
 export const TOOL_GROUPING_PARENT_KEY = Symbol.for("pi.ccstyle.tool-grouping-parent");
 export const TOOL_GROUPING_GENERATION_KEY = Symbol.for("pi.ccstyle.tool-grouping-generation");
 
+// ── regular 主屏渲染补丁 ──
+export const MAIN_SCREEN_DO_RENDER_PATCH = Symbol.for("pi.ccstyle.main-screen-do-render-patch");
+
 // ── 鼠标交互 ──
 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.6",
+	"version": "0.9.8",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",