@cortexkit/magic-context 0.21.6 → 0.21.8

package/dist/index.js

@@ -10987,25 +10987,28 @@ function writeMagicContextConfig(configPath, options) {
     historian.model = options.historianModel;
     config.historian = historian;
   }
+  const dreamer = config.dreamer ?? {};
+  delete dreamer.enabled;
   if (options.dreamerEnabled) {
-    const dreamer = config.dreamer ?? {};
-    dreamer.enabled = true;
+    delete dreamer.disable;
     if (options.dreamerModel) {
       dreamer.model = options.dreamerModel;
     }
-    config.dreamer = dreamer;
   } else {
-    const dreamer = config.dreamer ?? {};
-    dreamer.enabled = false;
-    config.dreamer = dreamer;
+    dreamer.disable = true;
   }
+  config.dreamer = dreamer;
+  const sidekick = config.sidekick ?? {};
+  delete sidekick.enabled;
   if (options.sidekickEnabled) {
-    const sidekick = config.sidekick ?? {};
-    sidekick.enabled = true;
+    delete sidekick.disable;
     if (options.sidekickModel) {
       sidekick.model = options.sidekickModel;
     }
     config.sidekick = sidekick;
+  } else {
+    sidekick.disable = true;
+    config.sidekick = sidekick;
   }
   if (options.claudeMax) {
     const cacheTtl = config.cache_ttl ?? {};
@@ -11311,23 +11314,20 @@ function writeMagicContextConfig2(configPath, options) {
     model: options.historianModel,
     thinking_level: options.historianThinkingLevel
   });
