@cortexkit/magic-context 0.49.27 → 0.49.29

package/dist/index.js

@@ -2577,6 +2577,23 @@ function migrateLegacyAgentEnabledInMemory(rawConfig, warnings) {
 }
 var init_agent_disable = () => {};
 
+// ../plugin/src/config/commit-retention-recovery.ts
+function applyCommitRetentionRecovery(config, recoveredFieldPaths, warnings) {
+  if (!recoveredFieldPaths.some((path) => RETENTION_FIELD === path || RETENTION_FIELD.startsWith(`${path}.`)))
+    return;
+  pausedRetention.add(config.memory.git_commit_indexing);
+  const message = `${RETENTION_FIELD}: retention eviction is paused until the invalid value is fixed.`;
+  const index = warnings.findIndex((warning) => warning.includes(RETENTION_FIELD));
+  if (index >= 0)
+    warnings[index] = `${warnings[index]} ${message}`;
+  else
+    warnings.push(message);
+}
+var pausedRetention, RETENTION_FIELD = "memory.git_commit_indexing.max_commits";
+var init_commit_retention_recovery = __esm(() => {
+  pausedRetention = new WeakSet;
+});
+
 // ../plugin/src/config/deprecated-config.ts
 function warnDeprecatedMuralModel(config, warnings) {
   const mural = config.mural;
@@ -11326,7 +11343,11 @@ function restoreTrustedValuesOverInvalidProjectValues(args) {
     if (!changed)
       break;
   }
-  return { warnings, restoredTopLevelKeys: [...restoredTopLevelKeys] };
+  return {
+    warnings,
+    restoredTopLevelKeys: [...restoredTopLevelKeys],
+    restoredFieldPaths: [...restored]
+  };
 }
 function wellFormedCommand(value) {
   if (!isPlainObject2(value))
@@ -12130,7 +12151,7 @@ function warnProtectedTagsDeprecationOnce() {
     log("[magic-context] protected_tags is deprecated and ignored; use protected_tokens instead.");
   }
 }
