@cortexkit/pi-magic-context 0.49.15 → 0.49.16

package/dist/index.js

@@ -248,7 +248,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-hshd96pt.js";
+} from "./index-4178cbfw.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical,
@@ -265,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,
@@ -288,7 +288,7 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-ccsscaap.js";
+} from "./index-v8d4vgam.js";
 import {
   setHomeProjectPermission,
   ProjectIdentityError,
@@ -299,7 +299,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-6ex901g3.js";
+} from "./index-y5c73caa.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -458,7 +458,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-75ah9413.js";
+} from "./index-44h64qza.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -545,7 +545,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-j0n09wtp.js";
+} from "./index-dne4ja7a.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -591,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";
@@ -617,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,
@@ -633,7 +631,7 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./index-7qc73yk5.js";
+} from "./index-afy3dzf9.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -642,7 +640,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-1mrvw9en.js";
+} from "./index-mx59cve4.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -668,7 +666,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-nwbhe6qv.js";
+} from "./index-n3r2d2pr.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -683,7 +681,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-bet4sd3e.js";
+} from "./index-tympym62.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -733,7 +731,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-0awvkeb5.js";
+} from "./index-xmzhrht0.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -764,10 +762,10 @@ 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,
@@ -789,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";
@@ -800,6 +800,9 @@ import {
 import {
   normalizeProtectedToolName
 } from "./index-674f6qs2.js";
+import {
+  sameProjectDirectory
+} from "./index-wrr9rp9a.js";
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
@@ -3509,7 +3512,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.15",
+  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",
@@ -5036,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) {
@@ -5071,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;
@@ -5097,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) {
@@ -5115,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,
@@ -6876,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
@@ -9437,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"
         });
@@ -9521,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)
@@ -28585,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 ?? ""}`
   ]);
@@ -28596,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;
 }
@@ -29005,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,
@@ -29034,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);
@@ -34352,6 +34353,87 @@ function isOmpUnmanagedCaptureRequest(payload) {
 // 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;
@@ -34423,20 +34505,20 @@ function piToolCallWireId(id, model, source) {
 }
 
 // src/pi-dispatch-chain-tail.ts
-function object(value) {
+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 = object(model.identity)?.class === "gpt-oss";
+  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" && object(model.compat)?.supportsImageDetailOriginal !== true ? "auto" : block.detail ?? "auto";
-    const file = object(block.providerFile);
+    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"))
@@ -34449,9 +34531,21 @@ function piEncodeChainTail(messages, assistant, responseItems, model) {
   };
   const items = [];
   for (const value of messages) {
-    const message = object(value);
+    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;
@@ -34462,7 +34556,7 @@ function piEncodeChainTail(messages, assistant, responseItems, model) {
     const images = [];
     const ordered = [];
     for (const value of content) {
-      const block = object(value);
+      const block = object2(value);
       if (block?.type === "text" && typeof block.text === "string") {
         texts.push(block.text);
         if (!user || block.text.trim())
@@ -34490,7 +34584,7 @@ function piEncodeChainTail(messages, assistant, responseItems, model) {
     if (typeof message.toolCallId !== "string" || message.providerMetadata !== undefined)
       return;
     const id = piToolCallWireId(message.toolCallId, model, assistant);
-    const call = responseItems.map(object).find((item) => item?.call_id === id);
+    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(`
@@ -34507,7 +34601,7 @@ ${OMITTED_IMAGE}` : OMITTED_IMAGE : joined);
 }
 
 // src/pi-dispatch-chain.ts
-function object2(value) {
+function object3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function piChainCapableApi(api) {
@@ -34521,14 +34615,14 @@ function piPreparedHistory(messages, model) {
     if (!fields)
       return;
     snapshots.push({ id: "", fields });
-    const source = object2(message);
+    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 = object2(messages[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);
@@ -34538,7 +34632,7 @@ function piPreparedHistory(messages, model) {
   return prepared;
 }
 function piChainedRequest(payload) {
-  const body = object2(payload);
+  const body = object3(payload);
   if (!body || body.previous_response_id === undefined)
     return;
   const id = body.previous_response_id;
@@ -34547,14 +34641,14 @@ function piChainedRequest(payload) {
   return { previousResponseId: id, delta: body.input };
 }
 function piChainResponse(message) {
-  const source = object2(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 = object2(source.providerPayload);
+  const payload = object3(source.providerPayload);
   if (payload?.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items))
     return;
   return {
@@ -34744,74 +34838,6 @@ function piHasManagedSignature(payload, signature) {
   return false;
 }
 
-// src/pi-dispatch-agent-history.ts
-function object3(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
-}
-function piAgentHistory(messages, api) {
-  return messages.flatMap((value) => {
-    const message = object3(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) => object3(part)?.type === "text").map((part) => object3(part)?.text).join(`
-`);
-      return [
-        {
-          ...message,
-          role: "user",
-          content: [
-            {
-              type: "text",
-              text: text.length ? "User interjection envelope" : ""
-            },
-            ...content.filter((part) => object3(part)?.type === "image")
-          ]
-        }
-      ];
-    }
-    if (userInvoked && message.customType === "skill-prompt")
-      return [{ ...message, role: "user", content }];
-    const images = content.filter((part) => object3(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) => object3(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:";
@@ -35282,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") {
@@ -35511,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) {
@@ -35684,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;
@@ -35823,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";
@@ -35903,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])))
@@ -43731,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;
@@ -43845,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
                   }
                 }));