@cortexkit/opencode-magic-context 0.22.2 → 0.22.4

package/dist/index.js

@@ -14968,6 +14968,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.")
@@ -15746,6 +15747,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();
@@ -15832,7 +15842,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 {
@@ -15868,6 +15878,9 @@ function getDefaultSessionMeta(sessionId) {
     cachedM0MaterializedAt: null,
     cachedM0SessionFactsVersion: null,
     cachedM0UpgradeState: null,
+    cachedM0SystemHash: null,
+    cachedM0ToolSetHash: null,
+    cachedM0ModelKey: null,
     lastObservedModelKey: null,
     upgradeRemindedAt: null,
     piStableIdScheme: null
@@ -15919,6 +15932,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)
@@ -15938,8 +15954,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);
@@ -15957,6 +15976,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],
@@ -16009,6 +16031,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"
@@ -16045,6 +16070,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"
@@ -149158,14 +149186,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}`;
@@ -149176,11 +149235,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
@@ -149308,7 +149370,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;
@@ -149424,6 +149488,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",
@@ -150076,6 +150141,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;
@@ -150869,6 +150946,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
@@ -151060,6 +151140,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(`
@@ -151264,7 +151347,7 @@ function getDatabasePersistenceError(db) {
     return null;
   return persistenceErrorByDatabase.get(db) ?? null;
 }
