@bitkyc08/opencodex 2.96.0 → 2.98.0-preview.20261107
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.
- package/bin/ocx.mjs +215 -20
- package/gui/dist/assets/App-6TFtZsUF.css +1 -0
- package/gui/dist/assets/App-B8_sOxoz.js +59 -0
- package/gui/dist/assets/Tray-DpWEp6ee.js +1 -0
- package/gui/dist/assets/WantedSansVariable.split.0-Dwvb1WRx.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.1-1wKD2RxI.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.10-CAKA6LIP.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.11-k5H85R4b.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.12-BHboLsUv.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.13-9GV377ix.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.14-DovDXnrj.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.15-DTdykCig.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.16-CKz2ccgK.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.17-Z2RD_KRZ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.18-BcKtfonJ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.19-DEQPOSZn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.2-DryboyuA.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.20-Bia5JMls.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.21-Cr4jFw-E.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.22-DjjB69TZ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.23-CvUzJskt.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.24-i_eMg5ox.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.25-2aKHwPX-.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.26-B6wXoCEL.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.27-D4h1WfGM.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.28-kvRPCStd.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.29-DHAiwleD.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.3-7H--eyZi.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.30-C66cfAY2.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.31-FDmtiNim.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.32-DouHt2Dd.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.33-B8HVvkJX.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.34-BtkRu1FN.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.35-DBylQbtk.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.36-Sg089Kgh.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.37-CYtvbriS.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.38-DKkSLf8Z.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.39-CecotKZD.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.4-Bv8O3ZMb.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.40-DdCvkmOU.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.41-ESn674Hc.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.42-DL9V7NNV.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.43-yipO0cyk.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.44-6rTmLZhm.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.45-BJAj8lrm.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.46-BDTzMn2c.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.47-Bxd4wGgi.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.48-DxnFBLnH.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.49-DnVD0aOD.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.5-B1wI2pp5.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.50-D9JlkZd6.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.51-D9Vw6Bu3.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.52-ClEJk4kn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.53-BSXU0vh-.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.54-EcuxkR9v.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.55-CYiFhQX8.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.56--Gk9g8BK.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.57-DnkOPZcy.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.58-9MB8504z.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.59-ByxIsN72.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.6-Bmk0dRVw.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.60-Bxwx_aWQ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.61-DA2z5sm7.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.62-C5iJPJZn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.63-DAqrmaEc.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.64-BgXFsljb.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.65-DKiWujvu.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.66-8po4vUZ4.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.67-Cy5qyI9O.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.68-BKny7Fy3.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.69-B4VU4u_b.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.7-BuqwNpgA.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.70-BCd4n346.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.71-CkQppaWn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.72-Db7vaoFs.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.73-DI80TYWl.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.74-tMCtDAHB.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.75-Ciw0D5WG.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.76-DoLjFgp-.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.77-CpT2uvMy.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.78-CkcJ4iZ1.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.79-DsOUJjEM.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.8-DsjypPd6.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.80-C0VwHTte.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.81-DTelu57i.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.82-BiMndGN1.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.83-CVcC6eDG.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.84-DlhZVt_O.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.85-S8I2D3pA.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.86-DozXXpH5.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.87-Dsn0Vuuo.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.88-iNwxxDCr.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.89-B63u_9CZ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.9-Bi3IzpMI.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.90-ByeH1Pqf.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.91-UQLlagpm.woff2 +0 -0
- package/gui/dist/assets/brand-mark-VPhzz-WE.js +1 -0
- package/gui/dist/assets/geist-cyrillic-ext-wght-normal-DjL33-gN.woff2 +0 -0
- package/gui/dist/assets/geist-cyrillic-wght-normal-BEAKL7Jp.woff2 +0 -0
- package/gui/dist/assets/geist-latin-ext-wght-normal-DC-KSUi6.woff2 +0 -0
- package/gui/dist/assets/geist-latin-wght-normal-BgDaEnEv.woff2 +0 -0
- package/gui/dist/assets/geist-mono-cyrillic-ext-wght-normal-X_5orZeX.woff2 +0 -0
- package/gui/dist/assets/geist-mono-cyrillic-wght-normal-DiZS0aHC.woff2 +0 -0
- package/gui/dist/assets/geist-mono-latin-ext-wght-normal-Bwz-egvJ.woff2 +0 -0
- package/gui/dist/assets/geist-mono-latin-wght-normal-XN7g48iV.woff2 +0 -0
- package/gui/dist/assets/geist-mono-symbols2-wght-normal-CO5SzqOn.woff2 +0 -0
- package/gui/dist/assets/geist-mono-vietnamese-wght-normal-DadHysG0.woff2 +0 -0
- package/gui/dist/assets/geist-vietnamese-wght-normal-6IgcOCM7.woff2 +0 -0
- package/gui/dist/assets/index-5REODpG3.css +2 -0
- package/gui/dist/assets/index-BWKBeK77.js +94 -0
- package/gui/dist/assets/segment-thumb-features-BQYzrze9.js +1 -0
- package/gui/dist/classic/assets/App-Bz65x1J6.js +58 -0
- package/gui/dist/{assets/Tray-BOPQyDbH.js → classic/assets/Tray-kk7mdO6I.js} +1 -1
- package/gui/dist/classic/assets/index-Dp2j8bSc.js +94 -0
- package/gui/dist/classic/assets/quota-summary-CvamtHjB.js +1 -0
- package/gui/dist/classic/index.html +47 -0
- package/gui/dist/favicon.png +0 -0
- package/gui/dist/favicon.svg +14 -0
- package/gui/dist/index.html +15 -2
- package/package.json +1 -1
- package/src/adapters/anthropic.ts +17 -8
- package/src/adapters/command-code.ts +15 -16
- package/src/adapters/cursor/transport-retry.ts +2 -2
- package/src/adapters/devin/cloud-direct/chat.ts +15 -6
- package/src/adapters/google.ts +7 -7
- package/src/adapters/kiro/adapter.ts +18 -3
- package/src/adapters/kiro/conversation.ts +8 -8
- package/src/adapters/kiro/payload.ts +45 -12
- package/src/adapters/kiro/stream.ts +230 -14
- package/src/adapters/kiro/structured-output-json.ts +191 -0
- package/src/adapters/kiro/structured-output-schema.ts +542 -0
- package/src/adapters/kiro/structured-output.ts +367 -0
- package/src/adapters/kiro-constants.ts +24 -1
- package/src/adapters/kiro-events.ts +31 -1
- package/src/adapters/kiro-retry.ts +3 -3
- package/src/adapters/kiro-tools.ts +14 -9
- package/src/adapters/kiro-wire.ts +9 -5
- package/src/adapters/ollama-native.ts +11 -1
- package/src/adapters/openai-chat/messages.ts +58 -5
- package/src/adapters/openai-chat/mistral-image-limit.ts +50 -0
- package/src/adapters/openai-chat/passthrough.ts +5 -3
- package/src/adapters/openai-chat/tool-schema.ts +83 -13
- package/src/adapters/openai-responses/empty-assistant.ts +15 -3
- package/src/adapters/openai-responses/opengateway-input.ts +18 -6
- package/src/adapters/openai-responses/passthrough.ts +5 -4
- package/src/adapters/openai-responses/reasoning.ts +9 -4
- package/src/adapters/openai-responses/request-strips.ts +1 -1
- package/src/adapters/openai-responses/tool-output-recovery.ts +79 -0
- package/src/adapters/physical-send.ts +3 -3
- package/src/adapters/qoder/live-models.ts +115 -1
- package/src/adapters/zed-openai-stream.ts +2 -1
- package/src/bridge/errors.ts +11 -2
- package/src/bridge/response-json.ts +2 -1
- package/src/bridge/sse.ts +14 -6
- package/src/chat/failure-verdict.ts +21 -0
- package/src/chat/outbound.ts +139 -21
- package/src/claude/failure-verdict.ts +21 -0
- package/src/claude/inbound-content-options.ts +15 -2
- package/src/claude/inbound-model-options.ts +2 -1
- package/src/claude/inbound-records.ts +2 -0
- package/src/claude/inbound.ts +17 -11
- package/src/claude/outbound.ts +98 -22
- package/src/cli/capabilities-access-remote.ts +13 -0
- package/src/cli/capabilities-base.ts +26 -3
- package/src/cli/capabilities-command.ts +12 -3
- package/src/cli/capabilities-provider-models.ts +3 -3
- package/src/cli/capability-contracts.ts +2 -0
- package/src/cli/codex-launch-auth.ts +30 -1
- package/src/cli/codex-launcher.ts +12 -5
- package/src/cli/codex-shim-autorestore.ts +12 -4
- package/src/cli/config-command.ts +11 -2
- package/src/cli/connect.ts +17 -2
- package/src/cli/dispatch.ts +14 -177
- package/src/cli/doctor.ts +95 -7
- package/src/cli/help.ts +2 -2
- package/src/cli/index.ts +17 -8
- package/src/cli/link-apply-restart.ts +9 -2
- package/src/cli/link.ts +1 -1
- package/src/cli/models.ts +124 -38
- package/src/cli/registry.ts +12 -4
- package/src/cli/restart-failure.ts +17 -0
- package/src/cli/root.ts +8 -0
- package/src/cli/stop-approval.ts +2 -2
- package/src/cli/sync-command.ts +243 -0
- package/src/cli/sync-fanout-process.ts +92 -0
- package/src/cli/sync-fanout.ts +161 -0
- package/src/cli/sync-flags.ts +10 -0
- package/src/cli/sync-link-status.ts +39 -0
- package/src/cli/sync-update-guard.ts +18 -0
- package/src/cli/system-restart-client.ts +5 -0
- package/src/cli/uninstall-client-state.ts +12 -1
- package/src/cli/update-restart-child.ts +13 -3
- package/src/cli/update-restart-home.ts +6 -3
- package/src/cli/update-restart.ts +36 -19
- package/src/client/connect.ts +35 -15
- package/src/client/hub-client.ts +5 -0
- package/src/client/link-home.ts +3 -2
- package/src/client/link-management-relay.ts +39 -2
- package/src/client/link-readiness.ts +3 -1
- package/src/client/machine-api.ts +2 -1
- package/src/client/machine-listener.ts +10 -0
- package/src/client/orphan-token-recovery.ts +322 -0
- package/src/client/restore-ownership.ts +19 -1
- package/src/client/runtime-restart.ts +12 -4
- package/src/client/runtime.ts +40 -11
- package/src/client/stop-routing.ts +62 -0
- package/src/client/sync-runtime.ts +65 -0
- package/src/clients/config-export.ts +32 -3
- package/src/codex/auth-context.ts +49 -103
- package/src/codex/catalog/antigravity-discovery.ts +16 -5
- package/src/codex/catalog/provider-models.ts +18 -12
- package/src/codex/forward-transport-headers.ts +35 -6
- package/src/codex/inject/config-toml.ts +88 -0
- package/src/codex/inject/multi-agent-v2.ts +30 -4
- package/src/codex/inject/plan.ts +34 -7
- package/src/codex/inject-coordination.ts +11 -0
- package/src/codex/inject.ts +18 -7
- package/src/codex/lineage.ts +13 -7
- package/src/codex/native-profile-api.ts +27 -1
- package/src/codex/quota.ts +22 -6
- package/src/codex/request-owned-affinity-key.ts +11 -0
- package/src/codex/request-owned-affinity.ts +118 -0
- package/src/codex/request-owned-main-pin.ts +86 -0
- package/src/codex/role-capability.ts +52 -41
- package/src/codex/routing/active-account.ts +13 -5
- package/src/codex/routing/selection.ts +40 -1
- package/src/codex/routing/thread-affinity-store.ts +916 -0
- package/src/codex/routing/thread-affinity.ts +90 -12
- package/src/codex/shim-diagnostics.ts +7 -0
- package/src/codex/shim-legacy-record.ts +290 -0
- package/src/codex/shim-windows-refresh.ts +9 -2
- package/src/codex/shim-wrapper-write.ts +7 -0
- package/src/codex/shim.ts +80 -21
- package/src/codex/toml-source-lines.ts +72 -13
- package/src/combos/failover.ts +6 -109
- package/src/combos/request.ts +2 -2
- package/src/combos/resolve.ts +29 -11
- package/src/config/diagnostics.ts +9 -9
- package/src/config/load-degrade.ts +27 -27
- package/src/config/process-state.ts +5 -0
- package/src/config/provider-validation.ts +9 -2
- package/src/config/removed-opencode-free-backup.ts +6 -3
- package/src/config/schema/leaf-validators.ts +1 -0
- package/src/config/tracked-runtime-inspection.ts +3 -3
- package/src/generated/compatibility-version.json +595 -255
- package/src/images/loop.ts +4 -3
- package/src/lib/client-error-body.ts +215 -0
- package/src/lib/client-retry-after.ts +66 -0
- package/src/lib/config-ownership-removal.ts +422 -0
- package/src/lib/config-ownership.ts +650 -81
- package/src/lib/context-overflow-verdict.ts +113 -0
- package/src/lib/crash-guard.ts +4 -2
- package/src/lib/desktop-cli-handoff.d.mts +4 -5
- package/src/lib/desktop-cli-handoff.mjs +18 -17
- package/src/lib/empty-tool-catalog.ts +25 -3
- package/src/lib/error-destination.ts +47 -0
- package/src/lib/errors.ts +1 -0
- package/src/lib/failure-detail.ts +66 -0
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/messages-error-body.ts +162 -0
- package/src/lib/messages-sse-error-presentation.ts +93 -0
- package/src/lib/model-identity.ts +44 -0
- package/src/lib/passive-read.ts +9 -4
- package/src/lib/private-sqlite-path.ts +124 -0
- package/src/lib/response-service-tier.ts +17 -0
- package/src/lib/retry-after.ts +3 -0
- package/src/lib/socks5-fetch.ts +21 -9
- package/src/lib/spend-ledger-owner.ts +43 -4
- package/src/lib/upstream-condition.ts +142 -0
- package/src/lib/upstream-retry.ts +95 -12
- package/src/lib/windows-owner-acl.ts +22 -9
- package/src/lib/winsw.ts +5 -5
- package/src/lib/workflow-budget.ts +3 -1
- package/src/link/remote-platform.ts +14 -0
- package/src/link/remote-windows.ts +51 -9
- package/src/link/ssh-argv.ts +63 -10
- package/src/oauth/generic-account-failover.ts +13 -11
- package/src/oauth/index.ts +42 -73
- package/src/oauth/oauth-errors.ts +67 -0
- package/src/oauth/store.ts +21 -11
- package/src/protocols/codecs/messages-ir.ts +15 -9
- package/src/protocols/codecs/ollama.ts +197 -0
- package/src/protocols/encoders/adapter-events.ts +30 -7
- package/src/protocols/encoders/chat.ts +18 -10
- package/src/protocols/encoders/messages.ts +72 -28
- package/src/protocols/trace.ts +18 -0
- package/src/providers/antigravity-models.ts +45 -12
- package/src/providers/fastwire.ts +3 -2
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/quota/anthropic-usage-windows.ts +13 -3
- package/src/providers/quota/vendor-probes-key.ts +60 -24
- package/src/providers/reasoning-metadata.ts +2 -1
- package/src/providers/registry/entries-extended.ts +9 -0
- package/src/providers/request-pacing.ts +3 -2
- package/src/reasoning-effort.ts +7 -2
- package/src/remote/hub-usage.ts +3 -0
- package/src/responses/apply-patch-envelope.ts +45 -19
- package/src/responses/compaction-history-framing.ts +5 -1
- package/src/responses/freeform-wrapper-scan.ts +5 -3
- package/src/responses/progressive-freeform-input.ts +354 -45
- package/src/routing/fallback-policy.ts +3 -1
- package/src/server/admission-model-scope.ts +17 -6
- package/src/server/admitted-http-turn.ts +57 -0
- package/src/server/anthropic-rate-limit-headers.ts +75 -3
- package/src/server/auth-cors.ts +5 -0
- package/src/server/chat-completions.ts +45 -20
- package/src/server/chat-native-sse.ts +52 -7
- package/src/server/chat-native.ts +60 -35
- package/src/server/claude-bridge-pool-session.ts +59 -0
- package/src/server/claude-messages.ts +174 -84
- package/src/server/context-history.ts +5 -1
- package/src/server/gui-static.ts +4 -1
- package/src/server/hub-usage.ts +7 -2
- package/src/server/inbound-body-admission.ts +11 -4
- package/src/server/index/link-management.ts +8 -0
- package/src/server/index/ollama-routes.ts +91 -0
- package/src/server/index/serve-options.ts +44 -24
- package/src/server/index/startup-warnings.ts +5 -12
- package/src/server/index/websocket-handler.ts +5 -2
- package/src/server/index.ts +6 -36
- package/src/server/inference/client-encoder-delivery.ts +9 -3
- package/src/server/json-serialized-bytes.ts +44 -0
- package/src/server/management/agent-settings-routes.ts +24 -21
- package/src/server/management/codex-cli-update-routes.ts +2 -1
- package/src/server/management/logs-usage-routes.ts +89 -4
- package/src/server/management/provider-routes.ts +2 -22
- package/src/server/management/qoder-provider-probe.ts +105 -0
- package/src/server/management/route-registry.ts +4 -1
- package/src/server/management/usage-aggregate-cache.ts +15 -5
- package/src/server/management/usage-source-facets.ts +38 -0
- package/src/server/messages-native-scope.ts +2 -1
- package/src/server/messages-native-tool-guard.ts +12 -4
- package/src/server/messages-native.ts +123 -47
- package/src/server/messages-response-headers.ts +25 -11
- package/src/server/messages-shared.ts +99 -65
- package/src/server/messages-sse-error-filter.ts +199 -0
- package/src/server/native-final-log.ts +93 -0
- package/src/server/ollama-inbound.ts +349 -0
- package/src/server/ollama-native-paths.ts +21 -0
- package/src/server/ollama-route-policy.ts +73 -0
- package/src/server/relay.ts +22 -3
- package/src/server/request-decompress.ts +4 -2
- package/src/server/request-log-failure-attribution.ts +22 -0
- package/src/server/request-log-failure-detail.ts +80 -0
- package/src/server/request-log-terminal-status.ts +4 -2
- package/src/server/request-log.ts +91 -42
- package/src/server/response-log-body.ts +6 -1
- package/src/server/responses/account-change-state.ts +17 -6
- package/src/server/responses/adapter-continuation.ts +17 -6
- package/src/server/responses/adapter-delivery.ts +17 -10
- package/src/server/responses/adapter-dispatch.ts +32 -31
- package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
- package/src/server/responses/codex-auth-error.ts +24 -19
- package/src/server/responses/codex-ws-exchange.ts +11 -8
- package/src/server/responses/codex-ws-metadata.ts +94 -21
- package/src/server/responses/codex-ws-request.ts +3 -1
- package/src/server/responses/codex-ws-wire.ts +19 -3
- package/src/server/responses/compact.ts +57 -24
- package/src/server/responses/compaction-recovery.ts +4 -2
- package/src/server/responses/compaction-routing.ts +9 -4
- package/src/server/responses/core-auth.ts +32 -14
- package/src/server/responses/core-codex-account.ts +17 -6
- package/src/server/responses/core-combo-failure.ts +7 -1
- package/src/server/responses/core-combo-native.ts +2 -1
- package/src/server/responses/core-combo.ts +43 -27
- package/src/server/responses/core-errors.ts +24 -21
- package/src/server/responses/core-lifetime.ts +6 -3
- package/src/server/responses/core-normalize.ts +1 -0
- package/src/server/responses/core-options.ts +9 -0
- package/src/server/responses/core-pipeline.ts +4 -3
- package/src/server/responses/empty-completion-guard.ts +4 -1
- package/src/server/responses/fetch-helpers.ts +7 -1
- package/src/server/responses/input-admission.ts +28 -2
- package/src/server/responses/native-injection.ts +1 -1
- package/src/server/responses/native-response-json.ts +13 -4
- package/src/server/responses/native-response-output.ts +1 -2
- package/src/server/responses/non-replayable-error.ts +2 -1
- package/src/server/responses/pacing-overload.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +55 -14
- package/src/server/responses/passthrough-dispatch.ts +20 -18
- package/src/server/responses/passthrough-error.ts +9 -9
- package/src/server/responses/policy-fallback.ts +2 -1
- package/src/server/responses/request-prepare.ts +69 -48
- package/src/server/responses/request-transport.ts +36 -31
- package/src/server/responses/response-effects.ts +3 -2
- package/src/server/responses/run-turn-execution.ts +6 -6
- package/src/server/responses/sidecar-execution.ts +16 -12
- package/src/server/responses/spend-storage-error.ts +2 -1
- package/src/server/responses/terminal-guard.ts +30 -0
- package/src/server/responses/ws-upstream.ts +9 -0
- package/src/server/responses-custom-tool-repair.ts +14 -3
- package/src/server/responses-terminal-repair.ts +5 -2
- package/src/server/responses-undeclared-tool-guard.ts +39 -16
- package/src/server/restart-replacement.ts +3 -1
- package/src/server/safe-response-headers.ts +162 -13
- package/src/server/sse-payload-rewrite.ts +23 -11
- package/src/server/turn-state-handles.ts +164 -0
- package/src/server/workflow-refusal.ts +2 -1
- package/src/server/ws-bridge.ts +4 -0
- package/src/service/definition.ts +36 -4
- package/src/service/launchd.ts +89 -32
- package/src/service/logging.ts +34 -7
- package/src/service/ownership-mutation-lease.d.mts +11 -2
- package/src/service/ownership-mutation-lease.mjs +53 -11
- package/src/service/plist-xml.ts +59 -0
- package/src/service/state.ts +8 -0
- package/src/service/systemd-env.ts +2 -0
- package/src/service/systemd.ts +31 -7
- package/src/service/windows-taskxml.ts +16 -7
- package/src/service-manager-probe.ts +4 -10
- package/src/types/config.ts +2 -0
- package/src/types/provider.ts +2 -0
- package/src/types/request.ts +13 -1
- package/src/update/config-preflight.ts +48 -0
- package/src/update/index.ts +148 -26
- package/src/update/npm-install.d.mts +8 -0
- package/src/update/npm-install.mjs +20 -1
- package/src/update/orchestrated-admission.d.mts +4 -0
- package/src/update/orchestrated-admission.mjs +12 -0
- package/src/update/orchestrated-arguments.d.mts +12 -0
- package/src/update/orchestrated-arguments.mjs +64 -0
- package/src/update/orchestrated-child.d.mts +12 -0
- package/src/update/orchestrated-child.mjs +70 -0
- package/src/update/orchestrated-entry.ts +234 -0
- package/src/update/orchestrated-identity-probe-entry.ts +20 -0
- package/src/update/orchestrated-identity.ts +53 -0
- package/src/update/orchestrated-live-identity.ts +48 -0
- package/src/update/orchestrated-node-driver.mjs +99 -0
- package/src/update/orchestrated-outcome.d.mts +21 -0
- package/src/update/orchestrated-outcome.mjs +40 -0
- package/src/update/orchestrated-plan.ts +49 -0
- package/src/update/orchestrated-pnpm.d.mts +8 -0
- package/src/update/orchestrated-pnpm.mjs +33 -0
- package/src/update/orchestrated-session.d.mts +37 -0
- package/src/update/orchestrated-session.mjs +264 -0
- package/src/update/orchestrated-token.d.mts +10 -0
- package/src/update/orchestrated-token.mjs +21 -0
- package/src/update/orchestrated-token.ts +3 -0
- package/src/update/orchestrated-tree.d.mts +1 -0
- package/src/update/orchestrated-tree.mjs +14 -0
- package/src/update/pnpm-global-install.d.mts +6 -0
- package/src/update/pnpm-global-install.mjs +9 -2
- package/src/update/posix-install-supervisor-entry.mjs +6 -0
- package/src/update/posix-install-supervisor.d.mts +10 -0
- package/src/update/posix-install-supervisor.mjs +88 -0
- package/src/update/sync-update-mutex.d.mts +10 -0
- package/src/update/sync-update-mutex.mjs +164 -0
- package/src/update/sync-update-mutex.ts +1 -0
- package/src/update/test-home-guard.mjs +33 -0
- package/src/update/transactional-install.mjs +2 -2
- package/src/usage/client.ts +43 -0
- package/src/usage/error-detail.ts +225 -0
- package/src/usage/log.ts +64 -27
- package/src/usage/source-facets.ts +51 -0
- package/src/usage/source-filter.ts +65 -0
- package/src/usage/summary.ts +50 -8
- package/src/web-search/anthropic-executor.ts +105 -24
- package/src/web-search/executor.ts +5 -3
- package/src/web-search/loop.ts +33 -6
- package/src/web-search/progress-stream.ts +64 -5
- package/gui/dist/assets/App-bwugJRKn.js +0 -58
- package/gui/dist/assets/index-ebuVUtB7.js +0 -94
- package/gui/dist/assets/quota-summary-6HsrHQAy.js +0 -1
- /package/gui/dist/{assets → classic/assets}/App-B4j-Txmb.css +0 -0
- /package/gui/dist/{assets → classic/assets}/index-CHWwDo9L.css +0 -0
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/** Private pool identity for translated Claude turns; replay headers remain unchanged. */
|
|
2
|
+
import { createHmac, randomBytes } from "node:crypto";
|
|
3
|
+
import { codexPoolAffinityKey } from "../codex/auth-context";
|
|
4
|
+
import { contextPrincipalIdOf, type DataPlaneAdmission } from "./auth-cors";
|
|
5
|
+
import { safeCallerSessionId } from "./caller-session-identity";
|
|
6
|
+
import { isThreadSpawnRequest } from "./effort-policy";
|
|
7
|
+
import type { RouteResult } from "../router";
|
|
8
|
+
import type { HandleResponsesOptions } from "./responses/core-options";
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Process-local, like the lineage key: a synthesized identity never leaves the process (replay and
|
|
12
|
+
* upstream headers stay uncompleted), so no caller can name it, not even as a complete
|
|
13
|
+
* session-id + thread-id pair, which reaches the pool unscoped.
|
|
14
|
+
*/
|
|
15
|
+
const BRIDGE_POOL_KEY = randomBytes(32);
|
|
16
|
+
|
|
17
|
+
export function resolveClaudeBridgePoolSession(args: {
|
|
18
|
+
ingress: Headers; replay: Headers; metadataSessionId?: string; admission?: DataPlaneAdmission;
|
|
19
|
+
}): string | undefined {
|
|
20
|
+
const { ingress, replay, metadataSessionId, admission } = args;
|
|
21
|
+
if (!admission || isThreadSpawnRequest(ingress) || isThreadSpawnRequest(replay)) return undefined;
|
|
22
|
+
if (ingress.has("x-codex-parent-thread-id") || ingress.has("thread-id")) return undefined;
|
|
23
|
+
if (codexPoolAffinityKey(replay) !== undefined) return undefined;
|
|
24
|
+
let value: string | undefined;
|
|
25
|
+
if (ingress.has("session_id") || ingress.has("session-id")) {
|
|
26
|
+
const first = ingress.get("session_id");
|
|
27
|
+
const second = ingress.get("session-id");
|
|
28
|
+
if (first && second && first !== second) return undefined;
|
|
29
|
+
value = safeCallerSessionId(first || second);
|
|
30
|
+
} else {
|
|
31
|
+
value = safeCallerSessionId(metadataSessionId ?? ingress.get("x-claude-code-session-id"));
|
|
32
|
+
}
|
|
33
|
+
if (!value) return undefined;
|
|
34
|
+
// Every identity this bridge names, caller aliases included, is bound to its admission scope:
|
|
35
|
+
// a shared or guessed value must never select another principal's conversation key.
|
|
36
|
+
let scope: unknown = "loopback";
|
|
37
|
+
if (admission.kind !== "loopback") {
|
|
38
|
+
const principal = contextPrincipalIdOf(admission);
|
|
39
|
+
if (!principal) return undefined;
|
|
40
|
+
scope = ["principal", principal];
|
|
41
|
+
}
|
|
42
|
+
return createHmac("sha256", BRIDGE_POOL_KEY)
|
|
43
|
+
.update(JSON.stringify(["opencodex-claude-bridge-pool-v1", scope, value])).digest("hex");
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export function completeClaudeBridgePoolIdentity(headers: Headers, options: Pick<HandleResponsesOptions, "claudeBridgePoolSession">): Headers {
|
|
47
|
+
const session = options.claudeBridgePoolSession;
|
|
48
|
+
if (!session || headers.get("x-codex-parent-thread-id") || headers.get("thread-id")
|
|
49
|
+
|| codexPoolAffinityKey(headers) !== undefined) return headers;
|
|
50
|
+
const completed = new Headers(headers);
|
|
51
|
+
completed.set("session-id", session);
|
|
52
|
+
completed.set("thread-id", session);
|
|
53
|
+
return completed;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export function applyClaudeBridgePoolSession(headers: Headers, route: Pick<RouteResult, "codexAccountMode">,
|
|
57
|
+
options: Pick<HandleResponsesOptions, "claudeBridgePoolSession">): Headers {
|
|
58
|
+
return route.codexAccountMode !== undefined ? completeClaudeBridgePoolIdentity(headers, options) : headers;
|
|
59
|
+
}
|
|
@@ -1,4 +1,12 @@
|
|
|
1
|
+
import { MessagesSseFrameContext } from "../lib/messages-sse-error-presentation";
|
|
2
|
+
import { createMessagesSseErrorFilter } from "./messages-sse-error-filter";
|
|
3
|
+
import { normalizeMessagesProxyRefusal, ownedAnthropicErrorPayload, ownedAnthropicErrorResponse, boundedMessagesDisplayCount, messagesOverflowPresentation, messagesRelayedOverflowPresentation } from "../lib/messages-error-body";
|
|
4
|
+
import { CLAUDE_CONTEXT_OVERFLOW_MESSAGE, isProxyError, markProxyError, carryProxyError, attachComboFailureEvidence, comboFailureEvidence } from "../lib/client-error-body";
|
|
5
|
+
import type { MessagesFailureVerdictSink } from "../claude/failure-verdict";
|
|
6
|
+
import { clientFacingModelLabel, clientFacingModelText } from "../lib/error-destination";
|
|
7
|
+
import { classifyUpstreamCondition } from "../lib/upstream-condition";
|
|
1
8
|
import { CodexInstallationIdUnavailableError } from "../codex/installation-id";
|
|
9
|
+
import { recordLocalFailureDetail, type FailureDetail } from "./request-log-failure-detail";
|
|
2
10
|
/**
|
|
3
11
|
* Anthropic Messages inbound (/v1/messages + /v1/messages/count_tokens) for Claude Code.
|
|
4
12
|
*
|
|
@@ -8,8 +16,9 @@ import { CodexInstallationIdUnavailableError } from "../codex/installation-id";
|
|
|
8
16
|
* unchanged. The Responses output (SSE or JSON) is converted back to Anthropic shape.
|
|
9
17
|
*/
|
|
10
18
|
import { FORWARD_HEADERS } from "../adapters/openai-responses";
|
|
19
|
+
import { resolveClaudeBridgePoolSession } from "./claude-bridge-pool-session";
|
|
11
20
|
import {
|
|
12
|
-
admissionModelDeniedResponse,
|
|
21
|
+
admissionModelDeniedResponse, projectAdmissionModelDeniedLog,
|
|
13
22
|
AdmissionModelDeniedError,
|
|
14
23
|
assertRouteAllowedByScope,
|
|
15
24
|
resolveAdmissionModelScope,
|
|
@@ -36,7 +45,7 @@ import { stripOneMillionMarker } from "../claude/context-windows";
|
|
|
36
45
|
import { captureAdmissionPolicy } from "./capture-admission-policy";
|
|
37
46
|
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
38
47
|
import { captureClaudeInbound } from "../claude/inbound-debug";
|
|
39
|
-
import { declaredAnthropicServerTools, replayedAnthropicServerBlocks } from "../claude/inbound-content-options";
|
|
48
|
+
import { declaredAnthropicServerTools, replayedAnthropicServerBlocks, systemCachePrefix } from "../claude/inbound-content-options";
|
|
40
49
|
import { claudeCodeForIngress } from "../claude/intercept/model-bindings";
|
|
41
50
|
import { classifyInterceptClient } from "../claude/intercept/client-class";
|
|
42
51
|
import { analyzeClaudeCompatibility, isClaudeCompatibilityMode } from "../claude/compatibility";
|
|
@@ -50,13 +59,15 @@ import {
|
|
|
50
59
|
UPSTREAM_RESET_REPLAY_REFUSED_CODE,
|
|
51
60
|
} from "../lib/upstream-retry";
|
|
52
61
|
import { isClientClosedMessage, recognizedUpstreamError, UNDECLARED_TOOL_CALL_ERROR_CODE } from "../lib/errors";
|
|
53
|
-
import { resolveClientRetryAfter } from "../lib/retry-after";
|
|
62
|
+
import { formatClientRetryAfter, resolveClientRetryAfter } from "../lib/retry-after";
|
|
54
63
|
import { anthropicRateLimitHeaders } from "./anthropic-rate-limit-headers";
|
|
55
|
-
import { upstreamMessagesRequestIdHeaders } from "./messages-response-headers";
|
|
64
|
+
import { messagesSuccessContentType, upstreamMessagesRequestIdHeaders } from "./messages-response-headers";
|
|
56
65
|
import {
|
|
57
66
|
anthropicErrorBody,
|
|
58
67
|
anthropicErrorResponse,
|
|
59
68
|
collectAnthropicMessage,
|
|
69
|
+
isContextOverflowError,
|
|
70
|
+
isThroughputLimitText,
|
|
60
71
|
responsesJsonToAnthropicMessage,
|
|
61
72
|
responsesSseToAnthropicSse,
|
|
62
73
|
} from "../claude/outbound";
|
|
@@ -211,7 +222,7 @@ async function readAnthropicBody(req: Request, budget: TranslatorBudget, maxByte
|
|
|
211
222
|
return await readJsonRequestBody(req, budget, maxBytes);
|
|
212
223
|
} catch (err) {
|
|
213
224
|
if (isTranslatorBudgetExceededError(err)) throw err;
|
|
214
|
-
throw new AnthropicRequestError(err instanceof Error && err.message ?
|
|
225
|
+
throw markProxyError(new AnthropicRequestError(err instanceof Error && messagesOverflowPresentation(err.message) ? CLAUDE_CONTEXT_OVERFLOW_MESSAGE : "Invalid JSON body"));
|
|
215
226
|
}
|
|
216
227
|
}
|
|
217
228
|
|
|
@@ -335,11 +346,14 @@ async function anthropicNativePassthrough(
|
|
|
335
346
|
const finalize = createFinalRequestLog(logIds, logCtx).finish;
|
|
336
347
|
// Locally generated diagnostics are fixed text plus validated guard limits. Runtime
|
|
337
348
|
// fetch errors retain their existing client response but use a fixed stored reason.
|
|
338
|
-
const fail = (status: number, closeReason: PassthroughCloseReason | "non_stream", message: string, type: string,
|
|
349
|
+
const fail = (status: number, closeReason: PassthroughCloseReason | "non_stream", message: string, type: string,
|
|
350
|
+
detail: FailureDetail, storedReason = message, originalMessage = message) => {
|
|
339
351
|
const safeMessage = redactSecretString(message);
|
|
340
|
-
logCtx
|
|
352
|
+
recordLocalFailureDetail(logCtx, storedReason, detail);
|
|
341
353
|
finalize(status, { closeReason });
|
|
342
|
-
|
|
354
|
+
const legacy = anthropicErrorBody(status, redactSecretString(originalMessage), type);
|
|
355
|
+
return markProxyError(ownedAnthropicErrorResponse({ status, type, evidence: { status }, localError: markProxyError({ message: safeMessage }),
|
|
356
|
+
overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy), closeReason === "body_stall" ? "body_stall" : closeReason === "body_overflow" ? "body_overflow" : undefined);
|
|
343
357
|
};
|
|
344
358
|
|
|
345
359
|
const base = (config.claudeCode?.anthropicBaseUrl ?? "https://api.anthropic.com").replace(/\/$/, "");
|
|
@@ -369,11 +383,11 @@ async function anthropicNativePassthrough(
|
|
|
369
383
|
req.signal,
|
|
370
384
|
);
|
|
371
385
|
if (result.kind === "timeout") {
|
|
372
|
-
return fail(504, "non_stream", "anthropic passthrough timed out waiting for response headers", "timeout_error");
|
|
386
|
+
return fail(504, "non_stream", "anthropic passthrough timed out waiting for response headers", "timeout_error", { code: "header_timeout" });
|
|
373
387
|
}
|
|
374
388
|
if (result.kind === "error") {
|
|
375
|
-
const
|
|
376
|
-
return fail(502, "non_stream",
|
|
389
|
+
const originalMessage = result.error instanceof Error ? result.error.message : String(result.error);
|
|
390
|
+
return fail(502, "non_stream", "anthropic passthrough failed: upstream connection error", "api_error", { code: "connect_failed" }, "anthropic passthrough failed: upstream connection error", `anthropic passthrough failed: ${originalMessage}`);
|
|
377
391
|
}
|
|
378
392
|
const upstream = result.upstream;
|
|
379
393
|
|
|
@@ -384,11 +398,12 @@ async function anthropicNativePassthrough(
|
|
|
384
398
|
};
|
|
385
399
|
const bodyGuard = resolvePassthroughBodyGuard(config, req.signal);
|
|
386
400
|
if (upstream.ok && contentType.includes("text/event-stream") && upstream.body) {
|
|
387
|
-
|
|
401
|
+
const frames = new MessagesSseFrameContext();
|
|
402
|
+
return new Response(tapAnthropicSseForLog(upstream.body, logCtx, finalize, bodyGuard, frames, createMessagesSseErrorFilter(frames)), {
|
|
388
403
|
status: upstream.status,
|
|
389
404
|
headers: {
|
|
390
405
|
...rateLimitHeaders,
|
|
391
|
-
"Content-Type":
|
|
406
|
+
"Content-Type": "text/event-stream",
|
|
392
407
|
"Cache-Control": "no-cache",
|
|
393
408
|
"Connection": "keep-alive",
|
|
394
409
|
},
|
|
@@ -398,13 +413,15 @@ async function anthropicNativePassthrough(
|
|
|
398
413
|
// idle/size bounds — headers are NOT yet sent here, so real statuses are available.
|
|
399
414
|
const bodyResult = await readBoundedPassthroughBody(upstream, bodyGuard);
|
|
400
415
|
if (bodyResult.kind === "client_cancel") {
|
|
401
|
-
return fail(499, "client_cancel", "client closed request during anthropic passthrough", "api_error");
|
|
416
|
+
return fail(499, "client_cancel", "client closed request during anthropic passthrough", "api_error", { code: "client_closed" });
|
|
402
417
|
}
|
|
403
418
|
if (bodyResult.kind === "stall") {
|
|
404
|
-
return fail(504, "body_stall", `anthropic passthrough body stalled: no upstream bytes for ${Math.round(bodyGuard.stallMs / 1000)}s
|
|
419
|
+
return fail(504, "body_stall", boundedMessagesDisplayCount(Math.round(bodyGuard.stallMs / 1000)) !== undefined ? `anthropic passthrough body stalled: no upstream bytes for ${boundedMessagesDisplayCount(Math.round(bodyGuard.stallMs / 1000))}s` : "anthropic passthrough body stalled", "timeout_error",
|
|
420
|
+
{ code: "body_stall", value: bodyGuard.stallMs });
|
|
405
421
|
}
|
|
406
422
|
if (bodyResult.kind === "overflow") {
|
|
407
|
-
return fail(502, "body_overflow", `anthropic passthrough body exceeded ${bodyGuard.maxBytes} bytes
|
|
423
|
+
return fail(502, "body_overflow", boundedMessagesDisplayCount(bodyGuard.maxBytes) !== undefined ? `anthropic passthrough body exceeded ${boundedMessagesDisplayCount(bodyGuard.maxBytes)} bytes` : "anthropic passthrough body exceeded the safe limit", "api_error",
|
|
424
|
+
{ code: "body_overflow", value: bodyGuard.maxBytes });
|
|
408
425
|
}
|
|
409
426
|
const text = bodyResult.text;
|
|
410
427
|
if (upstream.ok) {
|
|
@@ -416,24 +433,48 @@ async function anthropicNativePassthrough(
|
|
|
416
433
|
// Upstream text is untrusted: retain only a closed type vocabulary in history.
|
|
417
434
|
// Bound parsing work independently of the larger response-relay body limit.
|
|
418
435
|
const statusReason = `Provider error ${upstream.status}`;
|
|
419
|
-
logCtx
|
|
436
|
+
recordLocalFailureDetail(logCtx, statusReason, { code: "provider_error" }, { upstreamEvidence: true });
|
|
420
437
|
if (text.length <= PASSTHROUGH_ERROR_DETAIL_MAX_CHARS) {
|
|
421
438
|
try {
|
|
422
439
|
const parsed: unknown = JSON.parse(text);
|
|
423
440
|
if (isRec(parsed) && parsed.type === "error" && isRec(parsed.error)) {
|
|
424
441
|
const upstreamType = parsed.error.type;
|
|
425
442
|
const knownType = PASSTHROUGH_ERROR_TYPES.find(type => type === upstreamType);
|
|
426
|
-
if (knownType)
|
|
443
|
+
if (knownType) {
|
|
444
|
+
recordLocalFailureDetail(logCtx, `${statusReason}: ${knownType}`, { code: "provider_error", type: knownType }, { upstreamEvidence: true });
|
|
445
|
+
}
|
|
446
|
+
// The condition is classified here from the upstream message; only the closed member is kept.
|
|
447
|
+
const upstreamMessage = typeof parsed.error.message === "string" ? parsed.error.message : undefined;
|
|
448
|
+
logCtx.upstreamCondition = classifyUpstreamCondition({ status: upstream.status, type: knownType, message: upstreamMessage });
|
|
427
449
|
}
|
|
428
450
|
} catch { /* Malformed errors keep the fixed status-only diagnostic. */ }
|
|
429
451
|
}
|
|
430
452
|
}
|
|
431
453
|
finalize(upstream.status, { closeReason: "non_stream" });
|
|
432
|
-
const retryAfter = upstream.headers.get("retry-after");
|
|
433
|
-
return new Response(text, {
|
|
454
|
+
const retryAfter = formatClientRetryAfter(upstream.headers.get("retry-after"));
|
|
455
|
+
if (upstream.ok) return new Response(text, {
|
|
456
|
+
status: upstream.status,
|
|
457
|
+
headers: { ...rateLimitHeaders, "Content-Type": messagesSuccessContentType(upstream.headers), ...(retryAfter ? { "Retry-After": retryAfter } : {}) },
|
|
458
|
+
});
|
|
459
|
+
let parsed: unknown;
|
|
460
|
+
try { parsed = JSON.parse(text); } catch { /* non-JSON errors keep original recognition evidence */ }
|
|
461
|
+
const error = isRec(parsed) && isRec(parsed.error) ? parsed.error : isRec(parsed) ? parsed : {};
|
|
462
|
+
const isError = !upstream.ok;
|
|
463
|
+
const originalMessage = typeof error.message === "string" ? error.message : "";
|
|
464
|
+
const throughput = isThroughputLimitText(originalMessage);
|
|
465
|
+
const overflow = messagesRelayedOverflowPresentation(text, parsed);
|
|
466
|
+
const clientBody = isError ? JSON.stringify(ownedAnthropicErrorPayload({ status: upstream.status,
|
|
467
|
+
overflow, ...(throughput ? { condition: "rate_limited" as const } : {}),
|
|
468
|
+
type: typeof error.type === "string" ? error.type : undefined,
|
|
469
|
+
code: typeof error.code === "string" ? error.code : undefined,
|
|
470
|
+
evidence: { status: upstream.status, type: typeof error.type === "string" ? error.type : undefined,
|
|
471
|
+
code: typeof error.code === "string" ? error.code : undefined, message: typeof error.message === "string" ? error.message : undefined },
|
|
472
|
+
})) : text;
|
|
473
|
+
const out = new Response(clientBody, {
|
|
434
474
|
status: upstream.status,
|
|
435
|
-
headers: { ...rateLimitHeaders, "Content-Type":
|
|
475
|
+
headers: { ...rateLimitHeaders, "Content-Type": isError ? "application/json" : messagesSuccessContentType(upstream.headers), ...(retryAfter ? { "Retry-After": retryAfter } : {}) },
|
|
436
476
|
});
|
|
477
|
+
return isError ? attachComboFailureEvidence(out, text) : out;
|
|
437
478
|
}
|
|
438
479
|
|
|
439
480
|
type BoundedPassthroughBody =
|
|
@@ -555,11 +596,10 @@ export async function handleClaudeMessages(
|
|
|
555
596
|
): Promise<Response> {
|
|
556
597
|
const translatorBudget = createTranslatorBudget();
|
|
557
598
|
try {
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
);
|
|
599
|
+
const response = await handleClaudeMessagesWithBudget(req, config, logCtx, translatorBudget, logIds, requestPolicy, ingress);
|
|
600
|
+
const finalized = carryProxyError(response, finalizeTranslatorBudgetResponse(response, translatorBudget, req.signal));
|
|
601
|
+
const evidence = comboFailureEvidence(response);
|
|
602
|
+
return normalizeMessagesProxyRefusal(req, evidence === undefined ? finalized : attachComboFailureEvidence(finalized, evidence));
|
|
563
603
|
} catch (error) {
|
|
564
604
|
translatorBudget.dispose();
|
|
565
605
|
throw error;
|
|
@@ -573,12 +613,14 @@ function translationFailure(err: unknown, logCtx: RequestLogContext, logIds: { r
|
|
|
573
613
|
const status = overflow ? 413 : unavailable ? 503 : err instanceof AnthropicRequestError ? 400 : 500;
|
|
574
614
|
if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, status, { closeReason: "non_stream" });
|
|
575
615
|
if (unavailable) return desktopMappingUnavailableResponse(err);
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
);
|
|
616
|
+
const originalMessage = err instanceof Error ? err.message : String(err);
|
|
617
|
+
const clientMessage = overflow ? "request translation buffer exceeded the safe limit"
|
|
618
|
+
: err instanceof Error && isProxyError(err) ? err.message : "The proxy could not translate the Messages request.";
|
|
619
|
+
const code = overflow ? "translation_buffer_limit" : undefined;
|
|
620
|
+
const type = overflow ? "request_too_large" : undefined;
|
|
621
|
+
const legacy = anthropicErrorBody(status, overflow ? clientMessage : originalMessage, type, code);
|
|
622
|
+
return ownedAnthropicErrorResponse({ status, type, code, evidence: { status, message: originalMessage },
|
|
623
|
+
localError: markProxyError({ message: clientMessage }), overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
582
624
|
}
|
|
583
625
|
|
|
584
626
|
/**
|
|
@@ -619,6 +661,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
619
661
|
let effortRow: ParsedEffortRowId | null = null;
|
|
620
662
|
let fastRow: ParsedFastRowId | null = null;
|
|
621
663
|
let requestedModel = "";
|
|
664
|
+
let clientModelLabel = clientFacingModelLabel(undefined);
|
|
622
665
|
// Antigravity direct lane (off by default): planned before translation, kept only if routing
|
|
623
666
|
// settles on the route the plan was made for.
|
|
624
667
|
let directPlan: MessagesDirectPlan | undefined;
|
|
@@ -631,6 +674,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
631
674
|
const advisorAdmissionPolicy = logIds?.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, logIds?.admission);
|
|
632
675
|
try {
|
|
633
676
|
anthropicBody = await readAnthropicBody(req, translatorBudget, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
|
|
677
|
+
clientModelLabel = clientFacingModelLabel(isRec(anthropicBody) ? anthropicBody.model : undefined);
|
|
634
678
|
// Defensive [1m] strip (devlog 138): clients normally remove the context-variant
|
|
635
679
|
// marker themselves; the 1M signal we act on is the anthropic-beta header.
|
|
636
680
|
// Case-insensitive — the CLI matches /\[1m\]/i (audit 021 #7).
|
|
@@ -893,7 +937,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
893
937
|
// the same billed Fast lane as their final Responses scope check.
|
|
894
938
|
assertRouteAllowedByScope(
|
|
895
939
|
resolveAdmissionModelScope(config, logIds?.admission),
|
|
896
|
-
|
|
940
|
+
clientModelLabel,
|
|
897
941
|
{ providerName: route.providerName, modelId: previewXaiOauthWireModel({ options: {
|
|
898
942
|
serviceTier: typeof internalBody.service_tier === "string" ? internalBody.service_tier : undefined,
|
|
899
943
|
} }, route, config, "anthropic") },
|
|
@@ -904,7 +948,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
904
948
|
// Before any route-specific shaping, so a request that leaves the lane is shaped as the bridge's.
|
|
905
949
|
if (directPlan && !messagesDirectPlanHolds(directPlan, route, anthropicBody as Rec, config)) directLeaveError = leaveDirectPlan();
|
|
906
950
|
if (directEncodersApply(config, route)) {
|
|
907
|
-
clientEncoder = { protocol: "messages", stream, model:
|
|
951
|
+
clientEncoder = { protocol: "messages", stream, model: clientFacingModelText(clientModelLabel), inputTokenFloor: claudeRequestTokenFloor() };
|
|
908
952
|
}
|
|
909
953
|
if (route.provider.adapter === "openai-responses") {
|
|
910
954
|
// max_output_tokens is the caller's spend cap: the adapter strips it only for the canonical
|
|
@@ -934,18 +978,24 @@ async function handleClaudeMessagesWithBudget(
|
|
|
934
978
|
} catch (err) {
|
|
935
979
|
if (err instanceof AdmissionModelDeniedError) {
|
|
936
980
|
logCtx.requestedModel = requestedModel;
|
|
981
|
+
projectAdmissionModelDeniedLog(err, logCtx);
|
|
982
|
+
const response = admissionModelDeniedResponse(err);
|
|
937
983
|
if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 403, { closeReason: "non_stream" });
|
|
938
|
-
return
|
|
984
|
+
return response;
|
|
939
985
|
}
|
|
940
986
|
if (err instanceof UnknownRoutingPolicyError) {
|
|
941
987
|
logCtx.requestedModel = requestedModel;
|
|
942
988
|
if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 404, { closeReason: "non_stream" });
|
|
943
|
-
|
|
989
|
+
const legacy = anthropicErrorBody(404, err.message, "invalid_request_error");
|
|
990
|
+
return ownedAnthropicErrorResponse({ status: 404, type: "invalid_request_error", evidence: { status: 404 },
|
|
991
|
+
localError: markProxyError({ message: "Unknown routing policy" }), overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
944
992
|
}
|
|
945
993
|
if (err instanceof NoEligiblePolicyCandidateError) {
|
|
946
994
|
logCtx.routeDecision = err.trace;
|
|
947
995
|
if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 404, { closeReason: "non_stream" });
|
|
948
|
-
|
|
996
|
+
const legacy = anthropicErrorBody(404, err.message, "invalid_request_error");
|
|
997
|
+
return ownedAnthropicErrorResponse({ status: 404, type: "invalid_request_error", evidence: { status: 404 },
|
|
998
|
+
localError: markProxyError({ message: "No eligible candidates for policy profile" }), overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
949
999
|
}
|
|
950
1000
|
/* unknown model: let handleResponses shape the 404 */
|
|
951
1001
|
}
|
|
@@ -955,7 +1005,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
955
1005
|
// The direct lane answers through the direct encoder whatever `directEncoders` says: neither
|
|
956
1006
|
// direction passes through the internal Responses body.
|
|
957
1007
|
if (directRoute) {
|
|
958
|
-
clientEncoder = { protocol: "messages", stream, model:
|
|
1008
|
+
clientEncoder = { protocol: "messages", stream, model: clientFacingModelText(clientModelLabel), inputTokenFloor: claudeRequestTokenFloor(), requestLane: "direct" };
|
|
959
1009
|
}
|
|
960
1010
|
|
|
961
1011
|
// PF-08: a managed-key Anthropic route sends its Messages body natively. The caller-forward
|
|
@@ -1056,7 +1106,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1056
1106
|
const nativeMessagesRoute = settledRoute && nativeDecline === undefined ? settledRoute : undefined;
|
|
1057
1107
|
if (nativeProjectionOnlyError && !nativeMessagesRoute) {
|
|
1058
1108
|
if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 400, { closeReason: "non_stream" });
|
|
1059
|
-
return anthropicErrorResponse(400, nativeProjectionOnlyError.message, "invalid_request_error");
|
|
1109
|
+
return anthropicErrorResponse(400, isProxyError(nativeProjectionOnlyError) ? nativeProjectionOnlyError.message : "The proxy could not translate the Messages request.", "invalid_request_error");
|
|
1060
1110
|
}
|
|
1061
1111
|
// With the switch on, a declined route says why on its bridge mark, as native Chat does.
|
|
1062
1112
|
const antigravityDecline = settledRoute && !nativeMessagesRoute && !directRoute
|
|
@@ -1118,7 +1168,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1118
1168
|
const { handleNativeMessages } = await import("./messages-native");
|
|
1119
1169
|
return await handleNativeMessages({
|
|
1120
1170
|
req, config, logCtx, ...(logIds ? { logIds } : {}),
|
|
1121
|
-
route: nativeMessagesRoute, body: nativeBody, requestedModel, translatorBudget, selector: nativeSelector,
|
|
1171
|
+
route: nativeMessagesRoute, body: nativeBody, requestedModel: clientFacingModelText(clientModelLabel), translatorBudget, selector: nativeSelector,
|
|
1122
1172
|
modelScope: resolveAdmissionModelScope(config, logIds?.admission),
|
|
1123
1173
|
// Compatibility identity is an opaque request-local handle, separate from credentials.
|
|
1124
1174
|
clientIdentity: captureAnthropicClientIdentity(req.headers),
|
|
@@ -1176,6 +1226,9 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1176
1226
|
?? normalizeLogConversationId(req.headers.get("x-opencode-session"))
|
|
1177
1227
|
?? metadataGoLane
|
|
1178
1228
|
?? getOrAllocateRequestSessionLane(req);
|
|
1229
|
+
const claudeBridgePoolSession = resolveClaudeBridgePoolSession({
|
|
1230
|
+
ingress: req.headers, replay: headers, metadataSessionId: claudeNativeSessionId, admission: logIds?.admission,
|
|
1231
|
+
});
|
|
1179
1232
|
let internalReq: Request;
|
|
1180
1233
|
try {
|
|
1181
1234
|
// The UTF-16 JSON string and the Request's UTF-8 body coexist until dispatch.
|
|
@@ -1233,12 +1286,14 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1233
1286
|
// Out of body like the replay above: the core hands these to an Anthropic destination only.
|
|
1234
1287
|
anthropicServerTools: declaredAnthropicServerTools(anthropicBody),
|
|
1235
1288
|
anthropicServerReplay: replayedAnthropicServerBlocks(anthropicBody),
|
|
1289
|
+
anthropicSystemCachePrefix: isRec(anthropicBody) ? systemCachePrefix(anthropicBody.system) : undefined,
|
|
1236
1290
|
// Preserve the original catalog through late fallback; only the physical adapter projects it.
|
|
1237
1291
|
anthropicToolLoadingSource: cacheKeySource === "metadata" && isRec(anthropicBody)
|
|
1238
1292
|
&& Array.isArray(cc?.appendOnlyToolLoadingModels) && cc.appendOnlyToolLoadingModels.length > 0
|
|
1239
1293
|
? { tools: anthropicBody.tools, messages: anthropicBody.messages, tool_choice: anthropicBody.tool_choice } : undefined,
|
|
1240
1294
|
claudeGoAffinity: { sessionLane: claudeGoSessionLane },
|
|
1241
1295
|
claudeNativeSessionId,
|
|
1296
|
+
...(claudeBridgePoolSession ? { claudeBridgePoolSession } : {}),
|
|
1242
1297
|
stripClaudeMainAuthForNoncanonicalForward: true,
|
|
1243
1298
|
...(trustedClaudeMainAuth ? { trustedClaudeMainAuth } : {}),
|
|
1244
1299
|
// Claude's internal stored-main enrichment is not an original caller credential.
|
|
@@ -1248,6 +1303,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1248
1303
|
...(logIds ? { onFirstOutput: () => recordFirstOutput(logCtx, logIds.start) } : {}),
|
|
1249
1304
|
onNativePassthroughTerminal: status => finalizeNativeLog(httpStatusForRequestLogTerminal(status, logCtx), { terminalStatus: status, closeReason: "terminal" }),
|
|
1250
1305
|
onNativePassthroughCancel: () => finalizeNativeLog(499, { closeReason: "client_cancel" }),
|
|
1306
|
+
clientModelLabel,
|
|
1251
1307
|
...(clientEncoder ? { clientEncoder } : {}),
|
|
1252
1308
|
...(directRoute && directPlan
|
|
1253
1309
|
? { directRequest: messagesDirectRequestOption(directPlan, anthropicBody, cc, translatorBudget) }
|
|
@@ -1265,17 +1321,30 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1265
1321
|
let message = `upstream error (${response.status})`;
|
|
1266
1322
|
let contextError = false;
|
|
1267
1323
|
let catalogRefusal = false;
|
|
1324
|
+
let originalType: string | undefined;
|
|
1325
|
+
let originalCode: string | undefined;
|
|
1268
1326
|
try {
|
|
1269
1327
|
const text = await response.text();
|
|
1270
1328
|
try {
|
|
1271
1329
|
const parsed = JSON.parse(text) as { error?: { message?: string; type?: string; code?: unknown } | string; message?: string };
|
|
1272
|
-
contextError = typeof parsed?.error === "object" && parsed.error?.code === "context_length_exceeded";
|
|
1273
1330
|
catalogRefusal = typeof parsed?.error === "object" && parsed.error?.code === UNDECLARED_TOOL_CALL_ERROR_CODE;
|
|
1274
1331
|
const nested = typeof parsed?.error === "object" && parsed.error ? parsed.error.message : undefined;
|
|
1275
1332
|
const flat = typeof parsed?.error === "string" ? parsed.error : parsed?.message;
|
|
1276
1333
|
message = nested || flat || (text ? `upstream error (${response.status}): ${text.slice(0, 400)}` : message);
|
|
1334
|
+
const errorObject = typeof parsed?.error === "object" && parsed.error ? parsed.error : {};
|
|
1335
|
+
originalType = typeof errorObject.type === "string" ? errorObject.type : undefined;
|
|
1336
|
+
originalCode = typeof errorObject.code === "string" ? errorObject.code : undefined;
|
|
1337
|
+
// An uncoded overflow counts too (#8127); a rate-limit or credential status never does.
|
|
1338
|
+
contextError = errorObject.code === "context_length_exceeded"
|
|
1339
|
+
|| (![401, 403, 429].includes(response.status) && Boolean(nested || flat)
|
|
1340
|
+
&& isContextOverflowError(errorObject, message));
|
|
1277
1341
|
} catch {
|
|
1278
|
-
|
|
1342
|
+
// A plain-text gateway body carries the same verdict with no envelope to read a code from.
|
|
1343
|
+
const inspected = text.trim().slice(0, 16_384);
|
|
1344
|
+
const plain = inspected.slice(0, 400);
|
|
1345
|
+
contextError = Boolean(inspected) && ![401, 402, 403, 429].includes(response.status)
|
|
1346
|
+
&& isContextOverflowError({}, inspected);
|
|
1347
|
+
if (text) message = contextError ? plain : `upstream error (${response.status}): ${text.slice(0, 400)}`;
|
|
1279
1348
|
}
|
|
1280
1349
|
} catch { /* keep fallback message */ }
|
|
1281
1350
|
const upstreamRetryAfter = response.headers.get("retry-after");
|
|
@@ -1307,30 +1376,35 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1307
1376
|
? REPLAY_REFUSED_STATUS
|
|
1308
1377
|
: nativeMainFence ? 503 : contextError ? 400 : transient ? 529 : response.status;
|
|
1309
1378
|
const outHeaders = new Headers({ "Content-Type": "application/json" });
|
|
1310
|
-
|
|
1379
|
+
const clientRetryAfter = formatClientRetryAfter(retryAfter);
|
|
1380
|
+
if (clientRetryAfter) outHeaders.set("Retry-After", clientRetryAfter);
|
|
1311
1381
|
else if (transient) outHeaders.set("Retry-After", "2");
|
|
1312
1382
|
if (replayRefusal) applyReplayRefusalClientHeaders(outHeaders);
|
|
1313
|
-
const
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
|
|
1322
|
-
|
|
1383
|
+
const decidedCode = replayRefusal ? UPSTREAM_RESET_REPLAY_REFUSED_CODE : contextError ? "context_length_exceeded" : catalogRefusal ? UNDECLARED_TOOL_CALL_ERROR_CODE : undefined;
|
|
1384
|
+
const legacy = anthropicErrorBody(outStatus, message, undefined, decidedCode);
|
|
1385
|
+
const legacyBody = JSON.stringify(legacy);
|
|
1386
|
+
const out = new Response(JSON.stringify(ownedAnthropicErrorPayload({
|
|
1387
|
+
status: outStatus,
|
|
1388
|
+
evidence: { status: response.status, type: originalType, code: originalCode, message },
|
|
1389
|
+
code: decidedCode,
|
|
1390
|
+
overflow: messagesOverflowPresentation((legacy.error as Rec).message),
|
|
1391
|
+
...(contextError && isThroughputLimitText(message) ? { condition: "rate_limited" as const } : {}),
|
|
1392
|
+
...(replayRefusal ? { contract: "replay_refused" as const } : {}),
|
|
1393
|
+
...(isProxyError(response) ? { localError: carryProxyError(response, { message }) } : {}),
|
|
1394
|
+
})), {
|
|
1323
1395
|
status: outStatus,
|
|
1324
1396
|
headers: outHeaders,
|
|
1325
1397
|
});
|
|
1326
|
-
return carryReplayRefusal(response, out);
|
|
1398
|
+
return attachComboFailureEvidence(carryProxyError(response, carryReplayRefusal(response, out)), legacyBody);
|
|
1327
1399
|
}
|
|
1328
1400
|
|
|
1329
1401
|
const contentType = response.headers.get("content-type") ?? "";
|
|
1330
1402
|
if (contentType.includes("text/event-stream") && response.body) {
|
|
1331
|
-
const
|
|
1403
|
+
const failureVerdictSink: MessagesFailureVerdictSink = {};
|
|
1404
|
+
const anthropicSse = responsesSseToAnthropicSse(response.body, clientFacingModelText(clientModelLabel), {
|
|
1332
1405
|
translatorBudget,
|
|
1333
1406
|
nativeReasoningTagFor: blob => nativeReasoningTag(nativeReasoningMint.owner, blob),
|
|
1407
|
+
failureVerdictSink: stream ? undefined : failureVerdictSink, proxyErrorContext: logCtx,
|
|
1334
1408
|
// Only a floor, and only for the first frame: an upstream that reports usage early wins
|
|
1335
1409
|
// over it inside the translator, and the terminal `message_delta` carries the
|
|
1336
1410
|
// authoritative count either way (#4857).
|
|
@@ -1348,26 +1422,28 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1348
1422
|
}
|
|
1349
1423
|
let message: Rec;
|
|
1350
1424
|
try {
|
|
1351
|
-
message = await collectAnthropicMessage(anthropicSse,
|
|
1425
|
+
message = await collectAnthropicMessage(anthropicSse, clientFacingModelText(clientModelLabel), translatorBudget, failureVerdictSink);
|
|
1352
1426
|
} catch (error) {
|
|
1353
1427
|
if (isTranslatorBudgetExceededError(error)) {
|
|
1354
|
-
|
|
1428
|
+
const legacy = anthropicErrorBody(413, error.message, "request_too_large", "translation_buffer_limit");
|
|
1429
|
+
return ownedAnthropicErrorResponse({ status: 413, type: "request_too_large", code: "translation_buffer_limit",
|
|
1430
|
+
evidence: { status: 413, message: error.message }, overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
1355
1431
|
}
|
|
1356
|
-
|
|
1432
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
1433
|
+
const legacy = anthropicErrorBody(502, message, "api_error");
|
|
1434
|
+
return ownedAnthropicErrorResponse({ status: 502, type: "api_error", evidence: { status: 502, message },
|
|
1435
|
+
contract: "transport_failed", overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
1357
1436
|
}
|
|
1358
|
-
const
|
|
1359
|
-
const
|
|
1360
|
-
|
|
1437
|
+
const legacy = failureVerdictSink.collected ?? message;
|
|
1438
|
+
const isError = legacy.type === "error";
|
|
1439
|
+
const translatedError = isError && typeof legacy.error === "object"
|
|
1440
|
+
? (legacy as { error: { code?: unknown; message?: unknown } }).error
|
|
1361
1441
|
: undefined;
|
|
1362
1442
|
if (translatedError?.code === "translation_buffer_limit") {
|
|
1363
|
-
|
|
1364
|
-
|
|
1365
|
-
|
|
1366
|
-
|
|
1367
|
-
: "upstream translation buffer exceeded the safe limit",
|
|
1368
|
-
"request_too_large",
|
|
1369
|
-
"translation_buffer_limit",
|
|
1370
|
-
);
|
|
1443
|
+
const originalMessage = typeof translatedError.message === "string" ? translatedError.message : "upstream translation buffer exceeded the safe limit";
|
|
1444
|
+
const legacy = anthropicErrorBody(413, originalMessage, "request_too_large", "translation_buffer_limit");
|
|
1445
|
+
return ownedAnthropicErrorResponse({ status: 413, type: "request_too_large", code: "translation_buffer_limit",
|
|
1446
|
+
evidence: { status: 413, message: originalMessage }, overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
1371
1447
|
}
|
|
1372
1448
|
// A declared client refusal keeps its 4xx: as a 502 Claude Code retries a verdict that cannot
|
|
1373
1449
|
// change. Server classes and rate limits keep the 502 this path has always answered. A 400
|
|
@@ -1393,23 +1469,30 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1393
1469
|
}
|
|
1394
1470
|
const status = (json as Rec)?.status;
|
|
1395
1471
|
if (status === "failed") {
|
|
1396
|
-
const error = (json as { error?: { message?: string; code?: string } }).error;
|
|
1472
|
+
const error = (json as { error?: { message?: string; type?: string; code?: string } }).error;
|
|
1397
1473
|
if (error?.code === "translation_buffer_limit") {
|
|
1398
|
-
|
|
1399
|
-
|
|
1400
|
-
|
|
1401
|
-
"
|
|
1402
|
-
"translation_buffer_limit",
|
|
1403
|
-
);
|
|
1474
|
+
const originalMessage = error.message ?? "upstream translation buffer exceeded the safe limit";
|
|
1475
|
+
const legacy = anthropicErrorBody(413, originalMessage, "request_too_large", "translation_buffer_limit");
|
|
1476
|
+
return ownedAnthropicErrorResponse({ status: 413, type: "request_too_large", code: "translation_buffer_limit",
|
|
1477
|
+
evidence: { status: 413, message: originalMessage }, overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
1404
1478
|
}
|
|
1405
|
-
|
|
1406
|
-
|
|
1479
|
+
const originalMessage = typeof error?.message === "string" ? error.message : "";
|
|
1480
|
+
if (error && isContextOverflowError(error, originalMessage)) {
|
|
1481
|
+
const throughput = isThroughputLimitText(originalMessage);
|
|
1482
|
+
const legacy = anthropicErrorBody(400, originalMessage, "invalid_request_error", "context_length_exceeded");
|
|
1483
|
+
return Response.json(ownedAnthropicErrorPayload({
|
|
1484
|
+
status: 400, type: "invalid_request_error", code: "context_length_exceeded", overflow: messagesOverflowPresentation((legacy.error as Rec).message),
|
|
1485
|
+
...(throughput ? { condition: "rate_limited" as const } : {}), evidence: { status: 400, message: originalMessage },
|
|
1486
|
+
}), { status: 400 });
|
|
1407
1487
|
}
|
|
1408
|
-
|
|
1488
|
+
const legacy = anthropicErrorBody(502, originalMessage, "api_error");
|
|
1489
|
+
return Response.json(ownedAnthropicErrorPayload({ status: 502, type: "api_error",
|
|
1490
|
+
overflow: messagesOverflowPresentation((legacy.error as Rec).message),
|
|
1491
|
+
evidence: { status: 502, message: error?.message, type: error?.type, code: error?.code } }), { status: 502 });
|
|
1409
1492
|
}
|
|
1410
1493
|
let message: Rec;
|
|
1411
1494
|
try {
|
|
1412
|
-
message = responsesJsonToAnthropicMessage(json,
|
|
1495
|
+
message = responsesJsonToAnthropicMessage(json, clientFacingModelText(clientModelLabel), translatorBudget, blob => nativeReasoningTag(nativeReasoningMint.owner, blob));
|
|
1413
1496
|
} catch (err) {
|
|
1414
1497
|
if (!isTranslatorBudgetExceededError(err)) throw err;
|
|
1415
1498
|
return anthropicErrorResponse(413, "upstream translation buffer exceeded the safe limit", "request_too_large", "translation_buffer_limit");
|
|
@@ -1520,7 +1603,10 @@ function thinkingProjectionForPreview(config: OcxConfig, modelId: string): Claud
|
|
|
1520
1603
|
}
|
|
1521
1604
|
}
|
|
1522
1605
|
|
|
1523
|
-
export async function handleClaudeCountTokens(
|
|
1606
|
+
export async function handleClaudeCountTokens(...args: Parameters<typeof handleClaudeCountTokensInner>): Promise<Response> {
|
|
1607
|
+
return normalizeMessagesProxyRefusal(args[0], await handleClaudeCountTokensInner(...args));
|
|
1608
|
+
}
|
|
1609
|
+
async function handleClaudeCountTokensInner(
|
|
1524
1610
|
req: Request,
|
|
1525
1611
|
config: OcxConfig,
|
|
1526
1612
|
requestPolicy: RequestPolicyView = config,
|
|
@@ -1536,8 +1622,12 @@ export async function handleClaudeCountTokens(
|
|
|
1536
1622
|
body = await readAnthropicBody(req, translatorBudget, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
|
|
1537
1623
|
} catch (err) {
|
|
1538
1624
|
if (err instanceof DesktopModelMappingUnavailableError) return desktopMappingUnavailableResponse(err);
|
|
1539
|
-
if (err instanceof AnthropicRequestError) return anthropicErrorResponse(400, err.message);
|
|
1540
|
-
|
|
1625
|
+
if (err instanceof AnthropicRequestError) return anthropicErrorResponse(400, isProxyError(err) ? err.message : "Invalid JSON body");
|
|
1626
|
+
const originalMessage = err instanceof Error ? err.message : String(err);
|
|
1627
|
+
const legacy = anthropicErrorBody(500, originalMessage);
|
|
1628
|
+
return ownedAnthropicErrorResponse({ status: 500, evidence: { status: 500 },
|
|
1629
|
+
localError: markProxyError({ message: "The proxy could not read the Messages request." }),
|
|
1630
|
+
overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
1541
1631
|
} finally { translatorBudget.dispose(); }
|
|
1542
1632
|
if (!body || typeof body !== "object" || Array.isArray(body)) {
|
|
1543
1633
|
return anthropicErrorResponse(400, "request body must be a JSON object");
|
|
@@ -1596,7 +1686,7 @@ export async function handleClaudeCountTokens(
|
|
|
1596
1686
|
});
|
|
1597
1687
|
} catch (error) {
|
|
1598
1688
|
if (error instanceof DesktopModelMappingUnavailableError) return desktopMappingUnavailableResponse(error);
|
|
1599
|
-
if (error instanceof AnthropicRequestError) return anthropicErrorResponse(400, error.message);
|
|
1689
|
+
if (error instanceof AnthropicRequestError) return anthropicErrorResponse(400, isProxyError(error) ? error.message : "The proxy could not translate the Messages request.");
|
|
1600
1690
|
throw error;
|
|
1601
1691
|
}
|
|
1602
1692
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { formatClientRetryAfter } from "../lib/client-retry-after";
|
|
1
2
|
import { isolateCodexPoolClientMetadata, mergeCodexSelectedHeaders } from "../codex/forward-transport-headers";
|
|
2
3
|
import { CodexInstallationIdUnavailableError } from "../codex/installation-id";
|
|
3
4
|
/** Native history/notes JSON relay. No interpretation of encrypted tool arguments or retries. */
|
|
@@ -185,7 +186,10 @@ async function relayContextHistory(
|
|
|
185
186
|
if (result.oversized) return formatErrorResponse(502, "upstream_error", "Context response exceeded 16 MiB");
|
|
186
187
|
const outputHeaders = new Headers();
|
|
187
188
|
for (const key of RESPONSE_HEADERS) {
|
|
188
|
-
const
|
|
189
|
+
const raw = response.headers.get(key);
|
|
190
|
+
// Retry advice leaves as an integer this proxy formats, never the upstream bytes.
|
|
191
|
+
const value = key === "retry-after" ? formatClientRetryAfter(raw) ?? null : raw;
|
|
192
|
+
if (value !== null) outputHeaders.set(key, value);
|
|
189
193
|
}
|
|
190
194
|
// A context 403 is not evidence that the model credential is invalid. Don't mutate pool
|
|
191
195
|
// health/quota or retry writes; preserve the real upstream result for the caller.
|
package/src/server/gui-static.ts
CHANGED
|
@@ -205,7 +205,10 @@ export function serveGuiFile(
|
|
|
205
205
|
|
|
206
206
|
if (!isFile(filePath)) {
|
|
207
207
|
if (!extname(pathname)) {
|
|
208
|
-
|
|
208
|
+
// A directory with its own index.html is a separate app (the classic dashboard at
|
|
209
|
+
// /classic/); every other extensionless path is the main dashboard's SPA fallback.
|
|
210
|
+
const nestedIndex = join(filePath, "index.html");
|
|
211
|
+
const indexPath = isFile(nestedIndex) ? nestedIndex : join(guiDist, "index.html");
|
|
209
212
|
if (isFile(indexPath)) {
|
|
210
213
|
return htmlResponse(indexPath, session, runtimeRole, managementAuthRequired);
|
|
211
214
|
}
|