@cortexkit/pi-magic-context 0.49.0 → 0.49.2

package/dist/index.js

@@ -27,9 +27,6 @@ import {
   detectConfigFile,
   MIN_PLAUSIBLE_CONTEXT_LIMIT,
   catalogOutputReserve,
-  reloadWindowOverlay,
-  getWindowOverlay,
-  resolveWindowOverlayFacts,
   deriveWindowGeometry,
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -45,101 +42,6 @@ import {
   cortexKitProjectConfigBasePath,
   migrateMagicContextConfigLocations,
   getProtectedTokensTierOverrides,
-  MAX_EXECUTE_THRESHOLD,
-  escalationBands,
-  decodeMergedReasoningParts,
-  HYGIENE_PROVIDER_UNITS_VERSION,
-  sessionDecisionCalibration,
-  transitionSessionHygieneUnits,
-  computeProtectionWindow,
-  readEpochFloorSnapshot,
-  getProtectionWindowForSession,
-  ensureSessionMetaRow,
-  persistCachedM0,
-  clearCachedM0M1,
-  isRustMarkerAdmissionFenced,
-  ReplayDocumentError,
-  readReplayEnvelope,
-  updateReplayDocument,
-  isProviderOverflowFailClosedProven,
-  describeProtectedTailDrainBudgetSkip,
-  loadProtectedTailMeta,
-  markProtectedTailPolicyV3Seeded,
-  recordProtectedTailPublicationFloor,
-  recordProtectedTailNoEligibleHead,
-  getWrapupInProgressState,
-  isWrapupInProgress,
-  acquireWrapupInProgress,
-  updateWrapupInProgress,
-  releaseWrapupInProgress,
-  resolveCompactionModeRecord,
-  getCompactionModeRecord,
-  setCompactionModeRecord,
-  getProtectedTailDrainBudgetSkip,
-  reserveProtectedTailDrainTokens,
-  clearEmergencyDrainLatch,
-  recordHistorianDrainFailure,
-  clearHistorianDrainFailure,
-  rollbackProtectedTailDrainReservation,
-  clearPersistedReasoningWatermark,
-  getEmergencyInputSample,
-  setEmergencyDropSample,
-  clearEmergencyDropSample,
-  getLastNudgeUndropped,
-  setLastNudgeUndropped,
-  getChannel1NudgeState,
-  setChannel1NudgeState,
-  markChannel1PostReduceGracePending,
-  captureChannel1PostReduceGraceBaseline,
-  getChannel2NudgeState,
-  getChannel2NudgeClaim,
-  setChannel2NudgeState,
-  casChannel2NudgeState,
-  claimChannel2NudgeState,
-  casChannel2NudgeClaim,
-  getPersistedNoteNudge,
-  setPersistedNoteNudgeTrigger,
-  setPersistedNoteNudgeTriggerMessageId,
-  getNoteNudgeAnchors,
-  getAutoSearchHintDecisions,
-  deliverNoteNudgeAtomic,
-  appendAutoSearchHintDecision,
-  pruneNoteNudgeAnchors,
-  queueAutoSearchHintDecisionRetirement,
-  flushAutoSearchHintDecisionRetirement,
-  getPersistedTodoSyntheticAnchor,
-  setPersistedTodoSyntheticAnchor,
-  clearPersistedTodoSyntheticAnchor,
-  getNoteLastReadAt,
-  getHistorianFailureState,
-  incrementHistorianFailure,
-  clearHistorianFailureState,
-  getOverflowState,
-  recordOverflowDetected,
-  clearEmergencyRecovery,
-  clearDetectedContextLimit,
-  getStrippedPlaceholderIds,
-  applyStrippedPlaceholderDelta,
-  THINKING_BINDING_RECOVERY_FROZEN_PREFIX,
-  THINKING_BINDING_STRIP_ORDER_END_MARKER,
-  thinkingBindingRecoveryFrozenId,
-  getThinkingBindingRecoveryTarget,
-  armThinkingBindingRecovery,
-  clearThinkingBindingRecoveryIf,
-  getMergedReasoningStrippedIds,
-  addMergedReasoningStrippedIds,
-  getProcessedImageStrippedIds,
-  addProcessedImageStrippedIds,
-  getPendingCompactionMarkerState,
-  getCompactionMarkerHealth,
-  clearPendingCompactionMarkerStateIf,
-  getPendingPiCompactionMarkerState,
-  setPendingPiCompactionMarkerState,
-  clearPendingPiCompactionMarkerStateIf,
-  getSessionsWithPendingPiMarker,
-  setSessionWorkMetrics,
-  getSessionWorkMetrics,
-  resolveEpochFloorForPass,
   rememberUnpublishedAutoSearchNoHint,
   getUnpublishedAutoSearchNoHint,
   forgetUnpublishedAutoSearchNoHint,
@@ -182,9 +84,23 @@ import {
   getUncoveredCompartmentEndThrough,
   isPartialCompartmentEnd,
   readProjectDocsCanonical,
-  BoundedSessionMap,
   providerResponseFailed,
   isSuccessfulProviderCompletion,
+  requestPendingMaterialization,
+  pendingMaterializationOrigin,
+  clearPendingMaterialization,
+  recordSystemRefreshOwnership,
+  recordSystemPromptForRequest,
+  recordHeldHeadForRequest,
+  bindSystemPromptResponse,
+  acknowledgeSystemPromptDelivery,
+  deferDeliveredSystemRefresh,
+  clearSystemPromptDelivery,
+  saveLkgSlotToDb,
+  loadPersistedLkgSlot,
+  drainStaleLkgSlots,
+  createDbLkgPersistence,
+  replayLkg,
   registerLkgPersistence,
   LKG_SNAPSHOT_ARRAY,
   LKG_SNAPSHOT_OBJECT,
@@ -208,7 +124,6 @@ import {
   getInMemorySlot,
   getSlot,
   dropSlot,
-  noteEntry,
   TOOL_SWEEP_SCOPED_MARKER,
   encodePiContentDecision,
   decodePiContentDecision,
@@ -331,8 +246,14 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-ehybv5nr.js";
+} from "./index-28vnkyy7.js";
 import {
+  canonicalModelIdentity,
+  piModelRefToCanonical,
+  resolveModelRefForPi,
+  modelRefLookupOrder,
+  ompModelRefToCanonical,
+  resolveModelRefForOmp,
   isValidLanguageCode,
   withContentLanguageDirective,
   parseCron,
@@ -342,15 +263,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DREAM_TASK_PROMOTION_DEFAULTS,
   LIVE_RELOAD_CONFIG_PATHS
-} from "./index-1evzceyw.js";
-import {
-  canonicalModelIdentity,
-  piModelRefToCanonical,
-  resolveModelRefForPi,
-  modelRefLookupOrder,
-  ompModelRefToCanonical,
-  resolveModelRefForOmp
-} from "./index-bgmv2kaf.js";
+} from "./index-cyrnv16r.js";
 import {
   FAIL_CLOSED_DOCTOR_COMMAND,
   formatFailClosedBlockingMessage,
@@ -358,7 +271,6 @@ import {
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
   createFailClosedController,
-  piHarnessKindFromExecutable,
   getErrorMessage,
   describeError,
   startBootDeadline,
@@ -374,9 +286,8 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-t7xfqtg6.js";
+} from "./index-p5zesr4e.js";
 import {
-  sameProjectDirectory,
   setHomeProjectPermission,
   ProjectIdentityError,
   resolveProjectIdentityStrict,
@@ -386,12 +297,106 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-041ex0cj.js";
+} from "./index-g7hndmqm.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
   isPrefixBoundThinkingModel,
   detectOverflow,
+  MAX_EXECUTE_THRESHOLD,
+  escalationBands,
+  decodeMergedReasoningParts,
+  HYGIENE_PROVIDER_UNITS_VERSION,
+  sessionDecisionCalibration,
+  transitionSessionHygieneUnits,
+  computeProtectionWindow,
+  readEpochFloorSnapshot,
+  getProtectionWindowForSession,
+  ensureSessionMetaRow,
+  persistCachedM0,
+  clearCachedM0M1,
+  ReplayDocumentError,
+  readReplayEnvelope,
+  updateReplayDocument,
+  isProviderOverflowFailClosedProven,
+  describeProtectedTailDrainBudgetSkip,
+  loadProtectedTailMeta,
+  markProtectedTailPolicyV3Seeded,
+  recordProtectedTailPublicationFloor,
+  recordProtectedTailNoEligibleHead,
+  getWrapupInProgressState,
+  isWrapupInProgress,
+  acquireWrapupInProgress,
+  updateWrapupInProgress,
+  releaseWrapupInProgress,
+  resolveCompactionModeRecord,
+  getCompactionModeRecord,
+  setCompactionModeRecord,
+  getProtectedTailDrainBudgetSkip,
+  reserveProtectedTailDrainTokens,
+  clearEmergencyDrainLatch,
+  recordHistorianDrainFailure,
+  clearHistorianDrainFailure,
+  rollbackProtectedTailDrainReservation,
+  clearPersistedReasoningWatermark,
+  getEmergencyInputSample,
+  setEmergencyDropSample,
+  clearEmergencyDropSample,
+  getLastNudgeUndropped,
+  setLastNudgeUndropped,
+  getChannel1NudgeState,
+  setChannel1NudgeState,
+  markChannel1PostReduceGracePending,
+  captureChannel1PostReduceGraceBaseline,
+  getChannel2NudgeState,
+  getChannel2NudgeClaim,
+  setChannel2NudgeState,
+  casChannel2NudgeState,
+  claimChannel2NudgeState,
+  casChannel2NudgeClaim,
+  getPersistedNoteNudge,
+  setPersistedNoteNudgeTrigger,
+  setPersistedNoteNudgeTriggerMessageId,
+  getNoteNudgeAnchors,
+  getAutoSearchHintDecisions,
+  deliverNoteNudgeAtomic,
+  appendAutoSearchHintDecision,
+  pruneNoteNudgeAnchors,
+  queueAutoSearchHintDecisionRetirement,
+  flushAutoSearchHintDecisionRetirement,
+  getPersistedTodoSyntheticAnchor,
+  setPersistedTodoSyntheticAnchor,
+  clearPersistedTodoSyntheticAnchor,
+  getNoteLastReadAt,
+  getHistorianFailureState,
+  incrementHistorianFailure,
+  clearHistorianFailureState,
+  getOverflowState,
+  recordOverflowDetected,
+  clearEmergencyRecovery,
+  clearDetectedContextLimit,
+  getStrippedPlaceholderIds,
+  applyStrippedPlaceholderDelta,
+  THINKING_BINDING_RECOVERY_FROZEN_PREFIX,
+  THINKING_BINDING_STRIP_ORDER_END_MARKER,
+  thinkingBindingRecoveryFrozenId,
+  getThinkingBindingRecoveryTarget,
+  armThinkingBindingRecovery,
+  clearThinkingBindingRecoveryIf,
+  getMergedReasoningStrippedIds,
+  addMergedReasoningStrippedIds,
+  getProcessedImageStrippedIds,
+  addProcessedImageStrippedIds,
+  getPendingCompactionMarkerState,
+  getCompactionMarkerHealth,
+  clearPendingCompactionMarkerStateIf,
+  getPendingPiCompactionMarkerState,
+  setPendingPiCompactionMarkerState,
+  clearPendingPiCompactionMarkerStateIf,
+  getSessionsWithPendingPiMarker,
+  setSessionWorkMetrics,
+  getSessionWorkMetrics,
+  resolveEpochFloorForPass,
   retreatPastHostUnservedRows,
   completedToolArcCrossesBoundary,
   estimateTrueRawMessageTokens,
@@ -416,6 +421,16 @@ import {
   modelAcceptsEmptyContent,
   isAnthropicFamilyRoute,
   variantChangeBustsProviderCache,
+  isInActiveAnthropicTurn,
+  activeAnthropicTurnStart,
+  hasAnthropicReasoning,
+  findLatestAssistantReasoningMutationExemptMessage,
+  DEFAULT_KEEP_REASONING_TOKENS,
+  resolveKeepReasoningTokens,
+  reasoningStepCost,
+  reasoningBudgetCutoff,
+  reasoningTextAndOpaque,
+  opaqueThinkingCost,
   SKELETON_REAL_INPUT_MAX_BYTES,
   toolInputStringBytes,
   setRawMessageProvider2,
@@ -435,7 +450,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-3rea6zd9.js";
+} from "./index-fqb1bddn.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -567,20 +582,17 @@ import {
   RAW_SUMMARY_TEXT_MAX_CHARS2
 } from "./index-vakawmbc.js";
 import {
-  formatSynapseLaneDescriptor
-} from "./index-21v1kfs7.js";
-import"./index-r024r8da.js";
-import {
-  buildCanonicalChunkTextFromFts,
-  buildCompartmentSummaryFallbackText,
-  canonicalizeInMemoryChunkTextForEmbedding,
-  chunkCanonicalText,
-  chunkEmbeddingWindowsAreCurrent,
-  replaceCompartmentChunkEmbeddings,
-  deleteChunkEmbedBackoffForSession,
-  chunkWindowSourceKey
-} from "./index-bejpsj10.js";
+  piHarnessKindFromExecutable
+} from "./index-0j0zqb4t.js";
 import {
+  BoundedSessionMap,
+  LkgRecoveryFenceError,
+  clearLkgFenceProcessState,
+  lkgFenceRequiresRebuild,
+  lkgRecoveryFenceUnclean,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  markLkgRecoveryDirty,
   readSessionActivity,
   observeSessionActivity,
   backfillSessionActivity,
@@ -594,10 +606,25 @@ import {
   indexSingleMessage,
   indexMessagesAfterOrdinal,
   sweepOrphanedOpenCodeMessageIndexes
-} from "./index-yzcjxnt2.js";
+} from "./index-b2anqqad.js";
+import {
+  formatSynapseLaneDescriptor
+} from "./index-21v1kfs7.js";
+import {
+  sameProjectDirectory
+} from "./index-4gfq5t09.js";
+import {
+  buildCanonicalChunkTextFromFts,
+  buildCompartmentSummaryFallbackText,
+  canonicalizeInMemoryChunkTextForEmbedding,
+  chunkCanonicalText,
+  chunkEmbeddingWindowsAreCurrent,
+  replaceCompartmentChunkEmbeddings,
+  deleteChunkEmbedBackoffForSession,
+  chunkWindowSourceKey
+} from "./index-27jh224p.js";
 import {
   recordSessionProjectIdentity,
-  drainBackgroundBatches,
   GIT_SWEEP_LEASE_RENEWAL_MS,
   acquireGitSweepLease,
   renewGitSweepLease,
@@ -620,21 +647,19 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-yarjn32j.js";
+} from "./index-r874cgmv.js";
 import {
   V2_MEMORY_CATEGORIES
 } from "./index-135e8hvg.js";
 import {
   unescapeXml,
   parseCompartmentOutput,
-  layoutLkgPrefix,
-  assembleLkgPrefix,
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-3mgf68pn.js";
+} from "./index-rd53pk0h.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -684,7 +709,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-hwqb3s7f.js";
+} from "./index-0rasmwm8.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -715,9 +740,10 @@ import {
 import {
   pushNotification2
 } from "./index-q1yc6bs0.js";
+import"./index-gc2749rx.js";
 import {
   cosineSimilarity
-} from "./index-904reqtg.js";
+} from "./index-rdtgp48t.js";
 import {
   buildHiddenAgentRegistrations,
   logTemperatureDecision,
@@ -732,6 +758,9 @@ import {
 import {
   computeNormalizedHash
 } from "./index-9x1f96r8.js";
+import {
+  normalizeProtectedToolName
+} from "./index-674f6qs2.js";
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
@@ -741,10 +770,7 @@ import {
   ensureStorageDirectorySync,
   writeStorageFileSync,
   writeStorageFileAtomicSync
-} from "./index-vf38qhee.js";
-import {
-  normalizeProtectedToolName
-} from "./index-674f6qs2.js";
+} from "./index-81nthk8j.js";
 
 // src/index.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
@@ -2573,6 +2599,24 @@ function shouldKeepSubagents() {
   return keepSubagents;
 }
 
+// ../plugin/src/standalone-plugin-marker.ts
+var markerSymbol = Symbol.for("cortexkit.standalone-plugins");
+function registerStandalonePluginMarker(version) {
+  try {
+    const globals = globalThis;
+    let registry = globals[markerSymbol];
+    if (registry === undefined) {
+      registry = new Map;
+      globals[markerSymbol] = registry;
+    }
+    registry.set("magic-context", { version });
+  } catch (error) {
+    try {
+      log2("could not register the standalone plugin marker", error);
+    } catch {}
+  }
+}
+
 // ../plugin/src/shared/host-stall-profiler.ts
 import * as path7 from "node:path";
 
@@ -3366,6 +3410,112 @@ function startHostStallProfilerSwitch() {
     log2("[magic-context] host stall profiler: could not start the enable-file switch", error);
   }
 }
+// package.json
+var package_default = {
+  name: "@cortexkit/pi-magic-context",
+  version: "0.49.2",
+  type: "module",
+  description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
+  main: "dist/index.js",
+  license: "MIT",
+  author: "ualtinok",
+  keywords: [
+    "pi",
+    "pi-coding-agent",
+    "omp",
+    "oh-my-pi",
+    "extension",
+    "context",
+    "memory",
+    "magic-context",
+    "ai",
+    "llm"
+  ],
+  repository: {
+    type: "git",
+    url: "https://github.com/cortexkit/magic-context",
+    directory: "packages/pi-plugin"
+  },
+  files: [
+    "dist",
+    "README.md"
+  ],
+  "//": "The build intentionally bundles typebox (no --external typebox) and keeps it a regular dependency. OMP's extension loader rewrites every bare `typebox` import to its own omptype-based shim, whose schemas are callable objects rather than JSON Schema; they fail structuredClone during tool registration, so an external typebox import stops Magic Context loading on OMP. src/typebox-bundling.test.ts guards this.",
+  scripts: {
+    build: "bun ../../scripts/check-bun.mjs && tsc -p ../retina-local-fs/tsconfig.build.json && bun ../../scripts/clean-dist-chunks.mjs dist index.js subagent-entry.js historian-calibration-extension.js embedding-worker-process.js raw-ordinal-warmup-worker.js transformers-web.js transformers-node-wasm.js && bun build ../plugin/src/features/magic-context/memory/transformers-web-entry.ts --outfile dist/transformers-web.js --target browser --format esm --external onnxruntime-web && bun ../plugin/scripts/build-transformers-node-wasm.ts dist && bun build src/index.ts src/subagent-entry.ts src/historian-calibration-extension.ts ../plugin/src/features/magic-context/memory/embedding-worker.ts ../plugin/src/features/magic-context/memory/embedding-worker-process.ts ../plugin/src/features/magic-context/migration-worker.ts ../plugin/src/hooks/magic-context/auto-search-worker.ts ../plugin/src/hooks/magic-context/raw-ordinal-warmup-worker.ts --outdir dist --entry-naming '[name].[ext]' --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @oh-my-pi/pi-coding-agent --external @earendil-works/pi-tui --external onnxruntime-node --external onnxruntime-web --external sharp --external bun:ffi --external node:sqlite",
+    "build:e2e-argv": `bun ../../scripts/clean-dist-chunks.mjs ../../tests/docker/.generated subagent-runner-e2e.mjs && bun build src/subagent-runner.ts --outdir ../../tests/docker/.generated --entry-naming 'subagent-runner-e2e.mjs' --splitting --target node --format esm --external node:sqlite && node --input-type=module -e 'const { __test } = await import("../../tests/docker/.generated/subagent-runner-e2e.mjs"); if (typeof __test.buildArgs !== "function" || typeof __test.resolvePiInvocation !== "function") throw new Error("argv renderer exports missing"); console.log("Node argv renderer: 2 exports loaded")'`,
+    typecheck: "tsc -p ../retina-local-fs/tsconfig.build.json && tsc --noEmit",
+    test: "bun ../../scripts/check-bun.mjs && bun install --frozen-lockfile && BUN_JSC_useOMGJIT=0 bun test --parallel=4 --timeout 30000",
+    "test:serial": "bun ../../scripts/check-bun.mjs && bun install --frozen-lockfile && BUN_JSC_useOMGJIT=0 bun test --parallel=1 --timeout 30000",
+    lint: "bun ../../scripts/check-bun.mjs && biome check src",
+    "lint:fix": "biome check --write src",
+    format: "biome format --write src",
+    "format:check": "biome format src",
+    clean: "bun ../../scripts/clean-dist-chunks.mjs dist index.js subagent-entry.js historian-calibration-extension.js embedding-worker.js embedding-worker-process.js migration-worker.js raw-ordinal-warmup-worker.js transformers-web.js transformers-node-wasm.js",
+    prepublishOnly: "bun run build"
+  },
+  "//test": "Test runs cap file-isolated workers at four (one for test:serial) and disable JSC's optimizing WebAssembly tier so per-file isolation does not pay its compilation cost on every file. These are not production settings and do not change host process engine options.",
+  dependencies: {
+    "@cortexkit/subc-client": "0.11.1",
+    "@jitl/quickjs-singlefile-cjs-release-asyncify": "0.32.0",
+    "ai-tokenizer": "^1.0.6",
+    "comment-json": "^5.0.0",
+    "onnxruntime-web": "1.26.0-dev.20260416-b7804b056c",
+    "quickjs-emscripten": "^0.32.0",
+    zod: "^4.1.8"
+  },
+  optionalDependencies: {
+    "onnxruntime-node": "1.30.0",
+    sharp: "^0.35.0"
+  },
+  devDependencies: {
+    "@biomejs/biome": "^2.5.1",
+    "@earendil-works/pi-ai": "0.83.0",
+    "@earendil-works/pi-coding-agent": "0.83.0",
+    "@earendil-works/pi-tui": "0.83.0",
+    "@huggingface/transformers": "^4.3.0",
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/bun": "^1.3.10",
+    "@types/node": "^22.20.0",
+    "pi-agent-core-087": "npm:@earendil-works/pi-agent-core@0.87.1",
+    "pi-ai-086": "npm:@earendil-works/pi-ai@0.86.0",
+    "pi-coding-agent-086": "npm:@earendil-works/pi-coding-agent@0.86.0",
+    "pi-coding-agent-087": "npm:@earendil-works/pi-coding-agent@0.87.1",
+    typebox: "^1.3.1",
+    typescript: "^5.8.0"
+  },
+  peerDependencies: {
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    typebox: "*"
+  },
+  peerDependenciesMeta: {
+    "@earendil-works/pi-coding-agent": {
+      optional: true
+    },
+    "@earendil-works/pi-tui": {
+      optional: true
+    },
+    typebox: {
+      optional: true
+    }
+  },
+  exports: {
+    ".": {
+      import: "./dist/index.js"
+    }
+  },
+  pi: {
+    extensions: [
+      "./dist/index.js"
+    ]
+  },
+  omp: {
+    extensions: [
+      "./dist/index.js"
+    ]
+  }
+};
 
 // src/clone-inheritance.ts
 import { readFile } from "node:fs/promises";
