@nijaru/pi-provider-compaction 0.0.4 → 0.0.6

package/README.md

@@ -1,14 +1,14 @@
 # pi-provider-compaction
 
-Experimental provider-native compaction for [Pi](https://github.com/earendil-works/pi), with a meaningful portable summary saved alongside each native checkpoint. Requires Pi 0.87.0.
+Experimental provider-native compaction for [Pi](https://github.com/earendil-works/pi), with a meaningful portable summary saved alongside each native checkpoint. Minimum runtime: Pi 0.87.0. Development checks target Pi 1.2.0.
 
-**The unpublished redesign is not production-validated. Do not enable it globally yet.** Real runner/adapter fixtures and a Codex live smoke test pass; broader backend and deployment validation remains incomplete.
+**This experimental design is not production-validated. Do not enable it globally yet.** Real runner/adapter fixtures and a Codex live smoke test pass; broader backend and deployment validation remains incomplete.
 
 [pi-compactor](https://github.com/nijaru/pi-compactor) owns compaction timing and continuation. This extension owns native request capture, prefix coverage, persistence and replay. It does not change `/fast` or account reporting.
 
 ## Supported integration
 
-Pi 0.87.0 has replacement provider registration, not composable middleware. This extension only installs request observation where it can preserve the existing provider contract:
+Pi has replacement provider registration, not composable middleware. This extension only installs request observation where it can preserve the existing provider contract:
 
 - **Registered native base providers:** both streaming methods are decorated; authentication, catalogs, filtering, refresh and deferred methods stay with the original provider. `models.json` remains above that base.
 - **Existing static legacy `streamSimple` registrations:** the original callback and configuration are retained. This includes `pi-fast-mode`'s Codex registration. Legacy dynamic catalogs and OAuth model-projection callbacks are excluded.
@@ -38,7 +38,7 @@ Request-only suffix additions, deletions, redactions and reordering can survive
 
 Version 3 stores the portable summary, native output, usage, route identity and validated prefix metadata in one compaction entry. Both generation requests contribute to usage accounting. Raw credentials, complete auth headers and request snapshots are never persisted.
 
-Native eligibility is deliberately **session-local and short-lived**. Restart, reload, resume, fork, tree navigation, model changes, covered-history edits, and relevant prompt/tool/route changes revoke it. A credential refresh may conservatively revoke it too. Persisted native metadata alone is not authority to replay hidden content under a new runtime's privacy policy.
+Native eligibility is deliberately **session-local and short-lived**. Restart, reload, SDK disposal, resume, fork, tree navigation, model changes, covered-history edits, and relevant prompt/tool/route changes revoke it. A credential refresh may conservatively revoke it too. Persisted native metadata alone is not authority to replay hidden content under a new runtime's privacy policy.
 
 Dynamic privacy policies that can change what previously covered history is allowed to reveal are **not transparently supported**. A cooperating policy owner must emit `pi-provider-compaction:invalidate` before such a change; otherwise keep this extension disabled. Matching visible summary text cannot establish that hidden native state obeys a new policy.
 
@@ -60,7 +60,7 @@ An explicit generic model takes precedence, matching `pi-compactor`:
 2. trusted `.pi/compaction-policy.json`;
 3. agent `compaction-policy.json`.
 
-An empty `models` list is not an override.
+An empty `models` list is not an override. When `pi-compactor` is loaded, its effective selection takes precedence, including flags injected by an SDK host rather than passed on the command line.
 
 ## Local development
 
@@ -71,9 +71,9 @@ bun run build
 pi --extension ./dist/index.js
 ```
 
-The manifest loads the built `dist/index.js`; source edits alone do not update it. Keep global installation disabled while testing. Publishing and global activation are separate approval steps.
+The manifest loads the built `dist/index.js`, including a bundled stateless Responses serializer validator; source or host dependency changes require a rebuild. `bun run check` rebuilds first and tests the artifact against Pi's actual host serializer, including function-call history replayed as grammar tools. Keep global installation disabled while testing. Publishing and global activation are separate approval steps.
 
-Tests include real Pi 0.87.0 runner/adapter fixtures for all three protocols, repeated prefix compaction, transformed suffix preservation, unchanged fallback, grammar tools, strict defaults, tool IDs, images and prompt updates. The optional installed-fast-mode fixture (`PI_FAST_MODE_FIXTURE_PATH`) also checks actual `pi-fast-mode` composition across `/reload`; run it with an isolated `PI_CODING_AGENT_DIR` containing an active, persistent fast-mode configuration.
+Tests include real Pi 1.2.0 runner/adapter fixtures for all three protocols, repeated prefix compaction, transformed suffix preservation, unchanged fallback, grammar tools, strict defaults, tool IDs, images and prompt updates. Set `PI_COMPACTOR_FIXTURE_PATH` to a `pi-compactor` entrypoint to check SDK flag precedence in both extension orders. The optional installed-fast-mode fixture (`PI_FAST_MODE_FIXTURE_PATH`) checks actual `pi-fast-mode` composition across `/reload`; it creates an isolated fast-mode configuration.
 
 Authenticated protocol smoke tests are separate and send three small requests:
 

package/dist/index.js

@@ -1,6 +1,6 @@
 // index.ts
 import { createHash, createHmac, randomBytes, randomUUID } from "node:crypto";
-import { normalizeContext as normalizeContext2 } from "@earendil-works/pi-ai";
+import { normalizeContext as normalizeContext2, registerSessionResourceCleanup } from "@earendil-works/pi-ai";
 import { compact, convertToLlm } from "@earendil-works/pi-coding-agent";
 
 // policy.ts
@@ -119,18 +119,21 @@ function readCompactionModelFlagFromArgv(argv = process.argv.slice(2)) {
   return value;
 }
 function resolveCompactionModelPolicy(pi, ctx, argv = process.argv.slice(2)) {
+  let effective;
+  pi.events.emit("pi-compactor:resolve-model-policy", {
+    context: ctx,
+    respond: (hasSelectors) => {
+      if (typeof hasSelectors === "boolean")
+        effective = hasSelectors;
+    }
+  });
+  if (effective !== undefined)
+    return effective ? { hasSelectors: true, source: "compactor" } : { hasSelectors: false };
   const argvRaw = readCompactionModelFlagFromArgv(argv);
   if (typeof argvRaw === "string" && argvRaw.trim()) {
     const selector = normalizeSelector(argvRaw);
     return selector ? { hasSelectors: true, source: "flag" } : { hasSelectors: false };
   }
-  try {
-    const rawFlag = pi.getFlag(COMPACTION_MODEL_FLAG);
-    if (typeof rawFlag === "string" && rawFlag.trim()) {
-      const selector = normalizeSelector(rawFlag);
-      return selector ? { hasSelectors: true, source: "flag" } : { hasSelectors: false };
-    }
-  } catch {}
   const agentDir = activeAgentDir(ctx);
   const candidates = [];
   if (isProjectPolicyTrusted(ctx, agentDir)) {
@@ -147,8 +150,14 @@ function resolveCompactionModelPolicy(pi, ctx, argv = process.argv.slice(2)) {
 }
 
 // provider.ts
+var STREAM_OBSERVER = Symbol.for("@nijaru/pi-provider-compaction/stream-observer");
 function optionsWithObserver(model, context, options, observe) {
-  const handler = observe(model, context, options ?? {});
+  let handler;
+  try {
+    handler = observe(model, context, options ?? {});
+  } catch {
+    return options;
+  }
   if (!handler)
     return options;
   return {
@@ -191,15 +200,22 @@ function installObserver(pi, ctx, observe) {
   const id = model.provider;
   const native = registry.getRegisteredNativeProvider(id);
   if (native) {
+    const isInstalled = () => registry.getRegisteredNativeProvider(id) === wrapper;
     const guarded = (...args) => {
+      if (!isInstalled())
+        return;
       const handler = observe(...args);
-      return handler ? (payload) => registry.getRegisteredNativeProvider(id) === wrapper ? handler(payload) : payload : undefined;
+      return handler ? (payload) => isInstalled() ? handler(payload) : payload : undefined;
     };
     const wrapper = decorateProvider(native, guarded);
     pi.registerProvider(wrapper);
-    return () => {
-      if (registry.getRegisteredNativeProvider(id) === wrapper)
-        pi.registerProvider(native);
+    return {
+      provider: id,
+      isInstalled,
+      remove() {
+        if (isInstalled())
+          registry.registerProvider(native);
+      }
     };
   }
   const original = registry.getRegisteredProviderConfig(id);
@@ -208,27 +224,24 @@ function installObserver(pi, ctx, observe) {
   if (original.api !== model.api)
     return;
   const delegate = original.streamSimple.bind(original);
+  const isInstalled = () => registry.getRegisteredProviderConfig(id)?.streamSimple === wrapper && !registry.getRegisteredNativeProvider(id);
   const guarded = (...args) => {
+    if (!isInstalled())
+      return;
     const handler = observe(...args);
-    return handler ? (payload) => registry.getRegisteredProviderConfig(id)?.streamSimple === wrapper ? handler(payload) : payload : undefined;
+    return handler ? (payload) => isInstalled() ? handler(payload) : payload : undefined;
   };
   const wrapper = (requestModel, context, options) => delegate(requestModel, context, optionsWithObserver(requestModel, context, options, guarded));
-  pi.registerProvider(id, { ...original, api: original?.api ?? model.api, streamSimple: wrapper });
-  return () => {
-    const current = registry.getRegisteredProviderConfig(id);
-    if (current?.streamSimple !== wrapper || registry.getRegisteredNativeProvider(id))
+  const remove = () => {
+    if (!isInstalled())
       return;
-    const restored = { ...current };
-    if (original?.streamSimple)
-      restored.streamSimple = original.streamSimple;
-    else
-      delete restored.streamSimple;
-    if (!original?.api && restored.api === model.api)
-      delete restored.api;
-    pi.unregisterProvider(id);
-    if (Object.keys(restored).length)
-      pi.registerProvider(id, restored);
+    const restored = { ...registry.getRegisteredProviderConfig(id), streamSimple: original.streamSimple };
+    registry.unregisterProvider(id);
+    registry.registerProvider(id, restored);
   };
+  Object.defineProperty(wrapper, STREAM_OBSERVER, { value: { delegate: original.streamSimple, release: remove } });
+  pi.registerProvider(id, { ...original, streamSimple: wrapper });
+  return { provider: id, isInstalled, remove };
 }
 
 // replay.ts
@@ -273,7 +286,7 @@ function schemaAllowsNull(schema) {
     return true;
   return Array.isArray(schema.anyOf) && schema.anyOf.some((variant) => schemaAllowsNull(variant));
 }
-function makeJsonSchemaNodeStrict(schema) {
+function makeJsonSchemaNodeStrict(schema, isUnsupportedKeyword) {
   if (!isJsonSchemaObject(schema)) {
     throw new UnsupportedStrictJsonSchemaError("boolean schemas are unsupported");
   }
@@ -282,6 +295,13 @@ function makeJsonSchemaNodeStrict(schema) {
       throw new UnsupportedStrictJsonSchemaError(`${key} schemas are unsupported`);
     }
   }
+  if (isUnsupportedKeyword) {
+    for (const [key, value] of Object.entries(schema)) {
+      if (isUnsupportedKeyword(key, value)) {
+        throw new UnsupportedStrictJsonSchemaError(`${key}: ${JSON.stringify(value)} is unsupported`);
+      }
+    }
+  }
   if (schema.anyOf !== undefined) {
     if (!Array.isArray(schema.anyOf) || schema.anyOf.length === 0) {
       throw new UnsupportedStrictJsonSchemaError("anyOf must contain at least one schema");
@@ -290,14 +310,14 @@ function makeJsonSchemaNodeStrict(schema) {
       if (isStructuredSchema(variant)) {
         throw new UnsupportedStrictJsonSchemaError("object and array unions are unsupported");
       }
-      makeJsonSchemaNodeStrict(variant);
+      makeJsonSchemaNodeStrict(variant, isUnsupportedKeyword);
     }
   }
   if (schema.items !== undefined) {
     if (Array.isArray(schema.items)) {
       throw new UnsupportedStrictJsonSchemaError("tuple schemas are unsupported");
     }
-    makeJsonSchemaNodeStrict(schema.items);
+    makeJsonSchemaNodeStrict(schema.items, isUnsupportedKeyword);
   }
   const isObjectSchema = schema.type === "object";
   if (schema.properties !== undefined && !isObjectSchema) {
@@ -321,7 +341,7 @@ function makeJsonSchemaNodeStrict(schema) {
     throw new UnsupportedStrictJsonSchemaError("required contains an unknown property");
   }
   for (const [key, property] of Object.entries(properties)) {
-    makeJsonSchemaNodeStrict(property);
+    makeJsonSchemaNodeStrict(property, isUnsupportedKeyword);
     if (!required.has(key) && !schemaAllowsNull(property)) {
       properties[key] = { anyOf: [property, { type: "null" }] };
     }
@@ -329,12 +349,12 @@ function makeJsonSchemaNodeStrict(schema) {
   schema.required = propertyNames;
   schema.additionalProperties = false;
 }
-function makeStrictJsonSchema(schema) {
+function makeStrictJsonSchema(schema, isUnsupportedKeyword) {
   const cloned = structuredClone(schema);
   if (!isJsonSchemaObject(cloned)) {
     throw new UnsupportedStrictJsonSchemaError("root schema must have type object");
   }
-  makeJsonSchemaNodeStrict(cloned);
+  makeJsonSchemaNodeStrict(cloned, isUnsupportedKeyword);
   if (cloned.type !== "object") {
     throw new UnsupportedStrictJsonSchemaError("root schema must have type object");
   }
@@ -367,13 +387,13 @@ function inferGrammarInputProperty(tool) {
   }
   return inputProperty;
 }
-function resolveJsonSchemaStrictSampling(tool, supportsStrictMode) {
+function resolveJsonSchemaStrictSampling(tool, supportsStrictMode, isUnsupportedKeyword) {
   const config = tool.constrainedSampling;
   if (!config || config.type !== "json_schema")
     return;
   if (supportsStrictMode) {
     try {
-      makeStrictJsonSchema(tool.parameters);
+      makeStrictJsonSchema(tool.parameters, isUnsupportedKeyword);
       return true;
     } catch (error) {
       if (!(error instanceof UnsupportedStrictJsonSchemaError))
@@ -899,7 +919,8 @@ function convertResponsesMessages(model, context, allowedToolCallProviders, opti
           const [callId, itemIdRaw] = toolCall.id.split("|");
           const customInputProperty = options?.grammarToolInputProperties?.get(toolCall.name);
           let itemId = itemIdRaw;
-          if (isDifferentModel && itemId?.startsWith("fc_") || customInputProperty === undefined && !itemId?.startsWith("fc_")) {
+          const itemIdPrefix = customInputProperty === undefined ? "fc_" : "ctc_";
+          if (isDifferentModel || !itemId?.startsWith(itemIdPrefix)) {
             itemId = undefined;
           }
           if (customInputProperty !== undefined) {
@@ -1436,6 +1457,7 @@ async function requestProviderCompaction(request) {
 
 // replay.ts
 var TOOL_CALL_PROVIDERS = new Set(["openai", "openai-codex", "opencode"]);
+var AZURE_TOOL_CALL_PROVIDERS = new Set([...TOOL_CALL_PROVIDERS, "azure"]);
 var MAX_SNAPSHOT_BYTES = 8 * 1024 * 1024;
 var SNAPSHOT_TTL_MS = 5 * 60000;
 function equal(left, right) {
@@ -1447,7 +1469,7 @@ function serializeInput(model, context, declarations = context) {
   const codex = model.api === "openai-codex-responses";
   const normalized = resolveTranscript2(context, flag("supportsMidConvoSystemMessages"));
   const tools = resolveTranscript2(declarations, flag("supportsMidConvoSystemMessages"));
-  return convertResponsesMessages(model, normalized, model.api === "azure-openai-responses" ? new Set([...TOOL_CALL_PROVIDERS, "azure-openai-responses"]) : TOOL_CALL_PROVIDERS, {
+  return convertResponsesMessages(model, normalized, model.api === "azure-openai-responses" ? AZURE_TOOL_CALL_PROVIDERS : TOOL_CALL_PROVIDERS, {
     includeSystemPrompt: !codex,
     grammarToolInputProperties: createGrammarToolInputProperties(getDeclaredTools(tools.messages), flag("supportsOpenAIGrammarTools")),
     supportsMidConvoSystemMessages: flag("supportsMidConvoSystemMessages"),
@@ -1683,8 +1705,8 @@ function pi_provider_compaction_default(pi) {
   let snapshot;
   let active;
   let pending;
-  let uninstall;
-  let installedProvider;
+  let observer;
+  let unregisterCleanup;
   let generation = 0;
   let captureStatus = "no request observed";
   let compactionStatus = "not attempted in this runtime";
@@ -1698,7 +1720,7 @@ function pi_provider_compaction_default(pi) {
     description: "Show content-free native compaction eligibility and last attempt",
     handler: async (_args, context) => {
       context.ui.notify(`Provider compaction
-Observer: ${installedProvider ? "installed" : "unavailable for current registration"}
+Observer: ${observer?.isInstalled() ? "installed" : "unavailable for current registration"}
 Capture: ${captureStatus}
 Last attempt: ${compactionStatus}`, "info");
     }
@@ -1711,12 +1733,30 @@ Last attempt: ${compactionStatus}`, "info");
     pending = undefined;
     captureStatus = "invalidated by lifecycle/history/policy change";
   };
+  const retire = () => {
+    invalidate();
+    const installed = observer;
+    observer = undefined;
+    ctx = undefined;
+    unregisterCleanup?.();
+    unregisterCleanup = undefined;
+    installed?.remove();
+  };
   const generic = (context) => resolveCompactionModelPolicy(pi, context).hasSelectors;
   const route = (model, options) => routeDigest({ model, apiKey: options.apiKey, headers: options.headers, env: options.env });
   const unchanged = (branch, length, hash) => branch.length >= length && digest(branch.slice(0, length)) === hash && !branch.slice(length).some((entry) => entry.type === "context_edit");
   const observe = (model, context, options) => {
     const owner = ctx;
-    if (!owner || options.sessionId !== owner.sessionManager.getSessionId())
+    if (!owner)
+      return;
+    let manager;
+    try {
+      manager = owner.sessionManager;
+    } catch {
+      retire();
+      return;
+    }
+    if (options.sessionId !== manager.getSessionId())
       return;
     if (!supportsNativeCompaction(model)) {
       captureRejected("unsupported API");
@@ -1735,10 +1775,19 @@ Last attempt: ${compactionStatus}`, "info");
       return;
     }
     const ticket = generation;
-    const branch = owner.sessionManager.getBranch();
+    const branch = manager.getBranch();
     const branchHash = digest(branch);
-    const canonical = transcript(owner.sessionManager.buildSessionProjection().messages);
-    const current = () => generation === ticket && ctx === owner && !options.signal?.aborted && supportedRouteOptions(model, options) && digest(owner.sessionManager.getBranch()) === branchHash;
+    const canonical = transcript(manager.buildSessionProjection().messages);
+    const current = () => {
+      if (generation !== ticket || ctx !== owner || options.signal?.aborted || !supportedRouteOptions(model, options))
+        return false;
+      try {
+        return digest(owner.sessionManager.getBranch()) === branchHash;
+      } catch {
+        retire();
+        return false;
+      }
+    };
     return async (payload) => {
       if (!current())
         return payload;
@@ -1802,21 +1851,26 @@ Last attempt: ${compactionStatus}`, "info");
   };
   const install = (context) => {
     ctx = context;
-    if (installedProvider === context.model?.provider)
+    if (observer?.provider === context.model?.provider && observer?.isInstalled())
       return;
-    uninstall?.();
-    uninstall = undefined;
-    installedProvider = undefined;
+    if (observer) {
+      invalidate();
+      observer.remove();
+      observer = undefined;
+    }
     if (!supportsNativeCompaction(context.model))
       return;
-    uninstall = installObserver(pi, context, observe);
-    if (uninstall)
-      installedProvider = context.model.provider;
-    captureStatus = uninstall ? "awaiting prepared request" : "unsupported provider registration";
+    observer = installObserver(pi, context, observe);
+    captureStatus = observer ? "awaiting prepared request" : "unsupported provider registration";
   };
   pi.on("session_start", (_event, context) => {
-    invalidate();
+    retire();
     install(context);
+    const sessionId = context.sessionManager.getSessionId();
+    unregisterCleanup = registerSessionResourceCleanup((disposedId) => {
+      if (disposedId === undefined || disposedId === sessionId)
+        retire();
+    });
     const latest = latestCompaction(context.sessionManager.getBranch());
     if (latest?.summary === NATIVE_COMPACTION_SUMMARY)
       context.ui.notify("Legacy native compaction has no portable summary. Native replay is disabled; recover from earlier history or start a new session.", "warning");
@@ -1831,13 +1885,7 @@ Last attempt: ${compactionStatus}`, "info");
   pi.on("session_tree", () => {
     invalidate();
   });
-  pi.on("session_shutdown", () => {
-    invalidate();
-    uninstall?.();
-    uninstall = undefined;
-    installedProvider = undefined;
-    ctx = undefined;
-  });
+  pi.on("session_shutdown", retire);
   const removeInvalidation = pi.events.on("pi-provider-compaction:invalidate", invalidate);
   pi.on("session_shutdown", () => {
     if (typeof removeInvalidation === "function")

package/index.ts

@@ -1,9 +1,9 @@
 import { createHash, createHmac, randomBytes, randomUUID } from "node:crypto";
 import type { AgentMessage } from "@earendil-works/pi-agent-core";
-import { normalizeContext, type Model, type Provider, type ProviderHeaders, type ProviderStreamOptions, type SimpleStreamOptions, type TranscriptContext, type Usage } from "@earendil-works/pi-ai";
+import { normalizeContext, registerSessionResourceCleanup, type Model, type Provider, type ProviderHeaders, type ProviderStreamOptions, type SimpleStreamOptions, type TranscriptContext, type Usage } from "@earendil-works/pi-ai";
 import { compact, convertToLlm, type ExtensionAPI, type ExtensionContext, type SessionEntry } from "@earendil-works/pi-coding-agent";
 import { resolveCompactionModelPolicy } from "./policy";
-import { installObserver, type ObserveRequest } from "./provider";
+import { installObserver, type InstalledObserver, type ObserveRequest } from "./provider";
 import { capturePreparedRequest, equal, requestPolicy, selectCoveredPrefix, substituteSummary, summarySlot, type PreparedRequest } from "./replay";
 import { isObject, requestProviderCompaction, resolveNativeProtocol, supportsResponsesApi, validateCompactedOutput, type NativeProtocol, type ResponseItem } from "./protocol";
 
@@ -152,8 +152,8 @@ export default function (pi: ExtensionAPI): void {
 	let snapshot: Captured | undefined;
 	let active: Active | undefined;
 	let pending: { details: NativeCompactionDetails; capture: Captured; summary: string } | undefined;
-	let uninstall: (() => void) | undefined;
-	let installedProvider: string | undefined;
+	let observer: InstalledObserver | undefined;
+	let unregisterCleanup: (() => void) | undefined;
 	let generation = 0;
 	let captureStatus = "no request observed";
 	let compactionStatus = "not attempted in this runtime";
@@ -162,17 +162,33 @@ export default function (pi: ExtensionAPI): void {
 	pi.registerCommand("provider-compaction-status", {
 		description: "Show content-free native compaction eligibility and last attempt",
 		handler: async (_args, context) => {
-			context.ui.notify(`Provider compaction\nObserver: ${installedProvider ? "installed" : "unavailable for current registration"}\nCapture: ${captureStatus}\nLast attempt: ${compactionStatus}`, "info");
+			context.ui.notify(`Provider compaction\nObserver: ${observer?.isInstalled() ? "installed" : "unavailable for current registration"}\nCapture: ${captureStatus}\nLast attempt: ${compactionStatus}`, "info");
 		},
 	});
 	const invalidate = () => { generation++; runtimeId = randomUUID(); snapshot = undefined; active = undefined; pending = undefined; captureStatus = "invalidated by lifecycle/history/policy change"; };
+	const retire = () => {
+		invalidate();
+		const installed = observer;
+		observer = undefined; ctx = undefined;
+		unregisterCleanup?.(); unregisterCleanup = undefined;
+		installed?.remove();
+	};
 	const generic = (context: ExtensionContext) => resolveCompactionModelPolicy(pi, context).hasSelectors;
 	const route = (model: Model<any>, options: ProviderStreamOptions | SimpleStreamOptions) => routeDigest({ model, apiKey: options.apiKey, headers: options.headers, env: options.env });
 	const unchanged = (branch: readonly SessionEntry[], length: number, hash: string) => branch.length >= length && digest(branch.slice(0, length)) === hash && !branch.slice(length).some((entry) => entry.type === "context_edit");
 
 	const observe: ObserveRequest = (model, context, options) => {
 		const owner = ctx;
-		if (!owner || options.sessionId !== owner.sessionManager.getSessionId()) return;
+		if (!owner) return;
+		let manager: ExtensionContext["sessionManager"];
+		try { manager = owner.sessionManager; }
+		catch {
+			// Bare SDK dispose() invalidates contexts without session_shutdown.
+			// Retire the owned registration before dispatching another session.
+			retire();
+			return;
+		}
+		if (options.sessionId !== manager.getSessionId()) return;
 		if (!supportsNativeCompaction(model)) { captureRejected("unsupported API"); return; }
 		if (!options.onPayload) { captureRejected("no payload callback"); return; }
 		if (generic(owner)) { captureRejected("generic compaction model takes precedence"); return; }
@@ -180,10 +196,14 @@ export default function (pi: ExtensionAPI): void {
 		// fallbacks. Those must not silently select a route absent from our evidence.
 		if (!supportedRouteOptions(model, options)) { captureRejected("unsupported route overrides"); return; }
 		const ticket = generation;
-		const branch = owner.sessionManager.getBranch();
+		const branch = manager.getBranch();
 		const branchHash = digest(branch);
-		const canonical = transcript(owner.sessionManager.buildSessionProjection().messages);
-		const current = () => generation === ticket && ctx === owner && !options.signal?.aborted && supportedRouteOptions(model, options) && digest(owner.sessionManager.getBranch()) === branchHash;
+		const canonical = transcript(manager.buildSessionProjection().messages);
+		const current = () => {
+			if (generation !== ticket || ctx !== owner || options.signal?.aborted || !supportedRouteOptions(model, options)) return false;
+			try { return digest(owner.sessionManager.getBranch()) === branchHash; }
+			catch { retire(); return false; }
+		};
 		return async (payload) => {
 			if (!current()) return payload;
 			snapshot = undefined;
@@ -234,22 +254,27 @@ export default function (pi: ExtensionAPI): void {
 
 	const install = (context: ExtensionContext) => {
 		ctx = context;
-		if (installedProvider === context.model?.provider) return;
-		uninstall?.(); uninstall = undefined; installedProvider = undefined;
+		if (observer?.provider === context.model?.provider && observer?.isInstalled()) return;
+		if (observer) { invalidate(); observer.remove(); observer = undefined; }
 		if (!supportsNativeCompaction(context.model)) return;
-		uninstall = installObserver(pi, context, observe);
-		if (uninstall) installedProvider = context.model.provider;
-		captureStatus = uninstall ? "awaiting prepared request" : "unsupported provider registration";
+		observer = installObserver(pi, context, observe);
+		captureStatus = observer ? "awaiting prepared request" : "unsupported provider registration";
 	};
 	pi.on("session_start", (_event, context) => {
-		invalidate(); install(context);
+		retire(); install(context);
+		const sessionId = context.sessionManager.getSessionId();
+		// AgentSession.dispose() cleans session resources even without emitting
+		// session_shutdown. The captured registry keeps owned cleanup usable.
+		unregisterCleanup = registerSessionResourceCleanup((disposedId) => {
+			if (disposedId === undefined || disposedId === sessionId) retire();
+		});
 		const latest = latestCompaction(context.sessionManager.getBranch());
 		if (latest?.summary === NATIVE_COMPACTION_SUMMARY) context.ui.notify("Legacy native compaction has no portable summary. Native replay is disabled; recover from earlier history or start a new session.", "warning");
 	});
 	pi.on("before_agent_start", (_event, context) => { install(context); });
 	pi.on("model_select", (_event, context) => { invalidate(); install(context); });
 	pi.on("session_tree", () => { invalidate(); });
-	pi.on("session_shutdown", () => { invalidate(); uninstall?.(); uninstall = undefined; installedProvider = undefined; ctx = undefined; });
+	pi.on("session_shutdown", retire);
 	// Privacy-policy owners must invalidate before changing a policy that can affect
 	// hidden covered history. Arbitrary dynamic privacy compositions are unsupported.
 	const removeInvalidation = pi.events.on("pi-provider-compaction:invalidate", invalidate);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nijaru/pi-provider-compaction",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "type": "module",
   "description": "Provider-native context compaction adapters for Pi",
   "keywords": [
@@ -18,7 +18,7 @@
   "author": "Nick Naru <nick@nijaru.com>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nijaru/pi-provider-compaction.git"
+    "url": "git+https://github.com/nijaru/pi-provider-compaction.git"
   },
   "pi": {
     "extensions": [
@@ -31,7 +31,7 @@
     "test": "bun test",
     "lint": "oxlint build.ts index.ts protocol.ts policy.ts provider.ts replay.ts tests/",
     "typecheck": "tsc --noEmit",
-    "check": "bun test && bun run lint && tsc --noEmit"
+    "check": "bun run build && bun test && bun run lint && tsc --noEmit"
   },
   "files": [
     "dist",
@@ -44,14 +44,15 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@earendil-works/pi-ai": "0.87.0",
-    "@earendil-works/pi-agent-core": "0.87.0",
-    "@earendil-works/pi-coding-agent": "0.87.0",
+    "@earendil-works/pi-ai": "1.2.0",
+    "@earendil-works/pi-agent-core": "1.2.0",
+    "@earendil-works/pi-coding-agent": "1.2.0",
     "@types/bun": "latest",
     "oxlint": "^1.81.0",
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
+    "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*"
   }
 }

package/policy.ts

@@ -1,31 +1,9 @@
 /**
- * Generic-compaction-model precedence resolution shared with pi-compactor.
- *
- * When pi-compactor's generic compaction model is configured — via the
- * `compaction-model` flag or a `compaction-policy.json` file — the explicit
- * generic model takes precedence over provider-native compaction: this
- * extension must not request a native compaction and must not replay a
- * previously persisted native window.
- *
- * Pi scopes `getFlag` to flags the calling extension registered, and Pi
- * rejects two extensions registering the same flag name. This extension
- * therefore never registers `compaction-model` (owned by pi-compactor) and
- * reads the shared CLI value from `process.argv` instead. The policy-file
- * fallback mirrors pi-compactor exactly: project policy requires project
- * trust; the agent-dir policy does not; a valid file with an empty `models`
- * list disables the generic model. This module must stay in sync with
- * `readModelSelectors` in pi-compactor's policy.ts (see
- * tests/policy-parity.test.ts, which checks the two against each other when
- * the sibling checkout is present).
- *
- * Flag-source note (verified against Pi 0.85.1): extension flag values are
- * populated solely from CLI unknown flags (parseArgs in cli/args.js feeds
- * extensionFlagValues in main.js, applied by applyExtensionFlagValues in
- * agent-session-services.js). There is no config-file flag source, so reading
- * process.argv with Pi's exact parsing rules observes every flag value the
- * host can deliver. A programmatic SDK host injecting extensionFlagValues
- * without argv would not be seen here; flag scoping provides no shared read
- * API for that path.
+ * An explicit generic model suppresses both native acquisition and replay.
+ * Ask pi-compactor for its effective policy first: only the flag's owner can
+ * read SDK-injected extensionFlagValues. The event reply is synchronous.
+ * Without a companion reply, argv and policy files retain standalone support;
+ * their trust, bounds, and empty-policy rules mirror pi-compactor's resolver.
  */
 
 import {
@@ -49,7 +27,7 @@ type PolicyContext = Pick<ExtensionContext, "cwd" | "isProjectTrusted"> & {
 	sessionManager?: Pick<ExtensionContext["sessionManager"], "getSessionDir">;
 };
 
-export type CompactionModelSource = "flag" | "project-policy" | "agent-policy";
+export type CompactionModelSource = "compactor" | "flag" | "project-policy" | "agent-policy";
 
 export interface CompactionModelPolicy {
 	/** True when a generic compaction model takes precedence over native compaction. */
@@ -172,27 +150,24 @@ export function readCompactionModelFlagFromArgv(argv: readonly string[] = proces
 
 /** Resolve whether pi-compactor's generic compaction model takes precedence. */
 export function resolveCompactionModelPolicy(
-	pi: Pick<ExtensionAPI, "getFlag">,
+	pi: { events: Pick<ExtensionAPI["events"], "emit"> },
 	ctx: PolicyContext,
 	argv: readonly string[] = process.argv.slice(2),
 ): CompactionModelPolicy {
+	let effective: boolean | undefined;
+	pi.events.emit("pi-compactor:resolve-model-policy", {
+		context: ctx,
+		respond: (hasSelectors: boolean) => { if (typeof hasSelectors === "boolean") effective = hasSelectors; },
+	});
+	if (effective !== undefined) return effective ? { hasSelectors: true, source: "compactor" } : { hasSelectors: false };
+
 	const argvRaw = readCompactionModelFlagFromArgv(argv);
 	if (typeof argvRaw === "string" && argvRaw.trim()) {
 		const selector = normalizeSelector(argvRaw);
 		return selector ? { hasSelectors: true, source: "flag" } : { hasSelectors: false };
 	}
-	// A bare `--compaction-model` (true) or whitespace value falls through like
-	// pi-compactor: Pi reports "requires a value" and the policy files still apply.
+	// A bare or whitespace flag leaves policy files eligible, like pi-compactor.
 	// An oversized selector above already returned hasSelectors:false.
-	try {
-		const rawFlag = pi.getFlag(COMPACTION_MODEL_FLAG);
-		if (typeof rawFlag === "string" && rawFlag.trim()) {
-			const selector = normalizeSelector(rawFlag);
-			return selector ? { hasSelectors: true, source: "flag" } : { hasSelectors: false };
-		}
-	} catch {
-		// getFlag can throw on a stale context; fall through to policy files.
-	}
 
 	const agentDir = activeAgentDir(ctx);
 	const candidates: Array<{ path: string; source: CompactionModelSource }> = [];

package/provider.ts

@@ -3,8 +3,20 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 
 export type ObserveRequest = (model: Model<any>, context: TranscriptContext, options: StreamOptions) => ((payload: unknown) => unknown | Promise<unknown>) | undefined;
 
+export interface InstalledObserver {
+	provider: string;
+	isInstalled(): boolean;
+	remove(): void;
+}
+
+// Explicit cooperation with pi-fast-mode, not permission to replace arbitrary
+// streams: this observer delegates unchanged and can release only its own slot.
+export const STREAM_OBSERVER = Symbol.for("@nijaru/pi-provider-compaction/stream-observer");
+
 function optionsWithObserver<T extends StreamOptions>(model: Model<any>, context: TranscriptContext, options: T | undefined, observe: ObserveRequest): T | undefined {
-	const handler = observe(model, context, options ?? {});
+	let handler: ReturnType<ObserveRequest>;
+	try { handler = observe(model, context, options ?? {}); }
+	catch { return options; } // An expired or failing optional observer must not veto dispatch.
 	if (!handler) return options;
 	return {
 		...options,
@@ -40,21 +52,27 @@ export function decorateProvider(base: Provider, observe: ObserveRequest): Provi
 	* delegate their original callback (including /fast). Never register an effective
 	* composed provider as a native base: that loses model headers and freezes config.
 	*/
-export function installObserver(pi: ExtensionAPI, ctx: ExtensionContext, observe: ObserveRequest): (() => void) | undefined {
+export function installObserver(pi: ExtensionAPI, ctx: ExtensionContext, observe: ObserveRequest): InstalledObserver | undefined {
 	const model = ctx.model;
 	if (!model) return;
 	const registry = ctx.modelRegistry;
 	const id = model.provider;
 	const native = registry.getRegisteredNativeProvider(id);
 	if (native) {
+		const isInstalled = () => registry.getRegisteredNativeProvider(id) === wrapper;
 		const guarded: ObserveRequest = (...args) => {
+			if (!isInstalled()) return;
 			const handler = observe(...args);
-			return handler ? (payload) => registry.getRegisteredNativeProvider(id) === wrapper ? handler(payload) : payload : undefined;
+			return handler ? (payload) => isInstalled() ? handler(payload) : payload : undefined;
 		};
 		const wrapper = decorateProvider(native, guarded);
 		pi.registerProvider(wrapper);
-		return () => {
-			if (registry.getRegisteredNativeProvider(id) === wrapper) pi.registerProvider(native);
+		return {
+			provider: id, isInstalled,
+			remove() {
+				// Keep cleanup usable after bare SDK disposal invalidates the extension API.
+				if (isInstalled()) registry.registerProvider(native);
+			},
 		};
 	}
 	const original = registry.getRegisteredProviderConfig(id);
@@ -65,21 +83,21 @@ export function installObserver(pi: ExtensionAPI, ctx: ExtensionContext, observe
 	// An injected legacy streamSimple overlay would also intercept full stream()
 	// calls and change reasoning semantics. Only decorate an existing stream owner.
 	const delegate = original.streamSimple.bind(original);
+	const isInstalled = () => registry.getRegisteredProviderConfig(id)?.streamSimple === wrapper && !registry.getRegisteredNativeProvider(id);
 	const guarded: ObserveRequest = (...args) => {
+		if (!isInstalled()) return;
 		const handler = observe(...args);
-		return handler ? (payload) => registry.getRegisteredProviderConfig(id)?.streamSimple === wrapper ? handler(payload) : payload : undefined;
+		return handler ? (payload) => isInstalled() ? handler(payload) : payload : undefined;
 	};
 	const wrapper: Provider["streamSimple"] = (requestModel, context, options) => delegate(requestModel, context, optionsWithObserver(requestModel, context, options, guarded));
-	pi.registerProvider(id, { ...original, api: original?.api ?? model.api, streamSimple: wrapper });
-	return () => {
-		const current = registry.getRegisteredProviderConfig(id);
-		if (current?.streamSimple !== wrapper || registry.getRegisteredNativeProvider(id)) return;
+	const remove = () => {
+		if (!isInstalled()) return;
 		// registerProvider merges undefined properties: remove our layer before restore.
-		const restored = { ...current };
-		if (original?.streamSimple) restored.streamSimple = original.streamSimple;
-		else delete restored.streamSimple;
-		if (!original?.api && restored.api === model.api) delete restored.api;
-		pi.unregisterProvider(id);
-		if (Object.keys(restored).length) pi.registerProvider(id, restored);
+		const restored = { ...registry.getRegisteredProviderConfig(id)!, streamSimple: original.streamSimple };
+		registry.unregisterProvider(id);
+		registry.registerProvider(id, restored);
 	};
+	Object.defineProperty(wrapper, STREAM_OBSERVER, { value: { delegate: original.streamSimple, release: remove } });
+	pi.registerProvider(id, { ...original, streamSimple: wrapper });
+	return { provider: id, isInstalled, remove };
 }

package/replay.ts

@@ -5,6 +5,7 @@ import { convertResponsesMessages } from "@earendil-works/pi-ai/api/openai-respo
 import { isObject, type JsonObject, type ResponseItem } from "./protocol";
 
 const TOOL_CALL_PROVIDERS = new Set(["openai", "openai-codex", "opencode"]);
+const AZURE_TOOL_CALL_PROVIDERS = new Set([...TOOL_CALL_PROVIDERS, "azure"]);
 export const MAX_SNAPSHOT_BYTES = 8 * 1024 * 1024;
 export const SNAPSHOT_TTL_MS = 5 * 60_000;
 
@@ -19,7 +20,7 @@ export function serializeInput(model: Model<any>, context: TranscriptContext, de
 	const codex = model.api === "openai-codex-responses";
 	const normalized = resolveTranscript(context, flag("supportsMidConvoSystemMessages"));
 	const tools = resolveTranscript(declarations, flag("supportsMidConvoSystemMessages"));
-	return convertResponsesMessages(model, normalized, model.api === "azure-openai-responses" ? new Set([...TOOL_CALL_PROVIDERS, "azure-openai-responses"]) : TOOL_CALL_PROVIDERS, {
+	return convertResponsesMessages(model, normalized, model.api === "azure-openai-responses" ? AZURE_TOOL_CALL_PROVIDERS : TOOL_CALL_PROVIDERS, {
 		includeSystemPrompt: !codex,
 		grammarToolInputProperties: createGrammarToolInputProperties(getDeclaredTools(tools.messages), flag("supportsOpenAIGrammarTools")),
 		supportsMidConvoSystemMessages: flag("supportsMidConvoSystemMessages"),