@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isXaiGrokOAuth, readXaiLegacyPrivacyError, XAI_LEGACY_PRIVACY_MESSAGE } from "../../providers/xai-privacy-mode";
|
|
1
2
|
import { fetchCopilotAutoModels, copilotPickerModels, copilotRequiresAuto } from "../../providers/github-copilot-auto";
|
|
2
3
|
import { resolveGithubCopilotTransport } from "../../providers/github-copilot-transport";
|
|
3
4
|
import { resolveCopilotApiBaseUrl } from "../../oauth/github-copilot";
|
|
@@ -15,21 +16,28 @@ import { captureOAuthAccountSelection, credentialGeneration, getAccountCredentia
|
|
|
15
16
|
import { readKiroAccountModels, kiroObservedContextWindow } from "../../providers/kiro-model-catalog";
|
|
16
17
|
import { CODEX_CONFIG_PATH, CODEX_MODELS_CACHE_PATH, DEFAULT_CATALOG_PATH, readRootTomlString, resolveCodexConfigPath } from "../paths";
|
|
17
18
|
import {
|
|
19
|
+
canPublishModelDiscovery,
|
|
20
|
+
callerLocalModelDiscoveryRevision,
|
|
21
|
+
claimModelDiscoveryPublication,
|
|
22
|
+
captureModelDiscoveryGeneration,
|
|
18
23
|
clearModelCache,
|
|
19
24
|
clearProviderDiscoveryStatus,
|
|
20
25
|
captureModelCacheGeneration,
|
|
26
|
+
captureProviderDiscoveryObservation,
|
|
21
27
|
observeModelCacheRevision,
|
|
22
28
|
DEFAULT_MODEL_CACHE_TTL_MS,
|
|
23
29
|
getFreshCached,
|
|
24
30
|
getStaleCached,
|
|
25
31
|
isModelsFetchCoolingDown,
|
|
26
32
|
isModelCacheGenerationCurrent,
|
|
33
|
+
isProviderDiscoveryObservationCurrent,
|
|
27
34
|
markModelsFetchFailure,
|
|
28
35
|
markProviderDiscoveryFailed,
|
|
29
36
|
markProviderDiscoveryOk,
|
|
30
37
|
shouldLogDiscoveryFailure,
|
|
31
38
|
setCached,
|
|
32
39
|
type ProviderModelDiscoveryFailure,
|
|
40
|
+
type ProviderModelDiscoveryWarningCondition,
|
|
33
41
|
} from "../model-cache";
|
|
34
42
|
import {
|
|
35
43
|
buildModelsRequest,
|
|
@@ -130,6 +138,7 @@ import type {
|
|
|
130
138
|
} from "../convergence-types";
|
|
131
139
|
import type { CapturedProviderGather, CatalogGatherProviderAuthOutcome, CatalogGatherProviderModelOutcome, ModelsAuthResolution, ModelsAuthResolver } from "./gather-capture";
|
|
132
140
|
import { workBuddyCatalogIdentity } from "../../providers/workbuddy";
|
|
141
|
+
import { fetchM365CopilotCatalog } from "./m365-copilot-models";
|
|
133
142
|
import { QUIET_AUTHORITATIVE_CATALOG_PROVIDERS, applyConfigHintsToCachedModels, applyProviderConfigHints, boundedOwnedBy, catalogHintsFromModelsApiItem, catalogHintsFromProviderConfig, withVisionSidecarInput } from "./model-hints";
|
|
134
143
|
import { mergeConfiguredModelsIntoLiveCatalog, shouldExposeProviderModel, warnDroppedConfiguredIdsOnce } from "./model-visibility";
|
|
135
144
|
import { captureModelsRequest, captureProviderGather, materializeCapturedHeaders } from "./gather-capture";
|
|
@@ -178,6 +187,7 @@ export function observedModelsAuthResolver(
|
|
|
178
187
|
oauthAccountId: observation.snapshot.accountId,
|
|
179
188
|
oauthGeneration: observation.snapshot.generation,
|
|
180
189
|
...(observation.snapshot.workbuddy ? { workbuddy: observation.snapshot.workbuddy } : {}),
|
|
190
|
+
...(observation.snapshot.m365 ? { m365: observation.snapshot.m365 } : {}),
|
|
181
191
|
...(observation.snapshot.providerUserId ? { oauthProviderUserId: observation.snapshot.providerUserId } : {}),
|
|
182
192
|
...(observation.snapshot.apiBaseUrl ? { oauthApiBaseUrl: observation.snapshot.apiBaseUrl } : {}),
|
|
183
193
|
...(observation.snapshot.projectId ? { oauthProjectId: observation.snapshot.projectId } : {}),
|
|
@@ -185,8 +195,37 @@ export function observedModelsAuthResolver(
|
|
|
185
195
|
},
|
|
186
196
|
};
|
|
187
197
|
}
|
|
198
|
+
const activeProviderDiscoveries = new Map<string, number>();
|
|
199
|
+
|
|
200
|
+
export function isProviderDiscoveryInFlight(name: string): boolean {
|
|
201
|
+
return activeProviderDiscoveries.has(name);
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
/** Track occupancy only. Every admitted caller keeps its own result and authority. */
|
|
205
|
+
export async function withProviderDiscoveryInFlight<T>(name: string, run: () => Promise<T>): Promise<T> {
|
|
206
|
+
activeProviderDiscoveries.set(name, (activeProviderDiscoveries.get(name) ?? 0) + 1);
|
|
207
|
+
try {
|
|
208
|
+
return await run();
|
|
209
|
+
} finally {
|
|
210
|
+
const remaining = activeProviderDiscoveries.get(name)! - 1;
|
|
211
|
+
if (remaining === 0) activeProviderDiscoveries.delete(name);
|
|
212
|
+
else activeProviderDiscoveries.set(name, remaining);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
|
|
188
216
|
/** Project provider evidence without synthetic sidecar image input, which belongs to each gather. */
|
|
189
|
-
export
|
|
217
|
+
export function fetchProviderModelsWithAuth(
|
|
218
|
+
captured: CapturedProviderGather,
|
|
219
|
+
ttlMs: number,
|
|
220
|
+
contextCap: number | undefined,
|
|
221
|
+
resolveAuth: ModelsAuthResolver,
|
|
222
|
+
): Promise<ProviderModelsResult> {
|
|
223
|
+
const run = () => fetchProviderModelsUncached(captured, ttlMs, contextCap, resolveAuth);
|
|
224
|
+
if (captured.provider.authMode === "forward" || captured.provider.liveModels === false) return run();
|
|
225
|
+
return withProviderDiscoveryInFlight(captured.name, run);
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
async function fetchProviderModelsUncached(
|
|
190
229
|
captured: CapturedProviderGather,
|
|
191
230
|
ttlMs: number,
|
|
192
231
|
contextCap: number | undefined,
|
|
@@ -194,20 +233,30 @@ export async function fetchProviderModelsWithAuth(
|
|
|
194
233
|
): Promise<ProviderModelsResult> {
|
|
195
234
|
const { name, provider: prov, discovery, metadataModelIdCaseFold, metadataConfigDir } = captured;
|
|
196
235
|
const azureMetadata = isAzureModelMetadataDestination(prov.baseUrl);
|
|
236
|
+
// Capture before credential refresh. Newer accepted discoveries fence both result kinds.
|
|
237
|
+
const cacheGeneration = captureModelCacheGeneration(name);
|
|
238
|
+
const discoveryGeneration = captureModelDiscoveryGeneration();
|
|
239
|
+
const anthropicSelection = isAnthropicOAuthInstance(name) && prov.authMode === "oauth" && mayResolveModelsOAuth(name, prov)
|
|
240
|
+
? captureOAuthAccountSelection(name) : null;
|
|
241
|
+
const isCurrentCacheGeneration = () => isModelCacheGenerationCurrent(name, cacheGeneration);
|
|
242
|
+
const canPublish = () => isCurrentCacheGeneration() && canPublishModelDiscovery(name, discoveryGeneration);
|
|
243
|
+
const claimPublication = () => isCurrentCacheGeneration() && claimModelDiscoveryPublication(name, discoveryGeneration);
|
|
244
|
+
let vertexResponseRevoked = false;
|
|
197
245
|
const observed = (
|
|
198
246
|
models: CatalogModel[],
|
|
199
247
|
state: CatalogGatherProviderModelOutcome["state"],
|
|
248
|
+
current = !vertexResponseRevoked && canPublish(),
|
|
200
249
|
): ProviderModelsResult => ({
|
|
201
250
|
models,
|
|
202
|
-
outcome: { provider: name, state },
|
|
203
|
-
contentRevision: observeModelCacheRevision(name),
|
|
251
|
+
outcome: { provider: name, state: current ? state : "degraded" },
|
|
252
|
+
contentRevision: current ? observeModelCacheRevision(name) : "superseded",
|
|
253
|
+
});
|
|
254
|
+
const publishCache = (models: CatalogModel[], authority?: string) =>
|
|
255
|
+
setCached(name, models, Date.now(), cacheGeneration, authority, discoveryGeneration);
|
|
256
|
+
const supersededSuccess = (models: CatalogModel[]): ProviderModelsResult => ({
|
|
257
|
+
...observed(models, "degraded", false),
|
|
258
|
+
contentRevision: callerLocalModelDiscoveryRevision(cacheGeneration),
|
|
204
259
|
});
|
|
205
|
-
// Capture before any credential refresh or outbound await. OAuth account changes clear this
|
|
206
|
-
// generation, so a request started with the former account cannot later publish its result.
|
|
207
|
-
const cacheGeneration = captureModelCacheGeneration(name);
|
|
208
|
-
const isCurrentCacheGeneration = () => isModelCacheGenerationCurrent(name, cacheGeneration);
|
|
209
|
-
const anthropicSelection = isAnthropicOAuthInstance(name) && prov.authMode === "oauth" && mayResolveModelsOAuth(name, prov)
|
|
210
|
-
? captureOAuthAccountSelection(name) : null;
|
|
211
260
|
if (prov.authMode === "forward") return observed([], "authoritative"); // ChatGPT backend has no /models
|
|
212
261
|
if (azureMetadata) await refreshAzureModelMetadata(prov.baseUrl, metadataConfigDir);
|
|
213
262
|
const seedVertexDefault = prov.adapter === "google"
|
|
@@ -300,6 +349,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
300
349
|
oauthAccountId: snapshot.accountId,
|
|
301
350
|
oauthGeneration: snapshot.generation,
|
|
302
351
|
...(snapshot.workbuddy ? { workbuddy: snapshot.workbuddy } : {}),
|
|
352
|
+
...(snapshot.m365 ? { m365: snapshot.m365 } : {}),
|
|
303
353
|
...(snapshot.providerUserId ? { oauthProviderUserId: snapshot.providerUserId } : {}),
|
|
304
354
|
...(snapshot.apiBaseUrl ? { oauthApiBaseUrl: snapshot.apiBaseUrl } : {}),
|
|
305
355
|
...(snapshot.projectId ? { oauthProjectId: snapshot.projectId } : {}),
|
|
@@ -313,6 +363,10 @@ export async function fetchProviderModelsWithAuth(
|
|
|
313
363
|
}
|
|
314
364
|
: resolveAuth.resolve(name, prov));
|
|
315
365
|
const apiKey = auth.apiKey;
|
|
366
|
+
if (prov.adapter === "m365-copilot") {
|
|
367
|
+
const result = await fetchM365CopilotCatalog(captured, auth, ttlMs, contextCap, isCurrentCacheGeneration);
|
|
368
|
+
return observed(result.models, result.state);
|
|
369
|
+
}
|
|
316
370
|
// A passive gather's Vertex credential (always an API key) arrives already bound to its authority.
|
|
317
371
|
vertexAuth ??= auth.vertexAuth;
|
|
318
372
|
const vertexSendGuard = vertexDeadline !== undefined && prov.authMode !== "oauth";
|
|
@@ -330,13 +384,15 @@ export async function fetchProviderModelsWithAuth(
|
|
|
330
384
|
...catalogHintsFromModelsApiItem(name, model as ProviderModelsApiItem),
|
|
331
385
|
}, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, undefined, false));
|
|
332
386
|
if (!isCurrentCacheGeneration()) return observed(configured, "degraded");
|
|
333
|
-
markProviderDiscoveryOk(name, picker.length);
|
|
334
387
|
// Retain callable manual/combo selectors, but do not advertise named selection
|
|
335
388
|
// for an Auto-only account even when its saved configuration still contains it.
|
|
336
|
-
|
|
337
|
-
? picker : withConfiguredRetention(picker, { warnDrops: true })
|
|
389
|
+
const returned = copilotRequiresAuto(prov, models)
|
|
390
|
+
? picker : withConfiguredRetention(picker, { warnDrops: true });
|
|
391
|
+
if (!claimPublication()) return supersededSuccess(returned);
|
|
392
|
+
markProviderDiscoveryOk(name, picker.length);
|
|
393
|
+
return observed(returned, "authoritative");
|
|
338
394
|
} catch {
|
|
339
|
-
if (
|
|
395
|
+
if (claimPublication()) markProviderDiscoveryFailed(name, { reason: "provider" });
|
|
340
396
|
return observed(configured, "degraded");
|
|
341
397
|
}
|
|
342
398
|
}
|
|
@@ -397,13 +453,12 @@ export async function fetchProviderModelsWithAuth(
|
|
|
397
453
|
...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
|
|
398
454
|
}));
|
|
399
455
|
const forCache = withConfiguredRetention(discovered, { retainComboTargets: false });
|
|
400
|
-
if (!
|
|
401
|
-
|
|
402
|
-
}
|
|
456
|
+
if (!isCurrentCacheGeneration()) return observed(withConfiguredRetention(configured), "degraded", false);
|
|
457
|
+
if (!publishCache(forCache, authorityIdentity)) return supersededSuccess(withConfiguredRetention(forCache));
|
|
403
458
|
markProviderDiscoveryOk(name, live.models.length);
|
|
404
459
|
return observed(withConfiguredRetention(forCache, { warnDrops: true }), "authoritative");
|
|
405
460
|
}
|
|
406
|
-
if (
|
|
461
|
+
if (claimPublication()) {
|
|
407
462
|
markModelsFetchFailure(name, undefined, authorityIdentity);
|
|
408
463
|
markProviderDiscoveryFailed(name, { reason: "provider" });
|
|
409
464
|
console.warn(`[opencodex] CodeBuddy model discovery failed [${live.error}]${live.status === undefined ? "" : ` status=${live.status}`}; using stale/static catalog degradation.`);
|
|
@@ -454,13 +509,12 @@ export async function fetchProviderModelsWithAuth(
|
|
|
454
509
|
} as CatalogModel;
|
|
455
510
|
});
|
|
456
511
|
const forCache = withConfiguredRetention(discovered, { retainComboTargets: false });
|
|
457
|
-
if (!
|
|
458
|
-
|
|
459
|
-
}
|
|
512
|
+
if (!isCurrentCacheGeneration()) return observed(withConfiguredRetention(configured), "degraded", false);
|
|
513
|
+
if (!publishCache(forCache, authorityIdentity)) return supersededSuccess(withConfiguredRetention(forCache));
|
|
460
514
|
markProviderDiscoveryOk(name, live.models.length);
|
|
461
515
|
return observed(withConfiguredRetention(forCache, { warnDrops: true }), "authoritative");
|
|
462
516
|
} catch {
|
|
463
|
-
if (
|
|
517
|
+
if (claimPublication()) {
|
|
464
518
|
markModelsFetchFailure(name, undefined, authorityIdentity);
|
|
465
519
|
markProviderDiscoveryFailed(name, { reason: "provider" });
|
|
466
520
|
}
|
|
@@ -505,14 +559,13 @@ export async function fetchProviderModelsWithAuth(
|
|
|
505
559
|
...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
|
|
506
560
|
}));
|
|
507
561
|
const forCache = withConfiguredRetention(discovered, { retainComboTargets: false });
|
|
508
|
-
if (!
|
|
509
|
-
|
|
510
|
-
}
|
|
562
|
+
if (!isCurrentCacheGeneration()) return observed(withConfiguredRetention(configured), "degraded", false);
|
|
563
|
+
if (!publishCache(forCache, authorityIdentity)) return supersededSuccess(withConfiguredRetention(forCache));
|
|
511
564
|
markQoderDiscoveryCommitted(profile, apiKey, discoveryScope);
|
|
512
565
|
markProviderDiscoveryOk(name, live.models.length);
|
|
513
566
|
return observed(withConfiguredRetention(forCache, { warnDrops: true }), "authoritative");
|
|
514
567
|
}
|
|
515
|
-
if (
|
|
568
|
+
if (claimPublication()) {
|
|
516
569
|
markModelsFetchFailure(name);
|
|
517
570
|
markProviderDiscoveryFailed(name, { reason: "provider" });
|
|
518
571
|
console.warn(`[opencodex] Qoder model discovery for "${name}" failed [${live.error}]${live.detail ? `: ${live.detail}` : ""}; using stale/static catalog degradation.`);
|
|
@@ -588,13 +641,12 @@ export async function fetchProviderModelsWithAuth(
|
|
|
588
641
|
} as CatalogModel;
|
|
589
642
|
});
|
|
590
643
|
const forCache = withConfiguredRetention(result, { retainComboTargets: false });
|
|
591
|
-
if (!
|
|
592
|
-
|
|
593
|
-
}
|
|
644
|
+
if (!isCurrentCacheGeneration()) return observed(withConfiguredRetention(configured), "degraded", false);
|
|
645
|
+
if (!publishCache(forCache, authorityIdentity)) return supersededSuccess(withConfiguredRetention(forCache));
|
|
594
646
|
markProviderDiscoveryOk(name, liveResult.models.length);
|
|
595
647
|
return observed(withConfiguredRetention(forCache), "authoritative");
|
|
596
648
|
}
|
|
597
|
-
if (
|
|
649
|
+
if (claimPublication()) {
|
|
598
650
|
markModelsFetchFailure(name, undefined, authorityIdentity);
|
|
599
651
|
markProviderDiscoveryFailed(name, { reason: liveResult.error === "auth" ? "provider" : "invalid_response" });
|
|
600
652
|
}
|
|
@@ -647,9 +699,8 @@ export async function fetchProviderModelsWithAuth(
|
|
|
647
699
|
// Cache the discovery-filtered roster without combo retention so a later
|
|
648
700
|
// gather can re-apply the current capture's retain set on read.
|
|
649
701
|
const forCache = withConfiguredRetention(result, { retainComboTargets: false });
|
|
650
|
-
if (!
|
|
651
|
-
|
|
652
|
-
}
|
|
702
|
+
if (!isCurrentCacheGeneration()) return observed(withConfiguredRetention(configured), "degraded", false);
|
|
703
|
+
if (!publishCache(forCache, authorityIdentity)) return supersededSuccess(withConfiguredRetention(forCache));
|
|
653
704
|
// Publish roster-derived state only for a discovery the cache accepted: a stale
|
|
654
705
|
// in-flight capture (generation revoked by a credential/config change) must not
|
|
655
706
|
// overwrite the spelling or Max-Mode evidence of the newer one.
|
|
@@ -661,7 +712,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
661
712
|
markProviderDiscoveryOk(name, liveResult.models.length);
|
|
662
713
|
return observed(withConfiguredRetention(forCache, { warnDrops: true }), "authoritative");
|
|
663
714
|
}
|
|
664
|
-
if (
|
|
715
|
+
if (claimPublication()) {
|
|
665
716
|
markModelsFetchFailure(name, undefined, authorityIdentity);
|
|
666
717
|
markProviderDiscoveryFailed(name, { reason: "provider" });
|
|
667
718
|
console.warn(
|
|
@@ -726,10 +777,28 @@ export async function fetchProviderModelsWithAuth(
|
|
|
726
777
|
const urlClass = new URL(url).hostname.endsWith("aiplatform.googleapis.com")
|
|
727
778
|
? "vertex-aiplatform"
|
|
728
779
|
: "provider-models";
|
|
780
|
+
const xaiOAuth = isXaiGrokOAuth(name, prov);
|
|
781
|
+
let discoveryObservation: number | undefined;
|
|
782
|
+
const canPublishDiscovery = () => isProviderDiscoveryObservationCurrent(name, discoveryObservation);
|
|
783
|
+
const vertexResponseCurrent = () => !vertexSendGuard || (vertexAuth !== undefined
|
|
784
|
+
&& vertexDiscoveryAuthIsCurrent(prov, vertexAuth, headers, url));
|
|
785
|
+
const discoveryFallbackRows = (): { models: CatalogModel[]; fallback: "stale" | "configured" } => {
|
|
786
|
+
const stale = getStaleCached(name, catalogAuthority);
|
|
787
|
+
return {
|
|
788
|
+
models: withConfiguredRetention(
|
|
789
|
+
stale
|
|
790
|
+
? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false))
|
|
791
|
+
: failedDiscoveryConfigured,
|
|
792
|
+
),
|
|
793
|
+
fallback: stale ? "stale" : "configured",
|
|
794
|
+
};
|
|
795
|
+
};
|
|
729
796
|
const failedDiscoveryFallback = (
|
|
730
797
|
failure: ProviderModelDiscoveryFailure,
|
|
798
|
+
warningCondition?: ProviderModelDiscoveryWarningCondition,
|
|
731
799
|
): { models: CatalogModel[]; fallback: "stale" | "configured"; shouldLog: boolean } => {
|
|
732
|
-
|
|
800
|
+
vertexResponseRevoked = !vertexResponseCurrent();
|
|
801
|
+
if (!isCurrentCacheGeneration() || !maySendAnthropicDiscovery() || vertexResponseRevoked) {
|
|
733
802
|
return {
|
|
734
803
|
models: withConfiguredRetention(failedDiscoveryConfigured),
|
|
735
804
|
fallback: "configured",
|
|
@@ -739,19 +808,11 @@ export async function fetchProviderModelsWithAuth(
|
|
|
739
808
|
// Decide logging BEFORE recording the new status, so we can compare against the prior one and
|
|
740
809
|
// suppress an identical repeated failure (#395 log flood). The failure stays observable via the
|
|
741
810
|
// discovery-status API regardless.
|
|
742
|
-
|
|
811
|
+
if (!canPublishDiscovery() || !claimPublication()) return { ...discoveryFallbackRows(), shouldLog: false };
|
|
812
|
+
const shouldLog = shouldLogDiscoveryFailure(name, failure, warningCondition);
|
|
743
813
|
markModelsFetchFailure(name, undefined, catalogAuthority);
|
|
744
|
-
markProviderDiscoveryFailed(name, failure);
|
|
745
|
-
|
|
746
|
-
return {
|
|
747
|
-
models: withConfiguredRetention(
|
|
748
|
-
stale
|
|
749
|
-
? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false))
|
|
750
|
-
: failedDiscoveryConfigured,
|
|
751
|
-
),
|
|
752
|
-
fallback: stale ? "stale" : "configured",
|
|
753
|
-
shouldLog,
|
|
754
|
-
};
|
|
814
|
+
markProviderDiscoveryFailed(name, failure, warningCondition, discoveryObservation);
|
|
815
|
+
return { ...discoveryFallbackRows(), shouldLog };
|
|
755
816
|
};
|
|
756
817
|
try {
|
|
757
818
|
// Canonical-URL TUN transparency for Clash/Surge/Mihomo fake-IP DNS:
|
|
@@ -776,6 +837,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
776
837
|
headers,
|
|
777
838
|
signal: vertexDeadline ?? AbortSignal.timeout(8000),
|
|
778
839
|
}, outboundDependencies(url));
|
|
840
|
+
if (xaiOAuth) discoveryObservation = captureProviderDiscoveryObservation();
|
|
779
841
|
const redirectError = await providerRedirectError(res, url);
|
|
780
842
|
if (redirectError) {
|
|
781
843
|
const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "http", httpStatus: res.status });
|
|
@@ -787,10 +849,15 @@ export async function fetchProviderModelsWithAuth(
|
|
|
787
849
|
return observed(models, "degraded");
|
|
788
850
|
}
|
|
789
851
|
if (!res.ok) {
|
|
790
|
-
const
|
|
852
|
+
const privacyRefusal = xaiOAuth && await readXaiLegacyPrivacyError(res);
|
|
853
|
+
const { models, fallback, shouldLog } = failedDiscoveryFallback(
|
|
854
|
+
{ reason: "http", httpStatus: res.status },
|
|
855
|
+
privacyRefusal ? "xai-legacy-privacy-mode" : undefined,
|
|
856
|
+
);
|
|
791
857
|
if (shouldLog) {
|
|
858
|
+
const guidance = privacyRefusal ? ` ${XAI_LEGACY_PRIVACY_MESSAGE}` : "";
|
|
792
859
|
console.warn(
|
|
793
|
-
`[opencodex] Provider model discovery for "${name}" failed with HTTP ${res.status} [urlClass=${urlClass}, fallback=${fallback}]
|
|
860
|
+
`[opencodex] Provider model discovery for "${name}" failed with HTTP ${res.status} [urlClass=${urlClass}, fallback=${fallback}].${guidance}`,
|
|
794
861
|
);
|
|
795
862
|
}
|
|
796
863
|
return observed(models, "degraded");
|
|
@@ -858,6 +925,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
858
925
|
if (!isCurrentCacheGeneration()) {
|
|
859
926
|
return observed(withConfiguredRetention(configured), "degraded");
|
|
860
927
|
}
|
|
928
|
+
if (!canPublish()) return supersededSuccess(withConfiguredRetention(forCache));
|
|
861
929
|
// Save exact family routes before publishing synthetic IDs. These synchronous writes
|
|
862
930
|
// cannot interleave with a credential-generation change; failure keeps the prior cache.
|
|
863
931
|
registerAntigravityDiscoveredWireModels(prov.baseUrl, merged, {
|
|
@@ -867,9 +935,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
867
935
|
// Entitlement is per account (Claude 4.6 vs 5.5, Argon): remember what THIS account
|
|
868
936
|
// lists so account selection can prefer one that serves the requested model.
|
|
869
937
|
if (auth.oauthAccountId) recordAntigravityAccountRoster(name, auth.oauthAccountId, antigravity, Date.now(), antigravityObservation);
|
|
870
|
-
if (!
|
|
871
|
-
return observed(withConfiguredRetention(configured), "degraded");
|
|
872
|
-
}
|
|
938
|
+
if (!publishCache(forCache, catalogAuthority)) return supersededSuccess(withConfiguredRetention(forCache));
|
|
873
939
|
markProviderDiscoveryOk(name, live.length);
|
|
874
940
|
return observed(withConfiguredRetention(azureMetadata ? live : forCache, { warnDrops: true }), "authoritative");
|
|
875
941
|
}
|
|
@@ -970,15 +1036,22 @@ export async function fetchProviderModelsWithAuth(
|
|
|
970
1036
|
`[opencodex] Provider model discovery for "${name}" returned an authoritative empty catalog; ${droppedConfiguredIds.length > 0 ? `dropping configured model ids: ${droppedConfiguredIds.join(", ")}` : "no models will be exposed"}.`,
|
|
971
1037
|
);
|
|
972
1038
|
}
|
|
973
|
-
if (!maySendAnthropicDiscovery() || !
|
|
1039
|
+
if (!maySendAnthropicDiscovery() || !isCurrentCacheGeneration()) {
|
|
974
1040
|
return observed(withConfiguredRetention(configured), "degraded");
|
|
975
1041
|
}
|
|
976
|
-
|
|
1042
|
+
if (!vertexResponseCurrent()) return observed(returned, "degraded", false);
|
|
1043
|
+
if (!canPublishDiscovery()) return supersededSuccess(returned);
|
|
1044
|
+
// The original caller can inspect its own rows, but a superseded revision
|
|
1045
|
+
// prevents a sync or arrival-policy writer from adopting a superseded result.
|
|
1046
|
+
if (!publishCache(forCache, catalogAuthority)) return supersededSuccess(returned);
|
|
1047
|
+
markProviderDiscoveryOk(name, liveModelCount, discoveryObservation);
|
|
977
1048
|
return observed(returned, "authoritative");
|
|
978
1049
|
} catch (error) {
|
|
979
1050
|
if (error instanceof ProviderOutboundSendCancelledError) {
|
|
1051
|
+
vertexResponseRevoked = !vertexResponseCurrent();
|
|
980
1052
|
return observed(withConfiguredRetention(failedDiscoveryConfigured), "degraded");
|
|
981
1053
|
}
|
|
1054
|
+
if (xaiOAuth) discoveryObservation ??= captureProviderDiscoveryObservation();
|
|
982
1055
|
if (error instanceof ProviderOutboundPolicyError) {
|
|
983
1056
|
const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "blocked" });
|
|
984
1057
|
if (shouldLog) {
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
DEFAULT_MODEL_CACHE_TTL_MS,
|
|
17
17
|
getFreshCached,
|
|
18
18
|
getStaleCached,
|
|
19
|
+
observeModelCacheRevision,
|
|
19
20
|
isModelsFetchCoolingDown,
|
|
20
21
|
isModelCacheGenerationCurrent,
|
|
21
22
|
markModelsFetchFailure,
|
|
@@ -192,14 +193,19 @@ export function clearGatherRoutedModelsInflight(): void {
|
|
|
192
193
|
}
|
|
193
194
|
export async function gatherRoutedModels(
|
|
194
195
|
config: OcxConfig,
|
|
195
|
-
options?: GatherRoutedModelsOptions,
|
|
196
|
+
options?: GatherRoutedModelsOptions & { onlyProvider?: string },
|
|
196
197
|
): Promise<CatalogModel[]> {
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
198
|
+
if (options?.onlyProvider !== undefined) {
|
|
199
|
+
const lease = gatherGate.tryAcquire();
|
|
200
|
+
if (!lease) throw new CatalogGatherBusyError();
|
|
201
|
+
try {
|
|
202
|
+
const capture = captureGatherFlight(config, () => refreshingModelsAuthResolver, options.onlyProvider);
|
|
203
|
+
return projectGatherResult(await gatherRoutedModelsUncached(config, capture, options.onlyProvider), options);
|
|
204
|
+
} finally {
|
|
205
|
+
lease.release();
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
return gatherRoutedModelsWithAuth(config, `refreshing:${gatherFlightKey(config)}`, () => refreshingModelsAuthResolver, options);
|
|
203
209
|
}
|
|
204
210
|
|
|
205
211
|
/**
|
|
@@ -261,6 +267,10 @@ async function gatherRoutedModelsWithAuth(
|
|
|
261
267
|
gatherInflight.set(key, bucket);
|
|
262
268
|
entry = ownedEntry;
|
|
263
269
|
}
|
|
270
|
+
return projectGatherResult(await entry.promise, options);
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
function projectGatherResult(result: GatherFlightResult, options?: GatherRoutedModelsOptions): CatalogModel[] {
|
|
264
274
|
const {
|
|
265
275
|
models,
|
|
266
276
|
comboOmissions,
|
|
@@ -268,7 +278,7 @@ async function gatherRoutedModelsWithAuth(
|
|
|
268
278
|
providerModelOutcomes,
|
|
269
279
|
discoveryPolicySnapshots,
|
|
270
280
|
providerContentRevisions,
|
|
271
|
-
} =
|
|
281
|
+
} = result;
|
|
272
282
|
if (options?.comboOmissions) {
|
|
273
283
|
options.comboOmissions.length = 0;
|
|
274
284
|
options.comboOmissions.push(...comboOmissions);
|
|
@@ -323,6 +333,7 @@ function boundCustomNativeReasoning(
|
|
|
323
333
|
async function gatherRoutedModelsUncached(
|
|
324
334
|
config: OcxConfig,
|
|
325
335
|
capture: GatherFlightCapture,
|
|
336
|
+
onlyProvider?: string,
|
|
326
337
|
): Promise<GatherFlightResult> {
|
|
327
338
|
// Flight-local list: joiners copy from the resolved promise, not a process-global last write.
|
|
328
339
|
const localOmissions: ComboCatalogOmission[] = [];
|
|
@@ -408,7 +419,7 @@ async function gatherRoutedModelsUncached(
|
|
|
408
419
|
// 힌트(modelContextWindows 등)로 native 모델의 context window를 오버라이드한 경우
|
|
409
420
|
// 반영되지 않음. 하지만 nativeOpenAiContextWindow가 이미 config 오버라이드를
|
|
410
421
|
// 우선시하므로 실제 충돌 가능성은 낮음.
|
|
411
|
-
if (!hasComboTargets(config)) {
|
|
422
|
+
if (onlyProvider !== undefined || !hasComboTargets(config)) {
|
|
412
423
|
// Skip the native slug injection entirely when no combos are configured — avoids
|
|
413
424
|
// calling nativeOpenAiSlugs() (which reads the live Codex catalog from disk) for
|
|
414
425
|
// configs that will never need it.
|
|
@@ -465,7 +476,7 @@ async function gatherRoutedModelsUncached(
|
|
|
465
476
|
// catalog production and warning behavior, while this map is already private to combo input.
|
|
466
477
|
// - 장점, 단점 및 영향: custom context/modality/reasoning/tool-mode declarations now constrain
|
|
467
478
|
// their combos without widening unrelated rows; omitted fields retain provider/native limits.
|
|
468
|
-
for (const custom of config.customModels ?? []) {
|
|
479
|
+
for (const custom of onlyProvider === undefined ? config.customModels ?? [] : []) {
|
|
469
480
|
const key = `${custom.provider}/${custom.modelId}`;
|
|
470
481
|
const inherited = memberByKey.get(key) ?? {
|
|
471
482
|
provider: custom.provider,
|
|
@@ -487,7 +498,7 @@ async function gatherRoutedModelsUncached(
|
|
|
487
498
|
...(custom.codexToolMode !== undefined ? { codexToolMode: custom.codexToolMode } : {}),
|
|
488
499
|
});
|
|
489
500
|
}
|
|
490
|
-
for (const id of listComboIds(config)) {
|
|
501
|
+
for (const id of onlyProvider === undefined ? listComboIds(config) : []) {
|
|
491
502
|
const combo = getCombo(config, id);
|
|
492
503
|
if (!combo) continue;
|
|
493
504
|
const comboNativeLimits = nativeContextLimits(config);
|
|
@@ -540,7 +551,10 @@ async function gatherRoutedModelsUncached(
|
|
|
540
551
|
}
|
|
541
552
|
else warnUncataloguedComboOnce(id, combo, members, localOmissions);
|
|
542
553
|
}
|
|
543
|
-
|
|
554
|
+
if (onlyProvider === undefined && providerResults.every(({ outcome, contentRevision }) =>
|
|
555
|
+
observeModelCacheRevision(outcome.provider) === contentRevision)) {
|
|
556
|
+
replaceLastComboCatalogOmissions(localOmissions);
|
|
557
|
+
}
|
|
544
558
|
// Preserve declaratively ordered discovery (and cold-start seed order); other presets
|
|
545
559
|
// retain their historical alphabetical order. Renamed/custom transport scoping still applies.
|
|
546
560
|
// Read the captured discovery policy, never the live registry: a flight must keep the
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* its cooperating generation, and identities for catalog-owned targets.
|
|
9
9
|
*/
|
|
10
10
|
import { createHmac, randomBytes } from "node:crypto";
|
|
11
|
-
import { join
|
|
11
|
+
import { join } from "node:path";
|
|
12
12
|
|
|
13
13
|
import { observeConfigGeneration } from "../config";
|
|
14
14
|
import type { OcxConfig } from "../types";
|
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
legacyCatalogBackupPath,
|
|
24
24
|
samePath,
|
|
25
25
|
} from "./catalog/parsing";
|
|
26
|
-
import {
|
|
26
|
+
import { readCodexCatalogBinding } from "./paths";
|
|
27
27
|
import {
|
|
28
28
|
acceptCatalogGatherSourcePath,
|
|
29
29
|
captureAndSealCatalogHomeSelection,
|
|
@@ -170,11 +170,9 @@ export function captureCatalogAdmissionSnapshot(
|
|
|
170
170
|
const configBytes = readCatalogGatherSource(evidenceSession, "catalog-target-selection");
|
|
171
171
|
const configuredCatalogPath = configBytes === null
|
|
172
172
|
? null
|
|
173
|
-
:
|
|
173
|
+
: readCodexCatalogBinding(configPath, Buffer.from(configBytes).toString("utf8"));
|
|
174
174
|
const defaultCatalogPath = join(homeSelection.canonicalCodexHome, "opencodex-catalog.json");
|
|
175
|
-
const catalogPath = configuredCatalogPath
|
|
176
|
-
? resolve(homeSelection.canonicalCodexHome, configuredCatalogPath)
|
|
177
|
-
: defaultCatalogPath;
|
|
175
|
+
const catalogPath = configuredCatalogPath ?? defaultCatalogPath;
|
|
178
176
|
const backupPaths = [
|
|
179
177
|
catalogBackupPathFor(catalogPath),
|
|
180
178
|
...(samePath(catalogPath, defaultCatalogPath) ? [legacyCatalogBackupPath()] : []),
|
|
@@ -137,7 +137,7 @@ export function selectDriftHealCatalogPath(
|
|
|
137
137
|
|
|
138
138
|
/** Repair only the missing config roots; catalog convergence remains the later tick step. */
|
|
139
139
|
async function healCodexConfigDrift(config: OcxConfig, entryGeneration: number): Promise<"none" | "healed" | "not-healed"> {
|
|
140
|
-
const [{ codexConfigDrift }, { JOURNAL_PATH, journaledInjectedCatalogPath, journaledInjectedOpenaiBaseUrl, journaledInjectedRealtimeWsBaseUrl, journaledInjectedRootValues }, { shouldSyncCodexOnStart }, { injectCodexConfig }, { DEFAULT_CATALOG_PATH,
|
|
140
|
+
const [{ codexConfigDrift }, { JOURNAL_PATH, journaledInjectedCatalogPath, journaledInjectedOpenaiBaseUrl, journaledInjectedRealtimeWsBaseUrl, journaledInjectedRootValues }, { shouldSyncCodexOnStart }, { injectCodexConfig }, { CODEX_CONFIG_PATH, DEFAULT_CATALOG_PATH, resolveCodexCatalogPath }, { loadConfig }, { inspectNativeCodexOwnership }] =
|
|
141
141
|
await Promise.all([
|
|
142
142
|
import("./config-drift-heal"),
|
|
143
143
|
import("./journal"),
|
|
@@ -167,7 +167,9 @@ async function healCodexConfigDrift(config: OcxConfig, entryGeneration: number):
|
|
|
167
167
|
if (!current()) return "none";
|
|
168
168
|
const runtime = readRuntimePort(process.pid);
|
|
169
169
|
if (!runtime) return "not-healed";
|
|
170
|
-
const catalogPath = selectDriftHealCatalogPath(
|
|
170
|
+
const catalogPath = selectDriftHealCatalogPath(
|
|
171
|
+
JOURNAL_PATH, DEFAULT_CATALOG_PATH, path => resolveCodexCatalogPath(CODEX_CONFIG_PATH, path),
|
|
172
|
+
);
|
|
171
173
|
if (!current()) return "none";
|
|
172
174
|
// Keep the missing routing roots visible to the next tick. Catalog-only convergence below
|
|
173
175
|
// may recreate the file now, but it does not re-inject config.toml in this tick.
|
|
@@ -9,7 +9,7 @@ import { configEnablesRoutedNamespace, ocxRoutedNamespaceCounts } from "./catalo
|
|
|
9
9
|
import { inspectCodexHomeOwner } from "./codex-home-owner";
|
|
10
10
|
import { shouldSyncCodexOnStart } from "./desired-state";
|
|
11
11
|
import { JOURNAL_PATH, journalOwner } from "./journal";
|
|
12
|
-
import { CODEX_HOME, DEFAULT_CATALOG_PATH,
|
|
12
|
+
import { CODEX_CONFIG_PATH, CODEX_HOME, DEFAULT_CATALOG_PATH, resolveCodexCatalogPath } from "./paths";
|
|
13
13
|
import { siblingOfLivePort } from "./sibling-start";
|
|
14
14
|
|
|
15
15
|
export type { CatalogObservation } from "./catalog/heal-observation";
|
|
@@ -96,7 +96,9 @@ export function startCodexCatalogSelfHeal(options: { port?: number; deps?: Catal
|
|
|
96
96
|
const deps = options.deps ?? {};
|
|
97
97
|
const scheduleFn = deps.scheduleFn ?? defaultSchedule;
|
|
98
98
|
const clock = deps.now ?? (() => performance.now());
|
|
99
|
-
const catalogPath = deps.catalogPath ?? (() => selectCatalogHealPath(
|
|
99
|
+
const catalogPath = deps.catalogPath ?? (() => selectCatalogHealPath(
|
|
100
|
+
JOURNAL_PATH, DEFAULT_CATALOG_PATH, path => resolveCodexCatalogPath(CODEX_CONFIG_PATH, path),
|
|
101
|
+
));
|
|
100
102
|
const observe = deps.observe ?? observeCatalogHealFile;
|
|
101
103
|
const converge = deps.converge ?? convergeOwnCatalog;
|
|
102
104
|
const gates: CatalogSelfHealGates = {
|
|
@@ -4,3 +4,9 @@ export const CODEX_INTERNAL_OPENAI_MODELS: ReadonlySet<string> = new Set(["codex
|
|
|
4
4
|
export function isCodexControlPlaneModel(slug: unknown): boolean {
|
|
5
5
|
return typeof slug === "string" && CODEX_INTERNAL_OPENAI_MODELS.has(slug);
|
|
6
6
|
}
|
|
7
|
+
|
|
8
|
+
/** Model IDs reserved for canonical OpenAI ahead of default provider routing. */
|
|
9
|
+
export function isBareOpenAiFamilyModel(modelId: string): boolean {
|
|
10
|
+
return !modelId.includes("/")
|
|
11
|
+
&& (/^(?:gpt-|o1-|o3-|o4-)/.test(modelId) || CODEX_INTERNAL_OPENAI_MODELS.has(modelId));
|
|
12
|
+
}
|
package/src/codex/convergence.ts
CHANGED
|
@@ -100,6 +100,7 @@ import { ACCOUNT_GATED_NATIVE_OPENAI_MODELS } from "./catalog/native-models";
|
|
|
100
100
|
import { providerCodexAccountMode } from "../providers/registry";
|
|
101
101
|
import { OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers";
|
|
102
102
|
import { resolveRoutedCatalogDefaults } from "../config/schema/routed-catalog-defaults";
|
|
103
|
+
import { observeModelCacheRevision } from "./model-cache";
|
|
103
104
|
import { withCatalogWriteSerialization } from "./catalog-write-serialization";
|
|
104
105
|
import {
|
|
105
106
|
auditRefusedCatalogReplacement,
|
|
@@ -164,6 +165,7 @@ interface CandidateState {
|
|
|
164
165
|
readonly notices: readonly CatalogNotice[];
|
|
165
166
|
readonly modelEntitlements: CodexModelEntitlementSnapshot;
|
|
166
167
|
readonly discoveryConfig?: OcxConfig;
|
|
168
|
+
readonly providerContentRevisions: ReadonlyMap<string, string>;
|
|
167
169
|
/** Routed namespaces this candidate empties only because the driving config lacks them. */
|
|
168
170
|
readonly routedRemoval: UnconfiguredRoutedRemoval | null;
|
|
169
171
|
}
|
|
@@ -464,11 +466,13 @@ export async function gatherCodexCatalogCandidate(
|
|
|
464
466
|
const authOutcomes: CatalogGatherProviderAuthOutcome[] = [];
|
|
465
467
|
const providerModelOutcomes: CatalogGatherProviderModelOutcome[] = [];
|
|
466
468
|
const discoveryPolicies: CatalogProviderDiscoveryPolicySnapshot[] = [];
|
|
469
|
+
const providerContentRevisions = new Map<string, string>();
|
|
467
470
|
providerGatherStarted = true;
|
|
468
471
|
const [routedModels, modelEntitlements] = await Promise.all([
|
|
469
472
|
gatherRoutedModelsForCatalogGather(snapshot.config, session, {
|
|
470
473
|
providerAuthOutcomes: authOutcomes,
|
|
471
474
|
providerModelOutcomes,
|
|
475
|
+
providerContentRevisions,
|
|
472
476
|
discoveryPolicySnapshots: discoveryPolicies,
|
|
473
477
|
}),
|
|
474
478
|
resolveAdmittedCodexModelEntitlements(snapshot.config),
|
|
@@ -573,6 +577,7 @@ export async function gatherCodexCatalogCandidate(
|
|
|
573
577
|
? { legacyBackup: { path: paths.legacyBackup, content: pristineBytes } } : {}),
|
|
574
578
|
notices: Object.freeze([...notices]),
|
|
575
579
|
modelEntitlements,
|
|
580
|
+
providerContentRevisions,
|
|
576
581
|
...(discoveryChanged ? { discoveryConfig } : {}),
|
|
577
582
|
routedRemoval: unconfiguredRoutedRemoval(active, preparedCatalog, snapshot.config),
|
|
578
583
|
});
|
|
@@ -699,6 +704,11 @@ export async function commitCodexCatalogCandidate(
|
|
|
699
704
|
console.warn(`[opencodex] ${unbackedRoutedRemovalMessage(state.routedRemoval.namespaces.length)}`);
|
|
700
705
|
return { kind: "refused", reason: "unbacked-routed-removal" } as const;
|
|
701
706
|
}
|
|
707
|
+
for (const [provider, revision] of state.providerContentRevisions) {
|
|
708
|
+
if (observeModelCacheRevision(provider) !== revision) {
|
|
709
|
+
return { kind: "stale", reason: "process-local" } as const;
|
|
710
|
+
}
|
|
711
|
+
}
|
|
702
712
|
return fixedCommit(state, permit);
|
|
703
713
|
});
|
|
704
714
|
if (guarded.kind === "conflict") return { kind: "stale", reason: "generation" } as const;
|
|
@@ -25,9 +25,8 @@
|
|
|
25
25
|
* desktop restart: a stale picker the operator asked us to fix is the failure this
|
|
26
26
|
* command exists to prevent, so missing evidence never skips it.
|
|
27
27
|
*/
|
|
28
|
-
import {
|
|
29
|
-
import {
|
|
30
|
-
import { readRootTomlString } from "../paths";
|
|
28
|
+
import { statSync } from "node:fs";
|
|
29
|
+
import { readCodexCatalogBinding } from "../paths";
|
|
31
30
|
import { readProcessStartMsBatch } from "../app-server-processes";
|
|
32
31
|
import { listCodexDesktopShellPids, type DesktopAppRestartIo } from "../desktop-app-restart";
|
|
33
32
|
import { isTestHomeGuardArmed } from "../../lib/test-home-guard";
|
|
@@ -61,17 +60,7 @@ export interface DesktopPickerIo extends DesktopAppRestartIo {
|
|
|
61
60
|
catalogMtimeMs?: (path: string) => number | null;
|
|
62
61
|
}
|
|
63
62
|
|
|
64
|
-
|
|
65
|
-
export function readCodexCatalogBinding(): string | null {
|
|
66
|
-
try {
|
|
67
|
-
const configPath = activeCodexConfigPath();
|
|
68
|
-
if (!existsSync(configPath)) return null;
|
|
69
|
-
const path = readRootTomlString(readFileSync(configPath, "utf-8"), "model_catalog_json");
|
|
70
|
-
return path ? resolveActiveCodexConfigPath(path) : null;
|
|
71
|
-
} catch {
|
|
72
|
-
return null;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
63
|
+
export { readCodexCatalogBinding };
|
|
75
64
|
|
|
76
65
|
function defaultCatalogMtimeMs(path: string): number | null {
|
|
77
66
|
try {
|