@cortexkit/pi-magic-context 0.49.14 → 0.49.16

package/dist/index.js

@@ -27,6 +27,7 @@ import {
   claimConfigParseFailuresOnce,
   parseJsoncRecovering,
   detectConfigFile,
+  OPENCODE_OUTPUT_CAP,
   MIN_PLAUSIBLE_CONTEXT_LIMIT,
   catalogOutputReserve,
   deriveWindowGeometry,
@@ -247,7 +248,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-65kty5te.js";
+} from "./index-4178cbfw.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical,
@@ -264,7 +265,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DREAM_TASK_PROMOTION_DEFAULTS,
   LIVE_RELOAD_CONFIG_PATHS
-} from "./index-1k729e4f.js";
+} from "./index-bxmf4dhr.js";
 import {
   FAIL_CLOSED_DOCTOR_COMMAND,
   formatFailClosedBlockingMessage,
@@ -287,7 +288,7 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-ccsscaap.js";
+} from "./index-v8d4vgam.js";
 import {
   setHomeProjectPermission,
   ProjectIdentityError,
@@ -298,7 +299,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-6ex901g3.js";
+} from "./index-y5c73caa.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -457,7 +458,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-75ah9413.js";
+} from "./index-44h64qza.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -544,7 +545,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-j0n09wtp.js";
+} from "./index-dne4ja7a.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -590,7 +591,7 @@ import"./index-399p688g.js";
 import {
   runSessionWarmupWorker,
   RAW_SUMMARY_TEXT_MAX_CHARS2
-} from "./index-he9s4qsj.js";
+} from "./index-qqxqwqhp.js";
 import {
   piHarnessKindFromExecutable
 } from "./index-apgwdby5.js";
@@ -616,13 +617,11 @@ import {
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexes2
-} from "./index-a4pk5yv9.js";
+} from "./index-fhyy4ave.js";
 import {
   formatSynapseLaneDescriptor
 } from "./index-6dz2ed1v.js";
-import {
-  sameProjectDirectory
-} from "./index-djxc8w8c.js";
+import"./index-s1xn8qfw.js";
 import {
   buildCanonicalChunkTextFromFts,
   buildCompartmentSummaryFallbackText,
@@ -632,7 +631,7 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./index-7qc73yk5.js";
+} from "./index-afy3dzf9.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -641,7 +640,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-1mrvw9en.js";
+} from "./index-mx59cve4.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -667,7 +666,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-nwbhe6qv.js";
+} from "./index-n3r2d2pr.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -682,7 +681,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-bet4sd3e.js";
+} from "./index-tympym62.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -732,7 +731,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-0awvkeb5.js";
+} from "./index-xmzhrht0.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -763,19 +762,21 @@ import {
 import {
   pushNotification2
 } from "./index-q1yc6bs0.js";
-import"./index-9jvktm7k.js";
+import"./index-657xh9w4.js";
 import {
   cosineSimilarity
-} from "./index-7wagp5jp.js";
+} from "./index-p3evwech.js";
 import"./index-46q4e104.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
   buildHiddenAgentRegistrations,
   logTemperatureDecision,
+  readHostSystemPrompt,
   subagentStepCap,
   SubagentTelemetry,
-  readHostSystemPrompt
-} from "./index-y29y2j2w.js";
+  HISTORIAN_MAX_OUTPUT_TOKENS_ENV2,
+  SUBAGENT_OUTPUT_CEILING_ENV2
+} from "./index-ajfpyk0x.js";
 import {
   PiTagHydrationError,
   getPiTagSnapshotView,
@@ -786,8 +787,10 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-1vw4f2pe.js";
+} from "./index-x3k1530z.js";
 import"./index-f18ec69t.js";
+import"./index-1cvyaw9a.js";
+import"./index-ja1c33qa.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -797,6 +800,9 @@ import {
 import {
   normalizeProtectedToolName
 } from "./index-674f6qs2.js";
+import {
+  sameProjectDirectory
+} from "./index-wrr9rp9a.js";
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
@@ -3506,7 +3512,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.14",
+  version: "0.49.16",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -3570,10 +3576,12 @@ var package_default = {
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "^1.3.10",
     "@types/node": "^22.20.0",
+    "omp-coding-agent-1812": "npm:@oh-my-pi/pi-coding-agent@18.12.3",
     "pi-agent-core-087": "npm:@earendil-works/pi-agent-core@0.87.1",
     "pi-ai-086": "npm:@earendil-works/pi-ai@0.86.0",
     "pi-coding-agent-086": "npm:@earendil-works/pi-coding-agent@0.86.0",
     "pi-coding-agent-087": "npm:@earendil-works/pi-coding-agent@0.87.1",
+    "pi-coding-agent-130": "npm:@earendil-works/pi-coding-agent@1.3.0",
     typebox: "^1.3.1",
     typescript: "^5.8.0"
   },
@@ -4690,6 +4698,7 @@ var AGENT_STEPS = {
   [DREAMER_PRIMER_INVESTIGATOR_AGENT]: 40,
   [DREAMER_RETROSPECTIVE_AGENT]: 40
 };
+var DISPOSED_CHILDREN_KEY = Symbol.for("@cortexkit/magic-context/v2/disposed-hidden-children");
 class HiddenAgentStepLimit extends Error {
   agent;
   cap;
@@ -5030,14 +5039,14 @@ function throwWithPromptFailure(legacyError, failedAttempts, args, timeoutMs, tr
   });
   throw error;
 }
