@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -48,6 +48,12 @@ export interface CodexAccountUsabilityOptions {
|
|
|
48
48
|
* owns the cooled subscription -- follow a main the operator never chose.
|
|
49
49
|
*/
|
|
50
50
|
requestOwnedMainCredential?: boolean;
|
|
51
|
+
/**
|
|
52
|
+
* The caller named this account explicitly (an account-qualified route). Explicit selectors are
|
|
53
|
+
* an operator choice outside the pool-only policy; every automatic path omits this, so a path
|
|
54
|
+
* that forgets it still keeps native main out of Pool rotation.
|
|
55
|
+
*/
|
|
56
|
+
explicitAccountSelector?: boolean;
|
|
51
57
|
}
|
|
52
58
|
|
|
53
59
|
/**
|
|
@@ -57,6 +63,7 @@ export interface CodexAccountUsabilityOptions {
|
|
|
57
63
|
*/
|
|
58
64
|
export type CodexAccountUnusableReason =
|
|
59
65
|
| "model_not_entitled"
|
|
66
|
+
| "pool_only"
|
|
60
67
|
| "main_hard_locked"
|
|
61
68
|
| "main_traffic_blocked"
|
|
62
69
|
| "legacy_pool_sentinel"
|
|
@@ -68,6 +75,11 @@ export type CodexAccountUnusableReason =
|
|
|
68
75
|
| "validation_pending"
|
|
69
76
|
| "duplicate_main";
|
|
70
77
|
|
|
78
|
+
/** `codexPool.poolOnly` (#7410): automatic Pool resolution never serves native main. */
|
|
79
|
+
export function codexPoolOnlyExcludesMain(config: Pick<OcxConfig, "codexPool"> | undefined): boolean {
|
|
80
|
+
return config?.codexPool?.poolOnly === true;
|
|
81
|
+
}
|
|
82
|
+
|
|
71
83
|
/**
|
|
72
84
|
* The single source of truth for both selection and its explanation. `isCodexAccountUsable()` is
|
|
73
85
|
* this function's boolean projection rather than a parallel copy of the same branches, so a reason
|
|
@@ -82,6 +94,7 @@ export function codexAccountUnusableReason(
|
|
|
82
94
|
return "model_not_entitled";
|
|
83
95
|
}
|
|
84
96
|
if (accountId === MAIN_CODEX_ACCOUNT_ID) {
|
|
97
|
+
if (codexPoolOnlyExcludesMain(config) && options.explicitAccountSelector !== true) return "pool_only";
|
|
85
98
|
if (isMainAccountHardLocked(config)) return "main_hard_locked";
|
|
86
99
|
// Startup recovery owns the physical auth/vault boundary. Never parse or select
|
|
87
100
|
// native __main__ while an encrypted switch journal is pending or inconclusive.
|
|
@@ -2,8 +2,8 @@ import { getMainAccountExternalUsageWarning, type MainAccountExternalUsageWarnin
|
|
|
2
2
|
import { codexCreditsDtoField, hasCodexCreditsObservation, pruneCodexCredits } from "../credits";
|
|
3
3
|
import type { CodexCredits } from "../credits";
|
|
4
4
|
import { codexAccountLogLabel } from "../account-label";
|
|
5
|
-
import { poolQuotaHistoryIdentity, getCodexAccountCredential, getValidCodexToken, isCodexAccountGenerationLive, readCodexAccountRecord } from "../account-store";
|
|
6
|
-
import { getAccountQuota, isCodexQuotaExhausted, setAccountQuotaFromParsed, withoutRetiredCodexQuota } from "../quota";
|
|
5
|
+
import { codexAccountRecordFromSnapshot, loadCodexAccountRecordSnapshot, poolQuotaHistoryIdentity, poolQuotaHistoryIdentityOf, getCodexAccountCredential, getValidCodexToken, isCodexAccountGenerationLive, readCodexAccountRecord } from "../account-store";
|
|
6
|
+
import { getAccountQuota, getAccountWeeklyQuotaConflicts, isCodexQuotaExhausted, setAccountQuotaFromParsed, withoutRetiredCodexQuota } from "../quota";
|
|
7
7
|
import type { StoredAccountQuota } from "../quota";
|
|
8
8
|
import { ConfigMutationLockError, mutatePersistedConfig } from "../../config";
|
|
9
9
|
import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
|
|
@@ -23,6 +23,7 @@ import { getMainAccountHardLockStatus } from "../main-account-hard-lock";
|
|
|
23
23
|
import type { MainAccountHardLockStatus } from "../main-account-hard-lock";
|
|
24
24
|
import { emailMaskingEnabled, projectEmail } from "../../lib/privacy";
|
|
25
25
|
import type { CodexAccount, OcxConfig } from "../../types";
|
|
26
|
+
import type { CodexAccountCredentialRecord } from "../../types";
|
|
26
27
|
import { oauthAccountHealthFields, projectCodexAccountHealth } from "../../oauth/health";
|
|
27
28
|
import type { OAuthAccountHealth, OAuthHealthLabel } from "../../oauth/health";
|
|
28
29
|
import { isSelectableCodexPoolAccount } from "../account-id";
|
|
@@ -105,6 +106,15 @@ export type CodexAccountReauthReason =
|
|
|
105
106
|
| "unauthorized"
|
|
106
107
|
| "forbidden";
|
|
107
108
|
|
|
109
|
+
/** One store read for a lone row; same fail-closed shape as `poolQuotaHistoryIdentity`. */
|
|
110
|
+
function readPoolRecordOnce(accountId: string): CodexAccountCredentialRecord | null {
|
|
111
|
+
try {
|
|
112
|
+
return codexAccountRecordFromSnapshot(loadCodexAccountRecordSnapshot(), accountId);
|
|
113
|
+
} catch {
|
|
114
|
+
return null;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
108
118
|
export function poolAccountDto(
|
|
109
119
|
config: OcxConfig,
|
|
110
120
|
account: CodexAccount,
|
|
@@ -114,6 +124,11 @@ export function poolAccountDto(
|
|
|
114
124
|
priority: number,
|
|
115
125
|
maskEmails: boolean,
|
|
116
126
|
upstreamAccountKey?: string,
|
|
127
|
+
/**
|
|
128
|
+
* This account's credential record from the caller's one store snapshot. A roster listing
|
|
129
|
+
* passes it so the row costs no store read; a lone caller omits it and the row reads once.
|
|
130
|
+
*/
|
|
131
|
+
storeRecord?: CodexAccountCredentialRecord | null,
|
|
117
132
|
): CodexAuthAccountDto {
|
|
118
133
|
const plan = codexPlanValue(account.plan);
|
|
119
134
|
const quota = quotaForPlan(quotaResult.quota, plan);
|
|
@@ -139,6 +154,8 @@ export function poolAccountDto(
|
|
|
139
154
|
// account took their model away and why, so name the cause they actually have to act on.
|
|
140
155
|
const reauthReason: CodexAccountReauthReason | undefined = rawReauthReason ?? (health.status === "reauth_required" ? health.reason : undefined);
|
|
141
156
|
const duplicateMain = configuredCodexMainDuplicate(config, account.id);
|
|
157
|
+
const record = storeRecord !== undefined ? storeRecord : readPoolRecordOnce(account.id);
|
|
158
|
+
const weeklyQuotaConflicts = getAccountWeeklyQuotaConflicts(account.id, record);
|
|
142
159
|
return {
|
|
143
160
|
id: account.id,
|
|
144
161
|
slotId: account.id,
|
|
@@ -156,7 +173,8 @@ export function poolAccountDto(
|
|
|
156
173
|
creditsAfterLimit: codexAccountUsesCreditsAfterLimit(config, account.id),
|
|
157
174
|
useRemainingQuota: codexAccountUsesRemainingQuota(config, account.id),
|
|
158
175
|
quota: quota ? { ...quota } : null,
|
|
159
|
-
...
|
|
176
|
+
...(weeklyQuotaConflicts.length > 0 ? { weeklyQuotaConflicts } : {}),
|
|
177
|
+
...codexCreditsDtoField(config, account.id, poolQuotaHistoryIdentityOf(record) ?? null),
|
|
160
178
|
needsReauth: needsReauth || health.status === "reauth_required",
|
|
161
179
|
...(reauthReason !== undefined ? { reauthReason } : {}),
|
|
162
180
|
...(duplicateMain ? {
|
|
@@ -194,6 +212,8 @@ export interface CodexAuthAccountDto {
|
|
|
194
212
|
creditsAfterLimit?: boolean;
|
|
195
213
|
useRemainingQuota?: boolean;
|
|
196
214
|
quota: (StoredAccountQuota | (Omit<StoredAccountQuota, "updatedAt"> & { updatedAt: number })) | null;
|
|
215
|
+
/** Live weekly windows this account reported in contradiction (#8574); display only. */
|
|
216
|
+
weeklyQuotaConflicts?: import("../quota-window-conflict").WeeklyWindowConflict[];
|
|
197
217
|
credits?: CodexCredits;
|
|
198
218
|
needsReauth?: boolean;
|
|
199
219
|
/**
|
|
@@ -352,6 +372,9 @@ export async function listCodexAuthAccountsSnapshot(
|
|
|
352
372
|
});
|
|
353
373
|
reconcileFreshPoolAccountPlans(runtimeConfig, planUpdates);
|
|
354
374
|
|
|
375
|
+
// One store snapshot for every row's history identity and credential generation, read after
|
|
376
|
+
// the probes settle so a refresh during them is already visible.
|
|
377
|
+
const storeRecords = loadCodexAccountRecordSnapshot();
|
|
355
378
|
const withQuota = refreshedPool.flatMap(({ accountId, quotaResult }) => {
|
|
356
379
|
const currentAccount = configuredPoolAccount(runtimeConfig, accountId);
|
|
357
380
|
if (!currentAccount) return [];
|
|
@@ -365,6 +388,8 @@ export async function listCodexAuthAccountsSnapshot(
|
|
|
365
388
|
isCodexAccountPaused(runtimeConfig, accountId),
|
|
366
389
|
getCodexAccountPriority(runtimeConfig, accountId),
|
|
367
390
|
maskEmails,
|
|
391
|
+
undefined,
|
|
392
|
+
codexAccountRecordFromSnapshot(storeRecords, accountId),
|
|
368
393
|
)];
|
|
369
394
|
}
|
|
370
395
|
const resultGeneration = quotaResult.credentialGeneration ?? quotaResult.freshCredentialGeneration;
|
|
@@ -392,6 +417,7 @@ export async function listCodexAuthAccountsSnapshot(
|
|
|
392
417
|
maskEmails,
|
|
393
418
|
codexUpstreamAccountKey(identitySecret, verifiedAccountId,
|
|
394
419
|
user.conflict ? undefined : user.userId),
|
|
420
|
+
codexAccountRecordFromSnapshot(storeRecords, accountId),
|
|
395
421
|
)];
|
|
396
422
|
});
|
|
397
423
|
const projectSnapshot = (mainRefreshRefused = false): CodexAuthAccountsSnapshot => {
|
|
@@ -154,6 +154,8 @@ export interface MainAccountInfoProbeOptions {
|
|
|
154
154
|
passive?: boolean;
|
|
155
155
|
/** Exact owned result obtained before entering WHAM's shared credential claim. Never serialized. */
|
|
156
156
|
preparedToken?: MainAccountToken | null;
|
|
157
|
+
/** Always use paced usage scheduling, so failure backoff and Retry-After are recorded in every mode. */
|
|
158
|
+
paced?: boolean;
|
|
157
159
|
}
|
|
158
160
|
|
|
159
161
|
export const EMPTY_MAIN_ACCOUNT_INFO: MainAccountInfo = { email: null, plan: null, quota: null };
|
|
@@ -215,7 +217,7 @@ export async function fetchMainAccountInfoAttempt(
|
|
|
215
217
|
}
|
|
216
218
|
}
|
|
217
219
|
const probeOptions = preparedToken === undefined ? options : { ...options, preparedToken };
|
|
218
|
-
const paced = sharedMainQuotaPacingEnabled(config ?? loadConfig());
|
|
220
|
+
const paced = options.paced === true || sharedMainQuotaPacingEnabled(config ?? loadConfig());
|
|
219
221
|
const operation = async () => ({
|
|
220
222
|
...await fetchMainAccountInfoWhileOwned(forceRefresh, retriesRemaining, nativeMainLease, explicitRefresh, postReset, paced, probeOptions),
|
|
221
223
|
identityGeneration: captureMainAccountIdentityGeneration(),
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
import type { OcxConfig } from "../../types";
|
|
2
|
+
import { MAIN_CODEX_ACCOUNT_ID } from "../account-id";
|
|
3
|
+
import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
|
|
4
|
+
import { isCodexAccountPaused } from "../account-pause";
|
|
5
|
+
import { isAccountNeedsReauth } from "../account-runtime-state";
|
|
6
|
+
import { getMainAccountHardLockStatus } from "../main-account-hard-lock";
|
|
7
|
+
import { getValidMainAccountToken, mainAccountTokenIsCurrent, mainAccountTokenQuotaWriter } from "../main-account";
|
|
8
|
+
import {
|
|
9
|
+
captureMainAccountIdentityGeneration, captureMainQuotaDispatch, getMainQuotaCredentialGeneration, getObservedMainQuotaIdentityKey,
|
|
10
|
+
isMainAccountIdentityGenerationLive, isMainQuotaDispatchLive, matchesMainQuotaCredential, observeMainQuotaCredential,
|
|
11
|
+
} from "../main-account-cache";
|
|
12
|
+
import { tryAcquireNativeMainProfileClaim } from "../native-main-admission";
|
|
13
|
+
import { isNativeMainTrafficBlocked } from "../native-profile-startup";
|
|
14
|
+
import {
|
|
15
|
+
getMainPolicyUsageObservedAt, isValidWhamHistoryObservation, parseMainPolicyUsageQuota, parseUsageQuota, setAccountQuotaFromParsed,
|
|
16
|
+
type WhamUsageResponse,
|
|
17
|
+
} from "../quota";
|
|
18
|
+
import { fetchCodexUsage, nextCodexUsageQueryAt } from "../quota-query-backoff";
|
|
19
|
+
import { WHAM_REQUEST_TIMEOUT_MS } from "../quota-recovery-timing";
|
|
20
|
+
import { captureConfigGeneration } from "../../lib/state-store-sweeper";
|
|
21
|
+
import type { AdmissionLease } from "../../lib/admission";
|
|
22
|
+
import { fetchMainAccountInfoAttempt } from "./main-account-probe";
|
|
23
|
+
import { isQuotaDispatchCurrent, nextQuotaDispatchSequence, publishQuotaDispatch } from "./pool-quota-probe";
|
|
24
|
+
|
|
25
|
+
/** A hard-lock reading younger than this is current enough to refuse on (#8113). */
|
|
26
|
+
export const MAIN_HARD_LOCK_REFUSAL_READ_AGE_MS = 60_000;
|
|
27
|
+
/** At most one refusal-triggered WHAM read per main identity in this window. */
|
|
28
|
+
export const MAIN_HARD_LOCK_REFUSAL_READ_INTERVAL_MS = 60_000;
|
|
29
|
+
|
|
30
|
+
// Last refusal read per main identity, kept for the whole interval so an A→B→A switch cannot reset it.
|
|
31
|
+
const lastReadAt = new Map<string, number>();
|
|
32
|
+
let inFlight: Promise<void> | undefined;
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* The caller's own credential when the refused request authenticates as the main login itself
|
|
36
|
+
* (caller-owned Direct, or a request-scoped main bearer in Pool). Such a request may not read the
|
|
37
|
+
* physical main credential, so its fresh read uses this bearer, which the lock already proved is
|
|
38
|
+
* the observed main credential.
|
|
39
|
+
*/
|
|
40
|
+
export interface MainHardLockRefusalCaller {
|
|
41
|
+
bearer: string;
|
|
42
|
+
accountId: string;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** Test-only: forget the per-identity pacing and any settled read. */
|
|
46
|
+
export function resetMainHardLockRefusalReadForTests(): void {
|
|
47
|
+
lastReadAt.clear();
|
|
48
|
+
inFlight = undefined;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Before a main hard-lock refusal, read WHAM once when the reading behind the lock is stale (#8113).
|
|
53
|
+
*
|
|
54
|
+
* A reset redeemed outside OpenCodex leaves the cached reading above the threshold until a later
|
|
55
|
+
* observation replaces it, and the paced background recovery may not run for minutes. When the
|
|
56
|
+
* cached reading is older than {@link MAIN_HARD_LOCK_REFUSAL_READ_AGE_MS}, this reads usage once:
|
|
57
|
+
* with the proxy-owned main credential and the native-main claim through the recovery probe, or,
|
|
58
|
+
* for a caller-owned main request, with the caller's own bearer, published only while that bearer
|
|
59
|
+
* still matches the observed main credential. Concurrent refusals share
|
|
60
|
+
* one read, and each main identity gets at most one read per
|
|
61
|
+
* {@link MAIN_HARD_LOCK_REFUSAL_READ_INTERVAL_MS}. Server-advised usage backoff, a paused main,
|
|
62
|
+
* reauthentication quarantine and native-main maintenance all skip the read. The read is passive:
|
|
63
|
+
* it never sets or clears the reauthentication quarantine.
|
|
64
|
+
*
|
|
65
|
+
* Returns `true` when the lock no longer blocks, so the caller may resolve the request again;
|
|
66
|
+
* `false` keeps the refusal. A failed read keeps the existing policy observation.
|
|
67
|
+
*/
|
|
68
|
+
export async function refreshMainHardLockBeforeRefusal(
|
|
69
|
+
config: OcxConfig,
|
|
70
|
+
policy: Parameters<typeof getMainAccountHardLockStatus>[0] = config,
|
|
71
|
+
signal?: AbortSignal,
|
|
72
|
+
/** The caller-owned main credential; `null` when the request is caller-owned but unusable for a read. */
|
|
73
|
+
caller?: MainHardLockRefusalCaller | null,
|
|
74
|
+
now: () => number = Date.now,
|
|
75
|
+
): Promise<boolean> {
|
|
76
|
+
const blocked = () => getMainAccountHardLockStatus(policy, now()).state === "blocked";
|
|
77
|
+
if (!blocked()) return true;
|
|
78
|
+
if (caller === null) return false;
|
|
79
|
+
// The usage measurement's age, not the snapshot's write time: credits-only merges rewrite the latter.
|
|
80
|
+
const observedAt = getMainPolicyUsageObservedAt();
|
|
81
|
+
if (observedAt !== undefined && now() - observedAt < MAIN_HARD_LOCK_REFUSAL_READ_AGE_MS) return false;
|
|
82
|
+
if (isNativeMainTrafficBlocked() || isAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID)
|
|
83
|
+
|| isCodexAccountPaused(config, MAIN_CODEX_ACCOUNT_ID)) return false;
|
|
84
|
+
if (!inFlight) {
|
|
85
|
+
const identity = getObservedMainQuotaIdentityKey() ?? "";
|
|
86
|
+
for (const [key, at] of lastReadAt) {
|
|
87
|
+
if (now() - at >= MAIN_HARD_LOCK_REFUSAL_READ_INTERVAL_MS) lastReadAt.delete(key);
|
|
88
|
+
}
|
|
89
|
+
if (lastReadAt.has(identity)) return false;
|
|
90
|
+
const queryAfter = nextCodexUsageQueryAt(`main:${captureConfigGeneration()}:${getMainQuotaCredentialGeneration()}`);
|
|
91
|
+
if (queryAfter !== undefined && queryAfter > now()) return false;
|
|
92
|
+
let read: Promise<void>;
|
|
93
|
+
if (caller) {
|
|
94
|
+
// Without a live proof for the caller's credential there is nothing to read; keep the minute.
|
|
95
|
+
const dispatch = captureMainQuotaDispatch(caller.bearer, caller.accountId, captureConfigGeneration());
|
|
96
|
+
if (!dispatch) return false;
|
|
97
|
+
lastReadAt.set(identity, now());
|
|
98
|
+
read = readCallerMainUsage(caller, dispatch);
|
|
99
|
+
} else {
|
|
100
|
+
const lease = tryAcquireNativeMainProfileClaim();
|
|
101
|
+
if (!lease) return false;
|
|
102
|
+
lastReadAt.set(identity, now());
|
|
103
|
+
read = readMainUsage(config, lease).finally(() => lease.release());
|
|
104
|
+
}
|
|
105
|
+
read = read
|
|
106
|
+
.catch(() => { /* the refusal stands on the existing observation */ })
|
|
107
|
+
.finally(() => { if (inFlight === read) inFlight = undefined; });
|
|
108
|
+
inFlight = read;
|
|
109
|
+
}
|
|
110
|
+
await abortable(inFlight, signal);
|
|
111
|
+
return !blocked();
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
async function readMainUsage(config: OcxConfig, lease: AdmissionLease): Promise<void> {
|
|
115
|
+
reconcileMainCodexAccountRuntimeState();
|
|
116
|
+
const identityGeneration = captureMainAccountIdentityGeneration();
|
|
117
|
+
// Refresh can need an exclusive credential claim, so obtain the token before WHAM's shared claim.
|
|
118
|
+
const prepared = await getValidMainAccountToken({ preserveReauth: true });
|
|
119
|
+
if (!prepared) return;
|
|
120
|
+
if (mainAccountTokenQuotaWriter(prepared)) {
|
|
121
|
+
if (!mainAccountTokenIsCurrent(prepared)) return;
|
|
122
|
+
} else observeMainQuotaCredential(prepared.accessToken, prepared.chatgptAccountId);
|
|
123
|
+
if (!isMainAccountIdentityGenerationLive(identityGeneration) || isAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID)) return;
|
|
124
|
+
// Paced in every account mode: a failed or Retry-After answer must defer the next read.
|
|
125
|
+
await fetchMainAccountInfoAttempt(true, 1, lease, false, false, false, config,
|
|
126
|
+
{ passive: true, preparedToken: prepared, paced: true });
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/** Usage read with the caller's own main bearer: no physical credential read, no reauth state. */
|
|
130
|
+
async function readCallerMainUsage(
|
|
131
|
+
caller: MainHardLockRefusalCaller, dispatch: NonNullable<ReturnType<typeof captureMainQuotaDispatch>>,
|
|
132
|
+
): Promise<void> {
|
|
133
|
+
// The dispatch proof also fences credential commits (refresh, reauthentication) that advance the
|
|
134
|
+
// mutation epoch before the observed credential itself changes.
|
|
135
|
+
const writerGeneration = dispatch.configGeneration;
|
|
136
|
+
// Ordered like the main probe: a response publishes only if no later dispatch already published.
|
|
137
|
+
const sequence = nextQuotaDispatchSequence();
|
|
138
|
+
const key = `main:${writerGeneration}:${dispatch.credentialGeneration}`;
|
|
139
|
+
const admission = await fetchCodexUsage(key, {
|
|
140
|
+
headers: { Authorization: `Bearer ${caller.bearer}`, "ChatGPT-Account-Id": caller.accountId },
|
|
141
|
+
signal: AbortSignal.timeout(WHAM_REQUEST_TIMEOUT_MS),
|
|
142
|
+
}, undefined, { pacingKey: key });
|
|
143
|
+
// A joined read belongs to another owner, which publishes its own evidence.
|
|
144
|
+
if (!admission || admission.kind === "joined") return;
|
|
145
|
+
let usable = false;
|
|
146
|
+
try {
|
|
147
|
+
if (!admission.response.ok) return;
|
|
148
|
+
const data = await admission.response.json() as WhamUsageResponse;
|
|
149
|
+
if (data === null || typeof data !== "object" || Array.isArray(data)) return;
|
|
150
|
+
// The main login may have changed while the read was in flight; never publish across it.
|
|
151
|
+
if (!isMainQuotaDispatchLive(dispatch) || !matchesMainQuotaCredential(caller.bearer, caller.accountId)
|
|
152
|
+
|| writerGeneration !== captureConfigGeneration() || !isQuotaDispatchCurrent(sequence)) return;
|
|
153
|
+
const quota = parseUsageQuota(data);
|
|
154
|
+
if (!quota) return;
|
|
155
|
+
setAccountQuotaFromParsed(MAIN_CODEX_ACCOUNT_ID, quota, writerGeneration, dispatch.writer, parseMainPolicyUsageQuota(data),
|
|
156
|
+
undefined, false, false, isValidWhamHistoryObservation(data) ? quota : null);
|
|
157
|
+
publishQuotaDispatch(sequence);
|
|
158
|
+
usable = true;
|
|
159
|
+
} finally {
|
|
160
|
+
admission.settle(usable);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
function abortable(promise: Promise<void>, signal?: AbortSignal): Promise<void> {
|
|
165
|
+
if (!signal) return promise;
|
|
166
|
+
signal.throwIfAborted();
|
|
167
|
+
return new Promise<void>((resolve, reject) => {
|
|
168
|
+
const onAbort = () => reject(signal.reason);
|
|
169
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
170
|
+
promise.then(resolve, reject).finally(() => signal.removeEventListener("abort", onAbort));
|
|
171
|
+
});
|
|
172
|
+
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { readFileSync } from "node:fs";
|
|
2
1
|
import { join } from "node:path";
|
|
3
2
|
import { getCodexAccountCredential } from "./account-store";
|
|
4
3
|
import { loadConfig } from "../config";
|
|
@@ -7,7 +6,7 @@ import { extractAccountId } from "../oauth/chatgpt";
|
|
|
7
6
|
import { isSelectableCodexPoolAccount, MAIN_CODEX_ACCOUNT_ID } from "./account-id";
|
|
8
7
|
import { codexPlanKey } from "./plan";
|
|
9
8
|
import { getObservedMainCodexCollisionIdentity, sameCodexCollisionIdentity, type CodexCollisionIdentity } from "./collision-identity";
|
|
10
|
-
import {
|
|
9
|
+
import { readNativeMainAuthBytes } from "./native-main-auth-file";
|
|
11
10
|
|
|
12
11
|
export interface CodexTokens {
|
|
13
12
|
access_token: string;
|
|
@@ -25,6 +24,25 @@ export type CodexTokenReadResult =
|
|
|
25
24
|
| { status: "ok"; tokens: CodexTokens }
|
|
26
25
|
| { status: "missing" | "invalid" | "unreadable" };
|
|
27
26
|
|
|
27
|
+
function parseCodexTokens(raw: string): CodexTokenReadResult {
|
|
28
|
+
try {
|
|
29
|
+
const j = JSON.parse(raw) as {
|
|
30
|
+
tokens?: { access_token?: string; account_id?: string; id_token?: string };
|
|
31
|
+
};
|
|
32
|
+
if (!j?.tokens?.access_token) return { status: "invalid" };
|
|
33
|
+
return {
|
|
34
|
+
status: "ok",
|
|
35
|
+
tokens: {
|
|
36
|
+
access_token: j.tokens.access_token,
|
|
37
|
+
account_id: j.tokens.account_id ?? "",
|
|
38
|
+
id_token: j.tokens.id_token,
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
} catch {
|
|
42
|
+
return { status: "invalid" };
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
28
46
|
function hasErrnoCode(error: unknown, code: string): boolean {
|
|
29
47
|
return typeof error === "object" && error !== null && "code" in error
|
|
30
48
|
&& (error as { code?: unknown }).code === code;
|
|
@@ -45,28 +63,11 @@ export function readCodexTokensResult(
|
|
|
45
63
|
): CodexTokenReadResult {
|
|
46
64
|
let raw: string;
|
|
47
65
|
try {
|
|
48
|
-
raw = options?.bounded === true
|
|
49
|
-
? readBounded(authPath, MAX_AUTH_BYTES).toString("utf-8")
|
|
50
|
-
: readFileSync(authPath, "utf-8");
|
|
66
|
+
raw = readNativeMainAuthBytes(authPath, options?.bounded === true ? "bounded" : "plain").toString("utf-8");
|
|
51
67
|
} catch (error) {
|
|
52
68
|
return { status: hasErrnoCode(error, "ENOENT") ? "missing" : "unreadable" };
|
|
53
69
|
}
|
|
54
|
-
|
|
55
|
-
const j = JSON.parse(raw) as {
|
|
56
|
-
tokens?: { access_token?: string; account_id?: string; id_token?: string };
|
|
57
|
-
};
|
|
58
|
-
if (!j?.tokens?.access_token) return { status: "invalid" };
|
|
59
|
-
return {
|
|
60
|
-
status: "ok",
|
|
61
|
-
tokens: {
|
|
62
|
-
access_token: j.tokens.access_token,
|
|
63
|
-
account_id: j.tokens.account_id ?? "",
|
|
64
|
-
id_token: j.tokens.id_token,
|
|
65
|
-
},
|
|
66
|
-
};
|
|
67
|
-
} catch {
|
|
68
|
-
return { status: "invalid" };
|
|
69
|
-
}
|
|
70
|
+
return parseCodexTokens(raw);
|
|
70
71
|
}
|
|
71
72
|
|
|
72
73
|
/**
|
|
@@ -132,7 +133,7 @@ export function readMainAuth(authPath = join(resolveCodexHomeDir(), "auth.json")
|
|
|
132
133
|
const main = readCodexTokensResult(authPath, { bounded: true });
|
|
133
134
|
if (main.status !== "invalid") return main;
|
|
134
135
|
try {
|
|
135
|
-
const j: unknown = JSON.parse(
|
|
136
|
+
const j: unknown = JSON.parse(readNativeMainAuthBytes(authPath, "bounded").toString("utf-8"));
|
|
136
137
|
if (j === null || typeof j !== "object" || Array.isArray(j)) return main;
|
|
137
138
|
const envelope = j as { auth_mode?: unknown; OPENAI_API_KEY?: unknown; tokens?: unknown };
|
|
138
139
|
const apiKeyOnly = envelope.tokens == null
|
|
@@ -25,7 +25,7 @@ import {
|
|
|
25
25
|
import { isAccountNeedsReauth, markAccountNeedsReauth } from "./account-runtime-state";
|
|
26
26
|
import { ConfigMutationLockError } from "../config";
|
|
27
27
|
import { NativeProfileError } from "./native-profile-types";
|
|
28
|
-
import { codexAccountUnusableReason, isCodexAccountUsable } from "./account-usability";
|
|
28
|
+
import { codexAccountUnusableReason, codexPoolOnlyExcludesMain, isCodexAccountUsable } from "./account-usability";
|
|
29
29
|
import { reconcileMainCodexAccountRuntimeState } from "./account-lifecycle";
|
|
30
30
|
import {
|
|
31
31
|
MAIN_CODEX_ACCOUNT_ID,
|
|
@@ -535,7 +535,7 @@ export class CodexReserveUnavailableError extends CodexAccountCooldownError {
|
|
|
535
535
|
this.name = "CodexReserveUnavailableError";
|
|
536
536
|
this.message = "Codex Reserve is unavailable for this main credential."
|
|
537
537
|
+ " Use the stored main login or its matching caller credential, and retry when OpenAI grants Reserve access."
|
|
538
|
-
+ " Reserve compatibility requires the
|
|
538
|
+
+ " Reserve compatibility requires the local Reserve setting (codexReserveEnabled); it cannot switch accounts automatically.";
|
|
539
539
|
}
|
|
540
540
|
}
|
|
541
541
|
|
|
@@ -587,7 +587,8 @@ export class CodexRecoveryWithheldError extends CodexAccountCooldownError {
|
|
|
587
587
|
}
|
|
588
588
|
|
|
589
589
|
export type CodexAuthPolicyConfig = Readonly<Pick<OcxConfig,
|
|
590
|
-
"codexMainAccountHardLock" | "codexMainAccountHardLockThresholds" | "codexDesktopAuthless" | "
|
|
590
|
+
"codexMainAccountHardLock" | "codexMainAccountHardLockThresholds" | "codexDesktopAuthless" | "codexReserveEnabled"
|
|
591
|
+
| "codexReserveMigration" | "runtimeRole" | "pausedCodexAccountIds"
|
|
591
592
|
| "creditCodexAccountIds" | "codexAccounts" | "codexUseRemainingQuotaAccountIds"
|
|
592
593
|
>>;
|
|
593
594
|
|
|
@@ -1063,6 +1064,43 @@ export async function resolveCodexAuthContext(
|
|
|
1063
1064
|
config: OcxConfig,
|
|
1064
1065
|
mode: CodexAccountMode,
|
|
1065
1066
|
options: ResolveCodexAuthContextOptions = {},
|
|
1067
|
+
): Promise<CodexAuthContext> {
|
|
1068
|
+
try {
|
|
1069
|
+
return await resolveCodexAuthContextWithHint(headers, config, mode, options);
|
|
1070
|
+
} catch (error) {
|
|
1071
|
+
// #8113: a refusal resting on a reading older than 60 s first gets one fresh WHAM read, so a
|
|
1072
|
+
// reset redeemed outside OpenCodex lifts the lock now instead of at the next paced recovery.
|
|
1073
|
+
if (!(error instanceof CodexMainAccountHardLockError)) throw error;
|
|
1074
|
+
const { refreshMainHardLockBeforeRefusal } = await import("./auth-api/main-hard-lock-refusal-read");
|
|
1075
|
+
if (!await refreshMainHardLockBeforeRefusal(config, options.codexAuthPolicy ?? config, options.signal,
|
|
1076
|
+
callerOwnedMainRefusal(headers, mode, options))) throw error;
|
|
1077
|
+
return await resolveCodexAuthContextWithHint(headers, config, mode, options);
|
|
1078
|
+
}
|
|
1079
|
+
}
|
|
1080
|
+
|
|
1081
|
+
/**
|
|
1082
|
+
* A refusal for a request that authenticates as the main login itself. That request may never
|
|
1083
|
+
* read the physical main credential, so its fresh read uses the caller's own bearer (#8113).
|
|
1084
|
+
* Any other refusal is about the proxy-owned main credential.
|
|
1085
|
+
*/
|
|
1086
|
+
function callerOwnedMainRefusal(
|
|
1087
|
+
headers: Headers, mode: CodexAccountMode, options: ResolveCodexAuthContextOptions,
|
|
1088
|
+
): { bearer: string; accountId: string } | null | undefined {
|
|
1089
|
+
if (options.substituteMainCredentialForDirect === true || !hasCallerCodexBearer(headers)) return undefined;
|
|
1090
|
+
if (mode !== "direct" && options.requestScopedMainCredential !== true) return undefined;
|
|
1091
|
+
// An explicit stored-account selection resolves the proxy-owned credential, whatever bearer arrived.
|
|
1092
|
+
if (options.accountId !== undefined && options.requestScopedMainCredential !== true) return undefined;
|
|
1093
|
+
const bearer = authorizationCredential(headers);
|
|
1094
|
+
const accountId = headers.get("chatgpt-account-id") ?? (bearer ? extractAccountId(undefined, bearer) : undefined);
|
|
1095
|
+
// Caller-owned without a usable credential: no read at all, never the physical one.
|
|
1096
|
+
return bearer && accountId ? { bearer, accountId } : null;
|
|
1097
|
+
}
|
|
1098
|
+
|
|
1099
|
+
async function resolveCodexAuthContextWithHint(
|
|
1100
|
+
headers: Headers,
|
|
1101
|
+
config: OcxConfig,
|
|
1102
|
+
mode: CodexAccountMode,
|
|
1103
|
+
options: ResolveCodexAuthContextOptions,
|
|
1066
1104
|
): Promise<CodexAuthContext> {
|
|
1067
1105
|
// Filled by the inner resolver with the request's own fenced model evidence, so the hint obeys it.
|
|
1068
1106
|
const eligibility: RecoveryHintEligibility = {};
|
|
@@ -1109,6 +1147,10 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1109
1147
|
throw new CodexReserveUnavailableError();
|
|
1110
1148
|
}
|
|
1111
1149
|
const fixedAccountId = reserve ? MAIN_CODEX_ACCOUNT_ID : options.accountId;
|
|
1150
|
+
// #7410: automatic Pool resolution under `codexPool.poolOnly` never serves native main. Explicit
|
|
1151
|
+
// selectors (fixed account, Reserve) and Direct mode are operator choices outside the policy.
|
|
1152
|
+
// Read from the routing config, the same object the shared usability decision reads.
|
|
1153
|
+
const poolOnlyApplies = mode === "pool" && fixedAccountId === undefined && codexPoolOnlyExcludesMain(config);
|
|
1112
1154
|
const quotaScope = codexQuotaScopeForModel(options.modelId);
|
|
1113
1155
|
// Pool pins and fallback must not resurrect an observed main credential that is cooling
|
|
1114
1156
|
// down. Unrelated caller-owned credentials and explicit Direct keep their own policy.
|
|
@@ -1226,7 +1268,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1226
1268
|
// is the one exception where that exclusion is selection evidence in the opposite direction.
|
|
1227
1269
|
// Validate the caller's own gated-model roster before using it, and fall through to a Pool model
|
|
1228
1270
|
// detour when it lacks the grant. This branch performs no physical-main credential read.
|
|
1229
|
-
if (preserveRequestOwnedMainPin()) {
|
|
1271
|
+
if (!poolOnlyApplies && preserveRequestOwnedMainPin()) {
|
|
1230
1272
|
const callerEntitled = !options.modelId
|
|
1231
1273
|
|| !ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(options.modelId)
|
|
1232
1274
|
|| await (
|
|
@@ -1306,6 +1348,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1306
1348
|
// A fileless login can change identity even while its previous expiry observation is usable.
|
|
1307
1349
|
// The selector discovers it before identity-bound quota or hard-lock policy; dispatch still revalidates it.
|
|
1308
1350
|
if (selectionAdmission && !nativeMainReadsForbidden && !options.isMainAccountTokenLive
|
|
1351
|
+
&& !poolOnlyApplies
|
|
1309
1352
|
&& (fixedAccountId === undefined || fixedAccountId === MAIN_CODEX_ACCOUNT_ID)
|
|
1310
1353
|
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1311
1354
|
&& !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
|
|
@@ -1317,7 +1360,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1317
1360
|
} catch (cause) { mainDiscoveryFailure = cause; }
|
|
1318
1361
|
options.signal?.throwIfAborted();
|
|
1319
1362
|
}
|
|
1320
|
-
const excludeAccountIds = nativeMainReadsForbidden
|
|
1363
|
+
const excludeAccountIds = nativeMainReadsForbidden || poolOnlyApplies
|
|
1321
1364
|
? new Set([MAIN_CODEX_ACCOUNT_ID])
|
|
1322
1365
|
: undefined;
|
|
1323
1366
|
const mainModelGrantUnobserved = excludeAccountIds?.has(MAIN_CODEX_ACCOUNT_ID) === true;
|
|
@@ -1354,6 +1397,8 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1354
1397
|
);
|
|
1355
1398
|
eligibility.deniedModelAccountIds = deniedModelAccountIds;
|
|
1356
1399
|
const selectionOptions = {
|
|
1400
|
+
// A fixed selector (exact account, Reserve) is outside the pool-only policy (#7410).
|
|
1401
|
+
explicitAccountSelector: fixedAccountId !== undefined,
|
|
1357
1402
|
// Temporary switch drain keeps the candidate until the atomic claim rejects
|
|
1358
1403
|
// it. Retained recovery makes main wholly ineligible so pool routing continues.
|
|
1359
1404
|
nativeMainSelectionOnly,
|
|
@@ -1416,6 +1461,11 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1416
1461
|
const selected = resolution.status === "selected" ? resolution.accountId : null;
|
|
1417
1462
|
affinityDecision = selected ? honestAffinityDecision(resolution.affinity, affinityKey, selected, quotaScope, options.modelId, requestScopedMainCredential && config.codexPool?.requestOwnedAffinity !== true) : resolution.affinity;
|
|
1418
1463
|
transientProbe = resolution.status === "selected" ? resolution.transientProbe : undefined;
|
|
1464
|
+
// Every selector that can still name main (sentinels, preserved actives) ends here.
|
|
1465
|
+
if (selected === MAIN_CODEX_ACCOUNT_ID && poolOnlyApplies) {
|
|
1466
|
+
releaseTransientProbeGrant();
|
|
1467
|
+
throw new CodexPoolAuthenticationError();
|
|
1468
|
+
}
|
|
1419
1469
|
// Main now takes part in ordering when the request carries its own main bearer (#5019), so
|
|
1420
1470
|
// selection can name it outright rather than only through the no-candidate fallback below.
|
|
1421
1471
|
// Serve that selection from the credential the request arrived with: the read fence above
|
|
@@ -1441,6 +1491,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1441
1491
|
if (
|
|
1442
1492
|
requestScopedMainCredential
|
|
1443
1493
|
&& fixedAccountId === undefined
|
|
1494
|
+
&& !poolOnlyApplies
|
|
1444
1495
|
&& !(callerMatchesObservedMain(headers) && policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID))
|
|
1445
1496
|
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1446
1497
|
) {
|
|
@@ -1471,7 +1522,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1471
1522
|
if (nativeMainReadsForbidden && !options.excludeAccountId) {
|
|
1472
1523
|
throw new CodexMainProfileDrainingError();
|
|
1473
1524
|
}
|
|
1474
|
-
if (!nativeMainReadsForbidden && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1525
|
+
if (!nativeMainReadsForbidden && !poolOnlyApplies && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1475
1526
|
&& !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
|
|
1476
1527
|
&& (!modelEligibleAccountIds || modelEligibleAccountIds.has(MAIN_CODEX_ACCOUNT_ID))) {
|
|
1477
1528
|
assertMainAccountPolicy(policy);
|
|
@@ -1607,7 +1658,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1607
1658
|
// The selector can retain the configured Pool account when no stored
|
|
1608
1659
|
// alternate is eligible. A validated caller may still serve this request,
|
|
1609
1660
|
// just as it can after an upstream rejection, without changing Pool state.
|
|
1610
|
-
if (requestScopedMainCredential && fixedAccountId === undefined
|
|
1661
|
+
if (requestScopedMainCredential && fixedAccountId === undefined && !poolOnlyApplies
|
|
1611
1662
|
&& !(callerMatchesObservedMain(headers) && policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID))
|
|
1612
1663
|
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1613
1664
|
&& !callerIsCooledPoolAccount(headers, config, accountId)) {
|
|
@@ -1931,6 +1982,8 @@ export function headersForCodexAuthContext(
|
|
|
1931
1982
|
|
|
1932
1983
|
export function isCodexAuthContextUsable(ctx: CodexAuthContext, config: OcxConfig): boolean {
|
|
1933
1984
|
if (ctx.kind === "main") return true;
|
|
1934
|
-
if (ctx.kind === "main-pool")
|
|
1985
|
+
if (ctx.kind === "main-pool") {
|
|
1986
|
+
return isCodexAccountUsable(config, ctx.accountId, ctx.fixedAccount === true ? { explicitAccountSelector: true } : undefined);
|
|
1987
|
+
}
|
|
1935
1988
|
return isCodexAccountUsable(config, ctx.accountId) && isCodexAccountGenerationLive(ctx.accountId, ctx.generation);
|
|
1936
1989
|
}
|
|
@@ -52,6 +52,7 @@ import { PICKER_ORDER_PRIORITY_BASE, SPAWN_PRIORITY_FIELD } from "./subagent-ros
|
|
|
52
52
|
import { applyConfiguredUltraFast, configuredUltraFastSlugs } from "./configured-tiers";
|
|
53
53
|
import { applyNativeUltraFastTier } from "./native-ultrafast";
|
|
54
54
|
import { applyNativePriority, retainedNativeSourcePriorities, type NativePrioritySource } from "./native-priority";
|
|
55
|
+
import type { RoutedCatalogDefaults } from "../../config/schema/routed-catalog-defaults";
|
|
55
56
|
|
|
56
57
|
export interface ObservedCatalogEntryBuildInput {
|
|
57
58
|
readonly template: RawEntry | null;
|
|
@@ -76,6 +77,8 @@ export interface ObservedCatalogEntryBuildInput {
|
|
|
76
77
|
/** Codex-only manual selector metadata; deliberately independent of live permission. */
|
|
77
78
|
readonly reserve?: ReserveCatalogProjection;
|
|
78
79
|
readonly nativeSource?: NativePrioritySource;
|
|
80
|
+
/** Captured `routedCatalogDefaults` (#6872); applied to routed rows only, never read from config here. */
|
|
81
|
+
readonly routedCatalogDefaults?: Readonly<RoutedCatalogDefaults>;
|
|
79
82
|
}
|
|
80
83
|
|
|
81
84
|
/** Build entries with the process-observed Codex feature state. */
|
|
@@ -96,6 +99,7 @@ export function buildCatalogEntries(
|
|
|
96
99
|
keepNativeChatGptOnV1 = false,
|
|
97
100
|
modelPickerOrder: readonly string[] = [],
|
|
98
101
|
nativeSource?: NativePrioritySource,
|
|
102
|
+
routedCatalogDefaults?: Readonly<RoutedCatalogDefaults>,
|
|
99
103
|
): RawEntry[] {
|
|
100
104
|
const entries = buildCatalogEntriesFromObservedState({
|
|
101
105
|
template,
|
|
@@ -115,6 +119,7 @@ export function buildCatalogEntries(
|
|
|
115
119
|
accountNativeSlugs,
|
|
116
120
|
accountNativeSlugsBySelector,
|
|
117
121
|
nativeSource,
|
|
122
|
+
routedCatalogDefaults,
|
|
118
123
|
});
|
|
119
124
|
// Live discovery does not run the disk merge; use the same captured declarations and row fences.
|
|
120
125
|
const configured = configuredUltraFastSlugs(goModels);
|
|
@@ -148,6 +153,7 @@ export function buildCatalogEntriesFromObservedState({
|
|
|
148
153
|
accountNativeSlugsBySelector,
|
|
149
154
|
reserve,
|
|
150
155
|
nativeSource,
|
|
156
|
+
routedCatalogDefaults,
|
|
151
157
|
}: ObservedCatalogEntryBuildInput): RawEntry[] {
|
|
152
158
|
// Codex's models-manager sorts by `priority` ASC and advertises the first 5 picker-visible
|
|
153
159
|
// models to spawn_agent (sort_by_key(priority) + MAX_MODEL_OVERRIDES_IN_SPAWN_AGENT=5). Catalog
|
|
@@ -228,6 +234,8 @@ export function buildCatalogEntriesFromObservedState({
|
|
|
228
234
|
5,
|
|
229
235
|
nativeAlias,
|
|
230
236
|
exactComboSlugs,
|
|
237
|
+
undefined,
|
|
238
|
+
routedCatalogDefaults,
|
|
231
239
|
);
|
|
232
240
|
routed.opencodex_catalog_kind = CODEX_NATIVE_ALIAS_CATALOG_KIND;
|
|
233
241
|
const rankHit = rank.get(slug) ?? rank.get(`${nativeAlias.provider}/${nativeAlias.id}`);
|
|
@@ -286,6 +294,8 @@ export function buildCatalogEntriesFromObservedState({
|
|
|
286
294
|
5,
|
|
287
295
|
m,
|
|
288
296
|
exactComboSlugs,
|
|
297
|
+
undefined,
|
|
298
|
+
routedCatalogDefaults,
|
|
289
299
|
);
|
|
290
300
|
if (m.provider === COMBO_NAMESPACE && m.nativeAlias === true && !slug.includes("/")) {
|
|
291
301
|
e.opencodex_catalog_kind = CODEX_NATIVE_ALIAS_CATALOG_KIND;
|