pi-cc-extensions 1.0.11 → 1.0.12

package/README.en.md

@@ -46,7 +46,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 {
   // style
   "mode": "on",                            // on / compact / off
-  "excludeRenderers": [],                  // tools keeping the native renderer; Agent always keeps its dedicated renderer
+  "excludeRenderers": [],                  // tools keeping the native renderer, matched case-insensitively; Agent always keeps its dedicated renderer
 
   // features
   "enableSessionReference": true,          // @ session references

package/README.md

@@ -46,7 +46,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 {
   // style
   "mode": "on",                            // on / compact / off
-  "excludeRenderers": [],                  // 走原生渲染的工具名；Agent 始终保留专用渲染器
+  "excludeRenderers": [],                  // 走原生渲染的工具名，匹配忽略大小写；Agent 始终保留专用渲染器
 
   // features
   "enableSessionReference": true,          // @ session 引用

package/extensions/config/config.ts

@@ -340,6 +340,43 @@ export function formatExcludeRenderers(names: readonly string[]): string {
 	return names.length === 0 ? "none" : names.join(", ");
 }
 
+/** excludeRenderers 与运行时工具名按大小写不敏感匹配（如候选 "agent" 对上 pi-subagents 的 "Agent"）。 */
+export function isExcludedRenderer(
+	toolName: string,
+	excludeRenderers: readonly string[] = config.excludeRenderers,
+): boolean {
+	const key = toolName.toLowerCase();
+	return excludeRenderers.some((name) => name.toLowerCase() === key);
+}
+
+/** 写入名单时去掉同名异大小写项，再按 id 写入，避免 agent/Agent 并存。 */
+export function withExcludeRendererToggle(
+	excludeRenderers: readonly string[],
+	id: string,
+	exclude: boolean,
+): string[] {
+	const key = id.toLowerCase();
+	const next = excludeRenderers.filter((name) => name.toLowerCase() !== key);
+	if (exclude) next.push(id);
+	return [...new Set(next)].sort((a, b) => a.localeCompare(b));
+}
+
+/** 面板候选：内置候选与用户名单按大小写不敏感合并，保留先出现的写法（候选在前，仍是 agent）。 */
+export function mergeExcludeRendererCandidates(
+	names: readonly string[],
+	candidates: readonly string[] = EXCLUDE_RENDERER_CANDIDATES,
+): string[] {
+	const seen = new Set<string>();
+	const merged: string[] = [];
+	for (const name of [...candidates, ...names]) {
+		const key = name.toLowerCase();
+		if (seen.has(key)) continue;
+		seen.add(key);
+		merged.push(name);
+	}
+	return merged.sort((a, b) => a.localeCompare(b));
+}
+
 export function formatConfigStatus(source: Config = config): string {
 	return [
 		`mode=${source.mode}`,

package/extensions/config/panel.ts

@@ -38,7 +38,6 @@ import {
 	DIFF_INDICATOR_MODES,
 	DIFF_SPLIT_MIN_WIDTH_VALUES,
 	DIFF_VIEW_MODES,
-	EXCLUDE_RENDERER_CANDIDATES,
 	EXPANDED_INPUT_MAX_LINES_VALUES,
 	EXPANDED_OUTPUT_MAX_LINES_VALUES,
 	EXPANDED_PREVIEW_MAX_LINES_VALUES,
@@ -62,6 +61,9 @@ import {
 	type FooterGitStatsMode,
 	type FooterTokenRateMode,
 	type ScrollButtonMode,
+	isExcludedRenderer,
+	mergeExcludeRendererCandidates,
+	withExcludeRendererToggle,
 } from "./config.ts";
 
 /** renderer 注入的渲染副作用，面板自身不触碰渲染状态。 */
@@ -268,14 +270,13 @@ function buildExcludeRenderersSubmenu(
 	invalidate: () => void;
 	handleInput: (data: string) => void;
 } {
-	const candidates = [
-		...new Set([...EXCLUDE_RENDERER_CANDIDATES, ...config.excludeRenderers]),
-	].sort((a, b) => a.localeCompare(b));
+	// 候选与名单按大小写不敏感合并：存过 Agent 时不再多出一行 agent。
+	const candidates = mergeExcludeRendererCandidates(config.excludeRenderers);
 	const items = candidates.map((name) => ({
 		id: name,
 		label: name,
 		description: `Use Pi native renderer for ${name} instead of Claude Code styling.`,
-		currentValue: config.excludeRenderers.includes(name) ? "exclude" : "style",
+		currentValue: isExcludedRenderer(name, config.excludeRenderers) ? "exclude" : "style",
 		values: ["style", "exclude"],
 	}));
 	const list = new SettingsList(
@@ -283,10 +284,13 @@ function buildExcludeRenderersSubmenu(
 		Math.min(8, Math.max(4, items.length)),
 		getSettingsListTheme(),
 		(id: string, value: string) => {
-			const excluded = new Set(config.excludeRenderers);
-			if (value === "exclude") excluded.add(id);
-			else excluded.delete(id);
-			updateConfig({ excludeRenderers: [...excluded].sort((a, b) => a.localeCompare(b)) });
+			updateConfig({
+				excludeRenderers: withExcludeRendererToggle(
+					config.excludeRenderers,
+					id,
+					value === "exclude",
+				),
+			});
 			onLiveChange();
 		},
 		() => onClose(),

package/extensions/renderer/default-mode.ts

@@ -6,7 +6,7 @@
  * 生命周期对齐 compact-mode：installDefaultMode → hooks.shutdown。
  */
 import { ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
-import { config, type CompactStyleMode } from "../config/config.ts";
+import { config, isExcludedRenderer, type CompactStyleMode } from "../config/config.ts";
 import {
 	COMPONENT_TOOL_RENDER_MODE,
 	GLOBAL_TOOL_RENDER_PATCH,
@@ -27,7 +27,7 @@ export function preservesOriginalRenderer(
 	builtInToolDefinition?: any,
 	excludeRenderers: readonly string[] = config.excludeRenderers,
 ): boolean {
-	if (!excludeRenderers.includes(toolName)) return false;
+	if (!isExcludedRenderer(toolName, excludeRenderers)) return false;
 	return [extensionDefinition, builtInToolDefinition].some(
 		(definition) =>
 			definition?.renderShell === "self" ||

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

@@ -45,11 +45,51 @@ export function createCodeLineHighlighter(
 	invalidate?: () => void,
 ): CodeLineHighlighter {
 	const codeEntries = entries.filter((entry): entry is DiffLineEntry => entry.kind === "line");
+	const allCode = codeEntries
+		.map((entry) => cleanCodeLine(normalizeCodeWhitespace(entry.content)))
+		.join("\n");
+	// Budget check stays on the whole visible code: over the limit nothing is highlighted.
+	// Per-segment checks would let a huge diff highlight itself one segment at a time.
+	const segmentLanguage = shouldHighlightCodeBlock(allCode) ? language : undefined;
+	const highlightByEntry = new WeakMap<DiffLineEntry, CodeLineHighlighter>();
+	let segment: DiffLineEntry[] = [];
+
+	const flushSegment = () => {
+		if (segment.length === 0) return;
+		const highlight = createContiguousCodeLineHighlighter(
+			segmentLanguage,
+			theme,
+			segment,
+			invalidate,
+		);
+		for (const entry of segment) highlightByEntry.set(entry, highlight);
+		segment = [];
+	};
+
+	// Omitted source cannot carry lexer state across a diff discontinuity.
+	// Each segment is highlighted and cached on its own; the budget above still bounds one diff.
+	for (const entry of entries) {
+		if (entry.kind === "line") segment.push(entry);
+		else flushSegment();
+	}
+	flushSegment();
+
+	return (line, entry) => highlightByEntry.get(entry)?.(line, entry) ?? "";
+}
+
+function createContiguousCodeLineHighlighter(
+	language: string | undefined,
+	theme: DiffTheme,
+	codeEntries: readonly DiffLineEntry[],
+	invalidate?: () => void,
+): CodeLineHighlighter {
 	const cleanLines = codeEntries.map((entry) =>
 		cleanCodeLine(normalizeCodeWhitespace(entry.content)),
 	);
 	const code = cleanLines.join("\n");
-	const shouldHighlight = !!language && shouldHighlightCodeBlock(code);
+	// A segment is a subset of the visible code, so `segmentLanguage` already carries
+	// the total budget decision; only the per-segment highlight is left to decide here.
+	const shouldHighlight = language !== undefined;
 	const fallbackLines = shouldHighlight
 		? (() => {
 				try {

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

@@ -1,6 +1,5 @@
-import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
+import { createWriteToolDefinition, type WriteOperations } from "@earendil-works/pi-coding-agent";
 import { lstat, mkdir, readFile, writeFile } from "node:fs/promises";
-import { dirname, isAbsolute, resolve } from "node:path";
 
 export const MAX_COMPARABLE_WRITE_BYTES = 512_000;
 export const MAX_WRITE_METADATA_ENTRIES = 100;
@@ -81,33 +80,51 @@ export async function executeWriteWithMetadata(
 	signal: AbortSignal | undefined,
 	cwd: string,
 ): Promise<{ content: Array<{ type: "text"; text: string }>; details: undefined }> {
-	const absolutePath = isAbsolute(params.path) ? params.path : resolve(cwd, params.path);
 	store.delete(toolCallId);
+	// 覆盖层只揽写前快照：路径解析（含 Windows 下 /mnt/<drive>、/cygdrive/<drive> 转换）、
+	// 目录创建、mutation queue 与错误文案全交回 pi 官方 write，参数与官方逐字一致。
+	const definition = createWriteToolDefinition(cwd, {
+		operations: writeSnapshotOperations(store, toolCallId),
+	}) as any;
 	try {
-		return await withFileMutationQueue(absolutePath, async () => {
-			const throwIfAborted = () => {
-				if (signal?.aborted) throw new Error("Operation aborted");
-			};
-			throwIfAborted();
-			const metadata = await capturePreviousContent(absolutePath);
-			throwIfAborted();
-			await mkdir(dirname(absolutePath), { recursive: true });
-			throwIfAborted();
-			await writeFile(absolutePath, params.content, "utf8");
-			// The file is already changed. A later abort must not report failure.
-			store.set(toolCallId, metadata);
-			return {
-				content: [
-					{
-						type: "text",
-						text: `Successfully wrote ${Buffer.byteLength(params.content, "utf8")} bytes to ${params.path}`,
-					},
-				],
-				details: undefined,
-			};
-		});
+		await definition.execute(toolCallId, params, signal, undefined, { cwd });
+		return writeSuccessResult(params);
 	} catch (error) {
+		// 文件已落盘，只是官方写后那次 abort 检查抦了错：保持「文件已改即成功」。
+		if (store.get(toolCallId) && signal?.aborted) return writeSuccessResult(params);
 		store.delete(toolCallId);
 		throw error;
 	}
 }
+
+/** 官方 write 的落盘操作：拿到的是官方解析后的绝对路径，快照才跟真实落盘一致。 */
+function writeSnapshotOperations(
+	store: WriteExecutionMetadataStore,
+	toolCallId: string,
+): WriteOperations {
+	return {
+		mkdir: (dir) => mkdir(dir, { recursive: true }).then(() => {}),
+		writeFile: async (absolutePath, content) => {
+			store.delete(toolCallId);
+			const metadata = await capturePreviousContent(absolutePath);
+			await writeFile(absolutePath, content, "utf8");
+			// 写已生效：后续 abort 不得把这次写报成失败，快照先落下。
+			store.set(toolCallId, metadata);
+		},
+	};
+}
+
+function writeSuccessResult(params: { path: string; content: string }): {
+	content: Array<{ type: "text"; text: string }>;
+	details: undefined;
+} {
+	return {
+		content: [
+			{
+				type: "text",
+				text: `Successfully wrote ${Buffer.byteLength(params.content, "utf8")} bytes to ${params.path}`,
+			},
+		],
+		details: undefined,
+	};
+}

package/package.json

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