@cortexkit/opencode-magic-context 0.3.0 → 0.3.2

package/dist/index.js

@@ -15037,6 +15037,8 @@ function releaseLease(db, holderId) {
 function enqueueDream(db, projectIdentity, reason) {
   const now = Date.now();
   return db.transaction(() => {
+    const staleThresholdMs = 10 * 60 * 1000;
+    db.run("DELETE FROM dream_queue WHERE project_path = ? AND started_at IS NOT NULL AND started_at < ?", [projectIdentity, now - staleThresholdMs]);
     const existing = db.query("SELECT id FROM dream_queue WHERE project_path = ?").get(projectIdentity);
     if (existing) {
       return null;
@@ -15323,7 +15325,7 @@ async function runDream(args) {
     log(`[dreamer] lease released: ${holderId}`);
   }
   result.finishedAt = Date.now();
-  const hasSuccessfulTask = result.tasks.some((t) => !t.error);
+  const hasSuccessfulTask = result.tasks.some((t) => !t.error && t.name !== "smart-notes");
   if (hasSuccessfulTask) {
     setDreamState(args.db, `last_dream_at:${args.projectIdentity}`, String(result.finishedAt));
     setDreamState(args.db, "last_dream_at", String(result.finishedAt));
@@ -15569,9 +15571,20 @@ function checkScheduleAndEnqueue(db, schedule) {
   }
   return enqueued;
 }
-// src/features/magic-context/storage-db.ts
+// src/shared/internal-initiator-marker.ts
+var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
+
+// src/shared/system-directive.ts
+var SYSTEM_DIRECTIVE_PREFIX = "[SYSTEM DIRECTIVE: MAGIC-CONTEXT";
+function isSystemDirective(text) {
+  return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
+}
+function removeSystemReminders(text) {
+  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
+}
+
+// src/hooks/magic-context/read-session-db.ts
 import { Database } from "bun:sqlite";
-import { mkdirSync } from "fs";
 import { join as join5 } from "path";
 
 // src/shared/data-path.ts
@@ -15584,1012 +15597,1050 @@ function getOpenCodeStorageDir() {
   return path2.join(getDataDir(), "opencode", "storage");
 }
 
-// src/features/magic-context/storage-db.ts
-var databases = new Map;
-var FALLBACK_DATABASE_KEY = "__fallback__:memory:";
-var persistenceByDatabase = new WeakMap;
-var persistenceErrorByDatabase = new WeakMap;
-function resolveDatabasePath() {
-  const dbDir = join5(getOpenCodeStorageDir(), "plugin", "magic-context");
-  return { dbDir, dbPath: join5(dbDir, "context.db") };
+// src/hooks/magic-context/read-session-db.ts
+function getOpenCodeDbPath() {
+  return join5(getDataDir(), "opencode", "opencode.db");
+}
+var cachedReadOnlyDb = null;
+function closeCachedReadOnlyDb() {
+  if (!cachedReadOnlyDb) {
+    return;
+  }
+  try {
+    cachedReadOnlyDb.db.close(false);
+  } catch (error48) {
+    log("[magic-context] failed to close cached OpenCode read-only DB:", error48);
+  } finally {
+    cachedReadOnlyDb = null;
+  }
+}
+function getReadOnlySessionDb() {
+  const dbPath = getOpenCodeDbPath();
+  if (cachedReadOnlyDb?.path === dbPath) {
+    return cachedReadOnlyDb.db;
+  }
+  closeCachedReadOnlyDb();
+  const db = new Database(dbPath, { readonly: true });
+  cachedReadOnlyDb = { path: dbPath, db };
+  return db;
+}
+function withReadOnlySessionDb(fn) {
+  return fn(getReadOnlySessionDb());
+}
+function getRawSessionMessageCountFromDb(db, sessionId) {
+  const row = db.prepare("SELECT COUNT(*) as count FROM message WHERE session_id = ?").get(sessionId);
+  return typeof row?.count === "number" ? row.count : 0;
 }
-function initializeDatabase(db) {
-  db.run("PRAGMA journal_mode=WAL");
-  db.run("PRAGMA busy_timeout=5000");
-  db.run("PRAGMA foreign_keys=ON");
-  db.run(`
-    CREATE TABLE IF NOT EXISTS tags (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT,
-      message_id TEXT,
-      type TEXT,
-      status TEXT DEFAULT 'active',
-      byte_size INTEGER,
-      tag_number INTEGER,
-      UNIQUE(session_id, tag_number)
-    );
-
-    CREATE TABLE IF NOT EXISTS pending_ops (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT,
-      tag_id INTEGER,
-      operation TEXT,
-      queued_at INTEGER
-    );
 
-    CREATE TABLE IF NOT EXISTS source_contents (
-      tag_id INTEGER,
-      session_id TEXT,
-      content TEXT,
-      created_at INTEGER,
-      PRIMARY KEY(session_id, tag_id)
-    );
+// src/hooks/magic-context/read-session-formatting.ts
+var COMMIT_HASH_PATTERN = /`?\b([0-9a-f]{6,12})\b`?/gi;
+var COMMIT_HINT_PATTERN = /\b(commit(?:ted)?|cherry-?pick(?:ed)?|hash(?:es)?|sha)\b/i;
+var MAX_COMMITS_PER_BLOCK = 5;
+function hasMeaningfulUserText(parts) {
+  for (const part of parts) {
+    if (part === null || typeof part !== "object")
+      continue;
+    const candidate = part;
+    if (candidate.type !== "text" || typeof candidate.text !== "string")
+      continue;
+    if (candidate.ignored === true)
+      continue;
+    const cleaned = removeSystemReminders(candidate.text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
+    if (!cleaned)
+      continue;
+    if (isSystemDirective(cleaned))
+      continue;
+    return true;
+  }
+  return false;
+}
+function extractTexts(parts) {
+  const texts = [];
+  for (const part of parts) {
+    if (part === null || typeof part !== "object")
+      continue;
+    const p = part;
+    if (p.type === "text" && typeof p.text === "string" && p.text.trim().length > 0) {
+      texts.push(p.text.trim());
+    }
+  }
+  return texts;
+}
+function estimateTokens(text) {
+  return Math.ceil(text.length / 3.5);
+}
+function normalizeText(text) {
+  return text.replace(/\s+/g, " ").trim();
+}
+function compactRole(role) {
+  if (role === "assistant")
+    return "A";
+  if (role === "user")
+    return "U";
+  return role.slice(0, 1).toUpperCase() || "M";
+}
+function formatBlock(block) {
+  const range = block.startOrdinal === block.endOrdinal ? `[${block.startOrdinal}]` : `[${block.startOrdinal}-${block.endOrdinal}]`;
+  const commitSuffix = block.commitHashes.length > 0 ? ` commits: ${block.commitHashes.join(", ")}` : "";
+  return `${range} ${block.role}:${commitSuffix} ${block.parts.join(" / ")}`;
+}
+function extractCommitHashes(text) {
+  const hashes = [];
+  const seen = new Set;
+  for (const match of text.matchAll(COMMIT_HASH_PATTERN)) {
+    const hash2 = match[1]?.toLowerCase();
+    if (!hash2 || seen.has(hash2))
+      continue;
+    seen.add(hash2);
+    hashes.push(hash2);
+    if (hashes.length >= MAX_COMMITS_PER_BLOCK)
+      break;
+  }
+  return hashes;
+}
+function compactTextForSummary(text, role) {
+  const commitHashes = role === "assistant" ? extractCommitHashes(text) : [];
+  if (commitHashes.length === 0 || !COMMIT_HINT_PATTERN.test(text)) {
+    return { text, commitHashes };
+  }
+  const withoutHashes = text.replace(COMMIT_HASH_PATTERN, "").replace(/\(\s*\)/g, "").replace(/\s+,/g, ",").replace(/,\s*,+/g, ", ").replace(/\s{2,}/g, " ").replace(/\s+([,.;:])/g, "$1").trim();
+  return {
+    text: withoutHashes.length > 0 ? withoutHashes : text,
+    commitHashes
+  };
+}
+function mergeCommitHashes(existing, next) {
+  if (next.length === 0)
+    return existing;
+  const merged = [...existing];
+  for (const hash2 of next) {
+    if (merged.includes(hash2))
+      continue;
+    merged.push(hash2);
+    if (merged.length >= MAX_COMMITS_PER_BLOCK)
+      break;
+  }
+  return merged;
+}
 
-    CREATE TABLE IF NOT EXISTS compartments (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      sequence INTEGER NOT NULL,
-      start_message INTEGER NOT NULL,
-      end_message INTEGER NOT NULL,
-      start_message_id TEXT DEFAULT '',
-      end_message_id TEXT DEFAULT '',
-      title TEXT NOT NULL,
-      content TEXT NOT NULL,
-      created_at INTEGER NOT NULL,
-      UNIQUE(session_id, sequence)
-    );
+// src/hooks/magic-context/read-session-raw.ts
+function isRawMessageRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const candidate = row;
+  return typeof candidate.id === "string" && typeof candidate.data === "string";
+}
+function isRawPartRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const candidate = row;
+  return typeof candidate.message_id === "string" && typeof candidate.data === "string";
+}
+function parseJsonRecord(value) {
+  const parsed = JSON.parse(value);
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error("Expected JSON object");
+  }
+  return parsed;
+}
+function parseJsonUnknown(value) {
+  return JSON.parse(value);
+}
+function readRawSessionMessagesFromDb(db, sessionId) {
+  const messageRows = db.prepare("SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawMessageRow);
+  const partRows = db.prepare("SELECT message_id, data FROM part WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawPartRow);
+  const partsByMessageId = new Map;
+  for (const part of partRows) {
+    const list = partsByMessageId.get(part.message_id) ?? [];
+    list.push(parseJsonUnknown(part.data));
+    partsByMessageId.set(part.message_id, list);
+  }
+  return messageRows.map((row, index) => {
+    const info = parseJsonRecord(row.data);
+    const role = typeof info.role === "string" ? info.role : "unknown";
+    return {
+      ordinal: index + 1,
+      id: row.id,
+      role,
+      parts: partsByMessageId.get(row.id) ?? []
+    };
+  });
+}
 
-    CREATE TABLE IF NOT EXISTS session_facts (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      category TEXT NOT NULL,
-      content TEXT NOT NULL,
-      created_at INTEGER NOT NULL,
-      updated_at INTEGER NOT NULL
-    );
+// src/hooks/magic-context/tag-content-primitives.ts
+var encoder = new TextEncoder;
+var TAG_PREFIX_REGEX = /^\u00A7\d+\u00A7\s*/;
+function byteSize(value) {
+  return encoder.encode(value).length;
+}
+function stripTagPrefix(value) {
+  return value.replace(TAG_PREFIX_REGEX, "");
+}
+function prependTag(tagId, value) {
+  const stripped = stripTagPrefix(value);
+  return `\xA7${tagId}\xA7 ${stripped}`;
+}
+function isThinkingPart(part) {
+  if (part === null || typeof part !== "object")
+    return false;
+  const candidate = part;
+  return candidate.type === "thinking" || candidate.type === "reasoning";
+}
 
-    CREATE TABLE IF NOT EXISTS session_notes (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      content TEXT NOT NULL,
-      created_at INTEGER NOT NULL
-    );
-
-    CREATE TABLE IF NOT EXISTS memories (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      project_path TEXT NOT NULL,
-      category TEXT NOT NULL,
-      content TEXT NOT NULL,
-      normalized_hash TEXT NOT NULL,
-      source_session_id TEXT,
-      source_type TEXT DEFAULT 'historian',
-      seen_count INTEGER DEFAULT 1,
-      retrieval_count INTEGER DEFAULT 0,
-      first_seen_at INTEGER NOT NULL,
-      created_at INTEGER NOT NULL,
-      updated_at INTEGER NOT NULL,
-      last_seen_at INTEGER NOT NULL,
-      last_retrieved_at INTEGER,
-      status TEXT DEFAULT 'active',
-      expires_at INTEGER,
-      verification_status TEXT DEFAULT 'unverified',
-      verified_at INTEGER,
-      superseded_by_memory_id INTEGER,
-      merged_from TEXT,
-      metadata_json TEXT,
-      UNIQUE(project_path, category, normalized_hash)
-    );
-
-    CREATE TABLE IF NOT EXISTS memory_embeddings (
-      memory_id INTEGER PRIMARY KEY REFERENCES memories(id) ON DELETE CASCADE,
-      embedding BLOB NOT NULL,
-      model_id TEXT
-    );
-
-    CREATE TABLE IF NOT EXISTS dream_state (
-      key TEXT PRIMARY KEY,
-      value TEXT NOT NULL
-    );
-
-    CREATE TABLE IF NOT EXISTS dream_queue (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      project_path TEXT NOT NULL,
-      reason TEXT NOT NULL,
-      enqueued_at INTEGER NOT NULL,
-      started_at INTEGER,
-      retry_count INTEGER DEFAULT 0
-    );
-    CREATE INDEX IF NOT EXISTS idx_dream_queue_project ON dream_queue(project_path);
-CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, enqueued_at);
-
-    CREATE TABLE IF NOT EXISTS smart_notes (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      project_path TEXT NOT NULL,
-      content TEXT NOT NULL,
-      surface_condition TEXT NOT NULL,
-      status TEXT NOT NULL DEFAULT 'pending',
-      created_session_id TEXT,
-      created_at INTEGER NOT NULL,
-      updated_at INTEGER NOT NULL,
-      last_checked_at INTEGER,
-      ready_at INTEGER,
-      ready_reason TEXT
-    );
-    CREATE INDEX IF NOT EXISTS idx_smart_notes_project_status ON smart_notes(project_path, status);
-
-    CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
-      content,
-      category,
-      content='memories',
-      content_rowid='id',
-      tokenize='porter unicode61'
-    );
-
-    CREATE VIRTUAL TABLE IF NOT EXISTS message_history_fts USING fts5(
-      session_id UNINDEXED,
-      message_ordinal UNINDEXED,
-      message_id UNINDEXED,
-      role,
-      content,
-      tokenize='porter unicode61'
-    );
-
-    CREATE TABLE IF NOT EXISTS message_history_index (
-      session_id TEXT PRIMARY KEY,
-      last_indexed_ordinal INTEGER NOT NULL DEFAULT 0,
-      updated_at INTEGER NOT NULL
-    );
-
-    CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
-      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
-    END;
-
-    CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
-      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
-    END;
-
-    CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
-      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
-      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
-    END;
-
-    CREATE TABLE IF NOT EXISTS session_meta (
-      session_id TEXT PRIMARY KEY,
-      last_response_time INTEGER,
-      cache_ttl TEXT,
-      counter INTEGER DEFAULT 0,
-      last_nudge_tokens INTEGER DEFAULT 0,
-      last_nudge_band TEXT DEFAULT '',
-      last_transform_error TEXT DEFAULT '',
-      nudge_anchor_message_id TEXT DEFAULT '',
-      nudge_anchor_text TEXT DEFAULT '',
-      sticky_turn_reminder_text TEXT DEFAULT '',
-      sticky_turn_reminder_message_id TEXT DEFAULT '',
-      note_nudge_trigger_pending INTEGER DEFAULT 0,
-      note_nudge_trigger_message_id TEXT DEFAULT '',
-      note_nudge_sticky_text TEXT DEFAULT '',
-      note_nudge_sticky_message_id TEXT DEFAULT '',
-      is_subagent INTEGER DEFAULT 0,
-      last_context_percentage REAL DEFAULT 0,
-      last_input_tokens INTEGER DEFAULT 0,
-      times_execute_threshold_reached INTEGER DEFAULT 0,
-      compartment_in_progress INTEGER DEFAULT 0,
-      system_prompt_hash TEXT DEFAULT '',
-      memory_block_cache TEXT DEFAULT '',
-      memory_block_count INTEGER DEFAULT 0
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
-    CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
-    CREATE INDEX IF NOT EXISTS idx_pending_ops_session_tag_id ON pending_ops(session_id, tag_id);
-    CREATE INDEX IF NOT EXISTS idx_source_contents_session ON source_contents(session_id);
-    
-    CREATE TABLE IF NOT EXISTS recomp_compartments (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      sequence INTEGER NOT NULL,
-      start_message INTEGER NOT NULL,
-      end_message INTEGER NOT NULL,
-      start_message_id TEXT DEFAULT '',
-      end_message_id TEXT DEFAULT '',
-      title TEXT NOT NULL,
-      content TEXT NOT NULL,
-      pass_number INTEGER NOT NULL,
-      created_at INTEGER NOT NULL,
-      UNIQUE(session_id, sequence)
-    );
-
-    CREATE TABLE IF NOT EXISTS recomp_facts (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      category TEXT NOT NULL,
-      content TEXT NOT NULL,
-      pass_number INTEGER NOT NULL,
-      created_at INTEGER NOT NULL
-    );
+// src/hooks/magic-context/tag-part-guards.ts
+function isTextPart(part) {
+  if (part === null || typeof part !== "object")
+    return false;
+  const p = part;
+  return p.type === "text" && typeof p.text === "string";
+}
+function isToolPartWithOutput(part) {
+  if (part === null || typeof part !== "object")
+    return false;
+  const p = part;
+  if (p.type !== "tool" || typeof p.callID !== "string")
+    return false;
+  if (p.state === null || typeof p.state !== "object")
+    return false;
+  return typeof p.state.output === "string";
+}
+function isFilePart(part) {
+  if (part === null || typeof part !== "object")
+    return false;
+  const p = part;
+  return p.type === "file" && typeof p.url === "string";
+}
+function buildFileSourceContent(parts) {
+  const content = parts.filter(isTextPart).map((part) => stripTagPrefix(part.text)).join(`
+`).trim();
+  return content.length > 0 ? content : null;
+}
 
-    CREATE INDEX IF NOT EXISTS idx_compartments_session ON compartments(session_id);
-    CREATE INDEX IF NOT EXISTS idx_session_facts_session ON session_facts(session_id);
-    CREATE INDEX IF NOT EXISTS idx_recomp_compartments_session ON recomp_compartments(session_id);
-    CREATE INDEX IF NOT EXISTS idx_recomp_facts_session ON recomp_facts(session_id);
-    CREATE INDEX IF NOT EXISTS idx_session_notes_session ON session_notes(session_id);
-    CREATE INDEX IF NOT EXISTS idx_memories_project_status_category ON memories(project_path, status, category);
-    CREATE INDEX IF NOT EXISTS idx_memories_project_status_expires ON memories(project_path, status, expires_at);
-    CREATE INDEX IF NOT EXISTS idx_memories_project_category_hash ON memories(project_path, category, normalized_hash);
-    CREATE INDEX IF NOT EXISTS idx_message_history_index_updated_at ON message_history_index(updated_at);
-  `);
-  ensureColumn(db, "session_meta", "last_nudge_band", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "nudge_anchor_text", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "sticky_turn_reminder_text", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "sticky_turn_reminder_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "note_nudge_trigger_pending", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "note_nudge_trigger_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "note_nudge_sticky_text", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "note_nudge_sticky_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "times_execute_threshold_reached", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "compartment_in_progress", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
-  ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
-  ensureColumn(db, "session_meta", "memory_block_cache", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "memory_block_count", "INTEGER DEFAULT 0");
-  ensureColumn(db, "dream_queue", "retry_count", "INTEGER DEFAULT 0");
+// src/hooks/magic-context/read-session-chunk.ts
+var activeRawMessageCache = null;
+function cleanUserText(text) {
+  return removeSystemReminders(text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
 }
-function ensureColumn(db, table, column, definition) {
-  if (!/^[a-z_]+$/.test(table) || !/^[a-z_]+$/.test(column) || !/^[A-Z0-9_'(),\s]+$/i.test(definition)) {
-    throw new Error(`Unsafe schema identifier: ${table}.${column} ${definition}`);
+function withRawSessionMessageCache(fn) {
+  const outerCache = activeRawMessageCache;
+  if (!outerCache) {
+    activeRawMessageCache = new Map;
   }
-  const rows = db.prepare(`PRAGMA table_info(${table})`).all();
-  if (rows.some((row) => row.name === column)) {
-    return;
+  try {
+    return fn();
+  } finally {
+    if (!outerCache) {
+      activeRawMessageCache = null;
+    }
   }
-  db.run(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
 }
-function createFallbackDatabase() {
-  try {
-    const fallback = new Database(":memory:");
-    initializeDatabase(fallback);
-    return fallback;
-  } catch (error48) {
-    throw new Error(`[magic-context] storage fatal: failed to initialize fallback database: ${getErrorMessage(error48)}`);
+function readRawSessionMessages(sessionId) {
+  if (activeRawMessageCache) {
+    const cached2 = activeRawMessageCache.get(sessionId);
+    if (cached2) {
+      return cached2;
+    }
+    const messages = withReadOnlySessionDb((db) => readRawSessionMessagesFromDb(db, sessionId));
+    activeRawMessageCache.set(sessionId, messages);
+    return messages;
   }
+  return withReadOnlySessionDb((db) => readRawSessionMessagesFromDb(db, sessionId));
 }
-function openDatabase() {
-  try {
-    const { dbDir, dbPath } = resolveDatabasePath();
-    const existing = databases.get(dbPath);
-    if (existing) {
-      if (!persistenceByDatabase.has(existing)) {
-        persistenceByDatabase.set(existing, true);
+function getRawSessionMessageCount(sessionId) {
+  return withReadOnlySessionDb((db) => getRawSessionMessageCountFromDb(db, sessionId));
+}
+function getRawSessionTagKeysThrough(sessionId, upToMessageIndex) {
+  const messages = readRawSessionMessages(sessionId);
+  const keys = [];
+  for (const message of messages) {
+    if (message.ordinal > upToMessageIndex)
+      break;
+    for (const [partIndex, part] of message.parts.entries()) {
+      if (isTextPart(part)) {
+        keys.push(`${message.id}:p${partIndex}`);
       }
-      return existing;
-    }
-    mkdirSync(dbDir, { recursive: true });
-    const db = new Database(dbPath);
-    initializeDatabase(db);
-    databases.set(dbPath, db);
-    persistenceByDatabase.set(db, true);
-    persistenceErrorByDatabase.delete(db);
-    return db;
-  } catch (error48) {
-    log("[magic-context] storage error:", error48);
-    const errorMessage = getErrorMessage(error48);
-    const existingFallback = databases.get(FALLBACK_DATABASE_KEY);
-    if (existingFallback) {
-      if (!persistenceByDatabase.has(existingFallback)) {
-        persistenceByDatabase.set(existingFallback, false);
-        persistenceErrorByDatabase.set(existingFallback, errorMessage);
+      if (isFilePart(part)) {
+        keys.push(`${message.id}:file${partIndex}`);
+      }
+      if (isToolPartWithOutput(part)) {
+        keys.push(part.callID);
       }
-      return existingFallback;
     }
-    const fallback = createFallbackDatabase();
-    databases.set(FALLBACK_DATABASE_KEY, fallback);
-    persistenceByDatabase.set(fallback, false);
-    persistenceErrorByDatabase.set(fallback, errorMessage);
-    return fallback;
   }
+  return keys;
 }
-function isDatabasePersisted(db) {
-  return persistenceByDatabase.get(db) ?? false;
-}
-function getDatabasePersistenceError(db) {
-  return persistenceErrorByDatabase.get(db) ?? null;
-}
-// src/features/magic-context/storage-meta-shared.ts
-var META_COLUMNS = {
-  lastResponseTime: "last_response_time",
-  cacheTtl: "cache_ttl",
-  counter: "counter",
-  lastNudgeTokens: "last_nudge_tokens",
-  lastNudgeBand: "last_nudge_band",
-  lastTransformError: "last_transform_error",
-  isSubagent: "is_subagent",
-  lastContextPercentage: "last_context_percentage",
-  lastInputTokens: "last_input_tokens",
-  timesExecuteThresholdReached: "times_execute_threshold_reached",
-  compartmentInProgress: "compartment_in_progress",
-  systemPromptHash: "system_prompt_hash",
-  clearedReasoningThroughTag: "cleared_reasoning_through_tag"
-};
-var BOOLEAN_META_KEYS = new Set(["isSubagent", "compartmentInProgress"]);
-function isSessionMetaRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && typeof r.cache_ttl === "string" && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && typeof r.last_nudge_band === "string" && typeof r.last_transform_error === "string" && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && typeof r.times_execute_threshold_reached === "number" && typeof r.compartment_in_progress === "number" && (typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && typeof r.cleared_reasoning_through_tag === "number";
-}
-function getDefaultSessionMeta(sessionId) {
-  return {
-    sessionId,
-    lastResponseTime: 0,
-    cacheTtl: "5m",
-    counter: 0,
-    lastNudgeTokens: 0,
-    lastNudgeBand: null,
-    lastTransformError: null,
-    isSubagent: false,
-    lastContextPercentage: 0,
-    lastInputTokens: 0,
-    timesExecuteThresholdReached: 0,
-    compartmentInProgress: false,
-    systemPromptHash: "",
-    clearedReasoningThroughTag: 0
-  };
-}
-function ensureSessionMetaRow(db, sessionId) {
-  const defaults = getDefaultSessionMeta(sessionId);
-  db.prepare("INSERT OR IGNORE INTO session_meta (session_id, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(sessionId, defaults.lastResponseTime, defaults.cacheTtl, defaults.counter, defaults.lastNudgeTokens, defaults.lastNudgeBand ?? "", defaults.lastTransformError ?? "", defaults.isSubagent ? 1 : 0, defaults.lastContextPercentage, defaults.lastInputTokens, defaults.timesExecuteThresholdReached, defaults.compartmentInProgress ? 1 : 0, defaults.systemPromptHash ?? "", defaults.clearedReasoningThroughTag);
+var PROTECTED_TAIL_USER_TURNS = 5;
+function getProtectedTailStartOrdinal(sessionId) {
+  const messages = readRawSessionMessages(sessionId);
+  const userOrdinals = messages.filter((m) => m.role === "user" && hasMeaningfulUserText(m.parts)).map((m) => m.ordinal);
+  if (userOrdinals.length < PROTECTED_TAIL_USER_TURNS) {
+    return 1;
+  }
+  return userOrdinals[userOrdinals.length - PROTECTED_TAIL_USER_TURNS];
 }
-function toSessionMeta(row) {
+function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal) {
+  const messages = readRawSessionMessages(sessionId);
+  const startOrdinal = Math.max(1, offset);
+  const lines = [];
+  const lineMeta = [];
+  let totalTokens = 0;
+  let messagesProcessed = 0;
+  let lastOrdinal = startOrdinal - 1;
+  let lastMessageId = "";
+  let firstMessageId = "";
+  let currentBlock = null;
+  let pendingNoiseMeta = [];
+  let commitClusters = 0;
+  let lastFlushedRole = "";
+  function flushCurrentBlock() {
+    if (!currentBlock)
+      return true;
+    const blockText = formatBlock(currentBlock);
+    const blockTokens = estimateTokens(blockText);
+    if (totalTokens + blockTokens > tokenBudget && totalTokens > 0) {
+      return false;
+    }
+    if (currentBlock.role === "A" && currentBlock.commitHashes.length > 0 && lastFlushedRole !== "A") {
+      commitClusters++;
+    }
+    lastFlushedRole = currentBlock.role;
+    if (!firstMessageId)
+      firstMessageId = currentBlock.meta[0]?.messageId ?? "";
+    lastOrdinal = currentBlock.meta[currentBlock.meta.length - 1]?.ordinal ?? currentBlock.endOrdinal;
+    lastMessageId = currentBlock.meta[currentBlock.meta.length - 1]?.messageId ?? "";
+    messagesProcessed += currentBlock.meta.length;
+    lines.push(blockText);
+    lineMeta.push(...currentBlock.meta);
+    totalTokens += blockTokens;
+    currentBlock = null;
+    return true;
+  }
+  for (const msg of messages) {
+    if (eligibleEndOrdinal !== undefined && msg.ordinal >= eligibleEndOrdinal)
+      break;
+    if (msg.ordinal < startOrdinal)
+      continue;
+    const meta3 = { ordinal: msg.ordinal, messageId: msg.id };
+    if (msg.role === "user" && !hasMeaningfulUserText(msg.parts)) {
+      pendingNoiseMeta.push(meta3);
+      continue;
+    }
+    const role = compactRole(msg.role);
+    const compacted = compactTextForSummary(extractTexts(msg.parts).map((t) => msg.role === "user" ? cleanUserText(t) : t).map(normalizeText).filter((value) => value.length > 0).join(" / "), msg.role);
+    const text = compacted.text;
+    if (!text) {
+      pendingNoiseMeta.push(meta3);
+      continue;
+    }
+    if (currentBlock && currentBlock.role === role) {
+      currentBlock.endOrdinal = msg.ordinal;
+      currentBlock.parts.push(text);
+      currentBlock.meta.push(...pendingNoiseMeta, meta3);
+      currentBlock.commitHashes = mergeCommitHashes(currentBlock.commitHashes, compacted.commitHashes);
+      pendingNoiseMeta = [];
+      continue;
+    }
+    if (!flushCurrentBlock())
+      break;
+    currentBlock = {
+      role,
+      startOrdinal: pendingNoiseMeta[0]?.ordinal ?? msg.ordinal,
+      endOrdinal: msg.ordinal,
+      parts: [text],
+      meta: [...pendingNoiseMeta, meta3],
+      commitHashes: [...compacted.commitHashes]
+    };
+    pendingNoiseMeta = [];
+  }
+  flushCurrentBlock();
   return {
-    sessionId: row.session_id,
-    lastResponseTime: row.last_response_time,
-    cacheTtl: row.cache_ttl,
-    counter: row.counter,
-    lastNudgeTokens: row.last_nudge_tokens,
-    lastNudgeBand: row.last_nudge_band.length > 0 ? row.last_nudge_band : null,
-    lastTransformError: row.last_transform_error.length > 0 ? row.last_transform_error : null,
-    isSubagent: row.is_subagent === 1,
-    lastContextPercentage: row.last_context_percentage,
-    lastInputTokens: row.last_input_tokens,
-    timesExecuteThresholdReached: row.times_execute_threshold_reached,
-    compartmentInProgress: row.compartment_in_progress === 1,
-    systemPromptHash: String(row.system_prompt_hash),
-    clearedReasoningThroughTag: row.cleared_reasoning_through_tag
+    startIndex: startOrdinal,
+    endIndex: lastOrdinal,
+    startMessageId: firstMessageId,
+    endMessageId: lastMessageId,
+    messageCount: messagesProcessed,
+    tokenEstimate: totalTokens,
+    hasMore: lastOrdinal < (eligibleEndOrdinal !== undefined ? Math.min(eligibleEndOrdinal - 1, messages.length) : messages.length),
+    text: lines.join(`
+`),
+    lines: lineMeta,
+    commitClusterCount: commitClusters
   };
 }
 
-// src/features/magic-context/storage-meta-persisted.ts
-function isPersistedUsageRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && typeof r.last_response_time === "number";
+// src/features/magic-context/message-index.ts
+var lastIndexedStatements = new WeakMap;
+var insertMessageStatements = new WeakMap;
+var upsertIndexStatements = new WeakMap;
+var deleteFtsStatements = new WeakMap;
+var deleteIndexStatements = new WeakMap;
+var countIndexedMessageStatements = new WeakMap;
+var deleteIndexedMessageStatements = new WeakMap;
+function normalizeIndexText(text) {
+  return text.replace(/\s+/g, " ").trim();
 }
-function isPersistedNudgePlacementRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.nudge_anchor_message_id === "string" && typeof r.nudge_anchor_text === "string";
+function getLastIndexedStatement(db) {
+  let stmt = lastIndexedStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT last_indexed_ordinal FROM message_history_index WHERE session_id = ?");
+    lastIndexedStatements.set(db, stmt);
+  }
+  return stmt;
 }
-function isPersistedStickyTurnReminderRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.sticky_turn_reminder_text === "string" && typeof r.sticky_turn_reminder_message_id === "string";
+function getInsertMessageStatement(db) {
+  let stmt = insertMessageStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("INSERT INTO message_history_fts (session_id, message_ordinal, message_id, role, content) VALUES (?, ?, ?, ?, ?)");
+    insertMessageStatements.set(db, stmt);
+  }
+  return stmt;
 }
-function isPersistedNoteNudgeRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.note_nudge_trigger_pending === "number" && typeof r.note_nudge_trigger_message_id === "string" && typeof r.note_nudge_sticky_text === "string" && typeof r.note_nudge_sticky_message_id === "string";
+function getUpsertIndexStatement(db) {
+  let stmt = upsertIndexStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("INSERT INTO message_history_index (session_id, last_indexed_ordinal, updated_at) VALUES (?, ?, ?) ON CONFLICT(session_id) DO UPDATE SET last_indexed_ordinal = excluded.last_indexed_ordinal, updated_at = excluded.updated_at");
+    upsertIndexStatements.set(db, stmt);
+  }
+  return stmt;
 }
-function getDefaultPersistedNoteNudge() {
-  return {
-    triggerPending: false,
-    triggerMessageId: null,
-    stickyText: null,
-    stickyMessageId: null
-  };
-}
-function loadPersistedUsage(db, sessionId) {
-  const result = db.prepare("SELECT last_context_percentage, last_input_tokens, last_response_time FROM session_meta WHERE session_id = ?").get(sessionId);
-  if (!isPersistedUsageRow(result) || result.last_context_percentage === 0 && result.last_input_tokens === 0) {
-    return null;
+function getDeleteFtsStatement(db) {
+  let stmt = deleteFtsStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM message_history_fts WHERE session_id = ?");
+    deleteFtsStatements.set(db, stmt);
   }
-  return {
-    usage: {
-      percentage: result.last_context_percentage,
-      inputTokens: result.last_input_tokens
-    },
-    updatedAt: result.last_response_time || Date.now()
-  };
+  return stmt;
 }
-function getPersistedNudgePlacement(db, sessionId) {
-  const result = db.prepare("SELECT nudge_anchor_message_id, nudge_anchor_text FROM session_meta WHERE session_id = ?").get(sessionId);
-  if (!isPersistedNudgePlacementRow(result)) {
-    return null;
-  }
-  if (result.nudge_anchor_message_id.length === 0 || result.nudge_anchor_text.length === 0) {
-    return null;
+function getDeleteIndexStatement(db) {
+  let stmt = deleteIndexStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM message_history_index WHERE session_id = ?");
+    deleteIndexStatements.set(db, stmt);
   }
-  return {
-    messageId: result.nudge_anchor_message_id,
-    nudgeText: result.nudge_anchor_text
-  };
-}
-function setPersistedNudgePlacement(db, sessionId, messageId, nudgeText) {
-  db.transaction(() => {
-    ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET nudge_anchor_message_id = ?, nudge_anchor_text = ? WHERE session_id = ?").run(messageId, nudgeText, sessionId);
-  })();
-}
-function clearPersistedNudgePlacement(db, sessionId) {
-  db.prepare("UPDATE session_meta SET nudge_anchor_message_id = '', nudge_anchor_text = '' WHERE session_id = ?").run(sessionId);
+  return stmt;
 }
-function getPersistedStickyTurnReminder(db, sessionId) {
-  const result = db.prepare("SELECT sticky_turn_reminder_text, sticky_turn_reminder_message_id FROM session_meta WHERE session_id = ?").get(sessionId);
-  if (!isPersistedStickyTurnReminderRow(result)) {
-    return null;
-  }
-  if (result.sticky_turn_reminder_text.length === 0) {
-    return null;
+function getCountIndexedMessageStatement(db) {
+  let stmt = countIndexedMessageStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT COUNT(*) AS count FROM message_history_fts WHERE session_id = ? AND message_id = ?");
+    countIndexedMessageStatements.set(db, stmt);
   }
-  return {
-    text: result.sticky_turn_reminder_text,
-    messageId: result.sticky_turn_reminder_message_id.length > 0 ? result.sticky_turn_reminder_message_id : null
-  };
-}
-function setPersistedStickyTurnReminder(db, sessionId, text, messageId = "") {
-  db.transaction(() => {
-    ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET sticky_turn_reminder_text = ?, sticky_turn_reminder_message_id = ? WHERE session_id = ?").run(text, messageId, sessionId);
-  })();
-}
-function clearPersistedStickyTurnReminder(db, sessionId) {
-  db.prepare("UPDATE session_meta SET sticky_turn_reminder_text = '', sticky_turn_reminder_message_id = '' WHERE session_id = ?").run(sessionId);
+  return stmt;
 }
-function getPersistedNoteNudge(db, sessionId) {
-  const result = db.prepare("SELECT note_nudge_trigger_pending, note_nudge_trigger_message_id, note_nudge_sticky_text, note_nudge_sticky_message_id FROM session_meta WHERE session_id = ?").get(sessionId);
-  if (!isPersistedNoteNudgeRow(result)) {
-    return getDefaultPersistedNoteNudge();
+function getDeleteIndexedMessageStatement(db) {
+  let stmt = deleteIndexedMessageStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM message_history_fts WHERE session_id = ? AND message_id = ?");
+    deleteIndexedMessageStatements.set(db, stmt);
   }
-  return {
-    triggerPending: result.note_nudge_trigger_pending === 1,
-    triggerMessageId: result.note_nudge_trigger_message_id.length > 0 ? result.note_nudge_trigger_message_id : null,
-    stickyText: result.note_nudge_sticky_text.length > 0 ? result.note_nudge_sticky_text : null,
-    stickyMessageId: result.note_nudge_sticky_message_id.length > 0 ? result.note_nudge_sticky_message_id : null
-  };
+  return stmt;
 }
-function setPersistedNoteNudgeTrigger(db, sessionId, triggerMessageId = "") {
-  db.transaction(() => {
-    ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET note_nudge_trigger_pending = 1, note_nudge_trigger_message_id = ?, note_nudge_sticky_text = '', note_nudge_sticky_message_id = '' WHERE session_id = ?").run(triggerMessageId, sessionId);
-  })();
+function getLastIndexedOrdinal(db, sessionId) {
+  const row = getLastIndexedStatement(db).get(sessionId);
+  return typeof row?.last_indexed_ordinal === "number" ? row.last_indexed_ordinal : 0;
 }
-function setPersistedNoteNudgeTriggerMessageId(db, sessionId, triggerMessageId) {
-  db.transaction(() => {
-    ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET note_nudge_trigger_message_id = ? WHERE session_id = ?").run(triggerMessageId, sessionId);
-  })();
+function deleteIndexedMessage(db, sessionId, messageId) {
+  const row = getCountIndexedMessageStatement(db).get(sessionId, messageId);
+  const count = typeof row?.count === "number" ? row.count : 0;
+  if (count > 0) {
+    getDeleteIndexedMessageStatement(db).run(sessionId, messageId);
+  }
+  getDeleteIndexStatement(db).run(sessionId);
+  return count;
 }
-function setPersistedDeliveredNoteNudge(db, sessionId, text, messageId = "") {
+function clearIndexedMessages(db, sessionId) {
   db.transaction(() => {
-    ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET note_nudge_trigger_pending = 0, note_nudge_trigger_message_id = '', note_nudge_sticky_text = ?, note_nudge_sticky_message_id = ? WHERE session_id = ?").run(text, messageId, sessionId);
+    getDeleteFtsStatement(db).run(sessionId);
+    getDeleteIndexStatement(db).run(sessionId);
   })();
 }
-function clearPersistedNoteNudge(db, sessionId) {
-  db.prepare("UPDATE session_meta SET note_nudge_trigger_pending = 0, note_nudge_trigger_message_id = '', note_nudge_sticky_text = '', note_nudge_sticky_message_id = '' WHERE session_id = ?").run(sessionId);
-}
-function getStrippedPlaceholderIds(db, sessionId) {
-  const row = db.prepare("SELECT stripped_placeholder_ids FROM session_meta WHERE session_id = ?").get(sessionId);
-  const raw = row?.stripped_placeholder_ids;
-  if (!raw || raw.length === 0)
-    return new Set;
-  try {
-    const parsed = JSON.parse(raw);
-    if (Array.isArray(parsed))
-      return new Set(parsed.filter((v) => typeof v === "string"));
-  } catch {}
-  return new Set;
-}
-function setStrippedPlaceholderIds(db, sessionId, ids) {
-  ensureSessionMetaRow(db, sessionId);
-  const json2 = ids.size > 0 ? JSON.stringify([...ids]) : "";
-  db.prepare("UPDATE session_meta SET stripped_placeholder_ids = ? WHERE session_id = ?").run(json2, sessionId);
-}
-// src/shared/internal-initiator-marker.ts
-var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
-
-// src/shared/system-directive.ts
-var SYSTEM_DIRECTIVE_PREFIX = "[SYSTEM DIRECTIVE: MAGIC-CONTEXT";
-function isSystemDirective(text) {
-  return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
-}
-function removeSystemReminders(text) {
-  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
-}
-
-// src/hooks/magic-context/read-session-db.ts
-import { Database as Database2 } from "bun:sqlite";
-import { join as join6 } from "path";
-function getOpenCodeDbPath() {
-  return join6(getDataDir(), "opencode", "opencode.db");
-}
-var cachedReadOnlyDb = null;
-function closeCachedReadOnlyDb() {
-  if (!cachedReadOnlyDb) {
-    return;
+function getIndexableContent(role, parts) {
+  if (role === "user") {
+    if (!hasMeaningfulUserText(parts)) {
+      return "";
+    }
+    return extractTexts(parts).map(cleanUserText).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
   }
-  try {
-    cachedReadOnlyDb.db.close(false);
-  } catch (error48) {
-    log("[magic-context] failed to close cached OpenCode read-only DB:", error48);
-  } finally {
-    cachedReadOnlyDb = null;
+  if (role === "assistant") {
+    return extractTexts(parts).map(removeSystemReminders).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
   }
+  return "";
 }
-function getReadOnlySessionDb() {
-  const dbPath = getOpenCodeDbPath();
-  if (cachedReadOnlyDb?.path === dbPath) {
-    return cachedReadOnlyDb.db;
+function ensureMessagesIndexed(db, sessionId, readMessages) {
+  const messages = readMessages(sessionId);
+  if (messages.length === 0) {
+    db.transaction(() => clearIndexedMessages(db, sessionId))();
+    return;
   }
-  closeCachedReadOnlyDb();
-  const db = new Database2(dbPath, { readonly: true });
-  cachedReadOnlyDb = { path: dbPath, db };
-  return db;
-}
-function withReadOnlySessionDb(fn) {
-  return fn(getReadOnlySessionDb());
-}
-function getRawSessionMessageCountFromDb(db, sessionId) {
-  const row = db.prepare("SELECT COUNT(*) as count FROM message WHERE session_id = ?").get(sessionId);
-  return typeof row?.count === "number" ? row.count : 0;
-}
-
-// src/hooks/magic-context/read-session-formatting.ts
-var COMMIT_HASH_PATTERN = /`?\b([0-9a-f]{6,12})\b`?/gi;
-var COMMIT_HINT_PATTERN = /\b(commit(?:ted)?|cherry-?pick(?:ed)?|hash(?:es)?|sha)\b/i;
-var MAX_COMMITS_PER_BLOCK = 5;
-function hasMeaningfulUserText(parts) {
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const candidate = part;
-    if (candidate.type !== "text" || typeof candidate.text !== "string")
-      continue;
-    if (candidate.ignored === true)
-      continue;
-    const cleaned = removeSystemReminders(candidate.text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
-    if (!cleaned)
-      continue;
-    if (isSystemDirective(cleaned))
-      continue;
-    return true;
+  let lastIndexedOrdinal = getLastIndexedOrdinal(db, sessionId);
+  if (lastIndexedOrdinal > messages.length) {
+    db.transaction(() => clearIndexedMessages(db, sessionId))();
+    lastIndexedOrdinal = 0;
   }
-  return false;
-}
-function extractTexts(parts) {
-  const texts = [];
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const p = part;
-    if (p.type === "text" && typeof p.text === "string" && p.text.trim().length > 0) {
-      texts.push(p.text.trim());
-    }
+  if (lastIndexedOrdinal >= messages.length) {
+    return;
   }
-  return texts;
-}
-function estimateTokens(text) {
-  return Math.ceil(text.length / 3.5);
-}
-function normalizeText(text) {
-  return text.replace(/\s+/g, " ").trim();
-}
-function compactRole(role) {
-  if (role === "assistant")
-    return "A";
-  if (role === "user")
-    return "U";
-  return role.slice(0, 1).toUpperCase() || "M";
+  const messagesToInsert = messages.filter((message) => message.ordinal > lastIndexedOrdinal).filter((message) => message.role === "user" || message.role === "assistant").map((message) => ({
+    ordinal: message.ordinal,
+    id: message.id,
+    role: message.role,
+    content: getIndexableContent(message.role, message.parts)
+  })).filter((message) => message.content.length > 0);
+  const now = Date.now();
+  db.transaction(() => {
+    const insertMessage = getInsertMessageStatement(db);
+    for (const message of messagesToInsert) {
+      insertMessage.run(sessionId, message.ordinal, message.id, message.role, message.content);
+    }
+    getUpsertIndexStatement(db).run(sessionId, messages.length, now);
+  })();
 }
-function formatBlock(block) {
-  const range = block.startOrdinal === block.endOrdinal ? `[${block.startOrdinal}]` : `[${block.startOrdinal}-${block.endOrdinal}]`;
-  const commitSuffix = block.commitHashes.length > 0 ? ` commits: ${block.commitHashes.join(", ")}` : "";
-  return `${range} ${block.role}:${commitSuffix} ${block.parts.join(" / ")}`;
+// src/features/magic-context/storage-db.ts
+import { Database as Database2 } from "bun:sqlite";
+import { mkdirSync } from "fs";
+import { join as join6 } from "path";
+var databases = new Map;
+var FALLBACK_DATABASE_KEY = "__fallback__:memory:";
+var persistenceByDatabase = new WeakMap;
+var persistenceErrorByDatabase = new WeakMap;
+function resolveDatabasePath() {
+  const dbDir = join6(getOpenCodeStorageDir(), "plugin", "magic-context");
+  return { dbDir, dbPath: join6(dbDir, "context.db") };
 }
-function extractCommitHashes(text) {
-  const hashes = [];
-  const seen = new Set;
-  for (const match of text.matchAll(COMMIT_HASH_PATTERN)) {
-    const hash2 = match[1]?.toLowerCase();
-    if (!hash2 || seen.has(hash2))
-      continue;
-    seen.add(hash2);
-    hashes.push(hash2);
-    if (hashes.length >= MAX_COMMITS_PER_BLOCK)
-      break;
-  }
-  return hashes;
+function initializeDatabase(db) {
+  db.run("PRAGMA journal_mode=WAL");
+  db.run("PRAGMA busy_timeout=5000");
+  db.run("PRAGMA foreign_keys=ON");
+  db.run(`
+    CREATE TABLE IF NOT EXISTS tags (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT,
+      message_id TEXT,
+      type TEXT,
+      status TEXT DEFAULT 'active',
+      byte_size INTEGER,
+      tag_number INTEGER,
+      UNIQUE(session_id, tag_number)
+    );
+
+    CREATE TABLE IF NOT EXISTS pending_ops (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT,
+      tag_id INTEGER,
+      operation TEXT,
+      queued_at INTEGER
+    );
+
+    CREATE TABLE IF NOT EXISTS source_contents (
+      tag_id INTEGER,
+      session_id TEXT,
+      content TEXT,
+      created_at INTEGER,
+      PRIMARY KEY(session_id, tag_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS compartments (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      sequence INTEGER NOT NULL,
+      start_message INTEGER NOT NULL,
+      end_message INTEGER NOT NULL,
+      start_message_id TEXT DEFAULT '',
+      end_message_id TEXT DEFAULT '',
+      title TEXT NOT NULL,
+      content TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      UNIQUE(session_id, sequence)
+    );
+
+    CREATE TABLE IF NOT EXISTS session_facts (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS session_notes (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      content TEXT NOT NULL,
+      created_at INTEGER NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS memories (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      normalized_hash TEXT NOT NULL,
+      source_session_id TEXT,
+      source_type TEXT DEFAULT 'historian',
+      seen_count INTEGER DEFAULT 1,
+      retrieval_count INTEGER DEFAULT 0,
+      first_seen_at INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      last_seen_at INTEGER NOT NULL,
+      last_retrieved_at INTEGER,
+      status TEXT DEFAULT 'active',
+      expires_at INTEGER,
+      verification_status TEXT DEFAULT 'unverified',
+      verified_at INTEGER,
+      superseded_by_memory_id INTEGER,
+      merged_from TEXT,
+      metadata_json TEXT,
+      UNIQUE(project_path, category, normalized_hash)
+    );
+
+    CREATE TABLE IF NOT EXISTS memory_embeddings (
+      memory_id INTEGER PRIMARY KEY REFERENCES memories(id) ON DELETE CASCADE,
+      embedding BLOB NOT NULL,
+      model_id TEXT
+    );
+
+    CREATE TABLE IF NOT EXISTS dream_state (
+      key TEXT PRIMARY KEY,
+      value TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS dream_queue (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      reason TEXT NOT NULL,
+      enqueued_at INTEGER NOT NULL,
+      started_at INTEGER,
+      retry_count INTEGER DEFAULT 0
+    );
+    CREATE INDEX IF NOT EXISTS idx_dream_queue_project ON dream_queue(project_path);
+CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, enqueued_at);
+
+    CREATE TABLE IF NOT EXISTS smart_notes (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      content TEXT NOT NULL,
+      surface_condition TEXT NOT NULL,
+      status TEXT NOT NULL DEFAULT 'pending',
+      created_session_id TEXT,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      last_checked_at INTEGER,
+      ready_at INTEGER,
+      ready_reason TEXT
+    );
+    CREATE INDEX IF NOT EXISTS idx_smart_notes_project_status ON smart_notes(project_path, status);
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
+      content,
+      category,
+      content='memories',
+      content_rowid='id',
+      tokenize='porter unicode61'
+    );
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS message_history_fts USING fts5(
+      session_id UNINDEXED,
+      message_ordinal UNINDEXED,
+      message_id UNINDEXED,
+      role,
+      content,
+      tokenize='porter unicode61'
+    );
+
+    CREATE TABLE IF NOT EXISTS message_history_index (
+      session_id TEXT PRIMARY KEY,
+      last_indexed_ordinal INTEGER NOT NULL DEFAULT 0,
+      updated_at INTEGER NOT NULL
+    );
+
+    CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
+      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
+      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
+    END;
+
+    CREATE TABLE IF NOT EXISTS session_meta (
+      session_id TEXT PRIMARY KEY,
+      last_response_time INTEGER,
+      cache_ttl TEXT,
+      counter INTEGER DEFAULT 0,
+      last_nudge_tokens INTEGER DEFAULT 0,
+      last_nudge_band TEXT DEFAULT '',
+      last_transform_error TEXT DEFAULT '',
+      nudge_anchor_message_id TEXT DEFAULT '',
+      nudge_anchor_text TEXT DEFAULT '',
+      sticky_turn_reminder_text TEXT DEFAULT '',
+      sticky_turn_reminder_message_id TEXT DEFAULT '',
+      note_nudge_trigger_pending INTEGER DEFAULT 0,
+      note_nudge_trigger_message_id TEXT DEFAULT '',
+      note_nudge_sticky_text TEXT DEFAULT '',
+      note_nudge_sticky_message_id TEXT DEFAULT '',
+      is_subagent INTEGER DEFAULT 0,
+      last_context_percentage REAL DEFAULT 0,
+      last_input_tokens INTEGER DEFAULT 0,
+      times_execute_threshold_reached INTEGER DEFAULT 0,
+      compartment_in_progress INTEGER DEFAULT 0,
+      system_prompt_hash TEXT DEFAULT '',
+      memory_block_cache TEXT DEFAULT '',
+      memory_block_count INTEGER DEFAULT 0
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
+    CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
+    CREATE INDEX IF NOT EXISTS idx_pending_ops_session_tag_id ON pending_ops(session_id, tag_id);
+    CREATE INDEX IF NOT EXISTS idx_source_contents_session ON source_contents(session_id);
+    
+    CREATE TABLE IF NOT EXISTS recomp_compartments (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      sequence INTEGER NOT NULL,
+      start_message INTEGER NOT NULL,
+      end_message INTEGER NOT NULL,
+      start_message_id TEXT DEFAULT '',
+      end_message_id TEXT DEFAULT '',
+      title TEXT NOT NULL,
+      content TEXT NOT NULL,
+      pass_number INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      UNIQUE(session_id, sequence)
+    );
+
+    CREATE TABLE IF NOT EXISTS recomp_facts (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      pass_number INTEGER NOT NULL,
+      created_at INTEGER NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_compartments_session ON compartments(session_id);
+    CREATE INDEX IF NOT EXISTS idx_session_facts_session ON session_facts(session_id);
+    CREATE INDEX IF NOT EXISTS idx_recomp_compartments_session ON recomp_compartments(session_id);
+    CREATE INDEX IF NOT EXISTS idx_recomp_facts_session ON recomp_facts(session_id);
+    CREATE INDEX IF NOT EXISTS idx_session_notes_session ON session_notes(session_id);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_status_category ON memories(project_path, status, category);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_status_expires ON memories(project_path, status, expires_at);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_category_hash ON memories(project_path, category, normalized_hash);
+    CREATE INDEX IF NOT EXISTS idx_message_history_index_updated_at ON message_history_index(updated_at);
+  `);
+  ensureColumn(db, "session_meta", "last_nudge_band", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "nudge_anchor_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "sticky_turn_reminder_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "sticky_turn_reminder_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_trigger_pending", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "note_nudge_trigger_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_sticky_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_sticky_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "times_execute_threshold_reached", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "compartment_in_progress", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
+  ensureColumn(db, "session_meta", "memory_block_cache", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "memory_block_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "dream_queue", "retry_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "reasoning_byte_size", "INTEGER DEFAULT 0");
 }
-function compactTextForSummary(text, role) {
-  const commitHashes = role === "assistant" ? extractCommitHashes(text) : [];
-  if (commitHashes.length === 0 || !COMMIT_HINT_PATTERN.test(text)) {
-    return { text, commitHashes };
+function ensureColumn(db, table, column, definition) {
+  if (!/^[a-z_]+$/.test(table) || !/^[a-z_]+$/.test(column) || !/^[A-Z0-9_'(),\s]+$/i.test(definition)) {
+    throw new Error(`Unsafe schema identifier: ${table}.${column} ${definition}`);
   }
-  const withoutHashes = text.replace(COMMIT_HASH_PATTERN, "").replace(/\(\s*\)/g, "").replace(/\s+,/g, ",").replace(/,\s*,+/g, ", ").replace(/\s{2,}/g, " ").replace(/\s+([,.;:])/g, "$1").trim();
-  return {
-    text: withoutHashes.length > 0 ? withoutHashes : text,
-    commitHashes
-  };
-}
-function mergeCommitHashes(existing, next) {
-  if (next.length === 0)
-    return existing;
-  const merged = [...existing];
-  for (const hash2 of next) {
-    if (merged.includes(hash2))
-      continue;
-    merged.push(hash2);
-    if (merged.length >= MAX_COMMITS_PER_BLOCK)
-      break;
+  const rows = db.prepare(`PRAGMA table_info(${table})`).all();
+  if (rows.some((row) => row.name === column)) {
+    return;
   }
-  return merged;
-}
-
-// src/hooks/magic-context/read-session-raw.ts
-function isRawMessageRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const candidate = row;
-  return typeof candidate.id === "string" && typeof candidate.data === "string";
-}
-function isRawPartRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const candidate = row;
-  return typeof candidate.message_id === "string" && typeof candidate.data === "string";
+  db.run(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
 }
-function parseJsonRecord(value) {
-  const parsed = JSON.parse(value);
-  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error("Expected JSON object");
+function createFallbackDatabase() {
+  try {
+    const fallback = new Database2(":memory:");
+    initializeDatabase(fallback);
+    return fallback;
+  } catch (error48) {
+    throw new Error(`[magic-context] storage fatal: failed to initialize fallback database: ${getErrorMessage(error48)}`);
   }
-  return parsed;
-}
-function parseJsonUnknown(value) {
-  return JSON.parse(value);
 }
-function readRawSessionMessagesFromDb(db, sessionId) {
-  const messageRows = db.prepare("SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawMessageRow);
-  const partRows = db.prepare("SELECT message_id, data FROM part WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawPartRow);
-  const partsByMessageId = new Map;
-  for (const part of partRows) {
-    const list = partsByMessageId.get(part.message_id) ?? [];
-    list.push(parseJsonUnknown(part.data));
-    partsByMessageId.set(part.message_id, list);
+function openDatabase() {
+  try {
+    const { dbDir, dbPath } = resolveDatabasePath();
+    const existing = databases.get(dbPath);
+    if (existing) {
+      if (!persistenceByDatabase.has(existing)) {
+        persistenceByDatabase.set(existing, true);
+      }
+      return existing;
+    }
+    mkdirSync(dbDir, { recursive: true });
+    const db = new Database2(dbPath);
+    initializeDatabase(db);
+    databases.set(dbPath, db);
+    persistenceByDatabase.set(db, true);
+    persistenceErrorByDatabase.delete(db);
+    return db;
+  } catch (error48) {
+    log("[magic-context] storage error:", error48);
+    const errorMessage = getErrorMessage(error48);
+    const existingFallback = databases.get(FALLBACK_DATABASE_KEY);
+    if (existingFallback) {
+      if (!persistenceByDatabase.has(existingFallback)) {
+        persistenceByDatabase.set(existingFallback, false);
+        persistenceErrorByDatabase.set(existingFallback, errorMessage);
+      }
+      return existingFallback;
+    }
+    const fallback = createFallbackDatabase();
+    databases.set(FALLBACK_DATABASE_KEY, fallback);
+    persistenceByDatabase.set(fallback, false);
+    persistenceErrorByDatabase.set(fallback, errorMessage);
+    return fallback;
   }
-  return messageRows.map((row, index) => {
-    const info = parseJsonRecord(row.data);
-    const role = typeof info.role === "string" ? info.role : "unknown";
-    return {
-      ordinal: index + 1,
-      id: row.id,
-      role,
-      parts: partsByMessageId.get(row.id) ?? []
-    };
-  });
-}
-
-// src/hooks/magic-context/tag-content-primitives.ts
-var encoder = new TextEncoder;
-var TAG_PREFIX_REGEX = /^\u00A7\d+\u00A7\s*/;
-function byteSize(value) {
-  return encoder.encode(value).length;
-}
-function stripTagPrefix(value) {
-  return value.replace(TAG_PREFIX_REGEX, "");
 }
-function prependTag(tagId, value) {
-  const stripped = stripTagPrefix(value);
-  return `\xA7${tagId}\xA7 ${stripped}`;
+function isDatabasePersisted(db) {
+  return persistenceByDatabase.get(db) ?? false;
 }
-function isThinkingPart(part) {
-  if (part === null || typeof part !== "object")
-    return false;
-  const candidate = part;
-  return candidate.type === "thinking" || candidate.type === "reasoning";
+function getDatabasePersistenceError(db) {
+  return persistenceErrorByDatabase.get(db) ?? null;
 }
-
-// src/hooks/magic-context/tag-part-guards.ts
-function isTextPart(part) {
-  if (part === null || typeof part !== "object")
+// src/features/magic-context/storage-meta-shared.ts
+var META_COLUMNS = {
+  lastResponseTime: "last_response_time",
+  cacheTtl: "cache_ttl",
+  counter: "counter",
+  lastNudgeTokens: "last_nudge_tokens",
+  lastNudgeBand: "last_nudge_band",
+  lastTransformError: "last_transform_error",
+  isSubagent: "is_subagent",
+  lastContextPercentage: "last_context_percentage",
+  lastInputTokens: "last_input_tokens",
+  timesExecuteThresholdReached: "times_execute_threshold_reached",
+  compartmentInProgress: "compartment_in_progress",
+  systemPromptHash: "system_prompt_hash",
+  clearedReasoningThroughTag: "cleared_reasoning_through_tag"
+};
+var BOOLEAN_META_KEYS = new Set(["isSubagent", "compartmentInProgress"]);
+function isSessionMetaRow(row) {
+  if (row === null || typeof row !== "object")
     return false;
-  const p = part;
-  return p.type === "text" && typeof p.text === "string";
+  const r = row;
+  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && typeof r.cache_ttl === "string" && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && typeof r.last_nudge_band === "string" && typeof r.last_transform_error === "string" && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && typeof r.times_execute_threshold_reached === "number" && typeof r.compartment_in_progress === "number" && (typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && typeof r.cleared_reasoning_through_tag === "number";
 }
-function isToolPartWithOutput(part) {
-  if (part === null || typeof part !== "object")
-    return false;
-  const p = part;
-  if (p.type !== "tool" || typeof p.callID !== "string")
-    return false;
-  if (p.state === null || typeof p.state !== "object")
-    return false;
-  return typeof p.state.output === "string";
+function getDefaultSessionMeta(sessionId) {
+  return {
+    sessionId,
+    lastResponseTime: 0,
+    cacheTtl: "5m",
+    counter: 0,
+    lastNudgeTokens: 0,
+    lastNudgeBand: null,
+    lastTransformError: null,
+    isSubagent: false,
+    lastContextPercentage: 0,
+    lastInputTokens: 0,
+    timesExecuteThresholdReached: 0,
+    compartmentInProgress: false,
+    systemPromptHash: "",
+    clearedReasoningThroughTag: 0
+  };
 }
-function isFilePart(part) {
-  if (part === null || typeof part !== "object")
-    return false;
-  const p = part;
-  return p.type === "file" && typeof p.url === "string";
+function ensureSessionMetaRow(db, sessionId) {
+  const defaults = getDefaultSessionMeta(sessionId);
+  db.prepare("INSERT OR IGNORE INTO session_meta (session_id, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(sessionId, defaults.lastResponseTime, defaults.cacheTtl, defaults.counter, defaults.lastNudgeTokens, defaults.lastNudgeBand ?? "", defaults.lastTransformError ?? "", defaults.isSubagent ? 1 : 0, defaults.lastContextPercentage, defaults.lastInputTokens, defaults.timesExecuteThresholdReached, defaults.compartmentInProgress ? 1 : 0, defaults.systemPromptHash ?? "", defaults.clearedReasoningThroughTag);
 }
-function buildFileSourceContent(parts) {
-  const content = parts.filter(isTextPart).map((part) => stripTagPrefix(part.text)).join(`
-`).trim();
-  return content.length > 0 ? content : null;
+function toSessionMeta(row) {
+  return {
+    sessionId: row.session_id,
+    lastResponseTime: row.last_response_time,
+    cacheTtl: row.cache_ttl,
+    counter: row.counter,
+    lastNudgeTokens: row.last_nudge_tokens,
+    lastNudgeBand: row.last_nudge_band.length > 0 ? row.last_nudge_band : null,
+    lastTransformError: row.last_transform_error.length > 0 ? row.last_transform_error : null,
+    isSubagent: row.is_subagent === 1,
+    lastContextPercentage: row.last_context_percentage,
+    lastInputTokens: row.last_input_tokens,
+    timesExecuteThresholdReached: row.times_execute_threshold_reached,
+    compartmentInProgress: row.compartment_in_progress === 1,
+    systemPromptHash: String(row.system_prompt_hash),
+    clearedReasoningThroughTag: row.cleared_reasoning_through_tag
+  };
 }
 
-// src/hooks/magic-context/read-session-chunk.ts
-var activeRawMessageCache = null;
-function cleanUserText(text) {
-  return removeSystemReminders(text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
+// src/features/magic-context/storage-meta-persisted.ts
+function isPersistedUsageRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && typeof r.last_response_time === "number";
 }
-function withRawSessionMessageCache(fn) {
-  const outerCache = activeRawMessageCache;
-  if (!outerCache) {
-    activeRawMessageCache = new Map;
-  }
-  try {
-    return fn();
-  } finally {
-    if (!outerCache) {
-      activeRawMessageCache = null;
-    }
-  }
+function isPersistedReasoningWatermarkRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.cleared_reasoning_through_tag === "number";
 }
-function readRawSessionMessages(sessionId) {
-  if (activeRawMessageCache) {
-    const cached2 = activeRawMessageCache.get(sessionId);
-    if (cached2) {
-      return cached2;
-    }
-    const messages = withReadOnlySessionDb((db) => readRawSessionMessagesFromDb(db, sessionId));
-    activeRawMessageCache.set(sessionId, messages);
-    return messages;
-  }
-  return withReadOnlySessionDb((db) => readRawSessionMessagesFromDb(db, sessionId));
+function isPersistedNudgePlacementRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.nudge_anchor_message_id === "string" && typeof r.nudge_anchor_text === "string";
 }
-function getRawSessionMessageCount(sessionId) {
-  return withReadOnlySessionDb((db) => getRawSessionMessageCountFromDb(db, sessionId));
+function isPersistedStickyTurnReminderRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.sticky_turn_reminder_text === "string" && typeof r.sticky_turn_reminder_message_id === "string";
 }
-function getRawSessionTagKeysThrough(sessionId, upToMessageIndex) {
-  const messages = readRawSessionMessages(sessionId);
-  const keys = [];
-  for (const message of messages) {
-    if (message.ordinal > upToMessageIndex)
-      break;
-    for (const [partIndex, part] of message.parts.entries()) {
-      if (isTextPart(part)) {
-        keys.push(`${message.id}:p${partIndex}`);
-      }
-      if (isFilePart(part)) {
-        keys.push(`${message.id}:file${partIndex}`);
-      }
-      if (isToolPartWithOutput(part)) {
-        keys.push(part.callID);
-      }
-    }
-  }
-  return keys;
+function isPersistedNoteNudgeRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.note_nudge_trigger_pending === "number" && typeof r.note_nudge_trigger_message_id === "string" && typeof r.note_nudge_sticky_text === "string" && typeof r.note_nudge_sticky_message_id === "string";
 }
-var PROTECTED_TAIL_USER_TURNS = 5;
-function getProtectedTailStartOrdinal(sessionId) {
-  const messages = readRawSessionMessages(sessionId);
-  const userOrdinals = messages.filter((m) => m.role === "user" && hasMeaningfulUserText(m.parts)).map((m) => m.ordinal);
-  if (userOrdinals.length < PROTECTED_TAIL_USER_TURNS) {
-    return 1;
+function getDefaultPersistedNoteNudge() {
+  return {
+    triggerPending: false,
+    triggerMessageId: null,
+    stickyText: null,
+    stickyMessageId: null
+  };
+}
+function loadPersistedUsage(db, sessionId) {
+  const result = db.prepare("SELECT last_context_percentage, last_input_tokens, last_response_time FROM session_meta WHERE session_id = ?").get(sessionId);
+  if (!isPersistedUsageRow(result) || result.last_context_percentage === 0 && result.last_input_tokens === 0) {
+    return null;
   }
-  return userOrdinals[userOrdinals.length - PROTECTED_TAIL_USER_TURNS];
+  return {
+    usage: {
+      percentage: result.last_context_percentage,
+      inputTokens: result.last_input_tokens
+    },
+    updatedAt: result.last_response_time || Date.now()
+  };
 }
-function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal) {
-  const messages = readRawSessionMessages(sessionId);
-  const startOrdinal = Math.max(1, offset);
-  const lines = [];
-  const lineMeta = [];
-  let totalTokens = 0;
-  let messagesProcessed = 0;
-  let lastOrdinal = startOrdinal - 1;
-  let lastMessageId = "";
-  let firstMessageId = "";
-  let currentBlock = null;
-  let pendingNoiseMeta = [];
-  let commitClusters = 0;
-  let lastFlushedRole = "";
-  function flushCurrentBlock() {
-    if (!currentBlock)
-      return true;
-    const blockText = formatBlock(currentBlock);
-    const blockTokens = estimateTokens(blockText);
-    if (totalTokens + blockTokens > tokenBudget && totalTokens > 0) {
-      return false;
-    }
-    if (currentBlock.role === "A" && currentBlock.commitHashes.length > 0 && lastFlushedRole !== "A") {
-      commitClusters++;
-    }
-    lastFlushedRole = currentBlock.role;
-    if (!firstMessageId)
-      firstMessageId = currentBlock.meta[0]?.messageId ?? "";
-    lastOrdinal = currentBlock.meta[currentBlock.meta.length - 1]?.ordinal ?? currentBlock.endOrdinal;
-    lastMessageId = currentBlock.meta[currentBlock.meta.length - 1]?.messageId ?? "";
-    messagesProcessed += currentBlock.meta.length;
-    lines.push(blockText);
-    lineMeta.push(...currentBlock.meta);
-    totalTokens += blockTokens;
-    currentBlock = null;
-    return true;
+function getPersistedReasoningWatermark(db, sessionId) {
+  const result = db.prepare("SELECT cleared_reasoning_through_tag FROM session_meta WHERE session_id = ?").get(sessionId);
+  return isPersistedReasoningWatermarkRow(result) ? result.cleared_reasoning_through_tag : 0;
+}
+function setPersistedReasoningWatermark(db, sessionId, tagNumber) {
+  ensureSessionMetaRow(db, sessionId);
+  db.prepare("UPDATE session_meta SET cleared_reasoning_through_tag = ? WHERE session_id = ?").run(tagNumber, sessionId);
+}
+function getPersistedNudgePlacement(db, sessionId) {
+  const result = db.prepare("SELECT nudge_anchor_message_id, nudge_anchor_text FROM session_meta WHERE session_id = ?").get(sessionId);
+  if (!isPersistedNudgePlacementRow(result)) {
+    return null;
   }
-  for (const msg of messages) {
-    if (eligibleEndOrdinal !== undefined && msg.ordinal >= eligibleEndOrdinal)
-      break;
-    if (msg.ordinal < startOrdinal)
-      continue;
-    const meta3 = { ordinal: msg.ordinal, messageId: msg.id };
-    if (msg.role === "user" && !hasMeaningfulUserText(msg.parts)) {
-      pendingNoiseMeta.push(meta3);
-      continue;
-    }
-    const role = compactRole(msg.role);
-    const compacted = compactTextForSummary(extractTexts(msg.parts).map((t) => msg.role === "user" ? cleanUserText(t) : t).map(normalizeText).filter((value) => value.length > 0).join(" / "), msg.role);
-    const text = compacted.text;
-    if (!text) {
-      pendingNoiseMeta.push(meta3);
-      continue;
-    }
-    if (currentBlock && currentBlock.role === role) {
-      currentBlock.endOrdinal = msg.ordinal;
-      currentBlock.parts.push(text);
-      currentBlock.meta.push(...pendingNoiseMeta, meta3);
-      currentBlock.commitHashes = mergeCommitHashes(currentBlock.commitHashes, compacted.commitHashes);
-      pendingNoiseMeta = [];
-      continue;
-    }
-    if (!flushCurrentBlock())
-      break;
-    currentBlock = {
-      role,
-      startOrdinal: pendingNoiseMeta[0]?.ordinal ?? msg.ordinal,
-      endOrdinal: msg.ordinal,
-      parts: [text],
-      meta: [...pendingNoiseMeta, meta3],
-      commitHashes: [...compacted.commitHashes]
-    };
-    pendingNoiseMeta = [];
+  if (result.nudge_anchor_message_id.length === 0 || result.nudge_anchor_text.length === 0) {
+    return null;
   }
-  flushCurrentBlock();
   return {
-    startIndex: startOrdinal,
-    endIndex: lastOrdinal,
-    startMessageId: firstMessageId,
-    endMessageId: lastMessageId,
-    messageCount: messagesProcessed,
-    tokenEstimate: totalTokens,
-    hasMore: lastOrdinal < (eligibleEndOrdinal !== undefined ? Math.min(eligibleEndOrdinal - 1, messages.length) : messages.length),
-    text: lines.join(`
-`),
-    lines: lineMeta,
-    commitClusterCount: commitClusters
+    messageId: result.nudge_anchor_message_id,
+    nudgeText: result.nudge_anchor_text
   };
 }
-
-// src/features/magic-context/message-index.ts
-var lastIndexedStatements = new WeakMap;
-var insertMessageStatements = new WeakMap;
-var upsertIndexStatements = new WeakMap;
-var deleteFtsStatements = new WeakMap;
-var deleteIndexStatements = new WeakMap;
-function normalizeIndexText(text) {
-  return text.replace(/\s+/g, " ").trim();
+function setPersistedNudgePlacement(db, sessionId, messageId, nudgeText) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET nudge_anchor_message_id = ?, nudge_anchor_text = ? WHERE session_id = ?").run(messageId, nudgeText, sessionId);
+  })();
 }
-function getLastIndexedStatement(db) {
-  let stmt = lastIndexedStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT last_indexed_ordinal FROM message_history_index WHERE session_id = ?");
-    lastIndexedStatements.set(db, stmt);
-  }
-  return stmt;
+function clearPersistedNudgePlacement(db, sessionId) {
+  db.prepare("UPDATE session_meta SET nudge_anchor_message_id = '', nudge_anchor_text = '' WHERE session_id = ?").run(sessionId);
 }
-function getInsertMessageStatement(db) {
-  let stmt = insertMessageStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("INSERT INTO message_history_fts (session_id, message_ordinal, message_id, role, content) VALUES (?, ?, ?, ?, ?)");
-    insertMessageStatements.set(db, stmt);
+function getPersistedStickyTurnReminder(db, sessionId) {
+  const result = db.prepare("SELECT sticky_turn_reminder_text, sticky_turn_reminder_message_id FROM session_meta WHERE session_id = ?").get(sessionId);
+  if (!isPersistedStickyTurnReminderRow(result)) {
+    return null;
   }
-  return stmt;
-}
-function getUpsertIndexStatement(db) {
-  let stmt = upsertIndexStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("INSERT INTO message_history_index (session_id, last_indexed_ordinal, updated_at) VALUES (?, ?, ?) ON CONFLICT(session_id) DO UPDATE SET last_indexed_ordinal = excluded.last_indexed_ordinal, updated_at = excluded.updated_at");
-    upsertIndexStatements.set(db, stmt);
+  if (result.sticky_turn_reminder_text.length === 0) {
+    return null;
   }
-  return stmt;
+  return {
+    text: result.sticky_turn_reminder_text,
+    messageId: result.sticky_turn_reminder_message_id.length > 0 ? result.sticky_turn_reminder_message_id : null
+  };
 }
-function getDeleteFtsStatement(db) {
-  let stmt = deleteFtsStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM message_history_fts WHERE session_id = ?");
-    deleteFtsStatements.set(db, stmt);
-  }
-  return stmt;
+function setPersistedStickyTurnReminder(db, sessionId, text, messageId = "") {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET sticky_turn_reminder_text = ?, sticky_turn_reminder_message_id = ? WHERE session_id = ?").run(text, messageId, sessionId);
+  })();
 }
-function getDeleteIndexStatement(db) {
-  let stmt = deleteIndexStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM message_history_index WHERE session_id = ?");
-    deleteIndexStatements.set(db, stmt);
-  }
-  return stmt;
+function clearPersistedStickyTurnReminder(db, sessionId) {
+  db.prepare("UPDATE session_meta SET sticky_turn_reminder_text = '', sticky_turn_reminder_message_id = '' WHERE session_id = ?").run(sessionId);
 }
-function getLastIndexedOrdinal(db, sessionId) {
-  const row = getLastIndexedStatement(db).get(sessionId);
-  return typeof row?.last_indexed_ordinal === "number" ? row.last_indexed_ordinal : 0;
+function getPersistedNoteNudge(db, sessionId) {
+  const result = db.prepare("SELECT note_nudge_trigger_pending, note_nudge_trigger_message_id, note_nudge_sticky_text, note_nudge_sticky_message_id FROM session_meta WHERE session_id = ?").get(sessionId);
+  if (!isPersistedNoteNudgeRow(result)) {
+    return getDefaultPersistedNoteNudge();
+  }
+  return {
+    triggerPending: result.note_nudge_trigger_pending === 1,
+    triggerMessageId: result.note_nudge_trigger_message_id.length > 0 ? result.note_nudge_trigger_message_id : null,
+    stickyText: result.note_nudge_sticky_text.length > 0 ? result.note_nudge_sticky_text : null,
+    stickyMessageId: result.note_nudge_sticky_message_id.length > 0 ? result.note_nudge_sticky_message_id : null
+  };
 }
-function clearIndexedMessages(db, sessionId) {
+function setPersistedNoteNudgeTrigger(db, sessionId, triggerMessageId = "") {
   db.transaction(() => {
-    getDeleteFtsStatement(db).run(sessionId);
-    getDeleteIndexStatement(db).run(sessionId);
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET note_nudge_trigger_pending = 1, note_nudge_trigger_message_id = ?, note_nudge_sticky_text = '', note_nudge_sticky_message_id = '' WHERE session_id = ?").run(triggerMessageId, sessionId);
   })();
 }
-function getIndexableContent(role, parts) {
-  if (role === "user") {
-    if (!hasMeaningfulUserText(parts)) {
-      return "";
-    }
-    return extractTexts(parts).map(cleanUserText).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
-  }
-  if (role === "assistant") {
-    return extractTexts(parts).map(removeSystemReminders).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
-  }
-  return "";
+function setPersistedNoteNudgeTriggerMessageId(db, sessionId, triggerMessageId) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET note_nudge_trigger_message_id = ? WHERE session_id = ?").run(triggerMessageId, sessionId);
+  })();
 }
-function ensureMessagesIndexed(db, sessionId, readMessages) {
-  const messages = readMessages(sessionId);
-  if (messages.length === 0) {
-    db.transaction(() => clearIndexedMessages(db, sessionId))();
-    return;
-  }
-  let lastIndexedOrdinal = getLastIndexedOrdinal(db, sessionId);
-  if (lastIndexedOrdinal > messages.length) {
-    db.transaction(() => clearIndexedMessages(db, sessionId))();
-    lastIndexedOrdinal = 0;
-  }
-  if (lastIndexedOrdinal >= messages.length) {
-    return;
-  }
-  const messagesToInsert = messages.filter((message) => message.ordinal > lastIndexedOrdinal).filter((message) => message.role === "user" || message.role === "assistant").map((message) => ({
-    ordinal: message.ordinal,
-    id: message.id,
-    role: message.role,
-    content: getIndexableContent(message.role, message.parts)
-  })).filter((message) => message.content.length > 0);
-  const now = Date.now();
+function setPersistedDeliveredNoteNudge(db, sessionId, text, messageId = "") {
   db.transaction(() => {
-    const insertMessage = getInsertMessageStatement(db);
-    for (const message of messagesToInsert) {
-      insertMessage.run(sessionId, message.ordinal, message.id, message.role, message.content);
-    }
-    getUpsertIndexStatement(db).run(sessionId, messages.length, now);
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET note_nudge_trigger_pending = 0, note_nudge_trigger_message_id = '', note_nudge_sticky_text = ?, note_nudge_sticky_message_id = ? WHERE session_id = ?").run(text, messageId, sessionId);
   })();
 }
-
+function clearPersistedNoteNudge(db, sessionId) {
+  db.prepare("UPDATE session_meta SET note_nudge_trigger_pending = 0, note_nudge_trigger_message_id = '', note_nudge_sticky_text = '', note_nudge_sticky_message_id = '' WHERE session_id = ?").run(sessionId);
+}
+function getStrippedPlaceholderIds(db, sessionId) {
+  const row = db.prepare("SELECT stripped_placeholder_ids FROM session_meta WHERE session_id = ?").get(sessionId);
+  const raw = row?.stripped_placeholder_ids;
+  if (!raw || raw.length === 0)
+    return new Set;
+  try {
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed))
+      return new Set(parsed.filter((v) => typeof v === "string"));
+  } catch {}
+  return new Set;
+}
+function setStrippedPlaceholderIds(db, sessionId, ids) {
+  ensureSessionMetaRow(db, sessionId);
+  const json2 = ids.size > 0 ? JSON.stringify([...ids]) : "";
+  db.prepare("UPDATE session_meta SET stripped_placeholder_ids = ? WHERE session_id = ?").run(json2, sessionId);
+}
+function removeStrippedPlaceholderId(db, sessionId, messageId) {
+  const ids = getStrippedPlaceholderIds(db, sessionId);
+  if (!ids.delete(messageId)) {
+    return false;
+  }
+  setStrippedPlaceholderIds(db, sessionId, ids);
+  return true;
+}
 // src/features/magic-context/storage-meta-session.ts
 function getOrCreateSessionMeta(db, sessionId) {
   const result = db.prepare("SELECT session_id, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag FROM session_meta WHERE session_id = ?").get(sessionId);
@@ -16755,10 +16806,13 @@ function getSourceContents(db, sessionId, tagIds) {
 var insertTagStatements = new WeakMap;
 var updateTagStatusStatements = new WeakMap;
 var updateTagMessageIdStatements = new WeakMap;
+var getTagNumbersByMessageIdStatements = new WeakMap;
+var deleteTagsByMessageIdStatements = new WeakMap;
+var getMaxTagNumberBySessionStatements = new WeakMap;
 function getInsertTagStatement(db) {
   let stmt = insertTagStatements.get(db);
   if (!stmt) {
-    stmt = db.prepare("INSERT INTO tags (session_id, message_id, type, byte_size, tag_number) VALUES (?, ?, ?, ?, ?)");
+    stmt = db.prepare("INSERT INTO tags (session_id, message_id, type, byte_size, reasoning_byte_size, tag_number) VALUES (?, ?, ?, ?, ?, ?)");
     insertTagStatements.set(db, stmt);
   }
   return stmt;
@@ -16779,6 +16833,30 @@ function getUpdateTagMessageIdStatement(db) {
   }
   return stmt;
 }
+function getTagNumbersByMessageIdStatement(db) {
+  let stmt = getTagNumbersByMessageIdStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT tag_number FROM tags WHERE session_id = ? AND (message_id = ? OR message_id LIKE ? ESCAPE '\\' OR message_id LIKE ? ESCAPE '\\') ORDER BY tag_number ASC");
+    getTagNumbersByMessageIdStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getDeleteTagsByMessageIdStatement(db) {
+  let stmt = deleteTagsByMessageIdStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM tags WHERE session_id = ? AND (message_id = ? OR message_id LIKE ? ESCAPE '\\' OR message_id LIKE ? ESCAPE '\\')");
+    deleteTagsByMessageIdStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getMaxTagNumberBySessionStatement(db) {
+  let stmt = getMaxTagNumberBySessionStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT COALESCE(MAX(tag_number), 0) AS max_tag_number FROM tags WHERE session_id = ?");
+    getMaxTagNumberBySessionStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function isTagRow(row) {
   if (row === null || typeof row !== "object")
     return false;
@@ -16794,11 +16872,27 @@ function toTagEntry(row) {
     type,
     status,
     byteSize: row.byte_size,
+    reasoningByteSize: row.reasoning_byte_size ?? 0,
     sessionId: row.session_id
   };
 }
-function insertTag(db, sessionId, messageId, type, byteSize2, tagNumber) {
-  getInsertTagStatement(db).run(sessionId, messageId, type, byteSize2, tagNumber);
+function isTagNumberRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.tag_number === "number";
+}
+function isMaxTagNumberRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.max_tag_number === "number";
+}
+function escapeLikePattern(value) {
+  return value.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
+}
+function insertTag(db, sessionId, messageId, type, byteSize2, tagNumber, reasoningByteSize = 0) {
+  getInsertTagStatement(db).run(sessionId, messageId, type, byteSize2, reasoningByteSize, tagNumber);
   return tagNumber;
 }
 function updateTagStatus(db, sessionId, tagId, status) {
@@ -16807,15 +16901,30 @@ function updateTagStatus(db, sessionId, tagId, status) {
 function updateTagMessageId(db, sessionId, tagId, messageId) {
   getUpdateTagMessageIdStatement(db).run(messageId, sessionId, tagId);
 }
+function deleteTagsByMessageId(db, sessionId, messageId) {
+  const escapedMessageId = escapeLikePattern(messageId);
+  const textPartPattern = `${escapedMessageId}:p%`;
+  const filePartPattern = `${escapedMessageId}:file%`;
+  const tagNumbers = getTagNumbersByMessageIdStatement(db).all(sessionId, messageId, textPartPattern, filePartPattern).filter(isTagNumberRow).map((row) => row.tag_number);
+  if (tagNumbers.length === 0) {
+    return [];
+  }
+  getDeleteTagsByMessageIdStatement(db).run(sessionId, messageId, textPartPattern, filePartPattern);
+  return tagNumbers;
+}
+function getMaxTagNumberBySession(db, sessionId) {
+  const row = getMaxTagNumberBySessionStatement(db).get(sessionId);
+  return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
+}
 function getTagsBySession(db, sessionId) {
-  const rows = db.prepare("SELECT id, message_id, type, status, byte_size, session_id, tag_number FROM tags WHERE session_id = ? ORDER BY tag_number ASC, id ASC").all(sessionId).filter(isTagRow);
+  const rows = db.prepare("SELECT id, message_id, type, status, byte_size, reasoning_byte_size, session_id, tag_number FROM tags WHERE session_id = ? ORDER BY tag_number ASC, id ASC").all(sessionId).filter(isTagRow);
   return rows.map(toTagEntry);
 }
 function getTopNBySize(db, sessionId, n) {
   if (n <= 0) {
     return [];
   }
-  const rows = db.prepare("SELECT id, message_id, type, status, byte_size, session_id, tag_number FROM tags WHERE session_id = ? AND status = 'active' ORDER BY byte_size DESC, tag_number ASC LIMIT ?").all(sessionId, n).filter(isTagRow);
+  const rows = db.prepare("SELECT id, message_id, type, status, byte_size, reasoning_byte_size, session_id, tag_number FROM tags WHERE session_id = ? AND status = 'active' ORDER BY byte_size DESC, tag_number ASC LIMIT ?").all(sessionId, n).filter(isTagRow);
   return rows.map(toTagEntry);
 }
 // src/plugin/dream-timer.ts
@@ -17035,7 +17144,7 @@ function createTagger() {
     }
     return map2;
   }
-  function assignTag(sessionId, messageId, type, byteSize2, db) {
+  function assignTag(sessionId, messageId, type, byteSize2, db, reasoningByteSize = 0) {
     const sessionAssignments = getSessionAssignments(sessionId);
     const existing = sessionAssignments.get(messageId);
     if (existing !== undefined) {
@@ -17044,7 +17153,7 @@ function createTagger() {
     const current = counters.get(sessionId) ?? 0;
     const next = current + 1;
     db.transaction(() => {
-      insertTag(db, sessionId, messageId, type, byteSize2, next);
+      insertTag(db, sessionId, messageId, type, byteSize2, next, reasoningByteSize);
       getUpsertCounterStatement(db).run(sessionId, next);
     })();
     counters.set(sessionId, next);
@@ -17180,17 +17289,50 @@ var FORCE_MATERIALIZE_PERCENTAGE = 85;
 function getProactiveCompartmentTriggerPercentage(executeThresholdPercentage) {
   return Math.max(0, executeThresholdPercentage - PROACTIVE_TRIGGER_OFFSET_PERCENTAGE);
 }
-function estimateProjectedPostDropPercentage(db, sessionId, usage) {
-  const pendingDrops = getPendingOps(db, sessionId).filter((op) => op.operation === "drop");
-  if (pendingDrops.length === 0)
-    return null;
+function estimateProjectedPostDropPercentage(db, sessionId, usage, autoDropToolAge, protectedTags, clearReasoningAge, clearedReasoningThroughTag) {
   const activeTags = getTagsBySession(db, sessionId).filter((tag) => tag.status === "active");
-  const totalActiveBytes = activeTags.reduce((sum, tag) => sum + tag.byteSize, 0);
+  const totalActiveBytes = activeTags.reduce((sum, tag) => sum + tag.byteSize + tag.reasoningByteSize, 0);
   if (totalActiveBytes === 0)
     return null;
+  let droppableBytes = 0;
+  const pendingDrops = getPendingOps(db, sessionId).filter((op) => op.operation === "drop");
   const pendingDropTagIds = new Set(pendingDrops.map((op) => op.tagId));
-  const pendingDropBytes = activeTags.filter((tag) => pendingDropTagIds.has(tag.tagNumber)).reduce((sum, tag) => sum + tag.byteSize, 0);
-  const dropRatio = pendingDropBytes / totalActiveBytes;
+  if (pendingDrops.length > 0) {
+    droppableBytes += activeTags.filter((tag) => pendingDropTagIds.has(tag.tagNumber)).reduce((sum, tag) => sum + tag.byteSize + tag.reasoningByteSize, 0);
+  }
+  const maxTag = activeTags.reduce((max, t) => Math.max(max, t.tagNumber), 0);
+  if (autoDropToolAge !== undefined && protectedTags !== undefined) {
+    const toolAgeCutoff = maxTag - autoDropToolAge;
+    const protectedCutoff = maxTag - protectedTags;
+    for (const tag of activeTags) {
+      if (pendingDropTagIds.has(tag.tagNumber))
+        continue;
+      if (tag.tagNumber > protectedCutoff)
+        continue;
+      if (tag.type === "tool" && tag.tagNumber <= toolAgeCutoff) {
+        droppableBytes += tag.byteSize + tag.reasoningByteSize;
+      }
+    }
+  }
+  if (clearReasoningAge !== undefined && clearedReasoningThroughTag !== undefined) {
+    const reasoningAgeCutoff = maxTag - clearReasoningAge;
+    for (const tag of activeTags) {
+      if (tag.type !== "message")
+        continue;
+      if (pendingDropTagIds.has(tag.tagNumber))
+        continue;
+      if (tag.tagNumber <= clearedReasoningThroughTag)
+        continue;
+      if (tag.tagNumber > reasoningAgeCutoff)
+        continue;
+      if (tag.reasoningByteSize > 0) {
+        droppableBytes += tag.reasoningByteSize;
+      }
+    }
+  }
+  if (droppableBytes === 0)
+    return null;
+  const dropRatio = Math.min(droppableBytes / totalActiveBytes, 1);
   return usage.percentage * (1 - dropRatio);
 }
 var TAIL_INFO_DEFAULTS = {
@@ -17227,7 +17369,7 @@ function getUnsummarizedTailInfo(db, sessionId, compartmentTokenBudget) {
     }
   });
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, compartmentTokenBudget = DEFAULT_COMPARTMENT_TOKEN_BUDGET) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, compartmentTokenBudget = DEFAULT_COMPARTMENT_TOKEN_BUDGET, autoDropToolAge, protectedTagCount, clearReasoningAge) {
   if (sessionMeta.compartmentInProgress) {
     return { shouldFire: false };
   }
@@ -17235,7 +17377,7 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   if (!tailInfo.hasNewRawHistory) {
     return { shouldFire: false };
   }
-  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage);
+  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, autoDropToolAge, protectedTagCount, clearReasoningAge, sessionMeta.clearedReasoningThroughTag);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
   if (usage.percentage >= FORCE_COMPARTMENT_PERCENTAGE) {
     if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
@@ -17679,6 +17821,85 @@ function getMessageUpdatedAssistantInfo(properties) {
     }
   };
 }
+function getMessageRemovedInfo(properties) {
+  if (!isRecord(properties)) {
+    return null;
+  }
+  if (typeof properties.sessionID !== "string" || typeof properties.messageID !== "string") {
+    return null;
+  }
+  return {
+    sessionID: properties.sessionID,
+    messageID: properties.messageID
+  };
+}
+
+// src/hooks/magic-context/note-nudger.ts
+var NOTE_NUDGE_COOLDOWN_MS = 15 * 60 * 1000;
+var lastDeliveredAt = new Map;
+function getPersistedNoteNudgeDeliveredAt(_db, sessionId) {
+  return lastDeliveredAt.get(sessionId) ?? 0;
+}
+function recordNoteNudgeDeliveryTime(sessionId) {
+  lastDeliveredAt.set(sessionId, Date.now());
+}
+function onNoteTrigger(db, sessionId, trigger) {
+  setPersistedNoteNudgeTrigger(db, sessionId);
+  sessionLog(sessionId, `note-nudge: trigger fired (${trigger}), triggerPending=true`);
+}
+function peekNoteNudgeText(db, sessionId, currentUserMessageId, projectIdentity) {
+  const state = getPersistedNoteNudge(db, sessionId);
+  if (!state.triggerPending)
+    return null;
+  if (!state.triggerMessageId && currentUserMessageId) {
+    setPersistedNoteNudgeTriggerMessageId(db, sessionId, currentUserMessageId);
+    state.triggerMessageId = currentUserMessageId;
+  }
+  if (state.triggerMessageId && currentUserMessageId && state.triggerMessageId === currentUserMessageId) {
+    sessionLog(sessionId, `note-nudge: deferring \u2014 current user message ${currentUserMessageId} is same as trigger-time message`);
+    return null;
+  }
+  const deliveredAt = getPersistedNoteNudgeDeliveredAt(db, sessionId);
+  if (deliveredAt > 0 && Date.now() - deliveredAt < NOTE_NUDGE_COOLDOWN_MS) {
+    sessionLog(sessionId, `note-nudge: suppressing \u2014 last delivered ${Math.round((Date.now() - deliveredAt) / 1000)}s ago (cooldown ${NOTE_NUDGE_COOLDOWN_MS / 60000}m)`);
+    clearPersistedNoteNudge(db, sessionId);
+    return null;
+  }
+  const notes = getSessionNotes(db, sessionId);
+  const readySmartCount = projectIdentity ? getReadySmartNotes(db, projectIdentity).length : 0;
+  const totalCount = notes.length + readySmartCount;
+  if (totalCount === 0) {
+    sessionLog(sessionId, "note-nudge: triggerPending but no notes found, skipping");
+    clearPersistedNoteNudge(db, sessionId);
+    return null;
+  }
+  const parts = [];
+  if (notes.length > 0) {
+    parts.push(`${notes.length} deferred note${notes.length === 1 ? "" : "s"}`);
+  }
+  if (readySmartCount > 0) {
+    parts.push(`${readySmartCount} ready smart note${readySmartCount === 1 ? "" : "s"}`);
+  }
+  sessionLog(sessionId, `note-nudge: delivering nudge for ${parts.join(" and ")}`);
+  return `You have ${parts.join(" and ")}. Review with ctx_note read \u2014 some may be actionable now.`;
+}
+function markNoteNudgeDelivered(db, sessionId, text, messageId) {
+  setPersistedDeliveredNoteNudge(db, sessionId, messageId ? text : "", messageId ?? "");
+  recordNoteNudgeDeliveryTime(sessionId);
+  sessionLog(sessionId, messageId ? `note-nudge: marked delivered, sticky anchor=${messageId}` : "note-nudge: marked delivered without anchor");
+}
+function getStickyNoteNudge(db, sessionId) {
+  const state = getPersistedNoteNudge(db, sessionId);
+  if (!state.stickyText || !state.stickyMessageId)
+    return null;
+  return { text: state.stickyText, messageId: state.stickyMessageId };
+}
+function clearNoteNudgeState(db, sessionId, options) {
+  if (options?.persist !== false) {
+    clearPersistedNoteNudge(db, sessionId);
+  }
+  lastDeliveredAt.delete(sessionId);
+}
 
 // src/hooks/magic-context/event-handler.ts
 var CONTEXT_USAGE_TTL_MS = 60 * 60 * 1000;
@@ -17690,6 +17911,46 @@ function evictExpiredUsageEntries(contextUsageMap) {
     }
   }
 }
+function cleanupRemovedMessageState(deps, sessionId, messageId) {
+  return deps.db.transaction(() => {
+    const removedTagNumbers = deleteTagsByMessageId(deps.db, sessionId, messageId);
+    sessionLog(sessionId, `event message.removed: deleted ${removedTagNumbers.length} tag(s) for message ${messageId}`);
+    const strippedPlaceholderRemoved = removeStrippedPlaceholderId(deps.db, sessionId, messageId);
+    sessionLog(sessionId, strippedPlaceholderRemoved ? `event message.removed: removed ${messageId} from stripped placeholder ids` : `event message.removed: stripped placeholder ids unchanged for ${messageId}`);
+    const persistedNudgePlacement = getPersistedNudgePlacement(deps.db, sessionId);
+    const clearedNudgePlacement = persistedNudgePlacement?.messageId === messageId;
+    if (clearedNudgePlacement) {
+      clearPersistedNudgePlacement(deps.db, sessionId);
+    }
+    sessionLog(sessionId, clearedNudgePlacement ? `event message.removed: cleared nudge anchor for ${messageId}` : `event message.removed: nudge anchor unchanged for ${messageId}`);
+    const persistedNoteNudge = getPersistedNoteNudge(deps.db, sessionId);
+    const clearedNoteNudge = persistedNoteNudge.triggerMessageId === messageId || persistedNoteNudge.stickyMessageId === messageId;
+    if (clearedNoteNudge) {
+      clearPersistedNoteNudge(deps.db, sessionId);
+    }
+    sessionLog(sessionId, clearedNoteNudge ? `event message.removed: cleared note nudge state for ${messageId}` : `event message.removed: note nudge state unchanged for ${messageId}`);
+    const persistedStickyTurnReminder = getPersistedStickyTurnReminder(deps.db, sessionId);
+    const clearedStickyTurnReminder = persistedStickyTurnReminder?.messageId === messageId;
+    if (clearedStickyTurnReminder) {
+      clearPersistedStickyTurnReminder(deps.db, sessionId);
+    }
+    sessionLog(sessionId, clearedStickyTurnReminder ? `event message.removed: cleared sticky turn reminder for ${messageId}` : `event message.removed: sticky turn reminder unchanged for ${messageId}`);
+    const currentWatermark = getPersistedReasoningWatermark(deps.db, sessionId);
+    const maxRemainingTag = getMaxTagNumberBySession(deps.db, sessionId);
+    if (currentWatermark > maxRemainingTag) {
+      setPersistedReasoningWatermark(deps.db, sessionId, maxRemainingTag);
+      sessionLog(sessionId, `event message.removed: reset reasoning watermark ${currentWatermark}\u2192${maxRemainingTag}`);
+    } else {
+      sessionLog(sessionId, `event message.removed: reasoning watermark unchanged at ${currentWatermark} (max tag ${maxRemainingTag})`);
+    }
+    const removedIndexedMessages = deleteIndexedMessage(deps.db, sessionId, messageId);
+    sessionLog(sessionId, `event message.removed: deleted ${removedIndexedMessages} indexed message row(s) for ${messageId}`);
+    return {
+      clearedNudgePlacement,
+      clearedNoteNudge
+    };
+  })();
+}
 function createEventHandler2(deps) {
   return async (input) => {
     evictExpiredUsageEntries(deps.contextUsageMap);
@@ -17763,7 +18024,7 @@ function createEventHandler2(deps) {
           const sessionMeta = getOrCreateSessionMeta(deps.db, info.sessionID);
           const previousPercentage = sessionMeta.lastContextPercentage;
           if (!sessionMeta.isSubagent) {
-            const triggerResult = checkCompartmentTrigger(deps.db, info.sessionID, sessionMeta, { percentage, inputTokens: totalInputTokens }, previousPercentage, resolveExecuteThreshold(deps.config.execute_threshold_percentage ?? 65, modelKey, 65));
+            const triggerResult = checkCompartmentTrigger(deps.db, info.sessionID, sessionMeta, { percentage, inputTokens: totalInputTokens }, previousPercentage, resolveExecuteThreshold(deps.config.execute_threshold_percentage ?? 65, modelKey, 65), undefined, deps.config.auto_drop_tool_age ?? 100, deps.config.protected_tags, deps.config.clear_reasoning_age ?? 50);
             if (triggerResult.shouldFire) {
               sessionLog(info.sessionID, `compartment trigger: firing (reason=${triggerResult.reason})`);
               updateSessionMeta(deps.db, info.sessionID, {
@@ -17778,6 +18039,37 @@ function createEventHandler2(deps) {
       }
       return;
     }
+    if (input.event.type === "message.removed") {
+      const info = getMessageRemovedInfo(input.event.properties);
+      if (!info) {
+        const sessionId = properties ? resolveSessionId(properties) : null;
+        if (sessionId) {
+          sessionLog(sessionId, "event message.removed: no message removal info extracted from event");
+        } else {
+          log("[magic-context] event message.removed: no message removal info extracted from event");
+        }
+        return;
+      }
+      sessionLog(info.sessionID, `event message.removed: invalidating state for message ${info.messageID}`);
+      try {
+        const cleanup = cleanupRemovedMessageState(deps, info.sessionID, info.messageID);
+        deps.tagger.cleanup(info.sessionID);
+        sessionLog(info.sessionID, "event message.removed: invalidated tagger session cache");
+        if (cleanup.clearedNudgePlacement) {
+          deps.nudgePlacements.clear(info.sessionID, { persist: false });
+          sessionLog(info.sessionID, "event message.removed: cleared in-memory nudge placement cache");
+        }
+        if (cleanup.clearedNoteNudge) {
+          clearNoteNudgeState(deps.db, info.sessionID, { persist: false });
+          sessionLog(info.sessionID, "event message.removed: cleared in-memory note nudge state");
+        }
+        deps.onSessionCacheInvalidated?.(info.sessionID);
+        sessionLog(info.sessionID, "event message.removed: cleared session injection cache");
+      } catch (error48) {
+        sessionLog(info.sessionID, "event message.removed cleanup failed:", error48);
+      }
+      return;
+    }
     if (input.event.type === "session.compacted") {
       const sessionId = resolveSessionId(properties);
       if (!sessionId) {
@@ -18622,72 +18914,6 @@ function createTextCompleteHandler() {
   };
 }
 
-// src/hooks/magic-context/note-nudger.ts
-var NOTE_NUDGE_COOLDOWN_MS = 15 * 60 * 1000;
-var lastDeliveredAt = new Map;
-function getPersistedNoteNudgeDeliveredAt(_db, sessionId) {
-  return lastDeliveredAt.get(sessionId) ?? 0;
-}
-function recordNoteNudgeDeliveryTime(sessionId) {
-  lastDeliveredAt.set(sessionId, Date.now());
-}
-function onNoteTrigger(db, sessionId, trigger) {
-  setPersistedNoteNudgeTrigger(db, sessionId);
-  sessionLog(sessionId, `note-nudge: trigger fired (${trigger}), triggerPending=true`);
-}
-function peekNoteNudgeText(db, sessionId, currentUserMessageId, projectIdentity) {
-  const state = getPersistedNoteNudge(db, sessionId);
-  if (!state.triggerPending)
-    return null;
-  if (!state.triggerMessageId && currentUserMessageId) {
-    setPersistedNoteNudgeTriggerMessageId(db, sessionId, currentUserMessageId);
-    state.triggerMessageId = currentUserMessageId;
-  }
-  if (state.triggerMessageId && currentUserMessageId && state.triggerMessageId === currentUserMessageId) {
-    sessionLog(sessionId, `note-nudge: deferring \u2014 current user message ${currentUserMessageId} is same as trigger-time message`);
-    return null;
-  }
-  if (state.stickyText && state.stickyMessageId) {
-    const deliveredAt = getPersistedNoteNudgeDeliveredAt(db, sessionId);
-    if (deliveredAt > 0 && Date.now() - deliveredAt < NOTE_NUDGE_COOLDOWN_MS) {
-      sessionLog(sessionId, `note-nudge: suppressing \u2014 last delivered ${Math.round((Date.now() - deliveredAt) / 1000)}s ago (cooldown ${NOTE_NUDGE_COOLDOWN_MS / 60000}m)`);
-      clearPersistedNoteNudge(db, sessionId);
-      return null;
-    }
-  }
-  const notes = getSessionNotes(db, sessionId);
-  const readySmartCount = projectIdentity ? getReadySmartNotes(db, projectIdentity).length : 0;
-  const totalCount = notes.length + readySmartCount;
-  if (totalCount === 0) {
-    sessionLog(sessionId, "note-nudge: triggerPending but no notes found, skipping");
-    clearPersistedNoteNudge(db, sessionId);
-    return null;
-  }
-  const parts = [];
-  if (notes.length > 0) {
-    parts.push(`${notes.length} deferred note${notes.length === 1 ? "" : "s"}`);
-  }
-  if (readySmartCount > 0) {
-    parts.push(`${readySmartCount} ready smart note${readySmartCount === 1 ? "" : "s"}`);
-  }
-  sessionLog(sessionId, `note-nudge: delivering nudge for ${parts.join(" and ")}`);
-  return `You have ${parts.join(" and ")}. Review with ctx_note read \u2014 some may be actionable now.`;
-}
-function markNoteNudgeDelivered(db, sessionId, text, messageId) {
-  setPersistedDeliveredNoteNudge(db, sessionId, messageId ? text : "", messageId ?? "");
-  recordNoteNudgeDeliveryTime(sessionId);
-  sessionLog(sessionId, messageId ? `note-nudge: marked delivered, sticky anchor=${messageId}` : "note-nudge: marked delivered without anchor");
-}
-function getStickyNoteNudge(db, sessionId) {
-  const state = getPersistedNoteNudge(db, sessionId);
-  if (!state.stickyText || !state.stickyMessageId)
-    return null;
-  return { text: state.stickyText, messageId: state.stickyMessageId };
-}
-function clearNoteNudgeState(db, sessionId) {
-  clearPersistedNoteNudge(db, sessionId);
-}
-
 // src/hooks/magic-context/strip-content.ts
 var DROPPED_PLACEHOLDER_PATTERN = /^\[dropped \u00A7\d+\u00A7\]$/;
 var TAG_PREFIX_PATTERN = /^\u00A7\d+\u00A7\s*/;
@@ -20928,6 +21154,16 @@ function collectRelevantSourceTagIds(messages, assignments) {
   }
   return Array.from(relevantTagIds);
 }
+function getReasoningByteSize(parts) {
+  let reasoningBytes = 0;
+  for (const part of parts) {
+    const content = part.thinking ?? part.text ?? "";
+    if (content && content !== "[cleared]") {
+      reasoningBytes += byteSize(content);
+    }
+  }
+  return reasoningBytes;
+}
 function tagMessages(sessionId, messages, tagger, db) {
   const targets = new Map;
   const reasoningByMessage = new Map;
@@ -20988,7 +21224,8 @@ function tagMessages(sessionId, messages, tagger, db) {
           const thinkingParts = messageThinkingParts;
           const contentId = `${messageId}:p${partIndex}`;
           const existingTagId = resolver.resolve(messageId, "message", contentId, textOrdinal);
-          const tagId = tagger.assignTag(sessionId, contentId, "message", byteSize(textPart.text), db);
+          const reasoningBytes = textOrdinal === 0 ? getReasoningByteSize(thinkingParts) : 0;
+          const tagId = tagger.assignTag(sessionId, contentId, "message", byteSize(textPart.text), db, reasoningBytes);
           if (existingTagId === undefined) {
             const sourceContent = stripTagPrefix(textPart.text);
             if (sourceContent.trim().length > 0) {
@@ -21024,7 +21261,8 @@ function tagMessages(sessionId, messages, tagger, db) {
         if (isToolPartWithOutput(part)) {
           const toolPart = part;
           const thinkingParts = precedingThinkingParts;
-          const tagId = tagger.assignTag(sessionId, toolPart.callID, "tool", byteSize(toolPart.state.output), db);
+          const reasoningBytes = getReasoningByteSize(thinkingParts);
+          const tagId = tagger.assignTag(sessionId, toolPart.callID, "tool", byteSize(toolPart.state.output), db, reasoningBytes);
           messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
           toolPart.state.output = prependTag(tagId, toolPart.state.output);
           toolTagByCallId.set(toolPart.callID, tagId);
@@ -21676,10 +21914,10 @@ function createNudgePlacementStore(db) {
       store.set(sessionId, persisted);
       return persisted;
     },
-    clear(sessionId) {
+    clear(sessionId, options) {
       store.delete(sessionId);
       missingSessions.add(sessionId);
-      if (db) {
+      if (db && options?.persist !== false) {
         clearPersistedNudgePlacement(db, sessionId);
       }
     }
@@ -21906,6 +22144,9 @@ function createEventHook(args) {
       args.commitSeenLastPass?.delete(sessionId);
       clearNoteNudgeState(args.db, sessionId);
     }
+    if (input.event.type === "message.removed") {
+      return;
+    }
     const entry = args.contextUsageMap.get(sessionId);
     if (!entry)
       return;
@@ -21998,6 +22239,13 @@ Use \`ctx_note\` for deferred intentions \u2014 things to tackle later, not righ
 Use \`ctx_memory\` to manage cross-session project memories. Write new memories or delete stale ones. Memories persist across sessions and are automatically injected into new sessions.
 Use \`ctx_search\` to search across project memories, session facts, and conversation history from one query.
 Use \`ctx_expand\` to decompress a compartment range to see the original conversation transcript. Use \`start\`/\`end\` from \`<compartment start=N end=M>\` attributes. Returns the compacted U:/A: transcript for that message range, capped at ~15K tokens.
+**Search before asking the user**: If you can't remember or don't know something that might have been discussed before or stored in project memory, use \`ctx_search\` before asking the user. Examples:
+- Can't remember where a related codebase or dependency lives \u2192 \`ctx_search(query="opencode source code path")\`
+- Forgot a prior architectural decision or constraint \u2192 \`ctx_search(query="why did we choose SQLite over postgres")\`
+- Need a config value, API key location, or environment detail \u2192 \`ctx_search(query="embedding provider configuration")\`
+- Looking for how something was implemented previously \u2192 \`ctx_search(query="how does the dreamer lease work")\`
+- Want to recall what was decided in an earlier conversation \u2192 \`ctx_search(query="dashboard release signing setup")\`
+\`ctx_search\` returns ranked results from memories, session facts, and raw message history. Use message ordinals from results with \`ctx_expand\` to retrieve surrounding conversation context.
 NEVER drop large ranges blindly (e.g., "1-50"). Review each tag before deciding.
 NEVER drop user messages \u2014 they are short and will be summarized by compartmentalization automatically. Dropping them loses context the historian needs.
 NEVER drop assistant text messages unless they are exceptionally large. Your conversation messages are lightweight; only large tool outputs are worth dropping.
@@ -22006,7 +22254,14 @@ var BASE_INTRO_NO_REDUCE = `Messages and tool outputs are tagged with \xA7N\xA7
 Use \`ctx_note\` for deferred intentions \u2014 things to tackle later, not right now. NOT for task tracking (use todos). Notes survive context compression and you'll be reminded at natural work boundaries (after commits, historian runs, todo completion).
 Use \`ctx_memory\` to manage cross-session project memories. Write new memories or delete stale ones. Memories persist across sessions and are automatically injected into new sessions.
 Use \`ctx_search\` to search across project memories, session facts, and conversation history from one query.
-Use \`ctx_expand\` to decompress a compartment range to see the original conversation transcript. Use \`start\`/\`end\` from \`<compartment start=N end=M>\` attributes. Returns the compacted U:/A: transcript for that message range, capped at ~15K tokens.`;
+Use \`ctx_expand\` to decompress a compartment range to see the original conversation transcript. Use \`start\`/\`end\` from \`<compartment start=N end=M>\` attributes. Returns the compacted U:/A: transcript for that message range, capped at ~15K tokens.
+**Search before asking the user**: If you can't remember or don't know something that might have been discussed before or stored in project memory, use \`ctx_search\` before asking the user. Examples:
+- Can't remember where a related codebase or dependency lives \u2192 \`ctx_search(query="opencode source code path")\`
+- Forgot a prior architectural decision or constraint \u2192 \`ctx_search(query="why did we choose SQLite over postgres")\`
+- Need a config value, API key location, or environment detail \u2192 \`ctx_search(query="embedding provider configuration")\`
+- Looking for how something was implemented previously \u2192 \`ctx_search(query="how does the dreamer lease work")\`
+- Want to recall what was decided in an earlier conversation \u2192 \`ctx_search(query="dashboard release signing setup")\`
+\`ctx_search\` returns ranked results from memories, session facts, and raw message history. Use message ordinals from results with \`ctx_expand\` to retrieve surrounding conversation context.`;
 var SISYPHUS_SECTION = `
 ### Reduction Triggers
 - After collecting background agent results (explore/librarian) \u2014 drop raw outputs once you extracted what you need.
@@ -23210,7 +23465,8 @@ async function getSemanticScores(args) {
 function getFtsMatches(args) {
   try {
     return searchMemoriesFTS(args.db, args.projectPath, args.query, args.limit);
-  } catch {
+  } catch (error48) {
+    log(`[search] FTS query failed for "${args.query}": ${error48 instanceof Error ? error48.message : String(error48)}`);
     return [];
   }
 }