@cortexkit/pi-magic-context 0.24.1 → 0.25.0

package/dist/subagent-entry.js

@@ -8010,6 +8010,14 @@ function buildNodeSqliteDatabaseClass(DatabaseSync) {
       }
       super(typeof filename === "string" ? filename : ":memory:", translated);
     }
+    prepare(sql) {
+      const stmt = super.prepare(sql);
+      for (const method of ["run", "get", "all"]) {
+        const original = stmt[method].bind(stmt);
+        stmt[method] = (...args) => args.length === 1 && Array.isArray(args[0]) ? original(...args[0]) : original(...args);
+      }
+      return stmt;
+    }
     transaction(fn) {
       const self = this;
       const wrapped = function(...args) {
@@ -143218,6 +143226,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "historian_last_failure_at", "INTEGER DEFAULT NULL");
   ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "tool_reclaim_watermark", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "stale_reduce_stripped_ids", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "processed_image_stripped_ids", "TEXT DEFAULT ''");
@@ -159135,6 +159144,28 @@ function countUnembeddedSessionCompartments(db, projectPath, sessionId, modelId)
                )`).get(projectPath, sessionId, projectPath, modelId);
   return typeof row?.n === "number" ? row.n : 0;
 }
+function countSessionCompartmentEmbedCoverage(db, projectPath, sessionId, modelId) {
+  const row = db.prepare(`SELECT
+               COUNT(*) AS total,
+               SUM(CASE WHEN EXISTS (
+                   SELECT 1 FROM compartment_chunk_embeddings e
+                   WHERE e.compartment_id = c.id
+                     AND e.project_path = ?
+                     AND e.model_id = ?
+               ) THEN 1 ELSE 0 END) AS embedded
+             FROM compartments c
+             JOIN session_projects sp
+               ON sp.session_id = c.session_id
+              AND sp.harness = c.harness
+              AND sp.project_path = ?
+             WHERE c.session_id = ?
+               AND c.start_message IS NOT NULL
+               AND c.end_message IS NOT NULL`).get(projectPath, modelId, projectPath, sessionId);
+  return {
+    total: typeof row?.total === "number" ? row.total : 0,
+    embedded: typeof row?.embedded === "number" ? row.embedded : 0
+  };
+}
 
 // ../plugin/src/features/magic-context/memory/cosine-similarity.ts
 function cosineSimilarity(a, b) {
@@ -159287,6 +159318,19 @@ async function withQuietConsole(fn) {
     console.error = origError;
   }
 }
+var nativeRuntimeMissing = false;
+function isNativeRuntimeMissingError(error51) {
+  const message = error51 instanceof Error ? error51.message : String(error51 ?? "");
+  const lower = message.toLowerCase();
+  const code = error51?.code;
+  const name2 = error51?.name;
+  if (code === "ERR_DLOPEN_FAILED" && lower.includes("onnxruntime")) {
+    return true;
+  }
+  if (!lower.includes("onnxruntime-node"))
+    return false;
+  return code === "ERR_MODULE_NOT_FOUND" || name2 === "ResolveMessage" || lower.includes("cannot find package") || lower.includes("cannot find module") || lower.includes("err_module_not_found");
+}
 function isTransientLoadError(error51) {
   const message = error51 instanceof Error ? error51.message : String(error51 ?? "");
   if (!message)
@@ -159351,6 +159395,9 @@ class LocalEmbeddingProvider {
     if (this.pipeline) {
       return true;
     }
+    if (nativeRuntimeMissing) {
+      return false;
+    }
     if (this.initPromise) {
       await this.initPromise;
       return this.pipeline !== null;
@@ -159417,7 +159464,12 @@ class LocalEmbeddingProvider {
           await releaseLock();
         }
       } catch (error51) {
-        log("[magic-context] embedding model failed to load:", error51);
+        if (isNativeRuntimeMissingError(error51)) {
+          nativeRuntimeMissing = true;
+          log("[magic-context] local embedding runtime is not installed (onnxruntime-node missing from this install). Local embeddings are disabled. Fix: reinstall the plugin (run `npx @cortexkit/magic-context@latest doctor --force`), or configure an `openai-compatible`/`ollama` embedding endpoint instead. Existing memories are unaffected.");
+        } else {
+          log("[magic-context] embedding model failed to load:", error51);
+        }
         this.pipeline = null;
       } finally {
         this.initPromise = null;
@@ -159903,6 +159955,20 @@ function getDistinctStoredModelIds(db, projectPath) {
   const rows = getDistinctStoredModelIdsStatement(db).all(projectPath);
   return new Set(rows.map((row) => typeof row.modelId === "string" ? row.modelId : null));
 }
+function getMemoryEmbedCoverage(db, projectPath, modelId) {
+  const row = db.prepare(`SELECT
+               COUNT(*) AS total,
+               SUM(CASE WHEN EXISTS (
+                   SELECT 1 FROM memory_embeddings e
+                   WHERE e.memory_id = m.id AND e.model_id = ?
+               ) THEN 1 ELSE 0 END) AS embedded
+             FROM memories m
+             WHERE m.project_path = ? AND m.status = 'active'`).get(modelId, projectPath);
+  return {
+    total: typeof row?.total === "number" ? row.total : 0,
+    embedded: typeof row?.embedded === "number" ? row.embedded : 0
+  };
+}
 
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
 import { createHash as createHash6, randomUUID } from "node:crypto";
@@ -160009,6 +160075,118 @@ function getDistinctCommitEmbeddingModelIds(db, projectPath) {
   return new Set(rows.map((row) => typeof row.modelId === "string" ? row.modelId : null));
 }
 
+// ../plugin/src/features/magic-context/git-commits/storage-git-commits.ts
+init_logger();
+var insertStatements = new WeakMap;
+var existingShasStatements = new WeakMap;
+var projectCountStatements = new WeakMap;
+var evictStatements = new WeakMap;
+var evictOverflowStatements = new WeakMap;
+var latestCommitTimeStatements = new WeakMap;
+function getInsertStatement(db) {
+  let stmt = insertStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`INSERT INTO git_commits (sha, project_path, short_sha, message, author, committed_at, indexed_at)
+             VALUES (?, ?, ?, ?, ?, ?, ?)
+             ON CONFLICT(sha) DO UPDATE SET
+                 project_path = excluded.project_path,
+                 short_sha = excluded.short_sha,
+                 message = excluded.message,
+                 author = excluded.author,
+                 committed_at = excluded.committed_at,
+                 indexed_at = excluded.indexed_at
+             WHERE git_commits.message != excluded.message`);
+    insertStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getExistingShasStatement(db) {
+  let stmt = existingShasStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT sha FROM git_commits WHERE project_path = ?");
+    existingShasStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getProjectCountStatement(db) {
+  let stmt = projectCountStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT COUNT(*) AS count FROM git_commits WHERE project_path = ?");
+    projectCountStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getLatestCommitTimeStatement(db) {
+  let stmt = latestCommitTimeStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT MAX(committed_at) AS latest FROM git_commits WHERE project_path = ?");
+    latestCommitTimeStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getEvictOverflowStatement(db) {
+  let stmt = evictOverflowStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`DELETE FROM git_commits
+             WHERE rowid IN (
+                 SELECT rowid FROM git_commits
+                 WHERE project_path = ?
+                 ORDER BY committed_at DESC, sha DESC
+                 LIMIT -1 OFFSET ?
+             )`);
+    evictOverflowStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function upsertCommits(db, projectPath, commits) {
+  if (commits.length === 0)
+    return { inserted: 0, updated: 0 };
+  const existing = new Set;
+  for (const row of getExistingShasStatement(db).all(projectPath)) {
+    existing.add(row.sha);
+  }
+  let inserted = 0;
+  let updated = 0;
+  const now = Date.now();
+  const insertStmt = getInsertStatement(db);
+  db.transaction(() => {
+    for (const commit of commits) {
+      const result = insertStmt.run(commit.sha, projectPath, commit.shortSha, commit.message, commit.author, commit.committedAtMs, now);
+      if (result.changes > 0) {
+        if (existing.has(commit.sha)) {
+          updated++;
+        } else {
+          inserted++;
+          existing.add(commit.sha);
+        }
+      }
+    }
+  })();
+  return { inserted, updated };
+}
+function getCommitCount(db, projectPath) {
+  const row = getProjectCountStatement(db).get(projectPath);
+  return row?.count ?? 0;
+}
+function getLatestIndexedCommitTimeMs(db, projectPath) {
+  const row = getLatestCommitTimeStatement(db).get(projectPath);
+  return row?.latest ?? null;
+}
+function enforceProjectCap(db, projectPath, maxCommits) {
+  if (maxCommits <= 0)
+    return 0;
+  const count = getCommitCount(db, projectPath);
+  if (count <= maxCommits)
+    return 0;
+  getEvictOverflowStatement(db).run(projectPath, maxCommits);
+  const after = getCommitCount(db, projectPath);
+  const evicted = Math.max(0, count - after);
+  if (evicted > 0) {
+    log(`[git-commits] evicted ${evicted} oldest commits for project ${projectPath} (cap=${maxCommits}, was=${count})`);
+  }
+  return evicted;
+}
+
 // ../plugin/src/features/magic-context/git-commits/sweep-coordinator.ts
 var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
 var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
@@ -160241,8 +160419,12 @@ function repairMisScopedCompartmentChunkEmbeddingsForProject(db, projectPath) {
 var OFF_PROVIDER_IDENTITY = "embedding-provider:off";
 var SWEEP_MAX_WALL_CLOCK_MS = 10 * 60 * 1000;
 var CHUNK_DRAIN_BATCH_SIZE = 8;
-var MAX_WINDOWS_PER_EMBED_CALL = 16;
+var MAX_WINDOWS_PER_EMBED_CALL = 2;
 var SESSION_EMBED_LEASE_RENEWAL_MS = 60 * 1000;
+var EMBED_SLICE_RETRY_ATTEMPTS = 3;
+var EMBED_SLICE_RETRY_BASE_MS = 250;
+var EMBED_SLOW_FAILURE_NO_RETRY_MS = 1e4;
+var MAX_CONSECUTIVE_FAILED_BATCHES = 3;
 var projectRegistrations = new Map;
 var loadUnembeddedMemoriesStatements = new WeakMap;
 var globalRegistrationGeneration = 0;
@@ -160342,7 +160524,9 @@ function snapshotFor(registration) {
     enabled,
     gitCommitEnabled,
     modelId: registration.observationMode || !providerIsOn ? "off" : registration.modelId,
-    chunkModelId: registration.observationMode || !providerIsOn ? "off" : registration.chunkModelId
+    chunkModelId: registration.observationMode || !providerIsOn ? "off" : registration.chunkModelId,
+    model: registration.observationMode || !providerIsOn ? "off" : ("model" in registration.config) && registration.config.model.trim() ? registration.config.model.trim() : registration.modelId,
+    provider: registration.observationMode || !providerIsOn ? "off" : registration.config.provider ?? "local"
   };
 }
 function disposeProvider(provider) {
@@ -160553,8 +160737,9 @@ async function embedUnembeddedMemoriesForProject(db, projectIdentity, batchSize
 }
 async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates, signal) {
   const noWork = [];
+  const failed = [];
   if (candidates.length === 0)
-    return { embedded: 0, noWork };
+    return { embedded: 0, noWork, failed };
   const maxInputTokens = getProjectEmbeddingMaxInputTokens(projectIdentity);
   const prepared = [];
   for (const candidate of candidates) {
@@ -160571,7 +160756,7 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
     prepared.push({ candidate, windows });
   }
   if (prepared.length === 0)
-    return { embedded: 0, noWork };
+    return { embedded: 0, noWork, failed };
   let embedded = 0;
   let i = 0;
   while (i < prepared.length) {
@@ -160588,35 +160773,60 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
     const texts = [];
     for (const item of slice)
       texts.push(...item.windows.map((w) => w.text));
-    try {
-      const result = await embedBatchForProject(projectIdentity, texts, signal);
-      if (!result)
-        continue;
+    const persistedIds = new Set;
+    for (let attempt = 0;attempt < EMBED_SLICE_RETRY_ATTEMPTS; attempt++) {
       if (signal?.aborted)
         break;
-      let offset = 0;
-      for (const item of slice) {
-        const vectors = result.vectors.slice(offset, offset + item.windows.length);
-        offset += item.windows.length;
-        if (vectors.length !== item.windows.length || vectors.some((v) => !v)) {
-          continue;
+      let result = null;
+      const attemptStart = Date.now();
+      try {
+        result = await embedBatchForProject(projectIdentity, texts, signal);
+      } catch (error51) {
+        log("[magic-context] failed to proactively embed compartment chunks:", error51);
+      }
+      if (signal?.aborted)
+        break;
+      if (result) {
+        let offset = 0;
+        for (const item of slice) {
+          const vectors = result.vectors.slice(offset, offset + item.windows.length);
+          offset += item.windows.length;
+          if (persistedIds.has(item.candidate.id))
+            continue;
+          if (vectors.length !== item.windows.length || vectors.some((v) => !v)) {
+            continue;
+          }
+          const rows = item.windows.map((window, index) => ({
+            compartmentId: item.candidate.id,
+            sessionId: item.candidate.sessionId,
+            projectPath: projectIdentity,
+            window,
+            modelId,
+            vector: vectors[index]
+          }));
+          replaceCompartmentChunkEmbeddings(db, rows);
+          persistedIds.add(item.candidate.id);
         }
-        const rows = item.windows.map((window, index) => ({
-          compartmentId: item.candidate.id,
-          sessionId: item.candidate.sessionId,
-          projectPath: projectIdentity,
-          window,
-          modelId,
-          vector: vectors[index]
-        }));
-        replaceCompartmentChunkEmbeddings(db, rows);
-        embedded += 1;
       }
-    } catch (error51) {
-      log("[magic-context] failed to proactively embed compartment chunks:", error51);
+      if (persistedIds.size === slice.length)
+        break;
+      if (persistedIds.size > 0)
+        break;
+      if (Date.now() - attemptStart >= EMBED_SLOW_FAILURE_NO_RETRY_MS)
+        break;
+      if (attempt < EMBED_SLICE_RETRY_ATTEMPTS - 1) {
+        await new Promise((resolve3) => setTimeout(resolve3, EMBED_SLICE_RETRY_BASE_MS * 2 ** attempt));
+      }
+    }
+    embedded += persistedIds.size;
+    if (!signal?.aborted) {
+      for (const item of slice) {
+        if (!persistedIds.has(item.candidate.id))
+          failed.push(item.candidate.id);
+      }
     }
   }
-  return { embedded, noWork };
+  return { embedded, noWork, failed };
 }
 async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, options) {
   const snapshot = getProjectEmbeddingSnapshot(projectIdentity);
@@ -160639,9 +160849,11 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
   renewal.unref?.();
   const batchSize = Math.max(1, options?.batchSize ?? CHUNK_DRAIN_BATCH_SIZE);
   const skipIds = [];
+  const failedIds = [];
   let embedded = 0;
   let aborted2 = false;
-  let providerStalled = false;
+  let providerDown = false;
+  let consecutiveFailedBatches = 0;
   try {
     options?.onProgress?.({ embedded, total });
     for (;; ) {
@@ -160649,15 +160861,26 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
         aborted2 = true;
         break;
       }
-      const candidates = loadUnembeddedSessionChunkCandidates(db, projectIdentity, sessionId, snapshot.chunkModelId, batchSize, skipIds);
+      const candidates = loadUnembeddedSessionChunkCandidates(db, projectIdentity, sessionId, snapshot.chunkModelId, batchSize, [...skipIds, ...failedIds]);
       if (candidates.length === 0)
         break;
-      const { embedded: n, noWork } = await embedCandidateChunkBatch(db, projectIdentity, snapshot.chunkModelId, candidates, options?.signal);
+      const {
+        embedded: n,
+        noWork,
+        failed
+      } = await embedCandidateChunkBatch(db, projectIdentity, snapshot.chunkModelId, candidates, options?.signal);
       for (const id of noWork)
         skipIds.push(id);
+      for (const id of failed)
+        failedIds.push(id);
       if (n === 0 && noWork.length === 0) {
-        providerStalled = true;
-        break;
+        consecutiveFailedBatches += 1;
+        if (consecutiveFailedBatches >= MAX_CONSECUTIVE_FAILED_BATCHES) {
+          providerDown = true;
+          break;
+        }
+      } else {
+        consecutiveFailedBatches = 0;
       }
       embedded += n;
       options?.onProgress?.({ embedded: Math.min(embedded, total), total });
@@ -160665,16 +160888,50 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
     }
   } finally {
     clearInterval(renewal);
-    releaseGitSweepLease(db, projectIdentity, holderId);
+    try {
+      releaseGitSweepLease(db, projectIdentity, holderId);
+    } catch (error51) {
+      log("[magic-context] embed drain: lease release failed (will TTL-expire):", error51);
+    }
   }
   if (aborted2)
-    return { status: "aborted", embedded, total };
-  if (providerStalled) {
+    return { status: "aborted", embedded, total, failed: failedIds.length };
+  if (providerDown || failedIds.length > 0) {
     const remaining = Math.max(0, countUnembeddedSessionCompartments(db, projectIdentity, sessionId, snapshot.chunkModelId) - skipIds.length);
-    if (remaining > 0)
-      return { status: "stalled", embedded, total, remaining };
+    if (remaining > 0) {
+      return { status: "stalled", embedded, total, remaining, failed: failedIds.length };
+    }
   }
-  return { status: "done", embedded, total };
+  return { status: "done", embedded, total, failed: failedIds.length };
+}
+function getEmbeddingCoverageStatus(db, projectIdentity, sessionId) {
+  const snapshot = getProjectEmbeddingSnapshot(projectIdentity);
+  if (!snapshot?.enabled || snapshot.chunkModelId === "off") {
+    return {
+      enabled: false,
+      model: snapshot?.model ?? "off",
+      provider: snapshot?.provider ?? "off",
+      session: { embedded: 0, total: 0 },
+      memories: { embedded: 0, total: 0 },
+      commits: { embedded: 0, total: 0, gitEnabled: false }
+    };
+  }
+  const session = countSessionCompartmentEmbedCoverage(db, projectIdentity, sessionId, snapshot.chunkModelId);
+  const memories = getMemoryEmbedCoverage(db, projectIdentity, snapshot.modelId);
+  const gitEnabled = snapshot.gitCommitEnabled;
+  const commits = gitEnabled ? {
+    embedded: countEmbeddedCommits(db, projectIdentity),
+    total: getCommitCount(db, projectIdentity),
+    gitEnabled: true
+  } : { embedded: 0, total: 0, gitEnabled: false };
+  return {
+    enabled: true,
+    model: snapshot.model,
+    provider: snapshot.provider,
+    session,
+    memories,
+    commits
+  };
 }
 
 // ../plugin/src/features/magic-context/memory/embedding.ts
@@ -160903,6 +161160,7 @@ var SESSION_META_SELECT_COLUMNS = [
   "conversation_tokens",
   "tool_call_tokens",
   "cleared_reasoning_through_tag",
+  "tool_reclaim_watermark",
   "last_todo_state",
   "cached_m0_bytes",
   "cached_m1_bytes",
@@ -160951,6 +161209,7 @@ var META_COLUMNS = {
   conversationTokens: "conversation_tokens",
   toolCallTokens: "tool_call_tokens",
   clearedReasoningThroughTag: "cleared_reasoning_through_tag",
+  toolReclaimWatermark: "tool_reclaim_watermark",
   lastTodoState: "last_todo_state",
   cachedM0Bytes: "cached_m0_bytes",
   cachedM1Bytes: "cached_m1_bytes",
@@ -161019,7 +161278,7 @@ function isSessionMetaRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const r = row;
-  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isStringOrNull(r.cached_m0_workspace_fingerprint) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.last_usage_context_limit) && isNumberOrNull(r.prior_boundary_ordinal) && isNumberOrNull(r.protected_tail_policy_version) && isNumberOrNull(r.protected_tail_drain_window_started_at) && isNumberOrNull(r.protected_tail_drain_tokens) && isNumberOrNull(r.recovery_no_eligible_head_count) && isNumberOrNull(r.force_emergency_bypass_window_start) && isNumberOrNull(r.force_emergency_bypass_used) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
+  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isStringOrNull(r.cached_m0_workspace_fingerprint) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.last_usage_context_limit) && isNumberOrNull(r.prior_boundary_ordinal) && isNumberOrNull(r.protected_tail_policy_version) && isNumberOrNull(r.protected_tail_drain_window_started_at) && isNumberOrNull(r.protected_tail_drain_tokens) && isNumberOrNull(r.recovery_no_eligible_head_count) && isNumberOrNull(r.force_emergency_bypass_window_start) && isNumberOrNull(r.force_emergency_bypass_used) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme) && isNumberOrNull(r.tool_reclaim_watermark);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -161042,6 +161301,7 @@ function getDefaultSessionMeta(sessionId) {
     conversationTokens: 0,
     toolCallTokens: 0,
     clearedReasoningThroughTag: 0,
+    toolReclaimWatermark: 0,
     lastTodoState: "",
     cachedM0Bytes: null,
     cachedM1Bytes: null,
@@ -161105,6 +161365,7 @@ function toSessionMeta(row) {
     conversationTokens: numOrZero(row.conversation_tokens),
     toolCallTokens: numOrZero(row.tool_call_tokens),
     clearedReasoningThroughTag: numOrZero(row.cleared_reasoning_through_tag),
+    toolReclaimWatermark: numOrZero(row.tool_reclaim_watermark),
     lastTodoState: lastTodoStateRaw,
     cachedM0Bytes: toBufferOrNull(row.cached_m0_bytes),
     cachedM1Bytes: toBufferOrNull(row.cached_m1_bytes),
@@ -161531,6 +161792,8 @@ function readRawSessionTailFromDb(db, sessionId, baseOrdinal, anchorMessageId) {
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+var DANGLING_TAG_GLOBAL_REGEX = /\u00a7\d+(?!\.\d)[^\s\u00a7\w.]?/g;
+var DANGLING_TAG_PREFIX_REGEX = /^(?:\u00a7\d+(?!\.\d)[^\s\u00a7\w.]?\s*)+/;
 var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
 var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
 var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
@@ -161543,6 +161806,9 @@ function stripCompleteTagPairsGlobally(value) {
 function stripMalformedTagNotationGlobally(value) {
   return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
 }
+function stripDanglingTagNotationGlobally(value) {
+  return value.replace(DANGLING_TAG_GLOBAL_REGEX, "");
+}
 function stripTagSectionCharacters(value) {
   return value.replace(STRAY_SECTION_CHAR_REGEX, "");
 }
@@ -161550,6 +161816,7 @@ function stripPersistedAssistantText(value) {
   let text = stripWellFormedLeadingTagPrefix(value);
   text = stripCompleteTagPairsGlobally(text);
   text = stripMalformedTagNotationGlobally(text);
+  text = stripDanglingTagNotationGlobally(text);
   text = stripTagSectionCharacters(text);
   return text.trim();
 }
@@ -161562,6 +161829,7 @@ function stripTagPrefix(value) {
     const prev = stripped;
     stripped = stripped.replace(MALFORMED_TAG_PREFIX_REGEX, "");
     stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+    stripped = stripped.replace(DANGLING_TAG_PREFIX_REGEX, "");
     if (stripped === prev)
       break;
   }
@@ -161977,9 +162245,184 @@ Older parts of this session are summarized into <compartment> blocks inside <ses
 
 ctx_expand(start=120, end=245)  ← the compartment's own start/end attributes
 
-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.`;
+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.
+
+Two recovery modes for finer detail:
+- ctx_expand(start=120, end=245, verbose=true) — lists each message SEPARATELY with its ordinal [N] and a per-part preview (each tool call shown with its output size). Use this to find the exact message or tool call you want, then recover it in full by ordinal.
+- ctx_expand(message=138) — returns the FULL untruncated content of the message at that ordinal: every text part, and every tool call's complete input + output, read from stored history. This is the cheap way to get back a tool output you dropped with ctx_reduce — the original is still in storage even though the wire shows [dropped §N§]. If the message was deleted from history (session prune/revert), it says so.`;
 var CTX_EXPAND_TOKEN_BUDGET = 15000;
 
