pi-caveman 1.0.10 → 1.0.12

package/README.md

@@ -82,7 +82,7 @@ When active, a status bar displays caveman level and an animated campfire flicke
 
 ## How It Works
 
-The extension hooks `before_agent_start` to append caveman communication rules to the system prompt at the selected intensity. Within a session, the active level is stored as a custom session entry and restored on resume. Across sessions, persistent config (`~/.pi/agent/caveman.json` by default, or `$XDG_CONFIG_HOME/pi/agent/caveman.json` when `XDG_CONFIG_HOME` is set; `PI_CODING_AGENT_DIR` overrides both) provides the default level and status bar preference. Auto-clarity rules tell the model to drop caveman mode for security warnings or irreversible actions.
+The extension hooks `before_agent_start` to add caveman communication rules at the selected intensity. On Pi hosts with `systemPromptOptions.sections`, it writes a `caveman` section so later extensions can still add their own prompt sections, and removes that section when disabled. Older hosts use whole-prompt replacement, preserving ordered prompt blocks on OMP. Within a session, the active level is stored as a custom session entry and restored on resume. Across sessions, persistent config (`~/.pi/agent/caveman.json` by default, or `$XDG_CONFIG_HOME/pi/agent/caveman.json` when `XDG_CONFIG_HOME` is set; `PI_CODING_AGENT_DIR` overrides both) provides the default level and status bar preference. Auto-clarity rules tell the model to drop caveman mode for security warnings or irreversible actions.
 
 ## Warning
 

package/extensions/caveman.ts

@@ -212,6 +212,7 @@ export default function caveman(pi: ExtensionAPI) {
 	let config: CavemanConfig = { ...DEFAULT_CONFIG };
 	let timer: ReturnType<typeof setInterval> | null = null;
 	let frameIndex = 0;
+	let animationGeneration = 0;
 	let isActive = false;
 	let configLoadPromise: Promise<void> | null = null;
 
@@ -230,6 +231,7 @@ export default function caveman(pi: ExtensionAPI) {
 	// -- Animation helpers --
 
 	function stopAnimation() {
+		animationGeneration++;
 		if (timer) {
 			clearInterval(timer);
 			timer = null;
@@ -240,32 +242,34 @@ export default function caveman(pi: ExtensionAPI) {
 	function syncStatus(ctx: Pick<ExtensionContext, "ui">) {
 		stopAnimation();
 
-		if (level === "off" || !config.showStatus) {
-			ctx.ui.setStatus("caveman", "");
-			return;
-		}
-
-		// Hosts like pi-web-ui expose setStatus without a TUI theme — bail instead of throwing on theme.fg.
-		if (!ctx.ui.theme?.fg) return;
-		const theme = ctx.ui.theme;
+		const generation = animationGeneration;
+		const anim = level === "off" ? null : ANIMATIONS[level];
+		const renderFrame = () => {
+			if (generation !== animationGeneration) return false;
+			try {
+				if (!anim || !config.showStatus) {
+					ctx.ui.setStatus("caveman", "");
+					return false;
+				}
 
-		const anim = ANIMATIONS[level];
-		const setFrame = (frame: string) => {
-			ctx.ui.setStatus("caveman", frame + " " + theme.fg("muted", "caveman level: ") + theme.fg("text", anim.label));
+				// Hosts like pi-web-ui may expose setStatus without a TUI theme.
+				const theme = ctx.ui.theme;
+				if (!theme?.fg) return false;
+				const frame = anim.frames[frameIndex % anim.frames.length]!;
+				ctx.ui.setStatus("caveman", frame + " " + theme.fg("muted", "caveman level: ") + theme.fg("text", anim.label));
+				frameIndex++;
+				return true;
+			} catch (error) {
+				// Timer callbacks run outside Pi's event-handler error boundary.
+				stopAnimation();
+				if (!(error instanceof Error) || !error.message.includes("stale after session replacement")) throw error;
+				return false;
+			}
 		};
 
-		if (!isActive) {
-			setFrame(anim.frames[0]!);
-			return;
+		if (renderFrame() && isActive && anim) {
+			timer = setInterval(renderFrame, anim.interval);
 		}
-
-		const renderFrame = () => {
-			setFrame(anim.frames[frameIndex % anim.frames.length]!);
-			frameIndex++;
-		};
-
-		renderFrame();
-		timer = setInterval(renderFrame, anim.interval);
 	}
 
 	// -- Restore state on session load --
@@ -439,13 +443,25 @@ export default function caveman(pi: ExtensionAPI) {
 
 	pi.on("before_agent_start", async (event) => {
 		await ensureConfigLoaded();
-		if (level === "off") return;
+		// Use a structural check so older Pi/OMP hosts can still use the legacy path.
+		const sections = (event as { systemPromptOptions?: { sections?: Record<string, string> } })
+			.systemPromptOptions?.sections;
+		const hasSections = sections !== null && typeof sections === "object" && !Array.isArray(sections);
+		if (level === "off") {
+			if (hasSections) delete sections.caveman;
+			return;
+		}
 		const addition =
 			level === "micro"
 				? MICRO_PROMPT
 				: level === "lite"
 					? `${INTENSITY.lite}\n\n${SAFETY}`
 					: `${BASE}\n\n${INTENSITY[level]}\n\n${SAFETY}`;
+		if (hasSections) {
+			// Returning a whole prompt freezes it before later handlers add their sections.
+			sections.caveman = addition;
+			return;
+		}
 		return {
 			systemPrompt: appendSystemPrompt(
 				event.systemPrompt as string | string[] | null | undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-caveman",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Why use many token when few do trick. Caveman mode for pi — cuts ~75% output tokens while keeping full technical accuracy.",
   "keywords": [
     "pi-package",