billion-context 0.1.110-pr.776.620 → 0.1.110

package/dist/index.js

@@ -49049,13 +49049,8 @@ var CONTEXT_LIMIT_TABLE = [
 ];
 function lookupContextLimit(model) {
   if (!model) return void 0;
-  const slash = model.lastIndexOf("/");
-  const base = slash >= 0 ? model.slice(slash + 1) : "";
-  const names = base ? [model, base] : [model];
-  for (const name of names) {
-    for (const entry of CONTEXT_LIMIT_TABLE) {
-      if (entry.match.test(name)) return entry.limit;
-    }
+  for (const entry of CONTEXT_LIMIT_TABLE) {
+    if (entry.match.test(model)) return entry.limit;
   }
   return void 0;
 }
@@ -49878,36 +49873,31 @@ function registryLookup(reg, model, host) {
   if (!reg || !model) return void 0;
   const provider = host ? providerFromHost(host) : void 0;
   for (const name of modelVariants(model)) {
-    const slash = name.lastIndexOf("/");
-    const base = slash >= 0 ? name.slice(slash + 1) : "";
-    const names = base ? [name, base] : [name];
-    for (const n of names) {
-      const candidates = provider ? [`${provider}/${n}`, n] : [n];
-      for (const key of candidates) {
-        const entry = reg[key];
-        const ctx = entry?.limit?.context;
-        if (typeof ctx === "number" && ctx > 0) return ctx;
-      }
-      if (provider === void 0) {
-        const suffix = `/${n}`;
-        let max;
-        const distinct = /* @__PURE__ */ new Set();
-        const parts = [];
-        for (const key of Object.keys(reg)) {
-          if (!key.endsWith(suffix)) continue;
-          const ctx = reg[key].limit?.context;
-          if (typeof ctx !== "number" || ctx <= 0) continue;
-          if (max === void 0 || ctx > max) max = ctx;
-          distinct.add(ctx);
-          parts.push(`${key}=${ctx}`);
-        }
-        if (max !== void 0) {
-          if (distinct.size > 1 && !warnedConflicts.has(n)) {
-            warnedConflicts.add(n);
-            log("warn", `[acp-registry] conflicting context windows for "${n}" (${parts.join(", ")}) \u2014 using max ${max}`);
-          }
-          return max;
+    const candidates = provider ? [`${provider}/${name}`, name] : [name];
+    for (const key of candidates) {
+      const entry = reg[key];
+      const ctx = entry?.limit?.context;
+      if (typeof ctx === "number" && ctx > 0) return ctx;
+    }
+    if (provider === void 0) {
+      const suffix = `/${name}`;
+      let max;
+      const distinct = /* @__PURE__ */ new Set();
+      const parts = [];
+      for (const key of Object.keys(reg)) {
+        if (!key.endsWith(suffix)) continue;
+        const ctx = reg[key].limit?.context;
+        if (typeof ctx !== "number" || ctx <= 0) continue;
+        if (max === void 0 || ctx > max) max = ctx;
+        distinct.add(ctx);
+        parts.push(`${key}=${ctx}`);
+      }
+      if (max !== void 0) {
+        if (distinct.size > 1 && !warnedConflicts.has(name)) {
+          warnedConflicts.add(name);
+          log("warn", `[acp-registry] conflicting context windows for "${name}" (${parts.join(", ")}) \u2014 using max ${max}`);
         }
+        return max;
       }
     }
   }
@@ -54358,66 +54348,6 @@ ${icon} [ACP] ${inner}
 `;
 }
 
-// src/tool-pair-order.ts
-var CALL_TYPES = /* @__PURE__ */ new Set(["function_call", "custom_tool_call"]);
-var OUTPUT_TYPES = /* @__PURE__ */ new Set(["function_call_output", "custom_tool_call_output"]);
-function isCall(type) {
-  return type !== void 0 && CALL_TYPES.has(type);
-}
-function isOutput(type) {
-  return type !== void 0 && OUTPUT_TYPES.has(type);
-}
-function idOf(item) {
-  return typeof item.call_id === "string" ? item.call_id : "";
-}
-function hoistTrappedToolItems(items) {
-  const n = items.length;
-  if (n < 3) return items;
-  const callPos = /* @__PURE__ */ new Map();
-  const outPos = /* @__PURE__ */ new Map();
-  for (let i = 0; i < n; i++) {
-    const id = idOf(items[i]);
-    if (!id) continue;
-    const t = items[i].type;
-    if (isCall(t) && !callPos.has(id)) callPos.set(id, i);
-    else if (isOutput(t) && !outPos.has(id)) outPos.set(id, i);
-  }
-  if (callPos.size === 0) return items;
-  const hoistBefore = new Array(n).fill(null);
-  let anyTrapped = false;
-  for (let p2 = 0; p2 < n; p2++) {
-    const t = items[p2].type;
-    if (isCall(t) || isOutput(t)) continue;
-    let target = -1;
-    for (const [id, c] of callPos) {
-      const o = outPos.get(id);
-      if (o === void 0 || !(c < p2 && o > p2)) continue;
-      if (target === -1 || c < target) target = c;
-    }
-    if (target >= 0) {
-      hoistBefore[p2] = target;
-      anyTrapped = true;
-    }
-  }
-  if (!anyTrapped) return items;
-  const pendingByTarget = /* @__PURE__ */ new Map();
-  for (let p2 = 0; p2 < n; p2++) {
-    const target = hoistBefore[p2];
-    if (target === null) continue;
-    const batch = pendingByTarget.get(target);
-    if (batch) batch.push(items[p2]);
-    else pendingByTarget.set(target, [items[p2]]);
-  }
-  const result = [];
-  for (let p2 = 0; p2 < n; p2++) {
-    if (hoistBefore[p2] !== null) continue;
-    const batch = pendingByTarget.get(p2);
-    if (batch) result.push(...batch);
-    result.push(items[p2]);
-  }
-  return result;
-}
-
 // src/weak-overflow.ts
 var MIN_USAGE = 0.9;
 var WINDOW_MS = 15 * 60 * 1e3;
@@ -55367,7 +55297,6 @@ data: ${JSON.stringify({ type: "response.created", response: { id: createdRespId
       } else {
         inputItems = coreToResponses(coreMessages, customToolCallIds);
       }
-      inputItems = hoistTrappedToolItems(inputItems);
       const devParts = projection && projection.systemParts.length > 0 ? [...projection.systemParts, systemPrompt] : [systemPrompt];
       const withDev = injectResponsesDeveloperMessage(inputItems, devParts.join("\n\n---\n\n"));
       const rebuilt = { ...requestBody, input: withDev };
@@ -56601,16 +56530,7 @@ function surfaceReadonlyJson(current, proxyCalls, ctx) {
   }
   if (markers.length === 0) return current;
   const out = Array.isArray(current.output) ? [...current.output] : [];
-  const markerItem = { type: "message", id: `msg_acp_ro_${Date.now()}_${markers.length}`, role: "assistant", content: [{ type: "output_text", text: markers.join("\n") }] };
-  let insertAt = out.length;
-  for (let i = 0; i < out.length; i++) {
-    const t = out[i]?.type;
-    if (t === "function_call" || t === "custom_tool_call") {
-      insertAt = i;
-      break;
-    }
-  }
-  out.splice(insertAt, 0, markerItem);
+  out.push({ type: "message", id: `msg_acp_ro_${Date.now()}_${markers.length}`, role: "assistant", content: [{ type: "output_text", text: markers.join("\n") }] });
   return { ...current, output: out };
 }
 async function compressLoopResponsesJson(initialResponse, ctx, requestBody, requestOptions) {
@@ -56645,7 +56565,7 @@ async function compressLoopResponsesJson(initialResponse, ctx, requestBody, requ
       ctx.log(`[acp-proxy: responses JSON ${call.name} \u2192 ${result2.slice(0, 120).replace(/\n/g, " ")}]`);
       inputItems.push({ type: "message", role: "developer", content: buildVisibilityMarker(call.name, result2) });
     }
-    requestBody.input = hoistTrappedToolItems(inputItems);
+    requestBody.input = inputItems;
     const result = await fetchWithRetry(requestOptions.url, {
       method: "POST",
       headers: requestOptions.headers,
@@ -62157,7 +62077,6 @@ function prepareResponses(parsed, req, opts, core, config, prompts, surface, log
     processedMessages = repairResponsesAssistantOrdering(stripReasoning(stripKernelSummaries(turn.messages, turn.state)), originalMessages);
     reapOrphanBlocks(session, msgs, deactivateBlock);
     rebuiltInput = patchResponsesInput(projection, processedMessages);
-    if (Array.isArray(rebuiltInput)) rebuiltInput = hoistTrappedToolItems(rebuiltInput);
     const forgedSummaries = echoReplaced ? [] : session.metadata.codexForgedSummaries ?? [];
     if (shouldInject && !isCompactionTrigger && !process.env.ACP_NO_COMPRESS_PROMPT) {
       const prompt = withMarkerIntegrityNote(responsesTextProtocol ? buildCompressHybridSystemPrompt(prompts, surface?.promptSections) : buildCompressSystemPrompt(prompts, surface?.promptSections));
@@ -62323,12 +62242,11 @@ function prepareResponsesCompact(body, parsed, session, req, core, config, log2)
     }
     const viewed = applyAbsorbView(turn.messages, turn.state, compactConfig, session.stats.lastInputTokens);
     const processed = repairResponsesAssistantOrdering(stripKernelSummaries(viewed, turn.state), projection.msgs);
-    let output = patchResponsesInput(projection, processed);
+    const output = patchResponsesInput(projection, processed);
     if (typeof output === "string") {
       session.state = prevState;
       return base;
     }
-    output = hoistTrappedToolItems(output);
     snapshotMessages(session, projection.msgs);
     markDirty(session);
     log2("info", `[${session.id}] codex compact intercepted (endpoint); forged history with ${output.length} item(s), upstream not contacted`);