+// ../plugin/src/tools/ctx-expand/render.ts
+function isRecord2(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function roleLabel(role) {
+  if (role === "assistant")
+    return "A (assistant)";
+  if (role === "user")
+    return "U (user)";
+  return role;
+}
+function truncate(value, max) {
+  const t = value.trim();
+  return t.length <= max ? t : `${t.slice(0, max)}…`;
+}
+function keyArg(input) {
+  if (!input)
+    return "";
+  for (const k of ["filePath", "path", "pattern", "query", "symbol", "module", "action"]) {
+    const v = input[k];
+    if (typeof v === "string" && v.length > 0)
+      return truncate(v, 60);
+  }
+  if (typeof input.description === "string")
+    return truncate(input.description, 60);
+  return "";
+}
+function asToolPart(part) {
+  const type = typeof part.type === "string" ? part.type : "";
+  if (type === "tool") {
+    const state = isRecord2(part.state) ? part.state : null;
+    const output = state && typeof state.output === "string" ? state.output : state && state.output != null ? JSON.stringify(state.output) : null;
+    const metadata = state && isRecord2(state.metadata) ? state.metadata : null;
+    const title = state && typeof state.title === "string" && state.title || metadata && typeof metadata.title === "string" && metadata.title || null;
+    return {
+      name: typeof part.tool === "string" ? part.tool : "tool",
+      callId: typeof part.callID === "string" ? part.callID : "",
+      title,
+      input: state && isRecord2(state.input) ? state.input : null,
+      output
+    };
+  }
+  if (type === "tool_use") {
+    return {
+      name: typeof part.name === "string" ? part.name : "tool",
+      callId: typeof part.id === "string" ? part.id : "",
+      title: null,
+      input: isRecord2(part.input) ? part.input : null,
+      output: null
+    };
+  }
+  if (type === "tool_result") {
+    const content = part.content;
+    const output = typeof content === "string" ? content : content != null ? JSON.stringify(content) : null;
+    return {
+      name: "tool_result",
+      callId: typeof part.tool_use_id === "string" ? part.tool_use_id : "",
+      title: null,
+      input: null,
+      output
+    };
+  }
+  return null;
+}
+function textOf(part) {
+  if (part.type === "text" && typeof part.text === "string")
+    return part.text;
+  return null;
+}
+function reasoningOf(part) {
+  if ((part.type === "reasoning" || part.type === "thinking") && typeof part.text === "string") {
+    return part.text;
+  }
+  return null;
+}
+function renderPartPreview(part) {
+  if (!isRecord2(part))
+    return null;
+  const text = textOf(part);
+  if (text !== null) {
+    const t = truncate(text, 200);
+    return t.length > 0 ? `    • ${t}` : null;
+  }
+  const tool = asToolPart(part);
+  if (tool) {
+    const arg = keyArg(tool.input);
+    const head = arg ? `${tool.name}(${arg})` : tool.name;
+    return tool.output !== null ? `    • tool ${head} → output ~${estimateTokens(tool.output)} tok` : `    • tool ${head}`;
+  }
+  const reasoning = reasoningOf(part);
+  if (reasoning !== null)
+    return `    • [reasoning] ${truncate(reasoning, 120)}`;
+  const type = typeof part.type === "string" ? part.type : "part";
+  if (type === "file")
+    return "    • [file]";
+  if (type === "step-start" || type === "step-finish")
+    return null;
+  return `    • [${type}]`;
+}
+function renderPartFull(part) {
+  if (!isRecord2(part))
+    return null;
+  const text = textOf(part);
+  if (text !== null) {
+    return text.trim().length > 0 ? `  [text]
+${text}` : null;
+  }
+  const tool = asToolPart(part);
+  if (tool) {
+    const lines = [];
+    const idSuffix = tool.callId ? ` #${tool.callId}` : "";
+    lines.push(`  [tool: ${tool.name}${idSuffix}]`);
+    if (tool.title && tool.title.trim().length > 0) {
+      lines.push(`  description: ${tool.title.trim()}`);
+    }
+    if (tool.input)
+      lines.push(`  input: ${JSON.stringify(tool.input)}`);
+    if (tool.output !== null)
+      lines.push(`  output:
+${tool.output}`);
+    return lines.join(`
+`);
+  }
+  const type = typeof part.type === "string" ? part.type : "part";
+  if (type === "file") {
+    const name2 = typeof part.filename === "string" && part.filename || typeof part.url === "string" && part.url || "";
+    return `  [file]${name2 ? ` ${name2}` : ""}`;
+  }
+  return null;
+}
+function renderMessageByOrdinal(sessionId, ordinal) {
+  const msg = readRawSessionMessages(sessionId).find((m) => m.ordinal === ordinal);
+  if (!msg) {
+    return `No message at ordinal ${ordinal} in this session's stored history — it was deleted ` + `(session prune/revert) or the ordinal is wrong, so it can't be recovered. ` + `Re-run the tool if you still need the data.`;
+  }
+  const rendered = msg.parts.map(renderPartFull).filter((l) => l !== null);
+  const lines = [`[${msg.ordinal}] ${roleLabel(msg.role)} — full recovery:`, ""];
+  if (rendered.length === 0) {
+    lines.push("  (no recoverable content — message had only structural/reasoning parts)");
+  } else {
+    lines.push(...rendered);
+  }
+  return lines.join(`
+`);
+}
+function renderVerboseRange(sessionId, start, end, tokenBudget) {
+  const messages = readRawSessionMessages(sessionId).filter((m) => m.ordinal >= start && m.ordinal <= end);
+  const out = [];
+  let usedTokens = 0;
+  let lastOrdinal = start - 1;
+  let truncated = false;
+  for (const msg of messages) {
+    const header = `[${msg.ordinal}] ${roleLabel(msg.role)}`;
+    const partLines = msg.parts.map(renderPartPreview).filter((l) => l !== null);
+    const block = partLines.length > 0 ? `${header}
+${partLines.join(`
+`)}` : header;
+    const blockTokens = estimateTokens(block);
+    if (usedTokens + blockTokens > tokenBudget && out.length > 0) {
+      truncated = true;
+      break;
+    }
+    out.push(block);
+    usedTokens += blockTokens;
+    lastOrdinal = msg.ordinal;
+  }
+  return { text: out.join(`
+
+`), lastOrdinal, truncated };
+}
+
 // ../../node_modules/.bun/typebox@1.1.38/node_modules/typebox/build/system/memory/memory.mjs
 var exports_memory = {};
 __export(exports_memory, {
@@ -166336,12 +166779,18 @@ function synthesizeToolResultParts(msg) {
 
 // src/tools/ctx-expand.ts
 var ParamsSchema = exports_typebox.Object({
-  start: exports_typebox.Number({
+  start: exports_typebox.Optional(exports_typebox.Number({
     description: "Start message ordinal (from compartment start attribute)"
-  }),
-  end: exports_typebox.Number({
+  })),
+  end: exports_typebox.Optional(exports_typebox.Number({
     description: "End message ordinal (from compartment end 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."
+  }))
 });
 function ok(text) {
   return { content: [{ type: "text", text }], details: undefined };
@@ -166360,22 +166809,41 @@ function createCtxExpandTool(deps) {
     description: CTX_EXPAND_DESCRIPTION,
     parameters: ParamsSchema,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-      if (typeof params.start !== "number" || typeof params.end !== "number" || params.start < 1 || params.end < params.start) {
-        return err("Error: start and end must be positive integers with start <= end.");
-      }
       const sessionId = ctx.sessionManager.getSessionId();
       if (!sessionId) {
         return err("Error: no active Pi session.");
       }
-      const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
-      if (lastCompartmentEnd >= 0 && params.start > lastCompartmentEnd) {
-        return ok(`Range ${params.start}-${params.end} is entirely within the live tail (after the last compacted message ${lastCompartmentEnd}); those messages are already visible in context.`);
-      }
-      const effectiveEnd = lastCompartmentEnd >= 0 ? Math.min(params.end, lastCompartmentEnd) : params.end;
       const unregister = setRawMessageProvider(sessionId, {
         readMessages: () => readPiSessionMessages(ctx)
       });
       try {
+        if (typeof params.message === "number" && params.message >= 1) {
+          return ok(renderMessageByOrdinal(sessionId, params.message));
+        }
+        if (typeof params.start !== "number" || typeof params.end !== "number" || params.start < 1 || params.end < params.start) {
+          return err("Error: provide either message=<ordinal>, or start and end (positive integers, start <= end).");
+        }
+        const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
+        if (lastCompartmentEnd >= 0 && params.start > lastCompartmentEnd) {
+          return ok(`Range ${params.start}-${params.end} is entirely within the live tail (after the last compacted message ${lastCompartmentEnd}); those messages are already visible in context.`);
+        }
+        const effectiveEnd = lastCompartmentEnd >= 0 ? Math.min(params.end, lastCompartmentEnd) : params.end;
+        if (params.verbose === true) {
+          const v = renderVerboseRange(sessionId, params.start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET);
+          if (!v.text) {
+            return ok(`No messages found in range ${params.start}-${effectiveEnd}. The range may be outside this session's history.`);
+          }
+          const out = [
+            `Messages ${params.start}-${v.lastOrdinal} (verbose). Recover any one in full with ctx_expand(message=<ordinal>):`,
+            "",
+            v.text
+          ];
+          if (v.truncated) {
+            out.push("", `Truncated at message ${v.lastOrdinal} (budget: ~${CTX_EXPAND_TOKEN_BUDGET} tokens). Call again with start=${v.lastOrdinal + 1} end=${effectiveEnd} verbose=true for more.`);
+          }
+          return ok(out.join(`
+`));
+        }
         const chunk = readSessionChunk(sessionId, CTX_EXPAND_TOKEN_BUDGET, params.start, effectiveEnd + 1);
         if (!chunk.text || chunk.messageCount === 0) {
           return ok(`No messages found in range ${params.start}-${params.end}. The range may be outside this session's history.`);
@@ -168235,6 +168703,7 @@ var SESSION_META_FALLBACK_SELECTS = {
   last_transform_error: "'' AS last_transform_error",
   system_prompt_hash: "'' AS system_prompt_hash",
   last_todo_state: "'' AS last_todo_state",
+  tool_reclaim_watermark: "0 AS tool_reclaim_watermark",
   cached_m0_bytes: "NULL AS cached_m0_bytes",
   cached_m1_bytes: "NULL AS cached_m1_bytes",
   cached_m0_project_memory_epoch: "NULL AS cached_m0_project_memory_epoch",
@@ -168312,6 +168781,14 @@ function updateSessionMeta(db, sessionId, updates) {
     db.prepare(`UPDATE session_meta SET ${setClauses.join(", ")} WHERE session_id = ?`).run(...values, sessionId);
   })();
 }
+function advanceToolReclaimWatermark(db, sessionId, maxTagNumber) {
+  if (maxTagNumber <= 0)
+    return;
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET tool_reclaim_watermark = MAX(COALESCE(tool_reclaim_watermark, 0), ?) WHERE session_id = ?").run(maxTagNumber, sessionId);
+  })();
+}
 // ../plugin/src/features/magic-context/storage-notes.ts
 var NOTE_TYPES = new Set(["session", "smart"]);
 var NOTE_STATUSES = new Set(["active", "pending", "ready", "dismissed"]);
@@ -168709,6 +169186,26 @@ function getActiveTagTokenAggregate(db, sessionId, protectedTags = 0) {
     nullCount: row?.null_count ?? 0
   };
 }
+function getOldestActiveUnprotectedToolTags(db, sessionId, protectedTags = 0, limit = 4) {
+  if (limit <= 0)
+    return [];
+  const boundedLimit = Math.max(1, Math.min(10, Math.floor(limit)));
+  const whereProtected = protectedTags > 0 ? `AND tag_number < (
+                    SELECT tag_number FROM tags
+                    WHERE session_id = ? AND status = 'active'
+                    ORDER BY tag_number DESC LIMIT 1 OFFSET ?
+                )` : "";
+  const params = protectedTags > 0 ? [sessionId, sessionId, protectedTags - 1, boundedLimit] : [sessionId, boundedLimit];
+  const rows = db.prepare(`SELECT tag_number, tool_name
+             FROM tags
+             WHERE session_id = ? AND status = 'active' AND type = 'tool' ${whereProtected}
+             ORDER BY tag_number ASC, id ASC
+             LIMIT ?`).all(...params);
+  return rows.filter((row) => typeof row.tag_number === "number").map((row) => ({
+    tagNumber: row.tag_number,
+    toolName: typeof row.tool_name === "string" ? row.tool_name : null
+  }));
+}
 function getTriggerTagTokenUpperBound(db, sessionId) {
   const row = db.prepare(`SELECT
                 COALESCE(SUM(COALESCE(token_count, 0) + COALESCE(input_token_count, 0) + COALESCE(reasoning_token_count, 0)), 0) AS bound,
@@ -169658,15 +170155,16 @@ function parseInteger(str) {
 }
 
 // ../plugin/src/tools/ctx-reduce/constants.ts
-var CTX_REDUCE_DESCRIPTION = `Reduce context by dropping tagged content you no longer need.
-Use §N§ identifiers visible in conversation. The \`drop\` param accepts ranges: "3-5", "1,2,9", "1-5,8".
+var CTX_REDUCE_DESCRIPTION = `Mark spent tagged content as discardable to reclaim context space. This is NOT an immediate delete. Use §N§ identifiers visible in the conversation. The \`drop\` param accepts ranges: "3-5", "1,2,9", "1-5,8".
+
+How it works:
+- Marking QUEUES content for release. It stays fully visible to you until context space is actually needed — which may be as soon as the next turn if you are already under pressure, or many turns later if not. So mark spent outputs as soon as you finish with them; don't hoard the call for the end of the turn.
+- The newest tags are protected: marking one just queues it until it ages out of the recent window, so marking recent output is harmless.
+- When content is finally released it becomes a short placeholder, and re-running the tool is the only way to get it back. So mark only what you are genuinely DONE with — the test is "have I extracted what I need from this?", not "is it safe / do I have time before it drops?".
 
-CRITICAL RULES:
-- NEVER blanket-drop large ranges (e.g., "1-50"). Always review what each tag contains first.
-- Only drop tool outputs you have already processed and no longer need.
-- Protected tags are accepted but deferred until they leave the last protected range.
-- Keep recent context — only reduce OLD content that is no longer relevant to current work.
-- Dropped content is gone forever.`;
+Mark discardable once processed: large outputs you've summarized, repeated or redundant dumps, data written to disk, status/log output that only confirmed an expected state.
+Keep: user messages, unresolved errors, raw evidence you haven't extracted yet, and outputs whose exact wording may matter later.
+Never blanket-mark large ranges (e.g. "1-50") — review what each tag holds first.`;
 
 // src/tools/ctx-reduce.ts
 var ParamsSchema4 = exports_typebox.Object({
@@ -169851,120 +170349,6 @@ ${body}` : subject;
 }
 // ../plugin/src/features/magic-context/git-commits/indexer.ts
 init_logger();
-
-// ../plugin/src/features/magic-context/git-commits/storage-git-commits.ts
-init_logger();
-var insertStatements = new WeakMap;
-var existingShasStatements = new WeakMap;
-var projectCountStatements = new WeakMap;
-var evictStatements = new WeakMap;
-var evictOverflowStatements = new WeakMap;
-var latestCommitTimeStatements = new WeakMap;
-function getInsertStatement(db) {
-  let stmt = insertStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare(`INSERT INTO git_commits (sha, project_path, short_sha, message, author, committed_at, indexed_at)
-             VALUES (?, ?, ?, ?, ?, ?, ?)
-             ON CONFLICT(sha) DO UPDATE SET
-                 project_path = excluded.project_path,
-                 short_sha = excluded.short_sha,
-                 message = excluded.message,
-                 author = excluded.author,
-                 committed_at = excluded.committed_at,
-                 indexed_at = excluded.indexed_at
-             WHERE git_commits.message != excluded.message`);
-    insertStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getExistingShasStatement(db) {
-  let stmt = existingShasStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT sha FROM git_commits WHERE project_path = ?");
-    existingShasStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getProjectCountStatement(db) {
-  let stmt = projectCountStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT COUNT(*) AS count FROM git_commits WHERE project_path = ?");
-    projectCountStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getLatestCommitTimeStatement(db) {
-  let stmt = latestCommitTimeStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT MAX(committed_at) AS latest FROM git_commits WHERE project_path = ?");
-    latestCommitTimeStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getEvictOverflowStatement(db) {
-  let stmt = evictOverflowStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare(`DELETE FROM git_commits
-             WHERE rowid IN (
-                 SELECT rowid FROM git_commits
-                 WHERE project_path = ?
-                 ORDER BY committed_at DESC, sha DESC
-                 LIMIT -1 OFFSET ?
-             )`);
-    evictOverflowStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function upsertCommits(db, projectPath, commits) {
-  if (commits.length === 0)
-    return { inserted: 0, updated: 0 };
-  const existing = new Set;
-  for (const row of getExistingShasStatement(db).all(projectPath)) {
-    existing.add(row.sha);
-  }
-  let inserted = 0;
-  let updated = 0;
-  const now = Date.now();
-  const insertStmt = getInsertStatement(db);
-  db.transaction(() => {
-    for (const commit of commits) {
-      const result = insertStmt.run(commit.sha, projectPath, commit.shortSha, commit.message, commit.author, commit.committedAtMs, now);
-      if (result.changes > 0) {
-        if (existing.has(commit.sha)) {
-          updated++;
-        } else {
-          inserted++;
-          existing.add(commit.sha);
-        }
-      }
-    }
-  })();
-  return { inserted, updated };
-}
-function getCommitCount(db, projectPath) {
-  const row = getProjectCountStatement(db).get(projectPath);
-  return row?.count ?? 0;
-}
-function getLatestIndexedCommitTimeMs(db, projectPath) {
-  const row = getLatestCommitTimeStatement(db).get(projectPath);
-  return row?.latest ?? null;
-}
-function enforceProjectCap(db, projectPath, maxCommits) {
-  if (maxCommits <= 0)
-    return 0;
-  const count = getCommitCount(db, projectPath);
-  if (count <= maxCommits)
-    return 0;
-  getEvictOverflowStatement(db).run(projectPath, maxCommits);
-  const after = getCommitCount(db, projectPath);
-  const evicted = Math.max(0, count - after);
-  if (evicted > 0) {
-    log(`[git-commits] evicted ${evicted} oldest commits for project ${projectPath} (cap=${maxCommits}, was=${count})`);
-  }
-  return evicted;
-}
-
-// ../plugin/src/features/magic-context/git-commits/indexer.ts
 var MS_PER_DAY = 24 * 60 * 60 * 1000;
 var EMBED_BATCH_SIZE = 16;
 var EMBED_MAX_PER_SWEEP = 500;