@cortexkit/pi-magic-context 0.31.2 → 0.31.4

package/dist/subagent-entry.js

@@ -8198,6 +8198,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", ""],
@@ -8261,6 +8262,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
@@ -8615,6 +8617,7 @@ function storedPathBelongsToIdentity(storedProjectPath, projectIdentity) {
 }
 // ../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);
@@ -8629,23 +8632,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);
@@ -8654,16 +8673,33 @@ 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
                JOIN workspaces AS workspace ON workspace.id = member.workspace_id
               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]);
@@ -8768,7 +8804,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) {
@@ -143735,6 +143771,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'
     );
@@ -143764,6 +143801,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 '',
@@ -144010,6 +144048,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 ''");
@@ -144222,6 +144261,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'");
@@ -144237,7 +144277,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) {
@@ -145054,92 +145094,6 @@ function migrateLegacyExperimental(rawConfig, warnings) {
   return patched;
 }
 
-// ../plugin/src/config/project-security.ts
-var HIDDEN_AGENT_KEYS = ["historian", "dreamer", "sidekick"];
-var AGENT_ESCALATION_FIELDS = ["prompt", "permission", "tools", "system_prompt"];
-var EMBEDDING_DESTINATION_FIELDS = ["endpoint", "provider"];
-function isPlainObject2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function stripUnsafeProjectConfigFields(projectRaw) {
-  const warnings = [];
-  if ("auto_update" in projectRaw) {
-    delete projectRaw.auto_update;
-    warnings.push("Ignoring auto_update from project config (security: this setting only honors user-level config).");
-  }
-  if ("language" in projectRaw) {
-    delete projectRaw.language;
-    warnings.push("Ignoring language from project config (security: output language is a user-level setting).");
-  }
-  if ("sqlite" in 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).");
-  }
-  const embedding = projectRaw.embedding;
-  if (isPlainObject2(embedding)) {
-    const removed = [];
-    for (const field of EMBEDDING_DESTINATION_FIELDS) {
-      if (field in embedding) {
-        delete embedding[field];
-        removed.push(field);
-      }
-    }
-    if (removed.length > 0) {
-      warnings.push(`Ignoring embedding.${removed.join("/")} from project config ` + "(security: a repository cannot choose where private text is embedded).");
-    }
-  }
-  for (const agentKey of HIDDEN_AGENT_KEYS) {
-    const block = projectRaw[agentKey];
-    if (!isPlainObject2(block))
-      continue;
-    const removed = [];
-    for (const field of AGENT_ESCALATION_FIELDS) {
-      if (field in block) {
-        delete block[field];
-        removed.push(field);
-      }
-    }
-    if (removed.length > 0) {
-      warnings.push(`Ignoring ${agentKey}.${removed.join("/")} from project config ` + "(security: a repository cannot reprogram or re-permission hidden agents).");
-    }
-  }
-  return warnings;
-}
-function normalizeEndpoint(value) {
-  if (typeof value !== "string")
-    return;
-  const trimmed = value.trim().replace(/\/+$/, "");
-  return trimmed.length > 0 ? trimmed.toLowerCase() : undefined;
-}
-function dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, userRaw) {
-  const projectEmbedding = projectRaw.embedding;
-  if (!isPlainObject2(projectEmbedding))
-    return [];
-  const redirectsEndpoint = "endpoint" in projectEmbedding;
-  if (!redirectsEndpoint)
-    return [];
-  const userEmbedding = userRaw?.embedding;
-  if (isPlainObject2(userEmbedding)) {
-    const projectEndpoint = normalizeEndpoint(projectEmbedding.endpoint);
-    const userEndpoint = normalizeEndpoint(userEmbedding.endpoint);
-    if (projectEndpoint !== undefined && projectEndpoint === userEndpoint) {
-      return [];
-    }
-  }
-  const providesOwnKey = typeof projectEmbedding.api_key === "string" && projectEmbedding.api_key.length > 0;
-  if (providesOwnKey)
-    return [];
-  const mergedEmbedding = mergedRaw.embedding;
-  if (!isPlainObject2(mergedEmbedding))
-    return [];
-  if (!("api_key" in mergedEmbedding))
-    return [];
-  delete mergedEmbedding.api_key;
-  return [
-    "Dropped inherited user embedding api_key because project config redirected " + "embedding.endpoint without supplying its own key (security: prevents key " + "exfiltration to a repository-chosen endpoint)."
-  ];
-}
-
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -145771,7 +145725,7 @@ __export(exports_util, {
   jsonStringifyReplacer: () => jsonStringifyReplacer,
   joinValues: () => joinValues,
   issue: () => issue,
-  isPlainObject: () => isPlainObject3,
+  isPlainObject: () => isPlainObject2,
   isObject: () => isObject,
   hexToUint8Array: () => hexToUint8Array,
   getSizableOrigin: () => getSizableOrigin,
@@ -145953,7 +145907,7 @@ var allowsEval = /* @__PURE__ */ cached(() => {
     return false;
   }
 });
-function isPlainObject3(o) {
+function isPlainObject2(o) {
   if (isObject(o) === false)
     return false;
   const ctor = o.constructor;
@@ -145970,7 +145924,7 @@ function isPlainObject3(o) {
   return true;
 }
 function shallowClone(o) {
-  if (isPlainObject3(o))
+  if (isPlainObject2(o))
     return { ...o };
   if (Array.isArray(o))
     return [...o];
@@ -146174,7 +146128,7 @@ function omit(schema, mask) {
   return clone(schema, def);
 }
 function extend(schema, shape) {
-  if (!isPlainObject3(shape)) {
+  if (!isPlainObject2(shape)) {
     throw new Error("Invalid input to extend: expected a plain object");
   }
   const checks = schema._zod.def.checks;
@@ -146197,7 +146151,7 @@ function extend(schema, shape) {
   return clone(schema, def);
 }
 function safeExtend(schema, shape) {
-  if (!isPlainObject3(shape)) {
+  if (!isPlainObject2(shape)) {
     throw new Error("Invalid input to safeExtend: expected a plain object");
   }
   const def = mergeDefs(schema._zod.def, {
@@ -148540,7 +148494,7 @@ function mergeValues(a, b) {
   if (a instanceof Date && b instanceof Date && +a === +b) {
     return { valid: true, data: a };
   }
-  if (isPlainObject3(a) && isPlainObject3(b)) {
+  if (isPlainObject2(a) && isPlainObject2(b)) {
     const bKeys = Object.keys(b);
     const sharedKeys = Object.keys(a).filter((key) => bKeys.indexOf(key) !== -1);
     const newObj = { ...a, ...b };
@@ -148726,7 +148680,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
     const input = payload.value;
-    if (!isPlainObject3(input)) {
+    if (!isPlainObject2(input)) {
       payload.issues.push({
         expected: "record",
         code: "invalid_type",
@@ -159897,6 +159851,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%)."),
@@ -159933,6 +159891,295 @@ var MagicContextConfigSchema = exports_external.object({
   };
 });
 
+// ../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) {
+    delete projectRaw.auto_update;
+    warnings.push("Ignoring auto_update from project config (security: this setting only honors user-level config).");
+  }
+  if ("language" in projectRaw) {
+    delete projectRaw.language;
+    warnings.push("Ignoring language from project config (security: output language is a user-level setting).");
+  }
+  if ("sqlite" in 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).");
+  }
+  const embedding = projectRaw.embedding;
+  if (isPlainObject3(embedding)) {
+    const removed = [];
+    for (const field of EMBEDDING_DESTINATION_FIELDS) {
+      if (field in embedding) {
+        delete embedding[field];
+        removed.push(field);
+      }
+    }
+    if (removed.length > 0) {
+      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))
+      continue;
+    const removed = [];
+    for (const field of AGENT_ESCALATION_FIELDS) {
+      if (field in block) {
+        delete block[field];
+        removed.push(field);
+      }
+    }
+    if (removed.length > 0) {
+      warnings.push(`Ignoring ${agentKey}.${removed.join("/")} from project config ` + "(security: a repository cannot reprogram or re-permission hidden agents).");
+    }
+  }
+  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 normalizeEndpoint(value) {
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim().replace(/\/+$/, "");
+  return trimmed.length > 0 ? trimmed.toLowerCase() : undefined;
+}
+function dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, userRaw) {
+  const projectEmbedding = projectRaw.embedding;
+  if (!isPlainObject3(projectEmbedding))
+    return [];
+  const redirectsEndpoint = "endpoint" in projectEmbedding;
+  if (!redirectsEndpoint)
+    return [];
+  const userEmbedding = userRaw?.embedding;
+  if (isPlainObject3(userEmbedding)) {
+    const projectEndpoint = normalizeEndpoint(projectEmbedding.endpoint);
+    const userEndpoint = normalizeEndpoint(userEmbedding.endpoint);
+    if (projectEndpoint !== undefined && projectEndpoint === userEndpoint) {
+      return [];
+    }
+  }
+  const providesOwnKey = typeof projectEmbedding.api_key === "string" && projectEmbedding.api_key.length > 0;
+  if (providesOwnKey)
+    return [];
+  const mergedEmbedding = mergedRaw.embedding;
+  if (!isPlainObject3(mergedEmbedding))
+    return [];
+  if (!("api_key" in mergedEmbedding))
+    return [];
+  delete mergedEmbedding.api_key;
+  return [
+    "Dropped inherited user embedding api_key because project config redirected " + "embedding.endpoint without supplying its own key (security: prevents key " + "exfiltration to a repository-chosen endpoint)."
+  ];
+}
+
 // ../plugin/src/config/variable.ts
 import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
@@ -160265,6 +160512,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}`));
@@ -160277,6 +160525,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);
     }
@@ -160375,6 +160630,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}`));
@@ -160387,6 +160643,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);
     }
@@ -161771,6 +162034,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;
@@ -161801,6 +162065,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) {
@@ -161829,6 +162101,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;
@@ -162760,12 +163036,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;
@@ -162788,8 +163064,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;
@@ -164295,12 +164572,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(meta3) {
+    pendingNoiseMeta.push(meta3);
+    if (!currentBlock) {
+      highestScannedOrdinal = Math.max(highestScannedOrdinal, meta3.ordinal);
+    }
+  }
   function flushCurrentBlock() {
     if (!currentBlock)
       return true;
@@ -164316,6 +164600,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);
@@ -164339,7 +164624,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(meta3);
+        recordFilteredNoise(meta3);
         continue;
       }
       const tcText = tcSummaries.join(" / ");
@@ -164371,7 +164656,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     const compacted = compactTextForSummary(allParts.join(" / "), msg.role);
     const text = compacted.text;
     if (!text) {
-      pendingNoiseMeta.push(meta3);
+      recordFilteredNoise(meta3);
       continue;
     }
     const msgHasNarrative = textParts.length > 0;
@@ -164398,7 +164683,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];
@@ -164415,7 +164702,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,
@@ -168860,6 +169147,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);
@@ -168882,6 +169171,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))
@@ -169120,16 +169418,16 @@ function synthesizeToolResultParts(msg) {
 // 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) {
@@ -169606,25 +169904,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;
 }
@@ -170105,9 +170411,11 @@ import path4 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,
@@ -170291,7 +170599,10 @@ async function normalizeVerificationFiles(args) {
 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) {
@@ -170300,7 +170611,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;
@@ -170321,6 +170632,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) {
@@ -170329,6 +170656,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) {
@@ -170349,6 +170684,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;
@@ -170416,7 +170759,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) {
@@ -170433,7 +170784,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 {
@@ -171204,7 +171555,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) {
@@ -171212,7 +171563,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;
@@ -171620,6 +171971,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";
 
@@ -172941,25 +173299,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 fmt = (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"}:`,
     "",
+    fmt(headers),
+    [
+      "-".repeat(widths.id),
+      "-".repeat(widths.category),
+      "-".repeat(widths.status),
+      "-".repeat(widths.verification),
+      "-".repeat(widths.updated),
+      "-------"
+    ].join("-+-"),
     ...rows.map(fmt)
   ].join(`
 `);
@@ -173029,8 +173407,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.");
@@ -173077,7 +173456,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)) {
@@ -173124,7 +173504,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.`);
           }
@@ -173226,7 +173606,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)) {
@@ -173365,6 +173746,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();
@@ -173373,7 +173755,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);
@@ -173382,6 +173764,7 @@ function createCtxNoteTool(deps) {
           }
           const note2 = addNote(deps.db, "smart", {
             content,
+            sessionId,
             projectPath: projectIdentity,
             surfaceCondition,
             anchorOrdinal
@@ -173633,6 +174016,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.");
       }
@@ -173650,7 +174034,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);
@@ -174176,24 +174560,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;
@@ -174443,7 +174849,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({
@@ -174456,7 +174862,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({
@@ -175627,18 +176033,539 @@ function createCtxSearchTool(deps) {
   };
 }
 
-// src/tools/todowrite.ts
-var STATUS_VALUES = [
-  "pending",
-  "in_progress",
-  "completed",
-  "cancelled"
+// src/tools/todo-view-pi.ts
+import {
+  truncateToWidth
+} from "@earendil-works/pi-tui";
+
+// ../plugin/src/hooks/magic-context/todo-view.ts
+import { createHash as createHash8 } from "node:crypto";
+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 PRIORITY_VALUES = ["high", "medium", "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))
+    return null;
+  const normalized = [];
+  for (const todo of todos) {
+    if (!isTodoItem(todo))
+      return null;
+    normalized.push({
+      content: todo.content,
+      status: todo.status,
+      priority: todo.priority ?? TODO_PRIORITY_MEDIUM
+    });
+  }
+  return JSON.stringify(normalized);
+}
+function buildSyntheticTodoPart(stateJson) {
+  const todos = parseTodoState(stateJson);
+  if (todos === null || todos.length === 0)
+    return null;
+  if (todos.every((t) => TERMINAL_STATUSES.has(t.status)))
+    return null;
+  const callID = computeSyntheticCallId(stateJson);
+  const activeCount = todos.filter((t) => !TITLE_DONE_STATUSES.has(t.status)).length;
+  const output = JSON.stringify(todos, null, 2);
+  const ts = 0;
+  return {
+    type: "tool",
+    callID,
+    tool: "todowrite",
+    state: {
+      status: "completed",
+      input: { todos },
+      output,
+      title: `${activeCount} todos`,
+      metadata: { todos, truncated: false },
+      time: { start: ts, end: ts }
+    },
+    syntheticTodoMarker: true
+  };
+}
+function computeSyntheticCallId(stateJson) {
+  const hash2 = createHash8("sha256").update(stateJson).digest("hex").slice(0, 16);
+  return `${SYNTHETIC_CALL_ID_PREFIX}${hash2}`;
+}
+function parseTodoState(stateJson) {
+  if (stateJson.length === 0)
+    return null;
+  try {
+    const parsed = JSON.parse(stateJson);
+    if (!Array.isArray(parsed))
+      return null;
+    const result = [];
+    for (const item of parsed) {
+      if (!isTodoItem(item))
+        return null;
+      result.push({
+        content: item.content,
+        status: item.status,
+        priority: item.priority ?? TODO_PRIORITY_MEDIUM
+      });
+    }
+    return result;
+  } catch {
+    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" && isTodoStatus(todo.status) && (todo.priority === undefined || isTodoPriority(todo.priority));
+}
+
+// src/tools/todo-view-pi.ts
+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) => [truncateToWidth(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) => truncateToWidth(formatTodoLine(todo, theme, { showId: true }), width, "…"));
+    if (hiddenCount > 0) {
+      lines.push(truncateToWidth(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 truncate2 = (line) => truncateToWidth(line, width, "…");
+    const lines = [truncate2(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(truncate2(`${branch} ${formatTodoLine(todo, theme, { showId: true })}`));
+      if (todo.status === "completed")
+        this.completedTaskIdsPendingHide.add(key);
+    }
+    if (hiddenCount > 0) {
+      lines.push(truncate2(`${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 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({
@@ -175646,34 +176573,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: [
           {
@@ -175687,6 +176604,12 @@ function createTodowriteTool() {
           truncated: false
         }
       };
+    },
+    renderCall(args, theme) {
+      return renderTodowriteCall(args, theme);
+    },
+    renderResult(result, _opts, theme) {
+      return renderTodowriteResult(result, theme);
     }
   };
 }
@@ -175712,15 +176635,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
     }));
   }
 }
