opencode-anthropic-fix 0.5.0 → 0.6.0

package/lib/mimicry/wire-compat.mjs

@@ -314,90 +314,9 @@ const COUNT_TOKENS_INPUT_FIELDS = new Set([
   "clientApp",
   "anthropicAdditionalProtection",
   "extraHeaders",
+  "extraHeaderPolicy",
 ]);
 
-/**
- * The header names the package composes itself, mirrored from `HEADER_NAMES`
- * (src/headers.ts). Exported so `wire-compat.test.mjs` can pin the mirror
- * against the package's real behaviour rather than trusting this copy.
- */
-export const PACKAGE_CANONICAL_HEADER_NAMES = new Set([
-  "anthropic-beta",
-  "anthropic-dangerous-direct-browser-access",
-  "anthropic-version",
-  "authorization",
-  "content-type",
-  "user-agent",
-  "x-app",
-  "x-claude-code-session-id",
-  "x-client-request-id",
-  "x-stainless-arch",
-  "x-stainless-lang",
-  "x-stainless-os",
-  "x-stainless-package-version",
-  "x-stainless-retry-count",
-  "x-stainless-runtime",
-  "x-stainless-runtime-version",
-  "x-stainless-timeout",
-  "x-stainless-helper",
-  "x-claude-remote-container-id",
-  "x-claude-remote-session-id",
-  "x-client-app",
-  "x-anthropic-additional-protection",
-]);
-
-/** Mirror of the package's `FORBIDDEN_HEADER_NAMES` (src/headers.ts). */
-export const PACKAGE_FORBIDDEN_HEADER_NAMES = new Set([
-  "x-api-key",
-  "cookie",
-  "set-cookie",
-  "forwarded",
-  "content-length",
-  "host",
-  "connection",
-  "transfer-encoding",
-  "te",
-  "upgrade",
-  "keep-alive",
-]);
-
-/** Mirror of the package's `isForbiddenHeader` prefix rules. */
-export const PACKAGE_FORBIDDEN_HEADER_PREFIXES = Object.freeze(["proxy-", "x-forwarded-"]);
-
-/**
- * Apply the package's `dropConflicting` extra-header policy PLUGIN-SIDE.
- *
- * WHY THIS EXISTS. `extraHeaderPolicy` is not one of the sixteen keys
- * `ClaudeCodeCountTokensInput` picks, and `validateCountTokensInput` runs
- * `assertExactKeys`, so passing it is `INVALID_INPUT` rather than a no-op. The
- * count surface therefore always resolves extra headers under `strict`, where
- * the FIRST host header the package owns raises `DUPLICATE_HEADER` (canonical
- * name) or `FORBIDDEN_HEADER` (hop-by-hop / credential name) and nothing
- * reaches the wire. The plugin forwards a heterogeneous host header map — the
- * opencode SDK alone sends `content-type` and `accept` — so without this filter
- * every count turn would throw and fall back to nothing at all.
- *
- * The main turn gets the same outcome for free through
- * `extraHeaderPolicy: "dropConflicting"` on the transport, which the count pick
- * discards; this reproduces it. Only OWNERSHIP conflicts are dropped, exactly
- * as the package does: header syntax is still validated package-side and a
- * caller duplicating one of its OWN extra headers still raises
- * `DUPLICATE_HEADER`, because that is a caller bug and not ours to paper over.
- *
- * @param {readonly (readonly [string, string])[] | undefined} extraHeaders
- * @returns {readonly (readonly [string, string])[] | undefined}
- */
-function dropConflictingExtraHeaders(extraHeaders) {
-  if (extraHeaders === undefined) return undefined;
-  const kept = extraHeaders.filter(([name]) => {
-    const normalized = String(name).toLowerCase();
-    if (PACKAGE_CANONICAL_HEADER_NAMES.has(normalized)) return false;
-    if (PACKAGE_FORBIDDEN_HEADER_NAMES.has(normalized)) return false;
-    return !PACKAGE_FORBIDDEN_HEADER_PREFIXES.some((prefix) => normalized.startsWith(prefix));
-  });
-  return kept.length > 0 ? kept : undefined;
-}
-
 /**
  * Map the host body to the shared package's count-tokens input.
  *
@@ -418,6 +337,19 @@ function dropConflictingExtraHeaders(extraHeaders) {
  * malformed value and a field that is contractually absent from the count body
  * must not be able to fail the build.
  *
+ * EXTRA HEADERS. The count surface takes `extraHeaderPolicy` since wire-compat
+ * 0.4.0, so the policy is set here exactly as the main turn sets it on the
+ * transport (`buildAdapterTransport`). Under the package default (`strict`) the
+ * first host header the package owns raises `DUPLICATE_HEADER` (canonical name)
+ * or `FORBIDDEN_HEADER` (hop-by-hop / credential name) and nothing reaches the
+ * wire — and the plugin forwards a heterogeneous host header map, the opencode
+ * SDK alone sending `content-type` and `accept`. `dropConflicting` drops only
+ * OWNERSHIP conflicts: header syntax is still validated package-side and a
+ * caller duplicating one of its OWN extra headers still raises
+ * `DUPLICATE_HEADER`, because that is a caller bug and not ours to paper over.
+ * The names the package drops are reported back as
+ * `evidence.droppedExtraHeaderNames`.
+ *
  * @param {Record<string, import('@tormentalabs/claude-code-wire-compat').JsonValue>} body
  * @param {{
  *   accessToken: string,
@@ -440,9 +372,7 @@ export function toClaudeCodeCountTokensInput(body, transport) {
   const { system: _system, ...bodyWithoutSystem } = body;
   const full = toClaudeCodeRequestInput(bodyWithoutSystem, transport);
   const input = Object.fromEntries(Object.entries(full).filter(([name]) => COUNT_TOKENS_INPUT_FIELDS.has(name)));
-  const extraHeaders = dropConflictingExtraHeaders(input.extraHeaders);
-  if (extraHeaders === undefined) delete input.extraHeaders;
-  else input.extraHeaders = extraHeaders;
+  input.extraHeaderPolicy = "dropConflicting";
   if (transport.crypto !== undefined) input.crypto = transport.crypto;
   return input;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "GPL-3.0-or-later",
   "repository": {
     "type": "git",