@wolfx/opencode-magic-context 0.22.1-patch.1 → 0.22.4

package/dist/index.js

@@ -14967,6 +14967,7 @@ var init_magic_context = __esm(() => {
       model: DEFAULT_LOCAL_EMBEDDING_MODEL
     }).describe("Embedding provider configuration"),
     temporal_awareness: exports_external.boolean().default(true).describe('Inject wall-clock gap markers (<!-- +Xm -->) between user messages where > 5 min elapsed since the previous message, and add start/end date attributes on compartments. Gives the agent a sense of session pacing and "how long ago" across multi-day sessions. Graduated from experimental.temporal_awareness; default: true (set false to opt out).'),
+    keep_subagents: exports_external.boolean().default(false).describe("Debug: keep the child sessions Magic Context spawns for its own subagents (historian, dreamer, sidekick, memory-migration) instead of deleting them on success. Useful for short-term inspection/data collection — their full transcript (prompt, tool calls, token usage, output) stays in the host session store. Kept sessions accumulate until manually cleared; leave false for normal use. Requires a restart to take effect."),
     caveman_text_compression: exports_external.object({
       enabled: exports_external.boolean().default(false).describe("Apply deterministic caveman-style text compression to old conversation text. Only active when ctx_reduce_enabled=false. Compresses user/assistant text in oldest-first tiers: ultra (oldest 20%), full, lite, untouched (newest 40%)."),
       min_chars: exports_external.number().min(100).max(1e4).default(500).describe("Text parts shorter than this (characters) stay untouched. Min 100, max 10000. Default: 500.")
@@ -15216,9 +15217,6 @@ function getMagicContextStorageDir() {
 function getLegacyOpenCodeMagicContextStorageDir() {
   return path2.join(getOpenCodeStorageDir(), "plugin", "magic-context");
 }
-function getCacheDir() {
-  return process.env.XDG_CACHE_HOME ?? path2.join(os.homedir(), ".cache");
-}
 var init_data_path = () => {};
 
 // src/shared/logger.ts
@@ -15752,6 +15750,15 @@ function extractLatestAssistantText(messages) {
 }
 var init_assistant_message_extractor = () => {};
 
+// src/shared/keep-subagents.ts
+function setKeepSubagents(value) {
+  keepSubagents = value === true;
+}
+function shouldKeepSubagents() {
+  return keepSubagents;
+}
+var keepSubagents = false;
+
 // src/features/magic-context/compartment-lease.ts
 function acquireCompartmentLease(db, sessionId, holderId) {
   const acquiredAt = Date.now();
@@ -15838,7 +15845,7 @@ function isSessionMetaRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const r = row;
-  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
+  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -15874,6 +15881,9 @@ function getDefaultSessionMeta(sessionId) {
     cachedM0MaterializedAt: null,
     cachedM0SessionFactsVersion: null,
     cachedM0UpgradeState: null,
+    cachedM0SystemHash: null,
+    cachedM0ToolSetHash: null,
+    cachedM0ModelKey: null,
     lastObservedModelKey: null,
     upgradeRemindedAt: null,
     piStableIdScheme: null
@@ -15925,6 +15935,9 @@ function toSessionMeta(row) {
     cachedM0MaterializedAt: numOrNull(row.cached_m0_materialized_at),
     cachedM0SessionFactsVersion: numOrNull(row.cached_m0_session_facts_version),
     cachedM0UpgradeState: stringOrNull(row.cached_m0_upgrade_state),
+    cachedM0SystemHash: stringOrNull(row.cached_m0_system_hash),
+    cachedM0ToolSetHash: stringOrNull(row.cached_m0_tool_set_hash),
+    cachedM0ModelKey: stringOrNull(row.cached_m0_model_key),
     lastObservedModelKey: stringOrNull(row.last_observed_model_key),
     upgradeRemindedAt: numOrNull(row.upgrade_reminded_at),
     piStableIdScheme: numOrNull(row.pi_stable_id_scheme)
@@ -15944,8 +15957,11 @@ function persistCachedM0(db, sessionId, payload) {
             cached_m0_project_docs_hash = ?,
             cached_m0_materialized_at = ?,
             cached_m0_session_facts_version = ?,
-            cached_m0_upgrade_state = ?
-         WHERE session_id = ?`).run(Buffer2.from(payload.m0Bytes), payload.projectMemoryEpoch, payload.projectUserProfileVersion, payload.maxCompartmentSeq, payload.maxMemoryId, payload.maxMutationId, payload.maxMemoryMutationId ?? null, payload.m1Bytes ? Buffer2.from(payload.m1Bytes) : null, payload.projectDocsHash, payload.materializedAt, payload.sessionFactsVersion, payload.upgradeState, sessionId);
+            cached_m0_upgrade_state = ?,
+            cached_m0_system_hash = ?,
+            cached_m0_tool_set_hash = ?,
+            cached_m0_model_key = ?
+         WHERE session_id = ?`).run(Buffer2.from(payload.m0Bytes), payload.projectMemoryEpoch, payload.projectUserProfileVersion, payload.maxCompartmentSeq, payload.maxMemoryId, payload.maxMutationId, payload.maxMemoryMutationId ?? null, payload.m1Bytes ? Buffer2.from(payload.m1Bytes) : null, payload.projectDocsHash, payload.materializedAt, payload.sessionFactsVersion, payload.upgradeState, payload.systemHash ?? "", payload.toolSetHash ?? "", payload.modelKey ?? "", sessionId);
 }
 function clearCachedM0M1(db, sessionId) {
   ensureSessionMetaRow(db, sessionId);
@@ -15963,6 +15979,9 @@ function clearCachedM0M1(db, sessionId) {
     ["cached_m0_materialized_at", null],
     ["cached_m0_session_facts_version", null],
     ["cached_m0_upgrade_state", null],
+    ["cached_m0_system_hash", null],
+    ["cached_m0_tool_set_hash", null],
+    ["cached_m0_model_key", null],
     ["cached_m0_last_baseline_end_message_id", null],
     ["memory_block_cache", ""],
     ["memory_block_count", 0],
@@ -16015,6 +16034,9 @@ var init_storage_meta_shared = __esm(() => {
     "cached_m0_materialized_at",
     "cached_m0_session_facts_version",
     "cached_m0_upgrade_state",
+    "cached_m0_system_hash",
+    "cached_m0_tool_set_hash",
+    "cached_m0_model_key",
     "last_observed_model_key",
     "upgrade_reminded_at",
     "pi_stable_id_scheme"
@@ -16051,6 +16073,9 @@ var init_storage_meta_shared = __esm(() => {
     cachedM0MaterializedAt: "cached_m0_materialized_at",
     cachedM0SessionFactsVersion: "cached_m0_session_facts_version",
     cachedM0UpgradeState: "cached_m0_upgrade_state",
+    cachedM0SystemHash: "cached_m0_system_hash",
+    cachedM0ToolSetHash: "cached_m0_tool_set_hash",
+    cachedM0ModelKey: "cached_m0_model_key",
     lastObservedModelKey: "last_observed_model_key",
     upgradeRemindedAt: "upgrade_reminded_at",
     piStableIdScheme: "pi_stable_id_scheme"
@@ -149164,14 +149189,45 @@ function readRawSessionMessageByIdFromDb(db, sessionId, messageId) {
 }
 
 // src/hooks/magic-context/tag-content-primitives.ts
+function stripWellFormedLeadingTagPrefix(value) {
+  return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
+}
+function stripCompleteTagPairsGlobally(value) {
+  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
+}
+function stripMalformedTagNotationGlobally(value) {
+  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
+}
+function stripTagSectionCharacters(value) {
+  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
+}
+function stripPersistedAssistantText(value) {
+  let text = stripWellFormedLeadingTagPrefix(value);
+  text = stripCompleteTagPairsGlobally(text);
+  text = stripMalformedTagNotationGlobally(text);
+  text = stripTagSectionCharacters(text);
+  return text.trim();
+}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
 function stripTagPrefix(value) {
-  let stripped = value.replace(MALFORMED_TAG_PREFIX_REGEX, "");
-  stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+  let stripped = value;
+  for (let pass = 0;pass < 8; pass++) {
+    const prev = stripped;
+    stripped = stripped.replace(MALFORMED_TAG_PREFIX_REGEX, "");
+    stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+    if (stripped === prev)
+      break;
+  }
   return stripped;
 }
+function peelLeadingMcTagNotation(value) {
+  const body = stripTagPrefix(value);
+  if (body === value)
+    return { tagPrefix: "", body };
+  return { tagPrefix: value.slice(0, value.length - body.length), body };
+}
 function prependTag(tagId, value) {
   const stripped = stripTagPrefix(value);
   return `§${tagId}§ ${stripped}`;
@@ -149182,11 +149238,14 @@ function isThinkingPart(part) {
   const candidate = part;
   return candidate.type === "thinking" || candidate.type === "reasoning";
 }
-var encoder, TAG_PREFIX_REGEX, MALFORMED_TAG_PREFIX_REGEX;
+var encoder, TAG_PREFIX_REGEX, MALFORMED_TAG_PREFIX_REGEX, COMPLETE_TAG_PAIR_GLOBAL_REGEX, MALFORMED_TAG_GLOBAL_REGEX, STRAY_SECTION_CHAR_REGEX;
 var init_tag_content_primitives = __esm(() => {
   encoder = new TextEncoder;
   TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
   MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+  COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
+  MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
+  STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
 });
 
 // src/hooks/magic-context/tag-part-guards.ts
@@ -149314,7 +149373,9 @@ function hasMeaningfulPart(part) {
     return false;
   const type = part.type;
   if (type === "text") {
-    return typeof part.text === "string" && part.text.trim().length > 0;
+    if (typeof part.text !== "string")
+      return false;
+    return stripTagPrefix(part.text).trim().length > 0;
   }
   if (typeof type !== "string")
     return false;
@@ -149430,6 +149491,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch) {
 }
 var DROP_PREFIX = "[dropped", IGNORE_PART_TYPES, TRUNCATION_SENTINEL = "...[truncated]";
 var init_tool_drop_target = __esm(() => {
+  init_tag_content_primitives();
   IGNORE_PART_TYPES = new Set([
     "thinking",
     "reasoning",
@@ -150082,6 +150144,18 @@ function keyFor(providerID, modelID, agentName) {
 function fingerprintFor(description, parameters) {
   return createHash3("sha256").update(description).update("\x00").update(stableStringify(parameters)).digest("hex");
 }
+function getCurrentToolSetHash(providerID, modelID, agentName) {
+  const key = keyFor(providerID, modelID, agentName);
+  const inner = fingerprints.get(key);
+  if (!inner || inner.size === 0)
+    return "";
+  const parts = [];
+  for (const [toolID, fp] of inner)
+    parts.push(`${toolID}\x00${fp}`);
+  parts.sort();
+  return createHash3("sha256").update(parts.join(`
+`)).digest("hex");
+}
 function setDatabase(db) {
   persistenceDb = db;
   cachedInsertStmt = null;
@@ -150730,6 +150804,17 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       updated_at INTEGER NOT NULL DEFAULT 0
     );
 
+    CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+      project_path TEXT PRIMARY KEY,
+      lease_holder TEXT,
+      lease_expires_at INTEGER,
+      last_swept_at INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+      ON git_sweep_coordinator(lease_expires_at);
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+      ON git_sweep_coordinator(last_swept_at);
+
     CREATE TABLE IF NOT EXISTS m0_mutation_log (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       session_id TEXT NOT NULL,
@@ -150864,6 +150949,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       cached_m0_materialized_at INTEGER,
       cached_m0_session_facts_version INTEGER,
       cached_m0_upgrade_state TEXT,
+      cached_m0_system_hash TEXT,
+      cached_m0_tool_set_hash TEXT,
+      cached_m0_model_key TEXT,
       cached_m0_last_baseline_end_message_id TEXT,
       upgrade_reminded_at INTEGER,
       pi_stable_id_scheme INTEGER
@@ -151055,6 +151143,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "cached_m0_materialized_at", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_session_facts_version", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_upgrade_state", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
   ensureColumn(db, "session_meta", "cached_m0_last_baseline_end_message_id", "TEXT");
   ensureColumn(db, "session_meta", "upgrade_reminded_at", "INTEGER");
   db.exec(`
@@ -151259,7 +151350,7 @@ function getDatabasePersistenceError(db) {
     return null;
   return persistenceErrorByDatabase.get(db) ?? null;
 }
-var databases, persistenceByDatabase, persistenceErrorByDatabase, lastSchemaFenceRejection = null, LATEST_SUPPORTED_VERSION = 27, sqlitePragmaConfig;
+var databases, persistenceByDatabase, persistenceErrorByDatabase, lastSchemaFenceRejection = null, LATEST_SUPPORTED_VERSION = 30, sqlitePragmaConfig;
 var init_storage_db = __esm(async () => {
   init_data_path();
   init_logger();
@@ -152050,6 +152141,60 @@ var init_migrations = __esm(async () => {
                     ON tags(session_id, entry_fingerprint)
                     WHERE type='message' AND entry_fingerprint IS NOT NULL`);
       }
+    },
+    {
+      version: 28,
+      description: "Add git commit sweep coordinator lease/cooldown table",
+      up: (db) => {
+        db.exec(`
+                CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+                    project_path TEXT PRIMARY KEY,
+                    lease_holder TEXT,
+                    lease_expires_at INTEGER,
+                    last_swept_at INTEGER
+                );
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+                    ON git_sweep_coordinator(lease_expires_at);
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+                    ON git_sweep_coordinator(last_swept_at);
+            `);
+      }
+    },
+    {
+      version: 29,
+      description: "Add anchor_ordinal to notes (traceback to the conversation tail)",
+      up: (db) => {
+        const notesExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='notes'").get();
+        if (!notesExists) {
+          return;
+        }
+        const columns = db.prepare("PRAGMA table_info(notes)").all();
+        if (!columns.some((column) => column.name === "anchor_ordinal")) {
+          db.exec("ALTER TABLE notes ADD COLUMN anchor_ordinal INTEGER");
+        }
+      }
+    },
+    {
+      version: 30,
+      description: "HARD-bust m[0] markers: cached system/tool-set/model identity",
+      up: (db) => {
+        const hasSessionMeta = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='session_meta' LIMIT 1").get();
+        if (!hasSessionMeta)
+          return;
+        ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+        ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+        ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
+        const columns = new Set(db.prepare("PRAGMA table_info(session_meta)").all().map((column) => column.name));
+        if (columns.has("cached_m0_bytes")) {
+          db.prepare(`UPDATE session_meta SET
+                        cached_m0_bytes = NULL,
+                        cached_m1_bytes = NULL,
+                        cached_m0_materialized_at = NULL,
+                        cached_m0_system_hash = NULL,
+                        cached_m0_tool_set_hash = NULL,
+                        cached_m0_model_key = NULL`).run();
+        }
+      }
     }
   ];
   LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -152968,6 +153113,9 @@ var init_storage_meta_session = __esm(async () => {
     cached_m0_materialized_at: "NULL AS cached_m0_materialized_at",
     cached_m0_session_facts_version: "NULL AS cached_m0_session_facts_version",
     cached_m0_upgrade_state: "NULL AS cached_m0_upgrade_state",
+    cached_m0_system_hash: "NULL AS cached_m0_system_hash",
+    cached_m0_tool_set_hash: "NULL AS cached_m0_tool_set_hash",
+    cached_m0_model_key: "NULL AS cached_m0_model_key",
     last_observed_model_key: "NULL AS last_observed_model_key",
     upgrade_reminded_at: "NULL AS upgrade_reminded_at"
   };
@@ -153007,7 +153155,8 @@ function toNote(row) {
     updatedAt: row.updated_at,
     lastCheckedAt: toNullableNumber(row.last_checked_at),
     readyAt: toNullableNumber(row.ready_at),
-    readyReason: toNullableString(row.ready_reason)
+    readyReason: toNullableString(row.ready_reason),
+    anchorOrdinal: toNullableNumber(row.anchor_ordinal)
   };
 }
 function getNoteById(db, noteId) {
@@ -153059,7 +153208,7 @@ function getNotes(db, options = {}) {
 }
 function addNote(db, type, options) {
   const now = Date.now();
-  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness) VALUES ('session', 'active', ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId, now, now, getHarness()) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId ?? null, options.projectPath, options.surfaceCondition, now, now, getHarness());
+  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness, anchor_ordinal) VALUES ('session', 'active', ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId, now, now, getHarness(), options.anchorOrdinal ?? null) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness, anchor_ordinal) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId ?? null, options.projectPath, options.surfaceCondition, now, now, getHarness(), options.anchorOrdinal ?? null);
   if (!isNoteRow(result)) {
     throw new Error("[notes] failed to insert note");
   }
@@ -162943,25 +163092,56 @@ var require_src2 = __commonJS((exports, module) => {
 // src/features/magic-context/key-files/aft-availability.ts
 import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { join as join10 } from "node:path";
+import { isAbsolute as isAbsolute2, join as join10, resolve as resolve4 } from "node:path";
+import { fileURLToPath } from "node:url";
 function parseConfig(path6) {
   if (!existsSync9(path6))
     return null;
   return import_comment_json.parse(readFileSync7(path6, "utf-8"));
 }
-function entryMatchesAft(entry) {
+function stringMentionsAft(value) {
+  return AFT_NAME_NEEDLES.some((needle) => value.includes(needle));
+}
+function resolveLocalEntryPackageName(value, configDir) {
+  let dir = null;
+  if (value.startsWith("file://")) {
+    try {
+      dir = fileURLToPath(value);
+    } catch {
+      return null;
+    }
+  } else if (value.startsWith("~/")) {
+    dir = join10(homedir6(), value.slice(2));
+  } else if (value.startsWith("/") || value.startsWith("./") || value.startsWith("../")) {
+    dir = isAbsolute2(value) ? value : resolve4(configDir, value);
+  } else {
+    return null;
+  }
+  try {
+    const pkg = JSON.parse(readFileSync7(join10(dir, "package.json"), "utf-8"));
+    return typeof pkg.name === "string" ? pkg.name : null;
+  } catch {
+    return null;
+  }
+}
+function entryMatchesAft(entry, configDir) {
   const value = Array.isArray(entry) ? entry[0] : entry;
-  return typeof value === "string" && (value.includes("@cortexkit/aft") || value.includes("aft-opencode") || value.includes("aft-pi"));
+  if (typeof value !== "string")
+    return false;
+  if (stringMentionsAft(value))
+    return true;
+  const name2 = resolveLocalEntryPackageName(value, configDir);
+  return name2 != null && stringMentionsAft(name2);
 }
-function hasAftInArray(value) {
-  return Array.isArray(value) && value.some(entryMatchesAft);
+function hasAftInArray(value, configDir) {
+  return Array.isArray(value) && value.some((entry) => entryMatchesAft(entry, configDir));
 }
-function hasAftAtKeys(value, keys) {
+function hasAftAtKeys(value, keys, configDir) {
   if (!value || typeof value !== "object")
     return false;
   const record2 = value;
   for (const key of keys) {
-    if (hasAftInArray(record2[key]))
+    if (hasAftInArray(record2[key], configDir))
       return true;
   }
   return false;
@@ -162978,7 +163158,8 @@ function getAftAvailability() {
   for (const path6 of opencodePaths) {
     try {
       const config2 = parseConfig(path6);
-      if (hasAftAtKeys(config2, ["plugin", "plugins", "mcp", "mcp_servers"])) {
+      const configDir = join10(path6, "..");
+      if (hasAftAtKeys(config2, ["plugin", "plugins", "mcp", "mcp_servers"], configDir)) {
         opencode = true;
         break;
       }
@@ -162988,12 +163169,13 @@ function getAftAvailability() {
   for (const path6 of piPaths) {
     try {
       const config2 = parseConfig(path6);
-      if (hasAftAtKeys(config2, ["packages", "extensions"])) {
+      const configDir = join10(path6, "..");
+      if (hasAftAtKeys(config2, ["packages", "extensions"], configDir)) {
         pi = true;
         break;
       }
       const agent = config2?.agent;
-      if (hasAftAtKeys(agent, ["packages", "extensions"])) {
+      if (hasAftAtKeys(agent, ["packages", "extensions"], configDir)) {
         pi = true;
         break;
       }
@@ -163010,9 +163192,10 @@ function getAftAvailability() {
 function isAftAvailable() {
   return getAftAvailability().available;
 }
-var import_comment_json, overrideAvailability = null;
+var import_comment_json, overrideAvailability = null, AFT_NAME_NEEDLES;
 var init_aft_availability = __esm(() => {
   import_comment_json = __toESM(require_src2(), 1);
+  AFT_NAME_NEEDLES = ["@cortexkit/aft", "aft-opencode", "aft-pi"];
 });
 
 // src/features/magic-context/memory/storage-memory-embeddings.ts
@@ -163697,7 +163880,7 @@ async function acquireModelLoadLock(lockPath) {
       if (Date.now() - waitStart > MAX_LOCK_WAIT_MS) {
         throw new Error(`[magic-context] embedding-load lock wait exceeded ${MAX_LOCK_WAIT_MS}ms; another process is still loading the model. Skipping this init attempt to avoid an unsynchronized native load.`);
       }
-      await new Promise((resolve5) => setTimeout(resolve5, LOCK_POLL_MS));
+      await new Promise((resolve6) => setTimeout(resolve6, LOCK_POLL_MS));
     }
   }
 }
@@ -163866,7 +164049,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((resolve5) => setTimeout(resolve5, delayMs));
+              await new Promise((resolve6) => setTimeout(resolve6, delayMs));
             }
           }
           if (this.pipeline) {
@@ -163894,8 +164077,8 @@ class LocalEmbeddingProvider {
     if (this.inFlight === 0) {
       return Promise.resolve();
     }
-    return new Promise((resolve5) => {
-      this.inFlightWaiters.push(resolve5);
+    return new Promise((resolve6) => {
+      this.inFlightWaiters.push(resolve6);
     });
   }
   finishInFlight() {
@@ -164322,8 +164505,130 @@ var init_storage_git_commit_embeddings = __esm(() => {
   distinctModelIdStatements = new WeakMap;
 });
 
+// src/features/magic-context/git-commits/sweep-coordinator.ts
+function runImmediate2(db, body) {
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    const result = body();
+    db.exec("COMMIT");
+    committed = true;
+    return result;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
+function rowToState(row) {
+  return {
+    projectPath: row.project_path,
+    leaseHolder: row.lease_holder,
+    leaseExpiresAt: row.lease_expires_at,
+    lastSweptAt: row.last_swept_at
+  };
+}
+function getGitSweepCoordinatorState(db, projectPath) {
+  const row = db.prepare(`SELECT project_path, lease_holder, lease_expires_at, last_swept_at
+             FROM git_sweep_coordinator
+             WHERE project_path = ?`).get(projectPath);
+  return row ? rowToState(row) : null;
+}
+function acquireGitSweepLease(db, projectPath, holderId, options = {}) {
+  const cooldownMs = options.cooldownMs ?? GIT_SWEEP_COOLDOWN_MS;
+  const leaseTtlMs = options.leaseTtlMs ?? GIT_SWEEP_LEASE_TTL_MS;
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const row = getGitSweepCoordinatorState(db, projectPath);
+    if (row?.leaseHolder && row.leaseExpiresAt !== null && row.leaseExpiresAt > now) {
+      return {
+        acquired: false,
+        projectPath,
+        reason: "lease_active",
+        leaseHolder: row.leaseHolder,
+        leaseExpiresAt: row.leaseExpiresAt,
+        lastSweptAt: row.lastSweptAt,
+        nextAllowedAt: null
+      };
+    }
+    if (!options.ignoreCooldown && row?.lastSweptAt !== null && row?.lastSweptAt !== undefined) {
+      const nextAllowedAt = row.lastSweptAt + cooldownMs;
+      if (nextAllowedAt > now) {
+        return {
+          acquired: false,
+          projectPath,
+          reason: "cooldown_active",
+          leaseHolder: row.leaseHolder,
+          leaseExpiresAt: row.leaseExpiresAt,
+          lastSweptAt: row.lastSweptAt,
+          nextAllowedAt
+        };
+      }
+    }
+    const leaseExpiresAt = now + leaseTtlMs;
+    db.prepare(`INSERT INTO git_sweep_coordinator (
+                 project_path,
+                 lease_holder,
+                 lease_expires_at,
+                 last_swept_at
+             ) VALUES (?, ?, ?, NULL)
+             ON CONFLICT(project_path) DO UPDATE SET
+                 lease_holder = excluded.lease_holder,
+                 lease_expires_at = excluded.lease_expires_at`).run(projectPath, holderId, leaseExpiresAt);
+    return {
+      acquired: true,
+      projectPath,
+      holderId,
+      acquiredAt: now,
+      leaseExpiresAt
+    };
+  });
+}
+function renewGitSweepLease(db, projectPath, holderId, leaseTtlMs = GIT_SWEEP_LEASE_TTL_MS) {
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const leaseExpiresAt = now + leaseTtlMs;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_expires_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(leaseExpiresAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(now, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function releaseGitSweepLease(db, projectPath, holderId) {
+  runImmediate2(db, () => {
+    db.prepare(`UPDATE git_sweep_coordinator
+             SET lease_holder = NULL,
+                 lease_expires_at = NULL
+             WHERE project_path = ?
+               AND lease_holder = ?`).run(projectPath, holderId);
+  });
+}
+var GIT_SWEEP_COOLDOWN_MS, GIT_SWEEP_LEASE_TTL_MS, GIT_SWEEP_LEASE_RENEWAL_MS;
+var init_sweep_coordinator = __esm(() => {
+  GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
+  GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+  GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
+});
+
 // src/features/magic-context/project-embedding-registry.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash7, randomUUID } from "node:crypto";
 function resolveEmbeddingConfig(config2) {
   if (!config2 || config2.provider === "local") {
     return {
@@ -164587,6 +164892,7 @@ var init_project_embedding_registry = __esm(() => {
   init_magic_context();
   init_logger();
   init_storage_git_commit_embeddings();
+  init_sweep_coordinator();
   init_embedding_cache();
   init_embedding_identity();
   init_embedding_local();
@@ -164685,32 +164991,48 @@ var init_storage_memory_fts = __esm(() => {
 });
 
 // src/shared/models-dev-cache.ts
-import { createHash as createHash9 } from "node:crypto";
-import { existsSync as existsSync11, readFileSync as readFileSync9 } from "node:fs";
-import { homedir as homedir7, platform as platform2 } from "node:os";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync9, renameSync, writeFileSync } from "node:fs";
 import { join as join14 } from "node:path";
-function hashFast(input) {
-  return createHash9("sha1").update(input).digest("hex");
-}
-function getModelsJsonPath() {
-  const explicit = process.env.OPENCODE_MODELS_PATH?.trim();
-  if (explicit)
-    return explicit;
-  const cacheBase = getCacheDir();
-  const source = process.env.OPENCODE_MODELS_URL?.trim();
-  const filename = source && source !== "https://models.dev" ? `models-${hashFast(source)}.json` : "models.json";
-  return join14(cacheBase, "opencode", filename);
-}
-function getOpencodeConfigPath() {
-  const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  const configDir = envDir ? envDir : platform2() === "win32" ? join14(homedir7(), ".config", "opencode") : join14(process.env.XDG_CONFIG_HOME || join14(homedir7(), ".config"), "opencode");
-  const jsonc = join14(configDir, "opencode.jsonc");
-  if (existsSync11(jsonc))
-    return jsonc;
-  const json2 = join14(configDir, "opencode.json");
-  if (existsSync11(json2))
-    return json2;
-  return null;
+function isSaneLimit(limit) {
+  return typeof limit === "number" && limit >= MIN_SANE_LIMIT && limit <= MAX_SANE_LIMIT;
+}
+function persistFilePath() {
+  return join14(getMagicContextStorageDir(), `model-context-limits-${getHarness()}.json`);
+}
+function loadPersistedApiCacheOnce() {
+  if (persistSeedLoaded || apiCache !== null)
+    return;
+  persistSeedLoaded = true;
+  try {
+    const raw = readFileSync9(persistFilePath(), "utf-8");
+    const obj = JSON.parse(raw);
+    const map2 = new Map;
+    for (const [key, limit] of Object.entries(obj)) {
+      if (isSaneLimit(limit))
+        map2.set(key, { limit });
+    }
+    if (map2.size > 0) {
+      apiCache = map2;
+      sessionLog("global", `models-dev-cache: seeded ${map2.size} entries from persisted cache (cold start)`);
+    }
+  } catch {}
+}
+function persistApiCache() {
+  if (!apiCache)
+    return;
+  const obj = {};
+  for (const [key, value] of apiCache) {
+    if (isSaneLimit(value.limit))
+      obj[key] = value.limit;
+  }
+  try {
+    const dir = getMagicContextStorageDir();
+    mkdirSync4(dir, { recursive: true });
+    const target = persistFilePath();
+    const tmp = `${target}.${process.pid}.tmp`;
+    writeFileSync(tmp, JSON.stringify(obj), { encoding: "utf-8", mode: 384 });
+    renameSync(tmp, target);
+  } catch {}
 }
 function resolveLimit(limit) {
   if (!limit)
@@ -164723,7 +165045,7 @@ function resolveLimit(limit) {
 }
 function setCachedModelMetadata(cache, key, model) {
   const limit = resolveLimit(model?.limit);
-  if (limit === undefined) {
+  if (!isSaneLimit(limit)) {
     return;
   }
   const value = { limit };
@@ -164735,54 +165057,26 @@ function setCachedModelMetadata(cache, key, model) {
     }
   }
 }
-function loadModelsDevMetadataFromFile() {
-  const metadata = new Map;
-  const modelsJsonPath = getModelsJsonPath();
-  let fileFound = false;
-  try {
-    if (existsSync11(modelsJsonPath)) {
-      fileFound = true;
-      const raw = readFileSync9(modelsJsonPath, "utf-8");
-      const data = JSON.parse(raw);
-      for (const [providerId, provider2] of Object.entries(data)) {
-        if (!provider2?.models || typeof provider2.models !== "object")
-          continue;
-        for (const [modelId, model] of Object.entries(provider2.models)) {
-          setCachedModelMetadata(metadata, `${providerId}/${modelId}`, model);
-        }
-      }
-    }
-  } catch (error51) {
-    sessionLog("global", `models-dev-cache: failed to read models.json at ${modelsJsonPath}:`, error51 instanceof Error ? error51.message : String(error51));
-  }
-  try {
-    const configPath = getOpencodeConfigPath();
-    if (configPath && existsSync11(configPath)) {
-      const config2 = parseJsonc(readFileSync9(configPath, "utf-8"));
-      if (config2.provider && typeof config2.provider === "object") {
-        for (const [providerId, provider2] of Object.entries(config2.provider)) {
-          if (!provider2?.models || typeof provider2.models !== "object")
-            continue;
-          for (const [modelId, model] of Object.entries(provider2.models)) {
-            setCachedModelMetadata(metadata, `${providerId}/${modelId}`, model);
-          }
-        }
-      }
+async function refreshModelLimitsFromApi(client, options) {
+  const attempts = Math.max(1, (options?.retries ?? 0) + 1);
+  const delayMs = options?.retryDelayMs ?? 1000;
+  for (let attempt = 1;attempt <= attempts; attempt++) {
+    const ok = await refreshModelLimitsOnce(client);
+    if (ok)
+      return;
+    if (attempt < attempts) {
+      await new Promise((resolve6) => setTimeout(resolve6, delayMs));
     }
-  } catch (error51) {
-    sessionLog("global", "models-dev-cache: failed to read opencode config for custom models:", error51 instanceof Error ? error51.message : String(error51));
   }
-  sessionLog("global", `models-dev-cache: file-layer loaded ${metadata.size} model metadata entries (modelsJsonPath=${modelsJsonPath}, found=${fileFound})`);
-  return metadata;
 }
-async function refreshModelLimitsFromApi(client) {
+async function refreshModelLimitsOnce(client) {
   try {
     const result = await client.config.providers();
     const data = result.data;
     const providers = data?.providers;
-    if (!Array.isArray(providers)) {
-      sessionLog("global", "models-dev-cache: API refresh returned no providers payload");
-      return;
+    if (!Array.isArray(providers) || providers.length === 0) {
+      sessionLog("global", "models-dev-cache: API refresh returned no providers payload (will retry if attempts remain)");
+      return false;
     }
     const map2 = new Map;
     for (const entry of providers) {
@@ -164796,27 +165090,22 @@ async function refreshModelLimitsFromApi(client) {
     const previousSize = apiCache?.size ?? null;
     apiCache = map2;
     apiLoadedAt = Date.now();
+    persistApiCache();
     if (previousSize === null) {
       sessionLog("global", `models-dev-cache: API layer loaded ${map2.size} model metadata entries`);
     } else if (previousSize !== map2.size) {
       sessionLog("global", `models-dev-cache: API layer loaded ${map2.size} model metadata entries (was ${previousSize})`);
     }
+    return true;
   } catch (error51) {
     sessionLog("global", "models-dev-cache: API refresh failed:", error51 instanceof Error ? error51.message : String(error51));
+    return false;
   }
 }
-function getModelsDevContextLimit(providerID, modelID) {
-  const now = Date.now();
-  if (!fileCache || now - fileLastAttempt > RELOAD_INTERVAL_MS) {
-    fileLastAttempt = now;
-    fileCache = loadModelsDevMetadataFromFile();
-  }
+function getSdkContextLimit(providerID, modelID) {
+  loadPersistedApiCacheOnce();
   const fromApi = lookupLimitWithTagFallback(apiCache, providerID, modelID);
-  const fromFile = lookupLimitWithTagFallback(fileCache, providerID, modelID);
-  if (typeof fromApi === "number" && typeof fromFile === "number") {
-    return Math.max(fromApi, fromFile);
-  }
-  return fromApi ?? fromFile;
+  return isSaneLimit(fromApi) ? fromApi : undefined;
 }
 function lookupLimitWithTagFallback(cache, providerID, modelID) {
   if (!cache)
@@ -164833,12 +165122,10 @@ function lookupLimitWithTagFallback(cache, providerID, modelID) {
   }
   return;
 }
-var RELOAD_INTERVAL_MS, apiCache = null, apiLoadedAt = 0, fileCache = null, fileLastAttempt = 0;
+var MIN_SANE_LIMIT = 20000, MAX_SANE_LIMIT = 3000000, apiCache = null, apiLoadedAt = 0, persistSeedLoaded = false;
 var init_models_dev_cache = __esm(() => {
   init_data_path();
-  init_jsonc_parser();
   init_logger();
-  RELOAD_INTERVAL_MS = 5 * 60 * 1000;
 });
 
 // src/shared/rpc-notifications.ts
@@ -165564,7 +165851,7 @@ var init_compartment_runner_validation = __esm(async () => {
 });
 
 // src/hooks/magic-context/compartment-runner-historian.ts
-import { mkdirSync as mkdirSync4, unlinkSync, writeFileSync } from "node:fs";
+import { mkdirSync as mkdirSync5, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
 import { join as join17 } from "node:path";
 function historianResponseDumpDir(directory) {
   return getProjectMagicContextHistorianDir(directory);
@@ -165764,12 +166051,12 @@ async function runHistorianPrompt(args) {
       error: `Historian failed while processing this session: ${desc.brief}`
     };
   } finally {
-    if (agentSessionId && outcomeOk) {
+    if (agentSessionId && outcomeOk && !shouldKeepSubagents()) {
       await client.session.delete({ path: { id: agentSessionId } }).catch((e) => {
         sessionLog(parentSessionId, "compartment agent: session cleanup failed", getErrorMessage(e));
       });
-    } else if (agentSessionId && !outcomeOk) {
-      sessionLog(parentSessionId, `historian: KEEPING failed child session ${agentSessionId} for debugging (not deleted)`);
+    } else if (agentSessionId && (!outcomeOk || shouldKeepSubagents())) {
+      sessionLog(parentSessionId, `historian: KEEPING child session ${agentSessionId} (${outcomeOk ? "keep_subagents" : "failed"}) — not deleted`);
     }
   }
 }
@@ -165848,8 +166135,8 @@ function isTransientHistorianPromptError(message) {
   ].some((token) => normalized.includes(token));
 }
 function sleep(ms) {
-  return new Promise((resolve5) => {
-    setTimeout(resolve5, ms);
+  return new Promise((resolve6) => {
+    setTimeout(resolve6, ms);
   });
 }
 function cleanupHistorianDump(sessionId, dumpPath) {
@@ -165867,11 +166154,11 @@ function cleanupHistorianDump(sessionId, dumpPath) {
 function dumpHistorianResponse(sessionId, directory, label, text) {
   try {
     const dumpDir = historianResponseDumpDir(directory);
-    mkdirSync4(dumpDir, { recursive: true });
+    mkdirSync5(dumpDir, { recursive: true });
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
     const dumpPath = join17(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
-    writeFileSync(dumpPath, text, "utf8");
+    writeFileSync2(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
       dumpPath
@@ -165993,7 +166280,7 @@ function insertCompartmentEvents(db, sessionId, events, compartmentIds) {
 var init_compartment_events = () => {};
 
 // src/hooks/magic-context/historian-state-file.ts
-import { mkdirSync as mkdirSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { mkdirSync as mkdirSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
 function cleanupHistorianStateFile(path6) {
   if (!path6)
     return;
@@ -166548,9 +166835,7 @@ function injectTemporalMarkers(messages) {
         if (prefix && Array.isArray(msg.parts)) {
           const target = findFirstVisibleTextPart(msg.parts);
           if (target && typeof target.text === "string") {
-            const tagMatch = target.text.match(/^(?:§\d+§\s*)+/);
-            const tagPrefix = tagMatch ? tagMatch[0] : "";
-            const body = target.text.slice(tagPrefix.length);
+            const { tagPrefix, body } = peelLeadingMcTagNotation(target.text);
             if (!TEMPORAL_MARKER_PATTERN.test(body)) {
               target.text = tagPrefix + prefix + body;
               injected++;
@@ -166565,6 +166850,7 @@ function injectTemporalMarkers(messages) {
 }
 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(() => {
+  init_tag_content_primitives();
   SECONDS_PER_HOUR = 60 * 60;
   SECONDS_PER_DAY = 24 * 60 * 60;
   SECONDS_PER_WEEK = 7 * 24 * 60 * 60;
@@ -166859,12 +167145,6 @@ function getMaxCompartmentSeq(db, sessionId) {
   const row = cachedStatement(maxCompartmentSeqStatements, db, "SELECT COALESCE(MAX(sequence), -1) AS s FROM compartments WHERE session_id = ?").get(sessionId);
   return numberFromRow(row, "s");
 }
-function normalizeCachedMaxCompartmentSeq(db, sessionId, stored) {
-  if (stored === 0 && getMaxCompartmentSeq(db, sessionId) === EMPTY_MAX_COMPARTMENT_SEQ) {
-    return EMPTY_MAX_COMPARTMENT_SEQ;
-  }
-  return stored;
-}
 function getMaxMemoryId(db, projectPath) {
   if (!projectPath)
     return 0;
@@ -166888,6 +167168,7 @@ function getGlobalUserProfileVersion(db) {
 }
 function readCurrentM0SnapshotMarkers(args) {
   const projectDirectory = args.projectDirectory ?? args.projectPath ?? "";
+  const hard = args.hardSignals ?? EMPTY_HARD_SIGNALS;
   return {
     projectMemoryEpoch: getProjectMemoryEpoch(args.db, args.projectPath),
     projectUserProfileVersion: getGlobalUserProfileVersion(args.db),
@@ -166898,7 +167179,10 @@ function readCurrentM0SnapshotMarkers(args) {
     projectDocsHash: projectDirectory ? computeProjectDocsHash(projectDirectory) : "",
     materializedAt: Date.now(),
     sessionFactsVersion: getSessionFactsVersion(args.db, args.sessionId),
-    upgradeState: getUpgradeState(args.db, args.sessionId)
+    upgradeState: getUpgradeState(args.db, args.sessionId),
+    systemHash: hard.systemHash,
+    toolSetHash: hard.toolSetHash,
+    modelKey: hard.modelKey
   };
 }
 function snapshotMarkersFromCachedM0(state) {
@@ -166928,7 +167212,10 @@ function snapshotMarkersFromCachedM0(state) {
     projectDocsHash: state.cachedM0ProjectDocsHash ?? "",
     materializedAt: state.cachedM0MaterializedAt ?? 0,
     sessionFactsVersion: state.cachedM0SessionFactsVersion,
-    upgradeState: state.cachedM0UpgradeState
+    upgradeState: state.cachedM0UpgradeState,
+    systemHash: state.cachedM0SystemHash ?? "",
+    toolSetHash: state.cachedM0ToolSetHash ?? "",
+    modelKey: state.cachedM0ModelKey ?? ""
   };
 }
 function mustMaterialize(args) {
@@ -166936,16 +167223,22 @@ function mustMaterialize(args) {
     return { value: true, reason: "first_render" };
   if (!args.state.cachedM1Bytes)
     return { value: true, reason: "cached_m1_missing" };
+  const hard = args.hardSignals ?? EMPTY_HARD_SIGNALS;
   const current = readCurrentM0SnapshotMarkers(args);
-  if (args.state.cachedM0ProjectMemoryEpoch !== current.projectMemoryEpoch) {
-    return { value: true, reason: "project_memory_epoch" };
+  if (hard.modelKey !== "" && hard.modelKey !== (args.state.cachedM0ModelKey ?? "")) {
+    return { value: true, reason: "model_change" };
+  }
+  if (hard.systemHash !== "" && hard.systemHash !== (args.state.cachedM0SystemHash ?? "")) {
+    return { value: true, reason: "system_hash" };
   }
-  if (args.state.cachedM0ProjectUserProfileVersion !== current.projectUserProfileVersion) {
-    return { value: true, reason: "project_user_profile_version" };
+  if (hard.toolSetHash !== "" && hard.toolSetHash !== (args.state.cachedM0ToolSetHash ?? "")) {
+    return { value: true, reason: "tool_set_hash" };
   }
-  const cachedMaxSeq = args.state.cachedM0MaxCompartmentSeq === null ? null : normalizeCachedMaxCompartmentSeq(args.db, args.sessionId, args.state.cachedM0MaxCompartmentSeq);
-  if (cachedMaxSeq !== current.maxCompartmentSeq) {
-    return { value: true, reason: "max_compartment_seq" };
+  if (hard.cacheExpired && hard.lastResponseTime > 0 && hard.lastResponseTime > (args.state.cachedM0MaterializedAt ?? 0)) {
+    return { value: true, reason: "ttl_idle" };
+  }
+  if (args.state.cachedM0ProjectMemoryEpoch !== current.projectMemoryEpoch) {
+    return { value: true, reason: "project_memory_epoch" };
   }
   if (args.state.cachedM0MaxMutationId !== current.maxMutationId) {
     return { value: true, reason: "max_mutation_id" };
@@ -167134,6 +167427,9 @@ function applyMarkersToState(state, m0Bytes, markers, m1Bytes) {
   state.cachedM0MaterializedAt = markers.materializedAt;
   state.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
   state.cachedM0UpgradeState = markers.upgradeState;
+  state.cachedM0SystemHash = markers.systemHash;
+  state.cachedM0ToolSetHash = markers.toolSetHash;
+  state.cachedM0ModelKey = markers.modelKey;
   state.snapshotMarkers = markers;
 }
 function historySliceTokens(m0Text) {
@@ -167158,7 +167454,8 @@ function materializeM0(options) {
       db: options.db,
       sessionId: options.sessionId,
       projectPath,
-      projectDirectory
+      projectDirectory,
+      hardSignals: options.hardSignals
     });
     docs = projectDirectory ? readProjectDocsCanonical(projectDirectory) : { renderedBlock: "", canonicalHash: "" };
     snapshotMarkers.projectDocsHash = docs.canonicalHash;
@@ -167224,7 +167521,10 @@ function materializeM0(options) {
       projectDocsHash: phase3ProjectDocsHash,
       materializedAt: Date.now(),
       sessionFactsVersion: getSessionFactsVersion(options.db, options.sessionId),
-      upgradeState: getUpgradeState(options.db, options.sessionId)
+      upgradeState: getUpgradeState(options.db, options.sessionId),
+      systemHash: snapshotMarkers.systemHash,
+      toolSetHash: snapshotMarkers.toolSetHash,
+      modelKey: snapshotMarkers.modelKey
     };
     const stale = current.projectMemoryEpoch !== snapshotMarkers.projectMemoryEpoch || current.projectUserProfileVersion !== snapshotMarkers.projectUserProfileVersion || current.maxCompartmentSeq !== snapshotMarkers.maxCompartmentSeq || current.maxMutationId !== snapshotMarkers.maxMutationId || current.maxMemoryMutationId !== snapshotMarkers.maxMemoryMutationId || current.projectDocsHash !== snapshotMarkers.projectDocsHash || current.sessionFactsVersion !== snapshotMarkers.sessionFactsVersion || current.upgradeState !== snapshotMarkers.upgradeState;
     if (stale) {
@@ -167246,7 +167546,10 @@ function materializeM0(options) {
       projectDocsHash: snapshotMarkers.projectDocsHash,
       materializedAt: snapshotMarkers.materializedAt,
       sessionFactsVersion: snapshotMarkers.sessionFactsVersion,
-      upgradeState: snapshotMarkers.upgradeState
+      upgradeState: snapshotMarkers.upgradeState,
+      systemHash: snapshotMarkers.systemHash,
+      toolSetHash: snapshotMarkers.toolSetHash,
+      modelKey: snapshotMarkers.modelKey
     });
     options.db.prepare("UPDATE session_meta SET memory_block_count = ?, memory_block_ids = ? WHERE session_id = ?").run(renderedMemoryIds.length, JSON.stringify(renderedMemoryIds), options.sessionId);
     options.db.exec("COMMIT");
@@ -167405,6 +167708,9 @@ function readCachedM0M1Row(db, sessionId) {
                     cached_m0_materialized_at,
                     cached_m0_session_facts_version,
                     cached_m0_upgrade_state,
+                    cached_m0_system_hash,
+                    cached_m0_tool_set_hash,
+                    cached_m0_model_key,
                     memory_block_ids
                FROM session_meta
               WHERE session_id = ?`).get(sessionId);
@@ -167436,11 +167742,14 @@ function markersFromCachedRow(row) {
     projectDocsHash: row.cached_m0_project_docs_hash ?? "",
     materializedAt: row.cached_m0_materialized_at ?? 0,
     sessionFactsVersion: row.cached_m0_session_facts_version,
-    upgradeState: row.cached_m0_upgrade_state
+    upgradeState: row.cached_m0_upgrade_state,
+    systemHash: row.cached_m0_system_hash ?? "",
+    toolSetHash: row.cached_m0_tool_set_hash ?? "",
+    modelKey: row.cached_m0_model_key ?? ""
   };
 }
 function cachedRowMatchesState(row, state) {
-  return bufferEqualsNullable(row.cached_m0_bytes, state.cachedM0Bytes) && row.cached_m0_project_memory_epoch === state.cachedM0ProjectMemoryEpoch && row.cached_m0_project_user_profile_version === state.cachedM0ProjectUserProfileVersion && row.cached_m0_max_compartment_seq === state.cachedM0MaxCompartmentSeq && row.cached_m0_max_memory_id === state.cachedM0MaxMemoryId && row.cached_m0_max_mutation_id === state.cachedM0MaxMutationId && row.cached_m0_max_memory_mutation_id === state.cachedM0MaxMemoryMutationId && (row.cached_m0_project_docs_hash ?? "") === (state.cachedM0ProjectDocsHash ?? "") && row.cached_m0_materialized_at === state.cachedM0MaterializedAt && row.cached_m0_session_facts_version === state.cachedM0SessionFactsVersion && (row.cached_m0_upgrade_state ?? null) === (state.cachedM0UpgradeState ?? null);
+  return bufferEqualsNullable(row.cached_m0_bytes, state.cachedM0Bytes) && row.cached_m0_project_memory_epoch === state.cachedM0ProjectMemoryEpoch && row.cached_m0_project_user_profile_version === state.cachedM0ProjectUserProfileVersion && row.cached_m0_max_compartment_seq === state.cachedM0MaxCompartmentSeq && row.cached_m0_max_memory_id === state.cachedM0MaxMemoryId && row.cached_m0_max_mutation_id === state.cachedM0MaxMutationId && row.cached_m0_max_memory_mutation_id === state.cachedM0MaxMemoryMutationId && (row.cached_m0_project_docs_hash ?? "") === (state.cachedM0ProjectDocsHash ?? "") && row.cached_m0_materialized_at === state.cachedM0MaterializedAt && row.cached_m0_session_facts_version === state.cachedM0SessionFactsVersion && (row.cached_m0_upgrade_state ?? null) === (state.cachedM0UpgradeState ?? null) && (row.cached_m0_system_hash ?? "") === (state.cachedM0SystemHash ?? "") && (row.cached_m0_tool_set_hash ?? "") === (state.cachedM0ToolSetHash ?? "") && (row.cached_m0_model_key ?? "") === (state.cachedM0ModelKey ?? "");
 }
 function applyCachedRowToState(state, row) {
   const markers = markersFromCachedRow(row);
@@ -167459,6 +167768,9 @@ function applyCachedRowToState(state, row) {
   state.cachedM0MaterializedAt = markers.materializedAt;
   state.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
   state.cachedM0UpgradeState = markers.upgradeState;
+  state.cachedM0SystemHash = markers.systemHash;
+  state.cachedM0ToolSetHash = markers.toolSetHash;
+  state.cachedM0ModelKey = markers.modelKey;
   state.snapshotMarkers = markers;
 }
 function replayCachedM1(state) {
@@ -167575,7 +167887,8 @@ function injectM0M1(options) {
     sessionId: options.sessionId,
     state: options.state,
     projectPath: options.projectPath,
-    projectDirectory: options.projectDirectory
+    projectDirectory: options.projectDirectory,
+    hardSignals: options.hardSignals
   });
   let rematerialized = false;
   let contentionExhausted = false;
@@ -167633,7 +167946,10 @@ function injectM0M1(options) {
     m1Text = replayCachedM1(options.state);
   }
   const M0_DRIFT_RATIO_FLOOR = 2000;
-  if (!rematerialized && !contentionExhausted && m1Recomputed && options.isCacheBustingPass && (memoryUpdateCount > 40 || m1Text !== M1_EMPTY_PLACEHOLDER && m0Text.length >= M0_DRIFT_RATIO_FLOOR && m1Text.length > m0Text.length * 0.15)) {
+  const M1_ABSOLUTE_CAP_RATIO = 0.2;
+  const m1AbsoluteBudget = (options.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS) * M1_ABSOLUTE_CAP_RATIO;
+  const m1OverAbsoluteCap = m1Text !== M1_EMPTY_PLACEHOLDER && estimateTokens(m1Text) > m1AbsoluteBudget;
+  if (!rematerialized && !contentionExhausted && m1Recomputed && options.isCacheBustingPass && (memoryUpdateCount > 40 || m1OverAbsoluteCap || m1Text !== M1_EMPTY_PLACEHOLDER && m0Text.length >= M0_DRIFT_RATIO_FLOOR && m1Text.length > m0Text.length * 0.15)) {
     try {
       const refolded = materializeWithRetry(options);
       applyMarkersToState(options.state, refolded.m0Bytes, refolded.snapshotMarkers, refolded.m1Bytes);
@@ -167657,7 +167973,7 @@ function injectM0M1(options) {
     m1Text
   };
 }
-var INJECTION_CACHE_MAX = 100, injectionCache, CONSTRAINT_KEYWORDS, MaterializeContentionError, RenderM1InvalidMarkersError, DEFAULT_HISTORY_BUDGET_TOKENS = 60000, DEFAULT_MEMORY_BUDGET_TOKENS = 8000, MEMORY_BLOCK_WRAPPER_TOKENS = 6, DEFAULT_USER_PROFILE_BUDGET_TOKENS = 4000, M0_EMPTY_BODY = "<session-history></session-history>", M1_EMPTY_PLACEHOLDER = "<session-history-since>(no new content since last materialization)</session-history-since>", maxCompartmentSeqStatements, maxMemoryIdStatements, legacyCompartmentCountStatements, m0CompartmentStatements, newCompartmentStatements, EMPTY_MAX_COMPARTMENT_SEQ = -1;
+var INJECTION_CACHE_MAX = 100, injectionCache, CONSTRAINT_KEYWORDS, EMPTY_HARD_SIGNALS, MaterializeContentionError, RenderM1InvalidMarkersError, DEFAULT_HISTORY_BUDGET_TOKENS = 60000, DEFAULT_MEMORY_BUDGET_TOKENS = 8000, MEMORY_BLOCK_WRAPPER_TOKENS = 6, DEFAULT_USER_PROFILE_BUDGET_TOKENS = 4000, M0_EMPTY_BODY = "<session-history></session-history>", M1_EMPTY_PLACEHOLDER = "<session-history-since>(no new content since last materialization)</session-history-since>", maxCompartmentSeqStatements, maxMemoryIdStatements, legacyCompartmentCountStatements, m0CompartmentStatements, newCompartmentStatements;
 var init_inject_compartments = __esm(async () => {
   init_compartment_storage();
   init_constants();
@@ -167673,6 +167989,13 @@ var init_inject_compartments = __esm(async () => {
   ]);
   injectionCache = new BoundedSessionMap(INJECTION_CACHE_MAX);
   CONSTRAINT_KEYWORDS = /\b(must|never|always|cannot|should not|must not)\b/i;
+  EMPTY_HARD_SIGNALS = {
+    systemHash: "",
+    toolSetHash: "",
+    modelKey: "",
+    cacheExpired: false,
+    lastResponseTime: 0
+  };
   MaterializeContentionError = class MaterializeContentionError extends Error {
     retries;
     reason;
@@ -170829,7 +171152,7 @@ function resolveHistorianContextLimit(historianModelOverride) {
     const [providerID, ...rest] = historianModelOverride.split("/");
     const modelID = rest.join("/");
     if (providerID && modelID) {
-      const limit = getModelsDevContextLimit(providerID, modelID);
+      const limit = getSdkContextLimit(providerID, modelID);
       if (typeof limit === "number" && limit > 0)
         return limit;
     }
@@ -170848,7 +171171,7 @@ function resolveHistorianContextLimit(historianModelOverride) {
     const modelID = rest.join("/");
     if (!providerID || !modelID)
       continue;
-    const limit = getModelsDevContextLimit(providerID, modelID);
+    const limit = getSdkContextLimit(providerID, modelID);
     if (typeof limit !== "number" || limit <= 0)
       continue;
     if (minLimit === undefined || limit < minLimit)
@@ -171078,6 +171401,10 @@ async function runMemoryMigration(deps) {
   const cleanupChildSession = async (sid) => {
     if (!sid)
       return;
+    if (shouldKeepSubagents()) {
+      sessionLog(parentSessionId, `memory-migration: KEEPING child session ${sid} (keep_subagents)`);
+      return;
+    }
     await client.session.delete({ path: { id: sid } }).catch((e) => {
       sessionLog(parentSessionId, `memory-migration: child cleanup failed: ${String(e)}`);
     });
@@ -171215,6 +171542,7 @@ __export(exports_recomp_orchestrator, {
   setRecompNote: () => setRecompNote,
   runManagedUpgrade: () => runManagedUpgrade,
   runManagedRecomp: () => runManagedRecomp,
+  isRecompSkip: () => isRecompSkip,
   isRecompFailure: () => isRecompFailure,
   isRecompComplete: () => isRecompComplete,
   extractRecompReason: () => extractRecompReason,
@@ -171227,6 +171555,9 @@ function resolveLiveModelKey(liveSessionState, sessionId) {
 function isRecompFailure(message) {
   return /—\s*(Failed|Skipped)/.test(message);
 }
+function isRecompSkip(message) {
+  return /—\s*Skipped|already mutating compartment state|already running/i.test(message);
+}
 function isRecompComplete(message) {
   return /—\s*Complete/.test(message);
 }
@@ -171242,9 +171573,10 @@ function contextualizeUpgradeReason(reason) {
   }
   return rewritten;
 }
-function setRecompStarting(liveSessionState, sessionId, note) {
+function setRecompStarting(liveSessionState, sessionId, note, kind = "recomp") {
   liveSessionState.recompProgressBySession.set(sessionId, {
     sessionId,
+    kind,
     phase: "recomp",
     processedMessages: 0,
     totalMessages: 0,
@@ -171269,6 +171601,7 @@ function setRecompTerminal(liveSessionState, sessionId, phase, message) {
   const existing = liveSessionState.recompProgressBySession.get(sessionId);
   liveSessionState.recompProgressBySession.set(sessionId, {
     sessionId,
+    kind: existing?.kind ?? "recomp",
     phase,
     processedMessages: existing?.processedMessages ?? 0,
     totalMessages: existing?.totalMessages ?? 0,
@@ -171278,10 +171611,10 @@ function setRecompTerminal(liveSessionState, sessionId, phase, message) {
     updatedAt: Date.now(),
     message
   });
-  if (phase === "done") {
+  if (phase === "done" || phase === "skipped") {
     const t = setTimeout(() => {
       const cur = liveSessionState.recompProgressBySession.get(sessionId);
-      if (cur?.phase === "done")
+      if (cur?.phase === phase)
         liveSessionState.recompProgressBySession.delete(sessionId);
     }, RECOMP_DONE_GRACE_MS);
     t.unref?.();
@@ -171310,7 +171643,11 @@ function buildRecompDeps(ctx, sessionId) {
       ctx.liveSessionState.deferredHistoryRefreshSessions.add(sid);
     },
     onRecompProgress: (p) => {
-      ctx.liveSessionState.recompProgressBySession.set(sessionId, p);
+      const prevKind = ctx.liveSessionState.recompProgressBySession.get(sessionId)?.kind ?? "recomp";
+      ctx.liveSessionState.recompProgressBySession.set(sessionId, {
+        ...p,
+        kind: p.kind ?? prevKind
+      });
     }
   };
 }
@@ -171329,10 +171666,11 @@ async function resolveSessionDirectory(ctx, sessionId) {
   return ctx.directory;
 }
 async function runManagedRecomp(ctx, sessionId, options) {
-  setRecompStarting(ctx.liveSessionState, sessionId, "Starting recomp…");
+  setRecompStarting(ctx.liveSessionState, sessionId, "Starting recomp…", "recomp");
   try {
     const message = await executeContextRecomp(buildRecompDeps(ctx, sessionId), options);
-    setRecompTerminal(ctx.liveSessionState, sessionId, isRecompFailure(message) ? "failed" : "done", extractRecompReason(message));
+    const terminalPhase = isRecompSkip(message) ? "skipped" : isRecompFailure(message) ? "failed" : "done";
+    setRecompTerminal(ctx.liveSessionState, sessionId, terminalPhase, extractRecompReason(message));
     return message;
   } catch (error51) {
     setRecompTerminal(ctx.liveSessionState, sessionId, "failed", `Recomp crashed: ${String(error51)}`);
@@ -171342,7 +171680,7 @@ Recomp crashed: ${String(error51)}`;
   }
 }
 async function runManagedUpgrade(ctx, sessionId) {
-  setRecompStarting(ctx.liveSessionState, sessionId, "Starting upgrade…");
+  setRecompStarting(ctx.liveSessionState, sessionId, "Starting upgrade…", "upgrade");
   try {
     const compartments = getCompartments(ctx.db, sessionId);
     const legacyCount = compartments.filter((c) => c.legacy === 1 || !c.p1 || c.p1.trim() === "").length;
@@ -171400,6 +171738,7 @@ async function runUpgradeMemoryMigration(ctx, sessionId, migrationDirectory) {
   const prev = ctx.liveSessionState.recompProgressBySession.get(sessionId);
   ctx.liveSessionState.recompProgressBySession.set(sessionId, {
     sessionId,
+    kind: prev?.kind ?? "upgrade",
     phase: "migration",
     processedMessages: prev?.processedMessages ?? 0,
     totalMessages: prev?.totalMessages ?? 0,
@@ -172546,7 +172885,7 @@ async function runSidekick(deps) {
     }
     return null;
   } finally {
-    if (agentSessionId) {
+    if (agentSessionId && !shouldKeepSubagents()) {
       await deps.client.session.delete({
         path: { id: agentSessionId }
       }).catch((error51) => {
@@ -172796,7 +173135,8 @@ function createLiveSessionState() {
     pendingMaterializationSessions: new Set,
     deferredMaterializationSessions: new Set,
     sessionDirectoryBySession: new Map,
-    recompProgressBySession: new Map
+    recompProgressBySession: new Map,
+    internalChildSessions: new Set
   };
 }
 
@@ -173009,13 +173349,14 @@ init_shared();
 init_assistant_message_extractor();
 init_logger();
 import { readFileSync as readFileSync8 } from "node:fs";
-import { isAbsolute as isAbsolute2, join as join11, relative as relative2 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join11, relative as relative2 } from "node:path";
+init_subagent_token_capture();
 init_aft_availability();
 init_project_key_files();
 
 // src/features/magic-context/key-files/read-history.ts
 import { realpathSync as realpathSync3 } from "node:fs";
-import { relative, resolve as resolve4 } from "node:path";
+import { relative, resolve as resolve5 } from "node:path";
 function toMs(value) {
   if (typeof value === "number" && Number.isFinite(value))
     return value;
@@ -173052,7 +173393,7 @@ function coalesceRanges(ranges) {
 }
 function normalizeProjectRelativePath(projectPath, filePath) {
   const root = realpathSync3(projectPath);
-  const abs = filePath.startsWith("/") ? resolve4(filePath) : resolve4(root, filePath);
+  const abs = filePath.startsWith("/") ? resolve5(filePath) : resolve5(root, filePath);
   let real = abs;
   try {
     real = realpathSync3(abs);
@@ -173420,11 +173761,13 @@ async function runKeyFilesLlm(args) {
     const text = extractLatestAssistantText(messages);
     if (!text)
       throw new Error("Dreamer returned no key-files output.");
-    return text;
+    return { text, messages };
   } finally {
-    await args.client.session.delete({ path: { id: agentSessionId } }).catch(() => {
-      return;
-    });
+    if (!shouldKeepSubagents()) {
+      await args.client.session.delete({ path: { id: agentSessionId } }).catch(() => {
+        return;
+      });
+    }
   }
 }
 async function runKeyFilesTask(args) {
@@ -173470,9 +173813,27 @@ async function runKeyFilesTask(args) {
       log(`[key-files] lease renewal threw: ${getErrorMessage(error51)}`);
     }
   }, 60000);
+  let invocationRecorded = false;
+  const llmStartedAt = Date.now();
+  const recordKeyFilesInvocation = (params) => {
+    if (!args.parentSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db: args.db,
+      parentSessionId: args.parentSessionId,
+      harness: getHarness(),
+      subagent: "dreamer",
+      task: "key files",
+      startedAt: llmStartedAt,
+      status: params.status,
+      messages: params.messages,
+      error: params.error
+    });
+  };
   try {
     try {
-      const raw = await runKeyFilesLlm({
+      const { text: raw, messages: llmMessages } = await runKeyFilesLlm({
         client: args.client,
         parentSessionId: args.parentSessionId,
         projectPath,
@@ -173480,8 +173841,10 @@ async function runKeyFilesTask(args) {
         deadline: args.deadline,
         fallbackModels: args.fallbackModels
       });
+      recordKeyFilesInvocation({ status: "completed", messages: llmMessages });
       validated = validateLlmOutput(raw, args.config, projectPath, new Set(candidates.map((candidate) => candidate.path)));
     } catch (error51) {
+      recordKeyFilesInvocation({ status: "failed", error: error51 });
       log(`[key-files] LLM validation failed: ${getErrorMessage(error51)}`);
       throw error51;
     }
@@ -173580,7 +173943,8 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
       db: args.db,
       parentSessionId: args.parentSessionId,
       harness: "opencode",
-      subagent: "user_memory_review",
+      subagent: "dreamer",
+      task: "user memories",
       startedAt,
       status: params.status,
       messages: params.messages,
@@ -173704,7 +174068,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
     return result;
   } finally {
     clearInterval(leaseInterval);
-    if (agentSessionId) {
+    if (agentSessionId && !shouldKeepSubagents()) {
       await args.client.session.delete({
         path: { id: agentSessionId },
         query: { directory: args.sessionDirectory }
@@ -174027,14 +174391,14 @@ async function runDream(args) {
         }
       } finally {
         clearInterval(leaseRenewalInterval);
-        if (agentSessionId && !taskFailed) {
+        if (agentSessionId && !taskFailed && !shouldKeepSubagents()) {
           await args.client.session.delete({
             path: { id: agentSessionId }
           }).catch((error51) => {
             log("[dreamer] failed to delete child session:", error51);
           });
-        } else if (agentSessionId && taskFailed) {
-          log(`[dreamer] KEEPING failed child session ${agentSessionId} for task ${taskName} (debugging)`);
+        } else if (agentSessionId && (taskFailed || shouldKeepSubagents())) {
+          log(`[dreamer] KEEPING child session ${agentSessionId} for task ${taskName} (${taskFailed ? "failed" : "keep_subagents"})`);
         }
       }
       if (lostLease) {
@@ -174319,7 +174683,7 @@ Only include notes whose conditions you could definitively evaluate against exte
         parts: [{ type: "text", text: evaluationPrompt, synthetic: true }]
       }
     }, {
-      timeoutMs: Math.min(remainingMs, 300000),
+      timeoutMs: Math.min(remainingMs, 5 * 60 * 1000),
       signal: abortController.signal,
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:smart-notes"
@@ -174395,7 +174759,7 @@ Only include notes whose conditions you could definitively evaluate against exte
     });
   } finally {
     clearInterval(leaseInterval);
-    if (agentSessionId) {
+    if (agentSessionId && !shouldKeepSubagents()) {
       await args.client.session.delete({
         path: { id: agentSessionId }
       }).catch(() => {});
@@ -174406,14 +174770,14 @@ var MAX_LEASE_RETRIES = 3;
 async function processDreamQueue(args) {
   const maxRuntimeMs = args.maxRuntimeMinutes * 60 * 1000;
   if (!hasActiveDreamLease(args.db)) {
-    clearStaleEntries(args.db, maxRuntimeMs + 1800000, args.projectIdentity);
+    clearStaleEntries(args.db, maxRuntimeMs + 30 * 60 * 1000, args.projectIdentity);
   }
   const entry = dequeueNext(args.db, args.projectIdentity);
   if (!entry) {
     return null;
   }
   const projectDirectory = args.sessionDirectoryOverride ?? resolveDreamSessionDirectory(entry.projectIdentity);
-  log(`[dreamer] dequeued project ${entry.projectIdentity} (dir=${projectDirectory}), starting dream run`);
+  log(`[dreamer] dequeued project ${entry.projectIdentity}, starting dream run`);
   let result;
   try {
     result = await runDream({
@@ -174537,6 +174901,7 @@ async function readGitCommits(directory, options = {}) {
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
   }
+  const projectLabel = options.projectIdentity ?? "<project>";
   const args = [
     "log",
     revision,
@@ -174559,11 +174924,11 @@ async function readGitCommits(directory, options = {}) {
     stdout = result.stdout;
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
-    log(`[git-commits] readGitCommits failed at cwd=${directory}: ${message.slice(0, 500)}`);
+    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
     return [];
   }
   if (stdout.trim().length === 0) {
-    log(`[git-commits] readGitCommits returned empty stdout at cwd=${directory} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
+    log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
   return parseGitLogOutput(stdout);
 }
@@ -174618,6 +174983,7 @@ var insertStatements = new WeakMap;
 var existingShasStatements = new WeakMap;
 var projectCountStatements = new WeakMap;
 var evictStatements = new WeakMap;
+var evictOverflowStatements = new WeakMap;
 var latestCommitTimeStatements = new WeakMap;
 function getInsertStatement(db) {
   let stmt = insertStatements.get(db);
@@ -174660,17 +175026,17 @@ function getLatestCommitTimeStatement(db) {
   }
   return stmt;
 }
-function getEvictStatement(db) {
-  let stmt = evictStatements.get(db);
+function getEvictOverflowStatement(db) {
+  let stmt = evictOverflowStatements.get(db);
   if (!stmt) {
     stmt = db.prepare(`DELETE FROM git_commits
-             WHERE sha IN (
-                 SELECT sha FROM git_commits
+             WHERE rowid IN (
+                 SELECT rowid FROM git_commits
                  WHERE project_path = ?
-                 ORDER BY committed_at ASC
-                 LIMIT ?
+                 ORDER BY committed_at DESC, sha DESC
+                 LIMIT -1 OFFSET ?
              )`);
-    evictStatements.set(db, stmt);
+    evictOverflowStatements.set(db, stmt);
   }
   return stmt;
 }
@@ -174708,22 +175074,15 @@ function getLatestIndexedCommitTimeMs(db, projectPath) {
   const row = getLatestCommitTimeStatement(db).get(projectPath);
   return row?.latest ?? null;
 }
-function evictOldestCommits(db, projectPath, excess) {
-  if (excess <= 0)
-    return 0;
-  const before = getCommitCount(db, projectPath);
-  getEvictStatement(db).run(projectPath, excess);
-  const after = getCommitCount(db, projectPath);
-  return Math.max(0, before - after);
-}
 function enforceProjectCap(db, projectPath, maxCommits) {
   if (maxCommits <= 0)
     return 0;
   const count = getCommitCount(db, projectPath);
   if (count <= maxCommits)
     return 0;
-  const excess = count - maxCommits;
-  const evicted = evictOldestCommits(db, projectPath, excess);
+  getEvictOverflowStatement(db).run(projectPath, maxCommits);
+  const after = getCommitCount(db, projectPath);
+  const evicted = Math.max(0, count - after);
   if (evicted > 0) {
     log(`[git-commits] evicted ${evicted} oldest commits for project ${projectPath} (cap=${maxCommits}, was=${count})`);
   }
@@ -174755,7 +175114,8 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     const sinceMs = latestIndexed !== null ? Math.max(latestIndexed - 60000, Date.now() - options.sinceDays * MS_PER_DAY) : Date.now() - options.sinceDays * MS_PER_DAY;
     const commits = await readGitCommits(directory, {
       sinceMs,
-      maxCommits: options.maxCommits
+      maxCommits: options.maxCommits,
+      projectIdentity: projectPath
     });
     result.scanned = commits.length;
     if (commits.length === 0) {
@@ -174967,6 +175327,7 @@ function searchGitCommitsSync(db, projectPath, query, options) {
 
 // src/features/magic-context/git-commits/index.ts
 init_storage_git_commit_embeddings();
+init_sweep_coordinator();
 
 // src/plugin/dream-timer.ts
 init_embedding();
@@ -174999,7 +175360,7 @@ async function startDreamScheduleTimer(args) {
   const isNewRegistration = !registeredProjects.has(args.directory);
   registeredProjects.set(args.directory, args);
   if (isNewRegistration) {
-    log(`[dreamer] registered project ${args.directory} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
+    log(`[dreamer] registered project ${args.projectIdentity} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
   }
   if (!activeTimer) {
     log(`[dreamer] started independent schedule timer (every ${DREAM_TIMER_INTERVAL_MS / 60000}m)`);
@@ -175014,7 +175375,7 @@ async function startDreamScheduleTimer(args) {
   }
   return () => {
     registeredProjects.delete(args.directory);
-    log(`[dreamer] unregistered project ${args.directory} (remaining=${registeredProjects.size})`);
+    log(`[dreamer] unregistered project ${args.projectIdentity} (remaining=${registeredProjects.size})`);
     if (registeredProjects.size === 0 && activeTimer) {
       clearInterval(activeTimer);
       activeTimer = null;
@@ -175062,7 +175423,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
     return;
   }
   try {
-    log(`[dreamer] timer tick (${origin}) ${reg.directory} — checking schedule window "${reg.dreamerConfig.schedule}"`);
+    log(`[dreamer] timer tick (${origin}) ${reg.projectIdentity} — checking schedule window "${reg.dreamerConfig.schedule}"`);
     checkScheduleAndEnqueue(db, reg.dreamerConfig.schedule, reg.projectIdentity);
     await processDreamQueue({
       db,
@@ -175077,13 +175438,34 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
       fallbackModels: resolveFallbackChain(DREAMER_AGENT, reg.dreamerConfig.fallback_models)
     });
   } catch (error51) {
-    log(`[dreamer] timer-triggered queue processing failed for ${reg.directory}:`, error51);
+    log(`[dreamer] timer-triggered queue processing failed for ${reg.projectIdentity}:`, error51);
   }
 }
+function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
+  const timer = setInterval(() => {
+    try {
+      if (!renewGitSweepLease(db, projectIdentity, holderId)) {
+        log(`[git-commits] sweep lease renewal failed for ${projectIdentity}`);
+      }
+    } catch (error51) {
+      log(`[git-commits] sweep lease renewal errored for ${projectIdentity}: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    }
+  }, GIT_SWEEP_LEASE_RENEWAL_MS);
+  timer.unref?.();
+  return () => clearInterval(timer);
+}
 async function sweepGitCommits(args) {
   const { directory, projectIdentity, db, gitCommitIndexing } = args;
+  const holderId = crypto.randomUUID();
+  const lease2 = acquireGitSweepLease(db, projectIdentity, holderId);
+  if (!lease2.acquired) {
+    const reason = lease2.reason === "cooldown_active" ? `cooldown active until ${lease2.nextAllowedAt}` : `lease held by ${lease2.leaseHolder ?? "another holder"} until ${lease2.leaseExpiresAt ?? "unknown"}`;
+    log(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
+    return;
+  }
   const startedAt = Date.now();
-  log(`[git-commits] sweep starting for ${directory} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
+  const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
+  log(`[git-commits] sweep starting for ${projectIdentity} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
   try {
     const result = await indexCommitsForProject(db, projectIdentity, directory, {
       sinceDays: gitCommitIndexing.since_days,
@@ -175093,11 +175475,19 @@ async function sweepGitCommits(args) {
     if (result.embedded > 0) {
       drainedEmbeddings = await embedUnembeddedCommits(db, projectIdentity);
     }
+    const cooldownMarked = markGitSweepSuccessAndRelease(db, projectIdentity, holderId);
+    if (!cooldownMarked) {
+      releaseGitSweepLease(db, projectIdentity, holderId);
+      log(`[git-commits] sweep finished for ${projectIdentity}, but lease was no longer active; cooldown not advanced`);
+    }
     const elapsedMs = Date.now() - startedAt;
     log(`[git-commits] sweep finished for ${projectIdentity} in ${elapsedMs}ms: scanned=${result.scanned} inserted=${result.inserted} updated=${result.updated} evicted=${result.evicted} embedded=${result.embedded} drained=${drainedEmbeddings}`);
   } catch (error51) {
+    releaseGitSweepLease(db, projectIdentity, holderId);
     const elapsedMs = Date.now() - startedAt;
-    log(`[git-commits] sweep failed for ${directory} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    log(`[git-commits] sweep failed for ${projectIdentity} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
+  } finally {
+    stopRenewal();
   }
 }
 
@@ -175237,7 +175627,7 @@ init_models_dev_cache();
 var DEFAULT_CONTEXT_LIMIT = 128000;
 var MAX_EXECUTE_THRESHOLD = 80;
 function resolveContextLimit(providerID, modelID, ctx) {
-  const fromModelsDev = providerID && modelID ? getModelsDevContextLimit(providerID, modelID) : undefined;
+  const fromModelsDev = providerID && modelID ? getSdkContextLimit(providerID, modelID) : undefined;
   const baseline = fromModelsDev ?? DEFAULT_CONTEXT_LIMIT;
   if (ctx?.db && ctx.sessionID) {
     try {
@@ -175250,7 +175640,7 @@ function resolveContextLimit(providerID, modelID, ctx) {
   return baseline;
 }
 function resolveTrustedContextLimit(providerID, modelID, ctx) {
-  const fromModelsDev = providerID && modelID ? getModelsDevContextLimit(providerID, modelID) : undefined;
+  const fromModelsDev = providerID && modelID ? getSdkContextLimit(providerID, modelID) : undefined;
   let detected;
   if (ctx?.db && ctx.sessionID) {
     try {
@@ -175738,6 +176128,7 @@ function createTagger() {
 // src/hooks/magic-context/hook.ts
 init_magic_context();
 init_project_identity();
+init_tool_definition_tokens();
 await init_storage();
 init_logger();
 init_resolve_fallbacks();
@@ -176608,7 +176999,8 @@ function getSessionCreatedInfo(properties) {
     id: info.id,
     parentID: info.parentID,
     providerID: typeof info.providerID === "string" ? info.providerID : undefined,
-    modelID: typeof info.modelID === "string" ? info.modelID : undefined
+    modelID: typeof info.modelID === "string" ? info.modelID : undefined,
+    title: typeof info.title === "string" ? info.title : undefined
   };
 }
 function getMessageUpdatedAssistantInfo(properties) {
@@ -177718,7 +178110,7 @@ async function runCompartmentPhase(args) {
   async function awaitCompartmentRun(activeRun, reason) {
     sessionLog(args.sessionId, reason);
     const timeoutMs = args.historianTimeoutMs ?? 120000;
-    const timeout = new Promise((resolve5) => setTimeout(() => resolve5("timeout"), timeoutMs));
+    const timeout = new Promise((resolve6) => setTimeout(() => resolve6("timeout"), timeoutMs));
     const result = await Promise.race([activeRun.promise.then(() => "done"), timeout]);
     if (result === "timeout") {
       sessionLog(args.sessionId, `transform: compartment await timed out after ${timeoutMs}ms — proceeding without waiting`);
@@ -178675,6 +179067,64 @@ init_embedding();
 
 // src/features/magic-context/search.ts
 init_logger();
+
+// src/features/magic-context/literal-probes.ts
+var MAX_PROBES = 5;
+var MIN_PROBE_LENGTH = 3;
+var SLASH_COMMAND_RE = /\/[a-z][a-z0-9]*(?:-[a-z0-9]+)+/gi;
+var KEBAB_SNAKE_RE = /[a-z][a-z0-9]*(?:[-_][a-z0-9]+)+/gi;
+var DOTTED_RE = /[a-z0-9][a-z0-9_-]*(?:\.[a-z0-9_-]+)+/gi;
+var CAMEL_RE = /\b[a-zA-Z][a-z0-9]*(?:[A-Z][a-z0-9]*)+\b/g;
+var SHA_RE = /\b[0-9a-f]{7,40}\b/gi;
+var ERROR_CODE_RE = /\b(?:TS\d{4,}|ERR_[A-Z][A-Z0-9_]*)\b/g;
+var QUOTED_RE = /["`]([^"`]{3,80})["`]/g;
+function looksLikeSha(token) {
+  return /[0-9]/.test(token) && /^[0-9a-f]{7,40}$/i.test(token);
+}
+function extractLiteralProbes(query) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0)
+    return [];
+  const ordered = [];
+  const seen = new Set;
+  const add = (raw) => {
+    if (!raw)
+      return;
+    const probe = raw.trim();
+    if (probe.length < MIN_PROBE_LENGTH)
+      return;
+    const key = probe.toLowerCase();
+    if (seen.has(key))
+      return;
+    seen.add(key);
+    ordered.push(probe);
+  };
+  for (const m of trimmed.matchAll(QUOTED_RE))
+    add(m[1]);
+  for (const m of trimmed.matchAll(SLASH_COMMAND_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(ERROR_CODE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(DOTTED_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(KEBAB_SNAKE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(CAMEL_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(SHA_RE)) {
+    if (looksLikeSha(m[0]))
+      add(m[0]);
+  }
+  return ordered.slice(0, MAX_PROBES);
+}
+function containsProbeVerbatim(text, probes) {
+  if (probes.length === 0)
+    return false;
+  const haystack = text.toLowerCase();
+  return probes.some((probe) => haystack.includes(probe.toLowerCase()));
+}
+
+// src/features/magic-context/search.ts
 init_memory();
 init_embedding();
 init_storage_memory_fts();
@@ -178854,36 +179304,82 @@ function linearDecayScore(rank, total) {
     return 0;
   return Math.max(0, 1 - rank / total);
 }
-function searchMessages(args) {
-  const sanitizedQuery = sanitizeFtsQuery(args.query.trim());
-  if (sanitizedQuery.length === 0) {
+function runMessageFtsQuery(db, sessionId, ftsQuery, fetchLimit, cutoff) {
+  if (ftsQuery.length === 0)
     return [];
-  }
-  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
-  const rows = getMessageSearchStatement(args.db).all(args.sessionId, sanitizedQuery, fetchLimit).map((row) => row);
-  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
-  const filtered = rows.map((row) => {
+  const rows = getMessageSearchStatement(db).all(sessionId, ftsQuery, fetchLimit).map((row) => row);
+  const result = [];
+  for (const row of rows) {
     const messageOrdinal = getMessageOrdinal(row.messageOrdinal);
     if (messageOrdinal === null || typeof row.messageId !== "string" || typeof row.role !== "string" || typeof row.content !== "string") {
-      return null;
+      continue;
     }
     if (cutoff !== null && messageOrdinal > cutoff) {
-      return null;
+      continue;
     }
-    return {
+    result.push({
       messageOrdinal,
       messageId: row.messageId,
       role: row.role,
       content: row.content
-    };
-  }).filter((result) => result !== null).slice(0, args.limit);
-  return filtered.map((row, rank) => ({
+    });
+  }
+  return result;
+}
+var RRF_K = 60;
+var VERBATIM_PROBE_BONUS = 0.5;
+function searchMessages(args) {
+  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
+  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
+  const baseQuery = sanitizeFtsQuery(args.query.trim());
+  const probes = args.probes ?? [];
+  if (probes.length === 0) {
+    const filtered = runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff).slice(0, args.limit);
+    return filtered.map((row, rank) => ({
+      source: "message",
+      content: previewText(row.content),
+      score: linearDecayScore(rank, filtered.length),
+      messageOrdinal: row.messageOrdinal,
+      messageId: row.messageId,
+      role: row.role
+    }));
+  }
+  const queryLists = [];
+  if (baseQuery.length > 0) {
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff));
+  }
+  for (const probe of probes) {
+    const probeQuery = sanitizeFtsQuery(probe);
+    if (probeQuery.length === 0)
+      continue;
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, probeQuery, fetchLimit, cutoff));
+  }
+  const fused = new Map;
+  for (const list of queryLists) {
+    list.forEach((row, rank) => {
+      const rrf = 1 / (RRF_K + rank);
+      const existing = fused.get(row.messageId);
+      if (existing) {
+        existing.score += rrf;
+      } else {
+        fused.set(row.messageId, { row, score: rrf });
+      }
+    });
+  }
+  for (const entry of fused.values()) {
+    if (containsProbeVerbatim(entry.row.content, probes)) {
+      entry.score += VERBATIM_PROBE_BONUS;
+    }
+  }
+  const ranked = [...fused.values()].sort((a, b) => b.score !== a.score ? b.score - a.score : a.row.messageOrdinal - b.row.messageOrdinal).slice(0, args.limit);
+  const maxScore = ranked.length > 0 ? ranked[0].score : 1;
+  return ranked.map((entry) => ({
     source: "message",
-    content: previewText(row.content),
-    score: linearDecayScore(rank, filtered.length),
-    messageOrdinal: row.messageOrdinal,
-    messageId: row.messageId,
-    role: row.role
+    content: previewText(entry.row.content),
+    score: maxScore > 0 ? entry.score / maxScore : 0,
+    messageOrdinal: entry.row.messageOrdinal,
+    messageId: entry.row.messageId,
+    role: entry.row.role
   }));
 }
 function getSourceBoost(result) {
@@ -178967,12 +179463,14 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
     return null;
   }) : Promise.resolve(null);
   await Promise.resolve();
+  const messageProbes = options.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
   const messageResults = runMessages ? searchMessages({
     db,
     sessionId,
     query: trimmedQuery,
     limit: tierLimit,
-    maxOrdinal: options.maxMessageOrdinal
+    maxOrdinal: options.maxMessageOrdinal,
+    probes: messageProbes
   }) : [];
   const queryEmbedding = await queryEmbeddingPromise;
   const [memoryResults, gitCommitResults] = await Promise.all([
@@ -179095,10 +179593,10 @@ var AUTO_SEARCH_TIMEOUT_MS = 3000;
 async function unifiedSearchWithTimeout(db, sessionId, projectPath, prompt, options, timeoutMs) {
   const controller = new AbortController;
   let timer;
-  const timeoutPromise = new Promise((resolve5) => {
+  const timeoutPromise = new Promise((resolve6) => {
     timer = setTimeout(() => {
       controller.abort();
-      resolve5(null);
+      resolve6(null);
     }, timeoutMs);
   });
   try {
@@ -179555,7 +180053,7 @@ function isVisibleNoteReadPart(part) {
 }
 
 // src/hooks/magic-context/todo-view.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 var TERMINAL_STATUSES = new Set(["completed", "cancelled"]);
 var TITLE_DONE_STATUSES = new Set(["completed"]);
 var SYNTHETIC_CALL_ID_PREFIX = "mc_synthetic_todo_";
@@ -179600,7 +180098,7 @@ function buildSyntheticTodoPart(stateJson) {
   };
 }
 function computeSyntheticCallId(stateJson) {
-  const hash2 = createHash10("sha256").update(stateJson).digest("hex").slice(0, 16);
+  const hash2 = createHash9("sha256").update(stateJson).digest("hex").slice(0, 16);
   return `${SYNTHETIC_CALL_ID_PREFIX}${hash2}`;
 }
 function parseTodoState(stateJson) {
@@ -179792,7 +180290,8 @@ async function runPostTransformPhase(args) {
         memoryInjectionBudgetTokens: args.m0M1.memoryInjectionBudgetTokens,
         historyBudgetTokens: args.m0M1.historyBudgetTokens,
         keyFiles: args.m0M1.keyFiles,
-        isCacheBustingPass
+        isCacheBustingPass,
+        hardSignals: args.m0M1.hardSignals
       });
       if (result.injected) {
         sessionLog(args.sessionId, `transform: injected m[0]/m[1] (rematerialized=${result.m0RematerializedThisPass}, reason=${result.decision.reason ?? "cache_hit"})`);
@@ -180166,6 +180665,10 @@ function createTransform(deps) {
       return;
     }
     logTransformTiming(sessionId, "getOrCreateSessionMeta", tMeta);
+    if (deps.internalChildSessions?.has(sessionId)) {
+      sessionLog(sessionId, "transform skipped (internal magic-context child session)");
+      return;
+    }
     const reducedMode = sessionMeta.isSubagent;
     const fullFeatureMode = !reducedMode;
     let sessionDirectory = deps.directory ?? "";
@@ -180536,6 +181039,22 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const compartmentInProgress = compartmentPhase.compartmentInProgress;
     sessionMeta = { ...sessionMeta, compartmentInProgress };
     logTransformTiming(sessionId, "compartmentPhase", tCompartmentPhase);
+    const hardModel = deps.liveModelBySession?.get(sessionId);
+    const hardModelKey = hardModel ? `${hardModel.providerID}/${hardModel.modelID}` : "";
+    const hardToolSetHash = deps.getToolSetHash?.(sessionId) ?? "";
+    const hardSystemHash = typeof sessionMeta.systemPromptHash === "string" ? sessionMeta.systemPromptHash : "";
+    let hardTtlMs = 5 * 60 * 1000;
+    try {
+      hardTtlMs = parseCacheTtl(sessionMeta.cacheTtl);
+    } catch {}
+    const hardCacheExpired = sessionMeta.lastResponseTime > 0 && Date.now() - sessionMeta.lastResponseTime >= hardTtlMs;
+    const m0HardSignals = {
+      systemHash: hardSystemHash,
+      toolSetHash: hardToolSetHash,
+      modelKey: hardModelKey,
+      cacheExpired: hardCacheExpired,
+      lastResponseTime: sessionMeta.lastResponseTime
+    };
     const lateActiveRunBlocksMaterialization = getActiveCompartmentRun(sessionId) !== undefined && contextUsageEarly.percentage < FORCE_MATERIALIZE_PERCENTAGE;
     const canConsumeDeferredLate = canConsumeDeferredOnThisPass({
       schedulerDecision: midTurnAdjustedSchedulerDecision,
@@ -180599,7 +181118,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         keyFiles: {
           enabled: deps.experimentalPinKeyFiles === true,
           tokenBudget: deps.experimentalPinKeyFilesTokenBudget ?? 1e4
-        }
+        },
+        hardSignals: m0HardSignals
       }
     });
     logTransformTiming(sessionId, "postTransformPhase", tPostProcess);
@@ -180761,6 +181281,7 @@ function truncateHistorianEmergencyError(error51) {
 
 // src/hooks/magic-context/event-handler.ts
 var CONTEXT_USAGE_TTL_MS = 60 * 60 * 1000;
+var INTERNAL_CHILD_TITLE_PREFIX = "magic-context-";
 function formatTokens(value) {
   return value.toLocaleString();
 }
@@ -180825,6 +181346,10 @@ function createEventHandler2(deps) {
       if (!info) {
         return;
       }
+      if (deps.internalChildSessions && info.parentID.length > 0 && typeof info.title === "string" && info.title.startsWith(INTERNAL_CHILD_TITLE_PREFIX)) {
+        deps.internalChildSessions.add(info.id);
+        sessionLog(info.id, `marked internal magic-context child (title="${info.title}") — exempt from transform + injection`);
+      }
       try {
         const modelKey = resolveModelKey(info.providerID, info.modelID);
         updateSessionMeta(deps.db, info.id, {
@@ -181241,10 +181766,7 @@ await __promiseAll([
 ]);
 
 // src/hooks/magic-context/text-complete.ts
-var DEFAULT_PATTERNS = [
-  /^(\u00a7\d+\u00a7\s*)+/,
-  /\u00a7/g
-];
+init_tag_content_primitives();
 function parseRegex(src) {
   if (src.startsWith("/")) {
     const lastSlash = src.lastIndexOf("/");
@@ -181258,17 +181780,19 @@ function parseRegex(src) {
 }
 function createTextCompleteHandler(stripConfig) {
   const isEnabled = stripConfig?.enabled ?? true;
-  let patterns;
-  if (!isEnabled) {
-    patterns = [];
-  } else if (stripConfig?.patterns && stripConfig.patterns.length > 0) {
+  let patterns = null;
+  if (!isEnabled) {} else if (stripConfig?.patterns && stripConfig.patterns.length > 0) {
     patterns = stripConfig.patterns.map(parseRegex);
-  } else {
-    patterns = DEFAULT_PATTERNS;
   }
   return async (_input, output) => {
-    for (const regex of patterns) {
-      output.text = output.text.replace(regex, "");
+    if (!isEnabled)
+      return;
+    if (patterns) {
+      for (const regex of patterns) {
+        output.text = output.text.replace(regex, "");
+      }
+    } else {
+      output.text = stripPersistedAssistantText(output.text);
     }
   };
 }
@@ -181491,7 +182015,7 @@ function createToolExecuteAfterHook(args) {
 init_send_session_notification();
 
 // src/hooks/magic-context/system-prompt-hash.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 
 // src/agents/magic-context-prompt.ts
 var LONG_TERM_PARTNER_FRAME = `### You are the user's long-term partner on this project — not a one-off hire
@@ -181613,6 +182137,9 @@ function clearSystemPromptHashSession(sessionId, handleMaps) {
 function isInternalOpenCodeAgent(systemPromptContent) {
   return systemPromptContent.includes("You are a title generator. You output ONLY a thread title.") || systemPromptContent.includes("Summarize what was done in this conversation. Write like a pull request description.") || systemPromptContent.includes("You are an anchored context summarization assistant for coding sessions.");
 }
+function isMagicContextInternalAgent(systemPromptContent) {
+  return systemPromptContent.includes("You are Historian — the hippocampus of a long-running coding agent.") || systemPromptContent.includes("You are a memory maintenance agent for the magic-context system.") || systemPromptContent.includes("You are Sidekick, a focused memory-retrieval subagent for an AI coding assistant.") || systemPromptContent.includes("You are a file importance evaluator. Given read statistics about files");
+}
 function createSystemPromptHashHandler(deps) {
   const stickyDateBySession = new Map;
   const handler = async (input, output) => {
@@ -181625,6 +182152,10 @@ function createSystemPromptHashHandler(deps) {
       sessionLog(sessionId, "system-prompt-hash skipped (OpenCode internal agent: title/summary/compaction)");
       return;
     }
+    if (deps.internalChildSessions?.has(sessionId) || isMagicContextInternalAgent(fullPromptForDetection)) {
+      sessionLog(sessionId, "system-prompt-hash skipped (Magic Context internal child: historian/dreamer/sidekick/migration)");
+      return;
+    }
     const injectionEnabled = deps.injectionEnabled !== false;
     const skipSignatures = deps.injectionSkipSignatures ?? [];
     if (!injectionEnabled) {
@@ -181675,7 +182206,7 @@ function createSystemPromptHashHandler(deps) {
 `);
     if (systemContent.length === 0)
       return;
-    const currentHash = createHash11("md5").update(systemContent).digest("hex");
+    const currentHash = createHash10("md5").update(systemContent).digest("hex");
     if (!sessionMetaEarly) {
       return;
     }
@@ -181883,6 +182414,7 @@ function createMagicContextHook(deps) {
   const liveModelBySession = deps.liveSessionState?.liveModelBySession ?? new Map;
   const agentBySession = deps.liveSessionState?.agentBySession ?? new Map;
   const sessionDirectoryBySession = deps.liveSessionState?.sessionDirectoryBySession ?? new Map;
+  const internalChildSessions = deps.liveSessionState?.internalChildSessions ?? new Set;
   const recompProgressBySession = deps.liveSessionState?.recompProgressBySession ?? new Map;
   const recentReduceBySession = new Map;
   const toolUsageSinceUserTurn = new Map;
@@ -181914,7 +182446,8 @@ function createMagicContextHook(deps) {
       pendingMaterializationSessions,
       deferredMaterializationSessions,
       sessionDirectoryBySession,
-      recompProgressBySession
+      recompProgressBySession,
+      internalChildSessions
     },
     directory: deps.directory,
     historianChunkTokens: getHistorianChunkTokens(),
@@ -181959,6 +182492,7 @@ function createMagicContextHook(deps) {
     deferredMaterializationSessions,
     lastHeuristicsTurnId,
     commitSeenLastPass,
+    internalChildSessions,
     client: deps.client,
     directory: deps.directory,
     memoryConfig: deps.config.memory ? {
@@ -181978,6 +182512,12 @@ function createMagicContextHook(deps) {
       const model = liveModelBySession.get(sessionId);
       return resolveModelKey(model?.providerID, model?.modelID);
     },
+    getToolSetHash: (sessionId) => {
+      const model = liveModelBySession.get(sessionId);
+      if (!model)
+        return "";
+      return getCurrentToolSetHash(model.providerID, model.modelID, agentBySession.get(sessionId));
+    },
     getFallbackModelId: (sessionId) => {
       const model = liveModelBySession.get(sessionId);
       return model ? `${model.providerID}/${model.modelID}` : undefined;
@@ -182010,6 +182550,7 @@ function createMagicContextHook(deps) {
     tagger: deps.tagger,
     db,
     client: deps.client,
+    internalChildSessions,
     getNotificationParams: (sessionId) => getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession),
     nudgePlacements,
     onSessionCacheInvalidated: (sessionId) => {
@@ -182027,6 +182568,7 @@ function createMagicContextHook(deps) {
       recompProgressBySession.delete(sessionId);
       recentReduceBySession.delete(sessionId);
       toolUsageSinceUserTurn.delete(sessionId);
+      internalChildSessions.delete(sessionId);
     }
   });
   const runDreamQueueInBackground = () => {
@@ -182137,6 +182679,7 @@ function createMagicContextHook(deps) {
     injectionSkipSignatures: deps.config.system_prompt_injection?.skip_signatures ?? [
       "<!-- magic-context: skip -->"
     ],
+    internalChildSessions,
     experimentalUserMemories: deps.config.dreamer?.user_memories?.enabled,
     experimentalPinKeyFiles: deps.config.dreamer?.pin_key_files?.enabled ?? false,
     experimentalPinKeyFilesTokenBudget: deps.config.dreamer?.pin_key_files?.token_budget,
@@ -182905,6 +183448,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
         if (!p)
           return null;
         return {
+          kind: p.kind ?? "recomp",
           phase: p.phase,
           processedMessages: p.processedMessages,
           totalMessages: p.totalMessages,
@@ -182924,6 +183468,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
     return {
       ...empty,
       recompProgress: {
+        kind: p.kind ?? "recomp",
         phase: p.phase,
         processedMessages: p.processedMessages,
         totalMessages: p.totalMessages,
@@ -183640,16 +184185,30 @@ Example: \`ctx_note(action="write", content="Implement X because Y", surface_con
 
 Historian reads these notes, deduplicates them, and rewrites the remaining useful notes over time.`;
 // src/tools/ctx-note/tools.ts
-await init_storage();
+await __promiseAll([
+  init_message_index(),
+  init_storage()
+]);
 import { tool as tool3 } from "@opencode-ai/plugin";
+function captureAnchorOrdinal(db, sessionId) {
+  try {
+    const ordinal = getLastIndexedOrdinal(db, sessionId);
+    return ordinal > 0 ? ordinal : null;
+  } catch {
+    return null;
+  }
+}
+function anchorSuffix(note) {
+  return note.anchorOrdinal !== null ? ` ↳ @msg ${note.anchorOrdinal}` : "";
+}
 function formatNoteLine(note) {
   const statusSuffix = note.status === "active" ? "" : ` (${note.status})`;
   if (note.type === "session") {
-    return `- **#${note.id}**${statusSuffix}: ${note.content}`;
+    return `- **#${note.id}**${statusSuffix}: ${note.content}${anchorSuffix(note)}`;
   }
   const conditionText = note.status === "ready" ? note.readyReason ?? note.surfaceCondition ?? "Condition satisfied" : note.surfaceCondition ?? "No condition recorded";
   const conditionLabel = note.status === "ready" ? "Condition met" : "Condition";
-  return `- **#${note.id}**${statusSuffix}: ${note.content}
+  return `- **#${note.id}**${statusSuffix}: ${note.content}${anchorSuffix(note)}
   ${conditionLabel}: ${conditionText}`;
 }
 var DISMISS_FOOTER = `
@@ -183727,6 +184286,7 @@ function createCtxNoteTool(deps) {
         if (!content) {
           return "Error: 'content' is required when action is 'write'.";
         }
+        const anchorOrdinal = captureAnchorOrdinal(deps.db, sessionId);
         if (args.surface_condition?.trim()) {
           if (!deps.dreamerEnabled) {
             return "Error: Smart notes require dreamer to be enabled. Enable dreamer in magic-context.jsonc to use surface_condition.";
@@ -183738,13 +184298,14 @@ function createCtxNoteTool(deps) {
             content,
             projectPath: projectIdentity,
             sessionId,
-            surfaceCondition: args.surface_condition.trim()
+            surfaceCondition: args.surface_condition.trim(),
+            anchorOrdinal
           });
           return `Created smart note #${note2.id}. Dreamer will evaluate the condition during nightly runs:
 - Content: ${content}
 - Condition: ${args.surface_condition.trim()}`;
         }
-        const note = addNote(deps.db, "session", { sessionId, content });
+        const note = addNote(deps.db, "session", { sessionId, content, anchorOrdinal });
         return `Saved session note #${note.id}. Historian will rewrite or deduplicate notes as needed.`;
       }
       if (action === "dismiss") {
@@ -183807,9 +184368,13 @@ ${parts.join(`
 
 No session notes or smart notes.`;
       }
-      return sections.join(`
+      const body = sections.join(`
+
+`);
+      const anchorHint = body.includes("↳ @msg ") ? `
 
-`) + DISMISS_FOOTER;
+↳ @msg N marks the conversation tail when a note was written. To see what led to it: ctx_expand(start=N-x, end=N) (pick x for how far back to look).` : "";
+      return body + anchorHint + DISMISS_FOOTER;
     }
   });
 }
@@ -184100,7 +184665,8 @@ function createCtxSearchTool(deps) {
         maxMessageOrdinal: lastCompartmentEnd >= 0 ? lastCompartmentEnd : undefined,
         gitCommitsEnabled,
         sources: normalizeSources(args.sources),
-        visibleMemoryIds
+        visibleMemoryIds,
+        explicitSearch: true
       });
       return formatSearchResults(query, results);
     }
@@ -184201,22 +184767,22 @@ init_models_dev_cache();
 init_logger();
 import { randomBytes } from "node:crypto";
 import {
-  mkdirSync as mkdirSync7,
+  mkdirSync as mkdirSync8,
   readdirSync,
   readFileSync as readFileSync12,
-  renameSync,
+  renameSync as renameSync2,
   unlinkSync as unlinkSync3,
-  writeFileSync as writeFileSync4
+  writeFileSync as writeFileSync5
 } from "node:fs";
 import { createServer } from "node:http";
 import { dirname as dirname5 } from "node:path";
 
 // src/shared/rpc-utils.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 import { join as join20 } from "node:path";
 function projectHash(directory) {
   const normalized = directory.replace(/\/+$/, "");
-  return createHash12("sha256").update(normalized).digest("hex").slice(0, 16);
+  return createHash11("sha256").update(normalized).digest("hex").slice(0, 16);
 }
 function rpcPortDir(storageDir, directory) {
   return join20(storageDir, "rpc", projectHash(directory));
@@ -184282,7 +184848,7 @@ class MagicContextRpcServer {
     this.handlers.set(method, handler);
   }
   async start() {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const server = createServer((req, res) => this.dispatch(req, res));
       server.on("error", (err) => {
         log(`[rpc] server error: ${err.message}`);
@@ -184299,20 +184865,20 @@ class MagicContextRpcServer {
         try {
           this.warnIfOtherLiveInstance();
           const dir = dirname5(this.portFilePath);
-          mkdirSync7(dir, { recursive: true, mode: 448 });
+          mkdirSync8(dir, { recursive: true, mode: 448 });
           const tmpPath = `${this.portFilePath}.tmp`;
-          writeFileSync4(tmpPath, JSON.stringify({
+          writeFileSync5(tmpPath, JSON.stringify({
             port: this.port,
             pid: process.pid,
             started_at: this.startedAt,
             token: this.token
           }), { encoding: "utf-8", mode: 384 });
-          renameSync(tmpPath, this.portFilePath);
+          renameSync2(tmpPath, this.portFilePath);
           log(`[rpc] server listening on 127.0.0.1:${this.port}`);
         } catch (err) {
           log(`[rpc] failed to write port file: ${err}`);
         }
-        resolve5(this.port);
+        resolve6(this.port);
       });
       server.unref();
     });
@@ -184405,6 +184971,7 @@ var plugin = async (ctx) => {
     cacheSizeMb: pluginConfig.sqlite.cache_size_mb,
     mmapSizeMb: pluginConfig.sqlite.mmap_size_mb
   });
+  setKeepSubagents(pluginConfig.keep_subagents === true);
   if (pluginConfig.configWarnings?.length) {
     for (const w of pluginConfig.configWarnings) {
       log(`[magic-context] config warning: ${w}`);
@@ -184503,7 +185070,7 @@ var plugin = async (ctx) => {
     rpcServer.start().catch((err) => {
       log(`[magic-context] RPC server failed to start: ${err}`);
     });
-    refreshModelLimitsFromApi(ctx.client);
+    refreshModelLimitsFromApi(ctx.client, { retries: 3, retryDelayMs: 1000 });
   }
   {
     const fence = getSchemaFenceRejection();