npm - @bitkyc08/opencodex - Versions diffs - 2.42.0 → 2.43.0 - Mend

@bitkyc08/opencodex 2.42.0 → 2.43.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (246) hide show

package/AGENTS_INSTALL.md +2 -2
package/README.md +31 -0
package/bin/ocx.mjs +10 -1
package/gui/dist/assets/index-DS1NE4Jn.css +1 -0
package/gui/dist/assets/index-Djowl68T.js +112 -0
package/gui/dist/index.html +2 -2
package/package.json +1 -1
package/src/adapters/anthropic-image-codec.ts +304 -0
package/src/adapters/anthropic-image-normalize.ts +8 -298
package/src/adapters/anthropic.ts +30 -7
package/src/adapters/command-code.ts +7 -5
package/src/adapters/cursor/desktop-executor-contract.ts +15 -0
package/src/adapters/cursor/images.ts +36 -6
package/src/adapters/cursor/live-transport.ts +7 -2
package/src/adapters/cursor/native-exec-desktop.ts +2 -15
package/src/adapters/cursor/protobuf-request.ts +13 -3
package/src/adapters/cursor/tool-definitions.ts +5 -670
package/src/adapters/cursor/tool-guidance.ts +236 -0
package/src/adapters/cursor/tool-naming.ts +252 -0
package/src/adapters/cursor/tool-schemas.ts +195 -0
package/src/adapters/cursor/types.ts +6 -3
package/src/adapters/exec-tool-result-normalize.ts +1 -1
package/src/adapters/google-errors.ts +9 -1
package/src/adapters/google.ts +1 -0
package/src/adapters/kiro-calibration.ts +181 -0
package/src/adapters/kiro.ts +135 -3
package/src/adapters/openai-responses.ts +216 -26
package/src/adapters/responses-code-mode.ts +59 -0
package/src/adapters/tool-catalog-nudge.ts +1 -1
package/src/adapters/xai-schema-analysis.ts +86 -0
package/src/adapters/xai-tool-schema.ts +2 -87
package/src/adapters/xai-web-search.ts +1 -1
package/src/bridge.ts +22 -10
package/src/chat/inbound.ts +11 -3
package/src/claude/inbound-content-options.ts +60 -0
package/src/claude/inbound-model-options.ts +142 -0
package/src/claude/inbound-records.ts +7 -0
package/src/claude/inbound.ts +10 -202
package/src/claude/model-info.ts +45 -0
package/src/cli/account-auth.ts +21 -6
package/src/cli/capabilities.ts +13 -2
package/src/cli/claude.ts +232 -39
package/src/cli/config-command.ts +9 -1
package/src/cli/dispatch.ts +5 -1
package/src/cli/doctor.ts +10 -0
package/src/cli/effort.ts +372 -0
package/src/cli/export-command.ts +3 -9
package/src/cli/help.ts +1 -0
package/src/cli/index.ts +13 -0
package/src/cli/init.ts +4 -0
package/src/cli/model-selection-guidance.ts +30 -0
package/src/cli/models-runtime.ts +3 -2
package/src/cli/models.ts +8 -3
package/src/cli/opencode.ts +4 -1
package/src/cli/provider-runtime.ts +65 -0
package/src/cli/provider.ts +8 -0
package/src/cli/registry.ts +16 -2
package/src/cli/runtime-api.ts +3 -1
package/src/cli/star-prompt.ts +22 -6
package/src/cli/status-probes.ts +168 -0
package/src/cli/status.ts +5 -168
package/src/clients/config-export/constants.ts +69 -0
package/src/clients/config-export/contracts.ts +154 -0
package/src/clients/config-export/dsh.ts +132 -0
package/src/clients/config-export/fast-models.ts +29 -0
package/src/clients/config-export/mcode.ts +83 -0
package/src/clients/config-export/model-metadata.ts +108 -0
package/src/clients/config-export/omp.ts +104 -0
package/src/clients/config-export/zcode.ts +92 -0
package/src/clients/config-export.ts +18 -710
package/src/codex/account-lifecycle.ts +20 -3
package/src/codex/account-usability.ts +2 -0
package/src/codex/auth-api.ts +170 -23
package/src/codex/auth-context.ts +328 -24
package/src/codex/catalog/effort.ts +30 -4
package/src/codex/catalog/metadata.ts +39 -9
package/src/codex/catalog/native-models.ts +53 -12
package/src/codex/catalog/parsing.ts +119 -5
package/src/codex/catalog/provider-fetch.ts +150 -20
package/src/codex/catalog/reserve.ts +52 -0
package/src/codex/catalog/sync.ts +89 -16
package/src/codex/convergence-types.ts +1 -0
package/src/codex/convergence.ts +2 -0
package/src/codex/data/upstream-models.json +1 -1
package/src/codex/forward-transport-headers.ts +25 -0
package/src/codex/inject.ts +3 -28
package/src/codex/legacy-config-keys.ts +68 -0
package/src/codex/log-guard/inspect-schema.ts +137 -0
package/src/codex/log-guard/inspect.ts +2 -134
package/src/codex/loopback-target.ts +54 -0
package/src/codex/main-account-cache.ts +63 -1
package/src/codex/main-account-hard-lock.ts +52 -0
package/src/codex/main-account.ts +3 -1
package/src/codex/management-convergence.ts +3 -0
package/src/codex/model-entitlements.ts +54 -4
package/src/codex/project-config-warnings.ts +92 -2
package/src/codex/prompt-layers/encoding.ts +80 -0
package/src/codex/prompt-layers/paths.ts +54 -0
package/src/codex/prompt-layers/revision.ts +55 -0
package/src/codex/prompt-layers/toml-edit.ts +163 -0
package/src/codex/prompt-layers/toml-read.ts +181 -0
package/src/codex/prompt-layers.ts +14 -520
package/src/codex/quota-auto-refresh-state.ts +16 -0
package/src/codex/quota-auto-refresh.ts +219 -0
package/src/codex/quota-types.ts +51 -0
package/src/codex/quota.ts +252 -93
package/src/codex/reserve-availability.ts +177 -0
package/src/codex/routing.ts +28 -9
package/src/codex/shim.ts +53 -11
package/src/codex/subagent-model-fallback.ts +23 -3
package/src/combos/failover.ts +125 -7
package/src/combos/identifiers.ts +89 -0
package/src/combos/index.ts +4 -0
package/src/combos/resolve.ts +80 -9
package/src/combos/types.ts +20 -93
package/src/config/subagent-models.ts +24 -0
package/src/config.ts +156 -13
package/src/generated/compatibility-version.json +454 -166
package/src/generated/model-metadata.ts +1 -1
package/src/integrations/journal.ts +65 -4
package/src/integrations/store.ts +5 -0
package/src/lab/events/limits.ts +4 -0
package/src/lib/destination-policy.ts +31 -2
package/src/lib/errors.ts +39 -0
package/src/lib/provider-outbound.ts +69 -3
package/src/lib/proxy-env.ts +22 -0
package/src/lib/redact-folding.ts +176 -0
package/src/lib/redact.ts +2 -175
package/src/lib/state-store-sweeper.ts +20 -6
package/src/lib/token-estimate.ts +94 -27
package/src/lib/windows-user-principal.ts +53 -5
package/src/oauth/anthropic-routing.ts +99 -3
package/src/oauth/generic-account-failover.ts +36 -13
package/src/oauth/index.ts +127 -26
package/src/oauth/login-cli.ts +5 -0
package/src/oauth/meta-muse.ts +117 -15
package/src/oauth/pool-settings-capability.ts +15 -4
package/src/providers/api-keys.ts +8 -10
package/src/providers/default-aliases.ts +39 -0
package/src/providers/derive.ts +10 -2
package/src/providers/fastwire.ts +36 -7
package/src/providers/initial-model-selection-runtime.ts +90 -0
package/src/providers/initial-model-selection.ts +120 -0
package/src/providers/key-failover.ts +134 -54
package/src/providers/key-store.ts +11 -1
package/src/providers/label.ts +1 -1
package/src/providers/model-discovery.ts +76 -0
package/src/providers/model-rename-startup.ts +72 -8
package/src/providers/openai-sidecar.ts +17 -5
package/src/providers/openai-tiers-destination.ts +102 -0
package/src/providers/openai-tiers.ts +2 -99
package/src/providers/opencode-go-transport.ts +41 -0
package/src/providers/quota-key-accounts.ts +141 -0
package/src/providers/quota-types.ts +9 -0
package/src/providers/quota.ts +535 -104
package/src/providers/registry.ts +60 -17
package/src/providers/xai-responses-opt-in.ts +31 -5
package/src/quota/reset-activation.ts +81 -0
package/src/quota/reset-detector.ts +305 -0
package/src/quota/reset-notify-config.ts +162 -0
package/src/quota/reset-observer.ts +125 -0
package/src/quota/reset-poller.ts +160 -0
package/src/quota/reset-seen-store.ts +385 -0
package/src/quota/reset-sinks.ts +199 -0
package/src/quota/window-mapping.ts +106 -0
package/src/responses/apply-patch-envelope.ts +46 -0
package/src/responses/code-mode-helper-compat.ts +39 -1
package/src/responses/custom-tool-compat.ts +10 -4
package/src/responses/hosted-tool-policy.ts +12 -4
package/src/responses/parser-content.ts +133 -0
package/src/responses/parser-text-format.ts +24 -0
package/src/responses/parser-tools.ts +188 -0
package/src/responses/parser.ts +3 -326
package/src/responses/state.ts +124 -28
package/src/router.ts +48 -13
package/src/routing/analytics.ts +1 -0
package/src/routing/capability.ts +17 -4
package/src/server/auth-cors.ts +7 -1
package/src/server/background-lifecycle.ts +23 -1
package/src/server/chat-completions.ts +25 -3
package/src/server/claude-messages.ts +62 -5
package/src/server/effort-row.ts +1 -1
package/src/server/fast-row.ts +295 -0
package/src/server/gui-static.ts +30 -4
package/src/server/index.ts +107 -21
package/src/server/management/agent-settings-routes.ts +2 -2
package/src/server/management/combo-routes.ts +37 -9
package/src/server/management/config-routes.ts +93 -2
package/src/server/management/integration-routes.ts +108 -0
package/src/server/management/model-routes.ts +13 -3
package/src/server/management/model-rows.ts +20 -1
package/src/server/management/native-integration-routes.ts +4 -1
package/src/server/management/oauth-account-routes.ts +38 -10
package/src/server/management/provider-routes.ts +34 -3
package/src/server/management/quota-reset-routes.ts +57 -0
package/src/server/management/route-registry.ts +7 -4
package/src/server/management/shared.ts +19 -5
package/src/server/management/system-routes.ts +3 -2
package/src/server/management-api.ts +14 -2
package/src/server/ports.ts +12 -2
package/src/server/relay-eager.ts +38 -23
package/src/server/relay.ts +4 -0
package/src/server/request-log.ts +6 -0
package/src/server/responses/codex-ws-correlation.ts +65 -0
package/src/server/responses/codex-ws-exchange.ts +261 -0
package/src/server/responses/codex-ws-metadata.ts +134 -0
package/src/server/responses/codex-ws-pool.ts +162 -0
package/src/server/responses/codex-ws-request.ts +87 -0
package/src/server/responses/codex-ws-session.ts +93 -0
package/src/server/responses/codex-ws-wire.ts +144 -0
package/src/server/responses/collaboration.ts +41 -1
package/src/server/responses/compact.ts +105 -12
package/src/server/responses/core.ts +476 -57
package/src/server/responses/fetch-helpers.ts +10 -3
package/src/server/responses/input-admission.ts +16 -9
package/src/server/responses/responses-field-backfill.ts +1 -1
package/src/server/responses/ws-upstream.ts +34 -318
package/src/server/responses-custom-tool-repair.ts +20 -4
package/src/server/responses-undeclared-tool-guard.ts +100 -8
package/src/server/safe-response-headers.ts +23 -0
package/src/server/search.ts +9 -0
package/src/server/subagent-models-startup.ts +27 -0
package/src/server/system-env-shell.ts +238 -0
package/src/server/system-env.ts +7 -234
package/src/server/ws-bridge.ts +3 -25
package/src/server/xai-responses-startup.ts +21 -0
package/src/service-manager-probe.ts +1 -1
package/src/service.ts +55 -16
package/src/types/config.ts +108 -12
package/src/types/provider.ts +36 -7
package/src/types/tools.ts +26 -1
package/src/types.ts +2 -0
package/src/update/notify.ts +8 -2
package/src/usage/cost.ts +38 -28
package/src/usage/expected-prices.ts +34 -15
package/src/usage/log.ts +2 -0
package/src/usage/model-identity.ts +26 -0
package/src/usage/summary.ts +15 -1
package/src/vision/describe.ts +6 -0
package/src/vision/image-rewrite.ts +108 -0
package/src/vision/index.ts +19 -306
package/src/vision/plan.ts +205 -0
package/src/web-search/executor.ts +6 -0
package/src/web-search/index.ts +8 -1
package/gui/dist/assets/index-BU1tE0sr.js +0 -112
package/gui/dist/assets/index-DL9-iS6J.css +0 -1

