@cortexkit/pi-magic-context 0.45.0 → 0.46.1

package/dist/{index-2bw9k8nx.js → index-ykb8kkm3.js}

@@ -31,18 +31,21 @@ import {
   getEmbeddingProviderIdentity,
   dominantEmbeddingFailure,
   LocalEmbeddingProvider
-} from "./index-ttf0cqq8.js";
+} from "./index-r01b1b78.js";
 import {
   piModelRefToCanonical,
   modelRefLookupOrder
-} from "./index-g0xfx1c2.js";
+} from "./index-phh7e055.js";
 import {
   resolveDecisionCalibration,
   calibrationForModelKey,
+  protectedToolTagNumbers,
   isRecord,
   TODO_STATUSES,
   TODO_PRIORITIES,
   TITLE_DONE_STATUSES,
+  queuePendingOp,
+  getPendingOps,
   updateTagStatus,
   getInertWhitespaceAssistantTags,
   getTagNumberByMessageId,
@@ -54,31 +57,33 @@ import {
   hasRawMessageProvider2,
   setRawMessageProvider2,
   cleanUserText2,
-  readRawSessionMessages2,
   visitRawSessionMessages2,
   readRawSessionMessageById2,
   readSessionChunk2
-} from "./index-vxjgsr9m.js";
+} from "./index-xvw8zptx.js";
 import {
   removeSystemReminders,
   hasMeaningfulUserText2,
   extractTexts2,
   getTokenEstimatorFingerprint,
   estimateTokens
-} from "./index-j0mbc5vj.js";
+} from "./index-266qrgss.js";
+import {
+  stableStringify,
+  closeQuietly,
+  isKnownAutocommit,
+  getTableColumnNames,
+  resolveOpenCodeDbPath,
+  assertOpenCodeStoreGeneration
+} from "./index-td885aah.js";
 import {
   Database,
+  prepareCachedStatement,
   withSqliteBackgroundWriter,
   withoutSqliteTransformPass,
   isTransientSqliteError,
   withPrivilegedWriter
-} from "./index-2pbbk3en.js";
-import {
-  stableStringify,
-  resolveOpenCodeDbPath,
-  assertOpenCodeStoreGeneration,
-  closeQuietly
-} from "./index-e16q5sd7.js";
+} from "./index-wv28nczk.js";
 import {
   isUserHomeDirectory,
   directoryHasGitMetadata,
@@ -104,10 +109,14 @@ import {
   sourceNameForMemory,
   managedAuthorityNoteRow,
   getErrorMessage
-} from "./index-k0yd1ph9.js";
+} from "./index-4vfrjwf6.js";
+import {
+  ensureStorageDirectorySync,
+  writeStorageFileAtomicSync
+} from "./index-vf38qhee.js";
 import {
   logSlowWriteTransaction
-} from "./index-7s5yk3za.js";
+} from "./index-2p1e8706.js";
 
 // ../plugin/src/config/agent-disable.ts
 var COMPACTION_ENABLED_PATH = `compaction${"."}enabled`;
@@ -610,18 +619,7 @@ function formatCompactTokens(value) {
 }
 
 // ../plugin/src/config/migrate-config-location.ts
-import {
-  closeSync,
-  existsSync,
-  mkdirSync,
-  openSync,
-  readFileSync as readFileSync2,
-  renameSync,
-  rmSync,
-  statSync,
-  unlinkSync,
-  writeFileSync
-} from "node:fs";
+import { existsSync, readFileSync as readFileSync2, rmSync, statSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join as join2 } from "node:path";
 
