@cortexkit/opencode-magic-context 0.49.27 → 0.49.29

package/dist/v2/{context-na0esngr.js → context-g4ptae4x.js}

@@ -1,12 +1,13 @@
 import {
   getMagicContextBuiltinCommands,
   readJsoncFile,
+  isCommitRetentionPaused,
   cortexKitUserConfigBasePath,
   cortexKitProjectConfigBasePath,
   resolveLegacyConfigSources,
   getProtectedTokensTierOverrides,
   loadPluginConfigDetailed
-} from "./server-94wk1ey3.js";
+} from "./server-835q39kd.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -149,6 +150,7 @@ import {
   noteLkgHealthyPrefix,
   lkgRecoveryReplayUnproven,
   lkgRecoveryEntryUnproven,
+  lkgInputIdentity,
   beginLkgPass,
   visitMessageContentFields,
   contentSnapshotValue,
@@ -230,6 +232,7 @@ import {
   normalizeSDKResponse,
   annotateSubagentInvocationError,
   failedInvocationStatus,
+  emptyTokenTotals,
   sumTokensFromChildMessages,
   recordChildInvocation,
   createPromptAsyncTransport,
@@ -302,7 +305,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-jj9qye8y.js";
+} from "./server-q50ttc2g.js";
 import {
   resolveHistorianModel2
 } from "./server-5kym00ag.js";
@@ -327,7 +330,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-e3hc93wk.js";
+} from "./server-77gznpmf.js";
 import {
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
@@ -500,7 +503,7 @@ import {
   latestRealUserTurnIdFromOpenCodeDb,
   getMessageTimesFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./server-3vhxy2k5.js";
+} from "./server-a7x00tw8.js";
 import {
   expandToolPart,
   askAnswerLines,
@@ -699,7 +702,7 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-xkvxss5g.js";
+} from "./server-mxzj3r0y.js";
 import {
   BoundedSessionMap,
   recordToolDefinitionSet,
@@ -714,7 +717,7 @@ import {
   isMessageIndexReconciledThrough,
   clearIndexedMessages,
   indexMessagesAfterOrdinal
-} from "./server-z2n2xaeh.js";
+} from "./server-k9je35ev.js";
 import"./server-awr8qa4c.js";
 import {
   embedPauseBySession,
@@ -745,7 +748,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./server-yqek3s4k.js";
+} from "./server-zh3esb0z.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -822,7 +825,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-z3mk9jdc.js";
+} from "./server-ph300d6m.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -856,7 +859,7 @@ import {
 } from "./server-vr4szghm.js";
 import {
   cosineSimilarity
-} from "./server-6avtp9jp.js";
+} from "./server-p0snacz3.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -893,7 +896,7 @@ import"./server-1bw1wcbp.js";
 import {
   flushIgnoredMessages2,
   sendStatusNotification2
-} from "./server-6v3cdzsx.js";
+} from "./server-qc915kw2.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -913,14 +916,14 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-txbc3czn.js";
+} from "./server-976dxaxh.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
 import"./server-kaqs6h31.js";
 import {
   renderSearchArchiveOffThread2
-} from "./server-zmcrvpm3.js";
+} from "./server-w79f8ejn.js";
 import {
   compareSemverCore
 } from "./server-84w6rvvf.js";
@@ -7520,6 +7523,12 @@ var RECENT_TOOL_SKELETON_WINDOW = 20;
 function buildReplacementContent(tagId) {
   return `[dropped §${tagId}§]`;
 }
+var FROZEN_TEXT_ANNOTATION_SUFFIX = /(?:\n\n(?:<instruction name="deferred_notes">(?:(?!<\/instruction>)[\s\S])*<\/instruction>|<ctx-search-hint>(?:(?!<\/ctx-search-hint>)[\s\S])*<\/ctx-search-hint>))+$/;
+function renderDroppedText(tagId, renderedText) {
+  const placeholder = buildReplacementContent(tagId);
+  const annotations = renderedText?.match(FROZEN_TEXT_ANNOTATION_SUFFIX)?.[0] ?? "";
+  return placeholder + annotations;
+}
 function applyNewToolDrop(target, options) {
   const plan = planNewToolDrop(target, options, !!options.persist);
   if (!plan)
@@ -19284,8 +19293,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 ?? [],
@@ -20322,9 +20344,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);
@@ -20781,6 +20809,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);
@@ -20814,9 +20844,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;
@@ -22349,8 +22380,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),
@@ -22359,8 +22405,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) };
   }