package/gui/dist/index.html CHANGED Viewed

@@ -16,8 +16,8 @@
         } catch (e) {}
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-BU1tE0sr.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DL9-iS6J.css">
+    <script type="module" crossorigin src="/assets/index-Djowl68T.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DS1NE4Jn.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "2.42.0",
+  "version": "2.43.0",
   "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code",
   "type": "module",
   "main": "./bin/package-main.mjs",

package/src/adapters/anthropic-image-codec.ts ADDED Viewed

@@ -0,0 +1,304 @@
+import { sniffImageDimensions } from "./anthropic-image-guard";
+import { enforceAppOwnedMemoryBudget } from "../lib/app-owned-memory";
+/** One ladder position: dimension cap, JPEG quality attempts, per-image base64 cap. */
+export interface TierSpec {
+  maxEdge: number;
+  qualities: number[];
+  /** Hard per-image base64-length cap at this position; Infinity = terminal (measured size accepted). */
+  hardCap: number;
+}
+const KiB = 1024;
+const MiB = 1024 * 1024;
+/**
+ * Ladder positions 0-5. 0-2 are the age-assigned tiers; 3-5 are demotion floor steps.
+ * Terminal (last) accepts its measured output so the aggregate loop always terminates
+ * (audit round 2, blocker 1).
+ */
+export const TIER_SPECS: TierSpec[] = [
+  { maxEdge: 2000, qualities: [80, 60, 40, 30], hardCap: 2 * MiB },
+  { maxEdge: 1024, qualities: [70, 50], hardCap: 512 * KiB },
+  { maxEdge: 700, qualities: [60, 40], hardCap: 192 * KiB },
+  { maxEdge: 500, qualities: [40], hardCap: 100 * KiB },
+  { maxEdge: 400, qualities: [30], hardCap: 100 * KiB },
+  { maxEdge: 320, qualities: [25], hardCap: Infinity },
+];
+export const TERMINAL_POS = TIER_SPECS.length - 1;
+/** Newest 6 images ride tier 0, the next 14 tier 1, the rest tier 2 (020 tier table). */
+export const TIER0_COUNT = 6;
+export const TIER1_COUNT = 14;
+/** Decode-bomb guards: refuse to decode absurd inputs (020 guards; "extreme values excluded"). */
+export const MAX_INPUT_BASE64_LENGTH = 64 * MiB;
+/**
+ * First-pass worker-pool width. Memory-bound, not CPU-bound: each in-flight item can
+ * hold a decoded bitmap, so this bounds peak memory to ~4 decoded images while still
+ * overlapping I/O and native-encode threadpool work. Fixed on purpose — a config knob
+ * would widen the adapter contract with no demonstrated need.
+ */
+export const IMAGE_NORMALIZE_CONCURRENCY = 4;
+export const MAX_INPUT_PIXELS = 100_000_000;
+/** Formats Anthropic accepts as-is; anything else must be transcoded or dropped. */
+const PASSTHROUGH_MEDIA = new Set(["image/jpeg", "image/png", "image/gif", "image/webp"]);
+export interface NormalizeOptions {
+  /** Shift every image's starting ladder position down (413 retry tightening; 030). */
+  tierBias?: number;
+  /** Test seam: replaces the Bun.Image encode path (audit round 1, blocker 6). */
+  encode?: EncodeFn;
+  /** Test seam: replaces the pass-through decode validation (C-gate round 1, blocker 1). */
+  validate?: ValidateFn;
+}
+export type EncodeFn = (
+  input: Uint8Array,
+  spec: TierSpec,
+  quality: number,
+) => Promise<{ data: string; mediaType: string }>;
+/** Proves the payload fully decodes; must throw for corrupt/truncated data. */
+export type ValidateFn = (input: Uint8Array) => Promise<void>;
+type ProcessResult =
+  | { kind: "pass"; b64Length: number }
+  | { kind: "encoded"; data: string; mediaType: string }
+  | { kind: "failed" };
+/**
+ * Byte-weighted LRU over normalized outputs (audit round 1, blocker 2): aggregate cap,
+ * not entry count. Entries are immutable snapshots — demotions write NEW tier-suffixed
+ * keys, never mutate stored values.
+ */
+export const IMAGE_NORMALIZE_CACHE_MAX_BYTES = 64 * MiB;
+const CACHE_MAX_ENTRIES = 4_096;
+const CACHE_MAX_ENTRY_BYTES = 20 * MiB;
+// "pass" = validated pass-through; "miss" = this position's ladder cannot meet its hard
+// cap for these bytes (skip straight to the next position — C-gate round 2, blocker 1).
+type CacheValue = { data: string; mediaType: string } | "pass" | "miss";
+interface CacheEntry {
+  value: CacheValue;
+  sizeBytes: number;
+  metadataBytes: number;
+  storedAt: number;
+}
+interface NormalizeCacheLimits {
+  maxBytes: number;
+  maxEntries: number;
+  maxEntryBytes: number;
+}
+const DEFAULT_CACHE_LIMITS: NormalizeCacheLimits = {
+  maxBytes: IMAGE_NORMALIZE_CACHE_MAX_BYTES,
+  maxEntries: CACHE_MAX_ENTRIES,
+  maxEntryBytes: CACHE_MAX_ENTRY_BYTES,
+};
+const cacheEncoder = new TextEncoder();
+const cache = new Map<string, CacheEntry>();
+let cacheLimits = { ...DEFAULT_CACHE_LIMITS };
+let cacheBytes = 0;
+let cacheMetadataBytes = 0;
+let cacheSentinelEntries = 0;
+let encodeCalls = 0;
+function cacheEntry(key: string, value: CacheValue): CacheEntry {
+  const keyBytes = cacheEncoder.encode(key).byteLength;
+  const valueBytes = typeof value === "string"
+    ? cacheEncoder.encode(value).byteLength
+    : cacheEncoder.encode(value.mediaType).byteLength + cacheEncoder.encode(value.data).byteLength;
+  const metadataBytes = keyBytes + (typeof value === "string"
+    ? cacheEncoder.encode(value).byteLength
+    : cacheEncoder.encode(value.mediaType).byteLength);
+  return { value, sizeBytes: keyBytes + valueBytes, metadataBytes, storedAt: Date.now() };
+}
+function deleteCacheEntry(key: string): number {
+  const entry = cache.get(key);
+  if (!entry) return 0;
+  cache.delete(key);
+  cacheBytes -= entry.sizeBytes;
+  cacheMetadataBytes -= entry.metadataBytes;
+  if (typeof entry.value === "string") cacheSentinelEntries--;
+  return entry.sizeBytes;
+}
+function cachePut(key: string, value: CacheValue): boolean {
+  const next = cacheEntry(key, value);
+  if (
+    next.sizeBytes > cacheLimits.maxEntryBytes
+    || next.sizeBytes > cacheLimits.maxBytes
+    || cacheLimits.maxEntries <= 0
+  ) return false;
+  const existing = cache.get(key);
+  if (existing !== undefined) {
+    deleteCacheEntry(key); // re-insert refreshes recency and prevents double-count on concurrent misses
+  }
+  while (cache.size + 1 > cacheLimits.maxEntries || cacheBytes + next.sizeBytes > cacheLimits.maxBytes) {
+    const oldest = cache.keys().next().value;
+    if (oldest === undefined || deleteCacheEntry(oldest) === 0) return false;
+  }
+  cache.set(key, next);
+  cacheBytes += next.sizeBytes;
+  cacheMetadataBytes += next.metadataBytes;
+  if (typeof value === "string") cacheSentinelEntries++;
+  enforceAppOwnedMemoryBudget();
+  return true;
+}
+/** Read a cache entry, refreshing its recency (true LRU, C-gate round 1 blocker 5). */
+function cacheGet(key: string): CacheValue | undefined {
+  const entry = cache.get(key);
+  if (entry !== undefined) {
+    cache.delete(key);
+    entry.storedAt = Date.now();
+    cache.set(key, entry);
+  }
+  return entry?.value;
+}
+/** Test hooks: encoder-invocation counter + cache reset (no production caller). */
+export function getNormalizeStatsForTests(): {
+  encodeCalls: number;
+  cacheEntries: number;
+  cacheBytes: number;
+  sentinelEntries: number;
+  metadataBytes: number;
+  oldestAt: number | null;
+} {
+  return {
+    encodeCalls,
+    cacheEntries: cache.size,
+    cacheBytes,
+    sentinelEntries: cacheSentinelEntries,
+    metadataBytes: cacheMetadataBytes,
+    oldestAt: cache.values().next().value?.storedAt ?? null,
+  };
+}
+export function resetNormalizeStateForTests(): void {
+  cache.clear();
+  cacheBytes = 0;
+  cacheMetadataBytes = 0;
+  cacheSentinelEntries = 0;
+  encodeCalls = 0;
+}
+export function setNormalizeCacheLimitsForTests(limits?: Partial<NormalizeCacheLimits>): void {
+  resetNormalizeStateForTests();
+  cacheLimits = limits ? { ...DEFAULT_CACHE_LIMITS, ...limits } : { ...DEFAULT_CACHE_LIMITS };
+}
+export function anthropicImageNormalizeRetainedStoreSnapshot(): {
+  count: number;
+  bytes: number;
+  evictableBytes: number;
+  pinnedBytes: number;
+  oldestAt: number | null;
+} {
+  return {
+    count: cache.size,
+    bytes: cacheBytes,
+    evictableBytes: cacheBytes,
+    pinnedBytes: 0,
+    oldestAt: cache.values().next().value?.storedAt ?? null,
+  };
+}
+export function evictOldestAnthropicImageNormalizeForBudget(): number {
+  const oldest = cache.keys().next().value;
+  return oldest === undefined ? 0 : deleteCacheEntry(oldest);
+}
+/** Default encoder: Bun.Image resize-to-fit + JPEG at the given quality. */
+export const bunImageEncode: EncodeFn = async (input, spec, quality) => {
+  const image = new Bun.Image(input);
+  const meta = await image.metadata();
+  const w = typeof meta.width === "number" ? meta.width : 0;
+  const h = typeof meta.height === "number" ? meta.height : 0;
+  let pipeline = new Bun.Image(input);
+  if (w > spec.maxEdge || h > spec.maxEdge) {
+    const scale = spec.maxEdge / Math.max(w, h);
+    pipeline = pipeline.resize(Math.max(1, Math.round(w * scale)), Math.max(1, Math.round(h * scale)));
+  }
+  const out = await pipeline.jpeg({ quality }).toBuffer();
+  return { data: Buffer.from(out).toString("base64"), mediaType: "image/jpeg" };
+};
+/**
+ * Default pass-through validation: force a full decode (resize forces pixel decoding, a
+ * header-only metadata read does not). A sniffable-but-truncated payload must throw here
+ * instead of riding pass-through to an Anthropic 400 (C-gate round 1, blocker 1).
+ */
+export const bunImageValidate: ValidateFn = async input => {
+  await new Bun.Image(input).resize(1, 1).jpeg({ quality: 1 }).toBuffer();
+};
+/**
+ * Process one image at a ladder position: pass through when it already fits the
+ * position's caps (Anthropic-native format, dims within maxEdge, size within hardCap —
+ * this also exempts possibly-animated GIF/WebP from a lossy re-encode; pass-through is
+ * additionally VALIDATED with a full decode once, cached), otherwise walk positions
+ * downward encoding until a hard cap is met; terminal accepts measured size.
+ * `mediaType` must be the ORIGINAL source media type (cache keys include it — C-gate
+ * round 1, blocker 4 — and pass-through eligibility depends on it).
+ */
+export async function processAt(
+  b64: string,
+  startPos: number,
+  mediaType: string,
+  encode: EncodeFn,
+  validate: ValidateFn,
+): Promise<ProcessResult & { pos: number }> {
+  const dims = sniffImageDimensions(b64);
+  const hash = Bun.hash(b64).toString(36);
+  let input: Uint8Array;
+  try {
+    input = Uint8Array.from(Buffer.from(b64, "base64"));
+  } catch {
+    return { kind: "failed", pos: startPos };
+  }
+  for (let pos = startPos; pos <= TERMINAL_POS; pos++) {
+    const spec = TIER_SPECS[pos];
+    const key = `${hash}:${mediaType}:${pos}`;
+    const cached = cacheGet(key);
+    if (cached === "pass") return { kind: "pass", b64Length: b64.length, pos };
+    if (cached === "miss") continue; // known cap miss: skip to the next position
+    if (cached) return { kind: "encoded", data: cached.data, mediaType: cached.mediaType, pos };
+    const fitsDims = dims !== null && dims.width <= spec.maxEdge && dims.height <= spec.maxEdge;
+    if (PASSTHROUGH_MEDIA.has(mediaType) && fitsDims && b64.length <= spec.hardCap) {
+      try {
+        await validate(input); // sniffable-but-truncated data must not ride pass-through
+      } catch {
+        return { kind: "failed", pos };
+      }
+      cachePut(key, "pass");
+      return { kind: "pass", b64Length: b64.length, pos };
+    }
+    let last: { data: string; mediaType: string } | null = null;
+    try {
+      for (const quality of spec.qualities) {
+        encodeCalls++;
+        last = await encode(input, spec, quality);
+        if (last.data.length <= spec.hardCap) {
+          cachePut(key, last);
+          return { kind: "encoded", data: last.data, mediaType: last.mediaType, pos };
+        }
+      }
+    } catch {
+      // Decode/encode failure: corrupt or unsupported payload (audit round 2, blocker 2).
+      return { kind: "failed", pos };
+    }
+    if (pos === TERMINAL_POS && last) {
+      cachePut(key, last);
+      return { kind: "encoded", data: last.data, mediaType: last.mediaType, pos };
+    }
+    // Hard cap missed at this position — remember the miss, continue down the ladder.
+    cachePut(key, "miss");
+  }
+  return { kind: "failed", pos: TERMINAL_POS };
+}

