@cortexkit/pi-magic-context 0.21.6 → 0.21.7

package/dist/subagent-entry.js

@@ -8909,6 +8909,22 @@ var MIGRATIONS = [
         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);
+            `);
+    }
   }
 ];
 function ensureMigrationsTable(db) {
@@ -141956,6 +141972,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,
@@ -142384,6 +142409,56 @@ import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:f
 import { homedir as homedir3 } from "node:os";
 import { join as join6 } from "node:path";
 
+// ../plugin/src/config/agent-disable.ts
+function isDreamerRunnable(config) {
+  return !!config.dreamer && config.dreamer.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;
+}
+
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -156723,7 +156798,6 @@ var DEFAULT_DREAMER_TASKS = [
 ];
 var PiThinkingLevelSchema = exports_external.enum(["off", "minimal", "low", "medium", "high", "xhigh"]).optional();
 var 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),
@@ -156741,7 +156815,6 @@ var DreamerConfigSchema = AgentOverrideConfigSchema.merge(exports_external.objec
   thinking_level: PiThinkingLevelSchema
 }));
 var 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
@@ -157131,9 +157204,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;
@@ -157143,8 +157218,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";
@@ -163148,7 +163223,7 @@ function convertEntriesToRawMessages(entries) {
       if (pendingToolParts.length > 0) {
         result.push({
           ordinal: nextOrdinal++,
-          id: pendingFirstRealId,
+          id: `synth-user-${pendingFirstRealId}`,
           role: "user",
           parts: pendingToolParts
         });
@@ -163173,7 +163248,7 @@ function convertEntriesToRawMessages(entries) {
   if (pendingToolParts.length > 0) {
     result.push({
       ordinal: nextOrdinal,
-      id: pendingFirstRealId,
+      id: `synth-user-${pendingFirstRealId}`,
       role: "user",
       parts: pendingToolParts
     });
@@ -163325,6 +163400,99 @@ function createCtxExpandTool(_deps) {
     }
   };
 }
+// ../plugin/src/features/magic-context/compartment-lease.ts
+var COMPARTMENT_LEASE_TTL_MS = 5 * 60 * 1000;
+var COMPARTMENT_LEASE_RENEWAL_MS = 60 * 1000;
+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;
+}
+
+// ../plugin/src/features/magic-context/compression-depth-storage.ts
+var incrementDepthStatements = new WeakMap;
+var totalDepthStatements = new WeakMap;
+var maxDepthStatements = new WeakMap;
+var clearDepthStatements = new WeakMap;
+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);
+}
 
 // ../plugin/src/features/magic-context/compartment-storage.ts
 var insertCompartmentStatements = new WeakMap;
@@ -163435,6 +163603,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) {
@@ -163502,12 +163702,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);
@@ -163515,8 +163740,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 {
@@ -164376,64 +164609,6 @@ function createCtxMemoryTool(deps) {
     }
   };
 }
-// ../plugin/src/features/magic-context/compression-depth-storage.ts
-var incrementDepthStatements = new WeakMap;
-var totalDepthStatements = new WeakMap;
-var maxDepthStatements = new WeakMap;
-var clearDepthStatements = new WeakMap;
-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);
-}
 // ../plugin/src/features/magic-context/message-index.ts
 var lastIndexedStatements = new WeakMap;
 var insertMessageStatements = new WeakMap;
@@ -165077,6 +165252,7 @@ function getPendingPiCompactionMarkerState(db, sessionId) {
       return parsed;
     }
   } catch {}
+  db.prepare("UPDATE session_meta SET pending_pi_compaction_marker_state = NULL WHERE session_id = ? AND pending_pi_compaction_marker_state = ?").run(sessionId, raw);
   return null;
 }
 function setPendingPiCompactionMarkerState(db, sessionId, state) {
@@ -167367,8 +167543,7 @@ function magicContextSubagentExtension(pi) {
     try {
       const db = openDatabase();
       if (!db) {
-        log("[pi-subagent] storage open failed; tools will not register");
-        return;
+        throw new Error("storage open failed; refusing to start without Magic Context tools");
       }
       openedDb = db;
       const directory = process.cwd();
@@ -167382,7 +167557,10 @@ function magicContextSubagentExtension(pi) {
       });
       log(`[pi-subagent] registered tools: ctx_search, ctx_memory, ctx_note, ctx_expand` + ` (memory=${cfg.memory.enabled}, embedding=${cfg.embedding.provider !== "off"},` + ` git_commits=${cfg.experimental.git_commit_indexing.enabled}, dreamer_actions=${dreamerActionsEnabled})`);
     } catch (err5) {
-      log(`[pi-subagent] startup failed: ${err5 instanceof Error ? err5.message : String(err5)}`);
+      const message = err5 instanceof Error ? err5.message : String(err5);
+      log(`[pi-subagent] startup failed: ${message}`);
+      process.exitCode = 1;
+      throw err5;
     }
   });
   pi.on("session_shutdown", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/pi-magic-context",
-	"version": "0.21.6",
+	"version": "0.21.7",
 	"type": "module",
 	"description": "Pi coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",