@@ -22387,28 +22433,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",
@@ -22433,21 +22479,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) {
@@ -22460,8 +22497,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;
 }
@@ -22469,7 +22507,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))
@@ -22485,9 +22524,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;
@@ -23034,13 +23078,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 {}
@@ -23941,8 +23987,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-txsmbnvw.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-vdsgnf4c.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-f1df1gb8.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-x5nzy34v.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -24026,7 +24072,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-gjkszser.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-jq33fda8.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -27139,6 +27185,16 @@ function toolResultText(result) {
 `);
   return text.length > 0 ? text : undefined;
 }
+function sumRowUsage(rows) {
+  const count = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
+  return rows.reduce((total, row) => ({
+    input: total.input + count(row.data.tokens?.input),
+    output: total.output + count(row.data.tokens?.output),
+    cacheRead: total.cacheRead + count(row.data.tokens?.cache?.read),
+    cacheWrite: total.cacheWrite + count(row.data.tokens?.cache?.write),
+    ...total.reasoning !== undefined || row.data.tokens?.reasoning !== undefined ? { reasoning: (total.reasoning ?? 0) + count(row.data.tokens?.reasoning) } : {}
+  }), { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
+}
 function toolLoopMessages(attempt, rows) {
   const messages = attempt.observedMessages ?? [];
   const results = new Map;
@@ -27331,6 +27387,10 @@ function createLateHiddenExecutor(current) {
     open: (run) => wired().open(run),
     attempt: (handle, request) => wired().attempt(handle, request),
     collect: (handle, limit) => wired().collect(handle, limit),
+    collectPartial: (handle, limit) => {
+      const executor = wired();
+      return executor.collectPartial?.(handle, limit) ?? executor.collect(handle, limit);
+    },
     close: (handle, settlement) => wired().close(handle, settlement)
   };
 }
@@ -27420,9 +27480,32 @@ async function createV2HiddenCompletionExecutor(host, options) {
     });
     run.child = lifecycle.updateModel(run.child, requested);
   };
+  const partialCompletion = (run) => {
+    const attempt = run.attempt;
+    const rows = attempt ? withReader(options.openReader, (reader) => {
+      const latest = reader.latestAssistant(run.child.id);
+      return (reader.assistantSince?.(run.child.id, attempt.baseline) ?? (latest ? [latest] : [])).filter((row) => row.seq > attempt.baseline);
+    }) : [];
+    const usage = sumRowUsage(rows);
+    return {
+      text: rows.map(assistantText).filter(Boolean).join(`
+`) || null,
+      messages: attempt ? toolLoopMessages(attempt.child, rows) : [],
+      usage,
+      tokenLog: runTokenLog(usage),
+      lengthCapped: false
+    };
+  };
   const retire = (run, reason) => {
     if (run.retired)
       return;
+    if (hiddenToolLoop(run.identity) && !run.completion) {
+      try {
+        run.partialCompletion = partialCompletion(run);
+      } catch (error) {
+        note(`[magic-context] could not read interrupted child output: ${String(error)}`);
+      }
+    }
     lifecycle.retire(run.child, reason);
     run.retired = true;
   };
@@ -27553,6 +27636,8 @@ async function createV2HiddenCompletionExecutor(host, options) {
         shaped: false,
         budget: run.budget
       };
+      run.partialCompletion = undefined;
+      run.attempt = { child: attempt, baseline };
       options.hook.registerAttempt(marker, attempt);
       const deadline = Date.now() + run.identity.timeoutMs;
       const budget = run.budget;
@@ -27688,19 +27773,14 @@ async function createV2HiddenCompletionExecutor(host, options) {
         const tokenNumber = (value) => typeof value === "number" && Number.isFinite(value) ? value : undefined;
         const steps = withReader(options.openReader, (reader) => reader.assistantSince?.(run.child.id, baseline) ?? [row]).filter((step) => step.seq > baseline && step.seq <= row.seq);
         const reportedUsage = steps.some((step) => tokenNumber(step.data.tokens?.input) !== undefined || tokenNumber(step.data.tokens?.output) !== undefined);
-        const usage = steps.reduce((total, step) => ({
-          input: total.input + (tokenNumber(step.data.tokens?.input) ?? 0),
-          output: total.output + (tokenNumber(step.data.tokens?.output) ?? 0),
-          cacheRead: total.cacheRead + (tokenNumber(step.data.tokens?.cache?.read) ?? 0),
-          cacheWrite: total.cacheWrite + (tokenNumber(step.data.tokens?.cache?.write) ?? 0)
-        }), { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
+        const usage = sumRowUsage(steps);
         if (request.signal?.aborted || run.retired || Date.now() >= deadline) {
           await interruptAndRetire(run, "prompt-aborted-or-timeout");
           throw new Error(request.signal?.aborted ? "Hidden completion prompt aborted" : "Hidden completion prompt timed out");
         }
         run.completion = {
           text,
-          tokenLog: runTokenLog(tokens, run.identity.maxOutputTokens, row.data.finish),
+          tokenLog: runTokenLog(reportedUsage ? usage : tokens, run.identity.maxOutputTokens, row.data.finish),
           ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt, steps) } : {},
           reasoning: text ? null : assistantReasoning(row),
           usage: reportedUsage ? usage : meter(system, promptText(request), text ?? ""),
@@ -27749,6 +27829,12 @@ async function createV2HiddenCompletionExecutor(host, options) {
         throw new Error("Hidden completion has no settled output");
       return completion;
     },
+    async collectPartial(handle) {
+      const run = runs.get(handle);
+      if (!run)
+        throw new Error("Hidden completion handle is closed");
+      return run.completion ?? run.partialCompletion ?? partialCompletion(run);
+    },
     async close(handle, settlement) {
       if (!handle)
         return;
@@ -28923,7 +29009,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);
           })
@@ -30756,6 +30842,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;
@@ -30769,6 +30856,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
@@ -30793,11 +30881,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) {
@@ -31575,6 +31667,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
@@ -31602,7 +31695,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();
@@ -32160,8 +32257,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];
@@ -32196,7 +32293,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) {
@@ -32204,7 +32316,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 = [];
       }
@@ -32255,7 +32367,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);
@@ -32330,7 +32443,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;
@@ -32497,6 +32611,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
@@ -33775,7 +33890,8 @@ async function git2(root, args) {
     cwd: root,
     timeout: 1e4,
     maxBuffer: MAX_DIFF_BYTES,
-    encoding: "utf8"
+    encoding: "utf8",
+    windowsHide: true
   });
   return stdout;
 }
@@ -34417,7 +34533,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);
@@ -34491,7 +34608,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;
@@ -34750,6 +34868,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
@@ -34819,6 +34938,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 = [];
@@ -35626,6 +35754,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) => {
@@ -35641,6 +35770,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
@@ -35726,6 +35856,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 };
     };
@@ -35896,6 +36028,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)
@@ -35910,6 +36043,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
@@ -36027,6 +36161,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 {
@@ -37241,7 +37376,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)) {
@@ -37326,11 +37462,7 @@ function registerV2DreamScheduleTimer(args) {
     embeddingConfig: config.embedding,
     transformMode: config.transform_mode,
     moduleClient: createDreamTimerModuleClient(args.rustModeModuleClient),
-    gitCommitIndexing: gitCommitIndexing?.enabled ? {
-      enabled: true,
-      since_days: gitCommitIndexing.since_days,
-      max_commits: gitCommitIndexing.max_commits
-    } : undefined,
+    gitCommitIndexing: gitCommitIndexing?.enabled ? gitCommitIndexing : undefined,
     ensureRegistered: args.ensureRegistered ?? ensureProjectRegisteredFromOpenCodeDirectory
   }).catch((error) => {
     log2(`[magic-context] v2 dream timer registration failed (continuing without it): ${error}`);
@@ -38399,7 +38531,7 @@ function projectRawMessages(rows, ordinalFor) {
     const message = {
       id: row.id,
       ordinal: ordinalFor(row, index),
-      role: row.type === "assistant" ? "assistant" : "user",
+      role: row.type === "assistant" ? "assistant" : row.type === "system" ? "system" : "user",
       createdAt: row.time_created ?? row.data.time?.created,
       parts: row.type === "assistant" ? (row.data.content ?? []).map((part) => {
         if (part.type !== "tool")
@@ -51087,7 +51219,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();