pi-blackhole 0.3.4 → 0.3.7

package/src/core/render-entries.ts

@@ -3,6 +3,13 @@ import { clip, textOf } from "./content";
 import { summarizeToolArgs } from "./tool-args";
 import { extractPath } from "./tool-args";
 
+// Mirrors @earendil-works/pi-coding-agent's BashExecutionMessage (not re-exported from index)
+interface LocalBashExec {
+  role: "bashExecution";
+  command: string;
+  output: string;
+}
+
 export interface RenderedEntry {
   index: number;
   id: string;
@@ -41,8 +48,9 @@ export const renderMessage = (msg: Message, index: number, id: string, full = fa
   }
   // bashExecution has command+output instead of content
   if ((msg as any).role === "bashExecution") {
-    const cmd = (msg as any).command ?? "";
-    const out = (msg as any).output ?? "";
+    const bashMsg = msg as unknown as LocalBashExec;
+    const cmd = bashMsg.command ?? "";
+    const out = bashMsg.output ?? "";
     const text = full ? `$ ${cmd}\n${out}` : clip(`$ ${cmd}\n${out}`, 300);
     return { index, id, role: "bash", summary: text };
   }

package/src/core/search-entries.ts

@@ -9,6 +9,13 @@ import type { RenderedEntry } from "./render-entries";
 import { textOf, toolCallArgsText, isContentBearing } from "./content";
 import type { RecallMode } from "./recall-scope";
 
+// Mirrors @earendil-works/pi-coding-agent's BashExecutionMessage (not re-exported from index)
+interface LocalBashExec {
+  role: "bashExecution";
+  command: string;
+  output: string;
+}
+
 export interface FileMatch {
   /** Name of the tool (write, edit, hex_edit) */
   toolName: string;
@@ -183,15 +190,13 @@ const lineSnippet = (text: string, regex: RegExp, contextLines = 2): string | un
 const fullText = (msg: Message, mode?: RecallMode): string => {
   if ((msg as any).role === "bashExecution") {
     if (mode === "file") return ""; // bash is not file content
-    return `${(msg as any).command ?? ""} ${(msg as any).output ?? ""}`;
+    const bashMsg = msg as unknown as LocalBashExec;
+    return `${bashMsg.command ?? ""} ${bashMsg.output ?? ""}`;
   }
   if (mode === "file") {
     return toolCallArgsText(msg.content);
   }
-  if (mode === "transcript") {
-    return textOf(msg.content);
-  }
-  // hybrid (default): both
+  // hybrid (default): both transcript text + tool call args
   const text = textOf(msg.content);
   const toolArgs = toolCallArgsText(msg.content);
   return toolArgs ? `${text}\n${toolArgs}` : text;
@@ -322,7 +327,7 @@ export const searchEntries = (
       const hay = `${e.role} ${text} ${filePart}`;
       if (regex.test(hay)) {
         const snip = lineSnippet(text, regex);
-        const fileMatches = mode === "transcript" ? [] : computeFileMatches(msg, rawQuery);
+        const fileMatches = computeFileMatches(msg, rawQuery);
         const extra = fileMatches.length > 0 ? { fileMatches } : {};
         hits.push({ ...e, snippet: snip, matchCount: 1, ...extra });
       }
@@ -358,7 +363,7 @@ export const searchEntries = (
     const score = bm25Score(hay, terms, ctx);
     const text = fullTextCache[i];
     const snip = lineSnippet(text, snipRe);
-    const fileMatches = mode === "transcript" ? [] : computeFileMatches(messages[i], rawQuery);
+    const fileMatches = computeFileMatches(messages[i], rawQuery);
     const extra = fileMatches.length > 0 ? { fileMatches } : {};
     scored.push({
       hit: { ...e, snippet: snip, matchCount: mc, ...extra },

package/src/core/settings.ts

@@ -1,40 +1,9 @@
 /**
- * Pi-vcc settings — reads from unified pi-blackhole/pi-blackhole-config.json.
+ * Scaffold the pi-blackhole config file on disk.
  *
- * Upstream: https://github.com/sting8k/pi-vcc (src/core/settings.ts)
- * Modified by pi-vcc-om: loadSettings wraps loadUnifiedConfig.
+ * Only holds scaffoldSettings(); config loading/parsing happens in unified-config.ts.
  */
-import { loadUnifiedConfig, scaffoldConfig } from "./unified-config.js";
-
-export interface PiVccSettings {
-	/** @deprecated Use compactionEngine instead. */
-	overrideDefaultCompaction: boolean;
-	/** @deprecated Use compaction instead. */
-	noAutoCompact: boolean;
-	/** @deprecated Use compaction + memory instead. */
-	passive: boolean;
-	/** Write debug snapshots to /tmp/pi-blackhole-debug.json. */
-	debug: boolean;
-	/** Unified compaction control: "auto" | "manual" | "off". */
-	compaction: "auto" | "manual" | "off";
-	/** Compaction engine: "blackhole" | "pi-default". */
-	compactionEngine: "blackhole" | "pi-default";
-	/** Visible tail behavior: "pi-default" | "minimal". */
-	tailBehavior: "pi-default" | "minimal";
-}
-
-export function loadSettings(): PiVccSettings {
-	const config = loadUnifiedConfig(process.cwd());
-	return {
-		overrideDefaultCompaction: config.overrideDefaultCompaction ?? false,
-		noAutoCompact: config.noAutoCompact ?? false,
-		passive: config.passive ?? false,
-		debug: config.debug,
-		compaction: config.compaction,
-		compactionEngine: config.compactionEngine,
-		tailBehavior: config.tailBehavior,
-	};
-}
+import { scaffoldConfig } from "./unified-config.js";
 
 export function scaffoldSettings(): void {
 	scaffoldConfig();

package/src/core/summarize.ts

@@ -27,11 +27,19 @@ const sectionOf = (text: string, header: string): string => {
   const start = text.indexOf(tag);
   if (start < 0) return "";
   const after = text.slice(start);
-  // Find next section header or separator
+  // Find next section header (must start at line boundary to avoid matching in content)
   const nextSection = HEADER_NAMES
     .filter((h) => h !== header)
-    .map((h) => after.indexOf(`[${h}]`))
-    .filter((n) => n > 0);
+    .map((h) => {
+      // Escape the header name for regex safety
+      const escaped = h.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const re = new RegExp(`(?:^|\\n)\\[${escaped}\\]`);
+      const m = after.match(re);
+      if (!m) return -1;
+      // m.index points to \n (or 0); advance past it to the [
+      return m.index! + (m[0].startsWith("\n") ? 1 : 0);
+    })
+    .filter((n) => n >= 0);
   const nextSep = after.indexOf("\n\n---\n\n");
   const candidates = [...nextSection, ...(nextSep > 0 ? [nextSep] : [])].sort((a, b) => a - b);
   const end = candidates[0];
@@ -93,6 +101,8 @@ const mergeFileLines = (prev: string, fresh: string): string => {
 
   // Dedup: if already in Modified, drop from Created (file existed before)
   for (const p of merged.Modified) merged.Created.delete(p);
+  // Also remove Read entries that also appear in Modified (same file read+edited)
+  for (const p of merged.Modified) merged.Read.delete(p);
 
   const cap = (set: Set<string>, limit: number) => {
     const arr = [...set];
@@ -154,9 +164,7 @@ export const compile = (input: CompileInput): string => {
   prev = prev ? stripOMContent(prev) : undefined;
   const merged = prev ? mergePrevious(prev, fresh) : fresh;
   if (!merged) return "";
-  return wrapLongLines(merged);
-  // RECALL_NOTE is now part of OM_FOOTER in render-summary.ts, appended
-  // by the before-compact hook after observations/reflections.
+  return wrapLongLines(merged + SEPARATOR + RECALL_NOTE);
 };
 
 const stripRecallNote = (text: string): string => {
@@ -168,19 +176,28 @@ const stripRecallNote = (text: string): string => {
 };
 
 /**
- * Strip OM content (## Reflections, ## Observations, and the
- * CONTEXT_USAGE_INSTRUCTIONS preamble) from a previous compaction summary.
+ * Strip OM content and recall-guidance footers from a previous compaction summary.
+ *
+ * OM content (## Reflections / ## Observations + instructions) is appended after
+ * compile() by the before-compact hook, so it must be stripped from the previous
+ * summary to prevent compounding across compactions. The fresh OM projection is
+ * re-rendered each time.
  *
- * OM content is appended after compile() by the before-compact hook, so it
- * must be stripped from the previous summary to prevent compounding across
- * compactions. The fresh OM projection is re-rendered each time.
+ * Also strips the basic recall-guidance footer that is always appended when OM
+ * is off or has no entries.
  */
 const stripOMContent = (text: string): string => {
   // Remove everything from "## Reflections" or "## Observations" onward,
   // plus the instructions preamble that precedes them.
   // The preamble starts with "These are condensed memories from earlier in this session."
-  const reflIdx = text.indexOf("## Reflections");
-  const obsIdx = text.indexOf("## Observations");
+  // Use line-start anchoring to avoid matching inside conversation content
+  const reflMatch = text.match(/^## Reflections/m);
+  const reflIdx = reflMatch ? reflMatch.index! : -1;
+  const obsMatch = text.match(/^## Observations/m);
+  const obsIdx = obsMatch ? obsMatch.index! : -1;
+
+  // Also detect the basic recall-guidance footer (no observation preamble)
+  const basicFooterIdx = text.indexOf("Use `recall` with an id to retrieve original context, or `#N:path` drill-down");
 
   // Find the start of OM content: either the instructions preamble or the first section header
   let stripFrom = -1;
@@ -197,6 +214,9 @@ const stripOMContent = (text: string): string => {
     } else if (minSectionIdx < Infinity) {
       stripFrom = minSectionIdx;
     }
+  } else if (basicFooterIdx >= 0) {
+    // Strip the basic recall-guidance footer (no observations/reflections present)
+    stripFrom = basicFooterIdx;
   }
 
   if (stripFrom < 0) return text;

package/src/core/tool-args.ts

@@ -1,5 +1,8 @@
+/** Canonical list of path-like argument keys across all Pi tools. */
+export const PATH_KEYS = ["path", "file_path", "filePath", "file"] as const;
+
 export const extractPath = (args: Record<string, unknown>): string | null => {
-  for (const key of ["path", "file_path", "filePath", "file"]) {
+  for (const key of PATH_KEYS) {
     if (typeof args[key] === "string") return args[key] as string;
   }
   return null;

package/src/core/unified-config.ts

@@ -117,6 +117,10 @@ export interface UnifiedConfig {
 	/** Fallback models for dropper, tried in order after primary model fails. */
 	dropperFallbackModels?: OmModelConfig[];
 
+	/** When false, skip session model fallback when all OM model candidates are exhausted.
+	 *  Default true for backward compatibility. */
+	sessionFallback?: boolean;
+
 	/** @deprecated Use compaction instead. */
 	noAutoCompact?: boolean;
 	/** @deprecated Use compaction + memory instead. */
@@ -131,6 +135,7 @@ export interface UnifiedConfig {
 
 export const DEFAULTS: UnifiedConfig = {
 	debug: false,
+	sessionFallback: true,
 
 	// New config surface
 	compaction: "auto",
@@ -225,15 +230,18 @@ function parseConfig(raw: Record<string, unknown>): Partial<UnifiedConfig> {
 	if (typeof raw.debug === "boolean") c.debug = raw.debug;
 
 	// Booleans — om
+	if (typeof raw.sessionFallback === "boolean") c.sessionFallback = raw.sessionFallback;
 	if (typeof raw.noAutoCompact === "boolean") c.noAutoCompact = raw.noAutoCompact;
 	if (typeof raw.passive === "boolean") c.passive = raw.passive;
 	if (typeof raw.memory === "boolean") c.memory = raw.memory;
 	if (typeof raw.debugLog === "boolean") c.debugLog = raw.debugLog;
 
-	// Positive integers
+	// Numeric fields — use nonNegativeInt for observerPreambleMaxTokens (0 = auto)
 	const numKeys = ["observeAfterTokens", "reflectAfterTokens", "compactAfterTokens", "observationsPoolMaxTokens", "observationsPoolTargetTokens", "reflectorInputMaxTokens", "dropperInputMaxTokens", "observerChunkMaxTokens", "observerPreambleMaxTokens", "agentMaxTurns"] as const;
 	for (const k of numKeys) {
-		const v = positiveInt(raw[k]);
+		// observerPreambleMaxTokens accepts 0 (auto-compute); everything else must be > 0
+		const validator = k === "observerPreambleMaxTokens" ? nonNegativeInt : positiveInt;
+		const v = validator(raw[k]);
 		if (v !== undefined) (c as Record<string, unknown>)[k] = v;
 	}
 
@@ -262,8 +270,9 @@ function parseConfig(raw: Record<string, unknown>): Partial<UnifiedConfig> {
 
 /**
  * Migrate legacy config knobs to new unified surface.
- * Runs once at load time; old keys are removed from the parsed object.
- * Does NOT mutate the on-disk config file.
+ * Operates on the in-memory parsed object each time loadUnifiedConfig() is called;
+ * old keys are removed from this copy. Does NOT mutate the on-disk config file.
+ * Idempotent — safe to call repeatedly.
  */
 function migrateOldKnobs(parsed: Record<string, unknown>): void {
 	// Only run if new keys are absent AND old keys are present
@@ -361,13 +370,23 @@ export function loadUnifiedConfig(cwd: string): UnifiedConfig {
 
 	// Env override — new compaction surface
 	const envCompaction = process.env.PI_BLACKHOLE_COMPACTION;
-	if (envCompaction !== undefined && isCompaction(envCompaction.trim().toLowerCase())) {
-		parsed.compaction = envCompaction.trim().toLowerCase() as "auto" | "manual" | "off";
+	if (envCompaction !== undefined) {
+		const trimmed = envCompaction.trim().toLowerCase();
+		if (isCompaction(trimmed)) {
+			parsed.compaction = trimmed as "auto" | "manual" | "off";
+		} else {
+			console.warn(`blackhole: invalid PI_BLACKHOLE_COMPACTION value "${envCompaction}"; ignoring`);
+		}
 	}
 
 	const envCompactionEngine = process.env.PI_BLACKHOLE_COMPACTION_ENGINE;
-	if (envCompactionEngine !== undefined && isCompactionEngine(envCompactionEngine.trim().toLowerCase())) {
-		parsed.compactionEngine = envCompactionEngine.trim().toLowerCase() as "blackhole" | "pi-default";
+	if (envCompactionEngine !== undefined) {
+		const trimmed = envCompactionEngine.trim().toLowerCase();
+		if (isCompactionEngine(trimmed)) {
+			parsed.compactionEngine = trimmed as "blackhole" | "pi-default";
+		} else {
+			console.warn(`blackhole: invalid PI_BLACKHOLE_COMPACTION_ENGINE value "${envCompactionEngine}"; ignoring`);
+		}
 	}
 
 	// Merge defaults then override
@@ -445,24 +464,7 @@ export function scaffoldConfig(): void {
 	}
 }
 
-// ── Toggle helpers ───────────────────────────────────────────────────────────
-
-/** Cycle compaction: auto → manual → off → auto */
-export function toggleCompaction(current: "auto" | "manual" | "off"): "auto" | "manual" | "off" {
-	const cycle: Array<"auto" | "manual" | "off"> = ["auto", "manual", "off"];
-	const idx = cycle.indexOf(current);
-	return cycle[(idx + 1) % cycle.length];
-}
-
-/** Toggle compactionEngine: blackhole ↔ pi-default */
-export function toggleCompactionEngine(current: "blackhole" | "pi-default"): "blackhole" | "pi-default" {
-	return current === "blackhole" ? "pi-default" : "blackhole";
-}
 
-/** Toggle tailBehavior: pi-default ↔ minimal */
-export function toggleTailBehavior(current: "pi-default" | "minimal"): "pi-default" | "minimal" {
-	return current === "pi-default" ? "minimal" : "pi-default";
-}
 
 // ── Migration detection ───────────────────────────────────────────────────────
 

package/src/extract/commits.ts

@@ -6,8 +6,9 @@ interface CommitInfo {
 }
 
 const COMMIT_MSG_RE = /git\s+commit[^\n]*?-m\s+(?:"((?:[^"\\]|\\.)*)"|'((?:[^'\\]|\\.)*)'|\$?'((?:[^'\\]|\\.)*)')/;
-// Match short hash from git output: "[branch hash]" or "main hash" or 7-12 hex
-const HASH_RE = /\b([0-9a-f]{7,12})\b/;
+// Match short hash from git output — only as fallback after bracket/range patterns fail.
+// Requires 8+ hex chars to reduce false positives from random hex in tool output.
+const HASH_RE = /\b([0-9a-f]{8,12})\b/;
 
 const firstLineOf = (text: string): string => {
   const line = text.split(/\\n|\n/)[0] ?? "";

package/src/extract/files.ts

@@ -16,16 +16,18 @@ const FILE_WRITE_TOOLS = new Set([
   "MultiEdit",
 ]);
 
-const FILE_CREATE_TOOLS = new Set([
-  "Write", "write", "write_file",
-]);
+// Pi never exposes a "createdFiles" field — Write operations are tracked as modified.
+// FILE_CREATE_TOOLS kept as empty set for forward-compat if Pi adds a creation signal.
+const FILE_CREATE_TOOLS = new Set<string>();
 
 /**
  * Find the longest common directory prefix among absolute paths.
  * Returns "" if fewer than 2 absolute paths or no meaningful common prefix.
  */
 const longestCommonDirPrefix = (paths: string[]): string => {
-  const abs = paths.filter((p) => p.startsWith("/"));
+  // Normalize backslashes (Windows) to forward slashes for uniform comparison
+  const normalized = paths.map((p) => p.replace(/\\/g, "/"));
+  const abs = normalized.filter((p) => p.startsWith("/") || /^[A-Za-z]:\//.test(p));
   if (abs.length < 2) return "";
   const split = abs.map((p) => p.split("/"));
   const min = Math.min(...split.map((s) => s.length));

package/src/hooks/before-compact.ts

@@ -289,8 +289,10 @@ export const registerBeforeCompactHook = (pi: ExtensionAPI, omRuntime: Runtime)
     }
 
     // Determine effective tail behavior for buildOwnCut
+    // Both /blackhole and auto-triggered default to "minimal" (aggressive cut);
+    // users can opt into "pi-default" (gentler) by setting tailBehavior in config.
     const effectiveTailBehavior = isPiVcc
-      ? (omRuntime.config.tailBehavior ?? "minimal")   // /blackhole: minimal by default
+      ? (omRuntime.config.tailBehavior ?? "minimal")
       : (omRuntime.config.tailBehavior ?? "minimal");
 
     trace("before_compact.tail_behavior", {
@@ -451,7 +453,7 @@ export const registerBeforeCompactHook = (pi: ExtensionAPI, omRuntime: Runtime)
     omRuntime.compactWasPiVcc = isPiVcc;
 
     // ── Inject observational-memory content ───────────────────────────
-    let omContent = "";
+    let omContent: string;
     let omDetails: Record<string, unknown> | undefined;
     trace("before_compact.om_injection", { memoryEnabled: omRuntime.config.memory !== false });
     if (omRuntime.config.memory !== false) {
@@ -462,11 +464,13 @@ export const registerBeforeCompactHook = (pi: ExtensionAPI, omRuntime: Runtime)
     );
       omContent = renderSummary(projection.reflections, projection.observations);
       omDetails = projection.details;
+    } else {
+      omContent = renderSummary([], []);
     }
 
     return {
       compaction: {
-        summary: omContent ? summary + "\n\n" + omContent : summary,
+        summary: summary + "\n\n" + omContent,
         details: { ...details, "om.folded": omDetails },
         tokensBefore: preparation.tokensBefore,
         firstKeptEntryId,

package/src/om/agents/dropper/agent.ts

@@ -7,6 +7,7 @@
  */
 import { agentLoop, type AgentContext, type AgentLoopConfig, type AgentTool } from "@earendil-works/pi-agent-core";
 import type { Message, Model, ModelThinkingLevel } from "@earendil-works/pi-ai";
+import { createBridgeStreamFn } from "../../provider-stream.js";
 import { streamSimple } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
 import type { Static } from "typebox";
@@ -287,13 +288,7 @@ export async function runDropper(args: RunDropperArgs): Promise<string[] | undef
 
 	const loop = args.agentLoop ?? agentLoop;
 	// ── Bridge stream function ──
-	const PROVIDER_STREAMS_KEY = Symbol.for("pi-blackhole:provider-streams");
-	const bridgeStreamFn = (model: any, ctx: any, opts: any) => {
-		const providerStreams: Map<string, Function> | undefined = (globalThis as any)[PROVIDER_STREAMS_KEY];
-		if (!providerStreams) return streamSimple(model, ctx, opts);
-		const customFn = model?.api ? providerStreams.get(model.api) : undefined;
-		return customFn ? customFn(model, ctx, opts) : streamSimple(model, ctx, opts);
-	};
+	const bridgeStreamFn = createBridgeStreamFn(streamSimple);
 	const streamFn = args.streamFn ?? bridgeStreamFn;
 	const stream = loop(prompts, context, config, signal, streamFn);
 	let agentError: string | undefined;

package/src/om/agents/observer/agent.ts

@@ -8,6 +8,7 @@
  */
 import { agentLoop, type AgentContext, type AgentLoopConfig, type AgentTool } from "@earendil-works/pi-agent-core";
 import type { Message, Model, ModelThinkingLevel } from "@earendil-works/pi-ai";
+import { createBridgeStreamFn } from "../../provider-stream.js";
 import { streamSimple } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
 import type { Static } from "typebox";
@@ -85,13 +86,19 @@ export function normalizeSourceEntryIds(
 	const allowedOrder = new Map<string, number>();
 	for (let i = 0; i < allowedSourceEntryIds.length; i++) allowedOrder.set(allowedSourceEntryIds[i], i);
 
+	// Filter out invalid/unknown IDs instead of rejecting the entire batch.
+	// Matches the dropper's normalizeDropObservationIds pattern: one hallucinated
+	// ID from the LLM should not discard valid observations.
 	const seen = new Set<string>();
+	const valid: string[] = [];
 	for (const id of sourceEntryIds) {
-		if (!allowedOrder.has(id)) return undefined;
+		if (!allowedOrder.has(id)) continue;
+		if (seen.has(id)) continue;
 		seen.add(id);
+		valid.push(id);
 	}
-	if (seen.size === 0) return undefined;
-	return Array.from(seen).sort((a, b) => (allowedOrder.get(a) ?? 0) - (allowedOrder.get(b) ?? 0));
+	if (valid.length === 0) return undefined;
+	return valid.sort((a, b) => (allowedOrder.get(a) ?? 0) - (allowedOrder.get(b) ?? 0));
 }
 
 /** Result returned by runObserver when no observations are recorded. */
@@ -226,16 +233,7 @@ ${conversation}`;
 	// Consolidation agents run via jiti (moduleCache: false) which creates a separate
 	// pi-ai instance whose apiProviderRegistry lacks custom providers registered by
 	// other extensions (e.g., claude-bridge). The bridge looks up streamSimple functions
-	// from a Symbol.for() global that index.ts populates during provider registration.
-	// If no custom provider is found, it falls back to the jiti-loaded streamSimple
-	// which handles all built-in providers correctly.
-	const PROVIDER_STREAMS_KEY = Symbol.for("pi-blackhole:provider-streams");
-	const bridgeStreamFn = (model: any, ctx: any, opts: any) => {
-		const providerStreams: Map<string, Function> | undefined = (globalThis as any)[PROVIDER_STREAMS_KEY];
-		if (!providerStreams) return streamSimple(model, ctx, opts);
-		const customFn = model?.api ? providerStreams.get(model.api) : undefined;
-		return customFn ? customFn(model, ctx, opts) : streamSimple(model, ctx, opts);
-	};
+	const bridgeStreamFn = createBridgeStreamFn(streamSimple);
 	const streamFn = args.streamFn ?? bridgeStreamFn;
 	const stream = loop(prompts, context, config, signal, streamFn);
 	let agentError: string | undefined;

package/src/om/agents/reflector/agent.ts

@@ -7,6 +7,7 @@
  */
 import { agentLoop, type AgentContext, type AgentLoopConfig, type AgentTool } from "@earendil-works/pi-agent-core";
 import type { Message, Model, ModelThinkingLevel } from "@earendil-works/pi-ai";
+import { createBridgeStreamFn } from "../../provider-stream.js";
 import { streamSimple } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
 import type { Static } from "typebox";
@@ -150,13 +151,7 @@ export async function runReflector(args: RunReflectorArgs): Promise<Reflection[]
 
 	const loop = args.agentLoop ?? agentLoop;
 	// ── Bridge stream function ──
-	const PROVIDER_STREAMS_KEY = Symbol.for("pi-blackhole:provider-streams");
-	const bridgeStreamFn = (model: any, ctx: any, opts: any) => {
-		const providerStreams: Map<string, Function> | undefined = (globalThis as any)[PROVIDER_STREAMS_KEY];
-		if (!providerStreams) return streamSimple(model, ctx, opts);
-		const customFn = model?.api ? providerStreams.get(model.api) : undefined;
-		return customFn ? customFn(model, ctx, opts) : streamSimple(model, ctx, opts);
-	};
+	const bridgeStreamFn = createBridgeStreamFn(streamSimple);
 	const streamFn = args.streamFn ?? bridgeStreamFn;
 	const stream = loop(prompts, context, config, signal, streamFn);
 	let agentError: string | undefined;

package/src/om/compaction-trigger.ts

@@ -2,18 +2,43 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { rawTokensSinceLastCompaction, type Entry } from "./ledger/index.js";
 import type { Runtime } from "./runtime.js";
 import { debugLog } from "./debug-log.js";
+import { RETRYABLE_ERROR_RE } from "./retryable-error.js";
+
+function getErrorMessage(error: unknown): string {
+	if (error instanceof Error) return error.message;
+	if (error && typeof error === "object" && "message" in error) {
+		return String((error as { message: unknown }).message);
+	}
+	return String(error);
+}
+
+function isStaleExtensionContextError(error: unknown): boolean {
+	const message = getErrorMessage(error);
+	return message.includes("extension ctx is stale") || message.includes("ctx is stale");
+}
 
-/**
- * Regex matching Pi's internal retryable error detection.
- * When the last assistant message in agent_end has stopReason "error" matching this pattern,
- * Pi will auto-retry — we must not trigger compaction between attempts.
- */
-const RETRYABLE_ERROR_RE =
-	/overloaded|provider.?returned.?error|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server.?error|internal.?error|network.?error|connection.?error|connection.?refused|connection.?lost|websocket.?closed|websocket.?error|other side closed|fetch failed|upstream.?connect|reset before headers|socket hang up|ended without|http2 request did not get a response|timed? out|timeout|terminated|retry delay/i;
+function notifySafely(hasUI: boolean, ui: any, message: string, level: "info" | "warning" | "error"): void {
+	if (!hasUI) return;
+	try {
+		ui?.notify(message, level);
+	} catch (error) {
+		if (!isStaleExtensionContextError(error)) throw error;
+	}
+}
 
 export function registerCompactionTrigger(pi: ExtensionAPI, runtime: Runtime): void {
 	pi.on("agent_end", (event: any, ctx: any) => {
-		runtime.ensureConfig(ctx.cwd);
+		try {
+			handleAgentEnd(event, ctx, runtime);
+		} catch (error) {
+			if (isStaleExtensionContextError(error)) return;
+			throw error;
+		}
+	});
+}
+
+function handleAgentEnd(event: any, ctx: any, runtime: Runtime): void {
+	runtime.ensureConfig(ctx.cwd);
 
 		// Pass the config flag explicitly — this handler runs outside ALS context
 		// (agent_end events don't flow through consolidation's withDebugLogContext),
@@ -100,7 +125,9 @@ export function registerCompactionTrigger(pi: ExtensionAPI, runtime: Runtime): v
 
 		dbg("compaction_trigger.threshold_reached", { tokens, sessionId, hasUI });
 
-		if (hasUI) ui?.notify(
+		notifySafely(
+			hasUI,
+			ui,
 			`Observational memory: compaction threshold reached (~${tokens.toLocaleString()} tokens); triggering compaction`,
 			"info",
 		);
@@ -117,7 +144,9 @@ export function registerCompactionTrigger(pi: ExtensionAPI, runtime: Runtime): v
 				if (currentSessionId !== sessionId) {
 					runtime.compactInFlight = false;
 					dbg("compaction_trigger.microtask.bail", { reason: "session_changed" });
-					if (hasUI) ui?.notify(
+					notifySafely(
+						hasUI,
+						ui,
 						"Observational memory: compaction cancelled — session changed before compaction",
 						"info",
 					);
@@ -129,7 +158,9 @@ export function registerCompactionTrigger(pi: ExtensionAPI, runtime: Runtime): v
 				if (!isIdle) {
 					runtime.compactInFlight = false;
 					dbg("compaction_trigger.microtask.bail", { reason: "not_idle" });
-					if (hasUI) ui?.notify(
+					notifySafely(
+						hasUI,
+						ui,
 						"Observational memory: compaction deferred — agent became busy before compaction",
 						"info",
 					);
@@ -141,7 +172,9 @@ export function registerCompactionTrigger(pi: ExtensionAPI, runtime: Runtime): v
 				if (currentTokens < runtime.config.compactAfterTokens) {
 					runtime.compactInFlight = false;
 					dbg("compaction_trigger.microtask.bail", { reason: "pressure_relieved", currentTokens, threshold: runtime.config.compactAfterTokens });
-					if (hasUI) ui?.notify(
+					notifySafely(
+						hasUI,
+						ui,
 						"Observational memory: compaction skipped — another compaction already ran before deferred compaction",
 						"info",
 					);
@@ -153,7 +186,7 @@ export function registerCompactionTrigger(pi: ExtensionAPI, runtime: Runtime): v
 					onComplete: (result: any) => {
 						runtime.compactInFlight = false;
 						dbg("compaction_trigger.onComplete", { result: !!result });
-						if (hasUI) ui?.notify("Observational memory: compaction complete", "info");
+						notifySafely(hasUI, ui, "Observational memory: compaction complete", "info");
 					},
 					onError: (error: { message: string }) => {
 						runtime.compactInFlight = false;
@@ -162,15 +195,18 @@ export function registerCompactionTrigger(pi: ExtensionAPI, runtime: Runtime): v
 							// We already notified the user with the real reason before returning { cancel: true }.
 							return;
 						}
-						if (hasUI) ui?.notify(`Observational memory: ${error.message}`, "error");
+						notifySafely(hasUI, ui, `Observational memory: ${error.message}`, "error");
 					},
 				});
 			} catch (error) {
 				runtime.compactInFlight = false;
-				const msg = error instanceof Error ? error.message : String(error);
+				const msg = getErrorMessage(error);
+				if (isStaleExtensionContextError(error)) {
+					dbg("compaction_trigger.microtask.bail", { reason: "stale_ctx", message: msg });
+					return;
+				}
 				dbg("compaction_trigger.microtask.error", { message: msg });
-				if (hasUI) ui?.notify(`Observational memory: compact threw: ${msg}`, "error");
+				notifySafely(hasUI, ui, `Observational memory: compact threw: ${msg}`, "error");
 			}
-		}, 0);
-	});
+	}, 0);
 }

package/src/om/configure-overlay.ts

@@ -8,6 +8,7 @@
 
 import { visibleWidth } from "./key-matcher.js";
 import { matchesKey, decodeKittyPrintable } from "@earendil-works/pi-tui";
+import { DEFAULTS } from "../core/unified-config.js";
 import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 
@@ -49,6 +50,8 @@ const FIELDS: FieldDef[] = [
 	// ── Observational Memory ──
 	{ key: "memory", label: "Observational memory", type: "boolean", section: "Observational Memory",
 		helpText: "Enable OM workers (observer, reflector, dropper) and content injection" },
+	{ key: "sessionFallback", label: "Session model fallback", type: "boolean", section: "Observational Memory",
+		helpText: "off=skip stage when all OM models fail, instead of falling back to the main coding model" },
 	{ key: "observeAfterTokens", label: "Observer threshold", type: "number", section: "Observational Memory",
 		helpText: "Tokens accumulated since last observer run before triggering next observe" },
 	{ key: "reflectAfterTokens", label: "Reflect + dropper threshold", type: "number", section: "Observational Memory",
@@ -139,9 +142,10 @@ export function createConfigureOverlay(
 		raw = {};
 	}
 
+	const defaults = DEFAULTS as unknown as Record<string, unknown>;
 	const fields: FieldState[] = FIELDS.map((def) => ({
 		def,
-		value: formatValue(def, raw[def.key]),
+		value: formatValue(def, def.key in raw ? raw[def.key] : defaults[def.key]),
 		editing: false,
 		cursor: 0,
 	}));