@cortexkit/opencode-magic-context 0.49.27 → 0.49.29

package/dist/{index-qzbpbnqt.js → index-wpcdk76y.js}

@@ -82,6 +82,191 @@ import {
   parkGitSweepNonIndexable,
   releaseGitSweepLease
 } from "./index-kfyb3k6n.js";
+import {
+  getMagicContextBuiltinCommands,
+  formatConfigParseStatusLine,
+  isCommitRetentionPaused,
+  cortexKitUserConfigBasePath,
+  cortexKitProjectConfigBasePath,
+  resolveLegacyConfigSources,
+  loadPluginConfigDetailed,
+  historianRunConfig,
+  currentPluginConfigReader,
+  clampProducerAtomChars,
+  producerInputTokenLimit,
+  historianProducerReserve,
+  producerPromptFailureReason,
+  DREAMER_AGENT,
+  DREAMER_RETROSPECTIVE_AGENT,
+  DREAMER_PRIMER_INVESTIGATOR_AGENT,
+  DREAMER_MEMORY_MAPPER_AGENT,
+  DREAMER_CLASSIFIER_AGENT,
+  DREAMER_DOCS_AGENT,
+  DREAMER_REVIEWER_AGENT,
+  getCompartments,
+  getLastCompartmentEndMessage,
+  getLastCompartmentEndMessageId,
+  providerResponseFailed,
+  LkgRecoveryFenceError,
+  lkgServedArrayDigest,
+  hasCleanLkgRecoveryFence,
+  dirtyLkgRecoveryRevision,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  prepareLkgCaptureFence,
+  certifyCommittedLkgCapture,
+  markLkgRecoveryDirty,
+  getOrCreateSessionMeta,
+  updateSessionMeta,
+  retryPendingSessionCleanups,
+  retryPendingRustSessionCleanupsForProject,
+  requestPendingMaterialization,
+  hasPendingMaterializationOrigin,
+  clearPendingMaterialization,
+  recordSystemPromptForRequest,
+  recordHeldHeadForRequest,
+  isHeldHeadForRequest,
+  deferDeliveredSystemRefresh,
+  retirePendingSystemPromptDelivery,
+  claimLkgRequestIdentity,
+  currentLkgRequestIdentity,
+  noteCapturedLkgRequest,
+  measuredLkgPrefix,
+  saveLkgSlotToDb,
+  clearPersistedLkgSlotStrict,
+  loadPersistedLkgSlot,
+  drainStaleLkgSlots,
+  resolveLkgModelKeys,
+  createLkgEntryProjector,
+  captureLkgSlot,
+  validateAnthropicReasoningRuns,
+  validateLkgSeam,
+  replayLkg,
+  coldStartRawServedIndex,
+  coldStartUncapturedReplay,
+  noteUncertifiedNormalLkg,
+  hasProcessLocalLkgProof,
+  lkgDirtyRevision,
+  rememberLkgDirtyRevision,
+  readPersistedLkgUntaggedInputIds,
+  persistLkgUntaggedInputIds,
+  noteLkgRecoveryPrefix,
+  readLkgRecoveryPrefix,
+  noteLkgHealthyPrefix,
+  lkgRecoveryReplayUnproven,
+  lkgRecoveryEntryUnproven,
+  lkgInputIdentity,
+  beginLkgPass,
+  visitMessageContentFields,
+  contentSnapshotValue,
+  messageContentFields,
+  signatureForFields,
+  exactReusablePrefix,
+  incrementalLkgContentDigests,
+  lkgSlotRejection,
+  captureSlot,
+  getInMemorySlot,
+  getSlot,
+  forgetInMemorySlot,
+  dropSlot,
+  noteEntry,
+  getLkgSlotHeapStats,
+  TOOL_SWEEP_SCOPED_MARKER,
+  useScopedToolSweep,
+  createPreAdoptionToolSweepResolver,
+  queueMemoryMutation,
+  getMaxMemoryMutationIdForProjects,
+  GLOBAL_USER_PROFILE_PROJECT_PATH,
+  getProjectState,
+  bumpProjectUserProfileVersion,
+  createChildSessionWithFence,
+  HiddenCompletionRefusal,
+  DreamerProviderOutputFailureError,
+  withDreamerModelCooldown,
+  providerOutputFailureFromInvalidManifest,
+  extractLatestAssistantText,
+  hasLengthCappedOutput,
+  parseProviderModel,
+  modelBodyField,
+  toModelEntry,
+  isPromptTimeoutError,
+  getPromptFailureDetail,
+  raceWithSignal,
+  promptSyncWithValidatedOutputRetry,
+  normalizeSDKResponse,
+  annotateSubagentInvocationError,
+  failedInvocationStatus,
+  emptyTokenTotals,
+  sumTokensFromChildMessages,
+  recordChildInvocation,
+  createPromptAsyncTransport,
+  systemPromptFingerprint,
+  createPromptSurfaceRuntime,
+  createPromptSurfaceGuidanceEpochCache,
+  teardownChildSession,
+  getCompartmentEvents,
+  runTokenLog,
+  formatRunTokenLog,
+  buildMagicContextSection,
+  getMuralIdentity,
+  getMural,
+  modelKeyAcceptsImages,
+  resolveMuralWire,
+  USER_MEMORY_CANDIDATE_TTL_MS,
+  insertUserMemoryCandidates,
+  getUserMemoryCandidates,
+  deleteUserMemoryCandidates,
+  pruneExpiredUserMemoryCandidates,
+  insertUserMemory,
+  getActiveUserMemories,
+  updateUserMemoryContent,
+  dismissUserMemory,
+  getOpenCodeDbPath,
+  prepareCompactionMarkerCandidates,
+  removeMcOwnedCompactionMarkers,
+  MARKER_SUMMARY_TEXT,
+  markerUpdateDefinitelyDidNotCut,
+  extractM0Block,
+  formatDate,
+  TEMPORAL_MARKER_REPLAY_PATTERN,
+  collectTemporalCandidates,
+  injectTemporalMarkers,
+  getVisibleMemoryIds,
+  selectHiddenMessagesAtCompactionSeam,
+  prepareCompartmentInjection,
+  mustMaterialize,
+  trimMemoriesToBudgetV2,
+  renderMemoryBlockV2,
+  findHostCompactionWindow,
+  capturePrefixTrimSourceOrder,
+  resolveHiddenCompletionExecutor,
+  createV1HiddenCompletionExecutor,
+  readCoordinateGeneration,
+  readCoordinateRebaseNotice,
+  formatCoordinateRebaseNotice,
+  rebaseSessionCoordinatesAsync,
+  shouldWaitForNewHistorianHistory,
+  EMPTY_READ_REPLY,
+  noteTouchedAt,
+  renderGlance,
+  renderNotesById,
+  formatWriteReply,
+  onNoteTrigger,
+  clearNoteNudgeTriggerAndCooldown,
+  resetNoteNudgeCooldownOnly,
+  omitIncompleteFileTokenTotals,
+  RECOVERY_NO_HEAD_LIMIT,
+  deriveProtectedTailTokenTarget,
+  selectPerRunCap,
+  resolveOpenCodeProtectedTailBoundary,
+  getRawHistoryEligibility,
+  hasRunnableCompartmentWindow,
+  recordHighPressureNoEligibleHead,
+  noteTransformPassForExactOrdinalReads,
+  snapRangeToCompartments,
+  getActiveCompartmentRun,
+  startCompartmentAgent
+} from "./index-q9zvphbq.js";
 import {
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -177,7 +362,7 @@ import {
   latestPersistedMessageForRecovery,
   latestRealUserTurnIdFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-v0dhhxsq.js";
+} from "./index-y1qwzvxn.js";
 import {
   expandToolPart,
   askAnswerLines,
@@ -302,7 +487,7 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-yzjhx10y.js";
+} from "./index-zhgqgxtt.js";
 import {
   BoundedSessionMap,
   getMeasuredToolDefinitionTokens
@@ -320,7 +505,7 @@ import {
   runSqliteOptimize,
   openDatabase,
   openCurrentDatabase
-} from "./index-4cpc59jv.js";
+} from "./index-h4s5jk7f.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -344,188 +529,6 @@ import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
 } from "./index-fr0wbhdn.js";
