@cortexkit/opencode-magic-context 0.43.0 → 0.43.1

package/dist/index.js

@@ -1,3 +1,11 @@
+import {
+  setHarness,
+  getHarness,
+  getDataDir,
+  getOpenCodeStorageDir,
+  getMagicContextStorageResolution,
+  getMagicContextStorageDir
+} from "./index-6z9g64js.js";
 import {
   sanitizeDiagnosticText,
   hasShareabilitySensitiveText,
@@ -5,7 +13,7 @@ import {
   sessionLog,
   getLoggerDiagnostics,
   flushLogger
-} from "./index-qp20p2py.js";
+} from "./index-wgzyeyf5.js";
 import {
   withContentLanguageDirective,
   buildPrimaryLanguageDirective,
@@ -224,6 +232,7 @@ import {
   registerLkgPersistence,
   beginLkgPass,
   visitMessageContentFields,
+  contentSnapshotValue,
   messageContentFields,
   signatureForFields,
   exactReusablePrefix,
@@ -289,6 +298,8 @@ import {
   detectThinkingBindingMismatch,
   isFable51ThinkingBindingModel,
   detectOverflow,
+  extractLatestAssistantText,
+  hasLengthCappedOutput,
   parseProviderModel,
   modelBodyField,
   toModelEntry,
@@ -299,8 +310,6 @@ import {
   promptSurfaceHashMaterial,
   createPromptSurfaceRuntime,
   createPromptSurfaceGuidanceEpochCache,
-  extractLatestAssistantText,
-  hasLengthCappedOutput,
   setKeepSubagents,
   teardownChildSession,
   renderUserFacingFailure,
@@ -465,7 +474,7 @@ import {
   setRecompStarting2,
   setRecompTerminal2,
   runManagedRecomp2
-} from "./index-d0dh7v0f.js";
+} from "./index-7wpwr2e2.js";
 import {
   stripJsonComments,
   isPrototypePollutionKey,
@@ -496,7 +505,7 @@ import {
   deriveHistorianChunkTokens2,
   resolveKnownHistorianContextLimit2,
   resolveHistorianContextLimit2
-} from "./index-8w1skpnm.js";
+} from "./index-0ccmyzbj.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -519,7 +528,7 @@ import {
   latestPersistedMessageForRecovery,
   getMessageTimesFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-ykg9sdzz.js";
+} from "./index-v8qr6tt2.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -637,22 +646,23 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-ygwdyntq.js";
+} from "./index-j7cnyvq1.js";
+import"./index-febg06dy.js";
 import {
   getErrorMessage,
   describeError,
-  sendIgnoredMessage2,
+  sendCommandResult2,
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-rvwvdq59.js";
+} from "./index-yc81txp4.js";
 import {
   detectConflicts,
   resolveCompactionForBoot,
   sendConflictWarning2,
   cleanupConflictWarnings2
-} from "./index-rpz2me0v.js";
+} from "./index-kpmmr8s0.js";
 import {
   resolveModelCalibration,
   calibrateBuckets
@@ -676,7 +686,7 @@ import {
   compareTaskOrder,
   buildDreamTaskRuntimeConfigs2,
   userMemoryCollectionEnabled2
-} from "./index-99sfbrrf.js";
+} from "./index-6w9p73jz.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -692,24 +702,16 @@ import {
   ANNOUNCEMENT_FOOTER2,
   markAnnouncementSeen2,
   shouldShowAnnouncement2