package/src/adapters/anthropic-image-normalize.ts CHANGED Viewed

@@ -20,245 +20,21 @@ import {
   TOTAL_IMAGE_BASE64_BUDGET,
   type ImageBlockRef,
 } from "./anthropic-image-guard";
-import { enforceAppOwnedMemoryBudget } from "../lib/app-owned-memory";
-/** One ladder position: dimension cap, JPEG quality attempts, per-image base64 cap. */
-export interface TierSpec {
-  maxEdge: number;
-  qualities: number[];
-  /** Hard per-image base64-length cap at this position; Infinity = terminal (measured size accepted). */
-  hardCap: number;
-}
-const KiB = 1024;
-const MiB = 1024 * 1024;
-/**
- * Ladder positions 0-5. 0-2 are the age-assigned tiers; 3-5 are demotion floor steps.
- * Terminal (last) accepts its measured output so the aggregate loop always terminates
- * (audit round 2, blocker 1).
- */
-export const TIER_SPECS: TierSpec[] = [
-  { maxEdge: 2000, qualities: [80, 60, 40, 30], hardCap: 2 * MiB },
-  { maxEdge: 1024, qualities: [70, 50], hardCap: 512 * KiB },
-  { maxEdge: 700, qualities: [60, 40], hardCap: 192 * KiB },
-  { maxEdge: 500, qualities: [40], hardCap: 100 * KiB },
-  { maxEdge: 400, qualities: [30], hardCap: 100 * KiB },
-  { maxEdge: 320, qualities: [25], hardCap: Infinity },
-];
-const TERMINAL_POS = TIER_SPECS.length - 1;
-/** Newest 6 images ride tier 0, the next 14 tier 1, the rest tier 2 (020 tier table). */
-const TIER0_COUNT = 6;
-const TIER1_COUNT = 14;
+export type { TierSpec, NormalizeOptions, EncodeFn, ValidateFn } from "./anthropic-image-codec";
+export { TIER_SPECS, MAX_INPUT_BASE64_LENGTH, IMAGE_NORMALIZE_CONCURRENCY, MAX_INPUT_PIXELS } from "./anthropic-image-codec";
+export { IMAGE_NORMALIZE_CACHE_MAX_BYTES } from "./anthropic-image-codec";
+export { getNormalizeStatsForTests, resetNormalizeStateForTests, setNormalizeCacheLimitsForTests } from "./anthropic-image-codec";
+export { anthropicImageNormalizeRetainedStoreSnapshot, evictOldestAnthropicImageNormalizeForBudget } from "./anthropic-image-codec";
-/** Decode-bomb guards: refuse to decode absurd inputs (020 guards; "extreme values excluded"). */
-export const MAX_INPUT_BASE64_LENGTH = 64 * MiB;
-/**
- * First-pass worker-pool width. Memory-bound, not CPU-bound: each in-flight item can
- * hold a decoded bitmap, so this bounds peak memory to ~4 decoded images while still
- * overlapping I/O and native-encode threadpool work. Fixed on purpose — a config knob
- * would widen the adapter contract with no demonstrated need.
- */
-export const IMAGE_NORMALIZE_CONCURRENCY = 4;
-export const MAX_INPUT_PIXELS = 100_000_000;
+import { bunImageEncode, bunImageValidate, processAt, TERMINAL_POS, TIER0_COUNT, TIER1_COUNT } from "./anthropic-image-codec";
+import { IMAGE_NORMALIZE_CONCURRENCY, MAX_INPUT_BASE64_LENGTH, MAX_INPUT_PIXELS } from "./anthropic-image-codec";
+import type { NormalizeOptions } from "./anthropic-image-codec";
 const UNDECODABLE_TEXT = "[image omitted: undecodable or corrupt image data]";
 const BOMB_TEXT = "[image omitted: image too large to process safely]";
 const OVERFLOW_DROP_TEXT = "[image omitted: total image payload exceeded the provider request budget; older images were dropped]";