-import {
-  getMagicContextBuiltinCommands,
-  formatConfigParseStatusLine,
-  cortexKitUserConfigBasePath,
-  cortexKitProjectConfigBasePath,
-  resolveLegacyConfigSources,
-  loadPluginConfigDetailed,
-  historianRunConfig,
-  currentPluginConfigReader,
-  clampProducerAtomChars,
-  producerInputTokenLimit,
-  historianProducerReserve,
-  producerPromptFailureReason,
-  DREAMER_AGENT,
-  DREAMER_RETROSPECTIVE_AGENT,
-  DREAMER_PRIMER_INVESTIGATOR_AGENT,
-  DREAMER_MEMORY_MAPPER_AGENT,
-  DREAMER_CLASSIFIER_AGENT,
-  DREAMER_DOCS_AGENT,
-  DREAMER_REVIEWER_AGENT,
-  getCompartments,
-  getLastCompartmentEndMessage,
-  getLastCompartmentEndMessageId,
-  providerResponseFailed,
-  LkgRecoveryFenceError,
-  lkgServedArrayDigest,
-  hasCleanLkgRecoveryFence,
-  dirtyLkgRecoveryRevision,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
-  prepareLkgCaptureFence,
-  certifyCommittedLkgCapture,
-  markLkgRecoveryDirty,
-  getOrCreateSessionMeta,
-  updateSessionMeta,
-  retryPendingSessionCleanups,
-  retryPendingRustSessionCleanupsForProject,
-  requestPendingMaterialization,
-  hasPendingMaterializationOrigin,
-  clearPendingMaterialization,
-  recordSystemPromptForRequest,
-  recordHeldHeadForRequest,
-  isHeldHeadForRequest,
-  deferDeliveredSystemRefresh,
-  retirePendingSystemPromptDelivery,
-  claimLkgRequestIdentity,
-  currentLkgRequestIdentity,
-  noteCapturedLkgRequest,
-  measuredLkgPrefix,
-  saveLkgSlotToDb,
-  clearPersistedLkgSlotStrict,
-  loadPersistedLkgSlot,
-  drainStaleLkgSlots,
-  resolveLkgModelKeys,
-  createLkgEntryProjector,
-  captureLkgSlot,
-  validateAnthropicReasoningRuns,
-  validateLkgSeam,
-  replayLkg,
-  coldStartRawServedIndex,
-  coldStartUncapturedReplay,
-  noteUncertifiedNormalLkg,
-  hasProcessLocalLkgProof,
-  lkgDirtyRevision,
-  rememberLkgDirtyRevision,
-  readPersistedLkgUntaggedInputIds,
-  persistLkgUntaggedInputIds,
-  noteLkgRecoveryPrefix,
-  readLkgRecoveryPrefix,
-  noteLkgHealthyPrefix,
-  lkgRecoveryReplayUnproven,
-  lkgRecoveryEntryUnproven,
-  beginLkgPass,
-  visitMessageContentFields,
-  contentSnapshotValue,
-  messageContentFields,
-  signatureForFields,
-  exactReusablePrefix,
-  incrementalLkgContentDigests,
-  lkgSlotRejection,
-  captureSlot,
-  getInMemorySlot,
-  getSlot,
-  forgetInMemorySlot,
-  dropSlot,
-  noteEntry,
-  getLkgSlotHeapStats,
-  TOOL_SWEEP_SCOPED_MARKER,
-  useScopedToolSweep,
-  createPreAdoptionToolSweepResolver,
-  queueMemoryMutation,
-  getMaxMemoryMutationIdForProjects,
-  GLOBAL_USER_PROFILE_PROJECT_PATH,
-  getProjectState,
-  bumpProjectUserProfileVersion,
-  createChildSessionWithFence,
-  HiddenCompletionRefusal,
-  DreamerProviderOutputFailureError,
-  withDreamerModelCooldown,
-  providerOutputFailureFromInvalidManifest,
-  extractLatestAssistantText,
-  hasLengthCappedOutput,
-  parseProviderModel,
-  modelBodyField,
-  toModelEntry,
-  isPromptTimeoutError,
-  getPromptFailureDetail,
-  raceWithSignal,
-  promptSyncWithValidatedOutputRetry,
-  normalizeSDKResponse,
-  annotateSubagentInvocationError,
-  failedInvocationStatus,
-  sumTokensFromChildMessages,
-  recordChildInvocation,
-  createPromptAsyncTransport,
-  systemPromptFingerprint,
-  createPromptSurfaceRuntime,
-  createPromptSurfaceGuidanceEpochCache,
-  teardownChildSession,
-  getCompartmentEvents,
-  runTokenLog,
-  formatRunTokenLog,
-  buildMagicContextSection,
-  getMuralIdentity,
-  getMural,
-  modelKeyAcceptsImages,
-  resolveMuralWire,
-  USER_MEMORY_CANDIDATE_TTL_MS,
-  insertUserMemoryCandidates,
-  getUserMemoryCandidates,
-  deleteUserMemoryCandidates,
-  pruneExpiredUserMemoryCandidates,
-  insertUserMemory,
-  getActiveUserMemories,
-  updateUserMemoryContent,
-  dismissUserMemory,
-  getOpenCodeDbPath,
-  prepareCompactionMarkerCandidates,
-  removeMcOwnedCompactionMarkers,
-  MARKER_SUMMARY_TEXT,
-  markerUpdateDefinitelyDidNotCut,
-  extractM0Block,
-  formatDate,
-  TEMPORAL_MARKER_REPLAY_PATTERN,
-  collectTemporalCandidates,
-  injectTemporalMarkers,
-  getVisibleMemoryIds,
-  selectHiddenMessagesAtCompactionSeam,
-  prepareCompartmentInjection,
-  mustMaterialize,
-  trimMemoriesToBudgetV2,
-  renderMemoryBlockV2,
-  findHostCompactionWindow,
-  capturePrefixTrimSourceOrder,
-  resolveHiddenCompletionExecutor,
-  createV1HiddenCompletionExecutor,
-  readCoordinateGeneration,
-  readCoordinateRebaseNotice,
-  formatCoordinateRebaseNotice,
-  rebaseSessionCoordinatesAsync,
-  shouldWaitForNewHistorianHistory,
-  EMPTY_READ_REPLY,
-  noteTouchedAt,
-  renderGlance,
-  renderNotesById,
-  formatWriteReply,
-  onNoteTrigger,
-  clearNoteNudgeTriggerAndCooldown,
-  resetNoteNudgeCooldownOnly,
-  omitIncompleteFileTokenTotals,
-  RECOVERY_NO_HEAD_LIMIT,
-  deriveProtectedTailTokenTarget,
-  selectPerRunCap,
-  resolveOpenCodeProtectedTailBoundary,
-  getRawHistoryEligibility,
-  hasRunnableCompartmentWindow,
-  recordHighPressureNoEligibleHead,
-  noteTransformPassForExactOrdinalReads,
-  snapRangeToCompartments,
-  getActiveCompartmentRun,
-  startCompartmentAgent
-} from "./index-dcqk0y27.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -553,7 +556,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-a2fz9hpa.js";
+} from "./index-gxkhzmjq.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -571,7 +574,7 @@ import {
   clearIndexedMessages,
   indexSingleMessage,
   indexMessagesAfterOrdinal
