pi-caveman 1.0.7 → 1.0.8

package/extensions/caveman.ts

@@ -13,7 +13,11 @@
 import { readFile, writeFile, mkdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type {
+	BeforeAgentStartEventResult,
+	ExtensionAPI,
+	ExtensionContext,
+} from "@earendil-works/pi-coding-agent";
 import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Container, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui";
 
@@ -43,6 +47,18 @@ const CAVEMAN_COMMAND_OPTIONS = [
 // Persistent config (survives across sessions)
 // ---------------------------------------------------------------------------
 
+/**
+ * Resolve the pi agent config directory, mirroring pi itself and pi-web-access:
+ *  1. PI_CODING_AGENT_DIR env override (already points at the agent dir)
+ *  2. $XDG_CONFIG_HOME/pi/agent
+ *  3. ~/.pi/agent
+ */
+function getConfigDir(): string {
+	if (process.env.PI_CODING_AGENT_DIR) return process.env.PI_CODING_AGENT_DIR;
+	if (process.env.XDG_CONFIG_HOME) return join(process.env.XDG_CONFIG_HOME, "pi", "agent");
+	return join(homedir(), ".pi", "agent");
+}
+
 interface CavemanConfig {
 	/** Level to apply on new sessions. "off" means don't auto-enable. */
 	defaultLevel: Level;
@@ -50,7 +66,7 @@ interface CavemanConfig {
 	showStatus: boolean;
 }
 
-const CONFIG_PATH = join(homedir(), ".pi", "agent", "caveman.json");
+const CONFIG_PATH = join(getConfigDir(), "caveman.json");
 const DEFAULT_CONFIG: CavemanConfig = { defaultLevel: "full", showStatus: true };
 let saveConfigQueue: Promise<void> = Promise.resolve();
 
@@ -70,7 +86,7 @@ async function loadConfig(): Promise<CavemanConfig> {
 async function saveConfig(config: CavemanConfig): Promise<void> {
 	const snapshot = JSON.stringify(config, null, 2) + "\n";
 	saveConfigQueue = saveConfigQueue.then(async () => {
-		await mkdir(join(homedir(), ".pi", "agent"), { recursive: true });
+		await mkdir(getConfigDir(), { recursive: true });
 		await writeFile(CONFIG_PATH, snapshot, "utf8");
 	});
 	return saveConfigQueue;
@@ -172,6 +188,18 @@ Auto-clarity: drop caveman for security warnings, irreversible action confirmati
 or when user is confused. Resume after.
 Boundaries: write normal code. Only compress explanations. "stop caveman" or "normal mode" reverts.`;
 
+/** OMP passes ordered string[] blocks; upstream Pi passes one string. */
+function appendSystemPrompt(
+	systemPrompt: string | string[] | null | undefined,
+	addition: string,
+): string | string[] {
+	if (Array.isArray(systemPrompt)) {
+		return [...systemPrompt, addition];
+	}
+	const basePrompt = typeof systemPrompt === "string" ? systemPrompt : String(systemPrompt ?? "");
+	return basePrompt ? `${basePrompt}\n\n${addition}` : addition;
+}
+
 // ---------------------------------------------------------------------------
 // Extension
 // ---------------------------------------------------------------------------
@@ -336,7 +364,7 @@ export default function caveman(pi: ExtensionAPI) {
 
 			const container = new Container();
 			container.addChild(new Text(theme.fg("accent", theme.bold(" Caveman Config")), 0, 0));
-			container.addChild(new Text(theme.fg("dim", " Saved to ~/.pi/agent/caveman.json"), 0, 0));
+			container.addChild(new Text(theme.fg("dim", ` Saved to ${CONFIG_PATH}`), 0, 0));
 			container.addChild(new Text(theme.fg("dim", " Default level applies to future sessions."), 0, 0));
 			container.addChild(new Text("", 0, 0));
 
@@ -406,13 +434,13 @@ export default function caveman(pi: ExtensionAPI) {
 	pi.on("before_agent_start", async (event) => {
 		await ensureConfigLoaded();
 		if (level === "off") return;
-		if (level === "micro") {
-			return {
-				systemPrompt: `${event.systemPrompt}\n\n${MICRO_PROMPT}`,
-			};
-		}
+		const addition =
+			level === "micro" ? MICRO_PROMPT : `${BASE}\n\n${INTENSITY[level]}\n\n${SAFETY}`;
 		return {
-			systemPrompt: `${event.systemPrompt}\n\n${BASE}\n\n${INTENSITY[level]}\n\n${SAFETY}`,
-		};
+			systemPrompt: appendSystemPrompt(
+				event.systemPrompt as string | string[] | null | undefined,
+				addition,
+			),
+		} as unknown as BeforeAgentStartEventResult;
 	});
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-caveman",
-  "version": "1.0.7",
-  "description": "Why use many token when few do trick. Caveman mode for pi \u2014 cuts ~75% output tokens while keeping full technical accuracy.",
+  "version": "1.0.8",
+  "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",
     "pi-extension",