@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.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 +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -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.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- 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 +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- 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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-restart-client.ts +3 -2
- 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 +321 -34
- 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-readiness.ts +16 -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-status.ts +76 -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 +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -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/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- 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-types.ts +2 -0
- package/src/codex/convergence.ts +2 -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/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- 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/redact.ts +84 -8
- 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 +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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 +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- 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/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- 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-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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- 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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -2
- 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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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 +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- 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 +137 -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 +7 -1
- 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 +218 -0
- 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 +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -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 +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- 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-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- 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/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-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- 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 +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -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/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/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- 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 +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -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
|
|
|
@@ -266,6 +268,78 @@ function shortResetHasElapsed(resetAt: number | undefined, now: number): boolean
|
|
|
266
268
|
return resetAtToMs(resetAt) <= now;
|
|
267
269
|
}
|
|
268
270
|
|
|
271
|
+
/**
|
|
272
|
+
* Whether the account's reset tickets went DOWN, which means one was just redeemed.
|
|
273
|
+
*
|
|
274
|
+
* A manual reset zeroes the current window's usage without ending it: the deadline moves further
|
|
275
|
+
* out, but the account keeps spending in what is effectively a fresh window. The percentage we
|
|
276
|
+
* cached before the redemption measures the window that was thrown away, so it must not be
|
|
277
|
+
* carried into the reset one — the user has, by definition, just bought themselves an empty
|
|
278
|
+
* window, and reporting the old 98% keeps them locked out of the quota they paid to recover.
|
|
279
|
+
*
|
|
280
|
+
* Only a DECREASE counts. Upstream periodically grants new tickets (`available_count` rising),
|
|
281
|
+
* which says nothing about current usage and must never invalidate a reading.
|
|
282
|
+
*
|
|
283
|
+
* This is the one signal that catches a redemption made outside this process — in the ChatGPT web
|
|
284
|
+
* UI, or on another machine. The header stream carries no reset-ticket field at all, so it can
|
|
285
|
+
* only ever be learned from the `/wham/usage` payload, and the hard lock delays that probe by
|
|
286
|
+
* minutes-to-an-hour. Keeping the judgement data-driven and here means the moment any observation
|
|
287
|
+
* does carry the new count, the stale percentage is retired instead of replayed.
|
|
288
|
+
*/
|
|
289
|
+
function resetTicketWasRedeemed(
|
|
290
|
+
incoming: Omit<StoredAccountQuota, "updatedAt">,
|
|
291
|
+
existing: StoredAccountQuota | undefined,
|
|
292
|
+
): boolean {
|
|
293
|
+
const previousCount = existing?.resetCredits;
|
|
294
|
+
const nextCount = incoming.resetCredits;
|
|
295
|
+
if (typeof previousCount !== "number" || !Number.isFinite(previousCount)) return false;
|
|
296
|
+
if (typeof nextCount !== "number" || !Number.isFinite(nextCount)) return false;
|
|
297
|
+
return nextCount < previousCount;
|
|
298
|
+
}
|
|
299
|
+
|
|
300
|
+
/**
|
|
301
|
+
* Whether the stored weekly reading belongs to a window that is demonstrably over.
|
|
302
|
+
*
|
|
303
|
+
* This is the weekly counterpart of `shortResetHasElapsed`. The short (5h) branch has always
|
|
304
|
+
* expired a carried tuple whose reset had passed; the weekly branch never did, so a stale
|
|
305
|
+
* weekly percentage could outlive its own deadline indefinitely as long as observations omitted
|
|
306
|
+
* the weekly header. Either of these retires the reading (an observation that carries the weekly
|
|
307
|
+
* window itself, including a later deadline, already replaces the tuple before this is consulted):
|
|
308
|
+
*
|
|
309
|
+
* 1. The stored deadline has already elapsed. Usage only accumulates inside an open window, so a
|
|
310
|
+
* percentage pinned to a closed one is history, not current state. This is exactly the rule
|
|
311
|
+
* `shortResetHasElapsed` applies to the 5h tuple and it is what lets a stuck account re-measure.
|
|
312
|
+
* 2. A reset ticket was redeemed (`resetTicketWasRedeemed`) — the window's usage was zeroed on
|
|
313
|
+
* purpose, so the pre-redemption percentage describes a window nobody is spending in any more.
|
|
314
|
+
*
|
|
315
|
+
* Why this matters beyond a cosmetic bar: this display/rotation snapshot feeds quota exhaustion and
|
|
316
|
+
* the pool rotation score. A percentage that can never expire keeps a recovered account excluded and
|
|
317
|
+
* its card at "usage limit reached" while upstream shows a nearly-empty window. The main-account hard
|
|
318
|
+
* lock is unaffected: it reads the separate policy snapshot, which these signals never touch.
|
|
319
|
+
*
|
|
320
|
+
* Policy callers must NOT use these signals. The hard lock's contract is that only an explicit
|
|
321
|
+
* observation that replaces a blocking reading may release it — "a predicted reset is not
|
|
322
|
+
* recovery evidence". There, a clock elapsing, an advanced deadline, and a redeemed ticket are
|
|
323
|
+
* all non-events; the arriving low percentage is what releases it.
|
|
324
|
+
*
|
|
325
|
+
* Observed live, twice:
|
|
326
|
+
* - Upstream had rolled the window over while every response carried only credits headers, so the
|
|
327
|
+
* old 98% was replayed for ~20h against a true 4%.
|
|
328
|
+
* - The user then redeemed a reset ticket in the web UI. Upstream reported 0% used with a deadline
|
|
329
|
+
* 4.84 days further out, but the cache still said 98%, so the hard lock kept refusing to send.
|
|
330
|
+
* Both times only manual cache surgery recovered the account.
|
|
331
|
+
*/
|
|
332
|
+
function weeklyWindowRolledOver(
|
|
333
|
+
incoming: Omit<StoredAccountQuota, "updatedAt">,
|
|
334
|
+
existing: StoredAccountQuota | undefined,
|
|
335
|
+
now: number,
|
|
336
|
+
): boolean {
|
|
337
|
+
if (resetTicketWasRedeemed(incoming, existing)) return true;
|
|
338
|
+
const previousReset = existing?.weeklyResetAt;
|
|
339
|
+
if (typeof previousReset !== "number" || !Number.isFinite(previousReset) || previousReset <= 0) return false;
|
|
340
|
+
return resetAtToMs(previousReset) <= now;
|
|
341
|
+
}
|
|
342
|
+
|
|
269
343
|
/** Display/rotation carry expires; a reset clock cannot retract blocking hard-lock evidence. */
|
|
270
344
|
function assignCarriedShort(
|
|
271
345
|
next: StoredAccountQuota,
|
|
@@ -409,8 +483,14 @@ function mergeAccountQuota(
|
|
|
409
483
|
}
|
|
410
484
|
|
|
411
485
|
if (creditsOnly) {
|
|
412
|
-
|
|
413
|
-
|
|
486
|
+
// A credits-only refresh says nothing about usage windows, so it normally carries the known
|
|
487
|
+
// ones. The exception is a weekly window upstream has already rolled over: replaying that
|
|
488
|
+
// percentage would report the previous window's usage as the current one, and a
|
|
489
|
+
// credits-only-only stream would keep doing so indefinitely. Policy evidence is exempt for
|
|
490
|
+
// the same reason as below: only an explicit lower observation may release the hard lock.
|
|
491
|
+
const weeklyRolledOver = !policyEvidence && weeklyWindowRolledOver(quota, existing, updatedAt);
|
|
492
|
+
if (existing?.weeklyPercent !== undefined && !weeklyRolledOver) next.weeklyPercent = existing.weeklyPercent;
|
|
493
|
+
if (existing?.weeklyResetAt !== undefined && !weeklyRolledOver) next.weeklyResetAt = existing.weeklyResetAt;
|
|
414
494
|
if (existing?.monthlyPercent !== undefined) next.monthlyPercent = existing.monthlyPercent;
|
|
415
495
|
if (existing?.monthlyResetAt !== undefined) next.monthlyResetAt = existing.monthlyResetAt;
|
|
416
496
|
if (existing?.monthlyIsPrimaryWindow === true) next.monthlyIsPrimaryWindow = true;
|
|
@@ -422,9 +502,19 @@ function mergeAccountQuota(
|
|
|
422
502
|
}
|
|
423
503
|
|
|
424
504
|
const existingWeeklyPercent = existing?.weeklyPercent;
|
|
505
|
+
// The one thing a stale reading must never survive: proof that its window is over.
|
|
506
|
+
// Display only. Policy evidence obeys a stricter contract — see preserveKnownWeekly below.
|
|
507
|
+
const weeklyRolledOver = weeklyWindowRolledOver(quota, existing, updatedAt);
|
|
425
508
|
// A reset-only weekly observation is not a lower reading. Policy mode keeps a blocking weekly
|
|
426
509
|
// tuple whole, exactly like preserveKnownShort; a governing monthly-primary observation still
|
|
427
510
|
// replaces it, so that release path does not depend on this guard.
|
|
511
|
+
//
|
|
512
|
+
// This guard is deliberately NOT relaxed for a rolled-over or advanced window. Policy evidence
|
|
513
|
+
// is the hard lock's only input, and "a predicted reset is not recovery evidence" is a pinned
|
|
514
|
+
// contract: `main-account-hard-lock-policy` asserts that advancing `weeklyResetAt` from now+60s
|
|
515
|
+
// to now+120s alone must NOT clear a retained 99. Releasing the lock has to stay a deliberate,
|
|
516
|
+
// explicitly-observed decision, so the policy path is left exactly as upstream wrote it. The
|
|
517
|
+
// display path below is where a dead reading is allowed to expire.
|
|
428
518
|
const preserveKnownWeekly = policyEvidence
|
|
429
519
|
&& quota.weeklyPercent === undefined
|
|
430
520
|
&& quota.monthlyIsPrimaryWindow !== true
|
|
@@ -438,7 +528,17 @@ function mergeAccountQuota(
|
|
|
438
528
|
&& (!policyEvidence || quota.monthlyIsPrimaryWindow === true)) {
|
|
439
529
|
// Legacy monthly-only clearing is unchanged (#382). Policy needs a governing
|
|
440
530
|
// monthly-primary observation: a tertiary-only header cannot retract weekly99.
|
|
441
|
-
} else if (existing?.weeklyPercent !== undefined
|
|
531
|
+
} else if (existing?.weeklyPercent !== undefined
|
|
532
|
+
&& (policyEvidence || !weeklyRolledOver)) {
|
|
533
|
+
// Carry-forward is for windows whose deadline upstream has not moved. Once it has, the
|
|
534
|
+
// percentage we hold belongs to the closed window; re-publishing it would hand the next
|
|
535
|
+
// window a usage figure it never earned. Leaving the field unset is correct here — the
|
|
536
|
+
// caller treats "unknown" as "needs a fresh measurement", which is exactly the state that
|
|
537
|
+
// lets quota auto-refresh recover.
|
|
538
|
+
//
|
|
539
|
+
// Policy mode is exempt and always carries: it must only ever change through an explicit
|
|
540
|
+
// observation, so it never expires on its own clock. That is the pinned contract above, and
|
|
541
|
+
// admitting either signal here re-opens the "predicted reset releases the lock" hole.
|
|
442
542
|
next.weeklyPercent = existing.weeklyPercent;
|
|
443
543
|
if (existing.weeklyResetAt !== undefined) next.weeklyResetAt = existing.weeklyResetAt;
|
|
444
544
|
}
|
|
@@ -685,23 +785,30 @@ export function updateAccountQuota(
|
|
|
685
785
|
if (nextWeekly === undefined && nextMonthly === undefined && resetCredits === undefined) return;
|
|
686
786
|
hydrateAccountQuotasFromDisk();
|
|
687
787
|
const existing = accountQuota.get(accountId);
|
|
788
|
+
// The WHAM/usage path carries the same staleness hazard as `mergeAccountQuota`: pre-seeding
|
|
789
|
+
// from `existing` and only overwriting when a new value arrives replays an expired weekly
|
|
790
|
+
// reading forever, because a caller that omits the weekly window never clears it. That is the
|
|
791
|
+
// second half of the "weekly bar stuck at 98%" bug - the header path is fixed above, and
|
|
792
|
+
// without this the WHAM path would keep the stale value alive on its own.
|
|
793
|
+
const now = Date.now();
|
|
794
|
+
const weeklyExpired = weeklyWindowRolledOver({}, existing, now);
|
|
688
795
|
|
|
689
796
|
const quota: StoredAccountQuota = {
|
|
690
|
-
...(existing?.weeklyPercent !== undefined ? { weeklyPercent: existing.weeklyPercent } : {}),
|
|
797
|
+
...(existing?.weeklyPercent !== undefined && !weeklyExpired ? { weeklyPercent: existing.weeklyPercent } : {}),
|
|
691
798
|
...(existing?.monthlyPercent !== undefined ? { monthlyPercent: existing.monthlyPercent } : {}),
|
|
692
799
|
// Carry provenance with the value it describes. Dropping it here would downgrade a proven
|
|
693
800
|
// explicit-primary reading to "unproven" on the next unrelated weekly update.
|
|
694
801
|
...(existing?.monthlyPercent !== undefined && existing.monthlyIsPrimaryWindow === true
|
|
695
802
|
? { monthlyIsPrimaryWindow: true }
|
|
696
803
|
: {}),
|
|
697
|
-
...(existing?.weeklyResetAt !== undefined ? { weeklyResetAt: existing.weeklyResetAt } : {}),
|
|
804
|
+
...(existing?.weeklyResetAt !== undefined && !weeklyExpired ? { weeklyResetAt: existing.weeklyResetAt } : {}),
|
|
698
805
|
...(existing?.monthlyResetAt !== undefined ? { monthlyResetAt: existing.monthlyResetAt } : {}),
|
|
699
806
|
...(existing?.customWindows !== undefined ? { customWindows: existing.customWindows } : {}),
|
|
700
807
|
...(existing?.resetCredits !== undefined ? { resetCredits: existing.resetCredits } : {}),
|
|
701
808
|
...(existing?.credits !== undefined ? { credits: existing.credits } : {}),
|
|
702
809
|
...(existing?.credits === null && existing.creditObservationUnavailable === true
|
|
703
810
|
? { creditObservationUnavailable: true as const } : {}),
|
|
704
|
-
updatedAt:
|
|
811
|
+
updatedAt: now,
|
|
705
812
|
};
|
|
706
813
|
assignCarriedShort(quota, existing, quota.updatedAt);
|
|
707
814
|
|
|
@@ -1196,3 +1303,23 @@ export function latestCodexQuotaObservationSource(accountId: string): "wham" | "
|
|
|
1196
1303
|
hydrateAccountQuotasFromDisk();
|
|
1197
1304
|
return quotaHistory.peekLatestSource(accountId, poolQuotaHistoryIdentity(accountId));
|
|
1198
1305
|
}
|
|
1306
|
+
|
|
1307
|
+
/**
|
|
1308
|
+
* Live weekly windows the current credential generation has reported in contradiction (#8574),
|
|
1309
|
+
* read from the cached history only. Display evidence: admission, routing and credit consent
|
|
1310
|
+
* never read it.
|
|
1311
|
+
*
|
|
1312
|
+
* The caller passes the account's credential record, normally one entry of a single store
|
|
1313
|
+
* snapshot, so a roster listing costs no store read per account. The history is peeked, never
|
|
1314
|
+
* pruned or cleared, because a passive read (`/api/quota-pool`) reaches this.
|
|
1315
|
+
*/
|
|
1316
|
+
export function getAccountWeeklyQuotaConflicts(
|
|
1317
|
+
accountId: string,
|
|
1318
|
+
record: CodexAccountCredentialRecord | null | undefined,
|
|
1319
|
+
now = Date.now(),
|
|
1320
|
+
): WeeklyWindowConflict[] {
|
|
1321
|
+
hydrateAccountQuotasFromDisk();
|
|
1322
|
+
const identity = poolQuotaHistoryIdentityOf(record);
|
|
1323
|
+
if (!identity || !record) return [];
|
|
1324
|
+
return detectWeeklyWindowConflicts(quotaHistory.peekSamples(accountId, identity), record.generation, now);
|
|
1325
|
+
}
|
|
@@ -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
|