@bitkyc08/opencodex 2.100.5 → 2.100.6
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/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
import type { AdapterRequest, IncomingMeta, ProviderAdapter } from "../../adapters/base";
|
|
2
|
+
import type { OcxParsedRequest } from "../../types";
|
|
3
|
+
import type { PhysicalSendReporter } from "../../lib/request-execution-budget";
|
|
4
|
+
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
5
|
+
import { carryProxyError, isProxyError } from "../../lib/client-error-body";
|
|
6
|
+
import { checkOutboundBodySize } from "./outbound-body-guard";
|
|
7
|
+
import { releaseTranslatedEvent, type TranslatorBudget } from "../../lib/translator-budget";
|
|
8
|
+
import { isNonReplayableResponse, SendBudgetExhaustedError } from "../../lib/upstream-retry";
|
|
9
|
+
import { COMPACT_PROMPT, SUMMARY_PREFIX } from "../../responses/compaction";
|
|
10
|
+
import { sameProviderContinuationOwner } from "../../responses/provider-continuation";
|
|
11
|
+
import { readDisplaySafeErrorText } from "./core-errors";
|
|
12
|
+
import { deferPhysicalSendReporter } from "./deferred-send-reporter";
|
|
13
|
+
import { fetchWithHeaderTimeout, providerFetch } from "./fetch-helpers";
|
|
14
|
+
import { transientSendCapFor, type ResponsesSendBudget } from "./request-send-budget";
|
|
15
|
+
import { bindAdapterResponseSpend } from "./request-spend";
|
|
16
|
+
import { splitAnthropicImageContext } from "./anthropic-image-context";
|
|
17
|
+
import type { ResponsesRequestContext } from "./core-options";
|
|
18
|
+
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
19
|
+
import type { ResponsesTransport } from "./request-transport";
|
|
20
|
+
import { transientRetryPolicyFor } from "../../providers/key-failover";
|
|
21
|
+
|
|
22
|
+
type RecoveryBudget = Pick<ResponsesSendBudget, "remainingTransientSendBudget" | "targetSendsUsed" | "imageRecoverySendReporter">;
|
|
23
|
+
type ImageRecoveryTransport = Pick<ResponsesTransport, "pinAnthropicImageRecovery" | "noteRoutedAttemptSend">;
|
|
24
|
+
type RecoveredExchange = { response: Response; request?: AdapterRequest };
|
|
25
|
+
const SUMMARY_MAX_TOKENS = 1024;
|
|
26
|
+
|
|
27
|
+
function wireOutputLimit({ body }: AdapterRequest): number | undefined {
|
|
28
|
+
const { max_tokens } = JSON.parse(body) as { max_tokens: number };
|
|
29
|
+
return Number.isSafeInteger(max_tokens) && max_tokens > 0 ? max_tokens : undefined;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export type AnthropicImageRecovery = (
|
|
33
|
+
response: Response, parsed: OcxParsedRequest, adapter: ProviderAdapter, signal: AbortSignal,
|
|
34
|
+
) => Promise<RecoveredExchange>;
|
|
35
|
+
|
|
36
|
+
/** Preserve the bounded refusal while releasing its original pacing lease. */
|
|
37
|
+
export async function retainAdapterFailureResponse(response: Response, signal: AbortSignal): Promise<{
|
|
38
|
+
response: Response; text: string;
|
|
39
|
+
}> {
|
|
40
|
+
const text = await readDisplaySafeErrorText(response, signal, "");
|
|
41
|
+
const headers = new Headers(response.headers);
|
|
42
|
+
headers.delete("content-length");
|
|
43
|
+
headers.delete("content-encoding");
|
|
44
|
+
const retained = new Response(text, { status: response.status, statusText: response.statusText, headers });
|
|
45
|
+
return { response: carryProxyError(response, retained), text };
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export async function recoverAdapterImageContext(
|
|
49
|
+
recover: AnthropicImageRecovery, response: Response, parsed: OcxParsedRequest,
|
|
50
|
+
transport: Pick<ResponsesTransport, "activeAdapter" | "sameTargetRequest" | "sameTargetParsed" | "sameTargetToken" | "transportToken">,
|
|
51
|
+
signal: AbortSignal, refreshToolAliases: (request: AdapterRequest) => void,
|
|
52
|
+
): Promise<Response | undefined> {
|
|
53
|
+
try {
|
|
54
|
+
const recovered = await recover(response, parsed, transport.activeAdapter, signal);
|
|
55
|
+
if (recovered.request) {
|
|
56
|
+
transport.sameTargetRequest = recovered.request;
|
|
57
|
+
transport.sameTargetParsed = parsed;
|
|
58
|
+
transport.sameTargetToken = transport.transportToken;
|
|
59
|
+
refreshToolAliases(recovered.request);
|
|
60
|
+
}
|
|
61
|
+
return recovered.response;
|
|
62
|
+
} catch (error) {
|
|
63
|
+
if (!signal.aborted) throw error;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
// The ingress translator budget is shared by combo targets and compaction attempts.
|
|
68
|
+
const recoveryAttempted = new WeakSet<TranslatorBudget>();
|
|
69
|
+
|
|
70
|
+
/** One summary and one resend, using the original route, pacing, ledger and caller signal. */
|
|
71
|
+
export function createAnthropicImageRecovery(
|
|
72
|
+
{ config, options }: Pick<ResponsesRequestContext, "config" | "options">,
|
|
73
|
+
{ route, translatorBudget, selectedForwardHeaders, completedToolBlocks }: Pick<PreparedResponsesRequest,
|
|
74
|
+
"route" | "translatorBudget" | "selectedForwardHeaders" | "completedToolBlocks">,
|
|
75
|
+
transport: ImageRecoveryTransport,
|
|
76
|
+
budget: RecoveryBudget,
|
|
77
|
+
connectMs: number,
|
|
78
|
+
): AnthropicImageRecovery {
|
|
79
|
+
return async (response, parsed, adapter, signal) => {
|
|
80
|
+
if (recoveryAttempted.has(translatorBudget) || adapter.name !== "anthropic" || parsed._compactionRequest
|
|
81
|
+
|| response.status !== 413 || isProxyError(response) || isNonReplayableResponse(response)) return { response };
|
|
82
|
+
signal.throwIfAborted();
|
|
83
|
+
const owner = parsed._providerContinuationOwner;
|
|
84
|
+
const pin = transport.pinAnthropicImageRecovery(response);
|
|
85
|
+
if (!owner || !pin || !sameProviderContinuationOwner(owner, pin.owner)) return { response };
|
|
86
|
+
const split = splitAnthropicImageContext(parsed.context.messages);
|
|
87
|
+
if (!split || !adapter.parseResponse || !pin.request.body.includes('"type":"image"')) return { response };
|
|
88
|
+
|
|
89
|
+
const total = transientRetryPolicyFor(route.provider)?.attempts;
|
|
90
|
+
const remaining = () => budget.remainingTransientSendBudget(transientSendCapFor(total, budget.targetSendsUsed));
|
|
91
|
+
if (remaining() < 2) return { response };
|
|
92
|
+
const { response: retained, text } = await retainAdapterFailureResponse(response, signal);
|
|
93
|
+
signal.throwIfAborted();
|
|
94
|
+
// Require a provider size refusal and an actual image-bearing, compactable history.
|
|
95
|
+
if (recoveryAttempted.has(translatorBudget)
|
|
96
|
+
|| !/request_too_large|payload_too_large|(?:request|payload|image|body)[^\n]{0,60}too large/i.test(text)) {
|
|
97
|
+
return { response: retained };
|
|
98
|
+
}
|
|
99
|
+
recoveryAttempted.add(translatorBudget);
|
|
100
|
+
const originalBytes = Buffer.byteLength(pin.request.body, "utf8");
|
|
101
|
+
const incoming: IncomingMeta = { headers: selectedForwardHeaders, completedToolBlocks,
|
|
102
|
+
providerName: route.providerName, translatorBudget, abortSignal: signal };
|
|
103
|
+
const send = async (wire: AdapterRequest, input: OcxParsedRequest, minimum: number, outputLimit: number) => {
|
|
104
|
+
signal.throwIfAborted();
|
|
105
|
+
if (!pin.isCurrent() || remaining() < minimum) throw new SendBudgetExhaustedError();
|
|
106
|
+
const physical = budget.imageRecoverySendReporter(wire.body, outputLimit);
|
|
107
|
+
const receipt = deferPhysicalSendReporter(physical);
|
|
108
|
+
try {
|
|
109
|
+
const run = () => fetchWithHeaderTimeout(wire.url, {
|
|
110
|
+
method: wire.method, headers: wire.headers, body: wire.body,
|
|
111
|
+
}, signal, connectMs, input.stream, providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
112
|
+
httpOnly: true, providerName: route.providerName, modelId: route.modelId,
|
|
113
|
+
dispatchOverride: pin.dispatchOverride(wire, input),
|
|
114
|
+
onPhysicalDispatch: () => {
|
|
115
|
+
if (remaining() < minimum || !receipt.beforeDispatch()) throw new SendBudgetExhaustedError();
|
|
116
|
+
if (input._anthropicImageSummary) pin.recordRefusalSpend?.();
|
|
117
|
+
transport.noteRoutedAttemptSend(undefined, "image-413");
|
|
118
|
+
},
|
|
119
|
+
}));
|
|
120
|
+
const response = await (receipt.report.execute ? receipt.report.execute(run) : run());
|
|
121
|
+
return { response, recordUsage: physical.recordUsage };
|
|
122
|
+
} finally {
|
|
123
|
+
receipt.report.close?.();
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
const fits = (wire: AdapterRequest) => Buffer.byteLength(wire.body, "utf8") < originalBytes
|
|
127
|
+
&& checkOutboundBodySize(wire.body, config.maxUpstreamBodyBytes).admitted;
|
|
128
|
+
try {
|
|
129
|
+
signal.throwIfAborted();
|
|
130
|
+
if (!pin.isCurrent()) return { response: retained };
|
|
131
|
+
const originalLimit = wireOutputLimit(pin.request);
|
|
132
|
+
if (originalLimit === undefined) return { response: retained };
|
|
133
|
+
const summaryLimit = Math.min(originalLimit, SUMMARY_MAX_TOKENS);
|
|
134
|
+
const summaryInput: OcxParsedRequest = {
|
|
135
|
+
...parsed, stream: false, _anthropicImageOwner: owner, _anthropicImageSummary: true,
|
|
136
|
+
_anthropicServerTools: undefined, _anthropicServerReplay: undefined,
|
|
137
|
+
options: { toolChoice: "none", reasoning: "none", thinkingEnabled: false, maxOutputTokens: summaryLimit },
|
|
138
|
+
context: { ...parsed.context, tools: undefined, messages: [...split.history, {
|
|
139
|
+
role: "user", timestamp: 0,
|
|
140
|
+
content: `${COMPACT_PROMPT}\n\nReturn only the handoff summary. Do not call tools or continue the task.`,
|
|
141
|
+
}] },
|
|
142
|
+
};
|
|
143
|
+
const summaryRequest = await adapter.buildRequest(summaryInput, incoming);
|
|
144
|
+
let summarySend: Awaited<ReturnType<typeof send>>;
|
|
145
|
+
try {
|
|
146
|
+
if (!fits(summaryRequest) || !summaryRequest.body.includes('"type":"image"')) return { response: retained };
|
|
147
|
+
const outputLimit = wireOutputLimit(summaryRequest);
|
|
148
|
+
if (outputLimit === undefined || outputLimit > summaryLimit) return { response: retained };
|
|
149
|
+
summarySend = await send(summaryRequest, summaryInput, 2, outputLimit);
|
|
150
|
+
} finally { summaryRequest.releaseBodyObservation?.(); }
|
|
151
|
+
const { response: summaryResponse, recordUsage: recordSummaryUsage } = summarySend;
|
|
152
|
+
if (!summaryResponse.ok) {
|
|
153
|
+
void summaryResponse.body?.cancel().catch(() => {});
|
|
154
|
+
return { response: retained };
|
|
155
|
+
}
|
|
156
|
+
const payload = await readBoundedResponseBody(summaryResponse, { signal });
|
|
157
|
+
if (!payload.displaySafe) return { response: retained };
|
|
158
|
+
const { content } = JSON.parse(payload.text) as { content?: Array<{ type?: unknown }> };
|
|
159
|
+
const textOnly = Array.isArray(content)
|
|
160
|
+
&& content.every(block => ["text", "thinking", "redacted_thinking"].includes(String(block?.type)));
|
|
161
|
+
const events = await adapter.parseResponse(new Response(payload.text, { headers: summaryResponse.headers }),
|
|
162
|
+
translatorBudget, summaryRequest.tierLog);
|
|
163
|
+
let summary = "";
|
|
164
|
+
let completed = false;
|
|
165
|
+
let invalid = false;
|
|
166
|
+
for (const event of events) {
|
|
167
|
+
if ("usage" in event && event.usage) recordSummaryUsage?.(event.usage);
|
|
168
|
+
if (event.type === "done") completed = event.stopReason === "end_turn" || event.stopReason === "stop_sequence";
|
|
169
|
+
else if (event.type === "text_delta" && !event.anthropicThinkingSignature) summary += event.text;
|
|
170
|
+
else if (event.type.startsWith("tool_call") || event.type.startsWith("web_search")
|
|
171
|
+
|| event.type === "error" || event.type === "incomplete") invalid = true;
|
|
172
|
+
releaseTranslatedEvent(event, translatorBudget);
|
|
173
|
+
}
|
|
174
|
+
if (!textOnly || invalid || !completed || !summary.trim()) return { response: retained };
|
|
175
|
+
|
|
176
|
+
const successor: OcxParsedRequest = { ...parsed, _anthropicImageOwner: owner,
|
|
177
|
+
context: { ...parsed.context, messages: [
|
|
178
|
+
{ role: "user", timestamp: 0, content: `${SUMMARY_PREFIX}\n\n${summary}` }, ...split.retained,
|
|
179
|
+
] },
|
|
180
|
+
};
|
|
181
|
+
const request = await adapter.buildRequest(successor, incoming);
|
|
182
|
+
try {
|
|
183
|
+
if (!fits(request)) return { response: retained };
|
|
184
|
+
const outputLimit = wireOutputLimit(request);
|
|
185
|
+
if (outputLimit === undefined) return { response: retained };
|
|
186
|
+
const { response: replacement, recordUsage } = await send(request, successor, 1, outputLimit);
|
|
187
|
+
if (replacement.ok) {
|
|
188
|
+
bindAdapterResponseSpend(replacement, recordUsage);
|
|
189
|
+
parsed.context.messages = successor.context.messages;
|
|
190
|
+
parsed._anthropicImageOwner = owner;
|
|
191
|
+
}
|
|
192
|
+
return { response: replacement, request };
|
|
193
|
+
} finally { request.releaseBodyObservation?.(); }
|
|
194
|
+
} catch (error) {
|
|
195
|
+
if (signal.aborted) throw error;
|
|
196
|
+
return { response: retained };
|
|
197
|
+
}
|
|
198
|
+
};
|
|
199
|
+
}
|
|
@@ -12,6 +12,7 @@ import { clientFacingModelText, type ClientFacingModelLabel } from "../../lib/er
|
|
|
12
12
|
* resolves toward admitting.
|
|
13
13
|
*/
|
|
14
14
|
import { collapseDevinModelUid, DEVIN_MODEL_CONTEXT_WINDOWS } from "../../adapters/devin/live-models";
|
|
15
|
+
import { openAIChatSerializesThinking } from "../../adapters/openai-chat/messages";
|
|
15
16
|
import {
|
|
16
17
|
nativeOpenAiContextWindow,
|
|
17
18
|
nativeOpenAiMaxInputTokens,
|
|
@@ -22,7 +23,7 @@ import { getModelMetadata } from "../../generated/model-metadata";
|
|
|
22
23
|
import { estimateTokens } from "../../lib/token-estimate";
|
|
23
24
|
import { isCanonicalOpenAiForwardProvider, OPENAI_CODEX_PROVIDER_ID } from "../../providers/openai-tiers";
|
|
24
25
|
import { modelRecordValue } from "../../reasoning-effort";
|
|
25
|
-
import {
|
|
26
|
+
import type { OcxContentPart, OcxParsedRequest, OcxProviderConfig } from "../../types";
|
|
26
27
|
|
|
27
28
|
/**
|
|
28
29
|
* Multiplier applied to the ceiling before refusing.
|
|
@@ -69,6 +70,12 @@ export interface InputAdmissionResult {
|
|
|
69
70
|
contextWindow?: number | null;
|
|
70
71
|
/** Output space reserved by the combo preflight; absent on the loose direct gate. */
|
|
71
72
|
requiredOutputHeadroom?: number;
|
|
73
|
+
/**
|
|
74
|
+
* The margin-adjusted estimate the combo gate actually decided on. Present only when the
|
|
75
|
+
* strict gate ran, so refusal reporting can name the limit that bound without re-deriving
|
|
76
|
+
* the margin. `estimatedTokens` stays the raw figure.
|
|
77
|
+
*/
|
|
78
|
+
admissionEstimateTokens?: number;
|
|
72
79
|
}
|
|
73
80
|
|
|
74
81
|
function positive(value: unknown): number | null {
|
|
@@ -125,7 +132,7 @@ function contentTokens(content: string | readonly OcxContentPart[], modelId: str
|
|
|
125
132
|
export function estimateInputTokens(parsed: OcxParsedRequest, modelId: string, provider?: OcxProviderConfig): number {
|
|
126
133
|
const { context } = parsed;
|
|
127
134
|
const countThinking = provider?.adapter !== "openai-chat"
|
|
128
|
-
||
|
|
135
|
+
|| openAIChatSerializesThinking(provider, parsed.modelId).text;
|
|
129
136
|
let total = 0;
|
|
130
137
|
|
|
131
138
|
for (const prompt of context.systemPrompt ?? []) total += estimateTokens(prompt, modelId);
|
|
@@ -313,6 +320,16 @@ export function resolveOutputCeiling(
|
|
|
313
320
|
return limits.length === 0 ? null : Math.min(...limits);
|
|
314
321
|
}
|
|
315
322
|
|
|
323
|
+
/**
|
|
324
|
+
* Output room a combo child must retain when the caller declares no `max_output_tokens`. The
|
|
325
|
+
* loose direct-request gate tolerates pathological input because a solo request has nowhere
|
|
326
|
+
* else to go; a combo child does -- input admitted at 99.9% of the window leaves a few hundred
|
|
327
|
+
* tokens, so the target answers `incomplete`/`max_output_tokens` AFTER selection, when no
|
|
328
|
+
* sibling remains to retry. Bounded so a small window keeps a usable fraction and a large one
|
|
329
|
+
* cannot reserve a whole answer's worth.
|
|
330
|
+
*/
|
|
331
|
+
const COMBO_DEFAULT_OUTPUT_RESERVE = { fraction: 0.1, min: 1_024, max: 32_768 } as const;
|
|
332
|
+
|
|
316
333
|
/**
|
|
317
334
|
* Combo-only admission. A fallback must be able to satisfy the caller's declared output
|
|
318
335
|
* allowance inside its OWN context window. Otherwise it returns 200, emits a few hundred
|
|
@@ -327,7 +344,7 @@ export function resolveOutputCeiling(
|
|
|
327
344
|
* Direct and single-target requests keep the deliberately loose 2.5x pathological-input gate.
|
|
328
345
|
* This stricter rule applies only to synthetic combo children, where skipping one known-small
|
|
329
346
|
* target is safe and the ladder continues before any upstream bytes are sent. Unknown context
|
|
330
|
-
*
|
|
347
|
+
* falls back to the direct check, and an undeclared output allowance uses a default reserve.
|
|
331
348
|
*/
|
|
332
349
|
export function checkComboTargetInputAdmission(
|
|
333
350
|
parsed: OcxParsedRequest,
|
|
@@ -337,18 +354,25 @@ export function checkComboTargetInputAdmission(
|
|
|
337
354
|
nativeContextCap?: NativeContextLimitsInput,
|
|
338
355
|
): InputAdmissionResult {
|
|
339
356
|
const { window, ceiling } = resolveContextLimits(provider, providerName, modelId, nativeContextCap);
|
|
340
|
-
|
|
341
|
-
if (window === null || ceiling === null || requestedOutput === null) {
|
|
357
|
+
if (window === null || ceiling === null) {
|
|
342
358
|
return checkInputAdmission(parsed, provider, providerName, modelId, nativeContextCap);
|
|
343
359
|
}
|
|
360
|
+
const requestedOutput = positive(parsed.options.maxOutputTokens);
|
|
344
361
|
const targetOutput = resolveOutputCeiling(provider, providerName, modelId);
|
|
345
|
-
const
|
|
346
|
-
|
|
347
|
-
|
|
362
|
+
const defaultReserve = Math.min(
|
|
363
|
+
COMBO_DEFAULT_OUTPUT_RESERVE.max,
|
|
364
|
+
Math.max(COMBO_DEFAULT_OUTPUT_RESERVE.min, Math.floor(window * COMBO_DEFAULT_OUTPUT_RESERVE.fraction)),
|
|
365
|
+
);
|
|
366
|
+
const requiredOutputHeadroom = requestedOutput === null
|
|
367
|
+
? (targetOutput === null ? defaultReserve : Math.min(defaultReserve, targetOutput))
|
|
368
|
+
: (targetOutput === null ? requestedOutput : Math.min(requestedOutput, targetOutput));
|
|
348
369
|
const estimatedTokens = estimateInputTokens(parsed, modelId, provider);
|
|
370
|
+
// Apply the 1.1x estimate margin without rounding exact fits up by one token.
|
|
371
|
+
const admissionEstimate = Math.ceil((estimatedTokens * 11) / 10);
|
|
349
372
|
return {
|
|
350
|
-
admitted:
|
|
373
|
+
admitted: admissionEstimate <= ceiling && admissionEstimate + requiredOutputHeadroom <= window,
|
|
351
374
|
estimatedTokens,
|
|
375
|
+
admissionEstimateTokens: admissionEstimate,
|
|
352
376
|
ceiling,
|
|
353
377
|
requiredOutputHeadroom,
|
|
354
378
|
...(window !== ceiling ? { contextWindow: window } : {}),
|
|
@@ -377,9 +401,10 @@ export function checkInputAdmission(
|
|
|
377
401
|
export function inputAdmissionRefusalMessage(input: InputAdmissionResult, model: ClientFacingModelLabel): string {
|
|
378
402
|
const count = (value: number | null) => value !== null && Number.isFinite(value) && value >= 0 ? Math.trunc(value) : 0;
|
|
379
403
|
const label = clientFacingModelText(model);
|
|
380
|
-
const
|
|
404
|
+
const decisionEstimate = input.admissionEstimateTokens ?? input.estimatedTokens;
|
|
405
|
+
const estimate = count(decisionEstimate);
|
|
381
406
|
const ceiling = count(input.ceiling);
|
|
382
|
-
if (input.contextWindow !== undefined &&
|
|
407
|
+
if (input.contextWindow !== undefined && decisionEstimate > ceiling) {
|
|
383
408
|
const window = input.contextWindow === null ? "" : `; context window: ${count(input.contextWindow)} tokens`;
|
|
384
409
|
return `Estimated input (~${estimate} tokens) exceeds the input limit of ${label} (${ceiling} tokens${window}). `
|
|
385
410
|
+ "Start a new session or choose a model with a larger input limit.";
|
|
@@ -12,7 +12,6 @@ import { tryAdmitTurn } from "../lifecycle";
|
|
|
12
12
|
import type { RequestLogContext } from "../request-log";
|
|
13
13
|
import { createSseInspector } from "../relay";
|
|
14
14
|
import type { HandleResponsesOptions } from "./core-options";
|
|
15
|
-
import { ESTIMATED_USAGE_HEADER } from "./estimated-usage";
|
|
16
15
|
|
|
17
16
|
type HandleResponses = (
|
|
18
17
|
req: Request,
|
|
@@ -57,22 +56,28 @@ function responseUsage(response: Record<string, unknown>): Record<string, number
|
|
|
57
56
|
return Object.keys(usage).length > 0 ? usage : undefined;
|
|
58
57
|
}
|
|
59
58
|
|
|
60
|
-
function terminalResult(response: Record<string, unknown>, deltaText: string): JevModelInvokeResult {
|
|
61
|
-
|
|
62
|
-
if (response.
|
|
59
|
+
function terminalResult(response: Record<string, unknown>, deltaText: string, includeUsage: boolean): JevModelInvokeResult {
|
|
60
|
+
const usage = includeUsage ? responseUsage(response) : undefined;
|
|
61
|
+
if (response.error !== undefined && response.error !== null) throw new JevModelInvokeError("http", "decision model failed", usage);
|
|
62
|
+
if (response.status !== "completed") throw new JevModelInvokeError("malformed", "decision model did not complete", usage);
|
|
63
63
|
const text = messageOutputText(response.output) ?? deltaText;
|
|
64
|
-
const usage = responseUsage(response);
|
|
65
64
|
return { text, ...(usage ? { usage } : {}) };
|
|
66
65
|
}
|
|
67
66
|
|
|
68
|
-
function decodeSse(bytes: Uint8Array): JevModelInvokeResult {
|
|
67
|
+
function decodeSse(bytes: Uint8Array, includeUsage: boolean): JevModelInvokeResult {
|
|
69
68
|
let completed: Record<string, unknown> | undefined;
|
|
70
69
|
let terminal: string | undefined;
|
|
70
|
+
let terminalResponse: Record<string, unknown> | undefined;
|
|
71
71
|
let deltaText = "";
|
|
72
72
|
const inspector = createSseInspector({
|
|
73
73
|
onTerminal: status => { terminal ??= status; },
|
|
74
74
|
onCompletedResponse: value => { if (isRecord(value)) completed = value; },
|
|
75
75
|
onParsedPayload: payload => {
|
|
76
|
+
// The payload callback runs before onTerminal. Keep the first terminal's raw response
|
|
77
|
+
// even when the inspector cannot reconstruct its output.
|
|
78
|
+
if (!terminal && includeUsage) {
|
|
79
|
+
terminalResponse = isRecord(payload) && isRecord(payload.response) ? payload.response : undefined;
|
|
80
|
+
}
|
|
76
81
|
if (isRecord(payload) && payload.type === "response.output_text.delta" && typeof payload.delta === "string") {
|
|
77
82
|
deltaText += payload.delta;
|
|
78
83
|
}
|
|
@@ -85,9 +90,10 @@ function decodeSse(bytes: Uint8Array): JevModelInvokeResult {
|
|
|
85
90
|
inspector.dispose();
|
|
86
91
|
}
|
|
87
92
|
if (terminal !== "completed" || !completed) {
|
|
88
|
-
|
|
93
|
+
const usage = terminal && terminalResponse ? responseUsage(terminalResponse) : undefined;
|
|
94
|
+
throw new JevModelInvokeError(terminal === "failed" ? "http" : "malformed", "decision model did not complete", usage);
|
|
89
95
|
}
|
|
90
|
-
return terminalResult({ ...completed, status: completed.status ?? "completed" }, deltaText);
|
|
96
|
+
return terminalResult({ ...completed, status: completed.status ?? "completed" }, deltaText, includeUsage);
|
|
91
97
|
}
|
|
92
98
|
|
|
93
99
|
/**
|
|
@@ -172,8 +178,10 @@ export function createJevModelInvoker(context: JevModelInvokerContext): JevModel
|
|
|
172
178
|
}
|
|
173
179
|
const bounded = await readBoundedResponseBytes(response, { maxBytes: JEV_MAX_RESPONSE_BYTES, signal });
|
|
174
180
|
if (bounded.oversized) throw new JevModelInvokeError("malformed", "decision response too large");
|
|
181
|
+
// Apply process-owned provenance before decoding either a success or a failed terminal.
|
|
182
|
+
const includeUsage = !childLog.clientResponseUsage;
|
|
175
183
|
const result = hasResponseMediaType(response.headers, "text/event-stream")
|
|
176
|
-
? decodeSse(bounded.bytes)
|
|
184
|
+
? decodeSse(bounded.bytes, includeUsage)
|
|
177
185
|
: (() => {
|
|
178
186
|
let parsed: unknown;
|
|
179
187
|
try {
|
|
@@ -182,14 +190,13 @@ export function createJevModelInvoker(context: JevModelInvokerContext): JevModel
|
|
|
182
190
|
throw new JevModelInvokeError("malformed", "decision response is not JSON");
|
|
183
191
|
}
|
|
184
192
|
if (!isRecord(parsed)) throw new JevModelInvokeError("malformed", "decision response is not an object");
|
|
185
|
-
return terminalResult(parsed, "");
|
|
193
|
+
return terminalResult(parsed, "", includeUsage);
|
|
186
194
|
})();
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
return quotaOmitted ? { ...settled, quotaOmitted: true } : settled;
|
|
195
|
+
usage = result.usage;
|
|
196
|
+
return quotaOmitted ? { ...result, quotaOmitted: true } : result;
|
|
197
|
+
} catch (error) {
|
|
198
|
+
if (error instanceof JevModelInvokeError) usage = error.usage;
|
|
199
|
+
throw error;
|
|
193
200
|
} finally {
|
|
194
201
|
// No final log row is written for this detached context, so settle its spend here.
|
|
195
202
|
childLog.spendTracker?.settle(childLog.usage ?? (usage
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { carryProxyError } from "../../lib/client-error-body";
|
|
2
2
|
import { isNonReplayableResponse, isReplayRefusalResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
|
|
3
|
+
import { isXaiLegacyPrivacyError, xaiPrivacyModeRefusal } from "../../providers/xai-privacy-mode";
|
|
4
|
+
import type { RequestFailureCause } from "../../usage/telemetry-contract";
|
|
3
5
|
import { clientCancelledResponse, readDisplaySafeErrorText } from "./core-errors";
|
|
4
6
|
|
|
5
7
|
const UPSTREAM_ERROR_TYPES = new Set([
|
|
@@ -12,10 +14,11 @@ const UPSTREAM_ERROR_CODES = new Set([
|
|
|
12
14
|
"unsupported_parameter", "invalid_value", "string_above_max_length",
|
|
13
15
|
]);
|
|
14
16
|
|
|
15
|
-
/**
|
|
17
|
+
/** Project a terminal upstream error while retaining its non-replayability. */
|
|
16
18
|
export async function sanitizeNonReplayableUpstreamError(
|
|
17
19
|
response: Response,
|
|
18
20
|
signal: AbortSignal,
|
|
21
|
+
grokOAuthLogCtx?: { causeHint?: RequestFailureCause },
|
|
19
22
|
): Promise<Response> {
|
|
20
23
|
if (response.ok || !isNonReplayableResponse(response) || isReplayRefusalResponse(response)) return response;
|
|
21
24
|
const text = await readDisplaySafeErrorText(response, signal, "");
|
|
@@ -24,6 +27,13 @@ export async function sanitizeNonReplayableUpstreamError(
|
|
|
24
27
|
markResponseNonReplayable(cancelled);
|
|
25
28
|
return cancelled;
|
|
26
29
|
}
|
|
30
|
+
const noRetry = response.headers.get("x-should-retry") === "false";
|
|
31
|
+
if (grokOAuthLogCtx && isXaiLegacyPrivacyError(response.status, text)) {
|
|
32
|
+
const refusal = xaiPrivacyModeRefusal(grokOAuthLogCtx);
|
|
33
|
+
if (noRetry) refusal.headers.set("x-should-retry", "false");
|
|
34
|
+
markResponseNonReplayable(refusal);
|
|
35
|
+
return refusal;
|
|
36
|
+
}
|
|
27
37
|
let type = "upstream_error";
|
|
28
38
|
let code: string | undefined;
|
|
29
39
|
try {
|
|
@@ -40,7 +50,7 @@ export async function sanitizeNonReplayableUpstreamError(
|
|
|
40
50
|
message: `Provider error ${response.status}: upstream diagnostic withheld for a non-replayable failure`,
|
|
41
51
|
} });
|
|
42
52
|
const headers = new Headers({ "content-type": "application/json" });
|
|
43
|
-
if (
|
|
53
|
+
if (noRetry) headers.set("x-should-retry", "false");
|
|
44
54
|
const safe = new Response(response.status === 304 ? null : body, {
|
|
45
55
|
status: response.status, headers,
|
|
46
56
|
});
|
|
@@ -8,6 +8,7 @@ import { MuseToolChoiceCompatibilityError } from "../../adapters/openai-response
|
|
|
8
8
|
import { MuseToolCatalogCompatibilityError } from "../../adapters/openai-responses/muse-tool-catalog";
|
|
9
9
|
import { OpenGatewayInputCompatibilityError } from "../../adapters/openai-responses/opengateway-input";
|
|
10
10
|
import { mapCodexAuthContextErrorToResponse } from "./codex-auth-error";
|
|
11
|
+
import { HostedAdvisorSpendRefusal } from "./policy-request-scope";
|
|
11
12
|
|
|
12
13
|
/** Input-lowering errors are 400; late credential/identity failures retain their own contract. */
|
|
13
14
|
export function passthroughBuildErrorResponse(error: unknown, accountSelector?: string): Response | undefined {
|
|
@@ -24,10 +25,11 @@ export function passthroughBuildErrorResponse(error: unknown, accountSelector?:
|
|
|
24
25
|
return undefined;
|
|
25
26
|
}
|
|
26
27
|
|
|
27
|
-
/**
|
|
28
|
-
export function
|
|
28
|
+
/** Local refusals precede generic adapter-build 400s and preservation of an older rejection. */
|
|
29
|
+
export function adapterBuildRefusal(error: unknown, context: CodexAuthContext | undefined,
|
|
29
30
|
accountSelector?: string, cleanup?: () => void): Response | undefined {
|
|
30
|
-
const refusal =
|
|
31
|
+
const refusal = error instanceof HostedAdvisorSpendRefusal ? error.response()
|
|
32
|
+
: mapCodexAuthContextErrorToResponse(error, { now: Date.now(), accountSelector });
|
|
31
33
|
if (refusal) {
|
|
32
34
|
cleanup?.();
|
|
33
35
|
releaseCodexAuthContextProbeLease(context);
|