@retaw106/mmc-oc 1.2.3 → 2.1.0

package/dist/{index-by6h2pav.js → index-wtb9hzk6.js}

@@ -21,9 +21,11 @@ import {
   isTransientSqliteError,
   beginSqliteWriterAsync,
   withPrivilegedWriter
-} from "./index-fg34g6a5.js";
+} from "./index-1j34a56j.js";
 import {
   toolTemplateError,
+  DEFAULT_PROTECTED_TOOLS,
+  mergeProtectedTools,
   isRecord,
   detectOverflow,
   removeSystemReminders,
@@ -34,6 +36,8 @@ import {
   stripTagPrefix,
   peelLeadingMcTagNotation,
   stableStringify,
+  installV3PerfSchema,
+  queuePendingDropForUnchangedTag,
   getAllStatusTagTokenTotalsFlat,
   updateTagStatus,
   foldShrunkPartTags,
@@ -55,8 +59,10 @@ import {
   resolveHostServedBoundaryId2,
   hasRawMessageProvider2,
   cleanUserText2,
+  withRawSessionMessageCache2,
   getRawSessionMessageOrdinalCount2,
   readRawSessionMessageRange2,
+  primeTailRawMessageCache2,
   getCachedAbsoluteMessageCount2,
   readRawSessionMessageIdOrdinalsForRange2,
   hasRawSessionMessageById2,
@@ -66,7 +72,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-wgt4gamw.js";
+} from "./index-dr0gepzw.js";
 import {
   piModelRefToCanonical,
   modelRefLookupOrder,
@@ -74,7 +80,7 @@ import {
   providerMass,
   calibrationForModelKey,
   historyLocalBudget
-} from "./index-3wagyrnj.js";
+} from "./index-x37vg474.js";
 import {
   closeQuietly,
   isKnownAutocommit,
@@ -85,7 +91,7 @@ import {
   claimOpenCodeDbDiagnosticOnce,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-977gxfz0.js";
+} from "./index-ramz5kkm.js";
 import {
   shouldEnforcePrivateStoragePermissions,
   ensureStorageDirectorySync,
@@ -99,7 +105,7 @@ import {
   deriveTriggerBudget2,
   resolveHistorianProducerLimits2,
   producerSourceLocalBudget2
-} from "./index-zx63j2e2.js";
+} from "./index-5cep2r9n.js";
 import {
   pushNotification2
 } from "./index-jdxxq8cz.js";
@@ -107,10 +113,11 @@ import {
   getErrorMessage,
   describeError,
   sendStatusNotification2
-} from "./index-5pg0acf7.js";
+} from "./index-amycb7b1.js";
 import {
-  logSlowWriteTransaction
-} from "./index-e1q8002h.js";
+  logSlowWriteTransaction,
+  WriteTransactionSteps
+} from "./index-33gprt9g.js";
 
 // src/agents/memory-maintainer.ts
 var MEMORY_MAINTAINER_A_AGENT = "magic-context-maintainer-a";
@@ -7458,64 +7465,28 @@ var PromptSurfaceConfigSchema = object({
     message: "tool description values must not be empty or whitespace-only"
   })).optional().describe("USER-LEVEL ONLY top-level description overrides keyed by mmc_* tool ID; parameter schemas and descriptions are unchanged.")
 }).describe("Prompt-surface preset routing. Project config may select default/models, while guidance_override_path and tool_descriptions are user-level only.");
-var PER_HARNESS_MIGRATION_INVENTORY = {
-  historian: {
-    retained: [
-      "temperature",
-      "top_p",
-      "prompt",
-      "tools",
-      "disable",
-      "description",
-      "mode",
-      "color",
-      "maxSteps",
-      "permission",
-      "maxTokens",
-      "two_pass",
-      "disallowed_tools"
-    ],
-    migrated_execution: ["model", "fallback_models", "variant", "thinking_level"]
-  }
-};
-var PER_HARNESS_MODEL_KEYS = ["opencode", "pi"];
-var OcEntryObjectSchema = object({
-  model: string2().describe("OpenCode model ID (for example, provider/model)."),
-  variant: string2().optional().describe("OpenCode reasoning variant for this entry.")
-}).strict();
-var OcEntrySchema = union([string2(), OcEntryObjectSchema]);
-var PiEntryObjectSchema = object({
-  model: string2().describe("Pi model ID (for example, provider/model)."),
+var HISTORIAN_MODEL_RESOLUTION_FIELDS = [
+  "model",
+  "fallback_models",
+  "variant",
+  "thinking_level"
+];
+var LEGACY_HARNESS_BLOCK_KEYS = ["opencode", "pi"];
+var HistorianModelEntryObjectSchema = object({
+  model: string2().describe("Model ID (for example, provider/model)."),
+  variant: string2().optional().describe("OpenCode reasoning variant for this entry."),
   thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this entry.")
 }).strict();
-var PiEntrySchema = union([string2(), PiEntryObjectSchema]);
-var OpenCodeHarnessBlockSchema = object({
-  model: OcEntrySchema.optional().describe("Primary OpenCode model entry."),
-  fallback_models: array(OcEntrySchema).optional().describe("Ordered fallback OpenCode entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
-  variant: string2().optional().describe("OpenCode reasoning variant for the primary entry when it declares none. Fallback entries declare variants per-entry.")
-}).strict().describe("Strict OpenCode model-resolution block. It accepts no Pi vocabulary.");
-var PiHarnessBlockSchema = object({
-  model: PiEntrySchema.optional().describe("Primary Pi model entry."),
-  fallback_models: array(PiEntrySchema).optional().describe("Ordered fallback Pi entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
-  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary entry when it declares none. Fallback entries declare thinking levels per-entry.")
-}).strict().describe("Strict Pi model-resolution block. It accepts no OpenCode vocabulary.");
-var ProfileOpenCodeModelBlockSchema = object({
-  model: OcEntrySchema.optional().describe("Primary OpenCode model entry."),
-  fallback_models: array(OcEntrySchema).optional().describe("Ordered fallback OpenCode model entries."),
-  variant: string2().optional().describe("OpenCode reasoning variant for the primary model entry.")
-}).strict().describe("Strict profile-only OpenCode model-selection block.");
-var ProfilePiModelBlockSchema = object({
-  model: PiEntrySchema.optional().describe("Primary Pi model entry."),
-  fallback_models: array(PiEntrySchema).optional().describe("Ordered fallback Pi model entries."),
-  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary model entry.")
-}).strict().describe("Strict profile-only Pi model-selection block.");
+var HistorianModelEntrySchema = union([string2(), HistorianModelEntryObjectSchema]);
 var ProfileHistorianSchema = object({
-  opencode: ProfileOpenCodeModelBlockSchema.optional(),
-  pi: ProfilePiModelBlockSchema.optional()
-}).strict();
+  model: HistorianModelEntrySchema.optional().describe("Primary historian model entry."),
+  fallback_models: array(HistorianModelEntrySchema).optional().describe("Ordered fallback historian model entries."),
+  variant: string2().optional().describe("OpenCode reasoning variant for the primary entry. Ignored by Pi."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary entry. Ignored by OpenCode.")
+}).strict().describe("Strict profile-only historian model-selection block.");
 var ConfigProfileSchema = object({
   historian: ProfileHistorianSchema.optional()
-}).strict().describe("User-owned model-selection overlay. Only historian harness model blocks are allowed.");
+}).strict().describe("User-owned model-selection overlay. Only the flat historian model-resolution fields are allowed.");
 var ConfigProfilesSchema = record(string2().trim().min(1, "Profile names must not be empty or whitespace-only."), ConfigProfileSchema);
 var AgentMetadataSchema = AgentOverrideConfigSchema.pick({
   temperature: true,
@@ -7539,20 +7510,22 @@ var HistorianConfigSchema = AgentMetadataSchema.extend({
     }),
     literal(false)
   ])).optional().describe('Readable historian tool expansions, keyed by exact host tool name. Templates override built-in defaults; false disables an expansion. Supports ${input.path}, ${output.path}, bare ${output}, array [N], [*].field, .each("${field}"), .join("separator"), .count and final .truncate(N). Missing fields are empty; placeholders default to 300 characters, lists to 10 elements, expansions to 1000 characters. Valid in user and project config; affects historian/recomp and verbose ctx_expand only, never the wire or default ctx_expand transcript.'),