-var databases, persistenceByDatabase, persistenceErrorByDatabase, lastSchemaFenceRejection = null, LATEST_SUPPORTED_VERSION = 29, sqlitePragmaConfig;
+var databases, persistenceByDatabase, persistenceErrorByDatabase, lastSchemaFenceRejection = null, LATEST_SUPPORTED_VERSION = 30, sqlitePragmaConfig;
 var init_storage_db = __esm(async () => {
   init_data_path();
   init_logger();
@@ -152087,6 +152170,28 @@ var init_migrations = __esm(async () => {
           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);
@@ -153005,6 +153110,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"
   };
@@ -162981,25 +163089,56 @@ var init_conflict_warning_hook = __esm(() => {
 // src/features/magic-context/key-files/aft-availability.ts
 import { existsSync as existsSync12, readFileSync as readFileSync10 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { join as join14 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join14, resolve as resolve5 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 function parseConfig(path6) {
   if (!existsSync12(path6))
     return null;
   return import_comment_json3.parse(readFileSync10(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 = fileURLToPath2(value);
+    } catch {
+      return null;
+    }
+  } else if (value.startsWith("~/")) {
+    dir = join14(homedir8(), value.slice(2));
+  } else if (value.startsWith("/") || value.startsWith("./") || value.startsWith("../")) {
+    dir = isAbsolute3(value) ? value : resolve5(configDir, value);
+  } else {
+    return null;
+  }
+  try {
+    const pkg = JSON.parse(readFileSync10(join14(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;
@@ -163016,7 +163155,8 @@ function getAftAvailability() {
   for (const path6 of opencodePaths) {
     try {
       const config2 = parseConfig(path6);
-      if (hasAftAtKeys(config2, ["plugin", "plugins", "mcp", "mcp_servers"])) {
+      const configDir = join14(path6, "..");
+      if (hasAftAtKeys(config2, ["plugin", "plugins", "mcp", "mcp_servers"], configDir)) {
         opencode = true;
         break;
       }
@@ -163026,12 +163166,13 @@ function getAftAvailability() {
   for (const path6 of piPaths) {
     try {
       const config2 = parseConfig(path6);
-      if (hasAftAtKeys(config2, ["packages", "extensions"])) {
+      const configDir = join14(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;
       }
@@ -163048,9 +163189,10 @@ function getAftAvailability() {
 function isAftAvailable() {
   return getAftAvailability().available;
 }
-var import_comment_json3, overrideAvailability = null;
+var import_comment_json3, overrideAvailability = null, AFT_NAME_NEEDLES;
 var init_aft_availability = __esm(() => {
   import_comment_json3 = __toESM(require_src2(), 1);
+  AFT_NAME_NEEDLES = ["@cortexkit/aft", "aft-opencode", "aft-pi"];
 });
 
 // src/features/magic-context/memory/storage-memory-embeddings.ts
@@ -163735,7 +163877,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((resolve6) => setTimeout(resolve6, LOCK_POLL_MS));
+      await new Promise((resolve7) => setTimeout(resolve7, LOCK_POLL_MS));
     }
   }
 }
@@ -163904,7 +164046,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((resolve6) => setTimeout(resolve6, delayMs));
+              await new Promise((resolve7) => setTimeout(resolve7, delayMs));
             }
           }
           if (this.pipeline) {
@@ -163932,8 +164074,8 @@ class LocalEmbeddingProvider {
     if (this.inFlight === 0) {
       return Promise.resolve();
     }
-    return new Promise((resolve6) => {
-      this.inFlightWaiters.push(resolve6);
+    return new Promise((resolve7) => {
+      this.inFlightWaiters.push(resolve7);
     });
   }
   finishInFlight() {
@@ -164920,7 +165062,7 @@ async function refreshModelLimitsFromApi(client, options) {
     if (ok)
       return;
     if (attempt < attempts) {
-      await new Promise((resolve6) => setTimeout(resolve6, delayMs));
+      await new Promise((resolve7) => setTimeout(resolve7, delayMs));
     }
   }
 }
@@ -165906,12 +166048,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`);
     }
   }
 }
@@ -165990,8 +166132,8 @@ function isTransientHistorianPromptError(message) {
   ].some((token) => normalized.includes(token));
 }
 function sleep(ms) {
-  return new Promise((resolve6) => {
-    setTimeout(resolve6, ms);
+  return new Promise((resolve7) => {
+    setTimeout(resolve7, ms);
   });
 }
 function cleanupHistorianDump(sessionId, dumpPath) {
@@ -166690,9 +166832,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++;
@@ -166707,6 +166847,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;
@@ -167001,12 +167142,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;
@@ -167030,6 +167165,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),
@@ -167040,7 +167176,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) {
@@ -167070,7 +167209,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) {
@@ -167078,16 +167220,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 (hard.toolSetHash !== "" && hard.toolSetHash !== (args.state.cachedM0ToolSetHash ?? "")) {
+    return { value: true, reason: "tool_set_hash" };
   }
-  if (args.state.cachedM0ProjectUserProfileVersion !== current.projectUserProfileVersion) {
-    return { value: true, reason: "project_user_profile_version" };
+  if (hard.cacheExpired && hard.lastResponseTime > 0 && hard.lastResponseTime > (args.state.cachedM0MaterializedAt ?? 0)) {
+    return { value: true, reason: "ttl_idle" };
   }
-  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 (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" };
@@ -167276,6 +167424,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) {
@@ -167300,7 +167451,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;
@@ -167366,7 +167518,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) {
@@ -167388,7 +167543,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");
@@ -167547,6 +167705,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);
@@ -167578,11 +167739,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);
@@ -167601,6 +167765,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) {
@@ -167717,7 +167884,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;
@@ -167775,7 +167943,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);
@@ -167799,7 +167970,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();
@@ -167815,6 +167986,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;
@@ -171220,6 +171398,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)}`);
     });
@@ -172785,7 +172967,7 @@ async function runSidekick(deps) {
     }
     return null;
   } finally {
-    if (agentSessionId) {
+    if (agentSessionId && !shouldKeepSubagents()) {
       await deps.client.session.delete({
         path: { id: agentSessionId }
       }).catch((error51) => {
@@ -173623,7 +173805,8 @@ function createLiveSessionState() {
     pendingMaterializationSessions: new Set,
     deferredMaterializationSessions: new Set,
     sessionDirectoryBySession: new Map,
-    recompProgressBySession: new Map
+    recompProgressBySession: new Map,
+    internalChildSessions: new Set
   };
 }
 
@@ -173836,13 +174019,14 @@ init_shared();
 init_assistant_message_extractor();
 init_logger();
 import { readFileSync as readFileSync11 } from "node:fs";
-import { isAbsolute as isAbsolute3, join as join15, relative as relative2 } from "node:path";
+import { isAbsolute as isAbsolute4, join as join15, 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 resolve5 } from "node:path";
+import { relative, resolve as resolve6 } from "node:path";
 function toMs(value) {
   if (typeof value === "number" && Number.isFinite(value))
     return value;
@@ -173879,7 +174063,7 @@ function coalesceRanges(ranges) {
 }
 function normalizeProjectRelativePath(projectPath, filePath) {
   const root = realpathSync3(projectPath);
-  const abs = filePath.startsWith("/") ? resolve5(filePath) : resolve5(root, filePath);
+  const abs = filePath.startsWith("/") ? resolve6(filePath) : resolve6(root, filePath);
   let real = abs;
   try {
     real = realpathSync3(abs);
@@ -174247,11 +174431,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) {
@@ -174297,9 +174483,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,
@@ -174307,8 +174511,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;
     }
@@ -174407,7 +174613,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,
@@ -174531,7 +174738,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 }
@@ -174854,14 +175061,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) {
@@ -175146,7 +175353,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"
@@ -175222,7 +175429,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(() => {});
@@ -175233,14 +175440,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({
@@ -175364,6 +175571,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,
@@ -175386,11 +175594,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);
 }
@@ -175576,7 +175784,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) {
@@ -175821,7 +176030,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)`);
@@ -175836,7 +176045,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;
@@ -175884,7 +176093,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,
@@ -175899,7 +176108,7 @@ 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) {
@@ -175921,12 +176130,12 @@ async function sweepGitCommits(args) {
   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} (${directory}): ${reason}`);
+    log(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
     return;
   }
   const startedAt = Date.now();
   const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
-  log(`[git-commits] sweep starting for ${directory} (project=${projectIdentity} sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
+  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,
@@ -175946,7 +176155,7 @@ async function sweepGitCommits(args) {
   } 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();
   }
@@ -176590,6 +176799,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();
@@ -177460,7 +177670,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) {
@@ -178570,7 +178781,7 @@ async function runCompartmentPhase(args) {
   async function awaitCompartmentRun(activeRun, reason) {
     sessionLog(args.sessionId, reason);
     const timeoutMs = args.historianTimeoutMs ?? 120000;
-    const timeout = new Promise((resolve6) => setTimeout(() => resolve6("timeout"), timeoutMs));
+    const timeout = new Promise((resolve7) => setTimeout(() => resolve7("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`);
@@ -180053,10 +180264,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((resolve6) => {
+  const timeoutPromise = new Promise((resolve7) => {
     timer = setTimeout(() => {
       controller.abort();
-      resolve6(null);
+      resolve7(null);
     }, timeoutMs);
   });
   try {
@@ -180750,7 +180961,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"})`);
@@ -181124,6 +181336,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 ?? "";
@@ -181494,6 +181710,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,
@@ -181557,7 +181789,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);
@@ -181719,6 +181952,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();
 }
@@ -181783,6 +182017,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, {
@@ -182199,11 +182437,10 @@ await __promiseAll([
 ]);
 
 // src/hooks/magic-context/text-complete.ts
-var LEADING_TAG_PREFIX_REGEX = /^(\u00a7\d+\u00a7\s*)+/;
-var SECTION_CHAR_REGEX = /\u00a7/g;
+init_tag_content_primitives();
 function createTextCompleteHandler() {
   return async (_input, output) => {
-    output.text = output.text.replace(LEADING_TAG_PREFIX_REGEX, "").replace(SECTION_CHAR_REGEX, "");
+    output.text = stripPersistedAssistantText(output.text);
   };
 }
 
@@ -182547,6 +182784,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) => {
@@ -182559,6 +182799,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) {
@@ -182817,6 +183061,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;
@@ -182848,7 +183093,8 @@ function createMagicContextHook(deps) {
       pendingMaterializationSessions,
       deferredMaterializationSessions,
       sessionDirectoryBySession,
-      recompProgressBySession
+      recompProgressBySession,
+      internalChildSessions
     },
     directory: deps.directory,
     historianChunkTokens: getHistorianChunkTokens(),
@@ -182893,6 +183139,7 @@ function createMagicContextHook(deps) {
     deferredMaterializationSessions,
     lastHeuristicsTurnId,
     commitSeenLastPass,
+    internalChildSessions,
     client: deps.client,
     directory: deps.directory,
     memoryConfig: deps.config.memory ? {
@@ -182912,6 +183159,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;
@@ -182944,6 +183197,7 @@ function createMagicContextHook(deps) {
     tagger: deps.tagger,
     db,
     client: deps.client,
+    internalChildSessions,
     getNotificationParams: (sessionId) => getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession),
     nudgePlacements,
     onSessionCacheInvalidated: (sessionId) => {
@@ -182961,6 +183215,7 @@ function createMagicContextHook(deps) {
       recompProgressBySession.delete(sessionId);
       recentReduceBySession.delete(sessionId);
       toolUsageSinceUserTurn.delete(sessionId);
+      internalChildSessions.delete(sessionId);
     }
   });
   const runDreamQueueInBackground = () => {
@@ -183071,6 +183326,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,
@@ -185238,7 +185494,7 @@ class MagicContextRpcServer {
     this.handlers.set(method, handler);
   }
   async start() {
-    return new Promise((resolve6, reject) => {
+    return new Promise((resolve7, reject) => {
       const server = createServer((req, res) => this.dispatch(req, res));
       server.on("error", (err) => {
         log(`[rpc] server error: ${err.message}`);
@@ -185268,7 +185524,7 @@ class MagicContextRpcServer {
         } catch (err) {
           log(`[rpc] failed to write port file: ${err}`);
         }
-        resolve6(this.port);
+        resolve7(this.port);
       });
       server.unref();
     });
@@ -185361,6 +185617,7 @@ var plugin = async (ctx) => {
     cacheSizeMb: pluginConfig.sqlite.cache_size_mb,
     mmapSizeMb: pluginConfig.sqlite.mmap_size_mb
   });
+  setKeepSubagents(pluginConfig.keep_subagents === true);
   const autoUpdateAbort = new AbortController;
   process.once("exit", () => {
     autoUpdateAbort.abort();