@cortexkit/opencode-magic-context 0.43.0 → 0.43.1

package/dist/v2/server.js

@@ -1675,8 +1675,15 @@ function getHarness() {
 }
 var currentHarness = "opencode", harnessLocked = false;
 
+// src/shared/test-temp-dir.ts
+var STALE_TEMP_DIR_AGE_MS, registeredTempDirs;
+var init_test_temp_dir = __esm(() => {
+  STALE_TEMP_DIR_AGE_MS = 60 * 60 * 1000;
+  registeredTempDirs = new Set;
+});
+
 // src/shared/data-path.ts
-import { existsSync as existsSync2, mkdirSync, mkdtempSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 function getDataDir() {
@@ -1764,7 +1771,9 @@ function getLegacyOpenCodeMagicContextStorageDir() {
   return path.join(getOpenCodeStorageDir(), "plugin", "magic-context");
 }
 var GITIGNORE_GUARD_OPEN = "# >>> cortexkit:magic-context", GITIGNORE_GUARD_CLOSE = "# <<< cortexkit:magic-context";
-var init_data_path = () => {};
+var init_data_path = __esm(() => {
+  init_test_temp_dir();
+});
 
 // src/shared/harness-provider-map.ts
 function remapProviderPrefix(ref, map) {
@@ -8994,7 +9003,7 @@ var init_task_registry = __esm(() => {
     "maintain-docs": {
       requiresTools: true,
       transport: "tool-loop",
-      toolLoopPurpose: "needs file read and write tools to update project documentation"
+      toolLoopPurpose: "needs read-only file tools to investigate documentation corrections"
     },
     "evaluate-smart-notes": { requiresTools: false, transport: "single-shot" },
     "review-user-memories": { requiresTools: false, transport: "single-shot" },
@@ -18005,6 +18014,8 @@ function hasCountableParts(message) {
       case "step-start":
       case "step-finish":
         return true;
+      case "file":
+        return typeof p.url === "string" && p.url.startsWith("data:image/");
       default:
         return false;
     }
@@ -25201,9 +25212,22 @@ function visitMessageContentFields(value, visitor) {
   }
   return visitor.field(LKG_SNAPSHOT_UNDEFINED);
 }
+function contentSnapshotValue(value) {
+  if (!value || typeof value !== "object")
+    return value;
+  const message = value;
+  const info = message.info;
+  const summary = info?.summary;
+  if (!Array.isArray(message.parts) || info?.role !== "user" || summary === null || typeof summary !== "object" || Array.isArray(summary) || Object.keys(summary).length !== 1 || !Array.isArray(summary.diffs) || summary.diffs.length !== 0)
+    return value;
+  return {
+    ...message,
+    info: Object.fromEntries(Object.entries(info).filter(([key]) => key !== "summary"))
+  };
+}
 function messageContentFields(message) {
   const fields = [];
-  const complete = visitMessageContentFields(message, {
+  const complete = visitMessageContentFields(contentSnapshotValue(message), {
     field(value) {
       fields.push(value);
       return true;
@@ -25269,7 +25293,7 @@ function lkgContentFields(value) {
       fields.push(LKG_SNAPSHOT_UNDEFINED);
   };
   try {
-    visit(value);
+    visit(contentSnapshotValue(value));
     return fields;
   } catch {
     return null;
@@ -73985,7 +74009,12 @@ async function runGit(cwd, args) {
       encoding: "utf8"
     });
     return String(result.stdout);
-  } catch {
+  } catch (error) {
+    if (error.killed || error.code === "ETIMEDOUT") {
+      throw new Error(`Git verification command timed out after ${GIT_TIMEOUT_MS2}ms`, {
+        cause: error
+      });
+    }
     return null;
   }
 }
@@ -74408,6 +74437,45 @@ var init_note_nudger = __esm(() => {
   lastDeliveredAt = new Map;
 });
 
+// src/shared/safe-notification-target.ts
+function isDefaultSessionTitle(title) {
+  return DEFAULT_TITLE_RE.test(title);
+}
+async function readSessionTitle(client, sessionId) {
+  try {
+    const c = client;
+    if (typeof c.session?.get !== "function")
+      return null;
+    const raw = await Promise.resolve(c.session.get({ path: { id: sessionId } }));
+    const obj = raw;
+    const title = obj && typeof obj === "object" ? obj.data?.title ?? obj.title : undefined;
+    return typeof title === "string" ? title : null;
+  } catch {
+    return null;
+  }
+}
+async function waitForSafeNotificationTarget(client, sessionId, options) {
+  const attempts = Math.max(1, options?.attempts ?? 4);
+  const delayMs = options?.delayMs ?? 15000;
+  for (let attempt = 0;attempt < attempts; attempt += 1) {
+    const title = await readSessionTitle(client, sessionId);
+    if (title === null)
+      return "safe";
+    if (!isDefaultSessionTitle(title))
+      return "safe";
+    if (attempt < attempts - 1) {
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+  }
+  log(`[magic-context] notification skipped: session ${sessionId} still has its default title (would suppress title generation); will retry on a later startup`);
+  return "skip";
+}
+var DEFAULT_TITLE_RE;
+var init_safe_notification_target = __esm(() => {
+  init_logger();
+  DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+});
+
 // src/shared/rpc-notifications.ts
 function registerNotificationSink(sink) {
   sinks.add(sink);
@@ -74508,45 +74576,6 @@ var init_rpc_notifications = __esm(() => {
   sinks = new Set;
 });
 
-// src/shared/safe-notification-target.ts
-function isDefaultSessionTitle(title) {
-  return DEFAULT_TITLE_RE.test(title);
-}
-async function readSessionTitle(client, sessionId) {
-  try {
-    const c = client;
-    if (typeof c.session?.get !== "function")
-      return null;
-    const raw = await Promise.resolve(c.session.get({ path: { id: sessionId } }));
-    const obj = raw;
-    const title = obj && typeof obj === "object" ? obj.data?.title ?? obj.title : undefined;
-    return typeof title === "string" ? title : null;
-  } catch {
-    return null;
-  }
-}
-async function waitForSafeNotificationTarget(client, sessionId, options) {
-  const attempts = Math.max(1, options?.attempts ?? 4);
-  const delayMs = options?.delayMs ?? 15000;
-  for (let attempt = 0;attempt < attempts; attempt += 1) {
-    const title = await readSessionTitle(client, sessionId);
-    if (title === null)
-      return "safe";
-    if (!isDefaultSessionTitle(title))
-      return "safe";
-    if (attempt < attempts - 1) {
-      await new Promise((resolve) => setTimeout(resolve, delayMs));
-    }
-  }
-  log(`[magic-context] notification skipped: session ${sessionId} still has its default title (would suppress title generation); will retry on a later startup`);
-  return "skip";
-}
-var DEFAULT_TITLE_RE;
-var init_safe_notification_target = __esm(() => {
-  init_logger();
-  DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
-});
-
 // src/shared/prompt-context.ts
 function isRecord6(value) {
   return typeof value === "object" && value !== null;
@@ -74908,6 +74937,7 @@ async function sendStatusNotification(_client, sessionId, text, params) {
 var MAX_QUEUED_IGNORED_NOTIFICATIONS = 16, queuedIgnoredNotifications, flushingIgnoredNotifications, idleSessions, lastDeliveredText, activityEpoch, defaultHoldDetector = (sessionId) => !idleSessions.has(sessionId) || shouldHoldIgnoredNotification(sessionId), holdDetector, notificationServerUrl, noticeDeleter, notificationDiagnosticObserverForTests;
 var init_send_session_notification = __esm(async () => {
   init_logger();
+  init_safe_notification_target();
   await init_read_session_db();
   queuedIgnoredNotifications = new Map;
   flushingIgnoredNotifications = new Set;
@@ -75052,6 +75082,74 @@ var init_storage_user_memory = __esm(() => {
   USER_MEMORY_CANDIDATE_TTL_MS = 30 * 24 * 60 * 60 * 1000;
 });
 
+// src/shared/assistant-message-extractor.ts
+function asSessionMessage(value) {
+  if (!isRecord3(value))
+    return null;
+  const info = value.info;
+  const parts = value.parts;
+  return {
+    info: isRecord3(info) ? {
+      role: typeof info.role === "string" ? info.role : undefined,
+      time: isRecord3(info.time) ? {
+        created: typeof info.time.created === "number" ? info.time.created : undefined
+      } : undefined,
+      error: info.error,
+      finish: typeof info.finish === "string" ? info.finish : typeof info.finish_reason === "string" ? info.finish_reason : typeof info.finishReason === "string" ? info.finishReason : undefined
+    } : undefined,
+    parts
+  };
+}
+function getCreatedTime(message) {
+  return message.info?.time?.created ?? 0;
+}
+function getTextParts(message) {
+  if (!Array.isArray(message.parts))
+    return [];
+  return message.parts.filter((part) => isRecord3(part)).map((part) => ({
+    type: typeof part.type === "string" ? part.type : undefined,
+    text: typeof part.text === "string" ? part.text : undefined
+  })).filter((part) => part.type === "text" && Boolean(part.text));
+}
+function getLatestAssistantMessage(messages) {
+  if (!Array.isArray(messages) || messages.length === 0)
+    return null;
+  return messages.map(asSessionMessage).filter((message) => message !== null).filter((message) => message.info?.role === "assistant").sort((a, b) => getCreatedTime(b) - getCreatedTime(a))[0] ?? null;
+}
+function extractLatestAssistantText(messages) {
+  const latest = getLatestAssistantMessage(messages);
+  if (!latest)
+    return null;
+  return getTextParts(latest).map((part) => part.text).join(`
+`) || null;
+}
+function extractLatestAssistantFailure(messages) {
+  const latest = getLatestAssistantMessage(messages);
+  if (!latest || latest.info?.error === undefined || latest.info.error === null)
+    return null;
+  return {
+    error: latest.info.error,
+    finish: latest.info.finish ?? null
+  };
+}
+function hasLengthCappedOutput(value) {
+  if (Array.isArray(value))
+    return value.some((item) => hasLengthCappedOutput(item));
+  if (!isRecord3(value))
+    return false;
+  if (value.length_capped === true || value.lengthCapped === true)
+    return true;
+  const finishReason = value.finish_reason ?? value.finishReason ?? value.finish ?? (value.type === "step-finish" ? value.reason : undefined) ?? value.stopReason;
+  if (typeof finishReason === "string") {
+    const normalized = finishReason.toLowerCase();
+    if (normalized === "length" || normalized === "max_tokens" || normalized === "max_output_tokens") {
+      return true;
+    }
+  }
+  return Object.values(value).some((item) => hasLengthCappedOutput(item));
+}
+var init_assistant_message_extractor = () => {};
+
 // src/shared/resolve-fallbacks.ts
 function parseProviderModel(spec) {
   const slash = spec.indexOf("/");
@@ -75343,6 +75441,17 @@ async function attemptAndValidate(client, args, timeoutMs, signal, callContext,
     };
   }
   try {
+    if (!extractLatestAssistantText(output)) {
+      const assistantFailure = extractLatestAssistantFailure(output);
+      if (assistantFailure) {
+        const error = new Error(`Host recorded assistant error: ${String(assistantFailure.error)}`);
+        Object.assign(error, {
+          name: "DreamerProviderOutputFailureError",
+          transient: true
+        });
+        throw error;
+      }
+    }
     const validated = await options.validateOutput(output, attempt);
     return { output, validated, attempt };
   } catch (error) {
@@ -75429,6 +75538,7 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
 var ABORT_CALL_TIMEOUT_MS = 3000, promptFailureDetails;
 var init_model_suggestion_retry = __esm(() => {
   init_overflow_detection();
+  init_assistant_message_extractor();
   init_logger();
   init_redaction();
   promptFailureDetails = new WeakMap;
@@ -77636,74 +77746,6 @@ var init_subagent_token_capture = __esm(() => {
   init_logger();
 });
 
-// src/shared/assistant-message-extractor.ts
-function asSessionMessage(value) {
-  if (!isRecord3(value))
-    return null;
-  const info = value.info;
-  const parts = value.parts;
-  return {
-    info: isRecord3(info) ? {
-      role: typeof info.role === "string" ? info.role : undefined,
-      time: isRecord3(info.time) ? {
-        created: typeof info.time.created === "number" ? info.time.created : undefined
-      } : undefined,
-      error: info.error,
-      finish: typeof info.finish === "string" ? info.finish : typeof info.finish_reason === "string" ? info.finish_reason : typeof info.finishReason === "string" ? info.finishReason : undefined
-    } : undefined,
-    parts
-  };
-}
-function getCreatedTime(message) {
-  return message.info?.time?.created ?? 0;
-}
-function getTextParts(message) {
-  if (!Array.isArray(message.parts))
-    return [];
-  return message.parts.filter((part) => isRecord3(part)).map((part) => ({
-    type: typeof part.type === "string" ? part.type : undefined,
-    text: typeof part.text === "string" ? part.text : undefined
-  })).filter((part) => part.type === "text" && Boolean(part.text));
-}
-function getLatestAssistantMessage(messages) {
-  if (!Array.isArray(messages) || messages.length === 0)
-    return null;
-  return messages.map(asSessionMessage).filter((message) => message !== null).filter((message) => message.info?.role === "assistant").sort((a, b) => getCreatedTime(b) - getCreatedTime(a))[0] ?? null;
-}
-function extractLatestAssistantText(messages) {
-  const latest = getLatestAssistantMessage(messages);
-  if (!latest)
-    return null;
-  return getTextParts(latest).map((part) => part.text).join(`
-`) || null;
-}
-function extractLatestAssistantFailure(messages) {
-  const latest = getLatestAssistantMessage(messages);
-  if (!latest || latest.info?.error === undefined || latest.info.error === null)
-    return null;
-  return {
-    error: latest.info.error,
-    finish: latest.info.finish ?? null
-  };
-}
-function hasLengthCappedOutput(value) {
-  if (Array.isArray(value))
-    return value.some((item) => hasLengthCappedOutput(item));
-  if (!isRecord3(value))
-    return false;
-  if (value.length_capped === true || value.lengthCapped === true)
-    return true;
-  const finishReason = value.finish_reason ?? value.finishReason ?? value.finish ?? (value.type === "step-finish" ? value.reason : undefined) ?? value.stopReason;
-  if (typeof finishReason === "string") {
-    const normalized = finishReason.toLowerCase();
-    if (normalized === "length" || normalized === "max_tokens" || normalized === "max_output_tokens") {
-      return true;
-    }
-  }
-  return Object.values(value).some((item) => hasLengthCappedOutput(item));
-}
-var init_assistant_message_extractor = () => {};
-
 // src/shared/keep-subagents.ts
 function shouldKeepSubagents() {
   return keepSubagents;
@@ -108022,9 +108064,26 @@ init_window_geometry();
 init_compartment_storage();
 init_session_decision_calibration();
 init_logger();
+await init_storage();
+
+// 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
 init_read_session_true_raw_tokens();
 await __promiseAll([
-  init_storage(),
   init_protected_tail_boundary(),
   init_read_session_chunk()
 ]);
@@ -108204,7 +108263,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 };
@@ -108262,10 +108321,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)})`);
@@ -108325,8 +108386,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) {
@@ -109081,21 +109142,6 @@ init_harness_provider_map();
 init_logger();
 init_models_dev_cache();
 
-// 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
 init_shared();
 await init_storage();
@@ -115888,7 +115934,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;
@@ -116143,6 +116189,7 @@ function ensureState(states, sessionId) {
   if (!state) {
     state = {
       initialized: false,
+      baselineSystemHashOmitted: false,
       consecutiveFailures: 0,
       passCount: 0,
       parked: false,
@@ -117104,6 +117151,7 @@ function createRustModeTransform(deps, options) {
       }
     }
     timings.preflight = performance.now() - passStartedAt;
+    resolveCtxReduceAvailabilityFromMessages(sessionId, messages);
     const reduceAvailability = resolveCtxReduceAvailability(sessionId);
     resolveTodowriteAvailabilityFromMessages(sessionId, messages);
     const todoAvailability = resolveTodowriteAvailability(sessionId);
@@ -117175,6 +117223,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,
@@ -117196,7 +117246,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,
@@ -117471,7 +117521,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({
@@ -117905,6 +117955,9 @@ function createRustModeTransform(deps, options) {
         state.ordinalContinuationBase = ordinalContinuationBase;
       }
       if (!stateSyncRetryBusy) {
+        if (!state.initialized && !observedSystemHash) {
+          state.baselineSystemHashOmitted = true;
+        }
         state.initialized = true;
         state.seedPassPending = false;
       }
@@ -119033,7 +119086,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, deriveTriggerBudget(boundaryContextLimit, boundaryExecuteThreshold), deps.clearReasoningAge, historianRun?.commitClusterTrigger ?? deps.commitClusterTrigger, undefined, boundaryContextLimit, inMemoryTail, taggerFloor, { providerID: resolvedProviderID });
+        const triggerResult = checkCompartmentTrigger(db, sessionId, sessionMeta, boundaryUsageForProtectedTail, sessionMeta.lastContextPercentage, boundaryExecuteThreshold, deriveTriggerBudget(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 });
@@ -122771,9 +122829,33 @@ init_tag_content_primitives();
 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.";
@@ -122782,16 +122864,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"
+          }))
         ];
       });
     }
@@ -122836,15 +122916,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);
@@ -122855,19 +122941,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;
   }
 }
@@ -122949,9 +123059,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)
@@ -123153,6 +123263,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;
@@ -123404,7 +123545,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);
@@ -123413,6 +123554,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;
@@ -123435,7 +123580,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,
@@ -123493,6 +123638,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,
@@ -123552,6 +123698,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,
@@ -123596,7 +123743,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 {
@@ -125137,13 +125286,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,
@@ -126226,7 +126375,7 @@ import { createHash as createHash30 } from "node:crypto";
 import {
   existsSync as existsSync16,
   mkdirSync as mkdirSync11,
-  mkdtempSync as mkdtempSync2,
+  mkdtempSync,
   readdirSync as readdirSync6,
   readFileSync as readFileSync16,
   realpathSync as realpathSync4,
@@ -126333,7 +126482,7 @@ function protectedBytes(text) {
   ].map((match) => match[0]);
 }
 function diff(name, before, after) {
-  const dir = mkdtempSync2(join17(tmpdir2(), "mc-doc-diff-"));
+  const dir = mkdtempSync(join17(tmpdir2(), "mc-doc-diff-"));
   try {
     writeFileSync8(join17(dir, "before"), before);
     writeFileSync8(join17(dir, "after"), after);
@@ -128305,8 +128454,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",
@@ -128318,8 +128495,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: {
@@ -128334,7 +128510,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 }
         });
@@ -128377,15 +128553,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) {
@@ -129001,8 +129178,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",
@@ -129014,8 +129224,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: {
@@ -129030,7 +129239,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 }
         });
@@ -129059,15 +129268,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) {
@@ -129757,8 +129967,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",
@@ -129770,8 +130012,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: {
@@ -129786,7 +130027,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 }
         });
@@ -129827,15 +130068,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) {
@@ -130003,6 +130245,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
@@ -130336,7 +130580,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,
@@ -130373,7 +130618,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,
@@ -130474,7 +130720,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,
@@ -130742,24 +130989,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: {
@@ -130773,7 +131041,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 }
@@ -130783,14 +131057,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) {
@@ -130920,15 +131195,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) {
@@ -131002,72 +131285,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}`);
@@ -131137,15 +131455,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
+      });
   }
 }
 
@@ -131598,7 +131917,25 @@ async function warmModelLimitCacheFromCatalog(context, options = {}) {
 }
 
 // src/v2/hooks/payload.ts
+init_logger();
 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;
@@ -131789,6 +132126,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);
@@ -131796,14 +132183,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)
@@ -147857,7 +148253,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" }
     });