@cortexkit/opencode-magic-context 0.21.5 → 0.21.7

package/dist/index.js

@@ -14858,7 +14858,6 @@ var init_magic_context = __esm(() => {
   ];
   PiThinkingLevelSchema = exports_external.enum(["off", "minimal", "low", "medium", "high", "xhigh"]).optional();
   DreamerConfigSchema = AgentOverrideConfigSchema.merge(exports_external.object({
-    enabled: exports_external.boolean().default(false),
     schedule: exports_external.string().default("02:00-06:00"),
     max_runtime_minutes: exports_external.number().min(10).default(120),
     tasks: exports_external.array(DreamingTaskSchema).default(DEFAULT_DREAMER_TASKS),
@@ -14876,7 +14875,6 @@ var init_magic_context = __esm(() => {
     thinking_level: PiThinkingLevelSchema
   }));
   SidekickConfigSchema = AgentOverrideConfigSchema.extend({
-    enabled: exports_external.boolean().default(false),
     timeout_ms: exports_external.number().default(30000),
     system_prompt: exports_external.string().optional(),
     thinking_level: PiThinkingLevelSchema
@@ -156094,6 +156092,106 @@ var require_src2 = __commonJS((exports, module) => {
   };
 });
 
+// src/features/magic-context/compartment-lease.ts
+function acquireCompartmentLease(db, sessionId, holderId) {
+  const acquiredAt = Date.now();
+  const expiresAt = acquiredAt + COMPARTMENT_LEASE_TTL_MS;
+  const result = db.prepare(`INSERT INTO compartment_state_lease (session_id, holder_id, acquired_at, expires_at)
+             VALUES (?, ?, ?, ?)
+             ON CONFLICT(session_id) DO UPDATE SET
+                holder_id = excluded.holder_id,
+                acquired_at = excluded.acquired_at,
+                expires_at = excluded.expires_at
+             WHERE compartment_state_lease.holder_id = excluded.holder_id
+                OR compartment_state_lease.expires_at <= ?`).run(sessionId, holderId, acquiredAt, expiresAt, acquiredAt);
+  if (result.changes !== 1) {
+    return null;
+  }
+  return { sessionId, holderId, acquiredAt, expiresAt };
+}
+function renewCompartmentLease(db, sessionId, holderId) {
+  const now = Date.now();
+  const expiresAt = now + COMPARTMENT_LEASE_TTL_MS;
+  const result = db.prepare(`UPDATE compartment_state_lease
+             SET expires_at = ?, acquired_at = ?
+             WHERE session_id = ? AND holder_id = ? AND expires_at > ?`).run(expiresAt, now, sessionId, holderId, now);
+  return result.changes === 1;
+}
+function releaseCompartmentLease(db, sessionId, holderId) {
+  db.prepare("DELETE FROM compartment_state_lease WHERE session_id = ? AND holder_id = ?").run(sessionId, holderId);
+}
+function isCompartmentLeaseHeld(db, sessionId, holderId) {
+  const row = db.prepare("SELECT 1 FROM compartment_state_lease WHERE session_id = ? AND holder_id = ? AND expires_at > ?").get(sessionId, holderId, Date.now());
+  return row != null;
+}
+var COMPARTMENT_LEASE_TTL_MS, COMPARTMENT_LEASE_RENEWAL_MS;
+var init_compartment_lease = __esm(() => {
+  COMPARTMENT_LEASE_TTL_MS = 5 * 60 * 1000;
+  COMPARTMENT_LEASE_RENEWAL_MS = 60 * 1000;
+});
+
+// src/features/magic-context/compression-depth-storage.ts
+function getIncrementDepthStatement(db) {
+  let stmt = incrementDepthStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("INSERT INTO compression_depth (session_id, message_ordinal, depth, harness) VALUES (?, ?, 1, ?) ON CONFLICT(session_id, message_ordinal) DO UPDATE SET depth = depth + 1");
+    incrementDepthStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getTotalDepthStatement(db) {
+  let stmt = totalDepthStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT COALESCE(SUM(depth), 0) AS total_depth FROM compression_depth WHERE session_id = ? AND message_ordinal BETWEEN ? AND ?");
+    totalDepthStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getClearDepthStatement(db) {
+  let stmt = clearDepthStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM compression_depth WHERE session_id = ?");
+    clearDepthStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function incrementCompressionDepth(db, sessionId, startOrdinal, endOrdinal) {
+  if (endOrdinal < startOrdinal) {
+    return;
+  }
+  db.transaction(() => {
+    const stmt = getIncrementDepthStatement(db);
+    for (let ordinal = startOrdinal;ordinal <= endOrdinal; ordinal += 1) {
+      stmt.run(sessionId, ordinal, getHarness());
+    }
+  })();
+}
+function getAverageCompressionDepth(db, sessionId, startOrdinal, endOrdinal) {
+  if (endOrdinal < startOrdinal) {
+    return 0;
+  }
+  const row = getTotalDepthStatement(db).get(sessionId, startOrdinal, endOrdinal);
+  const totalDepth = typeof row?.total_depth === "number" ? row.total_depth : 0;
+  const messageCount = endOrdinal - startOrdinal + 1;
+  return totalDepth / messageCount;
+}
+function clearCompressionDepth(db, sessionId) {
+  getClearDepthStatement(db).run(sessionId);
+}
+function clearCompressionDepthRange(db, sessionId, startOrdinal, endOrdinal) {
+  if (endOrdinal < startOrdinal) {
+    return;
+  }
+  db.prepare("DELETE FROM compression_depth WHERE session_id = ? AND message_ordinal BETWEEN ? AND ?").run(sessionId, startOrdinal, endOrdinal);
+}
+var incrementDepthStatements, totalDepthStatements, maxDepthStatements, clearDepthStatements;
+var init_compression_depth_storage = __esm(() => {
+  incrementDepthStatements = new WeakMap;
+  totalDepthStatements = new WeakMap;
+  maxDepthStatements = new WeakMap;
+  clearDepthStatements = new WeakMap;
+});
+
 // src/features/magic-context/compartment-storage.ts
 function getInsertCompartmentStatement(db) {
   let stmt = insertCompartmentStatements.get(db);
@@ -156201,6 +156299,38 @@ function replaceAllCompartmentState(db, sessionId, compartments, facts) {
     db.prepare("UPDATE session_meta SET memory_block_cache = '', memory_block_ids = '' WHERE session_id = ?").run(sessionId);
   })();
 }
+function replaceAllCompartmentStateAndBumpDepth(db, holderId, sessionId, compartments, facts, depthStartOrdinal, depthEndOrdinal) {
+  const now = Date.now();
+  db.exec("BEGIN IMMEDIATE");
+  let finished = false;
+  try {
+    if (!isCompartmentLeaseHeld(db, sessionId, holderId)) {
+      db.exec("ROLLBACK");
+      finished = true;
+      return false;
+    }
+    db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
+    db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
+    insertCompartmentRows(db, sessionId, compartments, now);
+    insertFactRows(db, sessionId, facts, now);
+    db.prepare("UPDATE session_meta SET memory_block_cache = '', memory_block_ids = '' WHERE session_id = ?").run(sessionId);
+    if (depthEndOrdinal >= depthStartOrdinal) {
+      const stmt = getIncrementDepthStatement(db);
+      for (let ordinal = depthStartOrdinal;ordinal <= depthEndOrdinal; ordinal += 1) {
+        stmt.run(sessionId, ordinal, getHarness());
+      }
+    }
+    db.exec("COMMIT");
+    finished = true;
+    return true;
+  } finally {
+    if (!finished) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
 function buildCompartmentBlock(compartments, facts, memoryBlock, dateRanges) {
   const lines = [];
   if (memoryBlock) {
@@ -156268,12 +156398,37 @@ function getRecompStaging(db, sessionId) {
     lastEndMessage: lastEnd
   };
 }
-function promoteRecompStaging(db, sessionId) {
+function promoteRecompStaging(db, sessionId, holderId) {
   const now = Date.now();
-  return db.transaction(() => {
+  if (!holderId) {
+    return db.transaction(() => {
+      const staging = getRecompStaging(db, sessionId);
+      if (!staging || staging.compartments.length === 0)
+        return null;
+      db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
+      db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
+      insertCompartmentRows(db, sessionId, staging.compartments, now);
+      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 = '', memory_block_ids = '' WHERE session_id = ?").run(sessionId);
+      return { compartments: staging.compartments, facts: staging.facts };
+    })();
+  }
+  db.exec("BEGIN IMMEDIATE");
+  let finished = false;
+  try {
+    if (!isCompartmentLeaseHeld(db, sessionId, holderId)) {
+      db.exec("ROLLBACK");
+      finished = true;
+      return null;
+    }
     const staging = getRecompStaging(db, sessionId);
-    if (!staging || staging.compartments.length === 0)
+    if (!staging || staging.compartments.length === 0) {
+      db.exec("ROLLBACK");
+      finished = true;
       return null;
+    }
     db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
     db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
     insertCompartmentRows(db, sessionId, staging.compartments, now);
@@ -156281,8 +156436,16 @@ function promoteRecompStaging(db, sessionId) {
     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 = '', memory_block_ids = '' WHERE session_id = ?").run(sessionId);
+    db.exec("COMMIT");
+    finished = true;
     return { compartments: staging.compartments, facts: staging.facts };
-  })();
+  } finally {
+    if (!finished) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
 }
 function invalidateAllMemoryBlockCaches(db) {
   try {
@@ -156336,6 +156499,8 @@ function escapeXmlContent(s) {
 }
 var insertCompartmentStatements, insertFactStatements;
 var init_compartment_storage = __esm(() => {
+  init_compartment_lease();
+  init_compression_depth_storage();
   insertCompartmentStatements = new WeakMap;
   insertFactStatements = new WeakMap;
 });
@@ -156911,6 +157076,7 @@ var init_conflict_detector = __esm(() => {
 var exports_conflict_warning_hook = {};
 __export(exports_conflict_warning_hook, {
   sendTuiSetupNotification: () => sendTuiSetupNotification,
+  sendStartupAnnouncement: () => sendStartupAnnouncement,
   sendConflictWarning: () => sendConflictWarning,
   cleanupConflictWarnings: () => cleanupConflictWarnings
 });
@@ -157194,7 +157360,46 @@ async function sendTuiSetupNotification(client, directory, serverUrl) {
     } catch {}
   }, 1000);
 }
-var CONFLICT_WARNING_MARKER = "⚠️ Magic Context is disabled due to conflicting configuration:", ENABLED_MARKER = "✨ Magic Context is now enabled", TUI_SETUP_MARKER = "\uD83D\uDCCA Magic Context sidebar configured", cachedDesktopStateByDir;
+async function sendStartupAnnouncement(client, directory, version2, features, footer, markSeen) {
+  if (!version2 || features.length === 0)
+    return;
+  const { sessionId } = getDesktopState(directory);
+  if (!sessionId) {
+    return;
+  }
+  const bullets = features.map((line) => `  • ${line}`).join(`
+`);
+  const sections = [`${ANNOUNCEMENT_MARKER} v${version2}:`, "", bullets];
+  if (footer && footer.trim().length > 0) {
+    sections.push("", footer);
+  }
+  const text = sections.join(`
+`);
+  log(`[magic-context] sending startup announcement for v${version2} to session ${sessionId}`);
+  try {
+    const c = client;
+    const promptInput = {
+      path: { id: sessionId },
+      body: {
+        noReply: true,
+        parts: [{ type: "text", text, ignored: true }]
+      }
+    };
+    if (typeof c.session?.prompt === "function") {
+      await Promise.resolve(c.session.prompt(promptInput));
+    } else if (typeof c.session?.promptAsync === "function") {
+      await c.session.promptAsync(promptInput);
+    } else {
+      log("[magic-context] announcement: session prompt API unavailable");
+      return;
+    }
+  } catch (error51) {
+    log(`[magic-context] announcement: failed to send: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    return;
+  }
+  markSeen(version2);
+}
+var CONFLICT_WARNING_MARKER = "⚠️ Magic Context is disabled due to conflicting configuration:", ENABLED_MARKER = "✨ Magic Context is now enabled", TUI_SETUP_MARKER = "\uD83D\uDCCA Magic Context sidebar configured", ANNOUNCEMENT_MARKER = "✨ Magic Context — what's new in", cachedDesktopStateByDir;
 var init_conflict_warning_hook = __esm(() => {
   init_conflict_detector();
   init_logger();
@@ -159519,68 +159724,6 @@ var init_storage_memory_fts = __esm(() => {
   searchStatements = new WeakMap;
 });
 
-// src/features/magic-context/compression-depth-storage.ts
-function getIncrementDepthStatement(db) {
-  let stmt = incrementDepthStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("INSERT INTO compression_depth (session_id, message_ordinal, depth, harness) VALUES (?, ?, 1, ?) ON CONFLICT(session_id, message_ordinal) DO UPDATE SET depth = depth + 1");
-    incrementDepthStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getTotalDepthStatement(db) {
-  let stmt = totalDepthStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT COALESCE(SUM(depth), 0) AS total_depth FROM compression_depth WHERE session_id = ? AND message_ordinal BETWEEN ? AND ?");
-    totalDepthStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getClearDepthStatement(db) {
-  let stmt = clearDepthStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM compression_depth WHERE session_id = ?");
-    clearDepthStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function incrementCompressionDepth(db, sessionId, startOrdinal, endOrdinal) {
-  if (endOrdinal < startOrdinal) {
-    return;
-  }
-  db.transaction(() => {
-    const stmt = getIncrementDepthStatement(db);
-    for (let ordinal = startOrdinal;ordinal <= endOrdinal; ordinal += 1) {
-      stmt.run(sessionId, ordinal, getHarness());
-    }
-  })();
-}
-function getAverageCompressionDepth(db, sessionId, startOrdinal, endOrdinal) {
-  if (endOrdinal < startOrdinal) {
-    return 0;
-  }
-  const row = getTotalDepthStatement(db).get(sessionId, startOrdinal, endOrdinal);
-  const totalDepth = typeof row?.total_depth === "number" ? row.total_depth : 0;
-  const messageCount = endOrdinal - startOrdinal + 1;
-  return totalDepth / messageCount;
-}
-function clearCompressionDepth(db, sessionId) {
-  getClearDepthStatement(db).run(sessionId);
-}
-function clearCompressionDepthRange(db, sessionId, startOrdinal, endOrdinal) {
-  if (endOrdinal < startOrdinal) {
-    return;
-  }
-  db.prepare("DELETE FROM compression_depth WHERE session_id = ? AND message_ordinal BETWEEN ? AND ?").run(sessionId, startOrdinal, endOrdinal);
-}
-var incrementDepthStatements, totalDepthStatements, maxDepthStatements, clearDepthStatements;
-var init_compression_depth_storage = __esm(() => {
-  incrementDepthStatements = new WeakMap;
-  totalDepthStatements = new WeakMap;
-  maxDepthStatements = new WeakMap;
-  clearDepthStatements = new WeakMap;
-});
-
 // src/hooks/magic-context/read-session-db.ts
 import { join as join16 } from "node:path";
 function getOpenCodeDbPath2() {
@@ -160934,6 +161077,22 @@ var init_migrations = __esm(async () => {
           db.exec("ALTER TABLE session_meta ADD COLUMN pending_pi_compaction_marker_state TEXT");
         }
       }
+    },
+    {
+      version: 19,
+      description: "Add compartment state lease table",
+      up: (db) => {
+        db.exec(`
+                CREATE TABLE IF NOT EXISTS compartment_state_lease (
+                    session_id TEXT PRIMARY KEY NOT NULL,
+                    holder_id TEXT NOT NULL,
+                    acquired_at INTEGER NOT NULL,
+                    expires_at INTEGER NOT NULL
+                );
+                CREATE INDEX IF NOT EXISTS idx_compartment_state_lease_expires
+                    ON compartment_state_lease(expires_at);
+            `);
+      }
     }
   ];
 });
@@ -161274,6 +161433,15 @@ function initializeDatabase(db) {
     );
     CREATE INDEX IF NOT EXISTS idx_compartments_session ON compartments(session_id);
 
+    CREATE TABLE IF NOT EXISTS compartment_state_lease (
+      session_id TEXT PRIMARY KEY NOT NULL,
+      holder_id TEXT NOT NULL,
+      acquired_at INTEGER NOT NULL,
+      expires_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_compartment_state_lease_expires
+      ON compartment_state_lease(expires_at);
+
     CREATE TABLE IF NOT EXISTS compression_depth (
       session_id TEXT NOT NULL,
       message_ordinal INTEGER NOT NULL,
@@ -162406,6 +162574,7 @@ function clearSession(db, sessionId) {
     db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
     clearCompressionDepth(db, sessionId);
     db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
+    db.prepare("DELETE FROM compartment_state_lease WHERE session_id = ?").run(sessionId);
     db.prepare("DELETE FROM notes WHERE session_id = ? AND type = 'session'").run(sessionId);
     db.prepare("DELETE FROM recomp_compartments WHERE session_id = ?").run(sessionId);
     db.prepare("DELETE FROM recomp_facts WHERE session_id = ?").run(sessionId);
@@ -164543,6 +164712,12 @@ async function executePartialRecompInternal(deps, range) {
     getNotificationParams
   } = deps;
   const notifParams = () => getNotificationParams?.() ?? {};
+  const holderId = deps.compartmentLeaseHolderId;
+  if (!holderId) {
+    return `## Magic Recomp — Failed
+
+Could not acquire the compartment-state lease for this session.`;
+  }
   updateSessionMeta(db, sessionId, { compartmentInProgress: true });
   try {
     let promoteFinal = function() {
@@ -164579,7 +164754,7 @@ async function executePartialRecompInternal(deps, range) {
         return null;
       }
       saveRecompStagingPass(db, sessionId, passCount + 1, merged, currentFacts);
-      const promoted = promoteRecompStaging(db, sessionId);
+      const promoted = promoteRecompStaging(db, sessionId, holderId);
       if (!promoted) {
         log("[magic-context] partial recomp promote returned null");
         return null;
@@ -165349,6 +165524,10 @@ function cavemanLevelForDepth(outputDepth) {
 }
 async function runCompressionPassIfNeeded(deps) {
   const { db, sessionId, historyBudgetTokens } = deps;
+  if (deps.historianRunnable === false) {
+    sessionLog(sessionId, "compressor: skipped because historian.disable=true");
+    return false;
+  }
   const minCompartmentRatio = deps.minCompartmentRatio ?? DEFAULT_COMPRESSOR_MIN_COMPARTMENT_RATIO;
   const maxMergeDepth = deps.maxMergeDepth ?? DEFAULT_COMPRESSOR_MAX_MERGE_DEPTH;
   const compartments = getCompartments(db, sessionId);
@@ -165435,7 +165614,8 @@ ${c.content}
       originalStart: selectedCompartments[0].startMessage,
       originalEnd: selectedCompartments[selectedCompartments.length - 1].endMessage,
       facts,
-      logLabel: `depth-5 title-only collapse (${selectedCompartments.length} → ${selectedCompartments.length})`
+      logLabel: `depth-5 title-only collapse (${selectedCompartments.length} → ${selectedCompartments.length})`,
+      holderId: deps.compartmentLeaseHolderId
     });
   }
   try {
@@ -165465,7 +165645,8 @@ ${c.content}
       originalStart: selectedCompartments[0].startMessage,
       originalEnd: selectedCompartments[selectedCompartments.length - 1].endMessage,
       facts,
-      logLabel: `depth-${outputDepth} (${selectedCompartments.length} → ${finalCompressed.length})`
+      logLabel: `depth-${outputDepth} (${selectedCompartments.length} → ${finalCompressed.length})`,
+      holderId: deps.compartmentLeaseHolderId
     });
   } catch (error51) {
     sessionLog(sessionId, "compressor: unexpected error:", getErrorMessage(error51));
@@ -165590,7 +165771,8 @@ function finalizeCompression(args) {
     originalStart,
     originalEnd,
     facts,
-    logLabel
+    logLabel,
+    holderId
   } = args;
   const compressedStart = compressed[0].startMessage;
   const compressedEnd = compressed[compressed.length - 1].endMessage;
@@ -165641,8 +165823,16 @@ function finalizeCompression(args) {
       content: c.content
     }))
   ];
-  replaceAllCompartmentState(db, sessionId, allCompartments, facts.map((f) => ({ category: f.category, content: f.content })));
-  incrementCompressionDepth(db, sessionId, originalStart, originalEnd);
+  const factInputs = facts.map((f) => ({ category: f.category, content: f.content }));
+  const published = holderId ? replaceAllCompartmentStateAndBumpDepth(db, holderId, sessionId, allCompartments, factInputs, originalStart, originalEnd) : (() => {
+    replaceAllCompartmentState(db, sessionId, allCompartments, factInputs);
+    incrementCompressionDepth(db, sessionId, originalStart, originalEnd);
+    return true;
+  })();
+  if (!published) {
+    sessionLog(sessionId, "compressor: publish skipped because compartment lease is no longer held");
+    return false;
+  }
   sessionLog(sessionId, `compressor: completed ${logLabel}`);
   return true;
 }
@@ -165897,7 +166087,19 @@ No new compartments or facts were written. Check the historian model/output and
     const deferMarkerApplication = deps.preserveInjectionCacheUntilConsumed === true;
     const lastCompartmentEnd = lastNewEnd;
     const lastNewEndMessageId = newCompartments[newCompartments.length - 1]?.endMessageId;
-    db.transaction(() => {
+    const holderId = deps.compartmentLeaseHolderId;
+    if (!holderId) {
+      sessionLog(sessionId, "historian publish skipped: missing compartment lease holder");
+      return;
+    }
+    let published = false;
+    db.exec("BEGIN IMMEDIATE");
+    try {
+      if (!isCompartmentLeaseHeld(db, sessionId, holderId)) {
+        db.exec("ROLLBACK");
+        sessionLog(sessionId, "historian publish skipped: compartment lease no longer held");
+        return;
+      }
       appendCompartments(db, sessionId, newCompartments);
       replaceSessionFacts(db, sessionId, validatedPass.facts ?? []);
       clearHistorianFailureState(db, sessionId);
@@ -165909,7 +166111,15 @@ No new compartments or facts were written. Check the historian model/output and
           publishedAt: Date.now()
         });
       }
-    })();
+      db.exec("COMMIT");
+      published = true;
+    } finally {
+      if (!published) {
+        try {
+          db.exec("ROLLBACK");
+        } catch {}
+      }
+    }
     if (deps.preserveInjectionCacheUntilConsumed !== true) {
       clearInjectionCache(sessionId);
     }
@@ -165977,6 +166187,7 @@ var init_compartment_runner_incremental = __esm(async () => {
   init_compartment_storage();
   init_historian_state_file();
   init_historian_state_file();
+  init_compartment_lease();
   init_memory();
   init_project_identity();
   init_storage_memory();
@@ -166013,6 +166224,12 @@ async function executeContextRecompInternal(deps) {
     getNotificationParams
   } = deps;
   const notifParams = () => getNotificationParams?.() ?? {};
+  const holderId = deps.compartmentLeaseHolderId;
+  if (!holderId) {
+    return `## Magic Recomp — Skipped
+
+Could not acquire the compartment-state lease for this session.`;
+  }
   let currentStateFilePath;
   updateSessionMeta(db, sessionId, { compartmentInProgress: true });
   try {
@@ -166049,7 +166266,7 @@ Found ${existingStaging.compartments.length} staged compartment(s) from ${existi
       if (mergedError)
         return null;
       saveRecompStagingPass(db, sessionId, passCount, candidateCompartments, candidateFacts);
-      const promoted2 = promoteRecompStaging(db, sessionId);
+      const promoted2 = promoteRecompStaging(db, sessionId, holderId);
       if (!promoted2)
         return null;
       clearCompressionDepth(db, sessionId);
@@ -166200,10 +166417,12 @@ Recomp completed ${passCount} pass${passCount === 1 ? "" : "es"} but produced an
 Nothing was written.`;
     }
     saveRecompStagingPass(db, sessionId, passCount, candidateCompartments, candidateFacts);
-    const promoted = promoteRecompStaging(db, sessionId);
+    const promoted = promoteRecompStaging(db, sessionId, holderId);
     if (!promoted) {
-      replaceAllCompartmentState(db, sessionId, candidateCompartments, candidateFacts);
-      clearRecompStaging(db, sessionId);
+      sessionLog(sessionId, "recomp publish skipped: compartment lease no longer held");
+      return `## Magic Recomp — Skipped
+
+Another process acquired the compartment-state lease before recomp could publish. No state was written.`;
     }
     clearCompressionDepth(db, sessionId);
     if (deps.preserveInjectionCacheUntilConsumed !== true) {
@@ -166262,6 +166481,7 @@ var init_compartment_runner_recomp = __esm(async () => {
   init_project_identity();
   init_storage_memory();
   init_shared();
+  init_logger();
   init_compartment_prompt();
   init_compartment_runner_state_xml();
   init_send_session_notification();
@@ -166286,6 +166506,7 @@ __export(exports_compartment_runner, {
   registerActiveCompartmentRun: () => registerActiveCompartmentRun,
   markActiveCompartmentRunPublished: () => markActiveCompartmentRunPublished,
   getActiveCompartmentRun: () => getActiveCompartmentRun,
+  executeContextRecompWithResult: () => executeContextRecompWithResult,
   executeContextRecomp: () => executeContextRecomp
 });
 function getActiveCompartmentRun(sessionId) {
@@ -166319,30 +166540,59 @@ function withPublishedCallback(deps) {
     }
   };
 }
+function startLeaseRenewal(deps, holderId) {
+  return setInterval(() => {
+    if (!renewCompartmentLease(deps.db, deps.sessionId, holderId)) {
+      sessionLog(deps.sessionId, "compartment lease renewal failed; publish will be skipped if holder is stale");
+    }
+  }, COMPARTMENT_LEASE_RENEWAL_MS);
+}
 function startCompartmentAgent(deps) {
   const existing = activeRuns.get(deps.sessionId);
   if (existing) {
     return;
   }
-  const runnerDeps = withPublishedCallback(deps);
+  const holderId = crypto.randomUUID();
+  const lease2 = acquireCompartmentLease(deps.db, deps.sessionId, holderId);
+  if (!lease2) {
+    sessionLog(deps.sessionId, "compartment agent skipped: compartment lease held by another process");
+    return;
+  }
+  const renewal = startLeaseRenewal(deps, holderId);
+  const runnerDeps = withPublishedCallback({ ...deps, compartmentLeaseHolderId: holderId });
   const promise2 = runCompartmentAgent(runnerDeps).catch((err) => {
     sessionLog(deps.sessionId, "compartment agent: unhandled rejection:", err);
     try {
       updateSessionMeta(deps.db, deps.sessionId, { compartmentInProgress: false });
     } catch {}
   }).finally(() => {
+    clearInterval(renewal);
+    releaseCompartmentLease(deps.db, deps.sessionId, holderId);
     if (activeRuns.get(deps.sessionId)?.promise === promise2) {
       activeRuns.delete(deps.sessionId);
     }
   });
   activeRuns.set(deps.sessionId, { promise: promise2, published: false });
 }
-async function executeContextRecomp(deps, options = {}) {
+async function executeContextRecompWithResult(deps, options = {}) {
   const { sessionId } = deps;
   if (activeRuns.has(sessionId)) {
-    return "## Magic Recomp\n\nHistorian is already running for this session. Wait for it to finish, then try `/ctx-recomp` again.";
+    return {
+      message: "## Magic Recomp\n\nHistorian is already running for this session. Wait for it to finish, then try `/ctx-recomp` again.",
+      published: false
+    };
+  }
+  const holderId = crypto.randomUUID();
+  const lease2 = acquireCompartmentLease(deps.db, sessionId, holderId);
+  if (!lease2) {
+    sessionLog(sessionId, "recomp skipped: compartment lease held by another process");
+    return {
+      message: "## Magic Recomp\n\nAnother process is already mutating compartment state for this session. Wait for it to finish, then try `/ctx-recomp` again.",
+      published: false
+    };
   }
-  const runnerDeps = withPublishedCallback(deps);
+  const renewal = startLeaseRenewal(deps, holderId);
+  const runnerDeps = withPublishedCallback({ ...deps, compartmentLeaseHolderId: holderId });
   const promise2 = options.range ? executePartialRecompInternal(runnerDeps, options.range) : executeContextRecompInternal(runnerDeps);
   const wrappedPromise = promise2.then(() => {
     return;
@@ -166351,15 +166601,25 @@ async function executeContextRecomp(deps, options = {}) {
   });
   activeRuns.set(sessionId, { promise: wrappedPromise, published: false });
   try {
-    return await promise2;
+    const message = await promise2;
+    return {
+      message,
+      published: activeRuns.get(sessionId)?.published === true
+    };
   } finally {
+    clearInterval(renewal);
+    releaseCompartmentLease(deps.db, sessionId, holderId);
     if (activeRuns.get(sessionId)?.promise === wrappedPromise) {
       activeRuns.delete(sessionId);
     }
   }
 }
+async function executeContextRecomp(deps, options = {}) {
+  return (await executeContextRecompWithResult(deps, options)).message;
+}
 var activeRuns;
 var init_compartment_runner = __esm(async () => {
+  init_compartment_lease();
   init_logger();
   await __promiseAll([
     init_storage_meta(),
@@ -166371,13 +166631,65 @@ var init_compartment_runner = __esm(async () => {
   activeRuns = new Map;
 });
 
+// src/shared/announcement.ts
+var exports_announcement = {};
+__export(exports_announcement, {
+  shouldShowAnnouncement: () => shouldShowAnnouncement,
+  readLastAnnouncedVersion: () => readLastAnnouncedVersion,
+  markAnnouncementSeen: () => markAnnouncementSeen,
+  ANNOUNCEMENT_VERSION: () => ANNOUNCEMENT_VERSION,
+  ANNOUNCEMENT_FOOTER: () => ANNOUNCEMENT_FOOTER,
+  ANNOUNCEMENT_FEATURES: () => ANNOUNCEMENT_FEATURES
+});
+import * as fs2 from "node:fs";
+import * as path5 from "node:path";
+function getStateFilePath() {
+  return path5.join(getMagicContextStorageDir(), STATE_FILENAME);
+}
+function readLastAnnouncedVersion() {
+  try {
+    const file2 = getStateFilePath();
+    if (!fs2.existsSync(file2))
+      return "";
+    return fs2.readFileSync(file2, "utf-8").trim();
+  } catch {
+    return "";
+  }
+}
+function markAnnouncementSeen(version2) {
+  if (!version2)
+    return;
+  try {
+    const dir = getMagicContextStorageDir();
+    fs2.mkdirSync(dir, { recursive: true });
+    fs2.writeFileSync(getStateFilePath(), version2);
+  } catch {}
+}
+function shouldShowAnnouncement() {
+  if (!ANNOUNCEMENT_VERSION || ANNOUNCEMENT_FEATURES.length === 0)
+    return false;
+  return readLastAnnouncedVersion() !== ANNOUNCEMENT_VERSION;
+}
+var ANNOUNCEMENT_VERSION = "0.21.7", ANNOUNCEMENT_FEATURES, ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/F2uWxjGnU", STATE_FILENAME = "last_announced_version";
+var init_announcement = __esm(() => {
+  init_data_path();
+  ANNOUNCEMENT_FEATURES = [
+    "Pi parity sweep: 44 audit findings fixed, including a critical SHIP-BLOCKER where /ctx-flush did not drain the pending Pi compaction queue.",
+    "Pi historian recovery fix: empty/no-op historian returns now clear emergency recovery so sessions cannot loop forever at 95%.",
+    "trimPiMessagesToBoundary now sweeps non-contiguous tool-result orphans, fixing provider 400s after compaction in long Pi sessions.",
+    "Hidden subagent tool isolation: historian, dreamer, and sidekick can no longer spawn subagents or run unsafe tools.",
+    "TUI sidebar and /ctx-status header now show execute threshold inline: '47.5% / 65%' on the left, '475K / 1.0M' on the right.",
+    "doctor --issue now caps GitHub issue bodies at ~60KB with a dedicated 'Recent errors' section so reports stay submittable."
+  ];
+});
+
 // src/shared/tui-config.ts
 var exports_tui_config = {};
 __export(exports_tui_config, {
   ensureTuiPluginEntry: () => ensureTuiPluginEntry
 });
-import { existsSync as existsSync16, mkdirSync as mkdirSync9, readFileSync as readFileSync15, writeFileSync as writeFileSync8 } from "node:fs";
-import { dirname as dirname9, join as join27 } from "node:path";
+import { existsSync as existsSync17, mkdirSync as mkdirSync10, readFileSync as readFileSync16, writeFileSync as writeFileSync9 } from "node:fs";
+import { dirname as dirname9, join as join28 } from "node:path";
 function isMagicContextEntry(entry) {
   if (!entry)
     return false;
@@ -166391,11 +166703,11 @@ function isMagicContextEntry(entry) {
 }
 function resolveTuiConfigPath() {
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
-  const jsoncPath = join27(configDir, "tui.jsonc");
-  const jsonPath = join27(configDir, "tui.json");
-  if (existsSync16(jsoncPath))
+  const jsoncPath = join28(configDir, "tui.jsonc");
+  const jsonPath = join28(configDir, "tui.json");
+  if (existsSync17(jsoncPath))
     return jsoncPath;
-  if (existsSync16(jsonPath))
+  if (existsSync17(jsonPath))
     return jsonPath;
   return jsonPath;
 }
@@ -166403,8 +166715,8 @@ function ensureTuiPluginEntry() {
   try {
     const configPath = resolveTuiConfigPath();
     let config2 = {};
-    if (existsSync16(configPath)) {
-      const raw = readFileSync15(configPath, "utf-8");
+    if (existsSync17(configPath)) {
+      const raw = readFileSync16(configPath, "utf-8");
       config2 = import_comment_json4.parse(raw) ?? {};
     }
     const plugins = Array.isArray(config2.plugin) ? config2.plugin.filter((p) => typeof p === "string") : [];
@@ -166423,8 +166735,8 @@ function ensureTuiPluginEntry() {
       plugins.push(PLUGIN_ENTRY);
     }
     config2.plugin = plugins;
-    mkdirSync9(dirname9(configPath), { recursive: true });
-    writeFileSync8(configPath, `${import_comment_json4.stringify(config2, null, 2)}
+    mkdirSync10(dirname9(configPath), { recursive: true });
+    writeFileSync9(configPath, `${import_comment_json4.stringify(config2, null, 2)}
 `);
     log(`[magic-context] updated TUI plugin entry in ${configPath}`);
     return true;
@@ -166440,13 +166752,97 @@ var init_tui_config = __esm(() => {
   import_comment_json4 = __toESM(require_src2(), 1);
   PLUGIN_ENTRY = `${PLUGIN_NAME}@latest`;
 });
+// src/agents/permissions.ts
+function buildAllowOnlyPermission(allowedTools) {
+  const permission = { "*": "deny" };
+  for (const tool of allowedTools) {
+    permission[tool] = "allow";
+  }
+  return permission;
+}
+var HISTORIAN_ALLOWED_TOOLS = ["read", "aft_outline", "aft_zoom"];
+var DREAMER_ALLOWED_TOOLS = [
+  "read",
+  "grep",
+  "glob",
+  "bash",
+  "aft_outline",
+  "aft_zoom",
+  "ctx_memory",
+  "ctx_search",
+  "ctx_note"
+];
+var SIDEKICK_ALLOWED_TOOLS = [
+  "ctx_search",
+  "ctx_memory",
+  "aft_outline",
+  "aft_zoom"
+];
 // src/config/index.ts
 init_jsonc_parser();
-init_magic_context();
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join } from "node:path";
 
+// src/config/agent-disable.ts
+function isDreamerRunnable(config) {
+  return !!config.dreamer && config.dreamer.disable !== true;
+}
+function isSidekickRunnable(config) {
+  return !!config.sidekick && config.sidekick.disable !== true;
+}
+function isHistorianRunnable(config) {
+  return config.historian?.disable !== true;
+}
+function clonePlainObject(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return;
+  }
+  return { ...value };
+}
+function migrateLegacyEnabledForAgent(args) {
+  const agent = clonePlainObject(args.patched[args.agentName]);
+  if (!agent || !("enabled" in agent))
+    return;
+  const enabled = agent.enabled;
+  const disable = agent.disable;
+  delete agent.enabled;
+  if (args.agentName === "historian") {
+    args.warnings.push('Removed invalid "historian.enabled" in-memory (run doctor to persist).');
+    args.patched.historian = agent;
+    return;
+  }
+  if (args.agentName === "dreamer") {
+    if (disable !== true && enabled === false) {
+      agent.disable = true;
+      args.warnings.push('Migrated "dreamer.enabled=false" → "dreamer.disable=true" in-memory (run doctor to persist). This now also disables manual /ctx-dream; for manual-only remove disable and set schedule="".');
+    }
+    args.patched.dreamer = agent;
+    return;
+  }
+  if (disable !== true && enabled === false) {
+    agent.disable = true;
+    args.warnings.push('Migrated "sidekick.enabled=false" → "sidekick.disable=true" in-memory (run doctor to persist).');
+  }
+  args.patched.sidekick = agent;
+}
+function migrateLegacyAgentEnabledInMemory(rawConfig, warnings) {
+  const shouldPatch = ["dreamer", "sidekick", "historian"].some((key) => {
+    const agent = rawConfig[key];
+    return typeof agent === "object" && agent !== null && !Array.isArray(agent) && "enabled" in agent;
+  });
+  if (!shouldPatch)
+    return rawConfig;
+  const patched = { ...rawConfig };
+  migrateLegacyEnabledForAgent({ patched, agentName: "dreamer", warnings });
+  migrateLegacyEnabledForAgent({ patched, agentName: "sidekick", warnings });
+  migrateLegacyEnabledForAgent({ patched, agentName: "historian", warnings });
+  return patched;
+}
+
+// src/config/index.ts
+init_magic_context();
+
 // src/config/variable.ts
 init_jsonc_parser();
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
@@ -166690,7 +167086,8 @@ function migrateLegacyExperimental(rawConfig, warnings) {
 }
 function parsePluginConfig(rawConfig, recoveredTopLevelKeys = []) {
   const preMigrationWarnings = [];
-  const migrated = migrateLegacyExperimental(rawConfig, preMigrationWarnings);
+  const migratedExperimental = migrateLegacyExperimental(rawConfig, preMigrationWarnings);
+  const migrated = migrateLegacyAgentEnabledInMemory(migratedExperimental, preMigrationWarnings);
   const parsed = MagicContextConfigSchema.safeParse(migrated);
   const disabledHooks = Array.isArray(rawConfig.disabled_hooks) ? rawConfig.disabled_hooks.filter((value) => typeof value === "string") : undefined;
   const command = typeof rawConfig.command === "object" && rawConfig.command !== null ? rawConfig.command : undefined;
@@ -170093,7 +170490,7 @@ async function startDreamScheduleTimer(args) {
   const db = openDatabase();
   await args.ensureRegistered(args.directory, db);
   const snapshot = getProjectEmbeddingSnapshot(args.projectIdentity);
-  const dreamingEnabled = Boolean(args.dreamerConfig?.enabled && args.dreamerConfig.schedule?.trim());
+  const dreamingEnabled = Boolean(args.dreamerConfig && args.dreamerConfig.disable !== true && args.dreamerConfig.schedule?.trim());
   const embeddingSweepEnabled = snapshot?.enabled ?? false;
   const commitIndexingEnabled = snapshot?.gitCommitEnabled ?? false;
   if (!dreamingEnabled && !embeddingSweepEnabled && !commitIndexingEnabled) {
@@ -170149,7 +170546,7 @@ function runTick(origin) {
   })();
 }
 async function sweepProject(reg, origin, db = openDatabase(), gitCommitEnabled = getProjectEmbeddingSnapshot(reg.projectIdentity)?.gitCommitEnabled === true) {
-  const dreamingEnabled = Boolean(reg.dreamerConfig?.enabled && reg.dreamerConfig.schedule?.trim());
+  const dreamingEnabled = Boolean(reg.dreamerConfig && reg.dreamerConfig.disable !== true && reg.dreamerConfig.schedule?.trim());
   if (gitCommitEnabled && reg.gitCommitIndexing) {
     await sweepGitCommits({
       directory: reg.directory,
@@ -170792,7 +171189,6 @@ function createTagger() {
     cleanup
   };
 }
-
 // src/hooks/magic-context/hook.ts
 init_magic_context();
 init_project_identity();
@@ -172456,6 +172852,7 @@ init_temporal_awareness();
 
 // src/hooks/magic-context/transform-compartment-phase.ts
 init_magic_context();
+init_compartment_lease();
 init_compartment_storage();
 init_logger();
 await __promiseAll([
@@ -172487,11 +172884,12 @@ async function runCompartmentPhase(args) {
   let published = false;
   let justAwaitedPublication = false;
   let rebuiltHistoryThisPass = false;
+  const historianRunnable = args.historianRunnable !== false;
   let lastCompartmentEnd = null;
   let rawMessageCount = null;
   let cachedProtectedTailStart = null;
   function hasNewRawHistoryForCompartment() {
-    if (!args.fullFeatureMode)
+    if (!args.fullFeatureMode || !historianRunnable)
       return false;
     if (lastCompartmentEnd === null) {
       lastCompartmentEnd = getLastCompartmentEndMessage(args.db, args.resolvedSessionId);
@@ -172529,7 +172927,12 @@ async function runCompartmentPhase(args) {
     }
     return "completed";
   }
-  if (args.canRunCompartments && args.sessionMeta.compartmentInProgress && !getActiveCompartmentRun(args.sessionId)) {
+  if (!historianRunnable && args.sessionMeta.compartmentInProgress) {
+    sessionLog(args.sessionId, "transform: historian disabled; clearing stale compartmentInProgress flag");
+    updateSessionMeta(args.db, args.sessionId, { compartmentInProgress: false });
+    compartmentInProgress = false;
+  }
+  if (historianRunnable && args.canRunCompartments && args.sessionMeta.compartmentInProgress && !getActiveCompartmentRun(args.sessionId)) {
     if (!hasEligibleHistoryForCompartment()) {
       sessionLog(args.sessionId, `transform: skipping compartment start, no eligible history before protected tail (beyond ${lastCompartmentEnd ?? -1})`);
       updateSessionMeta(args.db, args.sessionId, { compartmentInProgress: false });
@@ -172565,7 +172968,7 @@ async function runCompartmentPhase(args) {
     }
   }
   let awaitedCompartmentRun = false;
-  if (args.canRunCompartments && !args.skipAwaitForThisPass && args.contextUsage.percentage >= BLOCK_UNTIL_DONE_PERCENTAGE) {
+  if (historianRunnable && args.canRunCompartments && !args.skipAwaitForThisPass && args.contextUsage.percentage >= BLOCK_UNTIL_DONE_PERCENTAGE) {
     let activeRun = getActiveCompartmentRun(args.sessionId);
     if (!activeRun && hasEligibleHistoryForCompartment() && args.client) {
       sessionLog(args.sessionId, `transform: 95% reached (${args.contextUsage.percentage.toFixed(1)}%), force-starting compartment agent and blocking`);
@@ -172609,19 +173012,41 @@ async function runCompartmentPhase(args) {
       }
     }
   }
-  if (args.safeForBackgroundCompression && !args.suppressBackgroundCompressionThisPass && args.historyBudgetTokens && args.historyBudgetTokens > 0 && args.client && !compartmentInProgress && !awaitedCompartmentRun && !isCompressorOnCooldown(args.sessionId, args.compressorCooldownMs ?? DEFAULT_COMPRESSOR_COOLDOWN_MS)) {
-    markCompressorRun(args.sessionId);
-    const compressorPromise = runCompressionPassIfNeeded({
-      client: args.client,
-      db: args.db,
-      sessionId: args.sessionId,
-      directory: args.compartmentDirectory,
-      historyBudgetTokens: args.historyBudgetTokens,
-      historianTimeoutMs: args.historianTimeoutMs,
-      fallbackModels: args.fallbackModels,
-      minCompartmentRatio: args.compressorMinCompartmentRatio,
-      maxMergeDepth: args.compressorMaxMergeDepth
-    }).then((compressed) => {
+  if (historianRunnable && args.safeForBackgroundCompression && args.historyBudgetTokens && args.historyBudgetTokens > 0 && args.client && !compartmentInProgress && !awaitedCompartmentRun && !isCompressorOnCooldown(args.sessionId, args.compressorCooldownMs ?? DEFAULT_COMPRESSOR_COOLDOWN_MS)) {
+    const client = args.client;
+    const historyBudgetTokens = args.historyBudgetTokens;
+    const holderId = crypto.randomUUID();
+    const compressorPromise = (async () => {
+      const lease2 = acquireCompartmentLease(args.db, args.sessionId, holderId);
+      if (!lease2) {
+        sessionLog(args.sessionId, "independent compressor skipped: compartment lease held by another process");
+        return false;
+      }
+      markCompressorRun(args.sessionId);
+      const renewal = setInterval(() => {
+        if (!renewCompartmentLease(args.db, args.sessionId, holderId)) {
+          sessionLog(args.sessionId, "independent compressor lease renewal failed; publish will be skipped if holder is stale");
+        }
+      }, COMPARTMENT_LEASE_RENEWAL_MS);
+      try {
+        return await runCompressionPassIfNeeded({
+          client,
+          db: args.db,
+          sessionId: args.sessionId,
+          directory: args.compartmentDirectory,
+          historyBudgetTokens,
+          historianTimeoutMs: args.historianTimeoutMs,
+          fallbackModels: args.fallbackModels,
+          minCompartmentRatio: args.compressorMinCompartmentRatio,
+          maxMergeDepth: args.compressorMaxMergeDepth,
+          historianRunnable,
+          compartmentLeaseHolderId: holderId
+        });
+      } finally {
+        clearInterval(renewal);
+        releaseCompartmentLease(args.db, args.sessionId, holderId);
+      }
+    })().then((compressed) => {
       if (compressed) {
         markActiveCompartmentRunPublished(args.sessionId);
         published = true;
@@ -173871,6 +174296,7 @@ ${trimmedBody}…
 }
 
 // src/hooks/magic-context/auto-search-runner.ts
+init_read_session_formatting();
 var AUTO_SEARCH_TIMEOUT_MS = 3000;
 async function unifiedSearchWithTimeout(db, sessionId, projectPath, prompt, options, timeoutMs) {
   const controller = new AbortController;
@@ -173899,10 +174325,12 @@ function collectUserPromptParts(message) {
   let collected = "";
   for (const part of message.parts) {
     const p = part;
-    if (p.type === "text" && typeof p.text === "string") {
-      collected += (collected.length > 0 ? `
+    if (p.type !== "text" || typeof p.text !== "string")
+      continue;
+    if (p.ignored === true)
+      continue;
+    collected += (collected.length > 0 ? `
 ` : "") + p.text;
-    }
   }
   return collected;
 }
@@ -173945,11 +174373,8 @@ function findLatestMeaningfulUserMessage(messages) {
       continue;
     if (typeof msg.info.id !== "string")
       continue;
-    for (const part of msg.parts) {
-      const p = part;
-      if (p.type === "text" && typeof p.text === "string" && p.text.trim().length > 0) {
-        return msg;
-      }
+    if (hasMeaningfulUserText(msg.parts)) {
+      return msg;
     }
   }
   return null;
@@ -174429,8 +174854,10 @@ function resetDegradedCacheCount(sessionId) {
 }
 async function runPostTransformPhase(args) {
   let didMutateFromPendingOperations = false;
-  const isExplicitFlush = args.pendingMaterializationSessions.has(args.sessionId);
-  const deferredMaterializationWasPending = args.deferredMaterializationSessions.has(args.sessionId);
+  const pendingMaterializationAtPassStart = args.pendingMaterializationSessions.has(args.sessionId);
+  const deferredMaterializationAtPassStart = args.deferredMaterializationSessions.has(args.sessionId);
+  const isExplicitFlush = pendingMaterializationAtPassStart;
+  const deferredMaterializationWasPending = deferredMaterializationAtPassStart;
   const alreadyRanThisTurn = args.currentTurnId !== null && args.lastHeuristicsTurnId.get(args.sessionId) === args.currentTurnId;
   const forceMaterialization = args.fullFeatureMode && args.contextUsage.percentage >= args.forceMaterializationPercentage;
   const activeCompartmentRun = args.canRunCompartments ? getActiveCompartmentRun(args.sessionId) : undefined;
@@ -174516,7 +174943,9 @@ async function runPostTransformPhase(args) {
         }
       }
       logTransformTiming(args.sessionId, "clearOldReasoning", t7);
-      args.pendingMaterializationSessions.delete(args.sessionId);
+      if (pendingMaterializationAtPassStart) {
+        args.pendingMaterializationSessions.delete(args.sessionId);
+      }
       if (args.currentTurnId) {
         args.lastHeuristicsTurnId.set(args.sessionId, args.currentTurnId);
       }
@@ -174721,7 +175150,7 @@ async function runPostTransformPhase(args) {
     }
   }
   let suppressV12HistoryDrain = false;
-  if (historyWasConsumedThisPass && args.deferredHistoryRefreshSessions.has(args.sessionId)) {
+  if (historyWasConsumedThisPass && args.deferredHistoryWasPendingAtPassStart) {
     const pending = getPendingCompactionMarkerState(args.db, args.sessionId);
     if (pending) {
       const outcome = applyDeferredCompactionMarker(args.db, args.sessionId, pending, args.sessionDirectory);
@@ -174738,11 +175167,11 @@ async function runPostTransformPhase(args) {
       }
     }
   }
-  const deferredHistoryDrainEligible = historyWasConsumedThisPass && !suppressV12HistoryDrain;
+  const deferredHistoryDrainEligible = historyWasConsumedThisPass && args.deferredHistoryWasPendingAtPassStart && !suppressV12HistoryDrain;
   if (deferredHistoryDrainEligible) {
     args.deferredHistoryRefreshSessions.delete(args.sessionId);
   }
-  if (explicitMaterializedSuccessfully || deferredMaterializedSuccessfully) {
+  if ((explicitMaterializedSuccessfully || deferredMaterializedSuccessfully) && deferredMaterializationAtPassStart) {
     args.deferredMaterializationSessions.delete(args.sessionId);
   }
   const workExecutedSuccessfully = explicitMaterializedSuccessfully || deferredMaterializedSuccessfully || heuristicsRanSuccessfully || pendingOpsRanSuccessfully;
@@ -174909,7 +175338,8 @@ function createTransform(deps) {
       } catch {}
     }
     const compartmentDirectory = sessionDirectory;
-    const canRunCompartments = fullFeatureMode && deps.client !== undefined && compartmentDirectory.length > 0;
+    const historianRunnable = deps.historianRunnable !== false;
+    const canRunCompartments = fullFeatureMode && historianRunnable && deps.client !== undefined && compartmentDirectory.length > 0;
     const fallbackModelId = deps.getFallbackModelId?.(sessionId);
     const tModelDetect = performance.now();
     if (deps.liveModelBySession) {
@@ -175001,6 +175431,7 @@ function createTransform(deps) {
     }
     sessionLog(sessionId, `[boundary-exec] base=${schedulerDecisionEarly} bypass=${bypassReason} midTurn=${midTurn} effective=${midTurnAdjustedSchedulerDecision} sideEffect=${sideEffect}`);
     const historyRefreshExplicitBeforePrepare = deps.historyRefreshSessions.has(sessionId);
+    const deferredHistoryWasPendingAtPassStart = deferredHistoryRefreshSessions.has(sessionId);
     const earlyActiveRunBlocksMaterialization = (getActiveCompartmentRun(sessionId) !== undefined || sessionMeta.compartmentInProgress) && contextUsageEarly.percentage < FORCE_MATERIALIZE_PERCENTAGE;
     const canConsumeDeferredEarly = canConsumeDeferredOnThisPass({
       schedulerDecision: midTurnAdjustedSchedulerDecision,
@@ -175008,9 +175439,8 @@ function createTransform(deps) {
       justAwaitedPublication: false,
       activeRunBlocksMaterialization: earlyActiveRunBlocksMaterialization
     });
-    const consumingDeferredEarly = canConsumeDeferredEarly && deferredHistoryRefreshSessions.has(sessionId);
+    const consumingDeferredEarly = canConsumeDeferredEarly && deferredHistoryWasPendingAtPassStart;
     const isCacheBusting = historyRefreshExplicitBeforePrepare || consumingDeferredEarly;
-    const historyBustThisPass = isCacheBusting;
     if (historianFailureState.failureCount === 0) {
       lastEmergencyNotificationCount.delete(sessionId);
     }
@@ -175204,6 +175634,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
     const compartmentPhase = await runCompartmentPhase({
       canRunCompartments,
       fullFeatureMode,
+      historianRunnable,
       sessionMeta,
       contextUsage,
       client: deps.client,
@@ -175221,8 +175652,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
       projectPath: projectIdentity,
       injectionBudgetTokens: deps.memoryConfig?.injectionBudgetTokens,
       getNotificationParams: rawGetNotifParams ? () => rawGetNotifParams(sessionId) : undefined,
-      safeForBackgroundCompression: isCacheBusting || midTurnAdjustedSchedulerDecision === "execute",
-      suppressBackgroundCompressionThisPass: historyBustThisPass,
+      safeForBackgroundCompression: historianRunnable && (isCacheBusting || midTurnAdjustedSchedulerDecision === "execute"),
       deferredHistoryRefreshSessions,
       skipAwaitForThisPass: skipCompartmentAwaitForThisPass,
       experimentalUserMemories: deps.experimentalUserMemories,
@@ -175271,6 +175701,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
       phaseJustAwaitedPublication: compartmentPhase.justAwaitedPublication,
       compartmentInProgress,
       historyRefreshExplicitBeforePrepare,
+      deferredHistoryWasPendingAtPassStart,
       compartmentInjectionRebuiltFromDb: pendingCompartmentInjection?.rebuiltFromDb === true,
       rebuiltHistoryFromInitialPrepare,
       historyRebuiltThisPass,
@@ -176652,6 +177083,11 @@ function createMagicContextHook(deps) {
     return;
   };
   const ctxReduceEnabled = deps.config.ctx_reduce_enabled !== false;
+  const dreamerRunnable = isDreamerRunnable(deps.config);
+  const dreamerConfig = dreamerRunnable ? deps.config.dreamer : undefined;
+  const historianRunnable = isHistorianRunnable(deps.config);
+  const sidekickRunnable = isSidekickRunnable(deps.config);
+  const sidekickConfig = sidekickRunnable ? deps.config.sidekick : undefined;
   const nudgerWithRecentReduce = ctxReduceEnabled ? createNudger({
     protected_tags: deps.config.protected_tags,
     nudge_interval_tokens: deps.config.nudge_interval_tokens ?? DEFAULT_NUDGE_INTERVAL_TOKENS,
@@ -176701,7 +177137,8 @@ function createMagicContextHook(deps) {
       return model ? `${model.providerID}/${model.modelID}` : undefined;
     },
     projectPath,
-    experimentalUserMemories: deps.config.dreamer?.user_memories?.enabled,
+    historianRunnable,
+    experimentalUserMemories: dreamerConfig?.user_memories?.enabled,
     experimentalTemporalAwareness: deps.config.experimental?.temporal_awareness === true,
     historianTwoPass: deps.config.historian?.two_pass === true,
     compressorMinCompartmentRatio: deps.config.compressor?.enabled === false ? undefined : deps.config.compressor?.min_compartment_ratio,
@@ -176740,7 +177177,7 @@ function createMagicContextHook(deps) {
   });
   const runDreamQueueInBackground = () => {
     const dreaming = deps.config.dreamer;
-    if (!dreaming?.enabled || !dreaming.schedule?.trim()) {
+    if (!dreaming || dreaming.disable === true || !dreaming.schedule?.trim()) {
       return;
     }
     const now = Date.now();
@@ -176760,16 +177197,16 @@ function createMagicContextHook(deps) {
       tasks: dreaming.tasks,
       taskTimeoutMinutes: dreaming.task_timeout_minutes,
       maxRuntimeMinutes: dreaming.max_runtime_minutes,
-      experimentalUserMemories: deps.config.dreamer?.user_memories?.enabled ? {
+      experimentalUserMemories: dreaming.user_memories?.enabled ? {
         enabled: true,
-        promotionThreshold: deps.config.dreamer.user_memories.promotion_threshold
+        promotionThreshold: dreaming.user_memories.promotion_threshold
       } : undefined,
-      experimentalPinKeyFiles: deps.config.dreamer?.pin_key_files?.enabled ? {
+      experimentalPinKeyFiles: dreaming.pin_key_files?.enabled ? {
         enabled: true,
-        token_budget: deps.config.dreamer.pin_key_files.token_budget,
-        min_reads: deps.config.dreamer.pin_key_files.min_reads
+        token_budget: dreaming.pin_key_files.token_budget,
+        min_reads: dreaming.pin_key_files.min_reads
       } : undefined,
-      fallbackModels: resolveFallbackChain(DREAMER_AGENT, deps.config.dreamer?.fallback_models),
+      fallbackModels: resolveFallbackChain(DREAMER_AGENT, dreaming.fallback_models),
       projectIdentity: projectPath
     }).catch((error51) => {
       log("[dreamer] scheduled queue processing failed:", error51);
@@ -176798,7 +177235,7 @@ function createMagicContextHook(deps) {
       systemPromptRefreshSessions.add(sessionId);
       pendingMaterializationSessions.add(sessionId);
     },
-    executeRecomp: async (sessionId, options) => executeContextRecomp({
+    executeRecomp: historianRunnable ? async (sessionId, options) => executeContextRecomp({
       client: deps.client,
       db,
       sessionId,
@@ -176822,34 +177259,34 @@ function createMagicContextHook(deps) {
       onDeferredMarkerPending: (sid) => {
         deferredHistoryRefreshSessions.add(sid);
       }
-    }, options),
+    }, options) : undefined,
     sendNotification: async (sessionId, text, params) => {
       await sendIgnoredMessage(deps.client, sessionId, text, {
         ...getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession),
         ...params
       });
     },
-    sidekick: deps.config.sidekick?.enabled ? {
-      config: deps.config.sidekick,
+    sidekick: sidekickConfig ? {
+      config: sidekickConfig,
       projectPath,
       sessionDirectory: deps.directory,
       client: deps.client
     } : undefined,
-    dreamer: deps.config.dreamer ? {
-      config: deps.config.dreamer,
+    dreamer: dreamerConfig ? {
+      config: dreamerConfig,
       projectPath,
       client: deps.client,
       directory: deps.directory,
-      experimentalUserMemories: deps.config.dreamer?.user_memories?.enabled ? {
+      experimentalUserMemories: dreamerConfig.user_memories?.enabled ? {
         enabled: true,
-        promotionThreshold: deps.config.dreamer.user_memories.promotion_threshold
+        promotionThreshold: dreamerConfig.user_memories.promotion_threshold
       } : undefined,
-      experimentalPinKeyFiles: deps.config.dreamer?.pin_key_files?.enabled ? {
+      experimentalPinKeyFiles: dreamerConfig.pin_key_files?.enabled ? {
         enabled: true,
-        token_budget: deps.config.dreamer.pin_key_files.token_budget,
-        min_reads: deps.config.dreamer.pin_key_files.min_reads
+        token_budget: dreamerConfig.pin_key_files.token_budget,
+        min_reads: dreamerConfig.pin_key_files.min_reads
       } : undefined,
-      fallbackModels: resolveFallbackChain(DREAMER_AGENT, deps.config.dreamer.fallback_models)
+      fallbackModels: resolveFallbackChain(DREAMER_AGENT, dreamerConfig.fallback_models)
     } : undefined
   });
   const systemPromptHash = createSystemPromptHashHandler({
@@ -176857,7 +177294,7 @@ function createMagicContextHook(deps) {
     protectedTags: deps.config.protected_tags,
     ctxReduceEnabled,
     dropToolStructure: deps.config.drop_tool_structure ?? true,
-    dreamerEnabled: deps.config.dreamer?.enabled === true,
+    dreamerEnabled: dreamerRunnable,
     injectDocs: deps.config.dreamer?.inject_docs !== false,
     directory: deps.directory,
     historyRefreshSessions,
@@ -177195,6 +177632,7 @@ function calibrateBuckets(input) {
 }
 
 // src/plugin/rpc-handlers.ts
+init_announcement();
 init_logger();
 init_rpc_notifications();
 function getDb() {
@@ -177241,7 +177679,7 @@ function resolveConfigValue(cfg, key, modelKey, defaultValue) {
   }
   return defaultValue;
 }
-function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, injectionBudgetTokens) {
+function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, injectionBudgetTokens, config2) {
   const empty = {
     sessionId,
     usagePercentage: 0,
@@ -177265,7 +177703,8 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
     memoryTokens: 0,
     conversationTokens: 0,
     toolCallTokens: 0,
-    toolDefinitionTokens: 0
+    toolDefinitionTokens: 0,
+    executeThreshold: 65
   };
   try {
     const projectIdentity = resolveProjectIdentity(directory);
@@ -177384,6 +177823,18 @@ ${c.content}
       }
     }
     const contextLimit = activeProviderID && activeModelID ? resolveContextLimit(activeProviderID, activeModelID, { db, sessionID: sessionId }) : 0;
+    let executeThreshold = 65;
+    if (config2) {
+      const modelKey = activeProviderID && activeModelID ? `${activeProviderID}/${activeModelID}` : undefined;
+      const pctCfg = config2.execute_threshold_percentage;
+      const tokensCfg = config2.execute_threshold_tokens;
+      const thresholdDetail = resolveExecuteThresholdDetail(pctCfg ?? 65, modelKey, 65, {
+        tokensConfig: tokensCfg,
+        contextLimit: contextLimit || undefined,
+        sessionId
+      });
+      executeThreshold = thresholdDetail.percentage;
+    }
     const calibration = resolveModelCalibration(activeProviderID, activeModelID);
     const calibrated = calibrateBuckets({
       inputTokens,
@@ -177419,7 +177870,8 @@ ${c.content}
       memoryTokens: calibrated.memoryTokens,
       conversationTokens: calibrated.conversationTokens,
       toolCallTokens: calibrated.toolCallTokens,
-      toolDefinitionTokens: calibrated.toolDefinitionTokens
+      toolDefinitionTokens: calibrated.toolDefinitionTokens,
+      executeThreshold
     };
     return applyStickySnapshotCache(sessionId, fresh);
   } catch (err) {
@@ -177428,7 +177880,7 @@ ${c.content}
   }
 }
 function buildStatusDetail(db, sessionId, directory, modelKey, config2, liveSessionState, injectionBudgetTokens) {
-  const base = buildSidebarSnapshot(db, sessionId, directory, liveSessionState, injectionBudgetTokens);
+  const base = buildSidebarSnapshot(db, sessionId, directory, liveSessionState, injectionBudgetTokens, config2);
   const detail = {
     ...base,
     tagCounter: 0,
@@ -177541,7 +177993,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db || !sessionId)
       return { error: "unavailable" };
-    return buildSidebarSnapshot(db, sessionId, dir, liveSessionState, injectionBudgetTokens);
+    return buildSidebarSnapshot(db, sessionId, dir, liveSessionState, injectionBudgetTokens, rawConfig);
   });
   rpcServer.handle("status-detail", async (params) => {
     const sessionId = String(params.sessionId ?? "");
@@ -177603,6 +178055,23 @@ function registerRpcHandlers(rpcServer, args) {
     const notifications = drainNotifications(Number.isFinite(lastReceivedId) ? lastReceivedId : 0);
     return { messages: notifications };
   });
+  rpcServer.handle("get-announcement", async () => {
+    if (!shouldShowAnnouncement()) {
+      return { show: false };
+    }
+    return {
+      show: true,
+      version: ANNOUNCEMENT_VERSION,
+      features: [...ANNOUNCEMENT_FEATURES],
+      footer: ANNOUNCEMENT_FOOTER
+    };
+  });
+  rpcServer.handle("mark-announced", async () => {
+    if (ANNOUNCEMENT_VERSION) {
+      markAnnouncementSeen(ANNOUNCEMENT_VERSION);
+    }
+    return { ok: true };
+  });
 }
 
 // src/plugin/tool-registry.ts
@@ -178546,7 +179015,7 @@ function createToolRegistry(args) {
     ...createCtxExpandTools(),
     ...createCtxNoteTools({
       db,
-      dreamerEnabled: pluginConfig.dreamer?.enabled === true,
+      dreamerEnabled: isDreamerRunnable(pluginConfig),
       resolveProjectPath: resolveProjectPath2
     }),
     ...createCtxSearchTools({
@@ -178577,28 +179046,28 @@ init_models_dev_cache();
 // src/shared/rpc-server.ts
 init_logger();
 import {
-  mkdirSync as mkdirSync8,
+  mkdirSync as mkdirSync9,
   readdirSync,
-  readFileSync as readFileSync14,
+  readFileSync as readFileSync15,
   renameSync as renameSync2,
   unlinkSync as unlinkSync3,
-  writeFileSync as writeFileSync7
+  writeFileSync as writeFileSync8
 } from "node:fs";
 import { createServer } from "node:http";
 import { dirname as dirname8 } from "node:path";
 
 // src/shared/rpc-utils.ts
 import { createHash as createHash10 } from "node:crypto";
-import { join as join26 } from "node:path";
+import { join as join27 } from "node:path";
 function projectHash(directory) {
   const normalized = directory.replace(/\/+$/, "");
   return createHash10("sha256").update(normalized).digest("hex").slice(0, 16);
 }
 function rpcPortDir(storageDir, directory) {
-  return join26(storageDir, "rpc", projectHash(directory));
+  return join27(storageDir, "rpc", projectHash(directory));
 }
 function rpcPortFilePath(storageDir, directory, pid = process.pid) {
-  return join26(rpcPortDir(storageDir, directory), `port-${pid}.json`);
+  return join27(rpcPortDir(storageDir, directory), `port-${pid}.json`);
 }
 function isPidAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0)
@@ -178673,9 +179142,9 @@ class MagicContextRpcServer {
         try {
           this.warnIfOtherLiveInstance();
           const dir = dirname8(this.portFilePath);
-          mkdirSync8(dir, { recursive: true });
+          mkdirSync9(dir, { recursive: true });
           const tmpPath = `${this.portFilePath}.tmp`;
-          writeFileSync7(tmpPath, JSON.stringify({
+          writeFileSync8(tmpPath, JSON.stringify({
             port: this.port,
             pid: process.pid,
             started_at: this.startedAt
@@ -178695,7 +179164,7 @@ class MagicContextRpcServer {
       for (const entry of readdirSync(this.portDir)) {
         if (!entry.startsWith("port-") || !entry.endsWith(".json"))
           continue;
-        const record2 = parseRpcPortFile(readFileSync14(`${this.portDir}/${entry}`, "utf-8"));
+        const record2 = parseRpcPortFile(readFileSync15(`${this.portDir}/${entry}`, "utf-8"));
         if (!record2 || record2.pid === process.pid || !isPidAlive(record2.pid))
           continue;
         log(`[rpc] another Magic Context RPC server is active for this project (pid ${record2.pid}, port ${record2.port}); starting separate instance on a new port`);
@@ -178820,18 +179289,19 @@ var plugin = async (ctx) => {
   });
   const storageDir = getMagicContextStorageDir();
   if (pluginConfig.enabled) {
+    const dreamerRunnable = isDreamerRunnable(pluginConfig);
     const timerRegistration = {
       directory: ctx.directory,
       projectIdentity: resolveProjectIdentity(ctx.directory),
       client: ctx.client,
-      dreamerConfig: pluginConfig.dreamer,
+      dreamerConfig: dreamerRunnable ? pluginConfig.dreamer : undefined,
       embeddingConfig: pluginConfig.embedding,
       memoryEnabled: pluginConfig.memory?.enabled === true,
-      experimentalUserMemories: pluginConfig.dreamer?.user_memories?.enabled ? {
+      experimentalUserMemories: dreamerRunnable && pluginConfig.dreamer?.user_memories?.enabled ? {
         enabled: true,
         promotionThreshold: pluginConfig.dreamer.user_memories.promotion_threshold
       } : undefined,
-      experimentalPinKeyFiles: pluginConfig.dreamer?.pin_key_files?.enabled ? {
+      experimentalPinKeyFiles: dreamerRunnable && pluginConfig.dreamer?.pin_key_files?.enabled ? {
         enabled: true,
         token_budget: pluginConfig.dreamer.pin_key_files.token_budget,
         min_reads: pluginConfig.dreamer.pin_key_files.min_reads
@@ -178875,6 +179345,22 @@ var plugin = async (ctx) => {
       }
     } catch {}
   }
+  if (pluginConfig.enabled && !conflictResult?.hasConflict) {
+    try {
+      const {
+        shouldShowAnnouncement: shouldShowAnnouncement2,
+        ANNOUNCEMENT_VERSION: ANNOUNCEMENT_VERSION2,
+        ANNOUNCEMENT_FEATURES: ANNOUNCEMENT_FEATURES2,
+        ANNOUNCEMENT_FOOTER: ANNOUNCEMENT_FOOTER2,
+        markAnnouncementSeen: markAnnouncementSeen2
+      } = await Promise.resolve().then(() => (init_announcement(), exports_announcement));
+      if (shouldShowAnnouncement2()) {
+        setTimeout(() => {
+          Promise.resolve().then(() => (init_conflict_warning_hook(), exports_conflict_warning_hook)).then(({ sendStartupAnnouncement: sendStartupAnnouncement2 }) => sendStartupAnnouncement2(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2)).catch(() => {});
+        }, 8000);
+      }
+    } catch {}
+  }
   let lastChatContext = null;
   return {
     tool: tools5,
@@ -178921,13 +179407,21 @@ var plugin = async (ctx) => {
       await hooks.magicContext?.["experimental.text.complete"]?.(input, output);
     },
     config: async (config2) => {
-      const buildHiddenAgentConfig = (agentId, prompt, overrides) => ({
-        prompt,
-        ...getAgentFallbackModels(agentId) ? { fallback_models: getAgentFallbackModels(agentId) } : {},
-        ...overrides ?? {},
-        mode: "subagent",
-        hidden: true
-      });
+      const buildHiddenAgentConfig = (agentId, prompt, allowedTools, overrides) => {
+        const { permission: overridePermission, ...restOverrides } = overrides ?? {};
+        const basePermission = buildAllowOnlyPermission(allowedTools);
+        return {
+          prompt,
+          ...getAgentFallbackModels(agentId) ? { fallback_models: getAgentFallbackModels(agentId) } : {},
+          ...restOverrides,
+          permission: {
+            ...basePermission,
+            ...overridePermission ?? {}
+          },
+          mode: "subagent",
+          hidden: true
+        };
+      };
       const commandConfig = {
         ...config2.command ?? {},
         ...getMagicContextBuiltinCommands(),
@@ -178936,7 +179430,6 @@ var plugin = async (ctx) => {
       config2.command = commandConfig;
       const dreamerAgentOverrides = pluginConfig.dreamer ? (() => {
         const {
-          enabled: _enabled,
           schedule: _schedule,
           max_runtime_minutes: _max,
           tasks: _tasks,
@@ -178947,7 +179440,6 @@ var plugin = async (ctx) => {
       })() : undefined;
       const sidekickAgentOverrides = pluginConfig.sidekick ? (() => {
         const {
-          enabled: _enabled,
           timeout_ms: _timeoutMs,
           system_prompt: _systemPrompt,
           ...agentOverrides
@@ -178960,10 +179452,10 @@ var plugin = async (ctx) => {
       })() : undefined;
       config2.agent = {
         ...config2.agent ?? {},
-        [DREAMER_AGENT]: buildHiddenAgentConfig(DREAMER_AGENT, DREAMER_SYSTEM_PROMPT, dreamerAgentOverrides),
-        [HISTORIAN_AGENT]: buildHiddenAgentConfig(HISTORIAN_AGENT, pluginConfig.dreamer?.user_memories?.enabled ? COMPARTMENT_AGENT_SYSTEM_PROMPT + USER_OBSERVATIONS_APPENDIX : COMPARTMENT_AGENT_SYSTEM_PROMPT, historianAgentOverrides),
-        [HISTORIAN_EDITOR_AGENT]: buildHiddenAgentConfig(HISTORIAN_EDITOR_AGENT, HISTORIAN_EDITOR_SYSTEM_PROMPT, historianAgentOverrides),
-        [SIDEKICK_AGENT]: buildHiddenAgentConfig(SIDEKICK_AGENT, SIDEKICK_SYSTEM_PROMPT, sidekickAgentOverrides)
+        [DREAMER_AGENT]: buildHiddenAgentConfig(DREAMER_AGENT, DREAMER_SYSTEM_PROMPT, DREAMER_ALLOWED_TOOLS, dreamerAgentOverrides),
+        [HISTORIAN_AGENT]: buildHiddenAgentConfig(HISTORIAN_AGENT, isDreamerRunnable(pluginConfig) && pluginConfig.dreamer?.user_memories?.enabled ? COMPARTMENT_AGENT_SYSTEM_PROMPT + USER_OBSERVATIONS_APPENDIX : COMPARTMENT_AGENT_SYSTEM_PROMPT, HISTORIAN_ALLOWED_TOOLS, historianAgentOverrides),
+        [HISTORIAN_EDITOR_AGENT]: buildHiddenAgentConfig(HISTORIAN_EDITOR_AGENT, HISTORIAN_EDITOR_SYSTEM_PROMPT, HISTORIAN_ALLOWED_TOOLS, historianAgentOverrides),
+        [SIDEKICK_AGENT]: buildHiddenAgentConfig(SIDEKICK_AGENT, SIDEKICK_SYSTEM_PROMPT, SIDEKICK_ALLOWED_TOOLS, sidekickAgentOverrides)
       };
     }
   };