@cortexkit/pi-magic-context 0.31.4 → 0.32.0

package/dist/subagent-entry.js

@@ -159849,8 +159849,11 @@ var MagicContextConfigSchema = exports_external.object({
     provider: "local",
     model: DEFAULT_LOCAL_EMBEDDING_MODEL
   }).describe("Embedding provider configuration"),
-  temporal_awareness: exports_external.boolean().default(true).describe('Inject wall-clock gap markers (<!-- +Xm -->) between user messages where > 5 min elapsed since the previous message, and add start/end date attributes on compartments. Gives the agent a sense of session pacing and "how long ago" across multi-day sessions. Graduated from experimental.temporal_awareness; default: true (set false to opt out).'),
+  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 compact date ranges to compartment headings. 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."),
+  shadow_transform: exports_external.object({
+    enabled: exports_external.boolean().default(false).describe("Dev flag: mirror every transform pass to the Magic Context Rust module over subc and byte-compare outputs. No behavior impact; default off.")
+  }).default({ enabled: false }).describe("Developer-only shadow transform lane. When enabled, the plugin fire-and-forgets a copy of each finalized transform to the Rust module for comparison; the live output is unchanged."),
   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.")
@@ -160007,6 +160010,10 @@ function stripUnsafeProjectConfigFields(projectRaw) {
     delete projectRaw.sqlite;
     warnings.push("Ignoring sqlite.* from project config (security: SQLite cache/mmap PRAGMAs apply to the " + "process-global shared database handle; only user-level config may set them).");
   }
+  if ("shadow_transform" in projectRaw) {
+    delete projectRaw.shadow_transform;
+    warnings.push("Ignoring shadow_transform from project config (security: this developer-only mirror lane is user-level only).");
+  }
   const embedding = projectRaw.embedding;
   if (isPlainObject3(embedding)) {
     const removed = [];
@@ -160679,6 +160686,9 @@ function loadPiConfigDetailed(opts = {}) {
   };
 }
 
+// src/embedding-bootstrap.ts
+import { statSync as statSync3 } from "node:fs";
+
 // ../plugin/src/features/magic-context/memory/embedding.ts
 init_logger();
 
@@ -163471,8 +163481,38 @@ function handleUntrustedLoad(db, projectIdentity, directory, detailed) {
 }
 
 // src/embedding-bootstrap.ts
+var registrationFingerprintsByDatabase = new WeakMap;
+function configCandidatePaths(directory, loadedPaths) {
+  const projectBase = cortexKitProjectConfigBasePath(directory);
+  const userBase = cortexKitUserConfigBasePath();
+  return [
+    `${projectBase}.jsonc`,
+    `${projectBase}.json`,
+    `${userBase}.jsonc`,
+    `${userBase}.json`,
+    ...loadedPaths
+  ].filter((path4, index, paths) => paths.indexOf(path4) === index);
+}
+function configFingerprint(paths) {
+  return paths.map((path4) => {
+    try {
+      const stat2 = statSync3(path4);
+      return `${path4}:${stat2.size}:${stat2.mtimeMs}`;
+    } catch {
+      return `${path4}:missing`;
+    }
+  }).join("|");
+}
 async function ensureProjectRegisteredFromPiDirectory(directory, db) {
   const projectIdentity = resolveProjectIdentity(directory);
+  let registrationFingerprints = registrationFingerprintsByDatabase.get(db);
+  if (!registrationFingerprints) {
+    registrationFingerprints = new Map;
+    registrationFingerprintsByDatabase.set(db, registrationFingerprints);
+  }
+  const cached2 = registrationFingerprints.get(projectIdentity);
+  if (cached2 && configFingerprint(cached2.paths) === cached2.fingerprint)
+    return;
   const detailed = loadPiConfigDetailed({ cwd: directory });
   if (isConfigLoadUntrusted(detailed)) {
     handleUntrustedLoad(db, projectIdentity, directory, detailed);
@@ -163483,6 +163523,11 @@ async function ensureProjectRegisteredFromPiDirectory(directory, db) {
     gitCommitEnabled: detailed.config.memory.git_commit_indexing.enabled
   };
   registerProjectEmbedding(db, projectIdentity, detailed.config.embedding, features, directory);
+  const fingerprintPaths = configCandidatePaths(directory, detailed.loadedFromPaths);
+  registrationFingerprints.set(projectIdentity, {
+    paths: fingerprintPaths,
+    fingerprint: configFingerprint(fingerprintPaths)
+  });
 }
 // ../plugin/src/features/magic-context/compartment-lease.ts
 var COMPARTMENT_LEASE_TTL_MS = 5 * 60 * 1000;
@@ -164102,6 +164147,12 @@ function parseJsonRecord(value) {
     return null;
   }
 }