-async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport) {
+async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport, allowModelSuggestions = true) {
   const originalBody = { ...args.body };
   const attemptArgs = copyPromptArgs(args, originalBody);
   try {
     await promptWithTimeout(client, attemptArgs, timeoutMs, signal, transport);
     return;
   } catch (error) {
-    if (isNonRetryable(error, signal))
+    if (isNonRetryable(error, signal) || !allowModelSuggestions)
       throw error;
     const suggestion = parseModelSuggestion(error);
     if (!suggestion || !originalBody.model) {
@@ -5065,7 +5074,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   let lastError = null;
   try {
-    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport);
+    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport, options.allowModelSuggestions);
     return;
   } catch (error) {
     lastError = error;
@@ -5091,7 +5100,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       ...fallback?.qualifier ? { variant: fallback.qualifier } : {}
     });
     try {
-      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport);
+      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport, options.allowModelSuggestions);
       log2(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
       return;
     } catch (error) {
@@ -5109,7 +5118,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
 }
 async function attemptAndValidate(client, args, timeoutMs, signal, callContext, attempt, options) {
   try {
-    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport);
+    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport, options.allowModelSuggestions);
   } catch (error) {
     throw {
       error,
@@ -5915,6 +5924,7 @@ Examples:
 - Every displayed raw message ordinal MUST appear in exactly one compartment. Gaps between compartments are invalid. When a displayed block is pure tool-only noise with no narrative text, do NOT skip it — extend the preceding compartment's \`end\` to absorb the range, or fold it into the current compartment if it's part of an ongoing work unit. Never create a dedicated compartment just to cover a tool-only run.
 - If a chunk is entirely tool-only with no narrative text (a long autonomous coding stretch), produce a single compartment whose narrative is derived from what the tools collectively accomplished.
 - If the chunk ends mid-topic, leave the unfinished portion out and report its first message index in \`<unprocessed_from>\`.
+- If every message in the chunk is covered by a compartment, nothing is unprocessed: set \`<unprocessed_from>\` to the chunk's last message index + 1. Never write \`0\` or the last covered index in that case.
 
 ---
 
@@ -6869,6 +6879,7 @@ function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationEr
     "Return a corrected full XML response for the same existing state and new messages.",
     "Do not skip any displayed raw ordinal or displayed raw range, even if the message looks trivial.",
     "Every displayed message range must belong to exactly one compartment unless it is intentionally left in one trailing suffix marked by <unprocessed_from>.",
+    "If every message in the chunk is covered by a compartment, nothing is unprocessed: set `<unprocessed_from>` to the chunk's last message index + 1.",
     "",
     "Previous invalid XML:",
     previousOutput
@@ -6920,16 +6931,19 @@ function validateParsedCompartments(compartments, chunkStart, chunkEnd, unproces
     expectedStart = compartment.endMessage + 1;
   }
   if (unprocessedFrom !== null) {
+    if (expectedStart <= chunkEnd) {
+      if (unprocessedFrom !== expectedStart) {
+        return `<unprocessed_from> ${unprocessedFrom} does not match next uncovered message ${expectedStart}`;
+      }
+      return null;
+    }
     if (unprocessedFrom === chunkEnd + 1) {
       return null;
     }
     if (unprocessedFrom < chunkStart || unprocessedFrom > chunkEnd) {
       return `<unprocessed_from> ${unprocessedFrom} is outside chunk ${chunkStart}-${chunkEnd}`;
     }
-    if (unprocessedFrom !== expectedStart) {
-      return `<unprocessed_from> ${unprocessedFrom} does not match next uncovered message ${expectedStart}`;
-    }
-    return null;
+    return `<unprocessed_from> ${unprocessedFrom} does not match completed chunk boundary ${chunkEnd + 1}`;
   }
   if (expectedStart <= chunkEnd) {
     return `output left uncovered messages ${expectedStart}-${chunkEnd} without <unprocessed_from>`;
@@ -9427,6 +9441,7 @@ async function runHistorianPrompt(args) {
             return executor.attempt(opened, request);
           }, { childSessionId: opened.childSessionId }),
           timeoutMs: timeoutMs ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
+          allowModelSuggestions: false,
           fallbackModels: modelOverride ? undefined : fallbackModels,
           callContext: agentId === HISTORIAN_EDITOR_AGENT ? "historian:editor" : "historian"
         });
@@ -9511,7 +9526,7 @@ async function runFallbackHistorianPass(args) {
   const primary = toModelEntry(args.model);
   for (const candidateInput of [
     ...args.fallbackModels ?? [],
-    ...args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
+    ...!primary && args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
   ]) {
     const candidate = toModelEntry(candidateInput);
     if (!candidate)
@@ -16463,6 +16478,7 @@ var VERIFY_BATCH_SIZE = 5;
 var VERIFY_TOKENS_PER_MEMORY = 1e5;
 var VERIFY_RUN_TOKEN_BUDGET = 2500000;
 var VERIFY_RUN_SLICE_MS = 240000;
+var VERIFY_IN_FLIGHT_GRACE_MS = 120000;
 function verifyBatchTokenBudget(size, configured) {
   return Math.min(configured ?? Number.MAX_SAFE_INTEGER, size * VERIFY_TOKENS_PER_MEMORY);
 }
@@ -16549,7 +16565,15 @@ async function runVerifyWithCooldown(args) {
   const runTokenBudget = Math.min(args.tokenBudget ?? VERIFY_RUN_TOKEN_BUDGET, VERIFY_RUN_TOKEN_BUDGET);
   try {
     for (let i = 0;i < batches.length; i += 1) {
-      const remainingMs = Math.max(0, Math.min(args.deadline, sliceDeadline) - Date.now());
+      const now = Date.now();
+      const startCutoff = Math.min(args.deadline, sliceDeadline);
+      const hardStop = Math.min(args.deadline, sliceDeadline + VERIFY_IN_FLIGHT_GRACE_MS);
+      const remainingMs = Math.max(0, hardStop - now);
+      if (now >= startCutoff) {
+        result.stopReason = "deadline";
+        log2(`[dreamer] ${args.forceBroad ? "verify-broad" : "verify"}: stopping before batch ${i + 1}/${batches.length} — the run deadline passed ${now - startCutoff}ms ago`);
+        break;
+      }
       if (remainingMs < VERIFY_BATCH_FLOOR_MS) {
         result.stopReason = "deadline";
         log2(`[dreamer] ${args.forceBroad ? "verify-broad" : "verify"}: stopping before batch ${i + 1}/${batches.length} — remaining budget ${remainingMs}ms is below the ${VERIFY_BATCH_FLOOR_MS}ms batch floor`);
@@ -19894,6 +19918,7 @@ import { createInterface } from "node:readline";
 import { StringDecoder } from "node:string_decoder";
 import { fileURLToPath } from "node:url";
 var PI_CODING_AGENT_MODULE = "@earendil-works/pi-coding-agent";
+var HIDDEN_CHILD_OUTPUT_CEILING = OPENCODE_OUTPUT_CAP;
 var PI_CODING_AGENT_PACKAGE_NAMES = new Set([
   PI_CODING_AGENT_MODULE,
   "@oh-my-pi/pi-coding-agent"
@@ -20631,6 +20656,8 @@ class PiSubagentRunner {
       let child;
       const parentEnv = { ...process.env };
       delete parentEnv.MAGIC_CONTEXT_HISTORIAN_TEMPERATURE;
+      delete parentEnv[HISTORIAN_MAX_OUTPUT_TOKENS_ENV2];
+      delete parentEnv[SUBAGENT_OUTPUT_CEILING_ENV2];
       try {
         child = inRootAsyncContext2(() => this.spawnImpl(this.invocation.command, [...this.invocation.prefixArgs, ...this.extraArgs, ...args], {
           windowsHide: true,
@@ -20645,8 +20672,10 @@ class PiSubagentRunner {
               MAGIC_CONTEXT_HISTORIAN_TEMPERATURE: String(options.temperature)
             } : {},
             ...options.maxOutputTokens !== undefined ? {
-              MAGIC_CONTEXT_HISTORIAN_MAX_OUTPUT_TOKENS: String(options.maxOutputTokens)
-            } : {}
+              [HISTORIAN_MAX_OUTPUT_TOKENS_ENV2]: String(options.maxOutputTokens)
+            } : {
+              [SUBAGENT_OUTPUT_CEILING_ENV2]: String(HIDDEN_CHILD_OUTPUT_CEILING)
+            }
           },
           stdio: [
             deliverViaStdin || rpcBudget ? "pipe" : "ignore",
@@ -28561,7 +28590,7 @@ async function runHistorianSubagentWithTransientRetriesGuarded(args) {
   }
   return historianAbortResult(startedAt);
 }
-function buildHistorianFallbackChain(primaryModel, primaryThinkingLevel, fallbackModels, fallbackModelId) {
+function buildHistorianFallbackChain(primaryModel, primaryThinkingLevel, fallbackModels) {
   const seen = new Set([
     `${primaryModel}\x00${primaryThinkingLevel ?? ""}`
   ]);
@@ -28572,13 +28601,7 @@ function buildHistorianFallbackChain(primaryModel, primaryThinkingLevel, fallbac
     if (!entry.model || seen.has(key))
       continue;
     seen.add(key);
-    chain.push({ entry, kind: "configured" });
-  }
-  if (fallbackModelId) {
-    const entry = { model: fallbackModelId };
-    const key = `${entry.model}\x00`;
-    if (!seen.has(key))
-      chain.push({ entry, kind: "session" });
+    chain.push(entry);
   }
   return chain;
 }
@@ -28981,9 +29004,11 @@ ${chunkText}`,
       });
       let validatedPass = await validateHistorianResult(firstResult, sessionId, chunk, priorCompartments, sequenceOffset);
       let validatedDraftText = firstResult.ok ? firstResult.assistantText : null;
