pi-cc-extensions 0.8.37 → 0.8.38

package/extensions/claude-code-style.ts

@@ -3171,7 +3171,12 @@ export default function (
 		const tui = toolMouseTui;
 		if (!tui) return;
 		if (toolMouseFixedFeaturesEnabled) patchToolMouseInputCapture(tui);
-		patchToolMouseMotionAfterRender(tui);
+		// compositor.install captured the current chain as originalDoRender, so an
+		// already-installed wrapper keeps receiving calls through it — re-wrapping
+		// only when no wrapper is active avoids stacking one per rebuild/reload.
+		if (!(toolMouseRenderPatchTui === tui && toolMouseRenderPatchState?.active)) {
+			patchToolMouseMotionAfterRender(tui);
+		}
 		tui.requestRender?.(true);
 	});
 	const writeExecutionMetadata = installWriteOverride(pi, new WriteExecutionMetadataStore());

package/extensions/fixed-editor.ts

@@ -170,7 +170,10 @@ export function installFixedEditorImePatch(compositorClass: {
 			const wasInstalled = Boolean(this.installed);
 			const result = Reflect.apply(originalInstall, this, args);
 			// Dependents re-wrap doRender only after the compositor actually owns it.
-			if (!wasInstalled && this.installed && !this.disposed) compositorInstallNotify?.();
+			// Read the global each time: the patch survives /reload on the shared
+			// prototype while the owner callback belongs to the live extension module.
+			if (!wasInstalled && this.installed && !this.disposed)
+				getCompositorInstallNotify()?.callback();
 			return result;
 		};
 		prototype[MOUSE_WRITE_PATCH] = true;
@@ -211,9 +214,22 @@ type FixedEditorOwner = {
 const FIXED_EDITOR_OWNER = Symbol.for("pi.ccstyle.fixed-editor-owner");
 const FIXED_EDITOR_FOOTER_HOOK = Symbol.for("pi.ccstyle.fixed-editor-footer-hook");
 
-/** Active owner callback; fired from compositor.install after a fresh install succeeds. */
-let compositorInstallNotify: (() => void) | undefined;
-let compositorInstallNotifyOwner: object | undefined;
+// /reload keeps the same TerminalSplitCompositor.prototype, so the install hook
+// patched by the pre-reload module must read a cross-reload global instead of a
+// module-local variable; otherwise notifyRebuild never fires after reload and
+// dependents (ccstyle mouse input capture) stay unbound.
+const COMPOSITOR_INSTALL_NOTIFY_KEY = Symbol.for("pi.ccstyle.compositor-install-notify");
+
+type CompositorInstallNotify = { owner: object; callback: () => void };
+function getCompositorInstallNotify(): CompositorInstallNotify | undefined {
+	return (globalThis as Record<PropertyKey, unknown>)[COMPOSITOR_INSTALL_NOTIFY_KEY] as
+		| CompositorInstallNotify
+		| undefined;
+}
+function setCompositorInstallNotify(value: CompositorInstallNotify | undefined): void {
+	if (value) (globalThis as Record<PropertyKey, unknown>)[COMPOSITOR_INSTALL_NOTIFY_KEY] = value;
+	else delete (globalThis as Record<PropertyKey, unknown>)[COMPOSITOR_INSTALL_NOTIFY_KEY];
+}
 /** Runs before fixed-editor start/probe so dependents can unwrap doRender before capture. */
 let beforeFixedEditorStart: (() => void) | undefined;
 
@@ -289,10 +305,7 @@ export function installFixedEditor(
 		});
 	};
 	function clearInstallNotify() {
-		if (compositorInstallNotifyOwner === owner) {
-			compositorInstallNotify = undefined;
-			compositorInstallNotifyOwner = undefined;
-		}
+		if (getCompositorInstallNotify()?.owner === owner) setCompositorInstallNotify(undefined);
 	}
 	function deactivate() {
 		fixedEditorState.scrollButtonHitbox = null;
@@ -311,12 +324,14 @@ export function installFixedEditor(
 		if (previous?.owner !== owner) previous?.stop();
 		const currentSession = session;
 		// Register before start/probe so the first real compositor.install notifies us.
-		compositorInstallNotify = () => {
-			if (!active) return;
-			if ((globalThis as any)[FIXED_EDITOR_OWNER]?.owner !== owner) return;
-			notifyRebuild();
-		};
-		compositorInstallNotifyOwner = owner;
+		setCompositorInstallNotify({
+			owner,
+			callback: () => {
+				if (!active) return;
+				if ((globalThis as any)[FIXED_EDITOR_OWNER]?.owner !== owner) return;
+				notifyRebuild();
+			},
+		});
 		// Unwrap outer doRender patches before compositor construction captures it.
 		beforeFixedEditorStart?.();
 		start?.(currentSession.event, currentSession.ctx);

package/extensions/working-message.ts

@@ -20,11 +20,12 @@ function formatCount(value: number): string {
 
 function estimateTextLength(message: any): number {
 	if (!Array.isArray(message?.content)) return 0;
-	return message.content.reduce(
-		(sum: number, block: any) =>
-			sum + (block?.type === "text" && typeof block.text === "string" ? block.text.length : 0),
-		0,
-	);
+	return message.content.reduce((sum: number, block: any) => {
+		if (block?.type === "text" && typeof block.text === "string") return sum + block.text.length;
+		if (block?.type === "thinking" && block.thinkingSignature?.body)
+			return sum + (block.thinkingSignature.body as string).length;
+		return sum;
+	}, 0);
 }
 
 function textBlockLengths(message: any): number[] {
@@ -34,6 +35,8 @@ function textBlockLengths(message: any): number[] {
 		const block = message.content[index];
 		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;
@@ -166,15 +169,12 @@ export default function (pi: ExtensionAPI): void {
 
 		if (evt.type === "start") {
 			resetResponseTracking(evt.partial);
-		} else if (evt.type === "text_start") {
+		} else if (evt.type === "thinking_start" || evt.type === "text_start") {
 			setTextBlockLength(evt.contentIndex, 0);
 			updateProviderUsage(evt.partial);
-		} else if (evt.type === "text_delta") {
-			setTextBlockLength(
-				evt.contentIndex,
-				(responseTextBlockLengths[evt.contentIndex] ?? 0) +
-					(typeof evt.delta === "string" ? evt.delta.length : 0),
-			);
+		} 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);
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "text_end") {
 			setTextBlockLength(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.8.37",
+	"version": "0.8.38",
 	"description": "A Pi productivity suite with Claude Code-style UI, fixed editor, context inspection, and agent/session references",
 	"type": "module",
 	"keywords": [

package/themes/github-dark-default.json

@@ -40,7 +40,7 @@
 
 		"selectedBg": "#13233a",
 		"userMessageBg": "surface",
-		"userMessageText": "text",
+		"userMessageText": "",
 		"customMessageBg": "surface",
 		"customMessageText": "text",
 		"customMessageLabel": "accent",