@cortexkit/pi-magic-context 0.49.20 → 0.49.21

package/dist/index.js

@@ -249,7 +249,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-jt0g3hn0.js";
+} from "./index-w6r3ggnp.js";
 import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
@@ -267,7 +267,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DREAM_TASK_PROMOTION_DEFAULTS,
   LIVE_RELOAD_CONFIG_PATHS
-} from "./index-bxmf4dhr.js";
+} from "./index-ccanzg8p.js";
 import {
   FAIL_CLOSED_DOCTOR_COMMAND,
   formatFailClosedBlockingMessage,
@@ -290,7 +290,7 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-mtvvhcw4.js";
+} from "./index-dbgg6hsf.js";
 import {
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
@@ -302,7 +302,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-p63nwn5v.js";
+} from "./index-hxp6q5f8.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -463,7 +463,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-zhwwp8zz.js";
+} from "./index-gqjxy2p7.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -550,7 +550,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-bttctq07.js";
+} from "./index-n8e5e9fp.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -567,6 +567,7 @@ import {
   inRootAsyncContext2,
   Database2,
   getSqliteDatabasePath2,
+  withSqliteTurnDeadline2,
   withSqliteBackgroundWriter2,
   withSqliteTransformPass2,
   withoutSqliteTransformPass2,
@@ -575,7 +576,7 @@ import {
   isTransientSqliteError2,
   withAsyncPrivilegedWriter2,
   indexCoordinationInput2
-} from "./index-hws5f0z9.js";
+} from "./index-2qtx0q6h.js";
 import {
   stableStringify,
   closeQuietly,
@@ -613,7 +614,7 @@ import {
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./index-vdy273xw.js";
+} from "./index-wgmhk91m.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -629,11 +630,11 @@ import {
 import {
   runSessionWarmupWorker,
   RAW_SUMMARY_TEXT_MAX_CHARS2
-} from "./index-rfyvax95.js";
+} from "./index-at6py2k3.js";
 import {
   formatSynapseLaneDescriptor
-} from "./index-jxjr7kz9.js";
-import"./index-rgfb753z.js";
+} from "./index-gwxaz0z5.js";
+import"./index-579m1751.js";
 import {
   buildCanonicalChunkTextFromFts2,
   buildCompartmentSummaryFallbackText2,
@@ -643,7 +644,7 @@ import {
   replaceCompartmentChunkEmbeddings2,
   deleteChunkEmbedBackoffForSession2,
   chunkWindowSourceKey2
-} from "./index-5n5zxs8e.js";
+} from "./index-vx6f7wff.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -652,7 +653,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-qerzchrs.js";
+} from "./index-j3pz3a1b.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -678,7 +679,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-v2epyzbm.js";
+} from "./index-w1twp2kp.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -693,7 +694,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-5vgt1zeh.js";
+} from "./index-3c3ztwgc.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -743,7 +744,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-af9t637y.js";
+} from "./index-ftvm2acc.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -767,7 +768,7 @@ import {
   setMemoryClassification2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./index-dzem6gn9.js";
+} from "./index-29nw7n1r.js";
 import {
   invalidateMemory2
 } from "./index-yhzhdp3m.js";
@@ -776,11 +777,11 @@ import {
 } from "./index-q1yc6bs0.js";
 import {
   getCachedLocalEmbeddingPooling
-} from "./index-e19qtjj0.js";
+} from "./index-wqpjhx1p.js";
 import {
   cosineSimilarity
-} from "./index-b8am7tns.js";
-import"./index-6kb2xpw7.js";
+} from "./index-pe5gz5c4.js";
+import"./index-6wdwv3a6.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
   buildHiddenAgentRegistrations,
@@ -793,6 +794,10 @@ import {
   SUBAGENT_OUTPUT_CEILING_ENV2
 } from "./index-fa485mqs.js";
 import {
+  PI_CONTEXT_BUDGET,
+  PiContextDeadlineError,
+  PiContextSupersededError,
+  PiContextBudget,
   PiTagHydrationError,
   getPiTagSnapshotView,
   getPiActiveTagSnapshotView,
@@ -802,10 +807,10 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-kqb3d8bs.js";
+} from "./index-5j6vwg4z.js";
 import"./index-jn44h81p.js";
 import"./index-1cvyaw9a.js";
