@cortexkit/pi-magic-context 0.43.0 → 0.43.2

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   log,
   sessionLog,
   flushLogger
-} from "./index-83wwtw1q.js";
+} from "./index-bfd52y8p.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -402,7 +402,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-5tw61yhp.js";
+} from "./index-bkrh6jhp.js";
 import {
   CTX_REDUCE_KEEP,
   newestCtxReduceTagNumbers,
@@ -512,13 +512,14 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-vcjgpb6f.js";
+} from "./index-mea04n1j.js";
 import {
   pushNotification2
 } from "./index-b3eqj1g6.js";
+import"./index-5v60m046.js";
 import {
   logSlowWriteTransaction
-} from "./index-y33j7m6y.js";
+} from "./index-17102c1m.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -842,7 +843,7 @@ var DREAM_TASK_CAPABILITIES = {
   "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" },
@@ -1823,6 +1824,8 @@ function setCtxReduceRegisteredGlobally(registered) {
 var availabilityBySession = new BoundedSessionMap(1000);
 var permissionDeniedBySession = new BoundedSessionMap(2000);
 var ctxReducePermissionDenyLogged = new BoundedSessionMap(1000);
+var ctxReduceSpawnPermissionDenied = new BoundedSessionMap(1000);
+var ctxReduceSpawnPermissionReads = new Map;
 
 // ../plugin/src/hooks/magic-context/derive-budgets.ts
 var TRIGGER_BUDGET_PERCENTAGE = 0.05;
@@ -2779,6 +2782,11 @@ var USER_FACING_FAILURES = {
     sentence: "Some finished background sessions could not be removed from this host.",
     action: "They are removed automatically the next time Magic Context runs inside a registered OpenCode service."
   },
+  historian_saved_history_misaligned: {
+    code: "MC-H03",
+    sentence: "History compression is paused because this session's saved summaries no longer line up with its messages.",
+    action: "Run /ctx-recomp to rebuild them."
+  },
   recomp_unavailable: {
     code: "MC-R01",
     sentence: "History compression could not be rebuilt.",
@@ -2949,6 +2957,11 @@ var USER_FACING_FAILURES = {
     sentence: "History compression is paused while the engine syncs.",
     action: "Retry in a moment."
   },
+  history_compression_needs_message: {
+    code: "MC-C12",
+    sentence: "History compression has not seen this session since Magic Context reconnected.",
+    action: "Send a message in this session first, then run /ctx-wrapup again."
+  },
   context_service_unavailable: {
     code: "MC-C10",
     sentence: "Magic Context is temporarily unavailable.",
@@ -3191,6 +3204,73 @@ class HiddenCompletionRefusal extends Error {
     this.name = "HiddenCompletionRefusal";
   }
 }
+// ../plugin/src/shared/assistant-message-extractor.ts
+function asSessionMessage(value) {
+  if (!isRecord(value))
+    return null;
+  const info = value.info;
+  const parts = value.parts;
+  return {
+    info: isRecord(info) ? {
+      role: typeof info.role === "string" ? info.role : undefined,
+      time: isRecord(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) => isRecord(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 (!isRecord(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));
+}
+
 // ../plugin/src/shared/resolve-fallbacks.ts
 function parseProviderModel(spec) {
   const slash = spec.indexOf("/");
@@ -3484,6 +3564,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) {
@@ -3611,73 +3702,6 @@ function summarizeChildStderr(stderr) {
   return excerptLines.join(`
 `).slice(0, MAX_CHILD_STDERR_SUMMARY_LENGTH);
 }
-// ../plugin/src/shared/assistant-message-extractor.ts
-function asSessionMessage(value) {
-  if (!isRecord(value))
-    return null;
-  const info = value.info;
-  const parts = value.parts;
-  return {
-    info: isRecord(info) ? {
-      role: typeof info.role === "string" ? info.role : undefined,
-      time: isRecord(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) => isRecord(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 (!isRecord(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));
-}
-
 // ../plugin/src/shared/child-session-teardown.ts
 async function teardownChildSession(args) {
   const { client, sessionId, sessionDirectory, promptSettled, context, log } = args;
@@ -6526,13 +6550,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,
@@ -7248,8 +7272,11 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
       anchors
     });
     if (moduleRoute) {
-      const run = await runClassifyThroughModule(args, chunk, anchors, signal);
-      recordInvocation(args, startedAt, { status: "completed" });
+      const { accounting, ...run } = await runClassifyThroughModule(args, chunk, anchors, signal);
+      recordInvocation(args, startedAt, {
+        status: "completed",
+        moduleAccounting: accounting
+      });
       return run;
     }
     const executor = resolveHiddenCompletionExecutor(args.hiddenCompletionExecutor, args.client, args.db, args.sessionDirectory, "classify-memories");
@@ -7351,7 +7378,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
       task: "classify",
       command_id: `classify:${args.moduleCommandId ?? Date.now()}:${createHash5("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`,
       authority_generation: args.moduleAuthorityGeneration,
-      ...resolvedModelChain.length > 0 ? { model_chain: resolvedModelChain } : {},
+      model_chain: resolvedModelChain,
       payload: {
         prompt_body: prompt,
         items: chunk.map((candidate) => ({
@@ -7372,6 +7399,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
   if (result.truncated === true) {
     throw new Error("classify returned length-capped output");
   }
+  const accounting = moduleClassifyAccounting(result);
   const parsed = validateClassifyManifest(manifestText, new Set(chunk.map((candidate) => candidate.id)));
   const rows = parsed.map((entry) => {
     const candidate = chunk.find((item) => item.id === entry.id);
@@ -7444,7 +7472,39 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
       throw new Error(`module accepted unknown memory ${moduleId}`);
     return candidate.contextMemory.id;
   });
-  return { classified: acceptedContextIds.length, changed: acceptedContextIds.length };
+  return {
+    classified: acceptedContextIds.length,
+    changed: acceptedContextIds.length,
+    accounting
+  };
+}
+function nonNegativeCount(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
+}
+function moduleClassifyAccounting(result) {
+  const accounting = {};
+  const usage = result.usage;
+  if (usage && typeof usage === "object") {
+    const record = usage;
+    accounting.tokens = {
+      input: nonNegativeCount(record.input),
+      output: nonNegativeCount(record.output),
+      cacheRead: nonNegativeCount(record.cache_read),
+      cacheWrite: nonNegativeCount(record.cache_write)
+    };
+  }
+  const diagnostics = result.diagnostics;
+  const model = diagnostics && typeof diagnostics === "object" ? diagnostics.model : undefined;
+  if (typeof model === "string") {
+    const parsed = parseProviderModel(model);
+    if (parsed) {
+      accounting.providerId = parsed.providerID;
+      accounting.modelId = parsed.modelID;
+    } else if (model.trim()) {
+      accounting.modelId = model.trim();
+    }
+  }
+  return accounting;
 }
 function applyClassifications(args, chunk, manifestText) {
   const byId = new Map(chunk.map((m) => [m.id, m]));
@@ -7489,6 +7549,11 @@ function recordInvocation(args, startedAt, params) {
       providerId: params.completion.providerId,
       modelId: params.completion.modelId
     } : {},
+    ...params.moduleAccounting ? {
+      tokens: params.moduleAccounting.tokens,
+      providerId: params.moduleAccounting.providerId,
+      modelId: params.moduleAccounting.modelId
+    } : {},
     error: params.error
   });
 }
@@ -9721,8 +9786,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",
@@ -9734,8 +9827,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: {
@@ -9750,7 +9842,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 }
         });
@@ -9793,15 +9885,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) {
@@ -10394,8 +10487,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",
@@ -10407,8 +10533,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: {
@@ -10423,7 +10548,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 }
         });
@@ -10452,15 +10577,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) {
@@ -11362,8 +11488,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",
@@ -11375,8 +11533,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: {
@@ -11391,7 +11548,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 }
         });
@@ -11432,15 +11589,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) {
@@ -11608,6 +11766,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
@@ -11941,7 +12101,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,
@@ -11978,7 +12139,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,
@@ -12079,7 +12241,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,
@@ -12347,24 +12510,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: {
@@ -12378,7 +12562,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 }
@@ -12388,14 +12578,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) {
@@ -12525,15 +12716,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) {
@@ -12607,72 +12806,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}`);
@@ -12742,15 +12976,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
+      });
   }
 }
 
@@ -18328,7 +18563,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 };
@@ -18386,10 +18621,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)})`);
@@ -18449,8 +18686,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) {
@@ -29862,7 +30099,8 @@ function registerPiContextHandler(pi, baseOptions) {
           sessionMeta,
           piUsage,
           minimumPercentage: usagePercentage,
-          historianStateSnapshot: historianStateForPass
+          historianStateSnapshot: historianStateForPass,
+          publishedHistoryRide: isCacheBusting
         });
       }
       logTransformTiming(sessionId, "historianScheduling", tHistorianScheduling);
