@cortexkit/opencode-magic-context 0.49.7 → 0.49.8

package/dist/v2/{server-mv1w7t6z.js → server-q360kdb8.js}

@@ -9,7 +9,7 @@ import {
   sanitizeDiagnosticText,
   log2,
   sessionLog2
-} from "./server-t4k4qexw.js";
+} from "./server-9e5r8y60.js";
 import {
   parseJsoncRecovering,
   detectConfigFile,
@@ -17,34 +17,32 @@ import {
   cortexKitProjectConfigBasePath,
   resolveLegacyConfigSourcesForHarness,
   loadPluginConfigDetailed
-} from "./server-d6g4whc2.js";
+} from "./server-4qr18rfg.js";
 import {
   catalogOutputReserve,
   getSdkContextLimit,
   modelSupportsVision,
   getSdkOutputLimit
-} from "./server-vb7pbd9p.js";
+} from "./server-nveratm5.js";
 import {
   withContentLanguageDirective,
   buildPrimaryLanguageDirective,
   resolvePromptSurface,
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   LIVE_RELOAD_CONFIG_PATHS
-} from "./server-cw6521wn.js";
+} from "./server-7e087rvk.js";
 import {
   hasMeaningfulUserText2,
   estimateTokens,
   estimateFixedPromptTokens
-} from "./server-kzns2hbz.js";
+} from "./server-s6jqh8bj.js";
 import {
+  inRootAsyncContext2,
   Database2,
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2,
   beginSqliteWriterAsync2
-} from "./server-j8epsc0g.js";
-import {
-  sameProjectDirectory
-} from "./server-brhj8qtd.js";
+} from "./server-wafzvyhg.js";
 import {
   buildCanonicalChunkTextFromFts,
   buildCompartmentSummaryFallbackText,
@@ -54,10 +52,10 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./server-fpqe39as.js";
+} from "./server-9a6bwc12.js";
 import {
   isPidAlive
-} from "./server-1rfgbjfn.js";
+} from "./server-cxsr0ng6.js";
 import {
   BoundedSessionMap,
   clearCompressionDepth,
@@ -72,7 +70,7 @@ import {
   toMessageIndexSource2,
   clearIndexedMessagesInTransaction2,
   indexSourcesAfterOrdinal2
-} from "./server-7srtwsa4.js";
+} from "./server-j3dm74ey.js";
 import {
   detectOverflow,
   SESSION_META_SELECT_COLUMNS,
@@ -161,17 +159,17 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./server-gtv9wbhq.js";
+} from "./server-xj4mewze.js";
 import {
   getTableColumnNames
-} from "./server-6byqfbqf.js";
+} from "./server-shme41gj.js";
 import {
   FAIL_CLOSED_DOCTOR_COMMAND,
   getSchemaFenceRejection,
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./server-v4fwha43.js";
+} from "./server-08k4zkfk.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -189,11 +187,11 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./server-w3zeywp1.js";
+} from "./server-jjsf29aq.js";
 import {
   isStrictGapHealingMessage2,
   noteRawSessionSummaryRowWritten2
-} from "./server-dd0nja67.js";
+} from "./server-bx59ezg6.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -203,10 +201,10 @@ import {
 import {
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./server-wkdgjjch.js";
+} from "./server-zrwaj29a.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./server-7ekna9zs.js";
+} from "./server-adfte03x.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY,
@@ -222,11 +220,11 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./server-hcvcxzx7.js";
+} from "./server-4gz0xkrc.js";
 import {
   shouldSkipHomeProjectMemory,
   resolveProjectIdentity
-} from "./server-kdrezdy0.js";
+} from "./server-njnx39q2.js";
 import {
   drainBackgroundBatches,
   contentSha2562,
@@ -234,7 +232,7 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./server-fw31krgq.js";
+} from "./server-4easnf78.js";
 import {
   getSessionNotes,
   getReadySmartNotes,
@@ -243,13 +241,13 @@ import {
   userFacingFailureCode,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./server-jdwd03ep.js";
+} from "./server-yak3sxya.js";
 import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
   readMarkerCandidateBasis2,
   prepareMarkerCandidateBasis2
-} from "./server-x08d1xf3.js";
+} from "./server-npm52h2q.js";
 import {
   computeCueContentHash,
   getMuralCueState,
@@ -257,7 +255,7 @@ import {
   getMemoriesByProject2,
   getMemoriesByProjects2,
   getMaxMemoryIdForProjects2
-} from "./server-9yyqq3mm.js";
+} from "./server-n78avt2p.js";
 import {
   pushNotification2
 } from "./server-x8a7jmkh.js";