-import"./index-tb3d9trm.js";
+import"./index-st4gwt64.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -3547,7 +3552,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.20",
+  version: "0.49.21",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -3596,7 +3601,7 @@ var package_default = {
     "comment-json": "^5.0.0",
     "onnxruntime-web": "1.26.0-dev.20260416-b7804b056c",
     "quickjs-emscripten": "^0.32.0",
-    zod: "^4.1.8"
+    zod: "^4.6.6"
   },
   optionalDependencies: {
     "onnxruntime-node": "1.30.0",
@@ -3612,9 +3617,12 @@ var package_default = {
     "@types/bun": "^1.3.10",
     "@types/node": "^22.20.0",
     "omp-coding-agent-1812": "npm:@oh-my-pi/pi-coding-agent@18.12.3",
+    "omp-coding-agent-18126": "npm:@oh-my-pi/pi-coding-agent@18.12.6",
+    "omp-pi-ai-171": "npm:@oh-my-pi/pi-ai@17.1.7",
     "omp-pi-ai-1889": "npm:@oh-my-pi/pi-ai@18.8.9",
     "omp-pi-ai-1811": "npm:@oh-my-pi/pi-ai@18.11.3",
     "omp-pi-ai-1812": "npm:@oh-my-pi/pi-ai@18.12.3",
+    "omp-pi-ai-18126": "npm:@oh-my-pi/pi-ai@18.12.6",
     "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-ai-087": "npm:@earendil-works/pi-ai@0.87.1",
@@ -5328,7 +5336,7 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
       throwWithPromptFailure(failure.error, failedAttempts, args, timeoutMs, options.transport);
     }
     if (!cooledPrimary && !quota)
-      log2(`[${callContext}] primary (${explicitPrimaryLabel}) failed validation/prompt: ${shortErr(failure.error)}; trying ${fallbacks.length} fallback(s)`);
+      log2(`[${callContext}] primary (${explicitPrimaryLabel}) failed validation/prompt: ${shortErr(failure.error)}; ${fallbacks.length} fallback(s) configured, subject to remaining budget`);
   }
   for (let i = 0;i < fallbacks.length; i += 1) {
     const fallback = toModelEntry(fallbacks[i]);
@@ -12285,28 +12293,35 @@ function diff(name, before, after) {
     rmSync(dir, { recursive: true, force: true });
   }
 }