-  opencode: OpenCodeHarnessBlockSchema.optional(),
-  pi: PiHarnessBlockSchema.optional(),
+  model: HistorianModelEntrySchema.optional().describe("Primary historian model entry. The active harness reads its own qualifier (OpenCode variant, Pi thinking_level); the other harness's qualifier is ignored."),
+  fallback_models: array(HistorianModelEntrySchema).optional().describe("Ordered fallback historian model entries, tried in order."),
+  variant: string2().optional().describe("OpenCode reasoning variant for the primary entry when it declares none. Ignored by Pi."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary entry when it declares none. Ignored by OpenCode."),
   two_pass: boolean2().default(false).describe("Run a second editor pass over historian output to clean low-signal U: lines and cross-compartment duplicates. Adds ~1 extra API call and ~1.3x cost per historian run. Useful for models without extended thinking support. (default: false)"),
   disallowed_tools: array(_enum(["*", "read", "aft_outline", "aft_zoom", "aft_search"])).default([]).describe(`OpenCode only. Tools to REMOVE from the historian's default allow-list [read, aft_outline, aft_zoom, aft_search]. Applies to both historian and historian-editor agents. Use ["*"] to strip all tool definitions from the model request — this prevents weak instruction-following models (e.g. mistral-small-latest) from entering tool-calling loops. Individual tool names remove just that tool. Note: a user-supplied historian.permission override can re-allow a tool that disallowed_tools removed — disallowed_tools sets the baseline, permission overrides take precedence. (default: [])`)
-}).optional();
+}).strict().optional();
 var MagicContextConfigSchema = object({
   enabled: boolean2().default(true).describe("Enable magic context (default: true)"),
   allow_home_project: boolean2().default(false).describe("Allow Magic Context sessions launched from the exact canonical home directory. A non-git home uses its deterministic dir: identity; a home repository uses its git: identity. USER-LEVEL ONLY: project config is ignored. The home identity is excluded from registry seed exports, never resolves descendants by containment, and cannot join a workspace."),
   auto_update: boolean2().optional().describe("DEPRECATED no-op: the automatic update check was removed (the package is private-registry-only, so public npm checks always 404). The key is still accepted so existing configs keep parsing; upgrade via the host's own plugin update channel."),
   language: string2().trim().toLowerCase().refine((s) => isValidLanguageCode(s), 'language must be a 2-letter ISO 639-1 code (e.g. "tr", "es", "de")').optional().describe("Output language for Magic Context's generated content and guidance, as a " + '2-letter ISO 639-1 code (e.g. "tr", "es", "de", "ja", "pt"). When set, the ' + "historian and the agent-guidance block instruct the model to " + "write its PROSE in this language while keeping all structural tokens (XML tags, " + "the five memory category names, code identifiers, file paths) in English. " + "USER-LEVEL ONLY (ignored in project config for security). Unset = today's " + "behavior (model mirrors the conversation; English scaffolding). Changing it " + "triggers one cache re-materialization; existing compartments/memories keep their " + "original language until naturally rewritten."),
   profile: string2().trim().min(1).optional().describe("Select a named user-owned model profile. A valid project name overrides this user default; an empty string, null, or other non-string project value is ignored with a warning so the user selection still applies. Unknown names warn and use the base configuration."),
-  profiles: ConfigProfilesSchema.optional().describe("User-level named model profiles. A profile may contain only historian model, fallback_models, OpenCode variant, and Pi thinking_level fields. Project configs may select a name but cannot define profiles."),
-  historian: HistorianConfigSchema.describe("Historian metadata plus independent strict OpenCode and Pi execution blocks. Retained metadata stays at historian; model, fallback_models, variant, and thinking_level belong only in historian.opencode or historian.pi."),
-  cache_ttl: union([string2(), object({ default: string2() }).catchall(string2())]).default("5m").describe(`How long Magic Context assumes the provider's cached prefix stays valid. This is MC's own deferral gate — it does not change the provider's actual cache lifetime. String (e.g. "5m", "1h", "30s") or per-model object ({ default: "5m", "provider/model": "1h", "provider/*": "never" }); keys resolve most-specific first (exact provider/model, bare model ID, shorter dash-prefixes, then the provider/* wildcard). Explicit per-model entries win; otherwise GPT-5.6 and later (including gpt-6*, through any provider prefix) use a built-in 30m lifetime before the object default or 5m fallback. An unset or global "5m" opts into built-in defaults; any other global string is an explicit policy and wins. Policy is frozen per session, including across restarts; a model switch resolves against that frozen policy. /mmc-status shows the effective value and source. OpenAI documents at least 30 minutes since the latest write or reuse: https://developers.openai.com/api/docs/guides/prompt-caching (Cache lifetime and Summary of model differences). Set to "never" to mean MC never assumes expiry (for lanes kept warm externally by a cache-keep tool) — disables the idle-TTL heuristic so MC never initiates a rebuild based on elapsed time. Provider-side extended TTL is a separate request-level concern (cache_control: { ttl } in the request body).`),
+  profiles: ConfigProfilesSchema.optional().describe("User-level named model profiles. A profile may contain only the flat historian model-resolution fields (model, fallback_models, OpenCode variant, Pi thinking_level). Project configs may select a name but cannot define profiles."),
+  historian: HistorianConfigSchema.describe("Historian metadata plus the flat model-resolution fields (model, fallback_models, variant, thinking_level). The active harness reads its own qualifier; the removed historian.opencode / historian.pi blocks are no longer accepted."),
+  cache_ttl: union([string2(), object({ default: string2() }).catchall(string2())]).default("5m").describe(`How long Magic Context assumes the provider's cached prefix stays valid. This is MC's own deferral gate — it does not change the provider's actual cache lifetime. String (e.g. "5m", "1h", "30s") or per-model object ({ default: "5m", "provider/model": "1h", "provider/*": "never" }); keys resolve most-specific first (exact provider/model, bare model ID, shorter dash-prefixes, then the provider/* wildcard). Explicit per-model entries win; otherwise GPT-5.6 and later (including gpt-6*, through any provider prefix) use a built-in 30m lifetime before the object default or 5m fallback. An unset or global "5m" opts into built-in defaults; any other global string is an explicit policy and wins. User and project settings, including an explicit "5m" or object default, apply on the next pass. Only built-in defaults are frozen per session (per model), including across restarts. /mmc-status shows the effective value and source. OpenAI documents at least 30 minutes since the latest write or reuse: https://developers.openai.com/api/docs/guides/prompt-caching (Cache lifetime and Summary of model differences). Set to "never" to mean MC never assumes expiry (for lanes kept warm externally by a cache-keep tool) — disables the idle-TTL heuristic so MC never initiates a rebuild based on elapsed time. Provider-side extended TTL is a separate request-level concern (cache_control: { ttl } in the request body).`),
   prompt_surface: PromptSurfaceConfigSchema.default({ default: "full" }).describe("Prompt-surface presets: default is full; models use bare model IDs, provider/model, or provider/* routing keys. Guidance and tool-description overrides are user-level only. OpenCode 1.x and Pi register tool descriptions once per process (they follow the default preset). OpenCode 2 rewrites the five mmc_* descriptions per request from the draft model."),
   output_reserve: union([
     number2().min(0),
@@ -7570,7 +7543,13 @@ var MagicContextConfigSchema = object({
     default: number2().min(5000).max(2000000).optional()
   }).catchall(number2().min(5000).max(2000000)).optional().describe("Absolute token thresholds per model. When matched, overrides execute_threshold_percentage for that model. Accepts `default` for all models or per-model keys. Values above 90% × context_limit are clamped with a warning log. Min 5_000, max 2_000_000."),
   protected_tokens: number2().int().min(PROTECTED_TOKENS_MIN).max(1e6).optional().describe("Positive integer token floor to protect from automatic reclaim (min: 4_000, max: 1_000_000). When omitted, the derived default is clamp(round(0.05 × usableSoft), min(16_000, round(0.08 × usableSoft)), 64_000)."),
-  clear_reasoning_age: number2().min(10).default(50).describe("Clear reasoning/thinking blocks older than N tags (default: 50)"),
+  clear_reasoning_age: unknown().optional().describe("Deprecated and ignored. Use keep_reasoning_tokens instead.").meta({ deprecated: true }),
+  keep_reasoning_tokens: union([
+    number2().int().min(0).max(1e6),
+    object({
+      default: number2().int().min(0).max(1e6).optional()
+    }).catchall(number2().int().min(0).max(1e6))
+  ]).optional().describe("Reasoning tokens to keep on rebuilding passes. Number or per-model object; exact, shorter model keys, provider/*, then default. Omitted: fixed 10,000. 0 removes all eligible historical reasoning; newest and exempt steps always stay."),
   history_budget_percentage: number2().min(0.05).max(0.5).default(DEFAULT_HISTORY_BUDGET_PERCENTAGE).describe("Fraction of usable context (context_limit × execute_threshold) reserved for the session history block (default: 0.15)"),
   historian_timeout_ms: number2().min(60000).default(DEFAULT_HISTORIAN_TIMEOUT_MS).describe("Timeout for each historian prompt call in both TypeScript and Rust transform modes, in milliseconds (default: 600000)"),
   commit_cluster_trigger: object({
@@ -7603,7 +7582,8 @@ var MagicContextConfigSchema = object({
     overlay: boolean2().default(true).describe("Pi only: show the persistent todo overlay above the editor while tasks are active.")
   }).default({ enabled: false, overlay: true }).describe("Pi-only todowrite tool and overlay controls. Pi registers tools and widgets at extension boot, so changing this after /cd requires /reload or restart."),
   pi: PiConfigSchema.describe("Pi-only child-process extension controls. This setting is user-level only; project configuration cannot choose which extensions a user's subagent children load."),
-  smart_drops: boolean2().default(false).describe("Content-aware reclaim of provably-superseded tool output, layered on the existing execute-pass auto-drop. When on: superseded todowrite (keep newest 1), spent mmc_reduce (keep newest 3), and zero-value meta (bash_status, bash_kill, mmc_note read/dismiss) outputs are dropped; older edits to a file are compressed to a filePath-preserving marker while the newest edit per file stays full. Only acts on passes already busting the cache, so it never originates a cache bust. Honors the protected-tag reserve. Experimental: opt-in, default off until cache stability is proven; when off the wire is byte-identical to the positional-only reclaim. Requires a restart."),
+  smart_drops: union([boolean2(), record(string2(), unknown())]).optional(),
+  protected_tools: record(string2(), number2().int().nonnegative()).default({ ...DEFAULT_PROTECTED_TOOLS }).transform((map) => mergeProtectedTools(map)).describe("Keep each tool's newest N still-active results in every automatic drop lane (upstream issue 621). User and project maps merge over defaults {todowrite: 1, mmc_reduce: 3}; 0 turns protection off. Names are case-insensitive and ignore leading mcp_ (upstream's ctx_reduce maps to mmc_reduce). Holds even at 95% pressure, with no byte cap: large protected outputs can reach refusal sooner. Queued drops, from the agent or historian publication, are held until newer calls displace the result and a later cache-rebuilding pass applies them. The historian's summary is unaffected; the raw result leaves at the next fold. Frozen strips are unaffected. Changes and rotation never originate a bust; dropped results are never restored."),
   caveman_text_compression: object({
     enabled: boolean2().default(false).describe("Apply deterministic caveman-style text compression to old conversation text. Active for primary sessions when enabled; never for subagents. Compresses user/assistant text in oldest-first tiers: ultra (oldest 20%), full, lite, untouched (newest 40%)."),
     min_chars: number2().min(100).max(1e4).default(500).describe("Text parts shorter than this (characters) stay untouched. Min 100, max 10000. Default: 500.")
@@ -7669,13 +7649,12 @@ var MagicContextConfigSchema = object({
   }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: the whole group is stripped from project-tier config so a cloned repository cannot raise budgets, relax cooldowns, or loosen the anomaly guard.")
 });
 var LIVE_RELOAD_CONFIG_PATHS = [
+  "cache_ttl",
   "toast_duration_ms",
-  "historian.opencode.model",
-  "historian.opencode.fallback_models",
-  "historian.opencode.variant",
-  "historian.pi.model",
-  "historian.pi.fallback_models",
-  "historian.pi.thinking_level",
+  "historian.model",
+  "historian.fallback_models",
+  "historian.variant",
+  "historian.thinking_level",
   "historian.two_pass",
   "historian.expand_tools",
   "historian.maxTokens",
@@ -8844,6 +8823,41 @@ function emergencyDrainExitThreshold(executeThresholdPercentage) {
   }
   return Math.max(0, executeThresholdPercentage - EMERGENCY_DRAIN_EXIT_MARGIN);
 }
+function resolvedEmergencyDrainLatch(meta, usagePercentage, executeThresholdPercentage, now) {
+  const { forceMaterializationPercentage } = escalationBands(executeThresholdPercentage);
+  if (usagePercentage >= forceMaterializationPercentage)
+    return meta.emergencyDrainActive > 0 ? meta.emergencyDrainActive : now;
+  if (usagePercentage < emergencyDrainExitThreshold(executeThresholdPercentage) || now - meta.emergencyDrainActive > EMERGENCY_DRAIN_MAX_LATCH_MS)
+    return 0;
+  return meta.emergencyDrainActive;
+}
+function drainFailureBackoffActive(meta, now) {
+  return meta.historianDrainFailureAt > 0 && meta.historianDrainFailureAt <= now && now - meta.historianDrainFailureAt < EMERGENCY_DRAIN_FAILURE_BACKOFF_MS;
+}
+function getProtectedTailDrainBudgetSkip(args) {
+  const now = args.now ?? Date.now();
+  const meta = loadProtectedTailMeta(args.db, args.sessionId);
+  const latch = resolvedEmergencyDrainLatch(meta, args.usagePercentage, args.executeThresholdPercentage, now);
+  if (latch !== meta.emergencyDrainActive) {
+    args.db.prepare("UPDATE session_meta SET emergency_drain_active = ? WHERE session_id = ? AND emergency_drain_active = ?").run(latch, args.sessionId, meta.emergencyDrainActive);
+  }
+  const startedAt = meta.protectedTailDrainWindowStartedAt;
+  if (startedAt <= 0 || startedAt > now || now - startedAt >= DRAIN_WINDOW_MS)
+    return null;
+  const limitTokens = protectedTailWindowBudget(args.usagePercentage, args.usable, args.perRunCap);
+  if (meta.protectedTailDrainTokens < limitTokens)
+    return null;
+  if (latch > 0 && !drainFailureBackoffActive(meta, now))
+    return null;
+  return {
+    windowStartedAt: startedAt,
+    resetsAt: startedAt + DRAIN_WINDOW_MS,
+    nextEligibleAt: latch > 0 ? Math.min(startedAt + DRAIN_WINDOW_MS, meta.historianDrainFailureAt + EMERGENCY_DRAIN_FAILURE_BACKOFF_MS) : startedAt + DRAIN_WINDOW_MS,
+    resetInMs: startedAt + DRAIN_WINDOW_MS - now,
+    spentTokens: meta.protectedTailDrainTokens,
+    limitTokens
+  };
+}
 function reserveProtectedTailDrainTokens(args) {
   const now = args.now ?? Date.now();
   const requested = Math.max(0, Math.floor(args.trueRawTokens));
@@ -8875,17 +8889,7 @@ function reserveProtectedTailDrainTokens(args) {
                      WHERE session_id = ?`).run(now, args.sessionId);
       meta = loadProtectedTailMeta(args.db, args.sessionId);
     }
-    const exitThreshold = emergencyDrainExitThreshold(args.executeThresholdPercentage);
-    let latchActiveSince = meta.emergencyDrainActive;
-    const { forceMaterializationPercentage } = escalationBands(args.executeThresholdPercentage);
-    if (args.usagePercentage >= forceMaterializationPercentage) {
-      if (latchActiveSince <= 0)
-        latchActiveSince = now;
-    } else if (latchActiveSince > 0) {
-      const expired = now - latchActiveSince > EMERGENCY_DRAIN_MAX_LATCH_MS;
-      if (args.usagePercentage < exitThreshold || expired)
-        latchActiveSince = 0;
-    }
+    const latchActiveSince = resolvedEmergencyDrainLatch(meta, args.usagePercentage, args.executeThresholdPercentage, now);
     if (latchActiveSince !== meta.emergencyDrainActive) {
       args.db.prepare("UPDATE session_meta SET emergency_drain_active = ? WHERE session_id = ?").run(latchActiveSince, args.sessionId);
     }
@@ -8894,7 +8898,7 @@ function reserveProtectedTailDrainTokens(args) {
     const remaining = Math.max(0, budget - meta.protectedTailDrainTokens);
     let reserved = Math.min(requested, args.perRunCap, remaining);
     let bypass = false;
-    const inFailureBackoff = meta.historianDrainFailureAt > 0 && meta.historianDrainFailureAt <= now && now - meta.historianDrainFailureAt < EMERGENCY_DRAIN_FAILURE_BACKOFF_MS;
+    const inFailureBackoff = drainFailureBackoffActive(meta, now);
     if (reserved <= 0 && latchActive && !inFailureBackoff) {
       reserved = Math.min(requested, args.perRunCap);
       bypass = true;
@@ -9828,9 +9832,6 @@ function resolveEpochFloorForPass(db, sessionId, inputs) {
   return preSnapshotResult(firstObservedMemo, resolvedInputs);
 }
 
-// src/hooks/magic-context/lkg-slot.ts
-import { createHash as createHash4 } from "node:crypto";
-
 // src/shared/bounded-session-map.ts
 class BoundedSessionMap {
   maxEntries;
@@ -9877,6 +9878,7 @@ class BoundedSessionMap {
 }
 
 // src/hooks/magic-context/lkg-slot.ts
+import { createHash as createHash4 } from "node:crypto";
 var LKG_TOTAL_BYTES = 64 * 1024 * 1024;
 var LKG_SINGLE_SLOT_BYTES = 24 * 1024 * 1024;
 var LKG_METADATA_BYTES = 256;
@@ -10401,6 +10403,29 @@ function layoutLkgPrefix(jsonPrefix) {
   const chunkHashes = chunks.map(hashLkgChunk);
   return { chunks, chunkHashes, chars: jsonPrefix.length, hash: hashLkgChunkList(chunkHashes) };
 }
+function assembleLkgPrefix(expected, rows) {
+  const { chars, chunks, hash } = expected;
+  if (typeof chars !== "number" || !Number.isSafeInteger(chars) || typeof chunks !== "number" || !Number.isSafeInteger(chunks) || typeof hash !== "string" || rows.length !== chunks) {
+    return;
+  }
+  const bodies = [];
+  let length = 0;
+  for (let index = 0;index < rows.length; index += 1) {
+    const row = rows[index];
+    if (row?.chunk !== index || typeof row.body !== "string")
+      return;
+    bodies.push(row.body);
+    length += row.body.length;
+  }
+  if (length !== chars)
+    return;
+  const chunkHashes = bodies.map(hashLkgChunk);
+  if (chunkHashes.some((chunkHash, index) => rows[index]?.hash !== chunkHash))
+    return;
+  if (hashLkgChunkList(chunkHashes) !== hash)
+    return;
+  return { jsonPrefix: bodies.join(""), chunkHashes, hash };
+}
 
 // src/features/magic-context/migration-v2-write-split.ts
 var LKG_SLOT_CHUNKS_DDL = `
@@ -10559,6 +10584,113 @@ function splitReplayDecisions(db) {
   db.exec("DROP TABLE temp.v2_replay_documents");
 }
 
+// src/features/magic-context/temporal-decisions.ts
+var PREFIX = "temporal-message-v1:";
+function decodeTemporalDecision(entry) {
+  if (!entry.startsWith(PREFIX))
+    return null;
+  try {
+    const pair = JSON.parse(entry.slice(PREFIX.length));
+    if (Array.isArray(pair) && pair.length === 2 && typeof pair[0] === "string" && pair[0] && typeof pair[1] === "string")
+      return [pair[0], pair[1]];
+  } catch {}
+  return null;
+}
+function readRows(db, sessionId, messageIds) {
+  if (!messageIds)
+    return db.prepare("SELECT message_id,marker FROM temporal_decisions WHERE session_id=?").all(sessionId);
+  const ids = [...messageIds];
+  const result = [];
+  for (let offset = 0;offset < ids.length; offset += 400) {
+    const chunk = ids.slice(offset, offset + 400);
+    result.push(...db.prepare(`SELECT message_id,marker FROM temporal_decisions WHERE session_id=? AND message_id IN (${chunk.map(() => "?").join(",")})`).all(sessionId, ...chunk));
+  }
+  return result;
+}
+function getTemporalDecisions(db, sessionId, messageIds) {
+  return new Map(readRows(db, sessionId, messageIds).flatMap((row) => row.marker === null ? [] : [[row.message_id, row.marker]]));
+}
+function observeTemporalDecisions(db, sessionId, candidates, previouslyServed, messageIds) {
+  const ids = new Set([...candidates.keys(), ...messageIds ?? []]);
+  const rows = readRows(db, sessionId, ids);
+  const known = new Set(rows.map((row) => row.message_id));
+  const missing = [...candidates].filter(([id]) => !known.has(id));
+  if (!missing.length)
+    return new Map(rows.flatMap((row) => row.marker === null ? [] : [[row.message_id, row.marker]]));
+  const transient = new Map;
+  db.transaction(() => {
+    const insert = db.prepare("INSERT OR IGNORE INTO temporal_decisions(session_id,message_id,marker) VALUES (?,?,?)");
+    const servedTag = db.prepare("SELECT 1 FROM tags WHERE session_id=? AND message_id=? UNION ALL SELECT 1 FROM tags WHERE session_id=? AND message_id>=? AND message_id<? LIMIT 1");
+    let served;
+    for (const [id, candidate] of missing) {
+      const historical = servedTag.get(sessionId, id, sessionId, `${id}:p`, `${id}:q`);
+      if (historical) {
+        served ??= previouslyServed?.(missing.map(([missingId]) => missingId)) ?? new Map;
+        const previous = served.get(id);
+        if (previous === undefined) {
+          transient.set(id, candidate);
+          continue;
+        }
+        insert.run(sessionId, id, previous === "" && candidate !== "" ? null : previous);
+      } else {
+        insert.run(sessionId, id, null);
+      }
+    }
+  }).immediate();
+  return new Map([...transient, ...getTemporalDecisions(db, sessionId, ids)]);
+}
+function freezeTemporalDecisions(db, sessionId, candidates) {
+  if (candidates.size === 0)
+    return new Map;
+  return db.transaction(() => {
+    const insert = db.prepare("INSERT INTO temporal_decisions(session_id,message_id,marker) VALUES (?,?,?) ON CONFLICT(session_id,message_id) DO UPDATE SET marker=excluded.marker WHERE temporal_decisions.marker IS NULL");
+    for (const [id, marker] of candidates) {
+      insert.run(sessionId, id, marker);
+    }
+    return getTemporalDecisions(db, sessionId, candidates.keys());
+  }).immediate();
+}
+
+// src/features/magic-context/migration-v4-temporal-decisions.ts
+var TEMPORAL_DECISIONS_DDL = `CREATE TABLE IF NOT EXISTS temporal_decisions (
+    session_id TEXT NOT NULL,
+    message_id TEXT NOT NULL,
+    marker TEXT,
+    PRIMARY KEY (session_id, message_id)
+) WITHOUT ROWID`;
+function installV4TemporalDecisions(db) {
+  const schema = new Map(db.prepare("SELECT name FROM sqlite_master").all().map((row) => [row.name, true]));
+  if (!schema.has("temporal_decisions")) {
+    db.exec(TEMPORAL_DECISIONS_DDL);
+    if (schema.has("session_meta")) {
+      const rows = db.prepare("SELECT session_id, merged_reasoning_stripped_ids AS entries FROM session_meta WHERE merged_reasoning_stripped_ids LIKE '%temporal-message-v1:%'").all();
+      const insert = db.prepare("INSERT OR IGNORE INTO temporal_decisions(session_id,message_id,marker) VALUES (?,?,?)");
+      for (const row of rows) {
+        let entries;
+        try {
+          entries = JSON.parse(row.entries);
+        } catch {
+          sessionLog(row.session_id, "v4 temporal metadata: malformed JSON skipped; original blob retained");
+          continue;
+        }
+        if (!Array.isArray(entries)) {
+          sessionLog(row.session_id, "v4 temporal metadata: non-array JSON skipped; original blob retained");
+          continue;
+        }
+        const kept = [];
+        for (const entry of entries) {
+          const decision = typeof entry === "string" ? decodeTemporalDecision(entry) : null;
+          if (decision)
+            insert.run(row.session_id, ...decision);
+          else
+            kept.push(entry);
+        }
+        db.prepare("UPDATE session_meta SET merged_reasoning_stripped_ids=? WHERE session_id=?").run(JSON.stringify(kept), row.session_id);
+      }
+    }
+  }
+}
+
 // src/features/magic-context/migrations.ts
 var FORK_MIGRATION_VERSION_FLOOR = 1e4;
 var MIGRATION_LOCK_RETRY_DELAYS_MS = [1000, 2000, 4000, 8000, 15000];
@@ -10590,6 +10722,20 @@ var MIGRATIONS = [
       splitLkgSlotPrefixes(db);
       splitReplayDecisions(db);
     }
+  },
+  {
+    version: 3,
+    description: "drop redundant single-column session indexes; add FTS rowid-map lookup",
+    up(db) {
+      installV3PerfSchema(db);
+    }
+  },
+  {
+    version: 4,
+    description: "store temporal replay decisions per message identity",
+    up(db) {
+      installV4TemporalDecisions(db);
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -10994,7 +11140,7 @@ function getSchemaFenceRejection() {
 function getMigrationOnOpenRefusal() {
   return lastMigrationOnOpenRefusal;
 }
-var LATEST_SUPPORTED_VERSION = 2;
+var LATEST_SUPPORTED_VERSION = 4;
 var BOOT_SQLITE_BUSY_TIMEOUT_MS = 5000;
 function ensureSecureStorageDir(dir) {
   ensureStorageDirectorySync(dir);
@@ -11386,8 +11532,8 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       startMessageFtsRowidMapBackfill(db).then(async () => {
         if (!readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-apjwrttc.js");
-        const { startMessageTimeBackfill } = await import("./message-time-backfill-5ewk0axe.js");
+        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-82rkqa8j.js");
+        const { startMessageTimeBackfill } = await import("./message-time-backfill-phrwp2fz.js");
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {
           readPage: readRawSessionMessagePage
         }));
@@ -11483,7 +11629,6 @@ function initializeDatabase(db, busyTimeoutMs = BOOT_SQLITE_BUSY_TIMEOUT_MS) {
       harness TEXT NOT NULL DEFAULT 'opencode',
       UNIQUE(session_id, sequence)
     );
-    CREATE INDEX IF NOT EXISTS idx_compartments_session ON compartments(session_id);
 
     CREATE TABLE IF NOT EXISTS compartment_chunk_embeddings (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -11544,7 +11689,6 @@ function initializeDatabase(db, busyTimeoutMs = BOOT_SQLITE_BUSY_TIMEOUT_MS) {
       harness TEXT NOT NULL DEFAULT 'opencode',
       PRIMARY KEY(session_id, message_ordinal)
     );
-    CREATE INDEX IF NOT EXISTS idx_compression_depth_session ON compression_depth(session_id);
 
     CREATE TABLE IF NOT EXISTS session_facts (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -12063,7 +12207,6 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       stale_reason           TEXT,
       PRIMARY KEY (project_path, path)
     );
-    CREATE INDEX IF NOT EXISTS idx_project_key_files_project ON project_key_files(project_path);
     CREATE INDEX IF NOT EXISTS idx_project_key_files_generated_at ON project_key_files(project_path, generated_at);
 
     CREATE TABLE IF NOT EXISTS project_key_files_version (
@@ -12423,10 +12566,6 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       input_tokens       INTEGER NOT NULL DEFAULT 0,
       PRIMARY KEY (session_id, harness, message_id)
     );
-    CREATE INDEX IF NOT EXISTS idx_transform_decisions_session_harness
-      ON transform_decisions(session_id, harness);
-
-    CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
     CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
 
     -- Clone/import paths can write tags before session bootstrap. Keep trigger-created
@@ -12472,10 +12611,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       WHERE NEW.session_id != OLD.session_id
       ON CONFLICT(session_id) DO UPDATE SET tags_version = tags_version + 1;
     END;
-    CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
     CREATE INDEX IF NOT EXISTS idx_pending_ops_session_tag_id ON pending_ops(session_id, tag_id);
-    CREATE INDEX IF NOT EXISTS idx_source_contents_session ON source_contents(session_id);
-    
     CREATE TABLE IF NOT EXISTS recomp_compartments (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       session_id TEXT NOT NULL,
@@ -12820,8 +12956,6 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
         input_tokens       INTEGER NOT NULL DEFAULT 0,
         PRIMARY KEY (session_id, harness, message_id)
       );
-      CREATE INDEX IF NOT EXISTS idx_transform_decisions_session_harness
-        ON transform_decisions(session_id, harness);
     `);
   ensureColumn(db, "transform_decisions", "system_hash_prev", "TEXT");
   ensureColumn(db, "transform_decisions", "system_hash_new", "TEXT");
@@ -12857,6 +12991,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
             ON tags(session_id, message_id)
             WHERE type = 'tool' AND tool_owner_message_id IS NULL;
     `);
+  installV3PerfSchema(db);
+  installV4TemporalDecisions(db);
 }
 var CHANNEL2_CLAIM_TTL_MS = 10 * 60000;
 var channel2HealStatements = new WeakMap;
@@ -13041,7 +13177,9 @@ function getDatabasePersistenceError(db) {
 }
 
 // src/v2/store-reader.ts
+import { createHash as createHash7 } from "node:crypto";
 import { statSync as statSync3 } from "node:fs";
+import { hostname } from "node:os";
 import { resolve as resolve2 } from "node:path";
 function gaDatabasePath(dataHome, channel = "latest", env = process.env) {
   return resolveOpenCodeDbPath("v2", { dataHome, channel, env }).path;
@@ -13155,6 +13293,8 @@ function decode2(row) {
   return { ...row, data };
 }
 function connect(path, identity = "") {
+  const stat = statSync3(path);
+  const acquiredIdentity = identity || `${stat.dev}:${stat.ino}:${stat.birthtimeMs}`;
   const db = new Database(path, { readonly: true, fileMustExist: true });
   try {
     assertOpenCodeStoreGeneration(db, "v2", path);
@@ -13166,7 +13306,7 @@ function connect(path, identity = "") {
   counters.openReaders += 1;
   counters.readersOpened += 1;
   counters.maxOpenReaders = Math.max(counters.maxOpenReaders, counters.openReaders);
-  return { db, statements: new Map, identity, leases: 0, retired: false };
+  return { db, statements: new Map, identity: acquiredIdentity, leases: 0, retired: false };
 }
 function closeConnection(connection) {
   connection.statements.clear();
@@ -13238,15 +13378,20 @@ class V2StoreReaderPool {
 }
 
 class V2StoreReader {
+  path;
   pool;
   db;
   connection;
   closed = false;
   constructor(path, pool) {
+    this.path = path;
     this.pool = pool;
     this.connection = pool ? pool.acquire(path) : connect(path);
     this.db = this.connection.db;
   }
+  hostIdentity() {
+    return createHash7("sha256").update(JSON.stringify([hostname(), resolve2(this.path), this.connection.identity])).digest("hex");
+  }
   prepare(sql) {
     if (this.closed)
       throw new Error("Store reader is closed");
@@ -13342,6 +13487,10 @@ class V2StoreReader {
       return null;
     return typeof row.parent_id === "string" && row.parent_id.length > 0;
   }
+  storedRowsAfter(sessionID, after) {
+    const row = this.prepare("SELECT COUNT(*) AS count FROM session_message WHERE session_id = ? AND seq > ?").get(sessionID, after);
+    return row.count;
+  }
   storedMessageCount(sessionID) {
     return trackDecodeOperation("storedMessageCount", () => {
       const row = this.prepare("SELECT COUNT(*) AS count FROM session_message WHERE session_id = ?").get(sessionID);
@@ -13594,6 +13743,10 @@ var SESSION_SCOPED_TABLES = [
   { table: "tool_owner_backfill_state" },
   { table: "tags", harnessScoped: true },
   { table: "session_meta", harnessScoped: true },
+  {
+    table: "temporal_decisions",
+    extraPredicate: "NOT EXISTS (SELECT 1 FROM session_meta AS remaining WHERE remaining.session_id = temporal_decisions.session_id)"
+  },
   {
     table: "session_replay_decisions",
     extraPredicate: "NOT EXISTS (SELECT 1 FROM session_meta AS remaining WHERE remaining.session_id = session_replay_decisions.session_id)"
@@ -13699,11 +13852,14 @@ function getSessionMetaSelectColumns(db) {
   sessionMetaSelectColumnsCache.set(db, projection);
   return projection;
 }
-function getOrCreateSessionMeta(db, sessionId) {
+function findSessionMeta(db, sessionId) {
   const result = db.prepare(`SELECT ${getSessionMetaSelectColumns(db)} FROM session_meta WHERE session_id = ?`).get(sessionId);
-  if (isSessionMetaRow(result)) {
-    return toSessionMeta(result);
-  }
+  return isSessionMetaRow(result) ? toSessionMeta(result) : undefined;
+}
+function getOrCreateSessionMeta(db, sessionId) {
+  const existing = findSessionMeta(db, sessionId);
+  if (existing)
+    return existing;
   const harness = getHarness();
   const defaults = getDefaultSessionMeta(sessionId);
   const fallbackSubagent = harness === "opencode" ? resolveIsSubagentFromOpenCodeDb(sessionId) : harness === "opencode2" ? resolveIsSubagentFromOpenCode2Db(sessionId) : null;
@@ -13767,7 +13923,7 @@ function clearSession(db, sessionId) {
   logSlowWriteTransaction("clear-session", transactionStartedAt);
 }
 // src/features/magic-context/message-index.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 var MESSAGE_HISTORY_ORPHAN_SAFETY_AGE_MS = 24 * 60 * 60 * 1000;
 var MESSAGE_HISTORY_ORPHAN_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
 var MESSAGE_HISTORY_ORPHAN_UNAVAILABLE_REPROBE_MS = 24 * 60 * 60 * 1000;
@@ -13928,7 +14084,7 @@ function toMessageIndexSource(message) {
     role: message.role,
     createdAt: message.createdAt,
     sourceVersion: normalizeSourceVersion(message.version),
-    contentHash: createHash7("sha256").update(content).digest("hex"),
+    contentHash: createHash8("sha256").update(content).digest("hex"),
     content
   };
 }
@@ -14165,15 +14321,15 @@ function createPreAdoptionToolSweepResolver(db, sessionId) {
 }
 
 // src/features/magic-context/pi-content-decisions.ts
-var PREFIX = "pi-content-replay-v1:";
+var PREFIX2 = "pi-content-replay-v1:";
 function encodePiContentDecision(kind, messageId) {
-  return PREFIX + JSON.stringify([kind, messageId]);
+  return PREFIX2 + JSON.stringify([kind, messageId]);
 }
 function decodePiContentDecision(value) {
-  if (!value.startsWith(PREFIX))
+  if (!value.startsWith(PREFIX2))
     return null;
   try {
-    const pair = JSON.parse(value.slice(PREFIX.length));
+    const pair = JSON.parse(value.slice(PREFIX2.length));
     if (Array.isArray(pair) && pair.length === 2 && (pair[0] === "reminder-strip" || pair[0] === "seam-temporal-strip") && typeof pair[1] === "string" && pair[1].length > 0)
       return [pair[0], pair[1]];
   } catch {}
@@ -14983,101 +15139,6 @@ function dismissNotes(db, noteIds, scope) {
 function dismissNote(db, noteId, scope) {
   return dismissNotes(db, [noteId], scope)[0]?.outcome === "dismissed";
 }
-// src/features/magic-context/storage-ops.ts
-var queuePendingOpStatements = new WeakMap;
-var queueUnchangedDropStatements = new WeakMap;
-var getPendingOpsStatements = new WeakMap;
-var getPendingOpsCountStatements = new WeakMap;
-var clearPendingOpsStatements = new WeakMap;
-var removePendingOpStatements = new WeakMap;
-function getQueuePendingOpStatement(db) {
-  let stmt = queuePendingOpStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("INSERT INTO pending_ops (session_id, tag_id, operation, queued_at, harness) VALUES (?, ?, ?, ?, ?)");
-    queuePendingOpStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getPendingOpsStatement(db) {
-  let stmt = getPendingOpsStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT id, session_id, tag_id, operation, queued_at FROM pending_ops WHERE session_id = ? ORDER BY queued_at ASC, id ASC");
-    getPendingOpsStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getClearPendingOpsStatement(db) {
-  let stmt = clearPendingOpsStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM pending_ops WHERE session_id = ?");
-    clearPendingOpsStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getRemovePendingOpStatement(db) {
-  let stmt = removePendingOpStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?");
-    removePendingOpStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function isPendingOpRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.id === "number" && typeof r.session_id === "string" && typeof r.tag_id === "number" && typeof r.operation === "string" && typeof r.queued_at === "number";
-}
-function toPendingOp(row) {
-  if (row.operation !== "drop") {
-    sessionLog(row.session_id, `unknown pending operation "${row.operation}"; ignoring`);
-    return null;
-  }
-  return {
-    id: row.id,
-    sessionId: row.session_id,
-    tagId: row.tag_id,
-    operation: row.operation,
-    queuedAt: row.queued_at
-  };
-}
-function queuePendingOp(db, sessionId, tagId, operation, queuedAt = Date.now()) {
-  getQueuePendingOpStatement(db).run(sessionId, tagId, operation, queuedAt, getHarness());
-}
-function queuePendingDropForUnchangedTag(db, sessionId, tag) {
-  let statement = queueUnchangedDropStatements.get(db);
-  if (!statement) {
-    statement = db.prepare(`INSERT INTO pending_ops (session_id, tag_id, operation, queued_at, harness)
-            SELECT session_id, tag_number, 'drop', ?, ? FROM tags
-            WHERE id = ? AND session_id = ? AND tag_number = ? AND message_id = ?
-                AND type = ? AND tool_owner_message_id IS ? AND status = 'active'`);
-    queueUnchangedDropStatements.set(db, statement);
-  }
-  return statement.run(Date.now(), getHarness(), tag.id ?? null, sessionId, tag.tagNumber, tag.messageId, tag.type, tag.toolOwnerMessageId).changes > 0;
-}
-function getPendingOps(db, sessionId) {
-  const rows = getPendingOpsStatement(db).all(sessionId).filter(isPendingOpRow);
-  return rows.map(toPendingOp).filter((op) => op !== null);
-}
-function getPendingOpsCount(db, sessionId) {
-  try {
-    let statement = getPendingOpsCountStatements.get(db);
-    if (!statement) {
-      statement = db.prepare("SELECT COUNT(*) AS count FROM pending_ops WHERE session_id = ?");
-      getPendingOpsCountStatements.set(db, statement);
-    }
-    const row = statement.get(sessionId);
-    return typeof row?.count === "number" && Number.isFinite(row.count) ? row.count : null;
-  } catch {
-    return null;
-  }
-}
-function clearPendingOps(db, sessionId) {
-  getClearPendingOpsStatement(db).run(sessionId);
-}
-function removePendingOp(db, sessionId, tagId) {
-  getRemovePendingOpStatement(db).run(sessionId, tagId);
-}
 // src/features/magic-context/storage-primers.ts
 var PRIMER_CANDIDATE_TTL_MS = 90 * 24 * 60 * 60 * 1000;
 var PRIMER_CANDIDATE_MAX_AGE_MS = 180 * 24 * 60 * 60 * 1000;
@@ -15282,7 +15343,7 @@ var ERROR_CLASSES = new Set([
   "unknown"
 ]);
 // src/features/magic-context/workspaces.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 
 // src/features/magic-context/memory/constants.ts
 var V2_MEMORY_CATEGORIES = [
@@ -15509,7 +15570,7 @@ function computeWorkspaceEpochFingerprint(db, identities) {
   const canonical = uniqueSorted(identities.filter((identity) => identity.length > 0));
   const epochs = getEpochMap(db, canonical);
   const shareCategories = selectWorkspaceShareCategories(db, canonical);
-  const hash = createHash8("sha256");
+  const hash = createHash9("sha256");
   hash.update("share_categories", "utf8");
   hash.update("\x00");
   hash.update(shareCategories === null ? "NO_WORKSPACE" : JSON.stringify(shareCategories), "utf8");
@@ -16353,9 +16414,6 @@ function renderCapabilityRefusal(capability) {
   return renderUserFacingFailure(CAPABILITY_FAILURES[capability]);
 }
 
-// src/v2/hooks/hidden-child.ts
-import { createHash as createHash9 } from "node:crypto";
-
 // src/hooks/magic-context/compartment-runner-types.ts
 class HiddenCompletionRefusal extends Error {
   code;
@@ -16369,6 +16427,7 @@ class HiddenCompletionRefusal extends Error {
 }
 
 // src/v2/hooks/hidden-child.ts
+import { createHash as createHash10 } from "node:crypto";
 var HIDDEN_HISTORIAN_AGENT = "historian";
 var AGENT_TOOL_ALLOWLIST = {
   [HIDDEN_HISTORIAN_AGENT]: [],
@@ -16378,9 +16437,22 @@ var AGENT_TOOL_ALLOWLIST = {
 var AGENT_STEP_CAPS = {
   [MEMORY_MAINTAINER_A_AGENT]: MEMORY_MAINTAINER_A_STEP_CAP
 };
+function hiddenAgentAllowedTools(agent) {
+  return agent !== undefined && Object.hasOwn(AGENT_TOOL_ALLOWLIST, agent) ? AGENT_TOOL_ALLOWLIST[agent] : undefined;
+}
+function hiddenChildPermissions(agent) {
+  return [
+    { action: "*", resource: "*", effect: "deny" },
+    ...(AGENT_TOOL_ALLOWLIST[agent] ?? []).map((tool) => ({
+      action: tool,
+      resource: "*",
+      effect: "allow"
+    }))
+  ];
+}
 async function registerHiddenChildAgents(agent) {
   await agent.transform((editor) => {
-    for (const [id, allowed] of Object.entries(AGENT_TOOL_ALLOWLIST)) {
+    for (const id of Object.keys(AGENT_TOOL_ALLOWLIST)) {
       editor.update(id, (config) => {
         config.system = "Magic Context hidden completion carrier.";
         config.description = "Internal Magic Context hidden completion carrier.";
@@ -16392,14 +16464,7 @@ async function registerHiddenChildAgents(agent) {
         const stepCap = AGENT_STEP_CAPS[id];
         if (stepCap !== undefined)
           config.steps = stepCap;
-        config.permissions = [
-          { action: "*", resource: "*", effect: "deny" },
-          ...allowed.map((tool) => ({
-            action: tool,
-            resource: "*",
-            effect: "allow"
-          }))
-        ];
+        config.permissions = hiddenChildPermissions(id);
       });
     }
   });
@@ -16472,7 +16537,7 @@ function markerCandidates(text) {
 function textDigest(text) {
   return {
     length: text.length,
-    sha256: createHash9("sha256").update(text).digest("hex").slice(0, 16)
+    sha256: createHash10("sha256").update(text).digest("hex").slice(0, 16)
   };
 }
 function firstDifference(a, b) {
@@ -16492,17 +16557,21 @@ function firstDifference(a, b) {
 
 class HiddenChildHook {
   note;
-  childIDs = new Set;
+  childIDs = new Map;
   attempts = new Map;
   active = new Map;
   constructor(note = log) {
     this.note = note;
   }
-  registerChild(sessionID) {
-    this.childIDs.add(sessionID);
+  registerChild(sessionID, agent) {
+    if (agent !== undefined || !this.childIDs.has(sessionID))
+      this.childIDs.set(sessionID, agent ?? this.childIDs.get(sessionID));
+  }
+  agentFor(sessionID) {
+    return this.childIDs.get(sessionID);
   }
   registerAttempt(marker, attempt) {
-    this.registerChild(attempt.childSessionId);
+    this.registerChild(attempt.childSessionId, attempt.agent);
     attempt.marker = marker;
     this.attempts.set(marker, attempt);
   }
@@ -16516,9 +16585,24 @@ class HiddenChildHook {
   owns(sessionID) {
     return this.childIDs.has(sessionID);
   }
-  compactionSummary(sessionID) {
-    if (!this.owns(sessionID))
+  toolCallRefusal(call) {
+    const owned = this.owns(call.sessionID);
+    const agent = owned ? this.agentFor(call.sessionID) ?? call.agent : call.agent;
+    const allowed = hiddenAgentAllowedTools(agent);
+    if (allowed === undefined) {
+      return owned ? `Magic Context hidden child ${call.sessionID} has no tool allowlist; ${call.tool} refused` : undefined;
+    }
+    if (allowed.includes(call.tool))
+      return;
+    return `Magic Context hidden agent ${agent} may only use ${allowed.length > 0 ? allowed.join(", ") : "no tools"}; ${call.tool} refused`;
+  }
+  compactionSummary(sessionID, agent) {
+    if (!this.owns(sessionID)) {
+      if (hiddenAgentAllowedTools(agent) !== undefined) {
+        this.refuse("Refusing to compact a Magic Context hidden-agent session this instance did not register", { sessionID, messages: [] }, undefined);
+      }
       return;
+    }
     const active = this.active.get(sessionID);
     const pending = [...this.attempts.values()].filter((attempt) => attempt.childSessionId === sessionID && !attempt.shaped);
     const inFlight = active ? [active] : pending;
@@ -16563,8 +16647,12 @@ class HiddenChildHook {
     return parts;
   }
   apply(draft) {
-    if (!this.owns(draft.sessionID))
+    if (!this.owns(draft.sessionID)) {
+      if (hiddenAgentAllowedTools(draft.agent) !== undefined) {
+        this.refuse("Refusing a Magic Context hidden-agent turn this instance did not register", draft, newestUserText(draft));
+      }
       return false;
+    }
     const raw = newestUserText(draft);
     let attempt;
     for (const candidate of raw === undefined ? [] : markerCandidates(raw)) {
@@ -16832,13 +16920,13 @@ var muralCueColumnCache = new WeakMap;
 var muralCueRejectionColumnCache = new WeakMap;
 
 // src/features/magic-context/memory/normalize-hash.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 function normalizeMemoryContent(content) {
   return content.toLowerCase().replace(/\s+/g, " ").trim();
 }
 function computeNormalizedHash(content) {
   const normalized = normalizeMemoryContent(content);
-  return createHash10("md5").update(normalized).digest("hex");
+  return createHash11("md5").update(normalized).digest("hex");
 }
 
 // src/features/magic-context/memory/visibility.ts
@@ -17411,14 +17499,14 @@ function archiveMemory(db, id, reason) {
 }
 
 // src/features/magic-context/compaction-marker.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 import { existsSync as existsSync4 } from "node:fs";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 var ID_PREFIX_HEX_LENGTH = 12;
 var ID_SUFFIX_LENGTH = 14;
 var ID_PREFIX_MASK = (1n << BigInt(ID_PREFIX_HEX_LENGTH * 4)) - 1n;
 function deterministicBase62(seed, length) {
-  let value = BigInt(`0x${createHash11("sha256").update(seed).digest("hex")}`);
+  let value = BigInt(`0x${createHash12("sha256").update(seed).digest("hex")}`);
   const chars = Array(length);
   for (let index = length - 1;index >= 0; index -= 1) {
     chars[index] = BASE62_CHARS[Number(value % 62n)];
@@ -17567,19 +17655,19 @@ function findBoundaryUserMessage(sessionId, endMessageId) {
                AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
                         AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
                AND COALESCE(json_extract(data, '$.role'), '') = 'user'
-               AND (time_created < ? OR (time_created = ? AND id <= ?))
+               AND (time_created, id) <= (?, ?)
                 AND NOT (
                     EXISTS (SELECT 1 FROM part p
-                            WHERE p.message_id = message.id AND +p.session_id = message.session_id
+                            WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
                               AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction')
                     AND NOT EXISTS (SELECT 1 FROM part p
-                                    WHERE p.message_id = message.id AND +p.session_id = message.session_id
+                                    WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
                                       AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction'
                                       AND COALESCE(json_extract(p.data, '$.synthetic'), 0) <> 1
                                       AND COALESCE(json_extract(p.data, '$.syntheticTodoMarker'), 0) <> 1)
                 )
               ORDER BY time_created DESC, id DESC
-             LIMIT 1`).get(sessionId, target.timeCreated, target.timeCreated, target.id);
+             LIMIT 1`).get(sessionId, target.timeCreated, target.id);
   if (typeof boundary?.id !== "string" || typeof boundary.time_created !== "number") {
     return null;
   }
@@ -18048,9 +18136,17 @@ function existingMarkerAlreadyCoversTarget(sessionId, existing, targetOrdinal, t
   return true;
 }
 function applyDeferredCompactionMarker(db, sessionId, pending, directory, trustedBoundary) {
+  let stepStartedAt = performance.now();
+  const stepMs = [];
+  const endStep = (name) => {
+    const now = performance.now();
+    stepMs.push(`${name}Ms=${(now - stepStartedAt).toFixed(1)}`);
+    stepStartedAt = now;
+  };
   try {
     const responseFencesTarget = trustedBoundary !== undefined && Number.isSafeInteger(trustedBoundary.rowVersion) && trustedBoundary.rowVersion > 0 && trustedBoundary.ordinal === pending.ordinal && trustedBoundary.endMessageId === pending.endMessageId;
     const validation = responseFencesTarget ? "ok" : validatePendingTarget(db, sessionId, pending);
+    endStep("validate");
     if (validation !== "ok") {
       sessionLog(sessionId, `compaction-marker drain: stale-skip (${validation}) for ordinal ${pending.ordinal} endMessageId=${pending.endMessageId}`);
       return { kind: "stale-skip", reason: validation };
@@ -18060,12 +18156,14 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
       return { kind: "already-current" };
     }
     const boundary = findBoundaryUserMessage(sessionId, pending.endMessageId);
+    endStep("boundary");
     if (!boundary) {
       return {
         kind: "retryable-failure",
         error: new Error(`no user boundary found at or before endMessageId ${pending.endMessageId} (ordinal ${pending.ordinal}); preserving existing marker`)
       };
     }
+    endStep("discardCheck");
     const removedSummaryMessageId = existing?.summaryMessageId ?? null;
     const replacement = replaceCompactionMarker(existing, {
       sessionId,
@@ -18075,6 +18173,7 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
       directory: directory ?? process.cwd(),
       resolvedBoundary: boundary
     });
+    endStep("replace");
     if (replacement.kind !== "committed") {
       return {
         kind: "retryable-failure",
@@ -18087,7 +18186,8 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
       boundaryOrdinal: pending.ordinal,
       targetEndMessageId: pending.endMessageId
     }, removedSummaryMessageId);
-    sessionLog(sessionId, `compaction-marker drain: applied at ordinal ${pending.ordinal}, boundary user msg ${result.boundaryMessageId}`);
+    endStep("persist");
+    sessionLog(sessionId, `compaction-marker drain: applied at ordinal ${pending.ordinal}, boundary user msg ${result.boundaryMessageId} ${stepMs.join(" ")}`);
     return {
       kind: "applied",
       markerOrdinal: pending.ordinal
@@ -18192,6 +18292,7 @@ var MEMORY_EPOCH_COMPONENT_PREFIX = "|memory-render:";
 var MURAL_COMPONENT_PREFIX = "|mural-enabled:";
 var BUDGET_COMPONENT_PREFIX = "|render-budgets:";
 var RENDERED_BUDGETS_COMPONENT_PREFIX = "|rendered-budgets:";
+var M0_MEMORY_IDS_COMPONENT_PREFIX = "|m0-memory-ids:";
 function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = COMPARTMENT_RENDER_EPOCH, muralEnabled = null, renderBudgetIdentity = null, memoryRenderEpoch = MEMORY_RENDER_FORMAT_EPOCH, renderedBudgets = null) {
   let encoded = upgradeState ?? "";
   if (compartmentRenderEpoch !== null) {
@@ -18236,7 +18337,8 @@ function decodeCachedM0UpgradeIdentity(value) {
     value.indexOf(MEMORY_EPOCH_COMPONENT_PREFIX),
     value.indexOf(MURAL_COMPONENT_PREFIX),
     value.indexOf(BUDGET_COMPONENT_PREFIX),
-    value.indexOf(RENDERED_BUDGETS_COMPONENT_PREFIX)
+    value.indexOf(RENDERED_BUDGETS_COMPONENT_PREFIX),
+    value.indexOf(M0_MEMORY_IDS_COMPONENT_PREFIX)
   ].filter((index) => index >= 0);
   const identityEnd = componentIndexes.length > 0 ? Math.min(...componentIndexes) : value.length;
   const upgradeState = value.slice(0, identityEnd);
@@ -18250,6 +18352,22 @@ function decodeCachedM0UpgradeIdentity(value) {
     renderedBudgets: component(value, RENDERED_BUDGETS_COMPONENT_PREFIX)
   };
 }
+function withCachedM0MemoryIds(identity, ids) {
+  const withoutIds = (identity ?? "").replace(/\|m0-memory-ids:[^|]*/g, "");
+  return `${withoutIds}${M0_MEMORY_IDS_COMPONENT_PREFIX}${JSON.stringify(ids)}`;
+}
+function readCachedM0MemoryIds(identity, legacyVisibleIds, maxMemoryId) {
+  const encoded = component(identity ?? "", M0_MEMORY_IDS_COMPONENT_PREFIX);
+  if (encoded !== null) {
+    try {
+      const ids = JSON.parse(encoded);
+      if (Array.isArray(ids) && ids.every((id) => Number.isSafeInteger(id) && id > 0)) {
+        return ids;
+      }
+    } catch {}
+  }
+  return legacyVisibleIds.filter((id) => id <= maxMemoryId);
+}
 function renderBudgetIdentityChanged(cached, current) {
   const legacy = /^(m[^-]+)-h\d+$/.exec(cached);
   if (legacy && current.startsWith("m") && current.includes("-hp")) {
@@ -18530,6 +18648,7 @@ function formatDate(ms) {
   return `${yyyy}-${mm}-${dd}`;
 }
 var TEMPORAL_MARKER_PATTERN = /^<!-- \+[\d]+[mhdw](?: [\d]+[mhdw])? -->\n/;
+var TEMPORAL_MARKER_REPLAY_PATTERN = /^<!-- \+[\d]+[mhdw](?: [\d]+[mhdw])? -->(?:\n|$)/;
 function temporalMarkerPrefix(seconds) {
   const marker = formatGap(seconds);
   if (!marker)
@@ -18553,7 +18672,23 @@ function findFirstVisibleTextPart(parts) {
   }
   return null;
 }
-function injectTemporalMarkers(messages) {
+function collectTemporalCandidates(messages) {
+  const candidates = new Map;
+  let prev = null;
+  for (const raw of messages) {
+    if (!raw || typeof raw !== "object")
+      continue;
+    const msg = raw;
+    if (msg.info?.id && msg.info.role === "user" && Array.isArray(msg.parts) && hasMeaningfulUserText2(msg.parts)) {
+      const current = msg.info.time?.created;
+      const prior = prev?.info?.time;
+      candidates.set(msg.info.id, current !== undefined && prior?.created !== undefined ? temporalMarkerPrefix((current - (prior.completed ?? prior.created)) / 1000) ?? "" : "");
+    }
+    prev = msg;
+  }
+  return candidates;
+}
+function injectTemporalMarkers(messages, frozen) {
   let injected = 0;
   let prev = null;
   for (const raw of messages) {
@@ -18561,6 +18696,20 @@ function injectTemporalMarkers(messages) {
       continue;
     const msg = raw;
     const role = msg.info?.role;
+    if (frozen) {
+      const marker = msg.info?.id ? frozen.get(msg.info.id) : undefined;
+      const target = Array.isArray(msg.parts) ? findFirstVisibleTextPart(msg.parts) : null;
+      if (marker !== undefined && target?.text !== undefined) {
+        const { tagPrefix, body } = peelLeadingMcTagNotation(target.text);
+        const source = body.replace(TEMPORAL_MARKER_REPLAY_PATTERN, "");
+        const text = tagPrefix + (source ? marker + source : marker.trimEnd());
+        if (text !== target.text) {
+          target.text = text;
+          injected++;
+        }
+      }
+      continue;
+    }
     const authoredUser = role === "user" && Array.isArray(msg.parts) && hasMeaningfulUserText2(msg.parts);
     if (prev !== null && authoredUser) {
       const prevTime = prev.info?.time;
@@ -19442,6 +19591,9 @@ function mustMaterialize(args) {
       return withToolSetHashComparison({ value: true, reason: "project_change" });
     }
   }
+  if (args.state.cachedM0ProjectMemoryEpoch !== current.projectMemoryEpoch) {
+    return { value: true, reason: "project_memory_epoch" };
+  }
   if (args.state.cachedM0MaxMutationId !== current.maxMutationId) {
     return withToolSetHashComparison({ value: true, reason: "max_mutation_id" });
   }
@@ -19692,7 +19844,7 @@ ${sessionHistory}
 
 `).trim();
 }
-function applyMarkersToState(state, m0Bytes, markers, m1Bytes) {
+function applyMarkersToState(state, m0Bytes, markers, m1Bytes, renderedM0Ids) {
   state.cachedM0Bytes = m0Bytes;
   if (m1Bytes)
     state.cachedM1Bytes = m1Bytes;
@@ -19706,7 +19858,7 @@ function applyMarkersToState(state, m0Bytes, markers, m1Bytes) {
   state.cachedM0ProjectDocsHash = markers.projectDocsHash;
   state.cachedM0MaterializedAt = markers.materializedAt;
   state.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
-  state.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null);
+  state.cachedM0UpgradeState = withCachedM0MemoryIds(encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null), renderedM0Ids);
   state.cachedM0SystemHash = markers.systemHash;
   state.cachedM0ToolSetHash = markers.toolSetHash;
   state.cachedM0ModelKey = markers.modelKey;
@@ -19805,10 +19957,18 @@ function materializeM0(options) {
   snapshotMarkers.materializedAt = foldMaterializedAt;
   const renderedMemoryIds = trimmed.renderOrder.map((m) => m.id);
   options.beforePhase3ForTest?.();
+  const steps = new WriteTransactionSteps;
+  const upgradeIdentity = withCachedM0MemoryIds(encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity, snapshotMarkers.memoryRenderEpoch, snapshotMarkers.renderedBudgets ?? null), renderedMemoryIds);
+  const baselineEndMessageId = lastCompartmentBoundaryId(compartments);
+  steps.mark("pre_metadata");
+  const commitFold = options.onFoldPrepare?.();
+  steps.mark("pre_onFoldPrepare");
   let m1Text = M1_EMPTY_PLACEHOLDER;
   let m1Bytes = Buffer4.from(m1Text, "utf8");
+  options.beforeCacheCommitForTest?.();
   const transactionStartedAt = performance.now();
   options.db.exec("BEGIN IMMEDIATE");
+  steps.reset();
   try {
     const currentWorkspace = resolveWorkspaceRenderContext({
       db: options.db,
@@ -19837,23 +19997,26 @@ function materializeM0(options) {
       renderBudgetIdentity: snapshotMarkers.renderBudgetIdentity,
       renderedBudgets: snapshotMarkers.renderedBudgets
     };
-    const stale = current.projectUserProfileVersion !== snapshotMarkers.projectUserProfileVersion || current.maxCompartmentSeq !== snapshotMarkers.maxCompartmentSeq || current.maxMutationId !== snapshotMarkers.maxMutationId || current.maxMemoryMutationId !== snapshotMarkers.maxMemoryMutationId || current.sessionFactsVersion !== snapshotMarkers.sessionFactsVersion || current.upgradeState !== snapshotMarkers.upgradeState || (current.projectIdentity ?? null) !== (snapshotMarkers.projectIdentity ?? null);
+    const stale = current.projectUserProfileVersion !== snapshotMarkers.projectUserProfileVersion || current.projectMemoryEpoch !== snapshotMarkers.projectMemoryEpoch || current.maxCompartmentSeq !== snapshotMarkers.maxCompartmentSeq || current.maxMutationId !== snapshotMarkers.maxMutationId || current.maxMemoryMutationId !== snapshotMarkers.maxMemoryMutationId || current.sessionFactsVersion !== snapshotMarkers.sessionFactsVersion || current.upgradeState !== snapshotMarkers.upgradeState || (current.projectIdentity ?? null) !== (snapshotMarkers.projectIdentity ?? null);
     if (stale) {
       options.db.exec("ROLLBACK");
       throw new MaterializeContentionError({ reason: "snapshot changed before Phase 3" });
     }
-    const m1Render = renderM1WithMetadata({
+    steps.mark("staleCheck");
+    const rendered = renderM1WithMetadata({
       ...options,
       workspaceIdentitySet: {
         identities: workspace.identities,
         namesByIdentity: workspace.namesByIdentity
       }
     }, snapshotMarkers, renderedMemoryIds);
-    m1Text = m1Render.text;
+    m1Text = rendered.text;
     m1Bytes = Buffer4.from(m1Text, "utf8");
     const visibleMemoryIds = [
-      ...new Set([...renderedMemoryIds, ...m1Render.renderedMemoryIds])
+      ...new Set([...renderedMemoryIds, ...rendered.renderedMemoryIds])
     ];
+    const visibleIdsJson = JSON.stringify(visibleMemoryIds);
+    steps.mark("m1Render");
     persistCachedM0(options.db, options.sessionId, {
       m0Bytes,
       muralDataUrl: frozenMuralDataUrl,
@@ -19869,21 +20032,24 @@ function materializeM0(options) {
       projectDocsHash: snapshotMarkers.projectDocsHash,
       materializedAt: snapshotMarkers.materializedAt,
       sessionFactsVersion: snapshotMarkers.sessionFactsVersion,
-      upgradeState: encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity, snapshotMarkers.memoryRenderEpoch, snapshotMarkers.renderedBudgets ?? null),
+      upgradeState: upgradeIdentity,
       systemHash: snapshotMarkers.systemHash,
       toolSetHash: snapshotMarkers.toolSetHash,
       modelKey: snapshotMarkers.modelKey,
       projectIdentity: snapshotMarkers.projectIdentity
     });
-    options.db.prepare("UPDATE session_meta SET memory_block_count = ?, memory_block_ids = ? WHERE session_id = ?").run(visibleMemoryIds.length, JSON.stringify(visibleMemoryIds), options.sessionId);
-    const baselineEndMessageId = lastCompartmentBoundaryId(compartments);
+    steps.mark("persistCachedM0");
+    options.db.prepare("UPDATE session_meta SET memory_block_count = ?, memory_block_ids = ?, cached_m0_last_baseline_end_message_id = ? WHERE session_id = ?").run(visibleMemoryIds.length, visibleIdsJson, baselineEndMessageId, options.sessionId);
     options.db.prepare("UPDATE session_meta SET cached_m0_last_baseline_end_message_id = ? WHERE session_id = ?").run(baselineEndMessageId, options.sessionId);
-    options.onFoldCommit?.(options.db, {
+    steps.mark("sessionMeta");
+    commitFold?.(options.db, {
       m0Bytes,
       m1Bytes
     });
+    steps.mark("onFoldCommit");
     options.db.exec("COMMIT");
-    logSlowWriteTransaction("opencode_materialize_cache", transactionStartedAt);
+    steps.mark("commit");
+    logSlowWriteTransaction("opencode_materialize_cache", transactionStartedAt, undefined, performance.now(), steps.durations);
     options.state.cachedM0MuralDataUrl = frozenMuralDataUrl;
     options.state.cachedM0MuralHash = frozenMuralHash;
   } catch (error) {
@@ -20013,7 +20179,7 @@ ${newCompartments.map((compartment) => renderCompartmentAtTier(compartment, 1)).
   const newMemoriesBlock = renderMemoryBlockV2(deltaMemories, "new-memories", newMemoryRenderOptions);
   if (newMemoriesBlock)
     blocks.push(newMemoriesBlock);
-  const renderedNewMemoryIds = newMemoriesBlock ? trimmedNewMemories.map((memory) => memory.id) : [];
+  const renderedNewMemoryIds = newMemoriesBlock ? deltaMemories.map((memory) => memory.id) : [];
   if (blocks.length === 0) {
     return {
       text: M1_EMPTY_PLACEHOLDER,
@@ -20156,8 +20322,11 @@ function replayCachedM1(state) {
   return decodeM0Bytes(state.cachedM1Bytes) ?? M1_EMPTY_PLACEHOLDER;
 }
 function softRefreshCachedM1(options) {
+  const steps = new WriteTransactionSteps;
+  options.beforeCacheCommitForTest?.();
   const transactionStartedAt = performance.now();
   options.db.exec("BEGIN IMMEDIATE");
+  steps.reset();
   try {
     const row = readCachedM0M1Row(options.db, options.sessionId);
     if (!row || !cachedRowMatchesState(row, options.state)) {
@@ -20172,23 +20341,28 @@ function softRefreshCachedM1(options) {
         renderedMemoryIds: []
       };
     }
+    steps.mark("staleCheck");
     const markers = markersFromCachedRow(row);
     if (!markers)
       throw new RenderM1InvalidMarkersError(options.sessionId);
-    const persistedVisibleIds = parseMemoryBlockIds(row.memory_block_ids);
-    const renderedM0Ids = persistedVisibleIds.filter((id) => id <= markers.maxMemoryId);
-    const rendered = renderM1WithMetadata({ ...options }, markers, renderedM0Ids);
+    const renderedM0Ids = readCachedM0MemoryIds(row.cached_m0_upgrade_state, parseMemoryBlockIds(row.memory_block_ids), markers.maxMemoryId);
+    const rendered = renderM1WithMetadata(options, markers, renderedM0Ids);
     const visibleMemoryIds = [...new Set([...renderedM0Ids, ...rendered.renderedMemoryIds])];
     const m1Bytes = Buffer4.from(rendered.text, "utf8");
+    const visibleIdsJson = JSON.stringify(visibleMemoryIds);
     const baselineEndMessageId = getLastCompartmentEndMessageId(options.db, options.sessionId);
+    steps.mark("m1Render");
     options.db.prepare(`UPDATE session_meta
                     SET cached_m1_bytes = ?,
                         cached_m0_last_baseline_end_message_id = ?,
                         memory_block_count = ?,
-                        memory_block_ids = ?
-                  WHERE session_id = ?`).run(m1Bytes, baselineEndMessageId, visibleMemoryIds.length, JSON.stringify(visibleMemoryIds), options.sessionId);
+                        memory_block_ids = ?,
+                        cached_m0_upgrade_state = ?
+                  WHERE session_id = ?`).run(m1Bytes, baselineEndMessageId, visibleMemoryIds.length, visibleIdsJson, withCachedM0MemoryIds(row.cached_m0_upgrade_state, renderedM0Ids), options.sessionId);
+    steps.mark("sessionMeta");
     options.db.exec("COMMIT");
-    logSlowWriteTransaction("opencode_soft_refresh_cache", transactionStartedAt);
+    steps.mark("commit");
+    logSlowWriteTransaction("opencode_soft_refresh_cache", transactionStartedAt, undefined, performance.now(), steps.durations);
     options.state.cachedM1Bytes = m1Bytes;
     options.state.snapshotMarkers = markers;
     return rendered;
@@ -20603,7 +20777,7 @@ function injectM0M1(options) {
   if (decision.value) {
     try {
       const materialized = materializeWithRetry(options);
-      applyMarkersToState(options.state, materialized.m0Bytes, materialized.snapshotMarkers, materialized.m1Bytes);
+      applyMarkersToState(options.state, materialized.m0Bytes, materialized.snapshotMarkers, materialized.m1Bytes, materialized.renderedMemoryIds);
       m1Render = {
         text: materialized.m1Text,
         memoryUpdateCount: 0,
@@ -20694,7 +20868,7 @@ function injectM0M1(options) {
   if (!rematerialized && !contentionExhausted && m1Recomputed && options.isCacheBustingPass && (memoryUpdateCount > 40 || m1OverAbsoluteCap || m1HasContent && m0Tokens >= M0_DRIFT_RATIO_FLOOR_TOKENS && m1Tokens > m0Tokens * M1_DRIFT_RATIO)) {
     try {
       const refolded = materializeWithRetry(options);
-      applyMarkersToState(options.state, refolded.m0Bytes, refolded.snapshotMarkers, refolded.m1Bytes);
+      applyMarkersToState(options.state, refolded.m0Bytes, refolded.snapshotMarkers, refolded.m1Bytes, refolded.renderedMemoryIds);
       rematerialized = true;
       m0Text = decodeM0Bytes(options.state.cachedM0Bytes) ?? M0_EMPTY_BODY;
       m1Text = refolded.m1Text;
@@ -20950,12 +21124,14 @@ function applyHeadCap(args) {
     diagnostics.completedRefence.tokenMass = index.rangeTokens(Math.min(...component.map((arc) => arc.invocation)), Math.max(...component.map((arc) => arc.result)) + 1);
   });
   diagnostics.completedRefence.to = end;
-  diagnostics.eligibleEnd = end <= offset ? offset : Math.min(end, protectedTailStart);
+  if (end > protectedTailStart)
+    end = offset;
+  diagnostics.eligibleEnd = end <= offset ? offset : end;
   args.observeDiagnostics?.(diagnostics);
   if (end <= offset && offset < protectedTailStart) {
     return { eligibleEndOrdinal: offset, oversizeAtomicUnit };
   }
-  return { eligibleEndOrdinal: Math.min(end, protectedTailStart), oversizeAtomicUnit };
+  return { eligibleEndOrdinal: end, oversizeAtomicUnit };
 }
 function resolveProtectedTailBoundary(ctx) {
   const createdAt = ctx.createdAt ?? Date.now();
@@ -21110,6 +21286,7 @@ function resolveProtectedTailBoundary(ctx) {
   }
   protectedTailStart = clampOrdinal(protectedTailStart, rawMessageCount);
   protectedTailStart = retreatPastHostUnservedRows(messages, protectedTailStart, offset);
+  protectedTailStart = Math.max(offset, fenceBoundaryForCompletedToolArcs(protectedTailStart, arcs, 1));
   const perRunCap = selectPerRunCap({
     usagePercentage,
     N: scaledN,
@@ -21129,7 +21306,8 @@ function resolveProtectedTailBoundary(ctx) {
     capTokens: perRunCap,
     recentOpenArcCutoff
   });
-  const eligibleEndOrdinal = retreatPastHostUnservedRows(messages, head.eligibleEndOrdinal, offset);
+  const servedEndOrdinal = retreatPastHostUnservedRows(messages, head.eligibleEndOrdinal, offset);
+  const eligibleEndOrdinal = Math.max(offset, fenceBoundaryForCompletedToolArcs(servedEndOrdinal, arcs, 1));
   const rawRangeFingerprint = computeRawRangeFingerprint(messages, offset, eligibleEndOrdinal);
   return {
     sessionId: ctx.sessionId,
@@ -21157,7 +21335,7 @@ function resolveProtectedTailBoundary(ctx) {
     cacheNamespace: ctx.cacheNamespace,
     createdAt,
     rawRangeFingerprint,
-    trueRawEligibleTokens: index.rangeTokens(offset, protectedTailStart),
+    trueRawEligibleTokens: index.rangeTokens(offset, eligibleEndOrdinal),
     oversizeAtomicUnit: head.oversizeAtomicUnit,
     boundaryReason,
     diagnostics: boundaryDiagnostics({
@@ -21388,6 +21566,8 @@ function getRawHistoryEligibility(db, sessionId) {
 function hasRunnableCompartmentWindow(snapshot) {
   if (snapshot.offset >= snapshot.protectedTailStart)
     return false;
+  if (snapshot.eligibleEndOrdinal <= snapshot.offset)
+    return false;
   const forceMaterializationPercentage = escalationBands(snapshot.executeThresholdPercentage).forceMaterializationPercentage;
   if (snapshot.usagePercentage >= forceMaterializationPercentage || snapshot.emergencyTailScale) {
     return snapshot.trueRawEligibleTokens >= deriveMinForceEligibleTokens(snapshot.N) || snapshot.eligibleEndOrdinal > snapshot.offset;
@@ -21628,6 +21808,22 @@ function searchMemoriesFTSUnion(db, projectPaths, query, limit = DEFAULT_SEARCH_
 function clearMemoryVerifications(db, memoryId) {
   db.prepare("DELETE FROM memory_verifications WHERE memory_id = ?").run(memoryId);
 }
+// src/features/magic-context/memory/types.ts
+var MEMORY_CATEGORY_RECORD = {
+  PROJECT_RULES: true,
+  ARCHITECTURE: true,
+  CONFIG_VALUES: true,
+  ARCHITECTURE_DECISIONS: true,
+  CONSTRAINTS: true,
+  CONFIG_DEFAULTS: true,
+  NAMING: true,
+  USER_PREFERENCES: true,
+  USER_DIRECTIVES: true,
+  ENVIRONMENT: true,
+  WORKFLOW_RULES: true,
+  KNOWN_ISSUES: true
+};
+var MEMORY_CATEGORIES = Object.keys(MEMORY_CATEGORY_RECORD);
 // src/features/magic-context/memory/verification-paths.ts
 import { execFile as execFile2 } from "node:child_process";
 import { promisify } from "node:util";
@@ -21743,6 +21939,10 @@ function hasLengthCappedOutput(value) {
   return Object.values(value).some((item) => hasLengthCappedOutput(item));
 }
 
+// src/shared/provider-output-failure.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var primaryQuotas = new AsyncLocalStorage;
+
 // src/shared/resolve-fallbacks.ts
 function parseProviderModel(spec) {
   const slash = spec.indexOf("/");
@@ -27119,7 +27319,7 @@ Found ${existingStaging.compartments.length} staged compartment(s) from ${existi
       afterPublish("publication-signal", () => deps.onCompartmentStatePublished?.(sessionId));
       if (lastCompartmentEnd > 0) {
         afterPublish("compaction-marker", () => {
-          const markerUpdated = updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, deps.directory);
+          const markerUpdated = (deps.compactionMarkerStrategy?.publish ?? updateCompactionMarkerAfterPublication)(db, sessionId, lastCompartmentEnd, deps.directory);
           if (markerUpdated) {
             const stalePending = getPendingCompactionMarkerState(db, sessionId);
             if (stalePending) {
@@ -27355,7 +27555,7 @@ Another process acquired the compartment-state lease before recomp could publish
     afterPublish("publication-signal", () => deps.onCompartmentStatePublished?.(sessionId));
     if (lastCompartmentEnd > 0) {
       afterPublish("compaction-marker", () => {
-        const markerUpdated = updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, deps.directory);
+        const markerUpdated = (deps.compactionMarkerStrategy?.publish ?? updateCompactionMarkerAfterPublication)(db, sessionId, lastCompartmentEnd, deps.directory);
         if (markerUpdated) {
           const stalePending = getPendingCompactionMarkerState(db, sessionId);
           if (stalePending) {
@@ -27508,7 +27708,7 @@ Could not acquire the compartment-state lease for this session.`;
       deps.onCompartmentStatePublished?.(sessionId);
       const lastEnd = merged[merged.length - 1]?.endMessage ?? snapEnd;
       if (lastEnd > 0) {
-        const markerUpdated = updateCompactionMarkerAfterPublication(db, sessionId, lastEnd, deps.directory);
+        const markerUpdated = (deps.compactionMarkerStrategy?.publish ?? updateCompactionMarkerAfterPublication)(db, sessionId, lastEnd, deps.directory);
         if (markerUpdated) {
           const stalePending = getPendingCompactionMarkerState(db, sessionId);
           if (stalePending) {
@@ -27761,10 +27961,10 @@ function startLeaseRenewal(deps, holderId) {
     }
   }, COMPARTMENT_LEASE_RENEWAL_MS);
 }
-function startCompartmentAgent(deps, runAgent = runCompartmentAgent) {
-  withoutSqliteTransformPass(() => startBackgroundCompartmentAgent(deps, runAgent));
+function startCompartmentAgent(deps, runAgent = runCompartmentAgent, prepareBoundary) {
+  withoutSqliteTransformPass(() => startBackgroundCompartmentAgent(deps, runAgent, prepareBoundary));
 }
-function startBackgroundCompartmentAgent(deps, runAgent) {
+function startBackgroundCompartmentAgent(deps, runAgent, prepareBoundary) {
   const existing = activeRuns.get(deps.sessionId);
   if (existing) {
     return;
@@ -27789,15 +27989,33 @@ function startBackgroundCompartmentAgent(deps, runAgent) {
     return;
   }
   const renewal = startLeaseRenewal(deps, holderId);
-  let realRunStarted = false;
   const runnerDeps = withPublishedCallback({
     ...deps,
-    compartmentLeaseHolderId: holderId,
-    onHistorianRunStarted: () => {
-      realRunStarted = true;
-    }
+    compartmentLeaseHolderId: holderId
   });
-  const promise = runAgent(runnerDeps).catch((err) => {
+  const promise = new Promise((resolve) => setTimeout(resolve, 0)).then(() => withRawSessionMessageCache2(() => {
+    const snapshot = deps.boundarySnapshot;
+    try {
+      primeTailRawMessageCache2({
+        sessionId: deps.sessionId,
+        lastCompartmentEnd: snapshot?.lastCompartmentEndMessageId !== undefined ? snapshot.offset - 1 : getLastCompartmentEndMessage(deps.db, deps.sessionId),
+        anchorMessageId: snapshot?.lastCompartmentEndMessageId !== undefined ? snapshot.lastCompartmentEndMessageId : getLastCompartmentEndMessageId(deps.db, deps.sessionId)
+      });
+    } catch (error) {
+      sessionLog(deps.sessionId, "compartment agent: tail prime failed (non-fatal):", error);
+    }
+    if (prepareBoundary) {
+      const boundary = prepareBoundary();
+      if (!boundary) {
+        updateSessionMeta(deps.db, deps.sessionId, {
+          compartmentInProgress: false
+        });
+        return;
+      }
+      runnerDeps.boundarySnapshot = boundary;
+    }
+    return runAgent(runnerDeps);
+  })).catch((err) => {
     sessionLog(deps.sessionId, "compartment agent: unhandled rejection:", err);
     try {
       updateSessionMeta(deps.db, deps.sessionId, { compartmentInProgress: false });
@@ -27814,9 +28032,6 @@ function startBackgroundCompartmentAgent(deps, runAgent) {
     }
   });
   activeRuns.set(deps.sessionId, { promise, published: false, kind: "incremental" });
-  if (!realRunStarted && activeRuns.get(deps.sessionId)?.promise === promise) {
-    activeRuns.delete(deps.sessionId);
-  }
 }
 async function executeContextRecompWithResult(deps, options = {}) {
   const { sessionId } = deps;
@@ -27880,4 +28095,4 @@ async function executeContextRecomp(deps, options = {}) {
   return (await executeContextRecompWithResult(deps, options)).message;
 }
 
-export { MEMORY_MAINTAINER_A_AGENT, MEMORY_MAINTAINER_B_AGENT, MEMORY_MAINTAINER_A_STEP_CAP, MEMORY_MAINTAINER_A_SYSTEM_PROMPT, MEMORY_MAINTAINER_B_SYSTEM_PROMPT, MEMORY_MAINTAINER_FINALIZE_INSTRUCTION, buildMemoryMaintainerStageAPrompt, buildMemoryMaintainerStageBPrompt, getOpenCodeGlobalConfigDir, getOpenCodeConfigDirs, opencodeUserConfigBasePath, mmcProjectConfigBasePath, buildPrimaryLanguageDirective, resolveModelConfigValue, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, PROTECTED_TOKENS_MIN, PER_HARNESS_MIGRATION_INVENTORY, PER_HARNESS_MODEL_KEYS, ConfigProfilesSchema, MagicContextConfigSchema, LIVE_RELOAD_CONFIG_PATHS, formatFailClosedBlockingMessage, formatFailClosedBlockingSummary, createFailClosedBlockingError, isFailClosedBlockingError, setHomeProjectPermission, shouldSkipHomeProjectMemory, ProjectIdentityError, takeDubiousOwnershipProjectIdentityWarning, isUserHomeDirectory, describeUnresolvedProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, V2_MEMORY_CATEGORIES, CATEGORY_PRIORITY, computeNormalizedHash, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, ModuleMemoryAuthorityError, insertMemory, insertMemoryIdempotent, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMemoryById, getMemoriesByIds, updateMemorySeenCount, updateMemoryRetrievalCount, supersededMemory, mergeMemoryStats, archiveMemory, relaxedFtsQuery, sanitizeFtsQuery, searchMemoriesFTS, searchMemoriesFTSUnion, clearMemoryVerifications, queueMemoryMutation, registerOwnRpcServerInstance, rpcPortDir, rpcPortFilePath, parseRpcPortFile, inspectProcessesAsync, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, clearCachedM0M1, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getAuthorityManagedMarker, getLastIndexedOrdinal, getIndexedMessageIdAtOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, clearIndexedMessages, indexMessagesAfterOrdinal, layoutLkgPrefix, MAX_EXECUTE_THRESHOLD, escalationBands, MERGED_REASONING_PARTS_PREFIX, readFrozenMergedReasoningParts, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, getProtectionWindowForSession, ReplayDocumentError, readReplayEnvelope, updateReplayDocument, isEmergencyRecoveryArmed, loadPersistedUsage, loadProtectedTailMeta, resetProtectedTailNoEligibleHead, getWrapupInProgressState, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getAutoSearchHintDecisions, appendAutoSearchHintDecision, pruneAutoSearchHintDecisions, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getHistorianFailureState, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, thinkingBindingRecoveryFrozenId, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, addStaleReduceStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, clearPendingCompactionMarkerStateIf, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, BoundedSessionMap, beginLkgPass, lkgContentDigest, captureSlot, getInMemorySlot, getSlot, dropSlot, noteEntry, getLkgSlotHeapStats, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, scheduleAfterBootQuiet, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getPersistedSchemaVersion, openDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, clearSession, getNoteByIdInScope, getNotes, addNote, getSessionNotes, updateNote, dismissNotes, dismissNote, queuePendingOp, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, getActivePrimers, saveSourceContent, replaceSourceContent, getSourceContents, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, resolveStoredPathWorkspaceIdentity, storedPathBelongsToWorkspace, sourceNameForMemory, rebaseSessionCoordinatesAsync, renderUserFacingFailure, userFacingFailureCode, renderCapabilityRefusal, HiddenCompletionRefusal, HIDDEN_HISTORIAN_AGENT, registerHiddenChildAgents, HiddenAgentStepLimit, HiddenChildHook, parseProviderModel, toModelEntry, ACTIVE_TOOL_IDS, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, removeMcOwnedCompactionMarkers, MARKER_SUMMARY_TEXT, applyDeferredCompactionMarker, HISTORIAN_AGENT, HISTORIAN_RECOMP_AGENT, HISTORIAN_EDITOR_AGENT, runTokenLog, extractM0Block, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };
+export { MEMORY_MAINTAINER_A_AGENT, MEMORY_MAINTAINER_B_AGENT, MEMORY_MAINTAINER_A_STEP_CAP, MEMORY_MAINTAINER_A_SYSTEM_PROMPT, MEMORY_MAINTAINER_B_SYSTEM_PROMPT, MEMORY_MAINTAINER_FINALIZE_INSTRUCTION, buildMemoryMaintainerStageAPrompt, buildMemoryMaintainerStageBPrompt, getOpenCodeGlobalConfigDir, getOpenCodeConfigDirs, opencodeUserConfigBasePath, mmcProjectConfigBasePath, buildPrimaryLanguageDirective, resolveModelConfigValue, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, PROTECTED_TOKENS_MIN, HISTORIAN_MODEL_RESOLUTION_FIELDS, LEGACY_HARNESS_BLOCK_KEYS, ConfigProfilesSchema, MagicContextConfigSchema, LIVE_RELOAD_CONFIG_PATHS, formatFailClosedBlockingMessage, formatFailClosedBlockingSummary, createFailClosedBlockingError, isFailClosedBlockingError, setHomeProjectPermission, shouldSkipHomeProjectMemory, ProjectIdentityError, takeDubiousOwnershipProjectIdentityWarning, isUserHomeDirectory, describeUnresolvedProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, V2_MEMORY_CATEGORIES, CATEGORY_PRIORITY, computeNormalizedHash, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, ModuleMemoryAuthorityError, insertMemory, insertMemoryIdempotent, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMemoryById, getMemoriesByIds, updateMemorySeenCount, updateMemoryRetrievalCount, supersededMemory, mergeMemoryStats, archiveMemory, relaxedFtsQuery, sanitizeFtsQuery, searchMemoriesFTS, searchMemoriesFTSUnion, clearMemoryVerifications, queueMemoryMutation, registerOwnRpcServerInstance, rpcPortDir, rpcPortFilePath, parseRpcPortFile, inspectProcessesAsync, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, clearCachedM0M1, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getAuthorityManagedMarker, getLastIndexedOrdinal, getIndexedMessageIdAtOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, clearIndexedMessages, indexMessagesAfterOrdinal, layoutLkgPrefix, assembleLkgPrefix, getTemporalDecisions, observeTemporalDecisions, freezeTemporalDecisions, MAX_EXECUTE_THRESHOLD, escalationBands, MERGED_REASONING_PARTS_PREFIX, readFrozenMergedReasoningParts, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, getProtectionWindowForSession, ReplayDocumentError, readReplayEnvelope, updateReplayDocument, isEmergencyRecoveryArmed, loadPersistedUsage, loadProtectedTailMeta, resetProtectedTailNoEligibleHead, getWrapupInProgressState, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getAutoSearchHintDecisions, appendAutoSearchHintDecision, pruneAutoSearchHintDecisions, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getHistorianFailureState, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, thinkingBindingRecoveryFrozenId, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, addStaleReduceStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, clearPendingCompactionMarkerStateIf, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, BoundedSessionMap, beginLkgPass, lkgContentDigest, captureSlot, getInMemorySlot, getSlot, dropSlot, noteEntry, getLkgSlotHeapStats, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, scheduleAfterBootQuiet, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getPersistedSchemaVersion, openDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, clearSession, getNoteByIdInScope, getNotes, addNote, getSessionNotes, updateNote, dismissNotes, dismissNote, getActivePrimers, saveSourceContent, replaceSourceContent, getSourceContents, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, resolveStoredPathWorkspaceIdentity, storedPathBelongsToWorkspace, sourceNameForMemory, rebaseSessionCoordinatesAsync, renderUserFacingFailure, userFacingFailureCode, renderCapabilityRefusal, HiddenCompletionRefusal, HIDDEN_HISTORIAN_AGENT, hiddenChildPermissions, registerHiddenChildAgents, HiddenAgentStepLimit, HiddenChildHook, parseProviderModel, toModelEntry, ACTIVE_TOOL_IDS, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, removeMcOwnedCompactionMarkers, MARKER_SUMMARY_TEXT, applyDeferredCompactionMarker, HISTORIAN_AGENT, HISTORIAN_RECOMP_AGENT, HISTORIAN_EDITOR_AGENT, runTokenLog, extractM0Block, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };