@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
1
3
|
import { parseCodexCredits, rememberCodexCredits } from "../credits";
|
|
2
4
|
import { fetchCodexUsage } from "../quota-query-backoff";
|
|
3
5
|
import type { CodexUsageOwner } from "../quota-query-backoff";
|
|
@@ -11,8 +13,9 @@ import type { StoredAccountQuota, WhamUsageResponse } from "../quota";
|
|
|
11
13
|
import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
|
|
12
14
|
import { getMainChatgptAccountId, readCodexTokensResult } from "../auth-collision";
|
|
13
15
|
import { clearAccountNeedsReauth, markAccountNeedsReauth } from "../account-runtime-state";
|
|
14
|
-
import { extractAccountId } from "../../oauth/chatgpt";
|
|
15
|
-
import { getMainAccountPlan, isMainAccountTokenVerifiablyLive, MAIN_CODEX_ACCOUNT_ID, setMainAccountPlan } from "../main-account";
|
|
16
|
+
import { decodeJwtPayload, extractAccountId } from "../../oauth/chatgpt";
|
|
17
|
+
import { getMainAccountPlan, getValidMainAccountToken, isMainAccountTokenVerifiablyLive, mainAccountTokenIsCurrent, mainAccountTokenQuotaWriter, MainAccountTokenRefreshError, MAIN_CODEX_ACCOUNT_ID, setMainAccountPlan, type MainAccountToken } from "../main-account";
|
|
18
|
+
import { resolveCodexHomeDir } from "../home";
|
|
16
19
|
import { captureConfigGeneration } from "../../lib/state-store-sweeper";
|
|
17
20
|
import { captureMainAccountIdentityGeneration, clearMainAccountInfoCache, getMainAccountInfoCache, getMainQuotaCredentialGeneration, isMainAccountIdentityGenerationLive, isMainQuotaWriterLive, matchesMainQuotaCredential, observeMainQuotaCredential, setMainAccountCredentialPresence, setMainAccountInfoCache } from "../main-account-cache";
|
|
18
21
|
import type { MainQuotaWriter, MainAccountInfo } from "../main-account-cache";
|
|
@@ -149,10 +152,19 @@ export async function fetchMainAccountInfo(forceRefresh = false, config?: OcxCon
|
|
|
149
152
|
export interface MainAccountInfoProbeOptions {
|
|
150
153
|
/** Metadata-only renewal never sets or clears the traffic reauth quarantine. */
|
|
151
154
|
passive?: boolean;
|
|
155
|
+
/** Exact owned result obtained before entering WHAM's shared credential claim. Never serialized. */
|
|
156
|
+
preparedToken?: MainAccountToken | null;
|
|
152
157
|
}
|
|
153
158
|
|
|
154
159
|
export const EMPTY_MAIN_ACCOUNT_INFO: MainAccountInfo = { email: null, plan: null, quota: null };
|
|
155
160
|
|
|
161
|
+
/** Caller holds the runtime lease, but no shared credential claim: Codex may need an exclusive claim. */
|
|
162
|
+
export async function prepareMainAccountInfoToken(): Promise<MainAccountToken | null | undefined> {
|
|
163
|
+
const home = resolveCodexHomeDir();
|
|
164
|
+
if (!existsSync(home) || existsSync(join(home, "auth.json"))) return undefined;
|
|
165
|
+
return getValidMainAccountToken({ preserveReauth: true });
|
|
166
|
+
}
|
|
167
|
+
|
|
156
168
|
export async function retryMainAccountInfoIfIdentityChanged(
|
|
157
169
|
requestAccountId: string | null,
|
|
158
170
|
retriesRemaining: number,
|
|
@@ -189,9 +201,23 @@ export async function fetchMainAccountInfoAttempt(
|
|
|
189
201
|
};
|
|
190
202
|
}
|
|
191
203
|
try {
|
|
204
|
+
let preparedToken = options.preparedToken;
|
|
205
|
+
if (!nativeMainSharedClaimHeld && preparedToken === undefined) {
|
|
206
|
+
const home = resolveCodexHomeDir();
|
|
207
|
+
const generation = captureMainAccountIdentityGeneration();
|
|
208
|
+
try { preparedToken = await prepareMainAccountInfoToken(); }
|
|
209
|
+
catch (error) {
|
|
210
|
+
const absent = error instanceof MainAccountTokenRefreshError && (error.reason === "reauth" || error.credentialObservedAbsent)
|
|
211
|
+
&& home === resolveCodexHomeDir() && isMainAccountIdentityGenerationLive(generation);
|
|
212
|
+
if (absent) setMainAccountCredentialPresence(false);
|
|
213
|
+
return { info: getMainAccountInfoCache() ?? EMPTY_MAIN_ACCOUNT_INFO,
|
|
214
|
+
credentialChecked: absent, hasCredential: false, identityGeneration: captureMainAccountIdentityGeneration() };
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
const probeOptions = preparedToken === undefined ? options : { ...options, preparedToken };
|
|
192
218
|
const paced = sharedMainQuotaPacingEnabled(config ?? loadConfig());
|
|
193
219
|
const operation = async () => ({
|
|
194
|
-
...await fetchMainAccountInfoWhileOwned(forceRefresh, retriesRemaining, nativeMainLease, explicitRefresh, postReset, paced,
|
|
220
|
+
...await fetchMainAccountInfoWhileOwned(forceRefresh, retriesRemaining, nativeMainLease, explicitRefresh, postReset, paced, probeOptions),
|
|
195
221
|
identityGeneration: captureMainAccountIdentityGeneration(),
|
|
196
222
|
});
|
|
197
223
|
if (nativeMainSharedClaimHeld) return await operation();
|
|
@@ -235,20 +261,28 @@ export async function fetchMainAccountInfoWhileOwned(
|
|
|
235
261
|
options: MainAccountInfoProbeOptions = {},
|
|
236
262
|
): Promise<MainAccountInfoFetchResult> {
|
|
237
263
|
const writerGeneration = captureConfigGeneration();
|
|
238
|
-
reconcileMainCodexAccountRuntimeState();
|
|
239
264
|
const tokenRead = readCodexTokensResult();
|
|
240
|
-
|
|
241
|
-
|
|
265
|
+
if (tokenRead.status === "missing" && options.preparedToken && !mainAccountTokenIsCurrent(options.preparedToken)) {
|
|
266
|
+
// A stale/copy handoff proves nothing about the current login, including its presence.
|
|
267
|
+
return { info: getMainAccountInfoCache() ?? EMPTY_MAIN_ACCOUNT_INFO, credentialChecked: false, hasCredential: false };
|
|
268
|
+
}
|
|
269
|
+
const owned = tokenRead.status === "missing" && options.preparedToken
|
|
270
|
+
&& mainAccountTokenIsCurrent(options.preparedToken) ? options.preparedToken : undefined;
|
|
271
|
+
// The owned RPC already reconciled identity; a missing file must not erase that observation.
|
|
272
|
+
if (!owned) reconcileMainCodexAccountRuntimeState();
|
|
273
|
+
const tokens = tokenRead.status === "ok" ? tokenRead.tokens : owned
|
|
274
|
+
? { access_token: owned.accessToken, account_id: owned.chatgptAccountId, id_token: undefined } : null;
|
|
275
|
+
setMainAccountCredentialPresence(tokens !== null);
|
|
276
|
+
if (!tokens) {
|
|
242
277
|
// A local read failure is NOT proof of sign-out: a missing file can be a non-atomic rewrite
|
|
243
278
|
// gap, and malformed JSON can be a half-written file. Clearing the cache and marking the
|
|
244
279
|
// account for reauth here destroyed healthy email/plan/quota state and pinned a working
|
|
245
280
|
// account as unusable. Preserve what we already know and let the caller retry; request
|
|
246
|
-
// routing stays fail-closed
|
|
247
|
-
//
|
|
281
|
+
// routing stays fail-closed through its owned credential resolver, and the account DTO
|
|
282
|
+
// reports hasCredential=false without either a readable file or a verified keyring handoff.
|
|
248
283
|
const preserved = getMainAccountInfoCache();
|
|
249
284
|
return { info: preserved ?? EMPTY_MAIN_ACCOUNT_INFO, credentialChecked: true, hasCredential: false };
|
|
250
285
|
}
|
|
251
|
-
const tokens = tokenRead.tokens;
|
|
252
286
|
const requestAccountId = extractAccountId(tokens.id_token, tokens.access_token) ?? (tokens.account_id || null);
|
|
253
287
|
const cached = getMainAccountInfoCache();
|
|
254
288
|
if (!forceRefresh && cached && Date.now() - cached.ts < MAIN_CACHE_TTL) {
|
|
@@ -256,13 +290,15 @@ export async function fetchMainAccountInfoWhileOwned(
|
|
|
256
290
|
}
|
|
257
291
|
// Bind quota to the owned credential and the account actually selected by WHAM's header.
|
|
258
292
|
// A conflicting legacy token/account tuple is not evidence for the new policy.
|
|
259
|
-
const mainQuotaWriter = requestAccountId === tokens.account_id
|
|
293
|
+
const mainQuotaWriter = owned ? mainAccountTokenQuotaWriter(owned) : requestAccountId === tokens.account_id
|
|
260
294
|
? observeMainQuotaCredential(tokens.access_token, tokens.account_id)
|
|
261
295
|
: undefined;
|
|
262
296
|
const mainQuotaCredentialGeneration = getMainQuotaCredentialGeneration();
|
|
263
297
|
/** A disk replacement may have no second probe to advance the credential generation. */
|
|
264
298
|
const credentialIsCurrent = (): boolean => {
|
|
265
299
|
const current = readCodexTokensResult(undefined, { bounded: true });
|
|
300
|
+
if (owned) return current.status === "missing" && mainAccountTokenIsCurrent(owned)
|
|
301
|
+
&& mainQuotaCredentialGeneration === getMainQuotaCredentialGeneration();
|
|
266
302
|
if (current.status !== "ok") return false;
|
|
267
303
|
const effectiveAccountId = extractAccountId(current.tokens.id_token, current.tokens.access_token)
|
|
268
304
|
?? (current.tokens.account_id || null);
|
|
@@ -313,7 +349,10 @@ export async function fetchMainAccountInfoWhileOwned(
|
|
|
313
349
|
const resp = admission.response;
|
|
314
350
|
quotaPhase = "publish";
|
|
315
351
|
if (!resp.ok) {
|
|
316
|
-
const
|
|
352
|
+
const ownedExpiry = owned ? decodeJwtPayload(owned.accessToken)?.exp : undefined;
|
|
353
|
+
const authFailure = await classifyMainAuthResponse(resp, owned
|
|
354
|
+
? typeof ownedExpiry === "number" && ownedExpiry * 1000 > Date.now()
|
|
355
|
+
: isMainAccountTokenVerifiablyLive());
|
|
317
356
|
const terminalAuthFailure = authFailure.terminal;
|
|
318
357
|
const retried = await retryMainAccountInfoIfIdentityChanged(requestAccountId, retriesRemaining, nativeMainLease, explicitRefresh, paced, options);
|
|
319
358
|
if (retried) return retried;
|
|
@@ -10,7 +10,7 @@ import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
|
|
|
10
10
|
import { claimDueCodexQuotaRecoveryProbes, settleCodexQuotaRecoveryProbe } from "../routing";
|
|
11
11
|
import { readCodexTokens } from "../auth-collision";
|
|
12
12
|
import { isAccountNeedsReauth } from "../account-runtime-state";
|
|
13
|
-
import { getValidMainAccountToken, MAIN_CODEX_ACCOUNT_ID, getMainAccountPlan } from "../main-account";
|
|
13
|
+
import { getValidMainAccountToken, mainAccountTokenIsCurrent, mainAccountTokenQuotaWriter, MAIN_CODEX_ACCOUNT_ID, getMainAccountPlan } from "../main-account";
|
|
14
14
|
import { captureConfigGeneration, registerStateSweepAfterTick } from "../../lib/state-store-sweeper";
|
|
15
15
|
import { observeMainQuotaCredential, getMainQuotaCredentialGeneration, captureMainAccountIdentityGeneration, isMainAccountIdentityGenerationLive } from "../main-account-cache";
|
|
16
16
|
import { getMainAccountHardLockStatus, latestMainBlockingResetAt } from "../main-account-hard-lock";
|
|
@@ -22,7 +22,7 @@ import type { AdmissionLease } from "../../lib/admission";
|
|
|
22
22
|
import { tryAcquireNativeMainProfileClaim } from "../native-main-admission";
|
|
23
23
|
import { withNativeMainCredentialClaim, isNativeMainClaimUnavailable } from "./http";
|
|
24
24
|
import type { PoolQuotaResult } from "./pool-quota-probe";
|
|
25
|
-
import { fetchMainAccountInfoAttempt, fetchMainAccountInfo, MAIN_CACHE_TTL } from "./main-account-probe";
|
|
25
|
+
import { fetchMainAccountInfoAttempt, fetchMainAccountInfo, prepareMainAccountInfoToken, MAIN_CACHE_TTL } from "./main-account-probe";
|
|
26
26
|
import { fetchPoolAccountQuota, PoolQuotaProbeBusyError, POOL_CACHE_TTL, POOL_QUOTA_REFRESH_CONCURRENCY } from "./pool-quota-probe";
|
|
27
27
|
import { getRuntimeConfig, configuredPoolAccount, mapWithConcurrency } from "./runtime-config";
|
|
28
28
|
import { trackBackgroundWork } from "../../lib/background-work";
|
|
@@ -183,12 +183,15 @@ export async function runMainAccountHardLockRecovery(config: OcxConfig): Promise
|
|
|
183
183
|
|| isAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID)) return;
|
|
184
184
|
const identityGeneration = captureMainAccountIdentityGeneration();
|
|
185
185
|
const passive = getMainAccountHardLockStatus(config).state !== "blocked";
|
|
186
|
+
let prepared: Awaited<ReturnType<typeof getValidMainAccountToken>>;
|
|
186
187
|
try {
|
|
187
188
|
// Refresh can require an exclusive credential claim: never hold WHAM's shared
|
|
188
189
|
// claim while obtaining a valid token. The runtime lease spans both operations.
|
|
189
|
-
|
|
190
|
+
prepared = await getValidMainAccountToken({ preserveReauth: true });
|
|
190
191
|
if (!prepared) return;
|
|
191
|
-
|
|
192
|
+
if (mainAccountTokenQuotaWriter(prepared)) {
|
|
193
|
+
if (!mainAccountTokenIsCurrent(prepared)) return;
|
|
194
|
+
} else observeMainQuotaCredential(prepared.accessToken, prepared.chatgptAccountId);
|
|
192
195
|
} catch {
|
|
193
196
|
// Native refresh retains its own grant-scoped refusal; global quarantine would outlive it.
|
|
194
197
|
return;
|
|
@@ -214,7 +217,7 @@ export async function runMainAccountHardLockRecovery(config: OcxConfig): Promise
|
|
|
214
217
|
after: currentQueryAfter };
|
|
215
218
|
return;
|
|
216
219
|
}
|
|
217
|
-
const result = await fetchMainAccountInfoAttempt(true, 1, lease, false, false, false, config, { passive });
|
|
220
|
+
const result = await fetchMainAccountInfoAttempt(true, 1, lease, false, false, false, config, { passive, preparedToken: prepared });
|
|
218
221
|
// Never charge a replacement credential for a late result from its predecessor.
|
|
219
222
|
if (isMainAccountIdentityGenerationLive(identityGeneration)
|
|
220
223
|
&& credential === getMainQuotaCredentialGeneration()) {
|
|
@@ -359,21 +362,26 @@ export async function primeCodexPoolQuotas(
|
|
|
359
362
|
if (!mainLease) return;
|
|
360
363
|
try {
|
|
361
364
|
try {
|
|
365
|
+
// The Codex RPC owns an exclusive claim; finish it before WHAM's shared claim.
|
|
366
|
+
const preparedToken = await prepareMainAccountInfoToken();
|
|
362
367
|
await withNativeMainCredentialClaim(async () => {
|
|
363
368
|
// Keep one local owner and one cross-process reader from physical
|
|
364
369
|
// identity reconciliation through WHAM and all quota publication.
|
|
365
|
-
|
|
370
|
+
if (preparedToken) {
|
|
371
|
+
if (!mainAccountTokenIsCurrent(preparedToken)) return;
|
|
372
|
+
} else (options.reconcileMainAccount ?? reconcileMainCodexAccountRuntimeState)();
|
|
366
373
|
const quota = getAccountQuota(MAIN_CODEX_ACCOUNT_ID);
|
|
367
374
|
const observationStale = reason === "priority-failback" && quota
|
|
368
375
|
&& !codexQuotaHasFreshUsage(quota, getMainAccountPlan(), Date.now(), CODEX_PRIORITY_FAILBACK_REFRESH_MS);
|
|
369
376
|
if (quota && (reason !== "priority-failback"
|
|
370
377
|
|| (!observationStale && Date.now() - quota.updatedAt < MAIN_CACHE_TTL))) return;
|
|
371
|
-
if (!(options.readMainTokens ?? readCodexTokens)()
|
|
378
|
+
if (!(options.readMainTokens ?? readCodexTokens)()
|
|
379
|
+
&& !(preparedToken && mainAccountTokenIsCurrent(preparedToken))) return;
|
|
372
380
|
const bypassCachedQuota = !!observationStale;
|
|
373
381
|
if (options.fetchMainInfo) await options.fetchMainInfo(bypassCachedQuota);
|
|
374
382
|
// Cache bypass is passive observation, never an explicit reauthentication recovery.
|
|
375
383
|
else await fetchMainAccountInfoAttempt(bypassCachedQuota, 1, mainLease, true,
|
|
376
|
-
false, false, config);
|
|
384
|
+
false, false, config, { preparedToken });
|
|
377
385
|
});
|
|
378
386
|
} catch (error) {
|
|
379
387
|
if (!isNativeMainClaimUnavailable(error)) throw error;
|
|
@@ -3,7 +3,7 @@ import { fetchCodexUsage } from "../quota-query-backoff";
|
|
|
3
3
|
import type { CodexUsageOwner } from "../quota-query-backoff";
|
|
4
4
|
import { capturePoolQuotaWriter, getValidCodexToken, isCodexAccountGenerationLive, forceRefreshCodexPoolToken, markCodexAccountValidated, markCodexAccountValidationFailed, readCodexAccountRecord, isTerminalCodexPoolRefreshFailure, CodexCredentialGenerationConflictError, CodexCredentialRefreshLockTimeoutError, CodexCredentialRefreshBusyError, CodexCredentialRefreshStaleError, TokenRefreshError } from "../account-store";
|
|
5
5
|
import type { PoolQuotaWriter } from "../quota-types";
|
|
6
|
-
import { isValidWhamHistoryObservation, getAccountQuota, isCompleteCodexQuotaRecoverySnapshot, parseUsageQuota, setAccountQuotaFromParsed } from "../quota";
|
|
6
|
+
import { isValidWhamHistoryObservation, getAccountQuota, isCompleteCodexQuotaRecoverySnapshot, parseUsageQuota, poolWhamPolicyObservation, setAccountQuotaFromParsed } from "../quota";
|
|
7
7
|
import type { StoredAccountQuota, WhamUsageResponse } from "../quota";
|
|
8
8
|
import type { ManualResetRefreshLineage } from "../routing";
|
|
9
9
|
import { clearAccountNeedsReauth, markAccountNeedsReauth } from "../account-runtime-state";
|
|
@@ -377,7 +377,7 @@ export async function commitPoolQuotaResponse(
|
|
|
377
377
|
return { quota: null, needsReauth: false, credentialGeneration: generation };
|
|
378
378
|
}
|
|
379
379
|
const validPolicyObservation = isValidWhamHistoryObservation(data);
|
|
380
|
-
setAccountQuotaFromParsed(accountId, quota, writerGeneration, undefined,
|
|
380
|
+
setAccountQuotaFromParsed(accountId, quota, writerGeneration, undefined, poolWhamPolicyObservation(data, quota),
|
|
381
381
|
ctx.poolWriter && validPolicyObservation ? { writer: ctx.poolWriter, observedAt, source: "wham", raw: quota } : undefined,
|
|
382
382
|
true);
|
|
383
383
|
return {
|
|
@@ -26,7 +26,9 @@ import {
|
|
|
26
26
|
MainAccountTokenRefreshError,
|
|
27
27
|
MainAuthJsonChangedDuringRefreshError,
|
|
28
28
|
getMainAccountToken,
|
|
29
|
+
getMainAccountCredentialStatus,
|
|
29
30
|
getValidMainAccountToken,
|
|
31
|
+
mainAccountTokenQuotaWriter,
|
|
30
32
|
isMainAccountTokenLive,
|
|
31
33
|
type NativeMainRefreshDependencies,
|
|
32
34
|
} from "./main-account";
|
|
@@ -73,6 +75,7 @@ import { CODEX_UNKNOWN_USAGE_SCORE, getAccountQuota, getMainPolicyQuota, isValid
|
|
|
73
75
|
import { codexAccountUsesCreditsAfterLimit, codexUsageLimitResetAt } from "./account-credit-use";
|
|
74
76
|
import type { CodexAccountMode, OcxConfig, OcxProviderConfig } from "../types";
|
|
75
77
|
import { FORWARD_HEADERS } from "../adapters/openai-responses";
|
|
78
|
+
import { isolateCodexPoolAccountHeaders } from "./forward-transport-headers";
|
|
76
79
|
import { captureConfigGeneration } from "../lib/state-store-sweeper";
|
|
77
80
|
import { extractAccountId, extractEmail } from "../oauth/chatgpt";
|
|
78
81
|
import {
|
|
@@ -319,8 +322,7 @@ export type CodexAuthContext =
|
|
|
319
322
|
transientProbe?: TransientProbeGrant;
|
|
320
323
|
}
|
|
321
324
|
| {
|
|
322
|
-
// Main
|
|
323
|
-
// (Option A). Distinct from "main" (request-owned passthrough or Direct mode).
|
|
325
|
+
// Main account rotating in the Pool (Option A), token from ~/.codex/auth.json; never request-owned "main".
|
|
324
326
|
kind: "main-pool";
|
|
325
327
|
accountId: string;
|
|
326
328
|
writerGeneration: number;
|
|
@@ -333,14 +335,14 @@ export type CodexAuthContext =
|
|
|
333
335
|
chatgptAccountId: string;
|
|
334
336
|
/** Bypass Pool selection and suppress quota/transient failover for an exact selector. */
|
|
335
337
|
fixedAccount?: boolean;
|
|
336
|
-
|
|
337
|
-
affinityKey?: string;
|
|
338
|
+
affinityKey?: string; // See `pool.affinityKey`.
|
|
338
339
|
/** See `pool.probeLeaseId`. */
|
|
339
340
|
probeLeaseId?: string;
|
|
340
341
|
quotaScope?: CodexQuotaScope;
|
|
341
342
|
probeQuotaScope?: CodexQuotaScope;
|
|
342
343
|
/** See `pool.transientProbe`. */
|
|
343
344
|
transientProbe?: TransientProbeGrant;
|
|
345
|
+
affinityDecision?: CodexAffinityDecision;
|
|
344
346
|
};
|
|
345
347
|
|
|
346
348
|
/** Probe lease carried by this context, when it holds one. */
|
|
@@ -359,8 +361,7 @@ export function codexTransientProbeGrant(ctx: CodexAuthContext | undefined): Tra
|
|
|
359
361
|
}
|
|
360
362
|
|
|
361
363
|
/**
|
|
362
|
-
* Hand back a probe lease for a request that will not reach upstream. Safe to
|
|
363
|
-
* call with a context that holds no lease.
|
|
364
|
+
* Hand back a probe lease for a request that will not reach upstream. Safe to call with a context that holds no lease.
|
|
364
365
|
*
|
|
365
366
|
* BOTH leases, deliberately. A context can carry the quota-cooldown probe or the transient-hold
|
|
366
367
|
* probe, and every one of the ~30 call sites that already hands back the first is a path where
|
|
@@ -569,8 +570,7 @@ export class CodexMainAccountCreditsOffError extends CodexAccountCooldownError {
|
|
|
569
570
|
readonly resetAt?: number;
|
|
570
571
|
|
|
571
572
|
constructor(resetAt?: number, creditRecovery = false) {
|
|
572
|
-
// Keep the included reset as policy evidence, but let consented callers retry
|
|
573
|
-
// within the base metadata recovery interval even when backoff grows longer.
|
|
573
|
+
// Keep the included reset as policy evidence, but let consented callers retry within the base metadata recovery interval even when backoff grows longer.
|
|
574
574
|
super(MAIN_CODEX_ACCOUNT_ID, creditRecovery
|
|
575
575
|
? Math.min(resetAt ?? Infinity, Date.now() + nextQuotaQueryDelay()) : resetAt ?? 0);
|
|
576
576
|
this.name = "CodexMainAccountCreditsOffError";
|
|
@@ -903,6 +903,10 @@ function observeSelectedMainCredential(
|
|
|
903
903
|
token: { accessToken: string; chatgptAccountId: string },
|
|
904
904
|
writer: MainQuotaWriter | undefined,
|
|
905
905
|
): MainQuotaWriter | undefined {
|
|
906
|
+
// A claimed RPC can observe a replacement identity while the caller awaits it. Only that
|
|
907
|
+
// exact result carries the replacement writer; stale results keep their stale fence.
|
|
908
|
+
const ownedWriter = mainAccountTokenQuotaWriter(token);
|
|
909
|
+
if (ownedWriter) return ownedWriter;
|
|
906
910
|
if (!writer) return undefined;
|
|
907
911
|
// Carry an explicitly stale writer through to quota's rejection fence; turning it into an
|
|
908
912
|
// untagged write would instead invalidate the replacement account's trusted observation.
|
|
@@ -1248,6 +1252,14 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1248
1252
|
throw new CodexMainProfileDrainingError();
|
|
1249
1253
|
}
|
|
1250
1254
|
if (isMainAccountHardLockEnabled(policy)) reconcileMainCodexAccountRuntimeState();
|
|
1255
|
+
if (!getMainAccountToken()) {
|
|
1256
|
+
try {
|
|
1257
|
+
await (options.getValidMainAccountToken ?? getValidMainAccountToken)({
|
|
1258
|
+
signal: options.signal, ...(options.nativeMainRefreshDependencies ?? {}),
|
|
1259
|
+
});
|
|
1260
|
+
} catch (cause) { throw new CodexAuthContextError(MAIN_CODEX_ACCOUNT_ID, cause); }
|
|
1261
|
+
options.signal?.throwIfAborted();
|
|
1262
|
+
}
|
|
1251
1263
|
assertMainAccountPolicy(policy);
|
|
1252
1264
|
if (options.modelId && ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(options.modelId)) {
|
|
1253
1265
|
const entitled = entitledCodexAccountIdsForModel(
|
|
@@ -1332,6 +1344,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1332
1344
|
const nativeMainSelectionOnly = !nativeMainTrafficBlocked
|
|
1333
1345
|
&& selectionAdmission?.mainProfileDraining === true;
|
|
1334
1346
|
let accountId: string;
|
|
1347
|
+
let mainDiscoveryFailure: unknown;
|
|
1335
1348
|
// Answering this with the manual-pin predicate made `codexAccountUnusableReason` report
|
|
1336
1349
|
// `main_credential_unavailable` for every UNPINNED request, so `getEligiblePoolAccounts` never
|
|
1337
1350
|
// listed main and the strategy compared only the stored accounts. With one stored sibling the
|
|
@@ -1348,6 +1361,20 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1348
1361
|
&& callerOwnsAnyCooledPoolSubscription(headers, config, quotaScope),
|
|
1349
1362
|
});
|
|
1350
1363
|
try {
|
|
1364
|
+
// A fileless login can change identity even while its previous expiry observation is usable.
|
|
1365
|
+
// The selector discovers it before identity-bound quota or hard-lock policy; dispatch still revalidates it.
|
|
1366
|
+
if (selectionAdmission && !nativeMainReadsForbidden && !options.isMainAccountTokenLive
|
|
1367
|
+
&& (fixedAccountId === undefined || fixedAccountId === MAIN_CODEX_ACCOUNT_ID)
|
|
1368
|
+
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1369
|
+
&& !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
|
|
1370
|
+
&& (!getMainAccountToken() || !getMainAccountCredentialStatus().usable)) {
|
|
1371
|
+
try {
|
|
1372
|
+
await (options.getValidMainAccountToken ?? getValidMainAccountToken)({
|
|
1373
|
+
signal: options.signal, ...(options.nativeMainRefreshDependencies ?? {}),
|
|
1374
|
+
});
|
|
1375
|
+
} catch (cause) { mainDiscoveryFailure = cause; }
|
|
1376
|
+
options.signal?.throwIfAborted();
|
|
1377
|
+
}
|
|
1351
1378
|
const excludeAccountIds = nativeMainReadsForbidden
|
|
1352
1379
|
? new Set([MAIN_CODEX_ACCOUNT_ID])
|
|
1353
1380
|
: undefined;
|
|
@@ -1460,6 +1487,11 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1460
1487
|
return context;
|
|
1461
1488
|
}
|
|
1462
1489
|
if (!selected) {
|
|
1490
|
+
// After an entitlement-await recovery, current selection evidence outranks the saved
|
|
1491
|
+
// probe failure; retain it only while main is still unusable (as for fixed selection).
|
|
1492
|
+
if (mainDiscoveryFailure !== undefined && !getMainAccountCredentialStatus().usable) {
|
|
1493
|
+
throw new CodexAuthContextError(MAIN_CODEX_ACCOUNT_ID, mainDiscoveryFailure);
|
|
1494
|
+
}
|
|
1463
1495
|
// A retry that excluded a failed Pool account may still use the validated caller-owned
|
|
1464
1496
|
// main credential. Treating every exclusion as if main itself had failed strands a healthy
|
|
1465
1497
|
// native bearer after the first Pool attempt. Preserve the exactly-once boundary by refusing
|
|
@@ -1543,6 +1575,11 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1543
1575
|
);
|
|
1544
1576
|
}
|
|
1545
1577
|
if (fixedAccountId !== undefined) {
|
|
1578
|
+
// Preserve exact-main discovery errors only while the current credential remains unusable, as above.
|
|
1579
|
+
if (accountId === MAIN_CODEX_ACCOUNT_ID && mainDiscoveryFailure !== undefined
|
|
1580
|
+
&& !getMainAccountCredentialStatus().usable) {
|
|
1581
|
+
throw new CodexAuthContextError(MAIN_CODEX_ACCOUNT_ID, mainDiscoveryFailure);
|
|
1582
|
+
}
|
|
1546
1583
|
if (policy.pausedCodexAccountIds?.includes(accountId)) {
|
|
1547
1584
|
throw new CodexPoolAuthenticationError("Selected Codex account is unavailable");
|
|
1548
1585
|
}
|
|
@@ -1695,6 +1732,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1695
1732
|
...(quotaScope ? { quotaScope } : {}),
|
|
1696
1733
|
...(probeLeaseId ? { probeLeaseId } : {}),
|
|
1697
1734
|
...(probeQuotaScope ? { probeQuotaScope } : {}),
|
|
1735
|
+
...(affinityDecision ? { affinityDecision } : {}),
|
|
1698
1736
|
...(transientProbe ? { transientProbe } : {}),
|
|
1699
1737
|
};
|
|
1700
1738
|
}
|
|
@@ -1809,6 +1847,7 @@ export function materializeCodexUpstreamAuth(
|
|
|
1809
1847
|
if (ctx.kind === "pool") assertPoolAccountCredits(ctx.accountId, poolContextCreditHoldResetAt(ctx, options.config), poolContextCreditRecoveryNeeded(ctx, options.config), ctx.quotaScope);
|
|
1810
1848
|
selected.set("authorization", `Bearer ${ctx.accessToken}`);
|
|
1811
1849
|
selected.set("chatgpt-account-id", ctx.chatgptAccountId);
|
|
1850
|
+
isolateCodexPoolAccountHeaders(selected, ctx.chatgptAccountId);
|
|
1812
1851
|
if (ctx.kind === "main-pool") {
|
|
1813
1852
|
ctx.mainQuotaWriter = observeSelectedMainCredential(ctx, ctx.mainQuotaWriter);
|
|
1814
1853
|
assertMainAccountPolicy(options.config);
|
|
@@ -1839,6 +1878,7 @@ export function materializeCodexUpstreamAuth(
|
|
|
1839
1878
|
selected.delete("chatgpt-account-id");
|
|
1840
1879
|
selected.set("authorization", `Bearer ${stored.accessToken}`);
|
|
1841
1880
|
if (stored.chatgptAccountId) selected.set("chatgpt-account-id", stored.chatgptAccountId);
|
|
1881
|
+
isolateCodexPoolAccountHeaders(selected, stored.chatgptAccountId ?? "");
|
|
1842
1882
|
observeSelectedMainCredential(stored, writer);
|
|
1843
1883
|
assertMainAccountPolicy(options.config);
|
|
1844
1884
|
assertMaterializedReserve(selected, ctx, options);
|
|
@@ -1923,6 +1963,7 @@ export async function materializeCodexUpstreamAuthAsync(
|
|
|
1923
1963
|
selected.delete("chatgpt-account-id");
|
|
1924
1964
|
selected.set("authorization", `Bearer ${stored.accessToken}`);
|
|
1925
1965
|
if (stored.chatgptAccountId) selected.set("chatgpt-account-id", stored.chatgptAccountId);
|
|
1966
|
+
isolateCodexPoolAccountHeaders(selected, stored.chatgptAccountId ?? "");
|
|
1926
1967
|
observeSelectedMainCredential(stored, writer);
|
|
1927
1968
|
assertMainAccountPolicy(options.config);
|
|
1928
1969
|
// An opt-in enabled during token refresh must not turn a proof-less context into Reserve.
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { getConfigDir } from "../../config/paths";
|
|
2
|
+
import { getValidAccessSnapshotForAccount, type OAuthAccessSnapshot } from "../../oauth";
|
|
3
|
+
import { credentialGeneration, getAccountCredentialWithStatus, getAccountSet } from "../../oauth/store";
|
|
4
|
+
import { providerOutboundPost, providerRedirectError } from "../../lib/provider-outbound";
|
|
5
|
+
import { isRegistryModelDiscoveryUrl, readBoundedDiscoveryJson } from "../../providers/model-discovery";
|
|
6
|
+
import { parseAntigravityAvailableModels, type AntigravityAvailableModel } from "../../providers/antigravity-models";
|
|
7
|
+
import { captureAntigravityModelObservation, recordAntigravityAccountRoster } from "../../providers/antigravity-account-roster";
|
|
8
|
+
import type { OcxProviderConfig } from "../../types";
|
|
9
|
+
import { materializeCapturedHeaders, type CapturedModelsRequest } from "./gather-capture";
|
|
10
|
+
|
|
11
|
+
/** A sibling contributes only while the exact snapshot sent is still usable. */
|
|
12
|
+
export async function discoverAntigravitySiblings(
|
|
13
|
+
name: string, provider: OcxProviderConfig, activeAccountId: string,
|
|
14
|
+
request: CapturedModelsRequest, maxBytes: number, maxModels: number,
|
|
15
|
+
root: string,
|
|
16
|
+
): Promise<() => AntigravityAvailableModel[]> {
|
|
17
|
+
if (root !== getConfigDir()) return () => [];
|
|
18
|
+
const results: Array<{
|
|
19
|
+
snapshot: OAuthAccessSnapshot; models: AntigravityAvailableModel[];
|
|
20
|
+
observation: ReturnType<typeof captureAntigravityModelObservation>;
|
|
21
|
+
}> = [];
|
|
22
|
+
const current = (snapshot: OAuthAccessSnapshot): boolean => {
|
|
23
|
+
if (getConfigDir() !== root) return false;
|
|
24
|
+
const row = getAccountCredentialWithStatus(name, snapshot.accountId);
|
|
25
|
+
return !!row && !row.paused && !row.needsReauth && row.credential.expires > Date.now()
|
|
26
|
+
&& credentialGeneration(row.credential) === snapshot.generation
|
|
27
|
+
&& row.credential.access === snapshot.accessToken;
|
|
28
|
+
};
|
|
29
|
+
// Bound concurrency and preserve stable account order; a failed sibling is fail-soft.
|
|
30
|
+
for (const sibling of getAccountSet(name)?.accounts ?? []) {
|
|
31
|
+
if (sibling.id === activeAccountId || sibling.paused || sibling.needsReauth) continue;
|
|
32
|
+
try {
|
|
33
|
+
if (getConfigDir() !== root) break;
|
|
34
|
+
const snapshot = await getValidAccessSnapshotForAccount(name, sibling.id, { requireUsableAccount: true });
|
|
35
|
+
const project = provider.project ?? snapshot.projectId;
|
|
36
|
+
if (!project || !current(snapshot)) continue;
|
|
37
|
+
const observation = captureAntigravityModelObservation();
|
|
38
|
+
const response = await providerOutboundPost(name, provider, request.url, {
|
|
39
|
+
headers: materializeCapturedHeaders(request, snapshot.accessToken),
|
|
40
|
+
body: JSON.stringify({ project }), signal: AbortSignal.timeout(8000),
|
|
41
|
+
}, { isCanonicalUrl: isRegistryModelDiscoveryUrl, beforeSend: () => current(snapshot) });
|
|
42
|
+
if (!response.ok || await providerRedirectError(response, request.url)) continue;
|
|
43
|
+
const bounded = await readBoundedDiscoveryJson(response, maxBytes);
|
|
44
|
+
if (!bounded.ok) continue;
|
|
45
|
+
const models = parseAntigravityAvailableModels(bounded.value, maxModels);
|
|
46
|
+
if (models && current(snapshot)) results.push({ snapshot, models, observation });
|
|
47
|
+
} catch { /* A sibling cannot invalidate successful active-account discovery. */ }
|
|
48
|
+
}
|
|
49
|
+
// Called synchronously with the catalog publication, after all outbound awaits.
|
|
50
|
+
return () => {
|
|
51
|
+
const union: AntigravityAvailableModel[] = [];
|
|
52
|
+
for (const { snapshot, models, observation } of results) {
|
|
53
|
+
if (!current(snapshot)) continue;
|
|
54
|
+
recordAntigravityAccountRoster(name, snapshot.accountId, models, Date.now(), observation);
|
|
55
|
+
union.push(...models);
|
|
56
|
+
}
|
|
57
|
+
return union;
|
|
58
|
+
};
|
|
59
|
+
}
|
|
@@ -51,6 +51,7 @@ import { deriveEntry, finishUpstreamNativeEntry, isExactComboCatalogEntry } from
|
|
|
51
51
|
import { PICKER_ORDER_PRIORITY_BASE, SPAWN_PRIORITY_FIELD } from "./subagent-roster";
|
|
52
52
|
import { applyConfiguredUltraFast, configuredUltraFastSlugs } from "./configured-tiers";
|
|
53
53
|
import { applyNativeUltraFastTier } from "./native-ultrafast";
|
|
54
|
+
import { applyNativePriority, retainedNativeSourcePriorities, type NativePrioritySource } from "./native-priority";
|
|
54
55
|
|
|
55
56
|
export interface ObservedCatalogEntryBuildInput {
|
|
56
57
|
readonly template: RawEntry | null;
|
|
@@ -74,6 +75,7 @@ export interface ObservedCatalogEntryBuildInput {
|
|
|
74
75
|
readonly accountNativeSlugsBySelector?: ReadonlyMap<string, readonly string[]>;
|
|
75
76
|
/** Codex-only manual selector metadata; deliberately independent of live permission. */
|
|
76
77
|
readonly reserve?: ReserveCatalogProjection;
|
|
78
|
+
readonly nativeSource?: NativePrioritySource;
|
|
77
79
|
}
|
|
78
80
|
|
|
79
81
|
/** Build entries with the process-observed Codex feature state. */
|
|
@@ -93,6 +95,7 @@ export function buildCatalogEntries(
|
|
|
93
95
|
accountNativeSlugsBySelector?: ReadonlyMap<string, readonly string[]>,
|
|
94
96
|
keepNativeChatGptOnV1 = false,
|
|
95
97
|
modelPickerOrder: readonly string[] = [],
|
|
98
|
+
nativeSource?: NativePrioritySource,
|
|
96
99
|
): RawEntry[] {
|
|
97
100
|
const entries = buildCatalogEntriesFromObservedState({
|
|
98
101
|
template,
|
|
@@ -111,6 +114,7 @@ export function buildCatalogEntries(
|
|
|
111
114
|
openaiContextCap: contextCap,
|
|
112
115
|
accountNativeSlugs,
|
|
113
116
|
accountNativeSlugsBySelector,
|
|
117
|
+
nativeSource,
|
|
114
118
|
});
|
|
115
119
|
// Live discovery does not run the disk merge; use the same captured declarations and row fences.
|
|
116
120
|
const configured = configuredUltraFastSlugs(goModels);
|
|
@@ -143,6 +147,7 @@ export function buildCatalogEntriesFromObservedState({
|
|
|
143
147
|
accountNativeSlugs,
|
|
144
148
|
accountNativeSlugsBySelector,
|
|
145
149
|
reserve,
|
|
150
|
+
nativeSource,
|
|
146
151
|
}: ObservedCatalogEntryBuildInput): RawEntry[] {
|
|
147
152
|
// Codex's models-manager sorts by `priority` ASC and advertises the first 5 picker-visible
|
|
148
153
|
// models to spawn_agent (sort_by_key(priority) + MAX_MODEL_OVERRIDES_IN_SPAWN_AGENT=5). Catalog
|
|
@@ -209,7 +214,7 @@ export function buildCatalogEntriesFromObservedState({
|
|
|
209
214
|
.map(catalogModelSlug));
|
|
210
215
|
for (const slug of gptSlugs.filter(slug => !isCodexControlPlaneModel(slug))) {
|
|
211
216
|
const native = deriveEntry(template, slug, "OpenAI native model (Codex OAuth passthrough).", 9, undefined, new Set(), openaiContextCap);
|
|
212
|
-
|
|
217
|
+
applyNativePriority(native, slug, rank, featured?.length ?? 0, nativeSource);
|
|
213
218
|
nativeEntries.push(native);
|
|
214
219
|
const nativeAlias = nativeAliasesBySlug.get(slug);
|
|
215
220
|
if (!nativeAlias || collisionSkipped.has(nativeAlias)) {
|
|
@@ -239,7 +244,7 @@ export function buildCatalogEntriesFromObservedState({
|
|
|
239
244
|
?? gptSlugs;
|
|
240
245
|
const accountNativeEntries = selectorNativeSlugs.filter(slug => slug !== NATIVE_RESERVE_MODEL && !isCodexControlPlaneModel(slug)).map(slug => (
|
|
241
246
|
nativeEntriesBySlug.get(slug)
|
|
242
|
-
?? deriveEntry(template, slug, "OpenAI native model (Codex OAuth passthrough).", 9, undefined, new Set(), openaiContextCap)
|
|
247
|
+
?? applyNativePriority(deriveEntry(template, slug, "OpenAI native model (Codex OAuth passthrough).", 9, undefined, new Set(), openaiContextCap), slug, rank, featured?.length ?? 0, nativeSource)
|
|
243
248
|
));
|
|
244
249
|
if (reserve?.mainSelectors.includes(selector)) accountNativeEntries.push(reserve.source);
|
|
245
250
|
for (const [nativeIndex, native] of accountNativeEntries.entries()) {
|
|
@@ -684,12 +689,7 @@ export function mergeCatalogEntriesFromObservedState({
|
|
|
684
689
|
return staleComboKeys.has(key) && !currentNonComboKeys.has(key);
|
|
685
690
|
});
|
|
686
691
|
const catalogModelsForMerge = [...detachedCatalogModels, ...restoredComboShadows];
|
|
687
|
-
const
|
|
688
|
-
const base = baseline.get(slug)
|
|
689
|
-
?? (typeof fallback === "number" ? fallback : 9);
|
|
690
|
-
if (rank.has(slug)) return rank.get(slug)!;
|
|
691
|
-
return featured.length > 0 ? Math.max(base, featured.length + 100) : base;
|
|
692
|
-
};
|
|
692
|
+
const nativeSource: NativePrioritySource = { baseline, retainedBySlug: retainedNativeSourcePriorities(catalogModelsForMerge) };
|
|
693
693
|
const nativeSourceEntries = includeNativeOpenAi
|
|
694
694
|
? catalogModelsForMerge
|
|
695
695
|
.filter(m => typeof m.slug === "string"
|
|
@@ -707,10 +707,9 @@ export function mergeCatalogEntriesFromObservedState({
|
|
|
707
707
|
if (shouldUpgradeToUpstreamEntry(m)) {
|
|
708
708
|
const upstream = upstreamNativeEntry(slug)!;
|
|
709
709
|
const finished = finishUpstreamNativeEntry(upstream, 9, openaiContextCap);
|
|
710
|
-
finished
|
|
711
|
-
return finished;
|
|
710
|
+
return applyNativePriority(finished, slug, rank, featured.length, nativeSource);
|
|
712
711
|
}
|
|
713
|
-
const preserved = normalizeServiceTiers({ ...m,
|
|
712
|
+
const preserved = normalizeServiceTiers(applyNativePriority({ ...m }, slug, rank, featured.length, nativeSource));
|
|
714
713
|
// Recompute spawn rank from current featured models, not a prior picker override.
|
|
715
714
|
delete preserved[SPAWN_PRIORITY_FIELD];
|
|
716
715
|
// Older natives kept from disk still need the mock top tiers (max + ultra always
|
|
@@ -736,12 +735,12 @@ export function mergeCatalogEntriesFromObservedState({
|
|
|
736
735
|
template ? JSON.parse(JSON.stringify(template)) : null,
|
|
737
736
|
slug,
|
|
738
737
|
"OpenAI native model (Codex OAuth passthrough).",
|
|
739
|
-
|
|
738
|
+
9,
|
|
740
739
|
undefined,
|
|
741
740
|
new Set(),
|
|
742
741
|
openaiContextCap,
|
|
743
742
|
);
|
|
744
|
-
entry
|
|
743
|
+
applyNativePriority(entry, slug, rank, featured.length, nativeSource);
|
|
745
744
|
native.push(entry);
|
|
746
745
|
}
|
|
747
746
|
}
|