@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
|
@@ -20,6 +20,7 @@ import { compareCodexVersions, displayCodexRuntimePath, resolveCodexRuntimeAsync
|
|
|
20
20
|
import type { ResolveCodexRuntimeResult } from "./runtime";
|
|
21
21
|
import { isTestHomeGuardArmed } from "../lib/test-home-guard";
|
|
22
22
|
import type { OcxConfig } from "../types/config";
|
|
23
|
+
import { observeNativeMainRefreshMode } from "./native-main-credentials";
|
|
23
24
|
|
|
24
25
|
export type NativeMainRefreshMode = "codex" | "opencodex";
|
|
25
26
|
|
|
@@ -66,14 +67,26 @@ export function setNativeMainRefreshResolutionForTests(value: NativeMainRefreshR
|
|
|
66
67
|
resolutionForTests = value;
|
|
67
68
|
}
|
|
68
69
|
|
|
69
|
-
|
|
70
|
+
/** The operator's configured refresh owner, before runtime resolution. */
|
|
71
|
+
export function configuredNativeMainRefreshMode(config: Pick<OcxConfig, "nativeMainRefresh"> | null | undefined): NativeMainRefreshMode | "auto" {
|
|
70
72
|
const value = config?.nativeMainRefresh;
|
|
71
73
|
return value === "codex" || value === "opencodex" ? value : "auto";
|
|
72
74
|
}
|
|
75
|
+
const configuredMode = configuredNativeMainRefreshMode;
|
|
73
76
|
|
|
74
77
|
export async function resolveNativeMainRefreshMode(
|
|
75
78
|
config: Pick<OcxConfig, "nativeMainRefresh"> | null | undefined,
|
|
76
79
|
deps: { resolveRuntime?: () => Promise<ResolveCodexRuntimeResult> } = {},
|
|
80
|
+
): Promise<NativeMainRefreshResolution> {
|
|
81
|
+
const resolution = await resolveNativeMainRefreshOwner(config, deps);
|
|
82
|
+
// A different refresh owner ends any retained native-main login (#7345).
|
|
83
|
+
observeNativeMainRefreshMode(resolution.mode);
|
|
84
|
+
return resolution;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
async function resolveNativeMainRefreshOwner(
|
|
88
|
+
config: Pick<OcxConfig, "nativeMainRefresh"> | null | undefined,
|
|
89
|
+
deps: { resolveRuntime?: () => Promise<ResolveCodexRuntimeResult> },
|
|
77
90
|
): Promise<NativeMainRefreshResolution> {
|
|
78
91
|
if (resolutionForTests) return resolutionForTests;
|
|
79
92
|
const configured = configuredMode(config);
|
|
@@ -75,6 +75,7 @@ import {
|
|
|
75
75
|
type NativeStageProof,
|
|
76
76
|
type NativeStageTerminalOutcome,
|
|
77
77
|
} from "./native-profile-stage-store";
|
|
78
|
+
import { writeNativeMainAuthFileAsync } from "./native-main-auth-file";
|
|
78
79
|
|
|
79
80
|
const LOCK_WAIT_MS = 5_000;
|
|
80
81
|
const LEGACY_STAGE_MAX_AGE_MS = 30 * 60_000;
|
|
@@ -1307,7 +1308,7 @@ export class NativeProfileManager {
|
|
|
1307
1308
|
journalPrepared = true;
|
|
1308
1309
|
await this.onSwitchBoundary("journal-prepared");
|
|
1309
1310
|
this.assertOperationStorageStable();
|
|
1310
|
-
await
|
|
1311
|
+
await writeNativeMainAuthFileAsync(this.context.authPath, target.text, this.atomicWrite);
|
|
1311
1312
|
const observedTarget = this.verifyWrittenEnvelope(target.digest, targetProfile.identityHash, key);
|
|
1312
1313
|
observedTarget.raw.fill(0);
|
|
1313
1314
|
advanceCodexCredentialMutationEpoch();
|
|
@@ -1336,7 +1337,7 @@ export class NativeProfileManager {
|
|
|
1336
1337
|
}
|
|
1337
1338
|
try {
|
|
1338
1339
|
this.assertOperationStorageStable();
|
|
1339
|
-
await
|
|
1340
|
+
await writeNativeMainAuthFileAsync(this.context.authPath, source!.text, this.atomicWrite);
|
|
1340
1341
|
const restored = this.verifyWrittenEnvelope(source!.digest, nativeIdentityHash(key!.key, source!.accountId), key!);
|
|
1341
1342
|
restored.raw.fill(0);
|
|
1342
1343
|
advanceCodexCredentialMutationEpoch();
|
|
@@ -1451,7 +1452,7 @@ export class NativeProfileManager {
|
|
|
1451
1452
|
rollbackVaultPublished = true;
|
|
1452
1453
|
}
|
|
1453
1454
|
this.assertOperationStorageStable();
|
|
1454
|
-
await
|
|
1455
|
+
await writeNativeMainAuthFileAsync(this.context.authPath, sourceEnvelope.text, this.atomicWrite);
|
|
1455
1456
|
const restored = this.verifyWrittenEnvelope(sourceEnvelope.digest, journal.sourceIdentityHash, key);
|
|
1456
1457
|
restored.raw.fill(0);
|
|
1457
1458
|
advanceCodexCredentialMutationEpoch();
|
|
@@ -7,19 +7,17 @@ import {
|
|
|
7
7
|
timingSafeEqual,
|
|
8
8
|
} from "node:crypto";
|
|
9
9
|
import {
|
|
10
|
-
closeSync,
|
|
11
10
|
constants as fsConstants,
|
|
12
11
|
existsSync,
|
|
13
12
|
fstatSync,
|
|
14
13
|
lstatSync,
|
|
15
|
-
openSync,
|
|
16
14
|
readdirSync,
|
|
17
|
-
readSync,
|
|
18
15
|
realpathSync,
|
|
19
16
|
statSync,
|
|
20
17
|
} from "node:fs";
|
|
21
18
|
import { basename, dirname, join, resolve } from "node:path";
|
|
22
19
|
import { getConfigDir } from "../config";
|
|
20
|
+
import { MAX_AUTH_BYTES, readBounded, readNativeMainAuthBytes, type BoundedReadTestSeam } from "./native-main-auth-file";
|
|
23
21
|
import { loadKeyringBinding } from "../lib/keyring-native";
|
|
24
22
|
import { extractAccountId } from "../oauth/chatgpt";
|
|
25
23
|
import { getCodexHome, readRootTomlString } from "./paths";
|
|
@@ -42,7 +40,7 @@ const KEYRING_SERVICE = "opencodex.native-main-profile.v1";
|
|
|
42
40
|
const SHARED_METADATA_DIR = ".opencodex-native-main-profiles";
|
|
43
41
|
const INSTANCE_STAGING_DIR = "native-main-profile-staging";
|
|
44
42
|
const LEGACY_METADATA_DIR = "native-main-profiles";
|
|
45
|
-
export
|
|
43
|
+
export { MAX_AUTH_BYTES, readBounded } from "./native-main-auth-file";
|
|
46
44
|
export const MAX_NATIVE_PROFILE_METADATA_BYTES = 4 * 1024 * 1024;
|
|
47
45
|
export const MAX_NATIVE_PROFILE_JOURNAL_BYTES = 17 * 1024 * 1024;
|
|
48
46
|
export const MAX_NATIVE_PROFILES = 32;
|
|
@@ -67,13 +65,6 @@ export interface NativeProfileContext {
|
|
|
67
65
|
lockPath: string;
|
|
68
66
|
}
|
|
69
67
|
|
|
70
|
-
interface BoundedReadTestSeam {
|
|
71
|
-
beforeOpen?: (path: string) => void;
|
|
72
|
-
afterValidatedOpen?: (path: string, fd: number) => void;
|
|
73
|
-
onBufferAllocated?: (byteLength: number) => void;
|
|
74
|
-
onRead?: (requestedBytes: number, bytesRead: number, totalBytesRead: number) => void;
|
|
75
|
-
}
|
|
76
|
-
|
|
77
68
|
function boundedReadTestSeam(context: NativeProfileContext): BoundedReadTestSeam | undefined {
|
|
78
69
|
return (context as NativeProfileContext & { [BOUNDED_READ_TEST_SEAM]?: BoundedReadTestSeam })[BOUNDED_READ_TEST_SEAM];
|
|
79
70
|
}
|
|
@@ -378,55 +369,6 @@ export function resolveNativeProfileContext(options: { codexHome?: string; confi
|
|
|
378
369
|
};
|
|
379
370
|
}
|
|
380
371
|
|
|
381
|
-
export function readBounded(path: string, limit: number, testSeam?: BoundedReadTestSeam): Buffer {
|
|
382
|
-
let fd: number | undefined;
|
|
383
|
-
let failed = false;
|
|
384
|
-
try {
|
|
385
|
-
testSeam?.beforeOpen?.(path);
|
|
386
|
-
const flags = process.platform === "win32"
|
|
387
|
-
? fsConstants.O_RDONLY
|
|
388
|
-
: fsConstants.O_RDONLY | fsConstants.O_NOFOLLOW | fsConstants.O_NONBLOCK;
|
|
389
|
-
fd = openSync(path, flags);
|
|
390
|
-
const opened = fstatSync(fd, { bigint: true });
|
|
391
|
-
if (!opened.isFile() || opened.size > BigInt(limit)) throw new Error("invalid bounded file");
|
|
392
|
-
|
|
393
|
-
if (process.platform === "win32") {
|
|
394
|
-
const pathEntry = lstatSync(path, { bigint: true });
|
|
395
|
-
if (
|
|
396
|
-
!pathEntry.isFile()
|
|
397
|
-
|| pathEntry.isSymbolicLink()
|
|
398
|
-
|| pathEntry.dev !== opened.dev
|
|
399
|
-
|| pathEntry.ino !== opened.ino
|
|
400
|
-
) throw new Error("invalid bounded file");
|
|
401
|
-
}
|
|
402
|
-
|
|
403
|
-
testSeam?.afterValidatedOpen?.(path, fd);
|
|
404
|
-
const buffer = Buffer.allocUnsafe(limit + 1);
|
|
405
|
-
testSeam?.onBufferAllocated?.(buffer.byteLength);
|
|
406
|
-
let totalBytesRead = 0;
|
|
407
|
-
while (totalBytesRead < buffer.byteLength) {
|
|
408
|
-
const requestedBytes = buffer.byteLength - totalBytesRead;
|
|
409
|
-
const bytesRead = readSync(fd, buffer, totalBytesRead, requestedBytes, totalBytesRead);
|
|
410
|
-
totalBytesRead += bytesRead;
|
|
411
|
-
testSeam?.onRead?.(requestedBytes, bytesRead, totalBytesRead);
|
|
412
|
-
if (bytesRead === 0) break;
|
|
413
|
-
}
|
|
414
|
-
if (totalBytesRead > limit) throw new Error("invalid bounded file");
|
|
415
|
-
return buffer.subarray(0, totalBytesRead);
|
|
416
|
-
} catch (error) {
|
|
417
|
-
failed = true;
|
|
418
|
-
throw error;
|
|
419
|
-
} finally {
|
|
420
|
-
if (fd !== undefined) {
|
|
421
|
-
try {
|
|
422
|
-
closeSync(fd);
|
|
423
|
-
} catch (error) {
|
|
424
|
-
if (!failed) throw error;
|
|
425
|
-
}
|
|
426
|
-
}
|
|
427
|
-
}
|
|
428
|
-
}
|
|
429
|
-
|
|
430
372
|
export function resolveNativeCredentialStoreMode(context: NativeProfileContext): string {
|
|
431
373
|
const path = join(context.codexHome, "config.toml");
|
|
432
374
|
let content: string;
|
|
@@ -501,7 +443,7 @@ export function parseNativeEnvelopeBytes(raw: Buffer): NativeEnvelopeSnapshot {
|
|
|
501
443
|
export function readNativeEnvelopeResult(path: string): NativeEnvelopeReadResult {
|
|
502
444
|
let raw: Buffer;
|
|
503
445
|
try {
|
|
504
|
-
raw =
|
|
446
|
+
raw = readNativeMainAuthBytes(path, "bounded");
|
|
505
447
|
} catch (error) {
|
|
506
448
|
return { status: (error as NodeJS.ErrnoException).code === "ENOENT" ? "missing" : "unreadable" };
|
|
507
449
|
}
|
package/src/codex/orca-import.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { atomicWriteFile, getConfigDir, getConfigPath, mutatePersistedConfig, re
|
|
|
5
5
|
import { readAlivePid, readRuntimePort } from "../config/process-state";
|
|
6
6
|
import { getCodexHome } from "./paths";
|
|
7
7
|
import { advanceCodexCredentialMutationEpoch } from "./credential-mutation-epoch";
|
|
8
|
+
import { readNativeMainAuthBytes } from "./native-main-auth-file";
|
|
8
9
|
import { assertPlainLocalPath, ORCA_ACCOUNT_DIRECTORY, parseOrcaAuth, readBoundedLocalFile, readOrcaAuthSource, sameLocalPath } from "./orca-auth-source";
|
|
9
10
|
|
|
10
11
|
export class OrcaImportError extends Error {
|
|
@@ -101,7 +102,15 @@ function prepare(sourceDir: string, registryPath: string) {
|
|
|
101
102
|
recoverable.set(credential.chatgptAccountId, { id, credential });
|
|
102
103
|
}
|
|
103
104
|
}
|
|
104
|
-
|
|
105
|
+
let mainRaw: string | undefined;
|
|
106
|
+
const mainAuthPath = join(getCodexHome(), "auth.json");
|
|
107
|
+
try {
|
|
108
|
+
mainRaw = readNativeMainAuthBytes(mainAuthPath, "local-bounded", 4 * 1024 * 1024).toString("utf8");
|
|
109
|
+
} catch (error) {
|
|
110
|
+
if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
|
|
111
|
+
throw new OrcaImportError("A target or main credential file is unreadable; import refused.");
|
|
112
|
+
}
|
|
113
|
+
}
|
|
105
114
|
if (mainRaw !== undefined) {
|
|
106
115
|
const main = object(JSON.parse(mainRaw));
|
|
107
116
|
if (main.tokens !== undefined) {
|
|
@@ -16,6 +16,8 @@ export interface QuotaHistorySample {
|
|
|
16
16
|
credentialGeneration: number;
|
|
17
17
|
windows: QuotaHistoryWindow[];
|
|
18
18
|
}
|
|
19
|
+
/** A stored sample handed out without a copy; the compiler, not a comment, keeps it unmodified. */
|
|
20
|
+
export type ReadonlyQuotaHistorySample = Readonly<Omit<QuotaHistorySample, "windows">> & { readonly windows: readonly Readonly<QuotaHistoryWindow>[] };
|
|
19
21
|
type Envelope = { identity: string; samples: QuotaHistorySample[] };
|
|
20
22
|
type Bucket = Envelope & { costs: number[]; overhead: number };
|
|
21
23
|
const encoder = new TextEncoder();
|
|
@@ -99,6 +101,17 @@ export class CodexQuotaHistory {
|
|
|
99
101
|
return bucket.samples.at(-1)?.source;
|
|
100
102
|
}
|
|
101
103
|
|
|
104
|
+
/**
|
|
105
|
+
* The stored samples, without pruning, clearing or cloning: a passive read changes nothing.
|
|
106
|
+
* The type is deeply read-only so a caller cannot mutate stored history. Samples past the age
|
|
107
|
+
* limit may still be here; a caller that cares about age filters by `observedAt` itself.
|
|
108
|
+
*/
|
|
109
|
+
peekSamples(accountId: string, identity: string | undefined): readonly ReadonlyQuotaHistorySample[] {
|
|
110
|
+
const bucket = this.accounts.get(accountId);
|
|
111
|
+
if (!identity || !bucket || bucket.identity !== identity) return [];
|
|
112
|
+
return bucket.samples;
|
|
113
|
+
}
|
|
114
|
+
|
|
102
115
|
clear(accountId?: string): number {
|
|
103
116
|
if (accountId === undefined) {
|
|
104
117
|
const count = this.accounts.size;
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import type { QuotaHistorySample, ReadonlyQuotaHistorySample } from "./quota-history";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Conflicting weekly quota windows for one Codex pool account (#8574).
|
|
5
|
+
*
|
|
6
|
+
* The same credential generation can report two different seven-day windows at once, from
|
|
7
|
+
* `wham` and from response headers alike, and the stored reading simply follows whichever came
|
|
8
|
+
* last. Nothing in the data says which window is right, so this never picks one and never feeds
|
|
9
|
+
* admission, routing or credit consent: it only names the disagreement so a reader is not told
|
|
10
|
+
* an earlier reset will restore the full allowance.
|
|
11
|
+
*
|
|
12
|
+
* Two reset times belong to one window when they are within RESET_TOLERANCE_MS of each other.
|
|
13
|
+
* Windows A (earlier reset) and B (later reset) conflict while A's reset is still ahead and A was
|
|
14
|
+
* observed again after B was first observed. A true rollover (A, A's reset passes, then B) and an
|
|
15
|
+
* early reset (A, then only B) never repeat A after B, so neither is a conflict.
|
|
16
|
+
*
|
|
17
|
+
* One stray observation is enough: a single B between two A readings keeps the warning up until
|
|
18
|
+
* A's reset passes. That is deliberate, since the stored reading may have followed that stray
|
|
19
|
+
* one, and the warning only says the two disagree.
|
|
20
|
+
*/
|
|
21
|
+
export const RESET_TOLERANCE_MS = 60 * 60_000;
|
|
22
|
+
|
|
23
|
+
/** The largest epoch-ms JavaScript Date can hold; beyond it date formatting throws (8.64e15). */
|
|
24
|
+
const MAX_DATE_MS = 8.64e15;
|
|
25
|
+
|
|
26
|
+
export interface WeeklyWindowObservation {
|
|
27
|
+
resetAtMs: number;
|
|
28
|
+
usedPercent: number;
|
|
29
|
+
source: QuotaHistorySample["source"];
|
|
30
|
+
observedAt: number;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export interface WeeklyWindowConflict {
|
|
34
|
+
family: "account" | "spark";
|
|
35
|
+
/** The earlier-reset window first; each entry is that window's most recent observation. */
|
|
36
|
+
windows: [WeeklyWindowObservation, WeeklyWindowObservation];
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
interface Cluster { resetAtMs: number; firstObservedAt: number; latest: WeeklyWindowObservation }
|
|
40
|
+
|
|
41
|
+
const record = (value: unknown): value is Record<string, unknown> => !!value && typeof value === "object" && !Array.isArray(value);
|
|
42
|
+
const nonNegative = (value: unknown): value is number => typeof value === "number" && Number.isFinite(value) && value >= 0;
|
|
43
|
+
/** A time a dashboard can format: a nanosecond-style epoch would make Intl.DateTimeFormat throw. */
|
|
44
|
+
const dateTime = (value: unknown): value is number => nonNegative(value) && value <= MAX_DATE_MS;
|
|
45
|
+
|
|
46
|
+
function parseObservation(value: unknown): WeeklyWindowObservation | undefined {
|
|
47
|
+
if (!record(value) || !dateTime(value.resetAtMs) || !dateTime(value.observedAt)
|
|
48
|
+
|| !nonNegative(value.usedPercent) || value.usedPercent > 100
|
|
49
|
+
|| (value.source !== "wham" && value.source !== "response-header")) return undefined;
|
|
50
|
+
return { resetAtMs: value.resetAtMs, usedPercent: value.usedPercent, source: value.source, observedAt: value.observedAt };
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** Conflicts read back from a management response; anything malformed is dropped, never fatal. */
|
|
54
|
+
export function parseWeeklyWindowConflicts(value: unknown): WeeklyWindowConflict[] | undefined {
|
|
55
|
+
if (!Array.isArray(value)) return undefined;
|
|
56
|
+
const parsed = value.slice(0, 2).flatMap(item => {
|
|
57
|
+
if (!record(item) || (item.family !== "account" && item.family !== "spark") || !Array.isArray(item.windows) || item.windows.length !== 2) return [];
|
|
58
|
+
const first = parseObservation(item.windows[0]);
|
|
59
|
+
const second = parseObservation(item.windows[1]);
|
|
60
|
+
return first && second ? [{ family: item.family as WeeklyWindowConflict["family"], windows: [first, second] as [WeeklyWindowObservation, WeeklyWindowObservation] }] : [];
|
|
61
|
+
});
|
|
62
|
+
return parsed.length > 0 ? parsed : undefined;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
export function detectWeeklyWindowConflicts(
|
|
66
|
+
samples: readonly ReadonlyQuotaHistorySample[],
|
|
67
|
+
credentialGeneration: number | undefined,
|
|
68
|
+
now: number,
|
|
69
|
+
): WeeklyWindowConflict[] {
|
|
70
|
+
if (credentialGeneration === undefined) return [];
|
|
71
|
+
const conflicts: WeeklyWindowConflict[] = [];
|
|
72
|
+
for (const family of ["account", "spark"] as const) {
|
|
73
|
+
const observations = samples
|
|
74
|
+
.filter(sample => sample.credentialGeneration === credentialGeneration && sample.observedAt <= now && dateTime(sample.observedAt))
|
|
75
|
+
.flatMap(sample => sample.windows
|
|
76
|
+
.filter(window => window.family === family && window.window === "weekly" && dateTime(window.resetAtMs))
|
|
77
|
+
.map(window => ({ resetAtMs: window.resetAtMs!, usedPercent: window.usedPercent, source: sample.source, observedAt: sample.observedAt })))
|
|
78
|
+
.sort((a, b) => a.observedAt - b.observedAt);
|
|
79
|
+
// Cluster by reset time; a window's reported reset moves by seconds, two windows by days.
|
|
80
|
+
const clusters: Cluster[] = [];
|
|
81
|
+
for (const observation of [...observations].sort((a, b) => a.resetAtMs - b.resetAtMs)) {
|
|
82
|
+
const last = clusters.at(-1);
|
|
83
|
+
if (last && observation.resetAtMs - last.resetAtMs <= RESET_TOLERANCE_MS) {
|
|
84
|
+
last.firstObservedAt = Math.min(last.firstObservedAt, observation.observedAt);
|
|
85
|
+
if (observation.observedAt >= last.latest.observedAt) last.latest = observation;
|
|
86
|
+
} else {
|
|
87
|
+
clusters.push({ resetAtMs: observation.resetAtMs, firstObservedAt: observation.observedAt, latest: observation });
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
const pending = clusters.filter(cluster => cluster.latest.resetAtMs > now);
|
|
91
|
+
let found: WeeklyWindowConflict | undefined;
|
|
92
|
+
for (let a = 0; a < pending.length && !found; a++) {
|
|
93
|
+
for (let b = pending.length - 1; b > a && !found; b--) {
|
|
94
|
+
// A reappeared after B had already been reported: the account flips between the two.
|
|
95
|
+
if (pending[a]!.latest.observedAt > pending[b]!.firstObservedAt) {
|
|
96
|
+
found = { family, windows: [{ ...pending[a]!.latest }, { ...pending[b]!.latest }] };
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
if (found) conflicts.push(found);
|
|
101
|
+
}
|
|
102
|
+
return conflicts;
|
|
103
|
+
}
|
package/src/codex/quota.ts
CHANGED
|
@@ -14,7 +14,9 @@ import { MAIN_CODEX_ACCOUNT_ID } from "./account-id";
|
|
|
14
14
|
import { getObservedMainQuotaIdentityKey, mainDecisionQuotaWriterGeneration, isMainQuotaWriterLive, type MainQuotaWriter } from "./main-account-cache";
|
|
15
15
|
|
|
16
16
|
import { CodexQuotaHistory, QUOTA_HISTORY_LIMITS, type QuotaHistoryWindow } from "./quota-history";
|
|
17
|
-
import { isPoolQuotaWriterLive, poolQuotaHistoryIdentity } from "./account-store";
|
|
17
|
+
import { isPoolQuotaWriterLive, poolQuotaHistoryIdentity, poolQuotaHistoryIdentityOf } from "./account-store";
|
|
18
|
+
import type { CodexAccountCredentialRecord } from "../types";
|
|
19
|
+
import { detectWeeklyWindowConflicts, type WeeklyWindowConflict } from "./quota-window-conflict";
|
|
18
20
|
import { CODEX_EXHAUSTED_USAGE_PERCENT, MAIN_ACCOUNT_HARD_LOCK_MIN_PERCENT, hasSpendableCodexCredits, resetAtToMs } from "./quota-types";
|
|
19
21
|
import type { PoolQuotaWriter, StoredAccountQuota, WhamUsageResponse, WhamUsageWindow } from "./quota-types";
|
|
20
22
|
|
|
@@ -40,6 +42,14 @@ type MainPolicyQuota = { identityKey: string; quota: StoredAccountQuota };
|
|
|
40
42
|
/** Fresh WHAM topology proof is consumed by the merge, never retained in a cache or DTO. */
|
|
41
43
|
type MainPolicyQuotaObservation = Omit<StoredAccountQuota, "updatedAt"> & { shortWindowAbsent?: true; monthlyWindowAbsent?: true };
|
|
42
44
|
let mainPolicyQuota: MainPolicyQuota | null = null;
|
|
45
|
+
/**
|
|
46
|
+
* When each main policy usage window was last measured in this process (#8113). A window's time
|
|
47
|
+
* moves only when a write measures that window's percentage; reset metadata, credits and other
|
|
48
|
+
* windows never renew it. Process-local and never persisted: a reading restored from disk has none.
|
|
49
|
+
*/
|
|
50
|
+
type PolicyUsageWindow = "shortPercent" | "weeklyPercent" | "monthlyPercent";
|
|
51
|
+
const POLICY_USAGE_WINDOWS: readonly PolicyUsageWindow[] = ["shortPercent", "weeklyPercent", "monthlyPercent"];
|
|
52
|
+
let mainPolicyUsageObservation: { identityKey: string; at: Partial<Record<PolicyUsageWindow, number>> } | undefined;
|
|
43
53
|
let diskHydrated = false;
|
|
44
54
|
let persistTimer: ReturnType<typeof setTimeout> | null = null;
|
|
45
55
|
let persistStartedAt: number | null = null;
|
|
@@ -440,6 +450,13 @@ export function setAccountQuotaFromParsed(
|
|
|
440
450
|
const policyExisting = mainWriter && mainPolicyQuota?.identityKey === mainWriter.identityKey
|
|
441
451
|
? mainPolicyQuota.quota
|
|
442
452
|
: undefined;
|
|
453
|
+
// Only a measured percentage renews its own window; anything else keeps the earlier time.
|
|
454
|
+
if (mainWriter && policyQuota) {
|
|
455
|
+
const at = mainPolicyUsageObservation?.identityKey === mainWriter.identityKey && policyExisting
|
|
456
|
+
? { ...mainPolicyUsageObservation.at } : {};
|
|
457
|
+
for (const window of POLICY_USAGE_WINDOWS) if (finitePercent(policyQuota[window])) at[window] = updatedAt;
|
|
458
|
+
mainPolicyUsageObservation = { identityKey: mainWriter.identityKey, at };
|
|
459
|
+
}
|
|
443
460
|
mainPolicyQuota = mainWriter && (policyQuota || policyExisting)
|
|
444
461
|
? {
|
|
445
462
|
identityKey: mainWriter.identityKey,
|
|
@@ -448,6 +465,7 @@ export function setAccountQuotaFromParsed(
|
|
|
448
465
|
: policyExisting!,
|
|
449
466
|
}
|
|
450
467
|
: null;
|
|
468
|
+
if (!mainPolicyQuota) mainPolicyUsageObservation = undefined;
|
|
451
469
|
}
|
|
452
470
|
schedulePersistAccountQuotas();
|
|
453
471
|
// Credits carry the previous usage tuple; they must not refresh its observation clock.
|
|
@@ -829,7 +847,7 @@ export function updateAccountQuota(
|
|
|
829
847
|
stampCodexQuotaUsageObservation(quota, { weeklyPercent: nextWeekly, monthlyPercent: nextMonthly }, existing);
|
|
830
848
|
accountQuota.set(accountId, quota);
|
|
831
849
|
// This legacy writer has no physical credential provenance.
|
|
832
|
-
if (accountId === MAIN_CODEX_ACCOUNT_ID) mainPolicyQuota = null;
|
|
850
|
+
if (accountId === MAIN_CODEX_ACCOUNT_ID) { mainPolicyQuota = null; mainPolicyUsageObservation = undefined; }
|
|
833
851
|
schedulePersistAccountQuotas();
|
|
834
852
|
// Observed like the other committed write. This function has no in-repo caller today, but it
|
|
835
853
|
// is re-exported as public API through src/codex/auth-api.ts, so a future caller would
|
|
@@ -896,6 +914,7 @@ function hydrateAccountQuotasFromDisk(): void {
|
|
|
896
914
|
quotaHistory.hydrate(parsed.history);
|
|
897
915
|
// Policy evidence deliberately outlives the legacy six-hour rotation-cache TTL.
|
|
898
916
|
mainPolicyQuota = readMainPolicyQuota(parsed.mainPolicyQuota);
|
|
917
|
+
mainPolicyUsageObservation = undefined;
|
|
899
918
|
const now = Date.now();
|
|
900
919
|
for (const [accountId, quota] of Object.entries(parsed.quotas)) {
|
|
901
920
|
if (!quota || typeof quota !== "object" || typeof quota.updatedAt !== "number") continue;
|
|
@@ -953,6 +972,26 @@ export function getMainPolicyQuota(): StoredAccountQuota | null {
|
|
|
953
972
|
return structuredClone(mainPolicyQuota.quota);
|
|
954
973
|
}
|
|
955
974
|
|
|
975
|
+
/**
|
|
976
|
+
* The oldest measurement time among the windows the observed main identity's policy reading
|
|
977
|
+
* retains, or undefined when any of them was not measured in this process (for example a reading
|
|
978
|
+
* restored from disk) (#8113). Any stale retained window therefore makes the whole reading stale.
|
|
979
|
+
*/
|
|
980
|
+
export function getMainPolicyUsageObservedAt(): number | undefined {
|
|
981
|
+
hydrateAccountQuotasFromDisk();
|
|
982
|
+
if (!mainPolicyQuota || mainPolicyQuota.identityKey !== getObservedMainQuotaIdentityKey()) return undefined;
|
|
983
|
+
const observation = mainPolicyUsageObservation?.identityKey === mainPolicyQuota.identityKey
|
|
984
|
+
? mainPolicyUsageObservation.at : undefined;
|
|
985
|
+
let oldest: number | undefined;
|
|
986
|
+
for (const window of POLICY_USAGE_WINDOWS) {
|
|
987
|
+
if (!finitePercent(mainPolicyQuota.quota[window])) continue;
|
|
988
|
+
const at = observation?.[window];
|
|
989
|
+
if (at === undefined) return undefined;
|
|
990
|
+
oldest = oldest === undefined ? at : Math.min(oldest, at);
|
|
991
|
+
}
|
|
992
|
+
return oldest;
|
|
993
|
+
}
|
|
994
|
+
|
|
956
995
|
/** An owned identity observation may retire legacy main quota only when its retained policy tag proves replacement. */
|
|
957
996
|
export function discardMismatchedMainQuota(): void {
|
|
958
997
|
hydrateAccountQuotasFromDisk();
|
|
@@ -999,14 +1038,14 @@ export function clearAccountQuota(accountId?: string): void {
|
|
|
999
1038
|
if (accountId) {
|
|
1000
1039
|
hydrateAccountQuotasFromDisk();
|
|
1001
1040
|
accountQuota.delete(accountId);
|
|
1002
|
-
if (accountId === MAIN_CODEX_ACCOUNT_ID) mainPolicyQuota = null;
|
|
1041
|
+
if (accountId === MAIN_CODEX_ACCOUNT_ID) { mainPolicyQuota = null; mainPolicyUsageObservation = undefined; }
|
|
1003
1042
|
schedulePersistAccountQuotas();
|
|
1004
1043
|
forgetCodexQuotaBaseline(accountId);
|
|
1005
1044
|
return;
|
|
1006
1045
|
}
|
|
1007
1046
|
accountQuota.clear();
|
|
1008
1047
|
forgetCodexQuotaBaseline();
|
|
1009
|
-
mainPolicyQuota = null;
|
|
1048
|
+
{ mainPolicyQuota = null; mainPolicyUsageObservation = undefined; }
|
|
1010
1049
|
diskHydrated = false;
|
|
1011
1050
|
if (persistTimer) {
|
|
1012
1051
|
clearTimeout(persistTimer);
|
|
@@ -1061,7 +1100,8 @@ export function parseMainPolicyUsageQuota(data: WhamUsageResponse): MainPolicyQu
|
|
|
1061
1100
|
const windows = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
|
|
1062
1101
|
if (windows.some(window => isInvalidPolicyUsagePercent(window?.used_percent))) return null;
|
|
1063
1102
|
const quota = filterMainPolicyMonthlyQuota(parseUsageQuota(data), isThirtyDayOnlyCodexPlan(data.plan_type));
|
|
1064
|
-
|
|
1103
|
+
// #8596: a complete, allowed main read retires a carried monthly tuple under the pool proof (#8067).
|
|
1104
|
+
return quota ? withWhamMonthlyWindowAbsence(data, withWhamShortWindowAbsence(data, quota)) : null;
|
|
1065
1105
|
}
|
|
1066
1106
|
|
|
1067
1107
|
/** Derive absence from complete WHAM topology without changing the display quota. */
|
|
@@ -1095,22 +1135,33 @@ export function poolWhamPolicyObservation(
|
|
|
1095
1135
|
data: WhamUsageResponse, quota: Omit<StoredAccountQuota, "updatedAt"> | null,
|
|
1096
1136
|
): MainPolicyQuotaObservation | null {
|
|
1097
1137
|
if (!quota || !isValidWhamHistoryObservation(data)) return null;
|
|
1098
|
-
|
|
1138
|
+
if (data.rate_limit?.allowed === false || hasMalformedWhamReading(data)) return quota;
|
|
1139
|
+
return withWhamMonthlyWindowAbsence(data, withWhamShortWindowAbsence(data, quota));
|
|
1140
|
+
}
|
|
1141
|
+
|
|
1142
|
+
/** Retirement releases a block, so a present reading that does not parse is not "unknown". */
|
|
1143
|
+
function hasMalformedWhamReading(data: WhamUsageResponse): boolean {
|
|
1099
1144
|
const readings = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
|
|
1100
1145
|
for (const limit of Array.isArray(data.additional_rate_limits) ? data.additional_rate_limits : []) {
|
|
1101
1146
|
if (limit && typeof limit === "object") readings.push(limit.rate_limit?.primary_window, limit.rate_limit?.secondary_window);
|
|
1102
1147
|
}
|
|
1103
|
-
|
|
1148
|
+
return readings.some(window => window?.used_percent != null
|
|
1104
1149
|
&& normalizeUsagePercent(window.used_percent) === undefined);
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
|
|
1110
|
-
|
|
1150
|
+
}
|
|
1151
|
+
|
|
1152
|
+
/**
|
|
1153
|
+
* #8067/#8596: the complete topology that proves short-window absence also proves there is no
|
|
1154
|
+
* monthly window when no window declares a monthly duration and no tertiary window is present,
|
|
1155
|
+
* so a plan change away from a monthly primary (Free to Pro Lite) retires the carried tuple.
|
|
1156
|
+
* An explicit denial and invalid or unparseable readings never supply that proof.
|
|
1157
|
+
*/
|
|
1158
|
+
function withWhamMonthlyWindowAbsence(
|
|
1159
|
+
data: WhamUsageResponse, observation: MainPolicyQuotaObservation,
|
|
1160
|
+
): MainPolicyQuotaObservation {
|
|
1161
|
+
if (observation.shortWindowAbsent !== true || data.rate_limit?.allowed === false) return observation;
|
|
1162
|
+
if (!isValidWhamHistoryObservation(data) || hasMalformedWhamReading(data)) return observation;
|
|
1111
1163
|
const [primary, secondary, tertiary] = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
|
|
1112
|
-
return
|
|
1113
|
-
&& !isExplicitMonthlyWindow(primary) && !isExplicitMonthlyWindow(secondary) && tertiary == null
|
|
1164
|
+
return !isExplicitMonthlyWindow(primary) && !isExplicitMonthlyWindow(secondary) && tertiary == null
|
|
1114
1165
|
? { ...observation, monthlyWindowAbsent: true }
|
|
1115
1166
|
: observation;
|
|
1116
1167
|
}
|
|
@@ -1301,3 +1352,23 @@ export function latestCodexQuotaObservationSource(accountId: string): "wham" | "
|
|
|
1301
1352
|
hydrateAccountQuotasFromDisk();
|
|
1302
1353
|
return quotaHistory.peekLatestSource(accountId, poolQuotaHistoryIdentity(accountId));
|
|
1303
1354
|
}
|
|
1355
|
+
|
|
1356
|
+
/**
|
|
1357
|
+
* Live weekly windows the current credential generation has reported in contradiction (#8574),
|
|
1358
|
+
* read from the cached history only. Display evidence: admission, routing and credit consent
|
|
1359
|
+
* never read it.
|
|
1360
|
+
*
|
|
1361
|
+
* The caller passes the account's credential record, normally one entry of a single store
|
|
1362
|
+
* snapshot, so a roster listing costs no store read per account. The history is peeked, never
|
|
1363
|
+
* pruned or cleared, because a passive read (`/api/quota-pool`) reaches this.
|
|
1364
|
+
*/
|
|
1365
|
+
export function getAccountWeeklyQuotaConflicts(
|
|
1366
|
+
accountId: string,
|
|
1367
|
+
record: CodexAccountCredentialRecord | null | undefined,
|
|
1368
|
+
now = Date.now(),
|
|
1369
|
+
): WeeklyWindowConflict[] {
|
|
1370
|
+
hydrateAccountQuotasFromDisk();
|
|
1371
|
+
const identity = poolQuotaHistoryIdentityOf(record);
|
|
1372
|
+
if (!identity || !record) return [];
|
|
1373
|
+
return detectWeeklyWindowConflicts(quotaHistory.peekSamples(accountId, identity), record.generation, now);
|
|
1374
|
+
}
|
|
@@ -298,7 +298,9 @@ export function isSubagentModelUnavailable(
|
|
|
298
298
|
// route (canonical openai defaults to pool even when codexAccountMode is omitted).
|
|
299
299
|
if (!candidateAccountId) return true;
|
|
300
300
|
if (isCodexAccountPaused(config, candidateAccountId)) return true;
|
|
301
|
-
|
|
301
|
+
// An account-qualified route is an explicit selector, outside the pool-only policy (#7410).
|
|
302
|
+
if (!isCodexAccountUsable(config, candidateAccountId, route.codexAccountId !== undefined
|
|
303
|
+
? { ...usabilityOptions, explicitAccountSelector: true } : usabilityOptions)) return true;
|
|
302
304
|
if (route.codexAccountId !== undefined) {
|
|
303
305
|
// An account-qualified route is pinned and cannot consume Pool's recovery-probe
|
|
304
306
|
// escape hatch. Honor both account-wide and model-scoped cooldowns so fallback
|