-  config.dreamer = {
+  const dreamer = {
     ...config.dreamer ?? {},
-    enabled: options.dreamerEnabled,
-    model: options.dreamerModel
+    model: options.dreamerModel,
+    disable: options.dreamerEnabled ? undefined : true,
+    enabled: undefined
   };
-  if (options.sidekickEnabled) {
-    config.sidekick = compactObject({
-      ...config.sidekick ?? {},
-      enabled: true,
-      model: options.sidekickModel
-    });
-  } else {
-    config.sidekick = {
-      ...config.sidekick ?? {},
-      enabled: false
-    };
-  }
+  config.dreamer = compactObject(dreamer);
+  const sidekick = {
+    ...config.sidekick ?? {},
+    model: options.sidekickEnabled ? options.sidekickModel : undefined,
+    disable: options.sidekickEnabled ? undefined : true,
+    enabled: undefined
+  };
+  config.sidekick = compactObject(sidekick);
   config.embedding = options.embedding;
   writeFileSync5(configPath, `${import_comment_json5.stringify(config, null, 2)}
 `);
@@ -12532,6 +12532,53 @@ var init_migrate = __esm(async () => {
   await init_sqlite();
 });
 
+// ../plugin/src/config/agent-disable.ts
+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;
+}
+
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/core/core.js
 function $constructor(name, initializer, params) {
   function init(inst, def) {
@@ -27211,7 +27258,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),
@@ -27229,7 +27275,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
@@ -27579,7 +27624,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;
@@ -28768,6 +28814,43 @@ import { existsSync as existsSync17, readFileSync as readFileSync13, rmSync, sta
 import { createRequire as createRequire4 } from "node:module";
 import { homedir as homedir13 } from "node:os";
 import { join as join16 } from "node:path";
+function migrateLegacyAgentEnabledConfigForDoctor(mcConfig, logs) {
+  let changed = false;
+  let fixes = 0;
+  const migrateLegacyAgentEnabled = (agentName) => {
+    const agent = mcConfig[agentName];
+    if (!agent || typeof agent !== "object" || !("enabled" in agent))
+      return;
+    const enabled = agent.enabled;
+    const disable = agent.disable;
+    delete agent.enabled;
+    changed = true;
+    fixes++;
+    if (agentName === "historian") {
+      logs.success("Removed invalid historian.enabled (historian uses disable=true to turn off).");
+      return;
+    }
+    if (agentName === "dreamer") {
+      if (disable !== true && enabled === false) {
+        agent.disable = true;
+        logs.warn("Migrated dreamer.enabled=false → dreamer.disable=true. This now also disables manual /ctx-dream. To keep manual dreaming, remove disable=true and set schedule to empty string.");
+      } else {
+        logs.success('Removed deprecated dreamer.enabled (use dreamer.disable=true to turn off the Dreamer agent; use schedule="" for manual-only dreaming).');
+      }
+      return;
+    }
+    if (disable !== true && enabled === false) {
+      agent.disable = true;
+      logs.success("Migrated sidekick.enabled=false → sidekick.disable=true.");
+    } else {
+      logs.success("Removed deprecated sidekick.enabled (use sidekick.disable=true to turn off Sidekick).");
+    }
+  };
+  migrateLegacyAgentEnabled("dreamer");
+  migrateLegacyAgentEnabled("sidekick");
+  migrateLegacyAgentEnabled("historian");
+  return { changed, fixes };
+}
 async function fetchNpmLatest(pkg, timeoutMs = 5000) {
   try {
     const controller = new AbortController;
@@ -29158,6 +29241,11 @@ async function runDoctor(options = {}) {
         log.success("Removed deprecated compaction_markers (always-on since v0.21.4)");
         fixed++;
       }
+      const agentEnabledMigration = migrateLegacyAgentEnabledConfigForDoctor(mcConfig, log);
+      if (agentEnabledMigration.changed) {
+        mcChanged = true;
+        fixed += agentEnabledMigration.fixes;
+      }
       if (experimental && "user_memories" in experimental) {
         const dreamer = mcConfig.dreamer ?? {};
         const oldUM = experimental.user_memories;
@@ -29355,11 +29443,11 @@ async function runDoctor(options = {}) {
       const mcRaw = readFileSync13(paths.magicContextConfig, "utf-8");
       const mcConfig = import_comment_json9.parse(mcRaw);
       const dreamerObj = mcConfig?.dreamer;
-      const dreamerEnabled = dreamerObj?.enabled === true;
+      const dreamerDisabled = dreamerObj?.disable === true;
       const userMemObj = dreamerObj?.user_memories;
       const userMemEnabled = userMemObj?.enabled !== false;
-      if (userMemEnabled && !dreamerEnabled) {
-        log.warn("dreamer.user_memories is enabled (default) but dreamer itself is disabled — user memory candidates will be collected but never promoted to stable memories. Enable `dreamer.enabled: true` or set `dreamer.user_memories.enabled: false` to silence this.");
+      if (userMemEnabled && dreamerDisabled) {
+        log.warn("dreamer.user_memories is enabled but dreamer.disable=true, so new promotions will not run. Remove dreamer.disable or set dreamer.user_memories.enabled=false.");
         issues++;
       }
       const pinKeyFilesObj = dreamerObj?.pin_key_files;
@@ -29534,11 +29622,11 @@ var init_doctor_opencode = __esm(async () => {
   PLUGIN_ENTRY_WITH_VERSION2 = `${PLUGIN_NAME6}@latest`;
 });
 
-// ../plugin/src/features/magic-context/compartment-storage.ts
-var insertCompartmentStatements, insertFactStatements;
-var init_compartment_storage = __esm(() => {
-  insertCompartmentStatements = new WeakMap;
-  insertFactStatements = new WeakMap;
+// ../plugin/src/features/magic-context/compartment-lease.ts
+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;
 });
 
 // ../plugin/src/features/magic-context/compression-depth-storage.ts
@@ -29549,6 +29637,15 @@ var init_compression_depth_storage = __esm(() => {
   maxDepthStatements = new WeakMap;
   clearDepthStatements = new WeakMap;
 });
+
+// ../plugin/src/features/magic-context/compartment-storage.ts
+var insertCompartmentStatements, insertFactStatements;
+var init_compartment_storage = __esm(() => {
+  init_compartment_lease();
+  init_compression_depth_storage();
+  insertCompartmentStatements = new WeakMap;
+  insertFactStatements = new WeakMap;
+});
 // ../plugin/src/shared/sqlite-helpers.ts
 function closeQuietly(db) {
   if (!db)
@@ -162611,6 +162708,65 @@ 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);
+            `);
+      }
+    },
+    {
+      version: 20,
+      description: "Add subagent invocation token accounting",
+      up: (db) => {
+        db.exec(`
+                CREATE TABLE IF NOT EXISTS subagent_invocations (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    session_id TEXT NOT NULL,
+                    harness TEXT NOT NULL,
+                    subagent TEXT NOT NULL,
+                    task TEXT,
+                    provider_id TEXT,
+                    model_id TEXT,
+                    started_at INTEGER NOT NULL,
+                    ended_at INTEGER,
+                    status TEXT NOT NULL,
+                    input_tokens INTEGER NOT NULL DEFAULT 0,
+                    output_tokens INTEGER NOT NULL DEFAULT 0,
+                    cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+                    cache_write_tokens INTEGER NOT NULL DEFAULT 0,
+                    error TEXT,
+                    parent_invocation_id INTEGER
+                );
+                CREATE INDEX IF NOT EXISTS idx_sai_session_started
+                    ON subagent_invocations(session_id, started_at DESC);
+                CREATE INDEX IF NOT EXISTS idx_sai_subagent
+                    ON subagent_invocations(subagent, started_at DESC);
+            `);
+      }
+    },
+    {
+      version: 21,
+      description: "Add session lifetime work metrics",
+      up: (db) => {
+        const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+        if (!cols.some((c2) => c2.name === "new_work_tokens")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN new_work_tokens INTEGER NOT NULL DEFAULT 0");
+        }
+        if (!cols.some((c2) => c2.name === "total_input_tokens")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN total_input_tokens INTEGER NOT NULL DEFAULT 0");
+        }
+      }
     }
   ];
 });
@@ -162983,6 +163139,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,
@@ -163179,12 +163344,37 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       -- is a valid JSON blob written via setPendingPiCompactionMarkerState.
       -- Excluded from healNullTextColumns.
       pending_pi_compaction_marker_state TEXT,
+      new_work_tokens INTEGER NOT NULL DEFAULT 0,
+      total_input_tokens INTEGER NOT NULL DEFAULT 0,
       -- deferred_execute_state: intentionally NULLABLE without a default.
       -- Absence is SQL NULL; presence is a JSON blob written via
       -- setDeferredExecutePendingIfAbsent. Excluded from healNullTextColumns.
       deferred_execute_state TEXT
     );
 
+    CREATE TABLE IF NOT EXISTS subagent_invocations (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      harness TEXT NOT NULL,
+      subagent TEXT NOT NULL,
+      task TEXT,
+      provider_id TEXT,
+      model_id TEXT,
+      started_at INTEGER NOT NULL,
+      ended_at INTEGER,
+      status TEXT NOT NULL,
+      input_tokens INTEGER NOT NULL DEFAULT 0,
+      output_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_write_tokens INTEGER NOT NULL DEFAULT 0,
+      error TEXT,
+      parent_invocation_id INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_sai_session_started
+      ON subagent_invocations(session_id, started_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_sai_subagent
+      ON subagent_invocations(subagent, started_at DESC);
+
     CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
     CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
     CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
@@ -163276,6 +163466,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
   ensureColumn(db, "session_meta", "pending_pi_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "new_work_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "total_input_tokens", "INTEGER NOT NULL DEFAULT 0");
   ensureColumn(db, "session_meta", "deferred_execute_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -163339,7 +163531,9 @@ function healNullIntegerColumns(db) {
     ["tool_call_tokens", 0],
     ["note_nudge_trigger_pending", 0],
     ["observed_safe_input_tokens", 0],
-    ["cache_alert_sent", 0]
+    ["cache_alert_sent", 0],
+    ["new_work_tokens", 0],
+    ["total_input_tokens", 0]
   ];
   for (const [column, fallback] of columns) {
     try {
@@ -163494,7 +163688,6 @@ 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 init_storage_tags = __esm(() => {
@@ -163607,9 +163800,11 @@ function mergeRawConfigs(base, override) {
   return merged;
 }
 function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
-  const parsed = MagicContextConfigSchema.safeParse(rawConfig);
+  const preMigrationWarnings = [];
+  const migrated = migrateLegacyAgentEnabledInMemory(rawConfig, preMigrationWarnings);
+  const parsed = MagicContextConfigSchema.safeParse(migrated);
   if (parsed.success) {
-    return { config: parsed.data, warnings: [] };
+    return { config: parsed.data, warnings: preMigrationWarnings };
   }
   const defaults = MagicContextConfigSchema.parse({});
   const errorPaths = new Set;
@@ -163619,8 +163814,8 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
       errorPaths.add(String(topKey));
     }
   }
-  const patched = { ...rawConfig };
-  const warnings = [];
+  const patched = { ...migrated };
+  const warnings = [...preMigrationWarnings];
   for (const key of errorPaths) {
     recoveredTopLevelKeys.push(key);
     const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";

package/package.json

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