@@ -10259,7 +10409,7 @@ function getAsyncModule() {
       await beforeModuleLoad();
     const [{ default: singlefileAsyncifyVariant }, { newQuickJSAsyncWASMModuleFromVariant }] = await importPluginModule(() => Promise.all([
       import("./index-e7vx3byk.js").then((m)=>__toESM(m.default,1)),
-      import("./index-5prbx026.js")
+      import("./index-2pp04pmg.js")
     ]));
     const module = await newQuickJSAsyncWASMModuleFromVariant(singlefileAsyncifyVariant);
     return module;
@@ -16131,284 +16281,6 @@ function clearDreamerTickFailure(db) {
   db.prepare("DELETE FROM schema_migrations_meta WHERE key = ?").run(DREAMER_TICK_FAILURE_KEY);
 }
 
-// ../plugin/src/hooks/magic-context/lkg-persist.ts
-import { createHash as createHash11 } from "node:crypto";
-function parseStringArray(value) {
-  if (typeof value !== "string")
-    return null;
-  let parsed;
-  try {
-    parsed = JSON.parse(value);
-  } catch {
-    return null;
-  }
-  if (!Array.isArray(parsed))
-    return null;
-  const result = [];
-  for (const entry of parsed) {
-    if (typeof entry !== "string" || entry.length === 0)
-      return null;
-    result.push(entry);
-  }
-  return result;
-}
-function parseNullableString(value) {
-  if (value === null || value === undefined)
-    return null;
-  return typeof value === "string" ? value : undefined;
-}
-function parseNullableInteger(value) {
-  if (value === null || value === undefined)
-    return;
-  return typeof value === "number" && Number.isSafeInteger(value) ? value : undefined;
-}
-function parsePersistedLkgSlot(row) {
-  if (!row || typeof row !== "object")
-    return;
-  const record = row;
-  const jsonPrefix = record.json_prefix;
-  const lastInputMessageId = record.last_input_message_id;
-  const capturedAt = record.captured_at;
-  let inputIdsRaw = record.input_id_seq;
-  let piOutputEntryIds;
-  if (typeof inputIdsRaw === "string") {
-    try {
-      const metadata = JSON.parse(inputIdsRaw);
-      if (metadata && !Array.isArray(metadata) && metadata.version === 1 && Array.isArray(metadata.piOutputEntryIds)) {
-        if (!metadata.piOutputEntryIds.every((id) => id === null || typeof id === "string" && id.length > 0))
-          return;
-        piOutputEntryIds = metadata.piOutputEntryIds;
-        inputIdsRaw = JSON.stringify(metadata.inputIds);
-      }
-    } catch {
-      return;
-    }
-  }
-  const inputIdSeq = parseStringArray(inputIdsRaw);
-  const inputContentDigests = parseStringArray(record.input_content_digests);
-  const modelKey = parseNullableString(record.model_key);
-  const providerKey = parseNullableString(record.provider_key);
-  if (typeof jsonPrefix !== "string" || typeof lastInputMessageId !== "string" || lastInputMessageId.length === 0 || typeof capturedAt !== "number" || !Number.isFinite(capturedAt) || inputIdSeq === null || inputContentDigests === null || inputContentDigests.length !== inputIdSeq.length || modelKey === undefined || providerKey === undefined) {
-    return;
-  }
-  if (piOutputEntryIds) {
-    try {
-      const output = JSON.parse(jsonPrefix);
-      const inputs = new Set(inputIdSeq);
-      if (!Array.isArray(output) || output.length !== piOutputEntryIds.length || piOutputEntryIds.some((id) => id !== null && !inputs.has(id)))
-        return;
-    } catch {
-      return;
-    }
-  }
-  let inputContentSignatures;
-  if (record.input_content_signatures !== null && record.input_content_signatures !== undefined) {
-    const parsed = parseStringArray(record.input_content_signatures);
-    if (parsed === null || parsed.length !== inputIdSeq.length)
-      return;
-    inputContentSignatures = parsed;
-  }
-  const slot = {
-    jsonPrefix,
-    inputIdSeq,
-    inputContentDigests,
-    lastInputMessageId,
-    modelKey,
-    providerKey,
-    capturedAt
-  };
-  if (inputContentSignatures)
-    slot.inputContentSignatures = inputContentSignatures;
-  if (piOutputEntryIds)
-    slot.piOutputEntryIds = piOutputEntryIds;
-  const rowVersion = parseNullableInteger(record.row_version);
-  if (rowVersion !== undefined)
-    slot.rowVersion = rowVersion;
-  const captureSequence = parseNullableInteger(record.capture_sequence);
-  if (captureSequence !== undefined)
-    slot.captureSequence = captureSequence;
-  return slot;
-}
-var persistedFingerprints = new WeakMap;
-var PERSISTED_FINGERPRINT_MAX_SESSIONS = 1000;
-function rememberFingerprint(db, sessionId, fingerprint) {
-  let saved = persistedFingerprints.get(db);
-  if (!saved) {
-    saved = new Map;
-    persistedFingerprints.set(db, saved);
-  }
-  saved.delete(sessionId);
-  if (saved.size >= PERSISTED_FINGERPRINT_MAX_SESSIONS) {
-    const oldest = saved.keys().next().value;
-    if (oldest !== undefined)
-      saved.delete(oldest);
-  }
-  saved.set(sessionId, fingerprint);
-}
-function slotFingerprint(slot) {
-  return createHash11("sha256").update(JSON.stringify([
-    slot.jsonPrefix,
-    slot.inputIdSeq,
-    slot.inputContentDigests,
-    slot.inputContentSignatures,
-    slot.piOutputEntryIds,
-    slot.lastInputMessageId,
-    slot.modelKey,
-    slot.providerKey,
-    slot.rowVersion,
-    slot.captureSequence
-  ])).digest("hex");
-}
-function saveLkgSlotToDb(db, sessionId, slot, publishMetadata) {
-  const fingerprint = slotFingerprint(slot);
-  if (!publishMetadata && persistedFingerprints.get(db)?.get(sessionId) === fingerprint)
-    return true;
-  const layout = layoutLkgPrefix(slot.jsonPrefix);
-  try {
-    db.transaction(() => {
-      const storedHashes = new Map;
-      for (const row of db.prepare("SELECT chunk, hash FROM lkg_slot_chunks WHERE session_id = ?").all(sessionId)) {
-        storedHashes.set(row.chunk, row.hash);
-      }
-      const upsertChunk = db.prepare(`INSERT INTO lkg_slot_chunks (session_id, chunk, hash, body) VALUES (?, ?, ?, ?)
-                ON CONFLICT(session_id, chunk) DO UPDATE SET hash = excluded.hash, body = excluded.body`);
-      for (let index = 0;index < layout.chunks.length; index += 1) {
-        if (storedHashes.get(index) === layout.chunkHashes[index])
-          continue;
-        upsertChunk.run(sessionId, index, layout.chunkHashes[index], layout.chunks[index]);
-      }
-      db.prepare("DELETE FROM lkg_slot_chunks WHERE session_id = ? AND chunk >= ?").run(sessionId, layout.chunks.length);
-      db.prepare(`INSERT INTO lkg_slots (
-                    session_id, json_prefix_chars, json_prefix_chunks, json_prefix_hash,
-                    input_id_seq, input_content_digests, input_content_signatures,
-                    last_input_message_id, model_key, provider_key,
-                    captured_at, row_version, capture_sequence
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                ON CONFLICT(session_id) DO UPDATE SET
-                    json_prefix_chars = excluded.json_prefix_chars,
-                    json_prefix_chunks = excluded.json_prefix_chunks,
-                    json_prefix_hash = excluded.json_prefix_hash,
-                    input_id_seq = excluded.input_id_seq,
-                    input_content_digests = excluded.input_content_digests,
-                    input_content_signatures = excluded.input_content_signatures,
-                    last_input_message_id = excluded.last_input_message_id,
-                    model_key = excluded.model_key,
-                    provider_key = excluded.provider_key,
-                    captured_at = excluded.captured_at,
-                    row_version = excluded.row_version,
-                    capture_sequence = excluded.capture_sequence`).run(sessionId, layout.chars, layout.chunks.length, layout.hash, JSON.stringify(slot.piOutputEntryIds ? {
-        version: 1,
-        inputIds: slot.inputIdSeq,
-        piOutputEntryIds: slot.piOutputEntryIds
-      } : slot.inputIdSeq), JSON.stringify(slot.inputContentDigests), slot.inputContentSignatures ? JSON.stringify(slot.inputContentSignatures) : null, slot.lastInputMessageId, slot.modelKey, slot.providerKey, slot.capturedAt, slot.rowVersion ?? null, slot.captureSequence ?? null);
-      publishMetadata?.();
-    }).immediate();
-    rememberFingerprint(db, sessionId, fingerprint);
-    return true;
-  } catch (error) {
-    if (!publishMetadata)
-      sessionLog2(sessionId, "LKG snapshot persistence failed (in-memory slot retained):", error);
-    return false;
-  }
-}
-function clearPersistedLkgSlot(db, sessionId) {
-  try {
-    clearPersistedLkgSlotStrict(db, sessionId);
-  } catch (error) {
-    sessionLog2(sessionId, "LKG snapshot durable clear failed:", error);
-  }
-}
-function clearPersistedLkgSlotStrict(db, sessionId) {
-  db.transaction(() => {
-    db.prepare("DELETE FROM lkg_slot_chunks WHERE session_id = ?").run(sessionId);
-    db.prepare("DELETE FROM lkg_slots WHERE session_id = ?").run(sessionId);
-  }).immediate();
-  persistedFingerprints.get(db)?.delete(sessionId);
-}
-function loadPersistedLkgSlot(db, sessionId) {
-  if (isRustMarkerAdmissionFenced(db, sessionId))
-    return;
-  let row;
-  let chunkRows;
-  try {
-    ({ row, chunkRows } = db.transaction(() => {
-      const slotRow = db.prepare("SELECT * FROM lkg_slots WHERE session_id = ?").get(sessionId);
-      if (!slotRow)
-        return { row: undefined, chunkRows: [] };
-      const slices = db.prepare("SELECT chunk, hash, body FROM lkg_slot_chunks WHERE session_id = ? ORDER BY chunk").all(sessionId);
-      return { row: slotRow, chunkRows: slices };
-    }).deferred());
-  } catch (error) {
-    sessionLog2(sessionId, "LKG snapshot durable load failed:", error);
-    return;
-  }
-  if (!row)
-    return;
-  const prefix = assembleLkgPrefix({
-    chars: row.json_prefix_chars,
-    chunks: row.json_prefix_chunks,
-    hash: row.json_prefix_hash
-  }, chunkRows);
-  const slot = prefix ? parsePersistedLkgSlot({ ...row, json_prefix: prefix.jsonPrefix }) : undefined;
-  if (!prefix || !slot) {
-    if (!prefix)
-      sessionLog2(sessionId, "LKG snapshot slices failed verification; slot cleared");
-    clearPersistedLkgSlot(db, sessionId);
-    return;
-  }
-  return slot;
-}
-function pruneStaleLkgSlotsBatch(db, now) {
-  const previousTimeout = db.prepare("PRAGMA busy_timeout").get();
-  const cutoff = now - 7 * 24 * 60 * 60 * 1000;
-  const stale = `captured_at < ? AND NOT EXISTS (
-        SELECT 1 FROM session_projects sp
-        WHERE sp.session_id = lkg_slots.session_id AND sp.updated_at >= ?
-    )`;
-  const slot = db.prepare(`SELECT session_id FROM lkg_slots WHERE ${stale} LIMIT 1`).get(cutoff, cutoff);
-  const chunks = db.prepare(`SELECT rowid FROM lkg_slot_chunks c WHERE
-        session_id = ? OR NOT EXISTS (SELECT 1 FROM lkg_slots s WHERE s.session_id = c.session_id)
-        LIMIT 25`).all(slot?.session_id ?? "");
-  if (!slot && chunks.length === 0)
-    return { slots: 0, chunks: 0 };
-  try {
-    db.exec("PRAGMA busy_timeout = 0");
-    let transactionStartedAt = 0;
-    const changes = db.transaction(() => {
-      transactionStartedAt = performance.now();
-      const removed = slot ? db.prepare(`DELETE FROM lkg_slots WHERE session_id = ? AND ${stale}`).run(slot.session_id, cutoff, cutoff).changes : 0;
-      const removeChunk = db.prepare(`DELETE FROM lkg_slot_chunks WHERE rowid = ? AND NOT EXISTS (
-                SELECT 1 FROM lkg_slots s WHERE s.session_id = lkg_slot_chunks.session_id
-            )`);
-      let removedChunks = 0;
-      for (const { rowid } of chunks)
-        removedChunks += removeChunk.run(rowid).changes;
-      return { slots: removed, chunks: removedChunks };
-    }).immediate();
-    logSlowWriteTransaction("lkg_stale_gc", transactionStartedAt);
-    if (changes.slots && slot)
-      persistedFingerprints.get(db)?.delete(slot.session_id);
-    return changes;
-  } finally {
-    db.exec(`PRAGMA busy_timeout = ${Number(previousTimeout.timeout) || 0}`);
-  }
-}
-async function drainStaleLkgSlots(db, now = Date.now(), budgetMs = 2000) {
-  let removed = 0;
-  await drainBackgroundBatches(() => {
-    const batch = pruneStaleLkgSlotsBatch(db, now);
-    removed += batch.slots;
-    return batch.slots + batch.chunks > 0;
-  }, { budgetMs });
-  return removed;
-}
-function createDbLkgPersistence(db) {
-  return {
-    load: (sessionId) => loadPersistedLkgSlot(db, sessionId),
-    clear: (sessionId) => clearPersistedLkgSlot(db, sessionId)
-  };
-}
-
 // ../plugin/src/plugin/dream-timer.ts
 var DREAM_TIMER_INTERVAL_MS = 15 * 60 * 1000;
 var GIT_COMMIT_BACKLOG_DRAIN_MAX_MS = 5 * 60 * 1000;
@@ -17300,13 +17172,33 @@ function resolveModelRefForTarget(ref, targetHarness) {
   return targetHarness === "omp" ? resolveModelRefForOmp(ref) : resolveModelRefForPi(ref);
 }
 var configuredSubagentExtensions;
+var PI_NON_LOCAL_EXTENSION_PREFIXES = [
+  "npm:",
+  "git:",
+  "github:",
+  "http:",
+  "https:",
+  "ssh:",
+  "builtin:"
+];
 function configurePiSubagentExtensions(extensions) {
   configuredSubagentExtensions = extensions?.slice();
 }
 function resolveSubagentExtensionEntry(entry, targetHarness) {
   const trimmed = entry.trim();
   const isNpmSource = trimmed.startsWith("npm:");
-  return !isNpmSource && !isAbsolute(trimmed) ? resolvePath(getHostAgentSettingsDir(targetHarness), trimmed) : trimmed;
+  const isPiSource = PI_NON_LOCAL_EXTENSION_PREFIXES.some((prefix) => trimmed.startsWith(prefix));
+  if (isNpmSource || targetHarness === "pi" && isPiSource)
+    return trimmed;
+  let normalized = trimmed;
+  if (normalized === "~") {
+    normalized = homedir();
+  } else if (normalized.startsWith("~/") || process.platform === "win32" && normalized.startsWith("~\\")) {
+    normalized = join10(homedir(), normalized.slice(2));
+  } else if (/^file:\/\//.test(normalized)) {
+    normalized = fileURLToPath(normalized);
+  }
+  return isAbsolute(normalized) ? normalized : resolvePath(getHostAgentSettingsDir(targetHarness), normalized);
 }
 var PI_READ_ONLY_BUILTINS = ["read", "grep", "find", "ls"];
 var PI_AFT_READ_TOOLS = ["aft_outline", "aft_zoom", "aft_search"];
@@ -21013,6 +20905,15 @@ var canonicalReasons = new Set([
   "project_memory_epoch",
   "ttl_idle",
   "explicit_flush",
+  "user_flush",
+  "fit_retry",
+  "pending_materialization",
+  "variant_change",
+  "recomp",
+  "boundary_repair",
+  "host_history_change",
+  "thinking_hold",
+  "mutation_drift",
   "max_mutation_id",
   "first_render",
   "pressure_refold",
@@ -22549,168 +22450,6 @@ function isHistorianDrainBudgetSpent(args) {
   return true;
 }
 
-// ../plugin/src/hooks/magic-context/active-anthropic-turn.ts
-function isInActiveAnthropicTurn(messages, index, anthropic) {
-  const start = activeAnthropicTurnStart(messages, anthropic);
-  return start !== undefined && index >= start;
-}
-function activeAnthropicTurnStart(messages, anthropic) {
-  if (!anthropic)
-    return;
-  for (let user = messages.length - 1;user >= 0; user--) {
-    const message = messages[user];
-    if (!isRecord(message))
-      continue;
-    const info = isRecord(message.info) ? message.info : message;
-    if (info.role !== "user" || info.synthetic === true || message.synthetic === true)
-      continue;
-    const id = typeof info.id === "string" ? info.id : "";
-    if (id.startsWith("synth-user-"))
-      continue;
-    const parts = Array.isArray(message.parts) ? message.parts : Array.isArray(message.content) ? message.content : [];
-    if (parts.length > 0 && parts.every((part) => isRecord(part) && (part.synthetic === true || part.ignored === true || ["tool_result", "toolResult", "tool-result"].includes(String(part.type)))))
-      continue;
-    return user + 1;
-  }
-  return;
-}
-function hasAnthropicReasoning(messages) {
-  return messages.some((message) => {
-    if (!isRecord(message))
-      return false;
-    const info = isRecord(message.info) ? message.info : message;
-    if (isAnthropicFamilyRoute(typeof info.providerID === "string" ? info.providerID : typeof info.provider === "string" ? info.provider : undefined, typeof info.modelID === "string" ? info.modelID : typeof info.model === "string" ? info.model : undefined))
-      return true;
-    const parts = Array.isArray(message.parts) ? message.parts : [];
-    return parts.some((part) => isRecord(part) && isRecord(part.metadata) && isRecord(part.metadata.anthropic));
-  });
-}
-
-// ../plugin/src/hooks/magic-context/strip-content.ts
-var METADATA_PART_TYPES = new Set([
-  "step-start",
-  "step-finish",
-  "snapshot",
-  "patch",
-  "agent",
-  "retry",
-  "subtask",
-  "compaction"
-]);
-var CLEARED_REASONING_TYPES = new Set(["thinking", "reasoning"]);
-var REASONING_IGNORED_PART_TYPES = new Set([
-  "step-start",
-  "step-finish",
-  "snapshot",
-  "patch",
-  "agent",
-  "retry",
-  "subtask",
-  "compaction"
-]);
-var REASONING_PART_TYPES = new Set(["reasoning", "thinking", "redacted_thinking"]);
-function hasReasoningReplayContent(message) {
-  return message.parts.some((part) => {
-    if (!isRecord(part) || part.ignored === true)
-      return false;
-    const type = typeof part.type === "string" ? part.type : "";
-    if (REASONING_IGNORED_PART_TYPES.has(type))
-      return false;
-    return type !== "text" || typeof part.text !== "string" || part.text.trim().length > 0;
-  });
-}
-function findLatestAssistantReasoningMutationExemptMessage(messages) {
-  for (let index = messages.length - 1;index >= 0; index -= 1) {
-    const message = messages[index];
-    if (message.info.role === "assistant" && hasReasoningReplayContent(message))
-      return message;
-  }
-  return;
-}
-
-// ../plugin/src/hooks/magic-context/reasoning-budget.ts
-var DEFAULT_KEEP_REASONING_TOKENS = 1e4;
-var UNKNOWN_REASONING_STEP_TOKENS = 1000;
-function resolveKeepReasoningTokens(config, modelKey) {
-  const values = config && typeof config === "object" ? Object.assign(Object.create(null), config) : undefined;
-  return typeof config === "number" ? config : resolveModelConfigValue(values, modelKey)?.value ?? values?.default ?? DEFAULT_KEEP_REASONING_TOKENS;
-}
-function reasoningStepCost(reported, textEstimate, opaque) {
-  if (reported !== undefined && Number.isFinite(reported) && reported > 0)
-    return reported;
-  if (textEstimate > 0)
-    return Math.ceil(textEstimate);
-  return opaque ? UNKNOWN_REASONING_STEP_TOKENS : 0;
-}
-function reasoningBudgetCutoff(steps, budget) {
-  const cost = (step) => step.alreadyRemoved ? 0 : typeof step.cost === "function" ? step.cost() : step.cost;
-  let kept = 0;
-  let upperBound = Number.POSITIVE_INFINITY;
-  for (const step of steps) {
-    if (!step.exempt)
-      continue;
-    kept += cost(step);
-    if (step.tag > 0)
-      upperBound = Math.min(upperBound, step.tag - 1);
-  }
-  for (let index = steps.length - 1;index >= 0; index--) {
-    const step = steps[index];
-    if (step.exempt || step.alreadyRemoved)
-      continue;
-    const tokens = cost(step);
-    if (kept + tokens <= budget) {
-      kept += tokens;
-      if (step.tag > 0)
-        upperBound = Math.min(upperBound, step.tag - 1);
-      continue;
-    }
-    let tag = step.tag;
-    for (let older = index - 1;tag <= 0 && older >= 0; older--)
-      tag = steps[older].tag;
-    return Math.max(0, Math.min(tag, upperBound));
-  }
-  return 0;
-}
-function reasoningTextAndOpaque(parts) {
-  let text = "";
-  let inlineText = "";
-  let opaque = false;
-  let hasReasoning = false;
-  const detailText = new Set;
-  for (const part of parts) {
-    if (!isRecord(part))
-      continue;
-    if (part.ignored === true)
-      continue;
-    if (isRecord(part.metadata)) {
-      const router = part.metadata.openrouter;
-      if (isRecord(router) && Array.isArray(router.reasoning_details) && router.reasoning_details.length > 0) {
-        hasReasoning = true;
-        opaque = true;
-        for (const detail of router.reasoning_details) {
-          if (!isRecord(detail))
-            continue;
-          if (detail.type === "reasoning.text" && typeof detail.text === "string")
-            detailText.add(detail.text);
-          if (detail.type === "reasoning.summary" && typeof detail.summary === "string")
-            detailText.add(detail.summary);
-        }
-      }
-    }
-    if (["reasoning", "thinking", "redacted_thinking"].includes(String(part.type))) {
-      hasReasoning = true;
-      const visible = part.type === "redacted_thinking" || part.redacted === true ? "" : typeof part.thinking === "string" ? part.thinking : typeof part.text === "string" ? part.text : "";
-      if (visible !== "[cleared]")
-        text += visible;
-      opaque ||= part.type === "redacted_thinking" || part.redacted === true || visible === "" && (part.metadata !== undefined || part.signature !== undefined || part.thinkingSignature !== undefined);
-    } else if (part.type === "text" && typeof part.text === "string") {
-      for (const match of part.text.matchAll(/<(?:thinking|think)>([\s\S]*?)<\/(?:thinking|think)>/gi))
-        inlineText += match[1];
-    }
-  }
-  return { text: text || [...detailText].join(""), inlineText, opaque, hasReasoning };
-}
-
 // ../plugin/src/hooks/magic-context/compartment-trigger.ts
 var PROACTIVE_TRIGGER_OFFSET_PERCENTAGE = 2;
 var POST_DROP_TARGET_RATIO = 0.75;
@@ -23655,9 +23394,9 @@ function advanceToolReclaimWatermarkToCurrentMax(db, sessionId) {
 }
 
 // ../plugin/src/shared/tag-transcript.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 function textIdentityDigest(value) {
-  return createHash12("sha256").update(value).digest("hex");
+  return createHash11("sha256").update(value).digest("hex");
 }
 function buildContentDerivedTextIds(messageId, parts) {
   const sources = parts.filter((part) => part.kind === "text").map((part) => stripTagPrefix(part.getText() ?? ""));
@@ -31632,6 +31371,17 @@ class PiContextBudget {
   abandoned = false;
   completed = false;
   failureReason;
+  signal;
+  cancelled = false;
+  isCancelled(error) {
+    return this.cancelled || this.signal?.aborted === true || !this.signal && typeof error === "object" && error !== null && "name" in error && error.name === "AbortError";
+  }
+  cancel() {
+    this.cancelled = true;
+    this.abandoned = true;
+    this.completed = false;
+    this.failureReason = undefined;
+  }
   assertOwner = () => {};
   constructor(startedAt = performance.now(), now = () => performance.now()) {
     this.startedAt = startedAt;
@@ -31649,6 +31399,7 @@ class PiContextBudget {
   }
   assertOutcome = () => {
     this.assertOwner();
+    this.signal?.throwIfAborted();
     if (this.abandoned || this.elapsed() >= PI_CONTEXT_BUDGET.outcomeMs)
       throw new PiContextDeadlineError(this.diagnostic());
   };
@@ -31658,6 +31409,7 @@ class PiContextBudget {
       throw new PiContextDeadlineError(this.diagnostic());
   };
   assertDecisionPublication = () => {
+    this.signal?.throwIfAborted();
     if (!this.completed)
       this.assertOwner();
     if (this.abandoned || !this.completed && this.elapsed() >= PI_CONTEXT_BUDGET.outcomeMs)
@@ -31667,17 +31419,33 @@ class PiContextBudget {
     return `stage=${this.stage} elapsed=${Math.round(this.elapsed())}ms recovery=${this.recovery}`;
   }
   waitUntil = async (pending, assert, remaining) => {
-    assert();
+    try {
+      assert();
+    } catch (error) {
+      pending.catch(() => {});
+      throw error;
+    }
     let timer;
+    let onAbort;
     try {
       return await Promise.race([
         pending,
+        ...this.signal ? [
+          new Promise((_, reject) => {
+            onAbort = () => reject(this.signal?.reason);
+            this.signal?.addEventListener("abort", onAbort, {
+              once: true
+            });
+          })
+        ] : [],
         new Promise((_, reject) => {
           timer = setTimeout(() => reject(new PiContextDeadlineError(this.diagnostic())), remaining());
         })
       ]);
     } finally {
       clearTimeout(timer);
+      if (onAbort)
+        this.signal?.removeEventListener("abort", onAbort);
       assert();
     }
   };
@@ -31706,7 +31474,6 @@ function resolvePiWindowGeometry(args) {
     output: args.model?.maxTokens
   }, {
     providerLimit: observedWindow === undefined ? undefined : { context: observedWindow },
-    overlay: resolveWindowOverlayFacts(providerID, modelID, getWindowOverlay()),
     contextCap: isSaneLimit2(args.detectedContextLimit) ? args.detectedContextLimit : undefined,
     outputReserveOverride,
     harness: "pi"
@@ -31850,6 +31617,775 @@ function isOmpUnmanagedCaptureRequest(payload) {
   return last?.role === "user" && firstText(last.content, request.textType)?.startsWith(CAPTURE_PREFIX) === true;
 }
 
+// src/pi-dispatch-google.ts
+function piGoogleConversation(payload) {
+  if (!payload || typeof payload !== "object")
+    return;
+  const body = payload;
+  if (body.messages !== undefined || body.input !== undefined)
+    return;
+  if (Array.isArray(body.contents))
+    return body;
+  const request = body.request;
+  if (!request || typeof request !== "object")
+    return;
+  const conversation = request;
+  return Array.isArray(conversation.contents) ? conversation : undefined;
+}
+
+// src/pi-dispatch-identity.ts
+var MAX_NODES = 1e5;
+var MAX_STRING_UNITS = 32 * 1024 * 1024;
+var MAX_DEPTH = 128;
+function piConversationFields(payload) {
+  try {
+    if (!payload || typeof payload !== "object")
+      return;
+    const body = payload;
+    let conversation;
+    let anthropic = false;
+    if (Array.isArray(body.messages) && body.input === undefined) {
+      conversation = { messages: body.messages, system: body.system };
+      anthropic = typeof body.system === "string" || Array.isArray(body.system);
+    } else if ((Array.isArray(body.input) || typeof body.input === "string") && body.messages === undefined) {
+      conversation = {
+        input: body.input,
+        instructions: body.instructions,
+        previous_response_id: body.previous_response_id,
+        conversation: body.conversation,
+        prompt: body.prompt
+      };
+    } else {
+      const google = piGoogleConversation(payload);
+      if (!google)
+        return;
+      conversation = {
+        contents: google.contents,
+        systemInstruction: google.systemInstruction,
+        configSystemInstruction: google.config?.systemInstruction
+      };
+    }
+    const fields = [];
+    const seen = new WeakSet;
+    let nodes = 0;
+    let strings = 0;
+    const visit = (value, position, depth) => {
+      if (++nodes > MAX_NODES || depth > MAX_DEPTH)
+        throw new Error("conversation structure limit");
+      if (typeof value === "string") {
+        strings += value.length;
+        if (strings > MAX_STRING_UNITS)
+          throw new Error("conversation string limit");
+        fields.push(LKG_SNAPSHOT_STRING, value);
+      } else if (value === null)
+        fields.push(LKG_SNAPSHOT_NULL);
+      else if (typeof value === "number")
+        fields.push(LKG_SNAPSHOT_NUMBER, value);
+      else if (typeof value === "boolean")
+        fields.push(LKG_SNAPSHOT_BOOLEAN, value);
+      else if (!value || typeof value !== "object")
+        fields.push(LKG_SNAPSHOT_UNDEFINED);
+      else {
+        if (seen.has(value))
+          throw new Error("cyclic conversation");
+        seen.add(value);
+        if (Array.isArray(value)) {
+          if (anthropic && (position === "content" || position === "system") && value.length === 1) {
+            const block = value[0];
+            if (block && typeof block === "object" && block.type === "text" && typeof block.text === "string" && Object.keys(block).every((key) => key === "type" || key === "text" || key === "cache_control")) {
+              visit(block.text, "other", depth + 1);
+              seen.delete(value);
+              return;
+            }
+          }
+          fields.push(LKG_SNAPSHOT_ARRAY, value.length);
+          for (const item of value)
+            visit(item, position === "messages" ? "message" : anthropic && (position === "content" || position === "system") ? "block" : "other", depth + 1);
+        } else {
+          const entries = Object.entries(value).filter(([key, child]) => child !== undefined && typeof child !== "function" && typeof child !== "symbol" && !(anthropic && position === "block" && key === "cache_control"));
+          for (const [key] of entries)
+            strings += key.length;
+          if (strings > MAX_STRING_UNITS)
+            throw new Error("conversation key limit");
+          entries.sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
+          fields.push(LKG_SNAPSHOT_OBJECT, entries.length);
+          for (const [key, child] of entries) {
+            fields.push(LKG_SNAPSHOT_KEY, key);
+            visit(child, position === "root" && key === "messages" ? "messages" : position === "root" && key === "system" ? "system" : position === "message" && key === "content" ? "content" : "other", depth + 1);
+          }
+        }
+        seen.delete(value);
+      }
+    };
+    visit(conversation, "root", 0);
+    return fields;
+  } catch {
+    return;
+  }
+}
+function piManagedSignature(messages) {
+  for (const message of messages.slice(0, 8)) {
+    if (!message || typeof message !== "object")
+      continue;
+    const content = message.content;
+    const text = typeof content === "string" ? content : Array.isArray(content) ? content.find((part) => part?.type === "text" && typeof part.text === "string")?.text : undefined;
+    if (!text)
+      continue;
+    const marker = /^(<session-history>|<session-history-since>|<memory>|§\d+§)/.exec(text)?.[0];
+    return marker ?? text.slice(0, 128);
+  }
+  return;
+}
+function piHasManagedSignature(payload, signature) {
+  if (!signature || !payload || typeof payload !== "object")
+    return false;
+  const body = payload;
+  const google = piGoogleConversation(payload);
+  const nativeText = !!google || body.inferenceConfig !== undefined;
+  if (typeof body.input === "string" && body.messages === undefined)
+    return body.input.slice(0, 4096).includes(signature);
+  const messages = Array.isArray(body.messages) ? body.messages : Array.isArray(body.input) ? body.input : google?.contents;
+  if (!messages)
+    return false;
+  for (const message of messages.slice(0, 8)) {
+    if (!message || typeof message !== "object")
+      continue;
+    const content = google ? message.parts : message.content;
+    if (typeof content === "string" && content.slice(0, 4096).includes(signature))
+      return true;
+    if (!Array.isArray(content))
+      continue;
+    for (const block of content.slice(0, 32)) {
+      if (block && (["text", "input_text", "output_text"].includes(block.type) || nativeText && block.type === undefined) && typeof block.text === "string" && block.text.slice(0, 4096).includes(signature))
+        return true;
+    }
+  }
+  return false;
+}
+
+// src/pi-dispatch-chat-history.ts
+var MAX_EXACT_UNITS = 32 * 1024 * 1024;
+var IMAGE_CAPTION = "Attached image(s) from tool result:";
+function object(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function omitsAssistant(message, model, compat) {
+  if (!Array.isArray(message.content))
+    return false;
+  let thinking = false;
+  let hasTextBlock = false;
+  for (const value of message.content) {
+    const block = object(value);
+    if (!block)
+      return false;
+    if (block.type === "text") {
+      hasTextBlock = true;
+      if (typeof block.text !== "string" || block.text.trim())
+        return false;
+    } else if (block.type === "thinking") {
+      if (typeof block.thinking !== "string")
+        return false;
+      thinking ||= block.thinking.trim().length > 0;
+    } else
+      return false;
+  }
+  if (!hasTextBlock && ["length", "error", "aborted"].includes(String(message.stopReason)))
+    return true;
+  if (compat.requiresReasoningContentForAllAssistantTurns === true)
+    return false;
+  if (!thinking)
+    return true;
+  return message.api === model.api && message.provider === model.provider && message.model === model.id && compat.requiresThinkingAsText !== true && compat.requiresReasoningContentForToolCalls !== true && compat.replayReasoningContent !== true && compat.mistralReasoningContentParts !== true && compat.thinkingFormat !== "zai";
+}
+function piChatHistoryPlan(messages, model) {
+  if (model?.api !== "openai-completions")
+    return;
+  const compat = object(model.compat) ?? {};
+  const calls = new Set;
+  for (const value of messages) {
+    const message = object(value);
+    if (message?.role !== "assistant" || !Array.isArray(message.content))
+      continue;
+    for (const value of message.content) {
+      const block = object(value);
+      if (block?.type === "toolCall" && typeof block.id === "string")
+        calls.add(block.id);
+    }
+  }
+  const transformed = [];
+  let pending = new Set;
+  let exactUnits = 0;
+  for (let index = 0;index < messages.length; index++) {
+    const message = object(messages[index]);
+    if (!message)
+      return;
+    if ((message.role === "bashExecution" || message.role === "pythonExecution") && message.excludeFromContext === true)
+      continue;
+    if (message.role === "assistant" || message.role === "user" || message.role === "developer")
+      pending = new Set;
+    if (message.role === "assistant") {
+      if (omitsAssistant(message, model, compat))
+        continue;
+      if (Array.isArray(message.content))
+        for (const value of message.content) {
+          const block = object(value);
+          if (block?.type === "toolCall" && typeof block.id === "string")
+            pending.add(block.id);
+        }
+    }
+    if (message.role === "toolResult" && typeof message.toolCallId === "string") {
+      pending.delete(message.toolCallId);
+      if (!calls.has(message.toolCallId)) {
+        if (pending.size || typeof message.toolName !== "string" || !Array.isArray(message.content))
+          return;
+        const parts = [];
+        for (const value of message.content) {
+          const part = object(value);
+          if (part?.type === "text" && typeof part.text === "string" && part.text.trim())
+            parts.push(part.text);
+        }
+        if (!parts.length)
+          return;
+        const error = message.isError ? ' is-error="true"' : "";
+        const template = `<stale-tool-result tool="${message.toolName}" id="${message.toolCallId}"${error}>
+${parts.join(`
+`)}
+</stale-tool-result>`;
+        if (exactUnits + template.length > MAX_EXACT_UNITS)
+          return;
+        const text = new TextDecoder().decode(new TextEncoder().encode(template));
+        exactUnits += text.length;
+        if (exactUnits > MAX_EXACT_UNITS)
+          return;
+        transformed.push({ kind: "note", text });
+        continue;
+      }
+    }
+    transformed.push({ kind: "source", index });
+  }
+  const steps = [];
+  let images = [];
+  const flushImages = () => {
+    if (images.length) {
+      steps.push({ kind: "images", urls: images });
+      images = [];
+    }
+  };
+  const vision = model.input?.includes("image") === true && compat.stripImageInput !== true;
+  for (const step of transformed) {
+    const message = step.kind === "source" ? object(messages[step.index]) : undefined;
+    if (message?.role !== "toolResult")
+      flushImages();
+    steps.push(step);
+    if (message?.role !== "toolResult" || !vision || !Array.isArray(message.content))
+      continue;
+    for (const value of message.content) {
+      const block = object(value);
+      if (block?.type !== "image")
+        continue;
+      if (compat.requiresAssistantAfterToolResult === true)
+        return;
+      let url;
+      if (typeof block.url === "string")
+        url = block.url;
+      else if (typeof block.data === "string" && typeof block.mimeType === "string")
+        url = `data:${block.mimeType};base64,${block.data}`;
+      else
+        return;
+      exactUnits += url.length;
+      if (exactUnits > MAX_EXACT_UNITS)
+        return;
+      images.push(url);
+    }
+  }
+  flushImages();
+  return steps;
+}
+function piMatchesChatImages(content, urls) {
+  if (!Array.isArray(content) || content.length !== urls.length + 1)
+    return false;
+  const caption = object(content[0]);
+  if (caption?.type !== "text" || caption.text !== IMAGE_CAPTION || Object.keys(caption).length !== 2)
+    return false;
+  for (let i = 0;i < urls.length; i++) {
+    const block = object(content[i + 1]);
+    const image = object(block?.image_url);
+    if (block?.type !== "image_url" || Object.keys(block).length !== 2 || !image || Object.keys(image).length !== 1 || image.url !== urls[i])
+      return false;
+  }
+  return true;
+}
+
+// src/pi-dispatch-responses-history.ts
+var MAX_TEXT_UNITS = 32 * 1024 * 1024;
+function object2(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function wellFormed(text) {
+  return text.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "�");
+}
+function textIdentity(text, phase) {
+  return JSON.stringify([
+    text,
+    phase === "commentary" || phase === "final_answer" ? phase : null
+  ]);
+}
+function signaturePhase(block) {
+  try {
+    if (typeof block.textSignature === "string") {
+      const signature = object2(JSON.parse(block.textSignature));
+      if (signature?.v === 1 && typeof signature.id === "string")
+        return signature.phase;
+    }
+  } catch {}
+  return;
+}
+function piResponsesAssistantTexts(value, model) {
+  const message = object2(value);
+  if (!message || !Array.isArray(message.content))
+    return;
+  const texts = [];
+  const blocks = [];
+  let units = 0;
+  for (const value of message.content) {
+    const block = object2(value);
+    if (block?.type === "toolCall")
+      continue;
+    if (block?.type !== "text" || typeof block.text !== "string")
+      return;
+    units += block.text.length;
+    if (units > MAX_TEXT_UNITS)
+      return;
+    const sameModel = message.api === model?.api && message.model === model?.id && message.provider === model?.provider;
+    texts.push(textIdentity(wellFormed(block.text), sameModel ? signaturePhase(block) : undefined));
+    blocks.push(block);
+  }
+  const payload = object2(message.providerPayload);
+  if (message.api !== model?.api || typeof model?.id !== "string" || typeof model?.provider !== "string" || message.model !== model?.id || (payload?.provider ?? message.provider) !== model?.provider || payload?.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items) || message.content.length !== blocks.length)
+    return texts;
+  const replay = [];
+  for (const value of payload.items) {
+    const item = object2(value);
+    if (item?.type !== "message" || item.role !== "assistant" || !Array.isArray(item.content))
+      return texts;
+    for (const value of item.content) {
+      const part = object2(value);
+      const block = blocks[replay.length];
+      if (!block || part?.type !== "output_text" || typeof part.text !== "string")
+        return texts;
+      let signature;
+      try {
+        if (typeof block.textSignature === "string")
+          signature = object2(JSON.parse(block.textSignature));
+      } catch {
+        return texts;
+      }
+      if (signature?.v !== 1 || typeof signature.id !== "string" || item.id !== signature.id || item.phase !== signature.phase || part.text !== block.text.replace(/^§\d+§ /u, ""))
+        return texts;
+      replay.push(textIdentity(wellFormed(part.text), item.phase));
+    }
+  }
+  return replay.length === texts.length ? replay : texts;
+}
+function piResponsesWireTexts(value, phase) {
+  if (phase !== undefined && phase !== null && phase !== "commentary" && phase !== "final_answer")
+    return;
+  if (typeof value === "string")
+    return [textIdentity(value, phase)];
+  if (!Array.isArray(value))
+    return;
+  const texts = [];
+  let units = 0;
+  for (const partValue of value) {
+    const part = object2(partValue);
+    if (part?.type !== "output_text" || typeof part.text !== "string")
+      return;
+    units += part.text.length;
+    if (units > MAX_TEXT_UNITS)
+      return;
+    texts.push(textIdentity(part.text, phase));
+  }
+  return texts;
+}
+
+// src/pi-dispatch-structure.ts
+var MAX_MESSAGES = 1e5;
+function object3(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function messageStructure(value) {
+  const message = object3(value);
+  if (!message)
+    return;
+  const role = [
+    "custom",
+    "hookMessage",
+    "developer",
+    "branchSummary",
+    "compactionSummary",
+    "bashExecution",
+    "pythonExecution"
+  ].includes(String(message.role)) ? "user" : message.role;
+  if (role !== "user" && role !== "assistant" && role !== "toolResult")
+    return;
+  const row = { role, calls: [], results: [] };
+  if (typeof message.timestamp === "number")
+    row.timestamp = message.timestamp;
+  if (role === "toolResult") {
+    if (typeof message.toolCallId !== "string")
+      return;
+    row.results.push(message.toolCallId);
+  }
+  if (role === "assistant" && Array.isArray(message.content)) {
+    for (const value of message.content) {
+      const block = object3(value);
+      if (block?.type !== "toolCall" && block?.type !== "tool_use")
+        continue;
+      if (typeof block.id !== "string")
+        return;
+      row.calls.push(block.id);
+      row.callNames ??= [];
+      row.callNames.push(typeof block.name === "string" ? block.name : "");
+    }
+  }
+  return row;
+}
+function piPreparedStructure(messages, model) {
+  if (!messages.length || messages.length > MAX_MESSAGES)
+    return;
+  const rows = [];
+  const toolNames = new Map;
+  const byIndex = new Map;
+  for (let index = 0;index < messages.length; index++) {
+    const message = messages[index];
+    const source = object3(message);
+    if (rows.length === 0 && (source?.role === "system" || source?.role === "developer"))
+      continue;
+    if ((source?.role === "bashExecution" || source?.role === "pythonExecution") && source.excludeFromContext === true)
+      continue;
+    const row = messageStructure(message);
+    if (!row)
+      return;
+    row.calls.forEach((id, index) => {
+      toolNames.set(id, row.callNames?.[index] ?? "");
+    });
+    if (row.results.length)
+      row.resultNames = row.results.map((id) => toolNames.get(id) ?? "");
+    rows.push(row);
+    byIndex.set(index, row);
+  }
+  const responsesApi = [
+    "openai-responses",
+    "azure-openai-responses",
+    "openai-codex-responses"
+  ].includes(model?.api ?? "");
+  let responsesMessages = responsesApi ? [] : undefined;
+  if (responsesMessages) {
+    for (const [index, row] of byIndex) {
+      if (row.role !== "assistant") {
+        responsesMessages.push(row);
+        continue;
+      }
+      const texts = piResponsesAssistantTexts(messages[index], model);
+      if (!texts) {
+        responsesMessages = undefined;
+        break;
+      }
+      if (!texts.length && !row.calls.length)
+        continue;
+      const previous = responsesMessages.at(-1);
+      if (previous?.role === "assistant") {
+        previous.calls.push(...row.calls);
+        previous.responseTexts?.push(...texts);
+      } else
+        responsesMessages.push({
+          ...row,
+          calls: [...row.calls],
+          responseTexts: [...texts]
+        });
+    }
+  }
+  const plan = piChatHistoryPlan(messages, model);
+  const chatMessages = plan?.flatMap((step) => {
+    if (step.kind === "source") {
+      const row = byIndex.get(step.index);
+      return row ? [row] : [];
+    }
+    return [
+      {
+        role: "user",
+        calls: [],
+        results: [],
+        ...step.kind === "note" ? { exactText: step.text } : { exactImages: step.urls }
+      }
+    ];
+  });
+  return {
+    messages: rows,
+    ...chatMessages ? { chatMessages } : {},
+    ...responsesMessages ? { responsesMessages } : {},
+    ...model?.api ? { api: model.api } : {}
+  };
+}
+function payloadStructure(payload, ollama = false, responsesItems = false) {
+  const body = object3(payload);
+  if (!body)
+    return;
+  const google = piGoogleConversation(payload);
+  if (google)
+    return googleStructure(google.contents);
+  const bedrock = body.inferenceConfig !== undefined;
+  if (body.messages === undefined && typeof body.input === "string")
+    return [{ role: "user", calls: [], results: [] }];
+  const responses = body.messages === undefined && Array.isArray(body.input);
+  const messages = responses ? body.input : body.messages;
+  if (!Array.isArray(messages) || messages.length > MAX_MESSAGES)
+    return;
+  const rows = [];
+  for (const value of messages) {
+    const message = object3(value);
+    if (!message)
+      return;
+    if (rows.length === 0 && (message.role === "system" || message.role === "developer"))
+      continue;
+    if (responses && message.type === "reasoning")
+      continue;
+    if (responses && ["function_call", "custom_tool_call", "computer_call"].includes(String(message.type))) {
+      if (typeof message.call_id !== "string")
+        return;
+      let assistant = rows.at(-1);
+      if (assistant?.role !== "assistant") {
+        assistant = {
+          role: "assistant",
+          calls: [],
+          results: [],
+          ...responsesItems ? { responseTexts: [] } : {}
+        };
+        rows.push(assistant);
+      }
+      assistant.calls.push(message.call_id);
+      continue;
+    }
+    if (responses && [
+      "function_call_output",
+      "custom_tool_call_output",
+      "computer_call_output"
+    ].includes(String(message.type))) {
+      if (typeof message.call_id !== "string")
+        return;
+      rows.push({ role: "toolResult", calls: [], results: [message.call_id] });
+      continue;
+    }
+    if (message.role === "tool") {
+      if (message.tool_call_id === undefined && ollama && typeof message.tool_name === "string") {
+        rows.push({
+          role: "toolResult",
+          calls: [],
+          results: [""],
+          resultNames: [message.tool_name],
+          idlessResults: [true]
+        });
+        continue;
+      }
+      if (typeof message.tool_call_id !== "string")
+        return;
+      rows.push({
+        role: "toolResult",
+        calls: [],
+        results: [message.tool_call_id]
+      });
+      continue;
+    }
+    if (message.role === "user" && Array.isArray(message.content)) {
+      const results = message.content.filter((block) => object3(block)?.type === "tool_result" || bedrock && object3(block)?.toolResult);
+      if (results.length) {
+        for (const block of results) {
+          const id = bedrock ? block.toolResult?.toolUseId : block.tool_use_id;
+          if (typeof id !== "string")
+            return;
+          rows.push({
+            role: "toolResult",
+            calls: [],
+            results: [id]
+          });
+        }
+        continue;
+      }
+    }
+    const row = messageStructure(message);
+    if (!row)
+      return;
+    row.wireContent = message.content;
+    if (responses && responsesItems && row.role === "assistant") {
+      const texts = piResponsesWireTexts(message.content, message.phase);
+      if (!texts)
+        return;
+      row.responseTexts = [...texts];
+    }
+    row.wireRole = message.role;
+    if (bedrock && row.role === "assistant" && Array.isArray(message.content)) {
+      for (const block of message.content) {
+        if (!block?.toolUse)
+          continue;
+        if (typeof block.toolUse.toolUseId !== "string")
+          return;
+        row.calls.push(block.toolUse.toolUseId);
+      }
+    }
+    if (Array.isArray(message.tool_calls)) {
+      for (const call of message.tool_calls) {
+        const source = object3(call);
+        if (!source)
+          return;
+        if (source.id === undefined && ollama) {
+          const fn = object3(source.function);
+          if (typeof fn?.name !== "string")
+            return;
+          row.calls.push("");
+          row.callNames ??= [];
+          row.callNames.push(fn.name);
+          row.idlessCalls ??= [];
+          row.idlessCalls.push(true);
+        } else {
+          if (typeof source.id !== "string")
+            return;
+          row.calls.push(source.id);
+          if (ollama) {
+            row.callNames ??= [];
+            row.callNames.push("");
+            row.idlessCalls ??= [];
+            row.idlessCalls.push(false);
+          }
+        }
+      }
+    }
+    if (responses && row.role === "assistant" && rows.at(-1)?.role === "assistant") {
+      const previous = rows[rows.length - 1];
+      previous.calls.push(...row.calls);
+      if (responsesItems)
+        previous.responseTexts?.push(...row.responseTexts ?? []);
+    } else
+      rows.push(row);
+  }
+  return rows;
+}
+function googleStructure(contents) {
+  if (contents.length > MAX_MESSAGES)
+    return;
+  const rows = [];
+  for (const value of contents) {
+    const message = object3(value);
+    if (!message || !Array.isArray(message.parts))
+      return;
+    if (message.role !== "user" && message.role !== "model")
+      return;
+    const row = {
+      role: message.role === "model" ? "assistant" : "user",
+      calls: [],
+      results: []
+    };
+    const results = [];
+    for (const value of message.parts) {
+      const part = object3(value);
+      if (!part)
+        return;
+      if (part.functionCall) {
+        const call = object3(part.functionCall);
+        if (row.role !== "assistant" || typeof call?.name !== "string" || call.id !== undefined && typeof call.id !== "string")
+          return;
+        row.calls.push(call.id ?? "");
+        row.callNames ??= [];
+        row.callNames.push(call.name);
+      }
+      if (part.functionResponse) {
+        const result = object3(part.functionResponse);
+        if (row.role !== "user" || typeof result?.name !== "string" || result.id !== undefined && typeof result.id !== "string")
+          return;
+        results.push({
+          role: "toolResult",
+          calls: [],
+          results: [result.id ?? ""],
+          resultNames: [result.name]
+        });
+      }
+    }
+    if (results.length)
+      rows.push(...results);
+    else
+      rows.push(row);
+  }
+  return rows;
+}
+function wireId(id, anthropic, responses) {
+  if (anthropic)
+    return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
+  if (responses) {
+    const callId = id.split(/[\n|]/, 1)[0];
+    return /^[a-zA-Z0-9_-]{1,64}$/.test(callId) ? callId : undefined;
+  }
+  return id;
+}
+function safeRole(row, readable) {
+  if (!readable)
+    return "unreadable";
+  if (!row)
+    return "missing";
+  return ["user", "assistant", "toolResult"].includes(row.role) ? row.role : "unknown";
+}
+function safeCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : "unreadable";
+}
+function structureDetail(index, expected, actual, comparison) {
+  const expectedRow = expected?.[index];
+  const actualRow = actual?.[index];
+  return `row=${index} expectedRows=${safeCount(expected?.length)} actualRows=${safeCount(actual?.length)} expectedRole=${safeRole(expectedRow, !!expected)} actualRole=${safeRole(actualRow, !!actual)} expectedCalls=${safeCount(expected ? expectedRow?.calls.length ?? 0 : undefined)} actualCalls=${safeCount(actual ? actualRow?.calls.length ?? 0 : undefined)} expectedResults=${safeCount(expected ? expectedRow?.results.length ?? 0 : undefined)} actualResults=${safeCount(actual ? actualRow?.results.length ?? 0 : undefined)} comparison=${comparison}`;
+}
+function piPreparedStructureMismatch(payload, prepared) {
+  try {
+    const body = object3(payload);
+    const ollama = prepared?.api === "ollama-chat" && !!body && Array.isArray(body.messages) && body.input === undefined && body.system === undefined && body.inferenceConfig === undefined;
+    const responses = body?.messages === undefined && Array.isArray(body?.input);
+    const rows = payloadStructure(payload, ollama, responses && !!prepared?.responsesMessages);
+    const chat = !!body && Array.isArray(body.messages) && body.system === undefined && body.input === undefined && body.inferenceConfig === undefined;
+    const expectedRows = responses && prepared?.responsesMessages ? prepared.responsesMessages : chat && prepared?.chatMessages ? prepared.chatMessages : prepared?.messages;
+    if (!rows || !expectedRows)
+      return structureDetail(0, expectedRows, rows, "count");
+    if (!body)
+      return structureDetail(0, expectedRows, rows, "count");
+    const google = !!piGoogleConversation(payload);
+    const anthropic = google || body.inferenceConfig !== undefined || typeof body.system === "string" || Array.isArray(body.system);
+    for (let i = 0;i < Math.min(rows.length, expectedRows.length); i++) {
+      const expected = expectedRows[i];
+      const actual = rows[i];
+      if (actual.role !== expected.role)
+        return structureDetail(i, expectedRows, rows, "role");
+      if (expected.responseTexts !== undefined && (expected.responseTexts.length !== actual.responseTexts?.length || expected.responseTexts.some((text, index) => text !== actual.responseTexts?.[index])))
+        return structureDetail(i, expectedRows, rows, "content");
+      if (expected.exactText !== undefined || expected.exactImages !== undefined) {
+        if (actual.wireRole !== "user")
+          return structureDetail(i, expectedRows, rows, "role");
+        if (expected.exactText !== undefined && actual.wireContent !== expected.exactText || expected.exactImages !== undefined && !piMatchesChatImages(actual.wireContent, expected.exactImages))
+          return structureDetail(i, expectedRows, rows, "content");
+      }
+      if (actual.calls.length !== expected.calls.length || actual.results.length !== expected.results.length)
+        return structureDetail(i, expectedRows, rows, "count");
+      if (actual.timestamp !== undefined && actual.timestamp !== expected.timestamp)
+        return structureDetail(i, expectedRows, rows, "timestamp");
+      for (let j = 0;j < actual.calls.length; j++)
+        if (google && actual.calls[j] === "" || ollama && actual.idlessCalls?.[j] === true ? !expected.callNames?.[j] || actual.callNames?.[j] !== expected.callNames[j] : actual.calls[j] !== wireId(expected.calls[j], anthropic, responses))
+          return structureDetail(i, expectedRows, rows, google && actual.calls[j] === "" || ollama && actual.idlessCalls?.[j] === true ? "name" : "call id");
+      for (let j = 0;j < actual.results.length; j++)
+        if (google && actual.results[j] === "" || ollama && actual.idlessResults?.[j] === true ? !expected.resultNames?.[j] || actual.resultNames?.[j] !== expected.resultNames[j] : actual.results[j] !== wireId(expected.results[j], anthropic, responses))
+          return structureDetail(i, expectedRows, rows, google && actual.results[j] === "" || ollama && actual.idlessResults?.[j] === true ? "name" : "result id");
+    }
+    if (rows.length !== expectedRows.length)
+      return structureDetail(Math.min(rows.length, expectedRows.length), expectedRows, rows, "count");
+    return;
+  } catch {
+    return structureDetail(0, undefined, undefined, "count");
+  }
+}
+
 // src/pi-context-refusal.ts
 var ENTRY_TYPE = "magic-context-turn-refused";
 var RETRY_MESSAGE = "Magic Context could not safely prepare this turn; send your message again.";
@@ -31867,6 +32403,26 @@ function clearPiContextReceipt(sessionId) {
   for (const receipts of receiptMaps)
     receipts.delete(sessionId);
 }
+function createPiContextOwnershipGuards(operations, key, active, budget, owner) {
+  const sideTurn = budget.sideTurn;
+  const signal = budget.signal;
+  const isOwned = () => sideTurn ? operations.get(key) === owner : operations.get(key) === active && active.pass === budget;
+  const isCurrent = () => isOwned() && (sideTurn || !active.ended);
+  const assertOwner = () => {
+    if (!isCurrent())
+      throw new PiContextSupersededError("Pi context pass superseded: no longer valid for this operation", active.ended ? "agent_end" : operations.get(key) !== (sideTurn ? owner : active) ? "operation replacement or cache eviction" : "newer context pass");
+    signal?.throwIfAborted();
+  };
+  return { isOwned, isCurrent, assertOwner };
+}
+function releasePiOperationPayloads(operation) {
+  operation.inputKeys = undefined;
+  operation.inputMessages = undefined;
+  operation.inputBranch = undefined;
+  operation.dispatchFields = undefined;
+  operation.managedSignature = undefined;
+  operation.preparedStructure = undefined;
+}
 function operationKey(ctx) {
   return ctx.sessionManager?.getSessionId?.() ?? ctx.sessionManager ?? "no-session";
 }
@@ -31894,6 +32450,69 @@ function endBelongsToEarlierRun(operation, event) {
     return false;
   return operation.inputKeys.some((key) => !ended.has(key));
 }
+function messageSnapshots(messages) {
+  const snapshots = [];
+  for (const message of messages) {
+    const id = messageKey(message);
+    const fields = lkgContentFields(message);
+    if (!id || !fields)
+      return;
+    snapshots.push({ id, fields });
+  }
+  return snapshots.length ? snapshots : undefined;
+}
+function inputBranch(ctx, inputs) {
+  try {
+    const branch = ctx.sessionManager.getBranch();
+    const entries = branch.filter((entry) => entry.type === "message" || entry.type === "custom_message");
+    const anchorId = entries.at(-1)?.id;
+    const native = messageSnapshots(entries.map((entry) => {
+      if (entry.type === "message")
+        return entry.message;
+      const attribution = entry.attribution;
+      const timestamp = new Date(entry.timestamp).getTime();
+      if (!Number.isFinite(timestamp) || !entry.customType || typeof entry.content !== "string" && !Array.isArray(entry.content) || attribution !== undefined && attribution !== "agent" && attribution !== "user")
+        return;
+      return {
+        role: "custom",
+        customType: entry.customType,
+        content: entry.content,
+        display: entry.display,
+        details: entry.details,
+        attribution,
+        timestamp
+      };
+    }));
+    inputs ??= native;
+    if (!anchorId || !native || !inputs || native.length > inputs.length || exactReusablePrefix(native, inputs) !== native.length)
+      return;
+    return {
+      anchorId,
+      anchorIndex: native.length - 1,
+      entryIds: entries.map((entry) => entry.id),
+      messages: inputs
+    };
+  } catch {
+    return;
+  }
+}
+function dispatchedEndBelongsToEarlierRun(operation, event, ctx) {
+  if (!operation.dispatched || !operation.started || !operation.ready || !operation.pass?.completed || operation.refused || operation.pass.abandoned || !operation.inputBranch)
+    return false;
+  try {
+    if (ctx.isIdle() !== false)
+      return false;
+    const current = inputBranch(ctx);
+    const prepared = operation.inputBranch;
+    if (!current || current.entryIds[prepared.anchorIndex] !== prepared.anchorId || current.messages.length !== prepared.messages.length || exactReusablePrefix(current.messages, prepared.messages) !== prepared.messages.length)
+      return false;
+    const messages = event?.messages;
+    const ended = Array.isArray(messages) ? messageSnapshots(messages) : undefined;
+    return !!(ended && ended.length <= prepared.anchorIndex && ended.length < prepared.messages.length && exactReusablePrefix(prepared.messages, ended) === ended.length);
+  } catch {
+    return false;
+  }
+}
 function inputMessageKeys(event) {
   try {
     const messages = event.messages;
@@ -31915,6 +32534,7 @@ function registerPiGuardedContext(pi, handler, options = {}) {
   const sideSessions = new Map;
   receiptMaps.add(operations);
   const newOperation = () => ({
+    retainedAfterEnd: false,
     dispatched: false,
     started: false,
     ready: false,
@@ -31943,6 +32563,7 @@ function registerPiGuardedContext(pi, handler, options = {}) {
     budget.recovery = budget.recovery === "not attempted" ? "no managed result; refused" : budget.recovery;
     const identityConflict = findPiTagIdentityConflict2(reason);
     const message = identityConflict ? `${identityConflict.message}. ${budget.diagnostic()}` : `${RETRY_MESSAGE} ${budget.diagnostic()} (${reason instanceof Error ? reason.message : String(reason)})`;
+    log2("[magic-context][pi] CONTEXT REFUSED", message);
     try {
       ctx.ui?.notify(message, "error");
     } catch (error) {
@@ -31980,7 +32601,9 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         log2(`[magic-context][pi] OMP context counts session=${String(key)} side_contexts=${counts.sides} context_passes=${counts.contexts} dispatch_fence=${counts.sides ? "latched off" : "on"}`);
       const operation = operations.get(key);
       if (operation) {
-        if (endBelongsToEarlierRun(operation, event)) {
+        if (endBelongsToEarlierRun(operation, event) || lifecycleSeen.starts > lifecycleSeen.ends && dispatchedEndBelongsToEarlierRun(operation, event, ctx)) {
+          if (operation.dispatched)
+            operation.retainedAfterEnd = true;
           if (lifecycleSeen.starts <= lifecycleSeen.ends)
             operation.started = false;
           log2(`[magic-context][pi] agent_end attributed to an earlier run; keeping the latest context pass session=${String(key)} ${operation.pass?.diagnostic() ?? ""}`);
@@ -31988,9 +32611,18 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         }
         operation.ended = true;
         operation.ready = false;
+        releasePiOperationPayloads(operation);
       }
     });
     pi.on("before_provider_request", (event, ctx) => {
+      const cancelledOperation = operations.get(operationKey(ctx));
+      const signal = ctx.signal;
+      if (signal ? signal.aborted : cancelledOperation?.pass?.isCancelled()) {
+        cancelledOperation?.pass?.cancel();
+        if (cancelledOperation)
+          cancelledOperation.ready = false;
+        return;
+      }
       if (options.compactionOff?.(ctx))
         return;
       const payload = event.payload;
@@ -32018,6 +32650,10 @@ function registerPiGuardedContext(pi, handler, options = {}) {
       const isCurrent = () => operations.get(key) === active;
       const capture = isOmpUnmanagedCaptureRequest(payload);
       const budget = (capture ? undefined : active.pass) ?? new PiContextBudget;
+      if (active.refused && active.pass === budget) {
+        ctx.abort();
+        return;
+      }
       let refusalOrigin;
       try {
         if (capture)
@@ -32032,8 +32668,33 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         }
         if (!budget.completed || !active.ready || active.refused || budget.abandoned)
           throw new Error("context pass ran without a managed context receipt");
+        if (!piHasManagedSignature(payload, active.managedSignature))
+          throw new Error("provider request does not match this pass's managed dispatch (missing current receipt signature)");
+        const fields = piConversationFields(payload);
+        if (!fields)
+          throw new Error("provider conversation identity could not be established");
+        const structureMismatch = piPreparedStructureMismatch(payload, active.preparedStructure);
+        if (structureMismatch)
+          throw new Error(`provider request does not match this pass's managed dispatch (prepared turn structure); ${structureMismatch}`);
+        if (active.dispatched) {
+          if (!active.dispatchFields || exactReusablePrefix([{ id: "conversation", fields }], [{ id: "conversation", fields: active.dispatchFields }]) !== 1)
+            throw new Error("provider request does not match this pass's managed dispatch");
+        }
+        if (!active.dispatched && active.inputMessages && (!active.inputBranch || active.inputBranch.anchorIndex < active.inputMessages.length - 1)) {
+          const previous = active.inputBranch;
+          const persisted = inputBranch(ctx, active.inputMessages);
+          if (!previous || persisted && persisted.anchorIndex > previous.anchorIndex && persisted.entryIds[previous.anchorIndex] === previous.anchorId)
+            active.inputBranch = persisted;
+        }
+        if (!active.dispatched)
+          active.dispatchFields = fields;
         active.dispatched = true;
       } catch (error) {
+        if (signal ? signal.aborted : budget.isCancelled(error)) {
+          budget.cancel();
+          active.ready = false;
+          return;
+        }
         active.refused = true;
         budget.stage = refusalOrigin ? `provider dispatch (origin=${refusalOrigin}; context stage=${budget.stage})` : "provider dispatch";
         refuse(ctx, budget, error, isCurrent);
@@ -32045,6 +32706,7 @@ function registerPiGuardedContext(pi, handler, options = {}) {
     if (fenceEnabled && isOmpDumpContext())
       return { messages: event.messages };
     const budget = new PiContextBudget;
+    budget.signal = event.signal ?? ctx.signal;
     budget.sideTurn = fenceEnabled && isOmpSideContext(event);
     const key = operationKey(ctx);
     if (fenceEnabled) {
@@ -32057,7 +32719,7 @@ function registerPiGuardedContext(pi, handler, options = {}) {
       if (budget.sideTurn && ++counts.sides === 1)
         log2(`[magic-context][pi] OMP dispatch fence disabled for session ${String(key)}: verified ephemeral context; session-wide abort cannot distinguish provider operations (side_contexts=${counts.sides} context_passes=${counts.contexts})`);
     }
-    const owner = operations.get(key);
+    const owner = budget.sideTurn ? operations.get(key) : undefined;
     let operation = operations.get(key);
     if (budget.sideTurn || !operation || operation.ended || !fenceEnabled) {
       operation = newOperation();
@@ -32066,26 +32728,38 @@ function registerPiGuardedContext(pi, handler, options = {}) {
     }
     const active = operation;
     active.pass = budget;
-    active.inputKeys = undefined;
+    releasePiOperationPayloads(active);
+    active.retainedAfterEnd = false;
     active.dispatched = false;
     active.ready = false;
     active.refused = false;
-    const isOwned = () => budget.sideTurn ? operations.get(key) === owner : operations.get(key) === active && active.pass === budget;
-    const isCurrent = () => isOwned() && (budget.sideTurn || !active.ended);
-    budget.assertOwner = () => {
-      if (!isCurrent())
-        throw new PiContextSupersededError("Pi context pass superseded: no longer valid for this operation", active.ended ? "agent_end" : operations.get(key) !== (budget.sideTurn ? owner : active) ? "operation replacement or cache eviction" : "newer context pass");
-    };
+    const { isOwned, isCurrent, assertOwner } = createPiContextOwnershipGuards(operations, key, active, budget, owner);
+    budget.assertOwner = assertOwner;
     try {
-      if (fenceEnabled && !budget.sideTurn)
+      budget.assertOutcome();
+      let inputs;
+      if (fenceEnabled && !budget.sideTurn) {
         active.inputKeys = inputMessageKeys(event);
+        inputs = messageSnapshots(event.messages);
+        active.inputMessages = inputs;
+      }
       const result = await budget.waitMandatory(Promise.resolve(withSqliteTransformPass2(() => handler(event, ctx, budget))));
       if (result?.messages) {
+        active.managedSignature = piManagedSignature(result.messages);
+        active.preparedStructure = piPreparedStructure(result.messages, fenceEnabled ? ctx.model : undefined);
         budget.completed = true;
         active.ready = true;
+        if (inputs)
+          active.inputBranch = inputBranch(ctx, inputs);
       }
       return result;
     } catch (error) {
+      if (budget.isCancelled(error)) {
+        budget.cancel();
+        if (isOwned())
+          active.ready = false;
+        return;
+      }
       if (error instanceof PiContextSupersededError || !isCurrent()) {
         if (fenceEnabled && !budget.sideTurn && !sideSessions.get(key)?.sides && !options.compactionOff?.(ctx)) {
           const nonce = crypto.randomUUID();
@@ -32123,6 +32797,9 @@ function registerPiGuardedContext(pi, handler, options = {}) {
       active.refused = true;
       refuse(ctx, budget, error, isOwned);
       return { messages: event.messages };
+    } finally {
+      if (!fenceEnabled || budget.sideTurn)
+        releasePiOperationPayloads(active);
     }
   });
 }
@@ -32241,342 +32918,6 @@ function createPiFallbackIndex() {
   };
 }
 
-// ../plugin/src/hooks/magic-context/openai-compat-adjacency.ts
-function assertOpenAiCompatAdjacency(messages) {
-  const violations = [];
-  for (let i = 0;i < messages.length; i++) {
-    const msg = messages[i];
-    if (msg.role !== "assistant" || !msg.tool_calls || msg.tool_calls.length === 0) {
-      continue;
-    }
-    const expectedIds = msg.tool_calls.map((tc) => tc.id);
-    const expectedSet = new Set(expectedIds);
-    const collected = new Map;
-    let j = i + 1;
-    while (j < messages.length && messages[j].role === "tool") {
-      const toolMsg = messages[j];
-      const id = toolMsg.tool_call_id;
-      if (!id) {
-        violations.push({
-          index: i,
-          kind: "unmatched_tool_call_id",
-          detail: `tool message at index ${j} missing tool_call_id`
-        });
-      } else if (!expectedSet.has(id)) {
-        violations.push({
-          index: i,
-          kind: "unmatched_tool_call_id",
-          toolCallId: id,
-          assistantToolCallIds: expectedIds,
-          detail: `tool message at index ${j} references unexpected id ${id}`
-        });
-      } else {
-        collected.set(id, j);
-      }
-      j++;
-    }
-    const followingRoles = messages.slice(i + 1, Math.min(messages.length, i + 4)).map((m) => m.role);
-    const missing = expectedIds.filter((id) => !collected.has(id));
-    if (missing.length > 0) {
-      violations.push({
-        index: i,
-        kind: "missing_tool_messages",
-        assistantToolCallIds: expectedIds,
-        followingRoles,
-        detail: missing.length === expectedIds.length ? `assistant at index ${i} has tool_calls but next messages are not contiguous tool role (following: ${followingRoles.join(", ") || "none"})` : `assistant at index ${i} missing tool results for: ${missing.join(", ")}`
-      });
-      if (j < messages.length && messages[j].role !== "tool") {
-        const last = violations[violations.length - 1];
-        last.detail += `; blocked by ${messages.slice(i + 1, j + 1).map((m, off) => `${m.role}[${i + 1 + off}]`).join(", ")}`;
-      }
-    }
-  }
-  for (let i = 0;i < messages.length; i++) {
-    if (messages[i].role !== "tool")
-      continue;
-    const id = messages[i].tool_call_id ?? "";
-    if (!id)
-      continue;
-    let found = false;
-    for (let k = i - 1;k >= 0; k--) {
-      const prev = messages[k];
-      if (prev.role === "assistant" && prev.tool_calls?.some((tc) => tc.id === id)) {
-        const between = messages.slice(k + 1, i);
-        if (between.every((m) => m.role === "tool")) {
-          found = true;
-        }
-        break;
-      }
-      if (prev.role === "assistant" || prev.role === "user")
-        break;
-    }
-    if (!found) {
-      violations.push({
-        index: i,
-        kind: "orphan_tool_message",
-        toolCallId: id,
-        detail: `tool message at index ${i} is not immediately after its assistant tool_calls`
-      });
-    }
-  }
-  return { ok: violations.length === 0, violations };
-}
-
-// ../plugin/src/hooks/magic-context/lkg-replay.ts
-function canonicalLkgModelKeys(modelKey, providerKey) {
-  const canonicalModelKey = modelKey ? piModelRefToCanonical(modelKey) : null;
-  const slash = canonicalModelKey?.indexOf("/") ?? -1;
-  return {
-    modelKey: canonicalModelKey,
-    providerKey: slash > 0 && canonicalModelKey ? canonicalModelKey.slice(0, slash) : providerKey
-  };
-}
-function recordValue(info, key) {
-  return info && typeof info === "object" ? info[key] : undefined;
-}
-function messageInfo(message) {
-  if (message.info && typeof message.info === "object")
-    return message.info;
-  return message;
-}
-function messageParts(message) {
-  return Array.isArray(message.parts) ? message.parts : [];
-}
-function messageRole(message) {
-  const infoRole = recordValue(messageInfo(message), "role");
-  if (typeof infoRole === "string")
-    return infoRole;
-  const role = recordValue(message, "role");
-  return typeof role === "string" ? role : undefined;
-}
-function messageId2(message) {
-  const id = recordValue(messageInfo(message), "id") ?? recordValue(message, "id");
-  return typeof id === "string" && id.length > 0 ? id : null;
-}
-function entryIdsAreValid(slot, entryIds) {
-  if (slot.inputIdSeq.length === 0 || entryIds.length < slot.inputIdSeq.length)
-    return false;
-  if (slot.inputIdSeq[slot.inputIdSeq.length - 1] !== slot.lastInputMessageId)
-    return false;
-  const seen = new Set;
-  for (const id of entryIds) {
-    if (!id || seen.has(id))
-      return false;
-    seen.add(id);
-  }
-  if (entryIds.indexOf(slot.lastInputMessageId) !== slot.inputIdSeq.length - 1)
-    return false;
-  for (let index = 0;index < slot.inputIdSeq.length; index += 1) {
-    if (entryIds[index] !== slot.inputIdSeq[index])
-      return false;
-  }
-  return true;
-}
-function entryContentIsValid(slot, entry) {
-  return entry.entryContentDigests.length >= slot.inputContentDigests.length && slot.inputContentDigests.every((digest, index) => isLegacyLkgDigest(digest) ? entry.entryLegacyContentDigests?.[index] === digest : entry.entryContentDigests[index] === digest);
-}
-function partCallIds(message) {
-  const ids = [];
-  for (const rawPart of messageParts(message)) {
-    if (!rawPart || typeof rawPart !== "object")
-      continue;
-    const part = rawPart;
-    if (part.type !== "tool" && part.type !== "tool_use")
-      continue;
-    const callId = part.callID ?? part.callId ?? part.id;
-    if (typeof callId === "string" && callId.length > 0)
-      ids.push(callId);
-  }
-  return ids;
-}
-function partResultIds(message) {
-  const ids = [];
-  for (const rawPart of messageParts(message)) {
-    if (!rawPart || typeof rawPart !== "object")
-      continue;
-    const part = rawPart;
-    if (part.type !== "tool_result" && part.type !== "tool-result")
-      continue;
-    const callId = part.tool_call_id ?? part.tool_use_id ?? part.callID ?? part.callId;
-    if (typeof callId === "string" && callId.length > 0)
-      ids.push(callId);
-  }
-  return ids;
-}
-function partIsReasoning(part) {
-  return Boolean(part && typeof part === "object" && part.type === "reasoning");
-}
-function partIsAnthropicThinking(part) {
-  if (!part || typeof part !== "object")
-    return false;
-  const type = part.type;
-  return type === "thinking" || type === "reasoning" || type === "redacted_thinking";
-}
-function partEndsAnthropicAssistantRun(part) {
-  if (!part || typeof part !== "object")
-    return false;
-  const value = part;
-  if (value.type !== "tool" || value.providerExecuted === true || !value.state || typeof value.state !== "object") {
-    return false;
-  }
-  const status = value.state.status;
-  return status === "completed" || status === "error";
-}
-function partIsOpenCodeStepMetadata(part) {
-  if (!part || typeof part !== "object")
-    return false;
-  const type = part.type;
-  return type === "step-start" || type === "step-finish";
-}
-function validateAnthropicReasoningRuns(messages) {
-  let index = 0;
-  while (index < messages.length) {
-    if (messageRole(messages[index]) !== "assistant") {
-      index += 1;
-      continue;
-    }
-    let firstMessageInRun = null;
-    let sawOtherContent = false;
-    while (index < messages.length && messageRole(messages[index]) === "assistant") {
-      for (const part of messageParts(messages[index])) {
-        if (partEndsAnthropicAssistantRun(part)) {
-          firstMessageInRun = null;
-          sawOtherContent = false;
-        } else if (!partIsOpenCodeStepMetadata(part)) {
-          if (firstMessageInRun === null)
-            firstMessageInRun = index;
-          if (partIsAnthropicThinking(part)) {
-            if (sawOtherContent || index !== firstMessageInRun)
-              return false;
-          } else {
-            sawOtherContent = true;
-          }
-        }
-      }
-      index += 1;
-    }
-  }
-  return true;
-}
-function validateLkgSeamBoundary(prefix, tail) {
-  const last = prefix[prefix.length - 1];
-  const first = tail[0];
-  if (!last || !first)
-    return true;
-  const lastCalls = partCallIds(last);
-  if (lastCalls.length === 0)
-    return true;
-  const firstCalls = new Set([...partCallIds(first), ...partResultIds(first)]);
-  if (messageRole(first) === "tool" || lastCalls.some((callId) => firstCalls.has(callId)))
-    return false;
-  return !messageParts(last).some((part) => {
-    if (!part || typeof part !== "object")
-      return false;
-    const value = part;
-    if (value.type !== "tool")
-      return false;
-    const state = value.state;
-    return !state || typeof state !== "object" || state.status !== "completed";
-  });
-}
-function validateLkgSeam(prefix, tail, providerKey) {
-  const all = [...prefix, ...tail];
-  const ids = new Set;
-  const calls = new Set;
-  const results = new Set;
-  for (const message of all) {
-    const id = messageId2(message);
-    if (id !== null) {
-      if (ids.has(id))
-        return false;
-      ids.add(id);
-    }
-    for (const callId of partCallIds(message)) {
-      if (calls.has(callId))
-        return false;
-      calls.add(callId);
-    }
-    for (const callId of partResultIds(message)) {
-      if (results.has(callId))
-        return false;
-      results.add(callId);
-    }
-    if (messageRole(message) !== "assistant" && messageParts(message).some(partIsReasoning))
-      return false;
-    if (providerKey !== "anthropic" && messageParts(message).some((part) => {
-      if (!part || typeof part !== "object")
-        return false;
-      const value = part;
-      return (value.type === "text" || value.type === "reasoning") && value.text === "";
-    }))
-      return false;
-  }
-  if (!validateLkgSeamBoundary(prefix, tail))
-    return false;
-  const wireCandidates = all.map((message) => message);
-  if (wireCandidates.every((message) => typeof message.role === "string")) {
-    const adjacency = assertOpenAiCompatAdjacency(wireCandidates);
-    if (!adjacency.ok)
-      return false;
-    const wireCallIds = new Set;
-    for (const wireMessage of wireCandidates) {
-      for (const call of wireMessage.tool_calls ?? []) {
-        if (wireCallIds.has(call.id))
-          return false;
-        wireCallIds.add(call.id);
-      }
-    }
-  }
-  return true;
-}
-function replayLkg(args) {
-  const slot = getSlot(args.sessionId);
-  if (!slot)
-    return { ok: false, reason: "lkg_invalidated_reshape" };
-  const requestedModelKeys = canonicalLkgModelKeys(args.modelKey, args.providerKey);
-  const capturedModelKeys = canonicalLkgModelKeys(slot.modelKey, slot.providerKey);
-  if (capturedModelKeys.modelKey !== requestedModelKeys.modelKey || capturedModelKeys.providerKey !== requestedModelKeys.providerKey) {
-    dropSlot(args.sessionId, "lkg_model_mismatch");
-    return { ok: false, reason: "lkg_model_mismatch" };
-  }
-  const entry = args.entry ?? noteEntry(args.sessionId, args.messages);
-  if (!entry || entry.anchorIndex !== slot.inputIdSeq.length - 1 || !entryIdsAreValid(slot, entry.entryInputIds)) {
-    dropSlot(args.sessionId, "lkg_invalidated_reshape");
-    return { ok: false, reason: "lkg_invalidated_reshape" };
-  }
-  if (!entryContentIsValid(slot, entry)) {
-    dropSlot(args.sessionId, "lkg_content_mismatch");
-    return { ok: false, reason: "lkg_content_mismatch" };
-  }
-  let prefix;
-  try {
-    const parsed = JSON.parse(slot.jsonPrefix);
-    if (!Array.isArray(parsed))
-      throw new Error("prefix is not an array");
-    prefix = parsed;
-  } catch {
-    dropSlot(args.sessionId, "lkg_seam_invalid");
-    return { ok: false, reason: "lkg_seam_invalid" };
-  }
-  const replayed = [...prefix, ...entry.pristineTail];
-  args.prepareReplay?.(replayed);
-  if (!args.skipSeamValidation) {
-    if (!validateLkgSeamBoundary(prefix, entry.pristineTail)) {
-      dropSlot(args.sessionId, "lkg_unsafe_seam");
-      return { ok: false, reason: "lkg_unsafe_seam" };
-    }
-    if (!validateLkgSeam(prefix, entry.pristineTail, requestedModelKeys.providerKey)) {
-      dropSlot(args.sessionId, "lkg_seam_invalid");
-      return { ok: false, reason: "lkg_seam_invalid" };
-    }
-  }
-  if (requestedModelKeys.providerKey === "anthropic" && !validateAnthropicReasoningRuns(replayed)) {
-    dropSlot(args.sessionId, "lkg_anthropic_reasoning_run_invalid");
-    return { ok: false, reason: "lkg_anthropic_reasoning_run_invalid" };
-  }
-  return { ok: true, messages: replayed };
-}
-
 // src/pi-lkg.ts
 var piLkgSessionStates = new Map;
 function completedProviderUsage(message) {
@@ -32633,6 +32974,7 @@ function clearPiLkgSessionState(sessionId) {
   if (state)
     state.captureSequence += 1;
   piLkgSessionStates.delete(sessionId);
+  clearLkgFenceProcessState(sessionId);
 }
 
 class PiLkgUncapturable extends Error {
@@ -32853,6 +33195,50 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
     }
     return state;
   };
+  const recoveryFor = (snapshot) => {
+    const state = stateFor(snapshot.sessionId);
+    const prefix = state.recoveryPrefix;
+    if (!prefix) {
+      const slot = getSlot(snapshot.sessionId);
+      return lkgRecoveryFenceUnclean(snapshot.sessionId) || slot && lkgFenceRequiresRebuild(snapshot.sessionId, state.acceptedInputs ? slot : loadPersistedLkgSlot(db, snapshot.sessionId) ?? slot, !!state.acceptedInputs) ? { rebuildReason: "lkg_restart_rebuild" } : {};
+    }
+    const durableSlot = loadPersistedLkgSlot(db, snapshot.sessionId) ?? getSlot(snapshot.sessionId);
+    if (snapshot.preparationFailure || !durableSlot || !ownsLkgDirtyFence(snapshot.sessionId, prefix.fenceRevision) || prefix.modelKey !== snapshot.modelKey || prefix.providerKey !== snapshot.providerKey || JSON.stringify(prefix.systemEntries) !== JSON.stringify(snapshot.systemEntries) || exactReusablePrefix(snapshot.inputs, prefix.inputs) !== prefix.inputs.length)
+      return { rebuildReason: "lkg_recovery_input_rebuild" };
+    return { prefix };
+  };
+  const noteRecovery = (snapshot, messages) => {
+    const state = stateFor(snapshot.sessionId);
+    const anchor = snapshot.replayAnchorInputIndex;
+    const slot = getSlot(snapshot.sessionId);
+    if (snapshot.preparationFailure || anchor === null || !slot?.piOutputEntryIds)
+      throw new PiLkgUncapturable("lkg_output_mapping_unavailable", "Cannot retain recovered output ownership");
+    const surviving = new Set(snapshot.inputs.map((input) => input.id));
+    const outputEntryIds = [
+      ...slot.piOutputEntryIds.filter((id) => id === null || surviving.has(id)),
+      ...snapshot.inputs.slice(anchor + 1).map((input) => input.id)
+    ];
+    if (outputEntryIds.length !== messages.length)
+      throw new PiLkgUncapturable("lkg_output_mapping_unavailable", "Recovered output ownership does not match the served array");
+    state.recoveryPrefix = {
+      fenceRevision: markLkgRecoveryDirty({
+        sessionId: snapshot.sessionId,
+        slot,
+        processLocalProof: !!state.acceptedInputs,
+        ownDirtyRevision: state.recoveryPrefix?.fenceRevision
+      }),
+      modelKey: snapshot.modelKey,
+      providerKey: snapshot.providerKey,
+      systemEntries: snapshot.systemEntries,
+      inputs: snapshot.inputs,
+      json: JSON.stringify(messages),
+      outputEntryIds,
+      untaggedInputIds: new Set([
+        ...state.recoveryPrefix?.untaggedInputIds ?? [],
+        ...snapshot.inputs.slice(anchor + 1).map((input) => input.id)
+      ])
+    };
+  };
   const beginPass = (args) => {
     const snapped = snapshotInputs(args.messages, args.entryIds, omitsRootBookkeeping(args));
     const slot = getSlot(args.sessionId);
@@ -32949,7 +33335,8 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
       modelKey: piModelRefToCanonical(request.modelKey).toLowerCase(),
       inputTokens: request.usage.inputTokens,
       envelopeSignature: request.envelopeSignature,
-      appendedMessages
+      appendedMessages,
+      previousMessages: JSON.parse(request.jsonPrefix)
     };
   };
   const replay = (snapshot, parentOf) => {
@@ -33169,7 +33556,10 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
         if (args.publishServedNumbers) {
           if (lkgSlotRejection(plan.sessionId, slot))
             throw new PiLkgUncapturable("lkg_slot_rejected", "LKG slot rejected the Pi snapshot");
-          if (!saveLkgSlotToDb(db, plan.sessionId, slot, args.publishServedNumbers)) {
+          if (!saveLkgSlotToDb(db, plan.sessionId, slot, args.publishServedNumbers, {
+            rebuild: args.releaseRecovery,
+            retainDirtyRevision: !args.releaseRecovery ? state.recoveryPrefix?.fenceRevision : undefined
+          })) {
             throw new Error("Pi LKG/served publication failed");
           }
           args.assertCurrentPass?.();
@@ -33179,7 +33569,18 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
         }
         state.acceptedInputs = plan.inputs;
         state.acceptedSlot = slot;
-        const persisted = args.publishServedNumbers ? true : saveLkgSlotToDb(db, plan.sessionId, slot);
+        if (state.recoveryPrefix) {
+          state.recoveryPrefix = args.releaseRecovery ? undefined : {
+            ...state.recoveryPrefix,
+            inputs: plan.inputs,
+            json: plan.jsonPrefix,
+            outputEntryIds: ownership ?? state.recoveryPrefix.outputEntryIds
+          };
+        }
+        const persisted = args.publishServedNumbers ? true : saveLkgSlotToDb(db, plan.sessionId, slot, undefined, {
+          rebuild: args.releaseRecovery,
+          retainDirtyRevision: state.recoveryPrefix?.fenceRevision
+        });
         state.syncCaptureRequired = !persisted;
         if (args.publishServedNumbers)
           noteCapturedRequest();
@@ -33226,6 +33627,8 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
     return state.outputSnapshot ?? undefined;
   };
   return {
+    noteRecovery,
+    recoveryFor,
     beginPass(args) {
       return {
         ...beginPass(args),
@@ -33290,7 +33693,7 @@ function resolvePiLkgOutputEntryIds(messages, syntheticLeadingCount, entryId) {
 }
 
 // src/pi-lkg-fit-envelope.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 function readPiLkgFitEnvelope(ctx, pi, modelKey, frozen, wireSchema) {
   try {
     if (!modelKey || typeof pi.getAllTools !== "function")
@@ -33352,7 +33755,7 @@ function readPiLkgFitEnvelope(ctx, pi, modelKey, frozen, wireSchema) {
       refusalToolDefinitionTokens,
       toolDefinitionsMeasured: refusalToolDefinitionTokens !== undefined,
       envelopeBytes: Buffer.byteLength(envelopeJson),
-      envelopeSignature: activeNames ? createHash13("sha256").update(envelopeJson).update(JSON.stringify(activeNames)).digest("hex") : undefined,
+      envelopeSignature: activeNames ? createHash12("sha256").update(envelopeJson).update(JSON.stringify(activeNames)).digest("hex") : undefined,
       calibration
     };
   } catch {
@@ -33361,13 +33764,13 @@ function readPiLkgFitEnvelope(ctx, pi, modelKey, frozen, wireSchema) {
 }
 
 // src/pi-message-identity.ts
-import { createHash as createHash16 } from "node:crypto";
+import { createHash as createHash15 } from "node:crypto";
 
 // src/pi-tool-identity.ts
-import { createHash as createHash15 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 
 // src/served-array-ledger.ts
-import { createHash as createHash14 } from "node:crypto";
+import { createHash as createHash13 } from "node:crypto";
 import { readFileSync as readFileSync11, statSync as statSync6 } from "node:fs";
 import * as path12 from "node:path";
 
@@ -33527,7 +33930,7 @@ function getPiLastServedArray(sessionId) {
   return previous ? `[${previous.serializedMessages.join(",")}]` : undefined;
 }
 function sha256(value) {
-  return createHash14("sha256").update(value).digest("hex");
+  return createHash13("sha256").update(value).digest("hex");
 }
 function safeSessionFileStem(sessionId) {
   const readable = sessionId.replace(/[^A-Za-z0-9._-]/g, "_").slice(0, 96);
@@ -33644,20 +34047,21 @@ function capturePiServedArray(sessionId, messages, options = {}) {
     const digest = sha256(serializedArray);
     const storageDir = options.storageDir ?? getMagicContextStorageDir();
     identityPersistenceFailed = true;
-    const previousNumbers = getPiServedTagNumbers(sessionId, storageDir);
+    const previousNumbers = options.recoveryWithoutTagState ? new Set : getPiServedTagNumbers(sessionId, storageDir);
+    const managedNumbers = options.recoveryWithoutTagState ? [] : options.servedTagNumbers ?? [];
     identityPersistenceFailed = false;
     const served = new Set(previousNumbers);
-    if (options.db) {
+    if (options.db && !options.recoveryWithoutTagState) {
       identityPersistenceFailed = true;
       for (const number of readPiCommittedServedNumbers(options.db, sessionId))
         served.add(number);
-      for (const number of options.servedTagNumbers ?? []) {
+      for (const number of managedNumbers) {
         if (!served.has(number))
           throw new PiServedIdentityError(new Error("Pi identities have no committed LKG"));
       }
       identityPersistenceFailed = false;
     }
-    for (const number of options.servedTagNumbers ?? []) {
+    for (const number of managedNumbers) {
       if (Number.isSafeInteger(number) && number > 0)
         served.add(number);
     }
@@ -33797,7 +34201,7 @@ function readPiServedCachedArray(sessionId) {
   const memory = getPiLastServedArray(sessionId);
   const slot = memory === undefined ? getSlot(sessionId) : undefined;
   const jsonPrefix = memory ?? slot?.jsonPrefix;
-  if (jsonPrefix === undefined || createHash15("sha256").update(jsonPrefix).digest("hex") !== getPiLastServedDigest(sessionId))
+  if (jsonPrefix === undefined || createHash14("sha256").update(jsonPrefix).digest("hex") !== getPiLastServedDigest(sessionId))
     return;
   let parsed;
   try {
@@ -33821,7 +34225,7 @@ function piMessageEntryFingerprint(message) {
   const m = message;
   if (typeof m.role !== "string")
     return null;
-  const contentHash = createHash16("sha256").update(stableStringify(m.content)).digest("hex");
+  const contentHash = createHash15("sha256").update(stableStringify(m.content)).digest("hex");
   return JSON.stringify([
     typeof m.responseId === "string" ? m.responseId : null,
     typeof m.timestamp === "number" || typeof m.timestamp === "string" ? m.timestamp : null,
@@ -34226,6 +34630,7 @@ function tokenizePiMessages(messages, options) {
         }
         if (!Array.isArray(content))
           continue;
+        let opaqueCounted = false;
         for (const part of content) {
           if (!part || typeof part !== "object")
             continue;
@@ -34234,14 +34639,15 @@ function tokenizePiMessages(messages, options) {
             case "text":
               if (typeof p.text === "string")
                 conversation += estimateTokens(p.text);
-              if (typeof p.textSignature === "string")
-                conversation += estimateTokens(p.textSignature);
               break;
             case "thinking":
-              if (typeof p.thinking === "string")
+            case "redacted_thinking":
+              if (!p.redacted && typeof p.thinking === "string")
                 conversation += estimateTokens(p.thinking);
-              if (typeof p.thinkingSignature === "string")
-                conversation += estimateTokens(p.thinkingSignature);
+              if (!opaqueCounted && (p.redacted || p.type === "redacted_thinking" || !p.thinking && p.thinkingSignature)) {
+                opaqueCounted = true;
+                conversation += opaqueThinkingCost(msg.usage?.reasoning, msg.usage?.output).tokens;
+              }
               break;
             case "image":
               conversation += 1200;
@@ -34305,7 +34711,11 @@ function tokenizePiMessages(messages, options) {
 function buildTokenCacheFingerprint(value) {
   const message = value;
   const role = typeof message.role === "string" ? message.role : null;
-  const fingerprint = [role];
+  const fingerprint = [
+    role,
+    String(message.usage?.reasoning ?? ""),
+    String(message.usage?.output ?? "")
+  ];
   if (role !== "user" && role !== "assistant" && role !== "toolResult") {
     return fingerprint;
   }
@@ -34335,7 +34745,8 @@ function buildTokenCacheFingerprint(value) {
         fingerprint.push("text", typeof part.text === "string" ? part.text : null, typeof part.textSignature === "string" ? part.textSignature : null);
         break;
       case "thinking":
-        fingerprint.push("thinking", typeof part.thinking === "string" ? part.thinking : null, typeof part.thinkingSignature === "string" ? part.thinkingSignature : null);
+      case "redacted_thinking":
+        fingerprint.push(part.type, String(part.redacted ?? false), typeof part.thinking === "string" ? part.thinking : null, typeof part.thinkingSignature === "string" ? part.thinkingSignature : null);
         break;
       case "image":
         fingerprint.push("image");
@@ -34349,6 +34760,39 @@ function buildTokenCacheFingerprint(value) {
   }
   return fingerprint;
 }
+function piOpaqueThinkingFallbackSteps(messages) {
+  return messages.filter((raw) => {
+    if (!raw || typeof raw !== "object")
+      return false;
+    const message = raw;
+    return opaqueThinkingCost(message.usage?.reasoning, message.usage?.output).fallback && Array.isArray(message.content) && message.content.some((p) => p && (p.type === "redacted_thinking" || p.type === "thinking" && (p.redacted || !p.thinking && p.thinkingSignature)));
+  }).length;
+}
+function piFitMessageBytes(raw) {
+  const message = raw;
+  const opaque = Array.isArray(message.content) && message.content.some((p) => p && (p.type === "redacted_thinking" || p.type === "thinking" && (p.redacted || !p.thinking && p.thinkingSignature)));
+  if (!opaque && (!Array.isArray(message.content) || !message.content.some((part) => part && (part.type === "thinking" && part.thinkingSignature !== undefined || part.type === "text" && part.textSignature !== undefined))))
+    return Buffer.byteLength(JSON.stringify(raw));
+  const content = Array.isArray(message.content) ? message.content.map((part) => {
+    if (!part || typeof part !== "object")
+      return part;
+    if (part.type === "redacted_thinking" || part.type === "thinking" && part.redacted)
+      return { type: part.type, redacted: true };
+    if (part.type === "thinking") {
+      const plain = { ...part };
+      delete plain.thinkingSignature;
+      return plain;
+    }
+    if (part.type === "text") {
+      const plain = { ...part };
+      delete plain.textSignature;
+      return plain;
+    }
+    return part;
+  }) : undefined;
+  const bytes = Buffer.byteLength(JSON.stringify(content ? { ...message, content } : raw));
+  return bytes + (opaque ? 4 * opaqueThinkingCost(message.usage?.reasoning, message.usage?.output).tokens : 0);
+}
 function tokenCacheFingerprintsEqual(left, right) {
   if (left.length !== right.length)
     return false;
@@ -34441,7 +34885,7 @@ function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, conte
     if (!message || typeof message !== "object")
       return false;
     const m = message;
-    return ["user", "assistant", "toolResult"].includes(m.role ?? "") && (typeof m.content === "string" || Array.isArray(m.content) && m.content.every((p) => p && typeof p === "object" && ["text", "thinking", "toolCall"].includes(String(p.type))));
+    return ["user", "assistant", "toolResult"].includes(m.role ?? "") && (typeof m.content === "string" || Array.isArray(m.content) && m.content.every((p) => p && typeof p === "object" && ["text", "thinking", "redacted_thinking", "toolCall"].includes(String(p.type))));
   });
   if (!complete)
     return { tokens: 0, trusted: false };
@@ -34458,9 +34902,7 @@ function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, conte
         for (const part of message.content) {
           for (const value of [
             part.text,
-            part.thinking,
-            part.thinkingSignature,
-            part.textSignature,
+            part.redacted ? undefined : part.thinking,
             part.name
           ])
             if (typeof value === "string")
@@ -34485,7 +34927,7 @@ function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, conte
       tools: observed.toolDefinitionTokens
     }, observed.calibration ?? calibrationForModelKey(observed.modelKey), true);
     const fit = observed.calibration ?? calibrationForModelKey(observed.modelKey);
-    const upper = envelope + Math.max(UNKNOWN_FIT_RATIO, fit.toolsRatio, fit.proseRatio) * Buffer.byteLength(JSON.stringify(priced));
+    const upper = envelope + Math.max(UNKNOWN_FIT_RATIO, fit.toolsRatio, fit.proseRatio) * priced.reduce((sum, message) => sum + piFitMessageBytes(message), 0);
     if (upper <= contextLimit)
       return {
         tokens: upper,
@@ -34500,9 +34942,7 @@ function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, conte
       return tokenCountUsesByteBound(content);
     return content.some((part) => [
       part.text,
-      part.thinking,
-      part.thinkingSignature,
-      part.textSignature,
+      part.redacted ? undefined : part.thinking,
       part.name,
       part.arguments === undefined ? undefined : JSON.stringify(part.arguments)
     ].some((value) => typeof value === "string" && tokenCountUsesByteBound(value)));
@@ -34511,7 +34951,7 @@ function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, conte
     return {
       tokens: providerMass({
         system: observed.systemTokens,
-        tools: observed.toolDefinitionTokens + Buffer.byteLength(JSON.stringify(messages))
+        tools: observed.toolDefinitionTokens + messages.reduce((sum, message) => sum + piFitMessageBytes(message), 0)
       }, observed.calibration ?? calibrationForModelKey(observed.modelKey), true),
       trusted: true,
       refusalGrade: false,
@@ -34531,9 +34971,7 @@ function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, conte
       return !tokenCountUsesByteBound(content);
     return content.every((part) => [
       part.text,
-      part.thinking,
-      part.thinkingSignature,
-      part.textSignature,
+      part.redacted ? undefined : part.thinking,
       part.name,
       part.arguments === undefined ? undefined : JSON.stringify(part.arguments)
     ].every((value) => typeof value !== "string" || !tokenCountUsesByteBound(value)));
@@ -34566,12 +35004,7 @@ function assertPiRawFallbackFits(messages, contextLimit, log, cause, observed, m
   let serializationFailed = false;
   try {
     for (const message of pricedMessages) {
-      const serialized = JSON.stringify(message);
-      if (typeof serialized !== "string") {
-        serializationFailed = true;
-        break;
-      }
-      bytes += Buffer.byteLength(serialized) + 1;
+      bytes += piFitMessageBytes(message) + 1;
       if (baseInputTokens + Math.ceil(bytes / 4) > contextLimit)
         break;
     }
@@ -34587,7 +35020,7 @@ function assertPiRawFallbackFits(messages, contextLimit, log, cause, observed, m
     if (!message || typeof message !== "object")
       return false;
     const m = message;
-    return ["user", "assistant", "toolResult"].includes(m.role ?? "") && (typeof m.content === "string" || Array.isArray(m.content) && m.content.every((p) => p !== null && typeof p === "object" && ["text", "thinking", "toolCall"].includes(String(p.type))));
+    return ["user", "assistant", "toolResult"].includes(m.role ?? "") && (typeof m.content === "string" || Array.isArray(m.content) && m.content.every((p) => p !== null && typeof p === "object" && ["text", "thinking", "redacted_thinking", "toolCall"].includes(String(p.type))));
   });
   const raw = tokenizePiMessages([...pricedMessages]);
   if (!hasTokenizerForFit()) {
@@ -35016,8 +35449,13 @@ function applyPiProactiveThinkingStrip(args) {
     if (protectedMessages.has(args.messages[index]))
       continue;
     const entryId = args.entryIds[index];
-    if (!entryId || !hasThinkingPart(args.messages[index]))
+    if (!hasThinkingPart(args.messages[index]))
+      continue;
+    if (!entryId) {
+      if (args.requirePersistence)
+        throw new Error("Cannot persist thinking omission without a stable entry id");
       continue;
+    }
     entryIds.push(entryId);
     indices.push(index);
   }
@@ -35033,6 +35471,8 @@ function applyPiProactiveThinkingStrip(args) {
     persisted = false;
   }
   if (!persisted) {
+    if (args.requirePersistence)
+      throw new Error("Cannot persist thinking omissions before recovery prefix rebuild");
     reportBindingRecovery(args.sessionId, args.report, "proactive thinking strip: persistence failed; serving the thinking unchanged");
     return null;
   }
@@ -35763,7 +36203,97 @@ function stripPiProcessedImages(args) {
 }
 
 // src/system-prompt.ts
-import { createHash as createHash17 } from "node:crypto";
+import { createHash as createHash16 } from "node:crypto";
+
+// ../plugin/src/hooks/magic-context/system-prompt-dates.ts
+function replaceHostDates(prompt, replace) {
+  const fields = /<(plugin-env|environment|env)>[\s\S]*?<\/\1>|Today's date: [^\r\n<]+/g;
+  return prompt.replace(fields, (block) => block.replace(/(^[\t ]*(?:Date|Today's date):[\t ]*)([^\r\n<]+)/gm, (_line, label, date) => `${label}${replace(date)}`));
+}
+function systemPromptDates(prompt, sticky) {
+  const values = [];
+  replaceHostDates(prompt, (date) => {
+    values.push(date);
+    return date;
+  });
+  const prior = sticky ? JSON.parse(sticky) : [];
+  let index = 0;
+  const stable = replaceHostDates(prompt, (date) => prior[index++] ?? date);
+  return { live: values.length ? JSON.stringify(values) : undefined, stable };
+}
+
+// src/system-prompt-delivery-pi.ts
+var requests = new BoundedSessionMap(1000);
+function beginPiSystemPromptRequest(db, sessionId, modelKey, branch) {
+  acknowledgePiPendingSystemPromptResponses(sessionId);
+  const request = {
+    kind: "v2",
+    startedAt: Date.now(),
+    previousResponseId: undefined,
+    modelKey: piModelRefToCanonical(modelKey)
+  };
+  requests.set(sessionId, { request, branch, replies: [] });
+  recordSystemPromptForRequest(sessionId, request, getOrCreateSessionMeta(db, sessionId).systemPromptHash, db);
+}
+function recordPiHeldSystemHead(sessionId, deferRefresh) {
+  recordHeldHeadForRequest(sessionId, requests.get(sessionId)?.request, deferRefresh);
+}
+function acknowledgePiSystemPromptResponse(sessionId, message) {
+  const saved = requests.get(sessionId);
+  if (!saved?.branch || !message || typeof message !== "object" || message.role !== "assistant")
+    return;
+  if (!saved.replies.includes(message)) {
+    if (saved.replies.length === 32)
+      saved.replies.shift();
+    saved.replies.push(message);
+  }
+  acknowledgePiPendingSystemPromptResponses(sessionId);
+}
+function acknowledgePiPendingSystemPromptResponses(sessionId) {
+  const saved = requests.get(sessionId);
+  if (!saved?.branch)
+    return;
+  let entries;
+  try {
+    entries = saved.branch.readBranch();
+  } catch {
+    return;
+  }
+  if (!entries)
+    return;
+  for (const value of entries) {
+    if (!value || typeof value !== "object")
+      continue;
+    const entry = value;
+    if (entry.type !== "message" || !entry.id || entry.parentId !== saved.branch.parentId || !entry.message || !saved.replies.includes(entry.message))
+      continue;
+    const reply = entry.message;
+    if (!reply.provider || !reply.model || typeof reply.timestamp !== "number")
+      continue;
+    const completion = { finish: reply.stopReason, error: reply.errorMessage };
+    if (!isSuccessfulProviderCompletion(completion) && !providerResponseFailed(completion))
+      continue;
+    const response = {
+      sessionId,
+      request: saved.request,
+      responseId: entry.id,
+      createdAt: reply.timestamp,
+      modelKey: piModelRefToCanonical(`${reply.provider}/${reply.model}`),
+      ...completion,
+      v2: true
+    };
+    bindSystemPromptResponse(sessionId, saved.request, response);
+    acknowledgeSystemPromptDelivery(response);
+    requests.delete(sessionId);
+    return;
+  }
+}
+function clearPiSystemPromptDelivery(sessionId) {
+  requests.delete(sessionId);
+  clearSystemPromptDelivery(sessionId);
+}
+
+// src/system-prompt.ts
 var MAGIC_CONTEXT_MARKER = "## Magic Context";
 var stickyDateBySession = new Map;
 function buildMagicContextBlock(opts) {
@@ -35778,7 +36308,6 @@ function composeMagicContextSystemPrompt(basePrompt, block) {
 
 ${block}` : basePrompt;
 }
-var DATE_PATTERN = /Today's date: .+/;
 function processSystemPromptForCache(args) {
   const { db, sessionId, systemPrompt, isCacheBusting } = args;
   let sessionMeta;
@@ -35790,11 +36319,13 @@ function processSystemPromptForCache(args) {
   const previousHash = sessionMeta?.systemPromptHash ?? "";
   const isFirstHash = previousHash === "" || previousHash === "0";
   let frozenPrompt = systemPrompt;
-  const dateMatch = systemPrompt.match(DATE_PATTERN);
-  const liveDate = dateMatch ? dateMatch[0] : null;
+  if (isFirstHash)
+    stickyDateBySession.delete(sessionId);
   const stickyDate = stickyDateBySession.get(sessionId);
-  const stableCandidate = liveDate && stickyDate && liveDate !== stickyDate ? systemPrompt.replace(DATE_PATTERN, stickyDate) : systemPrompt;
-  const stableCandidateHash = createHash17("md5").update(promptSurfaceHashMaterial(stableCandidate, args.promptSurfacePreset)).digest("hex");
+  const dates = systemPromptDates(systemPrompt, stickyDate);
+  const liveDate = dates.live;
+  const stableCandidate = dates.stable;
+  const stableCandidateHash = createHash16("md5").update(promptSurfaceHashMaterial(stableCandidate, args.promptSurfacePreset)).digest("hex");
   const contentOrPresetChanged = !isFirstHash && stableCandidateHash !== previousHash;
   const idleCacheExpired = sessionMeta !== undefined && computeHardCacheExpired(sessionMeta.cacheTtl, sessionMeta.lastResponseTime, Date.now());
   const dateMayAdvance = isCacheBusting || idleCacheExpired || contentOrPresetChanged;
@@ -35805,11 +36336,11 @@ function processSystemPromptForCache(args) {
       stickyDateBySession.set(sessionId, liveDate);
       sessionLog2(sessionId, `system prompt date updated: ${stickyDate} → ${liveDate} (cache-busting pass)`);
     } else {
-      frozenPrompt = systemPrompt.replace(DATE_PATTERN, stickyDate);
+      frozenPrompt = stableCandidate;
       sessionLog2(sessionId, `system prompt date frozen: real=${liveDate}, using=${stickyDate} (cache-stable pass)`);
     }
   }
-  const currentHash = createHash17("md5").update(promptSurfaceHashMaterial(frozenPrompt, args.promptSurfacePreset)).digest("hex");
+  const currentHash = createHash16("md5").update(promptSurfaceHashMaterial(frozenPrompt, args.promptSurfacePreset)).digest("hex");
   const hashChanged = !isFirstHash && currentHash !== previousHash;
   if (hashChanged) {
     sessionLog2(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${frozenPrompt.length})`);
@@ -35834,6 +36365,7 @@ function processSystemPromptForCache(args) {
   };
 }
 function clearPiSystemPromptSession(sessionId) {
+  clearPiSystemPromptDelivery(sessionId);
   stickyDateBySession.delete(sessionId);
 }
 
@@ -36453,6 +36985,21 @@ var systemPromptRefreshSessions = new Set;
 var pendingMaterializationSessions = new Set;
 var deferredHistoryRefreshSessions = new Set;
 var deferredMaterializationSessions = new Set;
+function signalPiSystemHashChange(sessionId, hash) {
+  recordSystemRefreshOwnership(sessionId, hash, !historyRefreshSessions.has(sessionId), historyRefreshSessions, pendingMaterializationSessions);
+  signalPiHistoryRefresh(sessionId);
+  signalPiSystemPromptRefresh(sessionId);
+  if (!pendingMaterializationSessions.has(sessionId))
+    signalPiPendingMaterialization(sessionId, "system_hash");
+}
+function deferPiDeliveredSystemRefresh(sessionId, ownsHistory) {
+  deferDeliveredSystemRefresh({
+    historyRefreshSessions,
+    pendingMaterializationSessions,
+    deferredHistoryRefreshSessions,
+    deferredMaterializationSessions
+  }, sessionId, ownsHistory);
+}
 var sessionsByProject = new Map;
 var lastSeenProjectIdentityBySession = new Map;
 var persistedProjectIdentityBySession = new Map;
@@ -36464,14 +37011,24 @@ var lastHeuristicsTurnIdBySession = new Map;
 var routinePressureAppliedBySession = new Map;
 var firstContextPassSeenBySession = new Set;
 var contextPassGeneration = new Map;
+function createPiContextGenerationGuard(assertOperation, passSessionId, generation, sideTurn, signal) {
+  return () => {
+    assertOperation();
+    if (!sideTurn && passSessionId && contextPassGeneration.get(passSessionId) !== generation)
+      throw new PiContextSupersededError("Pi context pass superseded by a newer context generation", "context generation");
+    signal?.throwIfAborted();
+  };
+}
 
 class PiLkgAdmissionReplay extends Error {
   messages;
   recovery;
-  constructor(messages, recovery = "fitting LKG before writer retries") {
+  trigger;
+  constructor(messages, recovery = "fitting LKG before writer retries", trigger = "writer_busy") {
     super("Saved request served before writer wait");
     this.messages = messages;
     this.recovery = recovery;
+    this.trigger = trigger;
   }
 }
 var liveModelBySession = new Map;
@@ -36646,8 +37203,8 @@ function signalPiHistoryRefresh(sessionId) {
 function signalPiSystemPromptRefresh(sessionId) {
   systemPromptRefreshSessions.add(sessionId);
 }
-function signalPiPendingMaterialization(sessionId) {
-  pendingMaterializationSessions.add(sessionId);
+function signalPiPendingMaterialization(sessionId, origin = "user_flush") {
+  requestPendingMaterialization(pendingMaterializationSessions, sessionId, origin);
 }
 function clearPiM0Cache(db, sessionId, reason) {
   clearM0M1PiCache(db, sessionId, reason);
@@ -36774,7 +37331,7 @@ function hasPendingMaterialization(sessionId) {
 }
 function consumePendingMaterialization(sessionId) {
   const wasSet = pendingMaterializationSessions.has(sessionId);
-  pendingMaterializationSessions.delete(sessionId);
+  clearPendingMaterialization(pendingMaterializationSessions, sessionId);
   return wasSet;
 }
 function resolveSessionId2(ctx) {
@@ -38047,7 +38604,7 @@ function registerPiContextHandler(pi, baseOptions) {
       sessionLog2(sessionId, `variant changed (${event.previousLevel} -> ${event.level}), triggering flush`);
       historyRefreshSessions.add(sessionId);
       systemPromptRefreshSessions.add(sessionId);
-      pendingMaterializationSessions.add(sessionId);
+      requestPendingMaterialization(pendingMaterializationSessions, sessionId, "variant_change");
       lastHeuristicsTurnIdBySession.delete(sessionId);
       return;
     }
@@ -38061,14 +38618,8 @@ function registerPiContextHandler(pi, baseOptions) {
     const generation = Symbol();
     if (passSessionId && !budget.sideTurn)
       contextPassGeneration.set(passSessionId, generation);
-    const signal = event.signal ?? ctx.signal;
-    const assertOperation = budget.assertOwner;
-    budget.assertOwner = () => {
-      assertOperation();
-      if (!budget.sideTurn && passSessionId && contextPassGeneration.get(passSessionId) !== generation)
-        throw new PiContextSupersededError("Pi context pass superseded by a newer context generation", "context generation");
-      signal?.throwIfAborted();
-    };
+    const signal = budget.signal;
+    budget.assertOwner = createPiContextGenerationGuard(budget.assertOwner, passSessionId, generation, budget.sideTurn, signal);
     let assertCurrentPass = budget.assert;
     const guardAwait = budget.wait;
     const passGuard = { assert: assertCurrentPass, wait: guardAwait };
@@ -38114,6 +38665,11 @@ function registerPiContextHandler(pi, baseOptions) {
       rawMessageCount = event.messages.length;
       const fullWireMessageCount = rawMessageCount;
       const options = baseOptions.resolveForProject?.(projectDirectory) ?? baseOptions;
+      const deliveryModelKey = resolvePiContextModelKey(ctx);
+      if (!budget.sideTurn && deliveryModelKey) {
+        const parentId = ctx.sessionManager.getLeafId?.();
+        beginPiSystemPromptRequest(options.db, sessionId, deliveryModelKey, parentId === null || typeof parentId === "string" ? { parentId, readBranch: () => ctx.sessionManager.getBranch() } : undefined);
+      }
       const schedulerConfig = options.scheduler ?? DEFAULT_SCHEDULER_CONFIG;
       const scheduler = schedulerFor(options);
       lkgCompactionOff = options.compactionOff === true;
@@ -38167,6 +38723,7 @@ function registerPiContextHandler(pi, baseOptions) {
         transport: ctx.model?.transport
       });
       lkgPassSnapshot = snapshot;
+      const recovery = budget.sideTurn || lkgCompactionOff ? {} : lkgCoordinator.recoveryFor(snapshot);
       const lkgInputFields = new WeakMap(snapshot.inputs.flatMap((input) => {
         const message = event.messages[input.messageIndex];
         return message && typeof message === "object" ? [[message, input.fields]] : [];
@@ -38195,7 +38752,7 @@ function registerPiContextHandler(pi, baseOptions) {
               rawContextWindow: piUsage?.contextWindow,
               detectedContextLimit: state.detectedContextLimit
             })?.usableHard;
-          if (lkgCompactionOff || lkgEmergencyRecoveryArmed || isProviderOverflowFailClosedProven(sessionId))
+          if (lkgCompactionOff || recovery.rebuildReason || lkgEmergencyRecoveryArmed || isProviderOverflowFailClosedProven(sessionId))
             return;
           const replay = lkgCoordinator.replay(snapshot, (id) => ctx.sessionManager.getEntry?.(id)?.parentId);
           if (!replay.ok)
@@ -38490,7 +39047,7 @@ function registerPiContextHandler(pi, baseOptions) {
       }
       if (stableIdSchemeCutover && !options.compactionOff) {
         schedulerDecision = "execute";
-        signalPiPendingMaterialization(sessionId);
+        signalPiPendingMaterialization(sessionId, "tag_identity_repair");
         sessionLog2(sessionId, `stable-id scheme cutover: stored=${storedStableIdScheme} < current=${PI_STABLE_ID_SCHEME} — forcing execute+materialize this pass`);
       }
       const tBoundaryChecks = performance.now();
@@ -38560,6 +39117,8 @@ function registerPiContextHandler(pi, baseOptions) {
       assertCurrentPass();
       const inputForThinkingFit = isPrefixBoundThinkingModel(ctx.model?.provider, ctx.model?.id) ? structuredClone(event.messages) : null;
       const pipelineArgs = {
+        recoveryPrefix: recovery.prefix,
+        recoveryRebuildReason: recovery.rebuildReason,
         assertCurrentPass,
         db: options.db,
         tagger,
@@ -38641,12 +39200,12 @@ function registerPiContextHandler(pi, baseOptions) {
             return;
           }
           logPiLkgRecovery(sessionId, "Pi held identity rebuild: replaying the served prefix and retaining the pending repair");
-          throw new PiLkgAdmissionReplay(replay.messages, "held tag-identity rebuild: replaying the served prefix");
+          throw new PiLkgAdmissionReplay(replay.messages, "held tag-identity rebuild: replaying the served prefix", "held_identity_repair");
         }
       };
       let result = await budget.waitMandatory(runPipeline(pipelineArgs));
       logTransformTiming(sessionId, "runPipeline", tRunPipeline);
-      if (result.identityRebuilt)
+      if (result.identityRebuilt || result.lkgFrozenReleaseReason)
         schedulerDecision = "execute";
       const postPipelineStart = performance.now();
       const tTransformDecision = performance.now();
@@ -38669,7 +39228,8 @@ function registerPiContextHandler(pi, baseOptions) {
           droppedTokens: result.droppedTokens,
           droppedCount: result.droppedCount,
           inputTokens: usageInputTokens,
-          bustedThisPass: true
+          bustedThisPass: true,
+          lkgFrozenReleaseReason: result.lkgFrozenReleaseReason
         }, piDecisionSnapshotNewestAssistant, budget.assertDecisionPublication);
       } : undefined;
       logTransformTiming(sessionId, "transformDecisionAndReuseState", tTransformDecision);
@@ -38838,15 +39398,38 @@ function registerPiContextHandler(pi, baseOptions) {
             entryIds: outputEntryIds,
             provider: lkgProviderKey ?? undefined,
             model: ctx.model?.id,
-            cacheBustingPass: result.signedPrefixRewritten || result.prefixBustPermitted && !result.strictThinkingKept && (isCacheBusting || result.prefixRebuildAlreadyPriced || result.executedWorkThisPass && (result.prefixEditBesidesReasoningTrim || hostEditBeforeNewestThinking)),
+            cacheBustingPass: !!recovery.rebuildReason || result.signedPrefixRewritten || result.prefixBustPermitted && !result.strictThinkingKept && (isCacheBusting || result.prefixRebuildAlreadyPriced || result.executedWorkThisPass && (result.prefixEditBesidesReasoningTrim || hostEditBeforeNewestThinking)),
             stripActiveTurn: result.signedPrefixRewritten,
+            requirePersistence: !!recovery.rebuildReason,
             report: (line) => sessionLog2(sessionId, line)
           });
         } catch (err) {
+          if (recovery.rebuildReason)
+            throw err;
           sessionLog2(sessionId, `proactive thinking strip failed: ${err instanceof Error ? err.message : String(err)}`);
         }
       }
       logTransformTiming(sessionId, "thinkingBinding", tThinkingBinding);
+      if (recovery.prefix && !result.recoveryNormalized) {
+        const priorIds = new Set(recovery.prefix.inputs.map((input) => input.id));
+        const newIds = new Set(snapshot.inputs.filter((input) => !priorIds.has(input.id)).map((input) => input.id));
+        const suffix = outputMessages.filter((message) => {
+          const id = result.postCommitEntryIdByRef.get(message) ?? result.lkgEntryIdByRef.get(message);
+          return id !== undefined && newIds.has(id);
+        });
+        const prefix = JSON.parse(recovery.prefix.json);
+        const recoveredEntryIds = new Map(result.postCommitEntryIdByRef);
+        prefix.forEach((message, index) => {
+          const id = recovery.prefix?.outputEntryIds[index];
+          if (id)
+            recoveredEntryIds.set(message, id);
+        });
+        result.postCommitEntryIdByRef = recoveredEntryIds;
+        outputMessages = [...prefix, ...suffix];
+        result.syntheticLeadingCount = recovery.prefix.outputEntryIds.findIndex((id) => id !== null);
+        if (result.syntheticLeadingCount < 0)
+          result.syntheticLeadingCount = prefix.length;
+      }
       const tChannelAccounting = performance.now();
       try {
         const sessionMetaForCh1 = sessionMeta;
@@ -38968,7 +39551,8 @@ function registerPiContextHandler(pi, baseOptions) {
       runPiDebugAssertion(assertTailHygieneLastWriter);
       if (!options.compactionOff && (result.executedWorkThisPass || isCacheBusting || schedulerDecision === "execute")) {
         const envelope = readPiLkgFitEnvelope(ctx, pi, resolvePiContextModelKey(ctx), sessionDecisionCalibration(options.db, sessionId), toolWireSchema);
-        let estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, lkgPassSnapshot ? lkgCoordinator.measureOutgoingPrefix(lkgPassSnapshot, outputMessages, (id) => ctx.sessionManager.getEntry?.(id)?.parentId) : undefined, rawFallbackLimit);
+        const measuredPrefix = lkgPassSnapshot ? lkgCoordinator.measureOutgoingPrefix(lkgPassSnapshot, outputMessages, (id) => ctx.sessionManager.getEntry?.(id)?.parentId) : undefined;
+        let estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, measuredPrefix, rawFallbackLimit);
         if (inputForThinkingFit && result.strictThinkingKept && rawFallbackLimit && estimate.refusalGrade && (estimate.refusalTokens ?? estimate.tokens) > rawFallbackLimit) {
           result = await budget.waitMandatory(runPipeline({
             ...pipelineArgs,
@@ -38994,6 +39578,16 @@ function registerPiContextHandler(pi, baseOptions) {
           });
           estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, undefined, rawFallbackLimit);
         }
+        const opaqueFallbackSteps = piOpaqueThinkingFallbackSteps(outputMessages);
+        if (opaqueFallbackSteps > 0)
+          sessionLog2(sessionId, `opaque thinking fallback: steps=${opaqueFallbackSteps} tokensPerStep=1000 (native usage unavailable; telemetry only)`);
+        if (measuredPrefix?.previousMessages?.some((raw) => {
+          const message = raw;
+          return Array.isArray(message.content) && message.content.some((part) => part.thinkingSignature);
+        })) {
+          const previous = estimatePiOutgoingInputTokens(measuredPrefix.previousMessages, envelope);
+          sessionLog2(sessionId, `thinking estimate drift: estimate=${previous.tokens} provider=${measuredPrefix.inputTokens} ratio=${(previous.tokens / measuredPrefix.inputTokens).toFixed(4)} (previous served request; telemetry only)`);
+        }
         if (result.signedPrefixRewritten && rawFallbackLimit && estimate.refusalGrade && (estimate.refusalTokens ?? estimate.tokens) > rawFallbackLimit)
           throw contextRefusalError("The request remains over the model window after stripping signed thinking and reclaiming context");
         const refusal = outgoingContextRefusal(estimate, rawFallbackLimit, protectedToolTokenCount(getActiveTagsBySession2(options.db, sessionId), options.protectedTools, envelope ? calibrationForModelKey(envelope.modelKey) : undefined));
@@ -39026,10 +39620,18 @@ function registerPiContextHandler(pi, baseOptions) {
             snapshot: lkgPassSnapshot,
             outputMessages,
             outputEntryIds: resolvePiLkgOutputEntryIds(outputMessages, result.syntheticLeadingCount, (message) => result.postCommitEntryIdByRef.get(message) ?? result.lkgEntryIdByRef.get(message)),
-            cacheBusting: result.bustedThisPass
+            cacheBusting: result.bustedThisPass,
+            releaseRecovery: result.recoveryNormalized || !!recovery.rebuildReason
           });
           numbersCommitted = true;
         } catch (error) {
+          if (error instanceof LkgRecoveryFenceError)
+            throw new PiServedIdentityError(error);
+          try {
+            invalidateCleanLkgRecoveryFence(sessionId, () => loadPersistedLkgSlot(options.db, sessionId));
+          } catch (fenceError) {
+            throw new PiServedIdentityError(fenceError);
+          }
           budget.assertOutcome();
           clearPiLkgSessionState(sessionId);
           if (error instanceof PiLkgUncapturable) {
@@ -39076,8 +39678,12 @@ function registerPiContextHandler(pi, baseOptions) {
       }
       budget.assertOutcome();
       publishTransformDecision?.();
+      if (!budget.sideTurn && result.strictThinkingKept && !result.signedPrefixRewritten && !result.materialized)
+        recordPiHeldSystemHead(sessionId, (ownsHistory) => deferPiDeliveredSystemRefresh(sessionId, ownsHistory));
       return { messages: outputMessages };
     } catch (err) {
+      if (budget.isCancelled(err))
+        throw err;
       budget.assertOutcome();
       budget.stage = "recovery";
       if (err instanceof PiServedIdentityError) {
@@ -39087,9 +39693,11 @@ function registerPiContextHandler(pi, baseOptions) {
       }
       if (err instanceof PiLkgAdmissionReplay && sessionIdForError) {
         budget.assertOutcome();
+        if (lkgPassSnapshot && err.trigger === "writer_busy")
+          lkgCoordinator.noteRecovery(lkgPassSnapshot, err.messages);
         if (!budget.sideTurn)
           captureServedEvidence(sessionIdForError, err.messages, {
-            db: baseOptions.db,
+            recoveryWithoutTagState: true,
             assertCurrentPass: budget.assertOutcome
           });
         budget.assertOutcome();
@@ -39116,7 +39724,10 @@ function registerPiContextHandler(pi, baseOptions) {
       const failureLabel = transientStorageFailure ? "TRANSIENT STORAGE FAILURE" : "DEGRADED PASS";
       if (replayOrRefuse && sessionIdForError && lkgPassSnapshot && !lkgCompactionOff && !lkgEmergencyRecoveryArmed) {
         try {
-          const replay = lkgCoordinator.replay(lkgPassSnapshot, (id) => ctx.sessionManager.getEntry?.(id)?.parentId);
+          const replay = lkgCoordinator.recoveryFor(lkgPassSnapshot).rebuildReason ? {
+            ok: false,
+            reason: lkgPassSnapshot.replayFailure ?? "lkg_recovery_unproven"
+          } : lkgCoordinator.replay(lkgPassSnapshot, (id) => ctx.sessionManager.getEntry?.(id)?.parentId);
           if (replay.ok) {
             assertPiRawFallbackFits(replay.messages, rawFallbackLimit, (line) => {
               if (sessionIdForError)
@@ -39125,9 +39736,10 @@ function registerPiContextHandler(pi, baseOptions) {
             const reason = piStorageErrorReason(err);
             logPiLkgRecovery(sessionIdForError, `${failureLabel} ${reason}: LKG replay served ${replay.messages.length} messages instead of raw ${rawMessageCount}`);
             budget.assertOutcome();
+            lkgCoordinator.noteRecovery(lkgPassSnapshot, replay.messages);
             if (!budget.sideTurn)
               captureServedEvidence(sessionIdForError, replay.messages, {
-                db: baseOptions.db,
+                recoveryWithoutTagState: true,
                 assertCurrentPass: budget.assertOutcome
               });
             budget.assertOutcome();
@@ -39781,7 +40393,7 @@ async function runPipeline(args) {
     parts: (message) => Array.isArray(message?.content) ? message.content : []
   });
   if (thinkingRecovery.ended)
-    signalPiPendingMaterialization(args.sessionId);
+    signalPiPendingMaterialization(args.sessionId, "thinking_hold");
   let restoreOriginals;
   let activeThinkingTurn = hasActiveAnthropicThinkingTurn(args.messages, args.resolvedProviderID, args.resolvedModelID);
   let protectedSignedPrefix = activeThinkingTurn && args.reasoningClearing?.prefixBound === true;
@@ -39798,7 +40410,8 @@ async function runPipeline(args) {
       model: args.resolvedModelID,
       cacheBustingPass: true,
       stripActiveTurn: true,
-      persistOnly: true
+      persistOnly: true,
+      requirePersistence: !!args.recoveryRebuildReason
     });
     if (activeThinkingTurn && !result)
       throw new Error("Cannot persist signed thinking omission before prefix rewrite");
@@ -39806,7 +40419,7 @@ async function runPipeline(args) {
     activeThinkingTurn = false;
     protectedSignedPrefix = false;
   };
-  if (args.forceSignedRebuildForFit && protectedSignedPrefix)
+  if (args.recoveryRebuildReason || args.forceSignedRebuildForFit && protectedSignedPrefix)
     stripForPrefixRewrite();
   const realStableId = (msg, index) => resolvePiRealStableId(msg, index, args.entryIds, args.entryIdByRef ?? undefined);
   const passFallbackIds = settlePiFallbackOccurrences(args.db, args.sessionId, piContentFallbackIds(args.messages, realStableId));
@@ -40164,6 +40777,8 @@ async function runPipeline(args) {
     ...message,
     parts: message.parts
   }));
+  const recoveryNormalized = !!args.recoveryPrefix && (foldBustsServedPrefixThisPass || firstRenderBust || identityRebuild);
+  const taggingView = args.recoveryPrefix && !recoveryNormalized ? mutationView.filter((message) => !args.recoveryPrefix?.untaggedInputIds.has(message.info.id ?? "")) : mutationView;
   let tagTextTokenCache = piTagTextTokenCacheBySession.get(args.sessionId);
   if (!tagTextTokenCache) {
     tagTextTokenCache = new Map;
@@ -40176,7 +40791,7 @@ async function runPipeline(args) {
   }
   const { targets } = runPersistedReplayStage("tagging-persistence-failure", () => args.tagger.cleanup(args.sessionId), () => {
     args.assertCurrentPass?.();
-    return tagTranscript(args.sessionId, { ...transcript, messages: mutationView }, args.tagger, args.db, {
+    return tagTranscript(args.sessionId, { ...transcript, messages: taggingView }, args.tagger, args.db, {
       skipPrefixInjection: !ctxReduceCallable,
       entryFingerprintByMessageId,
       reuseMessageIds: textIdentityPlan.reusableMessageIds,
@@ -40310,7 +40925,7 @@ async function runPipeline(args) {
     shouldRunReasoningCleanup: args.reasoningClearing !== undefined && shouldRunHeuristics
   });
   if (shouldApplyPendingOps) {
-    const applyReason = hasPendingMaterializeSignal ? "explicit_flush" : deferredMaterialize ? "deferred_publication" : args.forceMaterialization ? "force_materialization" : foldBustsServedPrefixThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `${reclaimRideLabel(rideSignals)} (scheduler=${args.schedulerDecision})`;
+    const applyReason = hasPendingMaterializeSignal ? `pending_materialization origin=${pendingMaterializationOrigin(pendingMaterializationSessions, args.sessionId)}` : deferredMaterialize ? "deferred_publication" : args.forceMaterialization ? "force_materialization" : foldBustsServedPrefixThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `${reclaimRideLabel(rideSignals)} (scheduler=${args.schedulerDecision})`;
     const pendingOpsDepth = getPendingOpsCount(args.db, args.sessionId);
     const pendingDecisionLog = `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${pendingOpsDepth === null ? "not loaded (deferred pass)" : pendingOpsDepth} context=${args.contextUsage.percentage.toFixed(1)}%`;
     sessionLog2(args.sessionId, pendingDecisionLog);
@@ -40655,7 +41270,7 @@ async function runPipeline(args) {
     db: args.db,
     sessionId: args.sessionId,
     activeTags,
-    targets: newTargets,
+    targets,
     legacyReminderTagNumbers: textIdentityPlan.legacyReminderTagNumbers,
     cacheBusting: isCacheBustingPass
   });
@@ -40912,7 +41527,7 @@ async function runPipeline(args) {
     }
   }
   const materializeReason = identityRebuild ? PI_TAG_IDENTITY_REPAIR_REASON : injectionResult?.m0Reason ?? null;
-  const bustedThisPass = identityRebuild || firstRenderBust || pendingOpsDidMutate || heuristicOrReasoningDidMutate || autoReclaimDidMutateThisPass || materialized || historyWasConsumedThisPass;
+  const bustedThisPass = !!args.recoveryRebuildReason || recoveryNormalized || identityRebuild || firstRenderBust || pendingOpsDidMutate || heuristicOrReasoningDidMutate || autoReclaimDidMutateThisPass || materialized || historyWasConsumedThisPass;
   const calibrationBustReason = identityRebuild ? PI_TAG_IDENTITY_REPAIR_REASON : materialized || firstRenderBust ? "fold" : args.forceMaterialization ? "force" : pendingOpsDidMutate ? "flush" : historyWasConsumedThisPass ? "refresh" : args.schedulerDecision === "execute" ? "execute" : "unknown";
   const activeCalibration = sessionDecisionCalibration(args.db, args.sessionId, {
     bustPermitted: bustedThisPass,
@@ -40952,6 +41567,8 @@ async function runPipeline(args) {
   }
   return {
     messages: outputMessages,
+    recoveryNormalized,
+    lkgFrozenReleaseReason: args.recoveryRebuildReason ?? (recoveryNormalized ? "recovery_tail_normalized" : undefined),
     prefixBustPermitted: isCacheBustingPass,
     prefixMutationAllowed,
     strictThinkingKept: protectedSignedPrefix,
@@ -40972,7 +41589,7 @@ async function runPipeline(args) {
     emergency,
     bustedThisPass,
     agentDropsAppliedThisPass: pendingOpsDidMutate,
-    prefixEditBesidesReasoningTrim: prefixEditBesidesReasoningTrim || firstRenderBust || args.isCacheBusting || hasPendingMaterializeSignal || deferredMaterializationConsumedThisPass || foldBustsServedPrefixThisPass || publishedM1RefreshedThisPass || materialized || historyWasConsumedThisPass || pendingOpsDidMutate || autoReclaimDidMutateThisPass || emergency,
+    prefixEditBesidesReasoningTrim: !!args.recoveryRebuildReason || prefixEditBesidesReasoningTrim || firstRenderBust || args.isCacheBusting || hasPendingMaterializeSignal || deferredMaterializationConsumedThisPass || foldBustsServedPrefixThisPass || publishedM1RefreshedThisPass || materialized || historyWasConsumedThisPass || pendingOpsDidMutate || autoReclaimDidMutateThisPass || emergency,
     targetCount: targets.size,
     reasoningWatermark: args.sessionMeta.clearedReasoningThroughTag ?? 0,
     activeTags,
@@ -41199,7 +41816,7 @@ function appendReminderToPiUserMessage(message, reminder) {
 function clearPiCompactionOffInMemoryState(sessionId) {
   historyRefreshSessions.delete(sessionId);
   deferredHistoryRefreshSessions.delete(sessionId);
-  pendingMaterializationSessions.delete(sessionId);
+  clearPendingMaterialization(pendingMaterializationSessions, sessionId);
   deferredMaterializationSessions.delete(sessionId);
   clearPiChannel1State(sessionId);
 }
@@ -41212,7 +41829,7 @@ function clearContextHandlerSession(sessionId) {
   clearAutoSearchForPiSession(sessionId);
   lastEmergencyNotificationAtMs.delete(sessionId);
   historyRefreshSessions.delete(sessionId);
-  pendingMaterializationSessions.delete(sessionId);
+  clearPendingMaterialization(pendingMaterializationSessions, sessionId);
   systemPromptRefreshSessions.delete(sessionId);
   deferredHistoryRefreshSessions.delete(sessionId);
   deferredMaterializationSessions.delete(sessionId);
@@ -43880,112 +44497,6 @@ function buildStatusViewFor(check, options) {
     }, check.versions, options);
   }
 }
-// package.json
-var package_default = {
-  name: "@cortexkit/pi-magic-context",
-  version: "0.49.0",
-  type: "module",
-  description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
-  main: "dist/index.js",
-  license: "MIT",
-  author: "ualtinok",
-  keywords: [
-    "pi",
-    "pi-coding-agent",
-    "omp",
-    "oh-my-pi",
-    "extension",
-    "context",
-    "memory",
-    "magic-context",
-    "ai",
-    "llm"
-  ],
-  repository: {
-    type: "git",
-    url: "https://github.com/cortexkit/magic-context",
-    directory: "packages/pi-plugin"
-  },
-  files: [
-    "dist",
-    "README.md"
-  ],
-  "//": "The build intentionally bundles typebox (no --external typebox) and keeps it a regular dependency. OMP's extension loader rewrites every bare `typebox` import to its own omptype-based shim, whose schemas are callable objects rather than JSON Schema; they fail structuredClone during tool registration, so an external typebox import stops Magic Context loading on OMP. src/typebox-bundling.test.ts guards this.",
-  scripts: {
-    build: "bun ../../scripts/check-bun.mjs && tsc -p ../retina-local-fs/tsconfig.build.json && bun ../../scripts/clean-dist-chunks.mjs dist index.js subagent-entry.js historian-calibration-extension.js raw-ordinal-warmup-worker.js transformers-web.js transformers-node-wasm.js && bun build ../plugin/src/features/magic-context/memory/transformers-web-entry.ts --outfile dist/transformers-web.js --target browser --format esm --external onnxruntime-web && bun ../plugin/scripts/build-transformers-node-wasm.ts dist && bun build src/index.ts src/subagent-entry.ts src/historian-calibration-extension.ts ../plugin/src/features/magic-context/memory/embedding-worker.ts ../plugin/src/features/magic-context/migration-worker.ts ../plugin/src/hooks/magic-context/auto-search-worker.ts ../plugin/src/hooks/magic-context/raw-ordinal-warmup-worker.ts --outdir dist --entry-naming '[name].[ext]' --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @oh-my-pi/pi-coding-agent --external @earendil-works/pi-tui --external onnxruntime-node --external onnxruntime-web --external sharp --external node:sqlite",
-    "build:e2e-argv": `bun ../../scripts/clean-dist-chunks.mjs ../../tests/docker/.generated subagent-runner-e2e.mjs && bun build src/subagent-runner.ts --outdir ../../tests/docker/.generated --entry-naming 'subagent-runner-e2e.mjs' --splitting --target node --format esm --external node:sqlite && node --input-type=module -e 'const { __test } = await import("../../tests/docker/.generated/subagent-runner-e2e.mjs"); if (typeof __test.buildArgs !== "function" || typeof __test.resolvePiInvocation !== "function") throw new Error("argv renderer exports missing"); console.log("Node argv renderer: 2 exports loaded")'`,
-    typecheck: "tsc -p ../retina-local-fs/tsconfig.build.json && tsc --noEmit",
-    test: "bun ../../scripts/check-bun.mjs && bun install --frozen-lockfile && BUN_JSC_useOMGJIT=0 bun test --parallel=4 --timeout 30000",
-    "test:serial": "bun ../../scripts/check-bun.mjs && bun install --frozen-lockfile && BUN_JSC_useOMGJIT=0 bun test --parallel=1 --timeout 30000",
-    lint: "bun ../../scripts/check-bun.mjs && biome check src",
-    "lint:fix": "biome check --write src",
-    format: "biome format --write src",
-    "format:check": "biome format src",
-    clean: "bun ../../scripts/clean-dist-chunks.mjs dist index.js subagent-entry.js historian-calibration-extension.js embedding-worker.js migration-worker.js raw-ordinal-warmup-worker.js transformers-web.js transformers-node-wasm.js",
-    prepublishOnly: "bun run build"
-  },
-  "//test": "Test runs cap file-isolated workers at four (one for test:serial) and disable JSC's optimizing WebAssembly tier so per-file isolation does not pay its compilation cost on every file. These are not production settings and do not change host process engine options.",
-  dependencies: {
-    "@cortexkit/subc-client": "0.11.1",
-    "@jitl/quickjs-singlefile-cjs-release-asyncify": "0.32.0",
-    "ai-tokenizer": "^1.0.6",
-    "comment-json": "^5.0.0",
-    "onnxruntime-web": "1.26.0-dev.20260416-b7804b056c",
-    "quickjs-emscripten": "^0.32.0",
-    zod: "^4.1.8"
-  },
-  optionalDependencies: {
-    "onnxruntime-node": "1.30.0",
-    sharp: "^0.35.0"
-  },
-  devDependencies: {
-    "@biomejs/biome": "^2.5.1",
-    "@earendil-works/pi-ai": "0.83.0",
-    "@earendil-works/pi-coding-agent": "0.83.0",
-    "@earendil-works/pi-tui": "0.83.0",
-    "@huggingface/transformers": "^4.3.0",
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/bun": "^1.3.10",
-    "@types/node": "^22.20.0",
-    "pi-agent-core-087": "npm:@earendil-works/pi-agent-core@0.87.1",
-    "pi-ai-086": "npm:@earendil-works/pi-ai@0.86.0",
-    "pi-coding-agent-086": "npm:@earendil-works/pi-coding-agent@0.86.0",
-    "pi-coding-agent-087": "npm:@earendil-works/pi-coding-agent@0.87.1",
-    typebox: "^1.3.1",
-    typescript: "^5.8.0"
-  },
-  peerDependencies: {
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    typebox: "*"
-  },
-  peerDependenciesMeta: {
-    "@earendil-works/pi-coding-agent": {
-      optional: true
-    },
-    "@earendil-works/pi-tui": {
-      optional: true
-    },
-    typebox: {
-      optional: true
-    }
-  },
-  exports: {
-    ".": {
-      import: "./dist/index.js"
-    }
-  },
-  pi: {
-    extensions: [
-      "./dist/index.js"
-    ]
-  },
-  omp: {
-    extensions: [
-      "./dist/index.js"
-    ]
-  }
-};
 
 // src/dialogs/status-dialog.ts
 var REFRESH_INTERVAL_MS = 1000;
@@ -45498,6 +46009,7 @@ function withTimeout(p, ms) {
 }
 
 // src/index.ts
+registerStandalonePluginMarker(package_default.version);
 var PI_HARNESS_DETECTION = await resolvePiHarnessDetection();
 var PI_HARNESS_KIND = PI_HARNESS_DETECTION.kind;
 var PREFIX2 = `[magic-context][${PI_HARNESS_KIND}]`;
@@ -45743,6 +46255,7 @@ function resolvePiPressureContextLimit(args) {
   }) ?? 0;
 }
 async function persistPiPressureFromMessageEnd(args) {
+  acknowledgePiSystemPromptResponse(args.sessionId, args.message);
   if (piMessageAnchorsLiveUsage(args.message)) {
     recordPiLiveUsageClassification(args.sessionId, false);
   } else if (typeof args.piTokensIsRawBranchEstimate === "boolean") {
@@ -45970,7 +46483,6 @@ async function src_default(pi) {
     info("plugin DISABLED via config (enabled: false) — skipping registration");
     return;
   }
-  reloadWindowOverlay(bootConfig.config.models?.window_overlay_path);
   setStoragePrivatePermissionEnforcement(bootConfig.config.storage.enforce_private_permissions);
   setSqlitePragmaConfig({
     cacheSizeMb: bootConfig.config.sqlite.cache_size_mb,
@@ -46754,9 +47266,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
         promptSurfacePreset: promptSurface.preset
       });
       if (result.hashChanged) {
-        signalPiHistoryRefresh(sessionId);
-        signalPiSystemPromptRefresh(sessionId);
-        signalPiPendingMaterialization(sessionId);
+        signalPiSystemHashChange(sessionId, result.currentHash);
       }
       if (isCacheBusting) {
         clearSystemPromptRefresh(sessionId);
@@ -46772,6 +47282,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
   });
   info("registered before_agent_start system prompt injector");
   pi.on("agent_end", (event, ctx) => {
+    acknowledgePiPendingSystemPromptResponses(ctx.sessionManager.getSessionId());
     setEmbeddingSessionBusy2(ctx.sessionManager.getSessionId(), false);
     log2("agent_end: returning synchronously (background work continues)");
     try {