@cortexkit/pi-magic-context 0.31.2 → 0.31.4

package/dist/index.js

@@ -14990,12 +14990,41 @@ function pushNotification(type, payload, sessionId) {
     queue = kept.sort((a, b) => a.id - b.id);
   }
 }
-function drainNotifications(lastReceivedId = 0, sessionId) {
+function cursor(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
+}
+function drainNotifications(lastReceivedId = 0, sessionId, options = {}) {
+  const sessionCursor = cursor(lastReceivedId);
+  if (options.globalOnly) {
+    queue = queue.filter((notification) => notification.sessionId !== undefined || notification.id > sessionCursor);
+    return queue.filter((notification) => notification.sessionId === undefined && notification.id > sessionCursor);
+  }
+  if (options.sessionOnly) {
+    if (sessionId === undefined)
+      return [];
+    queue = queue.filter((notification) => notification.sessionId !== sessionId || notification.id > sessionCursor);
+    return queue.filter((notification) => notification.sessionId === sessionId && notification.id > sessionCursor);
+  }
+  if (sessionId !== undefined && options.globalLastReceivedId !== undefined) {
+    const globalCursor = cursor(options.globalLastReceivedId);
+    queue = queue.filter((notification) => {
+      if (notification.sessionId === undefined)
+        return notification.id > globalCursor;
+      if (notification.sessionId === sessionId)
+        return notification.id > sessionCursor;
+      return true;
+    });
+    return queue.filter((notification) => {
+      if (notification.sessionId === undefined)
+        return notification.id > globalCursor;
+      return notification.sessionId === sessionId && notification.id > sessionCursor;
+    });
+  }
   const matchesClient = (notification) => sessionId === undefined || notification.sessionId === undefined || notification.sessionId === sessionId;
-  if (lastReceivedId > 0) {
-    queue = queue.filter((notification) => !(notification.id <= lastReceivedId && matchesClient(notification)));
+  if (sessionCursor > 0) {
+    queue = queue.filter((notification) => !(notification.id <= sessionCursor && matchesClient(notification)));
   }
-  return queue.filter((notification) => notification.id > lastReceivedId && matchesClient(notification));
+  return queue.filter((notification) => notification.id > sessionCursor && matchesClient(notification));
 }
 function isTuiConnected(sessionId) {
   if (sinks.size === 0)
@@ -15138,7 +15167,7 @@ var PROMPT_CONTEXT_MESSAGE_LIMIT = 50;
 
 // src/index.ts
 import { createRequire as createRequire3 } from "node:module";
-import { join as join13 } from "node:path";
+import { join as join13, resolve as resolve3 } from "node:path";
 
 // ../plugin/src/config/agent-disable.ts
 function isDreamerRunnable(config) {
@@ -149215,12 +149244,19 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
   let totalTokens = 0;
   let messagesProcessed = 0;
   let lastOrdinal = startOrdinal - 1;
+  let highestScannedOrdinal = startOrdinal - 1;
   let lastMessageId = "";
   let firstMessageId = "";
   let currentBlock = null;
   let pendingNoiseMeta = [];
   let commitClusters = 0;
   let lastFlushedRole = "";
+  function recordFilteredNoise(meta) {
+    pendingNoiseMeta.push(meta);
+    if (!currentBlock) {
+      highestScannedOrdinal = Math.max(highestScannedOrdinal, meta.ordinal);
+    }
+  }
   function flushCurrentBlock() {
     if (!currentBlock)
       return true;
@@ -149236,6 +149272,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     if (!firstMessageId)
       firstMessageId = currentBlock.meta[0]?.messageId ?? "";
     lastOrdinal = currentBlock.meta[currentBlock.meta.length - 1]?.ordinal ?? currentBlock.endOrdinal;
+    highestScannedOrdinal = Math.max(highestScannedOrdinal, lastOrdinal);
     lastMessageId = currentBlock.meta[currentBlock.meta.length - 1]?.messageId ?? "";
     messagesProcessed += currentBlock.meta.length;
     lines.push(blockText);
@@ -149259,7 +149296,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     if (msg.role === "user" && !hasMeaningfulUserText(msg.parts)) {
       const tcSummaries = extractToolCallSummaries(msg.parts);
       if (tcSummaries.length === 0) {
-        pendingNoiseMeta.push(meta);
+        recordFilteredNoise(meta);
         continue;
       }
       const tcText = tcSummaries.join(" / ");
@@ -149291,7 +149328,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     const compacted = compactTextForSummary(allParts.join(" / "), msg.role);
     const text = compacted.text;
     if (!text) {
-      pendingNoiseMeta.push(meta);
+      recordFilteredNoise(meta);
       continue;
     }
     const msgHasNarrative = textParts.length > 0;
@@ -149318,7 +149355,9 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     };
     pendingNoiseMeta = [];
   }
-  flushCurrentBlock();
+  if (flushCurrentBlock() && pendingNoiseMeta.length > 0) {
+    highestScannedOrdinal = Math.max(highestScannedOrdinal, pendingNoiseMeta[pendingNoiseMeta.length - 1]?.ordinal ?? highestScannedOrdinal);
+  }
   const toolOnlyRanges = [];
   for (const range of flushedToolOnlyBlocks) {
     const last = toolOnlyRanges[toolOnlyRanges.length - 1];
@@ -149335,7 +149374,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     endMessageId: lastMessageId,
     messageCount: messagesProcessed,
     tokenEstimate: totalTokens,
-    hasMore: lastOrdinal < (eligibleEndOrdinal !== undefined ? Math.min(eligibleEndOrdinal - 1, totalMessageCount) : totalMessageCount),
+    hasMore: Math.max(lastOrdinal, highestScannedOrdinal) < (eligibleEndOrdinal !== undefined ? Math.min(eligibleEndOrdinal - 1, totalMessageCount) : totalMessageCount),
     text: lines.join(`
 `),
     lines: lineMeta,
@@ -149370,7 +149409,10 @@ function clearCompressionDepthRange(db, sessionId, startOrdinal, endOrdinal) {
 var lastIndexedStatements = new WeakMap;
 var insertMessageStatements = new WeakMap;
 var upsertIndexStatements = new WeakMap;
+var upsertCleanIndexStatements = new WeakMap;
+var upsertDirtyFloorStatements = new WeakMap;
 var deleteFtsStatements = new WeakMap;
+var deleteFtsFromOrdinalStatements = new WeakMap;
 var deleteIndexStatements = new WeakMap;
 var countIndexedMessageStatements = new WeakMap;
 function normalizeIndexText(text) {
@@ -149379,7 +149421,7 @@ function normalizeIndexText(text) {
 function getLastIndexedStatement(db) {
   let stmt = lastIndexedStatements.get(db);
   if (!stmt) {
-    stmt = db.prepare("SELECT last_indexed_ordinal FROM message_history_index WHERE session_id = ?");
+    stmt = db.prepare("SELECT last_indexed_ordinal, dirty_floor_ordinal FROM message_history_index WHERE session_id = ?");
     lastIndexedStatements.set(db, stmt);
   }
   return stmt;
@@ -149400,6 +149442,22 @@ function getUpsertIndexStatement(db) {
   }
   return stmt;
 }
+function getUpsertCleanIndexStatement(db) {
+  let stmt = upsertCleanIndexStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("INSERT INTO message_history_index (session_id, last_indexed_ordinal, dirty_floor_ordinal, updated_at, harness) VALUES (?, ?, 0, ?, ?) ON CONFLICT(session_id) DO UPDATE SET last_indexed_ordinal = excluded.last_indexed_ordinal, dirty_floor_ordinal = 0, updated_at = excluded.updated_at");
+    upsertCleanIndexStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getUpsertDirtyFloorStatement(db) {
+  let stmt = upsertDirtyFloorStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("INSERT INTO message_history_index (session_id, last_indexed_ordinal, dirty_floor_ordinal, updated_at, harness) VALUES (?, ?, ?, ?, ?) ON CONFLICT(session_id) DO UPDATE SET last_indexed_ordinal = MAX(message_history_index.last_indexed_ordinal, excluded.last_indexed_ordinal), dirty_floor_ordinal = CASE WHEN message_history_index.dirty_floor_ordinal <= 0 THEN excluded.dirty_floor_ordinal WHEN excluded.dirty_floor_ordinal <= 0 THEN message_history_index.dirty_floor_ordinal ELSE MIN(message_history_index.dirty_floor_ordinal, excluded.dirty_floor_ordinal) END, updated_at = excluded.updated_at");
+    upsertDirtyFloorStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getDeleteFtsStatement(db) {
   let stmt = deleteFtsStatements.get(db);
   if (!stmt) {
@@ -149408,6 +149466,14 @@ function getDeleteFtsStatement(db) {
   }
   return stmt;
 }
+function getDeleteFtsFromOrdinalStatement(db) {
+  let stmt = deleteFtsFromOrdinalStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM message_history_fts WHERE session_id = ? AND CAST(message_ordinal AS INTEGER) >= ?");
+    deleteFtsFromOrdinalStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getDeleteIndexStatement(db) {
   let stmt = deleteIndexStatements.get(db);
   if (!stmt) {
@@ -149428,6 +149494,14 @@ function getLastIndexedOrdinal(db, sessionId) {
   const row = getLastIndexedStatement(db).get(sessionId);
   return typeof row?.last_indexed_ordinal === "number" ? row.last_indexed_ordinal : 0;
 }
+function getDirtyIndexFloor(db, sessionId) {
+  const row = getLastIndexedStatement(db).get(sessionId);
+  return typeof row?.dirty_floor_ordinal === "number" && row.dirty_floor_ordinal > 0 ? row.dirty_floor_ordinal : null;
+}
+function markMessageIndexDirty(db, sessionId, floorOrdinal) {
+  const dirtyFloor = Math.max(1, Math.floor(floorOrdinal));
+  getUpsertDirtyFloorStatement(db).run(sessionId, getLastIndexedOrdinal(db, sessionId), dirtyFloor, Date.now(), getHarness());
+}
 function isMessageAlreadyIndexed(db, sessionId, messageId) {
   const row = getCountIndexedMessageStatement(db).get(sessionId, messageId);
   return (typeof row?.count === "number" ? row.count : 0) > 0;
@@ -149495,7 +149569,15 @@ function indexMessagesAfterOrdinal(db, sessionId, messages, lastIndexedOrdinal,
   db.exec("BEGIN IMMEDIATE");
   let committed = false;
   try {
-    const effectiveWatermark = Math.max(lastIndexedOrdinal, getLastIndexedOrdinal(db, sessionId));
+    let effectiveWatermark = Math.max(lastIndexedOrdinal, getLastIndexedOrdinal(db, sessionId));
+    const dirtyFloor = getDirtyIndexFloor(db, sessionId);
+    if (dirtyFloor !== null) {
+      const rewindOrdinal = Math.max(1, Math.min(dirtyFloor, finalWatermark + 1));
+      if (rewindOrdinal <= finalWatermark) {
+        getDeleteFtsFromOrdinalStatement(db).run(sessionId, rewindOrdinal);
+      }
+      effectiveWatermark = Math.min(effectiveWatermark, rewindOrdinal - 1);
+    }
     const insertMessage = getInsertMessageStatement(db);
     for (const message of messages) {
       if (message.ordinal <= effectiveWatermark) {
@@ -149512,7 +149594,7 @@ function indexMessagesAfterOrdinal(db, sessionId, messages, lastIndexedOrdinal,
       inserted++;
     }
     const newWatermark = Math.max(effectiveWatermark, finalWatermark);
-    getUpsertIndexStatement(db).run(sessionId, newWatermark, now, getHarness());
+    getUpsertCleanIndexStatement(db).run(sessionId, newWatermark, now, getHarness());
     db.exec("COMMIT");
     committed = true;
   } finally {
@@ -149609,8 +149691,9 @@ function scheduleReconciliation(db, sessionId, readMessages) {
   reconciliationScheduledSessions.add(sessionId);
   defer(() => {
     reconcileSessionIndex(db, sessionId, readMessages).catch((error) => {
-      reconciliationScheduledSessions.delete(sessionId);
       logIndexingError(sessionId, "reconciliation", error);
+    }).finally(() => {
+      reconciliationScheduledSessions.delete(sessionId);
     });
   });
 }
@@ -149622,13 +149705,17 @@ function scheduleIncrementalIndex(db, sessionId, messageId, readSingleMessage) {
   const timer = setTimeout(() => {
     incrementalTimers.delete(key);
     pendingIncrementalKeys.add(key);
+    let attemptedOrdinal = null;
     runWithSessionLock(sessionId, () => {
       const message = readSingleMessage(sessionId, messageId);
       if (!message) {
         return;
       }
+      attemptedOrdinal = message.ordinal;
       indexSingleMessage(db, sessionId, message);
     }).catch((error) => {
+      markMessageIndexDirty(db, sessionId, attemptedOrdinal ?? getLastIndexedOrdinal(db, sessionId) + 1);
+      reconciledSessions.delete(sessionId);
       logIndexingError(sessionId, `incremental index for ${messageId}`, error);
     }).finally(() => {
       pendingIncrementalKeys.delete(key);
@@ -150580,6 +150667,7 @@ function healNullTextColumns(db) {
     ["cache_ttl", ""],
     ["last_nudge_band", ""],
     ["last_nudge_level", ""],
+    ["channel2_nudge_claim_token", ""],
     ["last_transform_error", ""],
     ["nudge_anchor_message_id", ""],
     ["nudge_anchor_text", ""],
@@ -150643,6 +150731,7 @@ function healNullIntegerColumns(db) {
 }
 
 // ../plugin/src/features/magic-context/workspaces.ts
+init_logger();
 import { createHash as createHash2 } from "node:crypto";
 
 // ../plugin/src/features/magic-context/memory/constants.ts
@@ -150693,6 +150782,7 @@ var CATEGORY_DEFAULT_TTL = {
 };
 // ../plugin/src/features/magic-context/workspaces.ts
 var VALID_SHARE_CATEGORIES = new Set(V2_MEMORY_CATEGORIES);
+var DEFAULT_WORKSPACE_SHARE_CATEGORIES = ["CONSTRAINTS"];
 function tableExists(db, tableName) {
   const row = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name = ? LIMIT 1").get(tableName);
   return Boolean(row);
@@ -150707,23 +150797,39 @@ function uniqueSorted(values) {
 function placeholders(values) {
   return values.map(() => "?").join(", ");
 }
+function defaultWorkspaceShareCategories() {
+  return [...DEFAULT_WORKSPACE_SHARE_CATEGORIES];
+}
+function warnInvalidShareCategories(reason, raw) {
+  log("[magic-context] WARN: invalid workspace share_categories; sharing no foreign memory categories", {
+    reason,
+    raw
+  });
+}
 function normalizeShareCategories(raw) {
-  if (raw === null || raw === undefined)
-    return null;
-  if (typeof raw !== "string")
-    return null;
+  if (raw === null || raw === undefined) {
+    return defaultWorkspaceShareCategories();
+  }
+  if (typeof raw !== "string") {
+    warnInvalidShareCategories("not a string", raw);
+    return [];
+  }
   let parsed;
   try {
     parsed = JSON.parse(raw);
   } catch {
-    return null;
+    warnInvalidShareCategories("malformed JSON", raw);
+    return [];
+  }
+  if (!Array.isArray(parsed)) {
+    warnInvalidShareCategories("not a JSON array", raw);
+    return [];
   }
-  if (!Array.isArray(parsed))
-    return null;
   const categories = [];
   for (const value of parsed) {
     if (typeof value !== "string" || !VALID_SHARE_CATEGORIES.has(value)) {
-      return null;
+      warnInvalidShareCategories("unknown category", raw);
+      return [];
     }
     if (!categories.includes(value))
       categories.push(value);
@@ -150732,8 +150838,21 @@ function normalizeShareCategories(raw) {
 }
 function selectWorkspaceShareCategories(db, identities) {
   const candidates = uniqueSorted(identities.filter((identity) => identity.length > 0));
-  if (candidates.length === 0 || !tableExists(db, "workspace_members") || !tableExists(db, "workspaces") || !columnExists(db, "workspaces", "share_categories")) {
+  if (candidates.length === 0 || !tableExists(db, "workspace_members")) {
+    return null;
+  }
+  const hasMembership = Boolean(db.prepare(`SELECT 1
+                   FROM workspace_members
+                  WHERE project_path IN (${placeholders(candidates)})
+                  LIMIT 1`).get(...candidates));
+  if (!hasMembership)
     return null;
+  if (!tableExists(db, "workspaces")) {
+    log("[magic-context] WARN: workspace member has no workspaces table; sharing no foreign memory categories");
+    return [];
+  }
+  if (!columnExists(db, "workspaces", "share_categories")) {
+    return defaultWorkspaceShareCategories();
   }
   const row = db.prepare(`SELECT workspace.share_categories AS shareCategories
                FROM workspace_members AS member
@@ -150741,7 +150860,11 @@ function selectWorkspaceShareCategories(db, identities) {
               WHERE member.project_path IN (${placeholders(candidates)})
               ORDER BY workspace.id ASC
               LIMIT 1`).get(...candidates);
-  return normalizeShareCategories(row?.shareCategories ?? null);
+  if (!row) {
+    log("[magic-context] WARN: workspace member has no workspace share_categories row; sharing no foreign memory categories");
+    return [];
+  }
+  return normalizeShareCategories(row.shareCategories);
 }
 function resolveWorkspaceShareCategories(db, projectIdentity) {
   return selectWorkspaceShareCategories(db, [projectIdentity]);
@@ -150846,7 +150969,7 @@ function computeWorkspaceEpochFingerprint(db, identities) {
   const hash = createHash2("sha256");
   hash.update("share_categories", "utf8");
   hash.update("\x00");
-  hash.update(shareCategories === null ? "ALL" : JSON.stringify(shareCategories), "utf8");
+  hash.update(shareCategories === null ? "NO_WORKSPACE" : JSON.stringify(shareCategories), "utf8");
   hash.update(`
 `);
   for (const identity of canonical) {
@@ -153418,6 +153541,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
     CREATE TABLE IF NOT EXISTS message_history_index (
       session_id TEXT PRIMARY KEY,
       last_indexed_ordinal INTEGER NOT NULL DEFAULT 0,
+      dirty_floor_ordinal INTEGER NOT NULL DEFAULT 0,
       updated_at INTEGER NOT NULL,
       harness TEXT NOT NULL DEFAULT 'opencode'
     );
@@ -153447,6 +153571,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       last_nudge_level TEXT DEFAULT '',
       channel2_nudge_state TEXT DEFAULT '',
       channel2_nudge_claimed_at INTEGER DEFAULT 0,
+      channel2_nudge_claim_token TEXT DEFAULT '',
       last_emergency_input_sample INTEGER DEFAULT 0,
       last_transform_error TEXT DEFAULT '',
       nudge_anchor_message_id TEXT DEFAULT '',
@@ -153693,6 +153818,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "last_nudge_level", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "channel2_nudge_state", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "channel2_nudge_claimed_at", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "channel2_nudge_claim_token", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "last_emergency_input_sample", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
@@ -153905,6 +154031,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
         ON transform_decisions(session_id, harness);
     `);
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "message_history_index", "dirty_floor_ordinal", "INTEGER NOT NULL DEFAULT 0");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "source_contents", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "compartments", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -153920,7 +154047,7 @@ var CHANNEL2_CLAIM_TTL_MS = 120000;
 function healWedgedChannel2Claims(db) {
   try {
     const staleBefore = Date.now() - CHANNEL2_CLAIM_TTL_MS;
-    db.prepare("UPDATE session_meta SET channel2_nudge_state = 'pending', channel2_nudge_claimed_at = 0 WHERE channel2_nudge_state = 'claimed' AND (channel2_nudge_claimed_at IS NULL OR channel2_nudge_claimed_at = 0 OR channel2_nudge_claimed_at <= ?)").run(staleBefore);
+    db.prepare("UPDATE session_meta SET channel2_nudge_state = 'pending', channel2_nudge_claimed_at = 0, channel2_nudge_claim_token = '' WHERE channel2_nudge_state = 'claimed' AND (channel2_nudge_claimed_at IS NULL OR channel2_nudge_claimed_at = 0 OR channel2_nudge_claimed_at <= ?)").run(staleBefore);
   } catch {}
 }
 function openDatabase(dbPathOrOptions) {
@@ -154613,7 +154740,7 @@ function setChannel2NudgeState(db, sessionId, state) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
     const claimedAt = state === "claimed" ? Date.now() : 0;
-    db.prepare("UPDATE session_meta SET channel2_nudge_state = ?, channel2_nudge_claimed_at = ? WHERE session_id = ?").run(state, claimedAt, sessionId);
+    db.prepare("UPDATE session_meta SET channel2_nudge_state = ?, channel2_nudge_claimed_at = ?, channel2_nudge_claim_token = '' WHERE session_id = ?").run(state, claimedAt, sessionId);
   })();
 }
 function casChannel2NudgeState(db, sessionId, from, to) {
@@ -154621,7 +154748,7 @@ function casChannel2NudgeState(db, sessionId, from, to) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
     const claimedAt = to === "claimed" ? Date.now() : 0;
-    const result = db.prepare("UPDATE session_meta SET channel2_nudge_state = ?, channel2_nudge_claimed_at = ? WHERE session_id = ? AND channel2_nudge_state = ?").run(to, claimedAt, sessionId, from);
+    const result = db.prepare("UPDATE session_meta SET channel2_nudge_state = ?, channel2_nudge_claimed_at = ?, channel2_nudge_claim_token = '' WHERE session_id = ? AND channel2_nudge_state = ?").run(to, claimedAt, sessionId, from);
     changed = (result.changes ?? 0) > 0;
   })();
   return changed;
@@ -155029,6 +155156,13 @@ function setSessionWorkMetrics(db, sessionId, newWorkTokens, totalInputTokens) {
          SET new_work_tokens = ?, total_input_tokens = ?
          WHERE session_id = ?`).run(Math.max(0, Math.floor(newWorkTokens)), Math.max(0, Math.floor(totalInputTokens)), sessionId);
 }
+function getSessionWorkMetrics(db, sessionId) {
+  const row = db.prepare("SELECT new_work_tokens, total_input_tokens FROM session_meta WHERE session_id = ?").get(sessionId);
+  return {
+    newWorkTokens: typeof row?.new_work_tokens === "number" ? row.new_work_tokens : 0,
+    totalInputTokens: typeof row?.total_input_tokens === "number" ? row.total_input_tokens : 0
+  };
+}
 // ../plugin/src/features/magic-context/storage-meta-session.ts
 import { Buffer as Buffer3 } from "node:buffer";
 
@@ -156826,8 +156960,31 @@ function clearNoteNudgeTriggerOnly(db, sessionId) {
 
 // ../plugin/src/hooks/magic-context/todo-view.ts
 import { createHash as createHash5 } from "node:crypto";
-var TERMINAL_STATUSES = new Set(["completed", "cancelled"]);
-var TITLE_DONE_STATUSES = new Set(["completed"]);
+var TODO_STATUS_PENDING = "pending";
+var TODO_STATUS_IN_PROGRESS = "in_progress";
+var TODO_STATUS_COMPLETED = "completed";
+var TODO_STATUS_CANCELLED = "cancelled";
+var TODO_PRIORITY_HIGH = "high";
+var TODO_PRIORITY_MEDIUM = "medium";
+var TODO_PRIORITY_LOW = "low";
+var TODO_STATUSES = [
+  TODO_STATUS_PENDING,
+  TODO_STATUS_IN_PROGRESS,
+  TODO_STATUS_COMPLETED,
+  TODO_STATUS_CANCELLED
+];
+var TODO_PRIORITIES = [
+  TODO_PRIORITY_HIGH,
+  TODO_PRIORITY_MEDIUM,
+  TODO_PRIORITY_LOW
+];
+var TODO_STATUS_SET = new Set(TODO_STATUSES);
+var TODO_PRIORITY_SET = new Set(TODO_PRIORITIES);
+var TERMINAL_STATUSES = new Set([
+  TODO_STATUS_COMPLETED,
+  TODO_STATUS_CANCELLED
+]);
+var TITLE_DONE_STATUSES = new Set([TODO_STATUS_COMPLETED]);
 var SYNTHETIC_CALL_ID_PREFIX = "mc_synthetic_todo_";
 function normalizeTodoStateJson(todos) {
   if (!Array.isArray(todos))
@@ -156839,7 +156996,7 @@ function normalizeTodoStateJson(todos) {
     normalized.push({
       content: todo.content,
       status: todo.status,
-      priority: todo.priority ?? "medium"
+      priority: todo.priority ?? TODO_PRIORITY_MEDIUM
     });
   }
   return JSON.stringify(normalized);
@@ -156883,11 +157040,11 @@ function parseTodoState(stateJson) {
     const result = [];
     for (const item of parsed) {
       if (!isTodoItem(item))
-        continue;
+        return null;
       result.push({
         content: item.content,
         status: item.status,
-        priority: item.priority ?? "medium"
+        priority: item.priority ?? TODO_PRIORITY_MEDIUM
       });
     }
     return result;
@@ -156895,11 +157052,17 @@ function parseTodoState(stateJson) {
     return null;
   }
 }
+function isTodoStatus(value) {
+  return typeof value === "string" && TODO_STATUS_SET.has(value);
+}
+function isTodoPriority(value) {
+  return typeof value === "string" && TODO_PRIORITY_SET.has(value);
+}
 function isTodoItem(value) {
   if (value === null || typeof value !== "object")
     return false;
   const todo = value;
-  return typeof todo.content === "string" && typeof todo.status === "string" && (todo.priority === undefined || typeof todo.priority === "string");
+  return typeof todo.content === "string" && isTodoStatus(todo.status) && (todo.priority === undefined || isTodoPriority(todo.priority));
 }
 
 // ../plugin/src/hooks/magic-context/upgrade-reminder.ts
@@ -157979,7 +158142,8 @@ function registerCtxAugCommand(pi, config) {
       const branch = ctx.sessionManager.getBranch();
       const lastEntryId = branch.length > 0 ? branch[branch.length - 1]?.id : "unknown";
       const sessionLabel = `pi-session-${lastEntryId}`;
-      if (!config) {
+      const currentConfig = typeof config === "function" ? config(ctx) : config;
+      if (!currentConfig) {
         ctx.ui.notify("/ctx-aug: Sidekick is not configured. Add `sidekick.model` to your magic-context.jsonc to enable this command.", "warning");
         return;
       }
@@ -157991,20 +158155,20 @@ function registerCtxAugCommand(pi, config) {
         ctx.ui.notify("\uD83D\uDD0D Preparing augmentation… 2-10s depending on your sidekick provider.", "info");
       }
       sessionLog(sessionLabel, "/ctx-aug: spawning sidekick", {
-        model: config.model
+        model: currentConfig.model
       });
       const projectIdentity = resolveProjectIdentity(ctx.cwd);
       sessionLog(sessionLabel, "/ctx-aug: project identity", projectIdentity);
       const result = await runner.run({
         agent: "sidekick",
-        systemPrompt: withContentLanguageDirective(config.systemPrompt ?? SIDEKICK_SYSTEM_PROMPT, config.language),
+        systemPrompt: withContentLanguageDirective(currentConfig.systemPrompt ?? SIDEKICK_SYSTEM_PROMPT, currentConfig.language),
         userMessage: prompt,
-        model: config.model,
-        fallbackModels: config.fallbackModels,
-        timeoutMs: config.timeoutMs ?? 30000,
+        model: currentConfig.model,
+        fallbackModels: currentConfig.fallbackModels,
+        timeoutMs: currentConfig.timeoutMs ?? 30000,
         cwd: ctx.cwd,
         signal: ctx.signal,
-        thinkingLevel: config.thinking_level,
+        thinkingLevel: currentConfig.thinking_level,
         accountingSessionId: sessionLabel,
         accountingSubagent: "sidekick"
       });
@@ -158577,6 +158741,22 @@ function extractLatestAssistantText(messages) {
   return getTextParts(latest).map((part) => part.text).join(`
 `) || null;
 }
+function hasLengthCappedOutput(value) {
+  if (Array.isArray(value))
+    return value.some((item) => hasLengthCappedOutput(item));
+  if (!isRecord(value))
+    return false;
+  if (value.length_capped === true || value.lengthCapped === true)
+    return true;
+  const finishReason = value.finish_reason ?? value.finishReason;
+  if (typeof finishReason === "string") {
+    const normalized = finishReason.toLowerCase();
+    if (normalized === "length" || normalized === "max_tokens" || normalized === "max_output_tokens") {
+      return true;
+    }
+  }
+  return Object.values(value).some((item) => hasLengthCappedOutput(item));
+}
 
 // ../plugin/src/features/magic-context/dreamer/task-executor.ts
 init_logger();
@@ -173234,6 +173414,10 @@ var MagicContextConfigSchema = exports_external.object({
   }).describe("Embedding provider configuration"),
   temporal_awareness: exports_external.boolean().default(true).describe('Inject wall-clock gap markers (<!-- +Xm -->) between user messages where > 5 min elapsed since the previous message, and add start/end date attributes on compartments. Gives the agent a sense of session pacing and "how long ago" across multi-day sessions. Graduated from experimental.temporal_awareness; default: true (set false to opt out).'),
   keep_subagents: exports_external.boolean().default(false).describe("Debug: keep the child sessions Magic Context spawns for its own subagents (historian, dreamer, sidekick, memory-migration) instead of deleting them on success. Useful for short-term inspection/data collection — their full transcript (prompt, tool calls, token usage, output) stays in the host session store. Kept sessions accumulate until manually cleared; leave false for normal use. Requires a restart to take effect."),
+  todowrite: exports_external.object({
+    enabled: exports_external.boolean().default(true).describe("Pi only: register Magic Context's todowrite task-list tool. Disable if you use your own todo extension. OpenCode ships its own built-in todowrite; this setting has no effect there."),
+    overlay: exports_external.boolean().default(true).describe("Pi only: show the persistent todo overlay above the editor while tasks are active.")
+  }).default({ enabled: true, overlay: true }).describe("Pi-only todowrite tool and overlay controls. Pi registers tools and widgets at extension boot, so changing this after /cd requires /reload or restart."),
   smart_drops: exports_external.boolean().default(false).describe("Content-aware reclaim of provably-superseded tool output, layered on the existing execute-pass auto-drop. When on: superseded todowrite (keep newest 1), spent ctx_reduce (keep newest 5), and zero-value meta (bash_status, bash_kill, ctx_note read/dismiss) outputs are dropped; older edits to a file are compressed to a filePath-preserving marker while the newest edit per file stays full. Only acts on passes already busting the cache, so it never originates a cache bust. Honors the protected-tag reserve. Experimental: opt-in, default off until cache stability is proven; when off the wire is byte-identical to the positional-only reclaim. Requires a restart."),
   caveman_text_compression: exports_external.object({
     enabled: exports_external.boolean().default(false).describe("Apply deterministic caveman-style text compression to old conversation text. Active for primary sessions when enabled; never for subagents. Compresses user/assistant text in oldest-first tiers: ultra (oldest 20%), full, lite, untouched (newest 40%)."),
@@ -174625,6 +174809,7 @@ class OpenAICompatibleEmbeddingProvider {
 
 // ../plugin/src/features/magic-context/memory/storage-memory-embeddings.ts
 var saveEmbeddingStatements = new WeakMap;
+var saveEmbeddingIfHashMatchesStatements = new WeakMap;
 var loadAllEmbeddingsStatements = new WeakMap;
 var deleteEmbeddingStatements = new WeakMap;
 var getStoredModelIdStatements = new WeakMap;
@@ -174655,6 +174840,14 @@ function getSaveEmbeddingStatement(db) {
   }
   return stmt;
 }
+function getSaveEmbeddingIfHashMatchesStatement(db) {
+  let stmt = saveEmbeddingIfHashMatchesStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("INSERT INTO memory_embeddings (memory_id, embedding, model_id) SELECT ?, ?, ? FROM memories WHERE id = ? AND normalized_hash = ? ON CONFLICT(memory_id, model_id) DO UPDATE SET embedding = excluded.embedding");
+    saveEmbeddingIfHashMatchesStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getLoadAllEmbeddingsStatement(db) {
   let stmt = loadAllEmbeddingsStatements.get(db);
   if (!stmt) {
@@ -174683,6 +174876,10 @@ function saveEmbedding(db, memoryId, embedding, modelId) {
   const blob = Buffer.from(embedding.buffer, embedding.byteOffset, embedding.byteLength);
   getSaveEmbeddingStatement(db).run(memoryId, blob, modelId);
 }
+function saveEmbeddingIfHashMatches(db, memoryId, embedding, modelId, normalizedHash) {
+  const blob = Buffer.from(embedding.buffer, embedding.byteOffset, embedding.byteLength);
+  return getSaveEmbeddingIfHashMatchesStatement(db).run(memoryId, blob, modelId, memoryId, normalizedHash).changes > 0;
+}
 function loadAllEmbeddings(db, projectPath, modelId) {
   const rows = getLoadAllEmbeddingsStatement(db).all(projectPath, modelId).filter(isEmbeddingRow);
   const embeddings = new Map;
@@ -175543,12 +175740,12 @@ function isUnembeddedMemoryRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const candidate = row;
-  return typeof candidate.id === "number" && typeof candidate.content === "string";
+  return typeof candidate.id === "number" && typeof candidate.content === "string" && typeof candidate.normalized_hash === "string";
 }
 function getLoadUnembeddedMemoriesStatement(db) {
   let stmt = loadUnembeddedMemoriesStatements.get(db);
   if (!stmt) {
-    stmt = db.prepare("SELECT m.id AS id, m.content AS content FROM memories m LEFT JOIN memory_embeddings me ON m.id = me.memory_id AND me.model_id = ? WHERE m.project_path = ? AND m.status = 'active' AND me.memory_id IS NULL LIMIT ?");
+    stmt = db.prepare("SELECT m.id AS id, m.content AS content, m.normalized_hash AS normalized_hash FROM memories m LEFT JOIN memory_embeddings me ON m.id = me.memory_id AND me.model_id = ? WHERE m.project_path = ? AND m.status = 'active' AND me.memory_id IS NULL LIMIT ?");
     loadUnembeddedMemoriesStatements.set(db, stmt);
   }
   return stmt;
@@ -175571,8 +175768,9 @@ async function embedUnembeddedMemoriesForProject(db, projectIdentity, batchSize
         const embedding = result.vectors[index];
         if (!embedding)
           continue;
-        saveEmbedding(db, memory.id, embedding, result.modelId);
-        embeddedCount += 1;
+        if (saveEmbeddingIfHashMatches(db, memory.id, embedding, result.modelId, memory.normalized_hash)) {
+          embeddedCount += 1;
+        }
       }
     })();
     return embeddedCount;
@@ -176274,25 +176472,33 @@ function getMemoryCountsByStatusStatement(db) {
   }
   return stmt;
 }
-function insertMemory(db, input) {
-  const now = Date.now();
-  const normalizedHash = computeNormalizedHash(input.content);
+function buildInsertMemoryValues(input, normalizedHash, now, includeImportance) {
   const insertValues = [
     input.projectPath,
     input.category,
     input.content,
     normalizedHash
   ];
-  if (hasMemoryImportanceColumn(db)) {
+  if (includeImportance) {
     insertValues.push(input.importance ?? 50);
   }
   insertValues.push(input.sourceSessionId ?? null, input.sourceType ?? "historian", 1, 0, now, now, now, now, null, "active", input.expiresAt ?? null, "unverified", null, null, null, input.metadataJson ?? null);
-  const result = getInsertMemoryStatement(db).run(...insertValues);
-  const insertedResult = result;
-  const inserted = getMemoryById(db, Number(insertedResult.lastInsertRowid));
+  return insertValues;
+}
+function loadInsertedMemory(db, rowid) {
+  const inserted = getMemoryById(db, Number(rowid));
   if (!inserted) {
     throw new Error("Failed to load inserted memory row");
   }
+  return inserted;
+}
+function insertMemory(db, input) {
+  const now = Date.now();
+  const normalizedHash = computeNormalizedHash(input.content);
+  const insertValues = buildInsertMemoryValues(input, normalizedHash, now, hasMemoryImportanceColumn(db));
+  const result = getInsertMemoryStatement(db).run(...insertValues);
+  const insertedResult = result;
+  const inserted = loadInsertedMemory(db, insertedResult.lastInsertRowid);
   invalidateProject(input.projectPath);
   return inserted;
 }
@@ -176773,9 +176979,11 @@ import path7 from "node:path";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
 var GIT_TIMEOUT_MS2 = 1e4;
+var defaultExecFileForVerificationPaths = async (file2, args, options) => await execFileAsync(file2, [...args], options);
+var execFileForVerificationPaths = defaultExecFileForVerificationPaths;
 async function runGit(cwd, args) {
   try {
-    const result = await execFileAsync("git", [...args], {
+    const result = await execFileForVerificationPaths("git", args, {
       cwd,
       timeout: GIT_TIMEOUT_MS2,
       maxBuffer: 16 * 1024 * 1024,
@@ -177084,6 +177292,14 @@ function renewLease(db, holderId, leaseKey = DREAMING_LEASE_KEY) {
     return true;
   });
 }
+function runLeaseGuardedWrite(db, holderId, leaseKey, fn) {
+  return runImmediate2(db, () => {
+    if (!peekLeaseHolderAndExpiry(db, holderId, leaseKey)) {
+      throw new Error("Dream lease lost before guarded write");
+    }
+    return fn();
+  });
+}
 var LEASE_HEARTBEAT_INTERVAL_MS = 60 * 1000;
 function startLeaseHeartbeat(db, holderId, leaseKey, onLost, intervalMs = LEASE_HEARTBEAT_INTERVAL_MS) {
   let lost = false;
@@ -177878,6 +178094,39 @@ function hasShareabilitySensitiveText(text) {
   }
 }
 
+// ../plugin/src/features/magic-context/dreamer/manifest-parser.ts
+function extractCompleteManifestBody(text, rootName) {
+  const escapedRoot = rootName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const rootMatch = new RegExp(`<${escapedRoot}\\b[^>]*>([\\s\\S]*?)<\\/${escapedRoot}>`, "i").exec(text);
+  if (rootMatch)
+    return rootMatch[1];
+  const hasOpenRoot = new RegExp(`<${escapedRoot}\\b`, "i").test(text);
+  const hasCloseRoot = new RegExp(`<\\/${escapedRoot}>`, "i").test(text);
+  if (hasOpenRoot && !hasCloseRoot) {
+    throw new Error(`${rootName} manifest missing closing root tag`);
+  }
+  throw new Error(`${rootName} manifest missing complete root element`);
+}
+function assertNoDuplicateManifestIds(ids, rootName) {
+  const seen = new Set;
+  for (const id of ids) {
+    if (seen.has(id))
+      throw new Error(`${rootName} manifest contains duplicate id ${id}`);
+    seen.add(id);
+  }
+}
+function assertManifestCoversExactly(ids, expectedIds, rootName) {
+  assertNoDuplicateManifestIds(ids, rootName);
+  for (const id of ids) {
+    if (!expectedIds.has(id))
+      throw new Error(`${rootName} manifest contains unknown id ${id}`);
+  }
+  for (const id of expectedIds) {
+    if (!ids.includes(id))
+      throw new Error(`${rootName} manifest missing id ${id}`);
+  }
+}
+
 // ../plugin/src/features/magic-context/dreamer/classify-prompt.ts
 var SCORING_GUIDANCE = `### How to score importance (1-100)
 Importance decides which memories survive when the injected memory block is over budget: high scores stay in context, low scores drop first. So the score is only useful if it **discriminates** — if most memories land in the same band, you have not classified them, you have just labelled them.
@@ -177944,14 +178193,15 @@ ${renderPool(args.memories)}`;
 var SCOPES = new Set(["project", "ecosystem", "universe"]);
 function parseClassifyManifest(text) {
   const out = [];
-  for (const m of text.matchAll(/<memory\b([^>]*)\/?>/g)) {
+  const body = extractCompleteManifestBody(text, "classify");
+  for (const m of body.matchAll(/<memory\b([^>]*)\/?>/g)) {
     const attrs = m[1];
     const idMatch = attrs.match(/\bid\s*=\s*"(\d+)"/);
     if (!idMatch)
-      continue;
+      throw new Error("classify manifest entry missing numeric id");
     const id = Number.parseInt(idMatch[1], 10);
     if (!Number.isInteger(id))
-      continue;
+      throw new Error("classify manifest entry missing numeric id");
     const entry = { id };
     const impMatch = attrs.match(/\bimportance\s*=\s*"(\d+)"/);
     if (impMatch) {
@@ -177960,18 +178210,23 @@ function parseClassifyManifest(text) {
         entry.importance = Math.max(1, Math.min(100, imp));
     }
     const scopeMatch = attrs.match(/\bscope\s*=\s*"([a-z]+)"/i);
-    if (scopeMatch && SCOPES.has(scopeMatch[1].toLowerCase())) {
-      entry.scope = scopeMatch[1].toLowerCase();
+    if (scopeMatch) {
+      const scope = scopeMatch[1].toLowerCase();
+      if (!SCOPES.has(scope))
+        throw new Error(`classify manifest invalid scope ${scope}`);
+      entry.scope = scope;
     }
     const shareMatch = attrs.match(/\bshareable\s*=\s*"(true|false|1|0)"/i);
     if (shareMatch) {
       const v = shareMatch[1].toLowerCase();
       entry.shareable = v === "true" || v === "1";
     }
-    if (entry.importance !== undefined || entry.scope || entry.shareable !== undefined) {
-      out.push(entry);
+    if (entry.importance === undefined && !entry.scope && entry.shareable === undefined) {
+      throw new Error(`classify manifest entry ${id} missing classification fields`);
     }
+    out.push(entry);
   }
+  assertNoDuplicateManifestIds(out.map((entry) => entry.id), "classify");
   return out;
 }
 
@@ -178106,9 +178361,13 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
         });
       },
       validateOutput: (messages) => {
+        if (hasLengthCappedOutput(messages)) {
+          throw new Error("classify returned length-capped output");
+        }
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("classify returned no output");
+        parseClassifyManifest(text);
         return text;
       }
     });
@@ -178134,17 +178393,13 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
 }
 function applyClassifications(args, chunk, manifestText) {
   const byId = new Map(chunk.map((m) => [m.id, m]));
-  const parsed = parseClassifyManifest(manifestText).filter((p) => byId.has(p.id));
+  const parsed = parseClassifyManifest(manifestText);
+  assertManifestCoversExactly(parsed.map((entry) => entry.id), new Set(byId.keys()), "classify");
   if (parsed.length === 0)
     return { classified: 0, changed: 0 };
   let classified = 0;
   let changed = 0;
-  let leaseLost = false;
-  args.db.transaction(() => {
-    if (!peekLeaseHolderAndExpiry(args.db, args.holderId, args.leaseKey)) {
-      leaseLost = true;
-      return;
-    }
+  runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
     for (const p of parsed) {
       const memory = byId.get(p.id);
       if (!memory)
@@ -178159,9 +178414,7 @@ function applyClassifications(args, chunk, manifestText) {
       if (didChange)
         changed += 1;
     }
-  })();
-  if (leaseLost)
-    throw new Error("Dream lease lost during classify commit");
+  });
   return { classified, changed };
 }
 function recordInvocation(args, startedAt, params) {
@@ -178209,9 +178462,11 @@ var SMART_NOTE_CHECK_LIVENESS_RECHECK_MS = 24 * 60 * 60 * 1000;
 
 class SmartNoteNetworkError extends Error {
   isSmartNoteNetworkError = true;
-  constructor(message) {
+  terminal;
+  constructor(message, options = {}) {
     super(message);
     this.name = "SmartNoteNetworkError";
+    this.terminal = options.terminal ?? false;
   }
 }
 
@@ -178225,6 +178480,9 @@ class SmartNoteSecurityError extends Error {
 function isSmartNoteNetworkError(error51) {
   return error51 instanceof SmartNoteNetworkError || error51 instanceof Error && (error51.name === "SmartNoteNetworkError" || error51.message.includes("SmartNoteNetworkError") || error51.message.includes("SMART_NOTE_NETWORK"));
 }
+function isTerminalSmartNoteNetworkError(error51) {
+  return error51 instanceof SmartNoteNetworkError && error51.terminal;
+}
 function parseSmartNoteManifest(json2) {
   if (!json2)
     return { capabilities: [] };
@@ -178254,6 +178512,7 @@ function stringArray(value) {
 var DNS_TIMEOUT_MS = 3000;
 var DEFAULT_HTTP_TIMEOUT_MS = 5000;
 var DEFAULT_HTTP_BODY_LIMIT_BYTES = 64 * 1024;
+var MAX_HTTP_ADDRESS_CANDIDATES = 4;
 var defaultResolver = {
   async lookup(hostname3, signal) {
     return await withAbortAndTimeout(dnsLookup(hostname3, { all: true, verbatim: true }), signal, DNS_TIMEOUT_MS, "DNS lookup timed out").then((rows) => rows.filter((row) => row.family === 4 || row.family === 6).map((row) => ({ address: row.address, family: row.family })));
@@ -178290,18 +178549,21 @@ async function guardedSmartNoteHttpGet(input, options) {
   });
   const timeoutMs = options.timeoutMs ?? DEFAULT_HTTP_TIMEOUT_MS;
   const bodyLimitBytes = options.bodyLimitBytes ?? DEFAULT_HTTP_BODY_LIMIT_BYTES;
+  const requestAddress = options.requestAddress ?? requestValidatedAddress;
+  const candidates = validation.addresses.slice(0, MAX_HTTP_ADDRESS_CANDIDATES);
   let lastError;
-  for (const candidate of validation.addresses) {
+  for (const candidate of candidates) {
     try {
-      return await requestValidatedAddress(validation, candidate, {
+      return await requestAddress(validation, candidate, {
         signal: options.signal,
         timeoutMs,
         bodyLimitBytes
       });
     } catch (error51) {
       lastError = error51;
-      if (error51 instanceof SmartNoteSecurityError || options.signal.aborted)
+      if (error51 instanceof SmartNoteSecurityError || options.signal.aborted || isTerminalSmartNoteNetworkError(error51)) {
         throw error51;
+      }
     }
   }
   throw toNetworkError(lastError, "all validated addresses failed");
@@ -178371,7 +178633,9 @@ function requestValidatedAddress(validation, candidate, options) {
         const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
         bytes += buf.byteLength;
         if (bytes > options.bodyLimitBytes) {
-          request2.destroy(new SmartNoteNetworkError("SMART_NOTE_NETWORK: response body too large"));
+          reject(new SmartNoteNetworkError("SMART_NOTE_NETWORK: response body too large", { terminal: true }));
+          response.destroy();
+          request2.destroy();
           return;
         }
         chunks.push(buf);
@@ -178388,10 +178652,16 @@ function requestValidatedAddress(validation, candidate, options) {
         resolve({ status, body: Buffer.concat(chunks).toString("utf8") });
       });
     });
-    const onAbort = () => request2.destroy(new SmartNoteNetworkError("SMART_NOTE_NETWORK: aborted"));
+    const onAbort = () => {
+      reject(new SmartNoteNetworkError("SMART_NOTE_NETWORK: aborted"));
+      request2.destroy();
+    };
     options.signal.addEventListener("abort", onAbort, { once: true });
     request2.on("timeout", () => {
-      request2.destroy(new SmartNoteNetworkError("SMART_NOTE_NETWORK: request timed out"));
+      reject(new SmartNoteNetworkError("SMART_NOTE_NETWORK: request timed out", {
+        terminal: true
+      }));
+      request2.destroy();
     });
     request2.on("error", (error51) => {
       options.signal.removeEventListener("abort", onAbort);
@@ -178739,6 +179009,20 @@ function withSandboxLock(fn) {
 var DEFAULT_TIMEOUT_MS = 2000;
 var DEFAULT_HEAP_LIMIT_BYTES = 8 * 1024 * 1024;
 var DEFAULT_STACK_LIMIT_BYTES = 512 * 1024;
+function resolveCapabilitiesForRun(options, signal) {
+  if (options.capabilityFactory) {
+    return options.capabilityFactory(signal);
+  }
+  if (options.capabilities) {
+    return options.capabilities;
+  }
+  throw new Error("smart-note check requires capabilities");
+}
+function throwIfRunAborted(signal) {
+  if (signal.aborted) {
+    throw signal.reason ?? new Error("smart-note check aborted");
+  }
+}
 async function runCompiledSmartNoteCheck(options) {
   return withSandboxLock(() => runCompiledSmartNoteCheckLocked(options));
 }
@@ -178746,17 +179030,24 @@ async function runCompiledSmartNoteCheckLocked(options) {
   const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const controller = new AbortController;
   const externalAbort = () => controller.abort(options.signal?.reason);
-  options.signal?.addEventListener("abort", externalAbort, { once: true });
+  if (options.signal?.aborted) {
+    externalAbort();
+  } else {
+    options.signal?.addEventListener("abort", externalAbort, { once: true });
+  }
   const timer = setTimeout(() => controller.abort(new Error("smart-note check timed out")), timeoutMs);
   try {
+    throwIfRunAborted(controller.signal);
+    const capabilities = resolveCapabilitiesForRun(options, controller.signal);
     const deadline = Date.now() + timeoutMs;
     const quickjs = await getAsyncModule();
+    throwIfRunAborted(controller.signal);
     const context = quickjs.newContext();
     try {
       context.runtime.setMemoryLimit(options.heapLimitBytes ?? DEFAULT_HEAP_LIMIT_BYTES);
       context.runtime.setMaxStackSize(options.stackLimitBytes ?? DEFAULT_STACK_LIMIT_BYTES);
       context.runtime.setInterruptHandler(() => controller.signal.aborted || Date.now() > deadline);
-      installCapabilityObject(context, options.capabilities);
+      installCapabilityObject(context, capabilities);
       disableAmbientDynamicCode(context);
       const result = await evalCheck(context, options.compiledCheck);
       const checkResult = result;
@@ -178909,6 +179200,7 @@ Remember: output only the JSON object described by the system prompt.`;
       }
     }, {
       timeoutMs: remainingMs,
+      signal: args.signal,
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:smart-note-compiler",
       fetchOutput: async () => {
@@ -178933,7 +179225,8 @@ Remember: output only the JSON object described by the system prompt.`;
     }
     const dryRun = await runCompiledSmartNoteCheck({
       compiledCheck,
-      capabilities: args.capabilities,
+      capabilityFactory: args.capabilityFactory,
+      signal: args.signal,
       timeoutMs: 2000
     });
     if (!dryRun.ok) {
@@ -179081,7 +179374,9 @@ function nextSmartNoteCheckDueAt(cron, options = {}) {
   const rawNext = cron?.trim() ? nextDueAtMs(cron, now) : null;
   const rawDelta = rawNext ? rawNext - now : SMART_NOTE_CHECK_DEFAULT_INTERVAL_MS;
   const clamped = Math.min(ceilingMs, Math.max(floorMs, rawDelta));
-  return now + clamped + deterministicJitterMs(clamped, options.noteId, options.hash);
+  const jittered = clamped + deterministicJitterMs(clamped, options.noteId, options.hash);
+  const bounded = Math.min(ceilingMs, Math.max(floorMs, jittered));
+  return now + bounded;
 }
 function deterministicJitterMs(intervalMs, noteId, hash2) {
   const max = Math.min(60000, Math.floor(intervalMs * 0.1));
@@ -179250,9 +179545,9 @@ async function runDueCompiledSmartNoteChecks(args) {
     try {
       const result = await runCompiledSmartNoteCheck({
         compiledCheck: note.compiledCheck,
-        capabilities: createSmartNoteCapabilities({
+        capabilityFactory: (signal) => createSmartNoteCapabilities({
           projectRoot: args.projectRoot,
-          signal: controller.signal
+          signal
         }),
         signal: controller.signal,
         timeoutMs: Math.min(2000, remaining)
@@ -179315,6 +179610,24 @@ var MAX_COMPILE_PER_RUN = 5;
 var MAX_FALLBACK_PER_RUN = 3;
 var MAX_COMPILATION_FAILURES = 3;
 var SMART_NOTE_CONFIRMATION_SYSTEM_PROMPT = 'You are a no-tool smart-note confirmation evaluator. Output only JSON shaped as {"met": boolean}. Return true only when the supplied text alone proves the condition is satisfied.';
+function createPromptAbortSignal(parent, timeoutMs, timeoutMessage) {
+  const controller = new AbortController;
+  const abortFromParent = () => {
+    controller.abort(parent.reason ?? new Error("smart-note prompt aborted by lease loss"));
+  };
+  if (parent.aborted)
+    abortFromParent();
+  else
+    parent.addEventListener("abort", abortFromParent, { once: true });
+  const timer = setTimeout(() => controller.abort(new Error(timeoutMessage)), timeoutMs);
+  return {
+    signal: controller.signal,
+    cleanup: () => {
+      clearTimeout(timer);
+      parent.removeEventListener("abort", abortFromParent);
+    }
+  };
+}
 async function evaluateSmartNotes(args) {
   const projectRoot = args.sessionDirectory ?? args.projectIdentity;
   const pendingAtStart = getPendingSmartNotes(args.db, args.projectIdentity).length;
@@ -179323,6 +179636,7 @@ async function evaluateSmartNotes(args) {
     return { surfaced: 0, pending: 0, ran: false };
   }
   let leaseLost = false;
+  const leaseAbortController = new AbortController;
   const leaseHeld = () => !leaseLost && peekLeaseHolderAndExpiry(args.db, args.holderId, args.leaseKey);
   const assertLeaseHeld = (phase) => {
     if (!leaseHeld()) {
@@ -179332,6 +179646,7 @@ async function evaluateSmartNotes(args) {
   };
   const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => {
     leaseLost = true;
+    leaseAbortController.abort(new Error("Dream lease lost during smart notes"));
     log("[dreamer] smart notes: lease lost — aborting");
     args.onLeaseLost?.("smart notes");
   });
@@ -179354,7 +179669,7 @@ async function evaluateSmartNotes(args) {
         break;
       assertLeaseHeld("compile start");
       didWork = true;
-      const compiled = await compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld);
+      const compiled = await compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld, leaseAbortController.signal);
       if (compiled)
         surfaced += 1;
     }
@@ -179374,7 +179689,7 @@ async function evaluateSmartNotes(args) {
         break;
       assertLeaseHeld("fallback start");
       didWork = true;
-      const met = await confirmReadOnly(args, note.id, note.content, note.surfaceCondition);
+      const met = await confirmReadOnly(args, note.id, note.content, note.surfaceCondition, leaseAbortController.signal);
       const now = Date.now();
       assertLeaseHeld("fallback commit");
       commitSmartNoteState(args.db, {
@@ -179400,9 +179715,8 @@ async function evaluateSmartNotes(args) {
     heartbeat.stop();
   }
 }
-async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld) {
-  const controller = new AbortController;
-  const timer = setTimeout(() => controller.abort(new Error("smart-note compile deadline")), Math.max(1000, args.deadline - Date.now()));
+async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld, leaseSignal) {
+  const promptSignal = createPromptAbortSignal(leaseSignal, Math.max(1000, args.deadline - Date.now()), "smart-note compile deadline");
   try {
     const result = await compileSmartNoteCheck({
       client: args.client,
@@ -179411,7 +179725,8 @@ async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld)
       sessionDirectory: args.sessionDirectory,
       projectIdentity: args.projectIdentity,
       note,
-      capabilities: createSmartNoteCapabilities({ projectRoot, signal: controller.signal }),
+      capabilityFactory: (signal) => createSmartNoteCapabilities({ projectRoot, signal }),
+      signal: promptSignal.signal,
       deadline: args.deadline,
       model: args.model,
       fallbackModels: args.fallbackModels
@@ -179456,7 +179771,7 @@ async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld)
     });
     return result.dryRun.met;
   } finally {
-    clearTimeout(timer);
+    promptSignal.cleanup();
   }
 }
 async function runLivenessCheck(args, note, projectRoot, assertLeaseHeld, leaseHeld) {
@@ -179467,7 +179782,7 @@ async function runLivenessCheck(args, note, projectRoot, assertLeaseHeld, leaseH
   try {
     const result = await runCompiledSmartNoteCheck({
       compiledCheck: note.compiledCheck,
-      capabilities: createSmartNoteCapabilities({ projectRoot, signal: controller.signal }),
+      capabilityFactory: (signal) => createSmartNoteCapabilities({ projectRoot, signal }),
       signal: controller.signal,
       timeoutMs: 2000
     });
@@ -179496,7 +179811,7 @@ async function runLivenessCheck(args, note, projectRoot, assertLeaseHeld, leaseH
     clearTimeout(timer);
   }
 }
-async function confirmReadOnly(args, noteId, content, surfaceCondition) {
+async function confirmReadOnly(args, noteId, content, surfaceCondition, leaseSignal) {
   let childSessionId = null;
   const startedAt = Date.now();
   let invocationRecorded = false;
@@ -179539,42 +179854,49 @@ Note content: ${JSON.stringify(content)}
 Surface condition: ${JSON.stringify(surfaceCondition ?? "")}
 
 Output exactly JSON: {"met": false}`;
-    const run = await promptSyncWithValidatedOutputRetry(args.client, {
-      path: { id: childSessionId },
-      query: { directory: args.sessionDirectory ?? args.projectIdentity },
-      body: {
-        agent: SMART_NOTE_COMPILER_AGENT,
-        system: SMART_NOTE_CONFIRMATION_SYSTEM_PROMPT,
-        ...modelBodyField(args.model),
-        parts: [{ type: "text", text: prompt, synthetic: true }]
-      }
-    }, {
-      timeoutMs: Math.max(1000, args.deadline - Date.now()),
-      fallbackModels: args.fallbackModels,
-      callContext: "dreamer:smart-note-read-only-confirm",
-      fetchOutput: async () => {
-        const messagesResponse = await args.client.session.messages({
-          path: { id: childSessionId },
-          query: {
-            directory: args.sessionDirectory ?? args.projectIdentity,
-            limit: 20
-          }
-        });
-        return normalizeSDKResponse(messagesResponse, [], {
-          preferResponseOnMissingData: true
-        });
-      },
-      validateOutput: (messages) => {
-        const text = extractLatestAssistantText(messages) ?? "";
-        const match = text.match(/\{[\s\S]*\}/);
-        if (!match)
-          throw new Error("confirmation evaluator returned no JSON");
-        const parsed = JSON.parse(match[0]);
-        if (typeof parsed.met !== "boolean")
-          throw new Error("confirmation met missing");
-        return parsed.met;
-      }
-    });
+    const promptSignal = createPromptAbortSignal(leaseSignal, Math.max(1000, args.deadline - Date.now()), "smart-note confirmation deadline");
+    let run;
+    try {
+      run = await promptSyncWithValidatedOutputRetry(args.client, {
+        path: { id: childSessionId },
+        query: { directory: args.sessionDirectory ?? args.projectIdentity },
+        body: {
+          agent: SMART_NOTE_COMPILER_AGENT,
+          system: SMART_NOTE_CONFIRMATION_SYSTEM_PROMPT,
+          ...modelBodyField(args.model),
+          parts: [{ type: "text", text: prompt, synthetic: true }]
+        }
+      }, {
+        timeoutMs: Math.max(1000, args.deadline - Date.now()),
+        signal: promptSignal.signal,
+        fallbackModels: args.fallbackModels,
+        callContext: "dreamer:smart-note-read-only-confirm",
+        fetchOutput: async () => {
+          const messagesResponse = await args.client.session.messages({
+            path: { id: childSessionId },
+            query: {
+              directory: args.sessionDirectory ?? args.projectIdentity,
+              limit: 20
+            }
+          });
+          return normalizeSDKResponse(messagesResponse, [], {
+            preferResponseOnMissingData: true
+          });
+        },
+        validateOutput: (messages) => {
+          const text = extractLatestAssistantText(messages) ?? "";
+          const match = text.match(/\{[\s\S]*\}/);
+          if (!match)
+            throw new Error("confirmation evaluator returned no JSON");
+          const parsed = JSON.parse(match[0]);
+          if (typeof parsed.met !== "boolean")
+            throw new Error("confirmation met missing");
+          return parsed.met;
+        }
+      });
+    } finally {
+      promptSignal.cleanup();
+    }
     recordInvocation2({ status: "completed", messages: run.output });
     return run.validated;
   } catch (error51) {
@@ -179789,19 +180111,21 @@ ${list}
 }
 function parseMapMemoriesManifest(text) {
   const out = [];
-  for (const m of text.matchAll(/<memory\b([^>]*)\/?>/g)) {
+  const body = extractCompleteManifestBody(text, "mappings");
+  for (const m of body.matchAll(/<memory\b([^>]*)\/?>/g)) {
     const attrs = m[1];
     const idMatch = attrs.match(/\bid\s*=\s*"(\d+)"/);
     if (!idMatch)
-      continue;
+      throw new Error("mappings manifest entry missing numeric id");
     const id = Number.parseInt(idMatch[1], 10);
     if (!Number.isInteger(id))
-      continue;
+      throw new Error("mappings manifest entry missing numeric id");
     const independent = /\bindependent\s*=\s*"(?:true|1)"/i.test(attrs);
     const filesMatch = attrs.match(/\bfiles\s*=\s*"([^"]*)"/);
     const files = filesMatch ? filesMatch[1].split(",").map((f) => f.trim()).filter(Boolean) : [];
     out.push({ id, files, independent: independent || files.length === 0 });
   }
+  assertNoDuplicateManifestIds(out.map((entry) => entry.id), "mappings");
   return out;
 }
 
@@ -179890,9 +180214,13 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         });
       },
       validateOutput: (messages) => {
+        if (hasLengthCappedOutput(messages)) {
+          throw new Error("map-memories returned length-capped output");
+        }
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("map-memories returned no output");
+        parseMapMemoriesManifest(text);
         return text;
       }
     });
@@ -179918,7 +180246,8 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
 }
 async function applyBatchMappings(args, batch, manifestText) {
   const batchIds = new Set(batch.map((m) => m.id));
-  const parsed = parseMapMemoriesManifest(manifestText).filter((p) => batchIds.has(p.id));
+  const parsed = parseMapMemoriesManifest(manifestText);
+  assertManifestCoversExactly(parsed.map((entry) => entry.id), batchIds, "mappings");
   if (parsed.length === 0)
     return { mapped: 0, independent: 0 };
   const planned = [];
@@ -179940,12 +180269,7 @@ async function applyBatchMappings(args, batch, manifestText) {
   const now = Date.now();
   let mapped = 0;
   let independent = 0;
-  let leaseLost = false;
-  args.db.transaction(() => {
-    if (!peekLeaseHolderAndExpiry(args.db, args.holderId, args.leaseKey)) {
-      leaseLost = true;
-      return;
-    }
+  runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
     for (const item of planned) {
       recordMemoryMapping(args.db, item.id, item.files, now);
       if (item.independent)
@@ -179953,9 +180277,7 @@ async function applyBatchMappings(args, batch, manifestText) {
       else
         mapped += 1;
     }
-  })();
-  if (leaseLost)
-    throw new Error("Dream lease lost during map-memories commit");
+  });
   return { mapped, independent };
 }
 function recordInvocation2(args, startedAt, params) {
@@ -180183,11 +180505,7 @@ async function promotePrimers(args) {
       activePrimers: primers,
       threshold: PRIMER_CLUSTER_THRESHOLD
     });
-    args.db.transaction(() => {
-      if (!peekLeaseHolderAndExpiry(args.db, args.holderId, args.leaseKey)) {
-        leaseLost = true;
-        return;
-      }
+    runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
       for (const cluster of clusters) {
         if (cluster.candidates.length === 0)
           continue;
@@ -180218,7 +180536,7 @@ async function promotePrimers(args) {
         });
         result.promoted += 1;
       }
-    })();
+    });
     if (leaseLost)
       throw new Error("Dream lease lost during promote-primers commit");
     log(`[dreamer] primers: candidates=${result.candidates} promoted=${result.promoted} updated=${result.updated}`);
@@ -180486,16 +180804,9 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
       log(`[dreamer] refresh-primers: primer #${primer.id} answer not committed (no investigation tool calls)`);
       return false;
     }
-    let leaseLost = false;
-    args.db.transaction(() => {
-      if (!peekLeaseHolderAndExpiry(args.db, args.holderId, args.leaseKey)) {
-        leaseLost = true;
-        return;
-      }
+    runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
       updatePrimerAnswer(args.db, primer.id, answer);
-    })();
-    if (leaseLost)
-      throw new Error("Dream lease lost during refresh-primers commit");
+    });
     return true;
   } catch (error51) {
     const desc = describeError(error51);
@@ -180692,8 +181003,7 @@ class OpenCodeRetrospectiveRawProvider {
                    LEFT JOIN session_meta m ON m.session_id = sp.session_id
                   WHERE sp.project_path = ? AND sp.harness = 'opencode'
                     AND COALESCE(m.is_subagent, 0) = 0
-                  ORDER BY sp.updated_at DESC, sp.session_id DESC
-                  LIMIT ?`).all(projectIdentity, RETROSPECTIVE_MAX_SESSIONS_PER_RUN);
+                  ORDER BY sp.updated_at ASC, sp.session_id ASC`).all(projectIdentity);
     return rows.map((row) => ({
       sessionId: row.session_id,
       updatedAt: typeof row.updated_at === "number" ? row.updated_at : undefined
@@ -180718,6 +181028,12 @@ class OpenCodeRetrospectiveRawProvider {
       return { messages: [], truncated: false };
     }
   }
+  readOldestMessageTimesSince(sessionIds, sinceMs) {
+    const db = this.resolveDb();
+    if (!db || sessionIds.length === 0)
+      return new Map;
+    return readOpenCodeOldestMessageTimesSince(db, sessionIds, sinceMs);
+  }
   readUserMessagesBefore(sessionId, beforeMs, count) {
     const db = this.resolveDb();
     if (!db)
@@ -180739,13 +181055,28 @@ class OpenCodeRetrospectiveRawProvider {
 async function readRetrospectiveScanWindow(provider2, projectIdentity, watermarkMs, overlapUserCount, options) {
   const maxMessages = options?.maxMessagesPerRun ?? RETROSPECTIVE_MAX_MESSAGES_PER_RUN;
   const capPerSession = options?.capPerSession ?? RETROSPECTIVE_MAX_MESSAGES_PER_SESSION;
-  const sessionReadPageSize = Math.max(1, Math.floor(options?.maxSessionsPerRun ?? RETROSPECTIVE_MAX_SESSIONS_PER_RUN));
+  const sessionLimit = Math.max(1, Math.floor(options?.maxSessionsPerRun ?? RETROSPECTIVE_MAX_SESSIONS_PER_RUN));
   try {
-    const sessions = await provider2.listProjectSessions(projectIdentity);
+    const allSessions = await provider2.listProjectSessions(projectIdentity);
+    const eligibleSessions = allSessions.map((session, index) => ({ session, index })).filter(({ session }) => (session.updatedAt ?? Number.POSITIVE_INFINITY) > watermarkMs);
+    const oldestBySession = provider2.readOldestMessageTimesSince ? await provider2.readOldestMessageTimesSince(eligibleSessions.map(({ session }) => session.sessionId), watermarkMs) : null;
+    const sessions = (oldestBySession ? eligibleSessions.filter(({ session }) => oldestBySession.has(session.sessionId)) : eligibleSessions).sort((a, b) => {
+      const aFrontier = oldestBySession?.get(a.session.sessionId);
+      const bFrontier = oldestBySession?.get(b.session.sessionId);
+      if (aFrontier !== undefined || bFrontier !== undefined) {
+        return (aFrontier ?? Number.POSITIVE_INFINITY) - (bFrontier ?? Number.POSITIVE_INFINITY) || a.index - b.index;
+      }
+      const aUpdated = a.session.updatedAt ?? Number.POSITIVE_INFINITY;
+      const bUpdated = b.session.updatedAt ?? Number.POSITIVE_INFINITY;
+      const byUpdated = aUpdated - bUpdated;
+      return byUpdated || a.index - b.index;
+    });
+    const sessionsToRead = sessions.slice(0, sessionLimit).map(({ session }) => session);
+    const firstExcludedSession = sessions[sessionLimit]?.session;
+    const firstExcludedPendingTs = firstExcludedSession ? oldestBySession?.get(firstExcludedSession.sessionId) : undefined;
     const sinceReads = [];
-    for (let i = 0;i < sessions.length; i += sessionReadPageSize) {
-      const page = sessions.slice(i, i + sessionReadPageSize);
-      sinceReads.push(...await Promise.all(page.map((session) => provider2.readUserMessagesSince(session.sessionId, watermarkMs, capPerSession))));
+    if (sessionsToRead.length > 0) {
+      sinceReads.push(...await Promise.all(sessionsToRead.map((session) => provider2.readUserMessagesSince(session.sessionId, watermarkMs, capPerSession))));
     }
     let saturatedFrontier = Number.POSITIVE_INFINITY;
     for (const read of sinceReads) {
@@ -180767,9 +181098,14 @@ async function readRetrospectiveScanWindow(provider2, projectIdentity, watermark
     if (firstDropped) {
       frontier = Math.min(frontier, firstDropped.ts - 1);
     }
+    if (typeof firstExcludedPendingTs === "number") {
+      frontier = Math.min(frontier, firstExcludedPendingTs - 1);
+    } else if (typeof firstExcludedSession?.updatedAt === "number") {
+      frontier = Math.min(frontier, firstExcludedSession.updatedAt - 1);
+    }
     maxScannedTs = Math.max(watermarkMs, Math.min(maxScannedTs, frontier));
     const keptSessionIds = new Set(keptSince.map((message) => message.sessionId));
-    const overlapSessions = sessions.filter((session) => keptSessionIds.has(session.sessionId));
+    const overlapSessions = sessionsToRead.filter((session) => keptSessionIds.has(session.sessionId));
     const overlapBatches = overlapUserCount > 0 && watermarkMs > 0 ? await Promise.all(overlapSessions.map((session) => provider2.readUserMessagesBefore(session.sessionId, watermarkMs, overlapUserCount))) : [];
     const seen = new Set;
     const merged = [];
@@ -180797,6 +181133,24 @@ function readOpenCodeMessagesSince(db, sessionId, sinceMs, capPerSession) {
   const kept = truncated ? rows.slice(0, limit) : rows;
   return { messages: normalizeOpenCodeRows(db, sessionId, kept), truncated };
 }
+function readOpenCodeOldestMessageTimesSince(db, sessionIds, sinceMs) {
+  const result = new Map;
+  const uniqueIds = Array.from(new Set(sessionIds.filter((id) => id.length > 0)));
+  const chunkSize = 500;
+  for (let i = 0;i < uniqueIds.length; i += chunkSize) {
+    const chunk = uniqueIds.slice(i, i + chunkSize);
+    const placeholders4 = chunk.map(() => "?").join(", ");
+    const rows = db.prepare(`SELECT session_id, MIN(time_created) AS oldest_ts
+                   FROM message
+                  WHERE time_created > ? AND session_id IN (${placeholders4})
+                  GROUP BY session_id`).all(sinceMs, ...chunk);
+    for (const row of rows) {
+      if (typeof row.oldest_ts === "number")
+        result.set(row.session_id, row.oldest_ts);
+    }
+  }
+  return result;
+}
 function readOpenCodeUserMessagesBefore(db, sessionId, beforeMs, count) {
   const want = Math.max(1, Math.floor(count));
   const window = Math.max(want * 5, 32);
@@ -181089,7 +181443,7 @@ async function partitionVerifyScope(args) {
       continue;
     }
     const files = v?.files ?? [];
-    const needs = files.some((file2) => !verificationFileExists(gitRoot, file2) || uncommitted.has(file2) || (changeTimes.get(file2) ?? 0) > verifiedAt);
+    const needs = files.some((file2) => !verificationFileExists(gitRoot, file2) || uncommitted.has(file2) || (changeTimes.get(file2) ?? 0) >= verifiedAt - 1000);
     if (needs)
       inScope.push(toPrompt(m));
     else
@@ -181155,22 +181509,26 @@ function filesOf(s) {
 }
 function parseVerifyManifest(text) {
   const out = { verified: [], updated: [], archived: [] };
-  for (const m of text.matchAll(/<verified\b([^>]*)\/?>/g)) {
+  const body = extractCompleteManifestBody(text, "verify");
+  for (const m of body.matchAll(/<verified\b([^>]*)\/?>/g)) {
     const id = Number.parseInt(attrOf(m[1], "id") ?? "", 10);
-    if (Number.isInteger(id))
-      out.verified.push({ id, files: filesOf(m[1]) });
+    if (!Number.isInteger(id))
+      throw new Error("verify manifest entry missing numeric id");
+    out.verified.push({ id, files: filesOf(m[1]) });
   }
-  for (const m of text.matchAll(/<update\b([^>]*?)(?:\/>|>([\s\S]*?)<\/update>)/g)) {
+  for (const m of body.matchAll(/<update\b([^>]*?)(?:\/>|>([\s\S]*?)<\/update>)/g)) {
     const id = Number.parseInt(attrOf(m[1], "id") ?? "", 10);
-    if (Number.isInteger(id)) {
-      out.updated.push({ id, files: filesOf(m[1]), content: (m[2] ?? "").trim() });
-    }
+    if (!Number.isInteger(id))
+      throw new Error("verify manifest entry missing numeric id");
+    out.updated.push({ id, files: filesOf(m[1]), content: (m[2] ?? "").trim() });
   }
-  for (const m of text.matchAll(/<archive\b([^>]*)\/?>/g)) {
+  for (const m of body.matchAll(/<archive\b([^>]*)\/?>/g)) {
     const id = Number.parseInt(attrOf(m[1], "id") ?? "", 10);
-    if (Number.isInteger(id))
-      out.archived.push({ id, reason: attrOf(m[1], "reason") ?? "" });
+    if (!Number.isInteger(id))
+      throw new Error("verify manifest entry missing numeric id");
+    out.archived.push({ id, reason: attrOf(m[1], "reason") ?? "" });
   }
+  assertNoDuplicateManifestIds([...out.verified, ...out.updated, ...out.archived].map((entry) => entry.id), "verify");
   return out;
 }
 
@@ -181263,9 +181621,13 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         });
       },
       validateOutput: (messages) => {
+        if (hasLengthCappedOutput(messages)) {
+          throw new Error("verify returned length-capped output");
+        }
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("verify returned no output");
+        parseVerifyManifest(text);
         return text;
       }
     });
@@ -181292,24 +181654,14 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
 async function applyVerifyManifest(args, batch, manifestText) {
   const batchIds = new Set(batch.map((m) => m.id));
   const parsed = parseVerifyManifest(manifestText);
+  assertManifestCoversExactly([...parsed.verified, ...parsed.updated, ...parsed.archived].map((entry) => entry.id), batchIds, "verify");
   const now = Date.now();
   const writes = [];
-  const verdictCounts = new Map;
-  for (const verdict of [...parsed.verified, ...parsed.updated, ...parsed.archived]) {
-    if (!batchIds.has(verdict.id))
-      continue;
-    verdictCounts.set(verdict.id, (verdictCounts.get(verdict.id) ?? 0) + 1);
-  }
-  const conflictingIds = new Set(Array.from(verdictCounts.entries()).filter(([, count]) => count !== 1).map(([id]) => id));
   for (const v of parsed.verified) {
-    if (!batchIds.has(v.id) || conflictingIds.has(v.id))
-      continue;
     const files = await normalizeFiles(args, v.files);
     writes.push({ kind: "verify", id: v.id, files });
   }
   for (const u of parsed.updated) {
-    if (!batchIds.has(u.id) || conflictingIds.has(u.id))
-      continue;
     const content = u.content.trim();
     if (!content || content.length > 20000) {
       const files2 = await normalizeFiles(args, u.files);
@@ -181326,8 +181678,6 @@ async function applyVerifyManifest(args, batch, manifestText) {
     });
   }
   for (const a of parsed.archived) {
-    if (!batchIds.has(a.id) || conflictingIds.has(a.id))
-      continue;
     writes.push({ kind: "archive", id: a.id, reason: a.reason });
   }
   if (writes.length === 0)
@@ -181335,12 +181685,7 @@ async function applyVerifyManifest(args, batch, manifestText) {
   let verified = 0;
   let updated = 0;
   let archived = 0;
-  let leaseLost = false;
-  args.db.transaction(() => {
-    if (!peekLeaseHolderAndExpiry(args.db, args.holderId, args.leaseKey)) {
-      leaseLost = true;
-      return;
-    }
+  runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
     for (const w of writes) {
       const memory = getMemoryById(args.db, w.id);
       if (!isPrimaryMutable(memory))
@@ -181368,9 +181713,7 @@ async function applyVerifyManifest(args, batch, manifestText) {
         archived += 1;
       }
     }
-  })();
-  if (leaseLost)
-    throw new Error("Dream lease lost during verify commit");
+  });
   return { verified, updated, archived };
 }
 async function normalizeFiles(args, rawFiles) {
@@ -181864,11 +182207,7 @@ async function runRetrospectiveTask(config2, ctx, helpers) {
       throw new Error("Dream lease lost during retrospective");
     const sourceSessionId = flagged[0]?.sessionId ?? userMessages[0]?.sessionId ?? "retrospective";
     const learnings = parseRetrospectiveLearnings(deepenRun.validated);
-    const applied = db.transaction(() => {
-      if (!peekLeaseHolderAndExpiry(db, holderId, leaseKey)) {
-        leaseLost = true;
-        return null;
-      }
+    const applied = runLeaseGuardedWrite(db, holderId, leaseKey, () => {
       const result = applyRetrospectiveLearnings({
         db,
         projectIdentity,
@@ -181879,7 +182218,7 @@ async function runRetrospectiveTask(config2, ctx, helpers) {
       });
       recordRetrospectiveWindowProcessed(db, projectIdentity, windowKey);
       return result;
-    })();
+    });
     if (leaseLost || !applied)
       throw new Error("Dream lease lost during retrospective commit");
     log(`[dreamer] retrospective: flagged=${flagged.length} learnings=${learnings.length} memory=${applied.memoryWritten} observations=${applied.observationsInserted} dropped=${applied.observationsDropped} rejected=${applied.rejected.length}`);
@@ -183414,11 +183753,106 @@ function migrateLegacyExperimental(rawConfig, warnings) {
 
 // ../plugin/src/config/project-security.ts
 var HIDDEN_AGENT_KEYS = ["historian", "dreamer", "sidekick"];
+var HISTORIAN_USER_ONLY_FIELDS = ["model", "fallback_models"];
 var AGENT_ESCALATION_FIELDS = ["prompt", "permission", "tools", "system_prompt"];
 var EMBEDDING_DESTINATION_FIELDS = ["endpoint", "provider"];
+var PERCENTAGE_THRESHOLD_REASON = "security: a repository may only raise compaction thresholds above the user's effective value; it cannot force earlier historian work or cloned-repo cost escalation.";
+var TOKEN_THRESHOLD_REASON = "security: a repository may only raise execute_threshold_tokens above the user's trusted token threshold; it cannot force earlier historian work or cloned-repo cost escalation.";
+var TOKEN_THRESHOLD_INTRODUCTION_REASON = "security: a repository cannot introduce a new execute_threshold_tokens override when the user has no trusted token threshold for that key; that could force earlier historian work or cloned-repo cost escalation.";
 function isPlainObject3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isValidPercentageThreshold(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 20 && value <= 80;
+}
+function isValidTokenThreshold(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 5000 && value <= 2000000;
+}
+function normalizeTrustedPercentageThresholds(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return { defaultValue: value, overrides: new Map };
+  }
+  if (isPlainObject3(value) && typeof value.default === "number" && Number.isFinite(value.default)) {
+    const overrides = new Map;
+    for (const [key, child] of Object.entries(value)) {
+      if (key === "default")
+        continue;
+      if (typeof child === "number" && Number.isFinite(child)) {
+        overrides.set(key, child);
+      }
+    }
+    return { defaultValue: value.default, overrides };
+  }
+  return { defaultValue: DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, overrides: new Map };
+}
+function normalizeTrustedTokenThresholds(value) {
+  if (!isPlainObject3(value)) {
+    return { defaultValue: undefined, overrides: new Map };
+  }
+  const overrides = new Map;
+  for (const [key, child] of Object.entries(value)) {
+    if (key === "default")
+      continue;
+    if (typeof child === "number" && Number.isFinite(child)) {
+      overrides.set(key, child);
+    }
+  }
+  return {
+    defaultValue: typeof value.default === "number" && Number.isFinite(value.default) ? value.default : undefined,
+    overrides
+  };
+}
+function clonePercentageThresholds(value) {
+  return {
+    defaultValue: value.defaultValue,
+    overrides: new Map(value.overrides)
+  };
+}
+function cloneTokenThresholds(value) {
+  return {
+    defaultValue: value.defaultValue,
+    overrides: new Map(value.overrides)
+  };
+}
+function percentageThresholdsEqual(left, right) {
+  if (left.defaultValue !== right.defaultValue)
+    return false;
+  if (left.overrides.size !== right.overrides.size)
+    return false;
+  for (const [key, value] of left.overrides) {
+    if (right.overrides.get(key) !== value)
+      return false;
+  }
+  return true;
+}
+function setMergedPercentageThreshold(mergedRaw, value) {
+  if (value.overrides.size === 0) {
+    mergedRaw.execute_threshold_percentage = value.defaultValue;
+    return;
+  }
+  const serialized = { default: value.defaultValue };
+  for (const [key, threshold] of value.overrides) {
+    serialized[key] = threshold;
+  }
+  mergedRaw.execute_threshold_percentage = serialized;
+}
+function setMergedTokenThreshold(mergedRaw, value) {
+  if (value.defaultValue === undefined && value.overrides.size === 0) {
+    delete mergedRaw.execute_threshold_tokens;
+    return;
+  }
+  const serialized = {};
+  if (value.defaultValue !== undefined) {
+    serialized.default = value.defaultValue;
+  }
+  for (const [key, threshold] of value.overrides) {
+    serialized[key] = threshold;
+  }
+  mergedRaw.execute_threshold_tokens = serialized;
+}
+function makeProjectThresholdWarning(field, reason) {
+  return `Ignoring ${field} from project config (${reason})`;
+}
 function stripUnsafeProjectConfigFields(projectRaw) {
   const warnings = [];
   if ("auto_update" in projectRaw) {
@@ -183446,6 +183880,19 @@ function stripUnsafeProjectConfigFields(projectRaw) {
       warnings.push(`Ignoring embedding.${removed.join("/")} from project config ` + "(security: a repository cannot choose where private text is embedded).");
     }
   }
+  const historian = projectRaw.historian;
+  if (isPlainObject3(historian)) {
+    const removed = [];
+    for (const field of HISTORIAN_USER_ONLY_FIELDS) {
+      if (field in historian) {
+        delete historian[field];
+        removed.push(field);
+      }
+    }
+    if (removed.length > 0) {
+      warnings.push(`Ignoring historian.${removed.join("/")} from project config ` + "(security: historian model selection is user-level only; a repository cannot force extra compaction cost).");
+    }
+  }
   for (const agentKey of HIDDEN_AGENT_KEYS) {
     const block = projectRaw[agentKey];
     if (!isPlainObject3(block))
@@ -183463,6 +183910,101 @@ function stripUnsafeProjectConfigFields(projectRaw) {
   }
   return warnings;
 }
+function constrainProjectThresholdOverrides(args) {
+  const warnings = [];
+  const basePercentage = normalizeTrustedPercentageThresholds(args.trustedBaseConfig.execute_threshold_percentage);
+  const baseTokens = normalizeTrustedTokenThresholds(args.trustedBaseConfig.execute_threshold_tokens);
+  if ("execute_threshold_percentage" in args.projectRaw) {
+    const projectValue = args.projectRaw.execute_threshold_percentage;
+    if (isValidPercentageThreshold(projectValue)) {
+      const constrained = clonePercentageThresholds(basePercentage);
+      constrained.defaultValue = Math.max(basePercentage.defaultValue, projectValue);
+      for (const [modelKey, threshold] of basePercentage.overrides) {
+        const raisedThreshold = Math.max(threshold, projectValue);
+        if (raisedThreshold === constrained.defaultValue) {
+          constrained.overrides.delete(modelKey);
+        } else {
+          constrained.overrides.set(modelKey, raisedThreshold);
+        }
+      }
+      setMergedPercentageThreshold(args.mergedRaw, constrained);
+      if (percentageThresholdsEqual(constrained, basePercentage)) {
+        warnings.push(makeProjectThresholdWarning("execute_threshold_percentage", PERCENTAGE_THRESHOLD_REASON));
+      }
+    } else if (isPlainObject3(projectValue)) {
+      const constrained = clonePercentageThresholds(basePercentage);
+      let touchedValidEntry = false;
+      if (isValidPercentageThreshold(projectValue.default)) {
+        touchedValidEntry = true;
+        if (projectValue.default > basePercentage.defaultValue) {
+          constrained.defaultValue = projectValue.default;
+        } else {
+          warnings.push(makeProjectThresholdWarning("execute_threshold_percentage.default", PERCENTAGE_THRESHOLD_REASON));
+        }
+      }
+      for (const [modelKey, rawValue] of Object.entries(projectValue)) {
+        if (modelKey === "default")
+          continue;
+        if (!isValidPercentageThreshold(rawValue))
+          continue;
+        touchedValidEntry = true;
+        const baseValue = basePercentage.overrides.get(modelKey) ?? basePercentage.defaultValue;
+        if (rawValue > baseValue) {
+          if (rawValue === constrained.defaultValue) {
+            constrained.overrides.delete(modelKey);
+          } else {
+            constrained.overrides.set(modelKey, rawValue);
+          }
+        } else {
+          warnings.push(makeProjectThresholdWarning(`execute_threshold_percentage.${modelKey}`, PERCENTAGE_THRESHOLD_REASON));
+        }
+      }
+      if (touchedValidEntry) {
+        setMergedPercentageThreshold(args.mergedRaw, constrained);
+      }
+    }
+  }
+  if ("execute_threshold_tokens" in args.projectRaw && isPlainObject3(args.projectRaw.execute_threshold_tokens)) {
+    const projectValue = args.projectRaw.execute_threshold_tokens;
+    const constrained = cloneTokenThresholds(baseTokens);
+    let touchedValidEntry = false;
+    if (isValidTokenThreshold(projectValue.default)) {
+      touchedValidEntry = true;
+      if (baseTokens.defaultValue === undefined) {
+        warnings.push(makeProjectThresholdWarning("execute_threshold_tokens.default", TOKEN_THRESHOLD_INTRODUCTION_REASON));
+      } else if (projectValue.default > baseTokens.defaultValue) {
+        constrained.defaultValue = projectValue.default;
+      } else {
+        warnings.push(makeProjectThresholdWarning("execute_threshold_tokens.default", TOKEN_THRESHOLD_REASON));
+      }
+    }
+    for (const [modelKey, rawValue] of Object.entries(projectValue)) {
+      if (modelKey === "default")
+        continue;
+      if (!isValidTokenThreshold(rawValue))
+        continue;
+      touchedValidEntry = true;
+      const baseValue = baseTokens.overrides.get(modelKey) ?? baseTokens.defaultValue;
+      if (baseValue === undefined) {
+        warnings.push(makeProjectThresholdWarning(`execute_threshold_tokens.${modelKey}`, TOKEN_THRESHOLD_INTRODUCTION_REASON));
+        continue;
+      }
+      if (rawValue > baseValue) {
+        if (rawValue === constrained.defaultValue) {
+          constrained.overrides.delete(modelKey);
+        } else {
+          constrained.overrides.set(modelKey, rawValue);
+        }
+      } else {
+        warnings.push(makeProjectThresholdWarning(`execute_threshold_tokens.${modelKey}`, TOKEN_THRESHOLD_REASON));
+      }
+    }
+    if (touchedValidEntry) {
+      setMergedTokenThreshold(args.mergedRaw, constrained);
+    }
+  }
+  return warnings;
+}
 function normalizeEndpoint3(value) {
   if (typeof value !== "string")
     return;
@@ -183830,6 +184372,7 @@ function loadPiConfig(opts = {}) {
     return a.scope === "user" ? -1 : 1;
   });
   const userRaw = mergeFiles.find((f) => f.scope === "user")?.config;
+  const trustedBaseConfig = parsePiConfig(userRaw ?? {}).config;
   for (const loaded of mergeFiles) {
     const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
     warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
@@ -183842,6 +184385,13 @@ function loadPiConfig(opts = {}) {
       for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, userRaw)) {
         warnings.push(`${prefix} ${warning}`);
       }
+      for (const warning of constrainProjectThresholdOverrides({
+        mergedRaw: rawConfig,
+        projectRaw,
+        trustedBaseConfig
+      })) {
+        warnings.push(`${prefix} ${warning}`);
+      }
     } else {
       rawConfig = mergeRawConfigs(rawConfig, loaded.config);
     }
@@ -183940,6 +184490,7 @@ function loadPiConfigDetailed(opts = {}) {
     return a.scope === "user" ? -1 : 1;
   });
   const userRaw = mergeFiles.find((f) => f.scope === "user")?.config;
+  const trustedBaseConfig = parsePiConfig(userRaw ?? {}).config;
   for (const loaded of mergeFiles) {
     const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
     warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
@@ -183952,6 +184503,13 @@ function loadPiConfigDetailed(opts = {}) {
       for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, userRaw)) {
         warnings.push(`${prefix} ${warning}`);
       }
+      for (const warning of constrainProjectThresholdOverrides({
+        mergedRaw: rawConfig,
+        projectRaw,
+        trustedBaseConfig
+      })) {
+        warnings.push(`${prefix} ${warning}`);
+      }
     } else {
       rawConfig = mergeRawConfigs(rawConfig, loaded.config);
     }
@@ -184030,6 +184588,8 @@ function isMidTurnPi(event, _sessionId) {
   }
   if (latestAssistant === null)
     return false;
+  if (hasRealUserAfter(messages, latestAssistantIndex))
+    return false;
   if (latestAssistant.stopReason === "toolUse")
     return true;
   const toolCallIds = getToolCallIds(latestAssistant.content);
@@ -184052,6 +184612,15 @@ function isMidTurnPi(event, _sessionId) {
   }
   return false;
 }
+function hasRealUserAfter(messages, latestAssistantIndex) {
+  for (const msg of messages.slice(latestAssistantIndex + 1)) {
+    if (msg === null || typeof msg !== "object")
+      continue;
+    if (msg.role === "user")
+      return true;
+  }
+  return false;
+}
 function getToolCallIds(content) {
   const ids = new Set;
   if (!Array.isArray(content))
@@ -184374,7 +184943,7 @@ class PiRetrospectiveRawProvider {
         updatedAt: typeof info.modified === "number" ? info.modified : undefined
       });
     }
-    return result.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
+    return result.sort((a, b) => (a.updatedAt ?? 0) - (b.updatedAt ?? 0));
   }
   async readUserMessagesSince(sessionId, sinceMs, capPerSession) {
     const all = await this.loadUserEntries(sessionId);
@@ -184385,6 +184954,15 @@ class PiRetrospectiveRawProvider {
       truncated: eligible.length > limit
     };
   }
+  async readOldestMessageTimesSince(sessionIds, sinceMs) {
+    const out = new Map;
+    for (const sessionId of sessionIds) {
+      const oldest = (await this.loadUserEntries(sessionId)).filter((message) => message.ts > sinceMs).sort((a, b) => a.ts - b.ts || a.ordinal - b.ordinal)[0];
+      if (oldest)
+        out.set(sessionId, oldest.ts);
+    }
+    return out;
+  }
   async readUserMessagesBefore(sessionId, beforeMs, count) {
     const all = await this.loadUserEntries(sessionId);
     return all.filter((entry) => entry.ts <= beforeMs).sort((a, b) => a.ts - b.ts || a.ordinal - b.ordinal).slice(-Math.max(1, Math.floor(count)));
@@ -184714,6 +185292,7 @@ function registerCtxDreamCommand(pi, deps) {
         projectDir: deps.projectDir,
         projectIdentity: deps.projectIdentity
       };
+      const dreamerEnabled = deps.resolveDreamerEnabled?.(ctx) ?? deps.dreamerEnabled;
       deps.onProjectSeen?.(project.projectIdentity);
       const requested = typeof args === "string" ? args.trim() : String(args ?? "").trim();
       let task;
@@ -184733,7 +185312,7 @@ Unknown task "${requested}".`,
         }
         task = requested;
       }
-      if (deps.dreamerEnabled === false) {
+      if (dreamerEnabled === false) {
         sendCtxStatusMessage(pi, {
           title: "/ctx-dream",
           text: "## /ctx-dream\n\nDreamer is disabled for this project (`dreamer.disable=true`).",
@@ -184848,6 +185427,8 @@ function formatEmbedStatusText(coverage, drain) {
 }
 
 // src/commands/ctx-embed.ts
+var EMBED_PROGRESS_COMPARTMENT_STEP = 8;
+var EMBED_PROGRESS_MIN_INTERVAL_MS = 1e4;
 function clearPiEmbedSessionState(sessionId) {
   embedPauseBySession.delete(sessionId);
   const ctrl = embedRunStateBySession.get(sessionId);
@@ -184857,7 +185438,7 @@ function clearPiEmbedSessionState(sessionId) {
   }
   autoEmbedAttemptedBySession.delete(sessionId);
 }
-async function runEmbedDrain(db, projectIdentity, sessionId) {
+async function runEmbedDrain(db, projectIdentity, sessionId, options = {}) {
   const activeCtrl = embedRunStateBySession.get(sessionId);
   if (activeCtrl && !activeCtrl.signal.aborted) {
     return {
@@ -184873,10 +185454,46 @@ Embedding is already running for this session.`,
     prior.abort();
   const controller = new AbortController;
   embedRunStateBySession.set(sessionId, controller);
+  const now = options.now ?? Date.now;
+  let startEmitted = false;
+  let lastProgressEmbedded = 0;
+  let lastProgressAt = 0;
+  const emitProgress = (progress) => {
+    if (progress.total <= 0)
+      return;
+    if (!startEmitted) {
+      startEmitted = true;
+      lastProgressAt = now();
+      options.onStatus?.({
+        text: `## /ctx-embed
+
+Embedding ${progress.total} compartment${progress.total === 1 ? "" : "s"} of history…`,
+        level: "info"
+      });
+      return;
+    }
+    if (progress.embedded <= 0 || progress.embedded >= progress.total)
+      return;
+    const currentTime = now();
+    const enoughCompartments = progress.embedded - lastProgressEmbedded >= EMBED_PROGRESS_COMPARTMENT_STEP;
+    const enoughTime = currentTime - lastProgressAt >= EMBED_PROGRESS_MIN_INTERVAL_MS && progress.embedded > lastProgressEmbedded;
+    if (!enoughCompartments && !enoughTime)
+      return;
+    lastProgressEmbedded = progress.embedded;
+    lastProgressAt = currentTime;
+    options.onStatus?.({
+      text: `## /ctx-embed
+
+Embedded ${progress.embedded}/${progress.total} compartments so far…`,
+      level: "info"
+    });
+  };
   let outcome;
   try {
     outcome = await embedSessionCompartmentChunks(db, projectIdentity, sessionId, {
-      signal: controller.signal
+      signal: controller.signal,
+      onProgress: emitProgress,
+      ...options.batchSize !== undefined ? { batchSize: options.batchSize } : {}
     });
   } finally {
     if (embedRunStateBySession.get(sessionId) === controller) {
@@ -184949,6 +185566,7 @@ No active Pi session is available.`,
         projectDir: deps.projectDir,
         projectIdentity: deps.projectIdentity
       };
+      const memoryEnabled = deps.resolveMemoryEnabled?.(ctx) ?? deps.memoryEnabled;
       const sub = args.trim().toLowerCase();
       if (sub === "pause") {
         embedPauseBySession.add(sessionId);
@@ -184965,7 +185583,7 @@ Paused at ${cov.session.embedded}/${cov.session.total} compartments embedded.`,
         });
         return;
       }
-      if (deps.memoryEnabled === false) {
+      if (memoryEnabled === false) {
         sendCtxStatusMessage(pi, {
           title: "/ctx-embed",
           text: `## /ctx-embed
@@ -184977,7 +185595,12 @@ Memory is disabled for this project, so there is no semantic embedding to backfi
       }
       await ensureProjectRegisteredFromPiDirectory(project.projectDir, deps.db);
       if (sub === "start") {
-        const { text, level } = await runEmbedDrain(deps.db, project.projectIdentity, sessionId);
+        const { text, level } = await runEmbedDrain(deps.db, project.projectIdentity, sessionId, {
+          onStatus: (status) => sendCtxStatusMessage(pi, {
+            title: "/ctx-embed",
+            ...status
+          })
+        });
         sendCtxStatusMessage(pi, { title: "/ctx-embed", text, level });
         return;
       }
@@ -186099,6 +186722,8 @@ init_logger();
 // ../plugin/src/hooks/magic-context/read-session-true-raw-tokens.ts
 var MAX_MESSAGE_CACHE_ENTRIES = 1e5;
 var MAX_MESSAGE_CACHE_KEY_BYTES = 64 * 1024 * 1024;
+var FNV1A_32_OFFSET = 2166136261;
+var FNV1A_32_PRIME = 16777619;
 var messageEstimateCache = new Map;
 var messageEstimateCacheBytes = 0;
 var EMPTY_BREAKDOWN = {
@@ -186201,6 +186826,23 @@ function recursiveByteLength(value) {
   }
   return String(value).length;
 }
+function updateFnv1a32(hash2, text) {
+  let next = hash2;
+  for (let index = 0;index < text.length; index += 1) {
+    next ^= text.charCodeAt(index);
+    next = Math.imul(next, FNV1A_32_PRIME) >>> 0;
+  }
+  return next;
+}
+function contentStringsHash(fields) {
+  let hash2 = FNV1A_32_OFFSET;
+  for (const field of fields) {
+    hash2 = updateFnv1a32(hash2, `${field.length}:`);
+    hash2 = updateFnv1a32(hash2, field);
+    hash2 = updateFnv1a32(hash2, "\x00");
+  }
+  return hash2.toString(16).padStart(8, "0");
+}
 function rawPartVersion(part) {
   return part.__magicContextPartUpdatedAt ?? part.updated_at ?? part.updatedAt ?? part.version ?? part.revision ?? "";
 }
@@ -186548,13 +187190,12 @@ function buildTrueRawTokenIndex(sessionId, messages, options) {
 function partContentFingerprint(part) {
   if (!isRecord(part))
     return `${typeof part}:${recursiveByteLength(part)}`;
-  const type = partType(part);
   const tool = toolSignalFromPart(part);
   if (tool) {
-    return `${type}:${tool.callId}:${tool.inputText.length}:${tool.outputText.length}`;
+    return contentStringsHash([tool.inputText, tool.outputText]);
   }
   const text = firstStringField(part, ["text", "thinking", "reasoning", "content", "url"]) ?? "";
-  return `${type}:${text.length}`;
+  return contentStringsHash([text]);
 }
 function computeRawRangeFingerprint(messages, startInclusive, endExclusive) {
   const pieces = [];
@@ -188010,6 +188651,11 @@ function renderMemoryBlockV2(memories, wrapper = "project-memory", renderOptions
 `);
 }
 
+// ../plugin/src/hooks/magic-context/sentinel.ts
+function modelAcceptsEmptyContent(providerID) {
+  return providerID === "anthropic";
+}
+
 // ../plugin/src/hooks/magic-context/supersession-reclaim.ts
 var TODOWRITE_KEEP = 1;
 var CTX_REDUCE_KEEP = 5;
@@ -188806,24 +189452,46 @@ function getMessageSearchStatementWithCutoff(db) {
   return stmt;
 }
 var ftsRowCountStatements = new WeakMap;
+var ftsRowCountStatementsWithCutoff = new WeakMap;
 var ftsMatchCountStatements = new WeakMap;
-function getSessionFtsRowCount(db, sessionId) {
-  let stmt = ftsRowCountStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT COUNT(*) AS n FROM message_history_fts WHERE session_id = ?");
-    ftsRowCountStatements.set(db, stmt);
-  }
-  const row = stmt.get(sessionId);
+var ftsMatchCountStatementsWithCutoff = new WeakMap;
+function getSessionFtsRowCount(db, sessionId, cutoff) {
+  const stmt = cutoff === null ? (() => {
+    let cached2 = ftsRowCountStatements.get(db);
+    if (!cached2) {
+      cached2 = db.prepare("SELECT COUNT(*) AS n FROM message_history_fts WHERE session_id = ?");
+      ftsRowCountStatements.set(db, cached2);
+    }
+    return cached2;
+  })() : (() => {
+    let cached2 = ftsRowCountStatementsWithCutoff.get(db);
+    if (!cached2) {
+      cached2 = db.prepare("SELECT COUNT(*) AS n FROM message_history_fts WHERE session_id = ? AND CAST(message_ordinal AS INTEGER) <= ?");
+      ftsRowCountStatementsWithCutoff.set(db, cached2);
+    }
+    return cached2;
+  })();
+  const row = cutoff === null ? stmt.get(sessionId) : stmt.get(sessionId, cutoff);
   return typeof row?.n === "number" ? row.n : 0;
 }
-function countSessionFtsMatches(db, sessionId, ftsQuery) {
-  let stmt = ftsMatchCountStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT COUNT(*) AS n FROM message_history_fts WHERE session_id = ? AND message_history_fts MATCH ?");
-    ftsMatchCountStatements.set(db, stmt);
-  }
+function countSessionFtsMatches(db, sessionId, ftsQuery, cutoff) {
+  const stmt = cutoff === null ? (() => {
+    let cached2 = ftsMatchCountStatements.get(db);
+    if (!cached2) {
+      cached2 = db.prepare("SELECT COUNT(*) AS n FROM message_history_fts WHERE session_id = ? AND message_history_fts MATCH ?");
+      ftsMatchCountStatements.set(db, cached2);
+    }
+    return cached2;
+  })() : (() => {
+    let cached2 = ftsMatchCountStatementsWithCutoff.get(db);
+    if (!cached2) {
+      cached2 = db.prepare("SELECT COUNT(*) AS n FROM message_history_fts WHERE session_id = ? AND message_history_fts MATCH ? AND CAST(message_ordinal AS INTEGER) <= ?");
+      ftsMatchCountStatementsWithCutoff.set(db, cached2);
+    }
+    return cached2;
+  })();
   try {
-    const row = stmt.get(sessionId, ftsQuery);
+    const row = cutoff === null ? stmt.get(sessionId, ftsQuery) : stmt.get(sessionId, ftsQuery, cutoff);
     return typeof row?.n === "number" ? row.n : 0;
   } catch {
     return 0;
@@ -189073,7 +189741,7 @@ function searchMessages(args) {
       role: row.role
     }));
   }
-  const corpusSize = getSessionFtsRowCount(args.db, args.sessionId);
+  const corpusSize = getSessionFtsRowCount(args.db, args.sessionId, cutoff);
   const queryLists = [];
   if (baseQuery.length > 0) {
     queryLists.push({
@@ -189086,7 +189754,7 @@ function searchMessages(args) {
     const probeQuery = sanitizeFtsQuery(probe);
     if (probeQuery.length === 0)
       continue;
-    const df = countSessionFtsMatches(args.db, args.sessionId, probeQuery);
+    const df = countSessionFtsMatches(args.db, args.sessionId, probeQuery, cutoff);
     const weight = probeDiscriminationWeight(df, corpusSize);
     probeWeights.set(probe, weight);
     queryLists.push({
@@ -190510,8 +191178,8 @@ function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config2, pr
       sessionLog(sessionId, `emergency tiered drop skipped: ${plan.reason}`);
     }
   }
-  const staleReduce = collectStaleReduceCallIds(piMessages, buildMessageIdToMaxTagFromTargets(targets), toolAgeCutoff, resolveStableId);
-  if (staleReduce.composite.size > 0 || staleReduce.bareCallIds.size > 0) {
+  const staleReduce = config2.staleReduceStripEnabled ? collectStaleReduceCallIds(piMessages, buildMessageIdToMaxTagFromTargets(targets), toolAgeCutoff, resolveStableId) : { composite: new Set, bareCallIds: new Set };
+  if (config2.staleReduceStripEnabled && (staleReduce.composite.size > 0 || staleReduce.bareCallIds.size > 0)) {
     db.transaction(() => {
       for (const tag of tags) {
         if (tag.status !== "active")
@@ -194792,8 +195460,122 @@ function buildReferenceBlocks(args) {
 init_logger();
 var HISTORIAN_AGENT_NAME = "magic-context-historian";
 var DEFAULT_HISTORIAN_TIMEOUT_MS2 = 120000;
+var MAX_HISTORIAN_RETRIES = 2;
 var HISTORIAN_ALERT_COOLDOWN_MS = 60 * 1000;
 var lastHistorianAlertBySession = new Map;
+function getHistorianRetryBackoffMs(retryIndex) {
+  if (retryIndex === 0) {
+    return 2000 + Math.floor(Math.random() * 1001);
+  }
+  return 6000 + Math.floor(Math.random() * 2001);
+}
+function isTransientHistorianPromptError(message) {
+  const normalized = message.toLowerCase();
+  if (normalized.includes("invalid request") || normalized.includes("bad request") || normalized.includes("unauthorized") || normalized.includes("forbidden") || normalized.includes("authentication") || normalized.includes("auth") || normalized.includes(" 400") || normalized.startsWith("400")) {
+    return false;
+  }
+  return [
+    "429",
+    "rate limit",
+    "timeout",
+    "econnreset",
+    "etimedout",
+    "503",
+    "502",
+    "500",
+    "overloaded"
+  ].some((token) => normalized.includes(token));
+}
+function isTransientHistorianRunFailure(result) {
+  if (result.reason === "abort")
+    return false;
+  if (result.reason === "timeout")
+    return true;
+  return isTransientHistorianPromptError(result.error);
+}
+function historianAbortResult(startedAt) {
+  return {
+    ok: false,
+    reason: "abort",
+    error: "pi subagent aborted by caller",
+    durationMs: Date.now() - startedAt
+  };
+}
+async function sleepWithAbort(ms, signal) {
+  if (signal?.aborted)
+    return true;
+  if (ms <= 0)
+    return signal?.aborted === true;
+  return new Promise((resolve3) => {
+    let settled = false;
+    let timeout;
+    const finish = (aborted2) => {
+      if (settled)
+        return;
+      settled = true;
+      if (timeout)
+        clearTimeout(timeout);
+      signal?.removeEventListener("abort", onAbort);
+      resolve3(aborted2);
+    };
+    const onAbort = () => finish(true);
+    signal?.addEventListener("abort", onAbort, { once: true });
+    timeout = setTimeout(() => finish(false), ms);
+  });
+}
+async function runHistorianSubagentWithTransientRetries(args) {
+  const startedAt = Date.now();
+  if (args.options.signal?.aborted)
+    return historianAbortResult(startedAt);
+  for (let retryIndex = 0;retryIndex <= MAX_HISTORIAN_RETRIES; retryIndex += 1) {
+    const attemptStart = Date.now();
+    let result;
+    try {
+      result = await args.runner.run({
+        ...args.options,
+        fallbackModels: undefined
+      });
+    } catch (error51) {
+      const desc = describeError(error51);
+      result = {
+        ok: false,
+        reason: "model_failed",
+        error: desc.brief,
+        durationMs: Date.now() - attemptStart
+      };
+    }
+    if (result.ok)
+      return result;
+    if (result.reason === "abort" || args.options.signal?.aborted) {
+      return result.reason === "abort" ? result : historianAbortResult(startedAt);
+    }
+    const shouldRetry = retryIndex < MAX_HISTORIAN_RETRIES && isTransientHistorianRunFailure(result);
+    if (!shouldRetry)
+      return result;
+    const backoffMs2 = args.retryBackoffMs?.(retryIndex) ?? getHistorianRetryBackoffMs(retryIndex);
+    sessionLog(args.sessionId, `historian[${args.passLabel}] transient failure; retry ${retryIndex + 1}/${MAX_HISTORIAN_RETRIES} on same model after ${backoffMs2}ms: ${result.error}`);
+    const aborted2 = await sleepWithAbort(backoffMs2, args.options.signal);
+    if (aborted2)
+      return historianAbortResult(startedAt);
+  }
+  return historianAbortResult(startedAt);
+}
+function buildHistorianFallbackChain(primaryModel, fallbackModels, fallbackModelId) {
+  const seen = new Set;
+  if (primaryModel)
+    seen.add(primaryModel);
+  const chain = [];
+  for (const candidate of fallbackModels ?? []) {
+    if (!candidate || seen.has(candidate))
+      continue;
+    seen.add(candidate);
+    chain.push({ modelId: candidate, kind: "configured" });
+  }
+  if (fallbackModelId && !seen.has(fallbackModelId)) {
+    chain.push({ modelId: fallbackModelId, kind: "session" });
+  }
+  return chain;
+}
 function parseSourceMessageTime(value) {
   if (typeof value === "number" && Number.isFinite(value))
     return value;
@@ -194842,11 +195624,14 @@ async function runPiHistorian(deps) {
     runner,
     historianModel,
     fallbackModels,
+    fallbackModelId,
     historianChunkTokens,
     boundarySnapshot: providedBoundarySnapshot,
     refreshBoundarySnapshot,
     currentContextLimit,
     historianTimeoutMs = DEFAULT_HISTORIAN_TIMEOUT_MS2,
+    signal,
+    retryBackoffMs,
     twoPass,
     thinkingLevel,
     memoryEnabled,
@@ -194860,7 +195645,9 @@ async function runPiHistorian(deps) {
     forceDrainQuota,
     forceKeepLastCompartment
   } = deps;
+  let issueNotified = false;
   const notify = async (message) => {
+    issueNotified = true;
     if (shouldSuppressHistorianAlert(sessionId)) {
       sessionLog(sessionId, "historian alert suppressed (cooldown)");
       return;
@@ -195051,61 +195838,77 @@ ${chunkText}`,
       retainDrainReservationForRetryThrottle = true;
       const historianSystemPrompt = withContentLanguageDirective(COMPARTMENT_AGENT_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true });
       const historianEditorSystemPrompt = withContentLanguageDirective(HISTORIAN_EDITOR_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true });
-      const firstResult = await runner.run({
-        agent: HISTORIAN_AGENT_NAME,
-        systemPrompt: historianSystemPrompt,
-        userMessage: prompt,
-        model: historianModel,
-        fallbackModels,
-        timeoutMs: historianTimeoutMs,
-        cwd: directory,
-        thinkingLevel,
-        onProgress: buildProgressLogger("first"),
-        accountingSessionId: sessionId,
-        accountingSubagent: "historian"
-      });
-      let validatedPass = await validateHistorianResult(firstResult, sessionId, chunk, priorCompartments, sequenceOffset);
-      let validatedDraftText = firstResult.ok ? firstResult.assistantText : null;
-      if (validatedPass.kind === "validation-failed") {
-        sessionLog(sessionId, `historian: first pass validation failed, retrying with repair prompt: ${validatedPass.error}`);
-        const repairPrompt = buildHistorianRepairPrompt(prompt, validatedPass.rawText, validatedPass.error, deps.language);
-        const repairResult = await runner.run({
+      const firstResult = await runHistorianSubagentWithTransientRetries({
+        runner,
+        sessionId,
+        passLabel: "first",
+        retryBackoffMs,
+        options: {
           agent: HISTORIAN_AGENT_NAME,
           systemPrompt: historianSystemPrompt,
-          userMessage: repairPrompt,
+          userMessage: prompt,
           model: historianModel,
-          fallbackModels,
           timeoutMs: historianTimeoutMs,
           cwd: directory,
+          signal,
           thinkingLevel,
-          onProgress: buildProgressLogger("repair"),
+          onProgress: buildProgressLogger("first"),
           accountingSessionId: sessionId,
           accountingSubagent: "historian"
-        });
-        validatedPass = await validateHistorianResult(repairResult, sessionId, chunk, priorCompartments, sequenceOffset);
-        if (validatedPass.kind === "ok" && repairResult.ok) {
-          validatedDraftText = repairResult.assistantText;
         }
-      }
-      if (validatedPass.kind !== "ok" && (fallbackModels?.length ?? 0) > 0) {
-        const seen = new Set([historianModel].filter(Boolean));
-        for (const candidate of fallbackModels ?? []) {
-          if (!candidate || seen.has(candidate))
-            continue;
-          seen.add(candidate);
-          sessionLog(sessionId, `historian: escalating to configured fallback model ${candidate}`);
-          const fbResult = await runner.run({
+      });
+      let validatedPass = await validateHistorianResult(firstResult, sessionId, chunk, priorCompartments, sequenceOffset);
+      let validatedDraftText = firstResult.ok ? firstResult.assistantText : null;
+      if (validatedPass.kind === "validation-failed") {
+        sessionLog(sessionId, `historian: first pass validation failed, retrying with repair prompt: ${validatedPass.error}`);
+        const repairPrompt = buildHistorianRepairPrompt(prompt, validatedPass.rawText, validatedPass.error, deps.language);
+        const repairResult = await runHistorianSubagentWithTransientRetries({
+          runner,
+          sessionId,
+          passLabel: "repair",
+          retryBackoffMs,
+          options: {
             agent: HISTORIAN_AGENT_NAME,
             systemPrompt: historianSystemPrompt,
-            userMessage: prompt,
-            model: candidate,
-            fallbackModels: undefined,
+            userMessage: repairPrompt,
+            model: historianModel,
             timeoutMs: historianTimeoutMs,
             cwd: directory,
+            signal,
             thinkingLevel,
-            onProgress: buildProgressLogger("fallback"),
+            onProgress: buildProgressLogger("repair"),
             accountingSessionId: sessionId,
             accountingSubagent: "historian"
+          }
+        });
+        validatedPass = await validateHistorianResult(repairResult, sessionId, chunk, priorCompartments, sequenceOffset);
+        if (validatedPass.kind === "ok" && repairResult.ok) {
+          validatedDraftText = repairResult.assistantText;
+        }
+      }
+      const fallbackChain = buildHistorianFallbackChain(historianModel, fallbackModels, fallbackModelId);
+      if (validatedPass.kind !== "ok" && !(validatedPass.kind === "spawn-failed" && validatedPass.reason === "abort") && fallbackChain.length > 0) {
+        for (let i = 0;i < fallbackChain.length; i += 1) {
+          const candidate = fallbackChain[i];
+          sessionLog(sessionId, `historian: escalating to ${candidate.kind === "session" ? "session-model last resort" : "configured fallback model"} ${candidate.modelId}`);
+          const fbResult = await runHistorianSubagentWithTransientRetries({
+            runner,
+            sessionId,
+            passLabel: candidate.kind === "session" ? "fallback-session" : "fallback",
+            retryBackoffMs,
+            options: {
+              agent: HISTORIAN_AGENT_NAME,
+              systemPrompt: historianSystemPrompt,
+              userMessage: prompt,
+              model: candidate.modelId,
+              timeoutMs: historianTimeoutMs,
+              cwd: directory,
+              signal,
+              thinkingLevel,
+              onProgress: buildProgressLogger("fallback"),
+              accountingSessionId: sessionId,
+              accountingSubagent: "historian"
+            }
           });
           const fbPass = await validateHistorianResult(fbResult, sessionId, chunk, priorCompartments, sequenceOffset);
           if (fbPass.kind === "ok") {
@@ -195114,6 +195917,10 @@ ${chunkText}`,
               validatedDraftText = fbResult.assistantText;
             break;
           }
+          if (fbPass.kind === "spawn-failed" && fbPass.reason === "abort") {
+            validatedPass = fbPass;
+            break;
+          }
         }
       }
       if (validatedPass.kind !== "ok") {
@@ -195130,17 +195937,24 @@ ${chunkText}`,
         const draftAssistantText = validatedDraftText ?? "";
         if (draftAssistantText.trim().length > 0) {
           sessionLog(sessionId, "historian two-pass: running editor on draft");
-          const editorResult = await runner.run({
-            agent: HISTORIAN_AGENT_NAME,
-            systemPrompt: historianEditorSystemPrompt,
-            userMessage: buildHistorianEditorPrompt(draftAssistantText),
-            model: historianModel,
-            timeoutMs: historianTimeoutMs,
-            cwd: directory,
-            thinkingLevel,
-            onProgress: buildProgressLogger("editor"),
-            accountingSessionId: sessionId,
-            accountingSubagent: "historian_editor"
+          const editorResult = await runHistorianSubagentWithTransientRetries({
+            runner,
+            sessionId,
+            passLabel: "editor",
+            retryBackoffMs,
+            options: {
+              agent: HISTORIAN_AGENT_NAME,
+              systemPrompt: historianEditorSystemPrompt,
+              userMessage: buildHistorianEditorPrompt(draftAssistantText),
+              model: historianModel,
+              timeoutMs: historianTimeoutMs,
+              cwd: directory,
+              signal,
+              thinkingLevel,
+              onProgress: buildProgressLogger("editor"),
+              accountingSessionId: sessionId,
+              accountingSubagent: "historian_editor"
+            }
           });
           const editorPass = await validateHistorianResult(editorResult, sessionId, chunk, priorCompartments, sequenceOffset);
           if (editorPass.kind === "ok") {
@@ -195353,7 +196167,7 @@ ${chunkText}`,
     const desc = describeError(error51);
     telemetry.failureReason = `exception: ${desc.brief}`;
     sessionLog(sessionId, `historian failure: source=exception ${desc.brief}${desc.stackHead ? ` stackHead="${desc.stackHead}"` : ""}`);
-    {
+    if (!issueNotified) {
       const failCount = incrementHistorianFailure(db, sessionId, desc.brief);
       await notify(buildHistorianFailureNotice(failCount, desc.brief));
     }
@@ -197302,6 +198116,8 @@ function registerPiContextHandler(pi, baseOptions) {
       }
       const sessionMeta = sessionMetaForUsage;
       const modelKey = liveModelBySession.get(sessionId);
+      const providerId = typeof ctx.model?.provider === "string" ? ctx.model.provider : undefined;
+      const canUseEmptySentinels = modelAcceptsEmptyContent(providerId);
       if (usageContextLimit === undefined) {
         const modelWindow = ctx.model?.contextWindow;
         if (isSaneLimit(modelWindow)) {
@@ -197312,6 +198128,7 @@ function registerPiContextHandler(pi, baseOptions) {
         usagePercentage = usageInputTokens / usageContextLimit * 100;
       }
       ({ percentage: usagePercentage, inputTokens: usageInputTokens } = applyForwardPressureFloor(usagePercentage, usageInputTokens, piUsage?.tokens, usageContextLimit));
+      const realUsagePercentageBeforeEmergencyBump = usagePercentage;
       if (needsEmergencyBump) {
         sessionLog(sessionId, `transform: overflow recovery flag set — bumping percentage to 95% (detectedLimit=${usageContextLimit ?? "unknown"})`);
         usagePercentage = Math.max(usagePercentage, 95);
@@ -197382,7 +198199,7 @@ function registerPiContextHandler(pi, baseOptions) {
             sessionLog(sessionId, "EMERGENCY: historian wait completed (or timed out)");
           } catch {}
         }
-        if (emergencyRecoveryArmed && !inFlightHistorian.has(sessionId) && !hasEligiblePiCompartmentHistory(options.db, sessionId)) {
+        if (emergencyRecoveryArmed && realUsagePercentageBeforeEmergencyBump < FORCE_MATERIALIZATION_PERCENTAGE && !inFlightHistorian.has(sessionId) && !hasEligiblePiCompartmentHistory(options.db, sessionId)) {
           try {
             clearEmergencyRecovery(options.db, sessionId);
             sessionLog(sessionId, "EMERGENCY: disarming recovery — no eligible pre-tail history to compact (would otherwise loop at 95%)");
@@ -197437,6 +198254,7 @@ function registerPiContextHandler(pi, baseOptions) {
         reasoningClearing: {
           clearReasoningAge: options.heuristics?.clearReasoningAge ?? DEFAULT_CLEAR_REASONING_AGE
         },
+        canUseEmptySentinels,
         temporalAwareness: options.injection?.temporalAwareness === true,
         appendCompaction: resolvePiAppendCompaction(ctx),
         readBranchEntries: resolvePiReadBranchEntries(ctx),
@@ -197458,6 +198276,7 @@ function registerPiContextHandler(pi, baseOptions) {
       }
       if (options.historian) {
         maybeFireHistorian({
+          pi,
           ctx,
           sessionId,
           db: options.db,
@@ -197698,6 +198517,7 @@ function sendPiIgnoredNotification(ctx, message) {
 }
 function spawnPiHistorianRun(args) {
   const {
+    pi,
     ctx,
     sessionId,
     db,
@@ -197706,7 +198526,8 @@ function spawnPiHistorianRun(args) {
     unregister,
     boundarySnapshot,
     refreshBoundarySnapshot,
-    currentContextLimit
+    currentContextLimit,
+    fallbackModelId
   } = args;
   const holderId = crypto3.randomUUID();
   const runPromise = (async () => {
@@ -197732,6 +198553,7 @@ function spawnPiHistorianRun(args) {
         runner: historian.runner,
         historianModel: historian.model,
         fallbackModels: historian.fallbackModels,
+        fallbackModelId,
         historianChunkTokens: historian.historianChunkTokens,
         boundarySnapshot,
         refreshBoundarySnapshot,
@@ -197744,6 +198566,17 @@ function spawnPiHistorianRun(args) {
         userMemoriesEnabled: historian.userMemoriesEnabled,
         language: historian.language,
         compartmentLeaseHolderId: holderId,
+        notifyIssue: (text) => {
+          if (!isContextHandlerSessionActive(sessionId)) {
+            sessionLog(sessionId, "historian failure notice skipped after session context cleared");
+            return;
+          }
+          sendCtxStatusMessage(pi, {
+            title: "Magic Context",
+            text,
+            level: "warning"
+          });
+        },
         onPublished: () => {
           const sessionStillActive = isContextHandlerSessionActive(sessionId);
           try {
@@ -197893,6 +198726,7 @@ function maybeFireHistorian(args) {
 
 Historian previously failed ${failureState.failureCount} time(s), so Magic Context is retrying history comparting immediately after restart.`);
         spawnPiHistorianRun({
+          pi: args.pi,
           ctx,
           sessionId,
           db,
@@ -197901,7 +198735,8 @@ Historian previously failed ${failureState.failureCount} time(s), so Magic Conte
           unregister,
           boundarySnapshot,
           refreshBoundarySnapshot: resolveRunnablePiBoundarySnapshot,
-          currentContextLimit: boundaryContextLimit
+          currentContextLimit: boundaryContextLimit,
+          fallbackModelId: modelKey
         });
         return;
       }
@@ -197923,6 +198758,7 @@ Historian previously failed ${failureState.failureCount} time(s), so Magic Conte
     triggered = true;
     sessionLog(sessionId, `historian trigger fired (reason=${trigger.reason ?? "unknown"}) usage=${usage.percentage.toFixed(1)}% — spawning subagent`);
     spawnPiHistorianRun({
+      pi: args.pi,
       ctx,
       sessionId,
       db,
@@ -197934,7 +198770,8 @@ Historian previously failed ${failureState.failureCount} time(s), so Magic Conte
         triggerBoundarySnapshot: trigger.boundarySnapshot
       }),
       refreshBoundarySnapshot: resolveRunnablePiBoundarySnapshot,
-      currentContextLimit: boundaryContextLimit
+      currentContextLimit: boundaryContextLimit,
+      fallbackModelId: modelKey
     });
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -198014,7 +198851,10 @@ async function runPipeline(args) {
     historyBudgetTokens: args.injection.historyBudgetTokens,
     hardSignals: piHardSignals
   }, args.db, getCompartments(args.db, args.sessionId)).value : false;
-  const shouldRunHeuristics = args.heuristics !== undefined && (args.forceMaterialization === true || hasPendingMaterialization(args.sessionId) || deferredMaterializeEligible || m0HardFoldThisPass || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
+  const historianRunning = inFlightHistorian.has(args.sessionId);
+  const bypassHistorianGate = args.forceMaterialization === true || m0HardFoldThisPass;
+  const hasPendingMaterializeSignal = hasPendingMaterialization(args.sessionId);
+  const shouldRunHeuristics = args.heuristics !== undefined && (!historianRunning || bypassHistorianGate) && (args.forceMaterialization === true || hasPendingMaterializeSignal || deferredMaterializeEligible || m0HardFoldThisPass || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
   const entryFingerprintByMessageId = buildEntryFingerprintMap(args.messages, stableIdResolver);
   adoptPiFallbackTags(args.db, args.sessionId, args.tagger, entryFingerprintByMessageId, {
     messages: args.messages,
@@ -198048,14 +198888,13 @@ async function runPipeline(args) {
   } catch (err) {
     sessionLog(args.sessionId, `commit-detect failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
   }
-  const hasPendingMaterializeSignal = hasPendingMaterialization(args.sessionId);
   const deferredMaterializationWasPending = deferredMaterializationSessions.has(args.sessionId);
   const deferredHistoryRefreshWasPending = deferredHistoryWasPendingAtPassStart;
   const pendingOps = getPendingOps(args.db, args.sessionId);
   const baseShouldApplyPendingOps = args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || m0HardFoldThisPass;
   const deferredMaterialize = canConsumeDeferredLate && deferredMaterializationWasPending;
   const deferredHistoryRefresh = canConsumeDeferredLate && deferredHistoryRefreshWasPending;
-  const shouldApplyPendingOps = baseShouldApplyPendingOps || deferredMaterialize;
+  const shouldApplyPendingOps = (baseShouldApplyPendingOps || deferredMaterialize) && (!historianRunning || bypassHistorianGate);
   if (shouldApplyPendingOps) {
     const applyReason = hasPendingMaterializeSignal ? "explicit_flush" : deferredMaterialize ? "deferred_publication" : args.forceMaterialization ? "force_materialization" : m0HardFoldThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into known m[0] bust, scheduler=${args.schedulerDecision})` : `scheduler_execute (scheduler=${args.schedulerDecision})`;
     sessionLog(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${pendingOps.length}, context=${args.contextUsage.percentage.toFixed(1)}%`);
@@ -198144,6 +198983,7 @@ async function runPipeline(args) {
       const tHeuristic = performance.now();
       heuristicsResult = applyPiHeuristicCleanup(args.sessionId, args.db, targets, args.messages, {
         protectedTags: args.protectedTags,
+        staleReduceStripEnabled: args.canUseEmptySentinels,
         emergency: args.forceMaterialization === true && args.emergencyCeilingTokens !== undefined && args.emergencyCeilingTokens > 0 ? {
           currentTotalInputTokens: args.contextUsage.inputTokens,
           ceilingTokens: args.emergencyCeilingTokens
@@ -198729,7 +199569,7 @@ init_data_path();
 function historianResponseDumpDir(directory) {
   return getProjectMagicContextHistorianDir(directory);
 }
-var MAX_HISTORIAN_RETRIES = 2;
+var MAX_HISTORIAN_RETRIES2 = 2;
 async function runValidatedHistorianPass(args) {
   const firstRun = await runHistorianPrompt({
     ...args,
@@ -198870,7 +199710,7 @@ async function runHistorianPrompt(args) {
       });
       return { ok: false, error: "Historian could not create its child session." };
     }
-    for (let retryIndex = 0;retryIndex <= MAX_HISTORIAN_RETRIES; retryIndex += 1) {
+    for (let retryIndex = 0;retryIndex <= MAX_HISTORIAN_RETRIES2; retryIndex += 1) {
       try {
         await promptSyncWithModelSuggestionRetry(client, {
           path: { id: agentSessionId },
@@ -198885,17 +199725,17 @@ async function runHistorianPrompt(args) {
           fallbackModels: modelOverride ? undefined : fallbackModels,
           callContext: agentId === HISTORIAN_EDITOR_AGENT ? "historian:editor" : "historian"
         });
-        sessionLog(parentSessionId, `historian: prompt completed (attempt ${retryIndex + 1}/${MAX_HISTORIAN_RETRIES + 1})`);
+        sessionLog(parentSessionId, `historian: prompt completed (attempt ${retryIndex + 1}/${MAX_HISTORIAN_RETRIES2 + 1})`);
         break;
       } catch (error51) {
         const errorMsg = getErrorMessage(error51);
         sessionLog(parentSessionId, `historian: prompt attempt ${retryIndex + 1} failed: ${errorMsg}`);
-        const shouldRetry = retryIndex < MAX_HISTORIAN_RETRIES && isTransientHistorianPromptError(errorMsg);
+        const shouldRetry = retryIndex < MAX_HISTORIAN_RETRIES2 && isTransientHistorianPromptError2(errorMsg);
         if (!shouldRetry) {
           throw error51;
         }
-        const backoffMs2 = getHistorianRetryBackoffMs(retryIndex);
-        sessionLog(parentSessionId, `historian retry ${retryIndex + 1}/${MAX_HISTORIAN_RETRIES} after ${backoffMs2}ms: ${errorMsg}`);
+        const backoffMs2 = getHistorianRetryBackoffMs2(retryIndex);
+        sessionLog(parentSessionId, `historian retry ${retryIndex + 1}/${MAX_HISTORIAN_RETRIES2} after ${backoffMs2}ms: ${errorMsg}`);
         await sleep(backoffMs2);
       }
     }
@@ -198988,13 +199828,13 @@ function parseModelOverride(modelId) {
   }
   return { providerID, modelID };
 }
-function getHistorianRetryBackoffMs(retryIndex) {
+function getHistorianRetryBackoffMs2(retryIndex) {
   if (retryIndex === 0) {
     return 2000 + Math.floor(Math.random() * 1001);
   }
   return 6000 + Math.floor(Math.random() * 2001);
 }
-function isTransientHistorianPromptError(message) {
+function isTransientHistorianPromptError2(message) {
   const normalized = message.toLowerCase();
   if (normalized.includes("invalid request") || normalized.includes("bad request") || normalized.includes("unauthorized") || normalized.includes("forbidden") || normalized.includes("authentication") || normalized.includes("auth") || normalized.includes(" 400") || normalized.startsWith("400")) {
     return false;
@@ -199949,6 +200789,15 @@ async function executeContextRecompWithResult(deps, options = {}) {
       published: false
     };
   }
+  options.onLeaseAcquired?.();
+  if (isWrapupInProgress(deps.db, sessionId)) {
+    sessionLog(sessionId, "recomp skipped: /ctx-wrapup became active");
+    releaseCompartmentLease(deps.db, sessionId, holderId);
+    return {
+      message: "## Magic Recomp — Skipped\n\n/ctx-wrapup is already compacting this session. Wait for it to finish, then try `/ctx-recomp` again.",
+      published: false
+    };
+  }
   const renewal = startLeaseRenewal(deps, holderId);
   const runnerDeps = withPublishedCallback({ ...deps, compartmentLeaseHolderId: holderId });
   const promise2 = options.range ? executePartialRecompInternal(runnerDeps, options.range) : executeContextRecompInternal(runnerDeps);
@@ -200238,6 +201087,13 @@ function spawnPiRecompRun(args) {
 // src/commands/ctx-recomp.ts
 var confirmationBySession = new Map;
 var RECOMP_CONFIRMATION_WINDOW_MS = 60000;
+var RECOMP_USAGE = [
+  "Usage:",
+  "- `/ctx-recomp` — full rebuild from message 1 to the protected tail",
+  "- `/ctx-recomp <start>-<end>` — partial rebuild of a message range (e.g. `/ctx-recomp 1-11322`)",
+  "- `/ctx-recomp --upgrade` — upgrade legacy v1 compartments to v2 layout (Wave 3 runner)"
+].join(`
+`);
 function registerCtxRecompCommand(pi, deps) {
   pi.registerCommand("ctx-recomp", {
     description: "Rebuild Magic Context compartments from raw Pi session history",
@@ -200253,21 +201109,30 @@ No active Pi session is available.`,
         });
         return;
       }
-      if (!deps.historianModel) {
+      const currentDeps = deps.resolveRuntimeDeps?.(ctx) ?? deps;
+      const parsed = parseRecompArgs(args);
+      if (parsed.kind === "error") {
         sendCtxStatusMessage(pi, {
           title: "/ctx-recomp",
-          text: "## Magic Recomp\n\n/ctx-recomp is unavailable because `historian.model` is not configured.",
+          text: `## Magic Recomp — Invalid Arguments
+
+${parsed.message}`,
           level: "error"
         });
         return;
       }
-      const parsed = parseRecompArgs(args);
-      if (parsed.kind === "error") {
+      if (parsed.kind === "upgrade") {
         sendCtxStatusMessage(pi, {
           title: "/ctx-recomp",
-          text: `## Magic Recomp — Invalid Arguments
-
-${parsed.message}`,
+          text: executeRecompUpgradeStub(currentDeps.db, sessionId),
+          level: "info"
+        });
+        return;
+      }
+      if (!currentDeps.historianModel) {
+        sendCtxStatusMessage(pi, {
+          title: "/ctx-recomp",
+          text: "## Magic Recomp\n\n/ctx-recomp is unavailable because `historian.model` is not configured.",
           level: "error"
         });
         return;
@@ -200277,7 +201142,7 @@ ${parsed.message}`,
       const confirmation = confirmationBySession.get(sessionId);
       const confirmed = confirmation !== undefined && now - confirmation.timestamp < RECOMP_CONFIRMATION_WINDOW_MS && confirmation.argsKey === argsKey;
       if (!confirmed) {
-        const warning = buildConfirmationWarning(deps.db, sessionId, parsed);
+        const warning = buildConfirmationWarning(currentDeps.db, sessionId, parsed);
         if (!warning.confirmable)
           confirmationBySession.delete(sessionId);
         else
@@ -200289,7 +201154,7 @@ ${parsed.message}`,
         });
         return;
       }
-      if (isWrapupInProgress(deps.db, sessionId)) {
+      if (isWrapupInProgress(currentDeps.db, sessionId)) {
         sendCtxStatusMessage(pi, {
           title: "/ctx-recomp",
           text: "## Magic Recomp\n\n/ctx-wrapup is already compacting this session. Wait for it to finish, then try `/ctx-recomp` again.",
@@ -200323,16 +201188,19 @@ Historian recomp started. Rebuilding compartments and facts from raw Pi session
       spawnPiRecompRun({
         sessionId,
         provider: provider2,
-        onStatusChange: () => updateStatusLine(ctx, { db: deps.db, projectIdentity: ctx.cwd }),
+        onStatusChange: () => updateStatusLine(ctx, {
+          db: currentDeps.db,
+          projectIdentity: ctx.cwd
+        }),
         work: async () => {
           const result = await executeContextRecompWithResult({
             client: createPiHistorianClient({
-              runner: deps.runner,
-              model: deps.historianModel,
-              systemPrompt: withContentLanguageDirective(COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true }),
-              fallbackModels: deps.historianFallbacks,
-              timeoutMs: deps.historianTimeoutMs,
-              thinkingLevel: deps.historianThinkingLevel,
+              runner: currentDeps.runner,
+              model: currentDeps.historianModel,
+              systemPrompt: withContentLanguageDirective(COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, currentDeps.language, { preserveUserQuotes: true }),
+              fallbackModels: currentDeps.historianFallbacks,
+              timeoutMs: currentDeps.historianTimeoutMs,
+              thinkingLevel: currentDeps.historianThinkingLevel,
               directory: ctx.cwd,
               accountingSessionId: sessionId,
               notify: (text) => {
@@ -200343,26 +201211,26 @@ Historian recomp started. Rebuilding compartments and facts from raw Pi session
                 });
               }
             }),
-            db: deps.db,
+            db: currentDeps.db,
             sessionId,
-            historianChunkTokens: deps.historianChunkTokens,
+            historianChunkTokens: currentDeps.historianChunkTokens,
             directory: ctx.cwd,
-            historianTimeoutMs: deps.historianTimeoutMs,
-            memoryEnabled: deps.memoryEnabled,
-            autoPromote: deps.autoPromote,
+            historianTimeoutMs: currentDeps.historianTimeoutMs,
+            memoryEnabled: currentDeps.memoryEnabled,
+            autoPromote: currentDeps.autoPromote,
             ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
-            fallbackModels: deps.historianFallbacks,
-            language: deps.language,
+            fallbackModels: currentDeps.historianFallbacks,
+            language: currentDeps.language,
             fallbackModelId: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined
           }, parsed.kind === "partial" ? { range: parsed.range } : {});
           if (result.published) {
             try {
-              clearEmergencyRecovery(deps.db, sessionId);
+              clearEmergencyRecovery(currentDeps.db, sessionId);
             } catch (recoveryError) {
               sessionLog(sessionId, `/ctx-recomp: clearEmergencyRecovery failed (continuing): ${describeError(recoveryError).brief}`);
             }
             try {
-              stagePiRecompMarker({ db: deps.db, sessionId, ctx });
+              stagePiRecompMarker({ db: currentDeps.db, sessionId, ctx });
             } catch (markerError) {
               sessionLog(sessionId, `/ctx-recomp: marker staging failed (recomp already published; continuing): ${describeError(markerError).brief}`);
             }
@@ -200383,11 +201251,15 @@ function parseRecompArgs(raw) {
   const trimmed = raw.trim();
   if (trimmed.length === 0)
     return { kind: "full" };
+  if (trimmed === "--upgrade")
+    return { kind: "upgrade" };
   const match = trimmed.match(/^(\d+)\s*-\s*(\d+)$/);
   if (!match) {
     return {
       kind: "error",
-      message: "Usage:\n- `/ctx-recomp` — full rebuild from message 1 to the protected tail\n- `/ctx-recomp <start>-<end>` — partial rebuild of a message range"
+      message: `Invalid /ctx-recomp arguments: \`${trimmed}\`.
+
+${RECOMP_USAGE}`
     };
   }
   const start = Number.parseInt(match[1], 10);
@@ -200401,6 +201273,21 @@ function parseRecompArgs(raw) {
     };
   return { kind: "partial", range: { start, end } };
 }
+function executeRecompUpgradeStub(db, sessionId) {
+  const legacyCount = getCompartments(db, sessionId).filter((compartment) => compartment.legacy === 1).length;
+  if (legacyCount === 0) {
+    return `## Magic Recomp Upgrade
+
+Nothing to upgrade: this session has no legacy compartments.`;
+  }
+  return [
+    "## Magic Recomp Upgrade",
+    "",
+    `Found ${legacyCount} legacy compartment${legacyCount === 1 ? "" : "s"} for this session.`,
+    "The `--upgrade` flag is deprecated. Run `/ctx-session-upgrade` to upgrade this session."
+  ].join(`
+`);
+}
 function buildConfirmationWarning(db, sessionId, parsed) {
   const compartments = getCompartments(db, sessionId);
   if (parsed.kind === "partial") {
@@ -200680,7 +201567,8 @@ No active Pi session is available.`,
         });
         return;
       }
-      if (!deps.historianModel) {
+      const currentDeps = deps.resolveRuntimeDeps?.(ctx) ?? deps;
+      if (!currentDeps.historianModel) {
         sendCtxStatusMessage(pi, {
           title: "/ctx-session-upgrade",
           text: "## Session Upgrade\n\nUnavailable because `historian.model` is not configured.",
@@ -200688,7 +201576,7 @@ No active Pi session is available.`,
         });
         return;
       }
-      if (isWrapupInProgress(deps.db, sessionId)) {
+      if (isWrapupInProgress(currentDeps.db, sessionId)) {
         sendCtxStatusMessage(pi, {
           title: "/ctx-session-upgrade",
           text: `## Session Upgrade
@@ -200708,27 +201596,27 @@ An upgrade or recomp is already running for this session in the background. Wait
         });
         return;
       }
-      const compartments = getCompartments(deps.db, sessionId);
+      const compartments = getCompartments(currentDeps.db, sessionId);
       const upgradableCount = compartments.filter((c) => c.legacy === 1 || !c.p1 || c.p1.trim() === "").length;
       const sessionMainModel = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
-      const migrationEnabled = deps.memoryEnabled;
+      const migrationEnabled = currentDeps.memoryEnabled;
       const runMigration = async () => {
         if (!migrationEnabled) {
           return "Memory migration skipped (memory disabled).";
         }
         try {
           const outcome = await runPiMemoryMigration({
-            db: deps.db,
-            runner: deps.runner,
+            db: currentDeps.db,
+            runner: currentDeps.runner,
             primaryModel: sessionMainModel,
-            model: deps.historianModel,
-            fallbackModels: deps.historianFallbacks,
-            timeoutMs: deps.historianTimeoutMs,
-            thinkingLevel: deps.historianThinkingLevel,
+            model: currentDeps.historianModel,
+            fallbackModels: currentDeps.historianFallbacks,
+            timeoutMs: currentDeps.historianTimeoutMs,
+            thinkingLevel: currentDeps.historianThinkingLevel,
             directory: ctx.cwd,
             sessionId,
-            userMemoriesEnabled: deps.userMemoriesEnabled,
-            language: deps.language
+            userMemoriesEnabled: currentDeps.userMemoriesEnabled,
+            language: currentDeps.language
           });
           return outcome.summary;
         } catch (error51) {
@@ -200737,7 +201625,7 @@ An upgrade or recomp is already running for this session in the background. Wait
       };
       if (upgradableCount === 0) {
         const projectPath = resolveProjectIdentity(ctx.cwd);
-        const migrationPending = migrationEnabled && !isMemoryMigrationDone(deps.db, projectPath);
+        const migrationPending = migrationEnabled && !isMemoryMigrationDone(currentDeps.db, projectPath);
         if (!migrationPending) {
           sendCtxStatusMessage(pi, {
             title: "/ctx-session-upgrade",
@@ -200763,7 +201651,10 @@ Compartments are already current. Re-organizing project memories. This may take
           provider: {
             readMessages: () => readPiSessionMessages(ctx)
           },
-          onStatusChange: () => updateStatusLine(ctx, { db: deps.db, projectIdentity: ctx.cwd }),
+          onStatusChange: () => updateStatusLine(ctx, {
+            db: currentDeps.db,
+            projectIdentity: ctx.cwd
+          }),
           work: async () => {
             const summary = await runMigration();
             sendCtxStatusMessage(pi, {
@@ -200789,35 +201680,38 @@ Rebuilding compartments into the v2 format and re-organizing project memories. T
       spawnPiRecompRun({
         sessionId,
         provider: provider2,
-        onStatusChange: () => updateStatusLine(ctx, { db: deps.db, projectIdentity: ctx.cwd }),
+        onStatusChange: () => updateStatusLine(ctx, {
+          db: currentDeps.db,
+          projectIdentity: ctx.cwd
+        }),
         work: async () => {
           const recompResult = await executeContextRecompWithResult({
             client: createPiHistorianClient({
-              runner: deps.runner,
-              model: deps.historianModel,
-              fallbackModels: deps.historianFallbacks,
-              timeoutMs: deps.historianTimeoutMs,
-              thinkingLevel: deps.historianThinkingLevel,
+              runner: currentDeps.runner,
+              model: currentDeps.historianModel,
+              fallbackModels: currentDeps.historianFallbacks,
+              timeoutMs: currentDeps.historianTimeoutMs,
+              thinkingLevel: currentDeps.historianThinkingLevel,
               directory: ctx.cwd,
               accountingSessionId: sessionId,
-              systemPrompt: withContentLanguageDirective(COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true }),
+              systemPrompt: withContentLanguageDirective(COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, currentDeps.language, { preserveUserQuotes: true }),
               notify: (text) => sendCtxStatusMessage(pi, {
                 title: "/ctx-session-upgrade",
                 text,
                 level: "info"
               })
             }),
-            db: deps.db,
+            db: currentDeps.db,
             sessionId,
-            historianChunkTokens: deps.historianChunkTokens,
+            historianChunkTokens: currentDeps.historianChunkTokens,
             directory: ctx.cwd,
-            historianTimeoutMs: deps.historianTimeoutMs,
-            memoryEnabled: deps.memoryEnabled,
-            autoPromote: deps.autoPromote,
+            historianTimeoutMs: currentDeps.historianTimeoutMs,
+            memoryEnabled: currentDeps.memoryEnabled,
+            autoPromote: currentDeps.autoPromote,
             ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
-            fallbackModels: deps.historianFallbacks,
+            fallbackModels: currentDeps.historianFallbacks,
             fallbackModelId: sessionMainModel,
-            language: deps.language
+            language: currentDeps.language
           }, {});
           if (!recompResult.published || !isRecompComplete(recompResult.message)) {
             const reason = contextualizeUpgradeReason(isRecompFailure(recompResult.message) ? extractRecompReason(recompResult.message) : `Compartments were not fully rebuilt: ${extractRecompReason(recompResult.message)}`);
@@ -200831,7 +201725,7 @@ ${reason}`,
             return;
           }
           try {
-            stagePiRecompMarker({ db: deps.db, sessionId, ctx });
+            stagePiRecompMarker({ db: currentDeps.db, sessionId, ctx });
           } catch (markerError) {
             sessionLog(sessionId, `pi /ctx-session-upgrade marker staging failed (non-fatal, recomp already published): ${describeError(markerError).brief}`);
           }
@@ -201029,7 +201923,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.31.2",
+  version: "0.31.4",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -201180,6 +202074,7 @@ function renderInner(s, theme, innerWidth) {
   lines.push(`${theme.fg("accent", theme.bold("⚡ Magic Context Status"))}   ${theme.fg("muted", `v${package_default.version}`)}`);
   lines.push("");
   lines.push(`Context  ${theme.fg(pctColor, theme.bold(`${s.usagePercentage.toFixed(1)}%`))} · ${fmt2(s.inputTokens)} / ${s.contextLimit > 0 ? fmt2(s.contextLimit) : "?"} tokens`);
+  lines.push(`Work tokens ${fmt2(s.newWorkTokens)} new · ${fmt2(s.totalInputTokens)} total input`);
   lines.push(renderBar(s, innerWidth));
   for (const seg of breakdownSegments(s)) {
     const pct = (seg.tokens / (s.inputTokens || 1) * 100).toFixed(1);
@@ -201275,6 +202170,7 @@ ${safeStringify(tool.parameters)}`);
     }
   } catch {}
   const conversationTokens = Math.max(0, inputTokens - systemPromptTokens - compartmentTokens - factTokens - memoryTokens - docsTokens - profileTokens - toolCallTokens - toolDefinitionTokens);
+  const workMetrics = getSessionWorkMetrics(deps.db, sessionId);
   const modelKey = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
   const threshold = resolveExecuteThresholdDetail(deps.executeThresholdPercentage ?? 65, modelKey, 65, {
     tokensConfig: deps.executeThresholdTokens,
@@ -201338,6 +202234,8 @@ ${safeStringify(tool.parameters)}`);
     conversationTokens,
     toolCallTokens,
     toolDefinitionTokens,
+    newWorkTokens: workMetrics.newWorkTokens,
+    totalInputTokens: workMetrics.totalInputTokens,
     upgradeNeededCount: safeRead(() => countCompartmentsNeedingUpgrade(deps.db, sessionId), 0),
     recompInFlight: isPiRecompInFlight(sessionId)
   };
@@ -201492,8 +202390,9 @@ function registerCtxStatusCommand(pi, deps) {
   pi.registerCommand("ctx-status", {
     description: "Show Magic Context status for the current Pi session",
     handler: async (_args, ctx) => {
-      const projectIdentity = deps.resolveProject?.(ctx).projectIdentity ?? deps.projectIdentity;
-      const currentDeps = { ...deps, projectIdentity };
+      const runtimeDeps = deps.resolveStatusDeps?.(ctx) ?? deps;
+      const projectIdentity = runtimeDeps.resolveProject?.(ctx).projectIdentity ?? runtimeDeps.projectIdentity;
+      const currentDeps = { ...runtimeDeps, projectIdentity };
       const sessionId = resolveSessionId(ctx);
       if (!sessionId) {
         sendCtxStatusMessage(pi, {
@@ -201574,6 +202473,11 @@ function readHistorianState(db, sessionId, meta3) {
 import * as crypto4 from "node:crypto";
 var DEFAULT_MESSAGES_TO_KEEP = 20;
 var LEASE_WAIT_MS = 1000;
+var MAX_WRAPUP_LEASE_WAIT_MS = 10 * 60 * 1000;
+function resolveWrapupLeaseWaitTimeout(deps) {
+  const configured = deps.wrapupLeaseWaitTimeoutMs ?? MAX_WRAPUP_LEASE_WAIT_MS;
+  return Number.isFinite(configured) && configured >= 0 ? configured : MAX_WRAPUP_LEASE_WAIT_MS;
+}
 function parseWrapupArgs(raw) {
   const trimmed = raw.trim();
   if (trimmed === "")
@@ -201608,7 +202512,8 @@ No active Pi session is available.`,
         });
         return;
       }
-      const sessionMeta = getOrCreateSessionMeta(deps.db, sessionId);
+      const currentDeps = deps.resolveRuntimeDeps?.(ctx) ?? deps;
+      const sessionMeta = getOrCreateSessionMeta(currentDeps.db, sessionId);
       if (sessionMeta.isSubagent) {
         sendCtxStatusMessage(pi, {
           title: "/ctx-wrapup",
@@ -201619,7 +202524,7 @@ No active Pi session is available.`,
         });
         return;
       }
-      if (!deps.historianModel) {
+      if (!currentDeps.historianModel) {
         sendCtxStatusMessage(pi, {
           title: "/ctx-wrapup",
           text: "## Magic Wrapup\n\n/ctx-wrapup is unavailable because `historian.model` is not configured.",
@@ -201638,7 +202543,7 @@ ${parsed.message}`,
         });
         return;
       }
-      const result = await runPiWrapup(pi, deps, ctx, sessionId, parsed.messagesToKeep);
+      const result = await runPiWrapup(pi, currentDeps, ctx, sessionId, parsed.messagesToKeep);
       sendCtxStatusMessage(pi, {
         title: "/ctx-wrapup",
         text: result,
@@ -201790,11 +202695,12 @@ Eligible history is about ${initialPlan.snapshot.trueRawEligibleTokens.toLocaleS
 Chunk ${chunkIndex}: wrapping messages ${plan.snapshot.offset}-${plan.snapshot.eligibleEndOrdinal - 1} (~${plan.snapshot.trueRawEligibleTokens.toLocaleString()} eligible tokens remain).`,
           level: "info"
         });
-        const leaseHolder = await acquireCompartmentLeaseEventually(deps.db, sessionId, renewWrapupMarker);
-        if (!leaseHolder) {
-          failure = ownershipLost ? `${ownershipLostReason}; wrapped up through message ${lastEnd}. Run /ctx-wrapup again to continue.` : "Another Magic Context rebuild started while wrapup was waiting. Run /ctx-wrapup again to continue.";
+        const leaseResult = await acquireCompartmentLeaseEventually(deps.db, sessionId, renewWrapupMarker, resolveWrapupLeaseWaitTimeout(deps));
+        if (!leaseResult.ok) {
+          failure = ownershipLost ? `${ownershipLostReason}; wrapped up through message ${lastEnd}. Run /ctx-wrapup again to continue.` : leaseResult.reason === "timeout" ? `Timed out waiting for another process to release the compartment-state lease; wrapped up through message ${lastEnd}. Run /ctx-wrapup again to continue.` : "Another Magic Context rebuild started while wrapup was waiting. Run /ctx-wrapup again to continue.";
           break;
         }
+        const leaseHolder = leaseResult.holderId;
         const leaseRenewal = setInterval(() => {
           try {
             renewCompartmentLease(deps.db, sessionId, leaseHolder);
@@ -201812,6 +202718,7 @@ Chunk ${chunkIndex}: wrapping messages ${plan.snapshot.offset}-${plan.snapshot.e
             runner: deps.runner,
             historianModel: deps.historianModel,
             fallbackModels: deps.historianFallbacks,
+            fallbackModelId: modelKey,
             historianChunkTokens: deps.historianChunkTokens,
             boundarySnapshot: plan.snapshot,
             refreshBoundarySnapshot: () => resolveWrapupProtectedTailBoundary({
@@ -201897,15 +202804,19 @@ function resolvePiContextLimit(ctx) {
   }
   return 128000;
 }
-async function acquireCompartmentLeaseEventually(db, sessionId, renewWrapupMarker) {
+async function acquireCompartmentLeaseEventually(db, sessionId, renewWrapupMarker, maxWaitMs) {
+  const waitStartedAt = Date.now();
+  const remainingMs = () => Math.max(0, waitStartedAt + maxWaitMs - Date.now());
   for (;; ) {
+    if (remainingMs() <= 0)
+      return { ok: false, reason: "timeout" };
     const holderId = crypto4.randomUUID();
     const lease = acquireCompartmentLease(db, sessionId, holderId);
     if (lease)
-      return holderId;
+      return { ok: true, holderId };
     if (!renewWrapupMarker({}))
-      return null;
-    await new Promise((resolve3) => setTimeout(resolve3, LEASE_WAIT_MS));
+      return { ok: false, reason: "ownership_lost" };
+    await new Promise((resolve3) => setTimeout(resolve3, Math.min(LEASE_WAIT_MS, remainingMs())));
   }
 }
 function estimateChunks(tokens, chunkTokens) {
@@ -206393,16 +207304,16 @@ __export(exports_typebox, {
 // src/tools/ctx-expand.ts
 var ParamsSchema = exports_typebox.Object({
   start: exports_typebox.Optional(exports_typebox.Number({
-    description: "Start message ordinal (from compartment start attribute)"
+    description: `First message ordinal to expand — a compartment's start="N" attribute, or an ordinal from a ctx_search message hit`
   })),
   end: exports_typebox.Optional(exports_typebox.Number({
-    description: "End message ordinal (from compartment end attribute)"
+    description: `Last message ordinal to expand (inclusive) — a compartment's end="M" attribute`
   })),
   verbose: exports_typebox.Optional(exports_typebox.Boolean({
     description: "With start/end: list each message separately with its ordinal [N] and per-part preview, so you can recover one in full by ordinal."
   })),
   message: exports_typebox.Optional(exports_typebox.Number({
-    description: "Full untruncated recovery of ONE message by its ordinal (text + every tool call's full input/output). Recovers a tool output you dropped with ctx_reduce."
+    description: "Full untruncated recovery of ONE message by its ordinal (every text part + every tool call's complete input/output). Use an ordinal from a compartment, ctx_search hit, or verbose range. Recovers a tool output you dropped with ctx_reduce."
   }))
 });
 function ok(text) {
@@ -206553,25 +207464,45 @@ function formatMemoryList(memories) {
     id: String(m.id),
     category: m.category,
     status: m.status,
+    verification: m.verificationStatus,
     updated: new Date(m.updatedAt).toISOString(),
     content: m.content.replace(/\s+/g, " ").trim()
   }));
+  const headers = {
+    id: "ID",
+    category: "CATEGORY",
+    status: "STATUS",
+    verification: "VERIFY",
+    updated: "UPDATED",
+    content: "CONTENT"
+  };
   const widths = {
-    id: Math.max(2, ...rows.map((r) => r.id.length)),
-    category: Math.max(8, ...rows.map((r) => r.category.length)),
-    status: Math.max(6, ...rows.map((r) => r.status.length)),
-    updated: Math.max(7, ...rows.map((r) => r.updated.length))
+    id: Math.max(headers.id.length, ...rows.map((r) => r.id.length)),
+    category: Math.max(headers.category.length, ...rows.map((r) => r.category.length)),
+    status: Math.max(headers.status.length, ...rows.map((r) => r.status.length)),
+    verification: Math.max(headers.verification.length, ...rows.map((r) => r.verification.length)),
+    updated: Math.max(headers.updated.length, ...rows.map((r) => r.updated.length))
   };
   const fmt3 = (r) => [
     r.id.padEnd(widths.id),
     r.category.padEnd(widths.category),
     r.status.padEnd(widths.status),
+    r.verification.padEnd(widths.verification),
     r.updated.padEnd(widths.updated),
     r.content
   ].join(" | ");
   return [
     `Found ${rows.length} active ${rows.length === 1 ? "memory" : "memories"}:`,
     "",
+    fmt3(headers),
+    [
+      "-".repeat(widths.id),
+      "-".repeat(widths.category),
+      "-".repeat(widths.status),
+      "-".repeat(widths.verification),
+      "-".repeat(widths.updated),
+      "-------"
+    ].join("-+-"),
     ...rows.map(fmt3)
   ].join(`
 `);
@@ -206641,8 +207572,9 @@ function createCtxMemoryTool(deps) {
         const isOwn = targetIdentityForStoredPath(memory2.projectPath) === projectIdentity;
         if (isOwn)
           return true;
-        return toolShareCategories === null || toolShareCategories.includes(memory2.category);
+        return toolShareCategories?.includes(memory2.category) ?? false;
       };
+      const memoryOwnedByTool = (memory2) => workspaceIdentitySet.identities.length > 1 ? targetIdentityForStoredPath(memory2.projectPath) === projectIdentity : storedPathBelongsToIdentity(memory2.projectPath, projectIdentity);
       const snapshot = getProjectEmbeddingSnapshot(projectIdentity);
       if (snapshot ? !snapshot.features.memoryEnabled : deps.memoryEnabled === false) {
         return err2("Cross-session memory is disabled for this project.");
@@ -206689,7 +207621,8 @@ function createCtxMemoryTool(deps) {
           return err2("Error: 'content' is required when action is 'update'.");
         }
         const memory2 = getMemoryById(deps.db, updateId);
-        if (!memory2 || !memoryVisibleToTool(memory2)) {
+        const updateAllowed = memory2 ? dreamerAllowed ? memoryVisibleToTool(memory2) : memoryOwnedByTool(memory2) : false;
+        if (!memory2 || !updateAllowed) {
           return err2(`Error: Memory with ID ${updateId} was not found.`);
         }
         if (!dreamerAllowed && !isPrimaryMutableMemory(memory2)) {
@@ -206736,7 +207669,7 @@ function createCtxMemoryTool(deps) {
           return err2("Error: One or more source memories were not found.");
         }
         if (!dreamerAllowed) {
-          const foreign = sourceMemories.find((memory2) => !memoryVisibleToTool(memory2));
+          const foreign = sourceMemories.find((memory2) => !memoryOwnedByTool(memory2));
           if (foreign) {
             return err2(`Error: Memory with ID ${foreign.id} was not found.`);
           }
@@ -206838,7 +207771,8 @@ function createCtxMemoryTool(deps) {
         const archiveIds = [...new Set(rawArchiveIds)];
         for (const memoryId of archiveIds) {
           const memory2 = getMemoryById(deps.db, memoryId);
-          if (!memory2 || !memoryVisibleToTool(memory2)) {
+          const archiveAllowed = memory2 ? dreamerAllowed ? memoryVisibleToTool(memory2) : memoryOwnedByTool(memory2) : false;
+          if (!memory2 || !archiveAllowed) {
             return err2(`Error: Memory with ID ${memoryId} was not found.`);
           }
           if (!dreamerAllowed && !isPrimaryMutableMemory(memory2)) {
@@ -206977,6 +207911,7 @@ function createCtxNoteTool(deps) {
     parameters: ParamsSchema3,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const sessionId = ctx.sessionManager.getSessionId();
+      const dreamerEnabled = deps.resolveDreamerEnabled?.(ctx) ?? deps.dreamerEnabled;
       const action2 = params.action ?? (params.content?.trim() ? "write" : "read");
       if (action2 === "write") {
         const content = params.content?.trim();
@@ -206985,7 +207920,7 @@ function createCtxNoteTool(deps) {
         const anchorOrdinal = captureAnchorOrdinal(deps.db, sessionId);
         const surfaceCondition = params.surface_condition?.trim();
         if (surfaceCondition) {
-          if (deps.dreamerEnabled !== true) {
+          if (dreamerEnabled !== true) {
             return err3("Error: Smart notes require dreamer to be enabled. Enable dreamer in magic-context.jsonc to use surface_condition.");
           }
           const projectIdentity = resolveProjectIdentity(ctx.cwd);
@@ -206994,6 +207929,7 @@ function createCtxNoteTool(deps) {
           }
           const note2 = addNote(deps.db, "smart", {
             content,
+            sessionId,
             projectPath: projectIdentity,
             surfaceCondition,
             anchorOrdinal
@@ -207245,6 +208181,7 @@ function createCtxReduceTool(deps) {
     parameters: ParamsSchema4,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const sessionId = ctx.sessionManager.getSessionId();
+      const protectedTags = Math.max(0, Math.floor(deps.resolveProtectedTags?.(ctx) ?? deps.protectedTags));
       if (!params.drop) {
         return err4("Error: 'drop' must be provided.");
       }
@@ -207262,7 +208199,7 @@ function createCtxReduceTool(deps) {
         return err4(`Error: Unknown tag(s) ${formatIds(unknownIds)}. Check available tags in conversation.`);
       }
       const activeTags = allTags.filter((tag) => tag.status === "active");
-      const protectedTagIds = activeTags.map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, deps.protectedTags);
+      const protectedTagIds = activeTags.map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, protectedTags);
       const protectedSet = new Set(protectedTagIds);
       const tagStatusMap = new Map(allTags.map((tag) => [tag.tagNumber, tag.status]));
       const pendingOps = getPendingOps(deps.db, sessionId);
@@ -207489,18 +208426,430 @@ function createCtxSearchTool(deps) {
   };
 }
 
+// src/tools/todo-view-pi.ts
+import {
+  truncateToWidth as truncateToWidth2
+} from "@earendil-works/pi-tui";
+var TODO_TOOL_NAME = "todowrite";
+var TODOS_COMMAND_NAME = "todos";
+var WIDGET_KEY = "magic-context-todos";
+var MAX_TODO_CONTENT_ROWS = 12;
+var STATUS_GLYPH = {
+  pending: "○",
+  in_progress: "◐",
+  completed: "✓",
+  cancelled: "✗"
+};
+var STATUS_COLOR = {
+  pending: "dim",
+  in_progress: "warning",
+  completed: "success",
+  cancelled: "error"
+};
+var snapshotsBySession = new Map;
+function isTodoStatus2(value) {
+  return TODO_STATUSES.includes(value);
+}
+function isTodoPriority2(value) {
+  return TODO_PRIORITIES.includes(value);
+}
+function cloneTodos(todos) {
+  return todos.map((todo) => ({ ...todo }));
+}
+function parseTodos(input) {
+  if (!Array.isArray(input))
+    return null;
+  const todos = [];
+  for (const item of input) {
+    if (item === null || typeof item !== "object")
+      return null;
+    const raw = item;
+    if (typeof raw.content !== "string" || !isTodoStatus2(raw.status)) {
+      return null;
+    }
+    const todo = {
+      content: raw.content,
+      status: raw.status
+    };
+    if (isTodoPriority2(raw.priority))
+      todo.priority = raw.priority;
+    if (typeof raw.id === "string" && raw.id.length > 0)
+      todo.id = raw.id;
+    todos.push(todo);
+  }
+  return todos;
+}
+function parseTodoStateJson(stateJson) {
+  if (!stateJson)
+    return null;
+  try {
+    return parseTodos(JSON.parse(stateJson));
+  } catch {
+    return null;
+  }
+}
+function setTodoSnapshot(sessionId, todos) {
+  const parsed = parseTodos(todos);
+  if (parsed === null)
+    return false;
+  snapshotsBySession.set(sessionId, { todos: parsed });
+  return true;
+}
+function seedTodoSnapshotFromStateJson(sessionId, stateJson) {
+  const parsed = parseTodoStateJson(stateJson);
+  if (parsed === null) {
+    snapshotsBySession.delete(sessionId);
+    return false;
+  }
+  snapshotsBySession.set(sessionId, { todos: parsed });
+  return true;
+}
+function getTodoSnapshot(sessionId) {
+  if (!sessionId)
+    return { todos: [] };
+  const snapshot = snapshotsBySession.get(sessionId);
+  return { todos: snapshot ? cloneTodos(snapshot.todos) : [] };
+}
+function clearTodoSnapshot(sessionId) {
+  snapshotsBySession.delete(sessionId);
+}
+function getSessionId(ctx) {
+  try {
+    const id = ctx.sessionManager?.getSessionId?.();
+    return typeof id === "string" && id.length > 0 ? id : undefined;
+  } catch {
+    return;
+  }
+}
+function countTodos(todos) {
+  const counts = {
+    total: todos.length,
+    pending: 0,
+    inProgress: 0,
+    completed: 0,
+    cancelled: 0
+  };
+  for (const todo of todos) {
+    switch (todo.status) {
+      case "pending":
+        counts.pending++;
+        break;
+      case "in_progress":
+        counts.inProgress++;
+        break;
+      case "completed":
+        counts.completed++;
+        break;
+      case "cancelled":
+        counts.cancelled++;
+        break;
+    }
+  }
+  return counts;
+}
+function activeTitleCount(todos) {
+  return todos.filter((todo) => !TITLE_DONE_STATUSES.has(todo.status)).length;
+}
+function formatCounts(counts) {
+  if (counts.total === 0)
+    return "No todos";
+  const parts = [`${counts.completed}/${counts.total} completed`];
+  if (counts.inProgress > 0)
+    parts.push(`${counts.inProgress} in progress`);
+  if (counts.pending > 0)
+    parts.push(`${counts.pending} pending`);
+  if (counts.cancelled > 0)
+    parts.push(`${counts.cancelled} cancelled`);
+  return parts.join(" · ");
+}
+function formatTodoLine(todo, theme, options = {}) {
+  const glyph = theme.fg(STATUS_COLOR[todo.status], STATUS_GLYPH[todo.status]);
+  const id = options.showId && todo.id ? `${theme.fg("accent", `#${todo.id}`)} ` : "";
+  const color = todo.status === "pending" || todo.status === "in_progress" ? "text" : "dim";
+  let content = theme.fg(color, todo.content);
+  if (todo.status === "completed" || todo.status === "cancelled") {
+    content = theme.strikethrough(content);
+  }
+  return `${glyph} ${id}${content}`;
+}
+function formatCommandLine(todo) {
+  const id = todo.id ? `#${todo.id} ` : "";
+  return `  ${STATUS_GLYPH[todo.status]} ${id}${todo.content}`;
+}
+function lineComponent(renderLines) {
+  return {
+    render: renderLines,
+    invalidate() {}
+  };
+}
+function capTodoRows(rows) {
+  if (rows.length <= MAX_TODO_CONTENT_ROWS) {
+    return { visible: [...rows], hiddenCount: 0 };
+  }
+  const visibleCount = Math.max(0, MAX_TODO_CONTENT_ROWS - 1);
+  return {
+    visible: rows.slice(0, visibleCount),
+    hiddenCount: rows.length - visibleCount
+  };
+}
+function renderTodowriteCall(args, theme) {
+  const todos = parseTodos(args.todos) ?? [];
+  const active = activeTitleCount(todos);
+  const activeColor = active > 0 ? "warning" : "success";
+  const line = `${theme.fg("toolTitle", theme.bold("Todos"))} ${theme.fg("muted", "—")} ${theme.fg(activeColor, `${active} active`)}`;
+  return lineComponent((width) => [truncateToWidth2(line, width, "…")]);
+}
+function renderTodowriteResult(result, theme) {
+  const detailsTodos = result.details?.todos;
+  let todos = parseTodos(detailsTodos);
+  if (todos === null && Array.isArray(result.content)) {
+    const text = result.content.find((part) => part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string")?.text;
+    if (text) {
+      try {
+        todos = parseTodos(JSON.parse(text));
+      } catch {}
+    }
+  }
+  const renderedTodos = todos ?? [];
+  return lineComponent((width) => {
+    if (renderedTodos.length === 0)
+      return [theme.fg("dim", "No todos")];
+    const { visible, hiddenCount } = capTodoRows(renderedTodos);
+    const lines = visible.map((todo) => truncateToWidth2(formatTodoLine(todo, theme, { showId: true }), width, "…"));
+    if (hiddenCount > 0) {
+      lines.push(truncateToWidth2(theme.fg("dim", `+${hiddenCount} more`), width, "…"));
+    }
+    return lines;
+  });
+}
+function registerTodosCommand(pi) {
+  pi.registerCommand(TODOS_COMMAND_NAME, {
+    description: "Show the current Magic Context todo list",
+    handler: async (_args, ctx) => {
+      if (!ctx.hasUI) {
+        ctx.ui.notify("The /todos command requires interactive UI.", "error");
+        return;
+      }
+      const sessionId = getSessionId(ctx);
+      const todos = getTodoSnapshot(sessionId).todos;
+      if (todos.length === 0) {
+        ctx.ui.notify("No todos yet.", "info");
+        return;
+      }
+      const counts = countTodos(todos);
+      const lines = [formatCounts(counts)];
+      const groups = [
+        ["pending", "── Pending ──"],
+        ["in_progress", "── In Progress ──"],
+        ["completed", "── Completed ──"],
+        ["cancelled", "── Cancelled ──"]
+      ];
+      for (const [status, heading] of groups) {
+        const group = todos.filter((todo) => todo.status === status);
+        if (group.length === 0)
+          continue;
+        lines.push(heading);
+        const { visible, hiddenCount } = capTodoRows(group);
+        for (const todo of visible)
+          lines.push(formatCommandLine(todo));
+        if (hiddenCount > 0)
+          lines.push(`  +${hiddenCount} more`);
+      }
+      ctx.ui.notify(lines.join(`
+`), "info");
+    }
+  });
+}
+function todoKey(todo, index) {
+  return todo.id ? `id:${todo.id}` : `pos:${index}:${todo.content}`;
+}
+function isOverlayLive(todo) {
+  return todo.status === "pending" || todo.status === "in_progress";
+}
+
+class TodoOverlay {
+  uiCtx;
+  sessionId;
+  widgetRegistered = false;
+  tui;
+  completedTaskIdsPendingHide = new Set;
+  hiddenCompletedTaskIds = new Set;
+  lastTodoKeys = new Set;
+  setUICtx(sessionId, ctx) {
+    if (ctx !== this.uiCtx || sessionId !== this.sessionId) {
+      this.uiCtx = ctx;
+      this.sessionId = sessionId;
+      this.widgetRegistered = false;
+      this.tui = undefined;
+      this.resetCompletedDisplayState();
+    }
+  }
+  update(sessionId = this.sessionId) {
+    if (!this.uiCtx || !this.sessionId || sessionId !== this.sessionId)
+      return;
+    const todos = getTodoSnapshot(this.sessionId).todos;
+    this.pruneCompletedDisplayState(todos);
+    const visible = this.selectOverlayTodos(todos);
+    if (visible.length === 0) {
+      if (this.widgetRegistered) {
+        this.uiCtx.setWidget(WIDGET_KEY, undefined);
+        this.widgetRegistered = false;
+        this.tui = undefined;
+      }
+      return;
+    }
+    if (!this.widgetRegistered) {
+      this.uiCtx.setWidget(WIDGET_KEY, (tui, theme) => {
+        this.tui = tui;
+        return {
+          render: (width) => this.renderWidget(theme, width),
+          invalidate: () => {
+            this.widgetRegistered = false;
+            this.tui = undefined;
+          }
+        };
+      }, { placement: "aboveEditor" });
+      this.widgetRegistered = true;
+    } else {
+      this.tui?.requestRender();
+    }
+  }
+  resetCompletedDisplayState() {
+    this.completedTaskIdsPendingHide.clear();
+    this.hiddenCompletedTaskIds.clear();
+    this.lastTodoKeys.clear();
+  }
+  hideCompletedTasksFromPreviousTurn() {
+    if (this.completedTaskIdsPendingHide.size === 0)
+      return;
+    for (const taskId of this.completedTaskIdsPendingHide) {
+      this.hiddenCompletedTaskIds.add(taskId);
+    }
+    this.completedTaskIdsPendingHide.clear();
+    this.update();
+  }
+  disposeSession(sessionId) {
+    if (this.sessionId !== sessionId)
+      return;
+    this.dispose();
+  }
+  dispose() {
+    if (this.uiCtx)
+      this.uiCtx.setWidget(WIDGET_KEY, undefined);
+    this.widgetRegistered = false;
+    this.tui = undefined;
+    this.uiCtx = undefined;
+    this.sessionId = undefined;
+    this.resetCompletedDisplayState();
+  }
+  pruneCompletedDisplayState(todos) {
+    const currentKeys = new Set(todos.map((todo, index) => todoKey(todo, index)));
+    const hasSharedKeys = [...currentKeys].some((key) => this.lastTodoKeys.has(key));
+    if (this.lastTodoKeys.size > 0 && currentKeys.size > 0 && !hasSharedKeys) {
+      this.resetCompletedDisplayState();
+    }
+    this.lastTodoKeys = currentKeys;
+    const completedKeys = new Set(todos.map((todo, index) => ({ todo, key: todoKey(todo, index) })).filter(({ todo }) => todo.status === "completed").map(({ key }) => key));
+    for (const taskId of this.completedTaskIdsPendingHide) {
+      if (!completedKeys.has(taskId))
+        this.completedTaskIdsPendingHide.delete(taskId);
+    }
+    for (const taskId of this.hiddenCompletedTaskIds) {
+      if (!completedKeys.has(taskId))
+        this.hiddenCompletedTaskIds.delete(taskId);
+    }
+  }
+  selectOverlayTodos(todos) {
+    return todos.map((todo, index) => ({ todo, key: todoKey(todo, index) })).filter(({ todo, key }) => {
+      if (isOverlayLive(todo))
+        return true;
+      return todo.status === "completed" && !this.hiddenCompletedTaskIds.has(key);
+    });
+  }
+  renderWidget(theme, width) {
+    if (!this.sessionId)
+      return [];
+    const todos = getTodoSnapshot(this.sessionId).todos;
+    this.pruneCompletedDisplayState(todos);
+    const overlayTodos = this.selectOverlayTodos(todos);
+    if (overlayTodos.length === 0)
+      return [];
+    const counts = countTodos(todos);
+    const hasInProgress = counts.inProgress > 0;
+    const headingColor = hasInProgress ? "accent" : "dim";
+    const headingIcon = hasInProgress ? "●" : "○";
+    const heading = `${theme.fg(headingColor, headingIcon)} ${theme.fg(headingColor, "Todos")} ${theme.fg("muted", "—")} ${theme.fg("dim", formatCounts(counts))}`;
+    const truncate3 = (line) => truncateToWidth2(line, width, "…");
+    const lines = [truncate3(heading)];
+    const { visible, hiddenCount } = capTodoRows(overlayTodos);
+    for (const [index, { todo, key }] of visible.entries()) {
+      const isLast = index === visible.length - 1 && hiddenCount === 0;
+      const branch = theme.fg("dim", isLast ? "└─" : "├─");
+      lines.push(truncate3(`${branch} ${formatTodoLine(todo, theme, { showId: true })}`));
+      if (todo.status === "completed")
+        this.completedTaskIdsPendingHide.add(key);
+    }
+    if (hiddenCount > 0) {
+      lines.push(truncate3(`${theme.fg("dim", "└─")} ${theme.fg("dim", `+${hiddenCount} more`)}`));
+    }
+    return lines;
+  }
+}
+function registerTodoOverlay(pi, deps) {
+  const overlay = new TodoOverlay;
+  pi.on("session_start", async (_event, ctx) => {
+    const sessionId = getSessionId(ctx);
+    if (!sessionId)
+      return;
+    seedTodoSnapshotFromStateJson(sessionId, deps.readLastTodoState(sessionId));
+    if (!ctx.hasUI)
+      return;
+    overlay.setUICtx(sessionId, ctx.ui);
+    overlay.update(sessionId);
+  });
+  pi.on("agent_start", async () => {
+    overlay.hideCompletedTasksFromPreviousTurn();
+  });
+  pi.on("session_shutdown", async (_event, ctx) => {
+    const sessionId = getSessionId(ctx);
+    if (!sessionId)
+      return;
+    clearTodoSnapshot(sessionId);
+    overlay.disposeSession(sessionId);
+  });
+  pi.on("session_before_switch", async (_event, ctx) => {
+    const sessionId = getSessionId(ctx);
+    if (!sessionId)
+      return;
+    clearTodoSnapshot(sessionId);
+    overlay.disposeSession(sessionId);
+  });
+  return overlay;
+}
+function registerTodoStateLifecycle(pi, deps) {
+  pi.on("session_start", async (_event, ctx) => {
+    const sessionId = getSessionId(ctx);
+    if (!sessionId)
+      return;
+    seedTodoSnapshotFromStateJson(sessionId, deps.readLastTodoState(sessionId));
+  });
+  pi.on("session_shutdown", async (_event, ctx) => {
+    const sessionId = getSessionId(ctx);
+    if (sessionId)
+      clearTodoSnapshot(sessionId);
+  });
+  pi.on("session_before_switch", async (_event, ctx) => {
+    const sessionId = getSessionId(ctx);
+    if (sessionId)
+      clearTodoSnapshot(sessionId);
+  });
+}
+
 // src/tools/todowrite.ts
-var STATUS_VALUES = [
-  "pending",
-  "in_progress",
-  "completed",
-  "cancelled"
-];
-var PRIORITY_VALUES = ["high", "medium", "low"];
 var TodoItem = exports_typebox.Object({
   content: exports_typebox.String({ description: "Brief description of the task" }),
-  status: exports_typebox.Union(STATUS_VALUES.map((v) => exports_typebox.Literal(v))),
-  priority: exports_typebox.Optional(exports_typebox.Union(PRIORITY_VALUES.map((v) => exports_typebox.Literal(v)))),
+  status: exports_typebox.Union(TODO_STATUSES.map((v) => exports_typebox.Literal(v))),
+  priority: exports_typebox.Optional(exports_typebox.Union(TODO_PRIORITIES.map((v) => exports_typebox.Literal(v)))),
   id: exports_typebox.Optional(exports_typebox.String({ description: "Optional stable id for the todo" }))
 });
 var TodowriteParams = exports_typebox.Object({
@@ -207508,34 +208857,24 @@ var TodowriteParams = exports_typebox.Object({
     description: "Replace the current task list with this complete set of todos. Include every task you intend to track this turn — pending, in_progress, completed, or cancelled — because the list overwrites previous state."
   })
 });
-var TOOL_DESCRIPTION = [
-  "Manage your task list for this session.",
-  "",
-  "Use this tool to plan multi-step work, track in-flight tasks, and",
-  "mark progress as you complete steps. Pass the COMPLETE updated list",
-  "of todos every time — this tool replaces the prior list rather than",
-  "appending to it.",
-  "",
-  "Task states:",
-  "  - pending: not started yet",
-  "  - in_progress: currently working on (limit to ONE task at a time)",
-  "  - completed: finished successfully",
-  "  - cancelled: no longer needed",
-  "",
-  "Use this tool proactively for non-trivial work spanning 3+ steps.",
-  "Skip it for single-shot answers or trivial 1-2 step tasks."
-].join(`
-`);
+var PROMPT_SNIPPET = "Manage a task list to track multi-step progress";
+var PROMPT_GUIDELINES = [
+  "Use `todowrite` for non-trivial work spanning 3+ steps, when the user gives you multiple tasks, or when you need to track progress across a verify/fix loop. Skip it for single-shot answers or trivial one-step work.",
+  "Pass the COMPLETE updated todo list every time. This tool replaces the prior list rather than appending to it, so include pending, in_progress, completed, and cancelled tasks that should remain visible.",
+  "When starting a task, mark exactly one todo `in_progress` before doing the work. Mark items `completed` immediately when done; use `cancelled` only for work that is no longer needed.",
+  "Never mark a todo completed if verification is failing, implementation is partial, or an unresolved blocker remains. Keep it `in_progress` and add or update a todo for the blocker instead."
+];
 function createTodowriteTool() {
   return {
-    name: "todowrite",
+    name: TODO_TOOL_NAME,
     label: "Todos",
-    description: TOOL_DESCRIPTION,
+    description: "Manage the session task list.",
+    promptSnippet: PROMPT_SNIPPET,
+    promptGuidelines: PROMPT_GUIDELINES,
     parameters: TodowriteParams,
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
       const todos = params.todos ?? [];
-      const completed = todos.filter((t) => t.status === "completed").length;
-      const active = todos.length - completed;
+      const active = todos.filter((todo) => !TITLE_DONE_STATUSES.has(todo.status)).length;
       return {
         content: [
           {
@@ -207549,6 +208888,12 @@ function createTodowriteTool() {
           truncated: false
         }
       };
+    },
+    renderCall(args, theme) {
+      return renderTodowriteCall(args, theme);
+    },
+    renderResult(result, _opts, theme) {
+      return renderTodowriteResult(result, theme);
     }
   };
 }
@@ -207574,15 +208919,22 @@ function registerMagicContextTools(pi, opts) {
   if (!opts.sessionScopedToolsDisabled) {
     pi.registerTool(createCtxNoteTool({
       db: opts.db,
-      dreamerEnabled: opts.dreamerEnabled ?? false
+      dreamerEnabled: opts.dreamerEnabled ?? false,
+      resolveDreamerEnabled: opts.resolveDreamerEnabled
     }));
     pi.registerTool(createCtxExpandTool({ db: opts.db }));
   }
-  pi.registerTool(createTodowriteTool());
+  if (opts.todowriteEnabled !== false) {
+    pi.registerTool(createTodowriteTool());
+    if (opts.todowriteCommandEnabled !== false) {
+      registerTodosCommand(pi);
+    }
+  }
   if (!opts.sessionScopedToolsDisabled) {
     pi.registerTool(createCtxReduceTool({
       db: opts.db,
-      protectedTags: opts.protectedTags ?? 20
+      protectedTags: opts.protectedTags ?? 20,
+      resolveProtectedTags: opts.resolveProtectedTags
     }));
   }
 }
@@ -207594,6 +208946,10 @@ function resolveCurrentProject(ctx) {
   const projectIdentity = resolveProjectIdentityOrFallback(projectDir);
   return { projectDir, projectIdentity };
 }
+function signalPiDeferredCompactionMarkerDrain(sessionId) {
+  signalPiDeferredHistoryRefresh(sessionId);
+  signalPiDeferredMaterialization(sessionId);
+}
 function persistPiMessageEndModelMeta(args) {
   if (!args.message || typeof args.message !== "object")
     return;
@@ -207609,6 +208965,55 @@ function persistPiMessageEndModelMeta(args) {
     updateSessionMeta(args.db, args.sessionId, { cacheTtl });
   }
 }
+function getCompatiblePiTodoCapture(todos) {
+  if (!Array.isArray(todos))
+    return null;
+  const normalized = normalizeTodoStateJson(todos);
+  if (normalized === null)
+    return null;
+  return { normalized, todos };
+}
+function applyCompatiblePiTodoCapture(args) {
+  if (args.todowriteEnabled) {
+    setTodoSnapshot(args.sessionId, args.capture.todos);
+    args.todoOverlay?.update(args.sessionId);
+  }
+  if (args.persist) {
+    updateSessionMeta(args.db, args.sessionId, {
+      lastTodoState: args.capture.normalized
+    });
+  }
+}
+function capturePiTodowriteArgsIfCompatible(args) {
+  const capture = getCompatiblePiTodoCapture(args.todos);
+  if (capture === null)
+    return false;
+  applyCompatiblePiTodoCapture({ ...args, capture });
+  return true;
+}
+function capturePiTodowriteMessageIfCompatible(args) {
+  const msg = args.message;
+  if (msg?.role !== "assistant" || !Array.isArray(msg.content)) {
+    return false;
+  }
+  for (const block of msg.content) {
+    if (!block || typeof block !== "object")
+      continue;
+    const b = block;
+    if (b.type !== "toolCall")
+      continue;
+    if (typeof b.name !== "string")
+      continue;
+    if (b.name !== "todowrite")
+      continue;
+    const capture = getCompatiblePiTodoCapture(b.arguments?.todos);
+    if (capture === null)
+      continue;
+    applyCompatiblePiTodoCapture({ ...args, capture });
+    return true;
+  }
+  return false;
+}
 function info(message, data) {
   log(`${PREFIX} ${message}`, data);
 }
@@ -207616,6 +209021,7 @@ function warn(message, data) {
   log(`${PREFIX} WARN ${message}`, data);
 }
 var migratedConfigDirs = new Set;
+var loggedPiConfigDirs = new Set;
 function ensureConfigLocationsMigrated(dir) {
   if (migratedConfigDirs.has(dir))
     return;
@@ -207625,6 +209031,28 @@ function ensureConfigLocationsMigrated(dir) {
     info: (m) => info(m)
   });
 }
+function logPiConfigLoad(args) {
+  const key = resolve3(args.dir);
+  if (args.dedupe && loggedPiConfigDirs.has(key))
+    return;
+  if (args.dedupe) {
+    loggedPiConfigDirs.add(key);
+  }
+  if (args.loadedFromPaths.length > 0) {
+    info(`config loaded from: ${args.loadedFromPaths.join(", ")}`);
+  } else {
+    info("config: no magic-context.jsonc found, using schema defaults");
+  }
+  for (const warning of args.warnings) {
+    warn(`config: ${warning}`);
+  }
+}
+var __test = {
+  logPiConfigLoad,
+  resetLoggedPiConfigDirs() {
+    loggedPiConfigDirs.clear();
+  }
+};
 function formatTokens(value) {
   return value.toLocaleString();
 }
@@ -207798,8 +209226,7 @@ async function src_default2(pi) {
   try {
     const pendingPiMarkerSessions = getSessionsWithPendingPiMarker(db);
     for (const sid of pendingPiMarkerSessions) {
-      signalPiDeferredHistoryRefresh(sid);
-      signalPiDeferredMaterialization(sid);
+      signalPiDeferredCompactionMarkerDrain(sid);
     }
     if (pendingPiMarkerSessions.length > 0) {
       log(`${PREFIX} rehydrated ${pendingPiMarkerSessions.length} Pi deferred compaction marker session(s)`);
@@ -207812,14 +209239,12 @@ async function src_default2(pi) {
   const { config: config2, warnings, loadedFromPaths } = loadPiConfig({
     cwd: projectDir
   });
-  if (loadedFromPaths.length > 0) {
-    info(`config loaded from: ${loadedFromPaths.join(", ")}`);
-  } else {
-    info("config: no magic-context.jsonc found, using schema defaults");
-  }
-  for (const w of warnings) {
-    warn(`config: ${w}`);
-  }
+  logPiConfigLoad({
+    dir: projectDir,
+    loadedFromPaths,
+    warnings,
+    dedupe: true
+  });
   setSqlitePragmaConfig({
     cacheSizeMb: config2.sqlite.cache_size_mb,
     mmapSizeMb: config2.sqlite.mmap_size_mb
@@ -207832,26 +209257,7 @@ async function src_default2(pi) {
   }
   await ensureProjectRegisteredFromPiDirectory(projectDir, db);
   info(`registered embedding config for project ${projectIdentity}`);
-  registerMagicContextTools(pi, {
-    db,
-    ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
-    allowDreamerActions: false,
-    memoryToolEnabled: true,
-    protectedTags: config2.protected_tags ?? 20,
-    dreamerEnabled: isDreamerRunnable(config2)
-  });
-  info("registered tools: ctx_search, ctx_memory, ctx_note, ctx_expand, ctx_reduce");
-  const historianConfig = resolveHistorianFromConfig(config2);
-  if (historianConfig) {
-    historianConfig.onStatusChange = (ctx) => {
-      updateStatusLine(ctx, {
-        db,
-        projectIdentity: resolveCurrentProject(ctx).projectIdentity
-      });
-    };
-  }
-  const autoSearchConfig = resolveAutoSearchFromConfig(config2);
-  const contextOptionsByDir = new Map;
+  const projectDepsByDir = new Map;
   const buildContextOptions = (cfg, hist, auto) => ({
     db: database,
     smartDrops: cfg.smart_drops === true,
@@ -207892,46 +209298,117 @@ async function src_default2(pi) {
       });
     }
   });
-  function resolveContextOptionsForProject(dir) {
-    const cached2 = contextOptionsByDir.get(dir);
-    if (cached2)
-      return cached2;
-    ensureConfigLocationsMigrated(dir);
-    const switchedConfig = loadPiConfig({ cwd: dir }).config;
-    const switchedHistorian = resolveHistorianFromConfig(switchedConfig);
-    if (switchedHistorian) {
-      switchedHistorian.onStatusChange = (ctx) => {
+  function buildProjectDeps(dir, identity, cfg) {
+    const hist = resolveHistorianFromConfig(cfg);
+    if (hist) {
+      hist.onStatusChange = (ctx) => {
         updateStatusLine(ctx, {
           db: database,
           projectIdentity: resolveCurrentProject(ctx).projectIdentity
         });
       };
     }
-    const built = buildContextOptions(switchedConfig, switchedHistorian, resolveAutoSearchFromConfig(switchedConfig));
-    contextOptionsByDir.set(dir, built);
+    const auto = resolveAutoSearchFromConfig(cfg);
+    return {
+      projectDir: dir,
+      projectIdentity: identity,
+      config: cfg,
+      historianConfig: hist,
+      autoSearchConfig: auto,
+      contextOptions: buildContextOptions(cfg, hist, auto),
+      sidekickConfig: resolveSidekickFromConfig(cfg),
+      dreamerConfig: resolveDreamerFromConfig(cfg),
+      dreamerEnabled: isDreamerRunnable(cfg)
+    };
+  }
+  function resolveProjectDepsForDir(dir, identityOverride) {
+    const cached2 = projectDepsByDir.get(dir);
+    if (cached2)
+      return cached2;
+    ensureConfigLocationsMigrated(dir);
+    const switchedLoad = loadPiConfig({ cwd: dir });
+    logPiConfigLoad({
+      dir,
+      loadedFromPaths: switchedLoad.loadedFromPaths,
+      warnings: switchedLoad.warnings,
+      dedupe: true
+    });
+    const switchedConfig = switchedLoad.config;
+    const switchedIdentity = identityOverride ?? resolveProjectIdentityOrFallback(dir);
+    const built = buildProjectDeps(dir, switchedIdentity, switchedConfig);
+    projectDepsByDir.set(dir, built);
     return built;
   }
-  const bootContextOptions = buildContextOptions(config2, historianConfig, autoSearchConfig);
-  contextOptionsByDir.set(projectDir, bootContextOptions);
-  registerPiContextHandler(pi, bootContextOptions);
-  info(historianConfig ? `registered historian trigger (model=${historianConfig.model}, executeThreshold=${formatExecuteThresholdForLog(historianConfig.executeThresholdPercentage)})` : "registered historian trigger: DISABLED (set historian.model in magic-context.jsonc)");
-  info(autoSearchConfig.enabled ? `registered auto-search hint (threshold=${autoSearchConfig.scoreThreshold}, minChars=${autoSearchConfig.minPromptChars})` : "registered auto-search hint: DISABLED (memory.auto_search.enabled=false)");
-  const sidekickConfig = resolveSidekickFromConfig(config2);
-  registerCtxAugCommand(pi, sidekickConfig);
-  info(sidekickConfig ? `registered /ctx-aug (sidekick model=${sidekickConfig.model})` : "registered /ctx-aug (sidekick disabled — set sidekick.disable=false and sidekick.model in config)");
+  function resolveCurrentProjectDeps(ctx) {
+    const currentProject = resolveCurrentProject(ctx);
+    return resolveProjectDepsForDir(currentProject.projectDir, currentProject.projectIdentity);
+  }
+  function resolveContextOptionsForProject(dir) {
+    return resolveProjectDepsForDir(dir).contextOptions;
+  }
+  const bootProjectDeps = buildProjectDeps(projectDir, projectIdentity, config2);
+  projectDepsByDir.set(projectDir, bootProjectDeps);
+  const todowriteEnabled = bootProjectDeps.config.todowrite.enabled !== false;
+  const todowriteOverlayEnabled = todowriteEnabled && bootProjectDeps.config.todowrite.overlay !== false;
+  registerMagicContextTools(pi, {
+    db,
+    ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
+    allowDreamerActions: false,
+    memoryToolEnabled: true,
+    protectedTags: config2.protected_tags ?? 20,
+    resolveProtectedTags: (ctx) => resolveCurrentProjectDeps(ctx).config.protected_tags ?? 20,
+    dreamerEnabled: isDreamerRunnable(config2),
+    resolveDreamerEnabled: (ctx) => resolveCurrentProjectDeps(ctx).dreamerEnabled,
+    todowriteEnabled
+  });
+  info(todowriteEnabled ? "registered tools: ctx_search, ctx_memory, ctx_note, ctx_expand, todowrite, ctx_reduce; registered /todos" : "registered tools: ctx_search, ctx_memory, ctx_note, ctx_expand, ctx_reduce (todowrite disabled)");
+  const readLastTodoState = (sessionId) => getOrCreateSessionMeta(db, sessionId).lastTodoState;
+  if (todowriteEnabled) {
+    registerTodoStateLifecycle(pi, { readLastTodoState });
+  }
+  const todoOverlay = todowriteOverlayEnabled ? registerTodoOverlay(pi, {
+    readLastTodoState
+  }) : undefined;
+  info(todowriteOverlayEnabled ? "registered todowrite overlay" : "registered todowrite overlay: DISABLED (todowrite.enabled=false or todowrite.overlay=false)");
+  registerPiContextHandler(pi, bootProjectDeps.contextOptions);
+  info(bootProjectDeps.historianConfig ? `registered historian trigger (model=${bootProjectDeps.historianConfig.model}, executeThreshold=${formatExecuteThresholdForLog(bootProjectDeps.historianConfig.executeThresholdPercentage)})` : "registered historian trigger: DISABLED (set historian.model in magic-context.jsonc)");
+  info(bootProjectDeps.autoSearchConfig.enabled ? `registered auto-search hint (threshold=${bootProjectDeps.autoSearchConfig.scoreThreshold}, minChars=${bootProjectDeps.autoSearchConfig.minPromptChars})` : "registered auto-search hint: DISABLED (memory.auto_search.enabled=false)");
+  registerCtxAugCommand(pi, (ctx) => resolveCurrentProjectDeps(ctx).sidekickConfig);
+  info(bootProjectDeps.sidekickConfig ? `registered /ctx-aug (sidekick model=${bootProjectDeps.sidekickConfig.model})` : "registered /ctx-aug (sidekick disabled — set sidekick.disable=false and sidekick.model in config)");
+  const recompRunner = new PiSubagentRunner;
+  const wrapupRunner = new PiSubagentRunner;
+  const upgradeRunner = new PiSubagentRunner;
   registerCtxStatusCommand(pi, {
     db,
     projectIdentity,
     resolveProject: resolveCurrentProject,
-    protectedTags: config2.protected_tags,
-    executeThresholdPercentage: config2.execute_threshold_percentage,
-    historyBudgetPercentage: config2.history_budget_percentage,
-    injectionBudgetTokens: config2.memory?.injection_budget_tokens,
-    commitClusterTrigger: config2.commit_cluster_trigger,
-    executeThresholdTokens: config2.execute_threshold_tokens,
+    protectedTags: bootProjectDeps.config.protected_tags,
+    executeThresholdPercentage: bootProjectDeps.config.execute_threshold_percentage,
+    historyBudgetPercentage: bootProjectDeps.config.history_budget_percentage,
+    injectionBudgetTokens: bootProjectDeps.config.memory?.injection_budget_tokens,
+    commitClusterTrigger: bootProjectDeps.config.commit_cluster_trigger,
+    executeThresholdTokens: bootProjectDeps.config.execute_threshold_tokens,
     dreamer: {
-      runnable: isDreamerRunnable(config2),
-      scheduleSummary: summarizeDreamSchedule(config2.dreamer)
+      runnable: bootProjectDeps.dreamerEnabled,
+      scheduleSummary: summarizeDreamSchedule(bootProjectDeps.config.dreamer)
+    },
+    resolveStatusDeps: (ctx) => {
+      const current = resolveCurrentProjectDeps(ctx);
+      return {
+        db,
+        projectIdentity: current.projectIdentity,
+        resolveProject: resolveCurrentProject,
+        protectedTags: current.config.protected_tags,
+        executeThresholdPercentage: current.config.execute_threshold_percentage,
+        historyBudgetPercentage: current.config.history_budget_percentage,
+        injectionBudgetTokens: current.config.memory?.injection_budget_tokens,
+        commitClusterTrigger: current.config.commit_cluster_trigger,
+        executeThresholdTokens: current.config.execute_threshold_tokens,
+        dreamer: {
+          runnable: current.dreamerEnabled,
+          scheduleSummary: summarizeDreamSchedule(current.config.dreamer)
+        }
+      };
     }
   });
   info("registered /ctx-status");
@@ -207941,45 +209418,94 @@ async function src_default2(pi) {
   info("registered /ctx-flush");
   registerCtxRecompCommand(pi, {
     db,
-    runner: new PiSubagentRunner,
-    historianModel: historianConfig?.model,
-    historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(historianConfig?.model)),
-    historianFallbacks: historianConfig?.fallbackModels,
-    historianTimeoutMs: config2.historian_timeout_ms,
-    historianThinkingLevel: historianConfig?.thinkingLevel,
-    language: config2.language,
-    memoryEnabled: config2.memory.enabled,
-    autoPromote: config2.memory.auto_promote
+    runner: recompRunner,
+    historianModel: bootProjectDeps.historianConfig?.model,
+    historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(bootProjectDeps.historianConfig?.model)),
+    historianFallbacks: bootProjectDeps.historianConfig?.fallbackModels,
+    historianTimeoutMs: bootProjectDeps.config.historian_timeout_ms,
+    historianThinkingLevel: bootProjectDeps.historianConfig?.thinkingLevel,
+    language: bootProjectDeps.config.language,
+    memoryEnabled: bootProjectDeps.config.memory.enabled,
+    autoPromote: bootProjectDeps.config.memory.auto_promote,
+    resolveRuntimeDeps: (ctx) => {
+      const current = resolveCurrentProjectDeps(ctx);
+      return {
+        db,
+        runner: recompRunner,
+        historianModel: current.historianConfig?.model,
+        historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(current.historianConfig?.model)),
+        historianFallbacks: current.historianConfig?.fallbackModels,
+        historianTimeoutMs: current.config.historian_timeout_ms,
+        historianThinkingLevel: current.historianConfig?.thinkingLevel,
+        language: current.config.language,
+        memoryEnabled: current.config.memory.enabled,
+        autoPromote: current.config.memory.auto_promote
+      };
+    }
   });
   info("registered /ctx-recomp");
   registerCtxWrapupCommand(pi, {
     db,
-    runner: new PiSubagentRunner,
-    historianModel: historianConfig?.model,
-    historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(historianConfig?.model)),
-    historianFallbacks: historianConfig?.fallbackModels,
-    historianTimeoutMs: config2.historian_timeout_ms,
-    historianThinkingLevel: historianConfig?.thinkingLevel,
-    language: config2.language,
-    memoryEnabled: config2.memory.enabled,
-    autoPromote: config2.memory.auto_promote,
-    userMemoriesEnabled: userMemoryCollectionEnabled(config2.dreamer),
-    executeThresholdPercentage: config2.execute_threshold_percentage,
-    executeThresholdTokens: config2.execute_threshold_tokens
+    runner: wrapupRunner,
+    historianModel: bootProjectDeps.historianConfig?.model,
+    historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(bootProjectDeps.historianConfig?.model)),
+    historianFallbacks: bootProjectDeps.historianConfig?.fallbackModels,
+    historianTimeoutMs: bootProjectDeps.config.historian_timeout_ms,
+    historianThinkingLevel: bootProjectDeps.historianConfig?.thinkingLevel,
+    language: bootProjectDeps.config.language,
+    memoryEnabled: bootProjectDeps.config.memory.enabled,
+    autoPromote: bootProjectDeps.config.memory.auto_promote,
+    userMemoriesEnabled: userMemoryCollectionEnabled(bootProjectDeps.config.dreamer),
+    executeThresholdPercentage: bootProjectDeps.config.execute_threshold_percentage,
+    executeThresholdTokens: bootProjectDeps.config.execute_threshold_tokens,
+    resolveRuntimeDeps: (ctx) => {
+      const current = resolveCurrentProjectDeps(ctx);
+      return {
+        db,
+        runner: wrapupRunner,
+        historianModel: current.historianConfig?.model,
+        historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(current.historianConfig?.model)),
+        historianFallbacks: current.historianConfig?.fallbackModels,
+        historianTimeoutMs: current.config.historian_timeout_ms,
+        historianThinkingLevel: current.historianConfig?.thinkingLevel,
+        language: current.config.language,
+        memoryEnabled: current.config.memory.enabled,
+        autoPromote: current.config.memory.auto_promote,
+        userMemoriesEnabled: userMemoryCollectionEnabled(current.config.dreamer),
+        executeThresholdPercentage: current.config.execute_threshold_percentage,
+        executeThresholdTokens: current.config.execute_threshold_tokens
+      };
+    }
   });
   info("registered /ctx-wrapup");
   registerCtxSessionUpgradeCommand(pi, {
     db,
-    runner: new PiSubagentRunner,
-    historianModel: historianConfig?.model,
-    historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(historianConfig?.model)),
-    historianFallbacks: historianConfig?.fallbackModels,
-    historianTimeoutMs: config2.historian_timeout_ms,
-    historianThinkingLevel: historianConfig?.thinkingLevel,
-    language: config2.language,
-    memoryEnabled: config2.memory.enabled,
-    autoPromote: config2.memory.auto_promote,
-    userMemoriesEnabled: userMemoryCollectionEnabled(config2.dreamer)
+    runner: upgradeRunner,
+    historianModel: bootProjectDeps.historianConfig?.model,
+    historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(bootProjectDeps.historianConfig?.model)),
+    historianFallbacks: bootProjectDeps.historianConfig?.fallbackModels,
+    historianTimeoutMs: bootProjectDeps.config.historian_timeout_ms,
+    historianThinkingLevel: bootProjectDeps.historianConfig?.thinkingLevel,
+    language: bootProjectDeps.config.language,
+    memoryEnabled: bootProjectDeps.config.memory.enabled,
+    autoPromote: bootProjectDeps.config.memory.auto_promote,
+    userMemoriesEnabled: userMemoryCollectionEnabled(bootProjectDeps.config.dreamer),
+    resolveRuntimeDeps: (ctx) => {
+      const current = resolveCurrentProjectDeps(ctx);
+      return {
+        db,
+        runner: upgradeRunner,
+        historianModel: current.historianConfig?.model,
+        historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(current.historianConfig?.model)),
+        historianFallbacks: current.historianConfig?.fallbackModels,
+        historianTimeoutMs: current.config.historian_timeout_ms,
+        historianThinkingLevel: current.historianConfig?.thinkingLevel,
+        language: current.config.language,
+        memoryEnabled: current.config.memory.enabled,
+        autoPromote: current.config.memory.auto_promote,
+        userMemoriesEnabled: userMemoryCollectionEnabled(current.config.dreamer)
+      };
+    }
   });
   info("registered /ctx-session-upgrade");
   registerCtxDreamCommand(pi, {
@@ -207987,7 +209513,8 @@ async function src_default2(pi) {
     projectDir,
     projectIdentity,
     resolveProject: resolveCurrentProject,
-    dreamerEnabled: isDreamerRunnable(config2),
+    dreamerEnabled: bootProjectDeps.dreamerEnabled,
+    resolveDreamerEnabled: (ctx) => resolveCurrentProjectDeps(ctx).dreamerEnabled,
     onProjectSeen: (identity) => seenDreamerProjectIdentities.add(identity)
   });
   info("registered /ctx-dream");
@@ -207995,26 +209522,27 @@ async function src_default2(pi) {
     db,
     projectDir,
     projectIdentity,
-    memoryEnabled: config2.memory.enabled,
+    memoryEnabled: bootProjectDeps.config.memory.enabled,
+    resolveMemoryEnabled: (ctx) => resolveCurrentProjectDeps(ctx).config.memory.enabled,
     resolveProject: resolveCurrentProject
   });
   info("registered /ctx-embed");
-  const dreamerConfig = resolveDreamerFromConfig(config2);
+  const dreamerConfig = bootProjectDeps.dreamerConfig;
   if (dreamerConfig) {
     registerPiDreamerProject({
       db,
       projectDir,
       projectIdentity,
       config: dreamerConfig,
-      embeddingConfig: config2.embedding,
-      memoryEnabled: config2.memory.enabled,
-      language: config2.language,
-      gitCommitIndexing: config2.memory.git_commit_indexing,
+      embeddingConfig: bootProjectDeps.config.embedding,
+      memoryEnabled: bootProjectDeps.config.memory.enabled,
+      language: bootProjectDeps.config.language,
+      gitCommitIndexing: bootProjectDeps.config.memory.git_commit_indexing,
       onAdjunctsRefreshNeeded: signalPiSystemPromptRefreshForProject
     });
     info(`registered dreamer (${summarizeDreamSchedule(dreamerConfig)})`);
   } else {
-    info(isDreamerRunnable(config2) ? "registered dreamer: DISABLED (no dreamer config)" : "registered dreamer: DISABLED (dreamer.disable=true or no dreamer config)");
+    info(bootProjectDeps.dreamerEnabled ? "registered dreamer: DISABLED (no dreamer config)" : "registered dreamer: DISABLED (dreamer.disable=true or no dreamer config)");
   }
   pi.on("before_agent_start", async (event, ctx) => {
     try {
@@ -208035,13 +209563,14 @@ async function src_default2(pi) {
       }
     } catch {}
     try {
-      const currentProject = resolveCurrentProject(ctx);
+      const effectiveProjectDeps = resolveCurrentProjectDeps(ctx);
+      const currentProject = {
+        projectDir: effectiveProjectDeps.projectDir,
+        projectIdentity: effectiveProjectDeps.projectIdentity
+      };
+      const effectiveConfig = effectiveProjectDeps.config;
       seenDreamerProjectIdentities.add(currentProject.projectIdentity);
-      const switchedProject = currentProject.projectDir !== projectDir;
-      if (switchedProject)
-        ensureConfigLocationsMigrated(currentProject.projectDir);
-      const effectiveConfig = switchedProject ? loadPiConfig({ cwd: currentProject.projectDir }).config : config2;
-      const effectiveDreamerConfig = switchedProject ? resolveDreamerFromConfig(effectiveConfig) : dreamerConfig;
+      const effectiveDreamerConfig = effectiveProjectDeps.dreamerConfig;
       if (effectiveDreamerConfig) {
         try {
           registerPiDreamerProject({
@@ -208051,13 +209580,14 @@ async function src_default2(pi) {
             config: effectiveDreamerConfig,
             embeddingConfig: effectiveConfig.embedding,
             memoryEnabled: effectiveConfig.memory.enabled,
+            language: effectiveConfig.language,
             gitCommitIndexing: effectiveConfig.memory.git_commit_indexing,
             onAdjunctsRefreshNeeded: signalPiSystemPromptRefreshForProject
           });
         } catch (err5) {
           warn("before_agent_start: registerPiDreamerProject threw:", err5);
         }
-      } else if (switchedProject) {
+      } else {
         try {
           unregisterPiDreamerProject({
             projectIdentity: currentProject.projectIdentity
@@ -208084,11 +209614,10 @@ async function src_default2(pi) {
           const smForDrain = sm;
           const canDrain = typeof smForDrain.appendCompaction === "function" && typeof smForDrain.getBranch === "function";
           if (canDrain && getPendingPiCompactionMarkerState(db, sessionId)) {
-            signalPiDeferredHistoryRefresh(sessionId);
-            signalPiPendingMaterialization(sessionId);
+            signalPiDeferredCompactionMarkerDrain(sessionId);
           }
         } catch {}
-        if (ctx.hasUI && historianConfig?.model) {
+        if (ctx.hasUI && effectiveProjectDeps.historianConfig?.model) {
           maybeSendUpgradeReminder({
             client: null,
             db,
@@ -208109,7 +209638,6 @@ async function src_default2(pi) {
         return;
       }
       const isCacheBusting = sessionId ? hasSystemPromptRefresh(sessionId) : true;
-      const effectiveDreamerRunnable = switchedProject ? isDreamerRunnable(effectiveConfig) : isDreamerRunnable(config2);
       const block = buildMagicContextBlock({
         db,
         cwd: currentProject.projectDir,
@@ -208118,7 +209646,7 @@ async function src_default2(pi) {
         includeGuidance: true,
         protectedTags: effectiveConfig.protected_tags,
         ctxReduceCallable: true,
-        dreamerEnabled: effectiveDreamerRunnable,
+        dreamerEnabled: effectiveProjectDeps.dreamerEnabled,
         temporalAwarenessEnabled: effectiveConfig.temporal_awareness ?? false,
         cavemanTextCompressionEnabled: effectiveConfig.caveman_text_compression?.enabled === true,
         language: effectiveConfig.language,
@@ -208176,14 +209704,14 @@ ${block}` : event.systemPrompt;
         const todoArgs = event.args;
         const todos = todoArgs?.todos;
         const sessionMeta = Array.isArray(todos) ? getOrCreateSessionMeta(db, sessionId) : null;
-        if (sessionMeta && !sessionMeta.isSubagent) {
-          const normalizedTodos = normalizeTodoStateJson(todos);
-          if (normalizedTodos !== null) {
-            updateSessionMeta(db, sessionId, {
-              lastTodoState: normalizedTodos
-            });
-          }
-        }
+        capturePiTodowriteArgsIfCompatible({
+          db,
+          sessionId,
+          todos,
+          todowriteEnabled,
+          todoOverlay,
+          persist: Boolean(sessionMeta && !sessionMeta.isSubagent)
+        });
         if (Array.isArray(todos) && todos.length > 0 && todos.every((t) => t.status === "completed" || t.status === "cancelled")) {
           if (sessionMeta && !sessionMeta.isSubagent) {
             onNoteTrigger(db, sessionId, "todos_complete");
@@ -208264,7 +209792,7 @@ ${block}` : event.systemPrompt;
         db,
         sessionId,
         message: event.message,
-        cacheTtlConfig: config2.cache_ttl
+        cacheTtlConfig: resolveCurrentProjectDeps(ctx).config.cache_ttl
       });
       const piUsage = ctx.getContextUsage?.();
       const piContextWindow = piUsage && typeof piUsage.contextWindow === "number" && piUsage.contextWindow > 0 ? piUsage.contextWindow : ctx.model?.contextWindow ?? 0;
@@ -208286,32 +209814,14 @@ ${block}` : event.systemPrompt;
       try {
         const sessionMetaForTodo = getOrCreateSessionMeta(db, sessionId);
         if (!sessionMetaForTodo.isSubagent) {
-          const msg = event.message;
-          if (msg && msg.role === "assistant" && Array.isArray(msg.content)) {
-            for (const block of msg.content) {
-              if (!block || typeof block !== "object")
-                continue;
-              const b = block;
-              if (b.type !== "toolCall")
-                continue;
-              if (typeof b.name !== "string")
-                continue;
-              if (b.name !== "todowrite") {
-                continue;
-              }
-              const args = b.arguments;
-              const todos = args?.todos;
-              if (!Array.isArray(todos))
-                continue;
-              const normalized = normalizeTodoStateJson(todos);
-              if (normalized === null)
-                continue;
-              updateSessionMeta(db, sessionId, {
-                lastTodoState: normalized
-              });
-              break;
-            }
-          }
+          capturePiTodowriteMessageIfCompatible({
+            db,
+            sessionId,
+            message: event.message,
+            todowriteEnabled,
+            todoOverlay,
+            persist: true
+          });
         }
       } catch (err5) {
         warn("message_end: synthetic todowrite capture failed:", err5);
@@ -208397,10 +209907,14 @@ function formatExecuteThresholdForLog(value) {
   return overrides.length > 0 ? `${base} (${overrides.join(", ")})` : base;
 }
 export {
+  signalPiDeferredCompactionMarkerDrain,
   resolveSidekickFromConfig,
   resolveHistorianFromConfig,
   resolveDreamerFromConfig,
   persistPiPressureFromMessageEnd,
   persistPiMessageEndModelMeta,
-  src_default2 as default
+  src_default2 as default,
+  capturePiTodowriteMessageIfCompatible,
+  capturePiTodowriteArgsIfCompatible,
+  __test
 };