@@ -2280,7 +2278,7 @@ var CONFIG_LOCK_STALE_MS = 4000;
 function acquireConfigMigrationLock(lockDir) {
   for (let attempt = 0;attempt < 2; attempt++) {
     try {
-      mkdirSync(lockDir, { recursive: false });
+      ensureStorageDirectorySync(lockDir, true, false);
       return () => {
         try {
           rmSync(lockDir, { recursive: true, force: true });
@@ -2305,26 +2303,7 @@ function acquireConfigMigrationLock(lockDir) {
   return null;
 }
 function atomicWriteConfigFile(targetPath, content) {
-  mkdirSync(dirname(targetPath), { recursive: true });
-  const tmpPath = join2(dirname(targetPath), `.${basename(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
-  let fd = null;
-  try {
-    fd = openSync(tmpPath, "wx", 384);
-    writeFileSync(fd, content);
-    closeSync(fd);
-    fd = null;
-    renameSync(tmpPath, targetPath);
-  } catch (err) {
-    if (fd !== null) {
-      try {
-        closeSync(fd);
-      } catch {}
-    }
-    try {
-      unlinkSync(tmpPath);
-    } catch {}
-    throw err;
-  }
+  writeStorageFileAtomicSync(targetPath, content, true);
 }
 function movedMarkerContent(targetPath, originalName, originalContent) {
   const header = [
@@ -2378,7 +2357,7 @@ function migrateConfigFile(opts) {
   if (existingSources.length === 0) {
     return { migrated: false, conflict: false, targetPath: opts.targetPath, warnings };
   }
-  mkdirSync(dirname(opts.targetPath), { recursive: true });
+  ensureStorageDirectorySync(dirname(opts.targetPath), true);
   const release = acquireConfigMigrationLock(`${opts.targetPath}.lock`);
   if (!release) {
     warnings.push(`Config migration for ${opts.scope} skipped this run (another instance is migrating); will retry on next start.`);
@@ -3058,6 +3037,9 @@ function escalationBands(effectiveThresholdPercentage) {
 
 // ../plugin/src/features/magic-context/merged-reasoning-decisions.ts
 var MERGED_REASONING_PARTS_PREFIX = "__merged_reasoning_parts_v1__:";
+var decodedDecisions = new Map;
+var decodedDecisionBytes = 0;
+var MAX_DECODED_DECISION_BYTES = 32 * 1024 * 1024;
 function decodeMergedReasoningParts(value) {
   if (!value.startsWith(MERGED_REASONING_PARTS_PREFIX))
     return null;
@@ -3078,9 +3060,24 @@ function decodeMergedReasoningParts(value) {
 function readFrozenMergedReasoningParts(ids) {
   const decisions = new Map;
   for (const value of ids) {
-    const record = decodeMergedReasoningParts(value);
+    let record = decodedDecisions.get(value);
+    if (record === undefined) {
+      record = decodeMergedReasoningParts(value);
+      const bytes = 2 * value.length + 128;
+      if (bytes <= MAX_DECODED_DECISION_BYTES) {
+        while (decodedDecisions.size >= 1e5 || decodedDecisionBytes + bytes > MAX_DECODED_DECISION_BYTES) {
+          const oldest = decodedDecisions.keys().next().value;
+          if (oldest === undefined)
+            break;
+          decodedDecisionBytes -= 2 * oldest.length + 128;
+          decodedDecisions.delete(oldest);
+        }
+        decodedDecisions.set(value, record);
+        decodedDecisionBytes += bytes;
+      }
+    }
     if (record && !decisions.has(record[0]))
-      decisions.set(...record);
+      decisions.set(record[0], [...record[1]]);
   }
   return decisions;
 }
@@ -3628,7 +3625,15 @@ function getDefaultSessionMeta(sessionId) {
     piStableIdScheme: null
   };
 }
+var sessionMetaExistsStatements = new WeakMap;
 function ensureSessionMetaRow(db, sessionId, initialIsSubagent = false) {
+  let exists = sessionMetaExistsStatements.get(db);
+  if (!exists) {
+    exists = prepareCachedStatement(db, "SELECT 1 FROM session_meta WHERE session_id = ?");
+    sessionMetaExistsStatements.set(db, exists);
+  }
+  if (exists.get(sessionId))
+    return;
   const defaults = getDefaultSessionMeta(sessionId);
   db.prepare("INSERT OR IGNORE INTO session_meta (session_id, harness, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, observed_safe_input_tokens, cache_alert_sent, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(sessionId, getHarness(), defaults.lastResponseTime, defaults.cacheTtl, defaults.counter, defaults.lastNudgeTokens, defaults.lastNudgeBand ?? "", defaults.lastTransformError ?? "", initialIsSubagent ? 1 : 0, defaults.lastContextPercentage, defaults.lastInputTokens, defaults.observedSafeInputTokens, defaults.cacheAlertSent ? 1 : 0, defaults.timesExecuteThresholdReached, defaults.compartmentInProgress ? 1 : 0, defaults.systemPromptHash ?? "", defaults.clearedReasoningThroughTag);
 }
@@ -3765,6 +3770,10 @@ function clearCachedM0M1(db, sessionId) {
 // ../plugin/src/features/magic-context/storage-replay-document.ts
 var CAS_RETRY_LIMIT = 5;
 var MISSING_REPLAY_DOCUMENT_COLUMN = Symbol("missing replay document column");
+function isRustMarkerAdmissionFenced(db, sessionId) {
+  const row = db.prepare("SELECT COALESCE(json_extract(NULLIF(trailing_blank_decisions, ''), '$.rustMarkerAdmissionFence'), 0) AS fenced FROM session_meta WHERE session_id=?").get(sessionId);
+  return row?.fenced === 1;
+}
 function isPersistedTrailingBlankDecision(value) {
   if (value === "keep" || value === "strip")
     return true;
@@ -5431,34 +5440,61 @@ function decode(row) {
   }
   return { ...row, data };
 }
-
+function connect(path, identity = "") {
+  const db = new Database(path, { readonly: true, fileMustExist: true });
+  try {
+    assertOpenCodeStoreGeneration(db, "v2", path);
+  } catch (error) {
+    db.close();
+    throw error;
+  }
+  const counters = debugCounters();
+  counters.openReaders += 1;
+  counters.readersOpened += 1;
+  counters.maxOpenReaders = Math.max(counters.maxOpenReaders, counters.openReaders);
+  return { db, statements: new Map, identity, leases: 0, retired: false };
+}
+function closeConnection(connection) {
+  connection.statements.clear();
+  try {
+    connection.db.close();
+  } finally {
+    const counters = debugCounters();
+    counters.openReaders = Math.max(0, counters.openReaders - 1);
+    counters.readersClosed += 1;
+  }
+}
 class V2StoreReader {
+  pool;
   db;
+  connection;
   closed = false;
-  constructor(path) {
-    this.db = new Database(path, { readonly: true, fileMustExist: true });
-    try {
-      assertOpenCodeStoreGeneration(this.db, "v2", path);
-    } catch (error) {
-      this.db.close();
-      throw error;
+  constructor(path, pool) {
+    this.pool = pool;
+    this.connection = pool ? pool.acquire(path) : connect(path);
+    this.db = this.connection.db;
+  }
+  prepare(sql) {
+    if (this.closed)
+      throw new Error("Store reader is closed");
+    const statements = this.connection.statements;
+    let statement = statements.get(sql);
+    if (!statement) {
+      statement = this.db.prepare(sql);
+      if (statements.size >= 128)
+        statements.clear();
+      statements.set(sql, statement);
     }
-    const counters = debugCounters();
-    counters.openReaders += 1;
-    counters.readersOpened += 1;
-    counters.maxOpenReaders = Math.max(counters.maxOpenReaders, counters.openReaders);
+    return statement;
   }
   close() {
     if (this.closed)
       return;
     this.closed = true;
-    try {
-      this.db.close();
-    } finally {
-      const counters = debugCounters();
-      counters.openReaders = Math.max(0, counters.openReaders - 1);
-      counters.readersClosed += 1;
-    }
+    if (this.pool)
+      this.pool.release(this.connection);
+    else
+      closeConnection(this.connection);
   }
   page(sessionID, options = {}) {
     return trackDecodeOperation("page", () => {
@@ -5480,7 +5516,7 @@ class V2StoreReader {
         predicates.push("type = ?");
         parameters.push(options.type);
       }
-      const rows = this.db.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+      const rows = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
                         WHERE ${predicates.join(" AND ")}
                         ORDER BY seq ASC LIMIT ?`).all(...parameters, limit).map(decode);
       return { rows, cursor: rows.at(-1)?.seq };
@@ -5498,46 +5534,56 @@ class V2StoreReader {
       if (pageSize <= 0)
         return [];
       if (after) {
-        const anchor = this.db.prepare("SELECT seq FROM session_message WHERE session_id = ? AND id = ?").get(sessionID, after.id);
+        const anchor = this.prepare("SELECT seq FROM session_message WHERE session_id = ? AND id = ?").get(sessionID, after.id);
         if (anchor) {
-          return this.db.prepare(`SELECT id, session_id, type, seq, time_created, data
+          return this.prepare(`SELECT id, session_id, type, seq, time_created, data
                         FROM session_message WHERE session_id = ? AND seq > ?
                         AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS}) ORDER BY seq ASC LIMIT ?`).all(sessionID, anchor.seq, ...RAW_MESSAGE_TYPES, pageSize).map(decode);
         }
       }
       const maximumSeq = Number.MAX_SAFE_INTEGER;
-      const rows = this.db.prepare(V2_MESSAGE_PAGE_SQL).all(afterOrdinal, sessionID, ...RAW_MESSAGE_TYPES, Math.max(0, afterOrdinal - 1), sessionID, ...RAW_MESSAGE_TYPES, finalWatermark - 1, maximumSeq, sessionID, ...RAW_MESSAGE_TYPES, pageSize);
+      const rows = this.prepare(V2_MESSAGE_PAGE_SQL).all(afterOrdinal, sessionID, ...RAW_MESSAGE_TYPES, Math.max(0, afterOrdinal - 1), sessionID, ...RAW_MESSAGE_TYPES, finalWatermark - 1, maximumSeq, sessionID, ...RAW_MESSAGE_TYPES, pageSize);
       return rows.map(decode);
     });
   }
   messageCount(sessionID) {
     return trackDecodeOperation("messageCount", () => {
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.db.prepare(`SELECT COUNT(*) AS count FROM session_message
+      const row = this.prepare(`SELECT COUNT(*) AS count FROM session_message
                      WHERE session_id = ? AND type IN (${rawTypes})`).get(sessionID, ...RAW_MESSAGE_TYPES);
       return typeof row?.count === "number" ? row.count : 0;
     });
   }
   sessionDirectoryPage(afterSessionID, limit) {
-    const rows = this.db.prepare(`SELECT id, COALESCE(directory, '') AS directory FROM session_v2
+    const rows = this.prepare(`SELECT id, COALESCE(directory, '') AS directory FROM session_v2
                  WHERE id > ? ORDER BY id ASC LIMIT ?`).all(afterSessionID ?? "", limit);
     return rows.map((row) => ({ sessionId: row.id, directory: row.directory }));
   }
   latestMessageTime(sessionID) {
-    const row = this.db.prepare("SELECT MAX(time_created) AS time FROM session_message WHERE session_id = ?").get(sessionID);
+    const row = this.prepare("SELECT MAX(time_created) AS time FROM session_message WHERE session_id = ?").get(sessionID);
     return row?.time ?? undefined;
   }
   isSubagent(sessionID) {
-    const row = this.db.prepare("SELECT parent_id FROM session_v2 WHERE id = ?").get(sessionID);
+    const row = this.prepare("SELECT parent_id FROM session_v2 WHERE id = ?").get(sessionID);
     if (!row)
       return null;
     return typeof row.parent_id === "string" && row.parent_id.length > 0;
   }
+  latestRootSessionInDirectory(directory) {
+    const columns = new Set(this.prepare("PRAGMA table_info(session_v2)").all().map((column) => column.name));
+    const archived = columns.has("time_archived") ? " AND time_archived IS NULL" : "";
+    const order = columns.has("time_updated") ? "time_updated DESC, id DESC" : "id DESC";
+    const row = this.prepare(`SELECT id FROM session_v2
+                 WHERE directory = ? AND parent_id IS NULL${archived}
+                   AND COALESCE(json_extract(metadata, '$.magic_context'), '') <> 'hidden-run'
+                 ORDER BY ${order} LIMIT 1`).get(directory);
+    return row?.id;
+  }
   rootSessionActivity(sessionIDs) {
     const roots = new Map;
     for (let offset = 0;offset < sessionIDs.length; offset += 500) {
       const chunk = sessionIDs.slice(offset, offset + 500);
-      const rows = this.db.prepare(`SELECT id, (
+      const rows = this.prepare(`SELECT id, (
                     SELECT MAX(time_created) FROM session_message
                     WHERE session_id = session_v2.id AND type = 'user'
                 ) AS time FROM session_v2
@@ -5554,7 +5600,7 @@ class V2StoreReader {
     const result = new Map;
     for (let offset = 0;offset < sessionIDs.length; offset += 500) {
       const chunk = sessionIDs.slice(offset, offset + 500);
-      const rows = this.db.prepare(`SELECT session_id, MIN(time_created) AS time FROM session_message
+      const rows = this.prepare(`SELECT session_id, MIN(time_created) AS time FROM session_message
                 WHERE type = 'user' AND time_created > ? AND session_id IN (${chunk.map(() => "?").join(",")})
                 GROUP BY session_id`).all(sinceMs, ...chunk);
       for (const row of rows)
@@ -5571,7 +5617,7 @@ class V2StoreReader {
     const direction = before ? "DESC" : "ASC";
     const head = Math.floor((maxChars - truncationMarker.length) / 2);
     const tail = maxChars - truncationMarker.length - head;
-    return this.db.prepare(`WITH users AS (
+    return this.prepare(`WITH users AS (
             SELECT seq, time_created, data FROM session_message
             WHERE session_id = ? AND type = 'user' AND time_created ${before ? "<=" : ">"} ?
             ORDER BY time_created ${direction}, seq ${direction} LIMIT ?
@@ -5591,14 +5637,14 @@ class V2StoreReader {
   }
   storedMessageCount(sessionID) {
     return trackDecodeOperation("storedMessageCount", () => {
-      const row = this.db.prepare("SELECT COUNT(*) AS count FROM session_message WHERE session_id = ?").get(sessionID);
+      const row = this.prepare("SELECT COUNT(*) AS count FROM session_message WHERE session_id = ?").get(sessionID);
       return typeof row?.count === "number" ? row.count : 0;
     });
   }
   messageById(sessionID, id) {
     return trackDecodeOperation("messageById", () => {
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.db.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+      const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
                      WHERE session_id = ? AND id = ? AND type IN (${rawTypes}) LIMIT 1`).get(sessionID, id, ...RAW_MESSAGE_TYPES);
       return row ? decode(row) : null;
     });
@@ -5606,7 +5652,7 @@ class V2StoreReader {
   messageExistsById(sessionID, id) {
     return trackDecodeOperation("messageExistsById", () => {
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.db.prepare(`SELECT 1 FROM session_message
+      const row = this.prepare(`SELECT 1 FROM session_message
                      WHERE id = ? AND session_id = ? AND type IN (${rawTypes}) LIMIT 1`).get(id, sessionID, ...RAW_MESSAGE_TYPES);
       return row != null;
     });
@@ -5614,7 +5660,7 @@ class V2StoreReader {
   messageOrdinalById(sessionID, id) {
     return trackDecodeOperation("messageOrdinalById", () => {
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.db.prepare(`WITH target AS (
+      const row = this.prepare(`WITH target AS (
                         SELECT seq FROM session_message
                         WHERE session_id = ? AND id = ? AND type IN (${rawTypes})
                         LIMIT 1
@@ -5636,7 +5682,7 @@ class V2StoreReader {
       if (!Number.isSafeInteger(toOrdinal) || toOrdinal < fromOrdinal)
         throw new Error("Invalid raw-message range end");
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const rows = this.db.prepare(`SELECT id FROM session_message
+      const rows = this.prepare(`SELECT id FROM session_message
                      WHERE session_id = ? AND type IN (${rawTypes})
                      ORDER BY seq ASC LIMIT ? OFFSET ?`).all(sessionID, ...RAW_MESSAGE_TYPES, toOrdinal - fromOrdinal + 1, fromOrdinal - 1);
       return new Map(rows.map((row, index) => [row.id, fromOrdinal + index]));
@@ -5646,10 +5692,10 @@ class V2StoreReader {
     return trackDecodeOperation("messageOrdinalPage", () => {
       if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1e4)
         throw new Error("Invalid page limit");
-      const rows = after ? this.db.prepare(`SELECT id, type, seq, json_valid(data) AS valid
+      const rows = after ? this.prepare(`SELECT id, type, seq, json_valid(data) AS valid
                                FROM session_message
                                WHERE session_id = ? AND (seq > ? OR (seq = ? AND id > ?))
-                               ORDER BY seq ASC, id ASC LIMIT ?`).all(sessionID, after.timeCreated, after.timeCreated, after.id, limit) : this.db.prepare(`SELECT id, type, seq, json_valid(data) AS valid
+                               ORDER BY seq ASC, id ASC LIMIT ?`).all(sessionID, after.timeCreated, after.timeCreated, after.id, limit) : this.prepare(`SELECT id, type, seq, json_valid(data) AS valid
                                FROM session_message
                                WHERE session_id = ?
                                ORDER BY seq ASC, id ASC LIMIT ?`).all(sessionID, limit);
@@ -5668,7 +5714,7 @@ class V2StoreReader {
   spanRowStamps(sessionID, after, through) {
     if (!Number.isSafeInteger(after) || !Number.isSafeInteger(through))
       throw new Error("Invalid seq span");
-    const rows = this.db.prepare(`SELECT seq, id, time_updated AS updated, length(CAST(data AS BLOB)) AS bytes
+    const rows = this.prepare(`SELECT seq, id, time_updated AS updated, length(CAST(data AS BLOB)) AS bytes
                  FROM session_message WHERE session_id = ? AND seq > ? AND seq <= ?
                  ORDER BY seq ASC`).all(sessionID, after, through);
     const stamps = new Map;
@@ -5683,7 +5729,7 @@ class V2StoreReader {
       if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1e4)
         throw new Error("Invalid page limit");
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      return this.db.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+      return this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
                          WHERE session_id = ? AND type IN (${rawTypes}) AND seq <= ?
                          ORDER BY seq DESC LIMIT ?`).all(sessionID, ...RAW_MESSAGE_TYPES, throughSeq, limit).map(decode);
     });
@@ -5691,14 +5737,18 @@ class V2StoreReader {
   sequenceForId(sessionID, id) {
     if (!id)
       return;
-    const row = this.db.prepare("SELECT seq FROM session_message WHERE session_id = ? AND id = ? LIMIT 1").get(sessionID, id);
+    const row = this.prepare("SELECT seq FROM session_message WHERE session_id = ? AND id = ? LIMIT 1").get(sessionID, id);
     return typeof row?.seq === "number" ? row.seq : undefined;
   }
+  syntheticMessageIDs(sessionID) {
+    const rows = this.prepare("SELECT id FROM session_message WHERE session_id = ? AND type = 'synthetic'").all(sessionID);
+    return new Set(rows.map((row) => row.id));
+  }
   forkOrigin(sessionID) {
-    const columns = new Set(this.db.prepare("PRAGMA table_info(session_v2)").all().map((column) => column.name));
+    const columns = new Set(this.prepare("PRAGMA table_info(session_v2)").all().map((column) => column.name));
     if (!columns.has("fork_session_id") || !columns.has("fork_boundary"))
       return null;
-    const row = this.db.prepare("SELECT fork_session_id, fork_boundary FROM session_v2 WHERE id = ?").get(sessionID);
+    const row = this.prepare("SELECT fork_session_id, fork_boundary FROM session_v2 WHERE id = ?").get(sessionID);
     if (!row?.fork_session_id || !row.fork_boundary)
       return null;
     try {
@@ -5714,17 +5764,17 @@ class V2StoreReader {
     }
   }
   sessionExists(sessionID) {
-    return this.db.prepare("SELECT 1 FROM session_v2 WHERE id = ?").get(sessionID) != null;
+    return this.prepare("SELECT 1 FROM session_v2 WHERE id = ?").get(sessionID) != null;
   }
   rowStampsThrough(sessionID, throughSeq) {
-    return this.db.prepare(`SELECT id, type, seq, time_created FROM session_message
+    return this.prepare(`SELECT id, type, seq, time_created FROM session_message
                  WHERE session_id = ? AND seq <= ? ORDER BY seq ASC`).all(sessionID, throughSeq);
   }
   latestSequenceForIds(sessionID, ids) {
     let latest = -1;
     for (let offset = 0;offset < ids.length; offset += 500) {
       const chunk = ids.slice(offset, offset + 500);
-      const row = this.db.prepare(`SELECT MAX(seq) AS seq FROM session_message
+      const row = this.prepare(`SELECT MAX(seq) AS seq FROM session_message
                      WHERE session_id = ? AND id IN (${chunk.map(() => "?").join(", ")})`).get(sessionID, ...chunk);
       if (typeof row?.seq === "number")
         latest = Math.max(latest, row.seq);
@@ -5732,7 +5782,7 @@ class V2StoreReader {
     return latest;
   }
   compactionByStatus(sessionID, status) {
-    const row = this.db.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+    const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
                 WHERE session_id = ? AND type = 'compaction'
                   AND json_extract(data, '$.status') = ?
                 ORDER BY seq DESC LIMIT 1`).get(sessionID, status);
@@ -5748,16 +5798,16 @@ class V2StoreReader {
     return trackDecodeOperation("idleRows", () => this.all(sessionID, after, "idle"));
   }
   earliestSequence(sessionID) {
-    const row = this.db.prepare("SELECT MIN(seq) AS seq FROM session_message WHERE session_id = ?").get(sessionID);
+    const row = this.prepare("SELECT MIN(seq) AS seq FROM session_message WHERE session_id = ?").get(sessionID);
     return typeof row?.seq === "number" ? row.seq : undefined;
   }
   latestSequence(sessionID) {
-    const row = this.db.prepare("SELECT MAX(seq) AS seq FROM session_message WHERE session_id = ?").get(sessionID);
+    const row = this.prepare("SELECT MAX(seq) AS seq FROM session_message WHERE session_id = ?").get(sessionID);
     return typeof row?.seq === "number" ? row.seq : -1;
   }
   assistantSince(sessionID, afterSeq) {
     return trackDecodeOperation("assistantSince", () => {
-      const rows = this.db.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+      const rows = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
                     WHERE session_id = ? AND type = 'assistant' AND seq > ?
                     ORDER BY seq ASC`).all(sessionID, afterSeq);
       return rows.map((row) => decode(row));
@@ -5765,7 +5815,7 @@ class V2StoreReader {
   }
   latestAssistant(sessionID) {
     return trackDecodeOperation("latestAssistant", () => {
-      const row = this.db.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+      const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
                     WHERE session_id = ? AND type = 'assistant'
                     ORDER BY seq DESC LIMIT 1`).get(sessionID);
       return row ? decode(row) : undefined;
@@ -5773,7 +5823,7 @@ class V2StoreReader {
   }
   latestIdle(sessionID) {
     return trackDecodeOperation("latestIdle", () => {
-      const row = this.db.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+      const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
                     WHERE session_id = ? AND type = 'idle'
                     ORDER BY seq DESC LIMIT 1`).get(sessionID);
       return row ? decode(row) : undefined;
@@ -6919,6 +6969,10 @@ var SESSION_SCOPED_TABLES = [
   { table: "tool_owner_backfill_state" },
   { table: "tags", harnessScoped: true },
   { table: "session_meta", harnessScoped: true },
+  {
+    table: "temporal_decisions",
+    extraPredicate: "NOT EXISTS (SELECT 1 FROM session_meta AS remaining WHERE remaining.session_id = temporal_decisions.session_id)"
+  },
   {
     table: "session_replay_decisions",
     extraPredicate: "NOT EXISTS (SELECT 1 FROM session_meta AS remaining WHERE remaining.session_id = session_replay_decisions.session_id)"
@@ -7158,6 +7212,19 @@ function clearSession(db, sessionId, rustModuleCleanupAcknowledged = false) {
   }).immediate()));
   logSlowWriteTransaction("clear-session", transactionStartedAt);
 }
+// ../plugin/src/shared/provider-response-completion.ts
+function providerResponseFailed(input) {
+  if (input.error !== undefined && input.error !== null && input.error !== "")
+    return true;
+  const finish = typeof input.finish === "string" ? input.finish.trim().toLowerCase() : "";
+  return ["error", "failed", "abort", "aborted", "interrupted", "cancelled", "canceled"].includes(finish);
+}
+function isSuccessfulProviderCompletion(input) {
+  if (providerResponseFailed(input))
+    return false;
+  return typeof input.completedAt === "number" && Number.isFinite(input.completedAt) && input.completedAt > 0 || typeof input.finish === "string" && input.finish.trim().length > 0;
+}
+
 // ../plugin/src/hooks/magic-context/embed-session-state.ts
 var embedPauseBySession = new Set;
 var embedRunStateBySession = new Map;
@@ -7372,7 +7439,31 @@ function toCompartment(row) {
   };
 }
 function getCompartments(db, sessionId) {
-  const rows = db.prepare("SELECT * FROM compartments WHERE session_id = ? ORDER BY sequence ASC").all(sessionId).filter(isCompartmentRow);
+  const presentColumns = getTableColumnNames(db, "compartments");
+  const columns = [
+    "id",
+    "session_id",
+    "sequence",
+    "start_message",
+    "end_message",
+    "start_message_id",
+    "end_message_id",
+    "start_block_index",
+    "end_block_index",
+    "title",
+    "content",
+    "p1",
+    "p2",
+    "p3",
+    "p4",
+    "importance",
+    "episode_type",
+    "legacy",
+    "created_at",
+    "rebase_status"
+  ].filter((column) => presentColumns.has(column));
+  const rows = db.prepare(`SELECT ${columns.length ? columns.join(", ") : "NULL AS id"}
+            FROM compartments WHERE session_id = ? ORDER BY sequence ASC`).all(sessionId).filter(isCompartmentRow);
   return rows.map(toCompartment);
 }
 function getLastCompartmentEndMessage(db, sessionId) {
@@ -7486,8 +7577,25 @@ function escapeXmlAttr(s) {
 function escapeXmlContent(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-function hasPartialCompartmentEndThrough(db, sessionId, endOrdinal) {
-  return Boolean(db.prepare("SELECT 1 FROM compartments WHERE session_id=? AND end_message<=? AND end_block_index IS NOT NULL LIMIT 1").get(sessionId, endOrdinal));
+function getUncoveredCompartmentEndThrough(db, sessionId, endOrdinal = Number.MAX_SAFE_INTEGER) {
+  const end = getUncoveredCompartmentEndsThrough(db, sessionId, endOrdinal)[0];
+  return end ? { endMessageId: end.endMessageId, endMessage: end.endMessage } : null;
+}
+function getUncoveredCompartmentEndsThrough(db, sessionId, endOrdinal = Number.MAX_SAFE_INTEGER, afterOrdinal = -1) {
+  const rows = db.prepare(`SELECT k.end_message_id, k.end_message,
+                n.start_message_id AS successor_id, n.start_message AS successor_start FROM compartments k
+         LEFT JOIN compartments n ON n.session_id = k.session_id AND n.sequence = k.sequence + 1
+         WHERE k.session_id = ?1 AND k.end_message <= ?2 AND k.end_message > ?3 AND k.end_block_index IS NOT NULL
+           AND NOT COALESCE(n.sequence IS NOT NULL AND (
+               (n.start_message_id = k.end_message_id AND n.start_block_index > k.end_block_index)
+               OR n.start_message = k.end_message + 1), 0)
+         ORDER BY k.sequence`).all(sessionId, endOrdinal, afterOrdinal);
+  return rows.map((row) => ({
+    endMessageId: row.end_message_id,
+    endMessage: row.end_message,
+    successorStartMessageId: row.successor_id,
+    successorStartMessage: row.successor_start
+  }));
 }
 function isPartialCompartmentEnd(db, sessionId, messageId) {
   return Boolean(db.prepare("SELECT 1 FROM compartments WHERE session_id=? AND end_message_id=? AND end_block_index IS NOT NULL LIMIT 1").get(sessionId, messageId));
@@ -7859,7 +7967,7 @@ function indexItemsAfterOrdinal(db, sessionId, items, finalWatermark, toSource)
   return inserted;
 }
 function harnessSupportsOpenCodeOrphanSweep(harness) {
-  return harness === "opencode" || harness === "opencode2";
+  return harness === "opencode";
 }
 function getMessageHistoryOrphanSweepState(db, harness) {
   return db.prepare("SELECT cursor_session_id, last_swept_at FROM message_history_orphan_sweep WHERE harness = ?").get(harness) ?? {};
@@ -7895,6 +8003,15 @@ function sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCod
   }
   if (!harnessSupportsOpenCodeOrphanSweep(harness)) {
     persistMessageHistoryOrphanSweepState(db, cursor, now + unavailableReprobeMs - cooldownMs, harness);
+    if (harness === "opencode2") {
+      return {
+        status: "unavailable",
+        scanned: 0,
+        deleted: 0,
+        cursor,
+        reason: "OpenCode 2 keeps its sessions in session_v2, which this sweep does not read"
+      };
+    }
     return { status: "unavailable", scanned: 0, deleted: 0, cursor };
   }
   let openCodeDb = null;
@@ -8141,6 +8258,14 @@ class BoundedSessionMap {
   }
 }
 
+// ../plugin/src/hooks/magic-context/lkg-measured-request.ts
+var requests = new BoundedSessionMap(1000);
+var claimedRequests = new WeakSet;
+var captures = new BoundedSessionMap(1000);
+function clearCapturedLkgMeasurement(sessionId) {
+  captures.delete(sessionId);
+}
+
 // ../plugin/src/hooks/magic-context/lkg-slot.ts
 var LKG_TOTAL_BYTES = 64 * 1024 * 1024;
 var LKG_SINGLE_SLOT_BYTES = 24 * 1024 * 1024;
@@ -8256,6 +8381,35 @@ function lkgContentDigestFromFields(fields) {
   }
   return hash.digest("base64url");
 }
+var digestMemo = new Map;
+var DIGEST_MEMO_MAX_BYTES = 16 * 1024 * 1024;
+var digestMemoBytes = 0;
+function memoizedLkgContentDigestFromFields(id, fields) {
+  const prior = digestMemo.get(id);
+  if (prior && equalContentFields(fields, prior.fields)) {
+    digestMemo.delete(id);
+    digestMemo.set(id, prior);
+    return prior.digest;
+  }
+  const digest = lkgContentDigestFromFields(fields);
+  if (prior) {
+    digestMemo.delete(id);
+    digestMemoBytes -= prior.bytes;
+  }
+  const bytes = 128 + id.length * 2 + fields.reduce((sum, field) => sum + 16 + (typeof field === "string" ? field.length * 2 : 0), 0);
+  if (bytes <= DIGEST_MEMO_MAX_BYTES) {
+    while (digestMemoBytes + bytes > DIGEST_MEMO_MAX_BYTES || digestMemo.size >= 20000) {
+      const oldest = digestMemo.entries().next().value;
+      if (!oldest)
+        break;
+      digestMemo.delete(oldest[0]);
+      digestMemoBytes -= oldest[1].bytes;
+    }
+    digestMemo.set(id, { fields: [...fields], digest, bytes });
+    digestMemoBytes += bytes;
+  }
+  return digest;
+}
 function equalContentFields(left, right) {
   if (left === right)
     return true;
@@ -8295,10 +8449,6 @@ function incrementalLkgContentDigests(entries, prior) {
   }
   return { digests, reusedPrefix };
 }
-function lkgContentDigest(message) {
-  const fields = lkgContentFields(message);
-  return fields ? lkgContentDigestFromFields(fields) : null;
-}
 function touch(sessionId, entry) {
   lkgHeapHolder.entries.delete(sessionId);
   lkgHeapHolder.entries.set(sessionId, entry);
@@ -8430,6 +8580,10 @@ function copySlotForRead(slot) {
     inputContentSignatures: slot.inputContentSignatures ? [...slot.inputContentSignatures] : undefined
   };
 }
+function getInMemorySlot(sessionId) {
+  const entry = lkgHeapHolder.entries.get(sessionId);
+  return entry ? copySlotForRead(entry.slot) : undefined;
+}
 function getSlot(sessionId) {
   const entry = lkgHeapHolder.entries.get(sessionId);
   if (!entry) {
@@ -8444,12 +8598,16 @@ function getSlot(sessionId) {
   touch(sessionId, entry);
   return copySlotForRead(entry.slot);
 }
-function dropSlot(sessionId, _reason) {
+function forgetInMemorySlot(sessionId) {
   const entry = lkgHeapHolder.entries.get(sessionId);
   if (entry) {
     lkgHeapHolder.entries.delete(sessionId);
     totalBytes -= entry.bytes;
   }
+}
+function dropSlot(sessionId, _reason) {
+  clearCapturedLkgMeasurement(sessionId);
+  forgetInMemorySlot(sessionId);
   const backend = persistenceBackend;
   if (!backend)
     return;
@@ -8473,7 +8631,10 @@ function noteEntry(sessionId, messages) {
   const anchorIndex = entryInputIds.indexOf(slot.lastInputMessageId);
   if (anchorIndex < 0)
     return null;
-  const entryContentDigests = messages.slice(0, anchorIndex + 1).map((message) => lkgContentDigest(message));
+  const entryContentDigests = messages.slice(0, anchorIndex + 1).map((message, index) => {
+    const fields = lkgContentFields(message);
+    return fields ? memoizedLkgContentDigestFromFields(entryInputIds[index] ?? "", fields) : null;
+  });
   if (entryContentDigests.some((digest) => digest === null))
     return null;
   const pristineTail = structuredClone(messages.slice(anchorIndex + 1));
@@ -8927,7 +9088,8 @@ function clampWatermark(value, maxCopiedTag) {
 }
 function copySessionStateForClone(db, sourceSessionId, destinationSessionId, filter) {
   return runImmediate(db, () => {
-    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0 || filter.copySessionNotesAndFacts === true && (tableExists(db, "notes") && countRows(db, "notes", destinationSessionId) > 0 || tableExists(db, "session_facts") && countRows(db, "session_facts", destinationSessionId) > 0)) {
+    const hasTemporalDecisions = tableExists(db, "temporal_decisions");
+    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0 || hasTemporalDecisions && countRows(db, "temporal_decisions", destinationSessionId) > 0 || filter.copySessionNotesAndFacts === true && (tableExists(db, "notes") && countRows(db, "notes", destinationSessionId) > 0 || tableExists(db, "session_facts") && countRows(db, "session_facts", destinationSessionId) > 0)) {
       return {
         kind: "destination-not-empty",
         compartmentsCopied: 0,
@@ -9019,6 +9181,14 @@ function copySessionStateForClone(db, sourceSessionId, destinationSessionId, fil
         insertPendingOp.run(destinationSessionId, row.tag_id, row.operation, row.queued_at, row.harness);
       }
     }
+    if (hasTemporalDecisions) {
+      const temporalRows = db.prepare("SELECT message_id,marker FROM temporal_decisions WHERE session_id=?").all(sourceSessionId);
+      const insertTemporal = db.prepare("INSERT INTO temporal_decisions(session_id,message_id,marker) VALUES (?,?,?)");
+      for (const row of temporalRows) {
+        if (filter.includeMessageId(row.message_id))
+          insertTemporal.run(destinationSessionId, mapMessageId(filter, row.message_id), row.marker);
+      }
+    }
     const inherited = filter.copySessionNotesAndFacts === true ? copyPiSessionNotesAndFacts(db, sourceSessionId, destinationSessionId, filter) : { notesCopied: 0, factsCopied: 0 };
     const meta = db.prepare(`SELECT cleared_reasoning_through_tag, tool_reclaim_watermark,
                         pi_stable_id_scheme, stripped_placeholder_ids,
@@ -9552,89 +9722,6 @@ function markNoteChecked(db, noteId) {
   const now = Date.now();
   db.prepare("UPDATE notes SET last_checked_at = ?, updated_at = ? WHERE id = ? AND type = 'smart'").run(now, now, noteId);
 }
-// ../plugin/src/features/magic-context/storage-ops.ts
-var queuePendingOpStatements = new WeakMap;
-var getPendingOpsStatements = new WeakMap;
-var getPendingOpsCountStatements = new WeakMap;
-var clearPendingOpsStatements = new WeakMap;
-var removePendingOpStatements = new WeakMap;
-function getQueuePendingOpStatement(db) {
-  let stmt = queuePendingOpStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("INSERT INTO pending_ops (session_id, tag_id, operation, queued_at, harness) VALUES (?, ?, ?, ?, ?)");
-    queuePendingOpStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getPendingOpsStatement(db) {
-  let stmt = getPendingOpsStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT id, session_id, tag_id, operation, queued_at FROM pending_ops WHERE session_id = ? ORDER BY queued_at ASC, id ASC");
-    getPendingOpsStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getClearPendingOpsStatement(db) {
-  let stmt = clearPendingOpsStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM pending_ops WHERE session_id = ?");
-    clearPendingOpsStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getRemovePendingOpStatement(db) {
-  let stmt = removePendingOpStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?");
-    removePendingOpStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function isPendingOpRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.id === "number" && typeof r.session_id === "string" && typeof r.tag_id === "number" && typeof r.operation === "string" && typeof r.queued_at === "number";
-}
-function toPendingOp(row) {
-  if (row.operation !== "drop") {
-    sessionLog(row.session_id, `unknown pending operation "${row.operation}"; ignoring`);
-    return null;
-  }
-  return {
-    id: row.id,
-    sessionId: row.session_id,
-    tagId: row.tag_id,
-    operation: row.operation,
-    queuedAt: row.queued_at
-  };
-}
-function queuePendingOp(db, sessionId, tagId, operation, queuedAt = Date.now()) {
-  getQueuePendingOpStatement(db).run(sessionId, tagId, operation, queuedAt, getHarness());
-}
-function getPendingOps(db, sessionId) {
-  const rows = getPendingOpsStatement(db).all(sessionId).filter(isPendingOpRow);
-  return rows.map(toPendingOp).filter((op) => op !== null);
-}
-function getPendingOpsCount(db, sessionId) {
-  try {
-    let statement = getPendingOpsCountStatements.get(db);
-    if (!statement) {
-      statement = db.prepare("SELECT COUNT(*) AS count FROM pending_ops WHERE session_id = ?");
-      getPendingOpsCountStatements.set(db, statement);
-    }
-    const row = statement.get(sessionId);
-    return typeof row?.count === "number" && Number.isFinite(row.count) ? row.count : null;
-  } catch {
-    return null;
-  }
-}
-function clearPendingOps(db, sessionId) {
-  getClearPendingOpsStatement(db).run(sessionId);
-}
-function removePendingOp(db, sessionId, tagId) {
-  getRemovePendingOpStatement(db).run(sessionId, tagId);
-}
 // ../plugin/src/features/magic-context/storage-primers.ts
 var PRIMER_CANDIDATE_TTL_MS = 90 * 24 * 60 * 60 * 1000;
 var PRIMER_CANDIDATE_MAX_AGE_MS = 180 * 24 * 60 * 60 * 1000;
@@ -9925,6 +10012,7 @@ function bumpProjectUserProfileVersion(db, projectPath = GLOBAL_USER_PROFILE_PRO
   return state;
 }
 // ../plugin/src/features/magic-context/storage-source.ts
+var sourceReadStatements = new WeakMap;
 function isSourceContentRow(row) {
   if (row === null || typeof row !== "object")
     return false;
@@ -9938,8 +10026,12 @@ function getSourceContents(db, sessionId, tagIds) {
   if (tagIds.length === 0) {
     return new Map;
   }
-  const placeholders = tagIds.map(() => "?").join(", ");
-  const rows = db.prepare(`SELECT tag_id, content FROM source_contents WHERE session_id = ? AND tag_id IN (${placeholders})`).all(sessionId, ...tagIds).filter(isSourceContentRow);
+  let statement = sourceReadStatements.get(db);
+  if (!statement) {
+    statement = db.prepare("SELECT tag_id, content FROM source_contents WHERE session_id = ? AND tag_id IN (SELECT value FROM json_each(?))");
+    sourceReadStatements.set(db, statement);
+  }
+  const rows = statement.all(sessionId, JSON.stringify(tagIds)).filter(isSourceContentRow);
   const sources = new Map;
   for (const row of rows) {
     sources.set(row.tag_id, row.content);
@@ -10319,752 +10411,424 @@ function createPromptSurfaceGuidanceEpochCache(runtime) {
   return cache;
 }
 
-// src/read-session-pi.ts
-var SYNTH_USER_ID_PREFIX = "synth-user-";
-function resolvePiStableId(msg, index, entryIds, entryIdByRef) {
-  if (!msg || typeof msg !== "object")
-    return;
-  const byRef = entryIdByRef?.get(msg);
-  if (typeof byRef === "string" && byRef.length > 0)
-    return byRef;
-  const positional = entryIds?.[index];
-  if (typeof positional === "string" && positional.length > 0)
-    return positional;
-  const m = msg;
-  const role = m.role ?? "unknown";
-  return typeof m.timestamp === "number" ? `pi-msg-${index}-${m.timestamp}-${role}` : `pi-msg-${index}-${role}`;
+// ../plugin/src/config/prune-config-leaf.ts
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function readPiSessionSnapshot(ctx) {
-  const sm = ctx.sessionManager;
-  if (sm === undefined)
-    return { branchEntries: [], rawMessages: [] };
-  const getBranch = sm.getBranch;
-  if (typeof getBranch !== "function")
-    return { branchEntries: [], rawMessages: [] };
-  let entries;
-  try {
-    entries = getBranch.call(sm);
-  } catch {
-    return { branchEntries: [], rawMessages: [] };
+function pruneNestedConfigLeaf(block, relativePath) {
+  if (relativePath.length === 0)
+    return null;
+  const result = { ...block };
+  let cursor = result;
+  for (let i = 0;i < relativePath.length - 1; i++) {
+    const seg = String(relativePath[i]);
+    const child = cursor[seg];
+    if (!isPlainObject2(child)) {
+      if (!(seg in cursor))
+        return null;
+      delete cursor[seg];
+      return {
+        block: result,
+        removed: relativePath.slice(0, i + 1).map(String).join(".")
+      };
+    }
+    const clonedChild = { ...child };
+    cursor[seg] = clonedChild;
+    cursor = clonedChild;
   }
-  if (!Array.isArray(entries))
-    return { branchEntries: [], rawMessages: [] };
-  return {
-    branchEntries: entries,
-    rawMessages: convertEntriesToRawMessages(entries)
-  };
+  const leaf = String(relativePath[relativePath.length - 1]);
+  if (!(leaf in cursor))
+    return null;
+  delete cursor[leaf];
+  return { block: result, removed: relativePath.map(String).join(".") };
 }
-function readPiSessionMessages(ctx) {
-  return readPiSessionSnapshot(ctx).rawMessages;
+
+// src/config/index.ts
+import { existsSync as existsSync6 } from "node:fs";
+
+// ../plugin/src/config/migrate-dreamer-v2.ts
+var OLD_VERIFY_TASK = "verify";
+var OLD_CURATE_TASKS = ["consolidate", "archive-stale", "improve"];
+var RETIRED_OBJECT_MEMORY_TASKS = ["maintain-memory", ...OLD_CURATE_TASKS];
+var CANONICAL = [
+  "map-memories",
+  "verify",
+  "verify-broad",
+  "curate",
+  "classify-memories",
+  "retrospective",
+  "maintain-docs",
+  "evaluate-smart-notes",
+  "review-user-memories",
+  "promote-primers",
+  "refresh-primers"
+];
+var DEFAULT_BASE_CRON = "0 2 * * *";
+var DEFAULT_CLASSIFY_CRON = "0 6 * * *";
+var DEFAULT_RETROSPECTIVE_CRON = "0 5 * * *";
+var DEFAULT_VERIFY_BROAD_CRON = "0 4 * * 0";
+function windowToCron(schedule) {
+  if (typeof schedule !== "string")
+    return DEFAULT_BASE_CRON;
+  const m = /^(\d{1,2}):(\d{2})\s*-/.exec(schedule.trim());
+  if (!m)
+    return DEFAULT_BASE_CRON;
+  const hour = Number(m[1]);
+  const minute = Number(m[2]);
+  if (hour >= 24 || minute >= 60)
+    return DEFAULT_BASE_CRON;
+  return `${minute} ${hour} * * *`;
 }
-function readPiSessionMessagePage(ctx, afterOrdinal, limit, finalWatermark) {
-  const sessionManager = ctx.sessionManager;
-  const getBranch = sessionManager?.getBranch;
-  if (typeof getBranch !== "function")
-    return [];
-  try {
-    const entries = getBranch.call(sessionManager);
-    return Array.isArray(entries) ? convertEntriesToRawMessagePage(entries, afterOrdinal, limit, finalWatermark) : [];
-  } catch {
-    return [];
+function asObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : undefined;
+}
+function cronIntervalScore(schedule) {
+  const parts = schedule.trim().split(/\s+/);
+  if (parts.length !== 5)
+    return Number.POSITIVE_INFINITY;
+  const [minute, hour, dayOfMonth, month, dayOfWeek] = parts;
+  if (month !== "*")
+    return 366 * 24 * 60;
+  if (dayOfMonth !== "*")
+    return 31 * 24 * 60;
+  if (dayOfWeek !== "*")
+    return 7 * 24 * 60;
+  const everyHour = /^\*\/(\d+)$/.exec(hour ?? "");
+  if (everyHour)
+    return Math.max(1, Number(everyHour[1])) * 60;
+  if (hour === "*") {
+    const everyMinute = /^\*\/(\d+)$/.exec(minute ?? "");
+    return everyMinute ? Math.max(1, Number(everyMinute[1])) : 60;
   }
+  return 24 * 60;
 }
-function findLastModelKeyFromBranch(entries) {
-  if (!Array.isArray(entries))
-    return;
-  for (let i = entries.length - 1;i >= 0; i--) {
-    const e = entries[i];
-    if (!e || typeof e !== "object")
-      continue;
-    const v = e;
-    if (v.type !== "model_change")
+function mostFrequentSchedule(schedules) {
+  const enabled = schedules.map((s) => s.trim()).filter(Boolean);
+  if (enabled.length === 0)
+    return "";
+  return enabled.sort((a, b) => cronIntervalScore(a) - cronIntervalScore(b))[0] ?? "";
+}
+function withoutBroadInterval(entry) {
+  const { broad_interval_days: _broad, ...rest } = entry;
+  return rest;
+}
+function reconcileV2TasksObject(rawConfig, dreamer, tasksObject) {
+  const hasVerifyBroad = "verify-broad" in tasksObject;
+  const hasBroadIntervalAnywhere = Object.values(tasksObject).some((v) => asObject(v) && ("broad_interval_days" in v));
+  const hasStaleKeyFiles = "key-files" in tasksObject;
+  if (hasVerifyBroad && !hasBroadIntervalAnywhere && !hasStaleKeyFiles)
+    return rawConfig;
+  const nextTasks = {};
+  for (const [key, value] of Object.entries(tasksObject)) {
+    if (key === "key-files")
       continue;
-    if (typeof v.provider === "string" && v.provider.length > 0 && typeof v.modelId === "string" && v.modelId.length > 0) {
-      return `${v.provider}/${v.modelId}`;
-    }
+    const obj = asObject(value);
+    nextTasks[key] = obj ? withoutBroadInterval(obj) : value;
   }
-  return;
+  if (!hasVerifyBroad) {
+    const verify = asObject(tasksObject.verify);
+    const verifyEnabled = typeof verify?.schedule === "string" && verify.schedule.trim() !== "";
+    nextTasks["verify-broad"] = {
+      schedule: verifyEnabled ? DEFAULT_VERIFY_BROAD_CRON : ""
+    };
+  }
+  return { ...rawConfig, dreamer: { ...dreamer, tasks: nextTasks } };
 }
-function findRestartModelSeedFromBranch(entries) {
-  if (!Array.isArray(entries))
-    return;
-  let switchedAfterLastReply = false;
-  for (let i = entries.length - 1;i >= 0; i--) {
-    const e = entries[i];
-    if (e?.type === "model_change") {
-      if (typeof e.provider === "string" && typeof e.modelId === "string")
-        switchedAfterLastReply = true;
-      continue;
-    }
-    if (e?.type !== "message")
-      continue;
-    const m = e.message;
-    if (m?.role !== "assistant")
-      continue;
-    if (typeof m.provider !== "string" || m.provider.length === 0 || typeof m.model !== "string" || m.model.length === 0) {
-      continue;
+function migrateDreamerV2(rawConfig, warnings) {
+  const dreamer = asObject(rawConfig.dreamer);
+  if (!dreamer)
+    return rawConfig;
+  const tasksObject = asObject(dreamer.tasks);
+  const hasRetiredObjectTasks = tasksObject ? RETIRED_OBJECT_MEMORY_TASKS.some((task) => (task in tasksObject)) : false;
+  if (tasksObject && !hasRetiredObjectTasks) {
+    const hasLegacyOutsideTasks = "schedule" in dreamer || "user_memories" in dreamer || "pin_key_files" in dreamer || "task_timeout_minutes" in dreamer || "max_runtime_minutes" in dreamer;
+    if (!hasLegacyOutsideTasks) {
+      return reconcileV2TasksObject(rawConfig, dreamer, tasksObject);
     }
-    return switchedAfterLastReply ? `${m.provider}/${m.model}` : findLastModelKeyFromBranch(entries);
   }
-  return findLastModelKeyFromBranch(entries);
-}
-function rawEntryVersion(entry) {
-  const record = entry;
-  const updated = record.updatedAt ?? record.updated_at ?? record.timestamp;
-  return typeof updated === "string" || typeof updated === "number" ? updated : entry.id;
-}
-function parsePiEntryTimestamp(entry) {
-  const record = entry;
-  const raw = record.timestamp;
-  if (typeof raw === "number" && Number.isSafeInteger(raw) && raw >= 0)
-    return raw;
-  if (typeof raw !== "string" || raw.trim().length === 0)
-    return null;
-  const parsed = Date.parse(raw);
-  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : null;
-}
-function attachPiPartVersion(parts, version) {
-  return parts.map((part) => {
-    if (part === null || typeof part !== "object" || Array.isArray(part))
-      return part;
-    try {
-      Object.defineProperty(part, "__magicContextPartUpdatedAt", {
-        value: version,
-        enumerable: false,
-        configurable: true
+  const hasLegacy = "schedule" in dreamer || Array.isArray(dreamer.tasks) || hasRetiredObjectTasks || "user_memories" in dreamer || "pin_key_files" in dreamer || "task_timeout_minutes" in dreamer || "max_runtime_minutes" in dreamer;
+  if (!hasLegacy)
+    return rawConfig;
+  const baseCron = windowToCron(dreamer.schedule);
+  const timeout = typeof dreamer.task_timeout_minutes === "number" ? dreamer.task_timeout_minutes : undefined;
+  const withTimeout = (entry) => timeout !== undefined ? { ...entry, timeout_minutes: timeout } : entry;
+  const classifySchedule = dreamer.disable === true ? "" : DEFAULT_CLASSIFY_CRON;
+  const retrospectiveSchedule = dreamer.disable === true ? "" : DEFAULT_RETROSPECTIVE_CRON;
+  const tasks = {};
+  if (tasksObject) {
+    for (const [key, value] of Object.entries(tasksObject)) {
+      if (RETIRED_OBJECT_MEMORY_TASKS.includes(key))
+        continue;
+      if (asObject(value))
+        tasks[key] = { ...value };
+    }
+    const maintainMemoryEntry = asObject(tasksObject["maintain-memory"]);
+    if (maintainMemoryEntry) {
+      const schedule = typeof maintainMemoryEntry.schedule === "string" ? maintainMemoryEntry.schedule : baseCron;
+      tasks.verify = withTimeout({
+        ...withoutBroadInterval(maintainMemoryEntry),
+        ...tasks.verify ?? {},
+        schedule: tasks.verify?.schedule ?? schedule
+      });
+      tasks.curate = withTimeout({
+        ...withoutBroadInterval(maintainMemoryEntry),
+        ...tasks.curate ?? {},
+        schedule: tasks.curate?.schedule ?? schedule
       });
-    } catch {}
-    return part;
-  });
-}
-function* iterateEntriesToRawMessageRange(entries, afterOrdinal, limit, finalWatermark) {
-  let emitted = 0;
-  const normalizedAfter = Math.max(0, Math.floor(afterOrdinal));
-  const normalizedLimit = Math.max(1, Math.floor(limit));
-  const normalizedWatermark = Math.max(normalizedAfter, Math.floor(finalWatermark));
-  let nextOrdinal = 1;
-  let pendingToolResults = [];
-  const buildToolParts = (results) => results.flatMap(({ msg, version }) => attachPiPartVersion(synthesizeToolResultParts(msg), version));
-  let hasPendingToolParts = false;
-  let pendingFirstRealId = "";
-  let pendingFirstRealVersion = "";
-  let pendingFirstCreatedAt = null;
-  const appendMessage = function* (id, role, version, createdAt, parts) {
-    const ordinal = nextOrdinal++;
-    if (ordinal > normalizedAfter && ordinal <= normalizedWatermark) {
-      emitted++;
-      yield {
-        ordinal,
-        id,
-        role,
-        parts: parts(),
-        version,
-        ...createdAt === null ? {} : { createdAt }
-      };
     }
-    return emitted >= normalizedLimit || nextOrdinal > normalizedWatermark;
-  };
-  for (const entry of entries) {
-    if (!isMessageEntry(entry))
-      continue;
-    const msg = entry.message;
-    const role = msg.role;
-    if (role === "toolResult") {
-      const callId = msg.toolCallId;
-      if (typeof callId !== "string" || callId.length === 0)
-        continue;
-      const version = rawEntryVersion(entry);
-      hasPendingToolParts = true;
-      pendingToolResults.push({ msg, version });
-      if (pendingFirstRealId === "") {
-        pendingFirstRealId = entry.id;
-        pendingFirstRealVersion = version;
-        pendingFirstCreatedAt = parsePiEntryTimestamp(entry);
-      }
-      continue;
+    const oldVerifyEntry = asObject(tasksObject[OLD_VERIFY_TASK]);
+    if (oldVerifyEntry) {
+      tasks.verify = withTimeout({
+        ...withoutBroadInterval(oldVerifyEntry),
+        ...tasks.verify ?? {},
+        schedule: tasks.verify?.schedule ?? (typeof oldVerifyEntry.schedule === "string" ? oldVerifyEntry.schedule : baseCron)
+      });
     }
-    if (role === "user") {
-      const version = rawEntryVersion(entry);
-      const bufferedToolResults = pendingToolResults;
-      const done = yield* appendMessage(entry.id, "user", version, parsePiEntryTimestamp(entry), () => [
-        ...buildToolParts(bufferedToolResults),
-        ...attachPiPartVersion(synthesizeUserParts(msg), version)
-      ]);
-      pendingToolResults = [];
-      hasPendingToolParts = false;
-      pendingFirstRealId = "";
-      pendingFirstRealVersion = "";
-      pendingFirstCreatedAt = null;
-      if (done)
-        break;
-      continue;
+    if (!tasks["verify-broad"]) {
+      const verifyEnabled = typeof tasks.verify?.schedule === "string" && tasks.verify.schedule.trim() !== "";
+      tasks["verify-broad"] = withTimeout({
+        schedule: verifyEnabled ? DEFAULT_VERIFY_BROAD_CRON : ""
+      });
     }
-    if (role === "assistant") {
-      if (hasPendingToolParts) {
-        const bufferedToolResults = pendingToolResults;
-        const pendingId = pendingFirstRealId;
-        const pendingVersion = pendingFirstRealVersion;
-        const done = yield* appendMessage(`${SYNTH_USER_ID_PREFIX}${pendingId}`, "user", pendingVersion, pendingFirstCreatedAt, () => buildToolParts(bufferedToolResults));
-        pendingToolResults = [];
-        hasPendingToolParts = false;
-        pendingFirstRealId = "";
-        pendingFirstRealVersion = "";
-        pendingFirstCreatedAt = null;
-        if (done)
-          break;
-      }
-      const version = rawEntryVersion(entry);
-      if (yield* appendMessage(entry.id, "assistant", version, parsePiEntryTimestamp(entry), () => attachPiPartVersion(synthesizeAssistantParts(msg), version))) {
-        break;
-      }
-      continue;
+    const oldCurateEntries = OLD_CURATE_TASKS.map((task) => asObject(tasksObject[task])).filter((entry) => Boolean(entry));
+    if (oldCurateEntries.length > 0) {
+      const oldSchedules = oldCurateEntries.map((entry) => typeof entry.schedule === "string" ? entry.schedule : baseCron);
+      tasks.curate = withTimeout({
+        ...tasks.curate ?? {},
+        schedule: mostFrequentSchedule(oldSchedules)
+      });
     }
-    if (yield* appendMessage(entry.id, typeof role === "string" ? role : "unknown", rawEntryVersion(entry), parsePiEntryTimestamp(entry), () => [])) {
-      break;
+    for (const task of CANONICAL) {
+      if (!tasks[task]) {
+        const schedule = task === "verify" || task === "curate" || task === "verify-broad" ? "" : task === "classify-memories" ? classifySchedule : task === "retrospective" ? retrospectiveSchedule : task === "maintain-docs" ? "" : baseCron;
+        tasks[task] = withTimeout({ schedule });
+      }
     }
+  } else {
+    const legacyArray = Array.isArray(dreamer.tasks) ? dreamer.tasks.filter((t) => typeof t === "string") : null;
+    const verifySelected = legacyArray ? legacyArray.includes(OLD_VERIFY_TASK) : true;
+    const curateSelected = legacyArray ? legacyArray.some((task) => OLD_CURATE_TASKS.includes(task)) : true;
+    tasks.verify = withTimeout({
+      schedule: verifySelected ? baseCron : ""
+    });
+    tasks["verify-broad"] = withTimeout({
+      schedule: verifySelected ? DEFAULT_VERIFY_BROAD_CRON : ""
+    });
+    tasks.curate = withTimeout({
+      schedule: curateSelected ? baseCron : ""
+    });
+    tasks["classify-memories"] = withTimeout({
+      schedule: classifySchedule
+    });
+    tasks.retrospective = withTimeout({
+      schedule: retrospectiveSchedule
+    });
+    tasks["maintain-docs"] = withTimeout({
+      schedule: legacyArray?.includes("maintain-docs") ? baseCron : ""
+    });
   }
-  if (hasPendingToolParts && emitted < normalizedLimit && nextOrdinal <= normalizedWatermark) {
-    yield* appendMessage(`${SYNTH_USER_ID_PREFIX}${pendingFirstRealId}`, "user", pendingFirstRealVersion, pendingFirstCreatedAt, () => buildToolParts(pendingToolResults));
-  }
-}
-function convertEntriesToRawMessages(entries) {
-  return [
-    ...iterateEntriesToRawMessageRange(entries, 0, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)
-  ];
-}
-function convertEntriesToRawMessagePage(entries, afterOrdinal, limit, finalWatermark) {
-  return [
-    ...iterateEntriesToRawMessageRange(entries, afterOrdinal, limit, finalWatermark)
-  ];
-}
-function isMessageEntry(value) {
-  if (value === null || typeof value !== "object")
-    return false;
-  const v = value;
-  if (v.type !== "message")
-    return false;
-  if (typeof v.id !== "string")
-    return false;
-  if (v.message === null || typeof v.message !== "object")
-    return false;
-  return true;
+  tasks["map-memories"] ??= withTimeout({ schedule: baseCron });
+  tasks["evaluate-smart-notes"] ??= withTimeout({ schedule: baseCron });
+  const um = asObject(dreamer.user_memories);
+  const umEnabled = um ? um.enabled !== false : true;
+  if (um || !tasks["review-user-memories"]) {
+    tasks["review-user-memories"] = withTimeout({
+      ...tasks["review-user-memories"] ?? {},
+      schedule: umEnabled ? baseCron : "",
+      ...um && typeof um.promotion_threshold === "number" ? { promotion_threshold: um.promotion_threshold } : {}
+    });
+  }
+  const {
+    schedule: _schedule,
+    tasks: _tasks,
+    task_timeout_minutes: _tto,
+    max_runtime_minutes: _max,
+    user_memories: _um,
+    pin_key_files: _pkf,
+    ...rest
+  } = dreamer;
+  warnings.push('Migrated legacy dreamer scheduling (schedule window / tasks array / user_memories / pin_key_files) → per-task "dreamer.tasks" in-memory (run `doctor` to persist).');
+  return { ...rawConfig, dreamer: { ...rest, tasks } };
 }
-function synthesizeUserParts(msg) {
-  const m = msg;
-  if (typeof m.content === "string") {
-    if (m.content.trim().length === 0)
-      return [];
-    return [{ type: "text", text: m.content }];
+
+// ../plugin/src/config/migrate-experimental.ts
+function migrateLegacyExperimental(rawConfig, warnings) {
+  const experimental = rawConfig.experimental;
+  if (typeof experimental !== "object" || experimental === null) {
+    return rawConfig;
   }
-  if (!Array.isArray(m.content))
-    return [];
-  const parts = [];
-  for (const c of m.content) {
-    if (c === null || typeof c !== "object")
-      continue;
-    const cc = c;
-    if (cc.type === "text" && typeof cc.text === "string") {
-      parts.push({ type: "text", text: cc.text });
-    }
+  const exp = experimental;
+  const hasUM = "user_memories" in exp;
+  const hasPKF = "pin_key_files" in exp;
+  const hasMural = "mural" in exp;
+  const TOP_LEVEL_GRADUATED = ["temporal_awareness", "caveman_text_compression"];
+  const MEMORY_GRADUATED = ["auto_search", "git_commit_indexing"];
+  const hasGraduated = TOP_LEVEL_GRADUATED.some((k) => (k in exp)) || MEMORY_GRADUATED.some((k) => (k in exp)) || hasMural;
+  if (!hasUM && !hasPKF && !hasGraduated) {
+    return rawConfig;
   }
-  return parts;
-}
-function synthesizeAssistantParts(msg) {
-  const m = msg;
-  if (!Array.isArray(m.content))
-    return [];
-  const parts = [];
-  for (const c of m.content) {
-    if (c === null || typeof c !== "object")
-      continue;
-    const cc = c;
-    if (cc.type === "text" && typeof cc.text === "string") {
-      parts.push({ type: "text", text: cc.text });
-    } else if (cc.type === "toolCall" && typeof cc.id === "string") {
-      parts.push({
-        type: "tool",
-        tool: typeof cc.name === "string" ? cc.name : "unknown",
-        callID: cc.id,
-        state: {
-          input: cc.arguments ?? {}
-        }
-      });
+  const patched = { ...rawConfig };
+  const dreamer = typeof patched.dreamer === "object" && patched.dreamer !== null ? { ...patched.dreamer } : {};
+  const memory = typeof patched.memory === "object" && patched.memory !== null ? { ...patched.memory } : {};
+  const newExperimental = { ...exp };
+  const coerceToObject = (value) => {
+    if (typeof value === "boolean") {
+      return { enabled: value };
+    }
+    if (typeof value === "object" && value !== null) {
+      return { ...value };
+    }
+    return;
+  };
+  const relocate = (key, dest, destLabel) => {
+    if (!(key in exp))
+      return;
+    const oldValue = exp[key];
+    const existing = dest[key];
+    if (existing === undefined) {
+      dest[key] = oldValue;
+      warnings.push(`Migrated "experimental.${key}" → "${destLabel}${key}" in-memory (run \`doctor\` to persist).`);
+    } else if (typeof oldValue === "object" && oldValue !== null && typeof existing === "object" && existing !== null) {
+      dest[key] = {
+        ...oldValue,
+        ...existing
+      };
+    }
+    delete newExperimental[key];
+  };
+  for (const key of TOP_LEVEL_GRADUATED)
+    relocate(key, patched, "");
+  for (const key of MEMORY_GRADUATED)
+    relocate(key, memory, "memory.");
+  if (hasMural) {
+    const oldMural = coerceToObject(exp.mural);
+    const existingMural = patched.mural;
+    if (existingMural === undefined) {
+      patched.mural = oldMural ?? exp.mural;
+      warnings.push('Deprecated "experimental.mural"; use top-level "mural" instead (migrated in memory; run `doctor` to persist).');
+    } else if (oldMural !== undefined && typeof existingMural === "object" && existingMural !== null && !Array.isArray(existingMural)) {
+      patched.mural = {
+        ...oldMural,
+        ...existingMural
+      };
     }
+    delete newExperimental.mural;
   }
-  return parts;
-}
-function synthesizeToolResultParts(msg) {
-  const m = msg;
-  const callID = typeof m.toolCallId === "string" ? m.toolCallId : "";
-  const tool = typeof m.toolName === "string" ? m.toolName : "unknown";
-  if (!callID)
-    return [];
-  let output = "";
-  if (Array.isArray(m.content)) {
-    const fragments = [];
-    for (const c of m.content) {
-      if (c === null || typeof c !== "object")
-        continue;
-      const cc = c;
-      if (cc.type === "text" && typeof cc.text === "string") {
-        fragments.push(cc.text);
+  if (hasUM) {
+    const oldUM = coerceToObject(exp.user_memories);
+    if (oldUM !== undefined) {
+      if (dreamer.user_memories === undefined) {
+        dreamer.user_memories = oldUM;
+        warnings.push('Migrated "experimental.user_memories" → "dreamer.user_memories" in-memory (run `doctor` to persist).');
+      } else if (typeof dreamer.user_memories === "object" && dreamer.user_memories !== null) {
+        dreamer.user_memories = {
+          ...oldUM,
+          ...dreamer.user_memories
+        };
       }
     }
-    output = fragments.join(`
-`);
+    delete newExperimental.user_memories;
   }
-  return [
-    {
-      type: "tool",
-      tool,
-      callID,
-      state: {
-        output
+  if (hasPKF) {
+    const oldPKF = coerceToObject(exp.pin_key_files);
+    if (oldPKF !== undefined) {
+      if (dreamer.pin_key_files === undefined) {
+        dreamer.pin_key_files = oldPKF;
+        warnings.push('Migrated "experimental.pin_key_files" → "dreamer.pin_key_files" in-memory (run `doctor` to persist).');
+      } else if (typeof dreamer.pin_key_files === "object" && dreamer.pin_key_files !== null) {
+        dreamer.pin_key_files = {
+          ...oldPKF,
+          ...dreamer.pin_key_files
+        };
+      } else if (typeof dreamer.pin_key_files === "boolean") {
+        dreamer.pin_key_files = { ...oldPKF, enabled: dreamer.pin_key_files };
       }
     }
-  ];
-}
-function countPiRawMessages(entries) {
-  let count = 0;
-  let pendingTools = false;
-  for (const entry of entries) {
-    if (!isMessageEntry(entry))
-      continue;
-    const message = entry.message;
-    if (message.role === "toolResult") {
-      if (typeof message.toolCallId === "string" && message.toolCallId.length > 0)
-        pendingTools = true;
-      continue;
-    }
-    if (message.role === "user")
-      pendingTools = false;
-    else if (message.role === "assistant" && pendingTools) {
-      count++;
-      pendingTools = false;
-    }
-    count++;
+    delete newExperimental.pin_key_files;
   }
-  return count + Number(pendingTools);
-}
-
-// ../plugin/src/config/prune-config-leaf.ts
-function isPlainObject2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function pruneNestedConfigLeaf(block, relativePath) {
-  if (relativePath.length === 0)
-    return null;
-  const result = { ...block };
-  let cursor = result;
-  for (let i = 0;i < relativePath.length - 1; i++) {
-    const seg = String(relativePath[i]);
-    const child = cursor[seg];
-    if (!isPlainObject2(child)) {
-      if (!(seg in cursor))
-        return null;
-      delete cursor[seg];
-      return {
-        block: result,
-        removed: relativePath.slice(0, i + 1).map(String).join(".")
-      };
-    }
-    const clonedChild = { ...child };
-    cursor[seg] = clonedChild;
-    cursor = clonedChild;
+  patched.experimental = newExperimental;
+  patched.dreamer = dreamer;
+  if (Object.keys(memory).length > 0) {
+    patched.memory = memory;
   }
-  const leaf = String(relativePath[relativePath.length - 1]);
-  if (!(leaf in cursor))
-    return null;
-  delete cursor[leaf];
-  return { block: result, removed: relativePath.map(String).join(".") };
+  return patched;
 }
 
-// src/config/index.ts
-import { existsSync as existsSync6 } from "node:fs";
-
-// ../plugin/src/config/migrate-dreamer-v2.ts
-var OLD_VERIFY_TASK = "verify";
-var OLD_CURATE_TASKS = ["consolidate", "archive-stale", "improve"];
-var RETIRED_OBJECT_MEMORY_TASKS = ["maintain-memory", ...OLD_CURATE_TASKS];
-var CANONICAL = [
-  "map-memories",
-  "verify",
-  "verify-broad",
-  "curate",
-  "classify-memories",
-  "retrospective",
-  "maintain-docs",
-  "evaluate-smart-notes",
-  "review-user-memories",
-  "promote-primers",
-  "refresh-primers"
-];
-var DEFAULT_BASE_CRON = "0 2 * * *";
-var DEFAULT_CLASSIFY_CRON = "0 6 * * *";
-var DEFAULT_RETROSPECTIVE_CRON = "0 5 * * *";
-var DEFAULT_VERIFY_BROAD_CRON = "0 4 * * 0";
-function windowToCron(schedule) {
-  if (typeof schedule !== "string")
-    return DEFAULT_BASE_CRON;
-  const m = /^(\d{1,2}):(\d{2})\s*-/.exec(schedule.trim());
-  if (!m)
-    return DEFAULT_BASE_CRON;
-  const hour = Number(m[1]);
-  const minute = Number(m[2]);
-  if (hour >= 24 || minute >= 60)
-    return DEFAULT_BASE_CRON;
-  return `${minute} ${hour} * * *`;
-}
-function asObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : undefined;
-}
-function cronIntervalScore(schedule) {
-  const parts = schedule.trim().split(/\s+/);
-  if (parts.length !== 5)
-    return Number.POSITIVE_INFINITY;
-  const [minute, hour, dayOfMonth, month, dayOfWeek] = parts;
-  if (month !== "*")
-    return 366 * 24 * 60;
-  if (dayOfMonth !== "*")
-    return 31 * 24 * 60;
-  if (dayOfWeek !== "*")
-    return 7 * 24 * 60;
-  const everyHour = /^\*\/(\d+)$/.exec(hour ?? "");
-  if (everyHour)
-    return Math.max(1, Number(everyHour[1])) * 60;
-  if (hour === "*") {
-    const everyMinute = /^\*\/(\d+)$/.exec(minute ?? "");
-    return everyMinute ? Math.max(1, Number(everyMinute[1])) : 60;
-  }
-  return 24 * 60;
-}
-function mostFrequentSchedule(schedules) {
-  const enabled = schedules.map((s) => s.trim()).filter(Boolean);
-  if (enabled.length === 0)
-    return "";
-  return enabled.sort((a, b) => cronIntervalScore(a) - cronIntervalScore(b))[0] ?? "";
+// ../plugin/src/config/profiles.ts
+function withoutProfileFields(raw) {
+  const copy = { ...raw };
+  delete copy.profile;
+  delete copy.profiles;
+  return copy;
 }
-function withoutBroadInterval(entry) {
-  const { broad_interval_days: _broad, ...rest } = entry;
-  return rest;
+function readProfileSelection(raw) {
+  if (!Object.hasOwn(raw, "profile"))
+    return { declared: false };
+  const value = raw.profile;
+  if (typeof value !== "string")
+    return { declared: true };
+  const name = value.trim();
+  return name.length > 0 ? { declared: true, name } : { declared: true };
 }
-function reconcileV2TasksObject(rawConfig, dreamer, tasksObject) {
-  const hasVerifyBroad = "verify-broad" in tasksObject;
-  const hasBroadIntervalAnywhere = Object.values(tasksObject).some((v) => asObject(v) && ("broad_interval_days" in v));
-  const hasStaleKeyFiles = "key-files" in tasksObject;
-  if (hasVerifyBroad && !hasBroadIntervalAnywhere && !hasStaleKeyFiles)
-    return rawConfig;
-  const nextTasks = {};
-  for (const [key, value] of Object.entries(tasksObject)) {
-    if (key === "key-files")
-      continue;
-    const obj = asObject(value);
-    nextTasks[key] = obj ? withoutBroadInterval(obj) : value;
+function resolveConfigProfile(args) {
+  const warnings = [];
+  const userSelection = readProfileSelection(args.userRaw);
+  const projectSelection = readProfileSelection(args.projectRaw);
+  const selection = projectSelection.name ? { name: projectSelection.name, source: "project" } : userSelection.name ? { name: userSelection.name, source: "user" } : undefined;
+  if (projectSelection.declared && !projectSelection.name) {
+    warnings.push("Ignoring invalid profile selection from project config; expected a non-empty string.");
   }
-  if (!hasVerifyBroad) {
-    const verify = asObject(tasksObject.verify);
-    const verifyEnabled = typeof verify?.schedule === "string" && verify.schedule.trim() !== "";
-    nextTasks["verify-broad"] = {
-      schedule: verifyEnabled ? DEFAULT_VERIFY_BROAD_CRON : ""
-    };
+  if (!projectSelection.declared && userSelection.declared && !userSelection.name) {
+    warnings.push("Ignoring invalid profile selection from user config; expected a non-empty string.");
   }
-  return { ...rawConfig, dreamer: { ...dreamer, tasks: nextTasks } };
-}
-function migrateDreamerV2(rawConfig, warnings) {
-  const dreamer = asObject(rawConfig.dreamer);
-  if (!dreamer)
-    return rawConfig;
-  const tasksObject = asObject(dreamer.tasks);
-  const hasRetiredObjectTasks = tasksObject ? RETIRED_OBJECT_MEMORY_TASKS.some((task) => (task in tasksObject)) : false;
-  if (tasksObject && !hasRetiredObjectTasks) {
-    const hasLegacyOutsideTasks = "schedule" in dreamer || "user_memories" in dreamer || "pin_key_files" in dreamer || "task_timeout_minutes" in dreamer || "max_runtime_minutes" in dreamer;
-    if (!hasLegacyOutsideTasks) {
-      return reconcileV2TasksObject(rawConfig, dreamer, tasksObject);
+  let profiles = {};
+  if (Object.hasOwn(args.userRaw, "profiles")) {
+    const parsed = ConfigProfilesSchema.safeParse(args.userRaw.profiles);
+    if (parsed.success) {
+      profiles = parsed.data;
+    } else {
+      warnings.push("Ignoring profiles from user config: invalid profile configuration; profiles may contain only historian/dreamer harness model blocks.");
     }
   }
-  const hasLegacy = "schedule" in dreamer || Array.isArray(dreamer.tasks) || hasRetiredObjectTasks || "user_memories" in dreamer || "pin_key_files" in dreamer || "task_timeout_minutes" in dreamer || "max_runtime_minutes" in dreamer;
-  if (!hasLegacy)
-    return rawConfig;
-  const baseCron = windowToCron(dreamer.schedule);
-  const timeout = typeof dreamer.task_timeout_minutes === "number" ? dreamer.task_timeout_minutes : undefined;
-  const withTimeout = (entry) => timeout !== undefined ? { ...entry, timeout_minutes: timeout } : entry;
-  const classifySchedule = dreamer.disable === true ? "" : DEFAULT_CLASSIFY_CRON;
-  const retrospectiveSchedule = dreamer.disable === true ? "" : DEFAULT_RETROSPECTIVE_CRON;
-  const tasks = {};
-  if (tasksObject) {
-    for (const [key, value] of Object.entries(tasksObject)) {
-      if (RETIRED_OBJECT_MEMORY_TASKS.includes(key))
-        continue;
-      if (asObject(value))
-        tasks[key] = { ...value };
-    }
-    const maintainMemoryEntry = asObject(tasksObject["maintain-memory"]);
-    if (maintainMemoryEntry) {
-      const schedule = typeof maintainMemoryEntry.schedule === "string" ? maintainMemoryEntry.schedule : baseCron;
-      tasks.verify = withTimeout({
-        ...withoutBroadInterval(maintainMemoryEntry),
-        ...tasks.verify ?? {},
-        schedule: tasks.verify?.schedule ?? schedule
-      });
-      tasks.curate = withTimeout({
-        ...withoutBroadInterval(maintainMemoryEntry),
-        ...tasks.curate ?? {},
-        schedule: tasks.curate?.schedule ?? schedule
-      });
-    }
-    const oldVerifyEntry = asObject(tasksObject[OLD_VERIFY_TASK]);
-    if (oldVerifyEntry) {
-      tasks.verify = withTimeout({
-        ...withoutBroadInterval(oldVerifyEntry),
-        ...tasks.verify ?? {},
-        schedule: tasks.verify?.schedule ?? (typeof oldVerifyEntry.schedule === "string" ? oldVerifyEntry.schedule : baseCron)
-      });
-    }
-    if (!tasks["verify-broad"]) {
-      const verifyEnabled = typeof tasks.verify?.schedule === "string" && tasks.verify.schedule.trim() !== "";
-      tasks["verify-broad"] = withTimeout({
-        schedule: verifyEnabled ? DEFAULT_VERIFY_BROAD_CRON : ""
-      });
-    }
-    const oldCurateEntries = OLD_CURATE_TASKS.map((task) => asObject(tasksObject[task])).filter((entry) => Boolean(entry));
-    if (oldCurateEntries.length > 0) {
-      const oldSchedules = oldCurateEntries.map((entry) => typeof entry.schedule === "string" ? entry.schedule : baseCron);
-      tasks.curate = withTimeout({
-        ...tasks.curate ?? {},
-        schedule: mostFrequentSchedule(oldSchedules)
-      });
-    }
-    for (const task of CANONICAL) {
-      if (!tasks[task]) {
-        const schedule = task === "verify" || task === "curate" || task === "verify-broad" ? "" : task === "classify-memories" ? classifySchedule : task === "retrospective" ? retrospectiveSchedule : task === "maintain-docs" ? "" : baseCron;
-        tasks[task] = withTimeout({ schedule });
-      }
-    }
-  } else {
-    const legacyArray = Array.isArray(dreamer.tasks) ? dreamer.tasks.filter((t) => typeof t === "string") : null;
-    const verifySelected = legacyArray ? legacyArray.includes(OLD_VERIFY_TASK) : true;
-    const curateSelected = legacyArray ? legacyArray.some((task) => OLD_CURATE_TASKS.includes(task)) : true;
-    tasks.verify = withTimeout({
-      schedule: verifySelected ? baseCron : ""
-    });
-    tasks["verify-broad"] = withTimeout({
-      schedule: verifySelected ? DEFAULT_VERIFY_BROAD_CRON : ""
-    });
-    tasks.curate = withTimeout({
-      schedule: curateSelected ? baseCron : ""
-    });
-    tasks["classify-memories"] = withTimeout({
-      schedule: classifySchedule
-    });
-    tasks.retrospective = withTimeout({
-      schedule: retrospectiveSchedule
-    });
-    tasks["maintain-docs"] = withTimeout({
-      schedule: legacyArray?.includes("maintain-docs") ? baseCron : ""
-    });
+  if (!selection) {
+    return {
+      userBase: withoutProfileFields(args.userRaw),
+      projectBase: withoutProfileFields(args.projectRaw),
+      overlay: {},
+      warnings
+    };
   }
-  tasks["map-memories"] ??= withTimeout({ schedule: baseCron });
-  tasks["evaluate-smart-notes"] ??= withTimeout({ schedule: baseCron });
-  const um = asObject(dreamer.user_memories);
-  const umEnabled = um ? um.enabled !== false : true;
-  if (um || !tasks["review-user-memories"]) {
-    tasks["review-user-memories"] = withTimeout({
-      ...tasks["review-user-memories"] ?? {},
-      schedule: umEnabled ? baseCron : "",
-      ...um && typeof um.promotion_threshold === "number" ? { promotion_threshold: um.promotion_threshold } : {}
-    });
+  if (!Object.hasOwn(profiles, selection.name)) {
+    warnings.push(`Unknown profile "${selection.name}" selected by ${selection.source} config; using base config without a profile.`);
+    return {
+      userBase: withoutProfileFields(args.userRaw),
+      projectBase: withoutProfileFields(args.projectRaw),
+      overlay: {},
+      warnings
+    };
   }
-  const {
-    schedule: _schedule,
-    tasks: _tasks,
-    task_timeout_minutes: _tto,
-    max_runtime_minutes: _max,
-    user_memories: _um,
-    pin_key_files: _pkf,
-    ...rest
-  } = dreamer;
-  warnings.push('Migrated legacy dreamer scheduling (schedule window / tasks array / user_memories / pin_key_files) → per-task "dreamer.tasks" in-memory (run `doctor` to persist).');
-  return { ...rawConfig, dreamer: { ...rest, tasks } };
-}
-
-// ../plugin/src/config/migrate-experimental.ts
-function migrateLegacyExperimental(rawConfig, warnings) {
-  const experimental = rawConfig.experimental;
-  if (typeof experimental !== "object" || experimental === null) {
-    return rawConfig;
-  }
-  const exp = experimental;
-  const hasUM = "user_memories" in exp;
-  const hasPKF = "pin_key_files" in exp;
-  const hasMural = "mural" in exp;
-  const TOP_LEVEL_GRADUATED = ["temporal_awareness", "caveman_text_compression"];
-  const MEMORY_GRADUATED = ["auto_search", "git_commit_indexing"];
-  const hasGraduated = TOP_LEVEL_GRADUATED.some((k) => (k in exp)) || MEMORY_GRADUATED.some((k) => (k in exp)) || hasMural;
-  if (!hasUM && !hasPKF && !hasGraduated) {
-    return rawConfig;
-  }
-  const patched = { ...rawConfig };
-  const dreamer = typeof patched.dreamer === "object" && patched.dreamer !== null ? { ...patched.dreamer } : {};
-  const memory = typeof patched.memory === "object" && patched.memory !== null ? { ...patched.memory } : {};
-  const newExperimental = { ...exp };
-  const coerceToObject = (value) => {
-    if (typeof value === "boolean") {
-      return { enabled: value };
-    }
-    if (typeof value === "object" && value !== null) {
-      return { ...value };
-    }
-    return;
-  };
-  const relocate = (key, dest, destLabel) => {
-    if (!(key in exp))
-      return;
-    const oldValue = exp[key];
-    const existing = dest[key];
-    if (existing === undefined) {
-      dest[key] = oldValue;
-      warnings.push(`Migrated "experimental.${key}" → "${destLabel}${key}" in-memory (run \`doctor\` to persist).`);
-    } else if (typeof oldValue === "object" && oldValue !== null && typeof existing === "object" && existing !== null) {
-      dest[key] = {
-        ...oldValue,
-        ...existing
-      };
-    }
-    delete newExperimental[key];
-  };
-  for (const key of TOP_LEVEL_GRADUATED)
-    relocate(key, patched, "");
-  for (const key of MEMORY_GRADUATED)
-    relocate(key, memory, "memory.");
-  if (hasMural) {
-    const oldMural = coerceToObject(exp.mural);
-    const existingMural = patched.mural;
-    if (existingMural === undefined) {
-      patched.mural = oldMural ?? exp.mural;
-      warnings.push('Deprecated "experimental.mural"; use top-level "mural" instead (migrated in memory; run `doctor` to persist).');
-    } else if (oldMural !== undefined && typeof existingMural === "object" && existingMural !== null && !Array.isArray(existingMural)) {
-      patched.mural = {
-        ...oldMural,
-        ...existingMural
-      };
-    }
-    delete newExperimental.mural;
-  }
-  if (hasUM) {
-    const oldUM = coerceToObject(exp.user_memories);
-    if (oldUM !== undefined) {
-      if (dreamer.user_memories === undefined) {
-        dreamer.user_memories = oldUM;
-        warnings.push('Migrated "experimental.user_memories" → "dreamer.user_memories" in-memory (run `doctor` to persist).');
-      } else if (typeof dreamer.user_memories === "object" && dreamer.user_memories !== null) {
-        dreamer.user_memories = {
-          ...oldUM,
-          ...dreamer.user_memories
-        };
-      }
-    }
-    delete newExperimental.user_memories;
-  }
-  if (hasPKF) {
-    const oldPKF = coerceToObject(exp.pin_key_files);
-    if (oldPKF !== undefined) {
-      if (dreamer.pin_key_files === undefined) {
-        dreamer.pin_key_files = oldPKF;
-        warnings.push('Migrated "experimental.pin_key_files" → "dreamer.pin_key_files" in-memory (run `doctor` to persist).');
-      } else if (typeof dreamer.pin_key_files === "object" && dreamer.pin_key_files !== null) {
-        dreamer.pin_key_files = {
-          ...oldPKF,
-          ...dreamer.pin_key_files
-        };
-      } else if (typeof dreamer.pin_key_files === "boolean") {
-        dreamer.pin_key_files = { ...oldPKF, enabled: dreamer.pin_key_files };
-      }
-    }
-    delete newExperimental.pin_key_files;
-  }
-  patched.experimental = newExperimental;
-  patched.dreamer = dreamer;
-  if (Object.keys(memory).length > 0) {
-    patched.memory = memory;
-  }
-  return patched;
-}
-
-// ../plugin/src/config/profiles.ts
-function withoutProfileFields(raw) {
-  const copy = { ...raw };
-  delete copy.profile;
-  delete copy.profiles;
-  return copy;
-}
-function readProfileSelection(raw) {
-  if (!Object.hasOwn(raw, "profile"))
-    return { declared: false };
-  const value = raw.profile;
-  if (typeof value !== "string")
-    return { declared: true };
-  const name = value.trim();
-  return name.length > 0 ? { declared: true, name } : { declared: true };
-}
-function resolveConfigProfile(args) {
-  const warnings = [];
-  const userSelection = readProfileSelection(args.userRaw);
-  const projectSelection = readProfileSelection(args.projectRaw);
-  const selection = projectSelection.name ? { name: projectSelection.name, source: "project" } : userSelection.name ? { name: userSelection.name, source: "user" } : undefined;
-  if (projectSelection.declared && !projectSelection.name) {
-    warnings.push("Ignoring invalid profile selection from project config; expected a non-empty string.");
-  }
-  if (!projectSelection.declared && userSelection.declared && !userSelection.name) {
-    warnings.push("Ignoring invalid profile selection from user config; expected a non-empty string.");
-  }
-  let profiles = {};
-  if (Object.hasOwn(args.userRaw, "profiles")) {
-    const parsed = ConfigProfilesSchema.safeParse(args.userRaw.profiles);
-    if (parsed.success) {
-      profiles = parsed.data;
-    } else {
-      warnings.push("Ignoring profiles from user config: invalid profile configuration; profiles may contain only historian/dreamer harness model blocks.");
-    }
-  }
-  if (!selection) {
-    return {
-      userBase: withoutProfileFields(args.userRaw),
-      projectBase: withoutProfileFields(args.projectRaw),
-      overlay: {},
-      warnings
-    };
-  }
-  if (!Object.hasOwn(profiles, selection.name)) {
-    warnings.push(`Unknown profile "${selection.name}" selected by ${selection.source} config; using base config without a profile.`);
-    return {
-      userBase: withoutProfileFields(args.userRaw),
-      projectBase: withoutProfileFields(args.projectRaw),
-      overlay: {},
-      warnings
-    };
-  }
-  const overlay = profiles[selection.name];
-  return {
-    userBase: withoutProfileFields(args.userRaw),
-    projectBase: withoutProfileFields(args.projectRaw),
-    overlay,
-    activeProfile: selection.name,
-    warnings
-  };
+  const overlay = profiles[selection.name];
+  return {
+    userBase: withoutProfileFields(args.userRaw),
+    projectBase: withoutProfileFields(args.projectRaw),
+    overlay,
+    activeProfile: selection.name,
+    warnings
+  };
 }
 
 // ../plugin/src/config/raw-loader.ts
 import {
-  closeSync as closeSync2,
+  closeSync,
   existsSync as existsSync4,
   linkSync,
-  openSync as openSync2,
+  openSync,
   readFileSync as readFileSync6,
   realpathSync,
-  renameSync as renameSync2,
+  renameSync,
   statSync as statSync4,
   unlinkSync as unlinkSync2,
-  writeFileSync as writeFileSync2
+  writeFileSync
 } from "node:fs";
 import { basename as basename2, dirname as dirname3, join as join3 } from "node:path";
 var MODEL_FIELDS = ["model", "fallback_models"];
@@ -11269,7 +11033,7 @@ function writeExclusiveBackup(backupPath, bytes, mode) {
     if (existingBytes.equals(bytes))
       return;
     if (bytes.subarray(0, existingBytes.length).equals(existingBytes)) {
-      renameSync2(temporaryPath, backupPath);
+      renameSync(temporaryPath, backupPath);
       return;
     }
   } finally {
@@ -11286,14 +11050,14 @@ function writeTemporaryCandidate(configPath, bytes, mode) {
     const path = join3(directory, `.${stem}.per-harness-${process.pid}-${temporaryFileSequence}.tmp`);
     let descriptor;
     try {
-      descriptor = openSync2(path, "wx", mode);
-      writeFileSync2(descriptor, bytes);
-      closeSync2(descriptor);
+      descriptor = openSync(path, "wx", mode);
+      writeFileSync(descriptor, bytes);
+      closeSync(descriptor);
       return path;
     } catch (error) {
       if (descriptor !== undefined) {
         try {
-          closeSync2(descriptor);
+          closeSync(descriptor);
         } catch {}
       }
       try {
@@ -11354,7 +11118,7 @@ function loadRawConfigFile(options) {
     let temporaryPath;
     try {
       const writePath = realpathSync(options.configPath);
-      const mode = statSync4(writePath).mode & 511;
+      const mode = options.tier === "user" ? 384 : statSync4(writePath).mode & 511;
       writeExclusiveBackup(backupPath, observedBytes, mode);
       temporaryPath = writeTemporaryCandidate(writePath, migration.bytes, mode);
       options.afterTemporaryWrite?.();
@@ -11374,7 +11138,7 @@ function loadRawConfigFile(options) {
         observedBytes = currentBytes;
         continue;
       }
-      renameSync2(temporaryPath, writePath);
+      renameSync(temporaryPath, writePath);
       return {
         configPath: options.configPath,
         bytes: migration.bytes,
@@ -11536,7 +11300,7 @@ function substituteConfigVariables(input) {
 }
 
 // ../plugin/src/shared/models-dev-cache.ts
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync8, renameSync as renameSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { readFileSync as readFileSync8 } from "node:fs";
 import { join as join4 } from "node:path";
 var MIN_SANE_LIMIT = 20000;
 var MAX_SANE_LIMIT = 3000000;
@@ -12127,6 +11891,9 @@ function loadPiConfigDetailed(opts = {}, applyRuntimeGlobals = true) {
   const recoveredTopLevelKeys = [];
   const cacheTtlConfigured = Object.hasOwn(rawConfig, "cache_ttl");
   const parsed = parsePiConfig(rawConfig, recoveredTopLevelKeys);
+  Object.defineProperty(parsed.config, "cacheTtlConfigured", {
+    value: cacheTtlConfigured
+  });
   for (const key of projectRestoredTopLevelKeys) {
     if (!recoveredTopLevelKeys.includes(key))
       recoveredTopLevelKeys.push(key);
@@ -16438,16 +16205,13 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
       return `Tag ${number}'s original tool owner is no longer in stored history.`;
     const parts = message?.parts.filter((part) => isRecord4(part) && asToolPart(part)?.callId === tag.messageId) ?? [];
     if (!parts.some((part) => isRecord4(part) && asToolPart(part)?.output !== null)) {
-      const messages = readRawSessionMessages2(sessionId);
-      const ownerIndex = messages.findIndex((candidate) => candidate.id === owner);
-      for (const candidate of messages.slice(Math.max(0, ownerIndex + 1))) {
+      visitRawSessionMessages2(sessionId, message.ordinal + 1, Number.MAX_SAFE_INTEGER, (candidate) => {
         const matching = candidate.parts.filter((part) => isRecord4(part) && asToolPart(part)?.callId === tag.messageId);
         if (matching.some((part) => isRecord4(part) && part.type === "tool_use"))
-          break;
+          return false;
         parts.push(...matching);
-        if (matching.length > 0)
-          break;
-      }
+        return matching.length === 0;
+      });
     }
     const rendered = parts.map(renderPartFull).filter((part) => part !== null);
     return rendered.length ? rendered.join(`
@@ -16782,77 +16546,418 @@ var encoder = new TextEncoder;
 function Boolean2(options) {
   return Create({ "~kind": "Boolean" }, { type: "boolean" }, options);
 }
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/integer.mjs
-var IntegerPattern = "-?(?:0|[1-9][0-9]*)";
-function Integer(options) {
-  return Create({ "~kind": "Integer" }, { type: "integer" }, options);
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/integer.mjs
+var IntegerPattern = "-?(?:0|[1-9][0-9]*)";
+function Integer(options) {
+  return Create({ "~kind": "Integer" }, { type: "integer" }, options);
+}
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/literal.mjs
+class InvalidLiteralValue extends Error {
+  constructor(value) {
+    super(`Invalid Literal value`);
+    Object.defineProperty(this, "cause", {
+      value: { value },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    });
+  }
+}
+function LiteralTypeName(value) {
+  return IsBigInt(value) ? "bigint" : IsBoolean(value) ? "boolean" : IsNumber(value) ? "number" : IsString(value) ? "string" : (() => {
+    throw new InvalidLiteralValue(value);
+  })();
+}
+function Literal(value, options) {
+  return Create({ "~kind": "Literal" }, { type: LiteralTypeName(value), const: value }, options);
+}
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/number.mjs
+var NumberPattern = "-?(?:0|[1-9][0-9]*)(?:\\.[0-9]+)?";
+function Number2(options) {
+  return Create({ "~kind": "Number" }, { type: "number" }, options);
+}
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/string.mjs
+var StringPattern = ".*";
+function String2(options) {
+  return Create({ "~kind": "String" }, { type: "string" }, options);
+}
+
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/union.mjs
+function Union(anyOf, options = {}) {
+  return Create({ "~kind": "Union" }, { anyOf }, options);
+}
+
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/record.mjs
+var IntegerKey = `^${IntegerPattern}$`;
+var NumberKey = `^${NumberPattern}$`;
+var StringKey = `^${StringPattern}$`;
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/internal/char.mjs
+function Range(start, end) {
+  return Array.from({ length: end - start + 1 }, (_, i) => String.fromCharCode(start + i));
+}
+var Alpha = [
+  ...Range(97, 122),
+  ...Range(65, 90)
+];
+var Zero = "0";
+var NonZero = Range(49, 57);
+var Digit = [Zero, ...NonZero];
+var UnderScore = "_";
+var DollarSign = "$";
+
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/unsigned_integer.mjs
+var AllowedDigits = [...Digit, UnderScore];
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/ident.mjs
+var Initial = [...Alpha, UnderScore, DollarSign];
+var Remaining = [...Initial, ...Digit];
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/unsigned_number.mjs
+var AllowedDigits2 = [...Digit, UnderScore];
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/engine/helpers/keys.mjs
+var integerKeyPattern = new RegExp("^(?:0|[1-9][0-9]*)$");
+
+// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/engine/indexed/from_object.mjs
+var NumericKeyPattern = new RegExp(IntegerKey);
+// src/read-session-pi.ts
+var SYNTH_USER_ID_PREFIX = "synth-user-";
+function resolvePiStableId(msg, index, entryIds, entryIdByRef) {
+  if (!msg || typeof msg !== "object")
+    return;
+  const byRef = entryIdByRef?.get(msg);
+  if (typeof byRef === "string" && byRef.length > 0)
+    return byRef;
+  const positional = entryIds?.[index];
+  if (typeof positional === "string" && positional.length > 0)
+    return positional;
+  const m = msg;
+  const role = m.role ?? "unknown";
+  return typeof m.timestamp === "number" ? `pi-msg-${index}-${m.timestamp}-${role}` : `pi-msg-${index}-${role}`;
+}
+function readPiSessionSnapshot(ctx) {
+  const sm = ctx.sessionManager;
+  if (sm === undefined)
+    return { branchEntries: [], rawMessages: [] };
+  const getBranch = sm.getBranch;
+  if (typeof getBranch !== "function")
+    return { branchEntries: [], rawMessages: [] };
+  let entries;
+  try {
+    entries = getBranch.call(sm);
+  } catch {
+    return { branchEntries: [], rawMessages: [] };
+  }
+  if (!Array.isArray(entries))
+    return { branchEntries: [], rawMessages: [] };
+  return {
+    branchEntries: entries,
+    rawMessages: convertEntriesToRawMessages(entries)
+  };
+}
+function readPiSessionMessages(ctx) {
+  return readPiSessionSnapshot(ctx).rawMessages;
+}
+function readPiSessionMessagePage(ctx, afterOrdinal, limit, finalWatermark) {
+  const sessionManager = ctx.sessionManager;
+  const getBranch = sessionManager?.getBranch;
+  if (typeof getBranch !== "function")
+    return [];
+  try {
+    const entries = getBranch.call(sessionManager);
+    return Array.isArray(entries) ? convertEntriesToRawMessagePage(entries, afterOrdinal, limit, finalWatermark) : [];
+  } catch {
+    return [];
+  }
+}
+function findLastModelKeyFromBranch(entries) {
+  if (!Array.isArray(entries))
+    return;
+  for (let i = entries.length - 1;i >= 0; i--) {
+    const e = entries[i];
+    if (!e || typeof e !== "object")
+      continue;
+    const v = e;
+    if (v.type !== "model_change")
+      continue;
+    if (typeof v.provider === "string" && v.provider.length > 0 && typeof v.modelId === "string" && v.modelId.length > 0) {
+      return `${v.provider}/${v.modelId}`;
+    }
+  }
+  return;
+}
+function findRestartModelSeedFromBranch(entries) {
+  if (!Array.isArray(entries))
+    return;
+  let switchedAfterLastReply = false;
+  for (let i = entries.length - 1;i >= 0; i--) {
+    const e = entries[i];
+    if (e?.type === "model_change") {
+      if (typeof e.provider === "string" && typeof e.modelId === "string")
+        switchedAfterLastReply = true;
+      continue;
+    }
+    if (e?.type !== "message")
+      continue;
+    const m = e.message;
+    if (m?.role !== "assistant")
+      continue;
+    if (typeof m.provider !== "string" || m.provider.length === 0 || typeof m.model !== "string" || m.model.length === 0) {
+      continue;
+    }
+    return switchedAfterLastReply ? `${m.provider}/${m.model}` : findLastModelKeyFromBranch(entries);
+  }
+  return findLastModelKeyFromBranch(entries);
+}
+function rawEntryVersion(entry) {
+  const record = entry;
+  const updated = record.updatedAt ?? record.updated_at ?? record.timestamp;
+  return typeof updated === "string" || typeof updated === "number" ? updated : entry.id;
+}
+function parsePiEntryTimestamp(entry) {
+  const record = entry;
+  const raw = record.timestamp;
+  if (typeof raw === "number" && Number.isSafeInteger(raw) && raw >= 0)
+    return raw;
+  if (typeof raw !== "string" || raw.trim().length === 0)
+    return null;
+  const parsed = Date.parse(raw);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : null;
+}
+function attachPiPartVersion(parts, version) {
+  return parts.map((part) => {
+    if (part === null || typeof part !== "object" || Array.isArray(part))
+      return part;
+    try {
+      Object.defineProperty(part, "__magicContextPartUpdatedAt", {
+        value: version,
+        enumerable: false,
+        configurable: true
+      });
+    } catch {}
+    return part;
+  });
+}
+function* iterateEntriesToRawMessageRange(entries, afterOrdinal, limit, finalWatermark) {
+  let emitted = 0;
+  const normalizedAfter = Math.max(0, Math.floor(afterOrdinal));
+  const normalizedLimit = Math.max(1, Math.floor(limit));
+  const normalizedWatermark = Math.max(normalizedAfter, Math.floor(finalWatermark));
+  let nextOrdinal = 1;
+  let pendingToolResults = [];
+  const buildToolParts = (results) => results.flatMap(({ msg, version }) => attachPiPartVersion(synthesizeToolResultParts(msg), version));
+  let hasPendingToolParts = false;
+  let pendingFirstRealId = "";
+  let pendingFirstRealVersion = "";
+  let pendingFirstCreatedAt = null;
+  const appendMessage = function* (id, role, version, createdAt, parts) {
+    const ordinal = nextOrdinal++;
+    if (ordinal > normalizedAfter && ordinal <= normalizedWatermark) {
+      emitted++;
+      yield {
+        ordinal,
+        id,
+        role,
+        parts: parts(),
+        version,
+        ...createdAt === null ? {} : { createdAt }
+      };
+    }
+    return emitted >= normalizedLimit || nextOrdinal > normalizedWatermark;
+  };
+  for (const entry of entries) {
+    if (!isMessageEntry(entry))
+      continue;
+    const msg = entry.message;
+    const role = msg.role;
+    if (role === "toolResult") {
+      const callId = msg.toolCallId;
+      if (typeof callId !== "string" || callId.length === 0)
+        continue;
+      const version = rawEntryVersion(entry);
+      hasPendingToolParts = true;
+      pendingToolResults.push({ msg, version });
+      if (pendingFirstRealId === "") {
+        pendingFirstRealId = entry.id;
+        pendingFirstRealVersion = version;
+        pendingFirstCreatedAt = parsePiEntryTimestamp(entry);
+      }
+      continue;
+    }
+    if (role === "user") {
+      const version = rawEntryVersion(entry);
+      const bufferedToolResults = pendingToolResults;
+      const done = yield* appendMessage(entry.id, "user", version, parsePiEntryTimestamp(entry), () => [
+        ...buildToolParts(bufferedToolResults),
+        ...attachPiPartVersion(synthesizeUserParts(msg), version)
+      ]);
+      pendingToolResults = [];
+      hasPendingToolParts = false;
+      pendingFirstRealId = "";
+      pendingFirstRealVersion = "";
+      pendingFirstCreatedAt = null;
+      if (done)
+        break;
+      continue;
+    }
+    if (role === "assistant") {
+      if (hasPendingToolParts) {
+        const bufferedToolResults = pendingToolResults;
+        const pendingId = pendingFirstRealId;
+        const pendingVersion = pendingFirstRealVersion;
+        const done = yield* appendMessage(`${SYNTH_USER_ID_PREFIX}${pendingId}`, "user", pendingVersion, pendingFirstCreatedAt, () => buildToolParts(bufferedToolResults));
+        pendingToolResults = [];
+        hasPendingToolParts = false;
+        pendingFirstRealId = "";
+        pendingFirstRealVersion = "";
+        pendingFirstCreatedAt = null;
+        if (done)
+          break;
+      }
+      const version = rawEntryVersion(entry);
+      if (yield* appendMessage(entry.id, "assistant", version, parsePiEntryTimestamp(entry), () => attachPiPartVersion(synthesizeAssistantParts(msg), version))) {
+        break;
+      }
+      continue;
+    }
+    if (yield* appendMessage(entry.id, typeof role === "string" ? role : "unknown", rawEntryVersion(entry), parsePiEntryTimestamp(entry), () => [])) {
+      break;
+    }
+  }
+  if (hasPendingToolParts && emitted < normalizedLimit && nextOrdinal <= normalizedWatermark) {
+    yield* appendMessage(`${SYNTH_USER_ID_PREFIX}${pendingFirstRealId}`, "user", pendingFirstRealVersion, pendingFirstCreatedAt, () => buildToolParts(pendingToolResults));
+  }
+}
+function convertEntriesToRawMessages(entries) {
+  return [
+    ...iterateEntriesToRawMessageRange(entries, 0, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)
+  ];
 }
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/literal.mjs
-class InvalidLiteralValue extends Error {
-  constructor(value) {
-    super(`Invalid Literal value`);
-    Object.defineProperty(this, "cause", {
-      value: { value },
-      writable: false,
-      configurable: false,
-      enumerable: false
-    });
+function convertPiAssistantEntryById(entries, entryId) {
+  for (let index = 0;index < entries.length; index++) {
+    const entry = entries[index];
+    if (!isMessageEntry(entry) || entry.id !== entryId)
+      continue;
+    if (entry.message.role !== "assistant" || entryId.startsWith(SYNTH_USER_ID_PREFIX)) {
+      return convertEntriesToRawMessages(entries).find((message) => message.id === entryId) ?? null;
+    }
+    const raw = convertEntriesToRawMessages([entry])[0];
+    return raw ? { ...raw, ordinal: countPiRawMessages(entries.slice(0, index + 1)) } : null;
   }
+  return null;
 }
-function LiteralTypeName(value) {
-  return IsBigInt(value) ? "bigint" : IsBoolean(value) ? "boolean" : IsNumber(value) ? "number" : IsString(value) ? "string" : (() => {
-    throw new InvalidLiteralValue(value);
-  })();
+function convertEntriesToRawMessagePage(entries, afterOrdinal, limit, finalWatermark) {
+  return [
+    ...iterateEntriesToRawMessageRange(entries, afterOrdinal, limit, finalWatermark)
+  ];
 }
-function Literal(value, options) {
-  return Create({ "~kind": "Literal" }, { type: LiteralTypeName(value), const: value }, options);
+function isMessageEntry(value) {
+  if (value === null || typeof value !== "object")
+    return false;
+  const v = value;
+  if (v.type !== "message")
+    return false;
+  if (typeof v.id !== "string")
+    return false;
+  if (v.message === null || typeof v.message !== "object")
+    return false;
+  return true;
 }
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/number.mjs
-var NumberPattern = "-?(?:0|[1-9][0-9]*)(?:\\.[0-9]+)?";
-function Number2(options) {
-  return Create({ "~kind": "Number" }, { type: "number" }, options);
+function synthesizeUserParts(msg) {
+  const m = msg;
+  if (typeof m.content === "string") {
+    if (m.content.trim().length === 0)
+      return [];
+    return [{ type: "text", text: m.content }];
+  }
+  if (!Array.isArray(m.content))
+    return [];
+  const parts = [];
+  for (const c of m.content) {
+    if (c === null || typeof c !== "object")
+      continue;
+    const cc = c;
+    if (cc.type === "text" && typeof cc.text === "string") {
+      parts.push({ type: "text", text: cc.text });
+    }
+  }
+  return parts;
 }
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/string.mjs
-var StringPattern = ".*";
-function String2(options) {
-  return Create({ "~kind": "String" }, { type: "string" }, options);
+function synthesizeAssistantParts(msg) {
+  const m = msg;
+  if (!Array.isArray(m.content))
+    return [];
+  const parts = [];
+  for (const c of m.content) {
+    if (c === null || typeof c !== "object")
+      continue;
+    const cc = c;
+    if (cc.type === "text" && typeof cc.text === "string") {
+      parts.push({ type: "text", text: cc.text });
+    } else if (cc.type === "toolCall" && typeof cc.id === "string") {
+      parts.push({
+        type: "tool",
+        tool: typeof cc.name === "string" ? cc.name : "unknown",
+        callID: cc.id,
+        state: {
+          input: cc.arguments ?? {}
+        }
+      });
+    }
+  }
+  return parts;
 }
-
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/union.mjs
-function Union(anyOf, options = {}) {
-  return Create({ "~kind": "Union" }, { anyOf }, options);
+function synthesizeToolResultParts(msg) {
+  const m = msg;
+  const callID = typeof m.toolCallId === "string" ? m.toolCallId : "";
+  const tool = typeof m.toolName === "string" ? m.toolName : "unknown";
+  if (!callID)
+    return [];
+  let output = "";
+  if (Array.isArray(m.content)) {
+    const fragments = [];
+    for (const c of m.content) {
+      if (c === null || typeof c !== "object")
+        continue;
+      const cc = c;
+      if (cc.type === "text" && typeof cc.text === "string") {
+        fragments.push(cc.text);
+      }
+    }
+    output = fragments.join(`
+`);
+  }
+  return [
+    {
+      type: "tool",
+      tool,
+      callID,
+      state: {
+        output
+      }
+    }
+  ];
 }
-
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/types/record.mjs
-var IntegerKey = `^${IntegerPattern}$`;
-var NumberKey = `^${NumberPattern}$`;
-var StringKey = `^${StringPattern}$`;
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/internal/char.mjs
-function Range(start, end) {
-  return Array.from({ length: end - start + 1 }, (_, i) => String.fromCharCode(start + i));
+function countPiRawMessages(entries) {
+  let count = 0;
+  let pendingTools = false;
+  for (const entry of entries) {
+    if (!isMessageEntry(entry))
+      continue;
+    const message = entry.message;
+    if (message.role === "toolResult") {
+      if (typeof message.toolCallId === "string" && message.toolCallId.length > 0)
+        pendingTools = true;
+      continue;
+    }
+    if (message.role === "user")
+      pendingTools = false;
+    else if (message.role === "assistant" && pendingTools) {
+      count++;
+      pendingTools = false;
+    }
+    count++;
+  }
+  return count + Number(pendingTools);
 }
-var Alpha = [
-  ...Range(97, 122),
-  ...Range(65, 90)
-];
-var Zero = "0";
-var NonZero = Range(49, 57);
-var Digit = [Zero, ...NonZero];
-var UnderScore = "_";
-var DollarSign = "$";
-
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/unsigned_integer.mjs
-var AllowedDigits = [...Digit, UnderScore];
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/ident.mjs
-var Initial = [...Alpha, UnderScore, DollarSign];
-var Remaining = [...Initial, ...Digit];
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/script/token/unsigned_number.mjs
-var AllowedDigits2 = [...Digit, UnderScore];
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/engine/helpers/keys.mjs
-var integerKeyPattern = new RegExp("^(?:0|[1-9][0-9]*)$");
 
-// ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/engine/indexed/from_object.mjs
-var NumericKeyPattern = new RegExp(IntegerKey);
 // src/tools/ctx-expand.ts
 var ParamsSchema = _Object_({
   tag: Optional(Union([Number2(), String2()], {
@@ -17282,9 +17387,8 @@ function getMuralCueState(db, memoryIds) {
   const ids = Array.from(new Set(memoryIds.filter(Number.isInteger)));
   if (ids.length === 0)
     return out;
-  const placeholders = ids.map(() => "?").join(", ");
   const rejectionCountColumn = hasMuralCueRejectionCountColumn(db) ? "COALESCE(mural_cue_rejection_count, 0) AS mural_cue_rejection_count" : "0 AS mural_cue_rejection_count";
-  const rows = db.prepare(`SELECT id, mural_cue, mural_cue_hash, ${rejectionCountColumn} FROM memories WHERE id IN (${placeholders})`).all(...ids);
+  const rows = db.prepare(`SELECT id, mural_cue, mural_cue_hash, ${rejectionCountColumn} FROM memories WHERE id IN (SELECT value FROM json_each(?))`).all(JSON.stringify(ids));
   for (const row of rows) {
     out.set(row.id, {
       cue: row.mural_cue ?? null,
@@ -17468,8 +17572,7 @@ function getUnclassifiedMemoryIds(db, memoryIds) {
   const ids = Array.from(new Set(memoryIds.filter(Number.isInteger)));
   if (ids.length === 0)
     return [];
-  const ph = ids.map(() => "?").join(", ");
-  const rows = db.prepare(`SELECT id FROM memories WHERE id IN (${ph}) AND classified_at IS NOT NULL`).all(...ids);
+  const rows = db.prepare("SELECT id FROM memories WHERE id IN (SELECT value FROM json_each(?)) AND classified_at IS NOT NULL").all(JSON.stringify(ids));
   const classified = new Set(rows.map((r) => r.id));
   return ids.filter((id) => !classified.has(id));
 }
@@ -17749,6 +17852,7 @@ function getMemoriesByProject(db, projectPath, statuses = ["active", "permanent"
   const rows = getMemoriesByProjectStatement(db, statuses).all(projectPath, ...statuses, expiryCutoff).filter(isMemoryRow);
   return rows.map(toMemory);
 }
+var memoryListStatements = new WeakMap;
 function sqlPlaceholders(values) {
   return values.map(() => "?").join(", ");
 }
@@ -18181,9 +18285,6 @@ function searchMemoriesFTSUnion(db, projectPaths, query, limit = DEFAULT_SEARCH_
 }
 // ../plugin/src/features/magic-context/memory/storage-memory-verifications.ts
 var MEMORY_VERIFICATION_SENTINEL = "";
-function placeholders2(values) {
-  return values.map(() => "?").join(", ");
-}
 function uniqueSortedFiles(files) {
   return Array.from(new Set(files.filter((file) => file !== MEMORY_VERIFICATION_SENTINEL))).sort();
 }
@@ -18211,7 +18312,7 @@ function getUnmappedMemoryIds(db, memoryIds) {
   const ids = Array.from(new Set(memoryIds.filter(Number.isInteger)));
   if (ids.length === 0)
     return [];
-  const rows = db.prepare(`SELECT DISTINCT memory_id FROM memory_verifications WHERE memory_id IN (${placeholders2(ids)})`).all(...ids);
+  const rows = db.prepare("SELECT DISTINCT memory_id FROM memory_verifications WHERE memory_id IN (SELECT value FROM json_each(?))").all(JSON.stringify(ids));
   const mapped = new Set(rows.map((r) => r.memory_id));
   return ids.filter((id) => !mapped.has(id));
 }
@@ -18225,8 +18326,8 @@ function getMemoryVerifications(db, memoryIds) {
     return result;
   const rows = db.prepare(`SELECT memory_id, file_path, verified_at, mapped_at, mapping_origin
                FROM memory_verifications
-              WHERE memory_id IN (${placeholders2(ids)})
-              ORDER BY memory_id, file_path`).all(...ids);
+              WHERE memory_id IN (SELECT value FROM json_each(?))
+              ORDER BY memory_id, file_path`).all(JSON.stringify(ids));
   for (const row of rows) {
     const existing = result.get(row.memory_id) ?? {
       files: [],
@@ -18307,10 +18408,10 @@ async function readGitHead(cwd) {
   const head = stdout?.trim();
   return head && /^[0-9a-f]{40}$/i.test(head) ? head : null;
 }
-async function readGitChangedFilesSince(cwd, revision) {
+async function readGitChangedFilesSince(cwd, revision, knownGitRoot) {
   if (!/^[0-9a-f]{7,40}$/i.test(revision))
     return null;
-  const gitRoot = await resolveGitTopLevel(cwd);
+  const gitRoot = knownGitRoot ?? await resolveGitTopLevel(cwd);
   if (!gitRoot)
     return null;
   const stdout = await runGit(gitRoot, ["diff", "--name-only", "-z", revision]);
@@ -18318,8 +18419,8 @@ async function readGitChangedFilesSince(cwd, revision) {
     return null;
   return new Set(stdout.split("\x00").filter(Boolean));
 }
-async function readGitFileChangeTimesSince(cwd, sinceMs) {
-  const gitRoot = await resolveGitTopLevel(cwd);
+async function readGitFileChangeTimesSince(cwd, sinceMs, knownGitRoot) {
+  const gitRoot = knownGitRoot ?? await resolveGitTopLevel(cwd);
   if (!gitRoot)
     return null;
   const sinceSec = Math.max(0, Math.floor(sinceMs / 1000));
@@ -18379,6 +18480,7 @@ async function normalizeVerificationFiles(args) {
   const rootReal = safeRealpath(root) ?? root;
   const warnings = [];
   const normalized = [];
+  let trackedPaths;
   for (const raw of args.files) {
     const value = typeof raw === "string" ? raw.trim() : "";
     if (!value) {
@@ -18420,7 +18522,14 @@ async function normalizeVerificationFiles(args) {
         warnings.push(`Skipped verification path "${value}" because it is not inside the git repo.`);
         continue;
       }
-      const tracked = await gitTrackedPath(gitRoot, repoRelative);
+      if (!trackedPaths) {
+        let trackedOutput = null;
+        try {
+          trackedOutput = await runGit(gitRoot, ["ls-files", "-z", "--full-name"]);
+        } catch {}
+        trackedPaths = new Set(trackedOutput?.split("\x00").filter(Boolean) ?? []);
+      }
+      const tracked = trackedPaths.has(repoRelative) ? repoRelative : await gitTrackedPath(gitRoot, repoRelative);
       if (!tracked) {
         warnings.push(`Skipped verification path "${value}" because it is not a tracked git file.`);
         continue;
@@ -20060,6 +20169,10 @@ Stamp: file reads, search results and tool outputs the work ahead no longer need
 Keep: user messages (never stamp one for its directive), your own conversation text, unresolved errors, raw evidence you haven't extracted yet, and outputs whose exact wording may still matter.
 
 Look at each tag before stamping it; never blanket-stamp a range like "1-50". Many small targeted stamps beat one sweep. \`drop\` accepts "3-5", "1,2,9", "1-5,8,12-15".`;
+var CTX_REDUCE_SELF_STAMP_MESSAGE_TEMPLATE = "§N§ is a ctx_reduce call; leave those alone, they are cleaned up automatically.";
+function ctxReduceSelfStampMessage(tagNumber) {
+  return CTX_REDUCE_SELF_STAMP_MESSAGE_TEMPLATE.replace("§N§", `§${tagNumber}§`);
+}
 
 // src/tools/ctx-reduce.ts
 var ParamsSchema3 = _Object_({
@@ -20105,11 +20218,18 @@ function createCtxReduceTool(deps) {
       if (unknownIds.length > 0) {
         return err4(`Error: Unknown tag(s) ${formatIds(unknownIds)}. Check available tags in conversation.`);
       }
+      const ctxReduceSelfStampIds = new Set(allTags.filter((tag) => tag.toolName?.toLowerCase() === "ctx_reduce").map((tag) => tag.tagNumber));
+      const ctxReduceSelfStampNote = dropIds.filter((id) => ctxReduceSelfStampIds.has(id)).filter((id, index, ids) => ids.indexOf(id) === index).map(ctxReduceSelfStampMessage).join(" ");
+      dropIds = dropIds.filter((id) => !ctxReduceSelfStampIds.has(id));
       const activeTags = allTags.filter((tag) => tag.status === "active");
       const effectiveFloor = readEpochFloorSnapshot(deps.db, sessionId) ?? deps.resolveFloor?.(ctx) ?? deps.floor ?? deps.protectedTokens ?? 16000;
       const windowResult = getProtectionWindowForSession(deps.db, sessionId, effectiveFloor);
       const hasToolTags = allTags.some((t) => t.type === "tool");
-      const protectedSet = hasToolTags ? windowResult.tagNumberSet.tagNumbers : typeof deps.protectedTags === "number" && deps.protectedTags > 0 ? new Set(activeTags.map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, deps.protectedTags)) : new Set;
+      const windowSet = hasToolTags ? windowResult.tagNumberSet.tagNumbers : typeof deps.protectedTags === "number" && deps.protectedTags > 0 ? new Set(activeTags.map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, deps.protectedTags)) : new Set;
+      const protectedSet = new Set([
+        ...windowSet,
+        ...protectedToolTagNumbers(activeTags, deps.resolveProtectedTools?.(ctx) ?? deps.protectedTools)
+      ]);
       const tagStatusMap = new Map(allTags.map((tag) => [tag.tagNumber, tag.status]));
       const inertWhitespaceTagNumbers = new Set(getInertWhitespaceAssistantTags(deps.db, sessionId).map((tag) => tag.tagNumber));
       const inertDropIds = [
@@ -20139,7 +20259,14 @@ function createCtxReduceTool(deps) {
       ].filter(Boolean).join(" ");
       dropIds = dropIds.filter((id) => !inertWhitespaceTagNumbers.has(id) && tagStatusMap.get(id) !== "dropped" && pendingMap.get(id) !== "drop");
       if (dropIds.length === 0) {
-        return ok4([inertNote, skippedNote, "No new action is needed."].filter(Boolean).join(" "));
+        const noActionNotes = [
+          ctxReduceSelfStampNote,
+          inertNote,
+          skippedNote
+        ].filter(Boolean);
+        if (!ctxReduceSelfStampNote)
+          noActionNotes.push("No new action is needed.");
+        return ok4(noActionNotes.join(" "));
       }
       try {
         deps.db.transaction(() => {
@@ -20164,7 +20291,8 @@ function createCtxReduceTool(deps) {
         parts.push(`drop ${formatIds(immediateDropIds)}`);
       if (deferredDropIds.length > 0)
         parts.push(`deferred drop ${formatIds(deferredDropIds)}`);
-      return ok4(`Queued: ${parts.join(", ")}.${skippedNote ? ` ${skippedNote}` : ""}${inertNote ? ` ${inertNote}` : ""}`);
+      const held = deferredDropIds.length === 1 ? `Held: §${deferredDropIds[0]} is inside the protected working set; it applies once newer work displaces it.` : deferredDropIds.length > 1 ? `Held: ${deferredDropIds.map((id) => `§${id}`).join(", ")} are inside the protected working set; they apply once newer work displaces them.` : "";
+      return ok4(`Queued: ${parts.join(", ")}.${held ? ` ${held}` : ""}${skippedNote ? ` ${skippedNote}` : ""}${inertNote ? ` ${inertNote}` : ""}${ctxReduceSelfStampNote ? ` ${ctxReduceSelfStampNote}` : ""}`);
     }
   };
 }
@@ -20395,6 +20523,47 @@ var ftsPlainStatements = new WeakMap;
 var datedFtsPlainStatements = new WeakMap;
 var getBySHAsStatements = new WeakMap;
 var datedGetBySHAsStatements = new WeakMap;
+var embeddingCache = new WeakMap;
+function getSearchEmbeddings(db, projectPath, modelId) {
+  if (!isKnownAutocommit(db)) {
+    embeddingCache.delete(db);
+    return loadProjectCommitEmbeddings(db, projectPath, modelId);
+  }
+  let cache = embeddingCache.get(db);
+  if (!cache) {
+    cache = {
+      revisionStatement: db.prepare(`SELECT total_changes() AS writes,
+                (SELECT data_version FROM pragma_data_version) AS dataVersion,
+                (SELECT schema_version FROM pragma_schema_version) AS schemaVersion`),
+      revision: "",
+      entries: new Map
+    };
+    embeddingCache.set(db, cache);
+  }
+  const revision = JSON.stringify(cache.revisionStatement.get());
+  if (revision !== cache.revision) {
+    cache.entries.clear();
+    cache.revision = revision;
+  }
+  const key = JSON.stringify([projectPath, modelId]);
+  const cached = cache.entries.get(key);
+  if (cached) {
+    cache.entries.delete(key);
+    cache.entries.set(key, cached);
+    return cached;
+  }
+  const vectors = loadProjectCommitEmbeddings(db, projectPath, modelId);
+  const size = (entries) => [...entries.values()].reduce((sum, vector) => sum + vector.byteLength, 0);
+  if (size(vectors) <= 32 * 1024 * 1024)
+    cache.entries.set(key, vectors);
+  while (cache.entries.size > 16 || [...cache.entries.values()].reduce((sum, entry) => sum + size(entry), 0) > 32 * 1024 * 1024) {
+    const oldest = cache.entries.keys().next().value;
+    if (oldest === undefined)
+      break;
+    cache.entries.delete(oldest);
+  }
+  return vectors;
+}
 function rowToCommit(row) {
   return {
     sha: row.sha,
@@ -20491,7 +20660,7 @@ function searchGitCommitsSync(db, projectPath, query, options) {
   });
   const semanticScores = new Map;
   if (options.queryEmbedding && options.queryModelId && options.queryModelId !== "off") {
-    const embeddings = loadProjectCommitEmbeddings(db, projectPath, options.queryModelId);
+    const embeddings = getSearchEmbeddings(db, projectPath, options.queryModelId);
     for (const [sha, embedding] of embeddings.entries()) {
       const similarity = clamp01(cosineSimilarity(options.queryEmbedding, embedding));
       if (similarity > 0) {
@@ -22861,30 +23030,45 @@ function muralImageTokenEstimateForDimensions(width, height) {
 var muralImageTokenEstimate = muralImageTokenEstimateForDimensions(MURAL_WIDTH, MURAL_HEIGHT);
 
 // ../plugin/src/features/magic-context/mural/resolve-mural.ts
-function getMuralCoverage(db, projectIdentity) {
+function readMuralPool(db, projectIdentity) {
   const memories = getMemoriesByProject(db, projectIdentity, ["active", "permanent"]);
-  const cueState = getMuralCueState(db, memories.map((memory) => memory.id));
+  return {
+    memories,
+    cueState: getMuralCueState(db, memories.map((memory) => memory.id)),
+    contentHashes: new Map
+  };
+}
+function poolContentHash(pool, memory) {
+  const cached = pool?.contentHashes.get(memory.id);
+  if (cached?.content === memory.content)
+    return cached.hash;
+  const value = computeCueContentHash(memory.content);
+  pool?.contentHashes.set(memory.id, { content: memory.content, hash: value });
+  return value;
+}
+function getMuralCoverage(db, projectIdentity, pool) {
+  const { memories, cueState } = pool ?? readMuralPool(db, projectIdentity);
   let cuedMemoryCount = 0;
   for (const memory of memories) {
     const state = cueState.get(memory.id);
-    if (state && typeof state.cue === "string" && state.cue.trim() !== "" && state.hash !== null && state.hash === computeCueContentHash(memory.content)) {
+    if (state && typeof state.cue === "string" && state.cue.trim() !== "" && state.hash !== null && state.hash === poolContentHash(pool, memory)) {
       cuedMemoryCount += 1;
     }
   }
   return { activeMemoryCount: memories.length, cuedMemoryCount };
 }
-function resolveMural(db, projectIdentity, budgetTokens = DEFAULT_MURAL_MEMORY_BUDGET) {
-  const memories = getMemoriesByProject(db, projectIdentity, ["active", "permanent"]);
+function resolveMural(db, projectIdentity, budgetTokens = DEFAULT_MURAL_MEMORY_BUDGET, pool) {
+  const memories = pool?.memories ?? getMemoriesByProject(db, projectIdentity, ["active", "permanent"]);
   const overflow = muralOverflowMemories(memories, budgetTokens);
   if (overflow.length === 0)
     return [];
-  const cueState = getMuralCueState(db, overflow.map((memory) => memory.id));
+  const cueState = pool?.cueState ?? getMuralCueState(db, overflow.map((memory) => memory.id));
   const entries = [];
   for (const memory of overflow) {
     const state = cueState.get(memory.id);
     if (!state || state.cue === null || state.hash === null)
       continue;
-    if (state.hash !== computeCueContentHash(memory.content))
+    if (state.hash !== poolContentHash(pool, memory))
       continue;
     entries.push({
       id: memory.id,
@@ -22971,13 +23155,14 @@ function muralCoverageGate(cuedMemoryCount, activeMemoryCount) {
   return cuedMemoryCount >= MIN_MURAL_CUED_MEMORIES || cuedMemoryCount >= MIN_MURAL_COVERAGE * activeMemoryCount;
 }
 function ensureMuralRendered(db, projectIdentity, budgetTokens = DEFAULT_MURAL_MEMORY_BUDGET) {
-  const coverage = getMuralCoverage(db, projectIdentity);
+  const pool = readMuralPool(db, projectIdentity);
+  const coverage = getMuralCoverage(db, projectIdentity, pool);
   if (coverage.activeMemoryCount === 0 || !muralCoverageGate(coverage.cuedMemoryCount, coverage.activeMemoryCount)) {
     const skipReason = coverage.activeMemoryCount === 0 ? "no active memories" : `only ${coverage.cuedMemoryCount}/${coverage.activeMemoryCount} active memories have current cues (requires ${MIN_MURAL_CUED_MEMORIES} cues or ${MIN_MURAL_COVERAGE * 100}% coverage)`;
     log(`[mural] skipped for ${projectIdentity}: ${skipReason}`);
     return { hasMural: false, rerendered: false, skipReason };
   }
-  const entries = resolveMural(db, projectIdentity, budgetTokens);
+  const entries = resolveMural(db, projectIdentity, budgetTokens, pool);
   if (entries.length === 0) {
     return { hasMural: false, rerendered: false };
   }
@@ -23206,6 +23391,38 @@ function getOpenCodeDbPath() {
   return resolveOpenCodeDbPath().path;
 }
 var cachedWriteDb = null;
+var cachedRemovalDb = null;
+var MARKER_BUSY_TIMEOUT_MS = 250;
+var MARKER_REMOVAL_BUSY_TIMEOUT_MS = 5000;
+function runMarkerWriteTransaction(db, site, operation) {
+  if (db.inTransaction)
+    return db.transaction(operation).immediate();
+  const startedAt = performance.now();
+  let acquiredAt;
+  let workFinishedAt;
+  let committed = false;
+  try {
+    const result = db.transaction(() => {
+      acquiredAt = performance.now();
+      try {
+        return operation();
+      } finally {
+        workFinishedAt = performance.now();
+      }
+    }).immediate();
+    committed = true;
+    return result;
+  } finally {
+    const finishedAt = performance.now();
+    const acquireMs = (acquiredAt ?? finishedAt) - startedAt;
+    const holdMs = acquiredAt === undefined ? 0 : finishedAt - acquiredAt;
+    const workMs = acquiredAt === undefined ? 0 : (workFinishedAt ?? finishedAt) - acquiredAt;
+    const endMs = workFinishedAt === undefined ? 0 : finishedAt - workFinishedAt;
+    try {
+      log(`[magic-context] sqlite writer site=${site} db=opencode acquire_ms=${Math.round(acquireMs)} hold_ms=${Math.round(holdMs)} work_ms=${Math.round(workMs)} end_ms=${Math.round(endMs)} outcome=${acquiredAt === undefined ? "not_acquired" : committed ? "committed" : "failed"}`);
+    } catch {}
+  }
+}
 var REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
 var REQUIRED_PART_COLUMNS = [
   "id",
@@ -23238,18 +23455,19 @@ function isOpenCodeSchemaCompatible(db, dbPath) {
     return false;
   }
 }
-function getWritableOpenCodeDb() {
+function getWritableOpenCodeDb(purpose = "publication") {
   if (!harnessOwnsOpenCodeStore()) {
     throw new Error("OpenCode database is not writable from a Pi-compatible process");
   }
   const resolution = resolveOpenCodeDbPath();
   const dbPath = resolution.path;
-  if (cachedWriteDb?.path === dbPath) {
-    return cachedWriteDb.db;
+  const cached = purpose === "removal" ? cachedRemovalDb : cachedWriteDb;
+  if (cached?.path === dbPath) {
+    return cached.db;
   }
-  if (cachedWriteDb) {
+  if (cached) {
     try {
-      closeQuietly(cachedWriteDb.db);
+      closeQuietly(cached.db);
     } catch {}
   }
   if (!existsSync10(dbPath)) {
@@ -23262,9 +23480,13 @@ function getWritableOpenCodeDb() {
     closeQuietly(db);
     throw error;
   }
-  db.exec("PRAGMA busy_timeout=5000");
+  const timeoutMs = purpose === "removal" ? MARKER_REMOVAL_BUSY_TIMEOUT_MS : MARKER_BUSY_TIMEOUT_MS;
+  db.exec(`PRAGMA busy_timeout=${timeoutMs}`);
   db.exec("PRAGMA journal_mode=WAL");
-  cachedWriteDb = { path: dbPath, db };
+  if (purpose === "removal")
+    cachedRemovalDb = { path: dbPath, db };
+  else
+    cachedWriteDb = { path: dbPath, db };
   return db;
 }
 function getNonSummaryMessageSortKey(sessionId, messageId) {
@@ -23292,19 +23514,19 @@ function findBoundaryUserMessage(sessionId, endMessageId) {
                AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
                         AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
                AND COALESCE(json_extract(data, '$.role'), '') = 'user'
-               AND (time_created < ? OR (time_created = ? AND id <= ?))
+               AND (time_created, id) <= (?, ?)
                 AND NOT (
                     EXISTS (SELECT 1 FROM part p
-                            WHERE p.message_id = message.id AND p.session_id = message.session_id
+                            WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
                               AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction')
                     AND NOT EXISTS (SELECT 1 FROM part p
-                                    WHERE p.message_id = message.id AND p.session_id = message.session_id
+                                    WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
                                       AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction'
                                       AND COALESCE(json_extract(p.data, '$.synthetic'), 0) <> 1
                                       AND COALESCE(json_extract(p.data, '$.syntheticTodoMarker'), 0) <> 1)
                 )
               ORDER BY time_created DESC, id DESC
-             LIMIT 1`).get(sessionId, target.timeCreated, target.timeCreated, target.id);
+             LIMIT 1`).get(sessionId, target.timeCreated, target.id);
   if (typeof boundary?.id !== "string" || typeof boundary.time_created !== "number") {
     return null;
   }
@@ -23325,6 +23547,25 @@ function compareOpenCodeMessagesByCanonicalOrder(sessionId, leftMessageId, right
     return 1;
   return 0;
 }
+function isOpenCodeGapHistorianAbsent(sessionId, endId, nextId) {
+  const end = getNonSummaryMessageSortKey(sessionId, endId);
+  const next = getNonSummaryMessageSortKey(sessionId, nextId);
+  if (!end || !next || end.timeCreated > next.timeCreated || end.timeCreated === next.timeCreated && end.id >= next.id)
+    return false;
+  const row = getWritableOpenCodeDb().prepare(`SELECT 1 FROM message m
+        WHERE m.session_id=?
+          AND (m.time_created, m.id) > (?, ?)
+          AND (m.time_created, m.id) < (?, ?)
+          AND NOT (COALESCE(json_type(m.data,'$.summary'),'')='true' AND COALESCE(json_extract(m.data,'$.finish'),'')='stop')
+          AND NOT (
+            EXISTS (SELECT 1 FROM part p WHERE likelihood(p.message_id=m.id, 0.000001) AND +p.session_id=m.session_id AND COALESCE(json_extract(p.data,'$.type'),'')<>'compaction')
+            AND NOT EXISTS (SELECT 1 FROM part p WHERE likelihood(p.message_id=m.id, 0.000001) AND +p.session_id=m.session_id
+                AND COALESCE(json_extract(p.data,'$.type'),'')<>'compaction'
+                AND COALESCE(json_type(p.data,'$.synthetic'),'')<>'true'
+                AND COALESCE(json_type(p.data,'$.syntheticTodoMarker'),'')<>'true')
+          ) LIMIT 1`).get(sessionId, end.timeCreated, end.id, next.timeCreated, next.id);
+  return !row;
+}
 function removeLegacyMarkerLineageRows(db, args) {
   const legacySummaries = db.prepare(`SELECT m.id
              FROM message m
@@ -23387,7 +23628,7 @@ function injectCompactionMarker(args) {
     time: { created: boundaryTime + 1, completed: boundaryTime + 1 }
   });
   try {
-    db.transaction(() => {
+    runMarkerWriteTransaction(db, "compaction-marker-inject", () => {
       removeLegacyMarkerLineageRows(db, {
         sessionId: args.sessionId,
         boundaryMessageId: boundary.id,
@@ -23418,7 +23659,7 @@ function injectCompactionMarker(args) {
                      time_created = excluded.time_created,
                      time_updated = excluded.time_updated,
                      data = excluded.data`).run(summaryPartId, summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, JSON.stringify({ type: "text", text: args.summaryText }));
-    }).immediate();
+    });
     log(`[magic-context] compaction-marker: injected boundary at user msg ${boundary.id} (ordinal ~${args.endOrdinal}), summary msg ${summaryMsgId}`);
     return {
       boundaryMessageId: boundary.id,
@@ -23432,9 +23673,14 @@ function injectCompactionMarker(args) {
   }
 }
 function replaceCompactionMarker(existing, args) {
-  const db = getWritableOpenCodeDb();
+  let connection;
+  let entered = false;
+  let readyToCommit = false;
   try {
-    return db.transaction(() => {
+    const db = getWritableOpenCodeDb();
+    connection = db;
+    const marker = runMarkerWriteTransaction(db, "compaction-marker-replace", () => {
+      entered = true;
       if (existing) {
         db.prepare("DELETE FROM part WHERE id = ?").run(existing.summaryPartId);
         db.prepare("DELETE FROM message WHERE id = ?").run(existing.summaryMessageId);
@@ -23444,11 +23690,17 @@ function replaceCompactionMarker(existing, args) {
       if (!replacement) {
         throw new Error(`failed to inject replacement marker at ordinal ${args.endOrdinal}`);
       }
+      readyToCommit = true;
       return replacement;
-    }).immediate();
+    });
+    return { kind: "committed", marker };
   } catch (error) {
     log(`[magic-context] compaction-marker: atomic replacement failed: ${error instanceof Error ? error.message : String(error)}`);
-    return null;
+    const definitelyNoCut = !entered || !readyToCommit && connection?.inTransaction === false;
+    return {
+      kind: definitelyNoCut ? "definitely-no-cut" : "uncertain",
+      error: error instanceof Error ? error : new Error(String(error))
+    };
   }
 }
 
@@ -23500,6 +23752,21 @@ function existingMarkerAlreadyCoversTarget(sessionId, existing, targetOrdinal, t
   }
   return true;
 }
+function boundaryWouldDiscardUncoveredMessage(db, sessionId, ordinal, boundaryMessageId) {
+  const current = getPersistedCompactionMarkerState(db, sessionId);
+  const partials = getUncoveredCompartmentEndsThrough(db, sessionId, ordinal);
+  for (const partial of partials) {
+    if (current && compareOpenCodeMessagesByCanonicalOrder(sessionId, partial.endMessageId, current.boundaryMessageId) === -1)
+      continue;
+    const ordering = compareOpenCodeMessagesByCanonicalOrder(sessionId, boundaryMessageId, partial.endMessageId);
+    if (ordering !== null && ordering <= 0)
+      continue;
+    if (partial.successorStartMessageId && partial.successorStartMessage !== null && partial.successorStartMessage > partial.endMessage + 1 && isOpenCodeGapHistorianAbsent(sessionId, partial.endMessageId, partial.successorStartMessageId))
+      continue;
+    return true;
+  }
+  return false;
+}
 function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, directory) {
   if (getHarness() !== "opencode") {
     return true;
@@ -23509,9 +23776,6 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     sessionLog(sessionId, `compaction-marker: no compartment endMessageId for ordinal ${lastCompartmentEnd}; preserving existing marker`);
     return false;
   }
-  if (hasPartialCompartmentEndThrough(db, sessionId, lastCompartmentEnd)) {
-    return false;
-  }
   const existing = getPersistedCompactionMarkerState(db, sessionId);
   const removedSummaryMessageId = existing?.summaryMessageId ?? null;
   if (existing) {
@@ -23524,7 +23788,10 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     sessionLog(sessionId, `compaction-marker: no user boundary found at or before endMessageId ${targetEndMessageId} (ordinal ${lastCompartmentEnd}); preserving existing marker`);
     return false;
   }
-  const result = replaceCompactionMarker(existing, {
+  if (boundaryWouldDiscardUncoveredMessage(db, sessionId, lastCompartmentEnd, boundary.id)) {
+    return false;
+  }
+  const replacement = replaceCompactionMarker(existing, {
     sessionId,
     endOrdinal: lastCompartmentEnd,
     endMessageId: targetEndMessageId,
@@ -23532,7 +23799,8 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     directory: directory ?? process.cwd(),
     resolvedBoundary: boundary
   });
-  if (result) {
+  if (replacement.kind === "committed") {
+    const result = replacement.marker;
     persistMarkerStateAndDropReplacedTag(db, sessionId, {
       ...result,
       boundaryOrdinal: lastCompartmentEnd,
@@ -23552,6 +23820,7 @@ var MEMORY_EPOCH_COMPONENT_PREFIX = "|memory-render:";
 var MURAL_COMPONENT_PREFIX = "|mural-enabled:";
 var BUDGET_COMPONENT_PREFIX = "|render-budgets:";
 var RENDERED_BUDGETS_COMPONENT_PREFIX = "|rendered-budgets:";
+var M0_MEMORY_IDS_COMPONENT_PREFIX = "|m0-memory-ids:";
 function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = COMPARTMENT_RENDER_EPOCH, muralEnabled = null, renderBudgetIdentity = null, memoryRenderEpoch = MEMORY_RENDER_FORMAT_EPOCH, renderedBudgets = null) {
   let encoded = upgradeState ?? "";
   if (compartmentRenderEpoch !== null) {
@@ -23596,7 +23865,8 @@ function decodeCachedM0UpgradeIdentity(value) {
     value.indexOf(MEMORY_EPOCH_COMPONENT_PREFIX),
     value.indexOf(MURAL_COMPONENT_PREFIX),
     value.indexOf(BUDGET_COMPONENT_PREFIX),
-    value.indexOf(RENDERED_BUDGETS_COMPONENT_PREFIX)
+    value.indexOf(RENDERED_BUDGETS_COMPONENT_PREFIX),
+    value.indexOf(M0_MEMORY_IDS_COMPONENT_PREFIX)
   ].filter((index) => index >= 0);
   const identityEnd = componentIndexes.length > 0 ? Math.min(...componentIndexes) : value.length;
   const upgradeState = value.slice(0, identityEnd);
@@ -23610,6 +23880,22 @@ function decodeCachedM0UpgradeIdentity(value) {
     renderedBudgets: component(value, RENDERED_BUDGETS_COMPONENT_PREFIX)
   };
 }
+function withCachedM0MemoryIds(identity, ids) {
+  const withoutIds = (identity ?? "").replace(/\|m0-memory-ids:[^|]*/g, "");
+  return `${withoutIds}${M0_MEMORY_IDS_COMPONENT_PREFIX}${JSON.stringify(ids)}`;
+}
+function readCachedM0MemoryIds(identity, legacyVisibleIds, maxMemoryId) {
+  const encoded = component(identity ?? "", M0_MEMORY_IDS_COMPONENT_PREFIX);
+  if (encoded !== null) {
+    try {
+      const ids = JSON.parse(encoded);
+      if (Array.isArray(ids) && ids.every((id) => Number.isSafeInteger(id) && id > 0)) {
+        return ids;
+      }
+    } catch {}
+  }
+  return legacyVisibleIds.filter((id) => id <= maxMemoryId);
+}
 function renderBudgetIdentityChanged(cached, current) {
   const legacy = /^(m[^-]+)-h\d+$/.exec(cached);
   if (legacy && current.startsWith("m") && current.includes("-hp")) {
@@ -23890,6 +24176,7 @@ function formatGap(seconds) {
   return days === 0 ? `+${weeks}w` : `+${weeks}w ${days}d`;
 }
 var TEMPORAL_MARKER_PATTERN = /^<!-- \+[\d]+[mhdw](?: [\d]+[mhdw])? -->\n/;
+var TEMPORAL_MARKER_REPLAY_PATTERN = /^<!-- \+[\d]+[mhdw](?: [\d]+[mhdw])? -->(?:\n|$)/;
 function temporalMarkerPrefix(seconds) {
   const marker = formatGap(seconds);
   if (!marker)
@@ -24503,9 +24790,11 @@ function registerMagicContextTools(pi, opts) {
     pi.registerTool(surfaceTool(createCtxReduceTool({
       db: opts.db,
       protectedTags: opts.protectedTags ?? 20,
+      protectedTools: opts.protectedTools,
+      resolveProtectedTools: opts.resolveProtectedTools,
       resolveProtectedTags: opts.resolveProtectedTags
     })));
   }
 }
 
-export { COMPACTION_ENABLED_PATH, isDreamerRunnable, isCompactionEnabled, formatConfigParseStatusLine, formatConfigParseNotice, claimConfigParseFailuresOnce, parseJsoncRecovering, detectConfigFile, MIN_PLAUSIBLE_CONTEXT_LIMIT, catalogOutputReserve, reloadWindowOverlay, getWindowOverlay, resolveWindowOverlayFacts, deriveWindowGeometry, hasTrustedAbsoluteWall, applyProvenInputFloor, formatWindowDerivationLine, isSaneLimit, resolveOutputReserve, getSdkWindowGeometry, getSdkContextLimit, getSdkOutputLimit, getSdkInputLimit, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, computeProtectionWindow, readEpochFloorSnapshot, getProtectionWindowForSession, persistCachedM0, clearCachedM0M1, ReplayDocumentError, readReplayEnvelope, updateReplayDocument, isProviderOverflowFailClosedProven, describeProtectedTailDrainBudgetSkip, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, pruneAutoSearchHintDecisions, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, recordOverflowDetected, clearEmergencyRecovery, clearDetectedContextLimit, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, getSessionsWithPendingPiMarker, setSessionWorkMetrics, getSessionWorkMetrics, resolveEpochFloorForPass, buildCanonicalChunkTextFromFts, buildCompartmentSummaryFallbackText, canonicalizeInMemoryChunkTextForEmbedding, chunkCanonicalText, chunkEmbeddingWindowsAreCurrent, replaceCompartmentChunkEmbeddings, deleteChunkEmbedBackoffForSession, chunkWindowSourceKey, readSessionActivity, observeSessionActivity, backfillSessionActivity, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, recordSessionProjectIdentity, embedPauseBySession, embedRunStateBySession, autoEmbedAttemptedBySession, autoEmbedIdentityBySession, invalidateAutoEmbedSession, getEmbedDrainUiStatus, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, clearCompressionDepth, clearCompressionDepthRange, isNoContentCompartment, HAS_COMPARTMENT_CONTENT_SQL, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getCompartmentsByEndMessageId, appendCompartments, saveRecompStagingPass, getRecompStaging, clearRecompStaging, getRecompPartialRange, setRecompPartialRange, escapeXmlAttr, escapeXmlContent, isPartialCompartmentEnd, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, readProjectDocsCanonical, BoundedSessionMap, registerLkgPersistence, signatureForFields, lkgContentFields, lkgContentDigestFromFields, exactReusablePrefix, incrementalLkgContentDigests, captureSlot, getSlot, dropSlot, noteEntry, encodePiContentDecision, getPiContentDecisions, freezePiContentDecision, getNativeReplayState, saveNativeToolInputs, addNativeReasoningIds, copySessionStateForClone, queueMemoryMutation, getMemoryMutationsForRender, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationId, getMaxMemoryMutationIdForProjects, getNotes, addNote, getSessionNotes, getPendingSmartNotes, getReadySmartNotes, markNoteReady, markNoteChecked, queuePendingOp, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, PRIMER_CANDIDATE_TTL_MS, PRIMER_CANDIDATE_MAX_AGE_MS, primerOccurrenceKey, primerOccurrenceUtcDay, insertPrimerCandidates, updatePrimerCandidateEmbedding, getPrimerCandidatesByIds, getPrimerCandidatesForPromotion, countPrimerCandidatesForProject, getActivePrimers, createPrimer, updatePrimerSupport, updatePrimerAnswer, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, getSourceContents, recordSubagentInvocation, getLatestHistorianInvocationId, noteTouchedAt, noteNudgePickIndex, formatNoteNudge, setEmbeddingSessionBusy, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, SYNTH_USER_ID_PREFIX, resolvePiStableId, readPiSessionSnapshot, readPiSessionMessages, readPiSessionMessagePage, findRestartModelSeedFromBranch, iterateEntriesToRawMessageRange, convertEntriesToRawMessages, convertEntriesToRawMessagePage, countPiRawMessages, computeCueContentHash, hasMuralCueColumns, getMuralCueState, memoryNeedsCue, setMuralCue, recordMuralCueRejection, invalidateMemory, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, getUnclassifiedMemoryIds, insertMemory, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMaxMemoryIdForProjects, getMemoryById, setMemoryClassification, archiveMemory, getMemoryCountsByStatus, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getTaskScheduleState, getFailingDreamTasks, getSkippedDreamTasks, getMostRecentTaskRunAt, pruneNonCanonicalTaskRows, deleteTaskScheduleRowsForProject, seedTaskScheduleState, writeTaskScheduleState, isRetrospectiveWindowProcessed, recordRetrospectiveWindowProcessed, curateCategoryForMemoryCategory, peekCurateCategoryScope, beginCurateCategoryRun, curateTaskStateAfterSuccess, cosineSimilarity, drainBackgroundBatches, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, describeShadowBackfillWriteRefusal, contentSha256, drainProjectEmbeddingIdentityMaintenance, drainStaleEmbeddingIdentitiesForProject, enqueueShadowEmbeddingItems, getProjectEmbeddingSnapshot, getProjectChunkEmbeddingModelId, getProjectEmbeddingMaxInputTokens, embedTextForProject, embedBatchForProject, embedItemsForProject, embedUnembeddedMemoriesForProject, drainCommitBacklogForProject, embedSessionCompartmentChunks, getEmbeddingCoverageStatus, getAutoEmbeddingSessionCoverage, promoteSessionFactsDurable, embedPromotedFacts, recordMemoryMapping, recordMemoryVerifications, getUnmappedMemoryIds, clearMemoryVerifications, getMemoryVerifications, resolveGitTopLevel, readGitHead, readGitChangedFilesSince, readGitFileChangeTimesSince, verificationFileExists, normalizeVerificationFiles, isDirectiveShapedProjectRule, takeCurateSafetyRefusalCount, wakePlaneStatus, indexCommitsForProject, embedUnembeddedCommits, loadPiConfig, loadPiConfigDetailed, unregisterPiProjectEmbeddings, ensureProjectRegisteredFromPiDirectory, resolvePiHarnessDetection, resolvePiHarnessKind, MEMORY_MURAL_BLOCK, buildMagicContextSection, resolveMuralWire, updateCompactionMarkerAfterPublication, COMPARTMENT_RENDER_EPOCH, MEMORY_RENDER_FORMAT_EPOCH, encodeCachedM0UpgradeIdentity, decodeCachedM0UpgradeIdentity, renderBudgetIdentityChanged, renderedBudgetSnapshot, renderedBudgetShrinkReason, DEFAULT_HISTORY_BUDGET_TOKENS, renderCompartmentAtTier, renderDecayedCompartments, extractM0Block, TEMPORAL_MARKER_PATTERN, temporalMarkerPrefix, renderUserProfileContent, clearInjectionCache, getVisibleMemoryIds, orderHistorianMemories, renderHistorianMemoryBlock, DEFAULT_MEMORY_BUDGET_TOKENS, DEFAULT_USER_PROFILE_BUDGET_TOKENS, trimMemoriesToBudgetV2, trimWorkspaceMemoriesToBudgetV2, trimUserMemoriesToBudget, renderMemoryBlockV2, stripMemoryMuralBlock, unifiedSearch, rememberTodowriteToolCallTodos, parseTodos, setTodoSnapshot, registerTodoOverlay, registerTodoStateLifecycle, syncCtxMemoryToolEnabled, registerMagicContextTools };
+export { COMPACTION_ENABLED_PATH, isDreamerRunnable, isCompactionEnabled, formatConfigParseStatusLine, formatConfigParseNotice, claimConfigParseFailuresOnce, parseJsoncRecovering, detectConfigFile, MIN_PLAUSIBLE_CONTEXT_LIMIT, catalogOutputReserve, reloadWindowOverlay, getWindowOverlay, resolveWindowOverlayFacts, deriveWindowGeometry, hasTrustedAbsoluteWall, applyProvenInputFloor, formatWindowDerivationLine, isSaneLimit, resolveOutputReserve, getSdkWindowGeometry, getSdkContextLimit, getSdkOutputLimit, getSdkInputLimit, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, BoundedSessionMap, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, computeProtectionWindow, readEpochFloorSnapshot, getProtectionWindowForSession, persistCachedM0, clearCachedM0M1, isRustMarkerAdmissionFenced, ReplayDocumentError, readReplayEnvelope, updateReplayDocument, isProviderOverflowFailClosedProven, describeProtectedTailDrainBudgetSkip, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, pruneAutoSearchHintDecisions, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, recordOverflowDetected, clearEmergencyRecovery, clearDetectedContextLimit, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, getSessionsWithPendingPiMarker, setSessionWorkMetrics, getSessionWorkMetrics, resolveEpochFloorForPass, buildCanonicalChunkTextFromFts, buildCompartmentSummaryFallbackText, canonicalizeInMemoryChunkTextForEmbedding, chunkCanonicalText, chunkEmbeddingWindowsAreCurrent, replaceCompartmentChunkEmbeddings, deleteChunkEmbedBackoffForSession, chunkWindowSourceKey, readSessionActivity, observeSessionActivity, backfillSessionActivity, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, recordSessionProjectIdentity, embedPauseBySession, embedRunStateBySession, autoEmbedAttemptedBySession, autoEmbedIdentityBySession, invalidateAutoEmbedSession, getEmbedDrainUiStatus, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, clearCompressionDepth, clearCompressionDepthRange, isNoContentCompartment, HAS_COMPARTMENT_CONTENT_SQL, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getCompartmentsByEndMessageId, appendCompartments, saveRecompStagingPass, getRecompStaging, clearRecompStaging, getRecompPartialRange, setRecompPartialRange, escapeXmlAttr, escapeXmlContent, getUncoveredCompartmentEndThrough, isPartialCompartmentEnd, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, readProjectDocsCanonical, providerResponseFailed, isSuccessfulProviderCompletion, registerLkgPersistence, LKG_SNAPSHOT_ARRAY, LKG_SNAPSHOT_OBJECT, LKG_SNAPSHOT_KEY, LKG_SNAPSHOT_STRING, LKG_SNAPSHOT_NUMBER, LKG_SNAPSHOT_BOOLEAN, LKG_SNAPSHOT_NULL, LKG_SNAPSHOT_UNDEFINED, contentSnapshotValue, signatureForFields, lkgContentFields, lkgContentDigestFromFields, exactReusablePrefix, incrementalLkgContentDigests, captureSlot, getInMemorySlot, getSlot, dropSlot, noteEntry, encodePiContentDecision, decodePiContentDecision, getPiContentDecisions, freezePiContentDecision, getNativeReplayState, saveNativeToolInputs, addNativeReasoningIds, copySessionStateForClone, queueMemoryMutation, getMemoryMutationsForRender, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationId, getMaxMemoryMutationIdForProjects, getNotes, addNote, getSessionNotes, getPendingSmartNotes, getReadySmartNotes, markNoteReady, markNoteChecked, PRIMER_CANDIDATE_TTL_MS, PRIMER_CANDIDATE_MAX_AGE_MS, primerOccurrenceKey, primerOccurrenceUtcDay, insertPrimerCandidates, updatePrimerCandidateEmbedding, getPrimerCandidatesByIds, getPrimerCandidatesForPromotion, countPrimerCandidatesForProject, getActivePrimers, createPrimer, updatePrimerSupport, updatePrimerAnswer, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, getSourceContents, recordSubagentInvocation, getLatestHistorianInvocationId, noteTouchedAt, noteNudgePickIndex, formatNoteNudge, setEmbeddingSessionBusy, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, SYNTH_USER_ID_PREFIX, resolvePiStableId, readPiSessionSnapshot, readPiSessionMessages, readPiSessionMessagePage, findRestartModelSeedFromBranch, iterateEntriesToRawMessageRange, convertEntriesToRawMessages, convertPiAssistantEntryById, convertEntriesToRawMessagePage, countPiRawMessages, computeCueContentHash, hasMuralCueColumns, getMuralCueState, memoryNeedsCue, setMuralCue, recordMuralCueRejection, invalidateMemory, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, getUnclassifiedMemoryIds, insertMemory, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMaxMemoryIdForProjects, getMemoryById, setMemoryClassification, archiveMemory, getMemoryCountsByStatus, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getTaskScheduleState, getFailingDreamTasks, getSkippedDreamTasks, getMostRecentTaskRunAt, pruneNonCanonicalTaskRows, deleteTaskScheduleRowsForProject, seedTaskScheduleState, writeTaskScheduleState, isRetrospectiveWindowProcessed, recordRetrospectiveWindowProcessed, curateCategoryForMemoryCategory, peekCurateCategoryScope, beginCurateCategoryRun, curateTaskStateAfterSuccess, cosineSimilarity, drainBackgroundBatches, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, describeShadowBackfillWriteRefusal, contentSha256, drainProjectEmbeddingIdentityMaintenance, drainStaleEmbeddingIdentitiesForProject, enqueueShadowEmbeddingItems, getProjectEmbeddingSnapshot, getProjectChunkEmbeddingModelId, getProjectEmbeddingMaxInputTokens, embedTextForProject, embedBatchForProject, embedItemsForProject, embedUnembeddedMemoriesForProject, drainCommitBacklogForProject, embedSessionCompartmentChunks, getEmbeddingCoverageStatus, getAutoEmbeddingSessionCoverage, promoteSessionFactsDurable, embedPromotedFacts, recordMemoryMapping, recordMemoryVerifications, getUnmappedMemoryIds, clearMemoryVerifications, getMemoryVerifications, resolveGitTopLevel, readGitHead, readGitChangedFilesSince, readGitFileChangeTimesSince, verificationFileExists, normalizeVerificationFiles, isDirectiveShapedProjectRule, takeCurateSafetyRefusalCount, wakePlaneStatus, indexCommitsForProject, embedUnembeddedCommits, loadPiConfig, loadPiConfigDetailed, unregisterPiProjectEmbeddings, ensureProjectRegisteredFromPiDirectory, resolvePiHarnessDetection, resolvePiHarnessKind, MEMORY_MURAL_BLOCK, buildMagicContextSection, resolveMuralWire, updateCompactionMarkerAfterPublication, COMPARTMENT_RENDER_EPOCH, MEMORY_RENDER_FORMAT_EPOCH, encodeCachedM0UpgradeIdentity, decodeCachedM0UpgradeIdentity, withCachedM0MemoryIds, readCachedM0MemoryIds, renderBudgetIdentityChanged, renderedBudgetSnapshot, renderedBudgetShrinkReason, DEFAULT_HISTORY_BUDGET_TOKENS, renderCompartmentAtTier, renderDecayedCompartments, extractM0Block, TEMPORAL_MARKER_PATTERN, TEMPORAL_MARKER_REPLAY_PATTERN, temporalMarkerPrefix, renderUserProfileContent, clearInjectionCache, getVisibleMemoryIds, orderHistorianMemories, renderHistorianMemoryBlock, DEFAULT_MEMORY_BUDGET_TOKENS, DEFAULT_USER_PROFILE_BUDGET_TOKENS, trimMemoriesToBudgetV2, trimWorkspaceMemoriesToBudgetV2, trimUserMemoriesToBudget, renderMemoryBlockV2, stripMemoryMuralBlock, unifiedSearch, rememberTodowriteToolCallTodos, parseTodos, setTodoSnapshot, registerTodoOverlay, registerTodoStateLifecycle, syncCtxMemoryToolEnabled, registerMagicContextTools };