@cortexkit/magic-context 0.21.4 → 0.21.5

package/dist/index.js

@@ -27378,6 +27378,21 @@ import { dirname as dirname7, isAbsolute, resolve as resolve2 } from "node:path"
 function substituteConfigVariables(input) {
   const warnings = [];
   let text2 = input.text;
+  if (input.isProjectConfig) {
+    const hasEnvTokens = ENV_PATTERN.test(text2);
+    const hasFileTokens = FILE_PATTERN.test(text2);
+    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: text2, warnings };
+  }
+  text2 = stripJsonComments(text2);
   text2 = text2.replace(ENV_PATTERN, (_, rawName) => {
     const varName = rawName.trim();
     const value = varName ? process.env[varName] : undefined;
@@ -27385,7 +27400,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(text2.matchAll(FILE_PATTERN));
   if (fileMatches.length === 0) {
@@ -27432,6 +27447,7 @@ function substituteConfigVariables(input) {
 }
 var ENV_PATTERN, FILE_PATTERN;
 var init_variable = __esm(() => {
+  init_jsonc_parser();
   ENV_PATTERN = /\{env:([^}]+)\}/g;
   FILE_PATTERN = /\{file:([^}]+)\}/g;
 });
@@ -27447,13 +27463,17 @@ function getUserConfigBasePath() {
 function getProjectConfigBasePath(directory) {
   return join11(directory, ".opencode", CONFIG_FILE_BASENAME);
 }
-function loadConfigFile(configPath) {
+function loadConfigFile(configPath, isProjectConfig = false) {
   try {
     if (!existsSync13(configPath)) {
       return null;
     }
     const rawText = readFileSync8(configPath, "utf-8");
-    const substituted = substituteConfigVariables({ text: rawText, configPath });
+    const substituted = substituteConfigVariables({
+      text: rawText,
+      configPath,
+      isProjectConfig
+    });
     return {
       config: parseJsonc3(substituted.text),
       warnings: substituted.warnings.map((w3) => `${configPath}: ${w3}`)
@@ -27617,7 +27637,7 @@ function loadPluginConfig(directory) {
   const dotOpenCodeDetected = detectConfigFile(getProjectConfigBasePath(directory));
   const projectDetected = rootDetected.format !== "none" ? rootDetected : dotOpenCodeDetected;
   const userLoaded = userDetected.format === "none" ? null : loadConfigFile(userDetected.path);
-  const projectLoaded = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path);
+  const projectLoaded = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path, true);
   const allWarnings = [];
   let mergedRaw = {};
   if (userLoaded) {
@@ -162015,8 +162035,10 @@ function deleteOrphanProjectKeyFiles(db, now = Date.now()) {
     if (existsSync18(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 (error51) {
       log2(`[key-files] orphan GC failed for ${row.projectPath}:`, error51);
@@ -162044,7 +162066,7 @@ function getCurrentVersion(db) {
   const row = db.prepare("SELECT MAX(version) as version FROM schema_migrations").get();
   return row?.version ?? 0;
 }
-function isSiblingMigrationConflict(error51, version2) {
+function isSiblingMigrationConflict(db, error51, version2) {
   if (!(error51 instanceof Error))
     return false;
   const code = error51.code;
@@ -162056,7 +162078,8 @@ function isSiblingMigrationConflict(error51, version2) {
     return false;
   if (!msg.toLowerCase().includes("version"))
     return false;
-  return true;
+  const confirmed = db.prepare("SELECT 1 FROM schema_migrations WHERE version = ?").get(version2);
+  return confirmed != null;
 }
 function runMigrations(db) {
   ensureMigrationsTable(db);
@@ -162077,7 +162100,7 @@ function runMigrations(db) {
       log2(`[migrations] applied v${migration.version}: ${migration.description}`);
       migrationIndex += 1;
     } catch (error51) {
-      if (isSiblingMigrationConflict(error51, migration.version)) {
+      if (isSiblingMigrationConflict(db, error51, migration.version)) {
         log2(`[migrations] v${migration.version} already applied by sibling instance — resuming with re-read version`);
         const reReadVersion = getCurrentVersion(db);
         if (reReadVersion <= currentVersion) {
@@ -162483,6 +162506,16 @@ var init_migrations = __esm(async () => {
                 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((c2) => c2.name === "pending_pi_compaction_marker_state")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN pending_pi_compaction_marker_state TEXT");
+        }
+      }
     }
   ];
 });
@@ -163046,6 +163079,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.
@@ -163142,6 +163180,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'");

package/package.json

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