@cortexkit/pi-magic-context 0.49.1 → 0.49.2

package/dist/index.js

@@ -3413,7 +3413,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.1",
+  version: "0.49.2",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -31617,6 +31617,22 @@ function isOmpUnmanagedCaptureRequest(payload) {
   return last?.role === "user" && firstText(last.content, request.textType)?.startsWith(CAPTURE_PREFIX) === true;
 }
 
+// src/pi-dispatch-google.ts
+function piGoogleConversation(payload) {
+  if (!payload || typeof payload !== "object")
+    return;
+  const body = payload;
+  if (body.messages !== undefined || body.input !== undefined)
+    return;
+  if (Array.isArray(body.contents))
+    return body;
+  const request = body.request;
+  if (!request || typeof request !== "object")
+    return;
+  const conversation = request;
+  return Array.isArray(conversation.contents) ? conversation : undefined;
+}
+
 // src/pi-dispatch-identity.ts
 var MAX_NODES = 1e5;
 var MAX_STRING_UNITS = 32 * 1024 * 1024;
@@ -31639,8 +31655,16 @@ function piConversationFields(payload) {
         conversation: body.conversation,
         prompt: body.prompt
       };
-    } else
-      return;
+    } else {
+      const google = piGoogleConversation(payload);
+      if (!google)
+        return;
+      conversation = {
+        contents: google.contents,
+        systemInstruction: google.systemInstruction,
+        configSystemInstruction: google.config?.systemInstruction
+      };
+    }
     const fields = [];
     const seen = new WeakSet;
     let nodes = 0;
@@ -31716,34 +31740,281 @@ function piHasManagedSignature(payload, signature) {
   if (!signature || !payload || typeof payload !== "object")
     return false;
   const body = payload;
+  const google = piGoogleConversation(payload);
+  const nativeText = !!google || body.inferenceConfig !== undefined;
   if (typeof body.input === "string" && body.messages === undefined)
     return body.input.slice(0, 4096).includes(signature);
-  const messages = Array.isArray(body.messages) ? body.messages : Array.isArray(body.input) ? body.input : undefined;
+  const messages = Array.isArray(body.messages) ? body.messages : Array.isArray(body.input) ? body.input : google?.contents;
   if (!messages)
     return false;
   for (const message of messages.slice(0, 8)) {
     if (!message || typeof message !== "object")
       continue;
-    const content = message.content;
+    const content = google ? message.parts : message.content;
     if (typeof content === "string" && content.slice(0, 4096).includes(signature))
       return true;
     if (!Array.isArray(content))
       continue;
     for (const block of content.slice(0, 32)) {
-      if (block && ["text", "input_text", "output_text"].includes(block.type) && typeof block.text === "string" && block.text.slice(0, 4096).includes(signature))
+      if (block && (["text", "input_text", "output_text"].includes(block.type) || nativeText && block.type === undefined) && typeof block.text === "string" && block.text.slice(0, 4096).includes(signature))
         return true;
     }
   }
   return false;
 }
 
