pi-claude-code-ui 1.0.83 → 1.0.85

package/extensions/settings-path.ts

@@ -0,0 +1,4 @@
+export function getUserSettingsPath(): string {
+	const agentDir = process.env.PI_CODING_AGENT_DIR || `${process.env.HOME ?? ""}/.pi`;
+	return `${agentDir}/settings.json`;
+}

package/extensions/spinner.ts

@@ -1,9 +1,13 @@
 import { existsSync, readFileSync } from "node:fs";
 import net from "node:net";
+import { homedir } from "node:os";
+import { join } from "node:path";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Loader } from "@earendil-works/pi-tui";
 
+import { getUserSettingsPath } from "./settings-path";
+
 // ---------------------------------------------------------------------------
 // Patch built-in Loader with Claude/OpenBrawd-style glyphs.
 // Keep animation cadence constant so the spinner doesn't appear to slow down
@@ -44,7 +48,7 @@ function readSpinnerSettings(): { adaptive: boolean; verbColor: string; statusCo
 	// orange as the glyph on themes like openAntigravity-dark.
 	let verbColor = "borderAccent";
 	let statusColor = "muted";
-	const paths = [`${process.cwd()}/.pi/settings.json`, `${process.env.HOME ?? ""}/.pi/settings.json`];
+	const paths = [`${process.cwd()}/.pi/settings.json`, getUserSettingsPath()];
 	for (const p of paths) {
 		try {
 			if (!p || !existsSync(p)) continue;
@@ -517,7 +521,9 @@ function statusText(text: string): string {
 // This extension replaces that text with themed spinner verbs (Cooking…,
 // Syncing…, …), so herdr sidebars go idle/stale while pi is actually busy.
 // When running inside herdr (HERDR_ENV=1), report working/idle over the
-// socket the same way herdr's official pi integration does. UI is unchanged.
+// socket only when herdr's official pi integration is not installed. The
+// official integration owns the same lifecycle authority and must remain the
+// sole reporter when present. UI is unchanged.
 // ---------------------------------------------------------------------------
 
 type HerdrAgentState = "working" | "idle";
@@ -532,9 +538,33 @@ const HERDR_PANE_ID = process.env.HERDR_PANE_ID;
 // Must be exactly "herdr:pi" — herdr only grants full lifecycle authority
 // (skip screen-manifest fallback) to that official source pair with agent "pi".
 const HERDR_SOURCE = "herdr:pi";
+const HERDR_INTEGRATION_MARKER = "HERDR_INTEGRATION_ID=pi";
+let officialHerdrIntegrationInstalled: boolean | undefined;
+
+function hasOfficialHerdrIntegration(): boolean {
+	if (officialHerdrIntegrationInstalled !== undefined) {
+		return officialHerdrIntegrationInstalled;
+	}
+
+	const agentDir = process.env.PI_CODING_AGENT_DIR
+		|| join(homedir(), ".pi", "agent");
+
+	try {
+		const integrationPath = join(agentDir, "extensions", "herdr-agent-state.ts");
+		officialHerdrIntegrationInstalled =
+			existsSync(integrationPath)
+			&& readFileSync(integrationPath, "utf8").includes(HERDR_INTEGRATION_MARKER);
+	} catch {
+		officialHerdrIntegrationInstalled = false;
+	}
+	return officialHerdrIntegrationInstalled;
+}
 
 function herdrEnabled(): boolean {
-	return HERDR_ENV === "1" && !!HERDR_SOCKET_PATH && !!HERDR_PANE_ID;
+	return HERDR_ENV === "1"
+		&& !!HERDR_SOCKET_PATH
+		&& !!HERDR_PANE_ID
+		&& !hasOfficialHerdrIntegration();
 }
 
 function herdrSendAttempt(request: unknown, timeoutMs: number): Promise<boolean> {
@@ -754,7 +784,12 @@ export default function (pi: ExtensionAPI) {
 	}
 
 	function syncWorkingMessage(force = false): void {
-		if (!activeCtx?.hasUI) return;
+		try {
+			if (!activeCtx?.hasUI) return;
+		} catch {
+			// Session replacement/reload invalidated the captured context.
+			return;
+		}
 		// Re-derive colors on every tick so /cc-spinner verb/status changes
 		// take effect within ~250 ms without waiting for the next pi event.
 		// applyThemeColors is identity-cached on (theme, verbKey, statusKey) so
@@ -770,7 +805,12 @@ export default function (pi: ExtensionAPI) {
 
 	function restoreDefaultWorkingMessage(): void {
 		lastWorkingMessage = null;
-		if (!activeCtx?.hasUI) return;
+		try {
+			if (!activeCtx?.hasUI) return;
+		} catch {
+			// Session replacement/reload invalidated the captured context.
+			return;
+		}
 		try {
 			activeCtx.ui.setWorkingMessage();
 		} catch { /* noop */ }
@@ -1002,20 +1042,25 @@ export default function (pi: ExtensionAPI) {
 			clearThoughtStatusTimer();
 		}
 
-		if (activeCtx?.hasUI) {
-			const message = `${STATUS_DIM}✻ Turn took ${formatDuration(elapsed)}${RESET}`;
-			lastWorkingMessage = message;
-			try {
-				activeCtx.ui.setWorkingMessage(message);
-			} catch { /* noop */ }
-			completionTimer = setTimeout(() => {
-				completionTimer = null;
-				if (activeTurnId !== turnId) return;
+		try {
+			if (activeCtx?.hasUI) {
+				const message = `${STATUS_DIM}✻ Turn took ${formatDuration(elapsed)}${RESET}`;
+				lastWorkingMessage = message;
+				try {
+					activeCtx.ui.setWorkingMessage(message);
+				} catch { /* noop */ }
+				completionTimer = setTimeout(() => {
+					completionTimer = null;
+					if (activeTurnId !== turnId) return;
+					restoreDefaultWorkingMessage();
+				}, TURN_COMPLETION_MS);
+				unrefTimer(completionTimer);
+			} else if (typeof thinkingStatus !== "number") {
 				restoreDefaultWorkingMessage();
-			}, TURN_COMPLETION_MS);
-			unrefTimer(completionTimer);
-		} else if (typeof thinkingStatus !== "number") {
-			restoreDefaultWorkingMessage();
+			}
+		} catch {
+			// Session replacement/reload invalidated the captured context.
+			return;
 		}
 
 		responseLength = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-claude-code-ui",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "Claude Code-style grouped tool rows for pi with Ctrl+O/Ctrl+Shift+O previews, math rendering, and consistent built-in, MCP, and custom tool rendering",
   "keywords": [
     "pi-package",
@@ -30,13 +30,15 @@
   "files": [
     "extensions/index.ts",
     "extensions/spinner.ts",
+    "extensions/settings-path.ts",
     "extensions/bash-command.ts",
     "config/config.example.json",
     "README.md",
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "node --experimental-strip-types --test scripts/bash-command.test.ts",
+    "test": "node --experimental-strip-types --test scripts/*.test.ts",
+    "test:fullscreen": "node scripts/fullscreen-mouse.test.mjs",
     "typecheck": "tsc --noEmit --target ES2022 --module NodeNext --moduleResolution NodeNext --skipLibCheck extensions/index.ts extensions/spinner.ts",
     "pack:dry-run": "npm pack --dry-run",
     "publish:dry-run": "npm publish --dry-run",