billion-context-omp 0.2.7 → 0.2.8

package/dist/index.js

@@ -748,12 +748,6 @@ function renderMessage(message, map, countTokens, strategy, snapshot = null) {
   if (!cleanText) return { ...message, text: prefix };
   return { ...message, text: prefix + cleanText };
 }
-function renderVisibleRefs(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
-  const map = state.messageRefs;
-  return messages.map(
-    (message) => renderMessage(message, map, countTokens, strategy)
-  );
-}
 function renderWithSnapshot(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
   const map = state.messageRefs;
   const snapshot = { ...state.tokenSnapshot ?? {} };
@@ -3693,15 +3687,77 @@ function payloadToCore(payload, fmt2) {
 function coreToPayloadMessages(msgs, fmt2, cacheControls) {
   return fmt2 === "anthropic" ? coreToAnthropic(msgs, cacheControls) : coreToOpenai(msgs);
 }
-function applyWireTagContract(msgs, state) {
+var ANTHROPIC_CODEC_BLOCKS = /* @__PURE__ */ new Set(["text", "tool_use", "tool_result", "thinking", "image"]);
+var OPENAI_CODEC_ROLES = /* @__PURE__ */ new Set(["system", "developer", "user", "assistant", "tool"]);
+function payloadRepresentable(payload, fmt2) {
+  const messages = payload.messages;
+  if (!Array.isArray(messages)) return { ok: false, reason: "messages not an array" };
+  for (const message of messages) {
+    if (message === null || typeof message !== "object") return { ok: false, reason: "message not an object" };
+    const bad = fmt2 === "anthropic" ? unrepresentableAnthropicMessage(message) : unrepresentableOpenaiMessage(message);
+    if (bad) return { ok: false, reason: bad };
+  }
+  return { ok: true };
+}
+function unrepresentableAnthropicMessage(message) {
+  const content = message.content;
+  if (content == null || typeof content === "string") return null;
+  if (!Array.isArray(content)) return "content neither string nor block array";
+  for (const block of content) {
+    const type5 = block?.type;
+    if (typeof type5 !== "string" || !ANTHROPIC_CODEC_BLOCKS.has(type5)) {
+      return `anthropic block type ${JSON.stringify(type5) ?? "missing"}`;
+    }
+    if (type5 === "tool_result") {
+      const inner = block.content;
+      if (Array.isArray(inner) && inner.some((c) => c?.type !== "text")) {
+        return "tool_result content carries non-text parts (images are flattened away)";
+      }
+    }
+    if (type5 === "thinking" && block.cache_control != null) {
+      return "cache_control on a thinking block is not re-attached";
+    }
+  }
+  return null;
+}
+function unrepresentableOpenaiMessage(message) {
+  const role = message.role;
+  if (typeof role !== "string" || !OPENAI_CODEC_ROLES.has(role)) {
+    return `openai role ${JSON.stringify(role) ?? "missing"}`;
+  }
+  const content = message.content;
+  if (content == null || typeof content === "string") return null;
+  if (!Array.isArray(content)) return "content neither string nor part array";
+  let dataImages = 0;
+  for (const part of content) {
+    if (typeof part === "string") continue;
+    const type5 = part?.type;
+    if (type5 === "text") continue;
+    if (type5 === "image_url" && role === "user") {
+      const url = part?.image_url?.url;
+      if (typeof url !== "string" || !url.startsWith("data:")) return "image_url without a data: URL is dropped";
+      if (++dataImages > 1) return "second image_url in one message is dropped";
+      continue;
+    }
+    return `openai content part type ${JSON.stringify(type5) ?? "missing"}`;
+  }
+  return null;
+}
+var renderRefsAll = createRenderRefsNode("all");
+function applyWireTagContract(msgs, state, scope) {
+  const stripAssistantTags = (m) => m.contentType === "text" && m.role === "assistant" ? { ...m, text: stripRefTag(m.text ?? "") } : m;
   const toolResults = msgs.filter((m) => m.contentType === "tool-result");
-  const taggedTools = toolResults.length > 0 ? renderVisibleRefs(toolResults, state, defaultCountTokens, "all") : [];
-  const bySource = new Map(toolResults.map((m, i) => [m, taggedTools[i]]));
-  return msgs.map((m) => {
-    if (m.contentType === "tool-result") return bySource.get(m) ?? m;
-    if (m.contentType === "text" && m.role === "assistant") return { ...m, text: stripRefTag(m.text ?? "") };
-    return m;
-  });
+  if (toolResults.length === 0) return msgs.map(stripAssistantTags);
+  const names = toolCallNames(msgs);
+  const named = toolResults.map((m) => m.toolName ? m : { ...m, toolName: names.get(m.toolCallId ?? "") ?? "tool" });
+  const io = renderRefsAll.run(
+    { messages: named, state, effects: {} },
+    { config: scope.config, tokenCount: scope.tokenCount, countTokens: defaultCountTokens }
+  );
+  if (io.state !== state) state.tokenSnapshot = io.state.tokenSnapshot;
+  const tagged = io.messages;
+  const bySource = new Map(toolResults.map((m, i) => [m, tagged[i]]));
+  return msgs.map((m) => m.contentType === "tool-result" ? bySource.get(m) ?? m : stripAssistantTags(m));
 }
 function coreIdentity(msg) {
   return JSON.stringify({
@@ -4793,7 +4849,7 @@ function renderMessage2(message, map, countTokens, strategy) {
   if (!cleanText) return { ...message, text: prefix };
   return { ...message, text: prefix + cleanText };
 }
-function renderVisibleRefs2(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
+function renderVisibleRefs(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
   const map = state.messageRefs;
   return messages.map(
     (message) => renderMessage2(message, map, countTokens, strategy)
@@ -4805,7 +4861,7 @@ function createRenderRefsNode2(strategy) {
     run(io, ctx) {
       return {
         ...io,
-        messages: renderVisibleRefs2(io.messages, io.state, ctx.countTokens, strategy)
+        messages: renderVisibleRefs(io.messages, io.state, ctx.countTokens, strategy)
       };
     }
   };
@@ -5416,7 +5472,7 @@ async function statusReport(runtime, ctx) {
   const coveredIds = collectCoveredMessageIds(state);
   const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: sentTokens });
-  const versionStr = "0.2.7" ? `billion-context-omp@${"0.2.7"}` : void 0;
+  const versionStr = "0.2.8" ? `billion-context-omp@${"0.2.8"}` : void 0;
   return buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -5710,7 +5766,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.2.7";
+    const current = runtimeVersion ?? "0.2.8";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -5985,9 +6041,9 @@ var index_default = createAcpExtension();
 function wireSessionLifecycle(pi, runtime) {
   pi.on("session_start", async (_event, ctx) => {
     const sid = ctx.sessionManager.getSessionId();
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.2.7" : null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.2.8" : null });
     const selfPath = import.meta.url;
-    const conflict = stampAndDetect(selfPath, true ? "0.2.7" : null);
+    const conflict = stampAndDetect(selfPath, true ? "0.2.8" : null);
     if (conflict) {
       logWarn("instance", { event: "dual-instance", self: selfPath, other: conflict.path, otherPid: conflict.pid, otherVersion: conflict.version });
       try {
@@ -6174,6 +6230,12 @@ function wireProviderTransform(pi, runtime) {
       debug.event("provider-transform-unknown-format", { sid });
       return void 0;
     }
+    const representable = payloadRepresentable(payload, fmt2);
+    if (!representable.ok) {
+      logInfo("provider-transform", { sid, fmt: fmt2, event: "unrepresentable", reason: representable.reason });
+      debug.event("provider-transform-unrepresentable", { sid, fmt: fmt2, reason: representable.reason });
+      return void 0;
+    }
     try {
       const { msgs, cacheControls } = payloadToCore(payload, fmt2);
       if (msgs.length === 0) return void 0;
@@ -6256,7 +6318,8 @@ async function transformStreamCore(ctx, runtime, wireMsgs, fmt2) {
     });
     const coreOut = applyWireTagContract(
       turn.messages.filter((m) => !m.id.startsWith("acp_summary_")),
-      turn.state
+      turn.state,
+      { config, tokenCount }
     );
     let nudgeInjected = false;
     if (turn.nudge?.shouldInject) {