pi-cc-extensions 0.8.3 → 0.8.5

package/README.md

@@ -86,7 +86,6 @@
 
 `mode` 可取 `on`、`off` 或 `compact`。旧版 `enabled: true/false` 会自动迁移为 `on/off`。排除名单使用精确工具名；手动修改配置后执行 `/reload`。`Agent` 的专用 renderer 始终保留。
 
-`compact` 不会自动修改 Pi 的 `hideThinkingBlock` 或 `outputPad` 设置。运行总结会持久化到 Session，但只在 `compact` 模式显示。
 
 Compact transcript 行为改编自 [avhagedorn/pi-compact-transcript](https://github.com/avhagedorn/pi-compact-transcript) v0.6.2（MIT，Alan Hagedorn）。
 

package/extensions/claude-code-style.ts

@@ -253,8 +253,8 @@ export class ExpandedToolResultText {
 	}
 }
 
-function renderCollapsedToolResult(body: string, collapsedHint = ""): string {
-	return `\n    ⎿ ${body}${collapsedHint}`;
+export function renderCollapsedToolResult(body: string, collapsedHint = ""): string {
+	return `  ↳ ${body}${collapsedHint}`;
 }
 
 function renderExpandedToolResult(
@@ -1172,7 +1172,7 @@ function shouldUseSelfShell(component: any, patch: GlobalToolRenderPatch): boole
 	const definition = component.toolDefinition ?? component.builtInToolDefinition;
 	const toolName = String(component.toolName || definition?.name || "");
 	const useSelfShell =
-		patch.mode() !== "off" &&
+		patch.enabled() &&
 		SUBAGENT_TOOL_NAMES.has(toolName) &&
 		definition != null &&
 		definition.renderShell === undefined;

package/extensions/compact-style.ts

@@ -32,6 +32,7 @@ type AssistantPrototypePatch = {
 	prototype: any;
 	active: boolean;
 	originalUpdateContent: (...args: any[]) => any;
+	nativeUpdateContent: (...args: any[]) => any;
 	patchedUpdateContent: (...args: any[]) => any;
 };
 
@@ -131,6 +132,7 @@ const MARKER_WIDTH = 2;
 const STATE_KEY = Symbol.for("pi.ccstyle.compact-style.state");
 const TOOL_PATCH_KEY = Symbol.for("pi.ccstyle.compact-style.tool-patch");
 const ASSISTANT_PATCH_KEY = Symbol.for("pi.ccstyle.compact-style.assistant-patch");
+const ASSISTANT_REENTRY_KEY = Symbol.for("pi.ccstyle.compact-style.assistant-reentry");
 const TOOL_NATIVE_CHILD_KEY = Symbol.for("pi.ccstyle.compact-style.native-tool-child");
 
 function newRunStats(): RunStats {
@@ -499,7 +501,7 @@ function anchorCurrentThoughtTo(info: ToolInfo) {
 
 function currentThoughtLine(toolCallId: string, theme: Theme): string {
 	if (!thoughtTickerEnabled() || state.thoughtAnchorId !== toolCallId || !state.currentThoughtHeading) return "";
-	const prefix = "  ↳ ";
+	const prefix = "↳ ";
 	const budget = previewWidth((process.stdout.columns || 100) - prefix.length);
 	return theme.fg("dim", prefix) + theme.fg("thinkingText", limitPlain(state.currentThoughtHeading, budget));
 }
@@ -786,8 +788,11 @@ function patchToolExecutionComponent(installation: CompactInstallation): ToolPro
 			return;
 		}
 
-		this.selfRenderContainer.addChild(new Text(line, 0, 0));
 		const thoughtLine = currentThoughtLine(this.toolCallId, theme);
+		// Keep a compact tool group visually separate from its thinking ticker,
+		// without adding vertical space to ordinary compact tool rows.
+		if (thoughtLine) this.selfRenderContainer.addChild(new Spacer(1));
+		this.selfRenderContainer.addChild(new Text(line, 0, 0));
 		if (thoughtLine) this.selfRenderContainer.addChild(new Text(thoughtLine, 0, 0));
 	};
 
@@ -839,20 +844,34 @@ function patchAssistantMessageComponent(installation: CompactInstallation): Assi
 		prototype,
 		active: true,
 		originalUpdateContent: prototype.updateContent,
+		nativeUpdateContent: prototype.updateContent,
 		patchedUpdateContent: undefined as any,
 	};
 
 	patch.patchedUpdateContent = function patchedUpdateContent(this: any, message: any) {
+		// A renderer loaded after ccstyle may call the previous ccstyle wrapper.
+		// Bypass the newly linked downstream wrapper on that re-entry to avoid a
+		// recursion loop while preserving the original native renderer.
+		if (this[ASSISTANT_REENTRY_KEY] === patch) {
+			return patch.nativeUpdateContent.call(this, message);
+		}
 		if (!patch.active || !installation.active || state.activeInstallation !== installation) {
 			return patch.originalUpdateContent.call(this, message);
 		}
 
 		state.assistantComponents.add(this);
-		state.thinkingHidden = !!this.hideThinkingBlock;
 		const mode = currentMode();
-		if (mode !== "compact" || !this.hideThinkingBlock || !Array.isArray(message?.content)) {
+		// Compact owns thinking presentation: always suppress the full native block
+		// and surface only the short ticker, without changing Pi's persisted setting.
+		state.thinkingHidden = mode === "compact" || !!this.hideThinkingBlock;
+		if (mode !== "compact" || !Array.isArray(message?.content)) {
 			if (mode !== "compact") clearCurrentThought();
-			return patch.originalUpdateContent.call(this, message);
+			this[ASSISTANT_REENTRY_KEY] = patch;
+			try {
+				return patch.originalUpdateContent.call(this, message);
+			} finally {
+				delete this[ASSISTANT_REENTRY_KEY];
+			}
 		}
 		const theme = state.currentTheme;
 		if (!theme || !this.contentContainer || typeof this.contentContainer.clear !== "function") {
@@ -886,6 +905,17 @@ function patchAssistantMessageComponent(installation: CompactInstallation): Assi
 	return patch;
 }
 
+/** Reclaim the outermost assistant renderer after another extension patches it. */
+function ensureAssistantPatchOwnership(installation: CompactInstallation): void {
+	const patch = installation.assistantPatch;
+	if (!installation.active || !patch) return;
+	const prototype = patch.prototype;
+	if (prototype.updateContent === patch.patchedUpdateContent) return;
+	patch.originalUpdateContent = prototype.updateContent;
+	prototype.updateContent = patch.patchedUpdateContent;
+	prototype[ASSISTANT_PATCH_KEY] = patch;
+}
+
 function patchRenderers(installation: CompactInstallation): void {
 	installation.toolPatch = patchToolExecutionComponent(installation);
 	installation.assistantPatch = patchAssistantMessageComponent(installation);
@@ -987,7 +1017,7 @@ export class DynamicSummaryComponent {
 	invalidate(): void {}
 
 	render(width: number): string[] {
-		const line = isCompact() ? summaryLine(this.data) : "";
+		const line = currentMode() !== "off" ? summaryLine(this.data) : "";
 		if (!line) return [];
 		return new Text(this.theme.fg("muted", line), 0, 0).render(width);
 	}
@@ -996,7 +1026,7 @@ export class DynamicSummaryComponent {
 function appendRunSummary() {
 	const stats = state.runStats;
 	// A single tool row is already the summary.
-	if (!isCompact() || stats.toolCount < 2 || !state.pi?.appendEntry) return;
+	if (currentMode() === "off" || stats.toolCount < 2 || !state.pi?.appendEntry) return;
 	const data: CompactSummaryData = {
 		reads: stats.readFiles.size,
 		edits: stats.editFiles.size,
@@ -1077,6 +1107,7 @@ export function installCompactStyle(pi: ExtensionAPI, host: CompactStyleHost): C
 	return {
 		onSessionStart: (_event, ctx) => {
 			if (!isOwner()) return;
+			ensureAssistantPatchOwnership(installation);
 			captureTheme(ctx);
 			state.agentActive = false;
 			state.runStats = newRunStats();
@@ -1111,6 +1142,7 @@ export function installCompactStyle(pi: ExtensionAPI, host: CompactStyleHost): C
 		},
 		onMessageUpdate: (event, ctx) => {
 			if (!isOwner()) return;
+			ensureAssistantPatchOwnership(installation);
 			captureTheme(ctx);
 			const type = event?.assistantMessageEvent?.type;
 			if (typeof type === "string" && type.startsWith("thinking_")) updateCurrentThoughtFromMessage(event.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cc-extensions",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
   "type": "module",
   "keywords": [
@@ -27,8 +27,7 @@
       "./extensions/claude-code-style.ts",
       "./extensions/context.ts",
       "./extensions/session-reference.ts",
-      "./extensions/agent-autocomplete.ts",
-      "./extensions/compact-style.ts"
+      "./extensions/agent-autocomplete.ts"
     ],
     "image": "https://raw.githubusercontent.com/minuque/pi-cc-extensions/main/assets/readme/welcome.webp"
   },