@@ -265,10 +263,13 @@ import {
   deriveTriggerBudget2,
   resolveHistorianProducerLimits2,
   producerSourceLocalBudget2
-} from "./server-t528t8qm.js";
+} from "./server-hn9fb3v0.js";
 import {
   sendStatusNotification2
-} from "./server-qcw43339.js";
+} from "./server-ak7w74j9.js";
+import {
+  sameProjectDirectory
+} from "./server-knvkbfvh.js";
 import {
   getErrorMessage,
   describeError
@@ -282,7 +283,7 @@ import {
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
-} from "./server-3t0q2cqx.js";
+} from "./server-7dv9wt9r.js";
 
 // src/config/live-snapshot.ts
 import { createHash } from "node:crypto";
@@ -1111,7 +1112,7 @@ var V2_MESSAGE_PAGE_SQL = `WITH bounds AS (
             SELECT seq FROM session_message
             WHERE session_id = ? AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS})
             ORDER BY seq ASC LIMIT 1 OFFSET ?
-        ), -1) END AS after_seq,
+        ), (SELECT MAX(seq) FROM session_message WHERE session_id = ?), -1) END AS after_seq,
         COALESCE((
             SELECT seq FROM session_message
             WHERE session_id = ? AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS})
@@ -1372,7 +1373,7 @@ class V2StoreReader {
         }
       }
       const maximumSeq = Number.MAX_SAFE_INTEGER;
-      const rows = this.prepare(V2_MESSAGE_PAGE_SQL).all(afterOrdinal, sessionID, ...RAW_MESSAGE_TYPES, Math.max(0, afterOrdinal - 1), sessionID, ...RAW_MESSAGE_TYPES, finalWatermark - 1, maximumSeq, sessionID, ...RAW_MESSAGE_TYPES, pageSize);
+      const rows = this.prepare(V2_MESSAGE_PAGE_SQL).all(afterOrdinal, sessionID, ...RAW_MESSAGE_TYPES, Math.max(0, afterOrdinal - 1), sessionID, sessionID, ...RAW_MESSAGE_TYPES, finalWatermark - 1, maximumSeq, sessionID, ...RAW_MESSAGE_TYPES, pageSize);
       return rows.map(decode);
     });
   }
@@ -12991,6 +12992,37 @@ function capturePrefixTrimSourceOrder(messages) {
     invalidReason
   });
 }
+function reanchorStoredBoundary(options, boundary) {
+  if (!options.messages)
+    return;
+  const source = options.prefixTrimSourceOrder ?? capturePrefixTrimSourceOrder(options.messages);
+  if (source.invalidReason)
+    return;
+  try {
+    if (compareRawSessionMessageOrder2(options.sessionId, boundary, boundary) !== 0)
+      return;
+    const messageIds = [...source.messageIds];
+    let previous;
+    let insertion = messageIds.length;
+    for (const [index, id] of messageIds.entries()) {
+      if (previous) {
+        const increasing = compareRawSessionMessageOrder2(options.sessionId, previous, id);
+        if (increasing === null || !Number.isFinite(increasing) || increasing >= 0)
+          return;
+      }
+      const order = compareRawSessionMessageOrder2(options.sessionId, boundary, id);
+      if (order === null || !Number.isFinite(order) || order === 0)
+        return;
+      if (order < 0 && insertion === messageIds.length)
+        insertion = index;
+      previous = id;
+    }
+    messageIds.splice(insertion, 0, boundary);
+    return { ...source, messageIds };
+  } catch {
+    return;
+  }
+}
 function trimToPreparedPrefix(options, prepared) {
   if (options.compactionOff || !options.messages)
     return "not-attempted";
@@ -13015,7 +13047,8 @@ function trimToPreparedPrefix(options, prepared) {
         });
         const boundaryPosition = sourcePosition.get(boundary) ?? sourcePosition.get(resolveHostServedBoundaryId2(options.sessionId, boundary));
         if (boundaryPosition === undefined) {
-          status = refuse("boundary absent from immutable source order");
+          const reanchored = reanchorStoredBoundary(options, boundary);
+          status = reanchored ? trimToPreparedPrefix({ ...options, prefixTrimSourceOrder: reanchored }, prepared) : refuse("boundary absent from immutable source order");
         } else {
           let lastSourcePosition = -1;
           let sawPersistedRow = false;
@@ -13026,8 +13059,7 @@ function trimToPreparedPrefix(options, prepared) {
           for (const [index, message] of options.messages.entries()) {
             const id = message.info.id;
             if (isHostRenderedSystemMessage(message)) {
-              if (lastSourcePosition >= boundaryPosition)
-                retained.push(message);
+              retained.push(message);
               continue;
             }
             if (typeof id !== "string" || id.length === 0) {
@@ -13070,12 +13102,19 @@ function trimToPreparedPrefix(options, prepared) {
     } else {
       const index = findBoundaryIndex(options.sessionId, options.messages, boundary);
       if (index >= 0) {
-        const removed = options.messages.splice(0, index + (isPartialCompartmentEnd(options.db, options.sessionId, boundary) ? 0 : 1));
+        const cut = index + (isPartialCompartmentEnd(options.db, options.sessionId, boundary) ? 0 : 1);
+        const unplaced = options.messages.slice(0, cut).filter(isHostRenderedSystemMessage);
+        const removed = options.messages.splice(0, cut, ...unplaced);
         retireDecisions(removed.map((message) => message.info.id).filter((id) => typeof id === "string"));
         resetPrefixTrimFallbackState(options.sessionId);
         status = "applied";
       } else {
-        status = classifyAbsentBoundary(options, options.messages, boundary);
+        const reanchored = reanchorStoredBoundary(options, boundary);
+        if (reanchored && reanchored.messageIds[0] !== boundary) {
+          status = trimToPreparedPrefix({ ...options, prefixTrimSourceOrder: reanchored }, prepared);
+        } else {
+          status = classifyAbsentBoundary(options, options.messages, boundary);
+        }
       }
     }
   }
@@ -18010,6 +18049,7 @@ Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${c
         sequenceOffset: candidateCompartments.length,
         dumpLabelBase: `recomp-${sessionId}-${chunk.startIndex}-${chunk.endIndex}-pass-${passCount + 1}`,
         timeoutMs: historianTimeoutMs,
+        maxOutputTokens: deps.historianMaxOutputTokens,
         model: deps.model,
         fallbackModelId: deps.fallbackModelId,
         fallbackModels: deps.fallbackModels,
@@ -18524,7 +18564,6 @@ ${renderUserFacingFailure("recomp_unavailable")}`;
     }
   }
 }
