@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.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-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- 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 +17 -4
- 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.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 +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- 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/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/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- 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 +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- 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 +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- 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 +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- 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 +58 -64
- 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/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.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- 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-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 +17 -4
- 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-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 +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- 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/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- 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 +257 -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 +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -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 +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -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 +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- 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 +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- 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/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- 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 +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- 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 +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- 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/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- 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-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/shadow-call.ts +55 -1
- 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 +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- 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 +238 -0
- package/src/local-credentials/inventory.ts +281 -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/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/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 +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- 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/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- 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/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -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 +9 -43
- package/src/server/index/websocket-handler.ts +7 -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 +424 -543
- 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 +79 -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/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -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 +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- 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/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- 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/combo-required-tool-contract.ts +2 -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 +14 -7
- 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 +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -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 +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- 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/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/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -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 +179 -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 +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- 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 +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -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 {
|
|
@@ -359,8 +362,7 @@ export function codexTransientProbeGrant(ctx: CodexAuthContext | undefined): Tra
|
|
|
359
362
|
}
|
|
360
363
|
|
|
361
364
|
/**
|
|
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.
|
|
365
|
+
* Hand back a probe lease for a request that will not reach upstream. Safe to call with a context that holds no lease.
|
|
364
366
|
*
|
|
365
367
|
* BOTH leases, deliberately. A context can carry the quota-cooldown probe or the transient-hold
|
|
366
368
|
* probe, and every one of the ~30 call sites that already hands back the first is a path where
|
|
@@ -569,8 +571,7 @@ export class CodexMainAccountCreditsOffError extends CodexAccountCooldownError {
|
|
|
569
571
|
readonly resetAt?: number;
|
|
570
572
|
|
|
571
573
|
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.
|
|
574
|
+
// Keep the included reset as policy evidence, but let consented callers retry within the base metadata recovery interval even when backoff grows longer.
|
|
574
575
|
super(MAIN_CODEX_ACCOUNT_ID, creditRecovery
|
|
575
576
|
? Math.min(resetAt ?? Infinity, Date.now() + nextQuotaQueryDelay()) : resetAt ?? 0);
|
|
576
577
|
this.name = "CodexMainAccountCreditsOffError";
|
|
@@ -903,6 +904,10 @@ function observeSelectedMainCredential(
|
|
|
903
904
|
token: { accessToken: string; chatgptAccountId: string },
|
|
904
905
|
writer: MainQuotaWriter | undefined,
|
|
905
906
|
): MainQuotaWriter | undefined {
|
|
907
|
+
// A claimed RPC can observe a replacement identity while the caller awaits it. Only that
|
|
908
|
+
// exact result carries the replacement writer; stale results keep their stale fence.
|
|
909
|
+
const ownedWriter = mainAccountTokenQuotaWriter(token);
|
|
910
|
+
if (ownedWriter) return ownedWriter;
|
|
906
911
|
if (!writer) return undefined;
|
|
907
912
|
// Carry an explicitly stale writer through to quota's rejection fence; turning it into an
|
|
908
913
|
// untagged write would instead invalidate the replacement account's trusted observation.
|
|
@@ -1248,6 +1253,14 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1248
1253
|
throw new CodexMainProfileDrainingError();
|
|
1249
1254
|
}
|
|
1250
1255
|
if (isMainAccountHardLockEnabled(policy)) reconcileMainCodexAccountRuntimeState();
|
|
1256
|
+
if (!getMainAccountToken()) {
|
|
1257
|
+
try {
|
|
1258
|
+
await (options.getValidMainAccountToken ?? getValidMainAccountToken)({
|
|
1259
|
+
signal: options.signal, ...(options.nativeMainRefreshDependencies ?? {}),
|
|
1260
|
+
});
|
|
1261
|
+
} catch (cause) { throw new CodexAuthContextError(MAIN_CODEX_ACCOUNT_ID, cause); }
|
|
1262
|
+
options.signal?.throwIfAborted();
|
|
1263
|
+
}
|
|
1251
1264
|
assertMainAccountPolicy(policy);
|
|
1252
1265
|
if (options.modelId && ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(options.modelId)) {
|
|
1253
1266
|
const entitled = entitledCodexAccountIdsForModel(
|
|
@@ -1332,6 +1345,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1332
1345
|
const nativeMainSelectionOnly = !nativeMainTrafficBlocked
|
|
1333
1346
|
&& selectionAdmission?.mainProfileDraining === true;
|
|
1334
1347
|
let accountId: string;
|
|
1348
|
+
let mainDiscoveryFailure: unknown;
|
|
1335
1349
|
// Answering this with the manual-pin predicate made `codexAccountUnusableReason` report
|
|
1336
1350
|
// `main_credential_unavailable` for every UNPINNED request, so `getEligiblePoolAccounts` never
|
|
1337
1351
|
// listed main and the strategy compared only the stored accounts. With one stored sibling the
|
|
@@ -1348,6 +1362,20 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1348
1362
|
&& callerOwnsAnyCooledPoolSubscription(headers, config, quotaScope),
|
|
1349
1363
|
});
|
|
1350
1364
|
try {
|
|
1365
|
+
// A fileless login can change identity even while its previous expiry observation is usable.
|
|
1366
|
+
// The selector discovers it before identity-bound quota or hard-lock policy; dispatch still revalidates it.
|
|
1367
|
+
if (selectionAdmission && !nativeMainReadsForbidden && !options.isMainAccountTokenLive
|
|
1368
|
+
&& (fixedAccountId === undefined || fixedAccountId === MAIN_CODEX_ACCOUNT_ID)
|
|
1369
|
+
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1370
|
+
&& !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
|
|
1371
|
+
&& (!getMainAccountToken() || !getMainAccountCredentialStatus().usable)) {
|
|
1372
|
+
try {
|
|
1373
|
+
await (options.getValidMainAccountToken ?? getValidMainAccountToken)({
|
|
1374
|
+
signal: options.signal, ...(options.nativeMainRefreshDependencies ?? {}),
|
|
1375
|
+
});
|
|
1376
|
+
} catch (cause) { mainDiscoveryFailure = cause; }
|
|
1377
|
+
options.signal?.throwIfAborted();
|
|
1378
|
+
}
|
|
1351
1379
|
const excludeAccountIds = nativeMainReadsForbidden
|
|
1352
1380
|
? new Set([MAIN_CODEX_ACCOUNT_ID])
|
|
1353
1381
|
: undefined;
|
|
@@ -1460,6 +1488,11 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1460
1488
|
return context;
|
|
1461
1489
|
}
|
|
1462
1490
|
if (!selected) {
|
|
1491
|
+
// After an entitlement-await recovery, current selection evidence outranks the saved
|
|
1492
|
+
// probe failure; retain it only while main is still unusable (as for fixed selection).
|
|
1493
|
+
if (mainDiscoveryFailure !== undefined && !getMainAccountCredentialStatus().usable) {
|
|
1494
|
+
throw new CodexAuthContextError(MAIN_CODEX_ACCOUNT_ID, mainDiscoveryFailure);
|
|
1495
|
+
}
|
|
1463
1496
|
// A retry that excluded a failed Pool account may still use the validated caller-owned
|
|
1464
1497
|
// main credential. Treating every exclusion as if main itself had failed strands a healthy
|
|
1465
1498
|
// native bearer after the first Pool attempt. Preserve the exactly-once boundary by refusing
|
|
@@ -1543,6 +1576,11 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1543
1576
|
);
|
|
1544
1577
|
}
|
|
1545
1578
|
if (fixedAccountId !== undefined) {
|
|
1579
|
+
// Preserve exact-main discovery errors only while the current credential remains unusable, as above.
|
|
1580
|
+
if (accountId === MAIN_CODEX_ACCOUNT_ID && mainDiscoveryFailure !== undefined
|
|
1581
|
+
&& !getMainAccountCredentialStatus().usable) {
|
|
1582
|
+
throw new CodexAuthContextError(MAIN_CODEX_ACCOUNT_ID, mainDiscoveryFailure);
|
|
1583
|
+
}
|
|
1546
1584
|
if (policy.pausedCodexAccountIds?.includes(accountId)) {
|
|
1547
1585
|
throw new CodexPoolAuthenticationError("Selected Codex account is unavailable");
|
|
1548
1586
|
}
|
|
@@ -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
|
}
|
|
@@ -35,7 +35,9 @@ import { decodeOverlayState } from "../shim-state-file";
|
|
|
35
35
|
|
|
36
36
|
import { activeCodexModelsCachePath, catalogBackupPathFor, findNativeTemplate, findSupportedNativeTemplate, isDefaultCatalogPath, legacyCatalogBackupPath, parseCatalogJson, readCatalog, readCatalogBackup, readCodexCatalogPath } from "./parsing";
|
|
37
37
|
import type { RawCatalog, RawEntry } from "./parsing";
|
|
38
|
-
import {
|
|
38
|
+
import { isSpawnableCodexCandidate } from "../exec-invocation";
|
|
39
|
+
import { validatedCodexExecInvocation, validatedCodexExecInvocationAsync } from "../exec-boundary";
|
|
40
|
+
import { isPlainObject } from "../../lib/plain-data";
|
|
39
41
|
import {
|
|
40
42
|
parsePersistedCodexRuntime,
|
|
41
43
|
peekCodexRuntimeProcessCache,
|
|
@@ -193,6 +195,14 @@ export interface BundledCatalogDeps {
|
|
|
193
195
|
platform?: NodeJS.Platform;
|
|
194
196
|
existsSync?: (path: string) => boolean;
|
|
195
197
|
readFileSync?: (path: string, encoding: "utf8") => string;
|
|
198
|
+
/** Exec-boundary bundle trust for sync drivers (resolve + debug exec). */
|
|
199
|
+
macBundleTrustReason?: (bundleRoot: string, binary: string) => string | null;
|
|
200
|
+
/** Exec-boundary bundle trust for async drivers; injected checks bypass the runtime memo. */
|
|
201
|
+
macBundleTrustReasonAsync?: (bundleRoot: string, binary: string, signal?: AbortSignal) => Promise<string | null>;
|
|
202
|
+
/** Exec-boundary spawnability predicate (regular file + X_OK). */
|
|
203
|
+
executable?: (path: string) => boolean;
|
|
204
|
+
/** Exec-boundary canonicalizer; returns null when the path cannot be resolved. */
|
|
205
|
+
realpath?: (path: string) => string | null;
|
|
196
206
|
now?: () => number;
|
|
197
207
|
discoverAlternatives?: boolean;
|
|
198
208
|
}
|
|
@@ -246,12 +256,43 @@ export function codexShimCommandCandidates(): string[] {
|
|
|
246
256
|
export function runCodexDebugModels<T>(
|
|
247
257
|
command: string,
|
|
248
258
|
execFile: (...args: Parameters<ExecFile>) => T,
|
|
249
|
-
deps: Pick<BundledCatalogDeps, "env" | "platform" | "existsSync"> = {},
|
|
259
|
+
deps: Pick<BundledCatalogDeps, "env" | "platform" | "existsSync" | "executable" | "realpath" | "macBundleTrustReason"> = {},
|
|
250
260
|
): T {
|
|
251
261
|
const args = ["debug", "models", "--bundled"];
|
|
252
|
-
const invocation =
|
|
262
|
+
const invocation = validatedCodexExecInvocation(command, args, {
|
|
253
263
|
env: deps.env,
|
|
264
|
+
platform: deps.platform,
|
|
254
265
|
exists: deps.existsSync,
|
|
266
|
+
executable: deps.executable,
|
|
267
|
+
realpath: deps.realpath,
|
|
268
|
+
macBundleTrustReason: deps.macBundleTrustReason,
|
|
269
|
+
});
|
|
270
|
+
return execFile(invocation.file, invocation.args, {
|
|
271
|
+
encoding: "utf8" as const,
|
|
272
|
+
stdio: ["ignore", "pipe", "ignore"] as ["ignore", "pipe", "ignore"],
|
|
273
|
+
timeout: 10_000,
|
|
274
|
+
maxBuffer: 64 * 1024 * 1024,
|
|
275
|
+
windowsHide: true,
|
|
276
|
+
...invocation.options,
|
|
277
|
+
});
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
/** Async twin of runCodexDebugModels: same args/options, bundle trust checked off the event loop. */
|
|
281
|
+
export async function runCodexDebugModelsAsync<T>(
|
|
282
|
+
command: string,
|
|
283
|
+
execFile: (...args: Parameters<ExecFile>) => Promise<T>,
|
|
284
|
+
deps: Pick<BundledCatalogDeps, "env" | "platform" | "existsSync" | "executable" | "realpath" | "macBundleTrustReasonAsync"> = {},
|
|
285
|
+
signal?: AbortSignal,
|
|
286
|
+
): Promise<T> {
|
|
287
|
+
const args = ["debug", "models", "--bundled"];
|
|
288
|
+
const invocation = await validatedCodexExecInvocationAsync(command, args, {
|
|
289
|
+
env: deps.env,
|
|
290
|
+
platform: deps.platform,
|
|
291
|
+
exists: deps.existsSync,
|
|
292
|
+
executable: deps.executable,
|
|
293
|
+
realpath: deps.realpath,
|
|
294
|
+
macBundleTrustReasonAsync: deps.macBundleTrustReasonAsync,
|
|
295
|
+
signal,
|
|
255
296
|
});
|
|
256
297
|
return execFile(invocation.file, invocation.args, {
|
|
257
298
|
encoding: "utf8" as const,
|
|
@@ -275,6 +316,12 @@ function bundledRuntimeDeps(deps: BundledCatalogDeps) {
|
|
|
275
316
|
platform: deps.platform,
|
|
276
317
|
existsSync: deps.existsSync,
|
|
277
318
|
readFileSync: deps.readFileSync,
|
|
319
|
+
// Exec-boundary trust deps forwarded so the runtime's own --version probes
|
|
320
|
+
// use the same injected checks as the catalog exec below.
|
|
321
|
+
...(deps.macBundleTrustReason ? { macBundleTrustReason: deps.macBundleTrustReason } : {}),
|
|
322
|
+
...(deps.macBundleTrustReasonAsync ? { macBundleTrustReasonAsync: deps.macBundleTrustReasonAsync } : {}),
|
|
323
|
+
...(deps.executable ? { executable: deps.executable } : {}),
|
|
324
|
+
...(deps.realpath ? { realpath: deps.realpath } : {}),
|
|
278
325
|
now: deps.now,
|
|
279
326
|
// Catalog loading only consumes `resolved.runtime.command`, never `newerAvailable`.
|
|
280
327
|
// Full PATH discovery probes every candidate launcher (100+ on a dev machine, ~1.2s),
|
|
@@ -406,8 +453,9 @@ export function loadBundledCodexCatalogAsync(
|
|
|
406
453
|
let step = steps.next();
|
|
407
454
|
while (!step.done) {
|
|
408
455
|
let output: string | null = null;
|
|
409
|
-
try { output = await
|
|
410
|
-
(file, args, options) => (deps.execFile ?? execCodexFileAsync)(file, args, { ...options, signal: controller.signal }),
|
|
456
|
+
try { output = await runCodexDebugModelsAsync(step.value,
|
|
457
|
+
(file, args, options) => (deps.execFile ?? execCodexFileAsync)(file, args, { ...options, signal: controller.signal }),
|
|
458
|
+
deps, controller.signal); }
|
|
411
459
|
catch { /* preserve last confirmed evidence on failure */ }
|
|
412
460
|
step = steps.next(output);
|
|
413
461
|
}
|
|
@@ -681,11 +729,13 @@ export function readCurrentCodexModelsCache(): RawCatalog | null {
|
|
|
681
729
|
export function loadCatalogTemplate(): RawEntry | null {
|
|
682
730
|
const catalogPath = readCodexCatalogPath();
|
|
683
731
|
const bundled = bundledCodexCatalogSnapshot();
|
|
732
|
+
const fromRows = (catalog: RawCatalog | null) => findSupportedNativeTemplate(catalog
|
|
733
|
+
? { ...catalog, models: (catalog.models ?? []).filter(isPlainObject) } : null);
|
|
684
734
|
// Template inheritance only. The validity gates in this file keep `findNativeTemplate`
|
|
685
735
|
// so a catalog carrying only a newly launched native row stays valid (#2813).
|
|
686
|
-
const native =
|
|
687
|
-
??
|
|
688
|
-
??
|
|
689
|
-
??
|
|
736
|
+
const native = fromRows(readCatalog(catalogPath))
|
|
737
|
+
?? fromRows(readCatalogBackup(catalogPath))
|
|
738
|
+
?? fromRows(readCatalog(activeCodexModelsCachePath()))
|
|
739
|
+
?? fromRows(bundled ? JSON.parse(JSON.stringify(bundled)) as RawCatalog : null);
|
|
690
740
|
return native ? JSON.parse(JSON.stringify(native)) : null;
|
|
691
741
|
}
|
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
isGpt56NativeSlug,
|
|
27
27
|
} from "./effort";
|
|
28
28
|
import { CATALOG_INACTIVE_REASON_FIELD, SPAWN_PRIORITY_FIELD } from "./subagent-roster";
|
|
29
|
+
import { OCX_NATIVE_SOURCE_PRIORITY_FIELD } from "./native-priority";
|
|
29
30
|
import { applyRoutedDescription } from "./ownership";
|
|
30
31
|
|
|
31
32
|
export function finishUpstreamNativeEntry(clone: RawEntry, priority: number, contextCap?: NativeContextLimitsInput): RawEntry {
|
|
@@ -127,6 +128,7 @@ export function deriveEntry(
|
|
|
127
128
|
delete e.opencodex_native_display_name;
|
|
128
129
|
// A cached template may carry display-order history; each new row owns its natural rank.
|
|
129
130
|
delete e[SPAWN_PRIORITY_FIELD];
|
|
131
|
+
delete e[OCX_NATIVE_SOURCE_PRIORITY_FIELD];
|
|
130
132
|
e.slug = slug;
|
|
131
133
|
e.display_name = routedDisplayName(slug, model);
|
|
132
134
|
applyRoutedDescription(e, desc, model);
|
|
@@ -39,6 +39,7 @@ import { CODEX_REASONING_LEVELS, codexEffortRank, configuredReasoningEfforts, mo
|
|
|
39
39
|
import { isModelVisionSidecarConsumer } from "../../vision/eligibility";
|
|
40
40
|
import { getModelMetadata, getModelMetadataCaseInsensitive, listModelMetadata, resolveMetadataProvider, type ModelMetadata } from "../../generated/model-metadata";
|
|
41
41
|
import { enrichProviderFromRegistry, shouldCaseFoldMetadataModelId } from "../../providers/derive";
|
|
42
|
+
import { applyRegistryCapabilitySeedFill } from "./model-hints";
|
|
42
43
|
import {
|
|
43
44
|
captureFastPolicyAuthority,
|
|
44
45
|
fastPolicyForModel,
|
|
@@ -360,6 +361,8 @@ export function captureProviderGather(
|
|
|
360
361
|
): CapturedProviderGather {
|
|
361
362
|
const metadataConfigDir = getConfigDir();
|
|
362
363
|
const enriched = detachedClone(withCanonicalOpenAiForwardAuthDefault(name, configured));
|
|
364
|
+
// Bound seed windows while the clone still distinguishes operator settings from defaults.
|
|
365
|
+
applyRegistryCapabilitySeedFill(name, enriched);
|
|
363
366
|
enrichProviderFromRegistry(name, enriched);
|
|
364
367
|
const registryTransportMatch = providerMatchesRegistryTransport(name, enriched);
|
|
365
368
|
const registryEntry = registryTransportMatch ? getProviderRegistryEntry(name) : undefined;
|
|
@@ -32,6 +32,7 @@ import type { NormalizedComboConfig } from "../../combos/types";
|
|
|
32
32
|
import { providerDestinationResolvedError } from "../../lib/destination-policy";
|
|
33
33
|
import { redactSecretString } from "../../lib/redact";
|
|
34
34
|
import { pinnedNativeModelRows } from "./pinned-models";
|
|
35
|
+
import { isPlainObject } from "../../lib/plain-data";
|
|
35
36
|
|
|
36
37
|
|
|
37
38
|
import type { RawEntry } from "./parsing";
|
|
@@ -858,11 +859,11 @@ export function observedAccountBoundNativeEntries(
|
|
|
858
859
|
*/
|
|
859
860
|
export function accountBoundNativeOpenAiSlugs(
|
|
860
861
|
observedEntries: readonly RawEntry[] = [
|
|
861
|
-
...(readCurrentCodexModelsCache()?.models ?? []),
|
|
862
|
+
...(readCurrentCodexModelsCache()?.models ?? []).filter(isPlainObject),
|
|
862
863
|
// Existing generated rows are also safe to reuse after a process starts without a cache
|
|
863
864
|
// invalidation pass; bare user-authored catalog rows are intentionally not trusted here.
|
|
864
865
|
...(readCurrentCodexCatalog()?.models ?? []).filter(entry =>
|
|
865
|
-
trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
866
|
+
isPlainObject(entry) && trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
866
867
|
],
|
|
867
868
|
): string[] {
|
|
868
869
|
const observed = observedEntries.flatMap(entry => {
|
|
@@ -883,9 +884,9 @@ export function accountBoundNativeOpenAiSlugs(
|
|
|
883
884
|
export function accountBoundNativeOpenAiSlugsBySelector(
|
|
884
885
|
config: AccountSelectorConfig,
|
|
885
886
|
observedEntries: readonly RawEntry[] = [
|
|
886
|
-
...(readCurrentCodexModelsCache()?.models ?? []),
|
|
887
|
+
...(readCurrentCodexModelsCache()?.models ?? []).filter(isPlainObject),
|
|
887
888
|
...(readCurrentCodexCatalog()?.models ?? []).filter(entry =>
|
|
888
|
-
trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
889
|
+
isPlainObject(entry) && trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
889
890
|
],
|
|
890
891
|
): ReadonlyMap<string, readonly string[]> {
|
|
891
892
|
const selectors = visibleCodexAccountSelectors(config);
|
|
@@ -926,7 +927,7 @@ export function observedAccountBoundNativeOpenAiSlugs(
|
|
|
926
927
|
|
|
927
928
|
function catalogNativeSlugs(): string[] {
|
|
928
929
|
const cat = readCurrentCatalogOrCache();
|
|
929
|
-
const models = cat?.models ?? [];
|
|
930
|
+
const models = (cat?.models ?? []).filter(isPlainObject);
|
|
930
931
|
const live = models.flatMap(entry => {
|
|
931
932
|
const slug = typeof entry.slug === "string" ? entry.slug : "";
|
|
932
933
|
return !slug.includes("/") && SUPPORTED_NATIVE_OPENAI_SLUGS.has(slug) ? [slug] : [];
|
|
@@ -95,6 +95,7 @@ import { disabledNativeSlugs, hasComboTargets, hasNativeOpenAiCapabilityMetadata
|
|
|
95
95
|
import { deriveComboCatalogModel, normalizedOpenAiApiSignature, openAiApiCollisionWarnings, replaceLastComboCatalogOmissions, warnUncataloguedComboOnce } from "./aggregation";
|
|
96
96
|
import type { ComboCatalogOmission } from "./aggregation";
|
|
97
97
|
import { clampObservedModelLimits, resolveModelPolicy } from "../../providers/resolved-model-policy";
|
|
98
|
+
import { mapFill } from "../../providers/resolved-model-policy-merge";
|
|
98
99
|
import type { CatalogGatherProviderAuthEvidence } from "./filesystem-evidence";
|
|
99
100
|
import type {
|
|
100
101
|
CatalogAdmissionSnapshot,
|
|
@@ -110,8 +111,8 @@ import type {
|
|
|
110
111
|
/**
|
|
111
112
|
* Fill the registry seed's per-model numeric capability maps beneath the provider's own
|
|
112
113
|
* values, mutating `prov` in place. The merge is per key — an operator's entry always
|
|
113
|
-
* wins; a model the persisted map never mentions picks up its seed value
|
|
114
|
-
*
|
|
114
|
+
* wins; a model the persisted map never mentions picks up its seed value, bounded
|
|
115
|
+
* by the operator's provider-wide context limit before enrichment can hide its origin.
|
|
115
116
|
*
|
|
116
117
|
* Routing already performs this fill at resolve time (routedProviderConfig in
|
|
117
118
|
* src/router.ts) and the catalog did not, and that divergence is #4570:
|
|
@@ -134,10 +135,14 @@ export function applyRegistryCapabilitySeedFill(name: string, prov: OcxProviderC
|
|
|
134
135
|
const entry = getProviderRegistryEntry(name);
|
|
135
136
|
if (!entry) return;
|
|
136
137
|
if (entry.modelContextWindows || prov.modelContextWindows) {
|
|
137
|
-
|
|
138
|
+
const providerWindow = typeof prov.contextWindow === "number" && prov.contextWindow > 0
|
|
139
|
+
? prov.contextWindow : undefined;
|
|
140
|
+
const seeds = Object.fromEntries(Object.entries(entry.modelContextWindows ?? {}).map(([id, window]) =>
|
|
141
|
+
[id, providerWindow !== undefined ? Math.min(window, providerWindow) : window]));
|
|
142
|
+
[prov.modelContextWindows] = mapFill(seeds, prov.modelContextWindows);
|
|
138
143
|
}
|
|
139
144
|
if (entry.modelMaxOutputTokens || prov.modelMaxOutputTokens) {
|
|
140
|
-
prov.modelMaxOutputTokens =
|
|
145
|
+
[prov.modelMaxOutputTokens] = mapFill(entry.modelMaxOutputTokens, prov.modelMaxOutputTokens);
|
|
141
146
|
}
|
|
142
147
|
}
|
|
143
148
|
const NUMERIC_MODEL_ID_SEGMENT = /^\d+$/;
|
|
@@ -562,6 +567,25 @@ export function positiveSafeInteger(...values: unknown[]): number | undefined {
|
|
|
562
567
|
return values.find(value => typeof value === "number" && Number.isSafeInteger(value) && value > 0) as number | undefined;
|
|
563
568
|
}
|
|
564
569
|
|
|
570
|
+
/** Bound inspection of untrusted upstream context ladders. */
|
|
571
|
+
const MAX_CONTEXT_WINDOW_RUNGS = 8;
|
|
572
|
+
|
|
573
|
+
/**
|
|
574
|
+
* The widest rung of a selectable context ladder an upstream published, if it published one.
|
|
575
|
+
*
|
|
576
|
+
* A lane that offers a long-context rung announces the whole ladder and reports its default
|
|
577
|
+
* rung as the effective window. The capacity is the widest rung, not the default one.
|
|
578
|
+
*/
|
|
579
|
+
function widestContextWindowRung(value: unknown): number | undefined {
|
|
580
|
+
if (!Array.isArray(value)) return undefined;
|
|
581
|
+
let widest: number | undefined;
|
|
582
|
+
for (const rung of value.slice(0, MAX_CONTEXT_WINDOW_RUNGS)) {
|
|
583
|
+
const window = positiveSafeInteger(rung);
|
|
584
|
+
if (window !== undefined && (widest === undefined || window > widest)) widest = window;
|
|
585
|
+
}
|
|
586
|
+
return widest;
|
|
587
|
+
}
|
|
588
|
+
|
|
565
589
|
function normalizedMetadataString(raw: string, maxLength: number): string | undefined {
|
|
566
590
|
if (raw.length > maxLength * 4 || MODEL_DISCOVERY_METADATA_CONTROL_CHARS.test(raw)) return undefined;
|
|
567
591
|
const normalized = raw.trim().toLowerCase().replace(/\s+/g, "-").slice(0, maxLength);
|
|
@@ -771,6 +795,14 @@ export function catalogHintsFromModelsApiItem(providerName: string, item: Provid
|
|
|
771
795
|
// real values. Appended after the recognized fields for the same reason as the
|
|
772
796
|
// llama.cpp entries above: no provider that already resolves changes behavior.
|
|
773
797
|
capabilityRecord?.context_length,
|
|
798
|
+
// The Grok CLI subscription lane publishes its default rung in `context_window` and the
|
|
799
|
+
// selectable ladder in `context_windows` (`[256000, 500000]` for grok-4.5/4.6/4.7 on
|
|
800
|
+
// 2026-10-24). Reading only the default rung published half of what the lane offers, and
|
|
801
|
+
// because a configured or registered window may only LOWER the observed one, the 500k the
|
|
802
|
+
// registry already carries could not raise it back. The widest rung is the model's capacity,
|
|
803
|
+
// so it outranks the default rung beside it; every other recognized field keeps the
|
|
804
|
+
// precedence it already had, and a lane that publishes no ladder is unaffected.
|
|
805
|
+
widestContextWindowRung(item.context_windows),
|
|
774
806
|
// OpenGateway publishes a top-level context_window. Keep this last so catalogs
|
|
775
807
|
// already resolving through any recognized field retain their existing window.
|
|
776
808
|
item.context_window,
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { discoveredNativeOpenAiModels } from "./native-models";
|
|
2
|
+
import { UPSTREAM_NATIVE_ENTRIES } from "./metadata";
|
|
3
|
+
import { readCatalogBackup, type RawEntry } from "./parsing";
|
|
4
|
+
import { isPlainObject } from "../../lib/plain-data";
|
|
5
|
+
|
|
6
|
+
// Private provenance, like opencodex_spawn_priority: Codex ignores unknown fields.
|
|
7
|
+
// This is always the unbanded source rank, independent of picker/guidance history.
|
|
8
|
+
export const OCX_NATIVE_SOURCE_PRIORITY_FIELD = "opencodex_native_source_priority";
|
|
9
|
+
export const NATIVE_SOURCE_PRIORITY_MAX = 1_000;
|
|
10
|
+
|
|
11
|
+
export interface NativePrioritySource {
|
|
12
|
+
readonly baseline?: ReadonlyMap<string, unknown>;
|
|
13
|
+
readonly retainedBySlug?: ReadonlyMap<string, unknown>;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** Optional native provenance validates its rows without changing shared catalog parsing. */
|
|
17
|
+
export function readNativeBaseline(catalogPath: string): Map<string, number> {
|
|
18
|
+
const baseline = new Map<string, number>();
|
|
19
|
+
for (const row of readCatalogBackup(catalogPath)?.models ?? []) {
|
|
20
|
+
if (isPlainObject(row) && typeof row.slug === "string" && !row.slug.includes("/")
|
|
21
|
+
&& typeof row.priority === "number" && Number.isFinite(row.priority)) {
|
|
22
|
+
baseline.set(row.slug, row.priority);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return baseline;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function validSourcePriority(value: unknown): value is number {
|
|
29
|
+
return typeof value === "number" && Number.isSafeInteger(value)
|
|
30
|
+
&& value >= 0 && value <= NATIVE_SOURCE_PRIORITY_MAX;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export function retainedNativeSourcePriorities(rows: readonly unknown[]): Map<string, unknown> {
|
|
34
|
+
return new Map(rows.flatMap(row => isPlainObject(row) && typeof row.slug === "string" && !row.slug.includes("/")
|
|
35
|
+
&& validSourcePriority(row[OCX_NATIVE_SOURCE_PRIORITY_FIELD])
|
|
36
|
+
? [[row.slug, row[OCX_NATIVE_SOURCE_PRIORITY_FIELD]] as const] : []));
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export function resolveNativeSourcePriority(slug: string, source: NativePrioritySource = {}): number {
|
|
40
|
+
// This registry is the same pristine source upstreamNativeEntry clones. Reading one scalar
|
|
41
|
+
// avoids cloning the full instruction payload a second time for every native row.
|
|
42
|
+
const upstream = UPSTREAM_NATIVE_ENTRIES.get(slug)?.priority;
|
|
43
|
+
if (discoveredNativeOpenAiModels().includes(slug) && validSourcePriority(upstream)) return upstream;
|
|
44
|
+
const baseline = source.baseline?.get(slug);
|
|
45
|
+
if (validSourcePriority(baseline)) return baseline;
|
|
46
|
+
const retained = source.retainedBySlug?.get(slug);
|
|
47
|
+
if (validSourcePriority(retained)) return retained;
|
|
48
|
+
return validSourcePriority(upstream) ? upstream : 9;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** Assign after derivation: finishUpstreamNativeEntry treats priority 9 as keep-upstream. */
|
|
52
|
+
export function applyNativePriority(
|
|
53
|
+
entry: RawEntry,
|
|
54
|
+
slug: string,
|
|
55
|
+
rank: ReadonlyMap<string, number>,
|
|
56
|
+
featuredCount: number,
|
|
57
|
+
source?: NativePrioritySource,
|
|
58
|
+
): RawEntry {
|
|
59
|
+
const priority = resolveNativeSourcePriority(slug, source);
|
|
60
|
+
entry[OCX_NATIVE_SOURCE_PRIORITY_FIELD] = priority;
|
|
61
|
+
entry.priority = rank.get(slug) ?? (featuredCount > 0 ? featuredCount + 100 + priority : priority);
|
|
62
|
+
return entry;
|
|
63
|
+
}
|