@cortexkit/magic-context 0.22.4 → 0.23.0

package/dist/index.js

@@ -145068,6 +145068,11 @@ function markSessionCompleted(db, sessionId, now) {
          SET status = 'completed', completed_at = ?, lease_expires_at = NULL, last_error = NULL
          WHERE session_id = ?`).run(now, sessionId);
 }
+function markSessionPendingRetry(db, sessionId) {
+  db.prepare(`UPDATE tool_owner_backfill_state
+         SET status = 'pending', completed_at = NULL, lease_expires_at = NULL, last_error = NULL
+         WHERE session_id = ?`).run(sessionId);
+}
 function markSessionSkipped(db, sessionId, now, reason) {
   db.prepare(`INSERT INTO tool_owner_backfill_state(session_id, status, completed_at, last_error)
          VALUES (?, 'skipped', ?, ?)
@@ -145144,12 +145149,18 @@ function applyOwnersForSession(db, sessionId, ownersByCallId) {
   const updateRowStmt = db.prepare(`UPDATE tags
          SET tool_owner_message_id = ?
          WHERE id = ? AND tool_owner_message_id IS NULL`);
+  const existingOwnerStmt = db.prepare(`SELECT 1 AS hit FROM tags
+         WHERE session_id = ? AND message_id = ? AND type = 'tool'
+           AND tool_owner_message_id = ?
+         LIMIT 1`);
   let rowsUpdated = 0;
   db.transaction(() => {
     for (const [callId, ownerId] of ownersByCallId) {
       const orphan = findOrphanStmt.get(sessionId, callId);
       if (!orphan)
         continue;
+      if (existingOwnerStmt.get(sessionId, callId, ownerId))
+        continue;
       const result = updateRowStmt.run(ownerId, orphan.id);
       rowsUpdated += result.changes ?? 0;
     }
@@ -145178,6 +145189,8 @@ function backfillToolOwnersInChunks(db, result) {
       if (owners.size === 0) {
         markSessionSkipped(db, sessionId, Date.now(), "no_oc_matches");
         result.sessionsSkippedNoMatches += 1;
+      } else if (rowsLeftNull > 0) {
+        markSessionPendingRetry(db, sessionId);
       } else {
         markSessionCompleted(db, sessionId, Date.now());
         result.sessionsCompleted += 1;
@@ -145293,9 +145306,9 @@ function applySqliteTuningPragmas(db) {
   db.exec("PRAGMA analysis_limit=400");
 }
 function initializeDatabase(db) {
+  db.exec("PRAGMA busy_timeout=5000");
   db.exec("PRAGMA foreign_keys=ON");
   db.exec("PRAGMA journal_mode=WAL");
-  db.exec("PRAGMA busy_timeout=5000");
   applySqliteTuningPragmas(db);
   db.exec(`
     CREATE TABLE IF NOT EXISTS tags (
@@ -145308,6 +145321,9 @@ function initializeDatabase(db) {
       tag_number INTEGER,
       harness TEXT NOT NULL DEFAULT 'opencode',
       entry_fingerprint TEXT,
+      token_count INTEGER,
+      input_token_count INTEGER,
+      reasoning_token_count INTEGER,
       UNIQUE(session_id, tag_number)
     );
 
@@ -145597,6 +145613,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       counter INTEGER DEFAULT 0,
       last_nudge_tokens INTEGER DEFAULT 0,
       last_nudge_band TEXT DEFAULT '',
+      last_nudge_undropped INTEGER DEFAULT 0,
+      last_nudge_level TEXT DEFAULT '',
+      channel2_nudge_state TEXT DEFAULT '',
+      channel2_nudge_claimed_at INTEGER DEFAULT 0,
+      last_emergency_input_sample INTEGER DEFAULT 0,
       last_transform_error TEXT DEFAULT '',
       nudge_anchor_message_id TEXT DEFAULT '',
       nudge_anchor_text TEXT DEFAULT '',
@@ -145653,6 +145674,14 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       cached_m0_project_docs_hash TEXT,
       cached_m1_bytes BLOB,
       last_observed_model_key TEXT,
+      last_usage_context_limit INTEGER NOT NULL DEFAULT 0,
+      prior_boundary_ordinal INTEGER NOT NULL DEFAULT 1,
+      protected_tail_policy_version INTEGER NOT NULL DEFAULT 0,
+      protected_tail_drain_window_started_at INTEGER NOT NULL DEFAULT 0,
+      protected_tail_drain_tokens INTEGER NOT NULL DEFAULT 0,
+      recovery_no_eligible_head_count INTEGER NOT NULL DEFAULT 0,
+      force_emergency_bypass_window_start INTEGER NOT NULL DEFAULT 0,
+      force_emergency_bypass_used INTEGER NOT NULL DEFAULT 0,
       cached_m0_materialized_at INTEGER,
       cached_m0_session_facts_version INTEGER,
       cached_m0_upgrade_state TEXT,
@@ -145763,6 +145792,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
     CREATE INDEX IF NOT EXISTS idx_message_history_index_updated_at ON message_history_index(updated_at);
   `);
   ensureColumn(db, "session_meta", "last_nudge_band", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "last_nudge_undropped", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "last_nudge_level", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "channel2_nudge_state", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "channel2_nudge_claimed_at", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "last_emergency_input_sample", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "nudge_anchor_text", "TEXT DEFAULT ''");
@@ -145789,6 +145823,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "stale_reduce_stripped_ids", "TEXT DEFAULT ''");
   ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
@@ -145807,6 +145842,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   db.exec(`CREATE INDEX IF NOT EXISTS idx_tags_pi_adopt
             ON tags(session_id, entry_fingerprint)
             WHERE type='message' AND entry_fingerprint IS NOT NULL`);
+  ensureColumn(db, "tags", "token_count", "INTEGER");
+  ensureColumn(db, "tags", "input_token_count", "INTEGER");
+  ensureColumn(db, "tags", "reasoning_token_count", "INTEGER");
   ensureColumn(db, "session_meta", "system_prompt_tokens", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "compaction_marker_state", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "key_files", "TEXT DEFAULT ''");
@@ -145847,6 +145885,14 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "cached_m0_project_docs_hash", "TEXT");
   ensureColumn(db, "session_meta", "cached_m1_bytes", "BLOB");
   ensureColumn(db, "session_meta", "last_observed_model_key", "TEXT");
+  ensureColumn(db, "session_meta", "last_usage_context_limit", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "prior_boundary_ordinal", "INTEGER NOT NULL DEFAULT 1");
+  ensureColumn(db, "session_meta", "protected_tail_policy_version", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "protected_tail_drain_window_started_at", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "protected_tail_drain_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "recovery_no_eligible_head_count", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "force_emergency_bypass_window_start", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "force_emergency_bypass_used", "INTEGER NOT NULL DEFAULT 0");
   ensureColumn(db, "session_meta", "cached_m0_materialized_at", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_session_facts_version", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_upgrade_state", "TEXT");
@@ -145916,6 +145962,12 @@ function healAllNullColumns(db) {
   healNullIntegerColumns(db);
   healMissingMemoryBlockIds(db);
 }
+function healWedgedChannel2Claims(db) {
+  try {
+    const staleBefore = Date.now() - CHANNEL2_CLAIM_TTL_MS;
+    db.prepare("UPDATE session_meta SET channel2_nudge_state = 'pending', channel2_nudge_claimed_at = 0 WHERE channel2_nudge_state = 'claimed' AND (channel2_nudge_claimed_at IS NULL OR channel2_nudge_claimed_at = 0 OR channel2_nudge_claimed_at <= ?)").run(staleBefore);
+  } catch {}
+}
 function healMissingMemoryBlockIds(db) {
   try {
     db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE memory_block_cache != '' AND (memory_block_ids IS NULL OR memory_block_ids = '') AND memory_block_count > 0").run();
@@ -145925,6 +145977,7 @@ function healNullTextColumns(db) {
   const columns = [
     ["cache_ttl", ""],
     ["last_nudge_band", ""],
+    ["last_nudge_level", ""],
     ["last_transform_error", ""],
     ["nudge_anchor_message_id", ""],
     ["nudge_anchor_text", ""],
@@ -145939,6 +145992,7 @@ function healNullTextColumns(db) {
     ["todo_synthetic_state_json", ""],
     ["system_prompt_hash", ""],
     ["stripped_placeholder_ids", ""],
+    ["stale_reduce_stripped_ids", ""],
     ["memory_block_cache", ""],
     ["memory_block_ids", ""],
     ["compaction_marker_state", ""],
@@ -145964,7 +146018,17 @@ function healNullIntegerColumns(db) {
     ["observed_safe_input_tokens", 0],
     ["cache_alert_sent", 0],
     ["new_work_tokens", 0],
-    ["total_input_tokens", 0]
+    ["total_input_tokens", 0],
+    ["last_emergency_input_sample", 0],
+    ["channel2_nudge_claimed_at", 0],
+    ["last_usage_context_limit", 0],
+    ["prior_boundary_ordinal", 1],
+    ["protected_tail_policy_version", 0],
+    ["protected_tail_drain_window_started_at", 0],
+    ["protected_tail_drain_tokens", 0],
+    ["recovery_no_eligible_head_count", 0],
+    ["force_emergency_bypass_window_start", 0],
+    ["force_emergency_bypass_used", 0]
   ];
   for (const [column, fallback] of columns) {
     try {
@@ -146003,6 +146067,7 @@ function openDatabase(dbPathOrOptions) {
     if (!persistenceByDatabase.has(existing)) {
       persistenceByDatabase.set(existing, true);
     }
+    healWedgedChannel2Claims(existing);
     return existing;
   }
   try {
@@ -146028,6 +146093,7 @@ function openDatabase(dbPathOrOptions) {
         log2(`[magic-context] key-files orphan GC failed: ${getErrorMessage(error)}`);
       }
     }
+    healWedgedChannel2Claims(db);
     if (!explicitDbPath) {
       try {
         runToolOwnerBackfill(db);
@@ -146063,7 +146129,7 @@ function closeDatabase() {
     }
   }
 }
-var databases, persistenceByDatabase, persistenceErrorByDatabase, lastSchemaFenceRejection = null, LATEST_SUPPORTED_VERSION = 30, sqlitePragmaConfig;
+var databases, persistenceByDatabase, persistenceErrorByDatabase, lastSchemaFenceRejection = null, LATEST_SUPPORTED_VERSION = 32, sqlitePragmaConfig, CHANNEL2_CLAIM_TTL_MS = 120000;
 var init_storage_db = __esm(async () => {
   init_data_path();
   init_logger();
@@ -146908,15 +146974,60 @@ var init_migrations = __esm(async () => {
                         cached_m0_model_key = NULL`).run();
         }
       }
+    },
+    {
+      version: 31,
+      description: "Nudge redesign: Channel 1 cadence (last_nudge_undropped) + Channel 2 ceiling lease " + "(channel2_nudge_state); zero legacy ctx_reduce-nudge sticky/anchor state (startup heal)",
+      up: (db) => {
+        const hasSessionMeta = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='session_meta' LIMIT 1").get();
+        if (!hasSessionMeta)
+          return;
+        ensureColumn(db, "session_meta", "last_nudge_undropped", "INTEGER DEFAULT 0");
+        ensureColumn(db, "session_meta", "channel2_nudge_state", "TEXT DEFAULT ''");
+        const columns = new Set(db.prepare("PRAGMA table_info(session_meta)").all().map((column) => column.name));
+        if (columns.has("sticky_turn_reminder_text")) {
+          db.prepare(`UPDATE session_meta SET
+                        sticky_turn_reminder_text = '',
+                        sticky_turn_reminder_message_id = '',
+                        nudge_anchor_message_id = '',
+                        nudge_anchor_text = ''`).run();
+        }
+      }
+    },
+    {
+      version: 32,
+      description: "Protected tail boundary state, usage resolver fields, recovery escape, and drain quota",
+      up: (db) => {
+        const hasSessionMeta = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='session_meta' LIMIT 1").get();
+        if (!hasSessionMeta)
+          return;
+        ensureColumn(db, "session_meta", "prior_boundary_ordinal", "INTEGER NOT NULL DEFAULT 1");
+        ensureColumn(db, "session_meta", "protected_tail_policy_version", "INTEGER NOT NULL DEFAULT 0");
+        ensureColumn(db, "session_meta", "protected_tail_drain_window_started_at", "INTEGER NOT NULL DEFAULT 0");
+        ensureColumn(db, "session_meta", "protected_tail_drain_tokens", "INTEGER NOT NULL DEFAULT 0");
+        ensureColumn(db, "session_meta", "recovery_no_eligible_head_count", "INTEGER NOT NULL DEFAULT 0");
+        ensureColumn(db, "session_meta", "force_emergency_bypass_window_start", "INTEGER NOT NULL DEFAULT 0");
+        ensureColumn(db, "session_meta", "force_emergency_bypass_used", "INTEGER NOT NULL DEFAULT 0");
+        ensureColumn(db, "session_meta", "last_usage_context_limit", "INTEGER NOT NULL DEFAULT 0");
+        db.prepare("UPDATE session_meta SET prior_boundary_ordinal = 1 WHERE prior_boundary_ordinal IS NULL OR prior_boundary_ordinal < 1").run();
+        db.prepare("UPDATE session_meta SET protected_tail_policy_version = 0 WHERE protected_tail_policy_version IS NULL").run();
+        db.prepare("UPDATE session_meta SET protected_tail_drain_window_started_at = 0 WHERE protected_tail_drain_window_started_at IS NULL").run();
+        db.prepare("UPDATE session_meta SET protected_tail_drain_tokens = 0 WHERE protected_tail_drain_tokens IS NULL").run();
+        db.prepare("UPDATE session_meta SET recovery_no_eligible_head_count = 0 WHERE recovery_no_eligible_head_count IS NULL").run();
+        db.prepare("UPDATE session_meta SET force_emergency_bypass_window_start = 0 WHERE force_emergency_bypass_window_start IS NULL").run();
+        db.prepare("UPDATE session_meta SET force_emergency_bypass_used = 0 WHERE force_emergency_bypass_used IS NULL").run();
+        db.prepare("UPDATE session_meta SET last_usage_context_limit = 0 WHERE last_usage_context_limit IS NULL").run();
+      }
     }
   ];
   LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
 });
 
 // ../plugin/src/features/magic-context/project-docs-hash.ts
-var docsCache;
+var MAX_PROJECT_DOC_BYTES, docsCache;
 var init_project_docs_hash = __esm(() => {
   init_compartment_storage();
+  MAX_PROJECT_DOC_BYTES = 256 * 1024;
   docsCache = new Map;
 });
 
@@ -147109,7 +147220,7 @@ var init_storage_memory_mutation_log = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/storage-meta-persisted.ts
-var AUTO_SEARCH_NO_HINT_REASONS;
+var AUTO_SEARCH_NO_HINT_REASONS, DRAIN_WINDOW_MS;
 var init_storage_meta_persisted = __esm(() => {
   init_logger();
   init_storage_meta_shared();
@@ -147121,6 +147232,7 @@ var init_storage_meta_persisted = __esm(() => {
     "stacked",
     "too-short"
   ]);
+  DRAIN_WINDOW_MS = 10 * 60 * 1000;
 });
 
 // ../plugin/src/features/magic-context/resolve-subagent-fallback.ts
@@ -147167,7 +147279,7 @@ var init_storage_ops = __esm(() => {
 // ../plugin/src/features/magic-context/storage-source.ts
 var init_storage_source = () => {};
 // ../plugin/src/features/magic-context/storage-tags.ts
-var insertTagStatements, updateTagStatusStatements, updateTagDropModeStatements, updateTagMessageIdStatements, getTagNumbersByMessageIdStatements, deleteTagsByMessageIdStatements, getMaxTagNumberBySessionStatements, getTagNumberByMessageIdStatements, updateTagByteSizeStatements, updateTagInputByteSizeStatements, getOwnerScopedToolTagNumbersStatements, getActiveTagsBySessionStatements, getMaxDroppedTagNumberStatements, getToolTagNumberByOwnerStatements, getNullOwnerToolTagStatements, adoptNullOwnerToolTagStatements, deleteToolTagsByOwnerStatements;
+var insertTagStatements, updateTagStatusStatements, updateTagDropModeStatements, updateTagMessageIdStatements, getTagNumbersByMessageIdStatements, deleteTagsByMessageIdStatements, getMaxTagNumberBySessionStatements, getTagNumberByMessageIdStatements, updateTagByteSizeStatements, updateTagInputByteSizeStatements, updateTagTokenCountStatements, updateTagInputTokenCountStatements, getOwnerScopedToolTagNumbersStatements, getActiveTagsBySessionStatements, getMaxDroppedTagNumberStatements, getToolTagNumberByOwnerStatements, getNullOwnerToolTagStatements, adoptNullOwnerToolTagStatements, deleteToolTagsByOwnerStatements;
 var init_storage_tags = __esm(() => {
   insertTagStatements = new WeakMap;
   updateTagStatusStatements = new WeakMap;
@@ -147179,6 +147291,8 @@ var init_storage_tags = __esm(() => {
   getTagNumberByMessageIdStatements = new WeakMap;
   updateTagByteSizeStatements = new WeakMap;
   updateTagInputByteSizeStatements = new WeakMap;
+  updateTagTokenCountStatements = new WeakMap;
+  updateTagInputTokenCountStatements = new WeakMap;
   getOwnerScopedToolTagNumbersStatements = new WeakMap;
   getActiveTagsBySessionStatements = new WeakMap;
   getMaxDroppedTagNumberStatements = new WeakMap;
@@ -147595,6 +147709,102 @@ function migrateLegacyExperimental(rawConfig, warnings) {
   return patched;
 }
 
+// ../plugin/src/config/project-security.ts
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stripUnsafeProjectConfigFields(projectRaw) {
+  const warnings = [];
+  if ("auto_update" in projectRaw) {
+    delete projectRaw.auto_update;
+    warnings.push("Ignoring auto_update from project config (security: this setting only honors user-level config).");
+  }
+  if ("sqlite" in projectRaw) {
+    delete projectRaw.sqlite;
+    warnings.push("Ignoring sqlite.* from project config (security: SQLite cache/mmap PRAGMAs apply to the " + "process-global shared database handle; only user-level config may set them).");
+  }
+  for (const agentKey of HIDDEN_AGENT_KEYS) {
+    const block = projectRaw[agentKey];
+    if (!isPlainObject(block))
+      continue;
+    const removed = [];
+    for (const field of AGENT_ESCALATION_FIELDS) {
+      if (field in block) {
+        delete block[field];
+        removed.push(field);
+      }
+    }
+    if (removed.length > 0) {
+      warnings.push(`Ignoring ${agentKey}.${removed.join("/")} from project config ` + "(security: a repository cannot reprogram or re-permission hidden agents).");
+    }
+  }
+  return warnings;
+}
+function normalizeEndpoint(value) {
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim().replace(/\/+$/, "");
+  return trimmed.length > 0 ? trimmed.toLowerCase() : undefined;
+}
+function dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, userRaw) {
+  const projectEmbedding = projectRaw.embedding;
+  if (!isPlainObject(projectEmbedding))
+    return [];
+  const redirectsEndpoint = "endpoint" in projectEmbedding;
+  if (!redirectsEndpoint)
+    return [];
+  const userEmbedding = userRaw?.embedding;
+  if (isPlainObject(userEmbedding)) {
+    const projectEndpoint = normalizeEndpoint(projectEmbedding.endpoint);
+    const userEndpoint = normalizeEndpoint(userEmbedding.endpoint);
+    if (projectEndpoint !== undefined && projectEndpoint === userEndpoint) {
+      return [];
+    }
+  }
+  const providesOwnKey = typeof projectEmbedding.api_key === "string" && projectEmbedding.api_key.length > 0;
+  if (providesOwnKey)
+    return [];
+  const mergedEmbedding = mergedRaw.embedding;
+  if (!isPlainObject(mergedEmbedding))
+    return [];
+  if (!("api_key" in mergedEmbedding))
+    return [];
+  delete mergedEmbedding.api_key;
+  return [
+    "Dropped inherited user embedding api_key because project config redirected " + "embedding.endpoint without supplying its own key (security: prevents key " + "exfiltration to a repository-chosen endpoint)."
+  ];
+}
+var HIDDEN_AGENT_KEYS, AGENT_ESCALATION_FIELDS;
+var init_project_security = __esm(() => {
+  HIDDEN_AGENT_KEYS = ["historian", "dreamer", "sidekick"];
+  AGENT_ESCALATION_FIELDS = ["prompt", "permission", "tools", "system_prompt"];
+});
+
+// ../plugin/src/config/prune-config-leaf.ts
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function pruneNestedConfigLeaf(block, relativePath) {
+  if (relativePath.length === 0)
+    return null;
+  const result = { ...block };
+  let cursor = result;
+  for (let i = 0;i < relativePath.length - 1; i++) {
+    const seg = String(relativePath[i]);
+    const child = cursor[seg];
+    if (!isPlainObject2(child))
+      return null;
+    const clonedChild = { ...child };
+    cursor[seg] = clonedChild;
+    cursor = clonedChild;
+  }
+  const leaf = String(relativePath[relativePath.length - 1]);
+  if (!(leaf in cursor))
+    return null;
+  delete cursor[leaf];
+  return { block: result, removed: relativePath.map(String).join(".") };
+}
+
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/core/core.js
 function $constructor(name2, initializer, params) {
   function init(inst, def) {
@@ -147705,7 +147915,7 @@ __export(exports_util, {
   jsonStringifyReplacer: () => jsonStringifyReplacer,
   joinValues: () => joinValues,
   issue: () => issue,
-  isPlainObject: () => isPlainObject,
+  isPlainObject: () => isPlainObject3,
   isObject: () => isObject,
   hexToUint8Array: () => hexToUint8Array,
   getSizableOrigin: () => getSizableOrigin,
@@ -147870,7 +148080,7 @@ function slugify(input) {
 function isObject(data) {
   return typeof data === "object" && data !== null && !Array.isArray(data);
 }
-function isPlainObject(o) {
+function isPlainObject3(o) {
   if (isObject(o) === false)
     return false;
   const ctor = o.constructor;
@@ -147887,7 +148097,7 @@ function isPlainObject(o) {
   return true;
 }
 function shallowClone(o) {
-  if (isPlainObject(o))
+  if (isPlainObject3(o))
     return { ...o };
   if (Array.isArray(o))
     return [...o];
@@ -148027,7 +148237,7 @@ function omit(schema, mask) {
   return clone(schema, def);
 }
 function extend(schema, shape) {
-  if (!isPlainObject(shape)) {
+  if (!isPlainObject3(shape)) {
     throw new Error("Invalid input to extend: expected a plain object");
   }
   const checks = schema._zod.def.checks;
@@ -148050,7 +148260,7 @@ function extend(schema, shape) {
   return clone(schema, def);
 }
 function safeExtend(schema, shape) {
-  if (!isPlainObject(shape)) {
+  if (!isPlainObject3(shape)) {
     throw new Error("Invalid input to safeExtend: expected a plain object");
   }
   const def = mergeDefs(schema._zod.def, {
@@ -149533,7 +149743,7 @@ function mergeValues(a, b2) {
   if (a instanceof Date && b2 instanceof Date && +a === +b2) {
     return { valid: true, data: a };
   }
-  if (isPlainObject(a) && isPlainObject(b2)) {
+  if (isPlainObject3(a) && isPlainObject3(b2)) {
     const bKeys = Object.keys(b2);
     const sharedKeys = Object.keys(a).filter((key) => bKeys.indexOf(key) !== -1);
     const newObj = { ...a, ...b2 };
@@ -150790,7 +151000,7 @@ var init_schemas = __esm(() => {
     $ZodType.init(inst, def);
     inst._zod.parse = (payload, ctx) => {
       const input = payload.value;
-      if (!isPlainObject(input)) {
+      if (!isPlainObject3(input)) {
         payload.issues.push({
           expected: "record",
           code: "invalid_type",
@@ -162254,7 +162464,7 @@ var init_agent_overrides = __esm(() => {
 });
 
 // ../plugin/src/config/schema/magic-context.ts
-var DEFAULT_NUDGE_INTERVAL_TOKENS = 1e4, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE = 65, EXECUTE_THRESHOLD_CAP_MESSAGE = "execute_threshold is capped at 80% for cache safety: a single large agent step can overflow the context window before Magic Context can compact between turns, forcing OpenCode's native compaction (hard to recover from). 80% also leaves headroom below the 85%/95% emergency bands. Use a value between 20 and 80.", DEFAULT_HISTORIAN_TIMEOUT_MS = 300000, DEFAULT_HISTORY_BUDGET_PERCENTAGE = 0.15, DEFAULT_LOCAL_EMBEDDING_MODEL = "Xenova/all-MiniLM-L6-v2", DREAMER_TASKS, DreamingTaskSchema, DEFAULT_DREAMER_TASKS, PiThinkingLevelSchema, DreamerConfigSchema, SidekickConfigSchema, HistorianConfigSchema, BaseEmbeddingConfigSchema, EmbeddingConfigSchema, MagicContextConfigSchema;
+var DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE = 65, EXECUTE_THRESHOLD_CAP_MESSAGE = "execute_threshold is capped at 80% for cache safety: a single large agent step can overflow the context window before Magic Context can compact between turns, forcing OpenCode's native compaction (hard to recover from). 80% also leaves headroom below the 85%/95% emergency bands. Use a value between 20 and 80.", DEFAULT_HISTORIAN_TIMEOUT_MS = 300000, DEFAULT_HISTORY_BUDGET_PERCENTAGE = 0.15, DEFAULT_LOCAL_EMBEDDING_MODEL = "Xenova/all-MiniLM-L6-v2", DREAMER_TASKS, DreamingTaskSchema, DEFAULT_DREAMER_TASKS, PiThinkingLevelSchema, DreamerConfigSchema, SidekickConfigSchema, HistorianConfigSchema, BaseEmbeddingConfigSchema, EmbeddingConfigSchema, MagicContextConfigSchema;
 var init_magic_context = __esm(() => {
   init_zod();
   init_agent_overrides();
@@ -162351,7 +162561,6 @@ var init_magic_context = __esm(() => {
     historian: HistorianConfigSchema.describe("Historian agent configuration (model, fallback_models, variant, temperature, maxTokens, permission, two_pass, etc.)"),
     dreamer: DreamerConfigSchema.optional().describe("Dreamer agent + scheduling configuration (model, fallback_models, disable, schedule, tasks, etc.)"),
     cache_ttl: exports_external.union([exports_external.string(), exports_external.object({ default: exports_external.string() }).catchall(exports_external.string())]).default("5m").describe('Cache TTL: string (e.g. "5m") or per-model object ({ default: "5m", "model-id": "10m" })'),
-    nudge_interval_tokens: exports_external.number().min(1000).default(DEFAULT_NUDGE_INTERVAL_TOKENS).describe("Minimum token growth between low-priority rolling nudges (default: DEFAULT_NUDGE_INTERVAL_TOKENS)"),
     execute_threshold_percentage: exports_external.union([
       exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE),
       exports_external.object({ default: exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE) }).catchall(exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE))
@@ -162360,10 +162569,7 @@ var init_magic_context = __esm(() => {
       default: exports_external.number().min(5000).max(2000000).optional()
     }).catchall(exports_external.number().min(5000).max(2000000)).optional().describe("Absolute token thresholds per model. When matched, overrides execute_threshold_percentage for that model. Accepts `default` for all models or per-model keys. Values above 80% × context_limit are clamped with a warning log. Min 5_000, max 2_000_000."),
     protected_tags: exports_external.number().min(1).max(100).optional().describe("Number of recent tags to protect from dropping (min: 1, max: 100, default: 20)"),
-    auto_drop_tool_age: exports_external.number().min(10).default(100).describe("Auto-drop tool outputs older than N tags during queue execution (default: 100)"),
-    drop_tool_structure: exports_external.boolean().default(true).describe("When true, dropped tool parts are fully removed instead of truncated in place (default: true)"),
     clear_reasoning_age: exports_external.number().min(10).default(50).describe("Clear reasoning/thinking blocks older than N tags (default: 50)"),
-    iteration_nudge_threshold: exports_external.number().min(5).default(15).describe("Number of consecutive assistant messages without user input to trigger iteration nudge (default: 15)"),
     history_budget_percentage: exports_external.number().min(0.05).max(0.5).default(DEFAULT_HISTORY_BUDGET_PERCENTAGE).describe("Fraction of usable context (context_limit × execute_threshold) reserved for the session history block (default: 0.15)"),
     historian_timeout_ms: exports_external.number().min(60000).default(DEFAULT_HISTORIAN_TIMEOUT_MS).describe("Timeout for each historian prompt call in milliseconds (default: 300000)"),
     commit_cluster_trigger: exports_external.object({
@@ -162427,6 +162633,21 @@ var init_magic_context = __esm(() => {
 import { existsSync as existsSync14, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
 import { dirname as dirname7, isAbsolute, resolve as resolve2 } from "node:path";
+function sensitiveFilePathReason(resolvedPath) {
+  const home = homedir7();
+  const sensitiveDirs = [
+    { dir: resolve2(home, ".ssh"), label: "SSH keys" },
+    { dir: resolve2(home, ".aws"), label: "AWS credentials" },
+    { dir: resolve2(home, ".gnupg"), label: "GnuPG keyring" },
+    { dir: resolve2(home, ".config", "gh"), label: "GitHub CLI auth" }
+  ];
+  for (const { dir, label } of sensitiveDirs) {
+    if (resolvedPath === dir || resolvedPath.startsWith(`${dir}/`)) {
+      return label;
+    }
+  }
+  return null;
+}
 function substituteConfigVariables(input) {
   const warnings = [];
   let text2 = input.text;
@@ -162480,6 +162701,10 @@ function substituteConfigVariables(input) {
     } else if (!isAbsolute(filePath)) {
       filePath = resolve2(configDir, filePath);
     }
+    const sensitiveReason = sensitiveFilePathReason(filePath);
+    if (sensitiveReason) {
+      warnings.push(`${token} resolves to a sensitive path (${sensitiveReason}: ${filePath}); ` + "inlining its contents into config — make sure this is intentional.");
+    }
     if (!existsSync14(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
       continue;
@@ -162550,9 +162775,6 @@ function deepMergeRawConfig(base, override) {
   }
   return result;
 }
-function getProjectUserOnlyFields(config2) {
-  return "auto_update" in config2 ? ["auto_update"] : [];
-}
 function redactConfigValue(value) {
   if (value === undefined)
     return "<missing>";
@@ -162591,12 +162813,16 @@ function parsePluginConfig(rawConfig, recoveredTopLevelKeys = []) {
   const warnings = [];
   const errorPaths = new Set;
   const customMessagesByKey = new Map;
+  const issuePathsByKey = new Map;
   const GENERIC_ZOD_PREFIXES = ["Too big", "Too small", "Invalid input", "Invalid", "Expected"];
   for (const issue2 of parsed.error.issues) {
     const topKey = issue2.path[0];
     if (topKey !== undefined) {
       const key = String(topKey);
       errorPaths.add(key);
+      const paths = issuePathsByKey.get(key) ?? [];
+      paths.push([...issue2.path]);
+      issuePathsByKey.set(key, paths);
       const msg = issue2.message;
       if (msg && !GENERIC_ZOD_PREFIXES.some((p2) => msg.startsWith(p2))) {
         if (!customMessagesByKey.has(key)) {
@@ -162612,12 +162838,33 @@ function parsePluginConfig(rawConfig, recoveredTopLevelKeys = []) {
     if (isAgentConfig) {
       delete patched[key];
       warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
-    } else {
-      delete patched[key];
-      const defaultVal = defaults[key];
-      const reason = customMessagesByKey.get(key);
-      warnings.push(`"${key}": invalid value (${redactConfigValue(rawConfig[key])}), using default ${JSON.stringify(defaultVal)}.${reason ? ` ${reason}` : ""}`);
+      continue;
+    }
+    const issuePaths = issuePathsByKey.get(key) ?? [];
+    const rawValue = rawConfig[key];
+    const allNested = issuePaths.length > 0 && issuePaths.every((p2) => p2.length >= 2) && typeof rawValue === "object" && rawValue !== null && !Array.isArray(rawValue);
+    if (allNested) {
+      let prunedBlock = {
+        ...rawValue
+      };
+      const prunedLeaves = [];
+      for (const p2 of issuePaths) {
+        const relative = p2.slice(1);
+        const result = pruneNestedConfigLeaf(prunedBlock, relative);
+        if (result) {
+          prunedBlock = result.block;
+          prunedLeaves.push(result.removed);
+        }
+      }
+      patched[key] = prunedBlock;
+      const reason2 = customMessagesByKey.get(key);
+      warnings.push(`"${key}": invalid nested field(s) ${prunedLeaves.map((l) => `"${l}"`).join(", ")}, using defaults for those.${reason2 ? ` ${reason2}` : ""}`);
+      continue;
     }
+    delete patched[key];
+    const defaultVal = defaults[key];
+    const reason = customMessagesByKey.get(key);
+    warnings.push(`"${key}": invalid value (${redactConfigValue(rawConfig[key])}), using default ${JSON.stringify(defaultVal)}.${reason ? ` ${reason}` : ""}`);
   }
   const retryMigrated = migrateLegacyExperimental(patched, preMigrationWarnings);
   const retryParsed = MagicContextConfigSchema.safeParse(retryMigrated);
@@ -162653,14 +162900,13 @@ function loadPluginConfig(directory) {
   if (projectLoaded) {
     allWarnings.push(...projectLoaded.warnings.map((w3) => `[project config] ${w3}`));
     const projectRaw = { ...projectLoaded.config };
-    const strippedUserOnlyFields = getProjectUserOnlyFields(projectRaw);
-    if (strippedUserOnlyFields.length > 0) {
-      for (const key of strippedUserOnlyFields) {
-        delete projectRaw[key];
-      }
-      allWarnings.push(`[project config] Ignoring ${strippedUserOnlyFields.join(", ")} from project config (security: these settings only honor user-level config)`);
+    for (const warning of stripUnsafeProjectConfigFields(projectRaw)) {
+      allWarnings.push(`[project config] ${warning}`);
     }
     mergedRaw = deepMergeRawConfig(mergedRaw, projectRaw);
+    for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, userLoaded?.config)) {
+      allWarnings.push(`[project config] ${warning}`);
+    }
   }
   const config2 = parsePluginConfig(mergedRaw);
   if (config2.configWarnings?.length) {
@@ -162682,6 +162928,7 @@ function loadPluginConfig(directory) {
 var CONFIG_FILE_BASENAME = "magic-context";
 var init_config = __esm(() => {
   init_jsonc_parser();
+  init_project_security();
   init_magic_context();
   init_variable();
 });
@@ -164337,6 +164584,14 @@ async function runDoctor(options = {}) {
         log.success("Removed deprecated compaction_markers (always-on since v0.21.4)");
         fixed++;
       }
+      for (const deadKey of ["auto_drop_tool_age", "drop_tool_structure"]) {
+        if (deadKey in mcConfig) {
+          delete mcConfig[deadKey];
+          mcChanged = true;
+          log.success(`Removed deprecated ${deadKey} (replaced by tiered emergency drop)`);
+          fixed++;
+        }
+      }
       const agentEnabledMigration = migrateLegacyAgentEnabledConfigForDoctor(mcConfig, log);
       if (agentEnabledMigration.changed) {
         mcChanged = true;
@@ -164775,7 +165030,8 @@ function loadConfigFile2(path5, scope) {
     const rawText = readFileSync15(path5, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
-      configPath: path5
+      configPath: path5,
+      isProjectConfig: scope === "project"
     });
     return {
       path: path5,
@@ -164817,14 +165073,14 @@ function redactConfigValue2(value) {
   }
   return typeof value;
 }
-function isPlainObject2(value) {
+function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function mergeRawConfigs(base, override) {
   const merged = { ...base };
   for (const [key, overrideValue] of Object.entries(override)) {
     const baseValue = merged[key];
-    merged[key] = isPlainObject2(baseValue) && isPlainObject2(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+    merged[key] = isPlainObject4(baseValue) && isPlainObject4(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
   }
   return merged;
 }
@@ -164838,10 +165094,15 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
   }
   const defaults = MagicContextConfigSchema.parse({});
   const errorPaths = new Set;
+  const issuePathsByKey = new Map;
   for (const issue2 of parsed.error.issues) {
     const topKey = issue2.path[0];
     if (topKey !== undefined) {
-      errorPaths.add(String(topKey));
+      const key = String(topKey);
+      errorPaths.add(key);
+      const paths = issuePathsByKey.get(key) ?? [];
+      paths.push([...issue2.path]);
+      issuePathsByKey.set(key, paths);
     }
   }
   const patched = { ...migrated };
@@ -164849,11 +165110,32 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
   for (const key of errorPaths) {
     recoveredTopLevelKeys.push(key);
     const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
-    delete patched[key];
     if (isAgentConfig) {
+      delete patched[key];
       warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
       continue;
     }
+    const issuePaths = issuePathsByKey.get(key) ?? [];
+    const rawValue = migrated[key];
+    const allNested = issuePaths.length > 0 && issuePaths.every((p2) => p2.length >= 2) && typeof rawValue === "object" && rawValue !== null && !Array.isArray(rawValue);
+    if (allNested) {
+      let prunedBlock = {
+        ...rawValue
+      };
+      const prunedLeaves = [];
+      for (const p2 of issuePaths) {
+        const relative = p2.slice(1);
+        const result = pruneNestedConfigLeaf(prunedBlock, relative);
+        if (result) {
+          prunedBlock = result.block;
+          prunedLeaves.push(result.removed);
+        }
+      }
+      patched[key] = prunedBlock;
+      warnings.push(`"${key}": invalid nested field(s) ${prunedLeaves.map((l) => `"${l}"`).join(", ")}, using defaults for those.`);
+      continue;
+    }
+    delete patched[key];
     const defaultValue = defaults[key];
     warnings.push(`"${key}": invalid value (${redactConfigValue2(rawConfig[key])}), using default ${JSON.stringify(defaultValue)}.`);
   }
@@ -164886,10 +165168,22 @@ function loadPiConfig(opts = {}) {
       return 0;
     return a.scope === "user" ? -1 : 1;
   });
+  const userRaw = mergeFiles.find((f) => f.scope === "user")?.config;
   for (const loaded of mergeFiles) {
     const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
     warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
-    rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    if (loaded.scope === "project") {
+      const projectRaw = { ...loaded.config };
+      for (const warning of stripUnsafeProjectConfigFields(projectRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+      rawConfig = mergeRawConfigs(rawConfig, projectRaw);
+      for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, userRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+    } else {
+      rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    }
   }
   const parsed = parsePiConfig(rawConfig);
   warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
@@ -164901,6 +165195,7 @@ function loadPiConfig(opts = {}) {
 }
 var import_comment_json10, CONFIG_FILE_NAME = "magic-context";
 var init_config2 = __esm(() => {
+  init_project_security();
   init_magic_context();
   init_variable();
   import_comment_json10 = __toESM(require_src2(), 1);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/magic-context",
-	"version": "0.22.4",
+	"version": "0.23.0",
 	"description": "Unified CLI for Magic Context — setup, doctor, and migration across OpenCode and Pi",
 	"keywords": [
 		"opencode",