@@ -30502,7 +30740,12 @@ Historian previously failed ${failureCount} time(s), so Magic Context is retryin
     const trigger = checkCompartmentTrigger(db, sessionId, sessionMeta, usage, 0, triggerInputs.executeThresholdPercentage, triggerInputs.triggerBudget, triggerInputs.clearReasoningAge, triggerInputs.commitClusterTrigger, args.activeTags, boundaryContextLimit, () => {
       const messages = provider.readMessages();
       return { messages, absoluteMessageCount: messages.length };
-    }, args.taggerFloor, { canClearReasoning: true });
+    }, args.taggerFloor, { canClearReasoning: true }, {
+      hardFold: false,
+      force: usage.percentage >= historianForceMaterializationPercentage && (usage.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
+      explicitFlush: hasPendingMaterialization(sessionId),
+      publishedHistory: args.publishedHistoryRide
+    });
     if (!trigger.shouldFire) {
       sessionLog(sessionId, `historian trigger eval: shouldFire=false (no trigger condition met)`);
       try {
@@ -31747,6 +31990,9 @@ ${result}`;
   });
 }
 
+// ../plugin/src/features/magic-context/store-generation-rebase.ts
+var repairCheckedSessions = new WeakMap;
+
 // ../plugin/src/hooks/magic-context/historian-state-file.ts
 import { mkdirSync as mkdirSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync7 } from "node:fs";
 function cleanupHistorianStateFile(path) {
@@ -31810,6 +32056,7 @@ async function sendStatusNotification(_client, sessionId, text, params) {
 var inconsistentProducerWindows = new Set;
 var HISTORIAN_ALERT_COOLDOWN_MS2 = 60 * 1000;
 var lastHistorianAlertBySession2 = new Map;
+var STORED_COMPARTMENT_FAILURE_BACKOFF_MS = 30 * 60 * 1000;
 
 // ../plugin/src/hooks/magic-context/compartment-runner-recomp.ts
 function insertRecompCompartmentRows(db, sessionId, compartments, now) {
@@ -33873,7 +34120,7 @@ function buildStatusView(source, options) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.43.0",
+  version: "0.43.2",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",