@@ -175751,9 +176681,11 @@ function magicContextSubagentExtension(pi) {
         ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
         memoryToolEnabled: dreamerActionsEnabled,
         allowDreamerActions: dreamerActionsEnabled,
-        sessionScopedToolsDisabled: true
+        sessionScopedToolsDisabled: true,
+        todowriteEnabled: cfg.todowrite.enabled !== false,
+        todowriteCommandEnabled: false
       });
-      log(`[pi-subagent] registered tools: ctx_search${dreamerActionsEnabled ? ", ctx_memory" : ""}` + ` (ctx_note/ctx_expand omitted: --no-session child;` + ` memory=${cfg.memory.enabled}, embedding=${cfg.embedding.provider !== "off"},` + ` git_commits=${cfg.memory.git_commit_indexing.enabled}, dreamer_actions=${dreamerActionsEnabled})`);
+      log(`[pi-subagent] registered tools: ctx_search${dreamerActionsEnabled ? ", ctx_memory" : ""}${cfg.todowrite.enabled !== false ? ", todowrite" : ""}` + ` (ctx_note/ctx_expand omitted: --no-session child;` + ` memory=${cfg.memory.enabled}, embedding=${cfg.embedding.provider !== "off"},` + ` git_commits=${cfg.memory.git_commit_indexing.enabled}, dreamer_actions=${dreamerActionsEnabled})`);
     } catch (err5) {
       const message = err5 instanceof Error ? err5.message : String(err5);
       log(`[pi-subagent] startup failed: ${message}`);