+// src/pi-dispatch-chat-history.ts
+var MAX_EXACT_UNITS = 32 * 1024 * 1024;
+var IMAGE_CAPTION = "Attached image(s) from tool result:";
+function object(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function omitsAssistant(message, model, compat) {
+  if (!Array.isArray(message.content))
+    return false;
+  let thinking = false;
+  let hasTextBlock = false;
+  for (const value of message.content) {
+    const block = object(value);
+    if (!block)
+      return false;
+    if (block.type === "text") {
+      hasTextBlock = true;
+      if (typeof block.text !== "string" || block.text.trim())
+        return false;
+    } else if (block.type === "thinking") {
+      if (typeof block.thinking !== "string")
+        return false;
+      thinking ||= block.thinking.trim().length > 0;
+    } else
+      return false;
+  }
+  if (!hasTextBlock && ["length", "error", "aborted"].includes(String(message.stopReason)))
+    return true;
+  if (compat.requiresReasoningContentForAllAssistantTurns === true)
+    return false;
+  if (!thinking)
+    return true;
+  return message.api === model.api && message.provider === model.provider && message.model === model.id && compat.requiresThinkingAsText !== true && compat.requiresReasoningContentForToolCalls !== true && compat.replayReasoningContent !== true && compat.mistralReasoningContentParts !== true && compat.thinkingFormat !== "zai";
+}
+function piChatHistoryPlan(messages, model) {
+  if (model?.api !== "openai-completions")
+    return;
+  const compat = object(model.compat) ?? {};
+  const calls = new Set;
+  for (const value of messages) {
+    const message = object(value);
+    if (message?.role !== "assistant" || !Array.isArray(message.content))
+      continue;
+    for (const value of message.content) {
+      const block = object(value);
+      if (block?.type === "toolCall" && typeof block.id === "string")
+        calls.add(block.id);
+    }
+  }
+  const transformed = [];
+  let pending = new Set;
+  let exactUnits = 0;
+  for (let index = 0;index < messages.length; index++) {
+    const message = object(messages[index]);
+    if (!message)
+      return;
+    if ((message.role === "bashExecution" || message.role === "pythonExecution") && message.excludeFromContext === true)
+      continue;
+    if (message.role === "assistant" || message.role === "user" || message.role === "developer")
+      pending = new Set;
+    if (message.role === "assistant") {
+      if (omitsAssistant(message, model, compat))
+        continue;
+      if (Array.isArray(message.content))
+        for (const value of message.content) {
+          const block = object(value);
+          if (block?.type === "toolCall" && typeof block.id === "string")
+            pending.add(block.id);
+        }
+    }
+    if (message.role === "toolResult" && typeof message.toolCallId === "string") {
+      pending.delete(message.toolCallId);
+      if (!calls.has(message.toolCallId)) {
+        if (pending.size || typeof message.toolName !== "string" || !Array.isArray(message.content))
+          return;
+        const parts = [];
+        for (const value of message.content) {
+          const part = object(value);
+          if (part?.type === "text" && typeof part.text === "string" && part.text.trim())
+            parts.push(part.text);
+        }
+        if (!parts.length)
+          return;
+        const error = message.isError ? ' is-error="true"' : "";
+        const template = `<stale-tool-result tool="${message.toolName}" id="${message.toolCallId}"${error}>
+${parts.join(`
+`)}
+</stale-tool-result>`;
+        if (exactUnits + template.length > MAX_EXACT_UNITS)
+          return;
+        const text = new TextDecoder().decode(new TextEncoder().encode(template));
+        exactUnits += text.length;
+        if (exactUnits > MAX_EXACT_UNITS)
+          return;
+        transformed.push({ kind: "note", text });
+        continue;
+      }
+    }
+    transformed.push({ kind: "source", index });
+  }
+  const steps = [];
+  let images = [];
+  const flushImages = () => {
+    if (images.length) {
+      steps.push({ kind: "images", urls: images });
+      images = [];
+    }
+  };
+  const vision = model.input?.includes("image") === true && compat.stripImageInput !== true;
+  for (const step of transformed) {
+    const message = step.kind === "source" ? object(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 = object(value);
+      if (block?.type !== "image")
+        continue;
+      if (compat.requiresAssistantAfterToolResult === true)
+        return;
+      let url;
+      if (typeof block.url === "string")
+        url = block.url;
+      else if (typeof block.data === "string" && typeof block.mimeType === "string")
+        url = `data:${block.mimeType};base64,${block.data}`;
+      else
+        return;
+      exactUnits += url.length;
+      if (exactUnits > MAX_EXACT_UNITS)
+        return;
+      images.push(url);
+    }
+  }
+  flushImages();
+  return steps;
+}
+function piMatchesChatImages(content, urls) {
+  if (!Array.isArray(content) || content.length !== urls.length + 1)
+    return false;
+  const caption = object(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 = object(content[i + 1]);
+    const image = object(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;
+  }
+  return true;
+}
+
+// src/pi-dispatch-responses-history.ts
+var MAX_TEXT_UNITS = 32 * 1024 * 1024;
+function object2(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function wellFormed(text) {
+  return text.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "�");
+}
+function textIdentity(text, phase) {
+  return JSON.stringify([
+    text,
+    phase === "commentary" || phase === "final_answer" ? phase : null
+  ]);
+}
+function signaturePhase(block) {
+  try {
+    if (typeof block.textSignature === "string") {
+      const signature = object2(JSON.parse(block.textSignature));
+      if (signature?.v === 1 && typeof signature.id === "string")
+        return signature.phase;
+    }
+  } catch {}
+  return;
+}
+function piResponsesAssistantTexts(value, model) {
+  const message = object2(value);
+  if (!message || !Array.isArray(message.content))
+    return;
+  const texts = [];
+  const blocks = [];
+  let units = 0;
+  for (const value of message.content) {
+    const block = object2(value);
+    if (block?.type === "toolCall")
+      continue;
+    if (block?.type !== "text" || typeof block.text !== "string")
+      return;
+    units += block.text.length;
+    if (units > MAX_TEXT_UNITS)
+      return;
+    const sameModel = message.api === model?.api && message.model === model?.id && message.provider === model?.provider;
+    texts.push(textIdentity(wellFormed(block.text), sameModel ? signaturePhase(block) : undefined));
+    blocks.push(block);
+  }
+  const payload = object2(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 = object2(value);
+    if (item?.type !== "message" || item.role !== "assistant" || !Array.isArray(item.content))
+      return texts;
+    for (const value of item.content) {
+      const part = object2(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 = object2(JSON.parse(block.textSignature));
+      } catch {
+        return texts;
+      }
+      if (signature?.v !== 1 || typeof signature.id !== "string" || item.id !== signature.id || item.phase !== signature.phase || part.text !== block.text.replace(/^§\d+§ /u, ""))
+        return texts;
+      replay.push(textIdentity(wellFormed(part.text), item.phase));
+    }
+  }
+  return replay.length === texts.length ? replay : texts;
+}
+function piResponsesWireTexts(value, phase) {
+  if (phase !== undefined && phase !== null && phase !== "commentary" && phase !== "final_answer")
+    return;
+  if (typeof value === "string")
+    return [textIdentity(value, phase)];
+  if (!Array.isArray(value))
+    return;
+  const texts = [];
+  let units = 0;
+  for (const partValue of value) {
+    const part = object2(partValue);
+    if (part?.type !== "output_text" || typeof part.text !== "string")
+      return;
+    units += part.text.length;
+    if (units > MAX_TEXT_UNITS)
+      return;
+    texts.push(textIdentity(part.text, phase));
+  }
+  return texts;
+}
+
 // src/pi-dispatch-structure.ts
 var MAX_MESSAGES = 1e5;
-function object(value) {
+function object3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function messageStructure(value) {
-  const message = object(value);
+  const message = object3(value);
   if (!message)
     return;
   const role = [
@@ -31767,35 +32038,103 @@ function messageStructure(value) {
   }
   if (role === "assistant" && Array.isArray(message.content)) {
     for (const value of message.content) {
-      const block = object(value);
+      const block = object3(value);
       if (block?.type !== "toolCall" && block?.type !== "tool_use")
         continue;
       if (typeof block.id !== "string")
         return;
       row.calls.push(block.id);
+      row.callNames ??= [];
+      row.callNames.push(typeof block.name === "string" ? block.name : "");
     }
   }
   return row;
 }
-function piPreparedStructure(messages) {
+function piPreparedStructure(messages, model) {
   if (!messages.length || messages.length > MAX_MESSAGES)
     return;
   const rows = [];
-  for (const message of messages) {
-    const source = object(message);
+  const toolNames = new Map;
+  const byIndex = new Map;
+  for (let index = 0;index < messages.length; index++) {
+    const message = messages[index];
+    const source = object3(message);
+    if (rows.length === 0 && (source?.role === "system" || source?.role === "developer"))
+      continue;
     if ((source?.role === "bashExecution" || source?.role === "pythonExecution") && source.excludeFromContext === true)
       continue;
     const row = messageStructure(message);
     if (!row)
       return;
+    row.calls.forEach((id, index) => {
+      toolNames.set(id, row.callNames?.[index] ?? "");
+    });
+    if (row.results.length)
+      row.resultNames = row.results.map((id) => toolNames.get(id) ?? "");
     rows.push(row);
+    byIndex.set(index, row);
+  }
+  const responsesApi = [
+    "openai-responses",
+    "azure-openai-responses",
+    "openai-codex-responses"
+  ].includes(model?.api ?? "");
+  let responsesMessages = responsesApi ? [] : undefined;
+  if (responsesMessages) {
+    for (const [index, row] of byIndex) {
+      if (row.role !== "assistant") {
+        responsesMessages.push(row);
+        continue;
+      }
+      const texts = piResponsesAssistantTexts(messages[index], model);
+      if (!texts) {
+        responsesMessages = undefined;
+        break;
+      }
+      if (!texts.length && !row.calls.length)
+        continue;
+      const previous = responsesMessages.at(-1);
+      if (previous?.role === "assistant") {
+        previous.calls.push(...row.calls);
+        previous.responseTexts?.push(...texts);
+      } else
+        responsesMessages.push({
+          ...row,
+          calls: [...row.calls],
+          responseTexts: [...texts]
+        });
+    }
   }
-  return { messages: rows };
+  const plan = piChatHistoryPlan(messages, model);
+  const chatMessages = plan?.flatMap((step) => {
+    if (step.kind === "source") {
+      const row = byIndex.get(step.index);
+      return row ? [row] : [];
+    }
+    return [
+      {
+        role: "user",
+        calls: [],
+        results: [],
+        ...step.kind === "note" ? { exactText: step.text } : { exactImages: step.urls }
+      }
+    ];
+  });
+  return {
+    messages: rows,
+    ...chatMessages ? { chatMessages } : {},
+    ...responsesMessages ? { responsesMessages } : {},
+    ...model?.api ? { api: model.api } : {}
+  };
 }
-function payloadStructure(payload) {
-  const body = object(payload);
+function payloadStructure(payload, ollama = false, responsesItems = false) {
+  const body = object3(payload);
   if (!body)
     return;
+  const google = piGoogleConversation(payload);
+  if (google)
+    return googleStructure(google.contents);
+  const bedrock = body.inferenceConfig !== undefined;
   if (body.messages === undefined && typeof body.input === "string")
     return [{ role: "user", calls: [], results: [] }];
   const responses = body.messages === undefined && Array.isArray(body.input);
@@ -31804,10 +32143,10 @@ function payloadStructure(payload) {
     return;
   const rows = [];
   for (const value of messages) {
-    const message = object(value);
+    const message = object3(value);
     if (!message)
       return;
-    if (!responses && rows.length === 0 && (message.role === "system" || message.role === "developer"))
+    if (rows.length === 0 && (message.role === "system" || message.role === "developer"))
       continue;
     if (responses && message.type === "reasoning")
       continue;
@@ -31816,7 +32155,12 @@ function payloadStructure(payload) {
         return;
       let assistant = rows.at(-1);
       if (assistant?.role !== "assistant") {
-        assistant = { role: "assistant", calls: [], results: [] };
+        assistant = {
+          role: "assistant",
+          calls: [],
+          results: [],
+          ...responsesItems ? { responseTexts: [] } : {}
+        };
         rows.push(assistant);
       }
       assistant.calls.push(message.call_id);
@@ -31833,6 +32177,16 @@ function payloadStructure(payload) {
       continue;
     }
     if (message.role === "tool") {
+      if (message.tool_call_id === undefined && ollama && typeof message.tool_name === "string") {
+        rows.push({
+          role: "toolResult",
+          calls: [],
+          results: [""],
+          resultNames: [message.tool_name],
+          idlessResults: [true]
+        });
+        continue;
+      }
       if (typeof message.tool_call_id !== "string")
         return;
       rows.push({
@@ -31843,15 +32197,16 @@ function payloadStructure(payload) {
       continue;
     }
     if (message.role === "user" && Array.isArray(message.content)) {
-      const results = message.content.filter((block) => object(block)?.type === "tool_result");
+      const results = message.content.filter((block) => object3(block)?.type === "tool_result" || bedrock && object3(block)?.toolResult);
       if (results.length) {
         for (const block of results) {
-          if (typeof block.tool_use_id !== "string")
+          const id = bedrock ? block.toolResult?.toolUseId : block.tool_use_id;
+          if (typeof id !== "string")
             return;
           rows.push({
             role: "toolResult",
             calls: [],
-            results: [block.tool_use_id]
+            results: [id]
           });
         }
         continue;
@@ -31860,20 +32215,107 @@ function payloadStructure(payload) {
     const row = messageStructure(message);
     if (!row)
       return;
+    row.wireContent = message.content;
+    if (responses && responsesItems && row.role === "assistant") {
+      const texts = piResponsesWireTexts(message.content, message.phase);
+      if (!texts)
+        return;
+      row.responseTexts = [...texts];
+    }
+    row.wireRole = message.role;
+    if (bedrock && row.role === "assistant" && Array.isArray(message.content)) {
+      for (const block of message.content) {
+        if (!block?.toolUse)
+          continue;
+        if (typeof block.toolUse.toolUseId !== "string")
+          return;
+        row.calls.push(block.toolUse.toolUseId);
+      }
+    }
     if (Array.isArray(message.tool_calls)) {
       for (const call of message.tool_calls) {
-        if (typeof call?.id !== "string")
+        const source = object3(call);
+        if (!source)
           return;
-        row.calls.push(call.id);
+        if (source.id === undefined && ollama) {
+          const fn = object3(source.function);
+          if (typeof fn?.name !== "string")
+            return;
+          row.calls.push("");
+          row.callNames ??= [];
+          row.callNames.push(fn.name);
+          row.idlessCalls ??= [];
+          row.idlessCalls.push(true);
+        } else {
+          if (typeof source.id !== "string")
+            return;
+          row.calls.push(source.id);
+          if (ollama) {
+            row.callNames ??= [];
+            row.callNames.push("");
+            row.idlessCalls ??= [];
+            row.idlessCalls.push(false);
+          }
+        }
       }
     }
     if (responses && row.role === "assistant" && rows.at(-1)?.role === "assistant") {
-      rows[rows.length - 1].calls.push(...row.calls);
+      const previous = rows[rows.length - 1];
+      previous.calls.push(...row.calls);
+      if (responsesItems)
+        previous.responseTexts?.push(...row.responseTexts ?? []);
     } else
       rows.push(row);
   }
   return rows;
 }
+function googleStructure(contents) {
+  if (contents.length > MAX_MESSAGES)
+    return;
+  const rows = [];
+  for (const value of contents) {
+    const message = object3(value);
+    if (!message || !Array.isArray(message.parts))
+      return;
+    if (message.role !== "user" && message.role !== "model")
+      return;
+    const row = {
+      role: message.role === "model" ? "assistant" : "user",
+      calls: [],
+      results: []
+    };
+    const results = [];
+    for (const value of message.parts) {
+      const part = object3(value);
+      if (!part)
+        return;
+      if (part.functionCall) {
+        const call = object3(part.functionCall);
+        if (row.role !== "assistant" || typeof call?.name !== "string" || call.id !== undefined && typeof call.id !== "string")
+          return;
+        row.calls.push(call.id ?? "");
+        row.callNames ??= [];
+        row.callNames.push(call.name);
+      }
+      if (part.functionResponse) {
+        const result = object3(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]
+        });
+      }
+    }
+    if (results.length)
+      rows.push(...results);
+    else
+      rows.push(row);
+  }
+  return rows;
+}
 function wireId(id, anthropic, responses) {
   if (anthropic)
     return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
@@ -31883,29 +32325,64 @@ function wireId(id, anthropic, responses) {
   }
   return id;
 }
-function piMatchesPreparedStructure(payload, prepared) {
+function safeRole(row, readable) {
+  if (!readable)
+    return "unreadable";
+  if (!row)
+    return "missing";
+  return ["user", "assistant", "toolResult"].includes(row.role) ? row.role : "unknown";
+}
+function safeCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : "unreadable";
+}
+function structureDetail(index, expected, actual, comparison) {
+  const expectedRow = expected?.[index];
+  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) {
   try {
-    const rows = payloadStructure(payload);
-    if (!rows || !prepared || rows.length !== prepared.messages.length)
-      return false;
-    const body = payload;
-    const anthropic = typeof body.system === "string" || Array.isArray(body.system);
-    const responses = body.messages === undefined && Array.isArray(body.input);
-    for (let i = 0;i < rows.length; i++) {
-      const expected = prepared.messages[i];
+    const body = object3(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 chat = !!body && Array.isArray(body.messages) && body.system === undefined && body.input === undefined && body.inferenceConfig === undefined;
+    const expectedRows = responses && prepared?.responsesMessages ? prepared.responsesMessages : chat && prepared?.chatMessages ? prepared.chatMessages : prepared?.messages;
+    if (!rows || !expectedRows)
+      return structureDetail(0, expectedRows, rows, "count");
+    if (!body)
+      return structureDetail(0, expectedRows, rows, "count");
+    const google = !!piGoogleConversation(payload);
+    const anthropic = google || body.inferenceConfig !== undefined || typeof body.system === "string" || Array.isArray(body.system);
+    for (let i = 0;i < Math.min(rows.length, expectedRows.length); i++) {
+      const expected = expectedRows[i];
       const actual = rows[i];
-      if (actual.role !== expected.role || actual.calls.length !== expected.calls.length || actual.results.length !== expected.results.length || actual.timestamp !== undefined && actual.timestamp !== expected.timestamp)
-        return false;
+      if (actual.role !== expected.role)
+        return structureDetail(i, expectedRows, rows, "role");
+      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))
+          return structureDetail(i, expectedRows, rows, "content");
+      }
+      if (actual.calls.length !== expected.calls.length || actual.results.length !== expected.results.length)
+        return structureDetail(i, expectedRows, rows, "count");
+      if (actual.timestamp !== undefined && actual.timestamp !== expected.timestamp)
+        return structureDetail(i, expectedRows, rows, "timestamp");
       for (let j = 0;j < actual.calls.length; j++)
-        if (actual.calls[j] !== wireId(expected.calls[j], anthropic, responses))
-          return false;
+        if (google && actual.calls[j] === "" || ollama && actual.idlessCalls?.[j] === true ? !expected.callNames?.[j] || actual.callNames?.[j] !== expected.callNames[j] : actual.calls[j] !== wireId(expected.calls[j], anthropic, responses))
+          return structureDetail(i, expectedRows, rows, google && actual.calls[j] === "" || ollama && actual.idlessCalls?.[j] === true ? "name" : "call id");
       for (let j = 0;j < actual.results.length; j++)
-        if (actual.results[j] !== wireId(expected.results[j], anthropic, responses))
-          return false;
+        if (google && actual.results[j] === "" || ollama && actual.idlessResults?.[j] === true ? !expected.resultNames?.[j] || actual.resultNames?.[j] !== expected.resultNames[j] : actual.results[j] !== wireId(expected.results[j], anthropic, responses))
+          return structureDetail(i, expectedRows, rows, google && actual.results[j] === "" || ollama && actual.idlessResults?.[j] === true ? "name" : "result id");
     }
-    return true;
+    if (rows.length !== expectedRows.length)
+      return structureDetail(Math.min(rows.length, expectedRows.length), expectedRows, rows, "count");
+    return;
   } catch {
-    return false;
+    return structureDetail(0, undefined, undefined, "count");
   }
 }
 
@@ -32196,8 +32673,9 @@ function registerPiGuardedContext(pi, handler, options = {}) {
         const fields = piConversationFields(payload);
         if (!fields)
           throw new Error("provider conversation identity could not be established");
-        if (!piMatchesPreparedStructure(payload, active.preparedStructure))
-          throw new Error("provider request does not match this pass's managed dispatch (prepared turn structure)");
+        const structureMismatch = piPreparedStructureMismatch(payload, active.preparedStructure);
+        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");
@@ -32268,7 +32746,7 @@ function registerPiGuardedContext(pi, handler, options = {}) {
       const result = await budget.waitMandatory(Promise.resolve(withSqliteTransformPass2(() => handler(event, ctx, budget))));
       if (result?.messages) {
         active.managedSignature = piManagedSignature(result.messages);
-        active.preparedStructure = piPreparedStructure(result.messages);
+        active.preparedStructure = piPreparedStructure(result.messages, fenceEnabled ? ctx.model : undefined);
         budget.completed = true;
         active.ready = true;
         if (inputs)

package/package.json

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