@cortexkit/opencode-magic-context 0.49.18 → 0.49.20

package/dist/{index-x4njr8df.js → index-48stjd56.js}

@@ -5,7 +5,7 @@ import {
   tagRevisionKey,
   tagIdentityRevisionKey,
   deleteTagIdentityRevisions
-} from "./index-bp5083x2.js";
+} from "./index-x9k3mqrf.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -15,37 +15,37 @@ import {
 import {
   isPidAlive,
   readProcessStartTime
-} from "./index-nj7yykkx.js";
+} from "./index-c7phnbvk.js";
 import {
   removeSystemReminders,
   removeNestedBlocks,
   hasMeaningfulUserText2,
   extractTexts2
-} from "./index-c5pytzne.js";
+} from "./index-b88dwwrh.js";
 import {
   Database2,
   getSqliteDatabasePath2,
   prepareCachedStatement2,
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2
-} from "./index-beht37jy.js";
+} from "./index-1zx2pa5d.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration
 } from "./index-58e3y90n.js";
 import {
   cleanUserText2
-} from "./index-rmwykbbb.js";
+} from "./index-x4k3f4mf.js";
 import {
   recordMessageFtsRowid2,
   recordIndexedMessageTime2,
   messageFtsOrdinalRangeIsMapped2,
   getMessageFtsRowidMapBackfillProgress2,
   deleteUnmappedMessageFtsRows2
-} from "./index-a6mc0v4d.js";
+} from "./index-jmycsey7.js";
 import {
-  deleteChunkEmbedBackoffForSession
-} from "./index-b5vqckbw.js";
+  deleteChunkEmbedBackoffForSession2
+} from "./index-153r2q6z.js";
 import {
   sameProjectDirectory
 } from "./index-knvkbfvh.js";
@@ -54,7 +54,7 @@ import {
 } from "./index-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./index-k29z4aqh.js";
