@cortexkit/opencode-magic-context 0.11.1 → 0.13.0

package/dist/index.js

@@ -49,7 +49,7 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var DREAMER_AGENT = "dreamer";
 
 // src/agents/historian.ts
-var HISTORIAN_AGENT = "historian";
+var HISTORIAN_AGENT = "historian", HISTORIAN_EDITOR_AGENT = "historian-editor";
 
 // src/agents/sidekick.ts
 var SIDEKICK_AGENT = "sidekick";
@@ -14070,10 +14070,17 @@ var init_agent_overrides = __esm(() => {
 });
 
 // src/config/schema/magic-context.ts
-var DEFAULT_NUDGE_INTERVAL_TOKENS = 1e4, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE = 65, DEFAULT_HISTORIAN_TIMEOUT_MS = 300000, DEFAULT_HISTORY_BUDGET_PERCENTAGE = 0.15, DEFAULT_LOCAL_EMBEDDING_MODEL = "Xenova/all-MiniLM-L6-v2", DREAMER_TASKS, DreamingTaskSchema, DEFAULT_DREAMER_TASKS, DreamerConfigSchema, SidekickConfigSchema, BaseEmbeddingConfigSchema, EmbeddingConfigSchema, MagicContextConfigSchema;
+var DEFAULT_NUDGE_INTERVAL_TOKENS = 1e4, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE = 65, DEFAULT_HISTORIAN_TIMEOUT_MS = 300000, DEFAULT_HISTORY_BUDGET_PERCENTAGE = 0.15, DEFAULT_LOCAL_EMBEDDING_MODEL = "Xenova/all-MiniLM-L6-v2", DEFAULT_COMPRESSOR_MIN_COMPARTMENT_RATIO = 1000, DEFAULT_COMPRESSOR_MAX_MERGE_DEPTH = 5, DEFAULT_COMPRESSOR_COOLDOWN_MS = 600000, DEFAULT_COMPRESSOR_MAX_COMPARTMENTS_PER_PASS = 15, DEFAULT_COMPRESSOR_GRACE_COMPARTMENTS = 10, COMPRESSOR_MERGE_RATIO_BY_DEPTH, DREAMER_TASKS, DreamingTaskSchema, DEFAULT_DREAMER_TASKS, DreamerConfigSchema, SidekickConfigSchema, HistorianConfigSchema, BaseEmbeddingConfigSchema, EmbeddingConfigSchema, MagicContextConfigSchema;
 var init_magic_context = __esm(() => {
   init_zod();
   init_agent_overrides();
+  COMPRESSOR_MERGE_RATIO_BY_DEPTH = {
+    1: 1.33,
+    2: 1.5,
+    3: 2,
+    4: 2,
+    5: 0
+  };
   DREAMER_TASKS = [
     "consolidate",
     "verify",
@@ -14101,6 +14108,9 @@ var init_magic_context = __esm(() => {
     timeout_ms: exports_external.number().default(30000),
     system_prompt: exports_external.string().optional()
   }).optional();
+  HistorianConfigSchema = AgentOverrideConfigSchema.extend({
+    two_pass: exports_external.boolean().default(false)
+  }).optional();
   BaseEmbeddingConfigSchema = exports_external.object({
     provider: exports_external.enum(["local", "openai-compatible", "off"]).default("local"),
     model: exports_external.string().optional(),
@@ -14143,14 +14153,17 @@ var init_magic_context = __esm(() => {
   MagicContextConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(true),
     ctx_reduce_enabled: exports_external.boolean().default(true),
-    historian: AgentOverrideConfigSchema.optional(),
+    historian: HistorianConfigSchema,
     dreamer: DreamerConfigSchema.optional(),
     cache_ttl: exports_external.union([exports_external.string(), exports_external.object({ default: exports_external.string() }).catchall(exports_external.string())]).default("5m"),
     nudge_interval_tokens: exports_external.number().min(1000).default(DEFAULT_NUDGE_INTERVAL_TOKENS),
     execute_threshold_percentage: exports_external.union([
-      exports_external.number().min(20).max(95),
-      exports_external.object({ default: exports_external.number().min(20).max(95) }).catchall(exports_external.number().min(20).max(95))
+      exports_external.number().min(20).max(80),
+      exports_external.object({ default: exports_external.number().min(20).max(80) }).catchall(exports_external.number().min(20).max(80))
     ]).default(DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE),
+    execute_threshold_tokens: exports_external.object({
+      default: exports_external.number().min(5000).max(2000000).optional()
+    }).catchall(exports_external.number().min(5000).max(2000000)).optional(),
     protected_tags: exports_external.number().min(1).max(100).optional(),
     auto_drop_tool_age: exports_external.number().min(10).default(100),
     drop_tool_structure: exports_external.boolean().default(true),
@@ -14163,6 +14176,21 @@ var init_magic_context = __esm(() => {
       min_clusters: exports_external.number().min(1).default(3)
     }).default({ enabled: true, min_clusters: 3 }),
     compaction_markers: exports_external.boolean().default(true),
+    compressor: exports_external.object({
+      enabled: exports_external.boolean().default(true),
+      min_compartment_ratio: exports_external.number().min(100).max(1e4).default(DEFAULT_COMPRESSOR_MIN_COMPARTMENT_RATIO),
+      max_merge_depth: exports_external.number().min(1).max(5).default(DEFAULT_COMPRESSOR_MAX_MERGE_DEPTH),
+      cooldown_ms: exports_external.number().min(60000).default(DEFAULT_COMPRESSOR_COOLDOWN_MS),
+      max_compartments_per_pass: exports_external.number().min(3).max(50).default(DEFAULT_COMPRESSOR_MAX_COMPARTMENTS_PER_PASS),
+      grace_compartments: exports_external.number().min(0).max(100).default(DEFAULT_COMPRESSOR_GRACE_COMPARTMENTS)
+    }).default({
+      enabled: true,
+      min_compartment_ratio: DEFAULT_COMPRESSOR_MIN_COMPARTMENT_RATIO,
+      max_merge_depth: DEFAULT_COMPRESSOR_MAX_MERGE_DEPTH,
+      cooldown_ms: DEFAULT_COMPRESSOR_COOLDOWN_MS,
+      max_compartments_per_pass: DEFAULT_COMPRESSOR_MAX_COMPARTMENTS_PER_PASS,
+      grace_compartments: DEFAULT_COMPRESSOR_GRACE_COMPARTMENTS
+    }),
     embedding: EmbeddingConfigSchema.default({
       provider: "local",
       model: DEFAULT_LOCAL_EMBEDDING_MODEL
@@ -14176,10 +14204,12 @@ var init_magic_context = __esm(() => {
         enabled: exports_external.boolean().default(false),
         token_budget: exports_external.number().min(2000).max(30000).default(1e4),
         min_reads: exports_external.number().min(2).max(20).default(4)
-      }).default({ enabled: false, token_budget: 1e4, min_reads: 4 })
+      }).default({ enabled: false, token_budget: 1e4, min_reads: 4 }),
+      temporal_awareness: exports_external.boolean().default(false)
     }).default({
       user_memories: { enabled: false, promotion_threshold: 3 },
-      pin_key_files: { enabled: false, token_budget: 1e4, min_reads: 4 }
+      pin_key_files: { enabled: false, token_budget: 1e4, min_reads: 4 },
+      temporal_awareness: false
     }),
     memory: exports_external.object({
       enabled: exports_external.boolean().default(true),
@@ -14300,6 +14330,7 @@ var init_model_requirements = __esm(() => {
   ];
   AGENT_MODEL_REQUIREMENTS = {
     [HISTORIAN_AGENT]: { fallbackChain: HISTORIAN_FALLBACK_CHAIN },
+    [HISTORIAN_EDITOR_AGENT]: { fallbackChain: HISTORIAN_FALLBACK_CHAIN },
     [DREAMER_AGENT]: { fallbackChain: DREAMER_FALLBACK_CHAIN },
     [SIDEKICK_AGENT]: { fallbackChain: SIDEKICK_FALLBACK_CHAIN }
   };
@@ -14589,14 +14620,16 @@ function replaceAllCompartmentState(db, sessionId, compartments, facts) {
     db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE session_id = ?").run(sessionId);
   })();
 }
-function buildCompartmentBlock(compartments, facts, memoryBlock) {
+function buildCompartmentBlock(compartments, facts, memoryBlock, dateRanges) {
   const lines = [];
   if (memoryBlock) {
     lines.push(memoryBlock);
     lines.push("");
   }
   for (const c of compartments) {
-    lines.push(`<compartment start="${c.startMessage}" end="${c.endMessage}" title="${escapeXmlAttr(c.title)}">`);
+    const dates = dateRanges?.byId.get(c.id);
+    const dateAttr = dates ? ` start-date="${dates.start}" end-date="${dates.end}"` : "";
+    lines.push(`<compartment start="${c.startMessage}" end="${c.endMessage}"${dateAttr} title="${escapeXmlAttr(c.title)}">`);
     lines.push(escapeXmlContent(c.content));
     lines.push("</compartment>");
     lines.push("");
@@ -14679,8 +14712,29 @@ function clearRecompStaging(db, sessionId) {
   db.transaction(() => {
     db.prepare("DELETE FROM recomp_compartments WHERE session_id = ?").run(sessionId);
     db.prepare("DELETE FROM recomp_facts WHERE session_id = ?").run(sessionId);
+    try {
+      db.prepare("UPDATE session_meta SET recomp_partial_range_start = 0, recomp_partial_range_end = 0 WHERE session_id = ?").run(sessionId);
+    } catch {}
   })();
 }
+function getRecompPartialRange(db, sessionId) {
+  try {
+    const row = db.prepare("SELECT recomp_partial_range_start AS start, recomp_partial_range_end AS end FROM session_meta WHERE session_id = ?").get(sessionId);
+    const start = typeof row?.start === "number" ? row.start : 0;
+    const end = typeof row?.end === "number" ? row.end : 0;
+    if (start <= 0 || end <= 0)
+      return null;
+    return { start, end };
+  } catch {
+    return null;
+  }
+}
+function setRecompPartialRange(db, sessionId, range) {
+  const start = range ? range.start : 0;
+  const end = range ? range.end : 0;
+  db.prepare("INSERT OR IGNORE INTO session_meta (session_id) VALUES (?)").run(sessionId);
+  db.prepare("UPDATE session_meta SET recomp_partial_range_start = ?, recomp_partial_range_end = ? WHERE session_id = ?").run(start, end, sessionId);
+}
 function isRecompCompartmentRow(row) {
   if (row === null || typeof row !== "object")
     return false;
@@ -14706,23 +14760,36 @@ var init_compartment_storage = __esm(() => {
 });
 
 // src/hooks/magic-context/compartment-prompt.ts
-function buildCompressorPrompt(compartments, currentTokens, targetTokens, averageDepth = 0) {
+function buildHistorianEditorPrompt(draft) {
+  return [
+    "This is a historian draft. Clean it up following the rules in your system prompt.",
+    "",
+    "<draft>",
+    draft,
+    "</draft>",
+    "",
+    "Return the cleaned draft as valid XML matching the original structure."
+  ].join(`
+`);
+}
+function buildCompressorPrompt(compartments, currentTokens, targetTokens, outputDepth, outputCount) {
   const lines = [];
-  lines.push(`These ${compartments.length} compartments use approximately ${currentTokens} tokens. Compress them to approximately ${targetTokens} tokens.`);
+  const densityLabel = outputDepth === 1 ? "MERGE ONLY" : outputDepth === 2 ? "LITE TIGHTEN" : outputDepth === 3 ? "FULL CONDENSE" : "ULTRA TELEGRAPH";
+  const resolvedOutputCount = outputCount ?? Math.max(1, Math.ceil(compartments.length / 2));
+  lines.push(`Density target: LEVEL ${outputDepth} (${densityLabel}). See system prompt for level rules.`);
+  lines.push(`Input: ${compartments.length} compartments, ~${currentTokens} tokens. Target output: exactly ${resolvedOutputCount} compartments, ~${targetTokens} tokens total.`);
   lines.push("");
-  if (averageDepth < 2) {
-    lines.push("These compartments contain U: lines showing what the user asked. Preserve ALL U: lines exactly as they are. Focus compression on the narrative prose \u2014 merge compartments, remove redundancy, condense descriptions. Do not modify or remove U: lines.");
-  } else if (averageDepth < 3) {
-    lines.push("These compartments have already been compressed multiple times. Condense each U: line to its core intent in one sentence, but keep them as separate U: lines. Focus aggressive compression on the narrative prose.");
+  if (outputDepth === 1) {
+    lines.push("Merge only. Preserve narrative and all U: lines. Drop only genuine duplicate sentences spanning compartments.");
+  } else if (outputDepth === 2) {
+    lines.push("Merge + drop filler words and hedging. Keep grammar, keep U: lines verbatim.");
+  } else if (outputDepth === 3) {
+    lines.push("Merge into single-paragraph compartments. Drop articles and weak auxiliaries. Keep only IRREPLACEABLE U: lines.");
   } else {
-    lines.push("These compartments have been heavily compressed. Fold any remaining U: user intent into the narrative prose \u2014 do not keep separate U: lines. Write fluent summary paragraphs that naturally capture both what was asked and what was done.");
+    lines.push("Merge into telegraphic fragments with symbol connectives (\u2192 + // |). U: lines only if truly irreplaceable.");
   }
   lines.push("");
-  lines.push("Rules:");
-  lines.push("- Merge adjacent compartments when they cover related work.");
-  lines.push("- Each output compartment must use the exact start/end ordinals from the input compartments it covers.");
-  lines.push("- Do not invent new ordinal boundaries that don't exist in the input.");
-  lines.push("- Preserve commit hashes and key technical details where possible.");
+  lines.push("Preserved literally at all levels: commit hashes, file paths, URLs, code spans.");
   lines.push("");
   for (const c of compartments) {
     lines.push(`<compartment start="${c.startMessage}" end="${c.endMessage}" title="${escapeXmlAttr(c.title)}">`);
@@ -14730,7 +14797,7 @@ function buildCompressorPrompt(compartments, currentTokens, targetTokens, averag
     lines.push("</compartment>");
     lines.push("");
   }
-  lines.push("Return compressed compartments as XML.");
+  lines.push("Return merged compartments as XML.");
   return lines.join(`
 `);
 }
@@ -14764,29 +14831,144 @@ var COMPARTMENT_AGENT_SYSTEM_PROMPT = `You condense long AI coding sessions into
 Compartment rules:
 - A compartment is one contiguous completed work unit: investigation, fix, refactor, docs update, feature, or decision.
 - Start a new compartment only when the work clearly pivots to a different objective.
+- If one broad effort contains multiple completed sub-pivots with distinct outcomes, prefer multiple smaller compartments over one umbrella compartment with many U: lines.
 - Do not create compartments for magic-context commands or tool-only noise.
 - If the input ends mid-topic, leave it out and report its first message index in <unprocessed_from>.
 - All compartment start/end ordinals and <unprocessed_from> must use the absolute raw message numbers shown in the input. Never renumber relative to this chunk.
+- Every displayed raw message ordinal in the input MUST appear in exactly one compartment. Gaps between compartments are invalid. When a displayed block is pure tool noise (e.g. a long "TC: ..." run with no narrative text), do NOT skip it \u2014 extend the preceding compartment's \`end\` to absorb the range, or include it inside the current compartment if the block falls within an ongoing work unit. Never create a dedicated compartment just to cover a tool-only run.
 - Only emit NEW compartments for the new messages. Do not re-emit existing compartments from the existing state.
 - Write comprehensive, detailed compartments. Include file paths, function names, commit hashes, config keys, and values when they matter.
 - Do not list every changed file. Do not narrate tool calls. Do not preserve dead-end exploration beyond a brief clause when needed.
 
-User message preservation:
-- Include high-signal user messages verbatim inside compartments, prefixed with U:.
-- A high-signal user message states a goal, constraint, design decision, direction, preference, or rationale.
-- Drop trivial messages: yes, continue, I agree, thanks, looks good, go ahead, and similar low-signal steering.
-- Drop large pasted text unless it contains durable rules or requirements; summarize its gist instead.
-- Place U: lines at the point in the summary where the user's direction changed the work.
-- Limit to 3-5 U: lines per compartment \u2014 keep only the most important ones.
-
-Compartment example:
-<compartment start="50" end="120" title="Built the LSP stack">
-U: We need inline diagnostics on every edit, not just on-demand
-Implemented in-process LSP client with per-server reader threads and crossbeam-channel delivery. Added inline edit diagnostics to write, edit, and apply_patch. commits: a3f891, b22c4e
-U: Ship this as 0.2.0
-Updated docs and publish automation, released v0.2.0.
+# Construction order (MANDATORY)
+
+For each compartment, build in this exact order:
+
+1. Write the narrative summary first \u2014 what was done, why, and the outcome. This is 1\u20134 sentences covering the work unit completely.
+2. Re-read your narrative. Ask: does the summary already convey all important decisions and constraints from this work unit?
+3. If yes, the compartment is DONE with zero U: lines. Move on.
+4. If no, identify the specific signal the narrative cannot capture. Add U: lines ONLY for those signals.
+5. Before writing each U: line, run the CROSS-COMPARTMENT CHECK (see below).
+
+Zero U: lines in a compartment is normal and expected. Most compartments should have 0\u20132 U: lines. Compartments with 3\u20135 are rare and must be justified by genuinely distinct durable signals.
+
+# DROP rules (check these first \u2014 if any match, drop without exception)
+
+- Questions in ANY form: "should I X?", "what about Y?", "do you think Z?", "isn't it better to A?", "why don't we B?", "any ideas?" \u2014 the resolved answer belongs in narrative only. If it feels important to keep the question, you are wrong: keep the answer in narrative.
+- Agreements and acknowledgments: "yes", "okay", "sure", "thanks", "go ahead", "looks good", "perfect", "I agree", "sounds good", "great".
+- Pure pacing and sequencing: "let's start", "continue", "let's do all", "now we can X", "let's commit", "first do A then B", "before that", "in the meantime".
+- Tactical observations: "I just noticed X", "we recently did Y", "I'm seeing Z right now", "this seems wrong".
+- Debugging status: "context is at 78%", "I'm restarting", "the last build failed".
+- Dogfooding/restart loops: "I restarted, can you check?", "okay we should have updated versions now", "let me try again".
+- Pasted error output or logs as U: line \u2014 capture the underlying problem in narrative, not the raw paste.
+- Examples and illustrations: "mine was when an agent wants to see X" \u2014 convert the underlying intent into a directive or drop.
+- Hype with embedded directive: ALL-CAPS pleas, "PLEASE PLEASE PLEASE just do X" \u2014 extract only the underlying directive into narrative; drop the hype.
+- Social signals, banter, emoji-only, enthusiasm.
+- Deferred ideas: "for later", "we can do X later", "another idea for the future".
+- Mid-process status: "running Y", "checking Z".
+- Superseded drafts once a later message gives the final decision.
+- Standing workflow rules ("always run lint before push") \u2014 these belong in WORKFLOW_RULES facts, not U: lines.
+
+# Wording rule (default: verbatim)
+
+By default, U: lines use the user's actual wording. The user's exact phrasing often carries negotiation context, emphasis, or technical specificity that paraphrase loses.
+
+Paraphrase ONLY in these cases:
+- **Strip agreement prefixes**: "Yes X", "Okay X", "Sure X" \u2192 keep only the substantive part of X, in the user's original wording.
+- **Split compound directives**: If one message contains two distinct durable directives, split into two U: lines \u2014 each preserving the user's wording for its part.
+- **Drop conversational noise, keep core**: If a message wraps a directive in exploratory phrasing ("so I was thinking, maybe... but actually..."), drop the exploration and keep the core directive in the user's remaining words. Don't invent new phrasing.
+
+NEVER:
+- Rewrite a clear user directive into a formal constraint statement. ("We need tool count at ~8" stays as-is; do NOT convert to "Tool count must be capped at 8.")
+- Synthesize a directive from multiple messages into one canonical statement. If the signal needs synthesis, it belongs in narrative, not a U: line.
+- Add technical specificity the user didn't state (file paths, function names, constant names). Canonical technical specificity belongs in narrative or facts, not in U: lines attributed to the user.
+
+Good example:
+  Original user message: "Yes let's do this. But we need to also make sure that we limit by message count as some sessions have quite a lot of messages."
+  Correct U: line: "We need to also make sure that we limit by message count as some sessions have quite a lot of messages."
+  (Stripped agreement prefix; kept the user's actual wording.)
+
+Bad example (do not do this):
+  Incorrect U: line: "Cap session history retrieval at a maximum message count to prevent memory issues on large sessions."
+  (Rewrote the user directive into formal language and invented specificity.)
+
+# KEEP rules (U: line survives only if ALL pass)
+
+1. DURABLE: The signal matters after the immediate turn.
+2. SPECIFIC: Concrete goal, hard constraint, design decision, rejection, rationale, threshold, source-of-truth correction, or future-work directive.
+3. OUTCOME-BACKED: This compartment's narrative clearly states what was done, decided, or changed because of the message.
+4. NON-REDUNDANT: Not captured by another U: line (see CROSS-COMPARTMENT CHECK), by a fact, or by the narrative.
+5. IRREPLACEABLE: The user's wording adds signal that narrative paraphrase cannot preserve. If the same information could appear as narrative without losing meaning, it should.
+
+Categories of KEEP:
+- Hard gates, thresholds, config defaults, percentages, byte sizes with concrete values.
+- Accepted designs and explicit decisions.
+- Rejections and negative constraints: "X is wrong because Y", "we should NOT do Z".
+- Source-of-truth corrections: "follow the code, not the README".
+- Implementation pivots stated in future tense: "instead of X let's do Y", "switch to Z".
+- Durable rationale that explains WHY an approach was chosen.
+- Specific feature requirements stated as durable goals.
+
+# PIVOT vs OBSERVATION test
+
+A pivot is FUTURE-TENSE and changes the plan: "instead of X, let's do Y", "switch this to Z", "actually, let's not do A".
+An observation is PAST-TENSE or PRESENT-TENSE and reports state: "we recently did X", "I just noticed Y", "this is broken right now".
+Observations may frame narrative context but are NOT pivots and NOT durable. Drop them as U: lines.
+
+# CROSS-COMPARTMENT CHECK (forward-looking)
+
+Before writing ANY U: line in the current compartment:
+1. Scan U: lines you have ALREADY written in previous compartments in this response.
+2. If any prior U: line expresses the same intent, decision, constraint, or rationale \u2014 even in different words \u2014 do NOT write the new U: line.
+3. Let the narrative in the current compartment carry the signal instead.
+
+This is a forward operation: you only need to check what you already wrote, not revisit past compartments.
+
+Examples of same-intent pairs to collapse:
+- "X shouldn't cause cache bust" + "X must not bust cache by itself" \u2192 keep only the first, in its original compartment.
+- "Let's use monorepo" + "Yes, monorepo is the right call" \u2192 keep only the first.
+- "Add logging" + "We need logs here too" \u2192 keep only the first.
+
+Never keep two U: lines for the same underlying directive across compartments.
+
+# Budget
+
+- HARD LIMIT: 3\u20135 U: lines per compartment. 0\u20132 is typical.
+- If you have more than 5 candidate U: lines in one compartment, that is a signal to split into two compartments at a natural pivot, not to stuff more.
+- Every U: line must be immediately followed by 1\u20133 sentences describing the outcome, decision, or effect. Never stack two U: lines without intervening outcome text.
+
+# Example: CORRECT preservation (narrative-first, verbatim U: line)
+
+<compartment start="50" end="120" title="Built the auth layer">
+Implemented JWT auth with hard 60-minute exp claim and refresh-token rotation. Chose Bearer tokens over cookies after finding cookie-based auth broke the SPA flow. Added session_expiry config (read-only at runtime). Commits: a3f891, b22c4e.
+U: We need session expiry capped at 1 hour, no exceptions
+Hardcoded the 60-minute cap at the JWT-issuer layer so runtime overrides cannot extend it.
+</compartment>
+
+Notice: only one U: line, kept verbatim from the user's actual message. The cookie-to-Bearer pivot is narrative because paraphrase captures the signal fully.
+
+# Example: OVER-PRESERVATION (avoid)
+
+<compartment start="200" end="350" title="Refactored data layer">
+U: Okay let's start on the data layer
+U: What about transactions?
+U: Yes that approach looks good
+U: Actually wait, maybe we need write-ahead logging
+U: I just noticed the previous commit broke a test
+U: Let's commit and ship it
+Refactored data layer with WAL mode and connection pooling.
+</compartment>
+
+Problems: pacing, question, agreement, observation, pacing again. Only one message carries signal, and even that is narrative-capturable.
+
+# CORRECT version of the above
+
+<compartment start="200" end="350" title="Refactored data layer">
+Refactored data layer to use WAL mode plus connection pooling. Chose WAL over plain connections for concurrent read performance under sustained write load.
 </compartment>
 
+Zero U: lines. The pivot to WAL is clear in narrative.
+
 Fact rules:
 - Facts are editable state, not append-only notes. Rewrite, normalize, deduplicate, or drop existing facts whenever needed.
 - Before emitting any fact, check all existing facts in the same category for semantic duplicates. If two facts describe the same decision, constraint, or default with different wording, merge them into one canonical statement. Never emit two facts that could be answered by the same question.
@@ -14849,7 +15031,44 @@ More summary text.
 </meta>
 </output>
 
-Omit empty fact categories. Compartments must be ordered, contiguous for the ranges they cover, and non-overlapping.`, USER_OBSERVATIONS_APPENDIX = `
+Omit empty fact categories. Compartments must be ordered, contiguous for the ranges they cover, and non-overlapping.`, HISTORIAN_EDITOR_SYSTEM_PROMPT = `You are an editor refining a historian draft. The draft was produced by a first-pass historian and may contain noise \u2014 low-signal U: lines, redundant quotes across compartments, and weak preservation decisions.
+
+Your job is to clean the draft without changing its structure:
+
+1. DROP low-signal U: lines:
+   - Questions in any form \u2014 resolved decision goes in narrative only.
+   - Pacing/agreement: "let's go", "yes", "okay", "sounds good", "I agree".
+   - Pasted error output, debugging status, mid-process observations.
+   - Tactical micro-direction: "now look at X", "first check Y".
+
+2. DROP cross-compartment duplicates:
+   - Scan U: lines across ALL compartments in the draft.
+   - If two U: lines express the same intent/decision, keep only ONE \u2014 in the compartment where the outcome is actually described.
+
+3. STRIP agreement prefixes:
+   - "Yes we should X" \u2192 keep only the directive content, or drop entirely if nothing substantive remains after "Yes".
+
+4. PREFER verbatim over paraphrase:
+   - If the draft rephrased a user directive into formal constraint language, restore the user's wording if available.
+   - Do not invent technical specificity (file paths, function names, constants) the user did not state.
+
+5. FOLD into narrative when possible:
+   - If a U: line's signal is already captured in the surrounding narrative, drop the U: line.
+   - Narrative should not need the U: line to be understood.
+
+6. KEEP as U: lines ONLY:
+   - Hard constraints with concrete values (thresholds, byte sizes, timeouts).
+   - Explicit rejections ("X is wrong because Y", "NOT Z").
+   - Implementation pivots in future-tense ("instead of A, do B").
+   - Source-of-truth corrections.
+
+Do NOT change:
+- Compartment titles, ranges, or ordering.
+- Narrative summary text unless it directly references a U: line you dropped (in which case integrate the signal into the narrative).
+- Facts \u2014 leave the facts section untouched.
+- <meta> section \u2014 leave messages_processed and unprocessed_from exactly as the draft has them.
+
+Output the cleaned version as valid XML matching the original structure. Preserve all XML tags, compartment ranges, meta, and facts.`, USER_OBSERVATIONS_APPENDIX = `
 
 User observation rules (EXPERIMENTAL):
 - After outputting compartments and facts, also output a <user_observations> section.
@@ -14870,17 +15089,17 @@ var init_compartment_prompt = __esm(() => {
 });
 
 // src/shared/opencode-config-dir.ts
-import { homedir as homedir2 } from "os";
-import { join as join3, resolve } from "path";
+import { homedir as homedir3 } from "os";
+import { join as join3, resolve as resolve2 } from "path";
 function getCliConfigDir() {
   const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envConfigDir) {
-    return resolve(envConfigDir);
+    return resolve2(envConfigDir);
   }
   if (process.platform === "win32") {
-    return join3(homedir2(), ".config", "opencode");
+    return join3(homedir3(), ".config", "opencode");
   }
-  return join3(process.env.XDG_CONFIG_HOME || join3(homedir2(), ".config"), "opencode");
+  return join3(process.env.XDG_CONFIG_HOME || join3(homedir3(), ".config"), "opencode");
 }
 function getOpenCodeConfigDir(_options) {
   return getCliConfigDir();
@@ -15087,12 +15306,12 @@ __export(exports_conflict_warning_hook, {
   sendConflictWarning: () => sendConflictWarning,
   cleanupConflictWarnings: () => cleanupConflictWarnings
 });
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
-import { homedir as homedir3, platform } from "os";
+import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
+import { homedir as homedir4, platform } from "os";
 import { join as join5 } from "path";
 function getDesktopStatePath() {
   const os2 = platform();
-  const home = homedir3();
+  const home = homedir4();
   if (os2 === "darwin") {
     return join5(home, "Library", "Application Support", "ai.opencode.desktop", "opencode.global.dat");
   }
@@ -15108,12 +15327,12 @@ function getDesktopStatePath() {
 }
 function readDesktopState(directory) {
   const statePath = getDesktopStatePath();
-  if (!statePath || !existsSync3(statePath)) {
+  if (!statePath || !existsSync4(statePath)) {
     log(`[magic-context] conflict-warning: Desktop state file not found at ${statePath}`);
     return { sessionId: null, sidecarUrl: null };
   }
   try {
-    const raw = readFileSync3(statePath, "utf-8");
+    const raw = readFileSync4(statePath, "utf-8");
     const state = JSON.parse(raw);
     let sidecarUrl = null;
     const serverStr = state.server;
@@ -16099,6 +16318,8 @@ var exports_read_session_db = {};
 __export(exports_read_session_db, {
   withReadOnlySessionDb: () => withReadOnlySessionDb,
   getRawSessionMessageCountFromDb: () => getRawSessionMessageCountFromDb,
+  getMessageTimesFromOpenCodeDb: () => getMessageTimesFromOpenCodeDb,
+  findLastAssistantModelFromOpenCodeDb: () => findLastAssistantModelFromOpenCodeDb,
   closeReadOnlySessionDb: () => closeReadOnlySessionDb
 });
 import { Database } from "bun:sqlite";
@@ -16140,6 +16361,47 @@ function getRawSessionMessageCountFromDb(db, sessionId) {
                       AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')`).get(sessionId);
   return typeof row?.count === "number" ? row.count : 0;
 }
+function getMessageTimesFromOpenCodeDb(sessionId, messageIds) {
+  const result = new Map;
+  if (messageIds.length === 0)
+    return result;
+  try {
+    withReadOnlySessionDb((db) => {
+      const placeholders = messageIds.map(() => "?").join(",");
+      const rows = db.prepare(`SELECT id, time_created FROM message WHERE session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds);
+      for (const row of rows) {
+        if (typeof row.id === "string" && typeof row.time_created === "number") {
+          result.set(row.id, row.time_created);
+        }
+      }
+    });
+  } catch (error48) {
+    log("[magic-context] failed to resolve message times from OpenCode DB:", error48);
+  }
+  return result;
+}
+function findLastAssistantModelFromOpenCodeDb(sessionId) {
+  try {
+    return withReadOnlySessionDb((db) => {
+      const row = db.prepare(`SELECT json_extract(data, '$.providerID') as providerID,
+                            json_extract(data, '$.modelID') as modelID
+                     FROM message
+                     WHERE session_id = ?
+                       AND json_extract(data, '$.role') = 'assistant'
+                       AND json_extract(data, '$.providerID') IS NOT NULL
+                       AND json_extract(data, '$.modelID') IS NOT NULL
+                     ORDER BY time_created DESC
+                     LIMIT 1`).get(sessionId);
+      if (!row || typeof row.providerID !== "string" || typeof row.modelID !== "string") {
+        return null;
+      }
+      return { providerID: row.providerID, modelID: row.modelID };
+    });
+  } catch (error48) {
+    log("[magic-context] failed to recover live model from OpenCode DB:", error48);
+    return null;
+  }
+}
 var cachedReadOnlyDb = null;
 var init_read_session_db = __esm(() => {
   init_data_path();
@@ -16203,7 +16465,7 @@ async function acquireModelLoadLock(lockPath) {
         log("[magic-context] embedding-load lock wait exceeded, proceeding without lock");
         return async () => {};
       }
-      await new Promise((resolve2) => setTimeout(resolve2, LOCK_POLL_MS));
+      await new Promise((resolve3) => setTimeout(resolve3, LOCK_POLL_MS));
     }
   }
 }
@@ -16328,7 +16590,7 @@ class LocalEmbeddingProvider {
               }
               const delayMs = 300 * attempt + Math.floor(Math.random() * 200);
               log(`[magic-context] embedding model load attempt ${attempt}/${MAX_ATTEMPTS} failed transiently, retrying in ${delayMs}ms`);
-              await new Promise((resolve2) => setTimeout(resolve2, delayMs));
+              await new Promise((resolve3) => setTimeout(resolve3, delayMs));
             }
           }
           if (this.pipeline) {
@@ -16692,14 +16954,6 @@ function getTotalDepthStatement(db) {
   }
   return stmt;
 }
-function getMaxDepthStatement(db) {
-  let stmt = maxDepthStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT COALESCE(MAX(depth), 0) AS max_depth FROM compression_depth WHERE session_id = ?");
-    maxDepthStatements.set(db, stmt);
-  }
-  return stmt;
-}
 function getClearDepthStatement(db) {
   let stmt = clearDepthStatements.get(db);
   if (!stmt) {
@@ -16728,13 +16982,15 @@ function getAverageCompressionDepth(db, sessionId, startOrdinal, endOrdinal) {
   const messageCount = endOrdinal - startOrdinal + 1;
   return totalDepth / messageCount;
 }
-function getMaxCompressionDepth(db, sessionId) {
-  const row = getMaxDepthStatement(db).get(sessionId);
-  return typeof row?.max_depth === "number" ? row.max_depth : 0;
-}
 function clearCompressionDepth(db, sessionId) {
   getClearDepthStatement(db).run(sessionId);
 }
+function clearCompressionDepthRange(db, sessionId, startOrdinal, endOrdinal) {
+  if (endOrdinal < startOrdinal) {
+    return;
+  }
+  db.prepare("DELETE FROM compression_depth WHERE session_id = ? AND message_ordinal BETWEEN ? AND ?").run(sessionId, startOrdinal, endOrdinal);
+}
 var incrementDepthStatements, totalDepthStatements, maxDepthStatements, clearDepthStatements;
 var init_compression_depth_storage = __esm(() => {
   incrementDepthStatements = new WeakMap;
@@ -149526,6 +149782,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
   const startOrdinal = Math.max(1, offset);
   const lines = [];
   const lineMeta = [];
+  const flushedToolOnlyBlocks = [];
   let totalTokens = 0;
   let messagesProcessed = 0;
   let lastOrdinal = startOrdinal - 1;
@@ -149555,6 +149812,12 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     lines.push(blockText);
     lineMeta.push(...currentBlock.meta);
     totalTokens += blockTokens;
+    if (currentBlock.isToolOnly) {
+      flushedToolOnlyBlocks.push({
+        start: currentBlock.startOrdinal,
+        end: currentBlock.endOrdinal
+      });
+    }
     currentBlock = null;
     return true;
   }
@@ -149585,7 +149848,8 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
           endOrdinal: msg.ordinal,
           parts: [tcText],
           meta: [...pendingNoiseMeta, meta3],
-          commitHashes: []
+          commitHashes: [],
+          isToolOnly: true
         };
         pendingNoiseMeta = [];
       }
@@ -149601,11 +149865,14 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
       pendingNoiseMeta.push(meta3);
       continue;
     }
+    const msgHasNarrative = textParts.length > 0;
     if (currentBlock && currentBlock.role === role) {
       currentBlock.endOrdinal = msg.ordinal;
       currentBlock.parts.push(text);
       currentBlock.meta.push(...pendingNoiseMeta, meta3);
       currentBlock.commitHashes = mergeCommitHashes(currentBlock.commitHashes, compacted.commitHashes);
+      if (msgHasNarrative)
+        currentBlock.isToolOnly = false;
       pendingNoiseMeta = [];
       continue;
     }
@@ -149617,11 +149884,21 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
       endOrdinal: msg.ordinal,
       parts: [text],
       meta: [...pendingNoiseMeta, meta3],
-      commitHashes: [...compacted.commitHashes]
+      commitHashes: [...compacted.commitHashes],
+      isToolOnly: !msgHasNarrative
     };
     pendingNoiseMeta = [];
   }
   flushCurrentBlock();
+  const toolOnlyRanges = [];
+  for (const range of flushedToolOnlyBlocks) {
+    const last = toolOnlyRanges[toolOnlyRanges.length - 1];
+    if (last && range.start === last.end + 1) {
+      last.end = range.end;
+    } else {
+      toolOnlyRanges.push({ start: range.start, end: range.end });
+    }
+  }
   return {
     startIndex: startOrdinal,
     endIndex: lastOrdinal,
@@ -149633,7 +149910,8 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     text: lines.join(`
 `),
     lines: lineMeta,
-    commitClusterCount: commitClusters
+    commitClusterCount: commitClusters,
+    toolOnlyRanges
   };
 }
 var activeRawMessageCache = null, PROTECTED_TAIL_USER_TURNS = 5;
@@ -150211,6 +150489,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "key_files", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "conversation_tokens", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "tool_call_tokens", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "recomp_partial_range_start", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "recomp_partial_range_end", "INTEGER DEFAULT 0");
   healNullTextColumns(db);
   healNullIntegerColumns(db);
 }
@@ -150950,8 +151230,8 @@ var init_storage = __esm(() => {
 
 // src/shared/models-dev-cache.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
-import { homedir as homedir5, platform as platform2 } from "os";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
+import { homedir as homedir6, platform as platform2 } from "os";
 import { join as join11 } from "path";
 function hashFast(input) {
   return createHash("sha1").update(input).digest("hex");
@@ -150966,9 +151246,9 @@ function getModelsJsonPath() {
   if (xdgCache) {
     cacheBase = xdgCache;
   } else if (os3 === "win32") {
-    cacheBase = process.env.LOCALAPPDATA ?? join11(homedir5(), "AppData", "Local");
+    cacheBase = process.env.LOCALAPPDATA ?? join11(homedir6(), "AppData", "Local");
   } else {
-    cacheBase = join11(homedir5(), ".cache");
+    cacheBase = join11(homedir6(), ".cache");
   }
   const source = process.env.OPENCODE_MODELS_URL?.trim();
   const filename = source && source !== "https://models.dev" ? `models-${hashFast(source)}.json` : "models.json";
@@ -150976,12 +151256,12 @@ function getModelsJsonPath() {
 }
 function getOpencodeConfigPath() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  const configDir = envDir ? envDir : platform2() === "win32" ? join11(homedir5(), ".config", "opencode") : join11(process.env.XDG_CONFIG_HOME || join11(homedir5(), ".config"), "opencode");
+  const configDir = envDir ? envDir : platform2() === "win32" ? join11(homedir6(), ".config", "opencode") : join11(process.env.XDG_CONFIG_HOME || join11(homedir6(), ".config"), "opencode");
   const jsonc = join11(configDir, "opencode.jsonc");
-  if (existsSync5(jsonc))
+  if (existsSync6(jsonc))
     return jsonc;
   const json2 = join11(configDir, "opencode.json");
-  if (existsSync5(json2))
+  if (existsSync6(json2))
     return json2;
   return null;
 }
@@ -150999,9 +151279,9 @@ function loadModelsDevLimitsFromFile() {
   const modelsJsonPath = getModelsJsonPath();
   let fileFound = false;
   try {
-    if (existsSync5(modelsJsonPath)) {
+    if (existsSync6(modelsJsonPath)) {
       fileFound = true;
-      const raw = readFileSync4(modelsJsonPath, "utf-8");
+      const raw = readFileSync5(modelsJsonPath, "utf-8");
       const data = JSON.parse(raw);
       for (const [providerId, provider2] of Object.entries(data)) {
         if (!provider2?.models || typeof provider2.models !== "object")
@@ -151025,8 +151305,8 @@ function loadModelsDevLimitsFromFile() {
   }
   try {
     const configPath = getOpencodeConfigPath();
-    if (configPath && existsSync5(configPath)) {
-      let raw = readFileSync4(configPath, "utf-8");
+    if (configPath && existsSync6(configPath)) {
+      let raw = readFileSync5(configPath, "utf-8");
       raw = raw.replace(/"(?:[^"\\]|\\.)*"|\/\/.*$/gm, (match) => match.startsWith('"') ? match : "");
       const config2 = JSON.parse(raw);
       if (config2.provider && typeof config2.provider === "object") {
@@ -151069,9 +151349,12 @@ async function refreshModelLimitsFromApi(client) {
         }
       }
     }
+    const previousSize = apiCache?.size ?? null;
     apiCache = map2;
     apiLoadedAt = Date.now();
-    sessionLog("global", `models-dev-cache: API layer loaded ${map2.size} model limits`);
+    if (previousSize === null || previousSize !== map2.size) {
+      sessionLog("global", `models-dev-cache: API layer loaded ${map2.size} model limits${previousSize !== null ? ` (was ${previousSize})` : ""}`);
+    }
   } catch (error48) {
     sessionLog("global", "models-dev-cache: API refresh failed:", error48 instanceof Error ? error48.message : String(error48));
   }
@@ -151162,608 +151445,6 @@ var init_rpc_notifications = __esm(() => {
   queue2 = [];
 });
 
-// src/hooks/magic-context/send-session-notification.ts
-var exports_send_session_notification = {};
-__export(exports_send_session_notification, {
-  sendUserPrompt: () => sendUserPrompt,
-  sendIgnoredMessage: () => sendIgnoredMessage
-});
-function hasNotificationSessionClient(client) {
-  if (client === null || typeof client !== "object")
-    return false;
-  const candidate = client;
-  if (candidate.session === undefined)
-    return true;
-  if (candidate.session === null || typeof candidate.session !== "object")
-    return false;
-  const session = candidate.session;
-  return (session.prompt === undefined || typeof session.prompt === "function") && (session.promptAsync === undefined || typeof session.promptAsync === "function");
-}
-function inferToastVariant(text) {
-  const lower = text.toLowerCase();
-  if (lower.includes("error") || lower.includes("failed") || lower.includes("alert"))
-    return "error";
-  if (lower.includes("warning") || lower.includes("\u26A0"))
-    return "warning";
-  if (lower.includes("complete") || lower.includes("success") || lower.includes("\u2713") || lower.includes("finished"))
-    return "success";
-  return "info";
-}
-function extractToastTitle(text) {
-  const headingMatch = text.match(/^#+\s+(.+)/m);
-  if (headingMatch)
-    return headingMatch[1].trim();
-  const firstLine = text.split(`
-`)[0].trim();
-  if (firstLine.length <= 80)
-    return firstLine;
-  return "Magic Context";
-}
-async function sendIgnoredMessage(client, sessionId, text, params) {
-  const { isTuiConnected: checkTui } = await Promise.resolve().then(() => (init_rpc_notifications(), exports_rpc_notifications));
-  if (checkTui()) {
-    try {
-      const c2 = client;
-      const tui = c2?.tui;
-      if (typeof tui?.showToast === "function") {
-        const tuiClient = tui;
-        await tuiClient.showToast({
-          body: {
-            title: extractToastTitle(text),
-            message: text.length > 200 ? `${text.slice(0, 200)}\u2026` : text,
-            variant: inferToastVariant(text),
-            duration: 5000
-          }
-        }).catch(() => {});
-        return;
-      }
-    } catch {}
-  }
-  const agent = params.agent || undefined;
-  const variant = params.variant || undefined;
-  const model = params.providerId && params.modelId ? {
-    providerID: params.providerId,
-    modelID: params.modelId
-  } : undefined;
-  if (!hasNotificationSessionClient(client)) {
-    sessionLog(sessionId, "session prompt API unavailable for notification");
-    return;
-  }
-  const c = client;
-  const input = {
-    path: { id: sessionId },
-    body: {
-      noReply: true,
-      agent,
-      model,
-      variant,
-      parts: [
-        {
-          type: "text",
-          text,
-          ignored: true
-        }
-      ]
-    }
-  };
-  try {
-    if (typeof c.session?.prompt === "function") {
-      await Promise.resolve(c.session.prompt(input));
-    } else if (typeof c.session?.promptAsync === "function") {
-      await c.session.promptAsync(input);
-    } else {
-      sessionLog(sessionId, "session prompt API unavailable for notification");
-    }
-  } catch (error48) {
-    const msg = getErrorMessage(error48);
-    sessionLog(sessionId, "failed to send notification:", msg);
-  }
-}
-async function sendUserPrompt(client, sessionId, text) {
-  if (!hasNotificationSessionClient(client)) {
-    sessionLog(sessionId, "session prompt API unavailable for user prompt");
-    return;
-  }
-  const c = client;
-  const input = {
-    path: { id: sessionId },
-    body: {
-      parts: [{ type: "text", text }]
-    }
-  };
-  try {
-    if (typeof c.session?.promptAsync === "function") {
-      await c.session.promptAsync(input);
-    } else if (typeof c.session?.prompt === "function") {
-      await Promise.resolve(c.session.prompt(input));
-    } else {
-      sessionLog(sessionId, "session prompt API unavailable for user prompt");
-    }
-  } catch (error48) {
-    const msg = getErrorMessage(error48);
-    sessionLog(sessionId, "failed to send user prompt:", msg);
-  }
-}
-var init_send_session_notification = __esm(() => {
-  init_logger();
-});
-
-// src/hooks/magic-context/derive-budgets.ts
-var exports_derive_budgets = {};
-__export(exports_derive_budgets, {
-  resolveHistorianContextLimit: () => resolveHistorianContextLimit,
-  deriveTriggerBudget: () => deriveTriggerBudget,
-  deriveHistorianChunkTokens: () => deriveHistorianChunkTokens
-});
-function deriveTriggerBudget(mainContextLimit, executeThresholdPercentage) {
-  if (!Number.isFinite(mainContextLimit) || mainContextLimit <= 0) {
-    return TRIGGER_BUDGET_MIN;
-  }
-  const thresholdFraction = Math.max(0, executeThresholdPercentage) / 100;
-  const usable = mainContextLimit * thresholdFraction;
-  const derived = Math.round(usable * TRIGGER_BUDGET_PERCENTAGE);
-  return Math.max(TRIGGER_BUDGET_MIN, Math.min(TRIGGER_BUDGET_MAX, derived));
-}
-function deriveHistorianChunkTokens(historianContextLimit) {
-  if (!Number.isFinite(historianContextLimit) || historianContextLimit <= 0) {
-    return HISTORIAN_CHUNK_MIN;
-  }
-  const derived = Math.round(historianContextLimit * HISTORIAN_CHUNK_PERCENTAGE);
-  return Math.max(HISTORIAN_CHUNK_MIN, Math.min(HISTORIAN_CHUNK_MAX, derived));
-}
-function resolveHistorianContextLimit(historianModelOverride) {
-  if (typeof historianModelOverride === "string" && historianModelOverride.includes("/")) {
-    const [providerID, ...rest] = historianModelOverride.split("/");
-    const modelID = rest.join("/");
-    if (providerID && modelID) {
-      const limit = getModelsDevContextLimit(providerID, modelID);
-      if (typeof limit === "number" && limit > 0)
-        return limit;
-    }
-    return DEFAULT_HISTORIAN_CONTEXT_FALLBACK;
-  }
-  if (typeof historianModelOverride === "string" && historianModelOverride.trim() !== "") {
-    console.warn(`[magic-context] historian.model "${historianModelOverride}" lacks provider prefix ("provider/model-id"); using fallback chain for chunk-budget derivation.`);
-  }
-  const chain = AGENT_MODEL_REQUIREMENTS[HISTORIAN_AGENT]?.fallbackChain;
-  if (!chain || chain.length === 0)
-    return DEFAULT_HISTORIAN_CONTEXT_FALLBACK;
-  const expanded = expandFallbackChain(chain);
-  let minLimit;
-  for (const key of expanded) {
-    const [providerID, ...rest] = key.split("/");
-    const modelID = rest.join("/");
-    if (!providerID || !modelID)
-      continue;
-    const limit = getModelsDevContextLimit(providerID, modelID);
-    if (typeof limit !== "number" || limit <= 0)
-      continue;
-    if (minLimit === undefined || limit < minLimit)
-      minLimit = limit;
-  }
-  return minLimit ?? DEFAULT_HISTORIAN_CONTEXT_FALLBACK;
-}
-var TRIGGER_BUDGET_PERCENTAGE = 0.05, TRIGGER_BUDGET_MIN = 5000, TRIGGER_BUDGET_MAX = 50000, HISTORIAN_CHUNK_PERCENTAGE = 0.25, HISTORIAN_CHUNK_MIN = 8000, HISTORIAN_CHUNK_MAX = 50000, DEFAULT_HISTORIAN_CONTEXT_FALLBACK = 128000;
-var init_derive_budgets = __esm(() => {
-  init_model_requirements();
-  init_models_dev_cache();
-});
-
-// src/features/magic-context/compaction-marker.ts
-import { Database as Database4 } from "bun:sqlite";
-import { join as join12 } from "path";
-function randomBase62(length) {
-  const chars = [];
-  for (let i = 0;i < length; i++) {
-    chars.push(BASE62_CHARS[Math.floor(Math.random() * BASE62_CHARS.length)]);
-  }
-  return chars.join("");
-}
-function generateId(prefix, timestampMs, counter = 0n) {
-  const encoded = BigInt(timestampMs) * 0x1000n + counter;
-  const hex3 = encoded.toString(16).padStart(14, "0");
-  return `${prefix}_${hex3}${randomBase62(14)}`;
-}
-function generateMessageId(timestampMs, counter = 0n) {
-  return generateId("msg", timestampMs, counter);
-}
-function generatePartId(timestampMs, counter = 0n) {
-  return generateId("prt", timestampMs, counter);
-}
-function getOpenCodeDbPath3() {
-  return join12(getDataDir(), "opencode", "opencode.db");
-}
-function getWritableOpenCodeDb() {
-  const dbPath = getOpenCodeDbPath3();
-  if (cachedWriteDb?.path === dbPath) {
-    return cachedWriteDb.db;
-  }
-  if (cachedWriteDb) {
-    try {
-      cachedWriteDb.db.close(false);
-    } catch {}
-  }
-  const db = new Database4(dbPath);
-  db.exec("PRAGMA journal_mode=WAL");
-  db.exec("PRAGMA busy_timeout=5000");
-  cachedWriteDb = { path: dbPath, db };
-  return db;
-}
-function findBoundaryUserMessage(sessionId, endOrdinal) {
-  const db = getWritableOpenCodeDb();
-  const rows = db.prepare("SELECT id, time_created, data FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId);
-  const filtered = rows.filter((row) => {
-    try {
-      const info = JSON.parse(row.data);
-      return !(info.summary === true && info.finish === "stop");
-    } catch {
-      return true;
-    }
-  });
-  let bestMatch = null;
-  for (let i = 0;i < filtered.length && i < endOrdinal; i++) {
-    const row = filtered[i];
-    try {
-      const info = JSON.parse(row.data);
-      if (info.role === "user") {
-        bestMatch = { id: row.id, timeCreated: row.time_created };
-      }
-    } catch {}
-  }
-  return bestMatch;
-}
-function injectCompactionMarker(args) {
-  const boundary = findBoundaryUserMessage(args.sessionId, args.endOrdinal);
-  if (!boundary) {
-    log(`[magic-context] compaction-marker: no user message found at or before ordinal ${args.endOrdinal}`);
-    return null;
-  }
-  const db = getWritableOpenCodeDb();
-  const boundaryTime = boundary.timeCreated;
-  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n);
-  const compactionPartId = generatePartId(boundaryTime, 1n);
-  const summaryPartId = generatePartId(boundaryTime + 1, 2n);
-  const summaryMsgData = JSON.stringify({
-    role: "assistant",
-    parentID: boundary.id,
-    summary: true,
-    finish: "stop",
-    mode: "compaction",
-    agent: "compaction",
-    path: { cwd: args.directory, root: args.directory },
-    cost: 0,
-    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-    modelID: "magic-context",
-    providerID: "magic-context",
-    time: { created: boundaryTime + 1 }
-  });
-  try {
-    db.transaction(() => {
-      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(compactionPartId, boundary.id, args.sessionId, boundaryTime, boundaryTime, '{"type":"compaction","auto":true}');
-      db.prepare("INSERT INTO message (id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?)").run(summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, summaryMsgData);
-      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(summaryPartId, summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, JSON.stringify({ type: "text", text: args.summaryText }));
-    })();
-    log(`[magic-context] compaction-marker: injected boundary at user msg ${boundary.id} (ordinal ~${args.endOrdinal}), summary msg ${summaryMsgId}`);
-    return {
-      boundaryMessageId: boundary.id,
-      summaryMessageId: summaryMsgId,
-      compactionPartId,
-      summaryPartId
-    };
-  } catch (error48) {
-    log(`[magic-context] compaction-marker: injection failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
-    return null;
-  }
-}
-function removeCompactionMarker(state) {
-  try {
-    const db = getWritableOpenCodeDb();
-    db.transaction(() => {
-      db.prepare("DELETE FROM part WHERE id = ?").run(state.summaryPartId);
-      db.prepare("DELETE FROM message WHERE id = ?").run(state.summaryMessageId);
-      db.prepare("DELETE FROM part WHERE id = ?").run(state.compactionPartId);
-    })();
-    return true;
-  } catch (error48) {
-    log(`[magic-context] compaction-marker: removal failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
-    return false;
-  }
-}
-var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", cachedWriteDb = null;
-var init_compaction_marker = __esm(() => {
-  init_data_path();
-  init_logger();
-});
-
-// src/hooks/magic-context/compaction-marker-manager.ts
-function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, directory) {
-  const existing = getPersistedCompactionMarkerState(db, sessionId);
-  if (existing) {
-    if (existing.boundaryOrdinal === lastCompartmentEnd) {
-      return;
-    }
-    try {
-      removeCompactionMarker(existing);
-      setPersistedCompactionMarkerState(db, sessionId, null);
-      sessionLog(sessionId, `compaction-marker: removed old boundary at ordinal ${existing.boundaryOrdinal}, moving to ${lastCompartmentEnd}`);
-    } catch (error48) {
-      sessionLog(sessionId, `compaction-marker: failed to remove old boundary at ordinal ${existing.boundaryOrdinal}, proceeding with new injection:`, error48);
-    }
-  }
-  const result = injectCompactionMarker({
-    sessionId,
-    endOrdinal: lastCompartmentEnd,
-    summaryText: MARKER_SUMMARY_TEXT,
-    directory: directory ?? process.cwd()
-  });
-  if (result) {
-    setPersistedCompactionMarkerState(db, sessionId, {
-      ...result,
-      boundaryOrdinal: lastCompartmentEnd
-    });
-    sessionLog(sessionId, `compaction-marker: injected at ordinal ${lastCompartmentEnd}, boundary user msg ${result.boundaryMessageId}`);
-  }
-}
-function removeCompactionMarkerForSession(db, sessionId) {
-  const existing = getPersistedCompactionMarkerState(db, sessionId);
-  if (existing) {
-    try {
-      removeCompactionMarker(existing);
-      setPersistedCompactionMarkerState(db, sessionId, null);
-      sessionLog(sessionId, "compaction-marker: removed on session cleanup");
-    } catch (error48) {
-      setPersistedCompactionMarkerState(db, sessionId, null);
-      sessionLog(sessionId, "compaction-marker: removal failed during session cleanup, cleared persisted state:", error48);
-    }
-  }
-}
-var MARKER_SUMMARY_TEXT = "[Compacted by magic-context \u2014 session history is managed by the plugin]";
-var init_compaction_marker_manager = __esm(() => {
-  init_compaction_marker();
-  init_storage_meta_persisted();
-  init_logger();
-});
-
-// src/hooks/magic-context/note-nudger.ts
-function getPersistedNoteNudgeDeliveredAt(_db, sessionId) {
-  return lastDeliveredAt.get(sessionId) ?? 0;
-}
-function recordNoteNudgeDeliveryTime(sessionId) {
-  lastDeliveredAt.set(sessionId, Date.now());
-}
-function onNoteTrigger(db, sessionId, trigger) {
-  setPersistedNoteNudgeTrigger(db, sessionId);
-  sessionLog(sessionId, `note-nudge: trigger fired (${trigger}), triggerPending=true`);
-}
-function peekNoteNudgeText(db, sessionId, currentUserMessageId, projectIdentity) {
-  const state = getPersistedNoteNudge(db, sessionId);
-  if (!state.triggerPending)
-    return null;
-  if (!state.triggerMessageId && currentUserMessageId) {
-    setPersistedNoteNudgeTriggerMessageId(db, sessionId, currentUserMessageId);
-    state.triggerMessageId = currentUserMessageId;
-  }
-  if (state.triggerMessageId && currentUserMessageId && state.triggerMessageId === currentUserMessageId) {
-    sessionLog(sessionId, `note-nudge: deferring \u2014 current user message ${currentUserMessageId} is same as trigger-time message`);
-    return null;
-  }
-  const deliveredAt = getPersistedNoteNudgeDeliveredAt(db, sessionId);
-  if (deliveredAt > 0 && Date.now() - deliveredAt < NOTE_NUDGE_COOLDOWN_MS) {
-    sessionLog(sessionId, `note-nudge: suppressing \u2014 last delivered ${Math.round((Date.now() - deliveredAt) / 1000)}s ago (cooldown ${NOTE_NUDGE_COOLDOWN_MS / 60000}m)`);
-    clearPersistedNoteNudge(db, sessionId);
-    return null;
-  }
-  const notes = getSessionNotes(db, sessionId);
-  const readySmartCount = projectIdentity ? getReadySmartNotes(db, projectIdentity).length : 0;
-  const totalCount = notes.length + readySmartCount;
-  if (totalCount === 0) {
-    sessionLog(sessionId, "note-nudge: triggerPending but no notes found, skipping");
-    clearPersistedNoteNudge(db, sessionId);
-    return null;
-  }
-  const parts = [];
-  if (notes.length > 0) {
-    parts.push(`${notes.length} deferred note${notes.length === 1 ? "" : "s"}`);
-  }
-  if (readySmartCount > 0) {
-    parts.push(`${readySmartCount} ready smart note${readySmartCount === 1 ? "" : "s"}`);
-  }
-  sessionLog(sessionId, `note-nudge: delivering nudge for ${parts.join(" and ")}`);
-  return `You have ${parts.join(" and ")}. Review with ctx_note read \u2014 some may be actionable now.`;
-}
-function markNoteNudgeDelivered(db, sessionId, text, messageId) {
-  setPersistedDeliveredNoteNudge(db, sessionId, messageId ? text : "", messageId ?? "");
-  recordNoteNudgeDeliveryTime(sessionId);
-  sessionLog(sessionId, messageId ? `note-nudge: marked delivered, sticky anchor=${messageId}` : "note-nudge: marked delivered without anchor");
-}
-function getStickyNoteNudge(db, sessionId) {
-  const state = getPersistedNoteNudge(db, sessionId);
-  if (!state.stickyText || !state.stickyMessageId)
-    return null;
-  return { text: state.stickyText, messageId: state.stickyMessageId };
-}
-function clearNoteNudgeState(db, sessionId, options) {
-  if (options?.persist !== false) {
-    clearPersistedNoteNudge(db, sessionId);
-  }
-  lastDeliveredAt.delete(sessionId);
-}
-var NOTE_NUDGE_COOLDOWN_MS, lastDeliveredAt;
-var init_note_nudger = __esm(() => {
-  init_storage_meta_persisted();
-  init_storage_notes();
-  init_logger();
-  NOTE_NUDGE_COOLDOWN_MS = 15 * 60 * 1000;
-  lastDeliveredAt = new Map;
-});
-
-// src/features/magic-context/memory/constants.ts
-var PROMOTABLE_CATEGORIES, CATEGORY_PRIORITY, CATEGORY_DEFAULT_TTL;
-var init_constants = __esm(() => {
-  PROMOTABLE_CATEGORIES = [
-    "ARCHITECTURE_DECISIONS",
-    "CONSTRAINTS",
-    "CONFIG_DEFAULTS",
-    "NAMING",
-    "USER_PREFERENCES",
-    "USER_DIRECTIVES",
-    "ENVIRONMENT",
-    "WORKFLOW_RULES",
-    "KNOWN_ISSUES"
-  ];
-  CATEGORY_PRIORITY = [
-    "USER_DIRECTIVES",
-    "USER_PREFERENCES",
-    "NAMING",
-    "CONFIG_DEFAULTS",
-    "CONSTRAINTS",
-    "ARCHITECTURE_DECISIONS",
-    "ENVIRONMENT",
-    "WORKFLOW_RULES",
-    "KNOWN_ISSUES"
-  ];
-  CATEGORY_DEFAULT_TTL = {
-    WORKFLOW_RULES: 90 * 24 * 60 * 60 * 1000,
-    KNOWN_ISSUES: 30 * 24 * 60 * 60 * 1000
-  };
-});
-
-// src/features/magic-context/memory/embedding-backfill.ts
-async function ensureMemoryEmbeddings(args) {
-  if (!isEmbeddingEnabled()) {
-    return args.existingEmbeddings;
-  }
-  const missingMemories = args.memories.filter((memory) => !args.existingEmbeddings.has(memory.id));
-  if (missingMemories.length === 0) {
-    return args.existingEmbeddings;
-  }
-  try {
-    const embeddings = await embedBatch(missingMemories.map((memory) => memory.content));
-    const modelId = getEmbeddingModelId();
-    const staged = new Map;
-    args.db.transaction(() => {
-      for (const [index, memory] of missingMemories.entries()) {
-        const embedding = embeddings[index];
-        if (!embedding) {
-          continue;
-        }
-        saveEmbedding(args.db, memory.id, embedding, modelId);
-        staged.set(memory.id, embedding);
-      }
-    })();
-    for (const [id, embedding] of staged) {
-      args.existingEmbeddings.set(id, embedding);
-    }
-  } catch (error48) {
-    log("[magic-context] failed to backfill memory embeddings:", error48);
-  }
-  return args.existingEmbeddings;
-}
-var init_embedding_backfill = __esm(() => {
-  init_logger();
-  init_embedding();
-  init_storage_memory_embeddings();
-});
-
-// src/features/magic-context/memory/promotion.ts
-function isPromotableCategory(category) {
-  return PROMOTABLE_CATEGORIES.some((promotableCategory) => promotableCategory === category);
-}
-function resolveExpiresAt(category) {
-  const ttl = CATEGORY_DEFAULT_TTL[category];
-  return ttl === undefined ? null : Date.now() + ttl;
-}
-function promoteSessionFactsToMemory(db, sessionId, projectPath, facts) {
-  for (const fact of facts) {
-    if (!isPromotableCategory(fact.category)) {
-      continue;
-    }
-    try {
-      const normalizedHash = computeNormalizedHash(fact.content);
-      const existingMemory = getMemoryByHash(db, projectPath, fact.category, normalizedHash);
-      if (existingMemory) {
-        updateMemorySeenCount(db, existingMemory.id);
-        continue;
-      }
-      const memoryInput = {
-        projectPath,
-        category: fact.category,
-        content: fact.content,
-        sourceSessionId: sessionId,
-        sourceType: "historian",
-        expiresAt: resolveExpiresAt(fact.category)
-      };
-      const memory = insertMemory(db, memoryInput);
-      embedAndStoreMemory(db, sessionId, memory.id, memory.content);
-    } catch (error48) {
-      sessionLog(sessionId, `memory promotion failed for fact "${fact.content.slice(0, 60)}":`, error48);
-    }
-  }
-}
-async function embedAndStoreMemory(db, sessionId, memoryId, content) {
-  try {
-    const embedding = await embedText(content);
-    if (embedding) {
-      saveEmbedding(db, memoryId, embedding, getEmbeddingModelId());
-    }
-  } catch (error48) {
-    sessionLog(sessionId, `memory embedding failed for memory ${memoryId}:`, error48);
-  }
-}
-var init_promotion = __esm(() => {
-  init_logger();
-  init_constants();
-  init_embedding();
-  init_storage_memory();
-  init_storage_memory_embeddings();
-});
-
-// src/features/magic-context/memory/storage-memory-fts.ts
-function getSearchStatement(db) {
-  let stmt = searchStatements.get(db);
-  if (!stmt) {
-    const selectColumns = Object.entries(COLUMN_MAP).map(([property, column]) => `memories.${column} AS ${property}`).join(", ");
-    stmt = db.prepare(`SELECT ${selectColumns} FROM memories_fts INNER JOIN memories ON memories.id = memories_fts.rowid WHERE memories.project_path = ? AND memories.status IN ('active', 'permanent') AND (memories.expires_at IS NULL OR memories.expires_at > ?) AND memories_fts MATCH ? ORDER BY bm25(memories_fts), memories.updated_at DESC, memories.id ASC LIMIT ?`);
-    searchStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function sanitizeFtsQuery(query) {
-  const tokens = query.split(/\s+/).filter((token) => token.length > 0);
-  if (tokens.length === 0)
-    return "";
-  return tokens.map((token) => `"${token.replace(/"/g, '""')}"`).join(" ");
-}
-function searchMemoriesFTS(db, projectPath, query, limit = DEFAULT_SEARCH_LIMIT) {
-  const trimmedQuery = query.trim();
-  if (trimmedQuery.length === 0 || limit <= 0) {
-    return [];
-  }
-  const sanitized = sanitizeFtsQuery(trimmedQuery);
-  if (sanitized.length === 0) {
-    return [];
-  }
-  const rows = getSearchStatement(db).all(projectPath, Date.now(), sanitized, limit).filter(isMemoryRow);
-  return rows.map(toMemory);
-}
-var DEFAULT_SEARCH_LIMIT = 10, searchStatements;
-var init_storage_memory_fts = __esm(() => {
-  init_storage_memory();
-  searchStatements = new WeakMap;
-});
-// src/features/magic-context/memory/index.ts
-var init_memory = __esm(() => {
-  init_project_identity();
-  init_promotion();
-  init_constants();
-  init_embedding();
-  init_embedding_backfill();
-  init_embedding_cache();
-  init_storage_memory();
-  init_storage_memory_embeddings();
-  init_storage_memory_fts();
-});
-
 // src/hooks/magic-context/compartment-parser.ts
 function parseCompartmentOutput(text) {
   const compartments = [];
@@ -151814,290 +151495,6 @@ var init_compartment_parser = __esm(() => {
   USER_OBS_ITEM_REGEX = /^\s*\*\s*(.+)$/gm;
 });
 
-// src/hooks/magic-context/compartment-runner-compressor.ts
-async function runCompressionPassIfNeeded(deps) {
-  const { db, sessionId, historyBudgetTokens } = deps;
-  const compartments = getCompartments(db, sessionId);
-  if (compartments.length <= 1)
-    return false;
-  const facts = getSessionFacts(db, sessionId);
-  let totalTokens = 0;
-  for (const c of compartments) {
-    totalTokens += estimateTokens(`<compartment start="${c.startMessage}" end="${c.endMessage}" title="${c.title}">
-${c.content}
-</compartment>
-`);
-  }
-  for (const f of facts) {
-    totalTokens += estimateTokens(`* ${f.content}
-`);
-  }
-  if (totalTokens <= historyBudgetTokens) {
-    sessionLog(sessionId, `compressor: history block ~${totalTokens} tokens within budget ${historyBudgetTokens}, skipping`);
-    return false;
-  }
-  const overage = totalTokens - historyBudgetTokens;
-  sessionLog(sessionId, `compressor: history block ~${totalTokens} tokens exceeds budget ${historyBudgetTokens} by ~${overage} tokens`);
-  const maxDepth = getMaxCompressionDepth(db, sessionId);
-  const scoredCompartments = compartments.map((compartment, index) => {
-    const tokenEstimate = estimateTokens(`<compartment start="${compartment.startMessage}" end="${compartment.endMessage}" title="${compartment.title}">
-${compartment.content}
-</compartment>
-`);
-    const averageDepth = getAverageCompressionDepth(db, sessionId, compartment.startMessage, compartment.endMessage);
-    const normalizedAge = compartments.length > 1 ? 1 - index / (compartments.length - 1) : 1;
-    const normalizedDepth = maxDepth > 0 ? 1 - averageDepth / maxDepth : 1;
-    const score = 0.7 * normalizedAge + 0.3 * normalizedDepth;
-    return {
-      compartment,
-      index,
-      tokenEstimate,
-      averageDepth,
-      score
-    };
-  });
-  const sortedByScore = [...scoredCompartments].sort((left, right) => right.score - left.score || left.index - right.index);
-  const targetSelectionTokens = overage * 2;
-  let selectedCandidateTokens = 0;
-  const selectedCandidates = [];
-  for (const compartment of sortedByScore) {
-    if (selectedCandidateTokens >= targetSelectionTokens)
-      break;
-    selectedCandidates.push(compartment);
-    selectedCandidateTokens += compartment.tokenEstimate;
-  }
-  if (selectedCandidates.length < 2) {
-    sessionLog(sessionId, "compressor: not enough compartments to compress, skipping");
-    return false;
-  }
-  const selectedStartIndex = Math.min(...selectedCandidates.map((compartment) => compartment.index));
-  const selectedEndIndex = Math.max(...selectedCandidates.map((compartment) => compartment.index));
-  let selectedScoredCompartments = scoredCompartments.slice(selectedStartIndex, selectedEndIndex + 1);
-  const expandedTokens = selectedScoredCompartments.reduce((t, c) => t + c.tokenEstimate, 0);
-  if (expandedTokens > selectedCandidateTokens * 3) {
-    const sortedByIndex = [...selectedCandidates].sort((a, b) => a.index - b.index);
-    let runEnd = sortedByIndex[0].index;
-    for (let i = 1;i < sortedByIndex.length; i++) {
-      if (sortedByIndex[i].index === runEnd + 1) {
-        runEnd = sortedByIndex[i].index;
-      } else {
-        break;
-      }
-    }
-    selectedScoredCompartments = scoredCompartments.slice(sortedByIndex[0].index, runEnd + 1);
-    sessionLog(sessionId, `compressor: contiguous expansion was ${expandedTokens} tokens (>${selectedCandidateTokens * 3}), fell back to contiguous run of ${selectedScoredCompartments.length}`);
-  }
-  if (selectedScoredCompartments.length < 2) {
-    sessionLog(sessionId, "compressor: not enough adjacent compartments to compress, skipping");
-    return false;
-  }
-  const selectedCompartments = selectedScoredCompartments.map((scoredCompartment) => scoredCompartment.compartment);
-  const selectedTokens = selectedScoredCompartments.reduce((total, scoredCompartment) => total + scoredCompartment.tokenEstimate, 0);
-  const targetTokens = Math.floor(selectedTokens / 2);
-  const minAverageDepth = Math.min(...selectedScoredCompartments.map((compartment) => compartment.averageDepth));
-  const maxAverageDepth = Math.max(...selectedScoredCompartments.map((compartment) => compartment.averageDepth));
-  const minScore = Math.min(...selectedScoredCompartments.map((compartment) => compartment.score));
-  const maxScore = Math.max(...selectedScoredCompartments.map((compartment) => compartment.score));
-  sessionLog(sessionId, `compressor: scored ${compartments.length} compartments, selected ${selectedCompartments.length} (avg_depth range: ${minAverageDepth.toFixed(1)}-${maxAverageDepth.toFixed(1)}, score range: ${minScore.toFixed(1)}-${maxScore.toFixed(1)})`);
-  const overallAverageDepth = selectedScoredCompartments.reduce((sum, c) => sum + c.averageDepth, 0) / selectedScoredCompartments.length;
-  const depthTier = overallAverageDepth < 2 ? "preserve U: lines" : overallAverageDepth < 3 ? "condense U: lines" : "fold U: into prose";
-  sessionLog(sessionId, `compressor: selected contiguous range ${selectedCompartments[0].startMessage}-${selectedCompartments[selectedCompartments.length - 1].endMessage} (~${selectedTokens} tokens), target ~${targetTokens} tokens, avg_depth=${overallAverageDepth.toFixed(1)} (${depthTier})`);
-  try {
-    const compressed = await runCompressorPass({
-      ...deps,
-      compartments: selectedCompartments,
-      currentTokens: selectedTokens,
-      targetTokens,
-      averageDepth: overallAverageDepth
-    });
-    if (!compressed) {
-      sessionLog(sessionId, "compressor: compression pass failed, keeping existing compartments");
-      return false;
-    }
-    const leadingCompartments = compartments.slice(0, selectedStartIndex);
-    const trailingCompartments = compartments.slice(selectedEndIndex + 1);
-    const allCompartments = [
-      ...leadingCompartments.map((c, i) => ({
-        sequence: i,
-        startMessage: c.startMessage,
-        endMessage: c.endMessage,
-        startMessageId: c.startMessageId,
-        endMessageId: c.endMessageId,
-        title: c.title,
-        content: c.content
-      })),
-      ...compressed.map((c, i) => ({
-        sequence: leadingCompartments.length + i,
-        startMessage: c.startMessage,
-        endMessage: c.endMessage,
-        startMessageId: c.startMessageId,
-        endMessageId: c.endMessageId,
-        title: c.title,
-        content: c.content
-      })),
-      ...trailingCompartments.map((c, i) => ({
-        sequence: leadingCompartments.length + compressed.length + i,
-        startMessage: c.startMessage,
-        endMessage: c.endMessage,
-        startMessageId: c.startMessageId,
-        endMessageId: c.endMessageId,
-        title: c.title,
-        content: c.content
-      }))
-    ];
-    const originalStart = selectedCompartments[0].startMessage;
-    const originalEnd = selectedCompartments[selectedCompartments.length - 1].endMessage;
-    const compressedStart = compressed[0].startMessage;
-    const compressedEnd = compressed[compressed.length - 1].endMessage;
-    if (compressedStart !== originalStart || compressedEnd !== originalEnd) {
-      sessionLog(sessionId, `compressor: compressed range ${compressedStart}-${compressedEnd} doesn't match original ${originalStart}-${originalEnd}, aborting`);
-      return false;
-    }
-    for (let i = 1;i < compressed.length; i++) {
-      const prev = compressed[i - 1];
-      const curr = compressed[i];
-      if (curr.startMessage <= prev.endMessage) {
-        sessionLog(sessionId, `compressor: overlap at compartment ${i}: prev ends ${prev.endMessage}, curr starts ${curr.startMessage}, aborting`);
-        return false;
-      }
-      if (curr.startMessage > prev.endMessage + 1) {
-        sessionLog(sessionId, `compressor: gap at compartment ${i}: prev ends ${prev.endMessage}, curr starts ${curr.startMessage}, aborting`);
-        return false;
-      }
-    }
-    replaceAllCompartmentState(db, sessionId, allCompartments, facts.map((f) => ({ category: f.category, content: f.content })));
-    incrementCompressionDepth(db, sessionId, originalStart, originalEnd);
-    sessionLog(sessionId, `compressor: replaced ${selectedCompartments.length} compartments with ${compressed.length} compressed compartments`);
-    sessionLog(sessionId, `compressor: incremented compression depth for messages ${originalStart}-${originalEnd}`);
-    return true;
-  } catch (error48) {
-    sessionLog(sessionId, "compressor: unexpected error:", getErrorMessage(error48));
-    return false;
-  }
-}
-async function runCompressorPass(args) {
-  const {
-    client,
-    sessionId,
-    directory,
-    compartments,
-    currentTokens,
-    targetTokens,
-    averageDepth,
-    historianTimeoutMs
-  } = args;
-  const prompt = buildCompressorPrompt(compartments, currentTokens, targetTokens, averageDepth);
-  let agentSessionId = null;
-  try {
-    const createResponse = await client.session.create({
-      body: {
-        parentID: sessionId,
-        title: "magic-context-compressor"
-      },
-      query: { directory }
-    });
-    const createdSession = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
-    agentSessionId = typeof createdSession?.id === "string" ? createdSession.id : null;
-    if (!agentSessionId) {
-      sessionLog(sessionId, "compressor: could not create child session");
-      return null;
-    }
-    await promptSyncWithModelSuggestionRetry(client, {
-      path: { id: agentSessionId },
-      query: { directory },
-      body: {
-        agent: HISTORIAN_AGENT2,
-        parts: [{ type: "text", text: prompt }]
-      }
-    }, { timeoutMs: historianTimeoutMs ?? DEFAULT_HISTORIAN_TIMEOUT_MS });
-    const messagesResponse = await client.session.messages({
-      path: { id: agentSessionId },
-      query: { directory }
-    });
-    const messages = normalizeSDKResponse(messagesResponse, [], {
-      preferResponseOnMissingData: true
-    });
-    const result = extractLatestAssistantText(messages);
-    if (!result) {
-      sessionLog(sessionId, "compressor: historian returned no output");
-      return null;
-    }
-    const parsed = parseCompartmentOutput(result);
-    if (parsed.compartments.length === 0) {
-      sessionLog(sessionId, "compressor: historian returned no compartments");
-      return null;
-    }
-    const messageIdMap = new Map;
-    for (const c of compartments) {
-      messageIdMap.set(c.startMessage, c.startMessageId);
-      messageIdMap.set(c.endMessage, c.endMessageId);
-    }
-    const mapped = parsed.compartments.map((pc) => {
-      const startId = messageIdMap.get(pc.startMessage) ?? "";
-      const endId = messageIdMap.get(pc.endMessage) ?? "";
-      if (!startId || !endId) {
-        sessionLog(sessionId, `compressor: messageId miss for ordinals ${pc.startMessage}\u2192${pc.endMessage} (startId=${startId || "MISSING"}, endId=${endId || "MISSING"})`);
-      }
-      return {
-        startMessage: pc.startMessage,
-        endMessage: pc.endMessage,
-        startMessageId: startId,
-        endMessageId: endId,
-        title: pc.title,
-        content: pc.content
-      };
-    });
-    const hasEmptyIds = mapped.some((c) => !c.startMessageId || !c.endMessageId);
-    if (hasEmptyIds) {
-      sessionLog(sessionId, "compressor: rejecting \u2014 one or more compartments have empty messageIds");
-      return null;
-    }
-    return mapped;
-  } catch (error48) {
-    sessionLog(sessionId, "compressor: historian call failed:", getErrorMessage(error48));
-    return null;
-  } finally {
-    if (agentSessionId) {
-      await client.session.delete({ path: { id: agentSessionId }, query: { directory } }).catch((e) => {
-        sessionLog(sessionId, "compressor: session cleanup failed:", getErrorMessage(e));
-      });
-    }
-  }
-}
-var HISTORIAN_AGENT2 = "historian";
-var init_compartment_runner_compressor = __esm(() => {
-  init_magic_context();
-  init_storage();
-  init_shared();
-  init_assistant_message_extractor();
-  init_logger();
-  init_compartment_parser();
-  init_compartment_prompt();
-  init_read_session_formatting();
-});
-
-// src/hooks/magic-context/compartment-runner-drop-queue.ts
-function queueDropsForCompartmentalizedMessages(db, sessionId, upToMessageIndex) {
-  const tags = getTagsBySession(db, sessionId);
-  const rawTagKeys = new Set(getRawSessionTagKeysThrough(sessionId, upToMessageIndex));
-  let dropsQueued = 0;
-  for (const tag of tags) {
-    if (tag.status !== "active")
-      continue;
-    if (rawTagKeys.has(tag.messageId)) {
-      queuePendingOp(db, sessionId, tag.tagNumber, "drop");
-      dropsQueued += 1;
-    }
-  }
-  sessionLog(sessionId, `compartment agent: queued ${dropsQueued} drops for messages 0-${upToMessageIndex}`);
-}
-var init_compartment_runner_drop_queue = __esm(() => {
-  init_storage_ops();
-  init_storage_tags();
-  init_logger();
-  init_read_session_chunk();
-});
-
 // src/hooks/magic-context/compartment-runner-mapping.ts
 function mapParsedCompartmentsToChunk(compartments, chunk, sequenceOffset) {
   const mapped = [];
@@ -152127,15 +151524,19 @@ var init_compartment_runner_mapping = __esm(() => {
 });
 
 // src/hooks/magic-context/compartment-runner-validation.ts
-function healCompartmentGaps(compartments) {
-  const MAX_HEALABLE_GAP = 15;
+function healCompartmentGaps(compartments, toolOnlyRanges = []) {
+  const SAFETY_HEAL_GAP = 15;
   for (let i = 1;i < compartments.length; i++) {
     const prev = compartments[i - 1];
     const curr = compartments[i];
-    const expectedStart = prev.endMessage + 1;
-    const gapSize = curr.startMessage - expectedStart;
-    if (gapSize > 0 && gapSize <= MAX_HEALABLE_GAP) {
-      prev.endMessage = curr.startMessage - 1;
+    const gapStart = prev.endMessage + 1;
+    const gapEnd = curr.startMessage - 1;
+    const gapSize = gapEnd - gapStart + 1;
+    if (gapSize <= 0)
+      continue;
+    const fullyInsideToolOnly = toolOnlyRanges.some((range) => range.start <= gapStart && range.end >= gapEnd);
+    if (fullyInsideToolOnly || gapSize <= SAFETY_HEAL_GAP) {
+      prev.endMessage = gapEnd;
     }
   }
 }
@@ -152147,7 +151548,7 @@ function validateHistorianOutput(text, _sessionId, chunk, _priorCompartments, se
       error: "Historian returned no usable compartments."
     };
   }
-  healCompartmentGaps(parsed.compartments);
+  healCompartmentGaps(parsed.compartments, chunk.toolOnlyRanges);
   const mapped = mapParsedCompartmentsToChunk(parsed.compartments, chunk, sequenceOffset);
   if (!mapped.ok) {
     return {
@@ -152266,7 +151667,7 @@ var init_compartment_runner_validation = __esm(() => {
 // src/hooks/magic-context/compartment-runner-historian.ts
 import { mkdirSync as mkdirSync3, unlinkSync, writeFileSync } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join13 } from "path";
+import { join as join12 } from "path";
 async function runValidatedHistorianPass(args) {
   const firstRun = await runHistorianPrompt({
     ...args,
@@ -152282,8 +151683,14 @@ async function runValidatedHistorianPass(args) {
   }
   const firstValidation = validateHistorianOutput(firstRun.result, args.parentSessionId, args.chunk, args.priorCompartments, args.sequenceOffset);
   if (firstValidation.ok) {
+    const finalResult = args.twoPass ? await runEditorPassOrFallback({
+      ...args,
+      draftXml: firstRun.result,
+      draftValidation: firstValidation,
+      draftDumpPath: firstRun.dumpPath
+    }) : firstValidation;
     cleanupHistorianDump(args.parentSessionId, firstRun.dumpPath);
-    return firstValidation;
+    return finalResult;
   }
   await args.callbacks?.onRepairRetry?.(firstValidation.error ?? "invalid compartment output");
   const repairPrompt = buildHistorianRepairPrompt(args.prompt, firstRun.result, firstValidation.error ?? "invalid compartment output");
@@ -152302,8 +151709,14 @@ async function runValidatedHistorianPass(args) {
   }
   const repairValidation = validateHistorianOutput(repairRun.result, args.parentSessionId, args.chunk, args.priorCompartments, args.sequenceOffset);
   if (repairValidation.ok) {
+    const finalResult = args.twoPass ? await runEditorPassOrFallback({
+      ...args,
+      draftXml: repairRun.result,
+      draftValidation: repairValidation,
+      draftDumpPath: repairRun.dumpPath
+    }) : repairValidation;
     cleanupHistorianDump(args.parentSessionId, repairRun.dumpPath);
-    return repairValidation;
+    return finalResult;
   }
   return runFallbackHistorianPass({
     ...args,
@@ -152312,6 +151725,32 @@ async function runValidatedHistorianPass(args) {
     dumpPaths: [firstRun.dumpPath, repairRun.dumpPath]
   });
 }
+async function runEditorPassOrFallback(args) {
+  sessionLog(args.parentSessionId, "historian two-pass: running editor on draft");
+  const editorRun = await runHistorianPrompt({
+    client: args.client,
+    parentSessionId: args.parentSessionId,
+    sessionDirectory: args.sessionDirectory,
+    prompt: buildHistorianEditorPrompt(args.draftXml),
+    timeoutMs: args.timeoutMs,
+    dumpLabel: `${args.dumpLabelBase}-editor`,
+    agentId: HISTORIAN_EDITOR_AGENT
+  });
+  if (!editorRun.ok || !editorRun.result) {
+    sessionLog(args.parentSessionId, "historian two-pass: editor call failed", {
+      error: editorRun.error
+    });
+    return args.draftValidation;
+  }
+  const editorValidation = validateHistorianOutput(editorRun.result, args.parentSessionId, args.chunk, args.priorCompartments, args.sequenceOffset);
+  if (!editorValidation.ok) {
+    sessionLog(args.parentSessionId, "historian two-pass: editor validation failed, falling back to draft", { error: editorValidation.error });
+    return args.draftValidation;
+  }
+  cleanupHistorianDump(args.parentSessionId, editorRun.dumpPath);
+  sessionLog(args.parentSessionId, "historian two-pass: editor accepted");
+  return editorValidation;
+}
 async function runHistorianPrompt(args) {
   const {
     client,
@@ -152320,11 +151759,12 @@ async function runHistorianPrompt(args) {
     prompt,
     timeoutMs,
     dumpLabel,
-    modelOverride
+    modelOverride,
+    agentId = HISTORIAN_AGENT
   } = args;
   let agentSessionId = null;
   try {
-    sessionLog(parentSessionId, `historian: creating child session (model=${modelOverride ? `${modelOverride.providerID}/${modelOverride.modelID}` : `agent:${HISTORIAN_AGENT}`})`);
+    sessionLog(parentSessionId, `historian: creating child session (agent=${agentId}, model=${modelOverride ? `${modelOverride.providerID}/${modelOverride.modelID}` : `agent:${agentId}`})`);
     const createResponse = await client.session.create({
       body: {
         parentID: parentSessionId,
@@ -152343,7 +151783,7 @@ async function runHistorianPrompt(args) {
           path: { id: agentSessionId },
           query: { directory: sessionDirectory },
           body: {
-            agent: HISTORIAN_AGENT,
+            agent: agentId,
             ...modelOverride ? { model: modelOverride } : {},
             parts: [{ type: "text", text: prompt }]
           }
@@ -152451,8 +151891,8 @@ function isTransientHistorianPromptError(message) {
   ].some((token) => normalized.includes(token));
 }
 function sleep(ms) {
-  return new Promise((resolve2) => {
-    setTimeout(resolve2, ms);
+  return new Promise((resolve3) => {
+    setTimeout(resolve3, ms);
   });
 }
 function cleanupHistorianDump(sessionId, dumpPath) {
@@ -152472,7 +151912,7 @@ function dumpHistorianResponse(sessionId, label, text) {
     mkdirSync3(HISTORIAN_RESPONSE_DUMP_DIR, { recursive: true });
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
-    const dumpPath = join13(HISTORIAN_RESPONSE_DUMP_DIR, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
+    const dumpPath = join12(HISTORIAN_RESPONSE_DUMP_DIR, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
     writeFileSync(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
@@ -152495,8 +151935,9 @@ var init_compartment_runner_historian = __esm(() => {
   init_magic_context();
   init_shared();
   init_assistant_message_extractor();
+  init_compartment_prompt();
   init_compartment_runner_validation();
-  HISTORIAN_RESPONSE_DUMP_DIR = join13(tmpdir2(), "magic-context-historian");
+  HISTORIAN_RESPONSE_DUMP_DIR = join12(tmpdir2(), "magic-context-historian");
 });
 
 // src/hooks/magic-context/compartment-runner-state-xml.ts
@@ -152537,6 +151978,131 @@ var init_compartment_runner_state_xml = __esm(() => {
   init_compartment_storage();
 });
 
+// src/features/magic-context/memory/constants.ts
+var PROMOTABLE_CATEGORIES, CATEGORY_PRIORITY, CATEGORY_DEFAULT_TTL;
+var init_constants = __esm(() => {
+  PROMOTABLE_CATEGORIES = [
+    "ARCHITECTURE_DECISIONS",
+    "CONSTRAINTS",
+    "CONFIG_DEFAULTS",
+    "NAMING",
+    "USER_PREFERENCES",
+    "USER_DIRECTIVES",
+    "ENVIRONMENT",
+    "WORKFLOW_RULES",
+    "KNOWN_ISSUES"
+  ];
+  CATEGORY_PRIORITY = [
+    "USER_DIRECTIVES",
+    "USER_PREFERENCES",
+    "NAMING",
+    "CONFIG_DEFAULTS",
+    "CONSTRAINTS",
+    "ARCHITECTURE_DECISIONS",
+    "ENVIRONMENT",
+    "WORKFLOW_RULES",
+    "KNOWN_ISSUES"
+  ];
+  CATEGORY_DEFAULT_TTL = {
+    WORKFLOW_RULES: 90 * 24 * 60 * 60 * 1000,
+    KNOWN_ISSUES: 30 * 24 * 60 * 60 * 1000
+  };
+});
+
+// src/hooks/magic-context/temporal-awareness.ts
+function formatGap(seconds) {
+  if (!Number.isFinite(seconds) || seconds < TEMPORAL_AWARENESS_THRESHOLD_SECONDS) {
+    return null;
+  }
+  if (seconds < SECONDS_PER_HOUR) {
+    const minutes = Math.floor(seconds / SECONDS_PER_MINUTE);
+    return `+${minutes}m`;
+  }
+  if (seconds < SECONDS_PER_DAY) {
+    const hours = Math.floor(seconds / SECONDS_PER_HOUR);
+    const minutes = Math.floor((seconds - hours * SECONDS_PER_HOUR) / SECONDS_PER_MINUTE);
+    return minutes === 0 ? `+${hours}h` : `+${hours}h ${minutes}m`;
+  }
+  if (seconds < SECONDS_PER_WEEK) {
+    const days2 = Math.floor(seconds / SECONDS_PER_DAY);
+    const hours = Math.floor((seconds - days2 * SECONDS_PER_DAY) / SECONDS_PER_HOUR);
+    return hours === 0 ? `+${days2}d` : `+${days2}d ${hours}h`;
+  }
+  const weeks = Math.floor(seconds / SECONDS_PER_WEEK);
+  const days = Math.floor((seconds - weeks * SECONDS_PER_WEEK) / SECONDS_PER_DAY);
+  return days === 0 ? `+${weeks}w` : `+${weeks}w ${days}d`;
+}
+function formatDate(ms) {
+  const d = new Date(ms);
+  const yyyy = d.getFullYear().toString().padStart(4, "0");
+  const mm = (d.getMonth() + 1).toString().padStart(2, "0");
+  const dd = d.getDate().toString().padStart(2, "0");
+  return `${yyyy}-${mm}-${dd}`;
+}
+function temporalMarkerPrefix(seconds) {
+  const marker = formatGap(seconds);
+  if (!marker)
+    return null;
+  return `<!-- ${marker} -->
+`;
+}
+function isMutableTextPart(part) {
+  if (part === null || typeof part !== "object")
+    return false;
+  const p = part;
+  return p.type === "text" && typeof p.text === "string";
+}
+function findFirstVisibleTextPart(parts) {
+  for (const p of parts) {
+    if (!isMutableTextPart(p))
+      continue;
+    if (p.ignored === true)
+      continue;
+    return p;
+  }
+  return null;
+}
+function injectTemporalMarkers(messages) {
+  let injected = 0;
+  let prev = null;
+  for (const raw of messages) {
+    if (!raw || typeof raw !== "object")
+      continue;
+    const msg = raw;
+    const role = msg.info?.role;
+    if (prev !== null && role === "user") {
+      const prevTime = prev.info?.time;
+      const currTime = msg.info?.time;
+      if (prevTime?.created !== undefined && currTime?.created !== undefined) {
+        const prevEnd = prevTime.completed ?? prevTime.created;
+        const gapSec = (currTime.created - prevEnd) / 1000;
+        const prefix = temporalMarkerPrefix(gapSec);
+        if (prefix && Array.isArray(msg.parts)) {
+          const target = findFirstVisibleTextPart(msg.parts);
+          if (target && typeof target.text === "string") {
+            const tagMatch = target.text.match(/^(?:\u00A7\d+\u00A7\s*)+/);
+            const tagPrefix = tagMatch ? tagMatch[0] : "";
+            const body = target.text.slice(tagPrefix.length);
+            if (!TEMPORAL_MARKER_PATTERN.test(body)) {
+              target.text = tagPrefix + prefix + body;
+              injected++;
+            }
+          }
+        }
+      }
+    }
+    prev = msg;
+  }
+  return injected;
+}
+var TEMPORAL_AWARENESS_THRESHOLD_SECONDS = 300, SECONDS_PER_MINUTE = 60, SECONDS_PER_HOUR, SECONDS_PER_DAY, SECONDS_PER_WEEK, TEMPORAL_MARKER_PATTERN;
+var init_temporal_awareness = __esm(() => {
+  SECONDS_PER_HOUR = 60 * 60;
+  SECONDS_PER_DAY = 24 * 60 * 60;
+  SECONDS_PER_WEEK = 7 * 24 * 60 * 60;
+  TEMPORAL_MARKER_PATTERN = /^<!-- \+[\d]+[mhdw](?: [\d]+[mhdw])? -->\n/;
+});
+
 // src/hooks/magic-context/inject-compartments.ts
 function clearInjectionCache(sessionId) {
   injectionCache.delete(sessionId);
@@ -152606,7 +152172,7 @@ function trimMemoriesToBudget(sessionId, memories, budgetTokens) {
   }
   return result;
 }
-function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, injectionBudgetTokens) {
+function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, injectionBudgetTokens, temporalAwareness) {
   const cached2 = injectionCache.get(sessionId);
   if (!isCacheBusting && cached2) {
     if (cached2.compartmentEndMessageId.length > 0) {
@@ -152652,7 +152218,28 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
     injectionCache.delete(sessionId);
     return null;
   }
-  const block = buildCompartmentBlock(compartments, facts, memoryBlock);
+  let dateRanges;
+  if (temporalAwareness && compartments.length > 0) {
+    const ids = new Set;
+    for (const c of compartments) {
+      if (c.startMessageId)
+        ids.add(c.startMessageId);
+      if (c.endMessageId)
+        ids.add(c.endMessageId);
+    }
+    const times = getMessageTimesFromOpenCodeDb(sessionId, Array.from(ids));
+    const byId = new Map;
+    for (const c of compartments) {
+      const startMs = times.get(c.startMessageId);
+      const endMs = times.get(c.endMessageId);
+      if (startMs !== undefined && endMs !== undefined) {
+        byId.set(c.id, { start: formatDate(startMs), end: formatDate(endMs) });
+      }
+    }
+    if (byId.size > 0)
+      dateRanges = { byId };
+  }
+  const block = buildCompartmentBlock(compartments, facts, memoryBlock, dateRanges);
   if (compartments.length === 0) {
     const result2 = {
       block,
@@ -152754,11 +152341,1523 @@ var init_inject_compartments = __esm(() => {
   init_constants();
   init_storage_memory();
   init_logger();
+  init_read_session_db();
   init_read_session_formatting();
+  init_temporal_awareness();
   injectionCache = new Map;
   CONSTRAINT_KEYWORDS = /\b(must|never|always|cannot|should not|must not)\b/i;
 });
 
+// src/hooks/magic-context/send-session-notification.ts
+var exports_send_session_notification = {};
+__export(exports_send_session_notification, {
+  sendUserPrompt: () => sendUserPrompt,
+  sendIgnoredMessage: () => sendIgnoredMessage
+});
+function hasNotificationSessionClient(client) {
+  if (client === null || typeof client !== "object")
+    return false;
+  const candidate = client;
+  if (candidate.session === undefined)
+    return true;
+  if (candidate.session === null || typeof candidate.session !== "object")
+    return false;
+  const session = candidate.session;
+  return (session.prompt === undefined || typeof session.prompt === "function") && (session.promptAsync === undefined || typeof session.promptAsync === "function");
+}
+function inferToastVariant(text) {
+  const lower = text.toLowerCase();
+  if (lower.includes("error") || lower.includes("failed") || lower.includes("alert"))
+    return "error";
+  if (lower.includes("warning") || lower.includes("\u26A0"))
+    return "warning";
+  if (lower.includes("complete") || lower.includes("success") || lower.includes("\u2713") || lower.includes("finished"))
+    return "success";
+  return "info";
+}
+function extractToastTitle(text) {
+  const headingMatch = text.match(/^#+\s+(.+)/m);
+  if (headingMatch)
+    return headingMatch[1].trim();
+  const firstLine = text.split(`
+`)[0].trim();
+  if (firstLine.length <= 80)
+    return firstLine;
+  return "Magic Context";
+}
+async function sendIgnoredMessage(client, sessionId, text, params) {
+  const { isTuiConnected: checkTui } = await Promise.resolve().then(() => (init_rpc_notifications(), exports_rpc_notifications));
+  if (checkTui()) {
+    try {
+      const c2 = client;
+      const tui = c2?.tui;
+      if (typeof tui?.showToast === "function") {
+        const tuiClient = tui;
+        await tuiClient.showToast({
+          body: {
+            title: extractToastTitle(text),
+            message: text.length > 200 ? `${text.slice(0, 200)}\u2026` : text,
+            variant: inferToastVariant(text),
+            duration: 5000
+          }
+        }).catch(() => {});
+        return;
+      }
+    } catch {}
+  }
+  const agent = params.agent || undefined;
+  const variant = params.variant || undefined;
+  const model = params.providerId && params.modelId ? {
+    providerID: params.providerId,
+    modelID: params.modelId
+  } : undefined;
+  if (!hasNotificationSessionClient(client)) {
+    sessionLog(sessionId, "session prompt API unavailable for notification");
+    return;
+  }
+  const c = client;
+  const input = {
+    path: { id: sessionId },
+    body: {
+      noReply: true,
+      agent,
+      model,
+      variant,
+      parts: [
+        {
+          type: "text",
+          text,
+          ignored: true
+        }
+      ]
+    }
+  };
+  try {
+    if (typeof c.session?.prompt === "function") {
+      await Promise.resolve(c.session.prompt(input));
+    } else if (typeof c.session?.promptAsync === "function") {
+      await c.session.promptAsync(input);
+    } else {
+      sessionLog(sessionId, "session prompt API unavailable for notification");
+    }
+  } catch (error48) {
+    const msg = getErrorMessage(error48);
+    sessionLog(sessionId, "failed to send notification:", msg);
+  }
+}
+async function sendUserPrompt(client, sessionId, text) {
+  if (!hasNotificationSessionClient(client)) {
+    sessionLog(sessionId, "session prompt API unavailable for user prompt");
+    return;
+  }
+  const c = client;
+  const input = {
+    path: { id: sessionId },
+    body: {
+      parts: [{ type: "text", text }]
+    }
+  };
+  try {
+    if (typeof c.session?.promptAsync === "function") {
+      await c.session.promptAsync(input);
+    } else if (typeof c.session?.prompt === "function") {
+      await Promise.resolve(c.session.prompt(input));
+    } else {
+      sessionLog(sessionId, "session prompt API unavailable for user prompt");
+    }
+  } catch (error48) {
+    const msg = getErrorMessage(error48);
+    sessionLog(sessionId, "failed to send user prompt:", msg);
+  }
+}
+var init_send_session_notification = __esm(() => {
+  init_logger();
+});
+
+// src/hooks/magic-context/compartment-runner-partial-recomp.ts
+function snapRangeToCompartments(compartments, range) {
+  if (compartments.length === 0) {
+    return {
+      error: "No compartments exist yet for this session. Run `/ctx-recomp` (full) first, then use partial recomp to refine specific ranges."
+    };
+  }
+  const sorted = compartments.slice().sort((a, b) => a.sequence - b.sequence);
+  const { start, end } = range;
+  if (start < 1)
+    return { error: `Start must be >= 1 (got ${start}).` };
+  if (end < start)
+    return { error: `End must be >= start (got ${start}-${end}).` };
+  const firstEnclosingIdx = sorted.findIndex((c) => c.endMessage >= start);
+  if (firstEnclosingIdx === -1) {
+    const last = sorted[sorted.length - 1];
+    return {
+      error: `Range ${start}-${end} starts after the last compartment (which ends at message ${last.endMessage}). Nothing to rebuild.`
+    };
+  }
+  let lastEnclosingIdx = -1;
+  for (let i = sorted.length - 1;i >= 0; i--) {
+    if (sorted[i].startMessage <= end) {
+      lastEnclosingIdx = i;
+      break;
+    }
+  }
+  if (lastEnclosingIdx === -1 || lastEnclosingIdx < firstEnclosingIdx) {
+    return {
+      error: `Range ${start}-${end} does not overlap any compartment.`
+    };
+  }
+  return {
+    snapStart: sorted[firstEnclosingIdx].startMessage,
+    snapEnd: sorted[lastEnclosingIdx].endMessage,
+    priorCompartments: sorted.slice(0, firstEnclosingIdx),
+    rangeCompartments: sorted.slice(firstEnclosingIdx, lastEnclosingIdx + 1),
+    tailCompartments: sorted.slice(lastEnclosingIdx + 1)
+  };
+}
+function compartmentToInput(c, newSequence) {
+  return {
+    sequence: newSequence,
+    startMessage: c.startMessage,
+    endMessage: c.endMessage,
+    startMessageId: c.startMessageId,
+    endMessageId: c.endMessageId,
+    title: c.title,
+    content: c.content
+  };
+}
+async function executePartialRecompInternal(deps, range) {
+  const {
+    client,
+    db,
+    sessionId,
+    historianChunkTokens,
+    directory,
+    historianTimeoutMs,
+    getNotificationParams
+  } = deps;
+  const notifParams = () => getNotificationParams?.() ?? {};
+  updateSessionMeta(db, sessionId, { compartmentInProgress: true });
+  try {
+    let promoteFinal = function() {
+      const newBuilt = candidateCompartments.slice(priorCompartments.length);
+      if (newBuilt.length === 0)
+        return null;
+      const newBuiltError = (() => {
+        let expected = snapStart;
+        for (const c of newBuilt) {
+          if (c.startMessage !== expected) {
+            return c.startMessage < expected ? `overlap in rebuilt range near ${expected}` : `gap in rebuilt range before ${c.startMessage} (expected ${expected})`;
+          }
+          if (c.endMessage < c.startMessage) {
+            return `invalid range ${c.startMessage}-${c.endMessage}`;
+          }
+          expected = c.endMessage + 1;
+        }
+        if (expected - 1 !== snapEnd) {
+          return `rebuilt range ends at ${expected - 1} but snapped end is ${snapEnd}`;
+        }
+        return null;
+      })();
+      if (newBuiltError) {
+        log(`[magic-context] partial recomp validation failed: ${newBuiltError}`);
+        return null;
+      }
+      const merged = [
+        ...candidateCompartments,
+        ...tailCompartments.map((c, idx) => compartmentToInput(c, candidateCompartments.length + idx))
+      ];
+      const mergedError = validateStoredCompartments(merged);
+      if (mergedError) {
+        log(`[magic-context] partial recomp merged validation failed: ${mergedError}`);
+        return null;
+      }
+      saveRecompStagingPass(db, sessionId, passCount + 1, merged, currentFacts);
+      const promoted = promoteRecompStaging(db, sessionId);
+      if (!promoted) {
+        log("[magic-context] partial recomp promote returned null");
+        return null;
+      }
+      setRecompPartialRange(db, sessionId, null);
+      clearCompressionDepthRange(db, sessionId, snapStart, snapEnd);
+      clearInjectionCache(sessionId);
+      const lastEnd = merged[merged.length - 1]?.endMessage ?? snapEnd;
+      return { compartmentCount: merged.length, lastEndMessage: lastEnd };
+    };
+    const protectedTailStart = getProtectedTailStartOrdinal(sessionId);
+    const existingCompartments = getCompartments(db, sessionId);
+    const snapResult = snapRangeToCompartments(existingCompartments, range);
+    if ("error" in snapResult) {
+      return `## Magic Recomp \u2014 Failed
+
+${snapResult.error}`;
+    }
+    const { snapStart, snapEnd, priorCompartments, tailCompartments } = snapResult;
+    if (snapEnd >= protectedTailStart) {
+      return `## Magic Recomp \u2014 Failed
+
+Snapped range ${snapStart}-${snapEnd} would cross into the protected tail (starting at ${protectedTailStart}). Partial recomp cannot rebuild recent messages. Try an earlier range.`;
+    }
+    const storedRange = getRecompPartialRange(db, sessionId);
+    const existingStaging = getRecompStaging(db, sessionId);
+    if (existingStaging && storedRange && (storedRange.start !== snapStart || storedRange.end !== snapEnd)) {
+      return [
+        "## Magic Recomp \u2014 Failed",
+        "",
+        `An unfinished partial recomp is already staged for range ${storedRange.start}-${storedRange.end}, which does not match the requested range ${snapStart}-${snapEnd}.`,
+        "",
+        "Resume that range by running `/ctx-recomp` with the same original arguments,",
+        "or cancel it by running `/ctx-flush` before starting a new partial recomp."
+      ].join(`
+`);
+    }
+    if (existingStaging && !storedRange) {
+      return [
+        "## Magic Recomp \u2014 Failed",
+        "",
+        "An unfinished full recomp is already staged for this session.",
+        "Resume it by running `/ctx-recomp` without arguments,",
+        "or cancel it before starting a partial recomp."
+      ].join(`
+`);
+    }
+    const currentFacts = getSessionFacts(db, sessionId).map((f) => ({
+      category: f.category,
+      content: f.content
+    }));
+    const parentSessionResponse = await client.session.get({ path: { id: sessionId } }).catch(() => null);
+    const parentSession = normalizeSDKResponse(parentSessionResponse, null, { preferResponseOnMissingData: true });
+    const sessionDirectory = parentSession?.directory ?? directory;
+    const projectPath = directory ? resolveProjectIdentity(directory) : undefined;
+    const memories = projectPath ? getMemoriesByProject(db, projectPath, ["active", "permanent"]) : [];
+    const memoryBlockForExistingState = memories.length > 0 ? undefined : undefined;
+    let candidateCompartments;
+    let passCount;
+    let offset;
+    const resumed = existingStaging !== null && storedRange !== null;
+    if (resumed && existingStaging) {
+      candidateCompartments = existingStaging.compartments;
+      passCount = existingStaging.passCount;
+      const lastInStaging = existingStaging.lastEndMessage;
+      offset = lastInStaging >= snapStart ? lastInStaging + 1 : snapStart;
+    } else {
+      candidateCompartments = priorCompartments.map((c, idx) => compartmentToInput(c, idx));
+      passCount = 0;
+      offset = snapStart;
+      saveRecompStagingPass(db, sessionId, 0, candidateCompartments, currentFacts);
+      setRecompPartialRange(db, sessionId, { start: snapStart, end: snapEnd });
+    }
+    let currentTokenBudget = historianChunkTokens;
+    let passAttempt = 1;
+    await sendIgnoredMessage(client, sessionId, resumed ? `## Magic Recomp \u2014 Resumed (Partial)
+
+Found ${candidateCompartments.length - priorCompartments.length} newly built compartment(s) from ${passCount} previous pass(es), covering messages ${snapStart}-${offset - 1}. Resuming from message ${offset} toward ${snapEnd}.` : `## Magic Recomp \u2014 Partial
+
+Snapped to compartment boundaries: rebuilding messages ${snapStart}-${snapEnd} (${tailCompartments.length} tail compartment(s) preserved).`, notifParams());
+    while (offset <= snapEnd) {
+      const chunk = readSessionChunk(sessionId, currentTokenBudget, offset, snapEnd + 1);
+      if (!chunk.text || chunk.messageCount === 0 || chunk.endIndex < offset) {
+        return `## Magic Recomp \u2014 Failed
+
+Recomp stopped because raw history ${offset}-${snapEnd} could not be turned into a valid historian chunk. Partial recomp preserved original state (staging kept for retry).`;
+      }
+      const chunkCoverageError = validateChunkCoverage(chunk);
+      if (chunkCoverageError) {
+        return `## Magic Recomp \u2014 Failed
+
+Partial recomp stopped because the raw chunk could not be represented safely: ${chunkCoverageError}
+
+Original state preserved (staging kept for retry).`;
+      }
+      const existingState = buildExistingStateXml(candidateCompartments, currentFacts, undefined);
+      const prompt = buildCompartmentAgentPrompt(existingState, `Messages ${chunk.startIndex}-${chunk.endIndex}:
+
+${chunk.text}`);
+      await sendIgnoredMessage(client, sessionId, `## Magic Recomp \u2014 Partial
+
+Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${chunk.startIndex}-${chunk.endIndex}.`, notifParams());
+      const validatedPass = await runValidatedHistorianPass({
+        client,
+        parentSessionId: sessionId,
+        sessionDirectory,
+        prompt,
+        chunk,
+        priorCompartments: candidateCompartments,
+        sequenceOffset: candidateCompartments.length,
+        dumpLabelBase: `partial-recomp-${sessionId}-${chunk.startIndex}-${chunk.endIndex}-pass-${passCount + 1}`,
+        timeoutMs: historianTimeoutMs,
+        fallbackModelId: deps.fallbackModelId,
+        twoPass: deps.historianTwoPass,
+        callbacks: {
+          onRepairRetry: async (error48) => {
+            await sendIgnoredMessage(client, sessionId, `## Magic Recomp \u2014 Partial
+
+Historian pass ${passCount + 1}, attempt ${passAttempt} is continuing with a repair retry for messages ${chunk.startIndex}-${chunk.endIndex}.
+
+The previous output did not validate: ${error48}`, notifParams());
+          }
+        }
+      });
+      if (!validatedPass.ok) {
+        const reducedBudget = getReducedRecompTokenBudget(currentTokenBudget);
+        if (reducedBudget !== null) {
+          const smallerChunk = readSessionChunk(sessionId, reducedBudget, offset, snapEnd + 1);
+          if (smallerChunk.messageCount > 0 && smallerChunk.endIndex < chunk.endIndex) {
+            await sendIgnoredMessage(client, sessionId, `## Magic Recomp \u2014 Partial
+
+Historian pass ${passCount + 1}, attempt ${passAttempt} is continuing with a smaller chunk ending at ${smallerChunk.endIndex} because messages ${chunk.startIndex}-${chunk.endIndex} could not be validated.
+
+Validator result: ${validatedPass.error}`, notifParams());
+            currentTokenBudget = reducedBudget;
+            passAttempt += 1;
+            continue;
+          }
+        }
+        return `## Magic Recomp \u2014 Failed
+
+Partial recomp failed while rebuilding messages ${chunk.startIndex}-${chunk.endIndex}: ${validatedPass.error}
+
+Original state preserved (staging kept for retry).`;
+      }
+      candidateCompartments = [
+        ...candidateCompartments,
+        ...validatedPass.compartments ?? []
+      ];
+      passCount += 1;
+      currentTokenBudget = historianChunkTokens;
+      passAttempt = 1;
+      saveRecompStagingPass(db, sessionId, passCount, candidateCompartments, currentFacts);
+      const nextOffset = (validatedPass.compartments?.[validatedPass.compartments.length - 1]?.endMessage ?? chunk.endIndex) + 1;
+      if (nextOffset <= offset) {
+        return `## Magic Recomp \u2014 Failed
+
+Partial recomp made no forward progress after messages ${chunk.startIndex}-${chunk.endIndex}. Staging kept for retry.`;
+      }
+      offset = nextOffset;
+    }
+    const finalResult = promoteFinal();
+    if (!finalResult) {
+      return `## Magic Recomp \u2014 Failed
+
+Partial recomp completed historian passes but the final compartment set failed validation. Original state preserved (staging kept for inspection).`;
+    }
+    return [
+      "## Magic Recomp \u2014 Partial Complete",
+      "",
+      ...resumed ? ["Resumed from previous interrupted partial run."] : [],
+      `Rebuilt compartments covering messages ${snapStart}-${snapEnd} using ${passCount} historian pass${passCount === 1 ? "" : "es"}.`,
+      `Preserved ${priorCompartments.length} prior compartment(s) and ${tailCompartments.length} tail compartment(s) unchanged.`,
+      `Facts unchanged (${currentFacts.length} entr${currentFacts.length === 1 ? "y" : "ies"}).`,
+      `Total compartments: ${finalResult.compartmentCount}.`
+    ].join(`
+`);
+  } catch (error48) {
+    const message = getErrorMessage(error48);
+    return `## Magic Recomp \u2014 Failed
+
+Partial recomp failed unexpectedly: ${message}
+
+Staging preserved for resume on next attempt.`;
+  } finally {
+    updateSessionMeta(db, sessionId, { compartmentInProgress: false });
+    const leftoverStaging = getRecompStaging(db, sessionId);
+    const leftoverRange = getRecompPartialRange(db, sessionId);
+    if (leftoverStaging && leftoverRange) {} else if (leftoverStaging && !leftoverRange) {
+      log(`[magic-context] partial recomp cleanup: clearing orphaned staging without range marker for session ${sessionId}`);
+      clearRecompStaging(db, sessionId);
+    }
+  }
+}
+var init_compartment_runner_partial_recomp = __esm(() => {
+  init_compartment_storage();
+  init_compression_depth_storage();
+  init_project_identity();
+  init_storage_memory();
+  init_storage_meta();
+  init_shared();
+  init_logger();
+  init_compartment_prompt();
+  init_compartment_runner_historian();
+  init_compartment_runner_state_xml();
+  init_compartment_runner_validation();
+  init_inject_compartments();
+  init_read_session_chunk();
+  init_send_session_notification();
+});
+
+// src/hooks/magic-context/derive-budgets.ts
+var exports_derive_budgets = {};
+__export(exports_derive_budgets, {
+  resolveHistorianContextLimit: () => resolveHistorianContextLimit,
+  deriveTriggerBudget: () => deriveTriggerBudget,
+  deriveHistorianChunkTokens: () => deriveHistorianChunkTokens
+});
+function deriveTriggerBudget(mainContextLimit, executeThresholdPercentage) {
+  if (!Number.isFinite(mainContextLimit) || mainContextLimit <= 0) {
+    return TRIGGER_BUDGET_MIN;
+  }
+  const thresholdFraction = Math.max(0, executeThresholdPercentage) / 100;
+  const usable = mainContextLimit * thresholdFraction;
+  const derived = Math.round(usable * TRIGGER_BUDGET_PERCENTAGE);
+  return Math.max(TRIGGER_BUDGET_MIN, Math.min(TRIGGER_BUDGET_MAX, derived));
+}
+function deriveHistorianChunkTokens(historianContextLimit) {
+  if (!Number.isFinite(historianContextLimit) || historianContextLimit <= 0) {
+    return HISTORIAN_CHUNK_MIN;
+  }
+  const derived = Math.round(historianContextLimit * HISTORIAN_CHUNK_PERCENTAGE);
+  return Math.max(HISTORIAN_CHUNK_MIN, Math.min(HISTORIAN_CHUNK_MAX, derived));
+}
+function resolveHistorianContextLimit(historianModelOverride) {
+  if (typeof historianModelOverride === "string" && historianModelOverride.includes("/")) {
+    const [providerID, ...rest] = historianModelOverride.split("/");
+    const modelID = rest.join("/");
+    if (providerID && modelID) {
+      const limit = getModelsDevContextLimit(providerID, modelID);
+      if (typeof limit === "number" && limit > 0)
+        return limit;
+    }
+    return DEFAULT_HISTORIAN_CONTEXT_FALLBACK;
+  }
+  if (typeof historianModelOverride === "string" && historianModelOverride.trim() !== "") {
+    console.warn(`[magic-context] historian.model "${historianModelOverride}" lacks provider prefix ("provider/model-id"); using fallback chain for chunk-budget derivation.`);
+  }
+  const chain = AGENT_MODEL_REQUIREMENTS[HISTORIAN_AGENT]?.fallbackChain;
+  if (!chain || chain.length === 0)
+    return DEFAULT_HISTORIAN_CONTEXT_FALLBACK;
+  const expanded = expandFallbackChain(chain);
+  let minLimit;
+  for (const key of expanded) {
+    const [providerID, ...rest] = key.split("/");
+    const modelID = rest.join("/");
+    if (!providerID || !modelID)
+      continue;
+    const limit = getModelsDevContextLimit(providerID, modelID);
+    if (typeof limit !== "number" || limit <= 0)
+      continue;
+    if (minLimit === undefined || limit < minLimit)
+      minLimit = limit;
+  }
+  return minLimit ?? DEFAULT_HISTORIAN_CONTEXT_FALLBACK;
+}
+var TRIGGER_BUDGET_PERCENTAGE = 0.05, TRIGGER_BUDGET_MIN = 5000, TRIGGER_BUDGET_MAX = 50000, HISTORIAN_CHUNK_PERCENTAGE = 0.25, HISTORIAN_CHUNK_MIN = 8000, HISTORIAN_CHUNK_MAX = 50000, DEFAULT_HISTORIAN_CONTEXT_FALLBACK = 128000;
+var init_derive_budgets = __esm(() => {
+  init_model_requirements();
+  init_models_dev_cache();
+});
+
+// src/features/magic-context/compaction-marker.ts
+import { Database as Database4 } from "bun:sqlite";
+import { join as join13 } from "path";
+function randomBase62(length) {
+  const chars = [];
+  for (let i = 0;i < length; i++) {
+    chars.push(BASE62_CHARS[Math.floor(Math.random() * BASE62_CHARS.length)]);
+  }
+  return chars.join("");
+}
+function generateId(prefix, timestampMs, counter = 0n) {
+  const encoded = BigInt(timestampMs) * 0x1000n + counter;
+  const hex3 = encoded.toString(16).padStart(14, "0");
+  return `${prefix}_${hex3}${randomBase62(14)}`;
+}
+function generateMessageId(timestampMs, counter = 0n) {
+  return generateId("msg", timestampMs, counter);
+}
+function generatePartId(timestampMs, counter = 0n) {
+  return generateId("prt", timestampMs, counter);
+}
+function getOpenCodeDbPath3() {
+  return join13(getDataDir(), "opencode", "opencode.db");
+}
+function getWritableOpenCodeDb() {
+  const dbPath = getOpenCodeDbPath3();
+  if (cachedWriteDb?.path === dbPath) {
+    return cachedWriteDb.db;
+  }
+  if (cachedWriteDb) {
+    try {
+      cachedWriteDb.db.close(false);
+    } catch {}
+  }
+  const db = new Database4(dbPath);
+  db.exec("PRAGMA journal_mode=WAL");
+  db.exec("PRAGMA busy_timeout=5000");
+  cachedWriteDb = { path: dbPath, db };
+  return db;
+}
+function findBoundaryUserMessage(sessionId, endOrdinal) {
+  const db = getWritableOpenCodeDb();
+  const rows = db.prepare("SELECT id, time_created, data FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId);
+  const filtered = rows.filter((row) => {
+    try {
+      const info = JSON.parse(row.data);
+      return !(info.summary === true && info.finish === "stop");
+    } catch {
+      return true;
+    }
+  });
+  let bestMatch = null;
+  for (let i = 0;i < filtered.length && i < endOrdinal; i++) {
+    const row = filtered[i];
+    try {
+      const info = JSON.parse(row.data);
+      if (info.role === "user") {
+        bestMatch = { id: row.id, timeCreated: row.time_created };
+      }
+    } catch {}
+  }
+  return bestMatch;
+}
+function injectCompactionMarker(args) {
+  const boundary = findBoundaryUserMessage(args.sessionId, args.endOrdinal);
+  if (!boundary) {
+    log(`[magic-context] compaction-marker: no user message found at or before ordinal ${args.endOrdinal}`);
+    return null;
+  }
+  const db = getWritableOpenCodeDb();
+  const boundaryTime = boundary.timeCreated;
+  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n);
+  const compactionPartId = generatePartId(boundaryTime, 1n);
+  const summaryPartId = generatePartId(boundaryTime + 1, 2n);
+  const summaryMsgData = JSON.stringify({
+    role: "assistant",
+    parentID: boundary.id,
+    summary: true,
+    finish: "stop",
+    mode: "compaction",
+    agent: "compaction",
+    path: { cwd: args.directory, root: args.directory },
+    cost: 0,
+    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+    modelID: "magic-context",
+    providerID: "magic-context",
+    time: { created: boundaryTime + 1 }
+  });
+  try {
+    db.transaction(() => {
+      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(compactionPartId, boundary.id, args.sessionId, boundaryTime, boundaryTime, '{"type":"compaction","auto":true}');
+      db.prepare("INSERT INTO message (id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?)").run(summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, summaryMsgData);
+      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(summaryPartId, summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, JSON.stringify({ type: "text", text: args.summaryText }));
+    })();
+    log(`[magic-context] compaction-marker: injected boundary at user msg ${boundary.id} (ordinal ~${args.endOrdinal}), summary msg ${summaryMsgId}`);
+    return {
+      boundaryMessageId: boundary.id,
+      summaryMessageId: summaryMsgId,
+      compactionPartId,
+      summaryPartId
+    };
+  } catch (error48) {
+    log(`[magic-context] compaction-marker: injection failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    return null;
+  }
+}
+function removeCompactionMarker(state) {
+  try {
+    const db = getWritableOpenCodeDb();
+    db.transaction(() => {
+      db.prepare("DELETE FROM part WHERE id = ?").run(state.summaryPartId);
+      db.prepare("DELETE FROM message WHERE id = ?").run(state.summaryMessageId);
+      db.prepare("DELETE FROM part WHERE id = ?").run(state.compactionPartId);
+    })();
+    return true;
+  } catch (error48) {
+    log(`[magic-context] compaction-marker: removal failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    return false;
+  }
+}
+var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", cachedWriteDb = null;
+var init_compaction_marker = __esm(() => {
+  init_data_path();
+  init_logger();
+});
+
+// src/hooks/magic-context/compaction-marker-manager.ts
+function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, directory) {
+  const existing = getPersistedCompactionMarkerState(db, sessionId);
+  if (existing) {
+    if (existing.boundaryOrdinal === lastCompartmentEnd) {
+      return;
+    }
+    try {
+      removeCompactionMarker(existing);
+      setPersistedCompactionMarkerState(db, sessionId, null);
+      sessionLog(sessionId, `compaction-marker: removed old boundary at ordinal ${existing.boundaryOrdinal}, moving to ${lastCompartmentEnd}`);
+    } catch (error48) {
+      sessionLog(sessionId, `compaction-marker: failed to remove old boundary at ordinal ${existing.boundaryOrdinal}, proceeding with new injection:`, error48);
+    }
+  }
+  const result = injectCompactionMarker({
+    sessionId,
+    endOrdinal: lastCompartmentEnd,
+    summaryText: MARKER_SUMMARY_TEXT,
+    directory: directory ?? process.cwd()
+  });
+  if (result) {
+    setPersistedCompactionMarkerState(db, sessionId, {
+      ...result,
+      boundaryOrdinal: lastCompartmentEnd
+    });
+    sessionLog(sessionId, `compaction-marker: injected at ordinal ${lastCompartmentEnd}, boundary user msg ${result.boundaryMessageId}`);
+  }
+}
+function removeCompactionMarkerForSession(db, sessionId) {
+  const existing = getPersistedCompactionMarkerState(db, sessionId);
+  if (existing) {
+    try {
+      removeCompactionMarker(existing);
+      setPersistedCompactionMarkerState(db, sessionId, null);
+      sessionLog(sessionId, "compaction-marker: removed on session cleanup");
+    } catch (error48) {
+      setPersistedCompactionMarkerState(db, sessionId, null);
+      sessionLog(sessionId, "compaction-marker: removal failed during session cleanup, cleared persisted state:", error48);
+    }
+  }
+}
+var MARKER_SUMMARY_TEXT = "[Compacted by magic-context \u2014 session history is managed by the plugin]";
+var init_compaction_marker_manager = __esm(() => {
+  init_compaction_marker();
+  init_storage_meta_persisted();
+  init_logger();
+});
+
+// src/hooks/magic-context/note-nudger.ts
+function getPersistedNoteNudgeDeliveredAt(_db, sessionId) {
+  return lastDeliveredAt.get(sessionId) ?? 0;
+}
+function recordNoteNudgeDeliveryTime(sessionId) {
+  lastDeliveredAt.set(sessionId, Date.now());
+}
+function onNoteTrigger(db, sessionId, trigger) {
+  setPersistedNoteNudgeTrigger(db, sessionId);
+  sessionLog(sessionId, `note-nudge: trigger fired (${trigger}), triggerPending=true`);
+}
+function peekNoteNudgeText(db, sessionId, currentUserMessageId, projectIdentity) {
+  const state = getPersistedNoteNudge(db, sessionId);
+  if (!state.triggerPending)
+    return null;
+  if (!state.triggerMessageId && currentUserMessageId) {
+    setPersistedNoteNudgeTriggerMessageId(db, sessionId, currentUserMessageId);
+    state.triggerMessageId = currentUserMessageId;
+  }
+  if (state.triggerMessageId && currentUserMessageId && state.triggerMessageId === currentUserMessageId) {
+    sessionLog(sessionId, `note-nudge: deferring \u2014 current user message ${currentUserMessageId} is same as trigger-time message`);
+    return null;
+  }
+  const deliveredAt = getPersistedNoteNudgeDeliveredAt(db, sessionId);
+  if (deliveredAt > 0 && Date.now() - deliveredAt < NOTE_NUDGE_COOLDOWN_MS) {
+    sessionLog(sessionId, `note-nudge: suppressing \u2014 last delivered ${Math.round((Date.now() - deliveredAt) / 1000)}s ago (cooldown ${NOTE_NUDGE_COOLDOWN_MS / 60000}m)`);
+    clearPersistedNoteNudge(db, sessionId);
+    return null;
+  }
+  const notes = getSessionNotes(db, sessionId);
+  const readySmartCount = projectIdentity ? getReadySmartNotes(db, projectIdentity).length : 0;
+  const totalCount = notes.length + readySmartCount;
+  if (totalCount === 0) {
+    sessionLog(sessionId, "note-nudge: triggerPending but no notes found, skipping");
+    clearPersistedNoteNudge(db, sessionId);
+    return null;
+  }
+  const parts = [];
+  if (notes.length > 0) {
+    parts.push(`${notes.length} deferred note${notes.length === 1 ? "" : "s"}`);
+  }
+  if (readySmartCount > 0) {
+    parts.push(`${readySmartCount} ready smart note${readySmartCount === 1 ? "" : "s"}`);
+  }
+  sessionLog(sessionId, `note-nudge: delivering nudge for ${parts.join(" and ")}`);
+  return `You have ${parts.join(" and ")}. Review with ctx_note read \u2014 some may be actionable now.`;
+}
+function markNoteNudgeDelivered(db, sessionId, text, messageId) {
+  setPersistedDeliveredNoteNudge(db, sessionId, messageId ? text : "", messageId ?? "");
+  recordNoteNudgeDeliveryTime(sessionId);
+  sessionLog(sessionId, messageId ? `note-nudge: marked delivered, sticky anchor=${messageId}` : "note-nudge: marked delivered without anchor");
+}
+function getStickyNoteNudge(db, sessionId) {
+  const state = getPersistedNoteNudge(db, sessionId);
+  if (!state.stickyText || !state.stickyMessageId)
+    return null;
+  return { text: state.stickyText, messageId: state.stickyMessageId };
+}
+function clearNoteNudgeState(db, sessionId, options) {
+  if (options?.persist !== false) {
+    clearPersistedNoteNudge(db, sessionId);
+  }
+  lastDeliveredAt.delete(sessionId);
+}
+var NOTE_NUDGE_COOLDOWN_MS, lastDeliveredAt;
+var init_note_nudger = __esm(() => {
+  init_storage_meta_persisted();
+  init_storage_notes();
+  init_logger();
+  NOTE_NUDGE_COOLDOWN_MS = 15 * 60 * 1000;
+  lastDeliveredAt = new Map;
+});
+
+// src/features/magic-context/memory/embedding-backfill.ts
+async function ensureMemoryEmbeddings(args) {
+  if (!isEmbeddingEnabled()) {
+    return args.existingEmbeddings;
+  }
+  const missingMemories = args.memories.filter((memory) => !args.existingEmbeddings.has(memory.id));
+  if (missingMemories.length === 0) {
+    return args.existingEmbeddings;
+  }
+  try {
+    const embeddings = await embedBatch(missingMemories.map((memory) => memory.content));
+    const modelId = getEmbeddingModelId();
+    const staged = new Map;
+    args.db.transaction(() => {
+      for (const [index, memory] of missingMemories.entries()) {
+        const embedding = embeddings[index];
+        if (!embedding) {
+          continue;
+        }
+        saveEmbedding(args.db, memory.id, embedding, modelId);
+        staged.set(memory.id, embedding);
+      }
+    })();
+    for (const [id, embedding] of staged) {
+      args.existingEmbeddings.set(id, embedding);
+    }
+  } catch (error48) {
+    log("[magic-context] failed to backfill memory embeddings:", error48);
+  }
+  return args.existingEmbeddings;
+}
+var init_embedding_backfill = __esm(() => {
+  init_logger();
+  init_embedding();
+  init_storage_memory_embeddings();
+});
+
+// src/features/magic-context/memory/promotion.ts
+function isPromotableCategory(category) {
+  return PROMOTABLE_CATEGORIES.some((promotableCategory) => promotableCategory === category);
+}
+function resolveExpiresAt(category) {
+  const ttl = CATEGORY_DEFAULT_TTL[category];
+  return ttl === undefined ? null : Date.now() + ttl;
+}
+function promoteSessionFactsToMemory(db, sessionId, projectPath, facts) {
+  for (const fact of facts) {
+    if (!isPromotableCategory(fact.category)) {
+      continue;
+    }
+    try {
+      const normalizedHash = computeNormalizedHash(fact.content);
+      const existingMemory = getMemoryByHash(db, projectPath, fact.category, normalizedHash);
+      if (existingMemory) {
+        updateMemorySeenCount(db, existingMemory.id);
+        continue;
+      }
+      const memoryInput = {
+        projectPath,
+        category: fact.category,
+        content: fact.content,
+        sourceSessionId: sessionId,
+        sourceType: "historian",
+        expiresAt: resolveExpiresAt(fact.category)
+      };
+      const memory = insertMemory(db, memoryInput);
+      embedAndStoreMemory(db, sessionId, memory.id, memory.content);
+    } catch (error48) {
+      sessionLog(sessionId, `memory promotion failed for fact "${fact.content.slice(0, 60)}":`, error48);
+    }
+  }
+}
+async function embedAndStoreMemory(db, sessionId, memoryId, content) {
+  try {
+    const embedding = await embedText(content);
+    if (embedding) {
+      saveEmbedding(db, memoryId, embedding, getEmbeddingModelId());
+    }
+  } catch (error48) {
+    sessionLog(sessionId, `memory embedding failed for memory ${memoryId}:`, error48);
+  }
+}
+var init_promotion = __esm(() => {
+  init_logger();
+  init_constants();
+  init_embedding();
+  init_storage_memory();
+  init_storage_memory_embeddings();
+});
+
+// src/features/magic-context/memory/storage-memory-fts.ts
+function getSearchStatement(db) {
+  let stmt = searchStatements.get(db);
+  if (!stmt) {
+    const selectColumns = Object.entries(COLUMN_MAP).map(([property, column]) => `memories.${column} AS ${property}`).join(", ");
+    stmt = db.prepare(`SELECT ${selectColumns} FROM memories_fts INNER JOIN memories ON memories.id = memories_fts.rowid WHERE memories.project_path = ? AND memories.status IN ('active', 'permanent') AND (memories.expires_at IS NULL OR memories.expires_at > ?) AND memories_fts MATCH ? ORDER BY bm25(memories_fts), memories.updated_at DESC, memories.id ASC LIMIT ?`);
+    searchStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function sanitizeFtsQuery(query) {
+  const tokens = query.split(/\s+/).filter((token) => token.length > 0);
+  if (tokens.length === 0)
+    return "";
+  return tokens.map((token) => `"${token.replace(/"/g, '""')}"`).join(" ");
+}
+function searchMemoriesFTS(db, projectPath, query, limit = DEFAULT_SEARCH_LIMIT) {
+  const trimmedQuery = query.trim();
+  if (trimmedQuery.length === 0 || limit <= 0) {
+    return [];
+  }
+  const sanitized = sanitizeFtsQuery(trimmedQuery);
+  if (sanitized.length === 0) {
+    return [];
+  }
+  const rows = getSearchStatement(db).all(projectPath, Date.now(), sanitized, limit).filter(isMemoryRow);
+  return rows.map(toMemory);
+}
+var DEFAULT_SEARCH_LIMIT = 10, searchStatements;
+var init_storage_memory_fts = __esm(() => {
+  init_storage_memory();
+  searchStatements = new WeakMap;
+});
+// src/features/magic-context/memory/index.ts
+var init_memory = __esm(() => {
+  init_project_identity();
+  init_promotion();
+  init_constants();
+  init_embedding();
+  init_embedding_backfill();
+  init_embedding_cache();
+  init_storage_memory();
+  init_storage_memory_embeddings();
+  init_storage_memory_fts();
+});
+
+// src/hooks/magic-context/caveman.ts
+function protectRegions(text) {
+  const preserved = [];
+  let working = text;
+  for (const pattern of PRESERVATION_PATTERNS) {
+    working = working.replace(pattern, (match) => {
+      const placeholder = `\x00MC_PRES_${preserved.length}\x00`;
+      preserved.push({ placeholder, original: match });
+      return placeholder;
+    });
+  }
+  return { text: working, preserved };
+}
+function restoreRegions(text, preserved) {
+  let working = text;
+  for (let i = preserved.length - 1;i >= 0; i--) {
+    working = working.split(preserved[i].placeholder).join(preserved[i].original);
+  }
+  return working;
+}
+function buildPhraseDropRegex(phrases) {
+  const escaped = phrases.map((p) => p.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+  return new RegExp(`(\\s+)?\\b(?:${escaped.join("|")})\\b`, "gi");
+}
+function dropPhrases(text, phrases) {
+  return text.replace(buildPhraseDropRegex(phrases), "");
+}
+function dropArticles(text) {
+  let working = text.replace(/\b(?:the|a|an)\b\s+/gi, "");
+  working = working.replace(/ +/g, " ");
+  return working;
+}
+function dropAuxiliaries(text) {
+  const sorted = [...AUXILIARIES].sort((a, b) => b.length - a.length);
+  const escaped = sorted.map((a) => a.replace(/\s+/g, "\\s+"));
+  const pattern = new RegExp(`\\s+\\b(?:${escaped.join("|")})\\b\\s+(?=\\w+(?:ed|en|ing|ized|ised)\\b)`, "gi");
+  let working = text.replace(pattern, " ");
+  working = working.replace(/ +/g, " ");
+  return working;
+}
+function applyPhraseShortenings(text) {
+  let working = text;
+  for (const [pattern, replacement] of PHRASE_SHORTENINGS) {
+    working = working.replace(pattern, replacement);
+  }
+  return working;
+}
+function applyUltraConnectives(text) {
+  let working = text;
+  for (const [pattern, replacement] of ULTRA_CONNECTIVE_REPLACEMENTS) {
+    working = working.replace(pattern, replacement);
+  }
+  return working;
+}
+function countWordOccurrences(text, term) {
+  const escaped = term.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const matches = text.match(new RegExp(`\\b${escaped}\\b`, "gi"));
+  return matches ? matches.length : 0;
+}
+function applyUltraAbbreviations(text) {
+  let working = text;
+  for (const [term, abbreviation] of Object.entries(ULTRA_ABBREVIATIONS)) {
+    if (countWordOccurrences(working, term) < 3)
+      continue;
+    const escaped = term.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    working = working.replace(new RegExp(`\\b${escaped}\\b`, "gi"), (match) => {
+      return match[0] === match[0].toUpperCase() ? abbreviation[0].toUpperCase() + abbreviation.slice(1) : abbreviation;
+    });
+  }
+  return working;
+}
+function transformPreservingUserLines(text, transform2) {
+  const lines = text.split(`
+`);
+  const output = [];
+  let buffer2 = [];
+  const flushBuffer = () => {
+    if (buffer2.length === 0)
+      return;
+    const joined = buffer2.join(`
+`);
+    output.push(transform2(joined));
+    buffer2 = [];
+  };
+  for (const line of lines) {
+    if (line.startsWith("U: ")) {
+      flushBuffer();
+      output.push(line);
+    } else {
+      buffer2.push(line);
+    }
+  }
+  flushBuffer();
+  return output.join(`
+`);
+}
+function normalizeWhitespace(text) {
+  return text.split(`
+`).map((line) => line.replace(/[ \t]+/g, " ").replace(/[ \t]+$/, "")).join(`
+`).replace(/\n{3,}/g, `
+
+`);
+}
+function cavemanCompress(text, level) {
+  if (text.length === 0)
+    return text;
+  const { text: protectedText, preserved } = protectRegions(text);
+  const transformed = transformPreservingUserLines(protectedText, (chunk) => {
+    let working = chunk;
+    working = dropPhrases(working, FILLER_WORDS);
+    working = dropPhrases(working, HEDGING_PHRASES);
+    working = dropPhrases(working, PLEASANTRIES);
+    working = applyPhraseShortenings(working);
+    if (level === "full" || level === "ultra") {
+      working = dropAuxiliaries(working);
+      working = dropArticles(working);
+    }
+    if (level === "ultra") {
+      working = applyUltraConnectives(working);
+      working = applyUltraAbbreviations(working);
+    }
+    return working;
+  });
+  const restored = restoreRegions(transformed, preserved);
+  return normalizeWhitespace(restored).trim();
+}
+var PRESERVATION_PATTERNS, FILLER_WORDS, HEDGING_PHRASES, PLEASANTRIES, AUXILIARIES, PHRASE_SHORTENINGS, ULTRA_CONNECTIVE_REPLACEMENTS, ULTRA_ABBREVIATIONS;
+var init_caveman = __esm(() => {
+  PRESERVATION_PATTERNS = [
+    /```[\s\S]*?```/g,
+    /`[^`\n]+`/g,
+    /https?:\/\/\S+/g,
+    /\u00A7\d+\u00A7/g,
+    /\b(?:msg|ses|toolu)_[A-Za-z0-9]+/g,
+    /(?:\.{1,2}\/)?(?:[\w.-]+\/)+[\w.-]+\.\w{1,6}/g,
+    /(?<![a-z0-9])[0-9a-f]{7,40}(?![a-z0-9])/gi
+  ];
+  FILLER_WORDS = [
+    "just",
+    "really",
+    "basically",
+    "actually",
+    "essentially",
+    "simply",
+    "clearly",
+    "obviously",
+    "quite",
+    "very",
+    "somewhat",
+    "rather",
+    "fairly",
+    "sort of",
+    "kind of",
+    "a bit"
+  ];
+  HEDGING_PHRASES = [
+    "i think",
+    "i believe",
+    "i feel",
+    "probably",
+    "perhaps",
+    "maybe",
+    "it seems",
+    "it appears",
+    "arguably",
+    "i suppose",
+    "i guess"
+  ];
+  PLEASANTRIES = ["please", "thanks", "thank you", "kindly", "if possible"];
+  AUXILIARIES = [
+    "was",
+    "were",
+    "is",
+    "are",
+    "am",
+    "be",
+    "been",
+    "being",
+    "has been",
+    "had been",
+    "have been",
+    "will be",
+    "would be",
+    "could be",
+    "should be",
+    "might be",
+    "may be"
+  ];
+  PHRASE_SHORTENINGS = [
+    [/\bin order to\b/gi, "to"],
+    [/\bdue to the fact that\b/gi, "because"],
+    [/\bat this point in time\b/gi, "now"],
+    [/\bat the moment\b/gi, "now"],
+    [/\bin the event that\b/gi, "if"],
+    [/\bfor the purpose of\b/gi, "for"],
+    [/\bwith regard to\b/gi, "about"],
+    [/\bin spite of the fact that\b/gi, "though"],
+    [/\bon the grounds that\b/gi, "because"],
+    [/\bfor the reason that\b/gi, "because"]
+  ];
+  ULTRA_CONNECTIVE_REPLACEMENTS = [
+    [/\b(?:and then|then after|afterwards)\b/gi, "\u2192"],
+    [/\bbecause of\b/gi, "//"],
+    [/\btherefore\b/gi, "\u2192"],
+    [/\bbecause\b/gi, "//"],
+    [/\bhowever\b/gi, "but"],
+    [/\bfurthermore\b/gi, "+"],
+    [/\badditionally\b/gi, "+"],
+    [/\bas well as\b/gi, "+"],
+    [/ and /gi, " + "],
+    [/ or /gi, " | "]
+  ];
+  ULTRA_ABBREVIATIONS = {
+    historian: "hist",
+    compartment: "cmpt",
+    compartments: "cmpts",
+    compressor: "cmp",
+    compression: "cmp",
+    context: "ctx",
+    message: "msg",
+    messages: "msgs",
+    session: "ses",
+    configuration: "cfg",
+    config: "cfg",
+    implementation: "impl",
+    implemented: "impl",
+    repository: "repo",
+    database: "db",
+    directory: "dir"
+  };
+});
+
+// src/hooks/magic-context/compartment-runner-compressor.ts
+function cavemanLevelForDepth(outputDepth) {
+  if (outputDepth <= 1)
+    return null;
+  if (outputDepth === 2)
+    return "lite";
+  if (outputDepth === 3)
+    return "full";
+  if (outputDepth === 4)
+    return "ultra";
+  return null;
+}
+async function runCompressionPassIfNeeded(deps) {
+  const { db, sessionId, historyBudgetTokens } = deps;
+  const minCompartmentRatio = deps.minCompartmentRatio ?? DEFAULT_COMPRESSOR_MIN_COMPARTMENT_RATIO;
+  const maxMergeDepth = deps.maxMergeDepth ?? DEFAULT_COMPRESSOR_MAX_MERGE_DEPTH;
+  const compartments = getCompartments(db, sessionId);
+  if (compartments.length <= 1)
+    return false;
+  const facts = getSessionFacts(db, sessionId);
+  let totalTokens = 0;
+  for (const c of compartments) {
+    totalTokens += estimateTokens(`<compartment start="${c.startMessage}" end="${c.endMessage}" title="${c.title}">
+${c.content}
+</compartment>
+`);
+  }
+  for (const f of facts) {
+    totalTokens += estimateTokens(`* ${f.content}
+`);
+  }
+  if (totalTokens <= historyBudgetTokens) {
+    sessionLog(sessionId, `compressor: history block ~${totalTokens} tokens within budget ${historyBudgetTokens}, skipping`);
+    return false;
+  }
+  const lastEndMessage = compartments[compartments.length - 1].endMessage;
+  const floor = Math.max(1, Math.ceil(lastEndMessage / minCompartmentRatio));
+  if (compartments.length <= floor) {
+    sessionLog(sessionId, `compressor: at floor (${compartments.length} compartments, floor=${floor} from ${lastEndMessage} msgs), skipping`);
+    return false;
+  }
+  const overage = totalTokens - historyBudgetTokens;
+  sessionLog(sessionId, `compressor: history block ~${totalTokens} tokens exceeds budget ${historyBudgetTokens} by ~${overage} tokens`);
+  const maxCompartmentsPerPass = deps.maxCompartmentsPerPass ?? DEFAULT_COMPRESSOR_MAX_COMPARTMENTS_PER_PASS;
+  const graceCompartments = deps.graceCompartments ?? DEFAULT_COMPRESSOR_GRACE_COMPARTMENTS;
+  const scored = scoreCompartments(db, sessionId, compartments);
+  const floorHeadroom = compartments.length - floor;
+  if (floorHeadroom < 1) {
+    sessionLog(sessionId, `compressor: no floor headroom (${compartments.length} compartments, floor=${floor}), skipping`);
+    return false;
+  }
+  const contiguous = findOldestContiguousSameDepthBand(scored, {
+    maxPickable: maxCompartmentsPerPass,
+    maxMergeDepth,
+    graceCompartments,
+    floorHeadroom
+  });
+  if (contiguous.length < 2) {
+    sessionLog(sessionId, `compressor: no eligible same-depth band found (floor=${floor}, maxDepth=${maxMergeDepth}, grace=${graceCompartments}, maxPerPass=${maxCompartmentsPerPass}), skipping`);
+    return false;
+  }
+  const firstIndex = contiguous[0].index;
+  const lastIndex = contiguous[contiguous.length - 1].index;
+  const selectedCompartments = contiguous.map((s) => s.compartment);
+  const selectedTokens = contiguous.reduce((t, s) => t + s.tokenEstimate, 0);
+  const overallAverageDepth = contiguous.reduce((sum, s) => sum + s.averageDepth, 0) / contiguous.length;
+  const outputDepth = Math.min(5, Math.max(1, Math.round(overallAverageDepth) + 1));
+  const mergeRatio = COMPRESSOR_MERGE_RATIO_BY_DEPTH[outputDepth] ?? 2;
+  const outputCount = mergeRatio > 0 ? Math.max(1, Math.ceil(contiguous.length / mergeRatio)) : 1;
+  sessionLog(sessionId, `compressor: scored ${compartments.length}, picked ${contiguous.length} contiguous (${selectedCompartments[0].startMessage}-${selectedCompartments[selectedCompartments.length - 1].endMessage}, ~${selectedTokens} tokens), avg_depth=${overallAverageDepth.toFixed(1)} \u2192 output_depth=${outputDepth} (ratio=${mergeRatio}, target=${outputCount} compartments)`);
+  if (outputDepth === 5) {
+    return finalizeCompression({
+      db,
+      sessionId,
+      compartments,
+      leadingCount: firstIndex,
+      trailingIndex: lastIndex + 1,
+      selectedCompartments,
+      compressed: selectedCompartments.map((c) => ({
+        startMessage: c.startMessage,
+        endMessage: c.endMessage,
+        startMessageId: c.startMessageId,
+        endMessageId: c.endMessageId,
+        title: c.title,
+        content: ""
+      })),
+      originalStart: selectedCompartments[0].startMessage,
+      originalEnd: selectedCompartments[selectedCompartments.length - 1].endMessage,
+      facts,
+      logLabel: `depth-5 title-only collapse (${selectedCompartments.length} \u2192 ${selectedCompartments.length})`
+    });
+  }
+  try {
+    const targetTokens = Math.max(200, Math.floor(selectedTokens / mergeRatio));
+    const llmCompressed = await runCompressorPass({
+      ...deps,
+      compartments: selectedCompartments,
+      currentTokens: selectedTokens,
+      targetTokens,
+      outputCount,
+      outputDepth
+    });
+    if (!llmCompressed) {
+      sessionLog(sessionId, "compressor: LLM pass failed, keeping existing compartments");
+      return false;
+    }
+    const level = cavemanLevelForDepth(outputDepth);
+    const finalCompressed = level ? llmCompressed.map((c) => ({ ...c, content: cavemanCompress(c.content, level) })) : llmCompressed;
+    return finalizeCompression({
+      db,
+      sessionId,
+      compartments,
+      leadingCount: firstIndex,
+      trailingIndex: lastIndex + 1,
+      selectedCompartments,
+      compressed: finalCompressed,
+      originalStart: selectedCompartments[0].startMessage,
+      originalEnd: selectedCompartments[selectedCompartments.length - 1].endMessage,
+      facts,
+      logLabel: `depth-${outputDepth} (${selectedCompartments.length} \u2192 ${finalCompressed.length})`
+    });
+  } catch (error48) {
+    sessionLog(sessionId, "compressor: unexpected error:", getErrorMessage(error48));
+    return false;
+  }
+}
+function scoreCompartments(db, sessionId, compartments) {
+  let maxDepthAcrossSession = 0;
+  for (const c of compartments) {
+    const d = getAverageCompressionDepth(db, sessionId, c.startMessage, c.endMessage);
+    if (d > maxDepthAcrossSession)
+      maxDepthAcrossSession = d;
+  }
+  return compartments.map((compartment, index) => {
+    const tokenEstimate = estimateTokens(`<compartment start="${compartment.startMessage}" end="${compartment.endMessage}" title="${compartment.title}">
+${compartment.content}
+</compartment>
+`);
+    const averageDepth = getAverageCompressionDepth(db, sessionId, compartment.startMessage, compartment.endMessage);
+    const normalizedAge = compartments.length > 1 ? 1 - index / (compartments.length - 1) : 1;
+    const normalizedDepth = maxDepthAcrossSession > 0 ? 1 - averageDepth / maxDepthAcrossSession : 1;
+    const score = 0.7 * normalizedAge + 0.3 * normalizedDepth;
+    return { compartment, index, tokenEstimate, averageDepth, score };
+  });
+}
+function findOldestContiguousSameDepthBand(scored, constraints) {
+  const { maxPickable, maxMergeDepth, graceCompartments, floorHeadroom } = constraints;
+  const hardMaxPick = Math.max(0, Math.min(maxPickable, floorHeadroom));
+  if (hardMaxPick < 2)
+    return [];
+  const scanEnd = Math.max(0, scored.length - graceCompartments);
+  if (scanEnd < 2)
+    return [];
+  let i = 0;
+  while (i < scanEnd) {
+    const c = scored[i];
+    if (!c || c.averageDepth >= maxMergeDepth) {
+      i++;
+      continue;
+    }
+    const anchorDepth = Math.round(c.averageDepth);
+    let j = i;
+    while (j < scanEnd) {
+      const entry = scored[j];
+      if (!entry)
+        break;
+      if (entry.averageDepth >= maxMergeDepth)
+        break;
+      if (Math.round(entry.averageDepth) !== anchorDepth)
+        break;
+      if (j - i >= hardMaxPick)
+        break;
+      j++;
+    }
+    const runLen = j - i;
+    if (runLen >= 2) {
+      return scored.slice(i, j);
+    }
+    i = Math.max(j, i + 1);
+  }
+  return [];
+}
+function snapLLMOutputToInputBoundaries(llmOutput, inputCompartments) {
+  const sorted = [...inputCompartments].sort((a, b) => a.startMessage - b.startMessage);
+  const containing = (ord) => {
+    let lo = 0;
+    let hi = sorted.length - 1;
+    while (lo <= hi) {
+      const mid = lo + hi >> 1;
+      const c = sorted[mid];
+      if (!c)
+        return null;
+      if (ord < c.startMessage)
+        hi = mid - 1;
+      else if (ord > c.endMessage)
+        lo = mid + 1;
+      else
+        return c;
+    }
+    return null;
+  };
+  const result = [];
+  let snapCount = 0;
+  for (const pc of llmOutput) {
+    const startOwner = containing(pc.startMessage);
+    const endOwner = containing(pc.endMessage);
+    if (!startOwner || !endOwner) {
+      return null;
+    }
+    if (startOwner.startMessage !== pc.startMessage)
+      snapCount++;
+    if (endOwner.endMessage !== pc.endMessage)
+      snapCount++;
+    result.push({
+      startMessage: startOwner.startMessage,
+      endMessage: endOwner.endMessage,
+      startMessageId: startOwner.startMessageId,
+      endMessageId: endOwner.endMessageId,
+      title: pc.title,
+      content: pc.content
+    });
+  }
+  return { result, snapCount };
+}
+function finalizeCompression(args) {
+  const {
+    db,
+    sessionId,
+    compartments,
+    leadingCount,
+    trailingIndex,
+    selectedCompartments: _selectedCompartments,
+    compressed,
+    originalStart,
+    originalEnd,
+    facts,
+    logLabel
+  } = args;
+  const compressedStart = compressed[0].startMessage;
+  const compressedEnd = compressed[compressed.length - 1].endMessage;
+  if (compressedStart !== originalStart || compressedEnd !== originalEnd) {
+    sessionLog(sessionId, `compressor: compressed range ${compressedStart}-${compressedEnd} doesn't match original ${originalStart}-${originalEnd}, aborting`);
+    return false;
+  }
+  for (let i = 1;i < compressed.length; i++) {
+    const prev = compressed[i - 1];
+    const curr = compressed[i];
+    if (curr.startMessage <= prev.endMessage) {
+      sessionLog(sessionId, `compressor: overlap at compartment ${i}, aborting`);
+      return false;
+    }
+    if (curr.startMessage > prev.endMessage + 1) {
+      sessionLog(sessionId, `compressor: gap at compartment ${i}, aborting`);
+      return false;
+    }
+  }
+  const leading = compartments.slice(0, leadingCount);
+  const trailing = compartments.slice(trailingIndex);
+  const allCompartments = [
+    ...leading.map((c, i) => ({
+      sequence: i,
+      startMessage: c.startMessage,
+      endMessage: c.endMessage,
+      startMessageId: c.startMessageId,
+      endMessageId: c.endMessageId,
+      title: c.title,
+      content: c.content
+    })),
+    ...compressed.map((c, i) => ({
+      sequence: leading.length + i,
+      startMessage: c.startMessage,
+      endMessage: c.endMessage,
+      startMessageId: c.startMessageId,
+      endMessageId: c.endMessageId,
+      title: c.title,
+      content: c.content
+    })),
+    ...trailing.map((c, i) => ({
+      sequence: leading.length + compressed.length + i,
+      startMessage: c.startMessage,
+      endMessage: c.endMessage,
+      startMessageId: c.startMessageId,
+      endMessageId: c.endMessageId,
+      title: c.title,
+      content: c.content
+    }))
+  ];
+  replaceAllCompartmentState(db, sessionId, allCompartments, facts.map((f) => ({ category: f.category, content: f.content })));
+  incrementCompressionDepth(db, sessionId, originalStart, originalEnd);
+  sessionLog(sessionId, `compressor: completed ${logLabel}`);
+  return true;
+}
+async function runCompressorPass(args) {
+  const {
+    client,
+    sessionId,
+    directory,
+    compartments,
+    currentTokens,
+    targetTokens,
+    outputCount,
+    outputDepth,
+    historianTimeoutMs
+  } = args;
+  const prompt = buildCompressorPrompt(compartments, currentTokens, targetTokens, outputDepth, outputCount);
+  let agentSessionId = null;
+  try {
+    const createResponse = await client.session.create({
+      body: { parentID: sessionId, title: "magic-context-compressor" },
+      query: { directory }
+    });
+    const createdSession = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
+    agentSessionId = typeof createdSession?.id === "string" ? createdSession.id : null;
+    if (!agentSessionId) {
+      sessionLog(sessionId, "compressor: could not create child session");
+      return null;
+    }
+    await promptSyncWithModelSuggestionRetry(client, {
+      path: { id: agentSessionId },
+      query: { directory },
+      body: {
+        agent: HISTORIAN_AGENT2,
+        parts: [{ type: "text", text: prompt }]
+      }
+    }, { timeoutMs: historianTimeoutMs ?? DEFAULT_HISTORIAN_TIMEOUT_MS });
+    const messagesResponse = await client.session.messages({
+      path: { id: agentSessionId },
+      query: { directory }
+    });
+    const messages = normalizeSDKResponse(messagesResponse, [], {
+      preferResponseOnMissingData: true
+    });
+    const result = extractLatestAssistantText(messages);
+    if (!result) {
+      sessionLog(sessionId, "compressor: historian returned no output");
+      return null;
+    }
+    const parsed = parseCompartmentOutput(result);
+    if (parsed.compartments.length === 0) {
+      sessionLog(sessionId, "compressor: historian returned no compartments");
+      return null;
+    }
+    const snapped = snapLLMOutputToInputBoundaries(parsed.compartments, compartments);
+    if (!snapped) {
+      sessionLog(sessionId, "compressor: rejecting \u2014 LLM output contains ordinal(s) outside input range");
+      return null;
+    }
+    if (snapped.snapCount > 0) {
+      sessionLog(sessionId, `compressor: snapped ${snapped.snapCount} LLM boundary value(s) to input compartment boundaries`);
+    }
+    return snapped.result;
+  } catch (error48) {
+    sessionLog(sessionId, "compressor: historian call failed:", getErrorMessage(error48));
+    return null;
+  } finally {
+    if (agentSessionId) {
+      await client.session.delete({ path: { id: agentSessionId }, query: { directory } }).catch((e) => {
+        sessionLog(sessionId, "compressor: session cleanup failed:", getErrorMessage(e));
+      });
+    }
+  }
+}
+var HISTORIAN_AGENT2 = "historian";
+var init_compartment_runner_compressor = __esm(() => {
+  init_magic_context();
+  init_storage();
+  init_shared();
+  init_assistant_message_extractor();
+  init_logger();
+  init_caveman();
+  init_compartment_parser();
+  init_compartment_prompt();
+  init_read_session_formatting();
+});
+
+// src/hooks/magic-context/compartment-runner-drop-queue.ts
+function queueDropsForCompartmentalizedMessages(db, sessionId, upToMessageIndex) {
+  const tags = getTagsBySession(db, sessionId);
+  const rawTagKeys = new Set(getRawSessionTagKeysThrough(sessionId, upToMessageIndex));
+  let dropsQueued = 0;
+  for (const tag of tags) {
+    if (tag.status !== "active")
+      continue;
+    if (rawTagKeys.has(tag.messageId)) {
+      queuePendingOp(db, sessionId, tag.tagNumber, "drop");
+      dropsQueued += 1;
+    }
+  }
+  sessionLog(sessionId, `compartment agent: queued ${dropsQueued} drops for messages 0-${upToMessageIndex}`);
+}
+var init_compartment_runner_drop_queue = __esm(() => {
+  init_storage_ops();
+  init_storage_tags();
+  init_logger();
+  init_read_session_chunk();
+});
+
 // src/hooks/magic-context/compartment-runner-incremental.ts
 function shouldSuppressHistorianAlert(sessionId) {
   const lastAlert = lastHistorianAlertBySession.get(sessionId);
@@ -152833,6 +153932,8 @@ ${chunk.text}`);
     const parentSessionResponse = await client.session.get({ path: { id: sessionId } }).catch(() => null);
     const parentSession = normalizeSDKResponse(parentSessionResponse, null, { preferResponseOnMissingData: true });
     const sessionDirectory = parentSession?.directory ?? directory;
+    const maxExistingSequence = priorCompartments.reduce((max, c) => c.sequence > max ? c.sequence : max, -1);
+    const sequenceOffset = priorCompartments.length === 0 ? 0 : maxExistingSequence + 1;
     const validatedPass = await runValidatedHistorianPass({
       client,
       parentSessionId: sessionId,
@@ -152840,10 +153941,11 @@ ${chunk.text}`);
       prompt,
       chunk,
       priorCompartments,
-      sequenceOffset: priorCompartments.length,
+      sequenceOffset,
       dumpLabelBase: `incremental-${sessionId}-${chunk.startIndex}-${chunk.endIndex}`,
       timeoutMs: historianTimeoutMs,
-      fallbackModelId: deps.fallbackModelId
+      fallbackModelId: deps.fallbackModelId,
+      twoPass: deps.historianTwoPass
     });
     if (!validatedPass.ok) {
       incrementHistorianFailure(db, sessionId, validatedPass.error);
@@ -152885,7 +153987,9 @@ No new compartments or facts were written. Check the historian model/output and
         sessionId,
         directory: sessionDirectory,
         historyBudgetTokens: deps.historyBudgetTokens,
-        historianTimeoutMs
+        historianTimeoutMs,
+        minCompartmentRatio: deps.compressorMinCompartmentRatio,
+        maxMergeDepth: deps.compressorMaxMergeDepth
       });
     }
     updateSessionMeta(db, sessionId, { compartmentInProgress: false });
@@ -152969,6 +154073,7 @@ async function executeContextRecompInternal(deps) {
       const promoted2 = promoteRecompStaging(db, sessionId);
       if (!promoted2)
         return null;
+      clearCompressionDepth(db, sessionId);
       clearInjectionCache(sessionId);
       if (deps.directory) {
         promoteSessionFactsToMemory(db, sessionId, resolveProjectIdentity(deps.directory), promoted2.facts);
@@ -153060,6 +154165,7 @@ Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${c
         dumpLabelBase: `recomp-${sessionId}-${chunk.startIndex}-${chunk.endIndex}-pass-${passCount + 1}`,
         timeoutMs: historianTimeoutMs,
         fallbackModelId: deps.fallbackModelId,
+        twoPass: deps.historianTwoPass,
         callbacks: {
           onRepairRetry: async (error48) => {
             await sendIgnoredMessage(client, sessionId, `## Magic Recomp
@@ -153135,6 +154241,7 @@ Nothing was written.`;
       replaceAllCompartmentState(db, sessionId, candidateCompartments, candidateFacts);
       clearRecompStaging(db, sessionId);
     }
+    clearCompressionDepth(db, sessionId);
     clearInjectionCache(sessionId);
     const finalCompartments = promoted?.compartments ?? candidateCompartments;
     const finalFacts = promoted?.facts ?? candidateFacts;
@@ -153153,7 +154260,9 @@ Nothing was written.`;
         sessionId,
         directory: sessionDirectory,
         historyBudgetTokens: deps.historyBudgetTokens,
-        historianTimeoutMs
+        historianTimeoutMs,
+        minCompartmentRatio: deps.compressorMinCompartmentRatio,
+        maxMergeDepth: deps.compressorMaxMergeDepth
       });
     }
     return [
@@ -153179,6 +154288,7 @@ Staging data preserved for resume on next attempt.`;
 }
 var init_compartment_runner_recomp = __esm(() => {
   init_compartment_storage();
+  init_compression_depth_storage();
   init_memory();
   init_project_identity();
   init_storage_memory();
@@ -153201,12 +154311,21 @@ var exports_compartment_runner = {};
 __export(exports_compartment_runner, {
   startCompartmentAgent: () => startCompartmentAgent,
   runCompartmentAgent: () => runCompartmentAgent,
+  registerActiveCompartmentRun: () => registerActiveCompartmentRun,
   getActiveCompartmentRun: () => getActiveCompartmentRun,
   executeContextRecomp: () => executeContextRecomp
 });
 function getActiveCompartmentRun(sessionId) {
   return activeRuns.get(sessionId);
 }
+function registerActiveCompartmentRun(sessionId, promise2) {
+  const wrapped = promise2.finally(() => {
+    if (activeRuns.get(sessionId) === wrapped) {
+      activeRuns.delete(sessionId);
+    }
+  });
+  activeRuns.set(sessionId, wrapped);
+}
 function startCompartmentAgent(deps) {
   const existing = activeRuns.get(deps.sessionId);
   if (existing) {
@@ -153222,12 +154341,12 @@ function startCompartmentAgent(deps) {
   });
   activeRuns.set(deps.sessionId, promise2);
 }
-async function executeContextRecomp(deps) {
+async function executeContextRecomp(deps, options = {}) {
   const { sessionId } = deps;
   if (activeRuns.has(sessionId)) {
     return "## Magic Recomp\n\nHistorian is already running for this session. Wait for it to finish, then try `/ctx-recomp` again.";
   }
-  const promise2 = executeContextRecompInternal(deps);
+  const promise2 = options.range ? executePartialRecompInternal(deps, options.range) : executeContextRecompInternal(deps);
   activeRuns.set(sessionId, promise2.then(() => {
     return;
   }).catch((err) => {
@@ -153244,6 +154363,7 @@ var init_compartment_runner = __esm(() => {
   init_storage_meta();
   init_logger();
   init_compartment_runner_incremental();
+  init_compartment_runner_partial_recomp();
   init_compartment_runner_recomp();
   init_compartment_runner_incremental();
   activeRuns = new Map;
@@ -161011,15 +162131,15 @@ var exports_tui_config = {};
 __export(exports_tui_config, {
   ensureTuiPluginEntry: () => ensureTuiPluginEntry
 });
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname2, join as join16 } from "path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname3, join as join16 } from "path";
 function resolveTuiConfigPath() {
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
   const jsoncPath = join16(configDir, "tui.jsonc");
   const jsonPath = join16(configDir, "tui.json");
-  if (existsSync7(jsoncPath))
+  if (existsSync8(jsoncPath))
     return jsoncPath;
-  if (existsSync7(jsonPath))
+  if (existsSync8(jsonPath))
     return jsonPath;
   return jsonPath;
 }
@@ -161027,8 +162147,8 @@ function ensureTuiPluginEntry() {
   try {
     const configPath = resolveTuiConfigPath();
     let config2 = {};
-    if (existsSync7(configPath)) {
-      const raw = readFileSync6(configPath, "utf-8");
+    if (existsSync8(configPath)) {
+      const raw = readFileSync7(configPath, "utf-8");
       config2 = import_comment_json.parse(raw) ?? {};
     }
     const plugins = Array.isArray(config2.plugin) ? config2.plugin.filter((p) => typeof p === "string") : [];
@@ -161047,7 +162167,7 @@ function ensureTuiPluginEntry() {
       plugins.push(PLUGIN_ENTRY);
     }
     config2.plugin = plugins;
-    mkdirSync5(dirname2(configPath), { recursive: true });
+    mkdirSync5(dirname3(configPath), { recursive: true });
     writeFileSync3(configPath, `${import_comment_json.stringify(config2, null, 2)}
 `);
     log(`[magic-context] updated TUI plugin entry in ${configPath}`);
@@ -161067,12 +162187,76 @@ var init_tui_config = __esm(() => {
 // src/config/index.ts
 init_jsonc_parser();
 init_magic_context();
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { homedir as homedir2 } from "os";
+import { join } from "path";
+
+// src/config/variable.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { dirname, isAbsolute, resolve } from "path";
+var ENV_PATTERN = /\{env:([^}]+)\}/g;
+var FILE_PATTERN = /\{file:([^}]+)\}/g;
+function substituteConfigVariables(input) {
+  const warnings = [];
+  let text = input.text;
+  text = text.replace(ENV_PATTERN, (_, rawName) => {
+    const varName = rawName.trim();
+    const value = varName ? process.env[varName] : undefined;
+    if (value === undefined || value === "") {
+      warnings.push(`Environment variable ${varName} is not set (referenced via {env:${varName}}); using empty string`);
+      return "";
+    }
+    return value;
+  });
+  const fileMatches = Array.from(text.matchAll(FILE_PATTERN));
+  if (fileMatches.length === 0) {
+    return { text, warnings };
+  }
+  const configDir = input.configPath ? dirname(input.configPath) : process.cwd();
+  let output = "";
+  let cursor = 0;
+  for (const match of fileMatches) {
+    const token = match[0];
+    const rawPath = match[1] ?? "";
+    const index = match.index ?? 0;
+    output += text.slice(cursor, index);
+    cursor = index + token.length;
+    const lineStart = text.lastIndexOf(`
+`, index - 1) + 1;
+    const prefix = text.slice(lineStart, index).trimStart();
+    if (prefix.startsWith("//")) {
+      output += token;
+      continue;
+    }
+    let filePath = rawPath.trim();
+    if (filePath.startsWith("~/")) {
+      filePath = resolve(homedir(), filePath.slice(2));
+    } else if (!isAbsolute(filePath)) {
+      filePath = resolve(configDir, filePath);
+    }
+    if (!existsSync2(filePath)) {
+      warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
+      continue;
+    }
+    let contents;
+    try {
+      contents = readFileSync2(filePath, "utf-8").trim();
+    } catch (error48) {
+      const message = error48 instanceof Error ? error48.message : String(error48);
+      warnings.push(`Failed to read file for ${token} (${filePath}): ${message}; using empty string`);
+      continue;
+    }
+    output += JSON.stringify(contents).slice(1, -1);
+  }
+  output += text.slice(cursor);
+  return { text: output, warnings };
+}
+
+// src/config/index.ts
 var CONFIG_FILE_BASENAME = "magic-context";
 function getUserConfigBasePath() {
-  const configRoot = process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config");
+  const configRoot = process.env.XDG_CONFIG_HOME ?? join(homedir2(), ".config");
   return join(configRoot, "opencode", CONFIG_FILE_BASENAME);
 }
 function getProjectConfigBasePath(directory) {
@@ -161080,10 +162264,15 @@ function getProjectConfigBasePath(directory) {
 }
 function loadConfigFile(configPath) {
   try {
-    if (!existsSync2(configPath)) {
+    if (!existsSync3(configPath)) {
       return null;
     }
-    return parseJsonc(readFileSync2(configPath, "utf-8"));
+    const rawText = readFileSync3(configPath, "utf-8");
+    const substituted = substituteConfigVariables({ text: rawText, configPath });
+    return {
+      config: parseJsonc(substituted.text),
+      warnings: substituted.warnings.map((w) => `${configPath}: ${w}`)
+    };
   } catch (error48) {
     console.warn(`[magic-context] failed to load config from ${configPath}:`, error48 instanceof Error ? error48.message : String(error48));
     return null;
@@ -161117,6 +162306,25 @@ function mergeConfigs(base, override) {
   };
   return config2;
 }
+function redactConfigValue(value) {
+  if (value === undefined)
+    return "<missing>";
+  if (value === null)
+    return "null";
+  if (typeof value === "string")
+    return `string, ${value.length} char${value.length === 1 ? "" : "s"}`;
+  if (typeof value === "number")
+    return `number ${value}`;
+  if (typeof value === "boolean")
+    return `boolean ${value}`;
+  if (Array.isArray(value))
+    return `array, ${value.length} item${value.length === 1 ? "" : "s"}`;
+  if (typeof value === "object") {
+    const keys = Object.keys(value);
+    return `object with keys [${keys.join(", ")}]`;
+  }
+  return typeof value;
+}
 function parsePluginConfig(rawConfig) {
   const parsed = MagicContextConfigSchema.safeParse(rawConfig);
   const disabledHooks = Array.isArray(rawConfig.disabled_hooks) ? rawConfig.disabled_hooks.filter((value) => typeof value === "string") : undefined;
@@ -161146,7 +162354,7 @@ function parsePluginConfig(rawConfig) {
     } else {
       delete patched[key];
       const defaultVal = defaults[key];
-      warnings.push(`"${key}": invalid value ${JSON.stringify(rawConfig[key])}, using default ${JSON.stringify(defaultVal)}.`);
+      warnings.push(`"${key}": invalid value (${redactConfigValue(rawConfig[key])}), using default ${JSON.stringify(defaultVal)}.`);
     }
   }
   const retryParsed = MagicContextConfigSchema.safeParse(patched);
@@ -161166,19 +162374,21 @@ function loadPluginConfig(directory) {
   const rootDetected = detectConfigFile(join(directory, CONFIG_FILE_BASENAME));
   const dotOpenCodeDetected = detectConfigFile(getProjectConfigBasePath(directory));
   const projectDetected = rootDetected.format !== "none" ? rootDetected : dotOpenCodeDetected;
-  const userConfig = userDetected.format === "none" ? null : loadConfigFile(userDetected.path);
-  const projectConfig = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path);
+  const userLoaded = userDetected.format === "none" ? null : loadConfigFile(userDetected.path);
+  const projectLoaded = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path);
   let config2 = parsePluginConfig({});
   const allWarnings = [];
-  if (userConfig) {
-    const parsed = parsePluginConfig(userConfig);
+  if (userLoaded) {
+    allWarnings.push(...userLoaded.warnings.map((w) => `[user config] ${w}`));
+    const parsed = parsePluginConfig(userLoaded.config);
     if (parsed.configWarnings?.length) {
       allWarnings.push(...parsed.configWarnings.map((w) => `[user config] ${w}`));
     }
     config2 = mergeConfigs(config2, parsed);
   }
-  if (projectConfig) {
-    const parsed = parsePluginConfig(projectConfig);
+  if (projectLoaded) {
+    allWarnings.push(...projectLoaded.warnings.map((w) => `[project config] ${w}`));
+    const parsed = parsePluginConfig(projectLoaded.config);
     if (parsed.configWarnings?.length) {
       allWarnings.push(...parsed.configWarnings.map((w) => `[project config] ${w}`));
     }
@@ -161831,7 +163041,7 @@ init_assistant_message_extractor();
 init_data_path();
 init_logger();
 import { Database as Database2 } from "bun:sqlite";
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { join as join8 } from "path";
 
 // src/features/magic-context/key-files/identify-key-files.ts
@@ -162227,7 +163437,7 @@ function getOpenCodeDbPath2() {
 }
 function openOpenCodeDb() {
   const dbPath = getOpenCodeDbPath2();
-  if (!existsSync4(dbPath)) {
+  if (!existsSync5(dbPath)) {
     log(`[key-files] OpenCode DB not found at ${dbPath} \u2014 skipping`);
     return null;
   }
@@ -162477,8 +163687,8 @@ async function runDream(args) {
       try {
         const docsDir = args.sessionDirectory ?? args.projectIdentity;
         const existingDocs = taskName === "maintain-docs" ? {
-          architecture: existsSync4(join8(docsDir, "ARCHITECTURE.md")),
-          structure: existsSync4(join8(docsDir, "STRUCTURE.md"))
+          architecture: existsSync5(join8(docsDir, "ARCHITECTURE.md")),
+          structure: existsSync5(join8(docsDir, "STRUCTURE.md"))
         } : undefined;
         const userMemories = taskName === "archive-stale" ? getActiveUserMemories(args.db).map((um) => ({
           id: um.id,
@@ -163033,8 +164243,10 @@ function createCompactionHandler() {
   };
 }
 // src/hooks/magic-context/event-resolvers.ts
+init_logger();
 init_models_dev_cache();
 var DEFAULT_CONTEXT_LIMIT = 128000;
+var MAX_EXECUTE_THRESHOLD = 80;
 function resolveContextLimit(providerID, modelID) {
   if (!providerID) {
     return DEFAULT_CONTEXT_LIMIT;
@@ -163062,6 +164274,10 @@ function resolveCacheTtl(cacheTtl, modelKey) {
   }
   return cacheTtl.default ?? "5m";
 }
+var clampWarnSeen = new Set;
+function isFinitePositive(v) {
+  return typeof v === "number" && Number.isFinite(v) && v > 0;
+}
 function* modelKeyLookupOrder(modelKey) {
   const slash = modelKey.indexOf("/");
   const provider2 = slash >= 0 ? modelKey.slice(0, slash) : "";
@@ -163076,9 +164292,36 @@ function* modelKeyLookupOrder(modelKey) {
     modelId = modelId.slice(0, lastDash);
   }
 }
-function resolveExecuteThreshold(config2, modelKey, fallback) {
-  const MAX_EXECUTE_THRESHOLD = 80;
+function resolveExecuteThresholdDetail(config2, modelKey, fallback, options) {
+  if (options?.tokensConfig && isFinitePositive(options.contextLimit)) {
+    const contextLimit = options.contextLimit;
+    const tokenMatch = resolveTokensMatchWithKey(options.tokensConfig, modelKey);
+    if (tokenMatch && isFinitePositive(tokenMatch.value)) {
+      const cap = contextLimit * (MAX_EXECUTE_THRESHOLD / 100);
+      const effectiveTokens = Math.min(tokenMatch.value, cap);
+      if (effectiveTokens < tokenMatch.value) {
+        const dedupeKey = `${options.sessionId ?? "__global__"}|${modelKey ?? "__default__"}|${tokenMatch.value}|${cap}`;
+        if (!clampWarnSeen.has(dedupeKey)) {
+          clampWarnSeen.add(dedupeKey);
+          const msg = `execute_threshold_tokens clamped: ${tokenMatch.value} \u2192 ${effectiveTokens} (80% of ${contextLimit}) for ${modelKey ?? "default"}`;
+          if (options.sessionId) {
+            sessionLog(options.sessionId, `WARN: ${msg}`);
+          } else {
+            log(`[magic-context] WARN: ${msg}`);
+          }
+        }
+      }
+      const percentage = effectiveTokens / contextLimit * 100;
+      return {
+        percentage: Math.min(percentage, MAX_EXECUTE_THRESHOLD),
+        mode: "tokens",
+        absoluteTokens: Math.floor(effectiveTokens),
+        matchedKey: tokenMatch.matchedKey
+      };
+    }
+  }
   let resolved;
+  let matchedKey;
   if (typeof config2 === "number") {
     resolved = config2;
   } else if (modelKey) {
@@ -163086,14 +164329,50 @@ function resolveExecuteThreshold(config2, modelKey, fallback) {
     for (const candidate of modelKeyLookupOrder(modelKey)) {
       if (typeof config2[candidate] === "number") {
         matched = config2[candidate];
+        matchedKey = candidate;
         break;
       }
     }
-    resolved = matched ?? config2.default ?? fallback;
+    if (matched === undefined && typeof config2.default === "number") {
+      resolved = config2.default;
+      matchedKey = "default";
+    } else {
+      resolved = matched ?? fallback;
+    }
+  } else if (typeof config2.default === "number") {
+    resolved = config2.default;
+    matchedKey = "default";
   } else {
-    resolved = config2.default ?? fallback;
+    resolved = fallback;
+  }
+  if (!Number.isFinite(resolved) || resolved < 0) {
+    resolved = fallback;
   }
-  return Math.min(resolved, MAX_EXECUTE_THRESHOLD);
+  return {
+    percentage: Math.min(resolved, MAX_EXECUTE_THRESHOLD),
+    mode: "percentage",
+    matchedKey
+  };
+}
+function resolveExecuteThreshold(config2, modelKey, fallback, options) {
+  return resolveExecuteThresholdDetail(config2, modelKey, fallback, options).percentage;
+}
+function resolveTokensMatchWithKey(tokensConfig, modelKey) {
+  if (!tokensConfig) {
+    return;
+  }
+  if (modelKey) {
+    for (const candidate of modelKeyLookupOrder(modelKey)) {
+      const value = tokensConfig[candidate];
+      if (typeof value === "number") {
+        return { value, matchedKey: candidate };
+      }
+    }
+  }
+  if (typeof tokensConfig.default === "number") {
+    return { value: tokensConfig.default, matchedKey: "default" };
+  }
+  return;
 }
 function resolveModelKey(providerID, modelID) {
   if (!providerID || !modelID) {
@@ -163143,11 +164422,16 @@ function parseCacheTtl(ttl) {
 }
 function createScheduler(config2) {
   return {
-    shouldExecute(sessionMeta, contextUsage, currentTime = Date.now(), sessionId, modelKey) {
+    shouldExecute(sessionMeta, contextUsage, currentTime = Date.now(), sessionId, modelKey, contextLimit) {
       if (contextUsage.percentage === 0 && sessionMeta.lastResponseTime === 0) {
         return "defer";
       }
-      const threshold = resolveExecuteThreshold(config2.executeThresholdPercentage, modelKey, 65);
+      const effectiveContextLimit = contextLimit ?? (contextUsage.percentage > 0 && contextUsage.inputTokens > 0 ? contextUsage.inputTokens / (contextUsage.percentage / 100) : undefined);
+      const threshold = resolveExecuteThreshold(config2.executeThresholdPercentage, modelKey, 65, {
+        tokensConfig: config2.executeThresholdTokens,
+        contextLimit: effectiveContextLimit,
+        sessionId
+      });
       if (contextUsage.percentage >= threshold) {
         return "execute";
       }
@@ -163295,6 +164579,7 @@ init_logger();
 init_storage();
 init_shared();
 init_rpc_notifications();
+init_compartment_runner_partial_recomp();
 
 // src/hooks/magic-context/execute-flush.ts
 init_storage();
@@ -163536,8 +164821,25 @@ function getRollingNudgeIntervalTokens(baseIntervalTokens, band) {
 
 // src/hooks/magic-context/execute-status.ts
 init_read_session_formatting();
-function executeStatus(db, sessionId, protectedTags, nudgeIntervalTokens = DEFAULT_NUDGE_INTERVAL_TOKENS, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger) {
-  const executeThresholdPercentage = resolveExecuteThreshold(executeThresholdPercentageConfig, liveModelKey, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE);
+function formatExecuteThreshold(thresholdPercentage, mode, contextLimit) {
+  if (mode === "tokens" && contextLimit > 0) {
+    const tokens = Math.floor(thresholdPercentage / 100 * contextLimit);
+    return `${tokens.toLocaleString()} tokens (${thresholdPercentage.toFixed(1)}% of ${contextLimit.toLocaleString()}) [token-mode]`;
+  }
+  if (contextLimit > 0) {
+    const tokens = Math.floor(thresholdPercentage / 100 * contextLimit);
+    return `${thresholdPercentage}% (${tokens.toLocaleString()} of ${contextLimit.toLocaleString()})`;
+  }
+  return `${thresholdPercentage}%`;
+}
+function executeStatus(db, sessionId, protectedTags, nudgeIntervalTokens = DEFAULT_NUDGE_INTERVAL_TOKENS, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit) {
+  const thresholdDetail = resolveExecuteThresholdDetail(executeThresholdPercentageConfig, liveModelKey, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, {
+    tokensConfig: executeThresholdTokens,
+    contextLimit,
+    sessionId
+  });
+  const executeThresholdPercentage = thresholdDetail.percentage;
+  const thresholdMode = thresholdDetail.mode;
   try {
     const meta3 = getOrCreateSessionMeta(db, sessionId);
     const tags = getTagsBySession(db, sessionId);
@@ -163558,6 +164860,7 @@ function executeStatus(db, sessionId, protectedTags, nudgeIntervalTokens = DEFAU
     const currentBand = getRollingNudgeBand(meta3.lastContextPercentage, executeThresholdPercentage);
     const nudgeInterval = getRollingNudgeIntervalTokens(nudgeIntervalTokens, currentBand);
     const proactiveCompartmentTrigger = getProactiveCompartmentTriggerPercentage(executeThresholdPercentage);
+    const displayContextLimit = contextLimit && contextLimit > 0 ? contextLimit : meta3.lastContextPercentage > 0 ? Math.round(meta3.lastInputTokens / (meta3.lastContextPercentage / 100)) : 0;
     const lines = [
       "## Magic Status",
       "",
@@ -163581,7 +164884,7 @@ function executeStatus(db, sessionId, protectedTags, nudgeIntervalTokens = DEFAU
       `- Queue will auto-execute: ${cacheExpired ? "yes (cache expired)" : `when TTL expires or context >= ${executeThresholdPercentage}%`}`,
       "",
       "### Rolling Nudges",
-      `- Execute threshold: ${executeThresholdPercentage}%`,
+      `- Execute threshold: ${formatExecuteThreshold(executeThresholdPercentage, thresholdMode, displayContextLimit)}`,
       `- Rolling anchor: ${meta3.lastNudgeTokens.toLocaleString()} tokens`,
       `- Effective interval: ${nudgeInterval.toLocaleString()} tokens`,
       `- Next rolling nudge after: ${(meta3.lastNudgeTokens + nudgeInterval).toLocaleString()} tokens`,
@@ -163592,9 +164895,8 @@ function executeStatus(db, sessionId, protectedTags, nudgeIntervalTokens = DEFAU
       `**Protected tags:** ${protectedTags}`,
       `**Subagent session:** ${meta3.isSubagent}`
     ];
-    const contextLimit = meta3.lastContextPercentage > 0 ? Math.round(meta3.lastInputTokens / (meta3.lastContextPercentage / 100)) : 0;
     if (meta3.lastContextPercentage > 0 || meta3.lastInputTokens > 0) {
-      lines.push("", "### Context Usage", `- Last percentage: ${meta3.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta3.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${contextLimit > 0 ? contextLimit.toLocaleString() : "unknown"}`, `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
+      lines.push("", "### Context Usage", `- Last percentage: ${meta3.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta3.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${displayContextLimit > 0 ? displayContextLimit.toLocaleString() : "unknown"}`, `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
     }
     const compartments = getCompartments(db, sessionId);
     const facts = getSessionFacts(db, sessionId);
@@ -163609,7 +164911,7 @@ ${c.content}
       historyBlockTokens += estimateTokens(`* ${f.content}
 `);
     }
-    const budgetTokens = historyBudgetPercentage && contextLimit > 0 ? Math.floor(contextLimit * (Math.min(executeThresholdPercentage, 80) / 100) * historyBudgetPercentage) : null;
+    const budgetTokens = historyBudgetPercentage && displayContextLimit > 0 ? Math.floor(displayContextLimit * (Math.min(executeThresholdPercentage, 80) / 100) * historyBudgetPercentage) : null;
     const budgetUsage = budgetTokens ? (historyBlockTokens / budgetTokens * 100).toFixed(0) : null;
     lines.push("", "### History Compression", `- Compartments: ${compartments.length}`, `- Facts: ${facts.length}`, `- History block: ~${historyBlockTokens.toLocaleString()} tokens`, ...budgetTokens ? [
       `- Compression budget: ~${budgetTokens.toLocaleString()} tokens (${budgetUsage}% used)`,
@@ -163633,6 +164935,37 @@ ${c.content}
 init_send_session_notification();
 var recompConfirmationBySession = new Map;
 var RECOMP_CONFIRMATION_WINDOW_MS = 60000;
+function parseRecompArgs(raw) {
+  const trimmed = raw.trim();
+  if (trimmed === "")
+    return { kind: "full" };
+  const match = trimmed.match(/^(\d+)\s*-\s*(\d+)$/);
+  if (!match) {
+    return {
+      kind: "error",
+      message: `Invalid /ctx-recomp arguments: \`${trimmed}\`.
+
+Usage:
+- \`/ctx-recomp\` \u2014 full rebuild from message 1 to the protected tail
+- \`/ctx-recomp <start>-<end>\` \u2014 partial rebuild of a message range (e.g. \`/ctx-recomp 1-11322\`)`
+    };
+  }
+  const start = Number.parseInt(match[1], 10);
+  const end = Number.parseInt(match[2], 10);
+  if (!Number.isFinite(start) || !Number.isFinite(end)) {
+    return { kind: "error", message: "Range values must be finite integers." };
+  }
+  if (start < 1) {
+    return { kind: "error", message: `Start must be >= 1 (got ${start}).` };
+  }
+  if (end < start) {
+    return {
+      kind: "error",
+      message: `End must be >= start (got ${start}-${end}).`
+    };
+  }
+  return { kind: "partial", range: { start, end } };
+}
 var SENTINEL_PREFIX = "__CONTEXT_MANAGEMENT_";
 function throwSentinel(command) {
   throw new Error(`${SENTINEL_PREFIX}${command.toUpperCase()}_HANDLED__`);
@@ -163755,49 +165088,102 @@ function createMagicContextCommandHandler(deps) {
           throwSentinel(input.command);
         }
         const liveModelKey = deps.getLiveModelKey?.(sessionId);
-        const statusOutput = executeStatus(deps.db, sessionId, deps.protectedTags, deps.nudgeIntervalTokens, deps.executeThresholdPercentage, liveModelKey, deps.historyBudgetPercentage, deps.commitClusterTrigger);
+        const liveContextLimit = deps.getContextLimit?.(sessionId);
+        const statusOutput = executeStatus(deps.db, sessionId, deps.protectedTags, deps.nudgeIntervalTokens, deps.executeThresholdPercentage, liveModelKey, deps.historyBudgetPercentage, deps.commitClusterTrigger, deps.executeThresholdTokens, liveContextLimit);
         result += result ? `
 
 ${statusOutput}` : statusOutput;
       }
       if (isRecomp) {
-        if (isTuiConnected()) {
+        const parsedArgs = parseRecompArgs(input.arguments);
+        if (parsedArgs.kind === "error") {
+          result = `## Magic Recomp \u2014 Invalid Arguments
+
+${parsedArgs.message}`;
+        } else if (isTuiConnected()) {
           pushNotification("action", { action: "show-recomp-dialog" }, sessionId);
           sessionLog(sessionId, "command ctx-recomp: pushed show-recomp-dialog to TUI");
           throwSentinel(input.command);
-        }
-        if (!deps.executeRecomp) {
+        } else if (!deps.executeRecomp) {
           result = `## Magic Recomp
 
 /ctx-recomp is unavailable because the recomp handler is not configured.`;
         } else {
+          const argsKey = parsedArgs.kind === "partial" ? `${parsedArgs.range.start}-${parsedArgs.range.end}` : "";
           const lastConfirmation = recompConfirmationBySession.get(sessionId);
           const now = Date.now();
-          if (lastConfirmation && now - lastConfirmation < RECOMP_CONFIRMATION_WINDOW_MS) {
+          const confirmationValid = lastConfirmation && now - lastConfirmation.timestamp < RECOMP_CONFIRMATION_WINDOW_MS && lastConfirmation.argsKey === argsKey;
+          if (confirmationValid) {
             recompConfirmationBySession.delete(sessionId);
-            await deps.sendNotification(sessionId, `## Magic Recomp
+            if (parsedArgs.kind === "partial") {
+              await deps.sendNotification(sessionId, `## Magic Recomp
+
+Partial recomp started for range ${parsedArgs.range.start}-${parsedArgs.range.end}. Rebuilding the matching compartments now (facts unchanged).`, {});
+              result = await deps.executeRecomp(sessionId, {
+                range: parsedArgs.range
+              });
+            } else {
+              await deps.sendNotification(sessionId, `## Magic Recomp
 
 Historian recomp started. Rebuilding compartments and facts from raw session history now.`, {});
-            result = await deps.executeRecomp(sessionId);
+              result = await deps.executeRecomp(sessionId);
+            }
           } else {
-            recompConfirmationBySession.set(sessionId, now);
+            recompConfirmationBySession.set(sessionId, {
+              timestamp: now,
+              argsKey
+            });
             const compartments = getCompartments(deps.db, sessionId);
             const compartmentCount = compartments.length;
-            const warningLines = [
-              "## \u26A0\uFE0F Recomp Confirmation Required",
-              "",
-              `You currently have **${compartmentCount}** compartments.`,
-              "Running /ctx-recomp will **regenerate all compartments and facts** from raw session history.",
-              "",
-              "This operation:",
-              "- May take a long time (minutes to hours for long sessions)",
-              "- Will consume significant tokens on your historian model",
-              "- Cannot be interrupted cleanly once started",
-              "",
-              "**To confirm, run `/ctx-recomp` again within 60 seconds.**"
-            ];
-            result = warningLines.join(`
+            if (parsedArgs.kind === "partial") {
+              const snap = snapRangeToCompartments(compartments, parsedArgs.range);
+              if ("error" in snap) {
+                recompConfirmationBySession.delete(sessionId);
+                result = `## Magic Recomp \u2014 Failed
+
+${snap.error}`;
+              } else {
+                const replaced = snap.rangeCompartments.length;
+                const preserved = snap.priorCompartments.length + snap.tailCompartments.length;
+                const warningLines = [
+                  "## \u26A0\uFE0F Partial Recomp Confirmation Required",
+                  "",
+                  `Requested range: \`${parsedArgs.range.start}-${parsedArgs.range.end}\``,
+                  `Snapped to compartment boundaries: **messages ${snap.snapStart}-${snap.snapEnd}**`,
+                  "",
+                  `This will **rebuild ${replaced} compartment(s)** in the snapped range.`,
+                  `**${preserved} compartment(s)** outside the range will be preserved unchanged.`,
+                  "Facts will not be re-extracted.",
+                  "",
+                  "This operation:",
+                  "- May take several minutes to tens of minutes depending on range size",
+                  "- Will consume historian-model tokens for each chunk",
+                  "- Is resumable if interrupted (staging preserved on failure)",
+                  "",
+                  `**To confirm, run \`/ctx-recomp ${parsedArgs.range.start}-${parsedArgs.range.end}\` again within 60 seconds.**`
+                ];
+                result = warningLines.join(`
 `);
+              }
+            } else {
+              const warningLines = [
+                "## \u26A0\uFE0F Recomp Confirmation Required",
+                "",
+                `You currently have **${compartmentCount}** compartments.`,
+                "Running /ctx-recomp will **regenerate all compartments and facts** from raw session history.",
+                "",
+                "This operation:",
+                "- May take a long time (minutes to hours for long sessions)",
+                "- Will consume significant tokens on your historian model",
+                "- Cannot be interrupted cleanly once started",
+                "",
+                "Tip: to rebuild only a specific message range, use `/ctx-recomp <start>-<end>` (e.g. `/ctx-recomp 1-11322`).",
+                "",
+                "**To confirm, run `/ctx-recomp` again within 60 seconds.**"
+              ];
+              result = warningLines.join(`
+`);
+            }
           }
         }
       }
@@ -164420,7 +165806,11 @@ function stripProcessedImages(messages, watermark, messageTagNumbers) {
   return stripped;
 }
 
+// src/hooks/magic-context/transform.ts
+init_temporal_awareness();
+
 // src/hooks/magic-context/transform-compartment-phase.ts
+init_magic_context();
 init_compartment_storage();
 init_storage();
 init_logger();
@@ -164430,11 +165820,11 @@ init_inject_compartments();
 init_read_session_chunk();
 init_send_session_notification();
 var lastCompressorRunBySession = new Map;
-function isCompressorOnCooldown(sessionId) {
+function isCompressorOnCooldown(sessionId, cooldownMs) {
   const lastRun = lastCompressorRunBySession.get(sessionId);
   if (!lastRun)
     return false;
-  return Date.now() - lastRun < 600000;
+  return Date.now() - lastRun < cooldownMs;
 }
 function markCompressorRun(sessionId) {
   lastCompressorRunBySession.set(sessionId, Date.now());
@@ -164471,14 +165861,14 @@ async function runCompartmentPhase(args) {
   async function awaitCompartmentRun(activeRun, reason) {
     sessionLog(args.sessionId, reason);
     const timeoutMs = args.historianTimeoutMs ?? 120000;
-    const timeout = new Promise((resolve2) => setTimeout(() => resolve2("timeout"), timeoutMs));
+    const timeout = new Promise((resolve3) => setTimeout(() => resolve3("timeout"), timeoutMs));
     const result = await Promise.race([activeRun.then(() => "done"), timeout]);
     if (result === "timeout") {
       sessionLog(args.sessionId, `transform: compartment await timed out after ${timeoutMs}ms \u2014 proceeding without waiting`);
       return "timed_out";
     }
     sessionLog(args.sessionId, "transform: compartment agent completed, refreshing compartment coverage");
-    pendingCompartmentInjection = prepareCompartmentInjection(args.db, args.resolvedSessionId, args.messages, args.cacheAlreadyBusting ?? false, args.projectPath, args.injectionBudgetTokens);
+    pendingCompartmentInjection = prepareCompartmentInjection(args.db, args.resolvedSessionId, args.messages, args.cacheAlreadyBusting ?? false, args.projectPath, args.injectionBudgetTokens, args.experimentalTemporalAwareness);
     return "completed";
   }
   if (args.canRunCompartments && args.sessionMeta.compartmentInProgress && !getActiveCompartmentRun(args.sessionId)) {
@@ -164503,7 +165893,10 @@ async function runCompartmentPhase(args) {
         fallbackModelId: args.fallbackModelId,
         getNotificationParams: args.getNotificationParams,
         experimentalCompactionMarkers: args.experimentalCompactionMarkers,
-        experimentalUserMemories: args.experimentalUserMemories
+        experimentalUserMemories: args.experimentalUserMemories,
+        historianTwoPass: args.historianTwoPass,
+        compressorMinCompartmentRatio: args.compressorMinCompartmentRatio,
+        compressorMaxMergeDepth: args.compressorMaxMergeDepth
       });
       compartmentInProgress = true;
     }
@@ -164524,7 +165917,10 @@ async function runCompartmentPhase(args) {
         fallbackModelId: args.fallbackModelId,
         getNotificationParams: args.getNotificationParams,
         experimentalCompactionMarkers: args.experimentalCompactionMarkers,
-        experimentalUserMemories: args.experimentalUserMemories
+        experimentalUserMemories: args.experimentalUserMemories,
+        historianTwoPass: args.historianTwoPass,
+        compressorMinCompartmentRatio: args.compressorMinCompartmentRatio,
+        compressorMaxMergeDepth: args.compressorMaxMergeDepth
       });
       activeRun = getActiveCompartmentRun(args.sessionId);
     } else if (!activeRun && hasEligibleHistoryForCompartment()) {
@@ -164544,15 +165940,17 @@ async function runCompartmentPhase(args) {
       }
     }
   }
-  if (args.cacheAlreadyBusting && args.historyBudgetTokens && args.historyBudgetTokens > 0 && args.client && !compartmentInProgress && !awaitedCompartmentRun && !isCompressorOnCooldown(args.sessionId)) {
+  if (args.cacheAlreadyBusting && args.historyBudgetTokens && args.historyBudgetTokens > 0 && args.client && !compartmentInProgress && !awaitedCompartmentRun && !isCompressorOnCooldown(args.sessionId, args.compressorCooldownMs ?? DEFAULT_COMPRESSOR_COOLDOWN_MS)) {
     markCompressorRun(args.sessionId);
-    runCompressionPassIfNeeded({
+    const compressorPromise = runCompressionPassIfNeeded({
       client: args.client,
       db: args.db,
       sessionId: args.sessionId,
       directory: args.compartmentDirectory,
       historyBudgetTokens: args.historyBudgetTokens,
-      historianTimeoutMs: args.historianTimeoutMs
+      historianTimeoutMs: args.historianTimeoutMs,
+      minCompartmentRatio: args.compressorMinCompartmentRatio,
+      maxMergeDepth: args.compressorMaxMergeDepth
     }).then((compressed) => {
       if (compressed) {
         sessionLog(args.sessionId, "independent compressor completed in background \u2014 compressed history will appear on next cache-busting pass");
@@ -164560,6 +165958,7 @@ async function runCompartmentPhase(args) {
     }).catch((error48) => {
       sessionLog(args.sessionId, "independent compressor failed in background:", getErrorMessage(error48));
     });
+    registerActiveCompartmentRun(args.sessionId, compressorPromise);
   }
   return { pendingCompartmentInjection, awaitedCompartmentRun, compartmentInProgress };
 }
@@ -166076,7 +167475,7 @@ function createTransform(deps) {
       }
     }
     const contextUsageEarly = loadContextUsage(deps.contextUsageMap, db, sessionId);
-    const historyBudgetTokens = resolveHistoryBudgetTokens(deps.historyBudgetPercentage, contextUsageEarly, deps.executeThresholdPercentage, deps.getModelKey?.(sessionId));
+    const historyBudgetTokens = resolveHistoryBudgetTokens(deps.historyBudgetPercentage, contextUsageEarly, deps.executeThresholdPercentage, deps.getModelKey?.(sessionId), deps.executeThresholdTokens);
     const schedulerDecisionEarly = resolveSchedulerDecision(deps.scheduler, sessionMeta, contextUsageEarly, sessionId, deps.getModelKey?.(sessionId));
     const isCacheBusting = deps.flushedSessions.has(sessionId);
     if (historianFailureState.failureCount === 0) {
@@ -166110,7 +167509,11 @@ function createTransform(deps) {
         fallbackModelId,
         getNotificationParams: () => notificationParams,
         experimentalCompactionMarkers: deps.experimentalCompactionMarkers,
-        experimentalUserMemories: deps.experimentalUserMemories
+        experimentalUserMemories: deps.experimentalUserMemories,
+        experimentalTemporalAwareness: deps.experimentalTemporalAwareness,
+        historianTwoPass: deps.historianTwoPass,
+        compressorMinCompartmentRatio: deps.compressorMinCompartmentRatio,
+        compressorMaxMergeDepth: deps.compressorMaxMergeDepth
       });
       skipCompartmentAwaitForThisPass = true;
       return true;
@@ -166144,7 +167547,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
     if (fullFeatureMode) {
       const tInj = performance.now();
       const projectPath = deps.memoryConfig?.enabled ? resolveProjectIdentity(deps.directory ?? process.cwd()) : undefined;
-      pendingCompartmentInjection = prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, deps.memoryConfig?.injectionBudgetTokens);
+      pendingCompartmentInjection = prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, deps.memoryConfig?.injectionBudgetTokens, deps.experimentalTemporalAwareness);
       logTransformTiming(sessionId, "prepareCompartmentInjection", tInj);
     }
     let targets = new Map;
@@ -166152,6 +167555,14 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
     let messageTagNumbers = new Map;
     let batch = null;
     let hasRecentReduceCall = false;
+    if (deps.experimentalTemporalAwareness) {
+      const tTemporal = performance.now();
+      const injected = injectTemporalMarkers(messages);
+      if (injected > 0) {
+        sessionLog(sessionId, `temporal: injected ${injected} gap markers`);
+      }
+      logTransformTiming(sessionId, "injectTemporalMarkers", tTemporal);
+    }
     try {
       const t0 = performance.now();
       deps.tagger.initFromDb(sessionId, db);
@@ -166243,7 +167654,12 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
       cacheAlreadyBusting: isCacheBusting || schedulerDecisionEarly === "execute",
       skipAwaitForThisPass: skipCompartmentAwaitForThisPass,
       experimentalCompactionMarkers: deps.experimentalCompactionMarkers,
-      experimentalUserMemories: deps.experimentalUserMemories
+      experimentalUserMemories: deps.experimentalUserMemories,
+      experimentalTemporalAwareness: deps.experimentalTemporalAwareness,
+      historianTwoPass: deps.historianTwoPass,
+      compressorMinCompartmentRatio: deps.compressorMinCompartmentRatio,
+      compressorMaxMergeDepth: deps.compressorMaxMergeDepth,
+      compressorCooldownMs: deps.compressorCooldownMs
     });
     pendingCompartmentInjection = compartmentPhase.pendingCompartmentInjection;
     const awaitedCompartmentRun = compartmentPhase.awaitedCompartmentRun;
@@ -166413,11 +167829,15 @@ function hasEligibleCompartmentHistory(db, sessionId) {
     return false;
   }
 }
-function resolveHistoryBudgetTokens(historyBudgetPercentage, contextUsage, executeThresholdPercentage, modelKey) {
+function resolveHistoryBudgetTokens(historyBudgetPercentage, contextUsage, executeThresholdPercentage, modelKey, executeThresholdTokens) {
   if (!historyBudgetPercentage || contextUsage.percentage <= 0) {
     return;
   }
-  return Math.floor(contextUsage.inputTokens / (contextUsage.percentage / 100) * (resolveExecuteThreshold(executeThresholdPercentage ?? 65, modelKey, 65) / 100) * historyBudgetPercentage);
+  const derivedContextLimit = contextUsage.inputTokens / (contextUsage.percentage / 100);
+  return Math.floor(derivedContextLimit * (resolveExecuteThreshold(executeThresholdPercentage ?? 65, modelKey, 65, {
+    tokensConfig: executeThresholdTokens,
+    contextLimit: derivedContextLimit
+  }) / 100) * historyBudgetPercentage);
 }
 function truncateHistorianEmergencyError(error48) {
   const normalized = (error48 ?? "unknown error").replace(/\s+/g, " ").trim();
@@ -166558,7 +167978,11 @@ function createEventHandler2(deps) {
           const sessionMeta = getOrCreateSessionMeta(deps.db, info.sessionID);
           const previousPercentage = sessionMeta.lastContextPercentage;
           if (!sessionMeta.isSubagent) {
-            const effectiveExecuteThreshold = resolveExecuteThreshold(deps.config.execute_threshold_percentage ?? 65, modelKey, 65);
+            const effectiveExecuteThreshold = resolveExecuteThreshold(deps.config.execute_threshold_percentage ?? 65, modelKey, 65, {
+              tokensConfig: deps.config.execute_threshold_tokens,
+              contextLimit,
+              sessionId: info.sessionID
+            });
             const triggerBudget = deriveTriggerBudget(contextLimit, effectiveExecuteThreshold);
             const triggerResult = checkCompartmentTrigger(deps.db, info.sessionID, sessionMeta, { percentage, inputTokens: totalInputTokens }, previousPercentage, effectiveExecuteThreshold, triggerBudget, deps.config.auto_drop_tool_age ?? 100, deps.config.protected_tags, deps.config.clear_reasoning_age ?? 50, deps.config.drop_tool_structure ?? true, deps.config.commit_cluster_trigger);
             if (triggerResult.shouldFire) {
@@ -166832,6 +168256,9 @@ function generateEmergencyNudgeText(db, sessionId, contextUsage, config2) {
 `);
 }
 
+// src/hooks/magic-context/hook.ts
+init_read_session_db();
+
 // src/hooks/magic-context/text-complete.ts
 var TAG_PREFIX_REGEX2 = /^(\u00a7\d+\u00a7\s*)+/;
 function createTextCompleteHandler() {
@@ -167010,8 +168437,8 @@ function createToolExecuteAfterHook(args) {
 init_send_session_notification();
 
 // src/hooks/magic-context/system-prompt-hash.ts
-import { existsSync as existsSync6, readFileSync as readFileSync5, realpathSync } from "fs";
-import { join as join14, resolve as resolve2, sep } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync6, realpathSync } from "fs";
+import { join as join14, resolve as resolve3, sep } from "path";
 
 // src/agents/magic-context-prompt.ts
 function getToolHistoryGuidance(dropToolStructure) {
@@ -167197,20 +168624,23 @@ function detectAgentFromSystemPrompt(systemPrompt) {
   }
   return null;
 }
-function buildMagicContextSection(agent, protectedTags, ctxReduceEnabled = true, dreamerEnabled = false, dropToolStructure = true) {
+var TEMPORAL_AWARENESS_GUIDANCE = `
+**Temporal awareness**: User messages may be preceded by HTML comments like \`<!-- +12m -->\`, \`<!-- +2h 15m -->\`, or \`<!-- +3d 4h -->\` indicating time elapsed since the previous message's completion. Compartments in \`<session-history>\` carry \`start-date\` and \`end-date\` attributes (YYYY-MM-DD) showing real-time boundaries. Use these when reasoning about workflow pacing, log durations, build times, or how long ago something happened.`;
+function buildMagicContextSection(agent, protectedTags, ctxReduceEnabled = true, dreamerEnabled = false, dropToolStructure = true, temporalAwarenessEnabled = false) {
   const smartNoteGuidance = dreamerEnabled ? `
 When \`surface_condition\` is provided with \`write\`, the note becomes a project-scoped smart note.
 The dreamer evaluates smart note conditions during nightly runs and surfaces them when conditions are met.
 Example: \`ctx_note(action="write", content="Implement X because Y", surface_condition="When PR #42 is merged in this repo")\`` : "";
+  const temporalGuidance = temporalAwarenessEnabled ? TEMPORAL_AWARENESS_GUIDANCE : "";
   if (!ctxReduceEnabled) {
     return `## Magic Context
 
-${BASE_INTRO_NO_REDUCE(dropToolStructure)}${smartNoteGuidance}`;
+${BASE_INTRO_NO_REDUCE(dropToolStructure)}${smartNoteGuidance}${temporalGuidance}`;
   }
   const section = agent ? AGENT_SECTIONS[agent] : GENERIC_SECTION;
   return `## Magic Context
 
-${BASE_INTRO(protectedTags, dropToolStructure)}${smartNoteGuidance}
+${BASE_INTRO(protectedTags, dropToolStructure)}${smartNoteGuidance}${temporalGuidance}
 ${section}
 
 Prefer many small targeted operations over one large blanket operation. Compress early and often \u2014 don't wait for warnings.`;
@@ -167233,8 +168663,8 @@ function readProjectDocs(directory) {
   for (const filename of DOC_FILES) {
     const filePath = join14(directory, filename);
     try {
-      if (existsSync6(filePath)) {
-        const content = readFileSync5(filePath, "utf-8").trim();
+      if (existsSync7(filePath)) {
+        const content = readFileSync6(filePath, "utf-8").trim();
         if (content.length > 0) {
           sections.push(`<${filename}>
 ${content}
@@ -167265,7 +168695,7 @@ function createSystemPromptHashHandler(deps) {
 `);
     if (fullPrompt.length > 0 && !fullPrompt.includes(MAGIC_CONTEXT_MARKER)) {
       const detectedAgent = detectAgentFromSystemPrompt(fullPrompt);
-      const guidance = buildMagicContextSection(detectedAgent, deps.protectedTags, deps.ctxReduceEnabled, deps.dreamerEnabled, deps.dropToolStructure);
+      const guidance = buildMagicContextSection(detectedAgent, deps.protectedTags, deps.ctxReduceEnabled, deps.dreamerEnabled, deps.dropToolStructure, deps.experimentalTemporalAwareness);
       output.system.push(guidance);
       sessionLog(sessionId, `injected ${detectedAgent ?? "generic"} guidance into system prompt`);
     }
@@ -167314,16 +168744,16 @@ ${items}
         const keyFileEntries = getKeyFiles(deps.db, sessionId);
         if (keyFileEntries.length > 0) {
           const sections = [];
-          const projectRoot = resolve2(deps.directory);
+          const projectRoot = resolve3(deps.directory);
           let remainingBudgetTokens = deps.experimentalPinKeyFilesTokenBudget ?? 1e4;
           for (const entry of keyFileEntries) {
             try {
-              const absPath = resolve2(deps.directory, entry.filePath);
+              const absPath = resolve3(deps.directory, entry.filePath);
               if (!absPath.startsWith(projectRoot + sep) && absPath !== projectRoot) {
                 log(`[magic-context] key file path escapes project root, skipping: ${entry.filePath}`);
                 continue;
               }
-              if (!existsSync6(absPath))
+              if (!existsSync7(absPath))
                 continue;
               let realPath;
               try {
@@ -167335,7 +168765,7 @@ ${items}
                 log(`[magic-context] key file symlink escapes project root, skipping: ${entry.filePath} \u2192 ${realPath}`);
                 continue;
               }
-              const content = readFileSync5(realPath, "utf-8").trim();
+              const content = readFileSync6(realPath, "utf-8").trim();
               if (content.length === 0)
                 continue;
               const fileTokens = estimateTokens(content);
@@ -167473,6 +168903,17 @@ function createMagicContextHook(deps) {
   const agentBySession = deps.liveSessionState?.agentBySession ?? new Map;
   const recentReduceBySession = new Map;
   const toolUsageSinceUserTurn = new Map;
+  const resolveLiveModel = (sessionId) => {
+    const cached2 = liveModelBySession.get(sessionId);
+    if (cached2)
+      return cached2;
+    const recovered = findLastAssistantModelFromOpenCodeDb(sessionId);
+    if (recovered) {
+      liveModelBySession.set(sessionId, recovered);
+      return recovered;
+    }
+    return;
+  };
   const ctxReduceEnabled = deps.config.ctx_reduce_enabled !== false;
   const nudgerWithRecentReduce = ctxReduceEnabled ? createNudger({
     protected_tags: deps.config.protected_tags,
@@ -167504,6 +168945,7 @@ function createMagicContextHook(deps) {
     getHistorianChunkTokens,
     historyBudgetPercentage: deps.config.history_budget_percentage,
     executeThresholdPercentage: deps.config.execute_threshold_percentage,
+    executeThresholdTokens: deps.config.execute_threshold_tokens,
     historianTimeoutMs: deps.config.historian_timeout_ms ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
     getNotificationParams: (sessionId) => getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession),
     getModelKey: (sessionId) => {
@@ -167517,6 +168959,11 @@ function createMagicContextHook(deps) {
     projectPath,
     experimentalCompactionMarkers: deps.config.compaction_markers,
     experimentalUserMemories: deps.config.experimental?.user_memories?.enabled,
+    experimentalTemporalAwareness: deps.config.experimental?.temporal_awareness === true,
+    historianTwoPass: deps.config.historian?.two_pass === true,
+    compressorMinCompartmentRatio: deps.config.compressor?.enabled === false ? undefined : deps.config.compressor?.min_compartment_ratio,
+    compressorMaxMergeDepth: deps.config.compressor?.enabled === false ? undefined : deps.config.compressor?.max_merge_depth,
+    compressorCooldownMs: deps.config.compressor?.enabled === false ? undefined : deps.config.compressor?.cooldown_ms,
     liveModelBySession
   });
   const eventHandler = createEventHandler2({
@@ -167571,14 +169018,21 @@ function createMagicContextHook(deps) {
     protectedTags: deps.config.protected_tags,
     nudgeIntervalTokens: deps.config.nudge_interval_tokens ?? DEFAULT_NUDGE_INTERVAL_TOKENS,
     executeThresholdPercentage: deps.config.execute_threshold_percentage ?? 65,
+    executeThresholdTokens: deps.config.execute_threshold_tokens,
     historyBudgetPercentage: deps.config.history_budget_percentage,
     commitClusterTrigger: deps.config.commit_cluster_trigger,
     getLiveModelKey: (sessionId) => {
-      const model = liveModelBySession.get(sessionId);
+      const model = resolveLiveModel(sessionId);
       return model ? `${model.providerID}/${model.modelID}` : undefined;
     },
+    getContextLimit: (sessionId) => {
+      const model = resolveLiveModel(sessionId);
+      if (!model)
+        return;
+      return resolveContextLimit(model.providerID, model.modelID);
+    },
     onFlush: (sessionId) => flushedSessions.add(sessionId),
-    executeRecomp: async (sessionId) => executeContextRecomp({
+    executeRecomp: async (sessionId, options) => executeContextRecomp({
       client: deps.client,
       db,
       sessionId,
@@ -167586,11 +169040,12 @@ function createMagicContextHook(deps) {
       historianTimeoutMs: deps.config.historian_timeout_ms ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
       directory: deps.directory,
       fallbackModelId: (() => {
-        const model = liveModelBySession.get(sessionId);
+        const model = resolveLiveModel(sessionId);
         return model ? `${model.providerID}/${model.modelID}` : undefined;
       })(),
-      getNotificationParams: () => getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession)
-    }),
+      getNotificationParams: () => getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession),
+      historianTwoPass: deps.config.historian?.two_pass === true
+    }, options),
     sendNotification: async (sessionId, text, params) => {
       await sendIgnoredMessage(deps.client, sessionId, text, {
         ...getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession),
@@ -167632,7 +169087,8 @@ function createMagicContextHook(deps) {
     lastHeuristicsTurnId,
     experimentalUserMemories: deps.config.experimental?.user_memories?.enabled,
     experimentalPinKeyFiles: deps.config.experimental?.pin_key_files?.enabled ?? false,
-    experimentalPinKeyFilesTokenBudget: deps.config.experimental?.pin_key_files?.token_budget
+    experimentalPinKeyFilesTokenBudget: deps.config.experimental?.pin_key_files?.token_budget,
+    experimentalTemporalAwareness: deps.config.experimental?.temporal_awareness === true
   });
   const eventHook = createEventHook({
     eventHandler,
@@ -167687,7 +169143,8 @@ function createSessionHooks(args) {
   }
   const tagger = createTagger();
   const scheduler2 = createScheduler({
-    executeThresholdPercentage: pluginConfig.execute_threshold_percentage ?? DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE
+    executeThresholdPercentage: pluginConfig.execute_threshold_percentage ?? DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE,
+    executeThresholdTokens: pluginConfig.execute_threshold_tokens
   });
   const compactionHandler = createCompactionHandler();
   return {
@@ -167708,12 +169165,14 @@ function createSessionHooks(args) {
         clear_reasoning_age: pluginConfig.clear_reasoning_age,
         iteration_nudge_threshold: pluginConfig.iteration_nudge_threshold,
         execute_threshold_percentage: pluginConfig.execute_threshold_percentage ?? DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE,
+        execute_threshold_tokens: pluginConfig.execute_threshold_tokens,
         historian: pluginConfig.historian,
         history_budget_percentage: pluginConfig.history_budget_percentage,
         historian_timeout_ms: pluginConfig.historian_timeout_ms,
         memory: pluginConfig.memory,
         sidekick: pluginConfig.sidekick,
         dreamer: pluginConfig.dreamer,
+        compressor: pluginConfig.compressor,
         experimental: pluginConfig.experimental
       }
     })
@@ -167969,6 +169428,7 @@ function buildStatusDetail(db, sessionId, directory, modelKey, config2) {
     cacheRemainingMs: 0,
     cacheExpired: false,
     executeThreshold: 65,
+    executeThresholdMode: "percentage",
     protectedTagCount: 20,
     nudgeInterval: 20000,
     historyBudgetPercentage: 0.15,
@@ -167999,9 +169459,20 @@ function buildStatusDetail(db, sessionId, directory, modelKey, config2) {
       const ops = db.query("SELECT tag_id, operation FROM pending_ops WHERE session_id = ?").all(sessionId);
       detail.pendingOps = ops.map((o) => ({ tagId: o.tag_id, operation: o.operation }));
     } catch {}
+    const contextLimitForTokens = base.usagePercentage > 0 ? Math.round(base.inputTokens / (base.usagePercentage / 100)) : 0;
     if (config2) {
-      const etp = resolveConfigValue(config2, "execute_threshold_percentage", modelKey, 65);
-      detail.executeThreshold = Math.min(etp, 80);
+      const pctCfg = config2.execute_threshold_percentage;
+      const tokensCfg = config2.execute_threshold_tokens;
+      const thresholdDetail = resolveExecuteThresholdDetail(pctCfg ?? 65, modelKey, 65, {
+        tokensConfig: tokensCfg,
+        contextLimit: contextLimitForTokens || undefined,
+        sessionId
+      });
+      detail.executeThreshold = thresholdDetail.percentage;
+      detail.executeThresholdMode = thresholdDetail.mode;
+      if (thresholdDetail.absoluteTokens !== undefined) {
+        detail.executeThresholdTokens = thresholdDetail.absoluteTokens;
+      }
       const ct = resolveConfigValue(config2, "cache_ttl", modelKey, "5m");
       detail.cacheTtl = ct;
       if (typeof config2.protected_tag_count === "number") {
@@ -169311,7 +170782,7 @@ init_models_dev_cache();
 init_logger();
 import { mkdirSync as mkdirSync4, renameSync, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "fs";
 import { createServer } from "http";
-import { dirname } from "path";
+import { dirname as dirname2 } from "path";
 
 // src/shared/rpc-utils.ts
 import { createHash as createHash2 } from "crypto";
@@ -169337,7 +170808,7 @@ class MagicContextRpcServer {
     this.handlers.set(method, handler);
   }
   async start() {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const server = createServer((req, res) => this.dispatch(req, res));
       server.on("error", (err) => {
         log(`[rpc] server error: ${err.message}`);
@@ -169352,7 +170823,7 @@ class MagicContextRpcServer {
         this.port = addr.port;
         this.server = server;
         try {
-          const dir = dirname(this.portFilePath);
+          const dir = dirname2(this.portFilePath);
           mkdirSync4(dir, { recursive: true });
           const tmpPath = `${this.portFilePath}.tmp`;
           writeFileSync2(tmpPath, String(this.port), "utf-8");
@@ -169361,7 +170832,7 @@ class MagicContextRpcServer {
         } catch (err) {
           log(`[rpc] failed to write port file: ${err}`);
         }
-        resolve3(this.port);
+        resolve4(this.port);
       });
       server.unref();
     });
@@ -169582,10 +171053,15 @@ var plugin = async (ctx) => {
         } = pluginConfig.sidekick;
         return agentOverrides;
       })() : undefined;
+      const historianAgentOverrides = pluginConfig.historian ? (() => {
+        const { two_pass: _twoPass, ...agentOverrides } = pluginConfig.historian;
+        return agentOverrides;
+      })() : undefined;
       config2.agent = {
         ...config2.agent ?? {},
         [DREAMER_AGENT]: buildHiddenAgentConfig(DREAMER_AGENT, DREAMER_SYSTEM_PROMPT, dreamerAgentOverrides),
-        [HISTORIAN_AGENT]: buildHiddenAgentConfig(HISTORIAN_AGENT, pluginConfig.experimental?.user_memories?.enabled ? COMPARTMENT_AGENT_SYSTEM_PROMPT + USER_OBSERVATIONS_APPENDIX : COMPARTMENT_AGENT_SYSTEM_PROMPT, pluginConfig.historian),
+        [HISTORIAN_AGENT]: buildHiddenAgentConfig(HISTORIAN_AGENT, pluginConfig.experimental?.user_memories?.enabled ? COMPARTMENT_AGENT_SYSTEM_PROMPT + USER_OBSERVATIONS_APPENDIX : COMPARTMENT_AGENT_SYSTEM_PROMPT, historianAgentOverrides),
+        [HISTORIAN_EDITOR_AGENT]: buildHiddenAgentConfig(HISTORIAN_EDITOR_AGENT, HISTORIAN_EDITOR_SYSTEM_PROMPT, historianAgentOverrides),
         [SIDEKICK_AGENT]: buildHiddenAgentConfig(SIDEKICK_AGENT, SIDEKICK_SYSTEM_PROMPT, sidekickAgentOverrides)
       };
     }