@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
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { markProxyError, isProxyError } from "../../lib/client-error-body";
|
|
1
2
|
/**
|
|
2
3
|
* AdapterEvent -> client wire, without the internal Responses SSE (PF-09).
|
|
3
4
|
*
|
|
@@ -88,14 +89,25 @@ export interface EncodedTerminal {
|
|
|
88
89
|
durable: boolean;
|
|
89
90
|
}
|
|
90
91
|
|
|
92
|
+
const encoderTransportFailures = new WeakSet<object>();
|
|
93
|
+
const originalErrorEvidence = new WeakMap<object, { status?: number; type?: string; code?: string; message: string }>();
|
|
94
|
+
/** Original adapter fields for a client writer; terminal classification stays independent. */
|
|
95
|
+
export function encoderOriginalErrorEvidence(terminal: EncodedTerminal) {
|
|
96
|
+
return originalErrorEvidence.get(terminal);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
export function isEncoderTransportFailure(terminal: EncodedTerminal): boolean {
|
|
100
|
+
return encoderTransportFailures.has(terminal);
|
|
101
|
+
}
|
|
102
|
+
|
|
91
103
|
/** Frame output owned by the driver: budget reservation, delivery release and relay counts. */
|
|
92
104
|
export interface ClientFrameSink {
|
|
93
105
|
readonly budget: TranslatorBudget;
|
|
94
|
-
emit(text: string, observation?: RelayedEventObservation): void;
|
|
106
|
+
emit(text: string, observation?: RelayedEventObservation, onAdmitted?: () => void, admissionText?: string): void;
|
|
95
107
|
/** Admit every frame before exposing any of them. */
|
|
96
108
|
emitBatch(frames: { text: string; observation?: RelayedEventObservation }[]): void;
|
|
97
109
|
/** A fixed, bounded frame that must reach the client even when the budget is exhausted. */
|
|
98
|
-
emitBounded(text: string): void;
|
|
110
|
+
emitBounded(text: string, onAdmitted?: () => void): void;
|
|
99
111
|
/** A transport keepalive; it counts as neither wire activity nor a relayed event. */
|
|
100
112
|
emitKeepalive(text: string): void;
|
|
101
113
|
desiredSize(): number;
|
|
@@ -202,10 +214,11 @@ export function encodeAdapterEventStream(
|
|
|
202
214
|
const relayed = (observation?: RelayedEventObservation) => {
|
|
203
215
|
try { hooks.onRelayed?.(observation ?? {}); } catch { /* counters never break the stream */ }
|
|
204
216
|
};
|
|
205
|
-
const enqueueCharged = (text: string, observation?: RelayedEventObservation, activity = true): void => {
|
|
217
|
+
const enqueueCharged = (text: string, observation?: RelayedEventObservation, activity = true, onAdmitted?: () => void, admissionText: string = text): void => {
|
|
206
218
|
if (closed) return;
|
|
207
219
|
const frame = textEncoder.encode(text);
|
|
208
|
-
const
|
|
220
|
+
const admittedBytes = admissionText === text ? frame.byteLength : Buffer.byteLength(admissionText);
|
|
221
|
+
const reservation = budget.reserveTransient(admittedBytes, { kind: "live_transient" });
|
|
209
222
|
try {
|
|
210
223
|
controller.enqueue(frame);
|
|
211
224
|
} catch {
|
|
@@ -214,16 +227,17 @@ export function encodeAdapterEventStream(
|
|
|
214
227
|
return;
|
|
215
228
|
}
|
|
216
229
|
reservation.commitRetained();
|
|
217
|
-
queuedFrameBytes.push(
|
|
230
|
+
queuedFrameBytes.push(admittedBytes);
|
|
218
231
|
emittedFrames++;
|
|
219
232
|
if (activity) wireActivity = true;
|
|
220
233
|
// A keepalive is transport liveness, not a relayed event: the bridge enqueues its heartbeat
|
|
221
234
|
// outside the relay counter, and the converters' keepalives never reach it either.
|
|
222
235
|
if (activity) relayed(observation);
|
|
236
|
+
onAdmitted?.();
|
|
223
237
|
};
|
|
224
238
|
const sink: ClientFrameSink = {
|
|
225
239
|
budget,
|
|
226
|
-
emit: (text, observation) => enqueueCharged(text, observation),
|
|
240
|
+
emit: (text, observation, onAdmitted, admissionText) => enqueueCharged(text, observation, true, onAdmitted, admissionText),
|
|
227
241
|
emitBatch: frames => {
|
|
228
242
|
if (closed) return;
|
|
229
243
|
const staged: { frame: Uint8Array; reservation: ReturnType<TranslatorBudget["reserveTransient"]>; observation?: RelayedEventObservation }[] = [];
|
|
@@ -252,12 +266,13 @@ export function encodeAdapterEventStream(
|
|
|
252
266
|
}
|
|
253
267
|
wireActivity = true;
|
|
254
268
|
},
|
|
255
|
-
emitBounded: text => {
|
|
269
|
+
emitBounded: (text, onAdmitted) => {
|
|
256
270
|
if (closed) return;
|
|
257
271
|
try {
|
|
258
272
|
controller.enqueue(textEncoder.encode(text));
|
|
259
273
|
emittedFrames++;
|
|
260
274
|
relayed({ terminal: true });
|
|
275
|
+
onAdmitted?.();
|
|
261
276
|
} catch {
|
|
262
277
|
closed = true;
|
|
263
278
|
}
|
|
@@ -525,6 +540,7 @@ export function encodeAdapterEventStream(
|
|
|
525
540
|
reportUsage: false,
|
|
526
541
|
durable: false,
|
|
527
542
|
};
|
|
543
|
+
markProxyError(terminal);
|
|
528
544
|
runBeforeTerminalSync(terminal);
|
|
529
545
|
try {
|
|
530
546
|
writer.terminal(terminal);
|
|
@@ -544,10 +560,13 @@ export function encodeAdapterEventStream(
|
|
|
544
560
|
stepping = true;
|
|
545
561
|
gated = false;
|
|
546
562
|
const emittedAtStart = emittedFrames;
|
|
563
|
+
let readingUpstream = false;
|
|
547
564
|
try {
|
|
548
565
|
while (!terminated && !closed && emittedFrames === emittedAtStart) {
|
|
549
566
|
iteratorStarted = true;
|
|
567
|
+
readingUpstream = true;
|
|
550
568
|
const next = await it.next();
|
|
569
|
+
readingUpstream = false;
|
|
551
570
|
// A cancel during the await must not process or charge a late event.
|
|
552
571
|
if (closed || clientCancelled) {
|
|
553
572
|
gated = true;
|
|
@@ -766,6 +785,7 @@ export function encodeAdapterEventStream(
|
|
|
766
785
|
reportUsage: true,
|
|
767
786
|
durable: true,
|
|
768
787
|
};
|
|
788
|
+
if (isProxyError(event)) markProxyError(terminal);
|
|
769
789
|
break;
|
|
770
790
|
}
|
|
771
791
|
case "error": {
|
|
@@ -791,6 +811,7 @@ export function encodeAdapterEventStream(
|
|
|
791
811
|
reportUsage: event.usage !== undefined,
|
|
792
812
|
durable: true,
|
|
793
813
|
};
|
|
814
|
+
originalErrorEvidence.set(terminal, { status: event.status, type: event.errorType, code: event.code, message: event.message });
|
|
794
815
|
break;
|
|
795
816
|
}
|
|
796
817
|
default:
|
|
@@ -820,6 +841,7 @@ export function encodeAdapterEventStream(
|
|
|
820
841
|
reportUsage: false,
|
|
821
842
|
durable: false,
|
|
822
843
|
};
|
|
844
|
+
if (readingUpstream) encoderTransportFailures.add(terminal);
|
|
823
845
|
try {
|
|
824
846
|
if (!await deliverTerminalGuarded(terminal)) return;
|
|
825
847
|
} catch { /* a failing hook on the failure path must not throw into the pull */ }
|
|
@@ -845,6 +867,7 @@ export function encodeAdapterEventStream(
|
|
|
845
867
|
reportUsage: true,
|
|
846
868
|
durable: true,
|
|
847
869
|
};
|
|
870
|
+
markProxyError(terminal);
|
|
848
871
|
try {
|
|
849
872
|
if (!await deliverTerminalGuarded(terminal)) return;
|
|
850
873
|
} catch { /* see the catch path above */ }
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { isProxyError, hasProxyErrorMessage } from "../../lib/client-error-body";
|
|
2
|
+
import type { FailureVerdictSink } from "../../chat/failure-verdict";
|
|
3
|
+
import { ownedChatErrorResponse } from "../../chat/outbound";
|
|
1
4
|
/**
|
|
2
5
|
* AdapterEvent -> OpenAI Chat Completions, without the internal Responses SSE (PF-09).
|
|
3
6
|
*
|
|
@@ -14,7 +17,6 @@ import type { TranslatorBudget } from "../../lib/translator-budget";
|
|
|
14
17
|
import { responsesUsage } from "../../bridge/internal";
|
|
15
18
|
import {
|
|
16
19
|
appendedUtf8Bytes,
|
|
17
|
-
chatCompletionsErrorResponse,
|
|
18
20
|
chatCompletionsFailedResponse,
|
|
19
21
|
chatCompletionsIncompleteOutcome,
|
|
20
22
|
chatCompletionsStreamErrorPayload,
|
|
@@ -40,9 +42,11 @@ type Rec = Record<string, unknown>;
|
|
|
40
42
|
export interface ChatCompletionEncodeOptions extends AdapterEventEncodeOptions {
|
|
41
43
|
/** The model string the client asked for; every chunk carries it. */
|
|
42
44
|
model: string;
|
|
45
|
+
failureVerdictSink?: FailureVerdictSink;
|
|
46
|
+
proxyErrorContext?: object;
|
|
43
47
|
}
|
|
44
48
|
|
|
45
|
-
function createChatCompletionWriter(sink: ClientFrameSink, model: string): ClientWireWriter {
|
|
49
|
+
function createChatCompletionWriter(sink: ClientFrameSink, model: string, failureVerdictSink?: FailureVerdictSink, proxyErrorContext?: object): ClientWireWriter {
|
|
46
50
|
const id = completionId();
|
|
47
51
|
const created = Math.floor(Date.now() / 1000);
|
|
48
52
|
let started = false;
|
|
@@ -149,10 +153,11 @@ function createChatCompletionWriter(sink: ClientFrameSink, model: string): Clien
|
|
|
149
153
|
terminated = true;
|
|
150
154
|
failed = true;
|
|
151
155
|
// A real error event, then an abnormal close without [DONE].
|
|
152
|
-
const { payload, bounded } = chatCompletionsStreamErrorPayload(message, details);
|
|
156
|
+
const { payload, bounded, verdict } = chatCompletionsStreamErrorPayload(message, details);
|
|
153
157
|
try {
|
|
154
158
|
if (bounded) sink.emitBounded(dataFrame(payload));
|
|
155
159
|
else sink.emit(dataFrame(payload), { terminal: true });
|
|
160
|
+
if (failureVerdictSink) { failureVerdictSink.verdict = verdict; failureVerdictSink.contract = details?.contract; failureVerdictSink.proxyAuthored = details?.proxyAuthored; }
|
|
156
161
|
} catch {
|
|
157
162
|
/* the converter drops an unadmittable error frame the same way */
|
|
158
163
|
}
|
|
@@ -236,12 +241,13 @@ function createChatCompletionWriter(sink: ClientFrameSink, model: string): Clien
|
|
|
236
241
|
if ("finishReason" in outcome) {
|
|
237
242
|
finish(outcome.finishReason, terminal.usageOnWire ? responsesUsage(terminal.usage) : null);
|
|
238
243
|
} else {
|
|
239
|
-
fail(outcome.
|
|
244
|
+
fail(outcome.originalFailMessage, { contract: "stream_incomplete",
|
|
245
|
+
proxyAuthored: isProxyError(terminal) });
|
|
240
246
|
}
|
|
241
247
|
return;
|
|
242
248
|
}
|
|
243
249
|
const failure = chatCompletionsFailedResponse((terminal.error ?? {}) as unknown as Rec);
|
|
244
|
-
fail(failure.message, failure.details);
|
|
250
|
+
fail(failure.message, { ...failure.details, proxyAuthored: hasProxyErrorMessage(proxyErrorContext, failure.message, failure.details) });
|
|
245
251
|
},
|
|
246
252
|
overflow() {
|
|
247
253
|
fail("upstream translation buffer exceeded the safe limit", {
|
|
@@ -259,7 +265,7 @@ export function encodeChatCompletionSse(
|
|
|
259
265
|
events: AsyncIterable<AdapterEvent>,
|
|
260
266
|
options: ChatCompletionEncodeOptions,
|
|
261
267
|
): ReadableStream<Uint8Array> {
|
|
262
|
-
return encodeAdapterEventStream(events, sink => createChatCompletionWriter(sink, options.model), options);
|
|
268
|
+
return encodeAdapterEventStream(events, sink => createChatCompletionWriter(sink, options.model, options.failureVerdictSink, options.proxyErrorContext), options);
|
|
263
269
|
}
|
|
264
270
|
|
|
265
271
|
/**
|
|
@@ -271,18 +277,19 @@ export async function collectChatCompletionResponse(
|
|
|
271
277
|
stream: ReadableStream<Uint8Array>,
|
|
272
278
|
model: string,
|
|
273
279
|
translatorBudget: TranslatorBudget,
|
|
280
|
+
failureVerdictSink?: FailureVerdictSink,
|
|
274
281
|
): Promise<Response> {
|
|
275
282
|
try {
|
|
276
|
-
const completion = await collectChatCompletion(stream, model, translatorBudget);
|
|
283
|
+
const completion = await collectChatCompletion(stream, model, translatorBudget, failureVerdictSink);
|
|
277
284
|
return new Response(JSON.stringify(completion), {
|
|
278
285
|
status: 200,
|
|
279
286
|
headers: { "Content-Type": "application/json" },
|
|
280
287
|
});
|
|
281
288
|
} catch (err) {
|
|
282
289
|
if (isChatCompletionsStreamError(err)) {
|
|
283
|
-
return
|
|
290
|
+
return ownedChatErrorResponse(err.status, err.message, err.type, err.code, failureVerdictSink?.contract, failureVerdictSink?.proxyAuthored);
|
|
284
291
|
}
|
|
285
|
-
return
|
|
292
|
+
return ownedChatErrorResponse(502, err instanceof Error ? err.message : String(err), "server_error");
|
|
286
293
|
}
|
|
287
294
|
}
|
|
288
295
|
|
|
@@ -291,5 +298,6 @@ export function foldChatCompletion(
|
|
|
291
298
|
events: AsyncIterable<AdapterEvent>,
|
|
292
299
|
options: ChatCompletionEncodeOptions,
|
|
293
300
|
): Promise<Response> {
|
|
294
|
-
|
|
301
|
+
const failureVerdictSink: FailureVerdictSink = {};
|
|
302
|
+
return collectChatCompletionResponse(encodeChatCompletionSse(events, { ...options, failureVerdictSink }), options.model, options.translatorBudget, failureVerdictSink);
|
|
295
303
|
}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import type { UpstreamConditionEvidence } from "../../lib/upstream-condition";
|
|
2
|
+
import { ownedAnthropicErrorPayload, ownedAnthropicErrorResponse, messagesOverflowPresentation, messagesRelayedOverflowPresentation } from "../../lib/messages-error-body";
|
|
3
|
+
import { proxyMessagePresentation, markProxyError, isProxyError, hasProxyErrorMessage } from "../../lib/client-error-body";
|
|
4
|
+
import { admitMessagesFailure, type MessagesFailureVerdictSink } from "../../claude/failure-verdict";
|
|
1
5
|
/**
|
|
2
6
|
* AdapterEvent -> Anthropic Messages, without the internal Responses SSE (PF-09).
|
|
3
7
|
*
|
|
@@ -21,13 +25,15 @@ import { encodeReasoningEnvelope } from "../../responses/reasoning-envelope";
|
|
|
21
25
|
import { responsesUsage, webSearchAction } from "../../bridge/internal";
|
|
22
26
|
import {
|
|
23
27
|
anthropicErrorBody,
|
|
24
|
-
|
|
28
|
+
anthropicErrorType,
|
|
29
|
+
isThroughputLimitText,
|
|
25
30
|
anthropicFailedStatus,
|
|
26
31
|
anthropicIncompleteOutcome,
|
|
27
32
|
anthropicUsage,
|
|
28
33
|
boundedReasoningIdentity,
|
|
29
34
|
collectAnthropicMessage,
|
|
30
35
|
isClaudeWebSearchToolName,
|
|
36
|
+
isContextOverflowError,
|
|
31
37
|
messageSnapshot,
|
|
32
38
|
sanitizeWebSearchInput,
|
|
33
39
|
sseFrame,
|
|
@@ -35,6 +41,8 @@ import {
|
|
|
35
41
|
} from "../../claude/outbound";
|
|
36
42
|
import {
|
|
37
43
|
encodeAdapterEventStream,
|
|
44
|
+
isEncoderTransportFailure,
|
|
45
|
+
encoderOriginalErrorEvidence,
|
|
38
46
|
type AdapterEventEncodeOptions,
|
|
39
47
|
type ClientFrameSink,
|
|
40
48
|
type ClientWireWriter,
|
|
@@ -51,6 +59,8 @@ export interface AnthropicMessageEncodeOptions extends AdapterEventEncodeOptions
|
|
|
51
59
|
model: string;
|
|
52
60
|
/** This proxy's prompt estimate for `message_start` when no usage arrived first (#4857). */
|
|
53
61
|
inputTokenFloor?: number;
|
|
62
|
+
failureVerdictSink?: MessagesFailureVerdictSink;
|
|
63
|
+
proxyErrorContext?: object;
|
|
54
64
|
}
|
|
55
65
|
|
|
56
66
|
interface OpenBlock {
|
|
@@ -84,6 +94,7 @@ function createAnthropicMessageWriter(
|
|
|
84
94
|
sink: ClientFrameSink,
|
|
85
95
|
model: string,
|
|
86
96
|
inputTokenFloor: number | undefined,
|
|
97
|
+
options: AnthropicMessageEncodeOptions,
|
|
87
98
|
): ClientWireWriter {
|
|
88
99
|
const budget = sink.budget;
|
|
89
100
|
let started = false;
|
|
@@ -184,22 +195,30 @@ function createAnthropicMessageWriter(
|
|
|
184
195
|
terminalDelivered = true;
|
|
185
196
|
};
|
|
186
197
|
// Transient upstream statuses become overloaded_error so Anthropic SDK clients back off.
|
|
187
|
-
const fail = (status: number, message: string, upstreamDerived = false, code?: string) => {
|
|
198
|
+
const fail = (status: number, message: string, upstreamDerived = false, code?: string, local = false, contract?: "stream_incomplete" | "transport_failed", evidence?: UpstreamConditionEvidence) => {
|
|
188
199
|
if (terminated && (code !== "translation_buffer_limit" || terminalDelivered)) return;
|
|
189
200
|
terminated = true;
|
|
201
|
+
const type = code === "translation_buffer_limit" ? "request_too_large"
|
|
202
|
+
: upstreamDerived && isTransientUpstreamStatus(status) ? "overloaded_error" : anthropicErrorType(status);
|
|
203
|
+
const legacy = anthropicErrorBody(status, message, type, code);
|
|
204
|
+
const payload = ownedAnthropicErrorPayload({ status, type, code, evidence: evidence ?? { status, message }, contract,
|
|
205
|
+
overflow: messagesOverflowPresentation((legacy.error as Rec).message),
|
|
206
|
+
condition: code === "context_length_exceeded" && isThroughputLimitText(message) ? "rate_limited" : undefined,
|
|
207
|
+
...(local ? { localError: markProxyError({ message }, proxyMessagePresentation(options.proxyErrorContext, message, { type: evidence?.type, code: evidence?.code ?? code })) } : {}),
|
|
208
|
+
});
|
|
209
|
+
const admitted = () => admitMessagesFailure(options.failureVerdictSink, payload, legacy);
|
|
190
210
|
if (code === "translation_buffer_limit") {
|
|
191
211
|
releaseThinkingBuffer(open);
|
|
192
212
|
if (open?.callId) budget.closeCall(open.callId);
|
|
193
213
|
open = null;
|
|
194
214
|
terminalDelivered = true;
|
|
195
215
|
// No normal close frames are valid after overflow: one bounded typed terminal.
|
|
196
|
-
sink.emitBounded(sseFrame("error",
|
|
216
|
+
sink.emitBounded(sseFrame("error", payload), admitted);
|
|
197
217
|
return;
|
|
198
218
|
}
|
|
199
|
-
const type = upstreamDerived && isTransientUpstreamStatus(status) ? "overloaded_error" : undefined;
|
|
200
219
|
// An initial failure is an error stream, not a partial message: no message_start first.
|
|
201
220
|
if (started) closeOpenBlock();
|
|
202
|
-
emit("error",
|
|
221
|
+
sink.emit(sseFrame("error", payload), { terminal: true }, admitted, sseFrame("error", legacy));
|
|
203
222
|
terminalDelivered = true;
|
|
204
223
|
};
|
|
205
224
|
|
|
@@ -370,7 +389,7 @@ function createAnthropicMessageWriter(
|
|
|
370
389
|
terminal(terminal) {
|
|
371
390
|
if (terminal.status === "completed") {
|
|
372
391
|
if (terminal.endTurn === false && !sawToolUse) {
|
|
373
|
-
fail(529, "upstream turn ended without a final answer", true);
|
|
392
|
+
fail(529, "upstream turn ended without a final answer", true, undefined, true);
|
|
374
393
|
return;
|
|
375
394
|
}
|
|
376
395
|
finish(sawToolUse ? "tool_use" : "end_turn", responsesUsage(terminal.usage));
|
|
@@ -379,21 +398,27 @@ function createAnthropicMessageWriter(
|
|
|
379
398
|
if (terminal.status === "incomplete") {
|
|
380
399
|
const outcome = anthropicIncompleteOutcome(terminal.incomplete?.reason, terminal.incomplete?.message);
|
|
381
400
|
if ("stopReason" in outcome) finish(outcome.stopReason, terminal.usageOnWire ? responsesUsage(terminal.usage) : null);
|
|
382
|
-
else fail(529, outcome.failMessage, true);
|
|
401
|
+
else fail(529, outcome.failMessage, true, undefined, isProxyError(terminal), "stream_incomplete");
|
|
383
402
|
return;
|
|
384
403
|
}
|
|
385
404
|
const error = (terminal.error ?? {}) as unknown as Rec;
|
|
386
405
|
if (error.code === "translation_buffer_limit") {
|
|
387
|
-
fail(413, "upstream translation buffer exceeded the safe limit", false, "translation_buffer_limit");
|
|
406
|
+
fail(413, "upstream translation buffer exceeded the safe limit", false, "translation_buffer_limit", true);
|
|
388
407
|
return;
|
|
389
408
|
}
|
|
390
409
|
const message = typeof error.message === "string" ? error.message : "upstream request failed";
|
|
391
410
|
const deterministic = error.code === UNDECLARED_TOOL_CALL_ERROR_CODE;
|
|
392
|
-
|
|
393
|
-
|
|
411
|
+
const transportFailure = isEncoderTransportFailure(terminal);
|
|
412
|
+
const classified = transportFailure ? { ...error, code: "upstream_stream_error", status: 502 } : error;
|
|
413
|
+
const overflow = isContextOverflowError(classified, message);
|
|
414
|
+
const original = encoderOriginalErrorEvidence(terminal);
|
|
415
|
+
fail(anthropicFailedStatus(classified, message), message, !deterministic,
|
|
416
|
+
deterministic ? error.code as string : overflow ? "context_length_exceeded" : undefined,
|
|
417
|
+
hasProxyErrorMessage(options.proxyErrorContext, message, { type: typeof error.type === "string" ? error.type : undefined, code: typeof error.code === "string" ? error.code : undefined }), transportFailure ? "transport_failed" : undefined,
|
|
418
|
+
{ ...(original ?? { message, type: typeof error.type === "string" ? error.type : undefined, code: typeof error.code === "string" ? error.code : undefined }), status: original?.status ?? anthropicFailedStatus(classified, message) });
|
|
394
419
|
},
|
|
395
420
|
overflow() {
|
|
396
|
-
fail(413, "upstream translation buffer exceeded the safe limit", false, "translation_buffer_limit");
|
|
421
|
+
fail(413, "upstream translation buffer exceeded the safe limit", false, "translation_buffer_limit", true);
|
|
397
422
|
},
|
|
398
423
|
dispose() {
|
|
399
424
|
releaseThinkingBuffer(open);
|
|
@@ -409,7 +434,7 @@ export function encodeAnthropicMessageSse(
|
|
|
409
434
|
): ReadableStream<Uint8Array> {
|
|
410
435
|
return encodeAdapterEventStream(
|
|
411
436
|
events,
|
|
412
|
-
sink => createAnthropicMessageWriter(sink, options.model, options.inputTokenFloor),
|
|
437
|
+
sink => createAnthropicMessageWriter(sink, options.model, options.inputTokenFloor, options),
|
|
413
438
|
{ ...options, get localUpstream() { return options.localUpstream; }, keepaliveMs: MESSAGES_KEEPALIVE_MS },
|
|
414
439
|
);
|
|
415
440
|
}
|
|
@@ -423,32 +448,49 @@ export async function collectAnthropicMessageResponse(
|
|
|
423
448
|
stream: ReadableStream<Uint8Array>,
|
|
424
449
|
model: string,
|
|
425
450
|
translatorBudget: TranslatorBudget,
|
|
451
|
+
failureVerdictSink?: MessagesFailureVerdictSink,
|
|
426
452
|
): Promise<Response> {
|
|
427
453
|
let message: Rec;
|
|
454
|
+
const collectorVerdictSink: MessagesFailureVerdictSink = failureVerdictSink ?? {};
|
|
428
455
|
try {
|
|
429
|
-
message = await collectAnthropicMessage(stream, model, translatorBudget);
|
|
456
|
+
message = await collectAnthropicMessage(stream, model, translatorBudget, collectorVerdictSink);
|
|
430
457
|
} catch (error) {
|
|
431
458
|
if (isTranslatorBudgetExceededError(error)) {
|
|
432
|
-
|
|
459
|
+
const legacy = anthropicErrorBody(413, error.message, "request_too_large", "translation_buffer_limit");
|
|
460
|
+
return ownedAnthropicErrorResponse({ status: 413, type: "request_too_large", code: "translation_buffer_limit",
|
|
461
|
+
evidence: { status: 413, message: error.message }, overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
433
462
|
}
|
|
434
|
-
|
|
463
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
464
|
+
const legacy = anthropicErrorBody(502, message, "api_error");
|
|
465
|
+
return ownedAnthropicErrorResponse({ status: 502, type: "api_error", evidence: { status: 502, message },
|
|
466
|
+
contract: "transport_failed", overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
435
467
|
}
|
|
436
|
-
const
|
|
437
|
-
const
|
|
438
|
-
|
|
468
|
+
const legacy = collectorVerdictSink.collected ?? message;
|
|
469
|
+
const isError = legacy.type === "error";
|
|
470
|
+
const translatedError = isError && typeof legacy.error === "object"
|
|
471
|
+
? (legacy as { error: { code?: unknown; message?: unknown } }).error
|
|
439
472
|
: undefined;
|
|
440
473
|
if (translatedError?.code === "translation_buffer_limit") {
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
474
|
+
const originalMessage = typeof translatedError.message === "string" ? translatedError.message : "upstream translation buffer exceeded the safe limit";
|
|
475
|
+
const legacy = anthropicErrorBody(413, originalMessage, "request_too_large", "translation_buffer_limit");
|
|
476
|
+
return ownedAnthropicErrorResponse({ status: 413, type: "request_too_large", code: "translation_buffer_limit",
|
|
477
|
+
evidence: { status: 413, message: originalMessage }, overflow: messagesRelayedOverflowPresentation("", legacy) }, legacy);
|
|
478
|
+
}
|
|
479
|
+
const baselineOverflow = isError && translatedError?.code === "context_length_exceeded";
|
|
480
|
+
const status = isError ? (baselineOverflow ? 400 : 502) : 200;
|
|
481
|
+
if (collectorVerdictSink.collectedErrorEvent && !collectorVerdictSink.collectedProjection) {
|
|
482
|
+
const error = (message.error ?? {}) as Rec;
|
|
483
|
+
const originalMessage = typeof error.message === "string" ? error.message : "";
|
|
484
|
+
const throughput = isThroughputLimitText(originalMessage);
|
|
485
|
+
message = ownedAnthropicErrorPayload({ status, type: typeof error.type === "string" ? error.type : undefined,
|
|
486
|
+
code: typeof error.code === "string" ? error.code : undefined,
|
|
487
|
+
evidence: { status, message: originalMessage },
|
|
488
|
+
overflow: messagesRelayedOverflowPresentation(JSON.stringify(message), message),
|
|
489
|
+
...(error.code === "context_length_exceeded" && throughput ? { condition: "rate_limited" as const } : {}),
|
|
490
|
+
});
|
|
449
491
|
}
|
|
450
492
|
return new Response(JSON.stringify(message), {
|
|
451
|
-
status
|
|
493
|
+
status,
|
|
452
494
|
headers: { "Content-Type": "application/json" },
|
|
453
495
|
});
|
|
454
496
|
}
|
|
@@ -458,9 +500,11 @@ export function foldAnthropicMessage(
|
|
|
458
500
|
events: AsyncIterable<AdapterEvent>,
|
|
459
501
|
options: AnthropicMessageEncodeOptions,
|
|
460
502
|
): Promise<Response> {
|
|
503
|
+
const failureVerdictSink: MessagesFailureVerdictSink = options.failureVerdictSink ?? {};
|
|
461
504
|
return collectAnthropicMessageResponse(
|
|
462
|
-
encodeAnthropicMessageSse(events, options),
|
|
505
|
+
encodeAnthropicMessageSse(events, { ...options, failureVerdictSink }),
|
|
463
506
|
options.model,
|
|
464
507
|
options.translatorBudget,
|
|
508
|
+
failureVerdictSink,
|
|
465
509
|
);
|
|
466
510
|
}
|
package/src/protocols/trace.ts
CHANGED
|
@@ -65,6 +65,18 @@ export interface ProtocolTraceAttempt {
|
|
|
65
65
|
const requestMarks = new WeakMap<object, EntryMark | BlockedMark>();
|
|
66
66
|
const attemptMarks = new WeakMap<object, AttemptMark>();
|
|
67
67
|
const shadowInputs = new WeakMap<object, ProtocolPlanInput>();
|
|
68
|
+
const suppressedContexts = new WeakSet<object>();
|
|
69
|
+
|
|
70
|
+
/** Suppress diagnostics for an internal protocol bridge while preserving request behavior. */
|
|
71
|
+
export function suppressProtocolTrace(logCtx: object): void {
|
|
72
|
+
suppressedContexts.add(logCtx);
|
|
73
|
+
requestMarks.delete(logCtx);
|
|
74
|
+
shadowInputs.delete(logCtx);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function protocolTraceSuppressed(logCtx: object): boolean {
|
|
78
|
+
return suppressedContexts.has(logCtx);
|
|
79
|
+
}
|
|
68
80
|
|
|
69
81
|
function boundedReasons(codes: Iterable<ProtocolReasonCode>): ProtocolReasonCode[] {
|
|
70
82
|
const out: ProtocolReasonCode[] = [];
|
|
@@ -95,6 +107,7 @@ export function markProtocolEntry(
|
|
|
95
107
|
logCtx: object,
|
|
96
108
|
mark: { inbound: Protocol; lane: ProtocolLane; reasonCodes?: Iterable<ProtocolReasonCode>; features?: ProtocolFeatureSource },
|
|
97
109
|
): void {
|
|
110
|
+
if (protocolTraceSuppressed(logCtx)) return;
|
|
98
111
|
try {
|
|
99
112
|
requestMarks.set(logCtx, {
|
|
100
113
|
kind: "entry",
|
|
@@ -110,6 +123,7 @@ export function markProtocolEntry(
|
|
|
110
123
|
|
|
111
124
|
/** Features the request's entry or blocked mark recorded, for the shadow plan input. */
|
|
112
125
|
export function protocolMarkFeatures(logCtx: object): readonly ProtocolFeature[] | undefined {
|
|
126
|
+
if (protocolTraceSuppressed(logCtx)) return undefined;
|
|
113
127
|
try {
|
|
114
128
|
const mark = requestMarks.get(logCtx);
|
|
115
129
|
return mark ? [...mark.features] : undefined;
|
|
@@ -123,6 +137,7 @@ export function protocolMarkFeatures(logCtx: object): readonly ProtocolFeature[]
|
|
|
123
137
|
* fixed vocabulary and the provider and model names the server already exposes, nothing else.
|
|
124
138
|
*/
|
|
125
139
|
export function markProtocolShadowPlanInput(logCtx: object, input: ProtocolPlanInput): void {
|
|
140
|
+
if (protocolTraceSuppressed(logCtx)) return;
|
|
126
141
|
try {
|
|
127
142
|
shadowInputs.set(logCtx, input);
|
|
128
143
|
} catch {
|
|
@@ -135,6 +150,7 @@ export function markProtocolBlocked(
|
|
|
135
150
|
logCtx: object,
|
|
136
151
|
mark: { inbound: Protocol; reasonCodes: Iterable<ProtocolReasonCode>; features?: ProtocolFeatureSource },
|
|
137
152
|
): void {
|
|
153
|
+
if (protocolTraceSuppressed(logCtx)) return;
|
|
138
154
|
try {
|
|
139
155
|
requestMarks.set(logCtx, {
|
|
140
156
|
kind: "blocked",
|
|
@@ -152,6 +168,7 @@ export function markProtocolBlocked(
|
|
|
152
168
|
* No-op without an entry mark, and a blocked mark is never reopened.
|
|
153
169
|
*/
|
|
154
170
|
export function addProtocolEntryReason(logCtx: object, code: ProtocolReasonCode): void {
|
|
171
|
+
if (protocolTraceSuppressed(logCtx)) return;
|
|
155
172
|
try {
|
|
156
173
|
const mark = requestMarks.get(logCtx);
|
|
157
174
|
if (mark?.kind !== "entry") return;
|
|
@@ -246,6 +263,7 @@ export function protocolTraceForRequest(
|
|
|
246
263
|
logCtx: ProtocolTraceContext,
|
|
247
264
|
attempts: readonly ProtocolTraceAttempt[] | undefined,
|
|
248
265
|
): ProtocolTraceV1 | undefined {
|
|
266
|
+
if (protocolTraceSuppressed(logCtx)) return undefined;
|
|
249
267
|
const trace = observedTrace(logCtx, attempts);
|
|
250
268
|
return trace ? withShadowPlan(logCtx, trace) : undefined;
|
|
251
269
|
}
|
|
@@ -236,13 +236,41 @@ const ANTIGRAVITY_EFFORT_WIRE_MAP: Record<string, Record<string, string>> = {
|
|
|
236
236
|
* Sending `thinkingLevel` beside such a suffix states the effort twice, and CCA does not reject
|
|
237
237
|
* the contradiction — a `-low` wire id paired with `HIGH` returns 200, so the tier that actually
|
|
238
238
|
* ran becomes unknowable from the response. Membership also makes static resolution
|
|
239
|
-
* byte-identical to
|
|
239
|
+
* byte-identical to discovery, except when an opted-in Argon summary needs its matching level.
|
|
240
240
|
*
|
|
241
241
|
* `gemini-3.1-pro` is deliberately absent: its `high` rung is `gemini-pro-agent`, which carries
|
|
242
242
|
* no tier suffix, so there the level is the only thing naming the effort.
|
|
243
243
|
*/
|
|
244
244
|
const ANTIGRAVITY_SUFFIX_TIER_MODELS = new Set([GEMINI_ARGON, "gemini-3.8-flash", CLAUDE_OPUS_55, CLAUDE_SONNET_55]);
|
|
245
245
|
|
|
246
|
+
/**
|
|
247
|
+
* Suffix-tier models that withhold `thought: true` text unless the request ALSO names its tier
|
|
248
|
+
* in `thinkingConfig.thinkingLevel`.
|
|
249
|
+
*
|
|
250
|
+
* Measured against live CCA (2026-10-27): `gemini-4-argon-high` with
|
|
251
|
+
* `{includeThoughts: true}` alone answers 200 with `thoughtsTokenCount` in the thousands and
|
|
252
|
+
* zero thought parts — the whole plan arrives as ordinary visible text. Sending
|
|
253
|
+
* `{thinkingLevel: "high", includeThoughts: true}` on the same wire id returns the thought
|
|
254
|
+
* parts. `gemini-3.8-flash-high` does not behave this way: its include-only request still
|
|
255
|
+
* returns thoughts, so it stays out of this set and keeps the one-field shape.
|
|
256
|
+
*/
|
|
257
|
+
const ANTIGRAVITY_THOUGHT_LEVEL_REQUIRED_SUFFIX_MODELS = new Set([GEMINI_ARGON]);
|
|
258
|
+
|
|
259
|
+
function suffixThoughtLevel(wireModelId: string, includeThoughts: boolean | undefined): string | undefined {
|
|
260
|
+
if (!includeThoughts) return undefined;
|
|
261
|
+
for (const base of ANTIGRAVITY_THOUGHT_LEVEL_REQUIRED_SUFFIX_MODELS) {
|
|
262
|
+
for (const tier of ANTIGRAVITY_DISCOVERY_EFFORTS) {
|
|
263
|
+
if (wireModelId === `${base}-${tier}`) return tier;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
return undefined;
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
function suffixThoughtWire(wireModelId: string, includeThoughts: boolean | undefined): { wireModelId: string; thinkingLevel?: string } {
|
|
270
|
+
const thinkingLevel = suffixThoughtLevel(wireModelId, includeThoughts);
|
|
271
|
+
return { wireModelId, ...(thinkingLevel ? { thinkingLevel } : {}) };
|
|
272
|
+
}
|
|
273
|
+
|
|
246
274
|
function completeDiscoveredEffortWireModelIds(
|
|
247
275
|
pickerId: string,
|
|
248
276
|
available: ReadonlyMap<string, Record<string, unknown>>,
|
|
@@ -719,8 +747,8 @@ export function resolveAntigravityWireModelId(modelId: string, baseUrl?: string)
|
|
|
719
747
|
|
|
720
748
|
/**
|
|
721
749
|
* Whether the given model ID is a suffix wire ID or compat alias that already encodes
|
|
722
|
-
* an effort level.
|
|
723
|
-
*
|
|
750
|
+
* an effort level. The suffix names the effort; an opted-in Argon summary additionally
|
|
751
|
+
* repeats that same level in thinkingConfig.
|
|
724
752
|
*/
|
|
725
753
|
export function isAntigravitySuffixModelId(modelId: string): boolean {
|
|
726
754
|
return !ANTIGRAVITY_KNOWN_PICKER_MODELS.includes(modelId);
|
|
@@ -735,9 +763,9 @@ export function retiredAntigravityFlashTier(modelId: string): string | undefined
|
|
|
735
763
|
* Resolve a picker-visible base model + optional reasoning effort to the CCA wire model ID.
|
|
736
764
|
*
|
|
737
765
|
* Precedence (evaluated in order):
|
|
738
|
-
* 1. Suffix wire ID or compat alias → resolve via `resolveAntigravityWireModelId
|
|
766
|
+
* 1. Suffix wire ID or compat alias → resolve via `resolveAntigravityWireModelId`.
|
|
739
767
|
* 2. Mapped Gemini base with effort → return mapped wire ID + thinkingLevel.
|
|
740
|
-
* 3. Mapped Gemini base without effort → return default-effort wire ID
|
|
768
|
+
* 3. Mapped Gemini base without effort → return default-effort wire ID.
|
|
741
769
|
* 4. Claude Opus with effort → return identity + thinkingLevel (no suffix variants exist).
|
|
742
770
|
* 5. All other IDs → return `resolveAntigravityWireModelId(modelId)`, no thinkingConfig.
|
|
743
771
|
*/
|
|
@@ -745,9 +773,12 @@ export function resolveAntigravityEffortWireModel(
|
|
|
745
773
|
modelId: string,
|
|
746
774
|
effort?: string,
|
|
747
775
|
baseUrl?: string,
|
|
776
|
+
options?: { includeThoughts?: boolean },
|
|
748
777
|
): { wireModelId: string; thinkingLevel?: string } {
|
|
749
778
|
const discoveredEffortWireModelId = discoveredAntigravityEffortWireModelId(modelId, effort, baseUrl);
|
|
750
|
-
if (discoveredEffortWireModelId)
|
|
779
|
+
if (discoveredEffortWireModelId) {
|
|
780
|
+
return suffixThoughtWire(discoveredEffortWireModelId, options?.includeThoughts);
|
|
781
|
+
}
|
|
751
782
|
|
|
752
783
|
// A collapsed picker row reports ONE representative wire id (whichever tier CCA
|
|
753
784
|
// listed first), so live discovery cannot describe a ladder — it can only name a
|
|
@@ -763,11 +794,12 @@ export function resolveAntigravityEffortWireModel(
|
|
|
763
794
|
: discoveredAntigravityWireModelId(modelId, baseUrl);
|
|
764
795
|
if (discoveredWireModelId && (discoveredWireModelId !== modelId || isAntigravitySuffixModelId(modelId))) {
|
|
765
796
|
const defaultLevel = ANTIGRAVITY_THINKING_LEVEL_MODELS[modelId];
|
|
797
|
+
const suffixLevel = suffixThoughtLevel(discoveredWireModelId, options?.includeThoughts);
|
|
766
798
|
return {
|
|
767
799
|
wireModelId: discoveredWireModelId,
|
|
768
800
|
...(defaultLevel
|
|
769
801
|
? { thinkingLevel: effort ? resolveAntigravityThinkingLevel(effort) ?? defaultLevel : defaultLevel }
|
|
770
|
-
: {}),
|
|
802
|
+
: suffixLevel ? { thinkingLevel: suffixLevel } : {}),
|
|
771
803
|
};
|
|
772
804
|
}
|
|
773
805
|
|
|
@@ -786,7 +818,8 @@ export function resolveAntigravityEffortWireModel(
|
|
|
786
818
|
|
|
787
819
|
// Rule 1: suffix/compat alias — suffix IS the effort.
|
|
788
820
|
if (isAntigravitySuffixModelId(modelId)) {
|
|
789
|
-
|
|
821
|
+
const wireModelId = resolveAntigravityWireModelId(modelId, baseUrl);
|
|
822
|
+
return suffixThoughtWire(wireModelId, options?.includeThoughts);
|
|
790
823
|
}
|
|
791
824
|
|
|
792
825
|
// Rule 1b: single-wire-id Gemini model whose tiers ride on thinkingLevel. Without
|
|
@@ -809,13 +842,13 @@ export function resolveAntigravityEffortWireModel(
|
|
|
809
842
|
const requested = suffixTiered && effort
|
|
810
843
|
? resolveAntigravityThinkingLevel(effort) ?? effort
|
|
811
844
|
: effort;
|
|
812
|
-
if (requested && requested
|
|
845
|
+
if (requested && Object.hasOwn(effortMap, requested)) {
|
|
813
846
|
const wireModelId = effortMap[requested]!;
|
|
814
|
-
|
|
815
|
-
|
|
847
|
+
return suffixTiered ? suffixThoughtWire(wireModelId, options?.includeThoughts)
|
|
848
|
+
: { wireModelId, thinkingLevel: requested };
|
|
816
849
|
}
|
|
817
850
|
const defaultEffort = ANTIGRAVITY_DEFAULT_EFFORT[modelId]!;
|
|
818
|
-
return
|
|
851
|
+
return suffixThoughtWire(effortMap[defaultEffort]!, options?.includeThoughts);
|
|
819
852
|
}
|
|
820
853
|
|
|
821
854
|
// Rule 4: Claude models — effort via thinkingConfig only (no suffix variants).
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { boundedServiceTier } from "../lib/response-service-tier";
|
|
1
2
|
import type {
|
|
2
3
|
AttemptTierOutcome,
|
|
3
4
|
FastWire,
|
|
@@ -361,7 +362,7 @@ export function createAdapterTierMetadata(
|
|
|
361
362
|
return {
|
|
362
363
|
outcome,
|
|
363
364
|
observeResponseServiceTier(value: unknown) {
|
|
364
|
-
const sanitized =
|
|
365
|
+
const sanitized = boundedServiceTier(value);
|
|
365
366
|
if (sanitized) outcome.responseServiceTier = sanitized;
|
|
366
367
|
},
|
|
367
368
|
markResponseUnparseable() {},
|
|
@@ -413,7 +414,7 @@ export function createAdapterTierMetadata(
|
|
|
413
414
|
}
|
|
414
415
|
return;
|
|
415
416
|
}
|
|
416
|
-
const sanitized =
|
|
417
|
+
const sanitized = boundedServiceTier(value);
|
|
417
418
|
if (sanitized) outcome.responseServiceTier = sanitized;
|
|
418
419
|
if (!responseCanConfirmFast) return;
|
|
419
420
|
if (canonicalFromWire(context.fastWire, value) === "priority") {
|