-
 // src/hooks/magic-context/compartment-runner.ts
 var activeRuns = new Map;
 function getActiveCompartmentRun(sessionId) {
@@ -18560,7 +18599,7 @@ function withPublishedCallback(deps) {
   };
 }
 function startLeaseRenewal(deps, holderId) {
-  return setInterval(() => {
+  return inRootAsyncContext2(() => setInterval(() => {
     try {
       if (!renewCompartmentLease(deps.db, deps.sessionId, holderId)) {
         sessionLog2(deps.sessionId, "compartment lease renewal failed; publish will be skipped if holder is stale");
@@ -18568,7 +18607,7 @@ function startLeaseRenewal(deps, holderId) {
     } catch (err) {
       sessionLog2(deps.sessionId, `compartment lease renewal threw; publish will be skipped if holder is stale (${err instanceof Error ? err.message : String(err)})`);
     }
-  }, COMPARTMENT_LEASE_RENEWAL_MS);
+  }, COMPARTMENT_LEASE_RENEWAL_MS));
 }
 function startCompartmentAgent(deps, runAgent = runCompartmentAgent, prepareBoundary) {
   withoutSqliteTransformPass2(() => startBackgroundCompartmentAgent(deps, runAgent, prepareBoundary));

package/dist/v2/{server-kzns2hbz.js → server-s6jqh8bj.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./server-t4k4qexw.js";
+} from "./server-9e5r8y60.js";
 
 // src/hooks/magic-context/read-session-formatting.ts
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";

package/dist/v2/{server-6byqfbqf.js → server-shme41gj.js}

@@ -1,6 +1,6 @@
 import {
   sessionLog2
-} from "./server-t4k4qexw.js";
+} from "./server-9e5r8y60.js";
 import {
   isKnownAutocommit
 } from "./server-8ajstryz.js";

package/dist/v2/{server-j8epsc0g.js → server-wafzvyhg.js}

@@ -1,6 +1,10 @@
 // src/shared/sqlite.ts
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
 import { statSync } from "node:fs";
+var resourceRoot = new AsyncResource("magic-context:root");
+function inRootAsyncContext2(operation) {
+  return resourceRoot.runInAsyncScope(operation);
+}
 var reportSlowPrivilegedWrite;
 function registerSlowWriteReporter2(reporter) {
   reportSlowPrivilegedWrite = reporter;
@@ -191,7 +195,7 @@ function installTransactionRouting(db, readonly) {
         return endWriterTransaction(db, () => nativeExec(sql), sql);
       if (!/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql)) {
         try {
-          return withAutocommitTimeout(db, () => nativeExec(sql));
+          return withAutocommitTimeout(db, () => nativeExec(sql), false);
         } finally {
           if (mayChangeTagIdentity(sql))
             tagIdentityWriteGeneration += 1;
@@ -333,7 +337,7 @@ function trackSqliteConnection(db, filename, options) {
 }
 var TrackedDatabase = new Proxy(DatabaseImpl, {
   construct(target, args) {
-    const db = Reflect.construct(target, args, target);
+    const db = inRootAsyncContext2(() => Reflect.construct(target, args, target));
     return trackSqliteConnection(db, args[0], args[1]);
   }
 });
@@ -577,29 +581,48 @@ function foregroundWaitLease() {
   const lease = transformPassScope.getStore();
   return lease?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? lease : undefined;
 }
-function withAutocommitTimeout(db, operation) {
+function withAutocommitTimeout(db, operation, singleStatement = true) {
   assertTransformWrite2();
   const lease = foregroundWaitLease();
   if (isInTransaction(db))
     return operation();
   const scoped = lease || backgroundWriterScope.getStore();
   const previous = scoped ? pragmaNumber(db, "busy_timeout") : null;
-  if (scoped)
-    db.exec(`PRAGMA busy_timeout=${lease ? Math.floor(Math.min(lease.remainingWaitMs, lease.guard?.remainingMs() ?? Infinity)) : SHORT_BUSY_TIMEOUT_MS}`);
   const started = performance.now();
   let completed = false;
-  try {
+  const execute = () => {
     const result = operation();
     completed = true;
     return result;
+  };
+  try {
+    if (!scoped)
+      return execute();
+    if (singleStatement) {
+      db.exec("PRAGMA busy_timeout=0");
+      try {
+        return execute();
+      } catch (error) {
+        if (!isTransientSqliteError2(error) || isInTransaction(db))
+          throw error;
+      }
+      assertTransformWrite2();
+    }
+    const timeout = Math.floor(Math.min(lease?.remainingWaitMs ?? SHORT_BUSY_TIMEOUT_MS, lease?.guard?.remainingMs() ?? Infinity));
+    db.exec(`PRAGMA busy_timeout=${timeout}`);
+    const waitStarted = performance.now();
+    try {
+      return execute();
+    } finally {
+      if (lease)
+        lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - (performance.now() - waitStarted));
+    }
   } catch (error) {
     if (lease && isTransientSqliteError2(error))
       throw new SqliteAcquisitionBusyError2(error, "autocommit");
     throw error;
   } finally {
     const elapsed = performance.now() - started;
-    if (lease)
-      lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - elapsed);
     if (previous !== null)
       db.exec(`PRAGMA busy_timeout=${previous}`);
     if (elapsed >= SLOW_WRITER_LOG_MS)
@@ -859,4 +882,4 @@ async function yieldIndexChunk2() {
   await yieldIndexTurn();
 }
 
-export { registerSlowWriteReporter2, registerSqliteDiagnosticSink2, detectSqliteRuntime2, getTagIdentityWriteGeneration2, Database2, getSqliteDatabasePath2, getSqliteMemoryStats2, prepareCachedStatement2, withSqliteBackgroundWriter2, withSqliteTransformPass2, withoutSqliteTransformPass2, assertTransformWrite2, isTransientSqliteError2, SqliteAcquisitionBusyError2, beginSqliteWriterAsync2, withAsyncPrivilegedWriter2, withPrivilegedWriter2, indexCoordinationInput2, releaseIndexOwner2, withIndexChunk2, yieldIndexChunk2 };
+export { inRootAsyncContext2, registerSlowWriteReporter2, registerSqliteDiagnosticSink2, detectSqliteRuntime2, getTagIdentityWriteGeneration2, Database2, getSqliteDatabasePath2, getSqliteMemoryStats2, prepareCachedStatement2, withSqliteBackgroundWriter2, withSqliteTransformPass2, withoutSqliteTransformPass2, assertTransformWrite2, isTransientSqliteError2, SqliteAcquisitionBusyError2, beginSqliteWriterAsync2, withAsyncPrivilegedWriter2, withPrivilegedWriter2, indexCoordinationInput2, releaseIndexOwner2, withIndexChunk2, yieldIndexChunk2 };