@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
|
@@ -33,9 +33,12 @@ import upstreamModelsSnapshot from "../data/upstream-models.json";
|
|
|
33
33
|
import { decodeOverlayState } from "../shim-state-file";
|
|
34
34
|
|
|
35
35
|
|
|
36
|
-
import { activeCodexModelsCachePath, catalogBackupPathFor, findNativeTemplate, findSupportedNativeTemplate, isDefaultCatalogPath, legacyCatalogBackupPath, parseCatalogJson, readCatalog, readCatalogBackup, readCodexCatalogPath } from "./parsing";
|
|
36
|
+
import { activeCodexModelsCachePath, catalogBackupPathFor, ensureStrictCatalogFields, findNativeTemplate, findSupportedNativeTemplate, isDefaultCatalogPath, legacyCatalogBackupPath, parseCatalogJson, readCatalog, readCatalogBackup, readCodexCatalogPath } from "./parsing";
|
|
37
|
+
import { retainedNativeInheritanceTemplate } from "./native-template";
|
|
37
38
|
import type { RawCatalog, RawEntry } from "./parsing";
|
|
38
|
-
import {
|
|
39
|
+
import { isSpawnableCodexCandidate } from "../exec-invocation";
|
|
40
|
+
import { validatedCodexExecInvocation, validatedCodexExecInvocationAsync } from "../exec-boundary";
|
|
41
|
+
import { isPlainObject } from "../../lib/plain-data";
|
|
39
42
|
import {
|
|
40
43
|
parsePersistedCodexRuntime,
|
|
41
44
|
peekCodexRuntimeProcessCache,
|
|
@@ -193,6 +196,14 @@ export interface BundledCatalogDeps {
|
|
|
193
196
|
platform?: NodeJS.Platform;
|
|
194
197
|
existsSync?: (path: string) => boolean;
|
|
195
198
|
readFileSync?: (path: string, encoding: "utf8") => string;
|
|
199
|
+
/** Exec-boundary bundle trust for sync drivers (resolve + debug exec). */
|
|
200
|
+
macBundleTrustReason?: (bundleRoot: string, binary: string) => string | null;
|
|
201
|
+
/** Exec-boundary bundle trust for async drivers; injected checks bypass the runtime memo. */
|
|
202
|
+
macBundleTrustReasonAsync?: (bundleRoot: string, binary: string, signal?: AbortSignal) => Promise<string | null>;
|
|
203
|
+
/** Exec-boundary spawnability predicate (regular file + X_OK). */
|
|
204
|
+
executable?: (path: string) => boolean;
|
|
205
|
+
/** Exec-boundary canonicalizer; returns null when the path cannot be resolved. */
|
|
206
|
+
realpath?: (path: string) => string | null;
|
|
196
207
|
now?: () => number;
|
|
197
208
|
discoverAlternatives?: boolean;
|
|
198
209
|
}
|
|
@@ -246,12 +257,43 @@ export function codexShimCommandCandidates(): string[] {
|
|
|
246
257
|
export function runCodexDebugModels<T>(
|
|
247
258
|
command: string,
|
|
248
259
|
execFile: (...args: Parameters<ExecFile>) => T,
|
|
249
|
-
deps: Pick<BundledCatalogDeps, "env" | "platform" | "existsSync"> = {},
|
|
260
|
+
deps: Pick<BundledCatalogDeps, "env" | "platform" | "existsSync" | "executable" | "realpath" | "macBundleTrustReason"> = {},
|
|
250
261
|
): T {
|
|
251
262
|
const args = ["debug", "models", "--bundled"];
|
|
252
|
-
const invocation =
|
|
263
|
+
const invocation = validatedCodexExecInvocation(command, args, {
|
|
253
264
|
env: deps.env,
|
|
265
|
+
platform: deps.platform,
|
|
254
266
|
exists: deps.existsSync,
|
|
267
|
+
executable: deps.executable,
|
|
268
|
+
realpath: deps.realpath,
|
|
269
|
+
macBundleTrustReason: deps.macBundleTrustReason,
|
|
270
|
+
});
|
|
271
|
+
return execFile(invocation.file, invocation.args, {
|
|
272
|
+
encoding: "utf8" as const,
|
|
273
|
+
stdio: ["ignore", "pipe", "ignore"] as ["ignore", "pipe", "ignore"],
|
|
274
|
+
timeout: 10_000,
|
|
275
|
+
maxBuffer: 64 * 1024 * 1024,
|
|
276
|
+
windowsHide: true,
|
|
277
|
+
...invocation.options,
|
|
278
|
+
});
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
/** Async twin of runCodexDebugModels: same args/options, bundle trust checked off the event loop. */
|
|
282
|
+
export async function runCodexDebugModelsAsync<T>(
|
|
283
|
+
command: string,
|
|
284
|
+
execFile: (...args: Parameters<ExecFile>) => Promise<T>,
|
|
285
|
+
deps: Pick<BundledCatalogDeps, "env" | "platform" | "existsSync" | "executable" | "realpath" | "macBundleTrustReasonAsync"> = {},
|
|
286
|
+
signal?: AbortSignal,
|
|
287
|
+
): Promise<T> {
|
|
288
|
+
const args = ["debug", "models", "--bundled"];
|
|
289
|
+
const invocation = await validatedCodexExecInvocationAsync(command, args, {
|
|
290
|
+
env: deps.env,
|
|
291
|
+
platform: deps.platform,
|
|
292
|
+
exists: deps.existsSync,
|
|
293
|
+
executable: deps.executable,
|
|
294
|
+
realpath: deps.realpath,
|
|
295
|
+
macBundleTrustReasonAsync: deps.macBundleTrustReasonAsync,
|
|
296
|
+
signal,
|
|
255
297
|
});
|
|
256
298
|
return execFile(invocation.file, invocation.args, {
|
|
257
299
|
encoding: "utf8" as const,
|
|
@@ -275,6 +317,12 @@ function bundledRuntimeDeps(deps: BundledCatalogDeps) {
|
|
|
275
317
|
platform: deps.platform,
|
|
276
318
|
existsSync: deps.existsSync,
|
|
277
319
|
readFileSync: deps.readFileSync,
|
|
320
|
+
// Exec-boundary trust deps forwarded so the runtime's own --version probes
|
|
321
|
+
// use the same injected checks as the catalog exec below.
|
|
322
|
+
...(deps.macBundleTrustReason ? { macBundleTrustReason: deps.macBundleTrustReason } : {}),
|
|
323
|
+
...(deps.macBundleTrustReasonAsync ? { macBundleTrustReasonAsync: deps.macBundleTrustReasonAsync } : {}),
|
|
324
|
+
...(deps.executable ? { executable: deps.executable } : {}),
|
|
325
|
+
...(deps.realpath ? { realpath: deps.realpath } : {}),
|
|
278
326
|
now: deps.now,
|
|
279
327
|
// Catalog loading only consumes `resolved.runtime.command`, never `newerAvailable`.
|
|
280
328
|
// Full PATH discovery probes every candidate launcher (100+ on a dev machine, ~1.2s),
|
|
@@ -406,8 +454,9 @@ export function loadBundledCodexCatalogAsync(
|
|
|
406
454
|
let step = steps.next();
|
|
407
455
|
while (!step.done) {
|
|
408
456
|
let output: string | null = null;
|
|
409
|
-
try { output = await
|
|
410
|
-
(file, args, options) => (deps.execFile ?? execCodexFileAsync)(file, args, { ...options, signal: controller.signal }),
|
|
457
|
+
try { output = await runCodexDebugModelsAsync(step.value,
|
|
458
|
+
(file, args, options) => (deps.execFile ?? execCodexFileAsync)(file, args, { ...options, signal: controller.signal }),
|
|
459
|
+
deps, controller.signal); }
|
|
411
460
|
catch { /* preserve last confirmed evidence on failure */ }
|
|
412
461
|
step = steps.next(output);
|
|
413
462
|
}
|
|
@@ -681,11 +730,19 @@ export function readCurrentCodexModelsCache(): RawCatalog | null {
|
|
|
681
730
|
export function loadCatalogTemplate(): RawEntry | null {
|
|
682
731
|
const catalogPath = readCodexCatalogPath();
|
|
683
732
|
const bundled = bundledCodexCatalogSnapshot();
|
|
733
|
+
const fromRows = (catalog: RawCatalog | null) => {
|
|
734
|
+
const template = findSupportedNativeTemplate(catalog
|
|
735
|
+
? { ...catalog, models: (catalog.models ?? []).filter(isPlainObject) } : null);
|
|
736
|
+
// An emitted native has already passed strict normalization. Match that read surface,
|
|
737
|
+
// including property insertion order, when the native survives only as source evidence.
|
|
738
|
+
return template && template === retainedNativeInheritanceTemplate(catalog)
|
|
739
|
+
? ensureStrictCatalogFields(structuredClone(template)) : template;
|
|
740
|
+
};
|
|
684
741
|
// Template inheritance only. The validity gates in this file keep `findNativeTemplate`
|
|
685
742
|
// so a catalog carrying only a newly launched native row stays valid (#2813).
|
|
686
|
-
const native =
|
|
687
|
-
??
|
|
688
|
-
??
|
|
689
|
-
??
|
|
743
|
+
const native = fromRows(readCatalog(catalogPath))
|
|
744
|
+
?? fromRows(readCatalogBackup(catalogPath))
|
|
745
|
+
?? fromRows(readCatalog(activeCodexModelsCachePath()))
|
|
746
|
+
?? fromRows(bundled ? JSON.parse(JSON.stringify(bundled)) as RawCatalog : null);
|
|
690
747
|
return native ? JSON.parse(JSON.stringify(native)) : null;
|
|
691
748
|
}
|
|
@@ -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";
|
|
@@ -117,15 +118,14 @@ export function configuredNativeAliasSlugs(
|
|
|
117
118
|
}
|
|
118
119
|
|
|
119
120
|
/**
|
|
120
|
-
* Bare native rows
|
|
121
|
-
*
|
|
122
|
-
* omitting disabled native rows is therefore part of the explicit native-alias opt-in.
|
|
121
|
+
* Bare native rows omitted by native-alias compatibility or explicit native-omission opt-in.
|
|
122
|
+
* Codex Desktop's remote allowlist can ignore `visibility: "hide"`.
|
|
123
123
|
*/
|
|
124
124
|
export function desktopAllowlistSuppressedNativeSlugs(
|
|
125
|
-
config: Pick<OcxConfig, "combos" | "disabledModels">,
|
|
125
|
+
config: Pick<OcxConfig, "combos" | "disabledModels" | "omitDisabledNativeModels">,
|
|
126
126
|
): Set<string> {
|
|
127
127
|
const suppressed = configuredNativeAliasSlugs(config);
|
|
128
|
-
if (suppressed.size === 0) return suppressed;
|
|
128
|
+
if (suppressed.size === 0 && config.omitDisabledNativeModels !== true) return suppressed;
|
|
129
129
|
const disabled = disabledNativeSlugs(config);
|
|
130
130
|
for (const slug of NATIVE_OPENAI_MODELS) {
|
|
131
131
|
if (disabled.has(slug)) suppressed.add(slug);
|
|
@@ -858,11 +858,11 @@ export function observedAccountBoundNativeEntries(
|
|
|
858
858
|
*/
|
|
859
859
|
export function accountBoundNativeOpenAiSlugs(
|
|
860
860
|
observedEntries: readonly RawEntry[] = [
|
|
861
|
-
...(readCurrentCodexModelsCache()?.models ?? []),
|
|
861
|
+
...(readCurrentCodexModelsCache()?.models ?? []).filter(isPlainObject),
|
|
862
862
|
// Existing generated rows are also safe to reuse after a process starts without a cache
|
|
863
863
|
// invalidation pass; bare user-authored catalog rows are intentionally not trusted here.
|
|
864
864
|
...(readCurrentCodexCatalog()?.models ?? []).filter(entry =>
|
|
865
|
-
trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
865
|
+
isPlainObject(entry) && trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
866
866
|
],
|
|
867
867
|
): string[] {
|
|
868
868
|
const observed = observedEntries.flatMap(entry => {
|
|
@@ -883,9 +883,9 @@ export function accountBoundNativeOpenAiSlugs(
|
|
|
883
883
|
export function accountBoundNativeOpenAiSlugsBySelector(
|
|
884
884
|
config: AccountSelectorConfig,
|
|
885
885
|
observedEntries: readonly RawEntry[] = [
|
|
886
|
-
...(readCurrentCodexModelsCache()?.models ?? []),
|
|
886
|
+
...(readCurrentCodexModelsCache()?.models ?? []).filter(isPlainObject),
|
|
887
887
|
...(readCurrentCodexCatalog()?.models ?? []).filter(entry =>
|
|
888
|
-
trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
888
|
+
isPlainObject(entry) && trustedAccountBoundNativeCatalogSlug(entry) !== undefined),
|
|
889
889
|
],
|
|
890
890
|
): ReadonlyMap<string, readonly string[]> {
|
|
891
891
|
const selectors = visibleCodexAccountSelectors(config);
|
|
@@ -926,7 +926,7 @@ export function observedAccountBoundNativeOpenAiSlugs(
|
|
|
926
926
|
|
|
927
927
|
function catalogNativeSlugs(): string[] {
|
|
928
928
|
const cat = readCurrentCatalogOrCache();
|
|
929
|
-
const models = cat?.models ?? [];
|
|
929
|
+
const models = (cat?.models ?? []).filter(isPlainObject);
|
|
930
930
|
const live = models.flatMap(entry => {
|
|
931
931
|
const slug = typeof entry.slug === "string" ? entry.slug : "";
|
|
932
932
|
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,28 @@
|
|
|
1
|
+
import type { OcxConfig } from "../../types";
|
|
2
|
+
import { trustedAccountBoundNativeCatalogSlug } from "./account-models";
|
|
3
|
+
import { CODEX_NATIVE_ALIAS_CATALOG_KIND } from "./kinds";
|
|
4
|
+
import { SUPPORTED_NATIVE_OPENAI_SLUGS } from "./native-models";
|
|
5
|
+
import { hasOcxRoutedAuthorship } from "./ownership";
|
|
6
|
+
import { hasOrdinaryNativeOpenAiRow } from "./control-plane";
|
|
7
|
+
import { isCodexControlPlaneModel } from "../control-plane-models";
|
|
8
|
+
import type { RawEntry } from "./parsing";
|
|
9
|
+
|
|
10
|
+
/** Final projection also covers exact selector disables and observed account-native ids. */
|
|
11
|
+
export function omitDisabledNativeCatalogEntries(
|
|
12
|
+
entries: RawEntry[],
|
|
13
|
+
config: Pick<OcxConfig, "omitDisabledNativeModels" | "disabledModels">,
|
|
14
|
+
): RawEntry[] {
|
|
15
|
+
if (config.omitDisabledNativeModels !== true) return entries;
|
|
16
|
+
const disabled = new Set(config.disabledModels ?? []);
|
|
17
|
+
const visible = entries.filter(entry => {
|
|
18
|
+
if (entry.opencodex_catalog_kind === CODEX_NATIVE_ALIAS_CATALOG_KIND) return true;
|
|
19
|
+
const slug = typeof entry.slug === "string" ? entry.slug : "";
|
|
20
|
+
const accountNative = trustedAccountBoundNativeCatalogSlug(entry);
|
|
21
|
+
if (accountNative) return !disabled.has(slug) && !disabled.has(accountNative);
|
|
22
|
+
return !SUPPORTED_NATIVE_OPENAI_SLUGS.has(slug) || hasOcxRoutedAuthorship(entry) || !disabled.has(slug);
|
|
23
|
+
});
|
|
24
|
+
// Nothing omitted: the flag must not change the catalog, control-plane rows included.
|
|
25
|
+
if (visible.length === entries.length) return entries;
|
|
26
|
+
return hasOrdinaryNativeOpenAiRow(visible)
|
|
27
|
+
? visible : visible.filter(entry => !isCodexControlPlaneModel(entry.slug));
|
|
28
|
+
}
|
|
@@ -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
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { COMBO_NAMESPACE } from "../../combos/identifiers";
|
|
2
|
+
import { isPlainObject } from "../../lib/plain-data";
|
|
3
|
+
import { CODEX_NATIVE_ALIAS_CATALOG_KIND } from "./kinds";
|
|
4
|
+
import { SUPPORTED_NATIVE_OPENAI_SLUGS } from "./native-models";
|
|
5
|
+
import { hasOcxRoutedAuthorship } from "./ownership";
|
|
6
|
+
import type { RawCatalog, RawEntry } from "./parsing";
|
|
7
|
+
|
|
8
|
+
/** Internal source evidence, outside the emitted model collection. */
|
|
9
|
+
export const NATIVE_INHERITANCE_TEMPLATE_FIELD = "opencodex_native_inheritance_template";
|
|
10
|
+
|
|
11
|
+
function isSupportedNativeTemplate(row: RawEntry): boolean {
|
|
12
|
+
return typeof row.slug === "string"
|
|
13
|
+
&& SUPPORTED_NATIVE_OPENAI_SLUGS.has(row.slug)
|
|
14
|
+
&& !row.slug.includes("/")
|
|
15
|
+
&& "base_instructions" in row
|
|
16
|
+
&& row.opencodex_catalog_kind !== CODEX_NATIVE_ALIAS_CATALOG_KIND
|
|
17
|
+
&& row.owned_by !== COMBO_NAMESPACE
|
|
18
|
+
&& !hasOcxRoutedAuthorship(row);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function retainedNativeInheritanceTemplate(catalog: RawCatalog | null): RawEntry | null {
|
|
22
|
+
const retained = catalog?.[NATIVE_INHERITANCE_TEMPLATE_FIELD];
|
|
23
|
+
return isPlainObject(retained) && isSupportedNativeTemplate(retained) ? retained : null;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Inheritance is stricter than catalog validity: unknown bare rows must never lend native
|
|
28
|
+
* eligibility to routed rows (#2813). Retained source evidence uses exactly the same rule.
|
|
29
|
+
* Prefer it over emitted rows so omission of the first native cannot change the next build.
|
|
30
|
+
* No supported source still returns null, preserving the existing null-template behavior.
|
|
31
|
+
*/
|
|
32
|
+
export function findSupportedNativeTemplate(catalog: RawCatalog | null): RawEntry | null {
|
|
33
|
+
return retainedNativeInheritanceTemplate(catalog)
|
|
34
|
+
?? catalog?.models?.find(isSupportedNativeTemplate) ?? null;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/** Capture before any visibility, capability or ordering projection mutates emitted rows. */
|
|
38
|
+
export function captureNativeInheritanceTemplate(catalog: RawCatalog, enabled: boolean): RawEntry | null {
|
|
39
|
+
const template = findSupportedNativeTemplate(catalog);
|
|
40
|
+
if (enabled && template) catalog[NATIVE_INHERITANCE_TEMPLATE_FIELD] = structuredClone(template);
|
|
41
|
+
else delete catalog[NATIVE_INHERITANCE_TEMPLATE_FIELD];
|
|
42
|
+
return template;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Replace upgradeable source evidence with the writer's fully normalized native result.
|
|
47
|
+
* Non-upgraded source evidence stays pristine, preserving existing byte-idempotent builds.
|
|
48
|
+
* The writer passes its upgrade rule in: importing it from `metadata.ts` here would close a
|
|
49
|
+
* load-time cycle through `bundled.ts`, which reads this module's retained template.
|
|
50
|
+
*/
|
|
51
|
+
export function advanceNativeInheritanceTemplate(
|
|
52
|
+
catalog: RawCatalog, entries: readonly RawEntry[], shouldUpgrade: (entry: RawEntry) => boolean,
|
|
53
|
+
): void {
|
|
54
|
+
const retained = retainedNativeInheritanceTemplate(catalog);
|
|
55
|
+
if (!retained || !shouldUpgrade(retained)) return;
|
|
56
|
+
const upgraded = entries.find(row => row.slug === retained.slug && isSupportedNativeTemplate(row));
|
|
57
|
+
if (upgraded) catalog[NATIVE_INHERITANCE_TEMPLATE_FIELD] = structuredClone(upgraded);
|
|
58
|
+
}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { VendorContextInference } from "./vendor-context";
|
|
2
|
+
import { retainedNativeInheritanceTemplate } from "./native-template";
|
|
3
|
+
export { findSupportedNativeTemplate } from "./native-template";
|
|
2
4
|
import { isCodexControlPlaneModel } from "../control-plane-models";
|
|
3
5
|
import { execFileSync } from "node:child_process";
|
|
4
6
|
import { createHash } from "node:crypto";
|
|
@@ -307,35 +309,7 @@ export function findNativeTemplate(catalog: RawCatalog | null): RawEntry | null
|
|
|
307
309
|
&& m.opencodex_catalog_kind !== CODEX_NATIVE_ALIAS_CATALOG_KIND
|
|
308
310
|
&& m.owned_by !== COMBO_NAMESPACE
|
|
309
311
|
&& !hasOcxRoutedAuthorship(m),
|
|
310
|
-
) ??
|
|
311
|
-
}
|
|
312
|
-
|
|
313
|
-
/**
|
|
314
|
-
* Template selection, as opposed to catalog VALIDITY.
|
|
315
|
-
*
|
|
316
|
-
* `findNativeTemplate` answers "does this look like a real catalog?" and must stay
|
|
317
|
-
* permissive: four call sites use it as a validity gate, and a catalog holding only a
|
|
318
|
-
* newly launched native model has to keep passing or sync falls back to stale data.
|
|
319
|
-
*
|
|
320
|
-
* This answers a different question — "which row should every routed model inherit
|
|
321
|
-
* from?" — and must be strict. `deriveEntry` deep-clones the chosen row, so an unknown
|
|
322
|
-
* bare row carrying `base_instructions` would become the template for every routed
|
|
323
|
-
* model and hand them its native eligibility metadata. #2813 is the report that made
|
|
324
|
-
* that concrete: a Reserve-shaped row injected by the client is exactly such a row.
|
|
325
|
-
*
|
|
326
|
-
* Returning null is safe and expected; `deriveEntry` falls back to a conservative
|
|
327
|
-
* synthetic template.
|
|
328
|
-
*/
|
|
329
|
-
export function findSupportedNativeTemplate(catalog: RawCatalog | null): RawEntry | null {
|
|
330
|
-
return catalog?.models?.find(
|
|
331
|
-
m => typeof m.slug === "string"
|
|
332
|
-
&& SUPPORTED_NATIVE_OPENAI_SLUGS.has(m.slug)
|
|
333
|
-
&& !m.slug.includes("/")
|
|
334
|
-
&& "base_instructions" in m
|
|
335
|
-
&& m.opencodex_catalog_kind !== CODEX_NATIVE_ALIAS_CATALOG_KIND
|
|
336
|
-
&& m.owned_by !== COMBO_NAMESPACE
|
|
337
|
-
&& !hasOcxRoutedAuthorship(m),
|
|
338
|
-
) ?? null;
|
|
312
|
+
) ?? retainedNativeInheritanceTemplate(catalog);
|
|
339
313
|
}
|
|
340
314
|
|
|
341
315
|
/** Does this row already carry an `ultrafast` tier the operator put there themselves? */
|
|
@@ -53,7 +53,8 @@ import {
|
|
|
53
53
|
import type { FastPolicyAuthority } from "../../providers/fastwire";
|
|
54
54
|
import { effectiveGoogleMode, getProviderRegistryEntry, providerMatchesRegistryTransport, registryEntryForProviderDestination } from "../../providers/registry";
|
|
55
55
|
import { parseAntigravityAvailableModels, registerAntigravityDiscoveredWireModels } from "../../providers/antigravity-models";
|
|
56
|
-
import { recordAntigravityAccountRoster } from "../../providers/antigravity-account-roster";
|
|
56
|
+
import { captureAntigravityModelObservation, recordAntigravityAccountRoster } from "../../providers/antigravity-account-roster";
|
|
57
|
+
import { discoverAntigravitySiblings } from "./antigravity-discovery";
|
|
57
58
|
import { applyProviderContextCap, providerContextCap, resolveUnknownRoutedContextWindow } from "../../providers/context-cap";
|
|
58
59
|
import { clampAutoCompactTokenLimit } from "../../providers/auto-compact-budget";
|
|
59
60
|
import { effectiveModelAliases } from "../../providers/default-aliases";
|
|
@@ -88,6 +89,7 @@ import {
|
|
|
88
89
|
providerRedirectError,
|
|
89
90
|
} from "../../lib/provider-outbound";
|
|
90
91
|
import { redactSecretString } from "../../lib/redact";
|
|
92
|
+
import { invalidModelDiscoveryHint } from "../../providers/model-discovery-diagnostic";
|
|
91
93
|
import {
|
|
92
94
|
extractProviderModelItems,
|
|
93
95
|
isRegistryModelDiscoveryUrl,
|
|
@@ -729,6 +731,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
729
731
|
// fetch a different URL and keep the rejection.
|
|
730
732
|
if (!maySendAnthropicDiscovery()) return observed(withConfiguredRetention(failedDiscoveryConfigured), "degraded");
|
|
731
733
|
const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl, beforeSend: maySendAnthropicDiscovery };
|
|
734
|
+
const antigravityObservation = cloudCodeAssist ? captureAntigravityModelObservation() : undefined;
|
|
732
735
|
const res = request.method === "POST"
|
|
733
736
|
? await providerOutboundPost(name, prov, url, {
|
|
734
737
|
headers,
|
|
@@ -790,7 +793,21 @@ export async function fetchProviderModelsWithAuth(
|
|
|
790
793
|
return observed(models, "degraded");
|
|
791
794
|
}
|
|
792
795
|
if (antigravity) {
|
|
793
|
-
|
|
796
|
+
if (getConfigDir() !== metadataConfigDir) return observed(withConfiguredRetention(configured), "degraded");
|
|
797
|
+
const admitSiblings = resolveAuth.kind === "refreshing" && name === "google-antigravity"
|
|
798
|
+
&& prov.authMode === "oauth" && auth.oauthAccountId
|
|
799
|
+
? await discoverAntigravitySiblings(name, prov, auth.oauthAccountId, request, discovery.maxResponseBytes, discovery.maxModels, metadataConfigDir)
|
|
800
|
+
: () => [];
|
|
801
|
+
if (!isCurrentCacheGeneration() || getConfigDir() !== metadataConfigDir) return observed(withConfiguredRetention(configured), "degraded");
|
|
802
|
+
const activeAccount = auth.oauthAccountId ? getAccountCredentialWithStatus(name, auth.oauthAccountId) : null;
|
|
803
|
+
if (auth.oauthAccountId && (!activeAccount || activeAccount.paused || activeAccount.needsReauth
|
|
804
|
+
|| activeAccount.credential.expires <= Date.now() || activeAccount.credential.access !== apiKey
|
|
805
|
+
|| credentialGeneration(activeAccount.credential) !== auth.oauthGeneration))
|
|
806
|
+
return observed(withConfiguredRetention(configured), "degraded");
|
|
807
|
+
const byId = new Map(antigravity.map(model => [model.id, model]));
|
|
808
|
+
for (const model of admitSiblings()) if (!byId.has(model.id)) byId.set(model.id, model);
|
|
809
|
+
const merged = [...byId.values()];
|
|
810
|
+
const upstream: CatalogModel[] = merged.map(model => ({
|
|
794
811
|
id: model.id,
|
|
795
812
|
provider: name,
|
|
796
813
|
// Only an exact discovered wire map proves a new model's selectable effort ladder.
|
|
@@ -810,13 +827,13 @@ export async function fetchProviderModelsWithAuth(
|
|
|
810
827
|
}
|
|
811
828
|
// Save exact family routes before publishing synthetic IDs. These synchronous writes
|
|
812
829
|
// cannot interleave with a credential-generation change; failure keeps the prior cache.
|
|
813
|
-
registerAntigravityDiscoveredWireModels(prov.baseUrl,
|
|
830
|
+
registerAntigravityDiscoveredWireModels(prov.baseUrl, merged, {
|
|
814
831
|
provider: name,
|
|
815
832
|
cacheGeneration,
|
|
816
833
|
});
|
|
817
834
|
// Entitlement is per account (Claude 4.6 vs 5.5, Argon): remember what THIS account
|
|
818
835
|
// lists so account selection can prefer one that serves the requested model.
|
|
819
|
-
if (auth.oauthAccountId) recordAntigravityAccountRoster(name, auth.oauthAccountId, antigravity);
|
|
836
|
+
if (auth.oauthAccountId) recordAntigravityAccountRoster(name, auth.oauthAccountId, antigravity, Date.now(), antigravityObservation);
|
|
820
837
|
if (!setCached(name, forCache, Date.now(), cacheGeneration, catalogAuthority)) {
|
|
821
838
|
return observed(withConfiguredRetention(configured), "degraded");
|
|
822
839
|
}
|
|
@@ -841,7 +858,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
841
858
|
};
|
|
842
859
|
if (shouldLog) {
|
|
843
860
|
console.warn(
|
|
844
|
-
`[opencodex] Provider model discovery for "${name}" ${diagnostic[extracted.reason]} [status=${res.status}, contentType=${contentType}, urlClass=${urlClass}, fallback=${fallback}]
|
|
861
|
+
`[opencodex] Provider model discovery for "${name}" ${diagnostic[extracted.reason]} [status=${res.status}, contentType=${contentType}, urlClass=${urlClass}, fallback=${fallback}]${extracted.reason === "invalid_shape" ? invalidModelDiscoveryHint("diagnostic" in extracted ? extracted.diagnostic : undefined) : "."}`,
|
|
845
862
|
);
|
|
846
863
|
}
|
|
847
864
|
return observed(models, "degraded");
|
|
@@ -16,6 +16,8 @@ import { COMBO_NAMESPACE } from "../../combos";
|
|
|
16
16
|
import { codexAccountNamespaceEntries, isMainCodexAccountTarget } from "../account-namespaces";
|
|
17
17
|
import { MAIN_CODEX_ACCOUNT_ID } from "../main-account";
|
|
18
18
|
import { applyNativeAccessPrograms } from "./access-programs";
|
|
19
|
+
import { advanceNativeInheritanceTemplate, captureNativeInheritanceTemplate } from "./native-template";
|
|
20
|
+
import { omitDisabledNativeCatalogEntries } from "./native-omission";
|
|
19
21
|
import {
|
|
20
22
|
availableAccountGatedNativeModels,
|
|
21
23
|
codexModelEntitlementStateForAccount,
|
|
@@ -30,17 +32,16 @@ import {
|
|
|
30
32
|
catalogBackupPathFor,
|
|
31
33
|
catalogHasRoutedEntries,
|
|
32
34
|
findNativeTemplate,
|
|
33
|
-
findSupportedNativeTemplate,
|
|
34
35
|
isDefaultCatalogPath,
|
|
35
36
|
legacyCatalogBackupPath,
|
|
36
37
|
readCatalog,
|
|
37
38
|
readCatalogBackup,
|
|
38
39
|
readCodexCatalogPath,
|
|
39
40
|
readCodexCatalogPathForHome,
|
|
40
|
-
readNativeBaseline,
|
|
41
41
|
nativeMultiAgentDefaults,
|
|
42
42
|
} from "./parsing";
|
|
43
43
|
import type { CatalogModel, MultiAgentMode, RawCatalog, RawEntry } from "./parsing";
|
|
44
|
+
import { readNativeBaseline } from "./native-priority";
|
|
44
45
|
import { ocxRoutedNamespaceCounts, routedRemovalBackedByConfigFile, unconfiguredRoutedRemoval } from "./routed-removal";
|
|
45
46
|
import { ConfigMutationLockError } from "../../config/mutation-lock";
|
|
46
47
|
import {
|
|
@@ -52,6 +53,7 @@ import {
|
|
|
52
53
|
observedReserveCatalogSource,
|
|
53
54
|
shouldIncludeAccountBoundNativeOpenAi,
|
|
54
55
|
shouldIncludeNativeOpenAi,
|
|
56
|
+
shouldUpgradeToUpstreamEntry,
|
|
55
57
|
upstreamNativeEntry,
|
|
56
58
|
} from "./metadata";
|
|
57
59
|
import { trustedAccountBoundNativeCatalogSlug } from "./account-models";
|
|
@@ -298,9 +300,6 @@ function writeRetainedCatalogSync({
|
|
|
298
300
|
catalog,
|
|
299
301
|
onDiskCatalog,
|
|
300
302
|
);
|
|
301
|
-
// Strict selector for template inheritance; the validity gate above keeps the broad one.
|
|
302
|
-
const template = findSupportedNativeTemplate(catalog);
|
|
303
|
-
|
|
304
303
|
try {
|
|
305
304
|
// Once-only: preserve the PRISTINE pre-opencodex catalog as the native-priority baseline
|
|
306
305
|
// (later syncs would otherwise overwrite it with featured-modified priorities).
|
|
@@ -321,6 +320,9 @@ function writeRetainedCatalogSync({
|
|
|
321
320
|
}
|
|
322
321
|
} catch { /* backup best-effort */ }
|
|
323
322
|
|
|
323
|
+
// Capture inheritance only after pristine backup preparation, before any row projection.
|
|
324
|
+
const template = captureNativeInheritanceTemplate(catalog, config.omitDisabledNativeModels === true);
|
|
325
|
+
|
|
324
326
|
// Hide disabled models from Codex, then feature the chosen subagent models (native OR routed)
|
|
325
327
|
// by giving them the lowest priority — see buildCatalogEntries for why priority, not array order.
|
|
326
328
|
const enabledGo = filterCatalogVisibleModels(goModels, config);
|
|
@@ -370,6 +372,13 @@ function writeRetainedCatalogSync({
|
|
|
370
372
|
...desktopAllowlistSuppressedNativeSlugs(config),
|
|
371
373
|
...unavailableGatedNativeSlugs,
|
|
372
374
|
]);
|
|
375
|
+
// An omitted source still needs the same upgrade/normalization as a visible native.
|
|
376
|
+
// Keep independent combo-alias and entitlement suppression authoritative.
|
|
377
|
+
if (template && shouldUpgradeToUpstreamEntry(template)
|
|
378
|
+
&& (!ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(String(template.slug)) || availableBareGatedNativeSlugs.has(String(template.slug)))
|
|
379
|
+
&& !desktopAllowlistSuppressedNativeSlugs({ ...config, omitDisabledNativeModels: false }).has(String(template.slug))) {
|
|
380
|
+
suppressedBareNativeSlugs.delete(String(template.slug));
|
|
381
|
+
}
|
|
373
382
|
const hasPhysicalComboProvider = Object.hasOwn(config.providers, COMBO_NAMESPACE);
|
|
374
383
|
const includeNativeOpenAi = shouldIncludeNativeOpenAi(config);
|
|
375
384
|
const includeAccountBoundNativeOpenAi = shouldIncludeAccountBoundNativeOpenAi(config);
|
|
@@ -549,9 +558,10 @@ function writeRetainedCatalogSync({
|
|
|
549
558
|
applyNativeAccessPrograms(catalog.models, modelEntitlements, accountTargets);
|
|
550
559
|
clampCatalogModelsToCodexSupport(catalog.models, { observedCatalog: bundledCodexCatalogSnapshot() });
|
|
551
560
|
finalizeAutoReviewModelOverride(catalog.models, catalogModelsForMerge, config);
|
|
561
|
+
advanceNativeInheritanceTemplate(catalog, catalog.models, shouldUpgradeToUpstreamEntry);
|
|
552
562
|
// Last mutation before serialization; see `enforceCatalogSlugUniqueness` for why the ordering
|
|
553
563
|
// against the effort clamp is load-bearing rather than cosmetic.
|
|
554
|
-
catalog.models = enforceCatalogSlugUniqueness(catalog.models, true);
|
|
564
|
+
catalog.models = enforceCatalogSlugUniqueness(omitDisabledNativeCatalogEntries(catalog.models, config), true);
|
|
555
565
|
|
|
556
566
|
const added = goEntries.length + accountBoundEntries.length;
|
|
557
567
|
const content = `${JSON.stringify(catalog, null, 2)}\n`;
|