@cortexkit/pi-magic-context 0.21.2 → 0.21.5

package/dist/subagent-entry.js

@@ -8489,8 +8489,10 @@ function deleteOrphanProjectKeyFiles(db, now = Date.now()) {
     if (existsSync2(row.projectPath))
       continue;
     try {
-      db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
-      db.prepare("DELETE FROM project_key_files_version WHERE project_path = ?").run(row.projectPath);
+      db.transaction(() => {
+        db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
+        db.prepare("DELETE FROM project_key_files_version WHERE project_path = ?").run(row.projectPath);
+      })();
       deletedProjects++;
     } catch (error) {
       log(`[key-files] orphan GC failed for ${row.projectPath}:`, error);
@@ -8897,6 +8899,16 @@ var MIGRATIONS = [
                 WHERE auto_search_hint_decisions IS NULL
             `);
     }
+  },
+  {
+    version: 18,
+    description: "Add pending_pi_compaction_marker_state column for Pi deferred marker drain",
+    up: (db) => {
+      const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+      if (!cols.some((c) => c.name === "pending_pi_compaction_marker_state")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN pending_pi_compaction_marker_state TEXT");
+      }
+    }
   }
 ];
 function ensureMigrationsTable(db) {
@@ -8912,7 +8924,7 @@ function getCurrentVersion(db) {
   const row = db.prepare("SELECT MAX(version) as version FROM schema_migrations").get();
   return row?.version ?? 0;
 }
-function isSiblingMigrationConflict(error, version) {
+function isSiblingMigrationConflict(db, error, version) {
   if (!(error instanceof Error))
     return false;
   const code = error.code;
@@ -8924,7 +8936,8 @@ function isSiblingMigrationConflict(error, version) {
     return false;
   if (!msg.toLowerCase().includes("version"))
     return false;
-  return true;
+  const confirmed = db.prepare("SELECT 1 FROM schema_migrations WHERE version = ?").get(version);
+  return confirmed != null;
 }
 function runMigrations(db) {
   ensureMigrationsTable(db);
@@ -8945,7 +8958,7 @@ function runMigrations(db) {
       log(`[migrations] applied v${migration.version}: ${migration.description}`);
       migrationIndex += 1;
     } catch (error) {
-      if (isSiblingMigrationConflict(error, migration.version)) {
+      if (isSiblingMigrationConflict(db, error, migration.version)) {
         log(`[migrations] v${migration.version} already applied by sibling instance — resuming with re-read version`);
         const reReadVersion = getCurrentVersion(db);
         if (reReadVersion <= currentVersion) {
@@ -142134,6 +142147,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       -- Excluded from healNullTextColumns. Readers filter IS NOT NULL AND
       -- != empty-string defensively. Plan v6 section 3.
       pending_compaction_marker_state TEXT,
+      -- pending_pi_compaction_marker_state: intentionally NULLABLE without a
+      -- default. Absence of a deferred Pi-native marker is SQL NULL; presence
+      -- is a valid JSON blob written via setPendingPiCompactionMarkerState.
+      -- Excluded from healNullTextColumns.
+      pending_pi_compaction_marker_state TEXT,
       -- deferred_execute_state: intentionally NULLABLE without a default.
       -- Absence is SQL NULL; presence is a JSON blob written via
       -- setDeferredExecutePendingIfAbsent. Excluded from healNullTextColumns.
@@ -142230,6 +142248,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
   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", "deferred_execute_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -156796,7 +156815,6 @@ var MagicContextConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(true),
     min_clusters: exports_external.number().min(1).default(3)
   }).default({ enabled: true, min_clusters: 3 }),
-  compaction_markers: exports_external.boolean().default(true),
   system_prompt_injection: exports_external.object({
     enabled: exports_external.boolean().default(true),
     skip_signatures: exports_external.array(exports_external.string()).default(["<!-- magic-context: skip -->"])
@@ -156868,11 +156886,124 @@ var MagicContextConfigSchema = exports_external.object({
 import { existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { dirname as dirname3, isAbsolute, resolve as resolve2 } from "node:path";
+
+// ../plugin/src/shared/jsonc-parser.ts
+function stripJsonComments(content) {
+  let result = "";
+  let inString = false;
+  let escaped = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let index = 0;index < content.length; index += 1) {
+    const char = content[index];
+    const next = content[index + 1];
+    if (inLineComment) {
+      if (char === `
+`) {
+        inLineComment = false;
+        result += char;
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (char === "*" && next === "/") {
+        inBlockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (inString) {
+      result += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      inLineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      inBlockComment = true;
+      index += 1;
+      continue;
+    }
+    result += char;
+  }
+  return result;
+}
+function stripTrailingCommas(content) {
+  let result = "";
+  let inString = false;
+  let escaped = false;
+  for (let index = 0;index < content.length; index += 1) {
+    const char = content[index];
+    if (inString) {
+      result += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+    if (char === ",") {
+      let lookahead = index + 1;
+      while (lookahead < content.length && /\s/.test(content[lookahead] ?? "")) {
+        lookahead += 1;
+      }
+      const next = content[lookahead];
+      if (next === "}" || next === "]") {
+        continue;
+      }
+    }
+    result += char;
+  }
+  return result;
+}
+function parseJsonc(content) {
+  const normalized = stripTrailingCommas(stripJsonComments(content));
+  return JSON.parse(normalized);
+}
+
+// ../plugin/src/config/variable.ts
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
 function substituteConfigVariables(input) {
   const warnings = [];
   let text = input.text;
+  if (input.isProjectConfig) {
+    const hasEnvTokens = ENV_PATTERN.test(text);
+    const hasFileTokens = FILE_PATTERN.test(text);
+    ENV_PATTERN.lastIndex = 0;
+    FILE_PATTERN.lastIndex = 0;
+    if (hasEnvTokens || hasFileTokens) {
+      const tokenTypes = [
+        hasEnvTokens ? "{env:}" : undefined,
+        hasFileTokens ? "{file:}" : undefined
+      ].filter(Boolean).join(" and ");
+      warnings.push(`Project-level config no longer supports ${tokenTypes} tokens for security reasons; leaving tokens literal. Move secret expansion to user-level config.`);
+    }
+    return { text, warnings };
+  }
+  text = stripJsonComments(text);
   text = text.replace(ENV_PATTERN, (_, rawName) => {
     const varName = rawName.trim();
     const value = varName ? process.env[varName] : undefined;
@@ -156880,7 +157011,7 @@ function substituteConfigVariables(input) {
       warnings.push(`Environment variable ${varName} is not set (referenced via {env:${varName}}); using empty string`);
       return "";
     }
-    return value;
+    return JSON.stringify(value).slice(1, -1);
   });
   const fileMatches = Array.from(text.matchAll(FILE_PATTERN));
   if (fileMatches.length === 0) {
@@ -163270,6 +163401,10 @@ function getLastCompartmentEndMessage(db, sessionId) {
   const row = db.prepare("SELECT MAX(end_message) as max_end FROM compartments WHERE session_id = ?").get(sessionId);
   return row?.max_end ?? -1;
 }
+function getCompartmentsByEndMessageId(db, sessionId, endMessageId) {
+  const rows = db.prepare("SELECT * FROM compartments WHERE session_id = ? AND end_message_id = ? ORDER BY sequence ASC").all(sessionId, endMessageId).filter(isCompartmentRow);
+  return rows.map(toCompartment);
+}
 function appendCompartments(db, sessionId, compartments) {
   if (compartments.length === 0)
     return;
@@ -163379,7 +163514,7 @@ function promoteRecompStaging(db, sessionId) {
     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 = '' 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 };
   })();
 }
@@ -164928,6 +165063,39 @@ function clearPendingCompactionMarkerStateIf(db, sessionId, expected) {
              WHERE session_id = ? AND pending_compaction_marker_state = ?`).run(sessionId, expectedBlob);
   return result.changes > 0;
 }
+function isPendingPiCompactionMarker(value) {
+  return typeof value === "object" && value !== null && typeof value.firstKeptEntryId === "string" && typeof value.endMessageId === "string" && typeof value.ordinal === "number" && typeof value.tokensBefore === "number" && typeof value.summary === "string" && typeof value.publishedAt === "number";
+}
+function getPendingPiCompactionMarkerState(db, sessionId) {
+  const row = db.prepare("SELECT pending_pi_compaction_marker_state FROM session_meta WHERE session_id = ?").get(sessionId);
+  const raw = row?.pending_pi_compaction_marker_state;
+  if (raw === null || raw === undefined || raw === "")
+    return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (isPendingPiCompactionMarker(parsed)) {
+      return parsed;
+    }
+  } catch {}
+  return null;
+}
+function setPendingPiCompactionMarkerState(db, sessionId, state) {
+  ensureSessionMetaRow(db, sessionId);
+  const blob = state ? stableStringify(state) : null;
+  db.prepare("UPDATE session_meta SET pending_pi_compaction_marker_state = ? WHERE session_id = ?").run(blob, sessionId);
+}
+function clearPendingPiCompactionMarkerStateIf(db, sessionId, expected) {
+  const expectedBlob = stableStringify(expected);
+  const result = db.prepare(`UPDATE session_meta SET pending_pi_compaction_marker_state = NULL
+             WHERE session_id = ? AND pending_pi_compaction_marker_state = ?`).run(sessionId, expectedBlob);
+  return result.changes > 0;
+}
+function getSessionsWithPendingPiMarker(db) {
+  const rows = db.prepare(`SELECT session_id FROM session_meta
+             WHERE pending_pi_compaction_marker_state IS NOT NULL
+               AND pending_pi_compaction_marker_state != ''`).all();
+  return rows.map((r) => r.session_id);
+}
 function peekDeferredExecutePending(db, sessionId) {
   const row = db.prepare("SELECT deferred_execute_state FROM session_meta WHERE session_id = ?").get(sessionId);
   const raw = row?.deferred_execute_state;
@@ -165048,6 +165216,12 @@ function getNoteById(db, noteId) {
   const row = db.prepare("SELECT * FROM notes WHERE id = ?").get(noteId);
   return isNoteRow(row) ? toNote(row) : null;
 }
+function noteBelongsToScope(note, scope) {
+  if (note.type === "session") {
+    return note.sessionId === scope.sessionId;
+  }
+  return note.projectPath === scope.projectPath;
+}
 function buildStatusClause(status) {
   if (status === undefined) {
     return null;
@@ -165109,9 +165283,9 @@ function getPendingSmartNotes(db, projectPath) {
 function getReadySmartNotes(db, projectPath) {
   return getSmartNotes(db, projectPath, "ready");
 }
-function updateNote(db, noteId, updates) {
+function updateNote(db, noteId, updates, scope) {
   const existing = getNoteById(db, noteId);
-  if (!existing) {
+  if (!existing || !noteBelongsToScope(existing, scope)) {
     return null;
   }
   const now = Date.now();
@@ -165158,7 +165332,11 @@ function updateNote(db, noteId, updates) {
   const result = db.prepare(`UPDATE notes SET ${sets.join(", ")} WHERE id = ? RETURNING *`).get(...params);
   return isNoteRow(result) ? toNote(result) : null;
 }
-function dismissNote(db, noteId) {
+function dismissNote(db, noteId, scope) {
+  const existing = getNoteById(db, noteId);
+  if (!existing || !noteBelongsToScope(existing, scope)) {
+    return false;
+  }
   const result = db.prepare("UPDATE notes SET status = 'dismissed', updated_at = ? WHERE id = ? AND status != 'dismissed'").run(Date.now(), noteId);
   return result.changes > 0;
 }
@@ -165578,8 +165756,15 @@ function createCtxNoteTool(deps) {
         if (typeof params.note_id !== "number") {
           return err3("Error: 'note_id' is required when action is 'dismiss'.");
         }
-        const dismissed = dismissNote(deps.db, params.note_id);
-        return ok3(dismissed ? `Note #${params.note_id} dismissed.` : `Note #${params.note_id} not found or already dismissed.`);
+        const projectIdentity = resolveProjectIdentity(ctx.cwd);
+        if (!projectIdentity) {
+          return err3("Error: Could not resolve project identity for note dismiss.");
+        }
+        const dismissed = dismissNote(deps.db, params.note_id, {
+          projectPath: projectIdentity,
+          sessionId
+        });
+        return dismissed ? ok3(`Note #${params.note_id} dismissed.`) : err3(`Error: Note #${params.note_id} not found in your session/project or already dismissed.`);
       }
       if (action2 === "update") {
         if (typeof params.note_id !== "number") {
@@ -165593,9 +165778,16 @@ function createCtxNoteTool(deps) {
         if (!updates.content && !updates.surfaceCondition) {
           return err3("Error: Provide 'content' and/or 'surface_condition' to update.");
         }
-        const updated = updateNote(deps.db, params.note_id, updates);
+        const projectIdentity = resolveProjectIdentity(ctx.cwd);
+        if (!projectIdentity) {
+          return err3("Error: Could not resolve project identity for note update.");
+        }
+        const updated = updateNote(deps.db, params.note_id, updates, {
+          projectPath: projectIdentity,
+          sessionId
+        });
         if (!updated) {
-          return err3(`Note #${params.note_id} not found.`);
+          return err3(`Error: Note #${params.note_id} not found in your session/project.`);
         }
         const parts = [];
         if (updates.content)

package/package.json

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