-} from "./index-ntbmt6rq.js";
+} from "./index-4b30nf6z.js";
 import {
   resolvePromptContext2
 } from "./index-fmsr7v69.js";
 import {
   runManagedWrapup2
-} from "./index-w2ety11c.js";
+} from "./index-1gtwrdc4.js";
 import {
   logSlowWriteTransaction
-} from "./index-9skq8m9y.js";
-import {
-  setHarness,
-  getHarness,
-  getDataDir,
-  getOpenCodeStorageDir,
-  getMagicContextStorageResolution,
-  getMagicContextStorageDir
-} from "./index-4ftb5hcq.js";
+} from "./index-9r1cbh9e.js";
 import {
   __toESM,
   __commonJS
@@ -12053,7 +12055,7 @@ async function getLatestVersion(channel = "latest", options = {}) {
   try {
     if (options.signal?.aborted)
       return null;
-    const response = await fetch(buildRegistryUrl(options.registryUrl ?? NPM_REGISTRY_URL), {
+    const response = await (options.fetch ?? fetch)(buildRegistryUrl(options.registryUrl ?? NPM_REGISTRY_URL), {
       signal: controller.signal,
       headers: { Accept: "application/json" }
     });
@@ -14575,13 +14577,13 @@ async function runHiddenSingleShotPrompt(args) {
           throw new Error(`${args.callContext} returned length-capped output`);
         }
         const text = completion.text;
-        if (!text)
+        if (!text && !args.allowEmpty)
           throw new Error(`${args.callContext} returned no output`);
-        return args.parse(text);
+        return args.parse(text ?? "", completion);
       }
     });
     promptSettled = true;
-    return { validated: run.validated, completion: run.output };
+    return { validated: run.validated, completion: run.output, childSessionId: handle.id };
   } finally {
     await args.executor.close(handle, {
       promptSettled,
@@ -18044,8 +18046,36 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   try {
+    const prompt = buildMapMemoriesPrompt(args.projectIdentity, batch);
+    if (args.hiddenCompletionExecutor) {
+      const run = await runHiddenSingleShotPrompt({
+        executor: args.hiddenCompletionExecutor,
+        parentSessionId: args.parentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        agent: DREAMER_MEMORY_MAPPER_AGENT,
+        system: MAP_MEMORIES_SYSTEM_PROMPT,
+        prompt,
+        title: "magic-context-dream-map-memories",
+        callContext: "dreamer:map-memories",
+        model: args.model,
+        fallbackModels: args.fallbackModels,
+        timeoutMs: sliceMs,
+        signal,
+        parse: (text) => validateMapMemoriesManifest(text, new Set(batch.map((memory) => memory.id)))
+      });
+      recordInvocation2(args, startedAt, {
+        status: "completed",
+        messages: run.completion.messages ?? []
+      });
+      const outcome = await applyParsedBatchMappings(args, batch, run.validated);
+      const returnedIds = new Set(run.validated.map((entry) => entry.id));
+      return { ...outcome, requeue: batch.filter((memory) => !returnedIds.has(memory.id)) };
+    }
+    const client = args.client;
+    if (!client)
+      throw new Error("map-memories requires a client or hidden completion executor");
     const createResponse = await createChildSessionWithFence({
-      client: args.client,
+      client,
       db: args.db,
       parentSessionId: args.parentSessionId,
       title: "magic-context-dream-map-memories",
@@ -18057,8 +18087,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
     agentSessionId = typeof created?.id === "string" ? created.id : null;
     if (!agentSessionId)
       throw new Error("Could not create map-memories session.");
-    const prompt = buildMapMemoriesPrompt(args.projectIdentity, batch);
-    const run = await promptSyncWithValidatedOutputRetry(args.client, {
+    const run = await promptSyncWithValidatedOutputRetry(client, {
       path: { id: agentSessionId },
       query: { directory: args.sessionDirectory },
       body: {
@@ -18073,7 +18102,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:map-memories",
       fetchOutput: async () => {
-        const messagesResponse = await args.client.session.messages({
+        const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
           query: { directory: args.sessionDirectory, limit: 100 }
         });
@@ -18116,15 +18145,16 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       }
     };
   } finally {
-    await teardownChildSession({
-      client: args.client,
-      sessionId: agentSessionId,
-      sessionDirectory: args.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] map-memories",
-      log
-    });
+    if (agentSessionId && args.client)
+      await teardownChildSession({
+        client: args.client,
+        sessionId: agentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] map-memories",
+        log
+      });
   }
 }
 async function applyParsedBatchMappings(args, batch, parsed) {
@@ -18717,8 +18747,41 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   try {
+    const prompt = buildInvestigationPrompt(primer, seed.kind, seed.orientation, seed.prePost);
+    if (args.hiddenCompletionExecutor) {
+      const run = await runHiddenSingleShotPrompt({
+        executor: args.hiddenCompletionExecutor,
+        parentSessionId: args.parentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        agent: DREAMER_PRIMER_INVESTIGATOR_AGENT,
+        system: PRIMER_INVESTIGATOR_SYSTEM_PROMPT,
+        prompt,
+        title: "magic-context-dream-refresh-primers",
+        callContext: "dreamer:refresh-primers",
+        model: args.model,
+        fallbackModels: args.fallbackModels,
+        language: args.language,
+        timeoutMs: sliceMs,
+        signal,
+        parse: (text) => parseAnswer([{ info: { role: "assistant" }, parts: [{ type: "text", text }] }], primer.answer)
+      });
+      recordInvocation3(args, startedAt, {
+        status: "completed",
+        messages: run.completion.messages ?? []
+      });
+      const answer = run.validated.trim();
+      if (!answer || investigationToolCallCount(run.completion.messages ?? []) === 0)
+        return false;
+      runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
+        updatePrimerAnswer(args.db, primer.id, answer);
+      });
+      return true;
+    }
+    const client = args.client;
+    if (!client)
+      throw new Error("refresh-primers requires a client or hidden completion executor");
     const createResponse = await createChildSessionWithFence({
-      client: args.client,
+      client,
       db: args.db,
       parentSessionId: args.parentSessionId,
       title: "magic-context-dream-refresh-primers",
@@ -18730,8 +18793,7 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
     agentSessionId = typeof created?.id === "string" ? created.id : null;
     if (!agentSessionId)
       throw new Error("Could not create primer refresh session.");
-    const prompt = buildInvestigationPrompt(primer, seed.kind, seed.orientation, seed.prePost);
-    const run = await promptSyncWithValidatedOutputRetry(args.client, {
+    const run = await promptSyncWithValidatedOutputRetry(client, {
       path: { id: agentSessionId },
       query: { directory: args.sessionDirectory },
       body: {
@@ -18746,7 +18808,7 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:refresh-primers",
       fetchOutput: async () => {
-        const messagesResponse = await args.client.session.messages({
+        const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
           query: { directory: args.sessionDirectory, limit: 100 }
         });
@@ -18775,15 +18837,16 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
     recordInvocation3(args, startedAt, { status: failedInvocationStatus(error), error });
     throw error;
   } finally {
-    await teardownChildSession({
-      client: args.client,
-      sessionId: agentSessionId,
-      sessionDirectory: args.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] refresh-primers",
-      log
-    });
+    if (agentSessionId && args.client)
+      await teardownChildSession({
+        client: args.client,
+        sessionId: agentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] refresh-primers",
+        log
+      });
   }
 }
 function originSessionIdForPrimer(args, primer) {
@@ -19518,8 +19581,40 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   try {
+    const prompt = buildVerifyPrompt(args.projectIdentity, batch);
+    if (args.hiddenCompletionExecutor) {
+      const run = await runHiddenSingleShotPrompt({
+        executor: args.hiddenCompletionExecutor,
+        parentSessionId: args.parentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        agent: DREAMER_MEMORY_MAPPER_AGENT,
+        system: VERIFY_SYSTEM_PROMPT,
+        prompt,
+        title: "magic-context-dream-verify",
+        callContext: "dreamer:verify",
+        model: args.model,
+        fallbackModels: args.fallbackModels,
+        language: args.language,
+        timeoutMs: sliceMs,
+        signal,
+        parse: (text) => {
+          const providerFailure = providerOutputFailureFromInvalidManifest([], text);
+          if (providerFailure)
+            throw providerFailure;
+          return validateVerifyManifest(text, new Set(batch.map((memory) => memory.id)));
+        }
+      });
+      recordInvocation4(args, startedAt, {
+        status: "completed",
+        messages: run.completion.messages ?? []
+      });
+      return applyParsedVerifyManifest(args, batch, run.validated);
+    }
+    const client = args.client;
+    if (!client)
+      throw new Error("verify requires a client or hidden completion executor");
     const createResponse = await createChildSessionWithFence({
-      client: args.client,
+      client,
       db: args.db,
       parentSessionId: args.parentSessionId,
       title: "magic-context-dream-verify",
@@ -19531,8 +19626,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     agentSessionId = typeof created?.id === "string" ? created.id : null;
     if (!agentSessionId)
       throw new Error("Could not create verify session.");
-    const prompt = buildVerifyPrompt(args.projectIdentity, batch);
-    const run = await promptSyncWithValidatedOutputRetry(args.client, {
+    const run = await promptSyncWithValidatedOutputRetry(client, {
       path: { id: agentSessionId },
       query: { directory: args.sessionDirectory },
       body: {
@@ -19547,7 +19641,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:verify",
       fetchOutput: async () => {
-        const messagesResponse = await args.client.session.messages({
+        const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
           query: { directory: args.sessionDirectory, limit: 100 }
         });
@@ -19588,15 +19682,16 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       providerFailure
     };
   } finally {
-    await teardownChildSession({
-      client: args.client,
-      sessionId: agentSessionId,
-      sessionDirectory: args.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] verify",
-      log
-    });
+    if (agentSessionId && args.client)
+      await teardownChildSession({
+        client: args.client,
+        sessionId: agentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] verify",
+        log
+      });
   }
 }
 async function applyParsedVerifyManifest(args, batch, parsed) {
@@ -19764,6 +19859,8 @@ async function applyParsedVerifyManifest(args, batch, parsed) {
 async function normalizeFiles(args, rawFiles) {
   if (rawFiles.length === 0)
     return [];
+  if (args.normalizeFiles)
+    return args.normalizeFiles(rawFiles);
   const normalized = await normalizeVerificationFiles({
     cwd: args.sessionDirectory,
     files: rawFiles
@@ -20097,7 +20194,8 @@ function createDreamTaskExecutor(deps) {
       if (config.task === "map-memories") {
         const result = await mapMemories({
           db,
-          client: requireDreamClient(deps.client),
+          client: deps.client,
+          hiddenCompletionExecutor: deps.hiddenCompletionExecutor,
           projectIdentity,
           parentSessionId: parent,
           sessionDirectory: deps.sessionDirectory,
@@ -20134,7 +20232,8 @@ function createDreamTaskExecutor(deps) {
         const memoryBefore = getMemoryCountsByStatus(db, projectIdentity);
         const result = await runVerify({
           db,
-          client: requireDreamClient(deps.client),
+          client: deps.client,
+          hiddenCompletionExecutor: deps.hiddenCompletionExecutor,
           projectIdentity,
           parentSessionId: parent,
           sessionDirectory: deps.sessionDirectory,
@@ -20235,7 +20334,8 @@ function createDreamTaskExecutor(deps) {
       if (config.task === "refresh-primers") {
         const result = await refreshPrimers({
           db,
-          client: requireDreamClient(deps.client),
+          client: deps.client,
+          hiddenCompletionExecutor: deps.hiddenCompletionExecutor,
           projectIdentity,
           parentSessionId: parent,
           sessionDirectory: deps.sessionDirectory,
@@ -20503,24 +20603,45 @@ async function runRetrospectiveTask(config, ctx, helpers) {
     abortController.abort();
   }, ctx.leaseAcquisition);
   let childSessionId = null;
+  let hiddenHandle = null;
   let promptSettled = false;
   try {
-    const createResponse = await createChildSessionWithFence({
-      client: requireDreamClient(deps.client),
-      db,
-      parentSessionId: parent ?? undefined,
-      title: "magic-context-dream-retrospective",
-      directory: deps.sessionDirectory
-    });
-    const created = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
-    childSessionId = typeof created?.id === "string" ? created.id : null;
-    if (!childSessionId)
-      throw new Error("Retrospective could not create its child session.");
+    if (deps.hiddenCompletionExecutor) {
+      hiddenHandle = await deps.hiddenCompletionExecutor.open({
+        parentSessionId: parent ?? undefined,
+        agent: DREAMER_RETROSPECTIVE_AGENT,
+        kind: "dreamer-task",
+        system: FRICTION_GATE_SYSTEM_PROMPT,
+        model: config.model,
+        configuredModels: [
+          ...config.model ? [config.model] : [],
+          ...config.fallbackModels ?? []
+        ],
+        timeoutMs: Math.max(1, deadline - Date.now()),
+        title: "magic-context-dream-retrospective",
+        directory: deps.sessionDirectory
+      });
+      childSessionId = hiddenHandle.id;
+    } else {
+      const createResponse = await createChildSessionWithFence({
+        client: requireDreamClient(deps.client),
+        db,
+        parentSessionId: parent ?? undefined,
+        title: "magic-context-dream-retrospective",
+        directory: deps.sessionDirectory
+      });
+      const created = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
+      childSessionId = typeof created?.id === "string" ? created.id : null;
+      if (!childSessionId)
+        throw new Error("Retrospective could not create its child session.");
+    }
     const sessionId = childSessionId;
+    if (!sessionId)
+      throw new Error("Retrospective could not create its child session.");
     const runChildTurn = async (system, userText) => {
       const remainingMs = Math.max(0, deadline - Date.now());
       promptSettled = false;
-      const run = await promptSyncWithValidatedOutputRetry(requireDreamClient(deps.client), {
+      const run = await promptSyncWithValidatedOutputRetry(deps.hiddenCompletionExecutor ? undefined : requireDreamClient(deps.client), {
         path: { id: sessionId },
         query: { directory: deps.sessionDirectory },
         body: {
@@ -20534,7 +20655,13 @@ async function runRetrospectiveTask(config, ctx, helpers) {
         signal: abortController.signal,
         fallbackModels: config.fallbackModels,
         callContext: "dreamer:retrospective",
+        ...hiddenHandle && deps.hiddenCompletionExecutor ? {
+          transport: Object.assign((request) => deps.hiddenCompletionExecutor?.attempt(hiddenHandle, request) ?? Promise.reject(new Error("Hidden transport unavailable")), { childSessionId: hiddenHandle.childSessionId })
+        } : {},
         fetchOutput: async () => {
+          if (hiddenHandle && deps.hiddenCompletionExecutor) {
+            return deps.hiddenCompletionExecutor.collect(hiddenHandle, 50);
+          }
           const messagesResponse = await requireDreamClient(deps.client).session.messages({
             path: { id: sessionId },
             query: { directory: deps.sessionDirectory, limit: 50 }
@@ -20544,14 +20671,15 @@ async function runRetrospectiveTask(config, ctx, helpers) {
           });
         },
         validateOutput: (outputMessages) => {
-          const text = extractLatestAssistantText(outputMessages);
+          const text = hiddenHandle ? outputMessages.text : extractLatestAssistantText(outputMessages);
           if (!text)
             throw new Error("Retrospective child returned no output.");
           return text;
         }
       });
       promptSettled = true;
-      return run;
+      const output = hiddenHandle ? run.output.messages ?? [] : run.output;
+      return { ...run, output };
     };
     const finish = (run, watermark) => {
       if (parent && run) {
@@ -20681,15 +20809,23 @@ async function runRetrospectiveTask(config, ctx, helpers) {
     });
   } finally {
     heartbeat.stop();
-    await teardownChildSession({
-      client: requireDreamClient(deps.client),
-      sessionId: childSessionId,
-      sessionDirectory: deps.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] retrospective",
-      log
-    });
+    if (hiddenHandle && deps.hiddenCompletionExecutor) {
+      await deps.hiddenCompletionExecutor.close(hiddenHandle, {
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] retrospective",
+        log
+      });
+    } else
+      await teardownChildSession({
+        client: requireDreamClient(deps.client),
+        sessionId: childSessionId,
+        sessionDirectory: deps.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] retrospective",
+        log
+      });
   }
 }
 async function runAgenticTask(config, ctx, helpers) {
@@ -20763,72 +20899,107 @@ async function runAgenticTask(config, ctx, helpers) {
       docsCurrentTokens: maintainDocsSnapshot ? Math.ceil([...maintainDocsSnapshot.values()].join("").length / 3.5) : 0,
       curate: curateMemories && curateCategory ? { category: curateCategory, memories: curateMemories } : undefined
     });
-    const createResponse = await createChildSessionWithFence({
-      client: requireDreamClient(deps.client),
-      db,
-      parentSessionId: parent ?? undefined,
-      title: `magic-context-dream-${task}`,
-      directory: docsDir
-    });
-    const created = normalizeSDKResponse(createResponse, null, {
-      preferResponseOnMissingData: true
-    });
-    childSessionId = typeof created?.id === "string" ? created.id : null;
-    if (!childSessionId)
-      throw new Error("Dreamer could not create its child session.");
-    const sessionId = childSessionId;
-    const remainingMs = Math.max(0, deadline - Date.now());
-    const run = await promptSyncWithValidatedOutputRetry(requireDreamClient(deps.client), {
-      path: { id: sessionId },
-      query: { directory: docsDir },
-      body: {
+    let run;
+    if (deps.hiddenCompletionExecutor) {
+      const hidden = await runHiddenSingleShotPrompt({
+        executor: deps.hiddenCompletionExecutor,
+        parentSessionId: parent ?? undefined,
+        sessionDirectory: docsDir,
         agent: task === "maintain-docs" ? DREAMER_DOCS_AGENT : DREAMER_AGENT,
-        system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : withContentLanguageDirective(CURATE_SYSTEM_PROMPT, config.language ?? deps.language),
-        ...modelBodyField(config.model),
-        parts: [{ type: "text", text: taskPrompt, synthetic: true }]
-      }
-    }, {
-      timeoutMs: Math.min(remainingMs, config.timeoutMinutes * 60 * 1000),
-      signal: abortController.signal,
-      fallbackModels: config.fallbackModels,
-      callContext: `dreamer:${task}`,
-      fetchOutput: async () => {
-        const messagesResponse = await requireDreamClient(deps.client).session.messages({
-          path: { id: sessionId },
-          query: {
-            directory: docsDir,
-            ...task === "curate" ? {} : { limit: 50 }
+        system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : CURATE_SYSTEM_PROMPT,
+        prompt: taskPrompt,
+        title: `magic-context-dream-${task}`,
+        callContext: `dreamer:${task}`,
+        allowEmpty: task === "curate",
+        model: config.model,
+        fallbackModels: config.fallbackModels,
+        language: task === "curate" ? config.language ?? deps.language : undefined,
+        timeoutMs: Math.min(Math.max(0, deadline - Date.now()), config.timeoutMinutes * 60 * 1000),
+        signal: abortController.signal,
+        parse: (text, completion) => {
+          if (task !== "curate")
+            return text;
+          const memoryOperations = inspectCurateMemoryOperations(completion.messages);
+          if (text)
+            validateCurateAssistantText(text);
+          if (memoryOperations.totalCalls > 0 && memoryOperations.completedActions.length === 0)
+            throw new Error("Curate returned no completed ctx_memory tool result.");
+          if (!text && memoryOperations.completedActions.length === 0)
+            throw new Error("Dreamer returned no assistant output.");
+          return { text: text || null, memoryOperations };
+        }
+      });
+      childSessionId = hidden.childSessionId;
+      run = { output: hidden.completion.messages ?? [], validated: hidden.validated };
+      promptSettled = true;
+    } else {
+      const createResponse = await createChildSessionWithFence({
+        client: requireDreamClient(deps.client),
+        db,
+        parentSessionId: parent ?? undefined,
+        title: `magic-context-dream-${task}`,
+        directory: docsDir
+      });
+      const created = normalizeSDKResponse(createResponse, null, {
+        preferResponseOnMissingData: true
+      });
+      childSessionId = typeof created?.id === "string" ? created.id : null;
+      if (!childSessionId)
+        throw new Error("Dreamer could not create its child session.");
+      const sessionId = childSessionId;
+      const remainingMs = Math.max(0, deadline - Date.now());
+      run = await promptSyncWithValidatedOutputRetry(requireDreamClient(deps.client), {
+        path: { id: sessionId },
+        query: { directory: docsDir },
+        body: {
+          agent: task === "maintain-docs" ? DREAMER_DOCS_AGENT : DREAMER_AGENT,
+          system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : withContentLanguageDirective(CURATE_SYSTEM_PROMPT, config.language ?? deps.language),
+          ...modelBodyField(config.model),
+          parts: [{ type: "text", text: taskPrompt, synthetic: true }]
+        }
+      }, {
+        timeoutMs: Math.min(remainingMs, config.timeoutMinutes * 60 * 1000),
+        signal: abortController.signal,
+        fallbackModels: config.fallbackModels,
+        callContext: `dreamer:${task}`,
+        fetchOutput: async () => {
+          const messagesResponse = await requireDreamClient(deps.client).session.messages({
+            path: { id: sessionId },
+            query: {
+              directory: docsDir,
+              ...task === "curate" ? {} : { limit: 50 }
+            }
+          });
+          return normalizeSDKResponse(messagesResponse, [], {
+            preferResponseOnMissingData: true
+          });
+        },
+        validateOutput: (messages) => {
+          const text = extractLatestAssistantText(messages);
+          if (task !== "curate") {
+            if (!text)
+              throw new Error("Dreamer returned no assistant output.");
+            return text;
+          }
+          const memoryOperations = inspectCurateMemoryOperations(messages);
+          if (text)
+            validateCurateAssistantText(text);
+          if (memoryOperations.completedActions.length > 0) {
+            return { text, memoryOperations };
           }
-        });
-        return normalizeSDKResponse(messagesResponse, [], {
-          preferResponseOnMissingData: true
-        });
-      },
-      validateOutput: (messages) => {
-        const text = extractLatestAssistantText(messages);
-        if (task !== "curate") {
           if (!text)
             throw new Error("Dreamer returned no assistant output.");
-          return text;
-        }
-        const memoryOperations = inspectCurateMemoryOperations(messages);
-        if (text)
-          validateCurateAssistantText(text);
-        if (memoryOperations.completedActions.length > 0) {
+          if (memoryOperations.totalCalls > 0) {
+            throw new Error("Curate returned no completed ctx_memory tool result.");
+          }
           return { text, memoryOperations };
         }
-        if (!text)
-          throw new Error("Dreamer returned no assistant output.");
-        if (memoryOperations.totalCalls > 0) {
-          throw new Error("Curate returned no completed ctx_memory tool result.");
-        }
-        return { text, memoryOperations };
-      }
-    });
-    promptSettled = true;
+      });
+      promptSettled = true;
+    }
     if (leaseLost)
       throw new Error("Dream lease lost during task");
-    const curateRefused = task === "curate" ? takeCurateSafetyRefusalCount(sessionId) : 0;
+    const curateRefused = task === "curate" ? takeCurateSafetyRefusalCount(childSessionId ?? "") : 0;
     if (curateRefused > 0) {
       helpers.reportProgress(curateRefused, curateRefused);
       log(`[dreamer] curate safety summary: refused=${curateRefused}`);
@@ -20898,15 +21069,16 @@ async function runAgenticTask(config, ctx, helpers) {
     heartbeat.stop();
     if (childSessionId)
       takeCurateSafetyRefusalCount(childSessionId);
-    await teardownChildSession({
-      client: requireDreamClient(deps.client),
-      sessionId: childSessionId,
-      sessionDirectory: docsDir,
-      promptSettled,
-      privacySensitive: true,
-      context: `[dreamer] ${task}`,
-      log
-    });
+    if (!deps.hiddenCompletionExecutor)
+      await teardownChildSession({
+        client: requireDreamClient(deps.client),
+        sessionId: childSessionId,
+        sessionDirectory: docsDir,
+        promptSettled,
+        privacySensitive: true,
+        context: `[dreamer] ${task}`,
+        log
+      });
   }
 }
 
@@ -26603,6 +26775,21 @@ function formatThresholdClampNote(opts) {
 // src/shared/rust-mode-status.ts
 var RUST_MODE_HOST_PATHS_LINE = "Host backends → MODULE: ctx_memory, ctx_note; historian: module-side";
 
+// src/hooks/magic-context/cache-busting-signals.ts
+function canConsumeDeferredOnThisPass(args) {
+  if (args.justAwaitedPublication)
+    return true;
+  return args.schedulerDecision === "execute" || args.contextPercentage >= (args.forceMaterializationPercentage ?? escalationBands(65).forceMaterializationPercentage);
+}
+function hasReclaimRide(signals) {
+  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory;
+}
+var RECLAIM_RIDE_NAMES = ["hardFold", "force", "explicitFlush", "publishedHistory"];
+function reclaimRideLabel(signals) {
+  const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
+  return `ride=${active.length > 0 ? active.join("+") : "none"}`;
+}
+
 // src/hooks/magic-context/compartment-trigger.ts
 var PROACTIVE_TRIGGER_OFFSET_PERCENTAGE = 2;
 var POST_DROP_TARGET_RATIO = 0.75;
@@ -26780,7 +26967,7 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
 function formatProjectedPostDropPercentage(value) {
   return value === null ? "none" : `${value.toFixed(1)}%`;
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, clearReasoningAge, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, clearReasoningAge, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide) {
   if (sessionMeta.compartmentInProgress) {
     sessionLog(sessionId, `compartment trigger: skipped — historian already in progress (usage=${usage.percentage.toFixed(1)}%)`);
     return { shouldFire: false };
@@ -26838,10 +27025,12 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession(db, sessionId), clearReasoningAge, sessionMeta.clearedReasoningThroughTag, canClearReasoning);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
+  const rideLabel = reclaimRide ? reclaimRideLabel(reclaimRide) : "ride=none";
+  const dropsCanLand = reclaimRide !== undefined && hasReclaimRide(reclaimRide);
   const forceMaterializationPercentage = escalationBands(executeThresholdPercentage).forceMaterializationPercentage;
   if (usage.percentage >= forceMaterializationPercentage) {
-    if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
-      sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — force band is ${forceMaterializationPercentage}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on the next eligible execute pass`);
+    if (dropsCanLand && projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
+      sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — force band is ${forceMaterializationPercentage}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on this pass (${rideLabel})`);
       return { shouldFire: false };
     }
     sessionLog(sessionId, `compartment trigger: force-firing at ${usage.percentage.toFixed(1)}% (projected post-drop ${formatProjectedPostDropPercentage(projectedPostDropPercentage)})`);
@@ -26901,8 +27090,8 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     sessionLog(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% — below proactive floor (${proactiveTriggerPercentage}%)`);
     return { shouldFire: false };
   }
-  if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
-    sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — usage is ${usage.percentage.toFixed(1)}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on the next eligible execute pass`);
+  if (dropsCanLand && projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
+    sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — usage is ${usage.percentage.toFixed(1)}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on this pass (${rideLabel})`);
     return { shouldFire: false };
   }
   if (!tailInfo.hasProtectedEligibleHead || !tailInfo.isMeaningful) {
@@ -30888,9 +31077,9 @@ function registerRpcHandlers(rpcServer, args) {
     return { count: buildCompartmentCount(db, sessionId, moduleStatus) };
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await import("./derive-budgets-0sg5vp61.js");
+    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await import("./derive-budgets-b8ybssh9.js");
     const { resolveHistorianModel } = await import("./model-resolution-dxatzjde.js");
-    const { userMemoryCollectionEnabled } = await import("./task-config-ex4nt0q0.js");
+    const { userMemoryCollectionEnabled } = await import("./task-config-mgf5nsh3.js");
     const DEFAULT_HISTORIAN_TIMEOUT_MS = 600000;
     const runConfig = historianRunConfig(config, currentPluginConfigReader(directory)?.poll().effective ?? config);
     const historianModel = resolveHistorianModel(runConfig, "opencode");
@@ -30922,8 +31111,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await import("./recomp-orchestrator-6akjp11f.js");
-    const { sendIgnoredMessage } = await import("./send-session-notification-f6gwkesy.js");
+    const { runManagedRecomp } = await import("./recomp-orchestrator-r00aa5t3.js");
+    const { sendIgnoredMessage } = await import("./send-session-notification-3warjyjp.js");
     log(`[rpc] recomp requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
     runManagedRecomp(ctx, sessionId).then((message) => {
@@ -30981,7 +31170,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await import("./wrapup-orchestrator-5akc87gr.js");
+    const { runManagedWrapup } = await import("./wrapup-orchestrator-y0bs7t5a.js");
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -31838,21 +32027,6 @@ async function maybeDeliverChannel2(sessionId, deps) {
   }
 }
 
-// src/hooks/magic-context/cache-busting-signals.ts
-function canConsumeDeferredOnThisPass(args) {
-  if (args.justAwaitedPublication)
-    return true;
-  return args.schedulerDecision === "execute" || args.contextPercentage >= (args.forceMaterializationPercentage ?? escalationBands(65).forceMaterializationPercentage);
-}
-function hasReclaimRide(signals) {
-  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory;
-}
-var RECLAIM_RIDE_NAMES = ["hardFold", "force", "explicitFlush", "publishedHistory"];
-function reclaimRideLabel(signals) {
-  const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
-  return `ride=${active.length > 0 ? active.join("+") : "none"}`;
-}
-
 // src/hooks/magic-context/caveman-cleanup.ts
 var DEPTH_UNTOUCHED = 0;
 var DEPTH_LITE = 1;
@@ -36620,7 +36794,7 @@ function rustCaptureDigests(inputs, prior, acceptedInputs) {
 }
 function messageMatchesContentSnapshot(message, snapshot) {
   let fieldIndex = 0;
-  const matched = visitMessageContentFields(message, {
+  const matched = visitMessageContentFields(contentSnapshotValue(message), {
     field(value) {
       if (!Object.is(value, snapshot.fields[fieldIndex]))
         return false;
@@ -36875,6 +37049,7 @@ function ensureState(states, sessionId) {
   if (!state) {
     state = {
       initialized: false,
+      baselineSystemHashOmitted: false,
       consecutiveFailures: 0,
       passCount: 0,
       parked: false,
@@ -37836,6 +38011,7 @@ function createRustModeTransform(deps, options) {
       }
     }
     timings.preflight = performance.now() - passStartedAt;
+    resolveCtxReduceAvailabilityFromMessages(sessionId, messages);
     const reduceAvailability = resolveCtxReduceAvailability(sessionId);
     resolveTodowriteAvailabilityFromMessages(sessionId, messages);
     const todoAvailability = resolveTodowriteAvailability(sessionId);
@@ -37907,6 +38083,8 @@ function createRustModeTransform(deps, options) {
       }
       const effectiveFloor = protectionFloorResolution.floor;
       const historianRun = deps.resolveHistorianRun?.();
+      const observedSystemHash = sessionMeta.systemPromptHash ?? "";
+      const rustSystemHash = state.baselineSystemHashOmitted && sessionMeta.cachedM0SystemHash === observedSystemHash ? "" : observedSystemHash;
       const passInputs = {
         now_ms: requestObservedAtMs,
         model_key: modelKey,
@@ -37928,7 +38106,7 @@ function createRustModeTransform(deps, options) {
         caveman_min_chars: deps.cavemanTextCompression?.minChars ?? 500,
         cache_ttl: sessionMeta.cacheTtl,
         is_subagent: sessionMeta.isSubagent,
-        system_prompt_hash: sessionMeta.systemPromptHash ?? "",
+        system_prompt_hash: rustSystemHash,
         upgrade_state: readUpgradeState(deps.db, sessionId),
         tool_present: toolPresent,
         todo_tool_present: false,
@@ -38203,7 +38381,7 @@ function createRustModeTransform(deps, options) {
         modelKey: modelKey ?? null,
         providerId: model?.providerID ?? null,
         variant: deps.variantBySession?.get(sessionId),
-        systemPromptHash: sessionMeta.systemPromptHash ?? "",
+        systemPromptHash: rustSystemHash,
         upgradeState: String(passInputs.upgrade_state ?? "")
       };
       let body = buildTransformBody({
@@ -38637,6 +38815,9 @@ function createRustModeTransform(deps, options) {
         state.ordinalContinuationBase = ordinalContinuationBase;
       }
       if (!stateSyncRetryBusy) {
+        if (!state.initialized && !observedSystemHash) {
+          state.baselineSystemHashOmitted = true;
+        }
         state.initialized = true;
         state.seedPassPending = false;
       }
@@ -39757,7 +39938,12 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       const tTrigger = performance.now();
       try {
         const inMemoryTail = buildTriggerInMemoryTail(db, sessionId, extractInMemoryMessageViews(messages));
-        const triggerResult = checkCompartmentTrigger(db, sessionId, sessionMeta, boundaryUsageForProtectedTail, sessionMeta.lastContextPercentage, boundaryExecuteThreshold, deriveTriggerBudget2(boundaryContextLimit, boundaryExecuteThreshold), deps.clearReasoningAge, historianRun?.commitClusterTrigger ?? deps.commitClusterTrigger, undefined, boundaryContextLimit, inMemoryTail, taggerFloor, { providerID: resolvedProviderID });
+        const triggerResult = checkCompartmentTrigger(db, sessionId, sessionMeta, boundaryUsageForProtectedTail, sessionMeta.lastContextPercentage, boundaryExecuteThreshold, deriveTriggerBudget2(boundaryContextLimit, boundaryExecuteThreshold), deps.clearReasoningAge, historianRun?.commitClusterTrigger ?? deps.commitClusterTrigger, undefined, boundaryContextLimit, inMemoryTail, taggerFloor, { providerID: resolvedProviderID }, {
+          hardFold: false,
+          force: contextUsageEarly.percentage >= forceMaterializationPercentage && (contextUsageEarly.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
+          explicitFlush: deps.pendingMaterializationSessions.has(sessionId),
+          publishedHistory: isCacheBusting
+        });
         if (triggerResult.shouldFire) {
           sessionLog(sessionId, `compartment trigger: firing (reason=${triggerResult.reason})`);
           updateSessionMeta(db, sessionId, { compartmentInProgress: true });
@@ -41990,7 +42176,7 @@ function createMagicContextHook(deps) {
     pauseEmbedDrain,
     getEmbedStatusText,
     sendNotification: async (sessionId, text, params) => {
-      await sendIgnoredMessage2(deps.client, sessionId, text, {
+      await sendCommandResult2(deps.client, sessionId, text, {
         ...getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession, (deps.sampleDreamConfig?.() ?? deps.config).toast_duration_ms),
         ...params
       });
@@ -45728,9 +45914,33 @@ ${data.output?.output ?? ""}`
 var HIDDEN_HISTORIAN_AGENT = "historian";
 var HIDDEN_DREAMER_AGENT = "dreamer-classifier";
 var HIDDEN_CURATE_AGENT = DREAMER_AGENT;
+var READ_TOOLS = ["read", "grep", "glob"];
+var AGENT_TOOLS = {
+  [HIDDEN_HISTORIAN_AGENT]: [],
+  [HIDDEN_DREAMER_AGENT]: [],
+  [HIDDEN_CURATE_AGENT]: ["ctx_memory", "ctx_memory_list"],
+  [DREAMER_MEMORY_MAPPER_AGENT]: READ_TOOLS,
+  [DREAMER_PRIMER_INVESTIGATOR_AGENT]: [...READ_TOOLS, "ctx_search"],
+  [DREAMER_RETROSPECTIVE_AGENT]: ["ctx_search"]
+};
+var AGENT_STEPS = {
+  [HIDDEN_CURATE_AGENT]: 150,
+  [DREAMER_MEMORY_MAPPER_AGENT]: 60,
+  [DREAMER_DOCS_AGENT]: 60,
+  [DREAMER_PRIMER_INVESTIGATOR_AGENT]: 40,
+  [DREAMER_RETROSPECTIVE_AGENT]: 40
+};
+function hiddenAgentFor(identity) {
+  if (identity.kind === "dreamer-task" && identity.agent === DREAMER_DOCS_AGENT)
+    return DREAMER_MEMORY_MAPPER_AGENT;
+  return identity.kind === "dreamer-task" && AGENT_TOOLS[identity.agent] ? identity.agent : identity.kind === "dreamer-task" ? HIDDEN_DREAMER_AGENT : HIDDEN_HISTORIAN_AGENT;
+}
+function hiddenToolLoop(identity) {
+  return identity.kind === "dreamer-task" && AGENT_STEPS[identity.agent] !== undefined;
+}
 async function registerHiddenChildAgents(agent) {
   await agent.transform((editor) => {
-    for (const id of [HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT]) {
+    for (const id of Object.keys(AGENT_TOOLS)) {
       editor.update(id, (config) => {
         config.system = "Magic Context hidden completion carrier.";
         config.description = "Internal Magic Context hidden completion carrier.";
@@ -45739,16 +45949,14 @@ async function registerHiddenChildAgents(agent) {
         config.request.settings = {};
         config.request.headers = {};
         config.request.body = {};
+        config.steps = AGENT_STEPS[id];
         config.permissions = [
           { action: "*", resource: "*", effect: "deny" },
-          ...id === HIDDEN_CURATE_AGENT ? [
-            { action: "tool", resource: "ctx_memory", effect: "allow" },
-            {
-              action: "tool",
-              resource: "ctx_memory_list",
-              effect: "allow"
-            }
-          ] : []
+          ...(AGENT_TOOLS[id] ?? []).map((tool) => ({
+            action: tool,
+            resource: "*",
+            effect: "allow"
+          }))
         ];
       });
     }
@@ -45793,15 +46001,21 @@ function calibratedParts(attempt) {
 class HiddenChildHook {
   childIDs = new Set;
   attempts = new Map;
+  active = new Map;
   registerChild(sessionID) {
     this.childIDs.add(sessionID);
   }
   registerAttempt(marker, attempt) {
     this.registerChild(attempt.childSessionId);
+    attempt.marker = marker;
     this.attempts.set(marker, attempt);
   }
   releaseAttempt(marker) {
+    const attempt = this.attempts.get(marker);
     this.attempts.delete(marker);
+    if (attempt && this.active.get(attempt.childSessionId) === attempt) {
+      this.active.delete(attempt.childSessionId);
+    }
   }
   owns(sessionID) {
     return this.childIDs.has(sessionID);
@@ -45812,19 +46026,43 @@ class HiddenChildHook {
     const raw = newestUserText(draft);
     const stripped = raw === undefined ? undefined : stripWellFormedLeadingTagPrefix(raw);
     const attempt = (raw !== undefined ? this.attempts.get(raw) : undefined) ?? (stripped && stripped !== raw ? this.attempts.get(stripped) : undefined);
-    if (!attempt || attempt.childSessionId !== draft.sessionID) {
+    const current = this.active.get(draft.sessionID);
+    const selected = attempt ?? current;
+    if (!selected || selected.childSessionId !== draft.sessionID || attempt && current && current !== attempt) {
       throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", "Refusing an unregistered prompt on a Magic Context hidden-run session", true);
     }
-    if (attempt.request.signal?.aborted) {
+    if (selected.request.signal?.aborted) {
       throw new Error("Hidden completion prompt aborted");
     }
-    const system = typeof attempt.request.body.system === "string" ? attempt.request.body.system : attempt.identity.system;
+    if (!selected.shaped) {
+      if (!attempt)
+        throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", "Hidden child first step requires a registered marker", true);
+      this.active.set(draft.sessionID, selected);
+    }
+    const steps = (selected.steps ?? 0) + 1;
+    const cap = AGENT_STEPS[selected.identity.agent];
+    if (cap !== undefined && steps > cap) {
+      throw new Error(`Hidden agent exceeded its ${cap}-step limit`);
+    }
+    selected.steps = steps;
+    const system = typeof selected.request.body.system === "string" ? selected.request.body.system : selected.identity.system;
     draft.system = [{ type: "text", text: system }];
-    draft.messages = [{ role: "user", content: calibratedParts(attempt) }];
-    draft.options = authoredOptions(attempt);
-    const dreamerTools = attempt.identity.agent === DREAMER_AGENT ? Object.fromEntries(["ctx_memory", "ctx_memory_list"].flatMap((id) => draft.tools[id] ? [[id, draft.tools[id]]] : [])) : {};
-    draft.tools = dreamerTools;
-    attempt.shaped = true;
+    if (!selected.shaped) {
+      draft.messages = [{ role: "user", content: calibratedParts(selected) }];
+    } else {
+      const first = draft.messages[0];
+      const firstText = first && newestUserText({ ...draft, messages: [first] });
+      const normalized = firstText === undefined ? undefined : stripWellFormedLeadingTagPrefix(firstText);
+      if (normalized !== selected.marker) {
+        throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", "Hidden child history does not begin with this run's registered marker", true);
+      }
+      draft.messages[0] = { ...first, content: calibratedParts(selected) };
+    }
+    draft.options = authoredOptions(selected);
+    const allowed = AGENT_TOOLS[hiddenAgentFor(selected.identity)] ?? [];
+    draft.tools = Object.fromEntries(allowed.flatMap((id) => draft.tools[id] ? [[id, draft.tools[id]]] : []));
+    selected.observedMessages = draft.messages;
+    selected.shaped = true;
     return true;
   }
 }
@@ -45906,9 +46144,9 @@ function resolveOwnerHostService(owner, env = process.env, pid = process.pid) {
   }
   return own;
 }
-async function removeHostSession(sessionID, owner, env = process.env) {
+async function removeHostSession(sessionID, owner, env = process.env, fetchSession = fetch) {
   const service = resolveOwnerHostService(owner, env);
-  const response = await fetch(`${service.url}/api/session/${encodeURIComponent(sessionID)}`, {
+  const response = await fetchSession(`${service.url}/api/session/${encodeURIComponent(sessionID)}`, {
     method: "DELETE",
     headers: service.headers,
     signal: AbortSignal.timeout(60000)
@@ -46110,6 +46348,37 @@ function settledProviderError(row) {
 function successfulReusableAssistant(row) {
   return row !== undefined && (typeof row.data.finish === "string" || assistantOutcome(row) === "succeeded") && row.data.error === undefined && row.data.tokens !== undefined;
 }
+function toolLoopMessages(attempt) {
+  const messages = attempt.observedMessages ?? [];
+  const results = new Map;
+  for (const message of messages) {
+    if (message.role !== "tool")
+      continue;
+    for (const part of message.content) {
+      if (part.type !== "tool-result" || typeof part.id !== "string")
+        continue;
+      const result = part.result;
+      results.set(part.id, { status: result?.type === "error" ? "error" : "completed" });
+    }
+  }
+  return messages.flatMap((message) => {
+    if (message.role !== "assistant")
+      return [];
+    const parts = message.content.flatMap((part) => {
+      if (part.type !== "tool-call" || typeof part.id !== "string" || typeof part.name !== "string")
+        return [];
+      const result = results.get(part.id);
+      return [
+        {
+          type: "tool",
+          tool: part.name,
+          state: { status: result?.status ?? "pending", input: part.input }
+        }
+      ];
+    });
+    return parts.length ? [{ info: { role: "assistant" }, parts }] : [];
+  });
+}
 function assistantText(row) {
   const text = (row.data.content ?? []).flatMap((part) => part.type === "text" && typeof part.text === "string" ? [part.text] : []).join("");
   return text.length > 0 ? text : null;
@@ -46361,7 +46630,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
     }
   };
   return {
-    capabilities: { tools: false, harness: "opencode2" },
+    capabilities: { tools: true, harness: "opencode2" },
     async open(identity) {
       const role = roleFor(identity);
       const releaseRole = await acquireRole(role);
@@ -46370,6 +46639,10 @@ async function createV2HiddenCompletionExecutor(host, options) {
         await options.ensureAgent?.();
         const head = await resolveHead(identity);
         let active = store.read().active[role];
+        if (active && hiddenToolLoop(identity)) {
+          retireChild(active, "fresh-tool-loop-run");
+          active = undefined;
+        }
         if (active && active.generation !== generation) {
           retireChild(active, "host-generation-changed");
           active = undefined;
@@ -46392,7 +46665,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
           const title = roleTitle(role);
           const created = await host.create({
             title,
-            agent: roleAgent(role),
+            agent: hiddenToolLoop(identity) ? hiddenAgentFor(identity) : roleAgent(role),
             model: {
               providerID: head.providerID,
               id: head.modelID,
@@ -46450,6 +46723,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
       await switchChildModel(run, requested);
       const baseline = withReader(options.openReader, (reader) => reader.latestSequence(run.child.id));
       const marker = `mc:hidden:${crypto.randomUUID()}:${crypto.randomUUID()}`;
+      run.completion = undefined;
       const attempt = {
         childSessionId: run.child.id,
         identity: run.identity,
@@ -46509,6 +46783,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         }
         run.completion = {
           text,
+          ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt) } : {},
           reasoning: null,
           usage: reportedInput !== undefined || reportedOutput !== undefined ? {
             input: reportedInput ?? 0,
@@ -46553,7 +46828,9 @@ async function createV2HiddenCompletionExecutor(host, options) {
         return;
       try {
         const reusable = run.failed && !run.unsettledFailure;
-        if (!run.completion && (run.failed || !settlement.promptSettled) && !reusable) {
+        if (hiddenToolLoop(run.identity)) {
+          retire(run, settlement.promptSettled ? "tool-loop-settled" : "tool-loop-failed");
+        } else if (!run.completion && (run.failed || !settlement.promptSettled) && !reusable) {
           retire(run, "hidden-run-failed");
         }
       } finally {
@@ -47279,6 +47556,23 @@ async function warmModelLimitCacheFromCatalog(context, options = {}) {
 
 // src/v2/hooks/payload.ts
 var HEAD_IDS = ["__magic_context_v2_m0__", "__magic_context_v2_m1__"];
+var HOST_CONTENT_TYPES = new Set([
+  "text",
+  "media",
+  "tool-call",
+  "tool-result",
+  "reasoning",
+  "compaction",
+  "effort"
+]);
+function rejectContentPart(message, part, reason) {
+  const type = typeof part.type === "string" ? part.type : "<missing>";
+  const text = `v2 context omitted a content part the host would reject: type=${type} message=${String(message.info.id ?? "<head>")} reason=${reason}`;
+  if (typeof message.info.sessionID === "string")
+    sessionLog(message.info.sessionID, text);
+  else
+    log(text);
+}
 function isHostInstance(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return false;
@@ -47469,6 +47763,56 @@ function adaptPayload(draft, admittedIDs = new Set) {
           const part = candidate;
           const bridge = bridges.get(part) ?? (part.type === "tool" && typeof part.callID === "string" ? bridgesFor(message)?.get(part.callID) : undefined);
           if (!bridge) {
+            if (part.type === "tool") {
+              const state = part.state;
+              if (typeof part.callID !== "string" || typeof part.tool !== "string" || !state || typeof state !== "object") {
+                rejectContentPart(message, part, "tool has no call ID, name, or state");
+                continue;
+              }
+              content.push({
+                type: "tool-call",
+                id: part.callID,
+                name: part.tool,
+                input: state.input
+              });
+              if (state.status === "completed" || state.status === "error") {
+                following.push({
+                  role: "tool",
+                  content: [
+                    {
+                      type: "tool-result",
+                      id: part.callID,
+                      name: part.tool,
+                      result: {
+                        type: state.status === "error" ? "error" : "text",
+                        value: toolStateContent(state)
+                      }
+                    }
+                  ]
+                });
+              }
+              continue;
+            }
+            if (part.type === "file") {
+              const mime = part.mime;
+              const url = part.url;
+              const prefix = `data:${mime};base64,`;
+              if (typeof mime !== "string" || !/^image\/(png|jpeg|gif|webp)$/.test(mime) || typeof url !== "string" || !url.startsWith(prefix)) {
+                rejectContentPart(message, part, "file is not an inline supported image");
+                continue;
+              }
+              const asset = hostMediaAsset(url.slice(prefix.length), mime);
+              if (typeof asset === "string") {
+                rejectContentPart(message, part, `host media unavailable: ${asset}`);
+                continue;
+              }
+              content.push({ type: "media", media: asset });
+              continue;
+            }
+            if (!HOST_CONTENT_TYPES.has(String(part.type))) {
+              rejectContentPart(message, part, "unknown host content type");
+              continue;
+            }
             const { synthetic: _synthetic, ...clean } = part;
             const original = hostPartTypes.has(clean.type) && !containsHostInstance(clean) ? hostParts.get(contentKey(clean)) : undefined;
             content.push(original ?? clean);
@@ -47476,14 +47820,23 @@ function adaptPayload(draft, admittedIDs = new Set) {
           }
           const state = part.state;
           if (bridge.native) {
-            const sourceState = bridge.native.state && typeof bridge.native.state === "object" ? bridge.native.state : {};
-            const nextState = { ...sourceState, input: state.input };
-            if (sourceState.content !== undefined) {
-              nextState.content = state.output === bridge.output ? sourceState.content : [{ type: "text", text: state.output }];
-            } else {
-              nextState.output = state.output;
+            const native = bridge.native;
+            const callID = String(native.id ?? native.callID ?? part.callID);
+            const name = String(native.name ?? native.tool ?? part.tool);
+            content.push({ type: "tool-call", id: callID, name, input: state.input });
+            if (state.status === "completed" || state.status === "error") {
+              following.push({
+                role: "tool",
+                content: [
+                  {
+                    type: "tool-result",
+                    id: callID,
+                    name,
+                    result: { type: "text", value: state.output }
+                  }
+                ]
+              });
             }
-            content.push({ ...bridge.native, state: nextState });
             continue;
           }
           if (bridge.call)
@@ -48753,7 +49106,7 @@ var server = async (ctx) => {
     if (hasBannerEntries)
       setTimeout(async () => {
         try {
-          const { sendStatusNotification } = await import("./send-session-notification-f6gwkesy.js");
+          const { sendStatusNotification } = await import("./send-session-notification-3warjyjp.js");
           const clientWithSessions = ctx.client;
           const sessions = await Promise.resolve(clientWithSessions.session?.list?.()).catch(() => null);
           const sessionList = Array.isArray(sessions) ? sessions : sessions?.data;
@@ -48770,7 +49123,7 @@ var server = async (ctx) => {
     log(`[magic-context] opencode_db_missing path=${openCodeDbResolution.path} source=${openCodeDbResolution.source}`);
     setTimeout(async () => {
       try {
-        const { sendStatusNotification } = await import("./send-session-notification-f6gwkesy.js");
+        const { sendStatusNotification } = await import("./send-session-notification-3warjyjp.js");
         const clientWithSessions = ctx.client;
         const sessions = await Promise.resolve(clientWithSessions.session?.list?.()).catch(() => null);
         const sessionList = Array.isArray(sessions) ? sessions : sessions?.data;
@@ -49037,12 +49390,12 @@ var server = async (ctx) => {
   {
     const fence = getSchemaFenceRejection();
     if (fence) {
-      import("./conflict-warning-hook-t2vb0wnx.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
+      import("./conflict-warning-hook-956fkedc.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
     }
   }
   const serverUrl = ctx.serverUrl;
   const serverUrlStr = serverUrl instanceof URL ? serverUrl.toString().replace(/\/$/, "") : typeof serverUrl === "string" ? serverUrl.replace(/\/$/, "") : undefined;
-  import("./send-session-notification-f6gwkesy.js").then(({ setNotificationServerUrl }) => {
+  import("./send-session-notification-3warjyjp.js").then(({ setNotificationServerUrl }) => {
     setNotificationServerUrl(serverUrlStr);
   });
   if (conflictResult?.hasConflict) {
@@ -49056,7 +49409,7 @@ var server = async (ctx) => {
   }
   if (pluginConfig.enabled && !conflictResult?.hasConflict) {
     setTimeout(() => {
-      import("./announcement-8mgn61fw.js").then(({
+      import("./announcement-1a8bvswd.js").then(({
         shouldShowAnnouncement,
         ANNOUNCEMENT_VERSION,
         ANNOUNCEMENT_FEATURES,
@@ -49065,7 +49418,7 @@ var server = async (ctx) => {
       }) => {
         if (!shouldShowAnnouncement())
           return;
-        return import("./conflict-warning-hook-t2vb0wnx.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION, ANNOUNCEMENT_FEATURES, ANNOUNCEMENT_FOOTER, markAnnouncementSeen));
+        return import("./conflict-warning-hook-956fkedc.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION, ANNOUNCEMENT_FEATURES, ANNOUNCEMENT_FOOTER, markAnnouncementSeen));
       }).catch(() => {});
     }, 8000);
   }
@@ -49138,9 +49491,7 @@ var server = async (ctx) => {
       const provId = typed.model?.providerID;
       const modId = typed.model?.modelID;
       const agent = typed.agent;
-      if (provId && modId && agent) {
-        lastChatContext = { providerID: provId, modelID: modId, agentName: agent };
-      }
+      lastChatContext = provId && modId ? { providerID: provId, modelID: modId, agentName: agent || "default" } : null;
       await magicContextRuntime.magicContext?.["chat.message"]?.(input, output);
     },
     "tool.definition": async (input, output) => {