-/** Formats Anthropic accepts as-is; anything else must be transcoded or dropped. */
-const PASSTHROUGH_MEDIA = new Set(["image/jpeg", "image/png", "image/gif", "image/webp"]);
-export interface NormalizeOptions {
-  /** Shift every image's starting ladder position down (413 retry tightening; 030). */
-  tierBias?: number;
-  /** Test seam: replaces the Bun.Image encode path (audit round 1, blocker 6). */
-  encode?: EncodeFn;
-  /** Test seam: replaces the pass-through decode validation (C-gate round 1, blocker 1). */
-  validate?: ValidateFn;
-}
-export type EncodeFn = (
-  input: Uint8Array,
-  spec: TierSpec,
-  quality: number,
-) => Promise<{ data: string; mediaType: string }>;
-/** Proves the payload fully decodes; must throw for corrupt/truncated data. */
-export type ValidateFn = (input: Uint8Array) => Promise<void>;
-type ProcessResult =
-  | { kind: "pass"; b64Length: number }
-  | { kind: "encoded"; data: string; mediaType: string }
-  | { kind: "failed" };
-/**
- * Byte-weighted LRU over normalized outputs (audit round 1, blocker 2): aggregate cap,
- * not entry count. Entries are immutable snapshots — demotions write NEW tier-suffixed
- * keys, never mutate stored values.
- */
-export const IMAGE_NORMALIZE_CACHE_MAX_BYTES = 64 * MiB;
-const CACHE_MAX_ENTRIES = 4_096;
-const CACHE_MAX_ENTRY_BYTES = 20 * MiB;
-// "pass" = validated pass-through; "miss" = this position's ladder cannot meet its hard
-// cap for these bytes (skip straight to the next position — C-gate round 2, blocker 1).
-type CacheValue = { data: string; mediaType: string } | "pass" | "miss";
-interface CacheEntry {
-  value: CacheValue;
-  sizeBytes: number;
-  metadataBytes: number;
-  storedAt: number;
-}
-interface NormalizeCacheLimits {
-  maxBytes: number;
-  maxEntries: number;
-  maxEntryBytes: number;
-}
-const DEFAULT_CACHE_LIMITS: NormalizeCacheLimits = {
-  maxBytes: IMAGE_NORMALIZE_CACHE_MAX_BYTES,
-  maxEntries: CACHE_MAX_ENTRIES,
-  maxEntryBytes: CACHE_MAX_ENTRY_BYTES,
-};
-const cacheEncoder = new TextEncoder();
-const cache = new Map<string, CacheEntry>();
-let cacheLimits = { ...DEFAULT_CACHE_LIMITS };
-let cacheBytes = 0;
-let cacheMetadataBytes = 0;
-let cacheSentinelEntries = 0;
-let encodeCalls = 0;
-function cacheEntry(key: string, value: CacheValue): CacheEntry {
-  const keyBytes = cacheEncoder.encode(key).byteLength;
-  const valueBytes = typeof value === "string"
-    ? cacheEncoder.encode(value).byteLength
-    : cacheEncoder.encode(value.mediaType).byteLength + cacheEncoder.encode(value.data).byteLength;
-  const metadataBytes = keyBytes + (typeof value === "string"
-    ? cacheEncoder.encode(value).byteLength
-    : cacheEncoder.encode(value.mediaType).byteLength);
-  return { value, sizeBytes: keyBytes + valueBytes, metadataBytes, storedAt: Date.now() };
-}
-function deleteCacheEntry(key: string): number {
-  const entry = cache.get(key);
-  if (!entry) return 0;
-  cache.delete(key);
-  cacheBytes -= entry.sizeBytes;
-  cacheMetadataBytes -= entry.metadataBytes;
-  if (typeof entry.value === "string") cacheSentinelEntries--;
-  return entry.sizeBytes;
-}
-function cachePut(key: string, value: CacheValue): boolean {
-  const next = cacheEntry(key, value);
-  if (
-    next.sizeBytes > cacheLimits.maxEntryBytes
-    || next.sizeBytes > cacheLimits.maxBytes
-    || cacheLimits.maxEntries <= 0
-  ) return false;
-  const existing = cache.get(key);
-  if (existing !== undefined) {
-    deleteCacheEntry(key); // re-insert refreshes recency and prevents double-count on concurrent misses
-  }
-  while (cache.size + 1 > cacheLimits.maxEntries || cacheBytes + next.sizeBytes > cacheLimits.maxBytes) {
-    const oldest = cache.keys().next().value;
-    if (oldest === undefined || deleteCacheEntry(oldest) === 0) return false;
-  }
-  cache.set(key, next);
-  cacheBytes += next.sizeBytes;
-  cacheMetadataBytes += next.metadataBytes;
-  if (typeof value === "string") cacheSentinelEntries++;
-  enforceAppOwnedMemoryBudget();
-  return true;
-}
-/** Read a cache entry, refreshing its recency (true LRU, C-gate round 1 blocker 5). */
-function cacheGet(key: string): CacheValue | undefined {
-  const entry = cache.get(key);
-  if (entry !== undefined) {
-    cache.delete(key);
-    entry.storedAt = Date.now();
-    cache.set(key, entry);
-  }
-  return entry?.value;
-}
-/** Test hooks: encoder-invocation counter + cache reset (no production caller). */
-export function getNormalizeStatsForTests(): {
-  encodeCalls: number;
-  cacheEntries: number;
-  cacheBytes: number;
-  sentinelEntries: number;
-  metadataBytes: number;
-  oldestAt: number | null;
-} {
-  return {
-    encodeCalls,
-    cacheEntries: cache.size,
-    cacheBytes,
-    sentinelEntries: cacheSentinelEntries,
-    metadataBytes: cacheMetadataBytes,
-    oldestAt: cache.values().next().value?.storedAt ?? null,
-  };
-}
-export function resetNormalizeStateForTests(): void {
-  cache.clear();
-  cacheBytes = 0;
-  cacheMetadataBytes = 0;
-  cacheSentinelEntries = 0;
-  encodeCalls = 0;
-}
-export function setNormalizeCacheLimitsForTests(limits?: Partial<NormalizeCacheLimits>): void {
-  resetNormalizeStateForTests();
-  cacheLimits = limits ? { ...DEFAULT_CACHE_LIMITS, ...limits } : { ...DEFAULT_CACHE_LIMITS };
-}
-export function anthropicImageNormalizeRetainedStoreSnapshot(): {
-  count: number;
-  bytes: number;
-  evictableBytes: number;
-  pinnedBytes: number;
-  oldestAt: number | null;
-} {
-  return {
-    count: cache.size,
-    bytes: cacheBytes,
-    evictableBytes: cacheBytes,
-    pinnedBytes: 0,
-    oldestAt: cache.values().next().value?.storedAt ?? null,
-  };
-}
-export function evictOldestAnthropicImageNormalizeForBudget(): number {
-  const oldest = cache.keys().next().value;
-  return oldest === undefined ? 0 : deleteCacheEntry(oldest);
-}
-/** Default encoder: Bun.Image resize-to-fit + JPEG at the given quality. */
-const bunImageEncode: EncodeFn = async (input, spec, quality) => {
-  const image = new Bun.Image(input);
-  const meta = await image.metadata();
-  const w = typeof meta.width === "number" ? meta.width : 0;
-  const h = typeof meta.height === "number" ? meta.height : 0;
-  let pipeline = new Bun.Image(input);
-  if (w > spec.maxEdge || h > spec.maxEdge) {
-    const scale = spec.maxEdge / Math.max(w, h);
-    pipeline = pipeline.resize(Math.max(1, Math.round(w * scale)), Math.max(1, Math.round(h * scale)));
-  }
-  const out = await pipeline.jpeg({ quality }).toBuffer();
-  return { data: Buffer.from(out).toString("base64"), mediaType: "image/jpeg" };
-};
-/**
- * Default pass-through validation: force a full decode (resize forces pixel decoding, a
- * header-only metadata read does not). A sniffable-but-truncated payload must throw here
- * instead of riding pass-through to an Anthropic 400 (C-gate round 1, blocker 1).
- */
-const bunImageValidate: ValidateFn = async input => {
-  await new Bun.Image(input).resize(1, 1).jpeg({ quality: 1 }).toBuffer();
-};
 function mediaTypeOf(ref: ImageBlockRef): string {
   const block = ref.container[ref.index] as { source?: { media_type?: unknown } } | undefined;
@@ -279,72 +55,6 @@ function initialPosition(newestFirstIndex: number, bias: number): number {
   return Math.min(base + Math.max(0, bias), TERMINAL_POS);
 }
-/**
- * Process one image at a ladder position: pass through when it already fits the
- * position's caps (Anthropic-native format, dims within maxEdge, size within hardCap —
- * this also exempts possibly-animated GIF/WebP from a lossy re-encode; pass-through is
- * additionally VALIDATED with a full decode once, cached), otherwise walk positions
- * downward encoding until a hard cap is met; terminal accepts measured size.
- * `mediaType` must be the ORIGINAL source media type (cache keys include it — C-gate
- * round 1, blocker 4 — and pass-through eligibility depends on it).
- */
-async function processAt(
-  b64: string,
-  startPos: number,
-  mediaType: string,
-  encode: EncodeFn,
-  validate: ValidateFn,
-): Promise<ProcessResult & { pos: number }> {
-  const dims = sniffImageDimensions(b64);
-  const hash = Bun.hash(b64).toString(36);
-  let input: Uint8Array;
-  try {
-    input = Uint8Array.from(Buffer.from(b64, "base64"));
-  } catch {
-    return { kind: "failed", pos: startPos };
-  }
-  for (let pos = startPos; pos <= TERMINAL_POS; pos++) {
-    const spec = TIER_SPECS[pos];
-    const key = `${hash}:${mediaType}:${pos}`;
-    const cached = cacheGet(key);
-    if (cached === "pass") return { kind: "pass", b64Length: b64.length, pos };
-    if (cached === "miss") continue; // known cap miss: skip to the next position
-    if (cached) return { kind: "encoded", data: cached.data, mediaType: cached.mediaType, pos };
-    const fitsDims = dims !== null && dims.width <= spec.maxEdge && dims.height <= spec.maxEdge;
-    if (PASSTHROUGH_MEDIA.has(mediaType) && fitsDims && b64.length <= spec.hardCap) {
-      try {
-        await validate(input); // sniffable-but-truncated data must not ride pass-through
-      } catch {
-        return { kind: "failed", pos };
-      }
-      cachePut(key, "pass");
-      return { kind: "pass", b64Length: b64.length, pos };
-    }
-    let last: { data: string; mediaType: string } | null = null;
-    try {
-      for (const quality of spec.qualities) {
-        encodeCalls++;
-        last = await encode(input, spec, quality);
-        if (last.data.length <= spec.hardCap) {
-          cachePut(key, last);
-          return { kind: "encoded", data: last.data, mediaType: last.mediaType, pos };
-        }
-      }
-    } catch {
-      // Decode/encode failure: corrupt or unsupported payload (audit round 2, blocker 2).
-      return { kind: "failed", pos };
-    }
-    if (pos === TERMINAL_POS && last) {
-      cachePut(key, last);
-      return { kind: "encoded", data: last.data, mediaType: last.mediaType, pos };
-    }
-    // Hard cap missed at this position — remember the miss, continue down the ladder.
-    cachePut(key, "miss");
-  }
-  return { kind: "failed", pos: TERMINAL_POS };
-}
 /**
  * Wire-neutral image handle (devlog/260714_image_normalization_pipeline/050): the core