+function isRawCompactionSummaryInfo(info) {
+  if (info === null || typeof info !== "object" || Array.isArray(info))
+    return false;
+  const candidate = info;
+  return candidate.summary === true && candidate.finish === "stop";
+}
 function parseJsonUnknown(value) {
   try {
     return JSON.parse(value);
@@ -164124,7 +164175,7 @@ function attachRawPartVersion(value, timeUpdated) {
   return value;
 }
 function readRawSessionMessagesFromDb(db, sessionId) {
-  const messageRows = db.prepare("SELECT id, data, time_updated FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawMessageRow);
+  const messageRows = db.prepare("SELECT id, data, time_created, time_updated FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawMessageRow);
   const partRows = db.prepare("SELECT message_id, data, time_updated FROM part WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawPartRow);
   const partsByMessageId = new Map;
   for (const part of partRows) {
@@ -164132,10 +164183,7 @@ function readRawSessionMessagesFromDb(db, sessionId) {
     list.push(attachRawPartVersion(parseJsonUnknown(part.data), part.time_updated));
     partsByMessageId.set(part.message_id, list);
   }
-  const filtered = messageRows.filter((row) => {
-    const info = parseJsonRecord(row.data);
-    return !(info?.summary === true && info?.finish === "stop");
-  });
+  const filtered = messageRows.filter((row) => !isRawCompactionSummaryInfo(parseJsonRecord(row.data)));
   return filtered.flatMap((row, index) => {
     const info = parseJsonRecord(row.data);
     if (!info)
@@ -164146,6 +164194,7 @@ function readRawSessionMessagesFromDb(db, sessionId) {
       id: row.id,
       role,
       parts: partsByMessageId.get(row.id) ?? [],
+      createdAt: row.time_created ?? null,
       version: row.time_updated ?? null
     };
   });
@@ -164160,7 +164209,7 @@ function readRawSessionTailFromDb(db, sessionId, baseOrdinal, anchorMessageId) {
   const anchorInfo = parseJsonRecord(anchorRow.data ?? "");
   if (anchorInfo?.summary === true && anchorInfo?.finish === "stop")
     return null;
-  const messageRows = db.prepare(`SELECT id, data, time_updated FROM message
+  const messageRows = db.prepare(`SELECT id, data, time_created, time_updated FROM message
              WHERE session_id = ?
                AND (time_created > ? OR (time_created = ? AND id >= ?))
              ORDER BY time_created ASC, id ASC`).all(sessionId, anchorRow.time_created, anchorRow.time_created, anchorRow.id).filter(isRawMessageRow);
@@ -164196,6 +164245,7 @@ function readRawSessionTailFromDb(db, sessionId, baseOrdinal, anchorMessageId) {
       id: row.id,
       role: typeof info.role === "string" ? info.role : "unknown",
       parts: partsByMessageId.get(row.id) ?? [],
+      createdAt: row.time_created ?? null,
       version: row.time_updated ?? null
     });
     ord += 1;
@@ -164714,9 +164764,9 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
 // ../plugin/src/tools/ctx-expand/constants.ts
 var CTX_EXPAND_DESCRIPTION = `Recover the original conversation from your compacted history.
 
-Older parts of this session are summarized into <compartment> blocks inside <session-history> — e.g. <compartment start="120" end="245" title="Fixed tagger collision">. Each one replaces the raw messages in that ordinal range with a summary. When the summary isn't enough — you need exact wording, a specific value, an error message, or the reasoning behind a decision — expand the range:
+Older parts of this session are summarized under \`## start-end · date · title\` headings inside <session-history> — e.g. \`## 120-245 · … · Fixed tagger collision\`. Each heading replaces the raw messages in that ordinal range with a summary. When the summary isn't enough — you need exact wording, a specific value, an error message, or the reasoning behind a decision — expand the range:
 
-ctx_expand(start=120, end=245)  ← the compartment's own start/end attributes
+ctx_expand(start=120, end=245)  ← the heading's start/end range
 
 Returns the raw transcript as [N] U:/A: lines, capped at ~15K tokens; an oversized range returns the head and tells you where to continue. Also works with ordinals from ctx_search message results — expand a window around a hit (e.g. start=N-10, end=N+5). Ranges after the last compartment are your live tail — already visible in context, not expandable.
 
@@ -169128,7 +169178,7 @@ function resolvePiStableId(msg, index, entryIds, entryIdByRef) {
   const role = m.role ?? "unknown";
   return typeof m.timestamp === "number" ? `pi-msg-${index}-${m.timestamp}-${role}` : `pi-msg-${index}-${role}`;
 }
-function isMidTurnPi(event, _sessionId) {
+function isMidTurnPi(event, _sessionId, branchEntries) {
   const messages = event?.messages;
   if (!Array.isArray(messages))
     return false;
@@ -169147,7 +169197,7 @@ function isMidTurnPi(event, _sessionId) {
   }
   if (latestAssistant === null)
     return false;
-  if (hasRealUserAfter(messages, latestAssistantIndex))
+  if (hasRealUserAfter(messages, latestAssistantIndex, branchEntries))
     return false;
   if (latestAssistant.stopReason === "toolUse")
     return true;
@@ -169171,12 +169221,27 @@ function isMidTurnPi(event, _sessionId) {
   }
   return false;
 }
-function hasRealUserAfter(messages, latestAssistantIndex) {
-  for (const msg of messages.slice(latestAssistantIndex + 1)) {
-    if (msg === null || typeof msg !== "object")
+function hasRealUserAfter(messages, latestAssistantIndex, branchEntries) {
+  if (!branchEntries)
+    return false;
+  const genuineUserMessages = new Set;
+  for (const entry of branchEntries) {
+    if (entry === null || typeof entry !== "object")
       continue;
-    if (msg.role === "user")
+    const record4 = entry;
+    if (record4.type !== "message")
+      continue;
+    const message = record4.message;
+    if (message === null || typeof message !== "object")
+      continue;
+    if (message.role === "user") {
+      genuineUserMessages.add(message);
+    }
+  }
+  for (const msg of messages.slice(latestAssistantIndex + 1)) {
+    if (msg !== null && typeof msg === "object" && genuineUserMessages.has(msg)) {
       return true;
+    }
   }
   return false;
 }
@@ -170406,7 +170471,7 @@ function getMemoryVerifications(db, memoryIds) {
 }
 // ../plugin/src/features/magic-context/memory/verification-paths.ts
 import { execFile } from "node:child_process";
-import { existsSync as existsSync9, realpathSync as realpathSync2, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync9, realpathSync as realpathSync2, statSync as statSync4 } from "node:fs";
 import path4 from "node:path";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
@@ -170548,7 +170613,7 @@ async function normalizeVerificationFiles(args) {
     }
     if (existsSync9(candidate)) {
       try {
-        if (statSync3(candidate).isDirectory()) {
+        if (statSync4(candidate).isDirectory()) {
           warnings.push(`Skipped verification path "${value}" because it is a directory.`);
           continue;
         }
@@ -170798,7 +170863,7 @@ function indexMessagesAfterOrdinal(db, sessionId, messages, lastIndexedOrdinal,
 }
 // ../plugin/src/features/magic-context/project-docs-hash.ts
 import { createHash as createHash7 } from "node:crypto";
-import { lstatSync, readFileSync as readFileSync5, statSync as statSync4 } from "node:fs";
+import { lstatSync, readFileSync as readFileSync5, statSync as statSync5 } from "node:fs";
 import path5 from "node:path";
 var PROJECT_DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 var PROJECT_DOCS_DELIMITER = `
@@ -170829,7 +170894,7 @@ function fingerprintFile(filePath) {
 }
 function readDirectoryMtimeMs(projectDirectory) {
   try {
-    return statSync4(projectDirectory).mtimeMs;
+    return statSync5(projectDirectory).mtimeMs;
   } catch {
     return 0;
   }
@@ -170919,6 +170984,160 @@ function readProjectDocsCanonical(projectDirectory) {
   });
   return { renderedBlock, canonicalHash };
 }
+// ../plugin/src/features/magic-context/storage-clone.ts
+function runImmediate2(db, body) {
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    const result = body();
+    db.exec("COMMIT");
+    committed = true;
+    return result;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
+function countRows(db, table, sessionId) {
+  const row = db.prepare(`SELECT COUNT(*) AS count FROM ${table} WHERE session_id = ?`).get(sessionId);
+  return typeof row?.count === "number" ? row.count : 0;
+}
+function filterIdBlob(raw, includeMessageId) {
+  if (!raw)
+    return "";
+  try {
+    const value = JSON.parse(raw);
+    if (!Array.isArray(value))
+      return "";
+    const filtered = value.filter((id) => typeof id === "string" && includeMessageId(id));
+    return filtered.length > 0 ? JSON.stringify(filtered) : "";
+  } catch {
+    return "";
+  }
+}
+function clampWatermark(value, maxCopiedTag) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0)
+    return 0;
+  return Math.min(Math.floor(value), maxCopiedTag);
+}
+function copySessionStateForClone(db, sourceSessionId, destinationSessionId, filter) {
+  return runImmediate2(db, () => {
+    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0) {
+      return {
+        kind: "destination-not-empty",
+        compartmentsCopied: 0,
+        tagsCopied: 0,
+        pendingOpsCopied: 0,
+        pendingMarkerMigrated: false
+      };
+    }
+    const sourceCompartments = db.prepare(`SELECT sequence, start_message, end_message, start_message_id, end_message_id,
+                        title, content, p1, p2, p3, p4, importance, episode_type, legacy,
+                        created_at, harness
+                   FROM compartments WHERE session_id = ? ORDER BY sequence ASC`).all(sourceSessionId);
+    const insertCompartment = db.prepare(`INSERT INTO compartments
+                (session_id, sequence, start_message, end_message, start_message_id,
+                 end_message_id, title, content, p1, p2, p3, p4, importance,
+                 episode_type, legacy, created_at, harness)
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+    const copiedCompartments = [];
+    for (const row of sourceCompartments) {
+      const startMessage = filter.resolveBoundaryOrdinal(row.start_message_id);
+      const endMessage = filter.resolveBoundaryOrdinal(row.end_message_id);
+      if (startMessage === undefined || endMessage === undefined)
+        continue;
+      insertCompartment.run(destinationSessionId, row.sequence, startMessage, endMessage, row.start_message_id, row.end_message_id, row.title, row.content, row.p1, row.p2, row.p3, row.p4, row.importance, row.episode_type, row.legacy, row.created_at, row.harness);
+      copiedCompartments.push({
+        sequence: row.sequence,
+        startMessage,
+        endMessage,
+        startMessageId: row.start_message_id,
+        endMessageId: row.end_message_id
+      });
+    }
+    const sourceTags = db.prepare(`SELECT message_id, type, status, byte_size, tag_number, harness,
+                        entry_fingerprint, token_count, input_token_count,
+                        reasoning_token_count, reasoning_byte_size, drop_mode, tool_name,
+                        input_byte_size, caveman_depth, tool_owner_message_id
+                   FROM tags WHERE session_id = ? ORDER BY tag_number ASC`).all(sourceSessionId);
+    const insertTag = db.prepare(`INSERT INTO tags
+                (session_id, message_id, type, status, byte_size, tag_number, harness,
+                 entry_fingerprint, token_count, input_token_count, reasoning_token_count,
+                 reasoning_byte_size, drop_mode, tool_name, input_byte_size,
+                 caveman_depth, tool_owner_message_id)
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+    const copiedTagNumbers = [];
+    for (const row of sourceTags) {
+      if (!filter.includeTag({
+        messageId: row.message_id,
+        type: row.type,
+        tagNumber: row.tag_number,
+        toolOwnerMessageId: row.tool_owner_message_id
+      })) {
+        continue;
+      }
+      insertTag.run(destinationSessionId, row.message_id, row.type, row.status, row.byte_size, row.tag_number, row.harness, row.entry_fingerprint, row.token_count, row.input_token_count, row.reasoning_token_count, row.reasoning_byte_size, row.drop_mode, row.tool_name, row.input_byte_size, row.caveman_depth, row.tool_owner_message_id);
+      copiedTagNumbers.push(row.tag_number);
+    }
+    if (copiedTagNumbers.length > 0) {
+      const placeholders3 = copiedTagNumbers.map(() => "?").join(", ");
+      db.prepare(`INSERT INTO source_contents (tag_id, session_id, content, created_at, harness)
+                 SELECT tag_id, ?, content, created_at, harness
+                   FROM source_contents
+                  WHERE session_id = ? AND tag_id IN (${placeholders3})`).run(destinationSessionId, sourceSessionId, ...copiedTagNumbers);
+      db.prepare(`INSERT INTO pending_ops (session_id, tag_id, operation, queued_at, harness)
+                 SELECT ?, tag_id, operation, queued_at, harness
+                   FROM pending_ops
+                  WHERE session_id = ? AND tag_id IN (${placeholders3})`).run(destinationSessionId, sourceSessionId, ...copiedTagNumbers);
+    }
+    const meta3 = db.prepare(`SELECT cleared_reasoning_through_tag, tool_reclaim_watermark,
+                        pi_stable_id_scheme, stripped_placeholder_ids,
+                        stale_reduce_stripped_ids, processed_image_stripped_ids,
+                        pending_pi_compaction_marker_state, last_todo_state,
+                        todo_synthetic_call_id, todo_synthetic_anchor_message_id,
+                        todo_synthetic_state_json
+                   FROM session_meta WHERE session_id = ?`).get(sourceSessionId);
+    const maxCopiedTag = copiedTagNumbers.reduce((max, value) => Math.max(max, value), 0);
+    const pendingMarker = filter.selectPendingPiMarker(meta3?.pending_pi_compaction_marker_state ?? null, copiedCompartments);
+    const todoAnchor = meta3?.todo_synthetic_anchor_message_id ?? "";
+    const migrateTodo = todoAnchor.length > 0 && filter.includeMessageId(todoAnchor);
+    db.prepare(`INSERT INTO session_meta
+                (session_id, harness, counter, cleared_reasoning_through_tag,
+                 tool_reclaim_watermark, pi_stable_id_scheme, stripped_placeholder_ids,
+                 stale_reduce_stripped_ids, processed_image_stripped_ids,
+                 pending_pi_compaction_marker_state, last_todo_state,
+                 todo_synthetic_call_id, todo_synthetic_anchor_message_id,
+                 todo_synthetic_state_json)
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+             ON CONFLICT(session_id) DO UPDATE SET
+                harness = excluded.harness,
+                counter = excluded.counter,
+                cleared_reasoning_through_tag = excluded.cleared_reasoning_through_tag,
+                tool_reclaim_watermark = excluded.tool_reclaim_watermark,
+                pi_stable_id_scheme = excluded.pi_stable_id_scheme,
+                stripped_placeholder_ids = excluded.stripped_placeholder_ids,
+                stale_reduce_stripped_ids = excluded.stale_reduce_stripped_ids,
+                processed_image_stripped_ids = excluded.processed_image_stripped_ids,
+                pending_pi_compaction_marker_state = excluded.pending_pi_compaction_marker_state,
+                last_todo_state = excluded.last_todo_state,
+                todo_synthetic_call_id = excluded.todo_synthetic_call_id,
+                todo_synthetic_anchor_message_id = excluded.todo_synthetic_anchor_message_id,
+                todo_synthetic_state_json = excluded.todo_synthetic_state_json,
+                cached_m0_bytes = NULL,
+                cached_m1_bytes = NULL`).run(destinationSessionId, getHarness(), maxCopiedTag, clampWatermark(meta3?.cleared_reasoning_through_tag ?? null, maxCopiedTag), clampWatermark(meta3?.tool_reclaim_watermark ?? null, maxCopiedTag), typeof meta3?.pi_stable_id_scheme === "number" && Number.isFinite(meta3.pi_stable_id_scheme) ? meta3.pi_stable_id_scheme : null, filterIdBlob(meta3?.stripped_placeholder_ids ?? null, filter.includeMessageId), filterIdBlob(meta3?.stale_reduce_stripped_ids ?? null, filter.includeMessageId), filterIdBlob(meta3?.processed_image_stripped_ids ?? null, filter.includeMessageId), pendingMarker, migrateTodo ? meta3?.last_todo_state ?? "" : "", migrateTodo ? meta3?.todo_synthetic_call_id ?? "" : "", migrateTodo ? todoAnchor : "", migrateTodo ? meta3?.todo_synthetic_state_json ?? "" : "");
+    const pendingOpsRow = db.prepare("SELECT COUNT(*) AS count FROM pending_ops WHERE session_id = ?").get(destinationSessionId);
+    return {
+      kind: "migrated",
+      compartmentsCopied: copiedCompartments.length,
+      tagsCopied: copiedTagNumbers.length,
+      pendingOpsCopied: typeof pendingOpsRow?.count === "number" ? pendingOpsRow.count : 0,
+      pendingMarkerMigrated: pendingMarker !== null
+    };
+  });
+}
 // ../plugin/src/features/magic-context/storage-m0-mutation-log.ts
 var M0_MUTATION_TYPES = new Set([
   "compartment_delete",
@@ -171885,6 +172104,36 @@ function parseStrippedBlob(raw) {
   } catch {}
   return [];
 }
+function getProcessedImageStrippedIds(db, sessionId) {
+  const row = db.prepare("SELECT processed_image_stripped_ids FROM session_meta WHERE session_id = ?").get(sessionId);
+  return new Set(parseStrippedBlob(row?.processed_image_stripped_ids));
+}
+function addProcessedImageStrippedIds(db, sessionId, ids) {
+  const add = [...ids];
+  if (add.length === 0)
+    return true;
+  ensureSessionMetaRow(db, sessionId);
+  for (let attempt = 0;attempt < CAS_RETRY_LIMIT; attempt += 1) {
+    const row = db.prepare("SELECT processed_image_stripped_ids FROM session_meta WHERE session_id = ?").get(sessionId);
+    const rawStored = row ? row.processed_image_stripped_ids ?? null : null;
+    const current = new Set(parseStrippedBlob(rawStored));
+    let changed = false;
+    for (const id of add) {
+      if (!current.has(id)) {
+        current.add(id);
+        changed = true;
+      }
+    }
+    if (!changed)
+      return true;
+    const nextBlob = JSON.stringify([...current]);
+    const result = db.prepare("UPDATE session_meta SET processed_image_stripped_ids = ? WHERE session_id = ? AND processed_image_stripped_ids IS ?").run(nextBlob, sessionId, rawStored);
+    if (result.changes > 0)
+      return true;
+  }
+  sessionLog(sessionId, `processed_image_stripped_ids CAS: ${CAS_RETRY_LIMIT} retries exhausted`);
+  return false;
+}
 function isPendingCompactionMarker(value) {
   return typeof value === "object" && value !== null && typeof value.ordinal === "number" && typeof value.endMessageId === "string" && typeof value.publishedAt === "number";
 }
@@ -172607,6 +172856,7 @@ var getTagNumbersByMessageIdStatements = new WeakMap;
 var deleteTagsByMessageIdStatements = new WeakMap;
 var getMaxTagNumberBySessionStatements = new WeakMap;
 var getTagNumberByMessageIdStatements = new WeakMap;
+var hasPiFallbackMessageTagStatements = new WeakMap;
 function getInsertTagStatement(db) {
   let stmt = insertTagStatements.get(db);
   if (!stmt) {
@@ -172750,6 +173000,18 @@ function getUpdateTagInputTokenCountStatement(db) {
 function updateTagTokenCount(db, sessionId, tagNumber, newTokenCount) {
   getUpdateTagTokenCountStatement(db).run(newTokenCount, sessionId, tagNumber);
 }
+function getPersistedToolTagAccounting(db, sessionId, tagNumber) {
+  const row = db.prepare(`SELECT byte_size AS byteSize,
+                    token_count AS tokenCount,
+                    input_byte_size AS inputByteSize,
+                    input_token_count AS inputTokenCount
+             FROM tags
+             WHERE session_id = ? AND tag_number = ? AND type = 'tool'`).get(sessionId, tagNumber);
+  if (!row || typeof row.byteSize !== "number" || row.tokenCount !== null && typeof row.tokenCount !== "number" || typeof row.inputByteSize !== "number" || row.inputTokenCount !== null && typeof row.inputTokenCount !== "number") {
+    return null;
+  }
+  return row;
+}
 function getAllStatusTagTokenTotalsFlat(db, sessionId, floor = 0) {
   const rows = floor > 0 ? db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
                        FROM tags
@@ -172851,6 +173113,19 @@ function updateTagDropMode(db, sessionId, tagNumber, dropMode) {
 function updateCavemanDepth(db, sessionId, tagNumber, depth) {
   db.prepare("UPDATE tags SET caveman_depth = ? WHERE session_id = ? AND tag_number = ?").run(depth, sessionId, tagNumber);
 }
+function hasPiFallbackMessageTags(db, sessionId) {
+  let statement = hasPiFallbackMessageTagStatements.get(db);
+  if (!statement) {
+    statement = db.prepare(`SELECT 1
+             FROM tags
+             WHERE session_id = ?
+               AND type = 'message'
+               AND message_id LIKE 'pi-msg-%'
+             LIMIT 1`);
+    hasPiFallbackMessageTagStatements.set(db, statement);
+  }
+  return statement.get(sessionId) != null;
+}
 function findAdoptableFallbackTags(db, sessionId, entryFingerprint) {
   const rows = db.prepare(`SELECT tag_number AS tagNumber, message_id AS messageId
              FROM tags
@@ -173021,27 +173296,24 @@ function adoptPiFallbackToolOwnerTag(db, sessionId, tagNumber, callId, oldOwnerM
   }
   const existing = getPiFallbackToolFoldTagRowByOwner(db, sessionId, callId, newOwnerMessageId);
   if (existing === null) {
-    const result2 = db.prepare(`UPDATE tags
+    const result = db.prepare(`UPDATE tags
                  SET tool_owner_message_id = ?
                  WHERE session_id = ?
                    AND tag_number = ?
                    AND type = 'tool'
                    AND message_id = ?
                    AND tool_owner_message_id = ?`).run(newOwnerMessageId, sessionId, tagNumber, callId, oldOwnerMessageId);
-    return (result2.changes ?? 0) === 1 ? { action: "rekeyed", tagNumber } : { action: "skipped" };
+    return (result.changes ?? 0) === 1 ? { action: "rekeyed", tagNumber } : { action: "skipped" };
   }
   if (existing.tagNumber === tagNumber) {
     return { action: "skipped" };
   }
-  foldDuplicateIntoSurvivor(db, sessionId, survivor, existing);
-  const result = db.prepare(`UPDATE tags
-             SET tool_owner_message_id = ?
-             WHERE session_id = ?
-               AND tag_number = ?
-               AND type = 'tool'
-               AND message_id = ?
-               AND tool_owner_message_id = ?`).run(newOwnerMessageId, sessionId, tagNumber, callId, oldOwnerMessageId);
-  return (result.changes ?? 0) === 1 ? { action: "folded", tagNumber, deletedTagNumbers: [existing.tagNumber] } : { action: "skipped" };
+  foldDuplicateIntoSurvivor(db, sessionId, existing, survivor);
+  return {
+    action: "folded",
+    tagNumber: existing.tagNumber,
+    deletedTagNumbers: [tagNumber]
+  };
 }
 function adoptPiFallbackMessageTag(db, sessionId, tagNumber, oldFallbackMessageId, newRealMessageId) {
   const survivor = getPiFallbackFoldTagRowByNumber(db, sessionId, tagNumber);
@@ -173050,26 +173322,28 @@ function adoptPiFallbackMessageTag(db, sessionId, tagNumber, oldFallbackMessageI
   }
   const duplicates = getPiFallbackMessageFoldTagRowsByMessageId(db, sessionId, newRealMessageId).filter((row) => row.tagNumber !== tagNumber);
   if (duplicates.length === 0) {
-    const result2 = db.prepare(`UPDATE tags
+    const result = db.prepare(`UPDATE tags
                  SET message_id = ?
                  WHERE session_id = ?
                    AND tag_number = ?
                    AND type = 'message'
                    AND message_id = ?`).run(newRealMessageId, sessionId, tagNumber, oldFallbackMessageId);
-    return (result2.changes ?? 0) === 1 ? { action: "rekeyed", tagNumber } : { action: "skipped" };
+    return (result.changes ?? 0) === 1 ? { action: "rekeyed", tagNumber } : { action: "skipped" };
   }
-  const deletedTagNumbers = [];
-  for (const duplicate of duplicates) {
-    foldDuplicateIntoSurvivor(db, sessionId, survivor, duplicate);
+  const realSurvivor = duplicates[0];
+  if (!realSurvivor)
+    return { action: "skipped" };
+  const deletedTagNumbers = [tagNumber];
+  foldDuplicateIntoSurvivor(db, sessionId, realSurvivor, survivor);
+  for (const duplicate of duplicates.slice(1)) {
+    foldDuplicateIntoSurvivor(db, sessionId, realSurvivor, duplicate);
     deletedTagNumbers.push(duplicate.tagNumber);
   }
-  const result = db.prepare(`UPDATE tags
-             SET message_id = ?
-             WHERE session_id = ?
-               AND tag_number = ?
-               AND type = 'message'
-               AND message_id = ?`).run(newRealMessageId, sessionId, tagNumber, oldFallbackMessageId);
-  return (result.changes ?? 0) === 1 ? { action: "folded", tagNumber, deletedTagNumbers } : { action: "skipped" };
+  return {
+    action: "folded",
+    tagNumber: realSurvivor.tagNumber,
+    deletedTagNumbers
+  };
 }
 var getOwnerScopedToolTagNumbersStatements = new WeakMap;
 function getMaxTagNumberBySession(db, sessionId) {
@@ -173141,10 +173415,40 @@ function getActiveTagsBySessionStatement(db) {
   }
   return stmt;
 }
+function getMaxDroppedTagNumberStatement(db) {
+  let stmt = getMaxDroppedTagNumberStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT COALESCE(MAX(tag_number), 0) AS max_tag_number FROM tags WHERE session_id = ? AND status = 'dropped'");
+    getMaxDroppedTagNumberStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getActiveTagsBySession(db, sessionId) {
   const rows = getActiveTagsBySessionStatement(db).all(sessionId).filter(isTagRow);
   return rows.map(toTagEntry);
 }
+function getTagsForPendingOperations(db, sessionId, pendingTagNumbers, protectedTags, recentToolWindow) {
+  const byNumber = new Map;
+  for (const tag of getTagsByNumbers(db, sessionId, pendingTagNumbers)) {
+    byNumber.set(tag.tagNumber, tag);
+  }
+  const addRows = (sql, limit) => {
+    if (limit <= 0)
+      return;
+    const rows = db.prepare(sql).all(sessionId, limit).filter(isTagRow);
+    for (const row of rows) {
+      const tag = toTagEntry(row);
+      byNumber.set(tag.tagNumber, tag);
+    }
+  };
+  addRows(`SELECT ${TAG_SELECT_COLUMNS} FROM tags
+         WHERE session_id = ? AND status = 'active'
+         ORDER BY tag_number DESC, id DESC LIMIT ?`, protectedTags);
+  addRows(`SELECT ${TAG_SELECT_COLUMNS} FROM tags
+         WHERE session_id = ? AND type = 'tool'
+         ORDER BY tag_number DESC, id DESC LIMIT ?`, recentToolWindow);
+  return [...byNumber.values()].sort((left, right) => left.tagNumber - right.tagNumber);
+}
 function getTagsByNumbers(db, sessionId, tagNumbers) {
   if (tagNumbers.length === 0)
     return [];
@@ -173159,6 +173463,10 @@ function getTagsByNumbers(db, sessionId, tagNumbers) {
   const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number IN (${placeholders4}) ORDER BY tag_number ASC, id ASC`).all(sessionId, ...tagNumbers).filter(isTagRow);
   return rows.map(toTagEntry);
 }
+function getMaxDroppedTagNumber(db, sessionId) {
+  const row = getMaxDroppedTagNumberStatement(db).get(sessionId);
+  return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
+}
 var getToolTagNumberByOwnerStatements = new WeakMap;
 var getNullOwnerToolTagStatements = new WeakMap;
 var adoptNullOwnerToolTagStatements = new WeakMap;
@@ -175517,12 +175825,26 @@ function computeBudgetPressure(compartments, historyBudget) {
 
 // ../plugin/src/hooks/magic-context/decay-render.ts
 var DEFAULT_HISTORY_BUDGET_TOKENS = 60000;
-function escapeXmlAttr2(s) {
-  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 function escapeXmlContent2(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function formatDateRange(startDate, endDate) {
+  if (!startDate || !endDate)
+    return "";
+  if (startDate === endDate)
+    return startDate;
+  if (startDate.slice(0, 7) === endDate.slice(0, 7))
+    return `${startDate}→${endDate.slice(8)}`;
+  return `${startDate}→${endDate}`;
+}
+function compartmentHeading(c) {
+  const dateRange = formatDateRange(c.startDate, c.endDate);
+  const dateSegment = dateRange ? ` · ${dateRange}` : "";
+  return `## ${c.startMessage}-${c.endMessage}${dateSegment} · ${c.title}`;
+}
+function guardCompartmentBody(body) {
+  return body.replace(/^## /gm, " ## ");
+}
 function isTieredRow(c) {
   return typeof c.p1 === "string" && c.p1.length > 0;
 }
@@ -175552,25 +175874,22 @@ function renderCompartmentAtTier(c, tier2) {
   return renderOneCompartment(c, tier2);
 }
 function renderOneCompartment(c, tier2) {
-  const baseAttrs = `start="${c.startMessage}" end="${c.endMessage}" title="${escapeXmlAttr2(c.title)}"`;
   if (tier2 >= 5)
     return "";
+  const heading = compartmentHeading(c);
   if (c.legacy === 1 || !isTieredRow(c)) {
     const flat = (c.content ?? "").trim();
     if (tier2 >= 4 || flat.length === 0)
-      return `<compartment ${baseAttrs} />`;
-    return [
-      `<compartment ${baseAttrs}>`,
-      escapeXmlContent2(legacyBodyForTier(flat, tier2)),
-      "</compartment>"
-    ].join(`
-`);
+      return heading;
+    const body2 = guardCompartmentBody(escapeXmlContent2(legacyBodyForTier(flat, tier2)));
+    return `${heading}
+${body2}`;
   }
   const body = tierBody(c, tier2);
   if (body.length === 0)
-    return `<compartment ${baseAttrs} />`;
-  return [`<compartment ${baseAttrs}>`, escapeXmlContent2(body), "</compartment>"].join(`
-`);
+    return heading;
+  return `${heading}
+${guardCompartmentBody(escapeXmlContent2(body))}`;
 }
 function computeTiers(compartments, historyBudgetTokens) {
   const v2Compartments = compartments.map((c, originalIndex) => ({ c, originalIndex })).filter(({ c }) => c.legacy !== 1);
@@ -175693,33 +176012,9 @@ function getVisibleMemoryIds(db, sessionId) {
   }
 }
 function renderMemoryBlock(memories) {
-  const byCategory = new Map;
-  for (const m of memories) {
-    const existing = byCategory.get(m.category);
-    if (existing) {
-      existing.push(m);
-    } else {
-      byCategory.set(m.category, [m]);
-    }
-  }
-  const sections = [];
-  for (const category of CATEGORY_PRIORITY) {
-    const categoryMemories = byCategory.get(category);
-    if (!categoryMemories || categoryMemories.length === 0) {
-      continue;
-    }
-    sections.push(`<${category}>`, ...categoryMemories.map((m) => `- ${escapeXmlContent(m.content)}`), `</${category}>`);
-  }
-  if (sections.length === 0) {
-    return null;
-  }
-  return `<project-memory>
-${sections.join(`
-`)}
-</project-memory>`;
+  return renderMemoryBlockV2(memories) || null;
 }
 var DEFAULT_MEMORY_BUDGET_TOKENS = 8000;
-var MEMORY_BLOCK_WRAPPER_TOKENS = 6;
 var DEFAULT_USER_PROFILE_BUDGET_TOKENS = 4000;
 function memoryCanonicalIdentity(memory2, workspace) {
   return resolveStoredPathWorkspaceIdentity(memory2.projectPath, workspace.identities, workspace.canonicalIdentityByStoredPath);
@@ -175737,11 +176032,18 @@ function memorySelectionOrder(left, right) {
   return left.id - right.id;
 }
 function memoryRenderOrder(left, right) {
-  const aPriority = MEMORY_CATEGORY_ORDER_PRIORITY[left.category] ?? MEMORY_CATEGORY_ORDER_UNKNOWN;
-  const bPriority = MEMORY_CATEGORY_ORDER_PRIORITY[right.category] ?? MEMORY_CATEGORY_ORDER_UNKNOWN;
-  const categoryDiff = aPriority - bPriority;
-  if (categoryDiff !== 0)
-    return categoryDiff;
+  const leftPriority = V2_MEMORY_CATEGORIES.indexOf(left.category);
+  const rightPriority = V2_MEMORY_CATEGORIES.indexOf(right.category);
+  if (leftPriority >= 0 || rightPriority >= 0) {
+    if (leftPriority < 0)
+      return 1;
+    if (rightPriority < 0)
+      return -1;
+    if (leftPriority !== rightPriority)
+      return leftPriority - rightPriority;
+  } else if (left.category !== right.category) {
+    return left.category < right.category ? -1 : 1;
+  }
   return left.id - right.id;
 }
 var maxCompartmentSeqStatements = new WeakMap;
@@ -175752,13 +176054,13 @@ var newCompartmentStatements = new WeakMap;
 function trimMemoriesToBudgetV2(sessionId, memories, budgetTokens, renderOptions = {}) {
   const selectionOrder = [...memories].sort(memorySelectionOrder);
   const selected = [];
-  let usedTokens = MEMORY_BLOCK_WRAPPER_TOKENS;
+  const accounting = createMemoryBlockAccounting(renderOptions);
   for (const memory2 of selectionOrder) {
-    const memoryTokens = estimateTokens(renderMemoryLineV2(memory2, renderOptions.sourceNameByMemoryId?.get(memory2.id)));
-    if (usedTokens + memoryTokens > budgetTokens)
+    const cost = accounting.candidateCost(memory2);
+    if (accounting.usedTokens + cost > budgetTokens)
       continue;
+    accounting.admit(memory2, cost);
     selected.push(memory2);
-    usedTokens += memoryTokens;
   }
   if (selected.length < memories.length) {
     sessionLog(sessionId, `v2 trimmed memories from ${memories.length} to ${selected.length} to fit injection budget of ${budgetTokens} tokens`);
@@ -175772,23 +176074,22 @@ function trimWorkspaceMemoriesToBudgetV2(sessionId, memories, budgetTokens, work
   }
   const selected = [];
   const selectedIds = new Set;
-  let usedTokens = MEMORY_BLOCK_WRAPPER_TOKENS;
-  const tokenCost = (memory2) => estimateTokens(renderMemoryLineV2(memory2, renderOptions.sourceNameByMemoryId?.get(memory2.id)));
+  const accounting = createMemoryBlockAccounting(renderOptions);
   const trySelect = (memory2) => {
     if (selectedIds.has(memory2.id))
       return false;
-    const tokens = tokenCost(memory2);
-    if (usedTokens + tokens > budgetTokens)
+    const cost = accounting.candidateCost(memory2);
+    if (accounting.usedTokens + cost > budgetTokens)
       return false;
     selected.push(memory2);
     selectedIds.add(memory2.id);
-    usedTokens += tokens;
+    accounting.admit(memory2, cost);
     return true;
   };
   for (const memory2 of memories.filter((candidate) => candidate.status === "permanent").sort(memorySelectionOrder)) {
     trySelect(memory2);
   }
-  const remainingAfterPermanent = Math.max(0, budgetTokens - usedTokens);
+  const remainingAfterPermanent = Math.max(0, budgetTokens - accounting.usedTokens);
   const floorTokens = remainingAfterPermanent / Math.max(1, workspace.identities.length);
   const byIdentity = new Map;
   for (const memory2 of memories) {
@@ -175807,15 +176108,15 @@ function trimWorkspaceMemoriesToBudgetV2(sessionId, memories, budgetTokens, work
     for (const memory2 of candidates2) {
       if (selectedIds.has(memory2.id))
         continue;
-      const tokens = tokenCost(memory2);
-      if (memberTokens + tokens > floorTokens)
+      const cost = accounting.candidateCost(memory2);
+      if (memberTokens + cost > floorTokens)
         continue;
-      if (usedTokens + tokens > budgetTokens)
+      if (accounting.usedTokens + cost > budgetTokens)
         continue;
       selected.push(memory2);
       selectedIds.add(memory2.id);
-      usedTokens += tokens;
-      memberTokens += tokens;
+      accounting.admit(memory2, cost);
+      memberTokens += cost;
     }
   }
   const remaining = memories.filter((memory2) => !selectedIds.has(memory2.id)).sort(memorySelectionOrder);
@@ -175839,17 +176140,55 @@ function trimUserMemoriesToBudget(memories, budgetTokens) {
   }
   return selected;
 }
+function createMemoryBlockAccounting(renderOptions) {
+  const seenCategories = new Set;
+  const categoryCost = new Map;
+  return {
+    usedTokens: estimateTokens(`<project-memory>
+</project-memory>`),
+    candidateCost(memory2) {
+      const line = renderMemoryLineV2(memory2, renderOptions.sourceNameByMemoryId?.get(memory2.id));
+      let cost = estimateTokens(`${line}
+`);
+      if (!seenCategories.has(memory2.category)) {
+        let tags = categoryCost.get(memory2.category);
+        if (tags === undefined) {
+          tags = estimateTokens(`<${escapeXmlAttr(memory2.category)}>
+</${escapeXmlAttr(memory2.category)}>
+`);
+          categoryCost.set(memory2.category, tags);
+        }
+        cost += tags;
+      }
+      return cost;
+    },
+    admit(memory2, cost) {
+      this.usedTokens += cost;
+      seenCategories.add(memory2.category);
+    }
+  };
+}
 function renderMemoryLineV2(memory2, sourceName) {
-  const sourceAttr = sourceName ? ` source="${escapeXmlAttr(sourceName)}"` : "";
-  return `  <memory id="${memory2.id}" category="${escapeXmlAttr(memory2.category)}"${sourceAttr} importance="${memory2.importance ?? 50}">${escapeXmlContent(memory2.content)}</memory>`;
+  const source = sourceName ? ` [${escapeXmlContent(sourceName)}]` : "";
+  return `#${memory2.id}${source}: ${escapeXmlContent(memory2.content)}`;
 }
 function renderMemoryBlockV2(memories, wrapper = "project-memory", renderOptions = {}) {
   if (memories.length === 0)
     return "";
+  const ordered = [...memories].sort(memoryRenderOrder);
   const lines = [`<${wrapper}>`];
-  for (const memory2 of memories) {
+  let openCategory;
+  for (const memory2 of ordered) {
+    if (memory2.category !== openCategory) {
+      if (openCategory !== undefined)
+        lines.push(`</${escapeXmlAttr(openCategory)}>`);
+      openCategory = memory2.category;
+      lines.push(`<${escapeXmlAttr(openCategory)}>`);
+    }
     lines.push(renderMemoryLineV2(memory2, renderOptions.sourceNameByMemoryId?.get(memory2.id)));
   }
+  if (openCategory !== undefined)
+    lines.push(`</${escapeXmlAttr(openCategory)}>`);
   lines.push(`</${wrapper}>`);
   return lines.join(`
 `);
@@ -176163,6 +176502,8 @@ var STATUS_COLOR = {
   cancelled: "error"
 };
 var snapshotsBySession = new Map;
+var MAX_TODOWRITE_RENDER_CACHE_ENTRIES = 50;
+var cachedTodowriteTodosByToolCallId = new Map;
 function isTodoStatus2(value) {
   return TODO_STATUSES.includes(value);
 }
@@ -176172,6 +176513,27 @@ function isTodoPriority2(value) {
 function cloneTodos(todos) {
   return todos.map((todo) => ({ ...todo }));
 }
+function rememberTodowriteToolCallTodos(toolCallId, todos) {
+  if (!toolCallId)
+    return;
+  cachedTodowriteTodosByToolCallId.delete(toolCallId);
+  cachedTodowriteTodosByToolCallId.set(toolCallId, cloneTodos(todos));
+  while (cachedTodowriteTodosByToolCallId.size > MAX_TODOWRITE_RENDER_CACHE_ENTRIES) {
+    const oldestKey = cachedTodowriteTodosByToolCallId.keys().next().value;
+    if (typeof oldestKey !== "string")
+      break;
+    cachedTodowriteTodosByToolCallId.delete(oldestKey);
+  }
+}
+function getCachedTodowriteToolCallTodos(toolCallId) {
+  if (!toolCallId)
+    return null;
+  const todos = cachedTodowriteTodosByToolCallId.get(toolCallId);
+  return todos ? cloneTodos(todos) : null;
+}
+function clearTodowriteToolCallTodos() {
+  cachedTodowriteTodosByToolCallId.clear();
+}
 function parseTodos(input) {
   if (!Array.isArray(input))
     return null;
@@ -176308,25 +176670,27 @@ function capTodoRows(rows) {
     hiddenCount: rows.length - visibleCount
   };
 }
-function renderTodowriteCall(args, theme) {
-  const todos = parseTodos(args.todos) ?? [];
+function renderTodowriteCall(args, theme, context) {
+  const todos = getCachedTodowriteToolCallTodos(context?.toolCallId) ?? 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) => [truncateToWidth(line, width, "…")]);
 }
-function renderTodowriteResult(result, theme) {
+function renderTodowriteResult(result, theme, context) {
   const detailsTodos = result.details?.todos;
   let todos = parseTodos(detailsTodos);
-  if (todos === null && Array.isArray(result.content)) {
+  if ((todos === null || todos.length === 0) && 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));
+        const parsed = parseTodos(JSON.parse(text));
+        if (parsed !== null)
+          todos = parsed;
       } catch {}
     }
   }
-  const renderedTodos = todos ?? [];
+  const renderedTodos = todos !== null && todos.length > 0 ? todos : getCachedTodowriteToolCallTodos(context?.toolCallId) ?? todos ?? [];
   return lineComponent((width) => {
     if (renderedTodos.length === 0)
       return [theme.fg("dim", "No todos")];
@@ -176527,6 +176891,7 @@ function registerTodoOverlay(pi, deps) {
     overlay.hideCompletedTasksFromPreviousTurn();
   });
   pi.on("session_shutdown", async (_event, ctx) => {
+    clearTodowriteToolCallTodos();
     const sessionId = getSessionId(ctx);
     if (!sessionId)
       return;
@@ -176534,6 +176899,7 @@ function registerTodoOverlay(pi, deps) {
     overlay.disposeSession(sessionId);
   });
   pi.on("session_before_switch", async (_event, ctx) => {
+    clearTodowriteToolCallTodos();
     const sessionId = getSessionId(ctx);
     if (!sessionId)
       return;
@@ -176550,11 +176916,13 @@ function registerTodoStateLifecycle(pi, deps) {
     seedTodoSnapshotFromStateJson(sessionId, deps.readLastTodoState(sessionId));
   });
   pi.on("session_shutdown", async (_event, ctx) => {
+    clearTodowriteToolCallTodos();
     const sessionId = getSessionId(ctx);
     if (sessionId)
       clearTodoSnapshot(sessionId);
   });
   pi.on("session_before_switch", async (_event, ctx) => {
+    clearTodowriteToolCallTodos();
     const sessionId = getSessionId(ctx);
     if (sessionId)
       clearTodoSnapshot(sessionId);
@@ -176605,11 +176973,11 @@ function createTodowriteTool() {
         }
       };
     },
-    renderCall(args, theme) {
-      return renderTodowriteCall(args, theme);
+    renderCall(args, theme, context) {
+      return renderTodowriteCall(args, theme, context);
     },
-    renderResult(result, _opts, theme) {
-      return renderTodowriteResult(result, theme);
+    renderResult(result, _opts, theme, context) {
+      return renderTodowriteResult(result, theme, context);
     }
   };
 }