-function parsePluginConfig(rawConfig, recoveredTopLevelKeys = []) {
+function parsePluginConfig(rawConfig, recoveredTopLevelKeys = [], recoveredFieldPaths = []) {
   const preMigrationWarnings = [];
   const configWithoutRemovedAgent = stripRemovedAgentConfig(rawConfig, preMigrationWarnings);
   if (Object.hasOwn(rawConfig, "clear_reasoning_age")) {
@@ -12212,11 +12233,13 @@ function parsePluginConfig(rawConfig, recoveredTopLevelKeys = []) {
       }
       if (prunedLeaves.length === issuePaths.length) {
         patched[key] = prunedBlock;
+        recoveredFieldPaths.push(...prunedLeaves.map((leaf) => `${key}.${leaf}`));
         const reason = customMessagesByKey.get(key);
         warnings.push(`"${key}": invalid nested field(s) ${prunedLeaves.map((leaf) => `"${key}.${leaf}"`).join(", ")}, using defaults for those.${reason ? ` ${reason}` : ""}`);
         continue;
       }
     }
+    recoveredFieldPaths.push(key);
     if (isAgentConfig) {
       delete patched[key];
       warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
@@ -12243,6 +12266,7 @@ function parsePluginConfig(rawConfig, recoveredTopLevelKeys = []) {
     };
   }
   warnings.push("Config recovery failed, using all defaults.");
+  recoveredFieldPaths.push("embedding", "memory", "subc", "shadow_embedding", "allow_home_project");
   return {
     ...defaults,
     disabled_hooks: disabledHooks,
@@ -12354,6 +12378,7 @@ function loadPluginConfigDetailed(directory, applyRuntimeGlobals = true) {
   let mergedRaw = trustedProfiledRaw;
   const trustedBaseConfig = parsePluginConfig(trustedProfiledRaw);
   let projectRestoredTopLevelKeys = [];
+  let projectRestoredFieldPaths = [];
   if (projectLoaded) {
     mergedRaw = deepMergeRawConfig(mergedRaw, profileResolution.projectBase);
     for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, profileResolution.userBase)) {
@@ -12376,6 +12401,7 @@ function loadPluginConfigDetailed(directory, applyRuntimeGlobals = true) {
       allWarnings.push(`[project config] ${warning}`);
     }
     projectRestoredTopLevelKeys = restoredOverProject.restoredTopLevelKeys;
+    projectRestoredFieldPaths = restoredOverProject.restoredFieldPaths;
     for (const warning of constrainProjectCommands({
       mergedRaw,
       trustedRaw: trustedProfiledRaw,
@@ -12386,8 +12412,10 @@ function loadPluginConfigDetailed(directory, applyRuntimeGlobals = true) {
     }
   }
   const recoveredTopLevelKeys = [];
+  const recoveredFieldPaths = [];
   const cacheTtlConfigured = Object.hasOwn(mergedRaw, "cache_ttl");
-  const config = parsePluginConfig(mergedRaw, recoveredTopLevelKeys);
+  const config = parsePluginConfig(mergedRaw, recoveredTopLevelKeys, recoveredFieldPaths);
+  recoveredFieldPaths.push(...projectRestoredFieldPaths);
   for (const key of projectRestoredTopLevelKeys) {
     if (!recoveredTopLevelKeys.includes(key))
       recoveredTopLevelKeys.push(key);
@@ -12401,7 +12429,11 @@ function loadPluginConfigDetailed(directory, applyRuntimeGlobals = true) {
   if (applyRuntimeGlobals) {
     setOutputReserveConfig(config.output_reserve);
   }
-  const leafValidationWarnings = [...config.configWarnings ?? []];
+  const recoveryWarnings = config.configWarnings ?? [];
+  applyCommitRetentionRecovery(config, recoveredFieldPaths, recoveryWarnings);
+  if (recoveryWarnings.length > 0)
+    config.configWarnings = recoveryWarnings;
+  const leafValidationWarnings = [...recoveryWarnings];
   if (config.configWarnings?.length) {
     allWarnings.push(...config.configWarnings.map((w) => {
       if (userLoaded && projectLoaded)
@@ -12453,6 +12485,7 @@ function loadPluginConfigDetailed(directory, applyRuntimeGlobals = true) {
     sources,
     substitutionFailures,
     recoveredTopLevelKeys,
+    recoveredFieldPaths,
     configParseFailures,
     warningDetails,
     cacheTtlConfigured
@@ -12466,6 +12499,7 @@ var init_config = __esm(() => {
   init_logger();
   init_models_dev_cache();
   init_agent_disable();
+  init_commit_retention_recovery();
   init_migrate_config_location();
   init_migrate_dreamer_v2();
   init_profiles();
@@ -34676,8 +34710,8 @@ function isHostUnservedRow(value) {
 var HOST_UNSERVED_ROW = "hostUnservedRow";
 
 // ../plugin/src/hooks/magic-context/read-session-db.ts
-function openCodeDbExists() {
-  return harnessOwnsOpenCodeStore() && openCodeDbPathExists(resolveOpenCodeDbPath());
+function openCodeDbExists(generation = "v1") {
+  return harnessOwnsOpenCodeStore() && openCodeDbPathExists(resolveOpenCodeDbPath(generation));
 }
 function closeCachedReadOnlyDb(generation) {
   const cached = cachedReadOnlyDbs[generation];
@@ -34696,7 +34730,7 @@ function getReadOnlySessionDb(generation = "v1") {
   if (!harnessOwnsOpenCodeStore()) {
     throw new Error("OpenCode session database is not readable from a Pi-compatible process; its history lives in Pi sessions");
   }
-  const resolution = resolveOpenCodeDbPath();
+  const resolution = resolveOpenCodeDbPath(generation);
   const dbPath = resolution.path;
   if (!openCodeDbPathExists(resolution)) {
     throw new Error(`OpenCode session database is unavailable at ${dbPath} (source=${resolution.source})`);
@@ -34717,8 +34751,8 @@ function getReadOnlySessionDb(generation = "v1") {
   clearOpenCodeDbReadFailure();
   return db;
 }
-function withReadOnlySessionDb(fn) {
-  return fn(getReadOnlySessionDb());
+function withReadOnlySessionDb(fn, generation = "v1") {
+  return fn(getReadOnlySessionDb(generation));
 }
 function getRawSessionMessageCountFromDb(db, sessionId) {
   const row = db.prepare(`SELECT COUNT(*) as count FROM message WHERE session_id = ?
@@ -36089,6 +36123,10 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     const meta = { ordinal: msg.ordinal, messageId: msg.id };
     if (isHostUnservedRow(msg))
       markHostUnservedRow(meta);
+    if (msg.role === "system") {
+      recordFilteredNoise(meta);
+      continue;
+    }
     if (msg.role === "user" && !hasMeaningfulChunkUserText(msg.parts)) {
       const tcSummaries = msg.parts.flatMap((part) => {
         if (expandedResults.has(part))
@@ -47525,7 +47563,7 @@ function mergeRawConfigs(base, override) {
   }
   return merged;
 }
-function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
+function parsePiConfig(rawConfig, recoveredTopLevelKeys = [], recoveredFieldPaths = []) {
   const preMigrationWarnings = [];
   if (Object.hasOwn(rawConfig, "clear_reasoning_age")) {
     preMigrationWarnings.push("clear_reasoning_age is deprecated and ignored. Magic Context now keeps reasoning up to a token budget, keep_reasoning_tokens (default 10,000). Remove the key, or set keep_reasoning_tokens to a token count.");
@@ -47590,10 +47628,12 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
       }
       if (prunedLeaves.length === issuePaths.length) {
         patched[key] = prunedBlock;
+        recoveredFieldPaths.push(...prunedLeaves.map((leaf) => `${key}.${leaf}`));
         warnings.push(`"${key}": invalid nested field(s) ${prunedLeaves.map((leaf) => `"${key}.${leaf}"`).join(", ")}, using defaults for those.`);
         continue;
       }
     }
+    recoveredFieldPaths.push(key);
     if (isAgentConfig) {
       delete patched[key];
       warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
@@ -47613,6 +47653,7 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
     return { config: retryParsed.data, warnings };
   }
   warnings.push("Config recovery failed, using all defaults.");
+  recoveredFieldPaths.push("embedding", "memory", "subc", "shadow_embedding", "allow_home_project");
   return { config: defaults, warnings };
 }
 function collectPiSchemaIssuePaths(rawConfig) {
@@ -47743,6 +47784,7 @@ function loadPiConfigDetailed(opts = {}, applyRuntimeGlobals = true) {
   let rawConfig = trustedProfiledRaw;
   const trustedBaseConfig = parsePiConfig(trustedProfiledRaw).config;
   let projectRestoredTopLevelKeys = [];
+  let projectRestoredFieldPaths = [];
   if (projectLayer) {
     rawConfig = mergeRawConfigs(rawConfig, profileResolution.projectBase);
     for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, profileResolution.userBase)) {
@@ -47765,11 +47807,14 @@ function loadPiConfigDetailed(opts = {}, applyRuntimeGlobals = true) {
       warnings.push(`[project config] ${warning}`);
     }
     projectRestoredTopLevelKeys = restoredOverProject.restoredTopLevelKeys;
+    projectRestoredFieldPaths = restoredOverProject.restoredFieldPaths;
   }
   const hasDeprecatedProtectedTags = Object.hasOwn(userRaw, "protected_tags") || Object.hasOwn(projectRaw, "protected_tags") || Object.hasOwn(rawConfig, "protected_tags");
   const recoveredTopLevelKeys = [];
+  const recoveredFieldPaths = [];
   const cacheTtlConfigured = Object.hasOwn(rawConfig, "cache_ttl");
-  const parsed = parsePiConfig(rawConfig, recoveredTopLevelKeys);
+  const parsed = parsePiConfig(rawConfig, recoveredTopLevelKeys, recoveredFieldPaths);
+  recoveredFieldPaths.push(...projectRestoredFieldPaths);
   Object.defineProperty(parsed.config, "cacheTtlConfigured", {
     value: cacheTtlConfigured
   });
@@ -47786,6 +47831,7 @@ function loadPiConfigDetailed(opts = {}, applyRuntimeGlobals = true) {
   if (applyRuntimeGlobals) {
     setOutputReserveConfig(parsed.config.output_reserve);
   }
+  applyCommitRetentionRecovery(parsed.config, recoveredFieldPaths, parsed.warnings);
   warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
   const substitutionFailures = loadedFiles.flatMap(bindSubstitutionFailures2);
   const userLoaded = loadedFiles.find((loaded) => loaded.scope === "user");
@@ -47815,6 +47861,7 @@ function loadPiConfigDetailed(opts = {}, applyRuntimeGlobals = true) {
     sources,
     substitutionFailures,
     recoveredTopLevelKeys,
+    recoveredFieldPaths,
     configParseFailures,
     warningDetails,
     cacheTtlConfigured,
@@ -47824,6 +47871,7 @@ function loadPiConfigDetailed(opts = {}, applyRuntimeGlobals = true) {
 var init_config2 = __esm(() => {
   init_migrate_config_location();
   init_agent_disable();
+  init_commit_retention_recovery();
   init_migrate_dreamer_v2();
   init_profiles();
   init_project_security();

package/package.json

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