-function validateDocsProposal(projectDir, output, budget, expected) {
-  if (Object.entries(expected).some(([name, value]) => docsBaseHashes(projectDir)[name] !== value))
-    throw new Error("base drifted");
+function parseDocsProposalOutput(output) {
   const match = output.match(/```json\s*([\s\S]*?)```/);
   const parsed = JSON.parse(match?.[1] ?? output);
   if (!Array.isArray(parsed))
     throw new Error("proposal must be a JSON array");
   const changes = parsed;
-  if (!changes.length)
-    throw new Error("empty proposal");
   if (changes.some((item) => !item || !FILES.includes(item.file)))
     throw new Error("unknown proposal file");
+  const seen = new Set;
+  for (const change of changes) {
+    const key = `${change.file}:${change.heading}`;
+    if (!["replace", "add", "remove"].includes(change.action) || typeof change.heading !== "string" || !/^#{1,6} [^\r\n]+$/.test(change.heading) || typeof change.text !== "string" || typeof change.reason !== "string" || !change.reason.trim() || /[\r\n]/.test(change.reason) || seen.has(key))
+      throw new Error(`invalid section change in ${change.file}`);
+    seen.add(key);
+  }
+  return changes;
+}
+function validateDocsProposal(projectDir, output, budget, expected) {
+  if (Object.entries(expected).some(([name, value]) => docsBaseHashes(projectDir)[name] !== value))
+    throw new Error("base drifted");
+  const changes = parseDocsProposalOutput(output);
+  if (!changes.length)
+    throw new Error("empty proposal");
   let tokens = 0;
   let diffs = "";
   for (const file of FILES) {
     const before = existsSync6(join8(projectDir, file)) ? readFileSync6(join8(projectDir, file), "utf8") : "";
     let after = before;
-    const seen = new Set;
     for (const change of changes.filter((item) => item.file === file)) {
-      if (!["replace", "add", "remove"].includes(change.action) || typeof change.heading !== "string" || !/^#{1,6} [^\r\n]+$/.test(change.heading) || typeof change.text !== "string" || typeof change.reason !== "string" || !change.reason.trim() || /[\r\n]/.test(change.reason) || seen.has(change.heading))
-        throw new Error(`invalid section change in ${file}`);
-      seen.add(change.heading);
       const section = sections(after).find((item) => item.heading === change.heading);
       if (change.action === "add") {
         if (section || !change.text.startsWith(`${change.heading}
@@ -18726,6 +18741,8 @@ async function runAgenticTask(config, ctx, helpers) {
           timeoutMs: Math.min(Math.max(0, deadline - Date.now()), config.timeoutMinutes * 60 * 1000),
           signal: abortController.signal,
           parse: (text, completion) => {
+            if (task === "maintain-docs")
+              parseDocsProposalOutput(text);
             if (task !== "curate")
               return text;
             const memoryOperations = inspectCurateMemoryOperations(completion.messages);
@@ -18789,6 +18806,8 @@ async function runAgenticTask(config, ctx, helpers) {
             if (task !== "curate") {
               if (!text)
                 throw new Error("Dreamer returned no assistant output.");
+              if (task === "maintain-docs")
+                parseDocsProposalOutput(text);
               return text;
             }
             const memoryOperations = inspectCurateMemoryOperations(messages);
@@ -18838,7 +18857,7 @@ async function runAgenticTask(config, ctx, helpers) {
     recordInvocation("completed", run.output);
     if (task === "maintain-docs" && docsHashes && changes) {
       try {
-        if (run.validated === "[]") {
+        if (parseDocsProposalOutput(String(run.validated)).length === 0) {
           helpers.recordRun("completed", null, { progress: "no corrections proposed" });
           return {
             status: "completed",
@@ -19479,6 +19498,8 @@ var RECONCILIATION_BATCH_SIZE = 100;
 
 class MagicContextMessageIndexHeapHolder {
   reconciledSessions = new Set;
+  reconciledSnapshots = new Map;
+  stalledSessions = new Set;
   reconciliationScheduledSessions = new Set;
   clearAndReindexScheduledSessions = new Map;
   sessionLocks = new Map;
@@ -19529,18 +19550,28 @@ function logIndexingError(sessionId, action, error) {
   sessionLog2(sessionId, `message FTS async ${action} failed: ${error instanceof Error ? error.message : String(error)}`);
   log2(`[message-index-async] ${action} failed for ${sessionId}:`, error);
 }
+function logReconciliationStall(sessionId, reason) {
+  if (heapHolder.stalledSessions.has(sessionId))
+    return;
+  heapHolder.stalledSessions.add(sessionId);
+  sessionLog2(sessionId, `message FTS reconciliation stalled: ${reason}; will retry`);
+}
 async function reconcileSessionIndex(db, sessionId, readMessages) {
-  if (!await sourceReady(readMessages, sessionId))
+  if (!await sourceReady(readMessages, sessionId)) {
+    logReconciliationStall(sessionId, "raw message reader is not ready");
     return false;
+  }
   await runWithSessionLock(sessionId, async () => {
-    if (heapHolder.reconciledSessions.has(sessionId))
+    if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId))
       return;
     let fallbackSnapshot = null;
     try {
       const fullReader = typeof readMessages === "function" ? readMessages : null;
-      const finalWatermark = readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
+      const revision = readMessages.getRevision?.(sessionId);
+      const previous = heapHolder.reconciledSnapshots.get(sessionId);
+      const finalWatermark = previous && revision === previous.revision ? previous.count : revision !== undefined && readMessages.getCountAfterRevision ? previous && revision > previous.revision ? previous.count + readMessages.getCountAfterRevision(sessionId, previous.revision, revision) : readMessages.getCountAfterRevision(sessionId, -1, revision) : readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
       let cursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
-      let after;
+      let after = cursor === previous?.count ? previous.after : undefined;
       while (cursor < finalWatermark) {
         const pageEnd = Math.min(finalWatermark, cursor + RECONCILIATION_BATCH_SIZE);
         const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark, after) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
@@ -19559,6 +19590,20 @@ async function reconcileSessionIndex(db, sessionId, readMessages) {
       }
       if (isMessageIndexReconciledThrough2(db, sessionId, finalWatermark)) {
         heapHolder.reconciledSessions.add(sessionId);
+        if (revision !== undefined) {
+          if (!after && finalWatermark > 0 && readMessages.readPage) {
+            const last = readMessages.readPage(sessionId, finalWatermark - 1, 1, finalWatermark).at(-1);
+            if (last?.ordinal === finalWatermark && typeof last.createdAt === "number")
+              after = { timeCreated: last.createdAt, id: last.id };
+          }
+          heapHolder.reconciledSnapshots.set(sessionId, {
+            revision,
+            count: finalWatermark,
+            after
+          });
+        }
+      } else {
+        logReconciliationStall(sessionId, `gap after ordinal ${cursor} (store count ${finalWatermark})`);
       }
     } finally {
       heapHolder.activeReconcilerBuffers.delete(sessionId);
@@ -19567,25 +19612,32 @@ async function reconcileSessionIndex(db, sessionId, readMessages) {
   return true;
 }
 function scheduleReconciliation(db, sessionId, readMessages) {
-  if (heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
+  if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
     return;
   }
   heapHolder.reconciliationScheduledSessions.add(sessionId);
   scheduleAfterBootQuiet(() => {
     defer(() => {
+      let appendedDuringReconciliation = false;
+      const previousSnapshot = heapHolder.reconciledSnapshots.get(sessionId);
       reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
-        if (ran)
+        if (ran) {
+          const snapshot = heapHolder.reconciledSnapshots.get(sessionId);
+          appendedDuringReconciliation = snapshot !== undefined && snapshot !== previousSnapshot && readMessages.getRevision !== undefined && readMessages.getRevision(sessionId) !== snapshot.revision;
           return;
+        }
         inRootAsyncContext2(() => setTimeout(() => {
           heapHolder.reconciliationScheduledSessions.delete(sessionId);
           scheduleReconciliation(db, sessionId, readMessages);
         }, PREPARE_RETRY_MS)).unref?.();
       }).catch((error) => {
-        logIndexingError(sessionId, "reconciliation", error);
+        logReconciliationStall(sessionId, error instanceof Error ? error.message : String(error));
         if (isDatabaseLockedError(error))
           inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
       }).finally(() => {
         heapHolder.reconciliationScheduledSessions.delete(sessionId);
+        if (appendedDuringReconciliation)
+          scheduleReconciliation(db, sessionId, readMessages);
       });
     });
   });
@@ -19718,6 +19770,8 @@ function clearSessionTracking(sessionId) {
     Atomics.store(cancellation, 0, 1);
   heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
   heapHolder.reconciledSessions.delete(sessionId);
+  heapHolder.reconciledSnapshots.delete(sessionId);
+  heapHolder.stalledSessions.delete(sessionId);
   heapHolder.reconciliationScheduledSessions.delete(sessionId);
   heapHolder.sessionLocks.delete(sessionId);
   heapHolder.activeReconcilerBuffers.delete(sessionId);
@@ -25107,7 +25161,7 @@ function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
 
 // ../plugin/src/hooks/magic-context/cache-busting-signals.ts
 function hasReclaimRide(signals) {
-  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true || signals.executeReclaim === true;
+  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true || signals.executeReclaim === true || signals.servedShapeRepair === true;
 }
 function prefixMutationPermitted(gate) {
   return !gate.signedThinkingHold || gate.firstRender || gate.idleExpiry || gate.emergency;
@@ -25121,7 +25175,8 @@ var RECLAIM_RIDE_NAMES = [
   "explicitFlush",
   "publishedHistory",
   "subagentExecute",
-  "executeReclaim"
+  "executeReclaim",
+  "servedShapeRepair"
 ];
 function reclaimRideLabel(signals) {
   const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
@@ -27690,6 +27745,7 @@ function tagTranscript(sessionId, transcript, tagger, db, options = {}) {
           db,
           targets,
           skipPrefixInjection,
+          preserveTagOnlyAssistantText: options.preserveTagOnlyAssistantText,
           entryFingerprint: options.entryFingerprintByMessageId?.get(messageId) ?? null,
           reuseIdentity: reuseIdentity || contentDerivedTextIds !== undefined,
           timing,
@@ -28081,7 +28137,7 @@ function isRecord2(value) {
 function tagTextPart(args) {
   const identityStart = args.timing ? performance.now() : 0;
   const text = args.part.getText() ?? "";
-  if (args.message.info.role === "assistant" && stripWellFormedLeadingTagPrefix(text).trim().length === 0) {
+  if (args.message.info.role === "assistant" && (stripWellFormedLeadingTagPrefix(text).trim().length === 0 || args.preserveTagOnlyAssistantText && text.includes("§") && stripPersistedAssistantText(text).length === 0)) {
     if (args.timing)
       args.timing.identity += performance.now() - identityStart;
     return;
@@ -28673,7 +28729,15 @@ class AutoSearchBusyError extends Error {
   }
 }
 async function searchAutoHint(db, sessionId, projectPath, query, options, entry = new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url)) {
-  return executeAutoSearchWorker(db, sessionId, projectPath, query, options, entry, "search");
+  const {
+    rerankConfig: _rerankConfig,
+    rerankClient: _rerankClient,
+    rerankConnectionFile: _rerankConnectionFile,
+    onRerankSkipped: _onRerankSkipped,
+    captureRerankLanes: _captureRerankLanes,
+    ...hintOptions
+  } = options;
+  return executeAutoSearchWorker(db, sessionId, projectPath, query, { ...hintOptions, explicitSearch: false, rerank: false }, entry, "search");
 }
 var pendingBackfills = new WeakMap;
 var searchWorkers = new WeakMap;
@@ -35216,123 +35280,6 @@ function adaptPiAppendCompaction(sessionManager) {
   };
 }
 
-// src/pi-context-budget.ts
-var PI_CONTEXT_BUDGET = {
-  hostDeadlineMs: 30000,
-  hostMarginMs: 5000,
-  outcomeMs: 25000,
-  fallbackObservedMs: 4,
-  workMs: 21000,
-  writerMs: 16500,
-  completionReserveMs: 2000,
-  searchMs: 3000
-};
-
-class PiContextDeadlineError extends Error {
-}
-
-class PiContextSupersededError extends Error {
-  origin;
-  constructor(message, origin = "context ownership") {
-    super(message);
-    this.origin = origin;
-  }
-}
-
-class PiContextBudget {
-  startedAt;
-  now;
-  sideTurn = false;
-  stage = "entry";
-  recovery = "not attempted";
-  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;
-    this.now = now;
-  }
-  elapsed() {
-    return this.now() - this.startedAt;
-  }
-  remainingWork = () => {
-    return Math.max(0, PI_CONTEXT_BUDGET.workMs - this.elapsed());
-  };
-  remainingOutcome = () => Math.max(0, PI_CONTEXT_BUDGET.outcomeMs - this.elapsed());
-  writerAllowance() {
-    return Math.max(0, Math.min(PI_CONTEXT_BUDGET.writerMs, this.remainingWork() - PI_CONTEXT_BUDGET.completionReserveMs));
-  }
-  hydrationAllowance() {
-    return Math.max(0, Math.min(this.remainingWork() - PI_CONTEXT_BUDGET.completionReserveMs, this.remainingOutcome() - PI_CONTEXT_BUDGET.completionReserveMs));
-  }
-  assertOutcome = () => {
-    this.assertOwner();
-    this.signal?.throwIfAborted();
-    if (this.abandoned || this.elapsed() >= PI_CONTEXT_BUDGET.outcomeMs)
-      throw new PiContextDeadlineError(this.diagnostic());
-  };
-  assert = () => {
-    this.assertOutcome();
-    if (this.elapsed() >= PI_CONTEXT_BUDGET.workMs)
-      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)
-      throw new PiContextDeadlineError(this.diagnostic());
-  };
-  diagnostic() {
-    return `stage=${this.stage} elapsed=${Math.round(this.elapsed())}ms recovery=${this.recovery}`;
-  }
-  waitUntil = async (pending, assert, remaining) => {
-    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();
-    }
-  };
-  wait = (pending) => this.waitUntil(pending, this.assert, () => this.remainingWork());
-  waitMandatory = (pending) => this.waitUntil(pending, this.assertOutcome, this.remainingOutcome);
-}
-
 // src/pi-context-limit.ts
 var MIN_SANE_LIMIT = 16000;
 var MAX_SANE_LIMIT = 1e7;
@@ -36025,6 +35972,11 @@ function piHasManagedSignature(payload, signature) {
   return false;
 }
 
+// src/pi-dispatch-assistant-history.ts
+function piOmitsTruncatedAssistant(message) {
+  return (message.stopReason === "length" || message.stopReason === "error" || message.stopReason === "aborted") && Array.isArray(message.content) && !message.content.some((block) => block?.type === "text" || block?.type === "toolCall");
+}
+
 // src/pi-dispatch-tool-pairing.ts
 var RESPONSES_APIS = new Set([
   "openai-responses",
@@ -36074,14 +36026,14 @@ function object5(value) {
 function omitsAssistant(message, model, compat) {
   if (!Array.isArray(message.content))
     return false;
+  if (piOmitsTruncatedAssistant(message))
+    return true;
   let thinking = false;
-  let hasTextBlock = false;
   for (const value of message.content) {
     const block = object5(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") {
@@ -36091,8 +36043,6 @@ function omitsAssistant(message, model, compat) {
     } else
       return false;
   }
-  if (!hasTextBlock && ["length", "error", "aborted"].includes(String(message.stopReason)))
-    return true;
   if (compat.requiresReasoningContentForAllAssistantTurns === true)
     return false;
   if (!thinking)
@@ -36397,11 +36347,25 @@ ${wellFormed(text)}
 </think>`;
   return;
 }
-function piResponsesAssistantTexts(value, model) {
+function coldReplayable(items) {
+  let reasoning = false;
+  for (const value of items) {
+    const item = object7(value);
+    if (typeof item?.encrypted_content === "string")
+      return false;
+    if (item?.type !== "reasoning")
+      continue;
+    if (!Array.isArray(item.content) || !item.content.some((part) => object7(part)?.type === "reasoning_text"))
+      return false;
+    reasoning = true;
+  }
+  return reasoning;
+}
+function piResponsesAssistantTexts(value, model, host, alternatives) {
   const message = object7(value);
   if (!message || !Array.isArray(message.content))
     return;
-  if (["length", "error", "aborted"].includes(String(message.stopReason)) && !message.content.some((value) => ["text", "toolCall"].includes(String(object7(value)?.type))))
+  if (piOmitsTruncatedAssistant(message))
     return [];
   const texts = [];
   const blocks = [];
@@ -36444,6 +36408,13 @@ function piResponsesAssistantTexts(value, model) {
   const replay = [];
   let bound = 0;
   let output = false;
+  const allowUnsigned = host === "omp" && message.role === "assistant" && [
+    "openai-responses",
+    "azure-openai-responses",
+    "openai-codex-responses"
+  ].includes(model?.api ?? "");
+  let unsigned = false;
+  let rewrittenText = false;
   for (const value of payload.items) {
     const item = object7(value);
     if (item?.type === "reasoning")
@@ -36467,8 +36438,14 @@ function piResponsesAssistantTexts(value, model) {
       } 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;
+      const signed = signature?.v === 1 && typeof signature.id === "string" && item.id === signature.id && item.phase === signature.phase && part.text === block.text.replace(/^§\d+§ /u, "");
+      if (!signed) {
+        const stripped = stripPersistedAssistantText(part.text);
+        if (!allowUnsigned || "textSignature" in block || stripped !== block.text.replace(/^§\d+§ /u, ""))
+          return texts;
+        unsigned = true;
+        rewrittenText ||= part.text !== stripped && part.text !== block.text;
+      }
       bound++;
       itemTexts.push(part.text);
     }
@@ -36478,7 +36455,13 @@ function piResponsesAssistantTexts(value, model) {
     for (const text of itemTexts)
       replay.push(textIdentity2(wellFormed(text), item.phase));
   }
-  return output && bound === blocks.length ? replay : texts;
+  if (!output || bound !== blocks.length || unsigned && !rewrittenText)
+    return texts;
+  if (unsigned && alternatives) {
+    alternatives.fallback = texts;
+    alternatives.cold = coldReplayable(payload.items) ? replay : texts;
+  }
+  return replay;
 }
 function piResponsesWireTexts(value, phase) {
   if (phase !== undefined && phase !== null && phase !== "commentary" && phase !== "final_answer")
@@ -36720,11 +36703,10 @@ function projectMissingToolResults(messages, model, host = "omp") {
     const message = object8(value);
     if (message?.role === "assistant") {
       flush(message.timestamp);
+      if (piOmitsTruncatedAssistant(message))
+        continue;
       projected.push(value);
       const calls = windowCalls(message);
-      const truncated = ["length", "error", "aborted"].includes(String(message.stopReason));
-      if (truncated && Array.isArray(message.content) && !message.content.some((part) => ["toolCall", "text"].includes(String(object8(part)?.type))))
-        continue;
       if (message.stopReason === "aborted" || message.stopReason === "error") {
         aborted = new Map(calls.map((call) => [pairingId(call.id), call]));
         abortedTimestamp = message.timestamp;
@@ -37018,31 +37000,43 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
   }
   const responsesApi = responsesLane(model?.api);
   let responsesMessages = responsesApi ? [] : undefined;
+  const fallbackMessages = [];
+  const coldMessages = [];
+  let unsignedAlternatives = false;
+  const appendResponse = (output, row, texts) => {
+    if (!texts.length && !row.calls.length)
+      return;
+    const previous = output.at(-1);
+    if (previous?.role === "assistant") {
+      previous.calls.push(...row.calls);
+      previous.wireCalls?.push(...row.wireCalls ?? []);
+      previous.responseTexts?.push(...texts);
+    } else
+      output.push({
+        ...row,
+        calls: [...row.calls],
+        ...row.wireCalls ? { wireCalls: [...row.wireCalls] } : {},
+        responseTexts: [...texts]
+      });
+  };
   if (responsesMessages) {
     for (const [index, row] of byIndex) {
       if (row.role !== "assistant") {
         responsesMessages.push(row);
+        fallbackMessages.push(row);
+        coldMessages.push(row);
         continue;
       }
-      const texts = piResponsesAssistantTexts(projectedMessages[index], model);
+      const alternatives = {};
+      const texts = piResponsesAssistantTexts(projectedMessages[index], model, host, alternatives);
       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.wireCalls?.push(...row.wireCalls ?? []);
-        previous.responseTexts?.push(...texts);
-      } else
-        responsesMessages.push({
-          ...row,
-          calls: [...row.calls],
-          ...row.wireCalls ? { wireCalls: [...row.wireCalls] } : {},
-          responseTexts: [...texts]
-        });
+      unsignedAlternatives ||= alternatives.fallback !== undefined;
+      appendResponse(responsesMessages, row, texts);
+      appendResponse(fallbackMessages, row, alternatives.fallback ?? texts);
+      appendResponse(coldMessages, row, alternatives.cold ?? texts);
     }
   }
   const plan = piChatHistoryPlan(projectedMessages, model);
@@ -37077,6 +37071,7 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
     ...responsesApi && !responsesMessages ? { structuralSkipReason: "Responses history transform is not modeled" } : model?.api === "openai-completions" && !chatMessages ? { structuralSkipReason: "Chat history transform is not modeled" } : {},
     ...chatMessages ? { chatMessages } : {},
     ...responsesMessages ? { responsesMessages } : {},
+    ...responsesMessages && unsignedAlternatives ? { responsesAlternatives: [fallbackMessages, coldMessages] } : {},
     ...model?.api ? { api: model.api } : {},
     ...model?.api?.startsWith("google-") ? {
       googleFunctionIds: object8(model.compat)?.supportsFunctionPartId === true
@@ -37393,6 +37388,10 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
     const chat = !!body && Array.isArray(body.messages) && (prepared?.api === "openai-completions" || body.system === undefined) && body.input === undefined && body.inferenceConfig === undefined;
     stage = "prepared rows";
     expectedRows = responses && prepared?.responsesMessages ? prepared.responsesMessages : chat && prepared?.chatMessages ? prepared.chatMessages : prepared?.messages;
+    if (responses && rows && prepared?.responsesAlternatives) {
+      const actual = rows;
+      expectedRows = [prepared.responsesMessages, ...prepared.responsesAlternatives].find((candidate) => candidate?.length === actual.length && candidate.every((expected, index) => JSON.stringify(expected.responseTexts) === JSON.stringify(actual[index].responseTexts))) ?? expectedRows;
+    }
     if (expectedRows && imageProjection && imageBudget)
       expectedRows = trimPreparedImageRows(expectedRows, imageBudget, trimmed);
     if (!rows || !expectedRows)
@@ -39169,7 +39168,7 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         inputs = messageSnapshots(event.messages);
         active.inputMessages = inputs;
       }
-      const result = await budget.waitMandatory(Promise.resolve(withSqliteTransformPass2(() => handler(event, ctx, budget))));
+      const result = await budget.waitMandatory(Promise.resolve(withSqliteTurnDeadline2(() => Math.max(0, budget.remainingOutcome() - PI_CONTEXT_BUDGET.completionReserveMs), () => withSqliteTransformPass2(() => handler(event, ctx, budget)))));
       if (result?.messages) {
         const prepared = preparePiDispatch(result.messages, fenceEnabled ? ctx.model : undefined, fenceEnabled);
         if (prepared.messages !== result.messages)
@@ -39437,13 +39436,15 @@ function recordPiUpperEstimateReclaim(db, cursor, reservation) {
   pendingInput.delete(cursor.sessionId);
 }
 function releasePiUpperEstimateReclaim(db, cursor, reservation) {
-  if (!updateReplayDocument(db, cursor.sessionId, (doc) => {
-    if (claimFrom(doc[KEY2], cursor.sessionId)?.reservation !== reservation)
-      return false;
-    delete doc[KEY2];
-    return true;
-  }))
-    throw new Error("Could not release upper-estimate reclaim");
+  withoutSqliteTransformPass2(() => withSqliteTurnDeadline2(() => 0, () => {
+    if (!updateReplayDocument(db, cursor.sessionId, (doc) => {
+      if (claimFrom(doc[KEY2], cursor.sessionId)?.reservation !== reservation)
+        return false;
+      delete doc[KEY2];
+      return true;
+    }))
+      throw new Error("Could not release upper-estimate reclaim");
+  }));
 }
 function resetPiUpperEstimateReclaim(db, sessionId) {
   if (!claimFrom(readReplayEnvelope(db, sessionId)[KEY2], sessionId))
@@ -39455,6 +39456,21 @@ function resetPiUpperEstimateReclaim(db, sessionId) {
     throw new Error("Could not clear upper-estimate reclaim cursor");
 }
 
+// src/pi-historian-turn-wait.ts
+var foregroundWaits = new Map;
+function inPiHistorianRootContext(sessionId, operation) {
+  return inRootAsyncContext2(() => withSqliteTurnDeadline2(() => foregroundWaits.get(sessionId)?.() ?? Infinity, operation));
+}
+async function waitForPiHistorianInTurn(sessionId, remainingMs, wait) {
+  foregroundWaits.set(sessionId, remainingMs);
+  try {
+    return await wait();
+  } finally {
+    if (foregroundWaits.get(sessionId) === remainingMs)
+      foregroundWaits.delete(sessionId);
+  }
+}
+
 // src/pi-lkg-fit-envelope.ts
 import { createHash as createHash13 } from "node:crypto";
 function readPiLkgFitEnvelope(ctx, pi, modelKey, frozen, wireSchema) {
@@ -45365,7 +45381,7 @@ function registerPiContextHandler(pi, baseOptions) {
                   const pending = inFlightHistorian.get(sessionId);
                   if (pending) {
                     budget.stage = "headless fit historian";
-                    await budget.wait(pending);
+                    await waitForPiHistorianInTurn(sessionId, () => Math.max(0, budget.remainingOutcome() - PI_CONTEXT_BUDGET.completionReserveMs), () => budget.wait(pending));
                   }
                 }
                 budget.stage = "outgoing fit reclaim";
@@ -45410,7 +45426,7 @@ function registerPiContextHandler(pi, baseOptions) {
                 estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, undefined, outgoingFitLimit);
               } finally {
                 if (!reclaimCompleted && upperCursor && reservation)
-                  withoutSqliteTransformPass2(() => releasePiUpperEstimateReclaim(options.db, upperCursor, reservation));
+                  releasePiUpperEstimateReclaim(options.db, upperCursor, reservation);
               }
             }
           }
@@ -45777,7 +45793,7 @@ function spawnPiHistorianRun(args) {
   const holderId = crypto3.randomUUID();
   const controller = new AbortController;
   historianAbortControllers.set(sessionId, controller);
-  const runPromise = inRootAsyncContext2(() => (async () => {
+  const runPromise = inPiHistorianRootContext(sessionId, () => (async () => {
     await new Promise((resolve) => setTimeout(resolve, 0));
     if (controller.signal.aborted)
       return;
@@ -46768,6 +46784,7 @@ async function runPipeline(args) {
     args.assertCurrentPass?.();
     return tagTranscript(args.sessionId, { ...transcript, messages: taggingView }, args.tagger, args.db, {
       skipPrefixInjection: !ctxReduceCallable,
+      preserveTagOnlyAssistantText: true,
       entryFingerprintByMessageId,
       reuseMessageIds: textIdentityPlan.reusableMessageIds,
       textIdentityDriftMessageIds: textIdentityPlan.driftedMessageIds,
@@ -51334,7 +51351,7 @@ function stripTagPrefixFromAssistantMessage(message) {
     const textPart = part;
     if (typeof textPart.text !== "string")
       continue;
-    const stripped = stripPersistedAssistantText(textPart.text);
+    const stripped = stripPersistedAssistantText(textPart.text, message.provider === "anthropic");
     if (stripped !== textPart.text) {
       textPart.text = stripped;
       mutated = true;
@@ -51342,7 +51359,7 @@ function stripTagPrefixFromAssistantMessage(message) {
   }
   return mutated;
 }
-function strippedAssistantContent(content) {
+function strippedAssistantContent(content, provider = "anthropic") {
   if (!Array.isArray(content))
     return;
   let copy;
@@ -51353,7 +51370,7 @@ function strippedAssistantContent(content) {
     }
     if (typeof part.text !== "string")
       continue;
-    const stripped = stripPersistedAssistantText(part.text);
+    const stripped = stripPersistedAssistantText(part.text, provider === "anthropic");
     if (stripped === part.text)
       continue;
     copy ??= content.slice();
@@ -51370,7 +51387,7 @@ function registerOmpAssistantMessageStrip(pi, isActive) {
       const message = event?.message;
       if (message?.role !== "assistant")
         return;
-      const content = strippedAssistantContent(message.content);
+      const content = strippedAssistantContent(message.content, message.provider ?? "unknown");
       return content === undefined ? undefined : { content };
     } catch {
       return;
@@ -51917,7 +51934,7 @@ async function src_default(pi) {
   let openFailureCause = null;
   const openStorage = async () => {
     try {
-      return await openDatabaseAsync();
+      return await openDatabaseAsync({ nativeTurnDeadlines: true });
     } catch (error) {
       openFailureCause = error instanceof Error ? error.message : String(error);
       return null;
@@ -52318,6 +52335,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
   const todowriteOverlayEnabled = todowriteEnabled && bootProjectDeps.config.todowrite.overlay;
   registerMagicContextTools(pi, {
     rerankConnectionFile: config.subc?.connection_file,
+    rerankConfig: config.rerank,
     expandTools: config.historian?.expand_tools,
     db,
     ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,