@bitkyc08/opencodex 2.100.5 → 2.100.6
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 +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -3,6 +3,7 @@ import { chmodSync, closeSync, fsyncSync, mkdtempSync, openSync, writeFileSync }
|
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { hardenSecretDir, hardenSecretPath } from "../lib/windows-secret-acl";
|
|
5
5
|
import { isOcxRoutingMarkerLine } from "./injected-marker";
|
|
6
|
+
import { CODEX_CONFIG_PATH, defaultCodexCatalogPathForConfig, sameCodexCatalogPath } from "./paths";
|
|
6
7
|
import { transformManagedSubagentDefaults, type WrittenSubagentDefaults } from "./subagent-defaults";
|
|
7
8
|
import { rootAssignmentKey, rootSourceLines, sourceAssignment, sourceText } from "./toml-source-lines";
|
|
8
9
|
|
|
@@ -87,9 +88,9 @@ function fields(content: string): Map<string, Field> {
|
|
|
87
88
|
|
|
88
89
|
export function captureJournalConfigFields(content: string, ownership: Ownership): JournalConfigFields {
|
|
89
90
|
const captured: JournalConfigFields = {};
|
|
91
|
+
const recorded = recordedValues(ownership);
|
|
90
92
|
for (const [key, span] of fields(content)) {
|
|
91
|
-
|
|
92
|
-
if (isDeepStrictEqual(span.value, recorded) || key === "model_provider" && span.value === "opencodex"
|
|
93
|
+
if (matchesInjectedField(key, span.value, recorded.get(key)) || key === "model_provider" && span.value === "opencodex"
|
|
93
94
|
|| key === "model_providers.opencodex" || key === "profiles.opencodex") captured[key] = span.text;
|
|
94
95
|
}
|
|
95
96
|
// Injection removes the root selection and old inline OCX profiles in URL-only mode.
|
|
@@ -135,23 +136,43 @@ interface Ownership {
|
|
|
135
136
|
injectedOpenaiBaseUrl?: string | null;
|
|
136
137
|
injectedRealtimeWsBaseUrl?: string | null;
|
|
137
138
|
injectedCatalogPath?: string | null;
|
|
139
|
+
injectedCatalogBinding?: string | null;
|
|
138
140
|
injectedRootWebSearch?: string | null;
|
|
139
141
|
replacedRootWebSearch?: string | null;
|
|
140
142
|
injectedSubagentDefaults?: WrittenSubagentDefaults | null;
|
|
141
143
|
injectedRootHistory?: unknown;
|
|
142
144
|
}
|
|
143
145
|
|
|
146
|
+
/** Older records selected a catalog artifact even when the operator owned the binding. */
|
|
147
|
+
export function ownedJournalCatalogBinding(journal: Ownership): string | null {
|
|
148
|
+
if (journal.injectedCatalogBinding !== undefined) {
|
|
149
|
+
return typeof journal.injectedCatalogBinding === "string" && journal.injectedCatalogBinding
|
|
150
|
+
? journal.injectedCatalogBinding : null;
|
|
151
|
+
}
|
|
152
|
+
const path = journal.injectedCatalogPath;
|
|
153
|
+
return typeof path === "string" && path
|
|
154
|
+
&& sameCodexCatalogPath(CODEX_CONFIG_PATH, path, defaultCodexCatalogPathForConfig(CODEX_CONFIG_PATH))
|
|
155
|
+
? path : null;
|
|
156
|
+
}
|
|
157
|
+
|
|
144
158
|
function recordedValues(journal: Ownership): Map<string, unknown> {
|
|
145
159
|
const values = new Map<string, unknown>();
|
|
146
160
|
for (const [key, value] of [
|
|
147
161
|
["openai_base_url", journal.injectedOpenaiBaseUrl],
|
|
148
162
|
["experimental_realtime_ws_base_url", journal.injectedRealtimeWsBaseUrl],
|
|
149
|
-
["model_catalog_json", journal
|
|
163
|
+
["model_catalog_json", ownedJournalCatalogBinding(journal)],
|
|
150
164
|
["web_search", journal.injectedRootWebSearch],
|
|
151
165
|
] as const) if (typeof value === "string") values.set(key, value);
|
|
152
166
|
return values;
|
|
153
167
|
}
|
|
154
168
|
|
|
169
|
+
function matchesInjectedField(key: string, value: unknown, injected: unknown): boolean {
|
|
170
|
+
if (key === "model_catalog_json" && typeof value === "string" && value && typeof injected === "string" && injected) {
|
|
171
|
+
return sameCodexCatalogPath(CODEX_CONFIG_PATH, value, injected);
|
|
172
|
+
}
|
|
173
|
+
return isDeepStrictEqual(value, injected);
|
|
174
|
+
}
|
|
175
|
+
|
|
155
176
|
/** Three-way restore: an edited preference stays; an edited routing field blocks hand-back. */
|
|
156
177
|
export function restoreJournalConfigFields(current: string, original: string, journal: Ownership, recoverOwnedEdits = false): string | null {
|
|
157
178
|
try {
|
|
@@ -159,6 +180,10 @@ export function restoreJournalConfigFields(current: string, original: string, jo
|
|
|
159
180
|
if (!defaults.ok) return null;
|
|
160
181
|
current = defaults.content;
|
|
161
182
|
const now = fields(current), before = fields(original);
|
|
183
|
+
const catalog = now.get("model_catalog_json");
|
|
184
|
+
const ownedCatalog = ownedJournalCatalogBinding(journal);
|
|
185
|
+
const canRestoreCatalog = ownedCatalog !== null && (journal.injectedCatalogBinding !== undefined
|
|
186
|
+
|| !catalog || matchesInjectedField("model_catalog_json", catalog.value, ownedCatalog));
|
|
162
187
|
if (journal.replacedRootWebSearch) {
|
|
163
188
|
const replaced = fields(journal.replacedRootWebSearch).get("web_search");
|
|
164
189
|
if (!replaced) return null;
|
|
@@ -167,6 +192,7 @@ export function restoreJournalConfigFields(current: string, original: string, jo
|
|
|
167
192
|
const expected = new Map<string, unknown>();
|
|
168
193
|
if (journal.injectedConfigFields) {
|
|
169
194
|
for (const [key, text] of Object.entries(journal.injectedConfigFields)) {
|
|
195
|
+
if (key === "model_catalog_json" && !canRestoreCatalog) continue;
|
|
170
196
|
if (text === null) { expected.set(key, undefined); continue; }
|
|
171
197
|
const parsed = fields(text);
|
|
172
198
|
const field = parsed.get(key);
|
|
@@ -201,6 +227,7 @@ export function restoreJournalConfigFields(current: string, original: string, jo
|
|
|
201
227
|
const append: string[] = [];
|
|
202
228
|
const eol = lines.find(line => line.eol)?.eol || "\n";
|
|
203
229
|
for (const key of new Set([...now.keys(), ...expected.keys()])) {
|
|
230
|
+
if (key === "model_catalog_json" && !canRestoreCatalog) continue;
|
|
204
231
|
const present = now.get(key), prior = before.get(key);
|
|
205
232
|
if (isDeepStrictEqual(present?.value, prior?.value)) continue;
|
|
206
233
|
if (!expected.has(key)) {
|
|
@@ -209,7 +236,7 @@ export function restoreJournalConfigFields(current: string, original: string, jo
|
|
|
209
236
|
}
|
|
210
237
|
const injected = expected.get(key);
|
|
211
238
|
if (isDeepStrictEqual(injected, prior?.value)) continue; // never owned
|
|
212
|
-
if (!
|
|
239
|
+
if (!matchesInjectedField(key, present?.value, injected)) {
|
|
213
240
|
if (key === "model" || key.startsWith("agents.") || key === "web_search") continue;
|
|
214
241
|
if (!recoverOwnedEdits) return null;
|
|
215
242
|
}
|
package/src/codex/journal.ts
CHANGED
|
@@ -8,9 +8,9 @@ import { assertCodexHomeOwner, codexHomeIsAbsent, CODEX_HOME_JOURNAL_FILE, Codex
|
|
|
8
8
|
import { hasInjectedCodexRouting } from "./injected-marker";
|
|
9
9
|
import { ConfigWriteContentChanged, configWriteLockFailureMessage, withConfigWriteLockHeld } from "./config-write-lock";
|
|
10
10
|
import type { LockHandle } from "./config-write-lock";
|
|
11
|
-
import { CODEX_HOME, CODEX_CONFIG_PATH, CODEX_PROFILE_PATH } from "./paths";
|
|
11
|
+
import { CODEX_HOME, CODEX_CONFIG_PATH, CODEX_PROFILE_PATH, resolveCodexCatalogPath } from "./paths";
|
|
12
12
|
import { transformManagedSubagentDefaults, type WrittenSubagentDefaults } from "./subagent-defaults";
|
|
13
|
-
import { appendInjectedRootHistory, captureJournalConfigFields, parseInjectedRootHistory, restoreJournalConfigFields, snapshotDisconnectRecovery, type InjectedRootHistory, type InjectedRootKey, type JournalConfigFields } from "./journal-config-restore";
|
|
13
|
+
import { appendInjectedRootHistory, captureJournalConfigFields, ownedJournalCatalogBinding, parseInjectedRootHistory, restoreJournalConfigFields, snapshotDisconnectRecovery, type InjectedRootHistory, type InjectedRootKey, type JournalConfigFields } from "./journal-config-restore";
|
|
14
14
|
|
|
15
15
|
/**
|
|
16
16
|
* Exported so that anything reasoning ABOUT the journal points at the journal.
|
|
@@ -71,7 +71,8 @@ interface Journal {
|
|
|
71
71
|
*/
|
|
72
72
|
replacedRootWebSearch?: string | null;
|
|
73
73
|
/**
|
|
74
|
-
* The catalog path this injection actually wrote to.
|
|
74
|
+
* The resolved catalog path this injection actually wrote to. Older journals may store a
|
|
75
|
+
* config-relative binding.
|
|
75
76
|
*
|
|
76
77
|
* #1798: restore re-resolves the catalog from the CURRENT config, so a Codex app rewrite
|
|
77
78
|
* that dropped `model_catalog_json` sends restore to the default catalog while the
|
|
@@ -79,6 +80,8 @@ interface Journal {
|
|
|
79
80
|
* file we actually touched.
|
|
80
81
|
*/
|
|
81
82
|
injectedCatalogPath?: string | null;
|
|
83
|
+
/** The root binding we wrote. Null means config.toml retained user ownership or had no binding. */
|
|
84
|
+
injectedCatalogBinding?: string | null;
|
|
82
85
|
/**
|
|
83
86
|
* The marker-owned `[agents]` default values this injection wrote, keyed by TOML key.
|
|
84
87
|
*
|
|
@@ -239,6 +242,7 @@ export interface InjectedJournalOwnership {
|
|
|
239
242
|
injectedOpenaiBaseUrl: string | null;
|
|
240
243
|
injectedRealtimeWsBaseUrl: string | null;
|
|
241
244
|
injectedCatalogPath: string | null;
|
|
245
|
+
injectedCatalogBinding?: string | null;
|
|
242
246
|
/** Omitted by callers that inject no `web_search` line, which is the value it then records. */
|
|
243
247
|
injectedRootWebSearch?: string | null;
|
|
244
248
|
/** Omitted by callers that removed no user `web_search` line. */
|
|
@@ -281,6 +285,7 @@ export function markJournalInjectedState(
|
|
|
281
285
|
journal.replacedRootWebSearch = ownership.replacedRootWebSearch ?? null;
|
|
282
286
|
journal.injectedSubagentDefaults = ownership.injectedSubagentDefaults ?? null;
|
|
283
287
|
journal.injectedCatalogPath = ownership.injectedCatalogPath;
|
|
288
|
+
journal.injectedCatalogBinding = ownership.injectedCatalogBinding;
|
|
284
289
|
journal.injectedRootHistory = appendInjectedRootHistory(journal.injectedRootHistory, {
|
|
285
290
|
openai_base_url: ownership.injectedOpenaiBaseUrl,
|
|
286
291
|
experimental_realtime_ws_base_url: ownership.injectedRealtimeWsBaseUrl,
|
|
@@ -327,7 +332,14 @@ export function journaledReplacedRootWebSearch(options: { readOnly?: boolean } =
|
|
|
327
332
|
|
|
328
333
|
/** The catalog path the last injection wrote to, or null when none was recorded. */
|
|
329
334
|
export function journaledInjectedCatalogPath(): string | null {
|
|
330
|
-
|
|
335
|
+
const path = readJournal()?.injectedCatalogPath;
|
|
336
|
+
return typeof path === "string" && path ? resolveCodexCatalogPath(CODEX_CONFIG_PATH, path) : null;
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
/** Config ownership is distinct from the catalog file selected for an injection. */
|
|
340
|
+
export function journaledOwnedCatalogBinding(options: { readOnly?: boolean } = {}): string | null {
|
|
341
|
+
const journal = readJournal(options.readOnly !== true);
|
|
342
|
+
return journal ? ownedJournalCatalogBinding(journal) : null;
|
|
331
343
|
}
|
|
332
344
|
|
|
333
345
|
/**
|
package/src/codex/model-cache.ts
CHANGED
|
@@ -21,6 +21,8 @@ interface CacheEntry {
|
|
|
21
21
|
sizeBytes: number;
|
|
22
22
|
/** Irreversible credential/account identity for entitlement-sensitive catalogs. */
|
|
23
23
|
authorityIdentity?: string;
|
|
24
|
+
/** Set by {@link expireModelCache}: the rows stay as the fallback but no longer count as fresh. */
|
|
25
|
+
expired?: true;
|
|
24
26
|
}
|
|
25
27
|
|
|
26
28
|
export type ProviderModelDiscoveryFailureReason =
|
|
@@ -45,6 +47,8 @@ export type ProviderModelDiscoveryFailure = ProviderModelDiscoveryStatus extends
|
|
|
45
47
|
: never
|
|
46
48
|
: never;
|
|
47
49
|
|
|
50
|
+
export type ProviderModelDiscoveryWarningCondition = "xai-legacy-privacy-mode";
|
|
51
|
+
|
|
48
52
|
/** Whether clearing cache rows also revokes in-flight discovery authority. */
|
|
49
53
|
export type ModelCacheClearReason = "authority" | "eviction";
|
|
50
54
|
|
|
@@ -92,7 +96,21 @@ interface DiscoveryFailure {
|
|
|
92
96
|
}
|
|
93
97
|
|
|
94
98
|
const failureAt = new Map<string, DiscoveryFailure>();
|
|
95
|
-
const discoveryStatus = new Map<string,
|
|
99
|
+
const discoveryStatus = new Map<string, {
|
|
100
|
+
observation: ProviderModelDiscoveryStatus;
|
|
101
|
+
observationOrder?: number;
|
|
102
|
+
warningCondition?: ProviderModelDiscoveryWarningCondition;
|
|
103
|
+
}>();
|
|
104
|
+
let nextDiscoveryObservationOrder = 0;
|
|
105
|
+
|
|
106
|
+
/** Stamp a discovery at headers, before reading a body that may finish out of order. */
|
|
107
|
+
export function captureProviderDiscoveryObservation(): number {
|
|
108
|
+
return ++nextDiscoveryObservationOrder;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
export function isProviderDiscoveryObservationCurrent(provider: string, order?: number): boolean {
|
|
112
|
+
return order === undefined || order > (discoveryStatus.get(provider)?.observationOrder ?? 0);
|
|
113
|
+
}
|
|
96
114
|
/**
|
|
97
115
|
* How many models the last successful discovery actually returned, before any configured-alias
|
|
98
116
|
* augmentation or custom-model merge. Consumers cannot recover this by subtracting known custom
|
|
@@ -112,16 +130,20 @@ export function markModelsFetchFailure(
|
|
|
112
130
|
|
|
113
131
|
/** `liveModelCount` is required so a caller that forgets to pass it fails typecheck instead of
|
|
114
132
|
* silently recording zero and misclassifying the provider as having no live catalog. */
|
|
115
|
-
export function markProviderDiscoveryOk(provider: string, liveModelCount: number): void {
|
|
116
|
-
discoveryStatus.set(provider, { status: "ok" });
|
|
133
|
+
export function markProviderDiscoveryOk(provider: string, liveModelCount: number, observationOrder?: number): void {
|
|
134
|
+
discoveryStatus.set(provider, { observation: { status: "ok" }, observationOrder });
|
|
135
|
+
// A newer discovery can succeed after an earlier failure started a cooldown in flight.
|
|
136
|
+
failureAt.delete(provider);
|
|
117
137
|
liveModelCounts.set(provider, Math.max(0, Math.floor(liveModelCount)));
|
|
118
138
|
}
|
|
119
139
|
|
|
120
140
|
export function markProviderDiscoveryFailed(
|
|
121
141
|
provider: string,
|
|
122
142
|
failure: ProviderModelDiscoveryFailure,
|
|
143
|
+
warningCondition?: ProviderModelDiscoveryWarningCondition,
|
|
144
|
+
observationOrder?: number,
|
|
123
145
|
): void {
|
|
124
|
-
discoveryStatus.set(provider, { status: "failed", ...failure });
|
|
146
|
+
discoveryStatus.set(provider, { observation: { status: "failed", ...failure }, warningCondition, observationOrder });
|
|
125
147
|
}
|
|
126
148
|
|
|
127
149
|
/**
|
|
@@ -130,16 +152,20 @@ export function markProviderDiscoveryFailed(
|
|
|
130
152
|
* Foundry, returns HTTP 404 forever; the 30s cooldown re-probes and previously re-logged each time).
|
|
131
153
|
*
|
|
132
154
|
* Returns true only when the failure SIGNATURE changed since the last observed status — i.e. the
|
|
133
|
-
* previous state was ok/undefined, or a different reason
|
|
134
|
-
* stay observable through `getProviderDiscoveryStatus()` / the
|
|
155
|
+
* previous state was ok/undefined, or a different reason, HTTP status, or warning condition.
|
|
156
|
+
* Repeated identical failures stay observable through `getProviderDiscoveryStatus()` / the
|
|
157
|
+
* providers API without log spam.
|
|
135
158
|
* Call this BEFORE `markProviderDiscoveryFailed` so it can see the prior state.
|
|
136
159
|
*/
|
|
137
160
|
export function shouldLogDiscoveryFailure(
|
|
138
161
|
provider: string,
|
|
139
162
|
failure: ProviderModelDiscoveryFailure,
|
|
163
|
+
warningCondition?: ProviderModelDiscoveryWarningCondition,
|
|
140
164
|
): boolean {
|
|
141
|
-
const
|
|
142
|
-
if (!
|
|
165
|
+
const previous = discoveryStatus.get(provider);
|
|
166
|
+
if (!previous || previous.observation.status !== "failed") return true;
|
|
167
|
+
if (previous.warningCondition !== warningCondition) return true;
|
|
168
|
+
const prev = previous.observation;
|
|
143
169
|
if (prev.reason !== failure.reason) return true;
|
|
144
170
|
if (prev.reason === "http" && failure.reason === "http") {
|
|
145
171
|
return prev.httpStatus !== failure.httpStatus;
|
|
@@ -153,7 +179,7 @@ export function clearProviderDiscoveryStatus(provider: string): void {
|
|
|
153
179
|
}
|
|
154
180
|
|
|
155
181
|
export function getProviderDiscoveryStatus(provider: string): ProviderModelDiscoveryStatus | undefined {
|
|
156
|
-
return discoveryStatus.get(provider);
|
|
182
|
+
return discoveryStatus.get(provider)?.observation;
|
|
157
183
|
}
|
|
158
184
|
|
|
159
185
|
/** Undefined when discovery has never succeeded for this provider. A failed refresh keeps the
|
|
@@ -187,7 +213,7 @@ export function isModelsFetchCoolingDown(
|
|
|
187
213
|
export function getFreshCached(provider: string, ttlMs: number, now = Date.now(), authorityIdentity?: string): CatalogModel[] | null {
|
|
188
214
|
const entry = cache.get(provider);
|
|
189
215
|
if (!entry) return null;
|
|
190
|
-
if (authorityIdentity !== undefined && entry.authorityIdentity !== authorityIdentity) return null;
|
|
216
|
+
if (entry.expired || (authorityIdentity !== undefined && entry.authorityIdentity !== authorityIdentity)) return null;
|
|
191
217
|
return now - entry.fetchedAt < ttlMs ? entry.models : null;
|
|
192
218
|
}
|
|
193
219
|
|
|
@@ -225,37 +251,62 @@ export function isModelCacheGenerationCurrent(provider: string, generation: stri
|
|
|
225
251
|
}
|
|
226
252
|
|
|
227
253
|
/**
|
|
228
|
-
*
|
|
229
|
-
*
|
|
230
|
-
*
|
|
231
|
-
* to publish, so it advances on an authority clear and must not be repurposed: moving it on a
|
|
232
|
-
* successful publication would cancel writes that are still legitimate. This counts accepted
|
|
233
|
-
* publications and removals instead, which is what a reader holding a derived roster needs to
|
|
234
|
-
* know, and it advances on exactly the event a generation does not: a discovery that succeeded
|
|
235
|
-
* and changed the rows.
|
|
236
|
-
*
|
|
237
|
-
* Reading is passive. An unseen provider reads as `0` rather than seeding an entry, so observing
|
|
238
|
-
* one cannot alter what a later capture or publication sees.
|
|
254
|
+
* Track cached row changes independently from authority invalidation and discovery ordering.
|
|
255
|
+
* A reader holding a derived roster needs all three terms to revalidate publication.
|
|
256
|
+
* Reading a revision is passive and never creates a provider entry.
|
|
239
257
|
*/
|
|
240
258
|
const providerCacheRevisions = new Map<string, number>();
|
|
241
259
|
let globalContentRevision = 0;
|
|
242
260
|
|
|
261
|
+
// The publication watermark survives row eviction while a delayed flight can still finish.
|
|
262
|
+
const publishedDiscoveryGenerations = new Map<string, number>();
|
|
263
|
+
let nextDiscoveryGeneration = 0;
|
|
264
|
+
|
|
265
|
+
export function captureModelDiscoveryGeneration(): number {
|
|
266
|
+
return ++nextDiscoveryGeneration;
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
export function canPublishModelDiscovery(provider: string, generation: number): boolean {
|
|
270
|
+
return generation >= (publishedDiscoveryGenerations.get(provider) ?? 0);
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
/** Advance the shared watermark for either outcome, independently of cached rows. */
|
|
274
|
+
export function claimModelDiscoveryPublication(provider: string, generation: number): boolean {
|
|
275
|
+
if (!canPublishModelDiscovery(provider, generation)) return false;
|
|
276
|
+
publishedDiscoveryGenerations.set(provider, generation);
|
|
277
|
+
return true;
|
|
278
|
+
}
|
|
279
|
+
|
|
243
280
|
function bumpProviderCacheRevision(provider: string): void {
|
|
244
281
|
providerCacheRevisions.set(provider, (providerCacheRevisions.get(provider) ?? 0) + 1);
|
|
245
282
|
}
|
|
246
283
|
|
|
284
|
+
/** A successful roster available to its caller after a newer observation wins publication. */
|
|
285
|
+
export function callerLocalModelDiscoveryRevision(cacheGeneration: string): string {
|
|
286
|
+
return `caller-local:${cacheGeneration}`;
|
|
287
|
+
}
|
|
288
|
+
|
|
247
289
|
export function observeModelCacheRevision(provider: string): string {
|
|
248
290
|
// The global term covers a clear that empties the map wholesale, which per-provider counters
|
|
249
291
|
// cannot express: without it, wiping every entry and republishing identical-looking rows would
|
|
250
292
|
// read as unchanged. It also survives pruning, so a retired provider cannot come back with a
|
|
251
|
-
// counter that matches a roster built before it left.
|
|
252
|
-
|
|
293
|
+
// counter that matches a roster built before it left. The publication watermark also
|
|
294
|
+
// retires older derived rosters on a newer failure, even when the rows stay unchanged.
|
|
295
|
+
return `${globalContentRevision}:${providerCacheRevisions.get(provider) ?? 0}`
|
|
296
|
+
+ `:${providerCacheGenerations.get(provider) ?? 0}:${publishedDiscoveryGenerations.get(provider) ?? 0}`;
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
/** Recognize ordered supersession while the provider's cache authority still holds. */
|
|
300
|
+
export function readableSupersededModelDiscovery(provider: string, revision: string): "caller-local" | "previously-current" | null {
|
|
301
|
+
const authority = providerCacheGenerations.get(provider) ?? 0;
|
|
302
|
+
if (revision === callerLocalModelDiscoveryRevision(`${globalCacheGeneration}:${authority}`)) return "caller-local";
|
|
303
|
+
const [epoch, , capturedAuthority, publication] = revision.split(":");
|
|
304
|
+
return epoch === String(globalContentRevision) && capturedAuthority === String(authority)
|
|
305
|
+
&& Number(publication) < (publishedDiscoveryGenerations.get(provider) ?? 0) ? "previously-current" : null;
|
|
253
306
|
}
|
|
254
307
|
|
|
255
308
|
/**
|
|
256
|
-
* Store a live result
|
|
257
|
-
* The optional generation keeps existing direct cache writers unchanged while discovery callers can
|
|
258
|
-
* prevent a previous OAuth account from repopulating the current account's cache.
|
|
309
|
+
* Store a live result if cache authority still holds and no newer discovery has published.
|
|
259
310
|
*/
|
|
260
311
|
export function setCached(
|
|
261
312
|
provider: string,
|
|
@@ -263,8 +314,10 @@ export function setCached(
|
|
|
263
314
|
now = Date.now(),
|
|
264
315
|
generation?: string,
|
|
265
316
|
authorityIdentity?: string,
|
|
317
|
+
discoveryGeneration?: number,
|
|
266
318
|
): boolean {
|
|
267
319
|
if (generation !== undefined && !isModelCacheGenerationCurrent(provider, generation)) return false;
|
|
320
|
+
if (discoveryGeneration !== undefined && !claimModelDiscoveryPublication(provider, discoveryGeneration)) return false;
|
|
268
321
|
deleteCachedProvider(provider);
|
|
269
322
|
const sizeBytes = modelCacheEncoder.encode(provider).byteLength
|
|
270
323
|
+ modelCacheEncoder.encode(JSON.stringify(models)).byteLength;
|
|
@@ -280,6 +333,18 @@ export function setCached(
|
|
|
280
333
|
return true;
|
|
281
334
|
}
|
|
282
335
|
|
|
336
|
+
/**
|
|
337
|
+
* Expire freshness and require a new observation, keeping the last-known-good rows for fallback.
|
|
338
|
+
* During failure backoff, leave both the cache and its failure observation intact.
|
|
339
|
+
*/
|
|
340
|
+
export function expireModelCache(provider: string): boolean {
|
|
341
|
+
if (isModelsFetchCoolingDown(provider)) return false;
|
|
342
|
+
const entry = cache.get(provider);
|
|
343
|
+
if (entry) entry.expired = true;
|
|
344
|
+
discoveryStatus.delete(provider);
|
|
345
|
+
return true;
|
|
346
|
+
}
|
|
347
|
+
|
|
283
348
|
/** Drop one provider's cache (or all) so the next resolve forces a live re-fetch. */
|
|
284
349
|
export function clearModelCache(
|
|
285
350
|
provider?: string,
|
|
@@ -290,13 +355,17 @@ export function clearModelCache(
|
|
|
290
355
|
if (provider) {
|
|
291
356
|
if (revokesInFlightDiscovery) {
|
|
292
357
|
providerCacheGenerations.set(provider, (providerCacheGenerations.get(provider) ?? 0) + 1);
|
|
358
|
+
publishedDiscoveryGenerations.delete(provider);
|
|
293
359
|
}
|
|
294
360
|
deleteCachedProvider(provider);
|
|
295
361
|
failureAt.delete(provider);
|
|
296
362
|
discoveryStatus.delete(provider);
|
|
297
363
|
liveModelCounts.delete(provider);
|
|
298
364
|
} else {
|
|
299
|
-
if (revokesInFlightDiscovery)
|
|
365
|
+
if (revokesInFlightDiscovery) {
|
|
366
|
+
globalCacheGeneration += 1;
|
|
367
|
+
publishedDiscoveryGenerations.clear();
|
|
368
|
+
}
|
|
300
369
|
cache.clear();
|
|
301
370
|
// A wholesale clear changes every provider's content at once, and clearing the map means no
|
|
302
371
|
// per-provider counter can record it. Advancing the global term retires every derived roster
|
|
@@ -321,6 +390,7 @@ export function reconcileModelCacheProviders(
|
|
|
321
390
|
const trackedProviders = new Set([
|
|
322
391
|
...providerCacheGenerations.keys(),
|
|
323
392
|
...providerCacheRevisions.keys(),
|
|
393
|
+
...publishedDiscoveryGenerations.keys(),
|
|
324
394
|
...failureAt.keys(),
|
|
325
395
|
...discoveryStatus.keys(),
|
|
326
396
|
...liveModelCounts.keys(),
|
|
@@ -348,6 +418,7 @@ export function reconcileModelCacheProviders(
|
|
|
348
418
|
// longer has must not keep an entry alive for the life of the process merely because nothing
|
|
349
419
|
// cleared the whole cache. The global epoch advanced above, so the removal is not an ABA.
|
|
350
420
|
providerCacheRevisions.delete(provider);
|
|
421
|
+
publishedDiscoveryGenerations.delete(provider);
|
|
351
422
|
removedProviders.add(provider);
|
|
352
423
|
}
|
|
353
424
|
lastReconciledGeneration = generation;
|
|
@@ -33,6 +33,7 @@ import {
|
|
|
33
33
|
DEFAULT_CATALOG_PATH,
|
|
34
34
|
getCodexHome,
|
|
35
35
|
readRootTomlString,
|
|
36
|
+
resolveCodexCatalogPath,
|
|
36
37
|
resolveCodexStateDbPath,
|
|
37
38
|
} from "./paths";
|
|
38
39
|
|
|
@@ -242,7 +243,7 @@ function catalogPathKey(path: string): string {
|
|
|
242
243
|
}
|
|
243
244
|
|
|
244
245
|
function catalogTargets(
|
|
245
|
-
|
|
246
|
+
configPath: string,
|
|
246
247
|
configuredPaths: readonly string[] = [],
|
|
247
248
|
): CatalogTarget[] {
|
|
248
249
|
const targets = new Map<string, CatalogTarget>();
|
|
@@ -252,21 +253,21 @@ function catalogTargets(
|
|
|
252
253
|
targets.set(key, { path: resolve(path), configured: configured || existing?.configured === true });
|
|
253
254
|
};
|
|
254
255
|
for (const configuredPath of configuredPaths) {
|
|
255
|
-
add(
|
|
256
|
+
add(resolveCodexCatalogPath(configPath, configuredPath), true);
|
|
256
257
|
}
|
|
257
|
-
add(join(
|
|
258
|
+
add(join(dirname(configPath), CATALOG_FILE_NAME), false);
|
|
258
259
|
return [...targets.values()];
|
|
259
260
|
}
|
|
260
261
|
|
|
261
|
-
function inspectConfig(
|
|
262
|
+
function inspectConfig(path: string): ConfigObservation {
|
|
262
263
|
const read = readRegularFile(path);
|
|
263
264
|
if (read.kind === "absent") {
|
|
264
|
-
return { classification: { kind: "clean" }, catalogTargets: catalogTargets(
|
|
265
|
+
return { classification: { kind: "clean" }, catalogTargets: catalogTargets(path) };
|
|
265
266
|
}
|
|
266
267
|
if (read.kind === "indeterminate") {
|
|
267
268
|
return {
|
|
268
269
|
classification: indeterminate("config", path, read.reason),
|
|
269
|
-
catalogTargets: catalogTargets(
|
|
270
|
+
catalogTargets: catalogTargets(path),
|
|
270
271
|
};
|
|
271
272
|
}
|
|
272
273
|
|
|
@@ -280,35 +281,35 @@ function inspectConfig(codexHome: string, path: string): ConfigObservation {
|
|
|
280
281
|
} catch (error) {
|
|
281
282
|
return {
|
|
282
283
|
classification: indeterminate("config", read.path, `malformed TOML: ${errorReason(error)}`),
|
|
283
|
-
catalogTargets: catalogTargets(
|
|
284
|
+
catalogTargets: catalogTargets(path, productionConfiguredPaths),
|
|
284
285
|
};
|
|
285
286
|
}
|
|
286
287
|
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
|
|
287
288
|
return {
|
|
288
289
|
classification: indeterminate("config", read.path, "TOML root is not a table"),
|
|
289
|
-
catalogTargets: catalogTargets(
|
|
290
|
+
catalogTargets: catalogTargets(path, productionConfiguredPaths),
|
|
290
291
|
};
|
|
291
292
|
}
|
|
292
293
|
|
|
293
294
|
const document = parsed as Record<string, unknown>;
|
|
294
295
|
let targets: CatalogTarget[];
|
|
295
296
|
if (!Object.hasOwn(document, "model_catalog_json")) {
|
|
296
|
-
targets = catalogTargets(
|
|
297
|
+
targets = catalogTargets(path, productionConfiguredPaths);
|
|
297
298
|
} else if (typeof document.model_catalog_json !== "string" || !document.model_catalog_json.trim()) {
|
|
298
299
|
return {
|
|
299
300
|
classification: indeterminate("config", read.path, "model_catalog_json must be one non-empty string"),
|
|
300
|
-
catalogTargets: catalogTargets(
|
|
301
|
+
catalogTargets: catalogTargets(path, productionConfiguredPaths),
|
|
301
302
|
};
|
|
302
303
|
} else {
|
|
303
304
|
try {
|
|
304
|
-
targets = catalogTargets(
|
|
305
|
+
targets = catalogTargets(path, [
|
|
305
306
|
...productionConfiguredPaths,
|
|
306
307
|
document.model_catalog_json,
|
|
307
308
|
]);
|
|
308
309
|
} catch (error) {
|
|
309
310
|
return {
|
|
310
311
|
classification: indeterminate("config", read.path, `model_catalog_json cannot be resolved: ${errorReason(error)}`),
|
|
311
|
-
catalogTargets: catalogTargets(
|
|
312
|
+
catalogTargets: catalogTargets(path, productionConfiguredPaths),
|
|
312
313
|
};
|
|
313
314
|
}
|
|
314
315
|
}
|
|
@@ -681,7 +682,7 @@ export function classifyNativeRoutedResidue(): NativeRoutedResidueResult {
|
|
|
681
682
|
const profilePath = join(codexHome, PROFILE_FILE_NAME);
|
|
682
683
|
const modelsCachePath = join(codexHome, MODELS_CACHE_FILE_NAME);
|
|
683
684
|
const journalPath = join(codexHome, JOURNAL_FILE_NAME);
|
|
684
|
-
const config = inspectConfig(
|
|
685
|
+
const config = inspectConfig(configPath);
|
|
685
686
|
const atomicWriteTargets = [
|
|
686
687
|
configPath,
|
|
687
688
|
profilePath,
|
package/src/codex/paths.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { readFileSync, realpathSync, statSync } from "node:fs";
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import { basename, isAbsolute, join, posix, resolve, win32 } from "node:path";
|
|
3
4
|
import { expandUserPath } from "../config";
|
|
4
5
|
import { defaultCodexHome } from "./home";
|
|
5
6
|
import { codexHomeIsAbsent } from "./codex-home-owner";
|
|
7
|
+
import { rootAssignmentKey, rootSourceLines, sourceAssignment } from "./toml-source-lines";
|
|
6
8
|
|
|
7
9
|
function resolveCodexHome(): string {
|
|
8
10
|
const raw = process.env.CODEX_HOME?.trim();
|
|
@@ -131,12 +133,11 @@ export function parseTomlString(raw: string): string {
|
|
|
131
133
|
}
|
|
132
134
|
|
|
133
135
|
export function readRootTomlString(content: string, key: string): string | null {
|
|
134
|
-
const lines = content
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
if (m) return parseTomlString(m[1]);
|
|
136
|
+
const { lines, rootEnd } = rootSourceLines(content);
|
|
137
|
+
for (let i = 0; i < rootEnd; i++) {
|
|
138
|
+
if (!lines[i].structural || rootAssignmentKey(lines[i].text) !== key) continue;
|
|
139
|
+
const value = sourceAssignment(lines, i, rootEnd)?.value;
|
|
140
|
+
if (typeof value === "string") return value;
|
|
140
141
|
}
|
|
141
142
|
return null;
|
|
142
143
|
}
|
|
@@ -196,18 +197,61 @@ export function isDefaultCatalogPath(path: string): boolean {
|
|
|
196
197
|
return samePath(path, activeDefaultCatalogPath());
|
|
197
198
|
}
|
|
198
199
|
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
200
|
+
function catalogPathApi(configPath: string) {
|
|
201
|
+
return process.platform === "win32" || /^(?:[a-z]:[\\/]|\\\\)/i.test(configPath) ? win32 : posix;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
/** Resolve a catalog binding against the config directory, with Codex's POSIX home expansion. */
|
|
205
|
+
export function resolveCodexCatalogPath(configPath: string, binding: string): string {
|
|
206
|
+
const path = catalogPathApi(configPath);
|
|
207
|
+
if (path === posix && (binding === "~" || binding.startsWith("~/"))) {
|
|
208
|
+
const home = homedir();
|
|
209
|
+
if (home) binding = path.join(home, binding.slice(2));
|
|
210
|
+
}
|
|
211
|
+
return path.resolve(path.dirname(configPath), binding);
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
export function defaultCodexCatalogPathForConfig(configPath: string): string {
|
|
215
|
+
return resolveCodexCatalogPath(configPath, basename(DEFAULT_CATALOG_PATH));
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
/** Compare resolved catalog paths, including legacy Windows spellings and aliases of the config directory. */
|
|
219
|
+
export function sameCodexCatalogPath(configPath: string, left: string, right: string): boolean {
|
|
220
|
+
const path = catalogPathApi(configPath);
|
|
221
|
+
const a = resolveCodexCatalogPath(configPath, left);
|
|
222
|
+
const b = resolveCodexCatalogPath(configPath, right);
|
|
223
|
+
const windows = path === win32;
|
|
224
|
+
const comparable = (value: string) => windows ? win32.toNamespacedPath(value).toLowerCase() : value;
|
|
225
|
+
if (comparable(a) === comparable(b)) return true;
|
|
226
|
+
// Canonicalize the parent only. A catalog-file symlink cannot identify a managed binding.
|
|
227
|
+
const aName = path.basename(a), bName = path.basename(b);
|
|
228
|
+
if (windows !== (process.platform === "win32")
|
|
229
|
+
|| (windows ? aName.toLowerCase() !== bName.toLowerCase() : aName !== bName)) return false;
|
|
202
230
|
try {
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
231
|
+
return comparable(realpathSync.native(path.dirname(a))) === comparable(realpathSync.native(path.dirname(b)));
|
|
232
|
+
} catch {
|
|
233
|
+
return false;
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
/** The sibling form works in both Windows and WSL when they share a Codex home. */
|
|
238
|
+
export function codexCatalogBindingForPath(configPath: string, catalogPath: string): string {
|
|
239
|
+
const name = catalogPathApi(configPath).basename(catalogPath);
|
|
240
|
+
return sameCodexCatalogPath(configPath, name, catalogPath) ? name : catalogPath;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
/** Read the configured binding, with no fallback when it cannot be read or is absent. */
|
|
244
|
+
export function readCodexCatalogBinding(configPath?: string, configText?: string): string | null {
|
|
245
|
+
try {
|
|
246
|
+
configPath ??= activeCodexConfigPath();
|
|
247
|
+
const binding = readRootTomlString(configText ?? readFileSync(configPath, "utf8"), "model_catalog_json");
|
|
248
|
+
return binding ? resolveCodexCatalogPath(configPath, binding) : null;
|
|
249
|
+
} catch { return null; }
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
export function readCodexCatalogPath(): string {
|
|
253
|
+
const configPath = activeCodexConfigPath();
|
|
254
|
+
return readCodexCatalogBinding(configPath) ?? defaultCodexCatalogPathForConfig(configPath);
|
|
211
255
|
}
|
|
212
256
|
|
|
213
257
|
/**
|
|
@@ -219,13 +263,6 @@ export function readCodexCatalogPath(): string {
|
|
|
219
263
|
* file the caller is holding. Omitting it keeps the original behaviour.
|
|
220
264
|
*/
|
|
221
265
|
export function readCodexCatalogPathForHome(codexHome: string, configText?: string): string {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
if (configText !== undefined || existsSync(configPath)) {
|
|
225
|
-
const toml = configText ?? readFileSync(configPath, "utf-8");
|
|
226
|
-
const path = readRootTomlString(toml, "model_catalog_json");
|
|
227
|
-
if (path) return resolve(codexHome, path);
|
|
228
|
-
}
|
|
229
|
-
} catch { /* ignore */ }
|
|
230
|
-
return join(codexHome, "opencodex-catalog.json");
|
|
266
|
+
const configPath = join(codexHome, "config.toml");
|
|
267
|
+
return readCodexCatalogBinding(configPath, configText) ?? defaultCodexCatalogPathForConfig(configPath);
|
|
231
268
|
}
|
|
@@ -24,6 +24,10 @@ export function stampCodexQuotaUsageObservation(
|
|
|
24
24
|
return next;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
export function codexQuotaUsageObservedAt(quota: StoredAccountQuota, window: Window): number | undefined {
|
|
28
|
+
return observed.get(quota)?.[window];
|
|
29
|
+
}
|
|
30
|
+
|
|
27
31
|
export function codexQuotaHasFreshUsage(quota: StoredAccountQuota, plan: unknown, now: number, maxAgeMs: number): boolean {
|
|
28
32
|
const long: Window[] = isThirtyDayOnlyCodexPlan(plan) ? ["monthlyPercent"] : ["weeklyPercent", "monthlyPercent"];
|
|
29
33
|
const relevant = long.filter(window => finite(quota[window]));
|