@cortexkit/pi-magic-context 0.49.4 → 0.49.5

package/dist/index.js

@@ -3421,7 +3421,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.4",
+  version: "0.49.5",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -32850,6 +32850,14 @@ var PI_CONTEXT_BUDGET = {
 class PiContextDeadlineError extends Error {
 }
 
+class PiContextSupersededError extends Error {
+  origin;
+  constructor(message, origin = "context ownership") {
+    super(message);
+    this.origin = origin;
+  }
+}
+
 class PiContextBudget {
   startedAt;
   now;
@@ -33512,9 +33520,151 @@ function piMatchesChatImages(content, urls) {
   return true;
 }
 
+// src/pi-dispatch-image-budget.ts
+function object3(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function piImageBudgetPlan(model) {
+  if (!model?.input?.includes("image") || object3(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,
+    hoistErrorImages: model.api === "anthropic-messages" || model.api === "bedrock-converse-stream"
+  };
+}
+function inputImage(block, api) {
+  const file = object3(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")
+    return { kind: "file", value: file.id };
+  if (api?.startsWith("google-") && file?.provider === "google" && typeof file.uri === "string")
+    return { kind: "url", value: file.uri };
+  if (api !== "bedrock-converse-stream" && typeof block.url === "string")
+    return { kind: "url", value: block.url };
+  return {
+    kind: "data",
+    value: typeof block.data === "string" ? block.data : "",
+    mime: typeof block.mimeType === "string" ? block.mimeType : ""
+  };
+}
+function piRecordImages(plan, row, source) {
+  if (!plan || !source || !["user", "developer", "toolResult"].includes(String(source.role)) || !Array.isArray(source.content))
+    return;
+  const images = [];
+  for (const value of source.content) {
+    const block = object3(value);
+    if (block?.type === "image")
+      images.push(inputImage(block, plan.api));
+  }
+  if (!images.length)
+    return;
+  plan.rows.set(row, {
+    first: plan.count,
+    images,
+    hoisted: source.role === "toolResult" && (plan.hoistToolImages || source.isError === true && plan.hoistErrorImages)
+  });
+  plan.count += images.length;
+}
+function piRemainingImages(run, drops) {
+  return run.images.slice(Math.max(0, Math.min(run.images.length, drops - run.first)));
+}
+function piWireImages(content, ollamaImages) {
+  if (Array.isArray(ollamaImages))
+    return ollamaImages.map((value) => ({
+      kind: "bytes",
+      value: String(value)
+    }));
+  if (!Array.isArray(content))
+    return [];
+  const images = [];
+  for (const value of content) {
+    const block = object3(value);
+    if (!block)
+      continue;
+    const source = object3(block.source);
+    const inline = object3(block.inlineData);
+    const file = object3(block.fileData);
+    const bedrock = object3(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)
+        });
+    } else if (block.type === "image") {
+      if (source?.type === "file")
+        images.push({ kind: "file", value: String(source.file_id) });
+      else if (source?.type === "url")
+        images.push({ kind: "url", value: String(source.url) });
+      else
+        images.push({
+          kind: "data",
+          value: String(source?.data),
+          mime: String(source?.media_type)
+        });
+    } else if (inline)
+      images.push({
+        kind: "data",
+        value: String(inline.data),
+        mime: String(inline.mimeType)
+      });
+    else if (file)
+      images.push({ kind: "url", value: String(file.fileUri) });
+    else if (bedrock)
+      images.push({
+        kind: "data",
+        value: String(object3(bedrock.source)?.bytes),
+        mime: `image/${bedrock.format}`
+      });
+  }
+  return images;
+}
+function piMatchesImages(actual, expected) {
+  if (actual.length !== expected.length)
+    return false;
+  for (let index = 0;index < expected.length; index++) {
+    const a = actual[index];
+    const e = expected[index];
+    if (e.kind === "data" && a.kind === "url") {
+      const prefix = `data:${e.mime};base64,`;
+      if (a.value.length !== prefix.length + e.value.length || !a.value.startsWith(prefix) || !a.value.endsWith(e.value))
+        return false;
+    } else if (a.kind !== e.kind || a.value !== e.value || a.mime?.replace("image/jpg", "image/jpeg") !== e.mime?.replace("image/jpg", "image/jpeg"))
+      return false;
+  }
+  return true;
+}
+function piWireImageCount(payload) {
+  const body = object3(payload);
+  const visit = (value) => {
+    if (Array.isArray(value))
+      return value.reduce((n, item) => n + visit(item), 0);
+    const block = object3(value);
+    if (!block)
+      return 0;
+    if (["image", "image_url", "input_image"].includes(String(block.type)) || block.inlineData || block.fileData || block.image)
+      return 1;
+    return [
+      block.content,
+      block.output,
+      block.parts,
+      block.toolResult,
+      block.functionResponse,
+      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);
+}
+
 // src/pi-dispatch-responses-history.ts
 var MAX_TEXT_UNITS = 32 * 1024 * 1024;
-function object3(value) {
+function object4(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function wellFormed(text) {
@@ -33529,7 +33679,7 @@ function textIdentity(text, phase) {
 function signaturePhase(block) {
   try {
     if (typeof block.textSignature === "string") {
-      const signature = object3(JSON.parse(block.textSignature));
+      const signature = object4(JSON.parse(block.textSignature));
       if (signature?.v === 1 && typeof signature.id === "string")
         return signature.phase;
     }
@@ -33549,17 +33699,17 @@ ${wellFormed(text)}
   return;
 }
 function piResponsesAssistantTexts(value, model) {
-  const message = object3(value);
+  const message = object4(value);
   if (!message || !Array.isArray(message.content))
     return;
-  if (["length", "error", "aborted"].includes(String(message.stopReason)) && !message.content.some((value) => ["text", "toolCall"].includes(String(object3(value)?.type))))
+  if (["length", "error", "aborted"].includes(String(message.stopReason)) && !message.content.some((value) => ["text", "toolCall"].includes(String(object4(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 = object3(value);
+    const block = object4(value);
     if (block?.type === "toolCall")
       continue;
     if (block?.type === "thinking") {
@@ -33569,7 +33719,7 @@ function piResponsesAssistantTexts(value, model) {
         return;
       if (!block.thinking.trim())
         continue;
-      const compat = object3(model.compat);
+      const compat = object4(model.compat);
       if (block.summary === false && (compat?.requiresReasoningContentForToolCalls === true || compat?.requiresReasoningContentForAllAssistantTurns === true))
         return;
       const text = demotedThinking(block.thinking, model);
@@ -33589,23 +33739,23 @@ function piResponsesAssistantTexts(value, model) {
     texts.push(textIdentity(wellFormed(block.text), sameModel ? signaturePhase(block) : undefined));
     blocks.push(block);
   }
-  const payload = object3(message.providerPayload);
+  const payload = object4(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) || message.content.length !== blocks.length)
     return texts;
   const replay = [];
   for (const value of payload.items) {
-    const item = object3(value);
+    const item = object4(value);
     if (item?.type !== "message" || item.role !== "assistant" || !Array.isArray(item.content))
       return texts;
     for (const value of item.content) {
-      const part = object3(value);
+      const part = object4(value);
       const block = blocks[replay.length];
       if (!block || part?.type !== "output_text" || typeof part.text !== "string")
         return texts;
       let signature;
       try {
         if (typeof block.textSignature === "string")
-          signature = object3(JSON.parse(block.textSignature));
+          signature = object4(JSON.parse(block.textSignature));
       } catch {
         return texts;
       }
@@ -33626,7 +33776,7 @@ function piResponsesWireTexts(value, phase) {
   const texts = [];
   let units = 0;
   for (const partValue of value) {
-    const part = object3(partValue);
+    const part = object4(partValue);
     if (part?.type !== "output_text" || typeof part.text !== "string")
       return;
     units += part.text.length;
@@ -33709,11 +33859,28 @@ function piToolCallWireId(id, model, source) {
 
 // src/pi-dispatch-structure.ts
 var MAX_MESSAGES = 1e5;
-function object4(value) {
+var ORPHAN_NOTE = Symbol("prepared orphan tool result");
+var TRANSFORM_MESSAGES_APIS = new Set([
+  "openai-completions",
+  "openai-responses",
+  "openrouter",
+  "openai-codex-responses",
+  "azure-openai-responses",
+  "anthropic-messages",
+  "bedrock-converse-stream",
+  "google-generative-ai",
+  "google-gemini-cli",
+  "google-vertex",
+  "ollama-chat",
+  "factory-droid-agent",
+  "devin-agent",
+  "apple-foundation-models"
+]);
+function object5(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function messageStructure(value) {
-  const message = object4(value);
+  const message = object5(value);
   if (!message)
     return;
   const role = [
@@ -33728,6 +33895,11 @@ function messageStructure(value) {
   if (role !== "user" && role !== "assistant" && role !== "toolResult")
     return;
   const row = { role, calls: [], results: [] };
+  if (ORPHAN_NOTE in message && typeof message.content === "string") {
+    if (message.content.length > 32 * 1024 * 1024)
+      return;
+    row.exactText = message.content;
+  }
   if (typeof message.timestamp === "number")
     row.timestamp = message.timestamp;
   if (role === "toolResult") {
@@ -33737,7 +33909,7 @@ function messageStructure(value) {
   }
   if (role === "assistant" && Array.isArray(message.content)) {
     for (const value of message.content) {
-      const block = object4(value);
+      const block = object5(value);
       if (block?.type !== "toolCall" && block?.type !== "tool_use")
         continue;
       if (typeof block.id !== "string")
@@ -33749,35 +33921,41 @@ function messageStructure(value) {
   }
   return row;
 }
-function projectMissingToolResults(messages) {
+function projectMissingToolResults(messages, api) {
+  const projectOrphans = TRANSFORM_MESSAGES_APIS.has(api ?? "");
   const responsesComponents = new Set;
   const opaqueIds = new Set;
+  const validToolUseIds = projectOrphans ? new Set : undefined;
   const component = (id) => {
     const pipe = id.indexOf("|");
     return pipe > 0 ? id.slice(0, pipe) : id;
   };
   for (const value of messages) {
-    const message = object4(value);
+    const message = object5(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object4(value);
+      const block = object5(value);
       if (block?.type !== "toolCall" || typeof block.id !== "string")
         continue;
       if ([
         "openai-responses",
         "azure-openai-responses",
         "openai-codex-responses"
-      ].includes(String(message.api)))
+      ].includes(String(message.api))) {
         responsesComponents.add(component(block.id));
-      else if (block.id.includes("|"))
-        opaqueIds.add(block.id);
+        validToolUseIds?.add(component(block.id));
+      } else {
+        if (block.id.includes("|"))
+          opaqueIds.add(block.id);
+        validToolUseIds?.add(block.id);
+      }
     }
   }
   const pairingId = (id) => !opaqueIds.has(id) && responsesComponents.has(component(id)) ? component(id) : id;
   const lastResult = new Map;
   messages.forEach((value, index) => {
-    const message = object4(value);
+    const message = object5(value);
     if (message?.role === "toolResult" && typeof message.toolCallId === "string")
       lastResult.set(pairingId(message.toolCallId), index);
   });
@@ -33808,13 +33986,35 @@ function projectMissingToolResults(messages) {
   };
   for (let index = 0;index < messages.length; index++) {
     const value = messages[index];
-    const message = object4(value);
+    const message = object5(value);
     if ((message?.role === "bashExecution" || message?.role === "pythonExecution") && message.excludeFromContext === true)
       continue;
     if (message?.role !== "toolResult")
       flush(message?.timestamp);
     else if (typeof message.toolCallId === "string" && pending.some((call) => pairingId(call.id) === pairingId(String(message.toolCallId))))
       resolved.add(pairingId(message.toolCallId));
+    else if (validToolUseIds && message?.role === "toolResult" && typeof message.toolCallId === "string" && typeof message.toolName === "string" && !validToolUseIds.has(pairingId(message.toolCallId)) && Array.isArray(message.content)) {
+      if (pending.some((call) => !resolved.has(pairingId(call.id))))
+        continue;
+      const parts = message.content.flatMap((value) => {
+        const part = object5(value);
+        return part?.type === "text" && typeof part.text === "string" && part.text.trim() ? [part.text] : [];
+      });
+      if (parts.length) {
+        const error = message.isError ? ' is-error="true"' : "";
+        const note = `<stale-tool-result tool="${message.toolName}" id="${message.toolCallId}"${error}>
+${parts.join(`
+`)}
+</stale-tool-result>`;
+        projected.push({
+          role: "user",
+          content: api === "ollama-chat" ? note : new TextDecoder().decode(new TextEncoder().encode(note)),
+          timestamp: message.timestamp,
+          [ORPHAN_NOTE]: true
+        });
+      }
+      continue;
+    }
     projected.push(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
@@ -33824,7 +34024,7 @@ function projectMissingToolResults(messages) {
     if (aborted && typeof timestamp !== "number")
       continue;
     for (const value of message.content) {
-      const block = object4(value);
+      const block = object5(value);
       if (block?.type === "toolCall" && typeof block.id === "string")
         pending.push({
           id: block.id,
@@ -33838,7 +34038,7 @@ function projectMissingToolResults(messages) {
 function preparePiDispatch(messages, model, omp) {
   let output = messages;
   const structure = buildPiPreparedStructure(messages, model, omp ? (index, source) => {
-    if (object4(source.providerPayload)?.type !== "openaiResponsesHistory")
+    if (object5(source.providerPayload)?.type !== "openaiResponsesHistory")
       return;
     if (output === messages)
       output = messages.slice();
@@ -33851,11 +34051,11 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   if (!messages.length || messages.length > MAX_MESSAGES)
     return;
   for (let index = 0;index < messages.length; index++) {
-    const source = object4(messages[index]);
+    const source = object5(messages[index]);
     if (source?.role === "user" || source?.role === "compactionSummary")
       prepareUser?.(index, source);
   }
-  const projectedMessages = projectMissingToolResults(model?.api ? piAgentHistory(messages, model.api) : messages);
+  const projectedMessages = projectMissingToolResults(model?.api ? piAgentHistory(messages, model.api) : messages, model?.api);
   if (projectedMessages.length > MAX_MESSAGES)
     return;
   const rows = [];
@@ -33863,10 +34063,11 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   const toolIds = new Map;
   const responsesToolIds = new Map;
   const byIndex = new Map;
+  const imageBudget = piImageBudgetPlan(model);
   let valid = true;
   for (let index = 0;index < projectedMessages.length; index++) {
     const message = projectedMessages[index];
-    const source = object4(message);
+    const source = object5(message);
     if (rows.length === 0 && (source?.role === "system" || source?.role === "developer"))
       continue;
     if ((source?.role === "bashExecution" || source?.role === "pythonExecution") && source.excludeFromContext === true)
@@ -33890,7 +34091,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 = object4(value);
+      const block = object5(value);
       return block?.type === "image" || block?.type === "text" && typeof block.text === "string" && block.text.trim();
     })))
       continue;
@@ -33916,6 +34117,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
     }
     rows.push(row);
     byIndex.set(index, row);
+    piRecordImages(imageBudget, row, source);
   }
   if (!valid)
     return;
@@ -33949,28 +34151,40 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
     }
   }
   const plan = piChatHistoryPlan(projectedMessages, model);
+  let pendingToolImages = [];
   const chatMessages = plan?.flatMap((step) => {
     if (step.kind === "source") {
       const row = byIndex.get(step.index);
+      const images = row && imageBudget?.rows.get(row);
+      if (row?.role === "toolResult" && images)
+        pendingToolImages.push(images);
       return row ? [row] : [];
     }
-    return [
-      {
-        role: "user",
-        calls: [],
-        results: [],
-        ...step.kind === "note" ? { exactText: step.text } : { exactImages: step.urls }
-      }
-    ];
+    const row = {
+      role: "user",
+      calls: [],
+      results: [],
+      ...step.kind === "note" ? { exactText: step.text } : { exactImages: step.urls }
+    };
+    if (step.kind === "images" && imageBudget && pendingToolImages.length) {
+      imageBudget.rows.set(row, {
+        first: pendingToolImages[0].first,
+        images: pendingToolImages.flatMap((run) => run.images),
+        synthesized: true
+      });
+      pendingToolImages = [];
+    }
+    return [row];
   });
   return {
     messages: rows,
+    ...imageBudget?.count ? { imageBudget } : {},
     ...responsesApi && !responsesMessages ? { structuralSkipReason: "Responses history transform is not modeled" } : model?.api === "openai-completions" && !chatMessages ? { structuralSkipReason: "Chat history transform is not modeled" } : {},
     ...chatMessages ? { chatMessages } : {},
     ...responsesMessages ? { responsesMessages } : {},
     ...model?.api ? { api: model.api } : {},
     ...model?.api?.startsWith("google-") ? {
-      googleFunctionIds: object4(model.compat)?.supportsFunctionPartId === true
+      googleFunctionIds: object5(model.compat)?.supportsFunctionPartId === true
     } : {}
   };
 }
@@ -33981,13 +34195,13 @@ function responsesLane(api) {
     "openai-codex-responses"
   ].includes(api ?? "");
 }
-function payloadStructure(payload, ollama = false, responsesItems = false) {
-  const body = object4(payload);
+function payloadStructure(payload, ollama = false, responsesItems = false, imageProjection = false) {
+  const body = object5(payload);
   if (!body)
     return;
   const google = piGoogleConversation(payload);
   if (google)
-    return googleStructure(google.contents);
+    return googleStructure(google.contents, imageProjection);
   const bedrock = body.inferenceConfig !== undefined;
   if (body.messages === undefined && typeof body.input === "string")
     return [{ role: "user", calls: [], results: [] }];
@@ -33997,7 +34211,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
     return;
   const rows = [];
   for (const value of messages) {
-    const message = object4(value);
+    const message = object5(value);
     if (!message)
       return;
     if (rows.length === 0 && (message.role === "system" || message.role === "developer"))
@@ -34028,6 +34242,8 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
       if (typeof message.call_id !== "string")
         return;
       rows.push({ role: "toolResult", calls: [], results: [message.call_id] });
+      if (imageProjection)
+        rows[rows.length - 1].images = piWireImages(message.output);
       continue;
     }
     if (message.role === "tool") {
@@ -34037,7 +34253,8 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
           calls: [],
           results: [""],
           resultNames: [message.tool_name],
-          idlessResults: [true]
+          idlessResults: [true],
+          ...imageProjection ? { images: piWireImages(message.content, message.images) } : {}
         });
         continue;
       }
@@ -34046,12 +34263,15 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
       rows.push({
         role: "toolResult",
         calls: [],
-        results: [message.tool_call_id]
+        results: [message.tool_call_id],
+        ...imageProjection ? {
+          images: piWireImages(message.content, ollama ? message.images : undefined)
+        } : {}
       });
       continue;
     }
     if (message.role === "user" && Array.isArray(message.content)) {
-      const results = message.content.filter((block) => object4(block)?.type === "tool_result" || bedrock && object4(block)?.toolResult);
+      const results = message.content.filter((block) => object5(block)?.type === "tool_result" || bedrock && object5(block)?.toolResult);
       if (results.length) {
         for (const block of results) {
           const id = bedrock ? block.toolResult?.toolUseId : block.tool_use_id;
@@ -34060,9 +34280,17 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
           rows.push({
             role: "toolResult",
             calls: [],
-            results: [id]
+            results: [id],
+            ...imageProjection ? {
+              images: piWireImages(bedrock ? block.toolResult?.content : block.content)
+            } : {}
           });
         }
+        if (imageProjection) {
+          const images = piWireImages(message.content.filter((block) => !results.includes(block)));
+          if (images.length)
+            rows.push({ role: "user", calls: [], results: [], images });
+        }
         continue;
       }
     }
@@ -34070,6 +34298,8 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
     if (!row)
       return;
     row.wireContent = message.content;
+    if (imageProjection)
+      row.images = piWireImages(message.content, ollama ? message.images : undefined);
     if (responses && responsesItems && row.role === "assistant") {
       const texts = piResponsesWireTexts(message.content, message.phase);
       if (!texts)
@@ -34088,11 +34318,11 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
     }
     if (Array.isArray(message.tool_calls)) {
       for (const call of message.tool_calls) {
-        const source = object4(call);
+        const source = object5(call);
         if (!source)
           return;
         if (source.id === undefined && ollama) {
-          const fn = object4(source.function);
+          const fn = object5(source.function);
           if (typeof fn?.name !== "string")
             return;
           row.calls.push("");
@@ -34123,12 +34353,12 @@ function payloadStructure(payload, ollama = false, responsesItems = false) {
   }
   return rows;
 }
-function googleStructure(contents) {
+function googleStructure(contents, imageProjection = false) {
   if (contents.length > MAX_MESSAGES)
     return;
   const rows = [];
   for (const value of contents) {
-    const message = object4(value);
+    const message = object5(value);
     if (!message || !Array.isArray(message.parts))
       return;
     if (message.role !== "user" && message.role !== "model")
@@ -34136,15 +34366,18 @@ function googleStructure(contents) {
     const row = {
       role: message.role === "model" ? "assistant" : "user",
       calls: [],
-      results: []
+      results: [],
+      ...imageProjection ? { images: piWireImages(message.parts) } : {},
+      wireRole: message.role,
+      wireContent: message.parts
     };
     const results = [];
     for (const value of message.parts) {
-      const part = object4(value);
+      const part = object5(value);
       if (!part)
         return;
       if (part.functionCall) {
-        const call = object4(part.functionCall);
+        const call = object5(part.functionCall);
         if (row.role !== "assistant" || typeof call?.name !== "string" || call.id !== undefined && typeof call.id !== "string")
           return;
         row.calls.push(call.id ?? "");
@@ -34152,20 +34385,23 @@ function googleStructure(contents) {
         row.callNames.push(call.name);
       }
       if (part.functionResponse) {
-        const result = object4(part.functionResponse);
+        const result = object5(part.functionResponse);
         if (row.role !== "user" || typeof result?.name !== "string" || result.id !== undefined && typeof result.id !== "string")
           return;
         results.push({
           role: "toolResult",
           calls: [],
           results: [result.id ?? ""],
-          resultNames: [result.name]
+          resultNames: [result.name],
+          ...imageProjection ? { images: piWireImages(result.parts) } : {}
         });
       }
     }
-    if (results.length)
+    if (results.length) {
       rows.push(...results);
-    else
+      if (imageProjection && row.images?.length)
+        rows.push({ role: "user", calls: [], results: [], images: row.images });
+    } else
       rows.push(row);
   }
   return rows;
@@ -34179,6 +34415,19 @@ function wireId(id, anthropic, responses) {
   }
   return id;
 }
+function matchesUserText(content, text, api, responses, googleOrBedrock) {
+  if (responses || googleOrBedrock) {
+    if (!Array.isArray(content) || content.length !== 1)
+      return false;
+    const block = object5(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;
+    return block?.type === "text" && block.text === text;
+  }
+  return content === text;
+}
 function safeRole(row, readable) {
   if (!readable)
     return "unreadable";
@@ -34194,16 +34443,57 @@ function structureDetail(index, expected, actual, comparison) {
   const actualRow = actual?.[index];
   return `row=${index} expectedRows=${safeCount(expected?.length)} actualRows=${safeCount(actual?.length)} expectedRole=${safeRole(expectedRow, !!expected)} actualRole=${safeRole(actualRow, !!actual)} expectedCalls=${safeCount(expected ? expectedRow?.calls.length ?? 0 : undefined)} actualCalls=${safeCount(actual ? actualRow?.calls.length ?? 0 : undefined)} expectedResults=${safeCount(expected ? expectedRow?.results.length ?? 0 : undefined)} actualResults=${safeCount(actual ? actualRow?.results.length ?? 0 : undefined)} comparison=${comparison}`;
 }
-function piPreparedStructureMismatch(payload, prepared) {
+function trimPreparedImageRows(rows, budget, drops) {
+  const projected = [];
+  let hoisted = [];
+  const flush = () => {
+    if (hoisted.length)
+      projected.push({ role: "user", calls: [], results: [], images: hoisted });
+    hoisted = [];
+  };
+  for (const row of rows) {
+    if (row.role !== "toolResult")
+      flush();
+    const run = budget.rows.get(row);
+    if (!run || budget.api === "openai-completions" && row.role === "toolResult") {
+      projected.push(row);
+      continue;
+    }
+    const images = piRemainingImages(run, drops);
+    if (run.synthesized) {
+      if (images.length)
+        projected.push({
+          ...row,
+          images,
+          exactImages: row.exactImages?.slice(run.images.length - images.length)
+        });
+    } else if (run.hoisted) {
+      projected.push(row);
+      hoisted.push(...images);
+    } else
+      projected.push({ ...row, images });
+  }
+  flush();
+  return projected;
+}
+function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
   try {
     if (prepared?.structuralSkipReason)
       return;
-    const body = object4(payload);
+    const imageBudget = prepared?.imageBudget;
+    const actualImages = imageBudget ? piWireImageCount(payload) : 0;
+    const trimmed = imageBudget ? imageBudget.count - actualImages : 0;
+    if (trimmed < 0)
+      return "comparison=image count";
+    const imageProjection = trimmed > 0;
+    const body = object5(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);
-    const rows = payloadStructure(payload, ollama, responses && !!prepared?.responsesMessages);
+    const rows = payloadStructure(payload, ollama, responses && !!prepared?.responsesMessages, imageProjection);
     const chat = !!body && Array.isArray(body.messages) && (prepared?.api === "openai-completions" || body.system === undefined) && body.input === undefined && body.inferenceConfig === undefined;
-    const expectedRows = responses && prepared?.responsesMessages ? prepared.responsesMessages : chat && prepared?.chatMessages ? prepared.chatMessages : prepared?.messages;
+    let expectedRows = responses && prepared?.responsesMessages ? prepared.responsesMessages : chat && prepared?.chatMessages ? prepared.chatMessages : prepared?.messages;
+    if (expectedRows && imageProjection && imageBudget)
+      expectedRows = trimPreparedImageRows(expectedRows, imageBudget, trimmed);
     if (!rows || !expectedRows)
       return structureDetail(0, expectedRows, rows, "count");
     if (!body)
@@ -34215,12 +34505,14 @@ function piPreparedStructureMismatch(payload, prepared) {
       const actual = rows[i];
       if (actual.role !== expected.role)
         return structureDetail(i, expectedRows, rows, "role");
+      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])))
         return structureDetail(i, expectedRows, rows, "content");
       if (expected.exactText !== undefined || expected.exactImages !== undefined) {
         if (actual.wireRole !== "user")
           return structureDetail(i, expectedRows, rows, "role");
-        if (expected.exactText !== undefined && actual.wireContent !== expected.exactText || expected.exactImages !== undefined && !piMatchesChatImages(actual.wireContent, expected.exactImages))
+        if (expected.exactText !== undefined && !matchesUserText(actual.wireContent, expected.exactText, prepared?.api, responses, google || body.inferenceConfig !== undefined) || expected.exactImages !== undefined && !piMatchesChatImages(actual.wireContent, expected.exactImages))
           return structureDetail(i, expectedRows, rows, "content");
       }
       if (actual.calls.length !== expected.calls.length || actual.results.length !== expected.results.length)
@@ -34236,6 +34528,12 @@ function piPreparedStructureMismatch(payload, prepared) {
     }
     if (rows.length !== expectedRows.length)
       return structureDetail(Math.min(rows.length, expectedRows.length), expectedRows, rows, "count");
+    if (imageProjection && imageBudget)
+      onImageTrim?.({
+        planned: imageBudget.count,
+        actual: actualImages,
+        trimmed
+      });
     return;
   } catch {
     return structureDetail(0, undefined, undefined, "count");
@@ -34246,14 +34544,6 @@ function piPreparedStructureMismatch(payload, prepared) {
 var ENTRY_TYPE = "magic-context-turn-refused";
 var RETRY_MESSAGE = "Magic Context could not safely prepare this turn; send your message again.";
 var MAX_UNSENDABLE_NONCES_PER_SESSION = 32;
-
-class PiContextSupersededError extends Error {
-  origin;
-  constructor(message, origin = "context ownership") {
-    super(message);
-    this.origin = origin;
-  }
-}
 var receiptMaps = new Set;
 function clearPiContextReceipt(sessionId) {
   for (const receipts of receiptMaps)
@@ -34412,6 +34702,8 @@ function registerPiGuardedContext(pi, handler, options = {}) {
   receiptMaps.add(unsendableNonces);
   const structureWarnings = new Map;
   receiptMaps.add(structureWarnings);
+  const imageTrimNotices = new Map;
+  receiptMaps.add(imageTrimNotices);
   const refuse = (ctx, budget, reason, isCurrent) => {
     if (!isCurrent()) {
       log2(`[magic-context][pi] DISCARDED CONTEXT RESULT ${budget.diagnostic()}`, reason);
@@ -34537,7 +34829,12 @@ function registerPiGuardedContext(pi, handler, options = {}) {
           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);
+        const structureMismatch = skipReason ? undefined : piPreparedStructureMismatch(payload, active.preparedStructure, (counts) => {
+          if (imageTrimNotices.has(key))
+            return;
+          imageTrimNotices.set(key, true);
+          log2(`[magic-context][pi] OMP provider images trimmed: planned=${counts.planned} actual=${counts.actual} trimmed=${counts.trimmed}`);
+        });
         if (structureMismatch)
           throw new Error(`provider request does not match this pass's managed dispatch (prepared turn structure); ${structureMismatch}`);
         if (active.dispatched) {
@@ -36293,6 +36590,8 @@ function flushPiServedArrayLedger() {
         item.assertCurrentPass?.();
         return true;
       } catch (error) {
+        if (error instanceof PiContextSupersededError)
+          return false;
         log2("[magic-context][pi] DISCARDED CONTEXT RESULT: queued served capture", error);
         return false;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/pi-magic-context",
-	"version": "0.49.4",
+	"version": "0.49.5",
 	"type": "module",
 	"description": "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",