+      let fallbackPrompt = prompt;
       if (validatedPass.kind === "validation-failed") {
         sessionLog2(sessionId, `historian: first pass validation failed, retrying with repair prompt: ${validatedPass.error}`);
         const repairPrompt = buildHistorianRepairPrompt(prompt, validatedPass.rawText, validatedPass.error, deps.language);
+        fallbackPrompt = repairPrompt;
         const repairResult = await runHistorianSubagentWithTransientRetries({
           runner,
           sessionId,
@@ -29010,31 +29035,31 @@ ${chunkText}`,
           validatedDraftText = repairResult.assistantText;
         }
       }
-      const fallbackChain = buildHistorianFallbackChain(historianModel, thinkingLevel, fallbackModels, fallbackModelId);
+      const fallbackChain = buildHistorianFallbackChain(historianModel, thinkingLevel, fallbackModels);
       if (validatedPass.kind !== "ok" && !(validatedPass.kind === "spawn-failed" && validatedPass.reason === "abort") && fallbackChain.length > 0) {
         for (let i = 0;i < fallbackChain.length; i += 1) {
           const candidate = fallbackChain[i];
-          sessionLog2(sessionId, `historian: escalating to ${candidate.kind === "session" ? "session-model last resort" : "configured fallback model"} ${candidate.entry.model}`);
+          sessionLog2(sessionId, `historian: escalating to configured fallback model ${candidate.model}`);
           const fbResult = await runHistorianSubagentWithTransientRetries({
             runner,
             sessionId,
-            passLabel: candidate.kind === "session" ? "fallback-session" : "fallback",
+            passLabel: "fallback",
             retryBackoffMs,
             options: {
               agent: HISTORIAN_AGENT_NAME,
               systemPrompt: historianSystemPrompt,
-              userMessage: prompt,
-              model: candidate.entry.model,
+              userMessage: fallbackPrompt,
+              model: candidate.model,
               timeoutMs: historianTimeoutMs,
               cwd: directory,
               signal,
-              thinkingLevel: candidate.entry.qualifier,
+              thinkingLevel: candidate.qualifier,
               temperature,
               maxOutputTokens,
               onProgress: buildProgressLogger("fallback"),
               accountingSessionId: sessionId,
               accountingSubagent: "historian",
-              accountingTask: candidate.kind === "session" ? "fallback-session" : "fallback"
+              accountingTask: "fallback"
             }
           });
           const fbPass = await validateHistorianResult(fbResult, sessionId, chunk, priorCompartments, sequenceOffset);
@@ -34325,6 +34350,348 @@ function isOmpUnmanagedCaptureRequest(payload) {
   return last?.role === "user" && firstText(last.content, request.textType)?.startsWith(CAPTURE_PREFIX) === true;
 }
 
+// src/pi-dispatch-chain.ts
+import { isDeepStrictEqual } from "node:util";
+
+// src/pi-dispatch-agent-history.ts
+function object(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+var DEVELOPER_ORIGIN = Symbol("custom developer history");
+function piIsDeveloperHistory(message) {
+  return message.role === "developer" || Reflect.get(message, DEVELOPER_ORIGIN) === true;
+}
+function piAgentHistory(messages, api) {
+  return messages.flatMap((value) => {
+    const message = object(value);
+    if (!message)
+      return [value];
+    if (message.role === "compactionSummary") {
+      return [
+        {
+          ...message,
+          role: "user",
+          content: message.blocks !== undefined ? [
+            { type: "text", text: message.summary },
+            ...Array.isArray(message.blocks) ? message.blocks : []
+          ] : [
+            { type: "text", text: "Compaction context envelope" },
+            ...Array.isArray(message.images) ? message.images : []
+          ]
+        }
+      ];
+    }
+    if (message.role !== "custom" && message.role !== "hookMessage")
+      return [value];
+    if (typeof message.content !== "string" && !Array.isArray(message.content))
+      return [];
+    const content = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
+    const userInvoked = message.role === "custom" && message.attribution === "user";
+    if (userInvoked && message.customType === "collab-prompt") {
+      const text = content.filter((part) => object(part)?.type === "text").map((part) => object(part)?.text).join(`
+`);
+      return [
+        {
+          ...message,
+          role: "user",
+          content: [
+            {
+              type: "text",
+              text: text.length ? "User interjection envelope" : ""
+            },
+            ...content.filter((part) => object(part)?.type === "image")
+          ]
+        }
+      ];
+    }
+    if (userInvoked && message.customType === "skill-prompt")
+      return [{ ...message, role: "user", content }];
+    const images = content.filter((part) => object(part)?.type === "image");
+    const developerRole = api === "ollama-chat" && message.attribution !== "user" ? "developer" : "user";
+    if (!images.length)
+      return [
+        { ...message, role: developerRole, content, [DEVELOPER_ORIGIN]: true }
+      ];
+    const texts = content.filter((part) => object(part)?.type === "text");
+    return [
+      ...texts.length ? [
+        {
+          ...message,
+          role: developerRole,
+          content: texts,
+          [DEVELOPER_ORIGIN]: true
+        }
+      ] : [],
+      {
+        ...message,
+        role: "user",
+        content: [
+          { type: "text", text: `Images attached to ${message.customType}.` },
+          ...images
+        ]
+      }
+    ];
+  });
+}
+
+// src/pi-dispatch-tool-ids.ts
+function record4(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+var sanitize = (id) => id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
+function hash2(id) {
+  return typeof Bun === "undefined" ? undefined : Bun.hash(id).toString(36);
+}
+function responsesComponent(id) {
+  const sep = id.search(/[\n|]/);
+  return sep > 0 ? id.slice(0, sep) : id;
+}
+function codexCallId(id) {
+  if (!id) {
+    const suffix = hash2("empty");
+    return suffix === undefined ? undefined : `call_${suffix}`;
+  }
+  const sep = id.search(/[\n|]/);
+  const base = sep > 0 ? id.slice(0, sep) : sep === 0 ? id.slice(1) : id;
+  const normalized = base.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+$/, "");
+  if (normalized && normalized.length <= 64 && normalized === base)
+    return normalized;
+  const suffix = hash2(base || id);
+  if (suffix === undefined)
+    return;
+  return `${(normalized || "call").slice(0, Math.max(0, 63 - suffix.length))}_${suffix}`.slice(0, 64);
+}
+function piToolCallWireId(id, model, source) {
+  const origin = record4(source);
+  const same = origin !== undefined && origin.provider === model.provider && origin.api === model.api && origin.model === model.id;
+  const compat = record4(model.compat);
+  switch (model.api) {
+    case "openai-completions": {
+      if (compat?.requiresMistralToolIds === true) {
+        const normalized = id.replace(/[^a-zA-Z0-9]/g, "");
+        return (normalized + "ABCDEFGHI".slice(0, Math.max(0, 9 - normalized.length))).slice(0, 9);
+      }
+      if (!same && id.includes("|"))
+        return id.split("|", 1)[0].replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 40);
+      return compat?.usesOpenAIToolCallIdLimit === true ? id.slice(0, 40) : id;
+    }
+    case "anthropic-messages": {
+      if (same && compat?.officialEndpoint !== true)
+        return id;
+      const normalized = sanitize(id);
+      if (normalized)
+        return normalized;
+      const suffix = hash2(id);
+      return suffix === undefined ? undefined : `toolu_${suffix}`;
+    }
+    case "bedrock-converse-stream":
+      return sanitize(id);
+    case "google-generative-ai":
+    case "google-gemini-cli":
+    case "google-vertex":
+      return same ? id : sanitize(id);
+    case "openai-responses":
+    case "azure-openai-responses": {
+      const sep = id.search(/[\n|]/);
+      const simple = sep < 0 && id.length <= 64 && /^[a-zA-Z0-9_-]+$/.test(id);
+      const foreign = origin && (origin.provider !== model.provider || origin.api !== model.api);
+      return !same && !simple && (foreign || sep >= 0 || id.length > 64) ? codexCallId(responsesComponent(id)) : responsesComponent(id);
+    }
+    case "openai-codex-responses":
+      return codexCallId(responsesComponent(id));
+    default:
+      return id;
+  }
+}
+
+// src/pi-dispatch-chain-tail.ts
+function object2(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+var OMITTED_IMAGE = "[image omitted: model does not support vision]";
+function piEncodeChainTail(messages, assistant, responseItems, model) {
+  const harmony = object2(model.identity)?.class === "gpt-oss";
+  const text = (value) => {
+    const wellFormed = value.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "�");
+    return harmony ? wellFormed.replace(/<\|(start|end|message|channel|constrain|return|call)\|>/g, "<\\|$1\\|>") : wellFormed;
+  };
+  const supportsImages = model.input?.includes("image") === true;
+  const image = (block) => {
+    const detail = block.detail === "original" && object2(model.compat)?.supportsImageDetailOriginal !== true ? "auto" : block.detail ?? "auto";
+    const file = object2(block.providerFile);
+    if (file?.provider === "openai" && typeof file.id === "string" && file.id)
+      return { type: "input_image", detail, file_id: file.id };
+    if (typeof block.url !== "string" && (typeof block.mimeType !== "string" || typeof block.data !== "string"))
+      return;
+    return {
+      type: "input_image",
+      detail,
+      image_url: block.url ?? `data:${block.mimeType};base64,${block.data}`
+    };
+  };
+  const items = [];
+  for (const value of messages) {
+    let message = object2(value);
+    if (!message || message.providerPayload !== undefined)
+      return;
+    if (message.role === "custom" || message.role === "hookMessage") {
+      if (typeof message.customType !== "string" || message.attribution === "user")
+        return;
+      const converted = piAgentHistory([message], model.api);
+      const developer = object2(converted[0]);
+      if (converted.length !== 1 || !developer || !piIsDeveloperHistory(developer))
+        return;
+      message = {
+        ...developer,
+        role: model.api === "openai-codex-responses" ? "developer" : "user"
+      };
+    }
+    const user = message.role === "user" || message.role === "developer";
+    if (!user && message.role !== "toolResult")
+      return;
+    const content = typeof message.content === "string" && user ? [{ type: "text", text: message.content }] : message.content;
+    if (!Array.isArray(content))
+      return;
+    const texts = [];
+    const images = [];
+    const ordered = [];
+    for (const value of content) {
+      const block = object2(value);
+      if (block?.type === "text" && typeof block.text === "string") {
+        texts.push(block.text);
+        if (!user || block.text.trim())
+          ordered.push({ type: "input_text", text: text(block.text) });
+      } else if (block?.type === "image") {
+        const encoded = image(block);
+        if (!encoded)
+          return;
+        images.push(encoded);
+        if (supportsImages)
+          ordered.push(encoded);
+      } else
+        return;
+    }
+    if (user) {
+      const input = texts.filter((value) => value.trim()).map((value) => ({ type: "input_text", text: text(value) }));
+      if (supportsImages)
+        input.push(...images);
+      else if (images.length)
+        input.push({ type: "input_text", text: OMITTED_IMAGE });
+      if (input.length)
+        items.push({ role: message.role, content: input });
+      continue;
+    }
+    if (typeof message.toolCallId !== "string" || message.providerMetadata !== undefined)
+      return;
+    const id = piToolCallWireId(message.toolCallId, model, assistant);
+    const call = responseItems.map(object2).find((item) => item?.call_id === id);
+    if (!id || call?.type !== "function_call" && call?.type !== "custom_tool_call")
+      return;
+    const joined = texts.join(`
+`);
+    const output = images.length && supportsImages ? ordered : text(images.length && !supportsImages ? joined ? `${joined}
+${OMITTED_IMAGE}` : OMITTED_IMAGE : joined);
+    items.push({
+      type: call.type === "custom_tool_call" ? "custom_tool_call_output" : "function_call_output",
+      call_id: id,
+      output
+    });
+  }
+  return items;
+}
+
+// src/pi-dispatch-chain.ts
+function object3(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function piChainCapableApi(api) {
+  return api === "openai-codex-responses" || api === "openai-responses" || api === "azure-openai-responses";
+}
+function piPreparedHistory(messages, model) {
+  const snapshots = [];
+  const responseIds = [];
+  for (const message of messages) {
+    const fields = lkgContentFields(message);
+    if (!fields)
+      return;
+    snapshots.push({ id: "", fields });
+    const source = object3(message);
+    responseIds.push(source?.role === "assistant" && typeof source.responseId === "string" && source.responseId.length > 0 ? source.responseId : undefined);
+  }
+  const prepared = { snapshots, responseIds };
+  let index = responseIds.length - 1;
+  while (index >= 0 && responseIds[index] === undefined)
+    index--;
+  const assistant = object3(messages[index]);
+  const response = piChainResponse(assistant);
+  if (model && assistant && response) {
+    const delta = piEncodeChainTail(messages.slice(index + 1), assistant, response.responseItems, model);
+    if (delta)
+      prepared.continuation = { index, ...response, delta };
+  }
+  return prepared;
+}
+function piChainedRequest(payload) {
+  const body = object3(payload);
+  if (!body || body.previous_response_id === undefined)
+    return;
+  const id = body.previous_response_id;
+  if (body.messages !== undefined || !Array.isArray(body.input) || typeof id !== "string" || !id)
+    throw new Error("invalid chained continuation frame");
+  return { previousResponseId: id, delta: body.input };
+}
+function piChainResponse(message) {
+  const source = object3(message);
+  if (source?.role !== "assistant")
+    return;
+  if (source.stopReason !== "stop" && source.stopReason !== "toolUse")
+    return;
+  if (typeof source.responseId !== "string" || !source.responseId)
+    return;
+  const payload = object3(source.providerPayload);
+  if (payload?.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items))
+    return;
+  return {
+    responseId: source.responseId,
+    responseItems: structuredClone(payload.items)
+  };
+}
+function piExpandChainedRequest(payload, chained, anchor, prepared, pass) {
+  if (!anchor)
+    return {
+      refusal: "no completed managed response is recorded for this continuation"
+    };
+  if (anchor.supersededBy !== undefined && (anchor.supersededBy !== pass.current || !pass.resend))
+    return {
+      refusal: "the last managed request has no completed response"
+    };
+  if (chained.previousResponseId !== anchor.responseId)
+    return {
+      refusal: "continuation does not follow the last managed request's response"
+    };
+  if (!prepared)
+    return { refusal: "this pass's prepared history was not recorded" };
+  const carried = anchor.prepared.snapshots.length;
+  if (exactReusablePrefix(prepared.snapshots, anchor.prepared.snapshots) !== carried)
+    return {
+      refusal: "prepared history does not extend the previous managed request"
+    };
+  if (prepared.responseIds[carried] !== anchor.responseId)
+    return {
+      refusal: "prepared history does not continue from the previous managed response"
+    };
+  const continuation = prepared.continuation;
+  if (!continuation || continuation.index !== carried || !isDeepStrictEqual(continuation.responseItems, anchor.responseItems))
+    return {
+      refusal: "prepared response or tail encoding cannot continue the recorded response"
+    };
+  if (!isDeepStrictEqual(continuation.delta, chained.delta))
+    return { refusal: "delta differs from the prepared provider input tail" };
+  const input = [...anchor.input, ...anchor.responseItems, ...chained.delta];
+  const { previous_response_id: _previous, ...rest } = payload;
+  return { payload: { ...rest, input }, input };
+}
+
 // src/pi-dispatch-google.ts
 function piGoogleConversation(payload) {
   if (!payload || typeof payload !== "object")
@@ -34471,78 +34838,10 @@ function piHasManagedSignature(payload, signature) {
   return false;
 }
 
-// src/pi-dispatch-agent-history.ts
-function object(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
-}
-function piAgentHistory(messages, api) {
-  return messages.flatMap((value) => {
-    const message = object(value);
-    if (!message)
-      return [value];
-    if (message.role === "compactionSummary") {
-      return [
-        {
-          ...message,
-          role: "user",
-          content: message.blocks !== undefined ? [
-            { type: "text", text: message.summary },
-            ...Array.isArray(message.blocks) ? message.blocks : []
-          ] : [
-            { type: "text", text: "Compaction context envelope" },
-            ...Array.isArray(message.images) ? message.images : []
-          ]
-        }
-      ];
-    }
-    if (message.role !== "custom" && message.role !== "hookMessage")
-      return [value];
-    if (typeof message.content !== "string" && !Array.isArray(message.content))
-      return [];
-    const content = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
-    const userInvoked = message.role === "custom" && message.attribution === "user";
-    if (userInvoked && message.customType === "collab-prompt") {
-      const text = content.filter((part) => object(part)?.type === "text").map((part) => object(part)?.text).join(`
-`);
-      return [
-        {
-          ...message,
-          role: "user",
-          content: [
-            {
-              type: "text",
-              text: text.length ? "User interjection envelope" : ""
-            },
-            ...content.filter((part) => object(part)?.type === "image")
-          ]
-        }
-      ];
-    }
-    if (userInvoked && message.customType === "skill-prompt")
-      return [{ ...message, role: "user", content }];
-    const images = content.filter((part) => object(part)?.type === "image");
-    const developerRole = api === "ollama-chat" && message.attribution !== "user" ? "developer" : "user";
-    if (!images.length)
-      return [{ ...message, role: developerRole, content }];
-    const texts = content.filter((part) => object(part)?.type === "text");
-    return [
-      ...texts.length ? [{ ...message, role: developerRole, content: texts }] : [],
-      {
-        ...message,
-        role: "user",
-        content: [
-          { type: "text", text: `Images attached to ${message.customType}.` },
-          ...images
-        ]
-      }
-    ];
-  });
-}
-
 // src/pi-dispatch-chat-history.ts
 var MAX_EXACT_UNITS = 32 * 1024 * 1024;
 var IMAGE_CAPTION = "Attached image(s) from tool result:";
-function object2(value) {
+function object4(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function omitsAssistant(message, model, compat) {
@@ -34551,7 +34850,7 @@ function omitsAssistant(message, model, compat) {
   let thinking = false;
   let hasTextBlock = false;
   for (const value of message.content) {
-    const block = object2(value);
+    const block = object4(value);
     if (!block)
       return false;
     if (block.type === "text") {
@@ -34576,14 +34875,14 @@ function omitsAssistant(message, model, compat) {
 function piChatHistoryPlan(messages, model) {
   if (model?.api !== "openai-completions")
     return;
-  const compat = object2(model.compat) ?? {};
+  const compat = object4(model.compat) ?? {};
   const calls = new Set;
   for (const value of messages) {
-    const message = object2(value);
+    const message = object4(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object2(value);
+      const block = object4(value);
       if (block?.type === "toolCall" && typeof block.id === "string")
         calls.add(block.id);
     }
@@ -34592,7 +34891,7 @@ function piChatHistoryPlan(messages, model) {
   let pending = new Set;
   let exactUnits = 0;
   for (let index = 0;index < messages.length; index++) {
-    const message = object2(messages[index]);
+    const message = object4(messages[index]);
     if (!message)
       return;
     if ((message.role === "bashExecution" || message.role === "pythonExecution") && message.excludeFromContext === true)
@@ -34604,7 +34903,7 @@ function piChatHistoryPlan(messages, model) {
         continue;
       if (Array.isArray(message.content))
         for (const value of message.content) {
-          const block = object2(value);
+          const block = object4(value);
           if (block?.type === "toolCall" && typeof block.id === "string")
             pending.add(block.id);
         }
@@ -34616,7 +34915,7 @@ function piChatHistoryPlan(messages, model) {
           return;
         const parts = [];
         for (const value of message.content) {
-          const part = object2(value);
+          const part = object4(value);
           if (part?.type === "text" && typeof part.text === "string" && part.text.trim())
             parts.push(part.text);
         }
@@ -34649,14 +34948,14 @@ ${parts.join(`
   };
   const vision = model.input?.includes("image") === true && compat.stripImageInput !== true;
   for (const step of transformed) {
-    const message = step.kind === "source" ? object2(messages[step.index]) : undefined;
+    const message = step.kind === "source" ? object4(messages[step.index]) : undefined;
     if (message?.role !== "toolResult")
       flushImages();
     steps.push(step);
     if (message?.role !== "toolResult" || !vision || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object2(value);
+      const block = object4(value);
       if (block?.type !== "image")
         continue;
       if (compat.requiresAssistantAfterToolResult === true)
@@ -34680,12 +34979,12 @@ ${parts.join(`
 function piMatchesChatImages(content, urls) {
   if (!Array.isArray(content) || content.length !== urls.length + 1)
     return false;
-  const caption = object2(content[0]);
+  const caption = object4(content[0]);
   if (caption?.type !== "text" || caption.text !== IMAGE_CAPTION || Object.keys(caption).length !== 2)
     return false;
   for (let i = 0;i < urls.length; i++) {
-    const block = object2(content[i + 1]);
-    const image = object2(block?.image_url);
+    const block = object4(content[i + 1]);
+    const image = object4(block?.image_url);
     if (block?.type !== "image_url" || Object.keys(block).length !== 2 || !image || Object.keys(image).length !== 1 || image.url !== urls[i])
       return false;
   }
@@ -34693,22 +34992,22 @@ function piMatchesChatImages(content, urls) {
 }
 
 // src/pi-dispatch-image-budget.ts
-function object3(value) {
+function object5(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function piImageBudgetPlan(model) {
-  if (!model?.input?.includes("image") || object3(model.compat)?.stripImageInput === true)
+  if (!model?.input?.includes("image") || object5(model.compat)?.stripImageInput === true)
     return;
   return {
     count: 0,
     api: model.api,
     rows: new Map,
-    hoistToolImages: model.api?.startsWith("google-") === true && object3(model.compat)?.multimodalFunctionResponse !== true || model.api === "bedrock-converse-stream" && model.requiresToolResultImageHoisting === true,
+    hoistToolImages: model.api?.startsWith("google-") === true && object5(model.compat)?.multimodalFunctionResponse !== true || model.api === "bedrock-converse-stream" && model.requiresToolResultImageHoisting === true,
     hoistErrorImages: model.api === "anthropic-messages" || model.api === "bedrock-converse-stream"
   };
 }
 function inputImage(block, api) {
-  const file = object3(block.providerFile);
+  const file = object5(block.providerFile);
   if (api === "ollama-chat")
     return { kind: "bytes", value: String(block.data ?? "") };
   if ((api?.endsWith("responses") && file?.provider === "openai" || api === "anthropic-messages" && file?.provider === "anthropic") && typeof file?.id === "string")
@@ -34728,7 +35027,7 @@ function piRecordImages(plan, row, source) {
     return;
   const images = [];
   for (const value of source.content) {
-    const block = object3(value);
+    const block = object5(value);
     if (block?.type === "image")
       images.push(inputImage(block, plan.api));
   }
@@ -34754,20 +35053,20 @@ function piWireImages(content, ollamaImages) {
     return [];
   const images = [];
   for (const value of content) {
-    const block = object3(value);
+    const block = object5(value);
     if (!block)
       continue;
-    const source = object3(block.source);
-    const inline = object3(block.inlineData);
-    const file = object3(block.fileData);
-    const bedrock = object3(block.image);
+    const source = object5(block.source);
+    const inline = object5(block.inlineData);
+    const file = object5(block.fileData);
+    const bedrock = object5(block.image);
     if (block.type === "image_url" || block.type === "input_image") {
       if (typeof block.file_id === "string")
         images.push({ kind: "file", value: block.file_id });
       else
         images.push({
           kind: "url",
-          value: String(typeof block.image_url === "string" ? block.image_url : object3(block.image_url)?.url)
+          value: String(typeof block.image_url === "string" ? block.image_url : object5(block.image_url)?.url)
         });
     } else if (block.type === "image") {
       if (source?.type === "file")
@@ -34791,7 +35090,7 @@ function piWireImages(content, ollamaImages) {
     else if (bedrock)
       images.push({
         kind: "data",
-        value: String(object3(bedrock.source)?.bytes),
+        value: String(object5(bedrock.source)?.bytes),
         mime: `image/${bedrock.format}`
       });
   }
@@ -34813,11 +35112,11 @@ function piMatchesImages(actual, expected) {
   return true;
 }
 function piWireImageCount(payload) {
-  const body = object3(payload);
+  const body = object5(payload);
   const visit = (value) => {
     if (Array.isArray(value))
       return value.reduce((n, item) => n + visit(item), 0);
-    const block = object3(value);
+    const block = object5(value);
     if (!block)
       return 0;
     if (["image", "image_url", "input_image"].includes(String(block.type)) || block.inlineData || block.fileData || block.image)
@@ -34831,12 +35130,12 @@ function piWireImageCount(payload) {
       block.response
     ].reduce((n, item) => n + visit(item), Array.isArray(block.images) ? block.images.length : 0);
   };
-  return visit(body?.messages ?? body?.input ?? body?.contents ?? object3(body?.request)?.contents);
+  return visit(body?.messages ?? body?.input ?? body?.contents ?? object5(body?.request)?.contents);
 }
 
 // src/pi-dispatch-responses-history.ts
 var MAX_TEXT_UNITS = 32 * 1024 * 1024;
-function object4(value) {
+function object6(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function wellFormed(text) {
@@ -34851,7 +35150,7 @@ function textIdentity2(text, phase) {
 function signaturePhase(block) {
   try {
     if (typeof block.textSignature === "string") {
-      const signature = object4(JSON.parse(block.textSignature));
+      const signature = object6(JSON.parse(block.textSignature));
       if (signature?.v === 1 && typeof signature.id === "string")
         return signature.phase;
     }
@@ -34871,17 +35170,17 @@ ${wellFormed(text)}
   return;
 }
 function piResponsesAssistantTexts(value, model) {
-  const message = object4(value);
+  const message = object6(value);
   if (!message || !Array.isArray(message.content))
     return;
-  if (["length", "error", "aborted"].includes(String(message.stopReason)) && !message.content.some((value) => ["text", "toolCall"].includes(String(object4(value)?.type))))
+  if (["length", "error", "aborted"].includes(String(message.stopReason)) && !message.content.some((value) => ["text", "toolCall"].includes(String(object6(value)?.type))))
     return [];
   const texts = [];
   const blocks = [];
   const sameModel = model !== undefined && typeof model.api === "string" && typeof model.id === "string" && typeof model.provider === "string" && message.api === model.api && message.model === model.id && message.provider === model.provider;
   let units = 0;
   for (const value of message.content) {
-    const block = object4(value);
+    const block = object6(value);
     if (block?.type === "toolCall")
       continue;
     if (block?.type === "thinking") {
@@ -34891,7 +35190,7 @@ function piResponsesAssistantTexts(value, model) {
         return;
       if (!block.thinking.trim())
         continue;
-      const compat = object4(model.compat);
+      const compat = object6(model.compat);
       if (block.summary === false && (compat?.requiresReasoningContentForToolCalls === true || compat?.requiresReasoningContentForAllAssistantTurns === true))
         return;
       const text = demotedThinking(block.thinking, model);
@@ -34911,14 +35210,14 @@ function piResponsesAssistantTexts(value, model) {
     texts.push(textIdentity2(wellFormed(block.text), sameModel ? signaturePhase(block) : undefined));
     blocks.push(block);
   }
-  const payload = object4(message.providerPayload);
+  const payload = object6(message.providerPayload);
   if (message.api !== model?.api || typeof model?.id !== "string" || typeof model?.provider !== "string" || message.model !== model?.id || (payload?.provider ?? message.provider) !== model?.provider || payload?.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items))
     return texts;
   const replay = [];
   let bound = 0;
   let output = false;
   for (const value of payload.items) {
-    const item = object4(value);
+    const item = object6(value);
     if (item?.type === "reasoning")
       continue;
     if (item?.type === "function_call" || item?.type === "custom_tool_call") {
@@ -34929,14 +35228,14 @@ function piResponsesAssistantTexts(value, model) {
       return texts;
     const itemTexts = [];
     for (const value of item.content) {
-      const part = object4(value);
+      const part = object6(value);
       const block = blocks[bound];
       if (!block || part?.type !== "output_text" || typeof part.text !== "string")
         return texts;
       let signature;
       try {
         if (typeof block.textSignature === "string")
-          signature = object4(JSON.parse(block.textSignature));
+          signature = object6(JSON.parse(block.textSignature));
       } catch {
         return texts;
       }
@@ -34963,7 +35262,7 @@ function piResponsesWireTexts(value, phase) {
   const texts = [];
   let units = 0;
   for (const partValue of value) {
-    const part = object4(partValue);
+    const part = object6(partValue);
     if (part?.type !== "output_text" || typeof part.text !== "string")
       return;
     units += part.text.length;
@@ -34974,76 +35273,6 @@ function piResponsesWireTexts(value, phase) {
   return texts;
 }
 
-// src/pi-dispatch-tool-ids.ts
-function record4(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
-}
-var sanitize = (id) => id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
-function hash2(id) {
-  return typeof Bun === "undefined" ? undefined : Bun.hash(id).toString(36);
-}
-function responsesComponent(id) {
-  const sep = id.search(/[\n|]/);
-  return sep > 0 ? id.slice(0, sep) : id;
-}
-function codexCallId(id) {
-  if (!id) {
-    const suffix = hash2("empty");
-    return suffix === undefined ? undefined : `call_${suffix}`;
-  }
-  const sep = id.search(/[\n|]/);
-  const base = sep > 0 ? id.slice(0, sep) : sep === 0 ? id.slice(1) : id;
-  const normalized = base.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+$/, "");
-  if (normalized && normalized.length <= 64 && normalized === base)
-    return normalized;
-  const suffix = hash2(base || id);
-  if (suffix === undefined)
-    return;
-  return `${(normalized || "call").slice(0, Math.max(0, 63 - suffix.length))}_${suffix}`.slice(0, 64);
-}
-function piToolCallWireId(id, model, source) {
-  const origin = record4(source);
-  const same = origin !== undefined && origin.provider === model.provider && origin.api === model.api && origin.model === model.id;
-  const compat = record4(model.compat);
-  switch (model.api) {
-    case "openai-completions": {
-      if (compat?.requiresMistralToolIds === true) {
-        const normalized = id.replace(/[^a-zA-Z0-9]/g, "");
-        return (normalized + "ABCDEFGHI".slice(0, Math.max(0, 9 - normalized.length))).slice(0, 9);
-      }
-      if (!same && id.includes("|"))
-        return id.split("|", 1)[0].replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 40);
-      return compat?.usesOpenAIToolCallIdLimit === true ? id.slice(0, 40) : id;
-    }
-    case "anthropic-messages": {
-      if (same && compat?.officialEndpoint !== true)
-        return id;
-      const normalized = sanitize(id);
-      if (normalized)
-        return normalized;
-      const suffix = hash2(id);
-      return suffix === undefined ? undefined : `toolu_${suffix}`;
-    }
-    case "bedrock-converse-stream":
-      return sanitize(id);
-    case "google-generative-ai":
-    case "google-gemini-cli":
-    case "google-vertex":
-      return same ? id : sanitize(id);
-    case "openai-responses":
-    case "azure-openai-responses": {
-      const sep = id.search(/[\n|]/);
-      const simple = sep < 0 && id.length <= 64 && /^[a-zA-Z0-9_-]+$/.test(id);
-      const foreign = origin && (origin.provider !== model.provider || origin.api !== model.api);
-      return !same && !simple && (foreign || sep >= 0 || id.length > 64) ? codexCallId(responsesComponent(id)) : responsesComponent(id);
-    }
-    case "openai-codex-responses":
-      return codexCallId(responsesComponent(id));
-    default:
-      return id;
-  }
-}
-
 // src/pi-dispatch-structure.ts
 var MAX_MESSAGES = 1e5;
 var ORPHAN_NOTE = Symbol("prepared orphan tool result");
@@ -35063,11 +35292,11 @@ var TRANSFORM_MESSAGES_APIS = new Set([
   "devin-agent",
   "apple-foundation-models"
 ]);
-function object5(value) {
+function object7(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function messageStructure(value) {
-  const message = object5(value);
+  const message = object7(value);
   if (!message)
     return;
   const role = [
@@ -35079,7 +35308,7 @@ function messageStructure(value) {
     "bashExecution",
     "pythonExecution"
   ].includes(String(message.role)) ? "user" : message.role;
-  if (role !== "user" && role !== "assistant" && role !== "toolResult")
+  if (role !== "user" && role !== "assistant" && role !== "toolResult" && role !== "system")
     return;
   const row = { role, calls: [], results: [] };
   if (ORPHAN_NOTE in message && typeof message.content === "string") {
@@ -35096,7 +35325,7 @@ function messageStructure(value) {
   }
   if (role === "assistant" && Array.isArray(message.content)) {
     for (const value of message.content) {
-      const block = object5(value);
+      const block = object7(value);
       if (block?.type !== "toolCall" && block?.type !== "tool_use")
         continue;
       if (typeof block.id !== "string")
@@ -35118,11 +35347,11 @@ function projectMissingToolResults(messages, api) {
     return pipe > 0 ? id.slice(0, pipe) : id;
   };
   for (const value of messages) {
-    const message = object5(value);
+    const message = object7(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object5(value);
+      const block = object7(value);
       if (block?.type !== "toolCall" || typeof block.id !== "string")
         continue;
       if ([
@@ -35142,7 +35371,7 @@ function projectMissingToolResults(messages, api) {
   const pairingId = (id) => !opaqueIds.has(id) && responsesComponents.has(component(id)) ? component(id) : id;
   const lastResult = new Map;
   messages.forEach((value, index) => {
-    const message = object5(value);
+    const message = object7(value);
     if (message?.role === "toolResult" && typeof message.toolCallId === "string")
       lastResult.set(pairingId(message.toolCallId), index);
   });
@@ -35173,7 +35402,7 @@ function projectMissingToolResults(messages, api) {
   };
   for (let index = 0;index < messages.length; index++) {
     const value = messages[index];
-    const message = object5(value);
+    const message = object7(value);
     if ((message?.role === "bashExecution" || message?.role === "pythonExecution") && message.excludeFromContext === true)
       continue;
     if (message?.role !== "toolResult")
@@ -35184,7 +35413,7 @@ function projectMissingToolResults(messages, api) {
       if (pending.some((call) => !resolved.has(pairingId(call.id))))
         continue;
       const parts = message.content.flatMap((value) => {
-        const part = object5(value);
+        const part = object7(value);
         return part?.type === "text" && typeof part.text === "string" && part.text.trim() ? [part.text] : [];
       });
       if (parts.length) {
@@ -35211,7 +35440,7 @@ ${parts.join(`
     if (aborted && typeof timestamp !== "number")
       continue;
     for (const value of message.content) {
-      const block = object5(value);
+      const block = object7(value);
       if (block?.type === "toolCall" && typeof block.id === "string")
         pending.push({
           id: block.id,
@@ -35225,7 +35454,7 @@ ${parts.join(`
 function preparePiDispatch(messages, model, omp) {
   let output = messages;
   const structure = buildPiPreparedStructure(messages, model, omp ? (index, source) => {
-    if (object5(source.providerPayload)?.type !== "openaiResponsesHistory")
+    if (object7(source.providerPayload)?.type !== "openaiResponsesHistory")
       return;
     if (output === messages)
       output = messages.slice();
@@ -35238,7 +35467,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   if (!messages.length || messages.length > MAX_MESSAGES)
     return;
   for (let index = 0;index < messages.length; index++) {
-    const source = object5(messages[index]);
+    const source = object7(messages[index]);
     if (source?.role === "user" || source?.role === "compactionSummary")
       prepareUser?.(index, source);
   }
@@ -35254,7 +35483,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   let valid = true;
   for (let index = 0;index < projectedMessages.length; index++) {
     const message = projectedMessages[index];
-    const source = object5(message);
+    const source = object7(message);
     if (rows.length === 0 && (source?.role === "system" || source?.role === "developer"))
       continue;
     if ((source?.role === "bashExecution" || source?.role === "pythonExecution") && source.excludeFromContext === true)
@@ -35278,7 +35507,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
       "azure-openai-responses",
       "openai-codex-responses"
     ].includes(model?.api ?? "") && (source?.role === "user" || source?.role === "developer") && (typeof source.content === "string" ? !source.content.trim() : Array.isArray(source.content) && !source.content.some((value) => {
-      const block = object5(value);
+      const block = object7(value);
       return block?.type === "image" || block?.type === "text" && typeof block.text === "string" && block.text.trim();
     })))
       continue;
@@ -35308,6 +35537,28 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   }
   if (!valid)
     return;
+  const positionedRows = [...byIndex];
+  for (let position = positionedRows.length - 1;position >= 0; position--) {
+    const [index, row] = positionedRows[position];
+    const source = object7(projectedMessages[index]);
+    if (!source)
+      return;
+    const content = source.content;
+    const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
+    const textOnly = Array.isArray(parts) && parts.every((part) => object7(part)?.type === "text" && typeof object7(part)?.text === "string");
+    if (piIsDeveloperHistory(source) && source.attribution !== "user") {
+      const previous = rows[position - 1];
+      const next = rows[position + 1];
+      if (model?.api === "ollama-chat" || model?.api === "anthropic-messages" && object7(model.compat)?.supportsMidConversationSystem === true && textOnly && (previous?.role === "user" || previous?.role === "toolResult") && (!next || next.role === "assistant"))
+        row.role = "system";
+    }
+    if (row.role === "system") {
+      if (!textOnly)
+        return;
+      const texts = parts.map((part) => part.text);
+      row.systemText = model?.api === "anthropic-messages" ? texts.filter((text) => text.trim()).map((text) => new TextDecoder().decode(new TextEncoder().encode(text))) : texts;
+    }
+  }
   const responsesApi = responsesLane(model?.api);
   let responsesMessages = responsesApi ? [] : undefined;
   if (responsesMessages) {
@@ -35371,7 +35622,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
     ...responsesMessages ? { responsesMessages } : {},
     ...model?.api ? { api: model.api } : {},
     ...model?.api?.startsWith("google-") ? {
-      googleFunctionIds: object5(model.compat)?.supportsFunctionPartId === true
+      googleFunctionIds: object7(model.compat)?.supportsFunctionPartId === true
     } : {}
   };
 }
@@ -35383,7 +35634,7 @@ function responsesLane(api) {
   ].includes(api ?? "");
 }
 function payloadStructure(payload, ollama = false, responsesItems = false, imageProjection = false) {
-  const body = object5(payload);
+  const body = object7(payload);
   if (!body)
     return;
   const google = piGoogleConversation(payload);
@@ -35398,7 +35649,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
     return;
   const rows = [];
   for (const value of messages) {
-    const message = object5(value);
+    const message = object7(value);
     if (!message)
       return;
     if (rows.length === 0 && (message.role === "system" || message.role === "developer"))
@@ -35458,7 +35709,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
       continue;
     }
     if (message.role === "user" && Array.isArray(message.content)) {
-      const results = message.content.filter((block) => object5(block)?.type === "tool_result" || bedrock && object5(block)?.toolResult);
+      const results = message.content.filter((block) => object7(block)?.type === "tool_result" || bedrock && object7(block)?.toolResult);
       if (results.length) {
         for (const block of results) {
           const id = bedrock ? block.toolResult?.toolUseId : block.tool_use_id;
@@ -35481,7 +35732,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
         continue;
       }
     }
-    const row = messageStructure(ollama && message.role === "system" ? { ...message, role: "user" } : message);
+    const row = messageStructure(message);
     if (!row)
       return;
     row.wireContent = message.content;
@@ -35505,11 +35756,11 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
     }
     if (Array.isArray(message.tool_calls)) {
       for (const call of message.tool_calls) {
-        const source = object5(call);
+        const source = object7(call);
         if (!source)
           return;
         if (source.id === undefined && ollama) {
-          const fn = object5(source.function);
+          const fn = object7(source.function);
           if (typeof fn?.name !== "string")
             return;
           row.calls.push("");
@@ -35545,7 +35796,7 @@ function googleStructure(contents, imageProjection = false) {
     return;
   const rows = [];
   for (const value of contents) {
-    const message = object5(value);
+    const message = object7(value);
     if (!message || !Array.isArray(message.parts))
       return;
     if (message.role !== "user" && message.role !== "model")
@@ -35560,11 +35811,11 @@ function googleStructure(contents, imageProjection = false) {
     };
     const results = [];
     for (const value of message.parts) {
-      const part = object5(value);
+      const part = object7(value);
       if (!part)
         return;
       if (part.functionCall) {
-        const call = object5(part.functionCall);
+        const call = object7(part.functionCall);
         if (row.role !== "assistant" || typeof call?.name !== "string" || call.id !== undefined && typeof call.id !== "string")
           return;
         row.calls.push(call.id ?? "");
@@ -35572,7 +35823,7 @@ function googleStructure(contents, imageProjection = false) {
         row.callNames.push(call.name);
       }
       if (part.functionResponse) {
-        const result = object5(part.functionResponse);
+        const result = object7(part.functionResponse);
         if (row.role !== "user" || typeof result?.name !== "string" || result.id !== undefined && typeof result.id !== "string")
           return;
         results.push({
@@ -35606,11 +35857,11 @@ function matchesUserText(content, text, api, responses, googleOrBedrock) {
   if (responses || googleOrBedrock) {
     if (!Array.isArray(content) || content.length !== 1)
       return false;
-    const block = object5(content[0]);
+    const block = object7(content[0]);
     return !!block && block.text === text && (responses ? block.type === "input_text" : Object.keys(block).length === 1);
   }
   if ((api === "anthropic-messages" || api === "factory-droid-agent") && Array.isArray(content)) {
-    const block = content.length === 1 ? object5(content[0]) : undefined;
+    const block = content.length === 1 ? object7(content[0]) : undefined;
     return block?.type === "text" && block.text === text;
   }
   return content === text;
@@ -35620,7 +35871,7 @@ function safeRole(row, readable) {
     return "unreadable";
   if (!row)
     return "missing";
-  return ["user", "assistant", "toolResult"].includes(row.role) ? row.role : "unknown";
+  return ["user", "assistant", "toolResult", "system"].includes(row.role) ? row.role : "unknown";
 }
 function safeCount(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : "unreadable";
@@ -35678,7 +35929,7 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
       return "comparison=image count";
     const imageProjection = trimmed > 0;
     stage = "wire rows";
-    const body = object5(payload);
+    const body = object7(payload);
     const ollama = prepared?.api === "ollama-chat" && !!body && Array.isArray(body.messages) && body.input === undefined && body.system === undefined && body.inferenceConfig === undefined;
     const responses = body?.messages === undefined && Array.isArray(body?.input);
     rows = payloadStructure(payload, ollama, responses && !!prepared?.responsesMessages, imageProjection);
@@ -35700,6 +35951,14 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
       const actual = rows[i];
       if (actual.role !== expected.role)
         return structureDetail(i, expectedRows, rows, "role");
+      if (expected.systemText !== undefined) {
+        const texts = expected.systemText;
+        const content = actual.wireContent;
+        const actualTexts = typeof content === "string" ? [content] : Array.isArray(content) && content.every((part) => object7(part)?.type === "text" && typeof object7(part)?.text === "string") ? content.map((part) => part.text) : undefined;
+        if (!actualTexts || (typeof content === "string" ? content !== texts.join(`
+`) : JSON.stringify(actualTexts) !== JSON.stringify(texts)))
+          return structureDetail(i, expectedRows, rows, "content");
+      }
       if (imageProjection && !piMatchesImages(actual.images ?? [], expected.images ?? []))
         return structureDetail(i, expectedRows, rows, "content");
       if (expected.responseTexts !== undefined && (expected.responseTexts.length !== actual.responseTexts?.length || expected.responseTexts.some((text, index) => text !== actual.responseTexts?.[index])))
@@ -37069,8 +37328,10 @@ function releasePiOperationPayloads(operation) {
   operation.inputMessages = undefined;
   operation.inputBranch = undefined;
   operation.dispatchFields = undefined;
+  operation.chainDispatchFields = undefined;
   operation.managedSignature = undefined;
   operation.preparedStructure = undefined;
+  operation.preparedHistory = undefined;
 }
 function operationKey(ctx) {
   return ctx.sessionManager?.getSessionId?.() ?? ctx.sessionManager ?? "no-session";
@@ -37207,6 +37468,8 @@ function registerPiGuardedContext(pi, handler, options = {}) {
   receiptMaps.add(structureWarnings);
   const imageTrimNotices = new Map;
   receiptMaps.add(imageTrimNotices);
+  const chains = new Map;
+  receiptMaps.add(chains);
   const refuse = (ctx, budget, reason, isCurrent) => {
     if (!isCurrent()) {
       log2(`[magic-context][pi] DISCARDED CONTEXT RESULT ${budget.diagnostic()}`, reason);
@@ -37267,6 +37530,19 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         releasePiOperationPayloads(operation);
       }
     });
+    pi.on("assistant_message", (event, ctx) => {
+      const key = operationKey(ctx);
+      try {
+        const awaiting = chains.get(key)?.awaiting;
+        const response = piChainResponse(event?.message);
+        if (awaiting && response)
+          chains.set(key, { anchor: { ...awaiting, ...response } });
+        else
+          chains.delete(key);
+      } catch {
+        chains.delete(key);
+      }
+    });
     pi.on("before_provider_request", (event, ctx) => {
       const cancelledOperation = operations.get(operationKey(ctx));
       const signal = ctx.signal;
@@ -37276,8 +37552,10 @@ function registerPiGuardedContext(pi, handler, options = {}) {
           cancelledOperation.ready = false;
         return;
       }
-      if (options.compactionOff?.(ctx))
+      if (options.compactionOff?.(ctx)) {
+        chains.delete(operationKey(ctx));
         return;
+      }
       const payload = event.payload;
       const key = operationKey(ctx);
       if (sideSessions.get(key)?.sides)
@@ -37321,18 +37599,33 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         }
         if (!budget.completed || !active.ready || active.refused || budget.abandoned)
           throw new Error("context pass ran without a managed context receipt");
-        if (!piHasManagedSignature(payload, active.managedSignature))
+        const chained = piChainedRequest(payload);
+        let checked = payload;
+        let chainInput;
+        if (chained) {
+          const expanded = piExpandChainedRequest(payload, chained, chains.get(key)?.anchor, active.preparedHistory, {
+            current: active.pass,
+            resend: active.chainDispatchFields !== undefined
+          });
+          if ("refusal" in expanded)
+            throw new Error(`provider request does not match this pass's managed dispatch (chained continuation: ${expanded.refusal})`);
+          checked = expanded.payload;
+          chainInput = expanded.input;
+        }
+        if (!piHasManagedSignature(checked, active.managedSignature))
           throw new Error("provider request does not match this pass's managed dispatch (missing current receipt signature)");
         const fields = piConversationFields(payload);
         if (!fields)
           throw new Error("provider conversation identity could not be established");
-        const body = payload;
+        const body = checked;
         const skipReason = active.preparedStructure ? active.preparedStructure.structuralSkipReason ?? (active.preparedStructure.api && body?.messages === undefined && Array.isArray(body?.input) && !active.preparedStructure.responsesMessages ? "provider selected Responses items without a matching history plan" : undefined) : "prepared history representation is not modeled";
+        if (chained && skipReason)
+          throw new Error("provider request does not match this pass's managed dispatch (chained continuation requires a modeled prepared history)");
         if (skipReason && !structureWarnings.has(key)) {
           structureWarnings.set(key, true);
           log2(`[magic-context][pi] OMP structural comparison skipped: ${skipReason}; stale prepared requests are not detected on this pass; session=${String(key)}`);
         }
-        const structureMismatch = skipReason ? undefined : piPreparedStructureMismatch(payload, active.preparedStructure, (counts) => {
+        const structureMismatch = skipReason ? undefined : piPreparedStructureMismatch(checked, active.preparedStructure, (counts) => {
           if (imageTrimNotices.has(key))
             return;
           imageTrimNotices.set(key, true);
@@ -37340,19 +37633,31 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         });
         if (structureMismatch)
           throw new Error(`provider request does not match this pass's managed dispatch (prepared turn structure); ${structureMismatch}`);
-        if (active.dispatched) {
-          if (!active.dispatchFields || exactReusablePrefix([{ id: "conversation", fields }], [{ id: "conversation", fields: active.dispatchFields }]) !== 1)
-            throw new Error("provider request does not match this pass's managed dispatch");
-        }
+        const admittedFields = chained ? active.chainDispatchFields : active.dispatchFields;
+        if (admittedFields && exactReusablePrefix([{ id: "conversation", fields }], [{ id: "conversation", fields: admittedFields }]) !== 1)
+          throw new Error("provider request does not match this pass's managed dispatch");
         if (!active.dispatched && active.inputMessages && (!active.inputBranch || active.inputBranch.anchorIndex < active.inputMessages.length - 1)) {
           const previous = active.inputBranch;
           const persisted = inputBranch(ctx, active.inputMessages);
           if (!previous || persisted && persisted.anchorIndex > previous.anchorIndex && persisted.entryIds[previous.anchorIndex] === previous.anchorId)
             active.inputBranch = persisted;
         }
-        if (!active.dispatched)
-          active.dispatchFields = fields;
+        if (chained)
+          active.chainDispatchFields ??= fields;
+        else
+          active.dispatchFields ??= fields;
         active.dispatched = true;
+        const chain = chains.get(key);
+        if (chain?.anchor && active.pass)
+          chain.anchor.supersededBy ??= active.pass;
+        const sentInput = chainInput ?? (Array.isArray(body?.input) && body.messages === undefined ? [...body.input] : undefined);
+        if (sentInput && active.preparedHistory)
+          chains.set(key, {
+            anchor: chain?.anchor,
+            awaiting: { input: sentInput, prepared: active.preparedHistory }
+          });
+        else
+          chains.delete(key);
       } catch (error) {
         if (signal ? signal.aborted : budget.isCancelled(error)) {
           budget.cancel();
@@ -37414,6 +37719,8 @@ function registerPiGuardedContext(pi, handler, options = {}) {
           result.messages = prepared.messages;
         active.managedSignature = piManagedSignature(result.messages);
         active.preparedStructure = prepared.structure;
+        if (fenceEnabled && !budget.sideTurn && piChainCapableApi(ctx.model?.api))
+          active.preparedHistory = piPreparedHistory(result.messages, ctx.model);
         budget.completed = true;
         active.ready = true;
         if (inputs)
@@ -43480,10 +43787,7 @@ function registerPiContextHandler(pi, baseOptions) {
             messages: inputForThinkingFit,
             forceSignedRebuildForFit: true,
             forceMaterialization: true,
-            contextUsage: {
-              ...pipelineArgs.contextUsage,
-              percentage: Math.max(95, pipelineArgs.contextUsage.percentage)
-            }
+            contextUsage: pipelineArgs.contextUsage
           }));
           observePipelineResultForTests(sessionId, result);
           fitReclaimedThisPass = true;
@@ -43594,7 +43898,7 @@ function registerPiContextHandler(pi, baseOptions) {
                     sessionMeta: freshMeta
                   }) : undefined,
                   contextUsage: {
-                    percentage: fitCase === "over-window-proof" ? Math.max(95, usagePercentage) : usagePercentage,
+                    percentage: usagePercentage,
                     inputTokens: usageInputTokens
                   }
                 }));
@@ -49219,6 +49523,178 @@ function bindStaleBuildNotice(ctx, moduleUrl) {
   });
 }
 
+// src/stream-tag-prefix-strip.ts
+var MAX_TAG_DIGITS = 12;
+var LEADING_NOTATION = new RegExp(`^\\s*(?:§\\d{1,${MAX_TAG_DIGITS}}§\\s*)*`);
+var UNFINISHED_HANDLE = new RegExp(`^§\\d{0,${MAX_TAG_DIGITS}}$`);
+function classifyStreamHead(text) {
+  const leading = LEADING_NOTATION.exec(text)?.[0] ?? "";
+  const rest = text.slice(leading.length);
+  if (rest.length === 0 || UNFINISHED_HANDLE.test(rest))
+    return { kind: "hold" };
+  if (leading.includes("§"))
+    return { kind: "strip", prefixLength: leading.length };
+  return { kind: "pass" };
+}
+function visibleText(text, state) {
+  if (state?.mode === "pass")
+    return text;
+  if (state?.mode === "stripped") {
+    return text.startsWith(state.prefix) ? text.slice(state.prefix.length) : text;
+  }
+  const decision = classifyStreamHead(text);
+  if (decision.kind === "hold")
+    return "";
+  if (decision.kind === "strip")
+    return text.slice(decision.prefixLength);
+  return text;
+}
+function isRecord7(value) {
+  return value !== null && typeof value === "object";
+}
+function canWrite(obj, key) {
+  const descriptor = Object.getOwnPropertyDescriptor(obj, key);
+  if (descriptor === undefined)
+    return Object.isExtensible(obj);
+  return descriptor.writable === true;
+}
+function visibleContent(content, blocks) {
+  if (!Array.isArray(content))
+    return;
+  let copy;
+  for (let index = 0;index < content.length; index++) {
+    const part = content[index];
+    if (!isRecord7(part) || part.type !== "text" || typeof part.text !== "string")
+      continue;
+    const shown = visibleText(part.text, blocks.get(index));
+    if (shown === part.text)
+      continue;
+    copy ??= content.slice();
+    copy[index] = { ...part, text: shown };
+  }
+  return copy;
+}
+function rewriteMessageUpdateEvent(event, state) {
+  if (state.disabled || !isRecord7(event))
+    return;
+  const message = event.message;
+  const update = event.assistantMessageEvent;
+  if (!isRecord7(message) || message.role !== "assistant" || !isRecord7(update))
+    return;
+  if (typeof update.type !== "string")
+    return;
+  const index = update.contentIndex;
+  const hasIndex = typeof index === "number" && Number.isInteger(index) && index >= 0;
+  const writes = [];
+  let nextBlock;
+  if (update.type === "text_start" && hasIndex) {
+    nextBlock = { mode: "holding", held: "" };
+  } else if (update.type === "text_delta" && hasIndex) {
+    if (typeof update.delta !== "string")
+      return;
+    const current = state.blocks.get(index) ?? { mode: "holding", held: "" };
+    if (current.mode === "holding") {
+      const held = current.held + update.delta;
+      const decision = classifyStreamHead(held);
+      let shown;
+      if (decision.kind === "hold") {
+        nextBlock = { mode: "holding", held };
+        shown = "";
+      } else if (decision.kind === "strip") {
+        nextBlock = {
+          mode: "stripped",
+          prefix: held.slice(0, decision.prefixLength)
+        };
+        shown = held.slice(decision.prefixLength);
+      } else {
+        nextBlock = { mode: "pass" };
+        shown = held;
+      }
+      if (shown !== update.delta)
+        writes.push({ target: update, key: "delta", value: shown });
+    }
+  } else if (update.type === "text_end" && hasIndex) {
+    if (typeof update.content !== "string")
+      return;
+    const current = state.blocks.get(index);
+    const shown = visibleText(update.content, current);
+    if (current === undefined || current.mode === "holding") {
+      nextBlock = shown === "" ? { mode: "stripped", prefix: update.content } : shown === update.content ? { mode: "pass" } : {
+        mode: "stripped",
+        prefix: update.content.slice(0, update.content.length - shown.length)
+      };
+    }
+    if (shown !== update.content)
+      writes.push({ target: update, key: "content", value: shown });
+  }
+  let blocks = state.blocks;
+  if (nextBlock !== undefined && hasIndex) {
+    blocks = new Map(state.blocks);
+    blocks.set(index, nextBlock);
+  }
+  const messageContent = visibleContent(message.content, blocks);
+  if (messageContent !== undefined) {
+    writes.push({ target: message, key: "content", value: messageContent });
+  }
+  const partial = update.partial;
+  if (isRecord7(partial)) {
+    const partialContent = visibleContent(partial.content, blocks);
+    if (partialContent !== undefined) {
+      writes.push({
+        target: update,
+        key: "partial",
+        value: { ...partial, content: partialContent }
+      });
+    }
+  }
+  if (!writes.every((write) => canWrite(write.target, write.key))) {
+    state.disabled = true;
+    return;
+  }
+  for (const write of writes) {
+    write.target[write.key] = write.value;
+  }
+  if (nextBlock !== undefined && hasIndex)
+    state.blocks.set(index, nextBlock);
+}
+function createMessageStreamState() {
+  return { blocks: new Map, disabled: false };
+}
+function registerStreamTagPrefixStrip(pi, isActive) {
+  const states = new WeakMap;
+  const fallbackKey = {};
+  const keyFor = (ctx) => {
+    const sessionManager = isRecord7(ctx) ? ctx.sessionManager : undefined;
+    return isRecord7(sessionManager) ? sessionManager : fallbackKey;
+  };
+  const isAssistant = (event) => isRecord7(event) && isRecord7(event.message) && event.message.role === "assistant";
+  pi.on("message_start", (event, ctx) => {
+    try {
+      if (isAssistant(event))
+        states.set(keyFor(ctx), createMessageStreamState());
+    } catch {}
+  });
+  pi.on("message_update", (event, ctx) => {
+    try {
+      if (!isActive() || !isAssistant(event))
+        return;
+      const key = keyFor(ctx);
+      let state = states.get(key);
+      if (state === undefined) {
+        state = createMessageStreamState();
+        states.set(key, state);
+      }
+      rewriteMessageUpdateEvent(event, state);
+    } catch {}
+  });
+  pi.on("message_end", (event, ctx) => {
+    try {
+      if (isAssistant(event))
+        states.delete(keyFor(ctx));
+    } catch {}
+  });
+}
+
 // src/strip-tag-prefix.ts
 function stripTagPrefixFromAssistantMessage(message) {
   if (message.role !== "assistant")
@@ -49241,6 +49717,41 @@ function stripTagPrefixFromAssistantMessage(message) {
   }
   return mutated;
 }
+function strippedAssistantContent(content) {
+  if (!Array.isArray(content))
+    return;
+  let copy;
+  for (let index = 0;index < content.length; index++) {
+    const part = content[index];
+    if (part === null || typeof part !== "object" || part.type !== "text") {
+      continue;
+    }
+    if (typeof part.text !== "string")
+      continue;
+    const stripped = stripPersistedAssistantText(part.text);
+    if (stripped === part.text)
+      continue;
+    copy ??= content.slice();
+    copy[index] = { ...part, text: stripped };
+  }
+  return copy;
+}
+function registerOmpAssistantMessageStrip(pi, isActive) {
+  const api = pi;
+  api.on("assistant_message", (event) => {
+    try {
+      if (!isActive())
+        return;
+      const message = event?.message;
+      if (message?.role !== "assistant")
+        return;
+      const content = strippedAssistantContent(message.content);
+      return content === undefined ? undefined : { content };
+    } catch {
+      return;
+    }
+  });
+}
 
 // src/subagent-host-tools.ts
 function registerPiSubagentHostTools(pi, harness) {
@@ -50645,6 +51156,11 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
     }
   });
   pi.on("session_before_compact", async (_event, ctx) => handlePiSessionBeforeCompact({ db, compactionOff, ctx }));
+  if (PI_HARNESS_KIND !== "omp") {
+    registerStreamTagPrefixStrip(pi, () => !compactionOff);
+  } else {
+    registerOmpAssistantMessageStrip(pi, () => !compactionOff);
+  }
   pi.on("message_end", async (event, ctx) => {
     try {
       const leafId = ctx.sessionManager.getLeafId();