+} from "./index-t5pck3ss.js";
 import {
   ensurePrivateStorageDirectorySync,
   writeStorageFileSync,
@@ -214,7 +214,14 @@ import { createHash as createHash4 } from "node:crypto";
 
 // src/hooks/magic-context/lkg-recovery-fence.ts
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
-import { lstatSync, readdirSync as readdirSync2, readFileSync as readFileSync2, rmdirSync, rmSync as rmSync2 } from "node:fs";
+import {
+  lstatSync,
+  opendirSync,
+  readdirSync as readdirSync2,
+  readFileSync as readFileSync2,
+  rmdirSync,
+  rmSync as rmSync2
+} from "node:fs";
 import { basename, dirname, join as join2 } from "node:path";
 
 // src/shared/storage-file-mutex.ts
@@ -357,6 +364,58 @@ var lkgServedArrayDigest = hash;
 function lkgRecoveryFencePath(sessionId) {
   return join2(getMagicContextStorageDir(), "lkg-recovery-fences", `${hash(sessionId)}.json`);
 }
+var lockSweepDirectory;
+function closeLkgLockSweepDirectory() {
+  lockSweepDirectory?.dir.closeSync();
+  lockSweepDirectory = undefined;
+}
+function takeLkgRecoveryLockSweepPage(maxEntries = 200) {
+  const path = join2(getMagicContextStorageDir(), "lkg-recovery-fences");
+  if (lockSweepDirectory?.path !== path)
+    closeLkgLockSweepDirectory();
+  const names = [];
+  try {
+    lockSweepDirectory ??= { path, dir: opendirSync(path) };
+    for (let i = 0;i < Math.min(200, Math.max(1, maxEntries)); i++) {
+      const entry = lockSweepDirectory.dir.readSync();
+      if (!entry) {
+        closeLkgLockSweepDirectory();
+        break;
+      }
+      if (entry.isDirectory() && /^[a-f0-9]{64}\.json\.locks$/.test(entry.name))
+        names.push(entry.name);
+    }
+  } catch {
+    closeLkgLockSweepDirectory();
+  }
+  return names;
+}
+function sweepEmptyLkgRecoveryLockDirectories(names, retainedSessionIds) {
+  if (!durableFencesSupported())
+    return 0;
+  const retainedHashes = new Set(Array.from(retainedSessionIds, hash));
+  const root = join2(getMagicContextStorageDir(), "lkg-recovery-fences");
+  let removed = 0;
+  for (const name of names.slice(0, 200)) {
+    if (!/^[a-f0-9]{64}\.json\.locks$/.test(name) || retainedHashes.has(name.slice(0, 64)))
+      continue;
+    const path = join2(root, name);
+    try {
+      try {
+        lstatSync(path.slice(0, -".locks".length));
+        continue;
+      } catch (error) {
+        if (error.code !== "ENOENT")
+          continue;
+      }
+      if (!lstatSync(path).isDirectory())
+        continue;
+      rmdirSync(path);
+      removed++;
+    } catch {}
+  }
+  return removed;
+}
 function metadata(slot) {
   return [
     slot.inputIdSeq,
@@ -934,6 +993,11 @@ class V2StoreReaderPool {
     this.idleWaiters.clear();
   }
 }
+function messageTimesQuery(count) {
+  return `SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS created,
+                   json_extract(data, '$.time.completed') AS completed
+            FROM session_message WHERE +session_id = ? AND id IN (${Array.from({ length: count }, () => "?").join(",")})`;
+}
 
 class V2StoreReader {
   path;
@@ -1157,9 +1221,7 @@ class V2StoreReader {
     const times = new Map;
     for (let offset = 0;offset < ids.length; offset += 500) {
       const batch = ids.slice(offset, offset + 500);
-      const rows = this.prepare(`SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS created,
-                        json_extract(data, '$.time.completed') AS completed
-                 FROM session_message WHERE session_id = ? AND id IN (${batch.map(() => "?").join(",")})`).all(sessionID, ...batch);
+      const rows = this.prepare(messageTimesQuery(batch.length)).all(sessionID, ...batch);
       for (const row of rows)
         times.set(row.id, {
           created: typeof row.created === "number" ? row.created : undefined,
@@ -1469,7 +1531,7 @@ function deleteSessionScopedRows(db, sessionIds, harness, options = {}) {
       fallback.run(tagTombstoneOwnerKey(id, getHarness2()), getHarness2(), ...tagTombstoneOwnerRange(id));
   }
   for (const sessionId of deletableSessionIds)
-    deleteChunkEmbedBackoffForSession(db, sessionId);
+    deleteChunkEmbedBackoffForSession2(db, sessionId);
   for (const definition of SESSION_SCOPED_TABLES) {
     if (definition.table === "message_history_fts") {
       cleanupStatement(db, `DELETE FROM message_history_fts
@@ -1520,7 +1582,7 @@ function deleteSessionScopedRowsSlice(db, sessionId, harness) {
   cleanupStatement(db, "INSERT OR IGNORE INTO schema_migrations_meta(key,value) VALUES (?,?)").run(tagTombstoneOwnerKey(sessionId, harness), harness);
   let remaining = SESSION_CLEANUP_SLICE_ROWS;
   const started = performance.now();
-  remaining -= deleteChunkEmbedBackoffForSession(db, sessionId, remaining);
+  remaining -= deleteChunkEmbedBackoffForSession2(db, sessionId, remaining);
   if (remaining <= 0)
     return { complete: false, deleted: 0 };
   for (const definition of SESSION_SCOPED_TABLES) {
@@ -2034,14 +2096,20 @@ function harnessSupportsOpenCodeOrphanSweep(harness) {
   return harness === "opencode" || harness === "opencode2";
 }
 function getMessageHistoryOrphanSweepState(db, harness) {
-  return db.prepare("SELECT cursor_session_id, last_swept_at FROM message_history_orphan_sweep WHERE harness = ?").get(harness) ?? {};
+  const state = db.prepare("SELECT cursor_session_id, last_swept_at FROM message_history_orphan_sweep WHERE harness = ?").get(harness) ?? {};
+  if (harness === "opencode2") {
+    if (!state.cursor_session_id?.startsWith("session_v2:"))
+      return {};
+    return { ...state, cursor_session_id: state.cursor_session_id.slice("session_v2:".length) };
+  }
+  return state;
 }
 function persistMessageHistoryOrphanSweepState(db, cursor, lastSweptAt, harness) {
   db.prepare(`INSERT INTO message_history_orphan_sweep (harness, cursor_session_id, last_swept_at)
           VALUES (?, ?, ?)
          ON CONFLICT(harness) DO UPDATE SET
              cursor_session_id = excluded.cursor_session_id,
-             last_swept_at = excluded.last_swept_at`).run(harness, cursor, lastSweptAt);
+             last_swept_at = excluded.last_swept_at`).run(harness, harness === "opencode2" ? `session_v2:${cursor}` : cursor, lastSweptAt);
 }
 function getOpenCodeSessionScopedCandidateSourceSql(harness) {
   const sources = SESSION_SCOPED_TABLES.filter((definition) => definition.harnessScoped === true).map((definition) => {
@@ -2089,13 +2157,14 @@ function* sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCo
   let v2Reader;
   try {
     let sessionExists;
+    let liveIds;
     if (harness === "opencode2") {
       try {
         const path = getSqliteDatabasePath2(openCodeDb);
         if (!path)
           throw new Error("OpenCode 2 source has no durable path");
         v2Reader = new V2StoreReader(path);
-        const liveIds = new Set(v2Reader.sessionIds());
+        liveIds = new Set(v2Reader.sessionIds());
         if (liveIds.size === 0)
           throw new Error("OpenCode 2 source has no sessions");
         sessionExists = (id) => liveIds.has(id);
@@ -2104,9 +2173,26 @@ function* sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCo
         return { status: "source_unavailable", scanned: 0, deleted: 0, cursor };
       }
     } else {
+      liveIds = new Set(openCodeDb.prepare("SELECT id FROM session").all().map((row) => row.id));
       const query = openCodeDb.prepare("SELECT 1 FROM session WHERE id = ? LIMIT 1");
       sessionExists = (id) => !!query.get(id);
     }
+    if (options.fenceLockNames?.length) {
+      const retainedIds = new Set(liveIds);
+      const sources = SESSION_SCOPED_TABLES.map((def) => `SELECT session_id FROM ${def.table}${def.extraPredicate ? ` WHERE ${def.extraPredicate}` : ""}`);
+      for (const row of db.prepare(sources.join(" UNION ")).all()) {
+        if (typeof row.session_id === "string")
+          retainedIds.add(row.session_id);
+      }
+      for (const row of db.prepare("SELECT key FROM schema_migrations_meta WHERE key >= ? AND key < ?").all(TAG_TOMBSTONE_OWNER_PREFIX, "tag_revision_owner;")) {
+        try {
+          const id = JSON.parse(row.key.slice(TAG_TOMBSTONE_OWNER_PREFIX.length, row.key.lastIndexOf(":")));
+          if (typeof id === "string")
+            retainedIds.add(id);
+        } catch {}
+      }
+      sweepEmptyLkgRecoveryLockDirectories(options.fenceLockNames, retainedIds);
+    }
     const cutoff = now - safetyAgeMs;
     const candidateSourceSql = getOpenCodeSessionScopedCandidateSourceSql(harness);
     const candidates = db.prepare(`SELECT session_id
@@ -2198,4 +2284,4 @@ async function sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource,
   }));
 }
 
-export { BoundedSessionMap, advanceSessionActivity, observeSessionActivity, backfillSessionActivity, clearCompressionDepth, clearCompressionDepthRange, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, cleanSearchText, keywordRelevance, matchedSearchSnippet, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, deleteSessionScopedRows, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexesCooperatively2 };
+export { BoundedSessionMap, advanceSessionActivity, observeSessionActivity, backfillSessionActivity, clearCompressionDepth, clearCompressionDepthRange, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, takeLkgRecoveryLockSweepPage, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, cleanSearchText, keywordRelevance, matchedSearchSnippet, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, deleteSessionScopedRows, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexesCooperatively2 };

package/dist/{index-24jbw52d.js → index-4n7w9rad.js}

@@ -1,6 +1,6 @@
 import {
   sessionLog2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   COMPARTMENT_LEASE_RENEWAL_MS,
   acquireCompartmentLease,
@@ -15,10 +15,10 @@ import {
   getActiveCompartmentRun,
   markActiveCompartmentRunPublished,
   registerActiveCompartmentRun
-} from "./index-s1ex9y6p.js";
+} from "./index-v7r4td4c.js";
 import {
   inRootAsyncContext2
-} from "./index-beht37jy.js";
+} from "./index-1zx2pa5d.js";
 import {
   getWrapupInProgressState,
   acquireWrapupInProgress,
@@ -27,17 +27,17 @@ import {
   getHistorianFailureState,
   clearEmergencyRecovery,
   prepareRawSessionOrdinals2
-} from "./index-rmwykbbb.js";
+} from "./index-x4k3f4mf.js";
 import {
   pushNotification2
 } from "./index-x8a7jmkh.js";
 import {
   sendStatusNotification2
-} from "./index-s74zqahq.js";
+} from "./index-kc9pn495.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-r4nkrs05.js";
+} from "./index-jfh3cktr.js";
 
 // src/hooks/magic-context/wrapup-orchestrator.ts
 import * as crypto from "node:crypto";

package/dist/{index-kee4kn5j.js → index-4pnsgvfk.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-sd3egckz.js";
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 
 // src/shared/conflict-detector.ts
 import { homedir as homedir2 } from "node:os";

package/dist/{v2/server-8cd2j99z.js → index-5kym00ag.js}

@@ -15,6 +15,9 @@ function resolveHarnessBlock(container, harness) {
   const selected = harness === "omp" ? container?.omp ?? container?.pi : container?.[harness];
   return asRecord(selected);
 }
+function sourceHarness(container, harness) {
+  return harness === "omp" && container?.omp == null ? "pi" : harness;
+}
 function normalizeModelEntry2(entry, harness) {
   if (typeof entry === "string") {
     const model = readString(entry);
@@ -61,13 +64,19 @@ function resolveHistorianModel2(config, harness) {
   const block = resolveHarnessBlock(historian, harness);
   if (!block)
     return { fallbacks: [] };
+  const source = `historian.${sourceHarness(historian, harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: block.model,
+    defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
+    harness
+  });
+  const fallbacks = resolveFallbackEntries2(block.fallback_models, harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: block.model,
-      defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
-      harness
-    }),
-    fallbacks: resolveFallbackEntries2(block.fallback_models, harness)
+    primary: primary ? { ...primary, sourceConfigKey: `${source}.model` } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: `${source}.fallback_models`
+    }))
   };
 }
 function resolveDreamerTaskModel2(args) {
@@ -86,15 +95,25 @@ function resolveDreamerTaskModel2(args) {
   const taskQualifier = taskBlock?.[args.harness === "opencode" ? "variant" : "thinking_level"];
   const harnessQualifier = harnessBlock[args.harness === "opencode" ? "variant" : "thinking_level"] ?? normalizeModelEntry2(harnessBlock.model, args.harness)?.qualifier;
   const taskHasModel = taskBlock !== undefined && hasOwn(taskBlock, "model");
+  const taskHasFallbacks = taskBlock !== undefined && hasOwn(taskBlock, "fallback_models");
   const primarySource = taskHasModel ? taskBlock?.model : harnessBlock.model;
-  const fallbackSource = taskBlock !== undefined && hasOwn(taskBlock, "fallback_models") ? taskBlock.fallback_models : harnessBlock.fallback_models;
+  const fallbackSource = taskHasFallbacks ? taskBlock?.fallback_models : harnessBlock.fallback_models;
+  const source = `dreamer.${sourceHarness(dreamer, args.harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: primarySource,
+    defaultQualifier: taskQualifier ?? harnessQualifier,
+    harness: args.harness
+  });
+  const fallbacks = resolveFallbackEntries2(fallbackSource, args.harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: primarySource,
-      defaultQualifier: taskQualifier ?? harnessQualifier,
-      harness: args.harness
-    }),
-    fallbacks: resolveFallbackEntries2(fallbackSource, args.harness),
+    primary: primary ? {
+      ...primary,
+      sourceConfigKey: taskHasModel ? `${source}.tasks.${args.task}.model` : `${source}.model`
+    } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: taskHasFallbacks ? `${source}.tasks.${args.task}.fallback_models` : `${source}.fallback_models`
+    })),
     schedule: readString(schedulingTask?.schedule),
     timeoutMinutes: typeof taskBlock?.timeout_minutes === "number" ? taskBlock.timeout_minutes : undefined,
     promotionThreshold: typeof schedulingTask?.promotion_threshold === "number" ? schedulingTask.promotion_threshold : undefined

package/dist/{index-4s3t0nd0.js → index-616rsjrv.js}

@@ -3,11 +3,11 @@ import {
 } from "./index-v0p37hm2.js";
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   inRootAsyncContext2,
   getSqliteDatabasePath2
-} from "./index-beht37jy.js";
+} from "./index-1zx2pa5d.js";
 
 // src/features/magic-context/compaction-marker-candidates.ts
 import { existsSync, realpathSync } from "node:fs";