@cortexkit/opencode-magic-context 0.21.2 → 0.21.5

package/dist/index.js

@@ -14950,7 +14950,6 @@ var init_magic_context = __esm(() => {
       enabled: exports_external.boolean().default(true),
       min_clusters: exports_external.number().min(1).default(3)
     }).default({ enabled: true, min_clusters: 3 }),
-    compaction_markers: exports_external.boolean().default(true),
     system_prompt_injection: exports_external.object({
       enabled: exports_external.boolean().default(true),
       skip_signatures: exports_external.array(exports_external.string()).default(["<!-- magic-context: skip -->"])
@@ -156281,7 +156280,7 @@ function promoteRecompStaging(db, sessionId) {
     insertFactRows(db, sessionId, staging.facts, now);
     db.prepare("DELETE FROM recomp_compartments WHERE session_id = ?").run(sessionId);
     db.prepare("DELETE FROM recomp_facts WHERE session_id = ?").run(sessionId);
-    db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE session_id = ?").run(sessionId);
+    db.prepare("UPDATE session_meta SET memory_block_cache = '', memory_block_ids = '' WHERE session_id = ?").run(sessionId);
     return { compartments: staging.compartments, facts: staging.facts };
   })();
 }
@@ -157706,8 +157705,10 @@ function deleteOrphanProjectKeyFiles(db, now = Date.now()) {
     if (existsSync10(row.projectPath))
       continue;
     try {
-      db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
-      db.prepare("DELETE FROM project_key_files_version WHERE project_path = ?").run(row.projectPath);
+      db.transaction(() => {
+        db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
+        db.prepare("DELETE FROM project_key_files_version WHERE project_path = ?").run(row.projectPath);
+      })();
       deletedProjects++;
     } catch (error51) {
       log(`[key-files] orphan GC failed for ${row.projectPath}:`, error51);
@@ -158255,6 +158256,12 @@ function getNoteById(db, noteId) {
   const row = db.prepare("SELECT * FROM notes WHERE id = ?").get(noteId);
   return isNoteRow(row) ? toNote(row) : null;
 }
+function noteBelongsToScope(note, scope) {
+  if (note.type === "session") {
+    return note.sessionId === scope.sessionId;
+  }
+  return note.projectPath === scope.projectPath;
+}
 function buildStatusClause(status) {
   if (status === undefined) {
     return null;
@@ -158316,9 +158323,9 @@ function getPendingSmartNotes(db, projectPath) {
 function getReadySmartNotes(db, projectPath) {
   return getSmartNotes(db, projectPath, "ready");
 }
-function updateNote(db, noteId, updates) {
+function updateNote(db, noteId, updates, scope) {
   const existing = getNoteById(db, noteId);
-  if (!existing) {
+  if (!existing || !noteBelongsToScope(existing, scope)) {
     return null;
   }
   const now = Date.now();
@@ -158365,7 +158372,11 @@ function updateNote(db, noteId, updates) {
   const result = db.prepare(`UPDATE notes SET ${sets.join(", ")} WHERE id = ? RETURNING *`).get(...params);
   return isNoteRow(result) ? toNote(result) : null;
 }
-function dismissNote(db, noteId) {
+function dismissNote(db, noteId, scope) {
+  const existing = getNoteById(db, noteId);
+  if (!existing || !noteBelongsToScope(existing, scope)) {
+    return false;
+  }
   const result = db.prepare("UPDATE notes SET status = 'dismissed', updated_at = ? WHERE id = ? AND status != 'dismissed'").run(Date.now(), noteId);
   return result.changes > 0;
 }
@@ -160473,7 +160484,7 @@ function getCurrentVersion(db) {
   const row = db.prepare("SELECT MAX(version) as version FROM schema_migrations").get();
   return row?.version ?? 0;
 }
-function isSiblingMigrationConflict(error51, version2) {
+function isSiblingMigrationConflict(db, error51, version2) {
   if (!(error51 instanceof Error))
     return false;
   const code = error51.code;
@@ -160485,7 +160496,8 @@ function isSiblingMigrationConflict(error51, version2) {
     return false;
   if (!msg.toLowerCase().includes("version"))
     return false;
-  return true;
+  const confirmed = db.prepare("SELECT 1 FROM schema_migrations WHERE version = ?").get(version2);
+  return confirmed != null;
 }
 function runMigrations(db) {
   ensureMigrationsTable(db);
@@ -160506,7 +160518,7 @@ function runMigrations(db) {
       log(`[migrations] applied v${migration.version}: ${migration.description}`);
       migrationIndex += 1;
     } catch (error51) {
-      if (isSiblingMigrationConflict(error51, migration.version)) {
+      if (isSiblingMigrationConflict(db, error51, migration.version)) {
         log(`[migrations] v${migration.version} already applied by sibling instance — resuming with re-read version`);
         const reReadVersion = getCurrentVersion(db);
         if (reReadVersion <= currentVersion) {
@@ -160912,6 +160924,16 @@ var init_migrations = __esm(async () => {
                 WHERE auto_search_hint_decisions IS NULL
             `);
       }
+    },
+    {
+      version: 18,
+      description: "Add pending_pi_compaction_marker_state column for Pi deferred marker drain",
+      up: (db) => {
+        const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+        if (!cols.some((c) => c.name === "pending_pi_compaction_marker_state")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN pending_pi_compaction_marker_state TEXT");
+        }
+      }
     }
   ];
 });
@@ -161443,6 +161465,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       -- Excluded from healNullTextColumns. Readers filter IS NOT NULL AND
       -- != empty-string defensively. Plan v6 section 3.
       pending_compaction_marker_state TEXT,
+      -- pending_pi_compaction_marker_state: intentionally NULLABLE without a
+      -- default. Absence of a deferred Pi-native marker is SQL NULL; presence
+      -- is a valid JSON blob written via setPendingPiCompactionMarkerState.
+      -- Excluded from healNullTextColumns.
+      pending_pi_compaction_marker_state TEXT,
       -- deferred_execute_state: intentionally NULLABLE without a default.
       -- Absence is SQL NULL; presence is a JSON blob written via
       -- setDeferredExecutePendingIfAbsent. Excluded from healNullTextColumns.
@@ -161539,6 +161566,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "pending_pi_compaction_marker_state", "TEXT");
   ensureColumn(db, "session_meta", "deferred_execute_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -162614,22 +162642,24 @@ function updateTagMessageId(db, sessionId, tagId, messageId) {
   getUpdateTagMessageIdStatement(db).run(messageId, sessionId, tagId);
 }
 function deleteTagsByMessageId(db, sessionId, messageId) {
-  const escapedMessageId = escapeLikePattern(messageId);
-  const textPartPattern = `${escapedMessageId}:p%`;
-  const filePartPattern = `${escapedMessageId}:file%`;
-  const messageScopedTags = getTagNumbersByMessageIdStatement(db).all(sessionId, messageId, textPartPattern, filePartPattern).filter(isTagNumberRow).map((row) => row.tag_number);
-  const ownerScopedTagNumbers = getOwnerScopedToolTagNumbers(db, sessionId, messageId);
-  if (messageScopedTags.length === 0 && ownerScopedTagNumbers.length === 0) {
-    return [];
-  }
-  if (messageScopedTags.length > 0) {
-    getDeleteTagsByMessageIdStatement(db).run(sessionId, messageId, textPartPattern, filePartPattern);
-  }
-  if (ownerScopedTagNumbers.length > 0) {
-    deleteToolTagsByOwner(db, sessionId, messageId);
-  }
-  const merged = new Set([...messageScopedTags, ...ownerScopedTagNumbers]);
-  return Array.from(merged).sort((a, b) => a - b);
+  return db.transaction(() => {
+    const escapedMessageId = escapeLikePattern(messageId);
+    const textPartPattern = `${escapedMessageId}:p%`;
+    const filePartPattern = `${escapedMessageId}:file%`;
+    const messageScopedTags = getTagNumbersByMessageIdStatement(db).all(sessionId, messageId, textPartPattern, filePartPattern).filter(isTagNumberRow).map((row) => row.tag_number);
+    const ownerScopedTagNumbers = getOwnerScopedToolTagNumbers(db, sessionId, messageId);
+    if (messageScopedTags.length === 0 && ownerScopedTagNumbers.length === 0) {
+      return [];
+    }
+    if (messageScopedTags.length > 0) {
+      getDeleteTagsByMessageIdStatement(db).run(sessionId, messageId, textPartPattern, filePartPattern);
+    }
+    if (ownerScopedTagNumbers.length > 0) {
+      deleteToolTagsByOwner(db, sessionId, messageId);
+    }
+    const merged = new Set([...messageScopedTags, ...ownerScopedTagNumbers]);
+    return Array.from(merged).sort((a, b) => a - b);
+  })();
 }
 function getOwnerScopedToolTagNumbers(db, sessionId, ownerMsgId) {
   let stmt = getOwnerScopedToolTagNumbersStatements.get(db);
@@ -164561,7 +164591,7 @@ async function executePartialRecompInternal(deps, range) {
       }
       deps.onCompartmentStatePublished?.(sessionId);
       const lastEnd = merged[merged.length - 1]?.endMessage ?? snapEnd;
-      if (deps.experimentalCompactionMarkers && lastEnd > 0) {
+      if (lastEnd > 0) {
         updateCompactionMarkerAfterPublication(db, sessionId, lastEnd, deps.directory);
         const stalePending = getPendingCompactionMarkerState(db, sessionId);
         if (stalePending) {
@@ -165778,6 +165808,7 @@ async function runCompartmentAgent(deps) {
     const existingValidationError = validateStoredCompartments(priorCompartments);
     if (existingValidationError) {
       sessionLog(sessionId, `historian failure: source=existing-validation reason="${existingValidationError}"`);
+      incrementHistorianFailure(db, sessionId, existingValidationError);
       await notifyHistorianIssue(`## Historian alert
 
 Historian skipped this session because existing stored compartments are invalid: ${existingValidationError}
@@ -165788,15 +165819,20 @@ No new compartments or facts were written. Rebuild or clear the broken compartme
     const offset = priorCompartments.length > 0 ? priorCompartments[priorCompartments.length - 1].endMessage + 1 : 1;
     const protectedTailStart = getProtectedTailStartOrdinal(sessionId);
     if (protectedTailStart <= offset) {
+      sessionLog(sessionId, `historian no-op: protectedTailStart=${protectedTailStart} <= offset=${offset} — nothing to compact`);
+      clearEmergencyRecovery(db, sessionId);
       return;
     }
     const chunk = readSessionChunk(sessionId, historianChunkTokens, offset, protectedTailStart);
     if (!chunk.text || chunk.messageCount === 0) {
+      sessionLog(sessionId, `historian no-op: chunk empty after filtering (messageCount=${chunk.messageCount}, textLen=${chunk.text?.length ?? 0}) range=${offset}-${protectedTailStart - 1}`);
+      clearEmergencyRecovery(db, sessionId);
       return;
     }
     const chunkCoverageError = validateChunkCoverage(chunk);
     if (chunkCoverageError) {
       sessionLog(sessionId, `historian failure: source=chunk-coverage reason="${chunkCoverageError}" chunkRange=${chunk.startIndex}-${chunk.endIndex}`);
+      incrementHistorianFailure(db, sessionId, chunkCoverageError);
       await notifyHistorianIssue(`## Historian alert
 
 Historian skipped this session because the raw chunk could not be represented safely: ${chunkCoverageError}
@@ -165858,7 +165894,7 @@ Historian returned compartments that made no forward progress beyond raw message
 No new compartments or facts were written. Check the historian model/output and try again.`);
       return;
     }
-    const deferMarkerApplication = deps.preserveInjectionCacheUntilConsumed === true && deps.experimentalCompactionMarkers === true;
+    const deferMarkerApplication = deps.preserveInjectionCacheUntilConsumed === true;
     const lastCompartmentEnd = lastNewEnd;
     const lastNewEndMessageId = newCompartments[newCompartments.length - 1]?.endMessageId;
     db.transaction(() => {
@@ -165883,12 +165919,10 @@ No new compartments or facts were written. Check the historian model/output and
       promoteSessionFactsToMemory(db, sessionId, resolveProjectIdentity(deps.directory), validatedPass.facts ?? []);
     }
     queueDropsForCompartmentalizedMessages(db, sessionId, lastCompartmentEnd);
-    if (deps.experimentalCompactionMarkers) {
-      if (deferMarkerApplication) {
-        deps.onDeferredMarkerPending?.(sessionId);
-      } else {
-        updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, sessionDirectory);
-      }
+    if (deferMarkerApplication) {
+      deps.onDeferredMarkerPending?.(sessionId);
+    } else {
+      updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, sessionDirectory);
     }
     if (deps.historyBudgetTokens && deps.historyBudgetTokens > 0) {
       await runCompressionPassIfNeeded({
@@ -166031,7 +166065,7 @@ Found ${existingStaging.compartments.length} staged compartment(s) from ${existi
       if (lastCompartmentEnd2 > 0) {
         queueDropsForCompartmentalizedMessages(db, sessionId, lastCompartmentEnd2);
       }
-      if (deps.experimentalCompactionMarkers && lastCompartmentEnd2 > 0) {
+      if (lastCompartmentEnd2 > 0) {
         updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd2, deps.directory);
         const stalePending = getPendingCompactionMarkerState(db, sessionId);
         if (stalePending) {
@@ -166414,6 +166448,7 @@ import { homedir as homedir2 } from "node:os";
 import { join } from "node:path";
 
 // src/config/variable.ts
+init_jsonc_parser();
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, resolve } from "node:path";
@@ -166422,6 +166457,21 @@ var FILE_PATTERN = /\{file:([^}]+)\}/g;
 function substituteConfigVariables(input) {
   const warnings = [];
   let text = input.text;
+  if (input.isProjectConfig) {
+    const hasEnvTokens = ENV_PATTERN.test(text);
+    const hasFileTokens = FILE_PATTERN.test(text);
+    ENV_PATTERN.lastIndex = 0;
+    FILE_PATTERN.lastIndex = 0;
+    if (hasEnvTokens || hasFileTokens) {
+      const tokenTypes = [
+        hasEnvTokens ? "{env:}" : undefined,
+        hasFileTokens ? "{file:}" : undefined
+      ].filter(Boolean).join(" and ");
+      warnings.push(`Project-level config no longer supports ${tokenTypes} tokens for security reasons; leaving tokens literal. Move secret expansion to user-level config.`);
+    }
+    return { text, warnings };
+  }
+  text = stripJsonComments(text);
   text = text.replace(ENV_PATTERN, (_, rawName) => {
     const varName = rawName.trim();
     const value = varName ? process.env[varName] : undefined;
@@ -166429,7 +166479,7 @@ function substituteConfigVariables(input) {
       warnings.push(`Environment variable ${varName} is not set (referenced via {env:${varName}}); using empty string`);
       return "";
     }
-    return value;
+    return JSON.stringify(value).slice(1, -1);
   });
   const fileMatches = Array.from(text.matchAll(FILE_PATTERN));
   if (fileMatches.length === 0) {
@@ -166484,13 +166534,17 @@ function getUserConfigBasePath() {
 function getProjectConfigBasePath(directory) {
   return join(directory, ".opencode", CONFIG_FILE_BASENAME);
 }
-function loadConfigFile(configPath) {
+function loadConfigFile(configPath, isProjectConfig = false) {
   try {
     if (!existsSync3(configPath)) {
       return null;
     }
     const rawText = readFileSync3(configPath, "utf-8");
-    const substituted = substituteConfigVariables({ text: rawText, configPath });
+    const substituted = substituteConfigVariables({
+      text: rawText,
+      configPath,
+      isProjectConfig
+    });
     return {
       config: parseJsonc(substituted.text),
       warnings: substituted.warnings.map((w) => `${configPath}: ${w}`)
@@ -166518,7 +166572,11 @@ function loadConfigFileDetailed(configPath, source) {
     };
   }
   try {
-    const substituted = substituteConfigVariables({ text: rawText, configPath });
+    const substituted = substituteConfigVariables({
+      text: rawText,
+      configPath,
+      isProjectConfig: source === "project"
+    });
     return {
       config: parseJsonc(substituted.text),
       warnings: substituted.warnings.map((w) => `${configPath}: ${w}`),
@@ -166690,7 +166748,7 @@ function loadPluginConfig(directory) {
   const dotOpenCodeDetected = detectConfigFile(getProjectConfigBasePath(directory));
   const projectDetected = rootDetected.format !== "none" ? rootDetected : dotOpenCodeDetected;
   const userLoaded = userDetected.format === "none" ? null : loadConfigFile(userDetected.path);
-  const projectLoaded = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path);
+  const projectLoaded = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path, true);
   const allWarnings = [];
   let mergedRaw = {};
   if (userLoaded) {
@@ -168219,6 +168277,43 @@ function normalizeProjectRelativePath(projectPath, filePath) {
     return null;
   return rel;
 }
+function isDocumentationOrMetaFile(rel) {
+  const lower = rel.toLowerCase();
+  if (lower.endsWith(".md") || lower.endsWith(".mdx") || lower.endsWith(".rst"))
+    return true;
+  if (lower.endsWith(".txt"))
+    return true;
+  const base = lower.split("/").pop() ?? "";
+  const baseNoExt = base.replace(/\.[^.]+$/, "");
+  const META_BASENAMES = new Set([
+    "license",
+    "licence",
+    "notice",
+    "copying",
+    "authors",
+    "contributors",
+    "changelog",
+    "changes",
+    "history",
+    "readme",
+    "contributing",
+    "code_of_conduct",
+    "security",
+    "support",
+    "maintainers",
+    "governance",
+    "package-lock",
+    "bun.lock",
+    "bun.lockb",
+    "yarn.lock",
+    "pnpm-lock",
+    "cargo.lock",
+    "uv.lock",
+    "poetry.lock",
+    "gemfile.lock"
+  ]);
+  return META_BASENAMES.has(base) || META_BASENAMES.has(baseNoExt);
+}
 function primarySessionIds(db) {
   try {
     const rows = db.prepare("SELECT session_id AS sessionId FROM session_meta WHERE is_subagent = 0").all();
@@ -168250,6 +168345,8 @@ function collectKeyFileCandidates(args) {
     const rel = normalizeProjectRelativePath(args.projectPath, row.file_path);
     if (!rel)
       continue;
+    if (isDocumentationOrMetaFile(rel))
+      continue;
     const timestamp = toMs(row.time_created);
     const candidate = byPath.get(rel) ?? {
       path: rel,
@@ -168386,7 +168483,8 @@ Rules:
 - Total approx_token_estimate must be < ${args.config.token_budget}.
 - path must be relative, no .., no absolute paths, no symlinks escaping project root.
 - path must be unique case-sensitively and case-insensitively.
-- content must be plain text; no XML tags inside.`;
+- content must be plain text; no XML tags inside.
+- DO NOT pick prose documentation (README.md, CONTRIBUTING.md, CHANGELOG, LICENSE, *.md/*.mdx/*.rst/*.txt) or lockfiles. Key files are project SOURCE the agent needs repeated orientation context on, not reference docs. Project docs are surfaced through a separate injection path.`;
 }
 function validateLlmOutput(raw, config2, projectPath) {
   let obj;
@@ -169278,6 +169376,13 @@ async function evaluateSmartNotes(args) {
 For each note below, determine whether its surface condition has been met.
 You have access to tools like GitHub CLI (gh), web search, and the local codebase to verify conditions.
 
+You DO NOT have access to:
+- Any conversation between the user and the original agent that wrote the note
+- The state of any active session, including whether messages have been sent
+- The current task, mood, or intent of the human user
+
+If a condition references conversation context the user is having ("When the user mentions X", "When they ask to do Y", "When we revisit Z", "When relevant to current discussion", etc.), it is UNEVALUATABLE — skip it (do not include in results) so the note stays pending. These are misuse cases that should never have been written as smart notes; leaving them pending is the correct outcome, the dreamer's archive-stale task will eventually retire them.
+
 ## Pending Smart Notes
 
 ${noteDescriptions}
@@ -169286,7 +169391,8 @@ ${noteDescriptions}
 
 1. Check each condition using the tools available to you.
 2. Be conservative — only mark a condition as met when you have clear evidence.
-3. Respond with a JSON array of results:
+3. Skip conditions that depend on session/conversation context you cannot observe — do not invent a "false" verdict for them, just omit them from your response.
+4. Respond with a JSON array of results:
 
 \`\`\`json
 [
@@ -169294,7 +169400,7 @@ ${noteDescriptions}
 ]
 \`\`\`
 
-Only include notes whose conditions you could definitively evaluate. Skip notes where you cannot determine the status (they will be re-evaluated next run).`;
+Only include notes whose conditions you could definitively evaluate against external signals. Skip notes where you cannot determine the status (they will be re-evaluated next run, or eventually archived as stale).`;
   const taskStartedAt = Date.now();
   let agentSessionId = null;
   const abortController = new AbortController;
@@ -170761,8 +170867,7 @@ var FORCE_MATERIALIZE_PERCENTAGE = 85;
 function getProactiveCompartmentTriggerPercentage(executeThresholdPercentage) {
   return Math.max(0, executeThresholdPercentage - PROACTIVE_TRIGGER_OFFSET_PERCENTAGE);
 }
-function estimateProjectedPostDropPercentage(db, sessionId, usage, autoDropToolAge, protectedTags, clearReasoningAge, clearedReasoningThroughTag, dropToolStructure = true) {
-  const activeTags = getTagsBySession(db, sessionId).filter((tag) => tag.status === "active");
+function estimateProjectedPostDropPercentage(db, sessionId, usage, activeTags, autoDropToolAge, protectedTags, clearReasoningAge, clearedReasoningThroughTag, dropToolStructure = true) {
   const totalActiveBytes = activeTags.reduce((sum, tag) => sum + tag.byteSize + tag.reasoningByteSize, 0);
   if (totalActiveBytes === 0)
     return null;
@@ -170849,15 +170954,24 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget) {
     }
   });
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, autoDropToolAge, protectedTagCount, clearReasoningAge, dropToolStructure = true, commitClusterTrigger) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, autoDropToolAge, protectedTagCount, clearReasoningAge, dropToolStructure = true, commitClusterTrigger, preloadedActiveTags) {
   if (sessionMeta.compartmentInProgress) {
+    sessionLog(sessionId, `compartment trigger: skipped — historian already in progress (usage=${usage.percentage.toFixed(1)}%)`);
     return { shouldFire: false };
   }
   const tailInfo = getUnsummarizedTailInfo(db, sessionId, triggerBudget);
   if (!tailInfo.hasNewRawHistory) {
+    try {
+      const lastCompartmentEnd = getLastCompartmentEndMessage(db, sessionId);
+      const rawMessageCount = getRawSessionMessageCount(sessionId);
+      const protectedTailStart = getProtectedTailStartOrdinal(sessionId);
+      sessionLog(sessionId, `compartment trigger: skipped — no new raw history (usage=${usage.percentage.toFixed(1)}% nextStartOrdinal=${tailInfo.nextStartOrdinal} lastCompartmentEnd=${lastCompartmentEnd} rawMessageCount=${rawMessageCount} protectedTailStart=${protectedTailStart})`);
+    } catch (error51) {
+      sessionLog(sessionId, `compartment trigger: skipped — no new raw history (usage=${usage.percentage.toFixed(1)}% nextStartOrdinal=${tailInfo.nextStartOrdinal} diagnostic-collection-failed: ${error51 instanceof Error ? error51.message : String(error51)})`);
+    }
     return { shouldFire: false };
   }
-  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, autoDropToolAge, protectedTagCount, clearReasoningAge, sessionMeta.clearedReasoningThroughTag, dropToolStructure);
+  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession(db, sessionId), autoDropToolAge, protectedTagCount, clearReasoningAge, sessionMeta.clearedReasoningThroughTag, dropToolStructure);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
   if (usage.percentage >= FORCE_COMPARTMENT_PERCENTAGE) {
     if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
@@ -170879,6 +170993,7 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   }
   const proactiveTriggerPercentage = getProactiveCompartmentTriggerPercentage(executeThresholdPercentage);
   if (usage.percentage < proactiveTriggerPercentage) {
+    sessionLog(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% — below proactive floor (${proactiveTriggerPercentage}%)`);
     return { shouldFire: false };
   }
   if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
@@ -171978,6 +172093,8 @@ function stripSystemInjectedMessages(messages, protectedTailStart, providerID) {
     const msg = messages[i];
     if (msg.parts.length === 0)
       continue;
+    if (msg.info.role === "user")
+      continue;
     if (msg.parts.length === 1 && isSentinel(msg.parts[0]))
       continue;
     let hasContentPart = false;
@@ -172435,7 +172552,6 @@ async function runCompartmentPhase(args) {
         fallbackModelId: args.fallbackModelId,
         ensureProjectRegistered: args.ensureProjectRegistered,
         getNotificationParams: args.getNotificationParams,
-        experimentalCompactionMarkers: args.experimentalCompactionMarkers,
         experimentalUserMemories: args.experimentalUserMemories,
         historianTwoPass: args.historianTwoPass,
         compressorMinCompartmentRatio: args.compressorMinCompartmentRatio,
@@ -172465,7 +172581,6 @@ async function runCompartmentPhase(args) {
         fallbackModelId: args.fallbackModelId,
         ensureProjectRegistered: args.ensureProjectRegistered,
         getNotificationParams: args.getNotificationParams,
-        experimentalCompactionMarkers: args.experimentalCompactionMarkers,
         experimentalUserMemories: args.experimentalUserMemories,
         historianTwoPass: args.historianTwoPass,
         compressorMinCompartmentRatio: args.compressorMinCompartmentRatio,
@@ -173818,7 +173933,7 @@ function stripNestedSystemReminders(text) {
   return result;
 }
 function extractUserPromptText(message) {
-  return stripNestedSystemReminders(collectUserPromptParts(message)).replace(/§\d+§\s*/g, "").replace(/<!--\s*\+[\d\s.hmdw]+\s*-->/g, "").replace(/<!--\s*OMO_INTERNAL_INITIATOR[\s\S]*?-->/g, "").replace(/<!--\s*ALFONSO_INTERNAL_INITIATOR[\s\S]*?-->/g, "").replace(/<ctx-search-hint>[\s\S]*?<\/ctx-search-hint>/g, "").replace(/<ctx-search-auto>[\s\S]*?<\/ctx-search-auto>/g, "").replace(/<instruction[^>]*>[\s\S]*?<\/instruction>/g, "").replace(/<sidekick-augmentation>[\s\S]*?<\/sidekick-augmentation>/g, "").replace(/[ \t]+\n/g, `
+  return stripNestedSystemReminders(collectUserPromptParts(message)).replace(/<!--[\s\S]*?-->/g, "").replace(/<\/?[a-zA-Z][^<>]*>/g, "").replace(/§\d+§\s*/g, "").replace(/[ \t]+\n/g, `
 `).replace(/\n{3,}/g, `
 
 `).trim();
@@ -174378,12 +174493,6 @@ async function runPostTransformPhase(args) {
         didMutateFromPendingOperations = true;
       }
       logTransformTiming(args.sessionId, "applyHeuristicCleanup", t5, `droppedTools=${cleanup.droppedTools} deduplicatedTools=${cleanup.deduplicatedTools} droppedInjections=${cleanup.droppedInjections} compressedTextTags=${cleanup.compressedTextTags}`);
-      if (args.watermark > 0) {
-        const t6 = performance.now();
-        truncateErroredTools(args.messages, args.watermark, args.messageTagNumbers);
-        stripProcessedImages(args.messages, args.watermark, args.messageTagNumbers);
-        logTransformTiming(args.sessionId, "watermarkCleanup", t6);
-      }
       const t7 = performance.now();
       const clearedReasoning = clearOldReasoning(args.messages, args.reasoningByMessage, args.messageTagNumbers, args.clearReasoningAge);
       stripClearedReasoning(args.messages);
@@ -174427,6 +174536,12 @@ async function runPostTransformPhase(args) {
         deferredMaterializedSuccessfully = true;
       heuristicsRanSuccessfully = true;
     }
+    if (args.watermark > 0) {
+      const tWatermarkCleanup = performance.now();
+      truncateErroredTools(args.messages, args.watermark, args.messageTagNumbers);
+      stripProcessedImages(args.messages, args.watermark, args.messageTagNumbers);
+      logTransformTiming(args.sessionId, "watermarkCleanup", tWatermarkCleanup);
+    }
     if (shouldApplyPendingOps) {
       pendingOpsRanSuccessfully = true;
     }
@@ -174927,7 +175042,6 @@ function createTransform(deps) {
         directory: compartmentDirectory,
         fallbackModelId,
         getNotificationParams: () => notificationParams,
-        experimentalCompactionMarkers: deps.experimentalCompactionMarkers,
         experimentalUserMemories: deps.experimentalUserMemories,
         experimentalTemporalAwareness: deps.experimentalTemporalAwareness,
         historianTwoPass: deps.historianTwoPass,
@@ -175111,7 +175225,6 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
       suppressBackgroundCompressionThisPass: historyBustThisPass,
       deferredHistoryRefreshSessions,
       skipAwaitForThisPass: skipCompartmentAwaitForThisPass,
-      experimentalCompactionMarkers: deps.experimentalCompactionMarkers,
       experimentalUserMemories: deps.experimentalUserMemories,
       experimentalTemporalAwareness: deps.experimentalTemporalAwareness,
       historianTwoPass: deps.historianTwoPass,
@@ -175852,7 +175965,8 @@ function applyStickySnapshotCache(sessionId, fresh) {
     cache.delete(sessionId);
     return fresh;
   }
-  if (!hasInFlightEvidence(fresh)) {
+  const stateSurvived = fresh.compartmentCount >= cached2.snapshot.compartmentCount && fresh.memoryCount >= cached2.snapshot.memoryCount;
+  if (!hasInFlightEvidence(fresh) && !stateSurvived) {
     cache.delete(sessionId);
     return fresh;
   }
@@ -176493,12 +176607,10 @@ function createMagicContextHook(deps) {
   }
   const projectPath = resolveProjectIdentity(deps.directory);
   registerDreamProjectDirectory(projectPath, deps.directory);
-  if (deps.config.compaction_markers !== false) {
-    try {
-      checkCompactionMarkerConsistency(db);
-    } catch (error51) {
-      log("[magic-context] startup compaction-marker consistency check failed:", error51);
-    }
+  try {
+    checkCompactionMarkerConsistency(db);
+  } catch (error51) {
+    log("[magic-context] startup compaction-marker consistency check failed:", error51);
   }
   let lastScheduleCheckMs = 0;
   const getHistorianChunkTokens = () => deriveHistorianChunkTokens(resolveHistorianContextLimit(deps.config.historian?.model));
@@ -176589,7 +176701,6 @@ function createMagicContextHook(deps) {
       return model ? `${model.providerID}/${model.modelID}` : undefined;
     },
     projectPath,
-    experimentalCompactionMarkers: deps.config.compaction_markers,
     experimentalUserMemories: deps.config.dreamer?.user_memories?.enabled,
     experimentalTemporalAwareness: deps.config.experimental?.temporal_awareness === true,
     historianTwoPass: deps.config.historian?.two_pass === true,
@@ -176854,7 +176965,6 @@ function createSessionHooks(args) {
         sidekick: pluginConfig.sidekick,
         dreamer: pluginConfig.dreamer,
         commit_cluster_trigger: pluginConfig.commit_cluster_trigger,
-        compaction_markers: pluginConfig.compaction_markers,
         system_prompt_injection: pluginConfig.system_prompt_injection,
         compressor: pluginConfig.compressor,
         experimental: pluginConfig.experimental
@@ -177885,9 +177995,26 @@ Actions:
 - \`dismiss\`: Dismiss a note by \`note_id\`.
 - \`update\`: Update a note by \`note_id\`.
 
-**Smart Notes**: When \`surface_condition\` is provided with \`write\`, the note becomes a project-scoped smart note.
-The dreamer evaluates smart note conditions during nightly runs and surfaces them when conditions are met.
-Example: \`ctx_note(action="write", content="Implement X because Y", surface_condition="When PR #42 is merged in this repo")\`
+**Smart Notes**: When \`surface_condition\` is provided with \`write\`, the note becomes a project-scoped smart note. A separate background process (the dreamer) periodically checks the condition using ONLY external, verifiable signals: GitHub state via \`gh\` CLI, web pages, files on disk, git history, etc. The dreamer cannot read your current conversation, cannot detect when the user says something, and has no memory of context that lives only in this session.
+
+Write a smart note ONLY when the surface_condition is something an external agent with read-only tools can definitively check:
+
+✓ GOOD conditions (externally verifiable):
+- "When PR #42 in cortexkit/magic-context is merged"
+- "When the file packages/plugin/src/foo.ts contains a function named bar"
+- "When the latest release tag is >= v0.22.0"
+- "When the GitHub Actions workflow runs/123 succeeds"
+
+✗ BAD conditions (require knowing this session's context):
+- "When the user mentions the worktree system has landed"  → dreamer cannot see user messages
+- "When they ask to re-run the audit fixes"                → dreamer cannot see future requests
+- "When we revisit this code path"                         → no observable signal
+- "When relevant to the current discussion"                → no observable signal
+- "After we finish the current refactor"                   → no externally checkable boundary
+
+If you want context that surfaces based on what's happening in your session, use a regular note (omit surface_condition) — those show up on natural work boundaries within this session. If you want a reminder tied to your future work without a clean external trigger, just write a regular note describing what to do; you'll see it when you read notes later.
+
+Example: \`ctx_note(action="write", content="Implement X because Y", surface_condition="When PR #42 in cortexkit/magic-context is merged")\`
 
 Historian reads these notes, deduplicates them, and rewrites the remaining useful notes over time.`;
 // src/tools/ctx-note/tools.ts
@@ -177965,7 +178092,7 @@ function createCtxNoteTool(deps) {
     args: {
       action: tool3.schema.enum(["write", "read", "dismiss", "update"]).optional().describe("Operation to perform. Defaults to 'write' when content is provided, otherwise 'read'."),
       content: tool3.schema.string().optional().describe("Note text to store when action is 'write'."),
-      surface_condition: tool3.schema.string().optional().describe("Open-ended condition for smart notes. When provided, creates a project-scoped smart note that the dreamer evaluates nightly. The note surfaces when the condition is met."),
+      surface_condition: tool3.schema.string().optional().describe("Externally verifiable condition for smart notes. A separate background agent (dreamer) checks this using gh CLI, web fetches, file reads, git, etc. — NOT your conversation history. Use only for things like GitHub PR/issue state, release tags, file contents, or workflow runs. DO NOT use for 'when the user mentions X' / 'when we revisit Y' / 'when relevant to current task' — dreamer has no access to session context. For session-relative reminders, omit this and write a regular note."),
       filter: tool3.schema.enum(["all", "active", "pending", "ready", "dismissed"]).optional().describe("Optional read filter. Defaults to active session notes + ready smart notes. Use 'all' to inspect every status or 'pending' to inspect unsurfaced smart notes."),
       note_id: tool3.schema.number().optional().describe("Note ID (required for 'dismiss' and 'update' actions).")
     },
@@ -178003,8 +178130,14 @@ function createCtxNoteTool(deps) {
         if (typeof noteId !== "number") {
           return "Error: 'note_id' is required when action is 'dismiss'.";
         }
-        const dismissed = dismissNote(deps.db, noteId);
-        return dismissed ? `Note #${noteId} dismissed.` : `Note #${noteId} not found or already dismissed.`;
+        if (!projectIdentity) {
+          return "Error: Could not resolve project identity for note dismiss.";
+        }
+        const dismissed = dismissNote(deps.db, noteId, {
+          projectPath: projectIdentity,
+          sessionId
+        });
+        return dismissed ? `Note #${noteId} dismissed.` : `Error: Note #${noteId} not found in your session/project or already dismissed.`;
       }
       if (action === "update") {
         const noteId = args.note_id;
@@ -178019,9 +178152,15 @@ function createCtxNoteTool(deps) {
         if (!updates.content && !updates.surfaceCondition) {
           return "Error: Provide 'content' and/or 'surface_condition' to update.";
         }
-        const updated = updateNote(deps.db, noteId, updates);
+        if (!projectIdentity) {
+          return "Error: Could not resolve project identity for note update.";
+        }
+        const updated = updateNote(deps.db, noteId, updates, {
+          projectPath: projectIdentity,
+          sessionId
+        });
         if (!updated) {
-          return `Note #${noteId} not found or has no compatible fields to update.`;
+          return `Error: Note #${noteId} not found in your session/project or has no compatible fields to update.`;
         }
         const parts = [];
         if (updates.content)