@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
|
@@ -68,6 +68,7 @@ import type { RouteResult } from "../router";
|
|
|
68
68
|
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
69
69
|
import { fetchWithHeaderTimeout, physicalSendObserverInit, providerFetch, safeHostLabel, sendWithConnectionPolicy } from "./responses/fetch-helpers";
|
|
70
70
|
import { isLocalUpstream } from "../lib/local-upstream";
|
|
71
|
+
import { resolveConnectTimeoutMs, resolveJsonBodyReadTimeoutMs } from "../stall-timeout";
|
|
71
72
|
import { linkAbortSignal } from "./responses";
|
|
72
73
|
import {
|
|
73
74
|
noteProviderAttemptSend,
|
|
@@ -326,7 +327,8 @@ export async function runNativeChatAttempt(
|
|
|
326
327
|
streamTurnRegistered = false;
|
|
327
328
|
unregisterTurn(upstream);
|
|
328
329
|
};
|
|
329
|
-
|
|
330
|
+
// Set only at the final send boundary; queued refresh can replace the destination.
|
|
331
|
+
let localUpstream = false;
|
|
330
332
|
// Native chat is its own entry path -- chat-completions.ts routes here directly and never
|
|
331
333
|
// through the Responses core -- so the pre-dispatch key preference is applied again here
|
|
332
334
|
// rather than inherited. Assigned before the adapter binds below, for the same reason it is
|
|
@@ -483,7 +485,7 @@ export async function runNativeChatAttempt(
|
|
|
483
485
|
body: request.body,
|
|
484
486
|
}, effectiveRecovery),
|
|
485
487
|
upstream.signal,
|
|
486
|
-
|
|
488
|
+
0, // Final physical send owns the header clock after queued credential/destination refresh.
|
|
487
489
|
requestedStream,
|
|
488
490
|
providerFetch(activeProvider, undefined, {
|
|
489
491
|
providerName: route.providerName,
|
|
@@ -545,19 +547,21 @@ export async function runNativeChatAttempt(
|
|
|
545
547
|
noteProviderAttemptSend(logCtx, route.providerName, activeProvider, logCtx.usageLogInputTokens, transportRecovery ?? recovery);
|
|
546
548
|
// A reselected provider transport is still a physical send: the connection policy
|
|
547
549
|
// and manual-redirect ownership wrap the selected implementation (#4992).
|
|
548
|
-
|
|
550
|
+
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
549
551
|
distributedKeyPhysicalFetch((activeProvider as OcxProviderTransport).fetch ?? execute,
|
|
550
552
|
route.providerName, activeProvider, request.url),
|
|
553
|
+
String(input), physicalInit, { providerName: route.providerName, provider: activeProvider },
|
|
554
|
+
)) as typeof fetch;
|
|
555
|
+
localUpstream = isLocalUpstream(request.url);
|
|
556
|
+
dispatched = await fetchWithHeaderTimeout(
|
|
551
557
|
request.url,
|
|
552
558
|
applyUpstreamRecoveryInit({
|
|
553
559
|
...init, method: request.method, headers, body: request.body,
|
|
554
560
|
...physicalSendObserverInit(observeAutoPause, request.url),
|
|
555
561
|
}, transportRecovery),
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
// because that transport wins over the executor that carries the binding.
|
|
560
|
-
{ providerName: route.providerName, provider: activeProvider },
|
|
562
|
+
init.signal ?? upstream.signal,
|
|
563
|
+
resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream }),
|
|
564
|
+
requestedStream, physicalFetch,
|
|
561
565
|
);
|
|
562
566
|
} finally {
|
|
563
567
|
try { if (physicalBudget.spendEnforced) spendReport(1); }
|
|
@@ -816,7 +820,7 @@ export async function runNativeChatAttempt(
|
|
|
816
820
|
translatorBudget,
|
|
817
821
|
signal: upstream.signal,
|
|
818
822
|
stallTimeoutSec: config.stallTimeoutSec,
|
|
819
|
-
localUpstream
|
|
823
|
+
localUpstream,
|
|
820
824
|
clientDeclaredEmptyToolCatalog,
|
|
821
825
|
declaredLegacyFunctionNames,
|
|
822
826
|
onFirstOutput,
|
|
@@ -888,11 +892,12 @@ export async function runNativeChatAttempt(
|
|
|
888
892
|
|
|
889
893
|
let body;
|
|
890
894
|
try {
|
|
895
|
+
const jsonBodyReadMs = resolveJsonBodyReadTimeoutMs(config.stallTimeoutSec, { localUpstream }, config.connectTimeoutMs);
|
|
891
896
|
body = await readBoundedResponseBody(response, {
|
|
892
897
|
signal: upstream.signal,
|
|
893
898
|
maxBytes: MAX_NATIVE_CHAT_JSON_BYTES,
|
|
894
|
-
totalTimeoutMs:
|
|
895
|
-
inactivityTimeoutMs:
|
|
899
|
+
totalTimeoutMs: localUpstream ? 0 : jsonBodyReadMs,
|
|
900
|
+
inactivityTimeoutMs: jsonBodyReadMs,
|
|
896
901
|
});
|
|
897
902
|
} catch (error) {
|
|
898
903
|
cleanupAbort();
|
|
@@ -32,6 +32,8 @@ import { isKnownDesktop3pModelId, resolveDesktop3pAlias } from "../claude/deskto
|
|
|
32
32
|
import { resolveAlias, claudeCodeNativeAlias, legacyAliasForNative } from "../claude/alias";
|
|
33
33
|
import { recordDesktopRequest } from "../claude/desktop-health";
|
|
34
34
|
import { stripOneMillionMarker } from "../claude/context-windows";
|
|
35
|
+
import { captureAdmissionPolicy } from "./capture-admission-policy";
|
|
36
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
35
37
|
import { captureClaudeInbound } from "../claude/inbound-debug";
|
|
36
38
|
import { declaredAnthropicServerTools, replayedAnthropicServerBlocks } from "../claude/inbound-content-options";
|
|
37
39
|
import { claudeCodeForIngress } from "../claude/intercept/model-bindings";
|
|
@@ -58,6 +60,8 @@ import {
|
|
|
58
60
|
responsesSseToAnthropicSse,
|
|
59
61
|
} from "../claude/outbound";
|
|
60
62
|
import { clearableDeadline, idleDeadline } from "../lib/abort";
|
|
63
|
+
import { isLocalUpstream } from "../lib/local-upstream";
|
|
64
|
+
import { resolveConnectTimeoutMs } from "../stall-timeout";
|
|
61
65
|
import {
|
|
62
66
|
CLAUDE_NATIVE_THINKING,
|
|
63
67
|
type ClaudeThinkingProjection,
|
|
@@ -358,7 +362,9 @@ async function anthropicNativePassthrough(
|
|
|
358
362
|
const result = await fetchWithHeaderDeadline(
|
|
359
363
|
`${base}${pathname}${search}`,
|
|
360
364
|
{ method: "POST", headers, body: JSON.stringify(body) },
|
|
361
|
-
|
|
365
|
+
// Local Anthropic-compatible endpoints (a self-hosted base URL) disable the header deadline
|
|
366
|
+
// when the operator sets none, so a slow local prefill is not cut before the first header.
|
|
367
|
+
resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(base) }),
|
|
362
368
|
req.signal,
|
|
363
369
|
);
|
|
364
370
|
if (result.kind === "timeout") {
|
|
@@ -539,7 +545,10 @@ export async function handleClaudeMessages(
|
|
|
539
545
|
req: Request,
|
|
540
546
|
config: OcxConfig,
|
|
541
547
|
logCtx: RequestLogContext,
|
|
542
|
-
logIds?: {
|
|
548
|
+
logIds?: {
|
|
549
|
+
requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
|
|
550
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
551
|
+
},
|
|
543
552
|
requestPolicy: RequestPolicyView = config,
|
|
544
553
|
ingress: ClaudeIngressOptions = {},
|
|
545
554
|
): Promise<Response> {
|
|
@@ -582,7 +591,10 @@ async function handleClaudeMessagesWithBudget(
|
|
|
582
591
|
config: OcxConfig,
|
|
583
592
|
logCtx: RequestLogContext,
|
|
584
593
|
translatorBudget: TranslatorBudget,
|
|
585
|
-
logIds?: {
|
|
594
|
+
logIds?: {
|
|
595
|
+
requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
|
|
596
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
597
|
+
},
|
|
586
598
|
requestPolicy: RequestPolicyView = config,
|
|
587
599
|
ingress: ClaudeIngressOptions = {},
|
|
588
600
|
): Promise<Response> {
|
|
@@ -614,6 +626,8 @@ async function handleClaudeMessagesWithBudget(
|
|
|
614
626
|
// Built only under the reject policy; the legacy default leaves this request untouched.
|
|
615
627
|
let envelope: ProtocolEnvelope | undefined;
|
|
616
628
|
let messagesFeatures: () => Iterable<ProtocolFeature> = () => [];
|
|
629
|
+
// The Advisor caller policy is the admitted snapshot: capture it before the first await (#7859).
|
|
630
|
+
const advisorAdmissionPolicy = logIds?.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, logIds?.admission);
|
|
617
631
|
try {
|
|
618
632
|
anthropicBody = await readAnthropicBody(req, translatorBudget, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
|
|
619
633
|
// Defensive [1m] strip (devlog 138): clients normally remove the context-variant
|
|
@@ -956,6 +970,83 @@ async function handleClaudeMessagesWithBudget(
|
|
|
956
970
|
...(settledRoute?.provider.authMode === "oauth" && settledInstance
|
|
957
971
|
? { oauthFailoverQuorum: anthropicRoutingFor(settledInstance).hasAnthropicFailoverQuorum() } : {}),
|
|
958
972
|
};
|
|
973
|
+
if (settledRoute && isRec(anthropicBody)
|
|
974
|
+
&& nativeMessagesDeclineReason(settledRoute, anthropicBody, config, nativeSelector) === "bridge-only-policy"
|
|
975
|
+
&& nativeMessagesDeclineReason(settledRoute, anthropicBody, config, { ...nativeSelector, webSearchBackendAvailable: false }) === undefined) {
|
|
976
|
+
const { parseRequest } = await import("../responses/parser");
|
|
977
|
+
const { planWebSearch, shouldResolveOpenAiWebSearchSidecar } = await import("../web-search");
|
|
978
|
+
const replayConfig = buildClaudeReplayConfig(config);
|
|
979
|
+
const parsed = parseRequest(internalBody);
|
|
980
|
+
let openAiSidecar: import("../providers/openai-sidecar").ResolvedOpenAiForwardSidecar | undefined;
|
|
981
|
+
if (shouldResolveOpenAiWebSearchSidecar(replayConfig, parsed, false)) {
|
|
982
|
+
const { listOpenAiForwardSidecarCandidates, captureExplicitOpenAiCallerAuth, resolveFirstUsableOpenAiSidecar } = await import("../providers/openai-sidecar");
|
|
983
|
+
const candidates = listOpenAiForwardSidecarCandidates(replayConfig);
|
|
984
|
+
const headers = new Headers();
|
|
985
|
+
for (const name of FORWARD_HEADERS) {
|
|
986
|
+
if (name === "authorization" || name === "chatgpt-account-id") continue;
|
|
987
|
+
const value = req.headers.get(name);
|
|
988
|
+
if (value) headers.set(name, value);
|
|
989
|
+
}
|
|
990
|
+
const { codexAccountSelectionForTurn, tryAdmitTurn } = await import("./lifecycle");
|
|
991
|
+
// The probe owns its claim only until selection completes, not for the client turn.
|
|
992
|
+
const probeLease = logIds?.turnAdmissionLease && candidates.length ? tryAdmitTurn() : undefined;
|
|
993
|
+
const errors = await import("../codex/auth-context");
|
|
994
|
+
try {
|
|
995
|
+
req.signal.throwIfAborted();
|
|
996
|
+
if (logIds?.turnAdmissionLease && candidates.length && !probeLease) {
|
|
997
|
+
// No independent admission means availability is unknown; preserve the bridge.
|
|
998
|
+
nativeSelector.webSearchBackendAvailable = true;
|
|
999
|
+
} else {
|
|
1000
|
+
if (candidates.some(candidate => candidate.accountMode === "direct") && probeLease) {
|
|
1001
|
+
if (!tryClaimNativeMainProfileForTurn(probeLease)) {
|
|
1002
|
+
nativeSelector.webSearchBackendAvailable = true;
|
|
1003
|
+
} else {
|
|
1004
|
+
const { getMainAccountToken } = await import("../codex/main-account");
|
|
1005
|
+
const token = getMainAccountToken();
|
|
1006
|
+
if (token) {
|
|
1007
|
+
const auth = captureExplicitOpenAiCallerAuth(new Headers({ authorization: `Bearer ${token.accessToken}`, "chatgpt-account-id": token.chatgptAccountId }), replayConfig);
|
|
1008
|
+
if (auth) { headers.set("authorization", auth.authorization); headers.set("chatgpt-account-id", auth.chatgptAccountId); }
|
|
1009
|
+
}
|
|
1010
|
+
}
|
|
1011
|
+
}
|
|
1012
|
+
openAiSidecar = await resolveFirstUsableOpenAiSidecar(candidates, headers, replayConfig, {
|
|
1013
|
+
admission: logIds?.admission, codexAuthPolicy: config, signal: req.signal,
|
|
1014
|
+
beginCodexAccountSelection: codexAccountSelectionForTurn(probeLease ?? undefined),
|
|
1015
|
+
});
|
|
1016
|
+
req.signal.throwIfAborted();
|
|
1017
|
+
// The bridge can inject main auth into pool selection. Only a negative pool probe
|
|
1018
|
+
// needs this extra read; an unavailable claim or present token leaves it uncertain.
|
|
1019
|
+
if (!openAiSidecar && probeLease && candidates.some(candidate => candidate.accountMode === "pool")) {
|
|
1020
|
+
if (!tryClaimNativeMainProfileForTurn(probeLease)) nativeSelector.webSearchBackendAvailable = true;
|
|
1021
|
+
else {
|
|
1022
|
+
const { getMainAccountToken } = await import("../codex/main-account");
|
|
1023
|
+
if (getMainAccountToken()) nativeSelector.webSearchBackendAvailable = true;
|
|
1024
|
+
}
|
|
1025
|
+
}
|
|
1026
|
+
}
|
|
1027
|
+
} catch (err) {
|
|
1028
|
+
// Refresh wraps cancellation in CodexAuthContextError; a cancelled request must not continue.
|
|
1029
|
+
if (req.signal.aborted) {
|
|
1030
|
+
openAiSidecar?.releaseProbeLease?.();
|
|
1031
|
+
throw req.signal.reason ?? err;
|
|
1032
|
+
}
|
|
1033
|
+
if (!(err instanceof errors.CodexPoolAuthenticationError) && !(err instanceof errors.CodexAuthContextError)
|
|
1034
|
+
&& !(err instanceof errors.CodexAccountCooldownError) && !(err instanceof errors.CodexThreadAffinityExpiredError)
|
|
1035
|
+
&& !(err instanceof errors.CodexMainProfileDrainingError)) {
|
|
1036
|
+
openAiSidecar?.releaseProbeLease?.();
|
|
1037
|
+
throw err;
|
|
1038
|
+
}
|
|
1039
|
+
if (probeLease && candidates.some(candidate => candidate.accountMode === "pool")) nativeSelector.webSearchBackendAvailable = true;
|
|
1040
|
+
} finally { probeLease?.release(); }
|
|
1041
|
+
}
|
|
1042
|
+
try {
|
|
1043
|
+
nativeSelector.webSearchBackendAvailable ??= !!planWebSearch(replayConfig, parsed, false, settledRoute.provider, settledRoute.modelId, openAiSidecar, {
|
|
1044
|
+
admission: logIds?.admission, codexAuthPolicy: config, providerName: settledRoute.providerName,
|
|
1045
|
+
});
|
|
1046
|
+
} finally {
|
|
1047
|
+
openAiSidecar?.releaseProbeLease?.();
|
|
1048
|
+
}
|
|
1049
|
+
}
|
|
959
1050
|
const nativeDecline = settledRoute && isRec(anthropicBody)
|
|
960
1051
|
? nativeMessagesDeclineReason(settledRoute, anthropicBody, config, nativeSelector)
|
|
961
1052
|
: "rollout-disabled";
|
|
@@ -1118,6 +1209,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1118
1209
|
// Routing keeps Claude-only sidecar overrides; admission policy must follow the live owner.
|
|
1119
1210
|
codexAuthPolicy: config,
|
|
1120
1211
|
...(logIds?.admission ? { admission: logIds.admission } : {}),
|
|
1212
|
+
advisorAdmissionPolicy,
|
|
1121
1213
|
// The translated request never forwards the caller credential; resolve the principal first.
|
|
1122
1214
|
replayPrincipal: { clientPrincipalId: resolveContextPrincipal(req, config, logIds?.admission) },
|
|
1123
1215
|
...(logIds?.turnAdmissionLease ? { turnAdmissionLease: logIds.turnAdmissionLease } : {}),
|
|
@@ -1138,6 +1230,10 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1138
1230
|
// Out of body like the replay above: the core hands these to an Anthropic destination only.
|
|
1139
1231
|
anthropicServerTools: declaredAnthropicServerTools(anthropicBody),
|
|
1140
1232
|
anthropicServerReplay: replayedAnthropicServerBlocks(anthropicBody),
|
|
1233
|
+
// Preserve the original catalog through late fallback; only the physical adapter projects it.
|
|
1234
|
+
anthropicToolLoadingSource: cacheKeySource === "metadata" && isRec(anthropicBody)
|
|
1235
|
+
&& Array.isArray(cc?.appendOnlyToolLoadingModels) && cc.appendOnlyToolLoadingModels.length > 0
|
|
1236
|
+
? { tools: anthropicBody.tools, messages: anthropicBody.messages, tool_choice: anthropicBody.tool_choice } : undefined,
|
|
1141
1237
|
claudeGoAffinity: { sessionLane: claudeGoSessionLane },
|
|
1142
1238
|
claudeNativeSessionId,
|
|
1143
1239
|
stripClaudeMainAuthForNoncanonicalForward: true,
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { websocketsEnabled } from "../config";
|
|
2
|
+
import { omitDisabledNativeCatalogEntries } from "../codex/catalog/native-omission";
|
|
3
|
+
import type { OcxConfig } from "../types";
|
|
4
|
+
import { buildCatalogEntries } from "../codex/catalog/build-entries";
|
|
5
|
+
import { loadCatalogTemplate } from "../codex/catalog/bundled";
|
|
6
|
+
import { applyNativeVisibility, nativeContextLimits } from "../codex/catalog/metadata";
|
|
7
|
+
import { readCatalog, readCodexCatalogPath, type CatalogModel } from "../codex/catalog/parsing";
|
|
8
|
+
import { readNativeBaseline, retainedNativeSourcePriorities } from "../codex/catalog/native-priority";
|
|
9
|
+
|
|
10
|
+
interface CodexModelListInput {
|
|
11
|
+
config: OcxConfig;
|
|
12
|
+
nativeSlugs: string[];
|
|
13
|
+
availableAccountNativeSlugs: string[];
|
|
14
|
+
accountNativeSlugs: string[];
|
|
15
|
+
accountNativeSlugsBySelector: ReadonlyMap<string, readonly string[]>;
|
|
16
|
+
goOrdered: CatalogModel[];
|
|
17
|
+
exactComboSlugs: ReadonlySet<string>;
|
|
18
|
+
accountSelectors: string[];
|
|
19
|
+
suppressedBareNativeSlugs: ReadonlySet<string>;
|
|
20
|
+
disabledModels: ReadonlySet<string>;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** Read-only Codex-shaped discovery; publication and backup creation belong to sync. */
|
|
24
|
+
export function buildCodexModelList({
|
|
25
|
+
config, nativeSlugs, availableAccountNativeSlugs, accountNativeSlugs,
|
|
26
|
+
accountNativeSlugsBySelector, goOrdered, exactComboSlugs, accountSelectors,
|
|
27
|
+
suppressedBareNativeSlugs, disabledModels,
|
|
28
|
+
}: CodexModelListInput) {
|
|
29
|
+
const catalogPath = readCodexCatalogPath();
|
|
30
|
+
const nativeSource = {
|
|
31
|
+
baseline: readNativeBaseline(catalogPath),
|
|
32
|
+
retainedBySlug: retainedNativeSourcePriorities(readCatalog(catalogPath)?.models ?? []),
|
|
33
|
+
};
|
|
34
|
+
const maMode = config.multiAgentMode === "v1" || config.multiAgentMode === "v2" ? config.multiAgentMode : "default";
|
|
35
|
+
// Account rows include hidden supported ids so newly re-enabled natives reappear before sync.
|
|
36
|
+
const catalogNativeSlugs = accountSelectors.length > 0
|
|
37
|
+
? [...new Set([...availableAccountNativeSlugs, ...accountNativeSlugs])]
|
|
38
|
+
: nativeSlugs;
|
|
39
|
+
const entries = buildCatalogEntries(
|
|
40
|
+
loadCatalogTemplate(), catalogNativeSlugs, goOrdered, config.subagentModels,
|
|
41
|
+
websocketsEnabled(config), maMode, exactComboSlugs, accountSelectors,
|
|
42
|
+
suppressedBareNativeSlugs, new Set(), nativeContextLimits(config), accountNativeSlugs,
|
|
43
|
+
accountNativeSlugsBySelector, config.keepNativeChatGptOnV1 === true, config.modelPickerOrder,
|
|
44
|
+
nativeSource,
|
|
45
|
+
);
|
|
46
|
+
return { models: omitDisabledNativeCatalogEntries(applyNativeVisibility(entries, disabledModels, accountSelectors.length > 0, new Set(accountNativeSlugs)), config) };
|
|
47
|
+
}
|
|
@@ -163,6 +163,11 @@ function build(configRead: StoreRead, authRead: StoreRead, signature: string, no
|
|
|
163
163
|
|| (config.value.providers !== undefined && !isRecord(config.value.providers)))) complete = false;
|
|
164
164
|
if (authSig !== "absent" && auth.ok && !isRecord(auth.value)) complete = false;
|
|
165
165
|
if (isRecord(config.value) && isRecord(config.value.providers)) walkProvider(config.value.providers, 0);
|
|
166
|
+
if (isRecord(config.value) && isRecord(config.value.codexRoleCapability)
|
|
167
|
+
&& isRecord(config.value.codexRoleCapability.artificialAnalysis)) {
|
|
168
|
+
const key = config.value.codexRoleCapability.artificialAnalysis.apiKey;
|
|
169
|
+
addReference(typeof key === "string" ? key.trim() : key);
|
|
170
|
+
}
|
|
166
171
|
if (isRecord(auth.value)) walkAuth(auth.value, 0);
|
|
167
172
|
|
|
168
173
|
const names = [...envNames].sort();
|
|
@@ -12,10 +12,13 @@ import {
|
|
|
12
12
|
|
|
13
13
|
export type GuiSessionIssuance =
|
|
14
14
|
| "loopback"
|
|
15
|
+
| "remembered-admin"
|
|
15
16
|
| "tailscale-identity"
|
|
16
17
|
| "pairing";
|
|
17
18
|
|
|
18
19
|
export interface GuiSessionRecord {
|
|
20
|
+
persistentDigest?: string;
|
|
21
|
+
persistentExpiresAt?: number;
|
|
19
22
|
serverOrigin: string;
|
|
20
23
|
browserOrigin: string;
|
|
21
24
|
csrfToken: string;
|
|
@@ -129,7 +132,7 @@ function evictOldestSession(state: GuiSessionState): void {
|
|
|
129
132
|
}
|
|
130
133
|
}
|
|
131
134
|
|
|
132
|
-
function mintSession(
|
|
135
|
+
export function mintSession(
|
|
133
136
|
serverOrigin: string,
|
|
134
137
|
browserOrigin: string,
|
|
135
138
|
issuance: GuiSessionIssuance,
|
|
@@ -458,6 +461,6 @@ export function authorizeGuiSessionRequest(
|
|
|
458
461
|
const csrf = req.headers.get("x-opencodex-csrf-token")?.trim();
|
|
459
462
|
if (!csrf || !equalSecret(csrf, session.csrfToken)) return { ok: false, reason: "csrf" };
|
|
460
463
|
}
|
|
461
|
-
if (session.issuance !== "loopback" && !session.localPairing) session.expiresAt = now + REMOTE_GUI_SESSION_TTL_MS;
|
|
464
|
+
if (session.issuance !== "loopback" && !session.localPairing) session.expiresAt = Math.min(now + REMOTE_GUI_SESSION_TTL_MS, session.persistentExpiresAt ?? Infinity);
|
|
462
465
|
return { ok: true, principal: "gui-session", session };
|
|
463
466
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {
|
|
2
|
-
MAX_CONFIGURABLE_INBOUND_BODY_BYTES,
|
|
3
2
|
MAX_DECOMPRESSED_BODY_BYTES,
|
|
4
3
|
resolveInboundBodyLimitBytes,
|
|
5
4
|
} from "./request-decompress";
|
|
@@ -7,17 +6,16 @@ import { withCors, type RequestPolicyView } from "./auth-cors";
|
|
|
7
6
|
import { codexCompatibleUrl } from "../codex/context-compat";
|
|
8
7
|
import { addFinalRequestLog, markLocalRequestLogRefusal } from "./request-log";
|
|
9
8
|
import type { WorkflowRefusalLog } from "./workflow-refusal";
|
|
9
|
+
import { inboundBodyBudget, bindInboundBodyLease, type InboundBodyBudget } from "./inbound-body-budget";
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
export const MAX_CONCURRENT_INBOUND_BODY_BYTES = MAX_CONFIGURABLE_INBOUND_BODY_BYTES;
|
|
13
|
-
let reservedInboundBodyBytes = 0;
|
|
11
|
+
export { configureInboundBodyBudget, MAX_CONCURRENT_INBOUND_BODY_BYTES } from "./inbound-body-budget";
|
|
14
12
|
|
|
15
13
|
// Match the HTTP routes whose JSON readers use maxInboundBodyBytes. Keep the
|
|
16
14
|
// current image/search/count_tokens support; management, audio, context relay,
|
|
17
15
|
// and WebSocket frames have separate limits and are not part of this gate.
|
|
18
16
|
// Exported so the contract tests classify the dispatcher's own route list
|
|
19
17
|
// instead of copying it: a new loopback route has to land in one of these two
|
|
20
|
-
// sets, or `tests/server/
|
|
18
|
+
// sets, or `tests/server/inbound-body-admission.test.ts` fails.
|
|
21
19
|
export const CONFIGURABLE_JSON_BODY_ROUTES: ReadonlySet<string> = new Set([
|
|
22
20
|
"/v1/responses",
|
|
23
21
|
"/v1/responses/compact",
|
|
@@ -139,6 +137,7 @@ function retainUntilResponseSettles(response: Response, signal: AbortSignal, rel
|
|
|
139
137
|
* EOF/error or settled cancellation. Call only at the admitted HTTP boundary,
|
|
140
138
|
* after auth/origin checks, not from readers or internal combo/translation hops.
|
|
141
139
|
* pathname is the same canonical pathname used by the server's dispatcher.
|
|
140
|
+
* The optional budget/wait override isolates lifecycle tests from the process-wide owner.
|
|
142
141
|
*/
|
|
143
142
|
export async function withRaisedInboundBodyAdmission(
|
|
144
143
|
req: Request,
|
|
@@ -146,6 +145,7 @@ export async function withRaisedInboundBodyAdmission(
|
|
|
146
145
|
configuredLimit: number | undefined,
|
|
147
146
|
work: () => Promise<Response>,
|
|
148
147
|
onRefusal: (response: Response) => Response = response => response,
|
|
148
|
+
options?: { budget?: InboundBodyBudget; maxWaitMs?: number },
|
|
149
149
|
): Promise<Response> {
|
|
150
150
|
const maxBytes = resolveInboundBodyLimitBytes(configuredLimit);
|
|
151
151
|
if (req.method !== "POST" || !CONFIGURABLE_JSON_BODY_ROUTES.has(pathname)
|
|
@@ -159,18 +159,26 @@ export async function withRaisedInboundBodyAdmission(
|
|
|
159
159
|
// protocol-specific 413 win over temporary capacity refusal, unchanged.
|
|
160
160
|
return work();
|
|
161
161
|
}
|
|
162
|
-
|
|
162
|
+
let lease;
|
|
163
|
+
try {
|
|
164
|
+
lease = await (options?.budget ?? inboundBodyBudget).acquire(maxBytes, req.signal, options?.maxWaitMs);
|
|
165
|
+
} catch (error) {
|
|
166
|
+
cancelUnreadBody(req, error);
|
|
167
|
+
throw error;
|
|
168
|
+
}
|
|
169
|
+
if (!lease) {
|
|
163
170
|
const error = new InboundBodyCapacityError();
|
|
164
171
|
cancelUnreadBody(req, error);
|
|
165
172
|
return onRefusal(capacityResponse(pathname, error));
|
|
166
173
|
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
+
// An immediate grant can race a disconnect before this async function resumes.
|
|
175
|
+
if (req.signal.aborted) {
|
|
176
|
+
lease.release();
|
|
177
|
+
cancelUnreadBody(req, req.signal.reason);
|
|
178
|
+
throw req.signal.reason;
|
|
179
|
+
}
|
|
180
|
+
const unbind = bindInboundBodyLease(req, lease);
|
|
181
|
+
const release = (): void => { unbind(); lease.release(); };
|
|
174
182
|
try {
|
|
175
183
|
return retainUntilResponseSettles(await work(), req.signal, release);
|
|
176
184
|
} catch (error) {
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import { DEFAULT_CONCURRENT_INBOUND_BODY_BYTES, resolveConcurrentInboundBodyLimitBytes } from "../lib/inbound-body-policy";
|
|
2
|
+
export { DEFAULT_CONCURRENT_INBOUND_BODY_BYTES, MAX_CONCURRENT_INBOUND_BODY_BYTES } from "../lib/inbound-body-policy";
|
|
3
|
+
export const MAX_QUEUED_INBOUND_BODIES = 32;
|
|
4
|
+
export const INBOUND_BODY_QUEUE_TIMEOUT_MS = 120_000;
|
|
5
|
+
|
|
6
|
+
export interface InboundBodyLease {
|
|
7
|
+
/** Return unused allowance after the bounded reader measures the accepted body. */
|
|
8
|
+
shrink(bytes: number): void;
|
|
9
|
+
/** Return the remaining charge exactly once when the HTTP owner settles. */
|
|
10
|
+
release(): void;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
/** FIFO admission whose bounded waiters neither read uploads nor own reservations. */
|
|
14
|
+
export function createInboundBodyBudget(capacity: number, maxQueued = MAX_QUEUED_INBOUND_BODIES) {
|
|
15
|
+
if (!Number.isSafeInteger(capacity) || capacity <= 0
|
|
16
|
+
|| !Number.isSafeInteger(maxQueued) || maxQueued < 0) {
|
|
17
|
+
throw new RangeError("Invalid inbound body budget");
|
|
18
|
+
}
|
|
19
|
+
let reservedBytes = 0;
|
|
20
|
+
let activeLeases = 0;
|
|
21
|
+
const pending: Array<{ bytes: number; admit(): void }> = [];
|
|
22
|
+
/** Only the FIFO head may consume newly available capacity. */
|
|
23
|
+
const drain = (): void => {
|
|
24
|
+
while (pending.length && pending[0]!.bytes <= capacity - reservedBytes) pending[0]!.admit();
|
|
25
|
+
};
|
|
26
|
+
/** Charge an allowance and give its HTTP owner an idempotent release handle. */
|
|
27
|
+
const grant = (bytes: number): InboundBodyLease => {
|
|
28
|
+
let held = bytes;
|
|
29
|
+
let released = false;
|
|
30
|
+
reservedBytes += held;
|
|
31
|
+
activeLeases++;
|
|
32
|
+
return {
|
|
33
|
+
/** Never increase a reservation or accept an invalid measurement. */
|
|
34
|
+
shrink(measured) {
|
|
35
|
+
if (released || !Number.isFinite(measured) || measured < 0) return;
|
|
36
|
+
const next = Math.min(held, Math.max(1, Math.ceil(measured)));
|
|
37
|
+
reservedBytes -= held - next;
|
|
38
|
+
held = next;
|
|
39
|
+
drain();
|
|
40
|
+
},
|
|
41
|
+
/** Free only this lease, including when EOF and cancellation race. */
|
|
42
|
+
release() {
|
|
43
|
+
if (released) return;
|
|
44
|
+
released = true;
|
|
45
|
+
reservedBytes -= held;
|
|
46
|
+
activeLeases--;
|
|
47
|
+
drain();
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
return {
|
|
52
|
+
/** Report the current shared allowance without confusing it with measured charges. */
|
|
53
|
+
capacity: () => capacity,
|
|
54
|
+
/** Startup configuration changes the same owner; existing leases and FIFO waiters survive. */
|
|
55
|
+
setCapacity(bytes: number): void {
|
|
56
|
+
if (!Number.isSafeInteger(bytes) || bytes <= 0) throw new RangeError("Invalid inbound body capacity");
|
|
57
|
+
capacity = bytes;
|
|
58
|
+
drain();
|
|
59
|
+
},
|
|
60
|
+
/** Observe counters without exposing request bodies or identities. */
|
|
61
|
+
snapshot: () => ({ reservedBytes, activeLeases, queuedRequests: pending.length }),
|
|
62
|
+
/** Wait for an entire upload allowance; null preserves the caller's overload response. */
|
|
63
|
+
acquire(bytes: number, signal: AbortSignal, waitMs = INBOUND_BODY_QUEUE_TIMEOUT_MS): Promise<InboundBodyLease | null> {
|
|
64
|
+
if (!Number.isSafeInteger(bytes) || bytes <= 0 || bytes > capacity) {
|
|
65
|
+
return Promise.reject(new RangeError("Invalid inbound body reservation"));
|
|
66
|
+
}
|
|
67
|
+
if (signal.aborted) return Promise.reject(signal.reason);
|
|
68
|
+
if (!pending.length && bytes <= capacity - reservedBytes) return Promise.resolve(grant(bytes));
|
|
69
|
+
if (pending.length >= maxQueued || !Number.isFinite(waitMs) || waitMs <= 0) return Promise.resolve(null);
|
|
70
|
+
return new Promise<InboundBodyLease | null>((resolve, reject) => {
|
|
71
|
+
let settled = false;
|
|
72
|
+
let timer: ReturnType<typeof setTimeout>;
|
|
73
|
+
/** Detach every waiter resource before admitting, timing out, or rejecting it. */
|
|
74
|
+
const cleanup = (): void => {
|
|
75
|
+
settled = true;
|
|
76
|
+
clearTimeout(timer);
|
|
77
|
+
signal.removeEventListener("abort", onAbort);
|
|
78
|
+
const index = pending.indexOf(entry);
|
|
79
|
+
if (index >= 0) pending.splice(index, 1);
|
|
80
|
+
};
|
|
81
|
+
/** A cancelled head must not strand a smaller eligible follower. */
|
|
82
|
+
const onAbort = (): void => {
|
|
83
|
+
if (settled) return;
|
|
84
|
+
cleanup();
|
|
85
|
+
reject(signal.reason);
|
|
86
|
+
drain();
|
|
87
|
+
};
|
|
88
|
+
const entry = { bytes,
|
|
89
|
+
/** Transfer a queued caller to a charged lease once, before resolving it. */
|
|
90
|
+
admit() {
|
|
91
|
+
if (settled) return;
|
|
92
|
+
cleanup();
|
|
93
|
+
resolve(grant(bytes));
|
|
94
|
+
},
|
|
95
|
+
};
|
|
96
|
+
pending.push(entry);
|
|
97
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
98
|
+
timer = setTimeout(() => {
|
|
99
|
+
if (settled) return;
|
|
100
|
+
cleanup();
|
|
101
|
+
resolve(null);
|
|
102
|
+
drain();
|
|
103
|
+
}, Math.min(waitMs, INBOUND_BODY_QUEUE_TIMEOUT_MS));
|
|
104
|
+
if (signal.aborted) onAbort();
|
|
105
|
+
});
|
|
106
|
+
},
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
export type InboundBodyBudget = ReturnType<typeof createInboundBodyBudget>;
|
|
111
|
+
export const inboundBodyBudget = createInboundBodyBudget(DEFAULT_CONCURRENT_INBOUND_BODY_BYTES);
|
|
112
|
+
const requestLeases = new WeakMap<Request, InboundBodyLease>();
|
|
113
|
+
|
|
114
|
+
/** Adopt one startup policy for every listener without resetting live accounting. */
|
|
115
|
+
export function configureInboundBodyBudget(configured?: number): void {
|
|
116
|
+
inboundBodyBudget.setCapacity(resolveConcurrentInboundBodyLimitBytes(configured));
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/** Connect only the admitted HTTP request to its bounded reader; internal reads own no lease. */
|
|
120
|
+
export function bindInboundBodyLease(req: Request, lease: InboundBodyLease): () => void {
|
|
121
|
+
requestLeases.set(req, lease);
|
|
122
|
+
return () => { if (requestLeases.get(req) === lease) requestLeases.delete(req); };
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/** Only an accepted, measured body can replace an HTTP owner's upload allowance. */
|
|
126
|
+
export function updateInboundBodyReservation(req: Request, bytes: number): void {
|
|
127
|
+
requestLeases.get(req)?.shrink(bytes);
|
|
128
|
+
}
|
|
@@ -26,6 +26,8 @@ export interface LinkListenerStartContext<T> {
|
|
|
26
26
|
dispatch: (req: Request, server: Server<T>) => Promise<Response>;
|
|
27
27
|
maxRequestBodySize: number;
|
|
28
28
|
keyFingerprints?: (apiKeyId: string) => readonly string[];
|
|
29
|
+
/** The Home supervisor's current tunnel connection for a link (relay-auth.ts). */
|
|
30
|
+
connectionGeneration?: (linkId: string) => string | undefined;
|
|
29
31
|
}
|
|
30
32
|
|
|
31
33
|
export interface LinkListenerDeps {
|
|
@@ -112,7 +114,7 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
112
114
|
return;
|
|
113
115
|
}
|
|
114
116
|
const requestedPort = store.listenerPort ?? 0;
|
|
115
|
-
const sessions = createLinkRelaySessions({ peers, fingerprints: (keyId, linkId) => {
|
|
117
|
+
const sessions = createLinkRelaySessions({ peers, connectionGeneration: linkId => startContext?.connectionGeneration?.(linkId), fingerprints: (keyId, linkId) => {
|
|
116
118
|
if (!readStoreForAdmission().links.some(link => link.id === linkId && link.apiKeyId === keyId)) return [];
|
|
117
119
|
return startContext?.keyFingerprints?.(keyId) ?? [];
|
|
118
120
|
} });
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { Server } from "bun";
|
|
2
2
|
import {
|
|
3
|
-
LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION,
|
|
4
|
-
LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER,
|
|
3
|
+
LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION, LINK_RELAY_CONNECTION_HEADER,
|
|
4
|
+
LINK_RELAY_CONNECTION_PROOF_HEADER, LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER, linkConnectionProof,
|
|
5
|
+
linkRelayProof, linkRelayProofMatches,
|
|
5
6
|
} from "../../link/relay-auth";
|
|
6
7
|
import { parseLinkPeerReport, type LinkPeerObservations } from "../../link/peer-report";
|
|
7
8
|
|
|
@@ -21,6 +22,8 @@ export interface LinkRelaySessionOptions {
|
|
|
21
22
|
reservationMs?: number;
|
|
22
23
|
/** Where a verified challenge records the Child's report, and a known link's version mismatch. */
|
|
23
24
|
peers?: LinkPeerObservations;
|
|
25
|
+
/** The current tunnel connection of a Home-initiated link, announced with each proof. */
|
|
26
|
+
connectionGeneration?: (linkId: string) => string | undefined;
|
|
24
27
|
}
|
|
25
28
|
|
|
26
29
|
/** One book per bound listener. A pending proof reserves the bind before the data request arrives. */
|
|
@@ -81,9 +84,13 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
|
|
|
81
84
|
linkRelayProofMatches(q.get("proof"), linkRelayProof(candidate, "caller", keyId, linkId, nonce)));
|
|
82
85
|
if (!fingerprint) return refuse();
|
|
83
86
|
options.peers?.observe(linkId, LINK_RELAY_AUTH_VERSION, parseLinkPeerReport(req.headers));
|
|
87
|
+
let generation: string | undefined;
|
|
88
|
+
try { generation = options.connectionGeneration?.(linkId); } catch { generation = undefined; }
|
|
89
|
+
const connectionProof = generation === undefined ? null : linkConnectionProof(fingerprint, keyId, linkId, nonce, generation);
|
|
84
90
|
const answer = () => new Response(null, { status: 204, headers: {
|
|
85
91
|
"x-opencodex-link-proof": linkRelayProof(fingerprint, "listener", keyId, linkId, nonce)!,
|
|
86
92
|
"cache-control": "no-store",
|
|
93
|
+
...(connectionProof ? { [LINK_RELAY_CONNECTION_HEADER]: generation!, [LINK_RELAY_CONNECTION_PROOF_HEADER]: connectionProof } : {}),
|
|
87
94
|
} });
|
|
88
95
|
// A readiness probe closes after this answer and sends no data request, so it reserves
|
|
89
96
|
// nothing: no session to consume, no capacity and no drain lease held until expiry.
|
|
@@ -103,6 +103,7 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
103
103
|
start(ctx) {
|
|
104
104
|
activeConfig = ctx.config;
|
|
105
105
|
linkListener.start({ dispatch: ctx.dispatch, maxRequestBodySize: ctx.maxRequestBodySize,
|
|
106
|
+
connectionGeneration: linkId => supervisor.connectionGeneration?.(linkId),
|
|
106
107
|
keyFingerprints: apiKeyId => {
|
|
107
108
|
const entry = activeConfig?.apiKeys?.find(candidate => candidate.id === apiKeyId);
|
|
108
109
|
if (!entry?.key) return [];
|