@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
|
@@ -13,6 +13,7 @@ import { RequestHistoryIndexStaleError } from "./ingest";
|
|
|
13
13
|
import type { RebuildWorkerReply, RebuildWorkerRequest } from "./rebuild-protocol";
|
|
14
14
|
|
|
15
15
|
const CLOSE_TIMEOUT_MS = 5_000;
|
|
16
|
+
type WorkerSuccess = Exclude<RebuildWorkerReply, { type: "error" }>;
|
|
16
17
|
|
|
17
18
|
function delay(ms: number): Promise<void> {
|
|
18
19
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
@@ -34,7 +35,7 @@ function errorFromReply(reply: Extract<RebuildWorkerReply, { type: "error" }>):
|
|
|
34
35
|
|
|
35
36
|
export class RebuildWorkerJob {
|
|
36
37
|
private readonly worker: Worker;
|
|
37
|
-
private pending: { resolve: (
|
|
38
|
+
private pending: { resolve: (reply: WorkerSuccess) => void; reject: (error: unknown) => void } | null = null;
|
|
38
39
|
private exited = false;
|
|
39
40
|
private exitedCleanly = false;
|
|
40
41
|
private disposal: Promise<void> | null = null;
|
|
@@ -49,8 +50,8 @@ export class RebuildWorkerJob {
|
|
|
49
50
|
this.pending = null;
|
|
50
51
|
if (!pending) return;
|
|
51
52
|
const reply = event.data;
|
|
52
|
-
if (reply.type === "
|
|
53
|
-
else pending.
|
|
53
|
+
if (reply.type === "error") pending.reject(errorFromReply(reply));
|
|
54
|
+
else pending.resolve(reply);
|
|
54
55
|
});
|
|
55
56
|
this.worker.addEventListener("error", (event: Event) => {
|
|
56
57
|
this.fail(new Error((event as ErrorEvent).message || "request-history rebuild worker failed"));
|
|
@@ -68,16 +69,29 @@ export class RebuildWorkerJob {
|
|
|
68
69
|
pending?.reject(error);
|
|
69
70
|
}
|
|
70
71
|
|
|
71
|
-
|
|
72
|
-
build(indexPath: string, buildPath: string, reason: string, revision: UsageLogRevision): Promise<number> {
|
|
72
|
+
private send(request: RebuildWorkerRequest): Promise<WorkerSuccess> {
|
|
73
73
|
if (this.exited || this.disposal) return Promise.reject(new Error("request-history rebuild worker is not running"));
|
|
74
74
|
if (this.pending) return Promise.reject(new Error("request-history rebuild worker is busy"));
|
|
75
75
|
return new Promise((resolve, reject) => {
|
|
76
76
|
this.pending = { resolve, reject };
|
|
77
|
-
this.worker.postMessage(
|
|
77
|
+
this.worker.postMessage(request);
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
+
/** Build the complete private file; resolves with the ingested row count. */
|
|
82
|
+
async build(indexPath: string, buildPath: string, reason: string, revision: UsageLogRevision): Promise<number> {
|
|
83
|
+
const reply = await this.send({ type: "build", indexPath, buildPath, reason, revision });
|
|
84
|
+
if (reply.type !== "built") throw new Error("unexpected request-history build reply");
|
|
85
|
+
return reply.rows;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/** Scan a read-only connection off-loop; operational errors are not corruption. */
|
|
89
|
+
async check(indexPath: string): Promise<boolean> {
|
|
90
|
+
const reply = await this.send({ type: "check", indexPath });
|
|
91
|
+
if (reply.type !== "checked") throw new Error("unexpected request-history integrity reply");
|
|
92
|
+
return reply.healthy;
|
|
93
|
+
}
|
|
94
|
+
|
|
81
95
|
/** Stop the thread; waits a bounded time for it to exit. */
|
|
82
96
|
dispose(): Promise<void> {
|
|
83
97
|
this.disposal ??= this.shutDown();
|
|
@@ -8,8 +8,9 @@ export type RebuildWorkerRequest = {
|
|
|
8
8
|
buildPath: string;
|
|
9
9
|
reason: string;
|
|
10
10
|
revision: UsageLogRevision;
|
|
11
|
-
};
|
|
11
|
+
} | { type: "check"; indexPath: string };
|
|
12
12
|
|
|
13
13
|
export type RebuildWorkerReply =
|
|
14
14
|
| { type: "built"; rows: number }
|
|
15
|
+
| { type: "checked"; healthy: boolean }
|
|
15
16
|
| { type: "error"; name: string; message: string };
|
|
@@ -8,12 +8,30 @@
|
|
|
8
8
|
* closes it. The serving thread then swaps the finished file in.
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
|
+
import { Database } from "bun:sqlite";
|
|
11
12
|
import { buildIndexFile, removeAbandonedBuilds } from "./build-file";
|
|
13
|
+
import { isHistoryIndexCorruption } from "./sqlite-errors";
|
|
12
14
|
import type { RebuildWorkerReply, RebuildWorkerRequest } from "./rebuild-protocol";
|
|
13
15
|
|
|
14
16
|
declare const self: Worker;
|
|
15
17
|
|
|
16
18
|
function handle(request: RebuildWorkerRequest): RebuildWorkerReply {
|
|
19
|
+
if (request.type === "check") {
|
|
20
|
+
let handle: Database | undefined;
|
|
21
|
+
try {
|
|
22
|
+
handle = new Database(request.indexPath, { readonly: true });
|
|
23
|
+
handle.exec("PRAGMA busy_timeout = 5000");
|
|
24
|
+
const row = handle.query("PRAGMA quick_check").get() as { quick_check?: string } | undefined;
|
|
25
|
+
return { type: "checked", healthy: row?.quick_check === "ok" };
|
|
26
|
+
} catch (error) {
|
|
27
|
+
if (isHistoryIndexCorruption(error)) return { type: "checked", healthy: false };
|
|
28
|
+
throw error;
|
|
29
|
+
} finally {
|
|
30
|
+
// Release the live index before posting a verdict: the serving thread
|
|
31
|
+
// may immediately replace it, including on Windows.
|
|
32
|
+
handle?.close();
|
|
33
|
+
}
|
|
34
|
+
}
|
|
17
35
|
removeAbandonedBuilds(request.indexPath);
|
|
18
36
|
const rows = buildIndexFile(request.buildPath, request.reason, request.revision);
|
|
19
37
|
return { type: "built", rows };
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/** Only structural SQLite damage justifies discarding the derived index. */
|
|
2
|
+
export function isHistoryIndexCorruption(error: unknown): boolean {
|
|
3
|
+
if (!error || typeof error !== "object") return false;
|
|
4
|
+
const { code, errno } = error as { code?: unknown; errno?: unknown };
|
|
5
|
+
// Bun exposes extended result codes too; the low byte is the primary code.
|
|
6
|
+
if (typeof errno === "number" && ((errno & 0xff) === 11 || (errno & 0xff) === 26)) return true;
|
|
7
|
+
return typeof code === "string"
|
|
8
|
+
&& /^(SQLITE_CORRUPT(?:_[A-Z]+)?|SQLITE_NOTADB)$/.test(code);
|
|
9
|
+
}
|
|
@@ -25,6 +25,8 @@ import { markResponseNonReplayable } from "../lib/upstream-retry";
|
|
|
25
25
|
* the management credential.
|
|
26
26
|
*/
|
|
27
27
|
export interface AdmissionModelScope {
|
|
28
|
+
/** Every inherited scope must also admit the final destination. */
|
|
29
|
+
readonly allOf?: readonly AdmissionModelScope[];
|
|
28
30
|
/** Resolved provider names this key may reach. Empty means every provider. */
|
|
29
31
|
readonly providers: readonly string[];
|
|
30
32
|
/** Resolved destinations this key may reach. Empty means every model. */
|
|
@@ -44,6 +46,11 @@ function providerAllowedByScope(scope: AdmissionModelScope, providerName: string
|
|
|
44
46
|
return scope.providers.length === 0 || scope.providers.includes(normalize(providerName));
|
|
45
47
|
}
|
|
46
48
|
|
|
49
|
+
function unnamedDestinationAllowedByScope(scope: AdmissionModelScope, providerName: string): boolean {
|
|
50
|
+
return providerAllowedByScope(scope, providerName) && scope.models.length === 0
|
|
51
|
+
&& (scope.allOf?.every(part => unnamedDestinationAllowedByScope(part, providerName)) ?? true);
|
|
52
|
+
}
|
|
53
|
+
|
|
47
54
|
function normalizedList(values: readonly string[] | undefined): readonly string[] {
|
|
48
55
|
if (!Array.isArray(values)) return [];
|
|
49
56
|
const seen = new Set<string>();
|
|
@@ -73,9 +80,13 @@ export function resolveAdmissionModelScope(
|
|
|
73
80
|
config: Pick<OcxConfig, "apiKeys">,
|
|
74
81
|
admission: DataPlaneAdmission | undefined,
|
|
75
82
|
): AdmissionModelScope | undefined {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
return entry ? admissionModelScopeOf(entry) : undefined;
|
|
83
|
+
const entry = admission?.kind === "configured"
|
|
84
|
+
? (config.apiKeys ?? []).find(key => key.id === admission.keyId) : undefined;
|
|
85
|
+
return intersectAdmissionModelScopes(entry ? admissionModelScopeOf(entry) : undefined, admission?.callerPolicy?.modelScope);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export function intersectAdmissionModelScopes(a: AdmissionModelScope | undefined, b: AdmissionModelScope | undefined): AdmissionModelScope | undefined {
|
|
89
|
+
return a && b ? { providers: [], models: [], allOf: [a, b] } : a ?? b;
|
|
79
90
|
}
|
|
80
91
|
|
|
81
92
|
/** Consent comes from stored operator config, never request headers. Use the full listener config. */
|
|
@@ -84,10 +95,15 @@ export function admissionMayUseMeteredComboTargets(
|
|
|
84
95
|
admission: DataPlaneAdmission | undefined,
|
|
85
96
|
combo?: { allowMeteredTargets?: boolean },
|
|
86
97
|
): boolean {
|
|
98
|
+
const caller = admission?.callerPolicy;
|
|
99
|
+
if (caller && (!caller.allowMeteredComboTargets || caller.meteredRequiresComboOptIn && combo?.allowMeteredTargets !== true)) return false;
|
|
87
100
|
if (admission?.kind === "configured") {
|
|
88
101
|
const entry = (config.apiKeys ?? []).find(key => key.id === admission.keyId);
|
|
89
102
|
return entry?.allowMeteredComboTargets === true;
|
|
90
103
|
}
|
|
104
|
+
// A loopback-admitted internal hop's captured policy already holds this branch's decision for
|
|
105
|
+
// its listener, or the consent of the validated key it presented (#7894); it was checked above.
|
|
106
|
+
if (admission?.kind === "loopback" && caller) return true;
|
|
91
107
|
// Linked ingress always carries keyed admission, even when the primary bind is loopback.
|
|
92
108
|
// A secondary loopback listener on a public proxy does not qualify either.
|
|
93
109
|
return (!admission || admission.kind === "loopback")
|
|
@@ -111,6 +127,7 @@ export function routeAllowedByScope(
|
|
|
111
127
|
route: ScopedRoute,
|
|
112
128
|
): boolean {
|
|
113
129
|
if (!scope) return true;
|
|
130
|
+
if (scope.allOf?.some(part => !routeAllowedByScope(part, route))) return false;
|
|
114
131
|
const model = normalize(route.modelId);
|
|
115
132
|
if (!providerAllowedByScope(scope, route.providerName)) return false;
|
|
116
133
|
if (scope.models.length === 0) return true;
|
|
@@ -226,7 +243,7 @@ export function admissionScopeDenial(
|
|
|
226
243
|
const scope = resolveAdmissionModelScope(config, admission);
|
|
227
244
|
if (!scope) return undefined;
|
|
228
245
|
const allowed = destination.modelId === undefined
|
|
229
|
-
?
|
|
246
|
+
? unnamedDestinationAllowedByScope(scope, destination.providerName)
|
|
230
247
|
: routeAllowedByScope(scope, { providerName: destination.providerName, modelId: destination.modelId });
|
|
231
248
|
if (allowed) return undefined;
|
|
232
249
|
return admissionModelDeniedResponse(new AdmissionModelDeniedError(
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import type { AdmissionModelScope } from "./admission-model-scope";
|
|
2
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
3
|
+
import { internalCallCapability, isInternalCallCapability } from "../lib/local-internal-call-capability";
|
|
4
|
+
import { immutableAdmissionPolicy } from "./capture-admission-policy";
|
|
5
|
+
|
|
6
|
+
export const ADVISOR_ADMISSION_POLICY_HEADER = "x-opencodex-advisor-admission-policy";
|
|
7
|
+
/** Routed helpers inherit policy without acquiring the Advisor recursion-suppression flag. */
|
|
8
|
+
export const SIDECAR_ADMISSION_POLICY_HEADER = "x-opencodex-sidecar-admission-policy";
|
|
9
|
+
export const SIDECAR_INTERNAL_CAPABILITY_HEADER = "x-opencodex-sidecar-internal";
|
|
10
|
+
const policies = new Map<string, { capability: string; policy: CapturedAdmissionPolicy }>();
|
|
11
|
+
|
|
12
|
+
/** A consult owns its registry entry until completion, failure or cancellation. */
|
|
13
|
+
export function registerAdvisorAdmissionPolicy(policy: CapturedAdmissionPolicy, signal?: AbortSignal) {
|
|
14
|
+
const token = Buffer.from(crypto.getRandomValues(new Uint8Array(32))).toString("base64url");
|
|
15
|
+
const release = () => {
|
|
16
|
+
policies.delete(token);
|
|
17
|
+
signal?.removeEventListener("abort", release);
|
|
18
|
+
};
|
|
19
|
+
if (!signal?.aborted) {
|
|
20
|
+
policies.set(token, { capability: internalCallCapability(), policy: immutableAdmissionPolicy(policy) });
|
|
21
|
+
signal?.addEventListener("abort", release, { once: true });
|
|
22
|
+
}
|
|
23
|
+
return { token, release };
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function readAdvisorAdmissionPolicy(token: string | null, capability: string | null): CapturedAdmissionPolicy | undefined {
|
|
27
|
+
if (!token || !isInternalCallCapability(capability)) return undefined;
|
|
28
|
+
const entry = policies.get(token);
|
|
29
|
+
return entry?.capability === capability ? entry.policy : undefined;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/** Scope metadata accepted only alongside the process-owned Advisor capability. */
|
|
33
|
+
export const ADVISOR_ADMISSION_SCOPE_HEADER = "x-opencodex-advisor-admission-scope";
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* The wire bound both ends share: the decoder refuses a longer value, so the encoder must
|
|
37
|
+
* refuse first rather than emit a header the peer is guaranteed to reject mid-request.
|
|
38
|
+
*/
|
|
39
|
+
export const MAX_ADVISOR_ADMISSION_SCOPE_VALUE_LENGTH = 16_384;
|
|
40
|
+
|
|
41
|
+
/** A scope whose encoded form exceeds the shared wire bound. */
|
|
42
|
+
export class AdvisorAdmissionScopeEncodedBoundExceeded extends Error {
|
|
43
|
+
constructor() {
|
|
44
|
+
super("advisor admission scope exceeds encoded bound");
|
|
45
|
+
this.name = "AdvisorAdmissionScopeEncodedBoundExceeded";
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export function encodeAdvisorAdmissionScope(scope: AdmissionModelScope): string {
|
|
50
|
+
const value = Buffer.from(JSON.stringify({ providers: scope.providers, models: scope.models }), "utf8").toString("base64url");
|
|
51
|
+
// Never truncate or drop the scope silently: losing it would let the consult run wider
|
|
52
|
+
// than the caller is allowed. The caller turns this into a controlled pre-fetch failure.
|
|
53
|
+
if (value.length > MAX_ADVISOR_ADMISSION_SCOPE_VALUE_LENGTH) {
|
|
54
|
+
throw new AdvisorAdmissionScopeEncodedBoundExceeded();
|
|
55
|
+
}
|
|
56
|
+
return value;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export function decodeAdvisorAdmissionScope(value: string | null): AdmissionModelScope | undefined {
|
|
60
|
+
if (!value || value.length > MAX_ADVISOR_ADMISSION_SCOPE_VALUE_LENGTH) return undefined;
|
|
61
|
+
try {
|
|
62
|
+
const parsed: unknown = JSON.parse(Buffer.from(value, "base64url").toString("utf8"));
|
|
63
|
+
if (!parsed || typeof parsed !== "object") return undefined;
|
|
64
|
+
const { providers, models } = parsed as { providers?: unknown; models?: unknown };
|
|
65
|
+
if (!Array.isArray(providers) || !Array.isArray(models)
|
|
66
|
+
|| providers.some(item => typeof item !== "string")
|
|
67
|
+
|| models.some(item => typeof item !== "string")) return undefined;
|
|
68
|
+
return { providers, models };
|
|
69
|
+
} catch {
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { formatErrorResponse } from "../bridge";
|
|
2
2
|
import {
|
|
3
3
|
CodexAccountCooldownError,
|
|
4
|
+
CodexAuthContextError,
|
|
4
5
|
CodexMainProfileDrainingError,
|
|
5
6
|
codexMainProfileDrainingResponse,
|
|
6
7
|
cooldownErrorResponse,
|
|
7
8
|
isCodexAuthContextUsable,
|
|
8
|
-
|
|
9
|
+
materializeCodexUpstreamAuthAsync,
|
|
9
10
|
releaseCodexAuthContextProbeLease,
|
|
10
11
|
resolveCodexAuthContext,
|
|
11
12
|
type CodexAuthContext,
|
|
12
13
|
} from "../codex/auth-context";
|
|
14
|
+
import { MAIN_CODEX_ACCOUNT_ID, MainAccountTokenRefreshError, MainAuthJsonChangedDuringRefreshError } from "../codex/main-account";
|
|
15
|
+
import { NativeProfileError } from "../codex/native-profile-types";
|
|
13
16
|
import { formatCodexProviderForLog } from "../codex/routing";
|
|
14
17
|
import type { AdmissionLease } from "../lib/admission";
|
|
15
18
|
import { captureExplicitOpenAiCallerAuth, resolveFirstUsableOpenAiSidecar, selectOpenAiImagesProvider } from "../providers/openai-sidecar";
|
|
@@ -25,6 +28,7 @@ import {
|
|
|
25
28
|
import { codexAccountSelectionForTurn } from "./lifecycle";
|
|
26
29
|
import type { RequestLogContext } from "./request-log";
|
|
27
30
|
import { authorizationCredential } from "../lib/authorization-scheme";
|
|
31
|
+
import { nativeMainRefreshFailureResponse } from "./responses/codex-auth-error";
|
|
28
32
|
|
|
29
33
|
export const TRANSCRIPTION_MODEL = "gpt-4o-transcribe";
|
|
30
34
|
export const LIVE_AUDIO_MODEL = "gpt-live-1-codex";
|
|
@@ -103,10 +107,11 @@ export async function resolveAudioUpstream(
|
|
|
103
107
|
signal: options.signal,
|
|
104
108
|
});
|
|
105
109
|
options.signal?.throwIfAborted();
|
|
106
|
-
selected =
|
|
110
|
+
selected = await materializeCodexUpstreamAuthAsync(headers, context, {
|
|
107
111
|
config,
|
|
108
112
|
admission: options.admission,
|
|
109
113
|
substituteMainCredential: true,
|
|
114
|
+
signal: options.signal,
|
|
110
115
|
});
|
|
111
116
|
} else {
|
|
112
117
|
const resolved = await resolveFirstUsableOpenAiSidecar(candidates.forwardCandidates, headers, config, {
|
|
@@ -172,6 +177,9 @@ export async function resolveAudioUpstream(
|
|
|
172
177
|
releaseCodexAuthContextProbeLease(context);
|
|
173
178
|
if (error instanceof CodexAccountCooldownError) return cooldownErrorResponse(error);
|
|
174
179
|
if (error instanceof CodexMainProfileDrainingError) return codexMainProfileDrainingResponse();
|
|
180
|
+
const mainCause = error instanceof CodexAuthContextError && error.accountId === MAIN_CODEX_ACCOUNT_ID ? error.cause : error;
|
|
181
|
+
if (mainCause instanceof MainAccountTokenRefreshError || mainCause instanceof MainAuthJsonChangedDuringRefreshError
|
|
182
|
+
|| (mainCause instanceof NativeProfileError && mainCause.retryable)) return nativeMainRefreshFailureResponse(mainCause);
|
|
175
183
|
return formatErrorResponse(401, "authentication_error", "Audio account authentication unavailable; reconnect the selected OpenAI account");
|
|
176
184
|
}
|
|
177
185
|
}
|
package/src/server/auth-cors.ts
CHANGED
|
@@ -53,6 +53,7 @@ let _corsOrigin = "http://localhost:10100";
|
|
|
53
53
|
// Listener identity is process-local. Never infer this trust from forwarded headers: the
|
|
54
54
|
// request handler marks a Request only after resolving the actual Bun Server instance.
|
|
55
55
|
const trustedHubManagementRequests = new WeakSet<Request>();
|
|
56
|
+
export function isTrustedHubManagementRequest(req: Request): boolean { return trustedHubManagementRequests.has(req); }
|
|
56
57
|
|
|
57
58
|
export function markTrustedHubManagementRequest(req: Request): void {
|
|
58
59
|
trustedHubManagementRequests.add(req);
|
|
@@ -432,10 +433,11 @@ function mintContextPrincipal(kind: string, keyId: string, credential: string):
|
|
|
432
433
|
.digest("hex");
|
|
433
434
|
}
|
|
434
435
|
|
|
435
|
-
export type DataPlaneAdmission =
|
|
436
|
+
export type DataPlaneAdmission = (
|
|
436
437
|
| { kind: "configured"; keyId: string; source: DataPlaneAdmissionSource; contextPrincipalId?: string }
|
|
437
438
|
| { kind: "environment"; source: DataPlaneAdmissionSource; contextPrincipalId?: string }
|
|
438
|
-
| { kind: "loopback"; source: "loopback" }
|
|
439
|
+
| { kind: "loopback"; source: "loopback" }
|
|
440
|
+
) & { readonly callerPolicy?: import("../types/admission-policy").CapturedAdmissionPolicy };
|
|
439
441
|
|
|
440
442
|
/**
|
|
441
443
|
* Which admission secret `token` is, or null when it is none of them.
|
|
@@ -513,6 +515,28 @@ export function resolveContextPrincipal(req: Request, config: OcxConfig, admissi
|
|
|
513
515
|
return undefined;
|
|
514
516
|
}
|
|
515
517
|
|
|
518
|
+
/** Stable structural replay identity. This does not replace process-local opaque-state ownership. */
|
|
519
|
+
export function resolveDurableReplayPrincipal(
|
|
520
|
+
req: Request,
|
|
521
|
+
config: Pick<OcxConfig, "apiKeys">,
|
|
522
|
+
admission: DataPlaneAdmission | undefined,
|
|
523
|
+
signingKey: Uint8Array,
|
|
524
|
+
): string | undefined {
|
|
525
|
+
if (!admission || signingKey.length !== 32) return undefined;
|
|
526
|
+
// The managed client sends this dedicated local credential; a thread id, User-Agent,
|
|
527
|
+
// loopback address or upstream bearer never establishes structural replay ownership.
|
|
528
|
+
const token = req.headers.get("x-opencodex-api-key")?.trim();
|
|
529
|
+
if (!token) return undefined;
|
|
530
|
+
const resolved = resolveDataPlaneAdmissionSecret(token, config, "dedicated");
|
|
531
|
+
if (!resolved) return undefined;
|
|
532
|
+
if (admission.kind !== "loopback" && (admission.kind !== resolved.kind
|
|
533
|
+
|| (admission.kind === "configured" && (resolved.kind !== "configured" || admission.keyId !== resolved.keyId)))) return undefined;
|
|
534
|
+
return createHmac("sha256", signingKey)
|
|
535
|
+
.update("opencodex.structural-replay-principal.v1\0")
|
|
536
|
+
.update(JSON.stringify([resolved.kind, resolved.kind === "configured" ? resolved.keyId : "", token]))
|
|
537
|
+
.digest("hex");
|
|
538
|
+
}
|
|
539
|
+
|
|
516
540
|
/** Whether `token` is a data-plane admission secret. */
|
|
517
541
|
export function isDataPlaneAdmissionSecret(token: string, config: OcxConfig): boolean {
|
|
518
542
|
return resolveDataPlaneAdmissionSecret(token, config) !== null;
|
|
@@ -1065,6 +1089,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1065
1089
|
annotateEmptyToolOutputs: "editor",
|
|
1066
1090
|
supportsServiceTier: "editor",
|
|
1067
1091
|
modelSupportsServiceTier: "editor",
|
|
1092
|
+
promoteAdditionalTools: "editor",
|
|
1068
1093
|
preserveResponsesReasoningContent: "editor",
|
|
1069
1094
|
preserveResponsesInputItemIds: "editor",
|
|
1070
1095
|
preserveResponsesMessageMetadata: "editor",
|
|
@@ -1170,6 +1195,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1170
1195
|
terminalContinuationGuard: "editor",
|
|
1171
1196
|
openaiChatEofTolerance: "editor",
|
|
1172
1197
|
foldDeveloperRoleToSystem: "editor",
|
|
1198
|
+
singleLeadingSystemMessage: "editor",
|
|
1173
1199
|
promptCacheKey: "editor",
|
|
1174
1200
|
chatServiceTier: "editor",
|
|
1175
1201
|
responsesItemIdRepair: "editor",
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** The public listener's bind spelling, shared with ownership discovery. */
|
|
2
|
+
export function normalizeBindHostname(hostname: string | undefined): string {
|
|
3
|
+
const configuredHost = hostname?.trim();
|
|
4
|
+
return !configuredHost || /^localhost\.?$/i.test(configuredHost) ? "127.0.0.1" : configuredHost;
|
|
5
|
+
}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import type { OcxConfig } from "../types";
|
|
2
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
3
|
+
import type { DataPlaneAdmission } from "./auth-cors";
|
|
4
|
+
import { resolveDataPlaneAdmissionSecret } from "./auth-cors";
|
|
5
|
+
import { admissionMayUseMeteredComboTargets, intersectAdmissionModelScopes, resolveAdmissionModelScope } from "./admission-model-scope";
|
|
6
|
+
import { fallbackDeviceIds } from "../routing/fallback-policy";
|
|
7
|
+
|
|
8
|
+
function freeze<T>(value: T): T {
|
|
9
|
+
if (value && typeof value === "object") {
|
|
10
|
+
for (const child of Object.values(value)) freeze(child);
|
|
11
|
+
Object.freeze(value);
|
|
12
|
+
}
|
|
13
|
+
return value;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export function immutableAdmissionPolicy(policy: CapturedAdmissionPolicy): CapturedAdmissionPolicy {
|
|
17
|
+
return freeze(structuredClone(policy));
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/** Combine already captured inputs without reading mutable caller or host configuration. */
|
|
21
|
+
export function intersectAdmissionPolicies(host: CapturedAdmissionPolicy, caller: CapturedAdmissionPolicy): CapturedAdmissionPolicy {
|
|
22
|
+
return immutableAdmissionPolicy({
|
|
23
|
+
modelScope: intersectAdmissionModelScopes(host.modelScope, caller.modelScope)!,
|
|
24
|
+
allowMeteredComboTargets: host.allowMeteredComboTargets && caller.allowMeteredComboTargets,
|
|
25
|
+
meteredRequiresComboOptIn: host.meteredRequiresComboOptIn || caller.meteredRequiresComboOptIn,
|
|
26
|
+
fallbackPolicies: [...host.fallbackPolicies, ...caller.fallbackPolicies],
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export function captureAdmissionPolicy(
|
|
31
|
+
config: Pick<OcxConfig, "apiKeys" | "hostname" | "fallback">,
|
|
32
|
+
admission?: DataPlaneAdmission,
|
|
33
|
+
modelScope = resolveAdmissionModelScope(config, admission),
|
|
34
|
+
): CapturedAdmissionPolicy {
|
|
35
|
+
return immutableAdmissionPolicy({
|
|
36
|
+
modelScope: modelScope ?? { providers: [], models: [] },
|
|
37
|
+
allowMeteredComboTargets: admissionMayUseMeteredComboTargets(config, admission, { allowMeteredTargets: true }),
|
|
38
|
+
meteredRequiresComboOptIn: !admission || admission.kind === "loopback"
|
|
39
|
+
|| admission.callerPolicy?.meteredRequiresComboOptIn === true,
|
|
40
|
+
fallbackPolicies: [
|
|
41
|
+
...(admission?.callerPolicy?.fallbackPolicies ?? []),
|
|
42
|
+
{ config: { fallback: config.fallback }, deviceIds: fallbackDeviceIds(config, admission) },
|
|
43
|
+
],
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** Attach constraints without changing the host's transport/principal identity. */
|
|
48
|
+
export function inheritAdmissionPolicy(
|
|
49
|
+
admission: DataPlaneAdmission | undefined,
|
|
50
|
+
callerPolicy: CapturedAdmissionPolicy,
|
|
51
|
+
): DataPlaneAdmission {
|
|
52
|
+
return Object.freeze({ ...(admission ?? { kind: "loopback", source: "loopback" }), callerPolicy }) as DataPlaneAdmission;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* Host policy of the data-plane credential an internal self-fetch presents (#7894).
|
|
57
|
+
*
|
|
58
|
+
* A loopback listener admits the self-fetch before it reads any token, so the listener snapshot
|
|
59
|
+
* says "loopback" and carries none of the selected key's model scope, paid-combo consent or
|
|
60
|
+
* device fallback identity. Call only after the internal capability and policy registration have
|
|
61
|
+
* been validated. Returns undefined when no credential is presented, and null when the data plane
|
|
62
|
+
* does not recognize it, which the caller must refuse rather than treat as unrestricted.
|
|
63
|
+
*/
|
|
64
|
+
export function captureSelfFetchCredentialPolicy(
|
|
65
|
+
req: Request,
|
|
66
|
+
config: Pick<OcxConfig, "apiKeys" | "hostname" | "fallback">,
|
|
67
|
+
): CapturedAdmissionPolicy | null | undefined {
|
|
68
|
+
const presented = req.headers.get("x-opencodex-api-key")?.trim();
|
|
69
|
+
if (!presented) return undefined;
|
|
70
|
+
const admission = resolveDataPlaneAdmissionSecret(presented, config, "dedicated");
|
|
71
|
+
return admission ? captureAdmissionPolicy(config, admission) : null;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* Host policy of an internal self-fetch whose presented credential was validated (#7894).
|
|
76
|
+
*
|
|
77
|
+
* Scope and fallback limits of the listener snapshot and the key both apply. Paid-combo consent
|
|
78
|
+
* is the key's own when a loopback listener admitted the hop: that snapshot holds only the
|
|
79
|
+
* loopback default, which a public proxy always refuses, so a consenting key would otherwise be
|
|
80
|
+
* weaker over Advisor than on a direct request. The loopback snapshot still demands the combo's
|
|
81
|
+
* own opt-in, and the caller's consent is intersected afterwards.
|
|
82
|
+
*/
|
|
83
|
+
export function selfFetchHostPolicy(
|
|
84
|
+
listener: CapturedAdmissionPolicy,
|
|
85
|
+
presented: CapturedAdmissionPolicy,
|
|
86
|
+
listenerAdmission: DataPlaneAdmission | undefined,
|
|
87
|
+
): CapturedAdmissionPolicy {
|
|
88
|
+
const merged = intersectAdmissionPolicies(listener, presented);
|
|
89
|
+
if (listenerAdmission && listenerAdmission.kind !== "loopback") return merged;
|
|
90
|
+
return immutableAdmissionPolicy({ ...merged, allowMeteredComboTargets: presented.allowMeteredComboTargets });
|
|
91
|
+
}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import { FORWARD_HEADERS } from "../adapters/openai-responses";
|
|
9
9
|
import {
|
|
10
10
|
assertChatCompletionsRoutingBody,
|
|
11
|
+
chatRawReasoningVisible,
|
|
11
12
|
ChatCompletionsRequestError,
|
|
12
13
|
} from "../chat/inbound";
|
|
13
14
|
import { chatSettingsBody, chatToResponsesBody } from "../protocols/codecs/chat";
|
|
@@ -22,6 +23,11 @@ import {
|
|
|
22
23
|
responsesSseToChatCompletionsSse,
|
|
23
24
|
} from "../chat/outbound";
|
|
24
25
|
import { ADVISOR_INTERNAL_CAPABILITY_HEADER, isInternalCallCapability } from "../lib/local-internal-call-capability";
|
|
26
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
27
|
+
import { ADVISOR_ADMISSION_SCOPE_HEADER, decodeAdvisorAdmissionScope, ADVISOR_ADMISSION_POLICY_HEADER, readAdvisorAdmissionPolicy, SIDECAR_ADMISSION_POLICY_HEADER, SIDECAR_INTERNAL_CAPABILITY_HEADER } from "./advisor-admission-scope";
|
|
28
|
+
import {
|
|
29
|
+
captureAdmissionPolicy, captureSelfFetchCredentialPolicy, inheritAdmissionPolicy, intersectAdmissionPolicies, selfFetchHostPolicy,
|
|
30
|
+
} from "./capture-admission-policy";
|
|
25
31
|
import { classifyError, cyberPolicyErrorType, CYBER_POLICY_ERROR_CODE, isCyberPolicyCode, UNDECLARED_TOOL_CALL_ERROR_CODE } from "../lib/errors";
|
|
26
32
|
import { redactSecretString } from "../lib/redact";
|
|
27
33
|
import { resolveClientRetryAfter } from "../lib/retry-after";
|
|
@@ -69,6 +75,7 @@ import type { AdmissionLease } from "../lib/admission";
|
|
|
69
75
|
import {
|
|
70
76
|
admissionModelDeniedResponse,
|
|
71
77
|
AdmissionModelDeniedError,
|
|
78
|
+
MODEL_NOT_ALLOWED_FOR_KEY,
|
|
72
79
|
assertRouteAllowedByScope,
|
|
73
80
|
resolveAdmissionModelScope,
|
|
74
81
|
} from "./admission-model-scope";
|
|
@@ -115,7 +122,10 @@ export async function handleChatCompletions(
|
|
|
115
122
|
req: Request,
|
|
116
123
|
config: OcxConfig,
|
|
117
124
|
logCtx: RequestLogContext,
|
|
118
|
-
logIds?: {
|
|
125
|
+
logIds?: {
|
|
126
|
+
requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
|
|
127
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
128
|
+
},
|
|
119
129
|
): Promise<Response> {
|
|
120
130
|
// Set before routing so pre-dispatch refusals stay correlated. A Hermes-only id is marked as a
|
|
121
131
|
// fallback, so a native id resolved later on the Responses bridge still replaces it.
|
|
@@ -149,8 +159,35 @@ async function handleChatCompletionsWithBudget(
|
|
|
149
159
|
config: OcxConfig,
|
|
150
160
|
logCtx: RequestLogContext,
|
|
151
161
|
translatorBudget: TranslatorBudget,
|
|
152
|
-
logIds?: {
|
|
162
|
+
logIds?: {
|
|
163
|
+
requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
|
|
164
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
165
|
+
},
|
|
153
166
|
): Promise<Response> {
|
|
167
|
+
const advisorInternal = isInternalCallCapability(req.headers.get(ADVISOR_INTERNAL_CAPABILITY_HEADER));
|
|
168
|
+
const sidecarInternal = isInternalCallCapability(req.headers.get(SIDECAR_INTERNAL_CAPABILITY_HEADER));
|
|
169
|
+
const callerPolicy = advisorInternal
|
|
170
|
+
? readAdvisorAdmissionPolicy(req.headers.get(ADVISOR_ADMISSION_POLICY_HEADER), req.headers.get(ADVISOR_INTERNAL_CAPABILITY_HEADER))
|
|
171
|
+
: readAdvisorAdmissionPolicy(req.headers.get(SIDECAR_ADMISSION_POLICY_HEADER), req.headers.get(SIDECAR_INTERNAL_CAPABILITY_HEADER));
|
|
172
|
+
const decodedScope = advisorInternal
|
|
173
|
+
? decodeAdvisorAdmissionScope(req.headers.get(ADVISOR_ADMISSION_SCOPE_HEADER))
|
|
174
|
+
: undefined;
|
|
175
|
+
// Only a validated internal hop gets its presented credential resolved; loopback admission for
|
|
176
|
+
// every other caller is untouched. An unknown credential fails closed (#7894).
|
|
177
|
+
const selfFetchPolicy = callerPolicy ? captureSelfFetchCredentialPolicy(req, config) : undefined;
|
|
178
|
+
if ((advisorInternal || sidecarInternal) && (!callerPolicy || selfFetchPolicy === null
|
|
179
|
+
|| advisorInternal && req.headers.has(ADVISOR_ADMISSION_SCOPE_HEADER) && !decodedScope)) {
|
|
180
|
+
// Refused requests still own a final log row like every other early rejection.
|
|
181
|
+
if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 403, { closeReason: "non_stream" });
|
|
182
|
+
return chatCompletionsErrorResponse(403, "invalid inherited advisor admission scope", "permission_error", MODEL_NOT_ALLOWED_FOR_KEY);
|
|
183
|
+
}
|
|
184
|
+
// The listener snapshot was captured at authentication; internal hops add the policy of the
|
|
185
|
+
// credential they selected (which loopback admission never read) and their frozen registration.
|
|
186
|
+
const listenerPolicy = logIds?.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, logIds?.admission);
|
|
187
|
+
const hostPolicy = selfFetchPolicy ? selfFetchHostPolicy(listenerPolicy, selfFetchPolicy, logIds?.admission) : listenerPolicy;
|
|
188
|
+
const advisorAdmissionPolicy = callerPolicy ? intersectAdmissionPolicies(hostPolicy, callerPolicy) : hostPolicy;
|
|
189
|
+
const admission = callerPolicy ? inheritAdmissionPolicy(logIds?.admission, advisorAdmissionPolicy) : logIds?.admission;
|
|
190
|
+
const inheritedAdmissionScope = callerPolicy ? advisorAdmissionPolicy.modelScope : undefined;
|
|
154
191
|
let chatBody: Rec;
|
|
155
192
|
try {
|
|
156
193
|
const rawBody = await readChatBody(req, translatorBudget, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
|
|
@@ -177,6 +214,8 @@ async function handleChatCompletionsWithBudget(
|
|
|
177
214
|
const droidDefaultEffort = effortRow
|
|
178
215
|
? undefined
|
|
179
216
|
: droidReasoningDefault(req.headers.get(DROID_DEFAULT_EFFORT_HEADER), chatBody);
|
|
217
|
+
// Read the caller's delivery choice before any generation default (Droid effort) is written.
|
|
218
|
+
const rawReasoningVisible = chatRawReasoningVisible(chatBody);
|
|
180
219
|
if (effortRow) chatBody.model = effortRow.baseId;
|
|
181
220
|
if (fastRow) {
|
|
182
221
|
chatBody.model = fastRow.baseId;
|
|
@@ -206,7 +245,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
206
245
|
);
|
|
207
246
|
// Native Chat must check its own destination; translated xAI OAuth turns
|
|
208
247
|
// preview the billed Fast lane before their final Responses scope check.
|
|
209
|
-
assertRouteAllowedByScope(resolveAdmissionModelScope(config, logIds?.admission), requestedModel, {
|
|
248
|
+
assertRouteAllowedByScope(inheritedAdmissionScope ?? resolveAdmissionModelScope(config, logIds?.admission), requestedModel, {
|
|
210
249
|
providerName: route.providerName,
|
|
211
250
|
modelId: previewXaiOauthWireModel({ options: {
|
|
212
251
|
serviceTier: typeof chatBody.service_tier === "string" ? chatBody.service_tier : undefined,
|
|
@@ -429,7 +468,6 @@ async function handleChatCompletionsWithBudget(
|
|
|
429
468
|
// authority comes from a process-owned capability minted at random per process and compared in
|
|
430
469
|
// constant time, so a forged header — or a token captured from an older process — is treated
|
|
431
470
|
// as an ordinary external request.
|
|
432
|
-
const advisorInternal = isInternalCallCapability(req.headers.get(ADVISOR_INTERNAL_CAPABILITY_HEADER));
|
|
433
471
|
// Concrete helper targets must fail before optional stored-main credential enrichment.
|
|
434
472
|
// Unresolved combos are checked after their concrete child route is selected in Responses.
|
|
435
473
|
if (settledRoute && !settledRoute.combo && isCanonicalOpenAiForwardProvider(settledRoute.provider)
|
|
@@ -512,12 +550,14 @@ async function handleChatCompletionsWithBudget(
|
|
|
512
550
|
...(logIds?.turnAdmissionLease ? { turnAdmissionLease: logIds.turnAdmissionLease } : {}),
|
|
513
551
|
// #1686: the Chat surface translates its body and replays here, so the admission fact has
|
|
514
552
|
// to ride along or a bearer-admitted Chat caller would still be refused by Direct.
|
|
515
|
-
...(
|
|
553
|
+
...(admission ? { admission } : {}),
|
|
554
|
+
advisorAdmissionPolicy,
|
|
516
555
|
// The bridge request carries no caller credential, so resolve the replay principal here.
|
|
517
556
|
replayPrincipal: { clientPrincipalId: resolveContextPrincipal(req, config, logIds?.admission) },
|
|
518
557
|
abortSignal: req.signal,
|
|
519
558
|
// Body is Responses-shaped by now, but the client spoke Chat Completions.
|
|
520
559
|
inboundWire: "chat",
|
|
560
|
+
chatRawReasoningVisible: rawReasoningVisible,
|
|
521
561
|
// A Chat caller may send an explicit empty `tools` array — a deny-all declaration the
|
|
522
562
|
// translation drops along with the whole catalog. Carried separately so the
|
|
523
563
|
// undeclared-tool guard can still enforce it; absent/partial catalogs stay deferred.
|
|
@@ -531,7 +571,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
531
571
|
req, config, envelope, requestedModel, requestedStream: stream, translatorBudget,
|
|
532
572
|
// Children run without logIds; the request's admission rides the source so their
|
|
533
573
|
// replay scope resolves the same caller principal as every other surface.
|
|
534
|
-
...(
|
|
574
|
+
...(admission ? { admission } : {}),
|
|
535
575
|
}),
|
|
536
576
|
} : {}),
|
|
537
577
|
// Terminal vision-describe marker (roadmap 180): the bridge rebuilds
|
|
@@ -539,6 +579,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
539
579
|
// header — so the fact is detected here and carried as an option flag.
|
|
540
580
|
...(visionDescribeTerminal ? { visionDescribeTerminal: true } : {}),
|
|
541
581
|
...(advisorInternal ? { advisorInternal: true } : {}),
|
|
582
|
+
...(inheritedAdmissionScope ? { admissionScope: inheritedAdmissionScope } : {}),
|
|
542
583
|
translatorBudget,
|
|
543
584
|
...(logIds ? { onFirstOutput: () => recordFirstOutput(logCtx, logIds.start) } : {}),
|
|
544
585
|
onNativePassthroughTerminal: status => finalizeNativeLog(httpStatusForRequestLogTerminal(status, logCtx), { terminalStatus: status, closeReason: "terminal" }),
|