@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
|
|
2
|
+
import { createSseInspector, type SseInspectorHandlers } from "../relay";
|
|
3
|
+
import { inspectResponseLogSsePayloadParsed } from "../request-log";
|
|
4
|
+
import { replaceSseDataPayload, sseDataPayload, type SseBlockRewrite } from "../sse-payload-rewrite";
|
|
5
|
+
import { isAuthorizedProviderExecutedCall, type ProviderExecutedCallType } from "../responses-undeclared-tool-guard";
|
|
6
|
+
import { requiredToolContractOf } from "./combo-required-tool-contract";
|
|
7
|
+
import { requiredToolFulfillments } from "./combo-required-tool-fulfillments";
|
|
8
|
+
import type { AdapterRequest } from "../../adapters/base";
|
|
9
|
+
|
|
10
|
+
type RecordValue = Record<string, unknown>;
|
|
11
|
+
function record(value: unknown): RecordValue | undefined {
|
|
12
|
+
return value !== null && typeof value === "object" && !Array.isArray(value) ? value as RecordValue : undefined;
|
|
13
|
+
}
|
|
14
|
+
const reasoningEvents = new Set([
|
|
15
|
+
"response.reasoning_summary_part.added", "response.reasoning_summary_part.done",
|
|
16
|
+
"response.reasoning_summary_text.delta", "response.reasoning_summary_text.done",
|
|
17
|
+
"response.reasoning_text.delta", "response.reasoning_text.done",
|
|
18
|
+
]);
|
|
19
|
+
const controlEvents = new Set(["response.created", "response.in_progress", "response.queued", "response.heartbeat"]);
|
|
20
|
+
|
|
21
|
+
/** Only known reasoning frames may extend a mandatory-tool prelude; other traffic commits. */
|
|
22
|
+
export function requiredToolReasoningPrelude(payload: unknown): boolean {
|
|
23
|
+
const event = record(payload);
|
|
24
|
+
return !!event && (reasoningEvents.has(String(event.type))
|
|
25
|
+
|| ((event.type === "response.output_item.added" || event.type === "response.output_item.done")
|
|
26
|
+
&& record(event.item)?.type === "reasoning"));
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** In-place projection is shared by the existing inspection and client rewrite owners. */
|
|
30
|
+
function terminalGuard(fulfills: (item: RecordValue, clientCall: boolean) => boolean, ownership: ReadonlySet<ProviderExecutedCallType>, evidence: { replayUnsafe: boolean }, normalizeItem: (item: unknown) => unknown) {
|
|
31
|
+
let fulfilled = false;
|
|
32
|
+
const observe = (value: unknown, complete: boolean) => {
|
|
33
|
+
const item = record(normalizeItem(value));
|
|
34
|
+
if (!item) { evidence.replayUnsafe = true; return; }
|
|
35
|
+
const providerExecuted = isAuthorizedProviderExecutedCall(item, ownership);
|
|
36
|
+
const clientCall = !providerExecuted && (item.type === "function_call" || item.type === "custom_tool_call");
|
|
37
|
+
const hostedCall = typeof item.type === "string" && item.type.endsWith("_call") && !clientCall;
|
|
38
|
+
if (providerExecuted || hostedCall) evidence.replayUnsafe = true;
|
|
39
|
+
if (complete && item.status !== "in_progress" && item.status !== "incomplete" && item.status !== "failed") {
|
|
40
|
+
fulfilled ||= fulfills(item, clientCall);
|
|
41
|
+
}
|
|
42
|
+
if (!clientCall && !hostedCall && item.type !== "message" && item.type !== "reasoning") evidence.replayUnsafe = true;
|
|
43
|
+
};
|
|
44
|
+
return {
|
|
45
|
+
opaque: () => { evidence.replayUnsafe = true; },
|
|
46
|
+
project(payload: unknown): boolean {
|
|
47
|
+
const event = record(payload);
|
|
48
|
+
if (!event) { evidence.replayUnsafe = true; return false; }
|
|
49
|
+
if (event.type !== "response.completed" && event.type !== "response.failed" && event.type !== "response.incomplete"
|
|
50
|
+
&& !controlEvents.has(String(event.type)) && !requiredToolReasoningPrelude(event)) evidence.replayUnsafe = true;
|
|
51
|
+
if (event.type === "response.output_item.added" || event.type === "response.output_item.done") {
|
|
52
|
+
observe(event.item, event.type === "response.output_item.done");
|
|
53
|
+
}
|
|
54
|
+
const response = record(event.response);
|
|
55
|
+
if (Array.isArray(response?.output)) {
|
|
56
|
+
for (const item of response.output) observe(item, event.type === "response.completed");
|
|
57
|
+
}
|
|
58
|
+
if (response?.output !== undefined && !Array.isArray(response.output)) evidence.replayUnsafe = true;
|
|
59
|
+
if (event.type !== "response.completed" || !response || !Array.isArray(response.output) || fulfilled) return false;
|
|
60
|
+
event.type = "response.failed";
|
|
61
|
+
response.status = "failed";
|
|
62
|
+
response.error = {
|
|
63
|
+
type: "upstream_error", code: REQUIRED_TOOL_CONTRACT_CODE,
|
|
64
|
+
message: "Target completed the response without the tool call required by tool_choice",
|
|
65
|
+
// This is evidence for preflight, never permission to replay after its commit boundary.
|
|
66
|
+
...(evidence.replayUnsafe ? { retryable: false } : {}),
|
|
67
|
+
};
|
|
68
|
+
return true;
|
|
69
|
+
},
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export function createComboRequiredToolStreamGuard(
|
|
74
|
+
rawBody: unknown, ownership: ReadonlySet<ProviderExecutedCallType>, evidence = { replayUnsafe: false },
|
|
75
|
+
normalizeItem: (item: unknown) => unknown = item => item,
|
|
76
|
+
request?: AdapterRequest,
|
|
77
|
+
) {
|
|
78
|
+
const contract = requiredToolContractOf(rawBody);
|
|
79
|
+
if (!contract) return undefined;
|
|
80
|
+
const fulfills = requiredToolFulfillments(rawBody, contract, normalizeItem, request);
|
|
81
|
+
const clientGuard = terminalGuard(fulfills, ownership, evidence, normalizeItem);
|
|
82
|
+
return {
|
|
83
|
+
rememberCompleted(response: RecordValue, remember: (response: RecordValue) => void) {
|
|
84
|
+
if (!clientGuard.project({ type: "response.completed", response })) remember(response);
|
|
85
|
+
},
|
|
86
|
+
inspectorFactory(handlers: SseInspectorHandlers) {
|
|
87
|
+
const guard = terminalGuard(fulfills, ownership, evidence, normalizeItem);
|
|
88
|
+
return createSseInspector({
|
|
89
|
+
...handlers,
|
|
90
|
+
onOpaquePayload(payload) { if (payload !== "[DONE]") guard.opaque(); handlers.onOpaquePayload?.(payload); },
|
|
91
|
+
onParsedPayload(payload) {
|
|
92
|
+
// Every raw observer, including continuation admission, sees the identity
|
|
93
|
+
// authorized by client restoration rather than an alternate wire spelling.
|
|
94
|
+
const event = record(payload);
|
|
95
|
+
if (event?.item !== undefined) event.item = normalizeItem(event.item);
|
|
96
|
+
const response = record(event?.response);
|
|
97
|
+
if (Array.isArray(response?.output)) response.output = response.output.map(normalizeItem);
|
|
98
|
+
// Inspection has parsed metadata but has not reported a terminal or persisted output yet.
|
|
99
|
+
if (guard.project(payload) && handlers.logCtx) {
|
|
100
|
+
inspectResponseLogSsePayloadParsed(handlers.logCtx, JSON.stringify(payload), payload);
|
|
101
|
+
}
|
|
102
|
+
handlers.onParsedPayload?.(payload);
|
|
103
|
+
},
|
|
104
|
+
});
|
|
105
|
+
},
|
|
106
|
+
blockRewrite: (() => {
|
|
107
|
+
const guard = clientGuard;
|
|
108
|
+
return ((block: string) => {
|
|
109
|
+
const data = sseDataPayload(block);
|
|
110
|
+
if (data === null || data === "[DONE]") return [block];
|
|
111
|
+
let payload: unknown;
|
|
112
|
+
try { payload = JSON.parse(data); } catch { guard.opaque(); return [block]; }
|
|
113
|
+
if (!guard.project(payload)) return [block];
|
|
114
|
+
const rewritten = replaceSseDataPayload(block, JSON.stringify(payload));
|
|
115
|
+
return [rewritten.replace(/^event:[^\r\n]*$/m, "event: response.failed")];
|
|
116
|
+
}) as SseBlockRewrite;
|
|
117
|
+
})(),
|
|
118
|
+
};
|
|
119
|
+
}
|
|
@@ -2,13 +2,18 @@ import { codexAccountModelRefusal, codexAccountModelRefusalPayload, hasConflicti
|
|
|
2
2
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
3
3
|
import { comboFailureDecision } from "../../combos";
|
|
4
4
|
import { httpStatusFromTerminalError } from "../../lib/errors";
|
|
5
|
+
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
5
6
|
import type { RequestFailureStage } from "../../lib/request-failure-model";
|
|
6
7
|
import type { RequestLogContext } from "../request-log";
|
|
7
8
|
import { carryResponseToolOwnership } from "./response-tool-ownership";
|
|
8
9
|
import { createSseInspector } from "../relay";
|
|
9
10
|
import { MAX_CLIENT_SSE_FRAME_BYTES } from "../sse-frame-buffer";
|
|
11
|
+
import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
|
|
12
|
+
import { requiredToolReasoningPrelude } from "./combo-required-tool-stream";
|
|
10
13
|
|
|
11
14
|
const COMBO_STREAM_PREFLIGHT_MAX_BYTES = MAX_CLIENT_SSE_FRAME_BYTES;
|
|
15
|
+
// Required-tool reasoning may delay delivery, but never for an unbounded/trickling prelude.
|
|
16
|
+
const COMBO_REQUIRED_TOOL_REASONING_HOLD_MS = 1_000;
|
|
12
17
|
// Keep retained object count proportional to the same byte budget used by the
|
|
13
18
|
// shared SSE framer. Tiny or empty upstream reads must not bypass the byte cap.
|
|
14
19
|
const COMBO_STREAM_PREFLIGHT_MAX_CHUNKS = Math.max(
|
|
@@ -123,7 +128,9 @@ function retryableZeroOutputTerminal(payload: unknown): boolean {
|
|
|
123
128
|
};
|
|
124
129
|
if (bareErrorIsRetryable(event)) return true;
|
|
125
130
|
if (event.type === "response.failed") {
|
|
126
|
-
const
|
|
131
|
+
const error = (event.response as { error?: { code?: unknown; retryable?: unknown } } | undefined)?.error;
|
|
132
|
+
const code = error?.code;
|
|
133
|
+
if (code === REQUIRED_TOOL_CONTRACT_CODE && error?.retryable === false) return false;
|
|
127
134
|
return !(typeof code === "string" && NON_REPLAYABLE_FAILED_CODES.has(code));
|
|
128
135
|
}
|
|
129
136
|
if (event.type !== "response.incomplete") return false;
|
|
@@ -188,6 +195,7 @@ function replayBufferedResponse(
|
|
|
188
195
|
response: Response,
|
|
189
196
|
reader: ReadableStreamDefaultReader<Uint8Array>,
|
|
190
197
|
buffered: Uint8Array[],
|
|
198
|
+
pendingRead?: ReturnType<typeof reader.read>,
|
|
191
199
|
): Response {
|
|
192
200
|
let index = 0;
|
|
193
201
|
const body = new ReadableStream<Uint8Array>({
|
|
@@ -197,7 +205,8 @@ function replayBufferedResponse(
|
|
|
197
205
|
return;
|
|
198
206
|
}
|
|
199
207
|
try {
|
|
200
|
-
const next = await reader.read();
|
|
208
|
+
const next = await (pendingRead ?? reader.read());
|
|
209
|
+
pendingRead = undefined;
|
|
201
210
|
if (next.done) controller.close();
|
|
202
211
|
else controller.enqueue(next.value);
|
|
203
212
|
} catch (error) {
|
|
@@ -285,22 +294,27 @@ export async function preflightComboStreamResponse(
|
|
|
285
294
|
response: Response,
|
|
286
295
|
logCtx: RequestLogContext,
|
|
287
296
|
retryableTerminal: (payload: unknown) => boolean = retryableZeroOutputTerminal,
|
|
288
|
-
options?: { allowMissingContentType?: boolean; replayReadErrors?: boolean },
|
|
297
|
+
options?: { allowMissingContentType?: boolean; replayReadErrors?: boolean; requiredToolPrelude?: boolean; signal?: AbortSignal },
|
|
289
298
|
): Promise<ComboStreamPreflightResult> {
|
|
290
|
-
const contentType = response.headers.get("content-type")
|
|
291
|
-
const isEventStream =
|
|
299
|
+
const contentType = response.headers.get("content-type");
|
|
300
|
+
const isEventStream = hasResponseMediaType(response.headers, "text/event-stream")
|
|
292
301
|
|| (!contentType && options?.allowMissingContentType === true);
|
|
293
302
|
if (!response.ok || !response.body || !isEventStream) {
|
|
294
303
|
return { kind: "accepted", response };
|
|
295
304
|
}
|
|
296
305
|
|
|
297
306
|
const reader = response.body.getReader();
|
|
307
|
+
const cancelRead = () => { reader.cancel(options?.signal?.reason).catch(() => undefined); };
|
|
308
|
+
if (options?.signal?.aborted) cancelRead();
|
|
309
|
+
else options?.signal?.addEventListener("abort", cancelRead, { once: true });
|
|
298
310
|
const buffered: Uint8Array[] = [];
|
|
299
311
|
let bufferedBytes = 0;
|
|
300
312
|
let outputCommitted = false;
|
|
301
313
|
let responseCreated = false;
|
|
302
314
|
let terminalStatus: ResponsesTerminalStatus | undefined;
|
|
303
315
|
let retryableTerminalPayload: Record<string, unknown> | undefined;
|
|
316
|
+
let holdTimer: ReturnType<typeof setTimeout> | undefined;
|
|
317
|
+
let holdDeadline: Promise<"hold-expired"> | undefined;
|
|
304
318
|
const inspector = createSseInspector({
|
|
305
319
|
logCtx,
|
|
306
320
|
// A payload the inspector could not parse still reached this proxy, and it may be output.
|
|
@@ -315,7 +329,22 @@ export async function preflightComboStreamResponse(
|
|
|
315
329
|
&& !Array.isArray(payload) && (payload as { type?: unknown }).type === "error";
|
|
316
330
|
// A zero-output bare error is terminal evidence. Explicit client errors stay
|
|
317
331
|
// committed; unknown and retryable upstream failures may advance the combo.
|
|
318
|
-
|
|
332
|
+
const heldReasoning = options?.requiredToolPrelude && requiredToolReasoningPrelude(payload);
|
|
333
|
+
if (heldReasoning) holdDeadline ??= new Promise(resolve => {
|
|
334
|
+
holdTimer = setTimeout(() => resolve("hold-expired"), COMBO_REQUIRED_TOOL_REASONING_HOLD_MS);
|
|
335
|
+
});
|
|
336
|
+
if (comboStreamPayloadCommitsOutput(payload) && !matchedBareError && !heldReasoning) outputCommitted = true;
|
|
337
|
+
if (options?.requiredToolPrelude && payload && typeof payload === "object") {
|
|
338
|
+
const event = payload as { type?: unknown; response?: { output?: unknown; error?: { code?: unknown; retryable?: unknown } } };
|
|
339
|
+
const output = event.response?.output;
|
|
340
|
+
const contractFailure = event.type === "response.failed" && event.response?.error?.code === REQUIRED_TOOL_CONTRACT_CODE
|
|
341
|
+
&& event.response.error.retryable !== false && Array.isArray(output) && output.every(item =>
|
|
342
|
+
item !== null && typeof item === "object" && !Array.isArray(item)
|
|
343
|
+
&& ["message", "reasoning"].includes((item as { type: string }).type));
|
|
344
|
+
// Other lifecycle/terminal snapshots can hide effects too. Only our checked contract
|
|
345
|
+
// failure may discard a terminal-only text snapshot that was held in its entirety.
|
|
346
|
+
if (output !== undefined && (!Array.isArray(output) || output.length > 0) && !contractFailure) outputCommitted = true;
|
|
347
|
+
}
|
|
319
348
|
if (!payload || typeof payload !== "object" || Array.isArray(payload)) return;
|
|
320
349
|
if (retryable) retryableTerminalPayload = payload as Record<string, unknown>;
|
|
321
350
|
},
|
|
@@ -324,9 +353,18 @@ export async function preflightComboStreamResponse(
|
|
|
324
353
|
|
|
325
354
|
try {
|
|
326
355
|
for (;;) {
|
|
356
|
+
options?.signal?.throwIfAborted();
|
|
327
357
|
let next: Awaited<ReturnType<typeof reader.read>>;
|
|
328
358
|
try {
|
|
329
|
-
|
|
359
|
+
const pendingRead = reader.read();
|
|
360
|
+
const observed = await (holdDeadline ? Promise.race([pendingRead, holdDeadline]) : pendingRead);
|
|
361
|
+
options?.signal?.throwIfAborted();
|
|
362
|
+
if (observed === "hold-expired") {
|
|
363
|
+
// Expiry commits this child. Hand the in-flight read to the relay so its
|
|
364
|
+
// eventual chunk/error is delivered exactly once, never lost to the race.
|
|
365
|
+
return { kind: "accepted", response: replayBufferedResponse(response, reader, buffered, pendingRead) };
|
|
366
|
+
}
|
|
367
|
+
next = observed;
|
|
330
368
|
} catch (error) {
|
|
331
369
|
if (!options?.replayReadErrors) throw error;
|
|
332
370
|
// The native relay still owns post-header transport failures. Preserve
|
|
@@ -372,6 +410,8 @@ export async function preflightComboStreamResponse(
|
|
|
372
410
|
}
|
|
373
411
|
}
|
|
374
412
|
} finally {
|
|
413
|
+
if (holdTimer !== undefined) clearTimeout(holdTimer);
|
|
414
|
+
options?.signal?.removeEventListener("abort", cancelRead);
|
|
375
415
|
inspector.dispose();
|
|
376
416
|
}
|
|
377
417
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { captureAccountAutoPauseAttempt, wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
|
|
2
2
|
import { spendLedgerStorageErrorResponse } from "./spend-storage-error";
|
|
3
|
+
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
3
4
|
import { createPhysicalSendReporter, rebindPhysicalSend } from "../../lib/request-execution-budget";
|
|
5
|
+
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
4
6
|
import { createInferenceSendBudget } from "../inference/context";
|
|
5
7
|
import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
|
|
6
8
|
import { capturePoolQuotaWriter } from "../../codex/account-store";
|
|
@@ -80,6 +82,7 @@ import {
|
|
|
80
82
|
} from "../../codex/auth-context";
|
|
81
83
|
import {
|
|
82
84
|
forceRefreshMainAccountToken,
|
|
85
|
+
mainAccountTokenQuotaWriter,
|
|
83
86
|
type NativeMainRefreshDependencies,
|
|
84
87
|
} from "../../codex/main-account";
|
|
85
88
|
import {
|
|
@@ -179,7 +182,7 @@ import { codexAccountSelectionForTurn, registerTurn, trackStreamLifetime, unregi
|
|
|
179
182
|
import type { AdmissionLease } from "../../lib/admission";
|
|
180
183
|
import { redactSecretString } from "../../lib/redact";
|
|
181
184
|
import { readBoundedResponseBytes } from "../../lib/bounded-body";
|
|
182
|
-
import { resolveStallTimeoutMs } from "../../stall-timeout";
|
|
185
|
+
import { resolveConnectTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
|
|
183
186
|
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
184
187
|
import { isRateLimitOrQuotaFailureMessage } from "../../lib/errors";
|
|
185
188
|
import { supportedLadderFor } from "../effort-policy";
|
|
@@ -317,6 +320,7 @@ function compactHandoffRoute(
|
|
|
317
320
|
}
|
|
318
321
|
|
|
319
322
|
export interface HandleResponsesCompactOptions {
|
|
323
|
+
advisorAdmissionPolicy?: import("../../types/admission-policy").CapturedAdmissionPolicy;
|
|
320
324
|
compactionRoutingOverride?: CompactionRoutingOverride | null;
|
|
321
325
|
nativeMainRefreshDependencies?: NativeMainRefreshDependencies;
|
|
322
326
|
/** Release the listener's idle guard only after the complete request body is accepted. */
|
|
@@ -371,6 +375,7 @@ async function refreshNativeMainCompactContext(args: {
|
|
|
371
375
|
...authCtx,
|
|
372
376
|
accessToken: refreshed.accessToken,
|
|
373
377
|
chatgptAccountId: refreshed.chatgptAccountId,
|
|
378
|
+
mainQuotaWriter: mainAccountTokenQuotaWriter(refreshed) ?? authCtx.mainQuotaWriter,
|
|
374
379
|
};
|
|
375
380
|
const refreshedProvider = applyCodexAuthContextToProvider(
|
|
376
381
|
stripCodexRuntimeProviderFields(provider),
|
|
@@ -657,6 +662,7 @@ export async function handleResponsesCompact(
|
|
|
657
662
|
admission?: DataPlaneAdmission,
|
|
658
663
|
options: HandleResponsesCompactOptions = {},
|
|
659
664
|
): Promise<Response> {
|
|
665
|
+
options = { ...options, advisorAdmissionPolicy: options.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, admission) };
|
|
660
666
|
let body: unknown;
|
|
661
667
|
try {
|
|
662
668
|
body = await readJsonRequestBody(req, undefined, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
|
|
@@ -1051,7 +1057,7 @@ export async function handleResponsesCompact(
|
|
|
1051
1057
|
}
|
|
1052
1058
|
compactHostAdmissionLease = null;
|
|
1053
1059
|
};
|
|
1054
|
-
const connectMs = config.connectTimeoutMs
|
|
1060
|
+
const connectMs = () => resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(compactUrl) });
|
|
1055
1061
|
// Takes its context explicitly: the alternate-account flow below records a rejection
|
|
1056
1062
|
// against A while promoting B, then records B's own outcome. A closure over a single
|
|
1057
1063
|
// `authCtx` cannot express either.
|
|
@@ -1172,7 +1178,9 @@ export async function handleResponsesCompact(
|
|
|
1172
1178
|
body: JSON.stringify({ ...buildCompactSendBody() as typeof compactBody, model: route.modelId }),
|
|
1173
1179
|
}, upstreamRecovery),
|
|
1174
1180
|
req.signal,
|
|
1175
|
-
|
|
1181
|
+
// Keyed sends can refresh their destination after pacing. Their physical send below
|
|
1182
|
+
// owns the header clock; the outer wrapper owns pacing and client cancellation only.
|
|
1183
|
+
sendProvider.authMode !== "forward" && sendProvider.apiKey ? 0 : connectMs(),
|
|
1176
1184
|
false,
|
|
1177
1185
|
providerFetch(sendProvider, undefined, {
|
|
1178
1186
|
providerName: route.providerName,
|
|
@@ -1216,10 +1224,12 @@ export async function handleResponsesCompact(
|
|
|
1216
1224
|
if (!rebindPhysicalSend(sendBudget, { poolId: logCtx.spendPoolId ?? route.providerName,
|
|
1217
1225
|
identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(safeHostLabel(compactUrl));
|
|
1218
1226
|
noteProviderAttemptSend(logCtx, route.providerName, sendProvider, logCtx.usageLogInputTokens, upstreamRecovery);
|
|
1219
|
-
|
|
1220
|
-
distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl),
|
|
1227
|
+
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
1228
|
+
distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), String(input),
|
|
1229
|
+
physicalInit, { providerName: route.providerName, provider: sendProvider })) as typeof fetch;
|
|
1230
|
+
return fetchWithHeaderTimeout(compactUrl,
|
|
1221
1231
|
{ ...init, headers: sendHeaders, body: JSON.stringify({ ...buildCompactSendBody() as typeof compactBody, model: route.modelId }) },
|
|
1222
|
-
|
|
1232
|
+
init.signal ?? req.signal, connectMs(), false, physicalFetch);
|
|
1223
1233
|
} : undefined,
|
|
1224
1234
|
...(onPhysicalDispatch ? { onPhysicalDispatch } : {}),
|
|
1225
1235
|
}),
|
|
@@ -1732,14 +1742,14 @@ export async function handleResponsesCompact(
|
|
|
1732
1742
|
// fallback spend four more.
|
|
1733
1743
|
// internalReq keeps only FORWARD_HEADERS, so the caller principal is resolved from req.
|
|
1734
1744
|
const replayPrincipal = { clientPrincipalId: resolveContextPrincipal(req, config, admission) };
|
|
1735
|
-
const response = await handleResponses(internalReq, config, logCtx, { abortSignal: req.signal, turnAdmissionLease, sendBudget, compactionRecoveryKind: "compaction-v1", compactionRoutingOverride: options.compactionRoutingOverride, replayPrincipal, ...(admission ? { admission } : {}) });
|
|
1745
|
+
const response = await handleResponses(internalReq, config, logCtx, { abortSignal: req.signal, turnAdmissionLease, sendBudget, compactionRecoveryKind: "compaction-v1", compactionRoutingOverride: options.compactionRoutingOverride, advisorAdmissionPolicy: options.advisorAdmissionPolicy, replayPrincipal, ...(admission ? { admission } : {}) });
|
|
1736
1746
|
if (req.signal.aborted) {
|
|
1737
1747
|
void response.body?.cancel(req.signal.reason).catch(() => undefined);
|
|
1738
1748
|
return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
1739
1749
|
}
|
|
1740
1750
|
if (!response.ok) return response;
|
|
1741
1751
|
let json: { output?: unknown[]; status?: unknown; error?: unknown };
|
|
1742
|
-
if (response.headers
|
|
1752
|
+
if (hasResponseMediaType(response.headers, "text/event-stream")) {
|
|
1743
1753
|
if (!response.body) {
|
|
1744
1754
|
return formatErrorResponse(502, "server_error", "compaction turn returned an empty event stream");
|
|
1745
1755
|
}
|
|
@@ -5,6 +5,7 @@ import { copyPlainData } from "../../lib/plain-data";
|
|
|
5
5
|
import { jsonUtf8Bytes } from "../../lib/json-byte-size";
|
|
6
6
|
import type { TranslatorBudget } from "../../lib/translator-budget";
|
|
7
7
|
import { readBoundedResponseBytes } from "../../lib/bounded-body";
|
|
8
|
+
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
8
9
|
import { isRequestExecutionBudget, type RequestExecutionBudget, type SingleUseDispatchPermit } from "../../lib/request-execution-budget";
|
|
9
10
|
import { isNonReplayableResponse, isNonReplayableUpstreamCode, markResponseNonReplayable, TRANSIENT_RETRY_MAX_ATTEMPTS } from "../../lib/upstream-retry";
|
|
10
11
|
import { isCyberPolicyCode, isTerminalRefusalCode } from "../../lib/errors";
|
|
@@ -162,7 +163,7 @@ export async function runWithCompactionRecovery(
|
|
|
162
163
|
const originalModel = firstOptions.compactionRoutingOverride?.sourceModel ?? String(snapshot.model);
|
|
163
164
|
// Use the established protocol commit boundary. For runTurn streams the direct event
|
|
164
165
|
// observer additionally preserves side-effect heartbeats that the bridge does not publish.
|
|
165
|
-
if (response.ok && response.headers
|
|
166
|
+
if (response.ok && hasResponseMediaType(response.headers, "text/event-stream")) {
|
|
166
167
|
const native = isNativePassthroughSseResponse(response);
|
|
167
168
|
const eager = isEagerRelaySseResponse(response);
|
|
168
169
|
const preflight = await preflightComboStreamResponse(response, logCtx);
|
|
@@ -42,7 +42,7 @@ import type { RequestLogContext } from "../request-log";
|
|
|
42
42
|
import { markLocalRequestLogRefusal } from "../request-log";
|
|
43
43
|
import { CODEX_POOL_REFRESH_INCOMPLETE_LOG_REASON } from "../../codex/pool-refresh-backoff";
|
|
44
44
|
import { codexAuthContextLogLabel } from "../../codex/account-label";
|
|
45
|
-
import { forceRefreshMainAccountToken } from "../../codex/main-account";
|
|
45
|
+
import { forceRefreshMainAccountToken, mainAccountTokenQuotaWriter } from "../../codex/main-account";
|
|
46
46
|
import { rebindPoolCreditPolicy } from "../../codex/pool-credit-policy";
|
|
47
47
|
import { safeCallerSessionId } from "../caller-session-identity";
|
|
48
48
|
import { copyResponsesClientMetadata } from "../../adapters/openai-responses/transport";
|
|
@@ -578,6 +578,7 @@ export async function refreshNativeMainForwardAuth(args: {
|
|
|
578
578
|
...authCtx,
|
|
579
579
|
accessToken: refreshed.accessToken,
|
|
580
580
|
chatgptAccountId: refreshed.chatgptAccountId,
|
|
581
|
+
mainQuotaWriter: mainAccountTokenQuotaWriter(refreshed) ?? authCtx.mainQuotaWriter,
|
|
581
582
|
};
|
|
582
583
|
const provider = applyCodexAuthContextToProvider(
|
|
583
584
|
stripCodexRuntimeProviderFields(route.provider),
|
|
@@ -918,6 +918,7 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
918
918
|
if (binding) {
|
|
919
919
|
applyAccountChangeConversationStateScrub({
|
|
920
920
|
body: parsed._rawBody,
|
|
921
|
+
headers: retryHeaders,
|
|
921
922
|
parsed,
|
|
922
923
|
preserveReasoningEncryptedContent: isCanonicalOpenAiForwardProvider(retryProvider)
|
|
923
924
|
&& parsed._nativeReasoningRetention?.accountSwitch === true,
|
|
@@ -4,6 +4,7 @@ import type { ConsumedComboFailure, HandleResponsesOptions } from "./core-option
|
|
|
4
4
|
import type { OcxUsage } from "../../types";
|
|
5
5
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
6
6
|
import { carryAnthropicRefusalCredential } from "../../oauth/anthropic-account-refusal";
|
|
7
|
+
import { carryCodexAccountCooldownResponse } from "../../codex/account-cooldown-response";
|
|
7
8
|
import { codexQuotaFailureMessage, codexQuotaOutcomeMeta } from "./core-codex-account";
|
|
8
9
|
import {
|
|
9
10
|
isRateLimitOrQuotaFailureMessage,
|
|
@@ -18,8 +19,9 @@ import {
|
|
|
18
19
|
import { normalizeUpstreamErrorText } from "./core-errors";
|
|
19
20
|
import { resolveClientRetryAfter } from "../../lib/retry-after";
|
|
20
21
|
import { formatErrorResponse } from "../../bridge";
|
|
22
|
+
import { upstreamCodeForComboFailure } from "../../bridge/errors";
|
|
21
23
|
import { OLLAMA_LATE_ATTRIBUTION_LIMIT_MESSAGE } from "../../adapters/ollama-native";
|
|
22
|
-
import { isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
|
|
24
|
+
import { carryReplayRefusal, isNonReplayableResponse, isReplayRefusalResponse, markResponseNonReplayable, UPSTREAM_RESET_REPLAY_REFUSED_CODE } from "../../lib/upstream-retry";
|
|
23
25
|
import { MODEL_NOT_ALLOWED_FOR_KEY } from "../admission-model-scope";
|
|
24
26
|
import { usageFromResponsesPayload } from "../request-log";
|
|
25
27
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
@@ -41,6 +43,7 @@ export async function consumeComboFailure(
|
|
|
41
43
|
// Read before the body: the marker lives on this Response object, and the failure below is
|
|
42
44
|
// rebuilt as a new one that would otherwise lose it.
|
|
43
45
|
const nonReplayable = isNonReplayableResponse(response);
|
|
46
|
+
const replayRefusal = isReplayRefusalResponse(response);
|
|
44
47
|
const fallback = `Provider error ${response.status}`;
|
|
45
48
|
let classificationText = fallback;
|
|
46
49
|
let codexModelRefusal: CodexAccountModelRefusal | undefined;
|
|
@@ -76,7 +79,8 @@ export async function consumeComboFailure(
|
|
|
76
79
|
const normalized = normalizeUpstreamErrorText(body.text, fallback);
|
|
77
80
|
if (utf8Trusted || isCyberPolicyCode(normalized.code) || isCyberPolicyMessage(normalized.safeText)) {
|
|
78
81
|
classificationText = normalized.safeText;
|
|
79
|
-
upstreamCode = codexAccountModelRefusalHardStopCode(response.status, body.text)
|
|
82
|
+
upstreamCode = codexAccountModelRefusalHardStopCode(response.status, body.text)
|
|
83
|
+
?? upstreamCodeForComboFailure(response, normalized.code);
|
|
80
84
|
// Only the adapter's own normalized refusal may claim the plan-refusal hop; another
|
|
81
85
|
// upstream echoing the code in any spelling keeps the meaning it had before, which was none.
|
|
82
86
|
if (namesModelNotInPlanCode(upstreamCode) && !isModelNotInPlanRefusal(response, upstreamCode)) upstreamCode = undefined;
|
|
@@ -93,7 +97,8 @@ export async function consumeComboFailure(
|
|
|
93
97
|
classificationText = fallback;
|
|
94
98
|
}
|
|
95
99
|
const cyberFailure = isCyberPolicyCode(upstreamCode) || isCyberPolicyMessage(classificationText);
|
|
96
|
-
const normalizedUpstreamCode = cyberFailure ? CYBER_POLICY_ERROR_CODE
|
|
100
|
+
const normalizedUpstreamCode = cyberFailure ? CYBER_POLICY_ERROR_CODE
|
|
101
|
+
: replayRefusal ? UPSTREAM_RESET_REPLAY_REFUSED_CODE : upstreamCode;
|
|
97
102
|
const message = cyberFailure
|
|
98
103
|
? upstreamMessage
|
|
99
104
|
?? (isCyberPolicyCode(upstreamCode) ? CYBER_POLICY_FALLBACK_MESSAGE : classificationText)
|
|
@@ -109,13 +114,13 @@ export async function consumeComboFailure(
|
|
|
109
114
|
: upstreamRetryAfter;
|
|
110
115
|
// Client response may get the synthetic "2" fallback; cooldown metadata must not —
|
|
111
116
|
// otherwise coolComboTarget treats it as a 2s cooldown instead of the 60s default.
|
|
112
|
-
const clientRetryAfter = resolveClientRetryAfter({
|
|
117
|
+
const clientRetryAfter = replayRefusal ? undefined : resolveClientRetryAfter({
|
|
113
118
|
status: response.status,
|
|
114
119
|
message,
|
|
115
120
|
upstreamRetryAfter: effectiveRetryAfter,
|
|
116
121
|
now,
|
|
117
122
|
});
|
|
118
|
-
const cooldownRetryAfter = resolveClientRetryAfter({
|
|
123
|
+
const cooldownRetryAfter = replayRefusal ? undefined : resolveClientRetryAfter({
|
|
119
124
|
status: response.status,
|
|
120
125
|
message,
|
|
121
126
|
upstreamRetryAfter: effectiveRetryAfter,
|
|
@@ -134,8 +139,10 @@ export async function consumeComboFailure(
|
|
|
134
139
|
},
|
|
135
140
|
);
|
|
136
141
|
if (nonReplayable) markResponseNonReplayable(failureResponse);
|
|
142
|
+
carryReplayRefusal(response, failureResponse);
|
|
137
143
|
if (verifiedPlanRefusal) markVerifiedModelNotInPlanResponse(failureResponse);
|
|
138
144
|
carryAnthropicRefusalCredential(response, failureResponse);
|
|
145
|
+
carryCodexAccountCooldownResponse(response, failureResponse);
|
|
139
146
|
return {
|
|
140
147
|
response: failureResponse,
|
|
141
148
|
...(nonReplayable ? { nonReplayable: true } : {}),
|
|
@@ -150,7 +157,7 @@ export async function consumeComboFailure(
|
|
|
150
157
|
// refusal in a 5xx still carries `x-codex-*-reset-at`, and gating on 402/429 alone threw
|
|
151
158
|
// those away, so the combo target came back up immediately instead of waiting for the
|
|
152
159
|
// window it was told about. `cyberFailure` stays excluded: a policy block is not a quota.
|
|
153
|
-
...(!cyberFailure
|
|
160
|
+
...(!cyberFailure && !replayRefusal
|
|
154
161
|
&& (response.status === 429 || response.status === 402 || quotaConfirmedByBody)
|
|
155
162
|
? { resetAt: codexQuotaOutcomeMeta(response).resetAt }
|
|
156
163
|
: {}),
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import type { OcxConfig } from "../../types";
|
|
18
18
|
import type { RouteResult } from "../../router";
|
|
19
|
-
import type {
|
|
19
|
+
import type { AdmissionModelScope } from "../admission-model-scope";
|
|
20
20
|
import type { AdmissionLease } from "../../lib/admission";
|
|
21
21
|
import type { RequestExecutionBudget, SingleUseDispatchPermit } from "../../lib/request-execution-budget";
|
|
22
22
|
import type { TransientSendBudget } from "../../lib/upstream-retry";
|
|
@@ -38,7 +38,7 @@ import { applyDroidReasoningDefault } from "../droid-reasoning-default";
|
|
|
38
38
|
import { resolveWireProtocolOverride } from "../adapter-resolve";
|
|
39
39
|
import { resolveOpenCodeGoTransport } from "../../providers/opencode-go-transport";
|
|
40
40
|
import { getOrAllocateRequestSessionLane } from "../request-log-conversation";
|
|
41
|
-
import { assertRouteAllowedByScope
|
|
41
|
+
import { assertRouteAllowedByScope } from "../admission-model-scope";
|
|
42
42
|
import { isNativeChatRouteEligible } from "../chat-native-eligibility";
|
|
43
43
|
import { chatCompletionsErrorResponse } from "../../chat/outbound";
|
|
44
44
|
import { isRequestExecutionBudget } from "../../lib/request-execution-budget";
|
|
@@ -108,12 +108,13 @@ export function createComboProtocolLanes(input: {
|
|
|
108
108
|
req: Request;
|
|
109
109
|
config: OcxConfig;
|
|
110
110
|
logCtx: RequestLogContext;
|
|
111
|
-
|
|
111
|
+
/** The request's resolved model-scope snapshot; internal callers carry the caller's scope. */
|
|
112
|
+
admissionScope: AdmissionModelScope | undefined;
|
|
112
113
|
droidDefaultEffort?: string;
|
|
113
114
|
comboId: string;
|
|
114
115
|
targets: readonly ComboTarget[];
|
|
115
116
|
}): ComboProtocolLanes | undefined {
|
|
116
|
-
const { source, req, config, logCtx,
|
|
117
|
+
const { source, req, config, logCtx, admissionScope, droidDefaultEffort, comboId, targets } = input;
|
|
117
118
|
if (!source) return undefined;
|
|
118
119
|
const envelope = source.envelope;
|
|
119
120
|
const reject = resolveProtocolSettings(config).unrepresentable === "reject";
|
|
@@ -125,7 +126,7 @@ export function createComboProtocolLanes(input: {
|
|
|
125
126
|
const settle = (target: ComboTarget, targetRoute: RouteResult): RouteResult | undefined => {
|
|
126
127
|
try {
|
|
127
128
|
const route: RouteResult = { ...targetRoute };
|
|
128
|
-
assertRouteAllowedByScope(
|
|
129
|
+
assertRouteAllowedByScope(admissionScope, selector(target), route);
|
|
129
130
|
const routedProvider = route.provider;
|
|
130
131
|
route.staticPolicy = captureRouteStaticPolicy(
|
|
131
132
|
route.providerName, route.modelId, routedProvider, route.staticPolicy.effectiveAlias, "chat",
|