-} from "./index-7gbcg8xv.js";
+} from "./index-tx68g9nc.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -615,7 +618,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./index-t3rbb8wr.js";
+} from "./index-pe6b4bhs.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -635,7 +638,7 @@ import {
 } from "./index-4dhv7mqz.js";
 import {
   cosineSimilarity
-} from "./index-4ypqzvhf.js";
+} from "./index-vnn5405n.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -681,17 +684,17 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-dzfevacx.js";
+} from "./index-wvffze8y.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-077ht5cq.js";
+} from "./index-waktfbjy.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-n8qmmd7f.js";
+} from "./index-093c4g1c.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -735,6 +738,7 @@ import {
   replayCavemanCompression,
   DegradedPassRefusalError,
   degradedPassError,
+  renderDroppedText,
   applyFlushedStatuses,
   prewarmTagOwners,
   waitForTagOwners,
@@ -753,7 +757,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-fq2p158w.js";
+} from "./index-bps8vn9r.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -766,7 +770,7 @@ import {
 } from "./index-fmsr7v69.js";
 import {
   renderSearchArchiveOffThread2
-} from "./index-89k1w6x2.js";
+} from "./index-a1h316s9.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -2952,7 +2956,7 @@ async function runHiddenSingleShotPrompt(args) {
       let timer;
       try {
         const completion = await Promise.race([
-          args.executor.collect(handle, 200),
+          args.executor.collectPartial?.(handle, 200) ?? args.executor.collect(handle, 200),
           new Promise((resolve) => {
             timer = setTimeout(() => resolve(null), 5000);
           })
@@ -5598,6 +5602,7 @@ Remember: output only the JSON object described by the system prompt.`;
   let childSessionId = null;
   let promptSettled = false;
   let invocationRecorded = false;
+  let completionUsage;
   const recordInvocation = (params) => {
     if (!args.db || !args.parentSessionId || invocationRecorded)
       return;
@@ -5611,6 +5616,7 @@ Remember: output only the JSON object described by the system prompt.`;
       startedAt,
       status: params.status,
       messages: params.messages,
+      tokens: args.hiddenCompletionExecutor?.capabilities.harness === "opencode2" ? completionUsage : undefined,
       attemptedModel: args.model,
       configuredModels: args.fallbackModels,
       error: params.error
@@ -5635,11 +5641,15 @@ Remember: output only the JSON object described by the system prompt.`;
         timeoutMs: remainingMs,
         signal: args.signal,
         metadata: { task: "evaluate-smart-notes" },
+        onFailureOutput: (completion) => {
+          completionUsage = completion.usage;
+        },
         parse: parseCompilerOutput
       });
       promptSettled = true;
       response = carried.validated;
       outputMessages = carried.completion.messages;
+      completionUsage = carried.completion.usage;
     } else {
       const client = args.client;
       if (!client) {
@@ -6599,6 +6609,7 @@ async function confirmReadOnly(args, noteId, content, surfaceCondition, leaseSig
       startedAt,
       status: params.status,
       messages: params.messages,
+      tokens: args.hiddenCompletionExecutor?.capabilities.harness === "opencode2" ? params.tokens : undefined,
       attemptedModel: args.model,
       configuredModels: args.fallbackModels,
       error: params.error
@@ -6626,7 +6637,11 @@ async function confirmReadOnly(args, noteId, content, surfaceCondition, leaseSig
           parse: parseConfirmationVerdict
         });
         promptSettled = true;
-        recordInvocation({ status: "completed", messages: run.completion.messages });
+        recordInvocation({
+          status: "completed",
+          messages: run.completion.messages,
+          tokens: run.completion.usage
+        });
         return run.validated;
       } finally {
         promptSignal.cleanup();
@@ -7184,8 +7199,8 @@ async function mapMemories(args) {
         result.failureStage = outcome.failure.stage;
       }
       const committed = outcome.mapped + outcome.independent;
+      const committedIds = new Set(outcome.committedIds);
       runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
-        const committedIds = new Set(outcome.committedIds);
         for (const memory of batch.inputs) {
           if (committedIds.has(memory.id)) {
             delete retries[memory.id];
@@ -7220,7 +7235,22 @@ async function mapMemories(args) {
           log2(`[dreamer] map-memories: targeted retry still omitted ${outcome.requeue.length} id(s); leaving them unmapped for the next run`);
         }
       }
-      if (outcome.failure?.class === "timeout" && committed === 0) {
+      if (outcome.failure?.class === "timeout" && batch.inputs.length > 1) {
+        const unmapped = batch.inputs.filter((memory) => !committedIds.has(memory.id));
+        const splitSize = Math.floor(batch.inputs.length / 2);
+        const splits = [];
+        for (let offset = 0;offset < unmapped.length; offset += splitSize) {
+          splits.push({
+            inputs: unmapped.slice(offset, offset + splitSize),
+            isOmissionRetry: batch.isOmissionRetry
+          });
+        }
+        if (splits.length > 0) {
+          batches.splice(i + 1, 0, ...splits);
+          log2(`[dreamer] map-memories: splitting batch [${batch.inputs.map((memory) => memory.id).join(",")}] into ${splits.map((split) => split.inputs.length).join("+")} after timeout; retrying ${unmapped.length} uncommitted mapping(s)`);
+        }
+      }
+      if (outcome.failure?.class === "timeout" && batch.inputs.length === 1 && committed === 0) {
         consecutiveTimeouts += 1;
         timeoutStreakElapsedMs.push(outcome.failure.elapsedMs);
         if (consecutiveTimeouts >= CONSECUTIVE_TIMEOUT_LIMIT2) {
@@ -7228,7 +7258,7 @@ async function mapMemories(args) {
           log2(`[dreamer] map-memories starvation: circuit breaker tripped after ${consecutiveTimeouts} consecutive batch timeouts with no committed mappings (investigation made no durable progress); per-batch elapsed [${timeoutStreakElapsedMs.join("ms, ")}ms] vs ${sliceMs}ms slice; stopping with ${result.remaining} mapping(s) remaining`);
           break;
         }
-      } else {
+      } else if (committed > 0 || outcome.failure?.class !== "timeout") {
         consecutiveTimeouts = 0;
         timeoutStreakElapsedMs = [];
       }
@@ -7279,7 +7309,8 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       });
       recordInvocation2(args, startedAt, {
         status: "completed",
-        messages: run.completion.messages ?? []
+        messages: run.completion.messages ?? [],
+        tokens: run.completion.usage
       });
       stage = "apply";
       const outcome = await applyParsedBatchMappings(args, batch, run.validated, budgetFinalized, true);
@@ -7354,7 +7385,8 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
     recordInvocation2(args, startedAt, {
       status: failedInvocationStatus(error),
       error,
-      messages
+      messages,
+      tokens: failedCompletion?.usage
     });
     if (error instanceof DreamerModuleFailureError)
       throw error;
@@ -7521,6 +7553,7 @@ function recordInvocation2(args, startedAt, params) {
     startedAt,
     status: params.status,
     messages: params.messages,
+    tokens: args.hiddenCompletionExecutor?.capabilities.harness === "opencode2" ? params.tokens : undefined,
     attemptedModel: args.model,
     configuredModels: args.fallbackModels,
     error: params.error
@@ -8655,7 +8688,8 @@ async function git2(root, args) {
     cwd: root,
     timeout: 1e4,
     maxBuffer: MAX_DIFF_BYTES,
-    encoding: "utf8"
+    encoding: "utf8",
+    windowsHide: true
   });
   return stdout;
 }
@@ -9297,7 +9331,8 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       });
       recordInvocation4(args, startedAt, {
         status: "completed",
-        messages: run.completion.messages ?? []
+        messages: run.completion.messages ?? [],
+        tokens: run.completion.usage
       });
       reportUsage(run.completion.messages ?? [], run.childSessionId, run.completion.usage.input + (run.completion.usage.cacheRead ?? 0) + (run.completion.usage.cacheWrite ?? 0));
       return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt, budgetFinalized);
@@ -9371,7 +9406,8 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     recordInvocation4(args, startedAt, {
       status: failedInvocationStatus(error),
       error,
-      messages
+      messages,
+      tokens: failedCompletion?.usage
     });
     if (error instanceof DreamerModuleFailureError || signal.aborted)
       throw error;
@@ -9630,6 +9666,7 @@ function recordInvocation4(args, startedAt, params) {
     startedAt,
     status: params.status,
     messages: params.messages,
+    tokens: args.hiddenCompletionExecutor?.capabilities.harness === "opencode2" ? params.tokens : undefined,
     attemptedModel: args.model,
     configuredModels: args.fallbackModels,
     error: params.error
@@ -9699,6 +9736,15 @@ function classifyFailure(error) {
   const transient = explicitTransient || name === "AbortError" || /abort|lease|timeout|timed out|econn|socket|network|rate.?limit|429|503|overloaded|sqlite_busy|database is locked/.test(combined);
   return { transient, brief };
 }
+function sumCompletionUsages(usages) {
+  return usages.reduce((total, usage) => ({
+    input: total.input + usage.input,
+    output: total.output + usage.output,
+    cacheRead: total.cacheRead + usage.cacheRead,
+    cacheWrite: total.cacheWrite + usage.cacheWrite,
+    ...total.reasoning !== undefined || usage.reasoning !== undefined ? { reasoning: (total.reasoning ?? 0) + (usage.reasoning ?? 0) } : {}
+  }), emptyTokenTotals());
+}
 function newIds(beforeIds, afterIds) {
   const before = new Set(beforeIds);
   const out = [];
@@ -10506,6 +10552,7 @@ async function runRetrospectiveTask(config, ctx, helpers) {
   }, ctx.leaseAcquisition);
   let childSessionId = null;
   let hiddenHandle = null;
+  const hiddenUsages = [];
   let promptSettled = false;
   let invocationRecorded = false;
   const recordInvocation = (status, messages, error) => {
@@ -10521,6 +10568,7 @@ async function runRetrospectiveTask(config, ctx, helpers) {
       startedAt: helpers.invocationStartedAt,
       status,
       messages,
+      tokens: deps.hiddenCompletionExecutor?.capabilities.harness === "opencode2" && hiddenUsages.length ? sumCompletionUsages(hiddenUsages) : undefined,
       attemptedModel: config.model,
       configuredModels: config.fallbackModels,
       error
@@ -10606,6 +10654,8 @@ async function runRetrospectiveTask(config, ctx, helpers) {
         }
       });
       promptSettled = true;
+      if (hiddenHandle)
+        hiddenUsages.push(run.output.usage);
       const output = hiddenHandle ? run.output.messages ?? [] : run.output;
       return { ...run, output };
     };
@@ -10776,6 +10826,7 @@ async function runAgenticTask(config, ctx, helpers) {
   let childSessionId = null;
   let promptSettled = false;
   let expiredArchived = 0;
+  const hiddenUsages = [];
   let invocationRecorded = false;
   const recordInvocation = (status, messages, error) => {
     if (!parent || !childSessionId || invocationRecorded)
@@ -10790,6 +10841,7 @@ async function runAgenticTask(config, ctx, helpers) {
       startedAt: invocationStartedAt,
       status,
       messages,
+      tokens: deps.hiddenCompletionExecutor?.capabilities.harness === "opencode2" && hiddenUsages.length ? sumCompletionUsages(hiddenUsages) : undefined,
       attemptedModel: config.model,
       configuredModels: config.fallbackModels,
       error
@@ -10907,6 +10959,7 @@ async function runAgenticTask(config, ctx, helpers) {
           }
         });
         childSessionId = hidden.childSessionId;
+        hiddenUsages.push(hidden.completion.usage);
         run = { output: hidden.completion.messages ?? [], validated: hidden.validated };
         promptSettled = true;
       } else {
@@ -11895,7 +11948,8 @@ async function sweepGitCommits(args) {
   try {
     const result = await indexCommitsForProject(db, projectIdentity, directory, {
       sinceDays: gitCommitIndexing.since_days,
-      maxCommits: gitCommitIndexing.max_commits
+      maxCommits: gitCommitIndexing.max_commits,
+      skipRetention: isCommitRetentionPaused(gitCommitIndexing)
     });
     if (result.nonIndexable) {
       if (!parkGitSweepNonIndexable(db, projectIdentity, holderId)) {
@@ -11958,28 +12012,28 @@ var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.query_instruction",
   "embedding.document_prefix",
   "embedding.fallback_provider",
-  "subc",
+  "embedding.local_runtime",
+  "embedding.local_dtype",
   "subc.connection_file",
-  "shadow_embedding"
+  "shadow_embedding.enabled",
+  "memory.enabled",
+  "memory.git_commit_indexing.enabled",
+  "allow_home_project"
 ]);
 var LITERAL_CONFIG_TOKEN_RE = /\{(?:env|file):[^}]+\}/;
-function embeddingConfigHasLiteralTokens(embedding) {
-  if (!embedding)
-    return false;
-  for (const value of Object.values(embedding)) {
+function affectsEmbeddingRegistration(path) {
+  return [...EMBEDDING_AFFECTING_KEYS].some((field) => field === path || field.startsWith(`${path}.`));
+}
+function untrustedConfigFieldPaths(detailed) {
+  const paths = (detailed.recoveredFieldPaths ?? detailed.recoveredTopLevelKeys).filter(affectsEmbeddingRegistration);
+  paths.push(...detailed.substitutionFailures.map((failure) => failure.keyPath).filter(affectsEmbeddingRegistration));
+  for (const [key, value] of Object.entries(detailed.config.embedding)) {
     if (typeof value === "string" && LITERAL_CONFIG_TOKEN_RE.test(value)) {
-      return true;
+      paths.push(`embedding.${key}`);
     }
   }
-  return false;
+  return [...new Set(paths)].sort();
 }
-var EMBEDDING_AFFECTING_TOP_LEVEL_KEYS = new Set([
-  "embedding",
-  "memory",
-  "experimental",
-  "subc",
-  "shadow_embedding"
-]);
 var EMBEDDING_WARNING_TERMS = [
   "api_key",
   "endpoint",
@@ -12004,21 +12058,12 @@ function isConfigLoadUntrusted(detailed) {
     return true;
   }
   for (const failure of detailed.substitutionFailures) {
-    if (EMBEDDING_AFFECTING_KEYS.has(failure.keyPath)) {
-      return true;
-    }
     if (failure.keyPath === "<unknown>" && warningLooksEmbeddingRelated(failure.message)) {
       return true;
     }
   }
-  for (const recoveredKey of detailed.recoveredTopLevelKeys) {
-    if (EMBEDDING_AFFECTING_TOP_LEVEL_KEYS.has(recoveredKey)) {
-      return true;
-    }
-  }
-  if (embeddingConfigHasLiteralTokens(detailed.config.embedding)) {
+  if (untrustedConfigFieldPaths(detailed).length > 0)
     return true;
-  }
   return false;
 }
 function describeFailure(detailed) {
@@ -12031,8 +12076,9 @@ function describeFailure(detailed) {
   if (detailed.substitutionFailures.length > 0) {
     parts.push(`substitution=${detailed.substitutionFailures.map((failure) => `${failure.source}:${failure.keyPath}`).join(",")}`);
   }
-  if (detailed.recoveredTopLevelKeys.length > 0) {
-    parts.push(`recovered=${detailed.recoveredTopLevelKeys.join(",")}`);
+  const recovered = detailed.recoveredFieldPaths ?? detailed.recoveredTopLevelKeys;
+  if (recovered.length > 0) {
+    parts.push(`recovered=${recovered.join(",")}`);
   }
   return parts.length > 0 ? parts.join("; ") : detailed.loadOutcome;
 }
@@ -12040,7 +12086,8 @@ function logConfigFailureOnce(projectIdentity, detailed) {
   const signature = sha256Prefix(JSON.stringify({
     outcomes: detailed.sources,
     substitutions: detailed.substitutionFailures.map((failure) => `${failure.source}:${failure.keyPath}:${failure.message}`).sort(),
-    recoveredTopLevelKeys: [...detailed.recoveredTopLevelKeys].sort()
+    recoveredTopLevelKeys: [...detailed.recoveredTopLevelKeys].sort(),
+    recoveredFieldPaths: detailed.recoveredFieldPaths?.slice().sort()
   }));
   const existing = loggedFailureSignatures.get(projectIdentity) ?? new Set;
   if (existing.has(signature))
@@ -12056,9 +12103,14 @@ function handleUntrustedLoad(db, projectIdentity, directory, detailed) {
     logConfigFailureOnce(projectIdentity, detailed);
     return true;
   }
-  registerProjectInObservationMode2(db, projectIdentity, directory, detailed.config.embedding, describeFailure(detailed));
+  registerProjectInObservationMode2(db, projectIdentity, directory, detailed.config.embedding, describeFailure(detailed), untrustedConfigMemoryMessage(detailed));
   return true;
 }
+function untrustedConfigMemoryMessage(detailed) {
+  const fields = untrustedConfigFieldPaths(detailed);
+  const cause = fields.length > 0 ? `has invalid embedding or project identity settings: ${fields.join(", ")}` : Object.values(detailed.sources).includes("legacy-config-unmigrated") ? "is awaiting config migration" : Object.values(detailed.sources).some((source) => source === "project-file-parse-error" || source === "project-file-io-error") ? "could not be read or parsed" : "has invalid embedding settings";
+  return `Cross-session memory is off for this project because magic-context.jsonc ${cause}.`;
+}
 
 // src/plugin/embedding-routing.ts
 var SYNAPSE_PROBE_TTL_MS = 60000;
@@ -13221,8 +13273,23 @@ WHERE session_id = ?
   AND data IS NOT NULL
   AND (time_created > ? OR (time_created = ? AND id > ?))
 ORDER BY time_created, id`;
-function readAssistantUsageRowsAfter(openCodeDb, sessionId, afterTimeCreated, afterId) {
-  const rows = openCodeDb.prepare(ASSISTANT_USAGE_ROWS_AFTER_SQL).all(sessionId, afterTimeCreated, afterTimeCreated, afterId);
+var V2_ASSISTANT_USAGE_ROWS_AFTER_SQL = `
+SELECT
+  json_extract(data, '$.agent') AS agent,
+  seq AS time_created,
+  id AS id,
+  COALESCE(json_extract(data, '$.tokens.input'), 0)
+    + COALESCE(json_extract(data, '$.tokens.cache.read'), 0)
+    + COALESCE(json_extract(data, '$.tokens.cache.write'), 0) AS prompt,
+  COALESCE(json_extract(data, '$.tokens.output'), 0) AS output
+FROM session_message
+WHERE session_id = ?
+  AND type = 'assistant'
+  AND data IS NOT NULL
+  AND (seq > ? OR (seq = ? AND id > ?))
+ORDER BY seq, id`;
+function readAssistantUsageRowsAfter(openCodeDb, sessionId, afterTimeCreated, afterId, generation = "v1") {
+  const rows = openCodeDb.prepare(generation === "v2" ? V2_ASSISTANT_USAGE_ROWS_AFTER_SQL : ASSISTANT_USAGE_ROWS_AFTER_SQL).all(sessionId, afterTimeCreated, afterTimeCreated, afterId);
   return rows.map((r) => ({
     agent: r.agent ?? null,
     timeCreated: Number(r.time_created ?? 0),
@@ -13231,8 +13298,8 @@ function readAssistantUsageRowsAfter(openCodeDb, sessionId, afterTimeCreated, af
     output: Number(r.output ?? 0)
   }));
 }
-function computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry) {
-  const rows = readAssistantUsageRowsAfter(openCodeDb, sessionId, carry.lastTimeCreated, carry.lastId);
+function computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry, generation = "v1") {
+  const rows = readAssistantUsageRowsAfter(openCodeDb, sessionId, carry.lastTimeCreated, carry.lastId, generation);
   if (rows.length === 0) {
     return { carry, metrics: metricsFromCarry(carry) };
   }
@@ -15547,13 +15614,15 @@ function runnerStatusFromModule(status) {
 }
 var rustStatusInFlight = new Map;
 function resolveSidebarWorkMetrics(db, sessionId, persistedNewWork, persistedTotalInput) {
-  if (!openCodeDbExists()) {
+  const generation = getHarness2() === "opencode2" ? "v2" : "v1";
+  if (!openCodeDbExists(generation)) {
     return { newWorkTokens: persistedNewWork, totalInputTokens: persistedTotalInput };
   }
   try {
-    const carry = workMetricsCarryBySession.get(sessionId) ?? emptyWorkMetricsCarry();
-    const { carry: nextCarry, metrics } = withReadOnlySessionDb((openCodeDb) => computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry));
-    workMetricsCarryBySession.set(sessionId, nextCarry);
+    const carryKey = `${generation}:${sessionId}`;
+    const carry = workMetricsCarryBySession.get(carryKey) ?? emptyWorkMetricsCarry();
+    const { carry: nextCarry, metrics } = withReadOnlySessionDb((openCodeDb) => computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry, generation), generation);
+    workMetricsCarryBySession.set(carryKey, nextCarry);
     try {
       setSessionWorkMetrics(db, sessionId, metrics.newWorkTokens, metrics.totalInputTokens);
     } catch {}
@@ -16454,8 +16523,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-02sa2ngr.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-afzzqy5b.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-na34m4c5.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-vz86nt79.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -16539,7 +16608,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-n5h5sr1x.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-f0xr7pft.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -24390,8 +24459,21 @@ function createTransform(deps) {
     const temporalReplayIds = temporalCandidates ? messages.flatMap((message) => message.info.id ? [message.info.id] : []) : undefined;
     logTransformTiming(sessionId, "findSessionId", tSessionId, `messages=${messages.length}`);
     const tLkgEntry = performance.now();
-    const lkgInput = deps.transformMode === "rust" ? [] : projectEntry(sessionId, messages);
+    const lkgInput = deps.transformMode === "rust" ? [] : projectEntry(sessionId, entryOrderForThinkingFit);
     const recovery = deps.compactionOff || deps.transformMode === "rust" ? {} : readLkgRecoveryPrefix(sessionId, lkgInput, messages, deps.db);
+    const recoveryTailSources = [];
+    if (recovery.prefix) {
+      const priorIdentities = new Set(recovery.prefix.inputs.map((input) => input.id));
+      lkgInput.forEach((input, index) => {
+        const identity = lkgInputIdentity(input.id, input.role, index);
+        if (!identity || priorIdentities.has(identity))
+          return;
+        recoveryTailSources.push({
+          identity,
+          pristineSystem: input.id === null && input.role === "system" ? structuredClone(entryOrderForThinkingFit[index]) : undefined
+        });
+      });
+    }
     const persistedUntaggedInputIds = deps.compactionOff || deps.transformMode === "rust" ? [] : readPersistedLkgUntaggedInputIds(deps.db, sessionId);
     const untaggedReplayIds = new Set([
       ...recovery.prefix?.untaggedInputIds ?? [],
@@ -25428,9 +25510,15 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     });
     compactionModeTransitionPending.delete(sessionId);
     if (recovery.prefix && !recoveryNormalized) {
-      const priorIds = new Set(recovery.prefix.inputs.map((input) => input.id));
-      const newIds = new Set(lkgInput.flatMap((input) => input.id && !priorIds.has(input.id) ? [input.id] : []));
-      const suffix = messages.filter((message) => message.info.id && newIds.has(message.info.id));
+      const renderedById = new Map;
+      for (const message of messages) {
+        if (!message.info.id)
+          continue;
+        const group = renderedById.get(message.info.id) ?? [];
+        group.push(message);
+        renderedById.set(message.info.id, group);
+      }
+      const suffix = recoveryTailSources.flatMap(({ identity, pristineSystem }) => pristineSystem ? [pristineSystem] : renderedById.get(identity) ?? []);
       messages.splice(0, messages.length, ...JSON.parse(recovery.prefix.json), ...suffix);
     }
     const recoveryReleaseReason = recovery.rebuildReason ?? (recoveryNormalized ? "recovery_tail_normalized" : undefined);
@@ -26373,6 +26461,8 @@ function replayCommittedDrops(db, sessionId, messages) {
   const toolThinking = new Map;
   const batch = new ToolMutationBatch(messages);
   for (const message of messages) {
+    if (message.info.syntheticHead === true)
+      continue;
     if (message.info.role === "user")
       precedingThinking = [];
     const thinking = message.parts.filter(isThinkingPart);
@@ -26406,9 +26496,10 @@ function replayCommittedDrops(db, sessionId, messages) {
             message,
             setContent(content) {
               if (isTextPart(part)) {
-                if (part.text === content)
+                const rendered = renderDroppedText(tag.tagNumber, part.text);
+                if (part.text === rendered)
                   return false;
-                part.text = content;
+                part.text = rendered;
               } else
                 message.parts[p] = { type: "text", text: content };
               return true;
@@ -27725,7 +27816,7 @@ function createCtxMemoryTool(deps) {
       const memoryOwnedByTool = (memory) => visibility.owned(memory);
       const embeddingSnapshot = getProjectEmbeddingSnapshot2(projectPath);
       if (embeddingSnapshot ? !embeddingSnapshot.features.memoryEnabled : deps.memoryEnabled === false) {
-        return getDisabledMessage();
+        return embeddingSnapshot?.memoryDisabledReason ?? getDisabledMessage();
       }
       if (args.action === "write") {
         const content = args.content?.trim();