@codexstar/pi-pompom 1.0.0 → 1.1.0

package/extensions/pompom-extension.ts

@@ -2,9 +2,7 @@
  * pi-pompom — Pompom Companion Extension for Pi CLI.
  *
  * A 3D raymarched virtual pet that lives above the editor.
- * Interactive commands: pet, feed, ball, music, color, sleep, wake, flip, hide.
- *
- * Install as a standalone extension — no dependencies on pi-voice.
+ * Hardened against conflicts with other extensions.
  */
 
 import type {
@@ -14,6 +12,9 @@ import type {
 
 import { renderPompom, resetPompom, pompomSetTalking, pompomKeypress, pompomStatus } from "./pompom";
 
+// Namespaced widget ID — prevents collision with any other extension
+const WIDGET_ID = "codexstar-pompom-companion";
+
 export default function (pi: ExtensionAPI) {
 	let ctx: ExtensionContext | null = null;
 	let companionTimer: ReturnType<typeof setInterval> | null = null;
@@ -22,31 +23,44 @@ export default function (pi: ExtensionAPI) {
 	let terminalInputUnsub: (() => void) | null = null;
 	let enabled = true;
 
-	function showCompanion() {
-		if (companionActive) return;
-		if (!ctx?.hasUI) return;
-		companionActive = true;
-		lastRenderTime = Date.now();
+	// ─── Safe render wrapper — never lets an error crash the TUI ─────────
 
-		const renderCompanion = (width: number): string[] => {
+	function safeRender(width: number): string[] {
+		try {
 			const now = Date.now();
 			const dt = Math.min(0.1, (now - lastRenderTime) / 1000);
 			lastRenderTime = now;
 			return renderPompom(Math.max(40, width), 0, dt);
-		};
+		} catch {
+			// If rendering fails, return a minimal placeholder so the TUI doesn't crash
+			return [" ".repeat(Math.max(1, width))];
+		}
+	}
+
+	// ─── Widget management ──────────────────────────────────────────────
 
-		ctx.ui.setWidget("pompom-companion", (_tui, _theme) => ({
-			invalidate() {},
-			render: renderCompanion,
-		}), { placement: "aboveEditor" });
+	function showCompanion() {
+		if (companionActive) return;
+		if (!ctx?.hasUI) return;
+		companionActive = true;
+		lastRenderTime = Date.now();
 
-		companionTimer = setInterval(() => {
+		const setWidget = () => {
 			if (!ctx?.hasUI) return;
-			ctx.ui.setWidget("pompom-companion", (_tui, _theme) => ({
-				invalidate() {},
-				render: renderCompanion,
-			}), { placement: "aboveEditor" });
-		}, 150);
+			try {
+				ctx.ui.setWidget(WIDGET_ID, (_tui, _theme) => ({
+					invalidate() {},
+					render: safeRender,
+				}), { placement: "aboveEditor" });
+			} catch {
+				// Widget slot may be unavailable — don't crash
+			}
+		};
+
+		setWidget();
+		// Re-set widget on interval for animation. Defensive: clear any stale timer first.
+		if (companionTimer) clearInterval(companionTimer);
+		companionTimer = setInterval(setWidget, 150);
 	}
 
 	function hideCompanion() {
@@ -56,74 +70,77 @@ export default function (pi: ExtensionAPI) {
 			companionTimer = null;
 		}
 		pompomSetTalking(false);
-		if (ctx?.hasUI) {
-			ctx.ui.setWidget("pompom-companion", undefined);
+		try {
+			if (ctx?.hasUI) ctx.ui.setWidget(WIDGET_ID, undefined);
+		} catch {
+			// Ignore — widget may already be gone
 		}
 	}
 
-	// macOS Option+key produces Unicode characters when macos-option-as-alt is off.
-	// Windows/Linux don't use this — they send ESC prefix for Alt+key (handled below).
+	// ─── Keyboard input ─────────────────────────────────────────────────
+
+	// macOS Option+key Unicode map (only fires when macos-option-as-alt is off)
 	const optionUnicodeMap: Record<string, string> = {
-		"π": "p",  // Option+p → Pet
-		"ƒ": "f",  // Option+f → Feed
-		"∫": "b",  // Option+b → Ball
-		"µ": "m",  // Option+m → Music
-		"ç": "c",  // Option+c → Color
-		"∂": "d",  // Option+d → Flip
-		"ß": "s",  // Option+s → Sleep
-		"∑": "w",  // Option+w → Wake
-		"ø": "o",  // Option+o → Hide
-		"≈": "x",  // Option+x → Dance
-		"†": "t",  // Option+t → Treat
-		"˙": "h",  // Option+h → Hug
+		"π": "p", "ƒ": "f", "∫": "b", "µ": "m", "ç": "c",
+		"∂": "d", "ß": "s", "∑": "w", "ø": "o",
+		"≈": "x", "†": "t", "˙": "h",
 	};
 
+	const POMPOM_KEYS = "pfbmcdswoxth";
+
 	function setupKeyHandler() {
 		if (!ctx?.hasUI) return;
+		// Always clean up previous handler first — prevents double-binding
 		if (terminalInputUnsub) { terminalInputUnsub(); terminalInputUnsub = null; }
 
-		terminalInputUnsub = ctx.ui.onTerminalInput((data: string) => {
-			if (!enabled || !companionActive) return undefined;
+		try {
+			terminalInputUnsub = ctx.ui.onTerminalInput((data: string) => {
+				if (!enabled || !companionActive) return undefined;
 
-			// 1. Ghostty keybind prefix \x1d + letter (macOS with Ghostty config)
-			if (data.length === 2 && data[0] === "\x1d" && "pfbmcdswoxth".includes(data[1])) {
-				pompomKeypress(data[1]);
-				return { consume: true };
-			}
-
-			// 2. ESC prefix — Alt+key on Windows/Linux, Option-as-Meta on macOS
-			//    This is the primary method on Windows Terminal, CMD, PowerShell, WSL
-			if (data.length === 2 && data[0] === "\x1b" && "pfbmcdswoxth".includes(data[1])) {
-				pompomKeypress(data[1]);
-				return { consume: true };
-			}
+				try {
+					// 1. Ghostty keybind prefix \x1d + letter
+					if (data.length === 2 && data[0] === "\x1d" && POMPOM_KEYS.includes(data[1])) {
+						pompomKeypress(data[1]);
+						return { consume: true };
+					}
 
-			// 3. macOS Unicode chars (Option key without macos-option-as-alt)
-			const mapped = optionUnicodeMap[data];
-			if (mapped) {
-				pompomKeypress(mapped);
-				return { consume: true };
-			}
+					// 2. ESC prefix — Alt+key on Windows/Linux, Option-as-Meta on macOS
+					if (data.length === 2 && data[0] === "\x1b" && POMPOM_KEYS.includes(data[1])) {
+						pompomKeypress(data[1]);
+						return { consume: true };
+					}
 
-			// 4. Kitty keyboard protocol (Ghostty, Kitty, WezTerm, Windows Terminal 1.22+)
-			//    Format: \x1b[<codepoint>;{1+modifier}u — Alt modifier bit = 2
-			const kittyMatch = data.match(/^\x1b\[(\d+);(\d+)u$/);
-			if (kittyMatch) {
-				const mod = parseInt(kittyMatch[2]);
-				if ((mod - 1) & 2) {
-					const char = String.fromCharCode(parseInt(kittyMatch[1]));
-					if ("pfbmcdswoxth".includes(char)) {
-						pompomKeypress(char);
+					// 3. macOS Unicode chars
+					const mapped = optionUnicodeMap[data];
+					if (mapped) {
+						pompomKeypress(mapped);
 						return { consume: true };
 					}
+
+					// 4. Kitty keyboard protocol
+					const kittyMatch = data.match(/^\x1b\[(\d+);(\d+)u$/);
+					if (kittyMatch) {
+						const mod = parseInt(kittyMatch[2]);
+						if ((mod - 1) & 2) {
+							const char = String.fromCharCode(parseInt(kittyMatch[1]));
+							if (POMPOM_KEYS.includes(char)) {
+								pompomKeypress(char);
+								return { consume: true };
+							}
+						}
+					}
+				} catch {
+					// Never let a key handler error propagate to the TUI
 				}
-			}
 
-			return undefined;
-		});
+				return undefined;
+			});
+		} catch {
+			// onTerminalInput may not be available — gracefully degrade (commands still work)
+		}
 	}
 
-	// ─── Lifecycle ───────────────────────────────────────────────────────────
+	// ─── Lifecycle — defensive against load-order issues ────────────────
 
 	pi.on("session_start", async (_event, startCtx) => {
 		ctx = startCtx;
@@ -149,7 +166,7 @@ export default function (pi: ExtensionAPI) {
 		}
 	});
 
-	// ─── /pompom command ─────────────────────────────────────────────────────
+	// ─── /pompom command ────────────────────────────────────────────────
 
 	const pompomCommands: Record<string, string> = {
 		pet: "p", feed: "f", ball: "b", music: "m", color: "c", theme: "c",
@@ -229,7 +246,7 @@ export default function (pi: ExtensionAPI) {
 				return;
 			}
 
-			// No args or unknown: toggle if active, else show help
+			// No args: toggle. Unknown: error.
 			if (sub === "") {
 				if (companionActive) {
 					enabled = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codexstar/pi-pompom",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Pompom — a 3D raymarched virtual pet companion for Pi CLI",
   "type": "module",
   "keywords": [