@bitkyc08/opencodex 2.100.1 → 2.100.3
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 +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -9,6 +9,7 @@ import { createHash, createHmac, randomBytes } from "node:crypto";
|
|
|
9
9
|
import { copyFileSync, existsSync, mkdirSync, readFileSync, realpathSync } from "node:fs";
|
|
10
10
|
import { delimiter, dirname, join, resolve } from "node:path";
|
|
11
11
|
import { atomicWriteFile, expandUserPath, getConfigDir, websocketsEnabled } from "../../config";
|
|
12
|
+
import { isProviderApiKeyPaused } from "../../providers/api-key-pause";
|
|
12
13
|
import { resolveProviderApiKey } from "../../providers/key-store";
|
|
13
14
|
import { captureOAuthAccountSelection, credentialGeneration, getAccountCredentialWithStatus, getAccountSet } from "../../oauth/store";
|
|
14
15
|
import { readKiroAccountModels, kiroObservedContextWindow } from "../../providers/kiro-model-catalog";
|
|
@@ -52,7 +53,7 @@ import {
|
|
|
52
53
|
} from "../../providers/service-tier";
|
|
53
54
|
import type { FastPolicyAuthority } from "../../providers/fastwire";
|
|
54
55
|
import { effectiveGoogleMode, getProviderRegistryEntry, providerMatchesRegistryTransport, registryEntryForProviderDestination } from "../../providers/registry";
|
|
55
|
-
import { parseAntigravityAvailableModels, registerAntigravityDiscoveredWireModels } from "../../providers/antigravity-models";
|
|
56
|
+
import { discoveredAntigravityDefaultEffort, parseAntigravityAvailableModels, registerAntigravityDiscoveredWireModels } from "../../providers/antigravity-models";
|
|
56
57
|
import { captureAntigravityModelObservation, recordAntigravityAccountRoster } from "../../providers/antigravity-account-roster";
|
|
57
58
|
import { antigravityActiveAccountCurrent, discoverAntigravitySiblings } from "./antigravity-discovery";
|
|
58
59
|
import { applyProviderContextCap, providerContextCap, resolveUnknownRoutedContextWindow } from "../../providers/context-cap";
|
|
@@ -89,7 +90,7 @@ import {
|
|
|
89
90
|
providerRedirectError,
|
|
90
91
|
} from "../../lib/provider-outbound";
|
|
91
92
|
import { redactSecretString } from "../../lib/redact";
|
|
92
|
-
import { invalidModelDiscoveryHint } from "../../providers/model-discovery-diagnostic";
|
|
93
|
+
import { invalidModelDiscoveryHint, shouldWarnSkippedModelRows } from "../../providers/model-discovery-diagnostic";
|
|
93
94
|
import {
|
|
94
95
|
extractProviderModelItems,
|
|
95
96
|
isRegistryModelDiscoveryUrl,
|
|
@@ -99,7 +100,16 @@ import {
|
|
|
99
100
|
type ProviderModelsApiItem,
|
|
100
101
|
type ResolvedProviderModelDiscovery,
|
|
101
102
|
} from "../../providers/model-discovery";
|
|
102
|
-
import {
|
|
103
|
+
import {
|
|
104
|
+
collectVertexPublisherModelPages,
|
|
105
|
+
countDiscoveryResponseBytes,
|
|
106
|
+
extractGoogleNativeModelItems,
|
|
107
|
+
resolveObservedVertexDiscoveryAuth,
|
|
108
|
+
resolveVertexDiscoveryAuth,
|
|
109
|
+
vertexDiscoveryAuthIsCurrent,
|
|
110
|
+
vertexDiscoveryDeadline,
|
|
111
|
+
type VertexDiscoveryAuth,
|
|
112
|
+
} from "../../providers/google-vertex-model-discovery";
|
|
103
113
|
import { applyConfiguredHeadersLast, fetchOllamaShowEnrichment, ollamaShowEnrichable } from "../../providers/ollama-show";
|
|
104
114
|
import upstreamModelsSnapshot from "../data/upstream-models.json";
|
|
105
115
|
import { createAdmissionGate, ResourceAdmissionError, type AdmissionMetrics } from "../../lib/admission";
|
|
@@ -143,6 +153,7 @@ export interface ProviderModelsResult {
|
|
|
143
153
|
}
|
|
144
154
|
export const refreshingModelsAuthResolver: ModelsAuthResolver = { kind: "refreshing" };
|
|
145
155
|
|
|
156
|
+
/** Build a synchronous non-refreshing credential resolver from a captured auth-store buffer. */
|
|
146
157
|
export function observedModelsAuthResolver(
|
|
147
158
|
authStoreBuffer: Uint8Array | null,
|
|
148
159
|
outcomes: CatalogGatherProviderAuthOutcome[],
|
|
@@ -152,7 +163,9 @@ export function observedModelsAuthResolver(
|
|
|
152
163
|
resolve(name, provider) {
|
|
153
164
|
if (provider.authMode === "forward") return { apiKey: undefined, observed: true };
|
|
154
165
|
if (provider.authMode !== "oauth") {
|
|
155
|
-
return { apiKey: resolveProviderApiKey(provider.apiKey), observed: true };
|
|
166
|
+
if (effectiveGoogleMode(name, provider) !== "vertex") return { apiKey: resolveProviderApiKey(provider.apiKey), observed: true };
|
|
167
|
+
const vertexAuth = resolveObservedVertexDiscoveryAuth(provider);
|
|
168
|
+
return { apiKey: vertexAuth?.token, observed: true, ...(vertexAuth ? { vertexAuth } : {}) };
|
|
156
169
|
}
|
|
157
170
|
|
|
158
171
|
const observation: OAuthActiveTokenObservation = mayResolveModelsOAuth(name, provider)
|
|
@@ -273,6 +286,9 @@ export async function fetchProviderModelsWithAuth(
|
|
|
273
286
|
}
|
|
274
287
|
return observed(configured, "authoritative");
|
|
275
288
|
}
|
|
289
|
+
// One Vertex deadline covers ADC, the first request and every follow-up page.
|
|
290
|
+
const vertexDeadline = effectiveGoogleMode(name, prov) === "vertex" ? vertexDiscoveryDeadline() : undefined;
|
|
291
|
+
let vertexAuth: VertexDiscoveryAuth | undefined;
|
|
276
292
|
const auth: ModelsAuthResolution = prov.authMode === "oauth" && !mayResolveModelsOAuth(name, prov)
|
|
277
293
|
? { apiKey: undefined, observed: resolveAuth.kind === "observed" }
|
|
278
294
|
: captured.observedAuth ?? (resolveAuth.kind === "refreshing"
|
|
@@ -289,9 +305,20 @@ export async function fetchProviderModelsWithAuth(
|
|
|
289
305
|
...(snapshot.projectId ? { oauthProjectId: snapshot.projectId } : {}),
|
|
290
306
|
}))
|
|
291
307
|
.catch(() => ({ apiKey: undefined, observed: false }))
|
|
292
|
-
: {
|
|
308
|
+
: {
|
|
309
|
+
apiKey: effectiveGoogleMode(name, prov) === "vertex"
|
|
310
|
+
? (vertexAuth = await resolveVertexDiscoveryAuth(prov, vertexDeadline))?.token
|
|
311
|
+
: await resolveModelsAuthToken(name, prov),
|
|
312
|
+
observed: false,
|
|
313
|
+
}
|
|
293
314
|
: resolveAuth.resolve(name, prov));
|
|
294
315
|
const apiKey = auth.apiKey;
|
|
316
|
+
// A passive gather's Vertex credential (always an API key) arrives already bound to its authority.
|
|
317
|
+
vertexAuth ??= auth.vertexAuth;
|
|
318
|
+
const vertexSendGuard = vertexDeadline !== undefined && prov.authMode !== "oauth";
|
|
319
|
+
if ((prov.authMode === "oauth" && !apiKey) || isProviderApiKeyPaused(prov)) {
|
|
320
|
+
return observed(configured, "degraded");
|
|
321
|
+
}
|
|
295
322
|
if (name === "github-copilot" && apiKey) {
|
|
296
323
|
const transport = resolveGithubCopilotTransport({ ...prov, apiKey }, prov.authMode === "oauth"
|
|
297
324
|
? resolveCopilotApiBaseUrl(auth.oauthApiBaseUrl) : undefined);
|
|
@@ -649,12 +676,6 @@ export async function fetchProviderModelsWithAuth(
|
|
|
649
676
|
"degraded",
|
|
650
677
|
);
|
|
651
678
|
}
|
|
652
|
-
if (prov.authMode === "oauth" && !apiKey) {
|
|
653
|
-
// No usable token (logged out, or account marked needsReauth). Still surface the
|
|
654
|
-
// configured static catalog so the GUI Models tab / rail counts are not empty —
|
|
655
|
-
// matching Cursor's !apiKey → configured degradation and fetch-failure fallback.
|
|
656
|
-
return observed(configured, "degraded");
|
|
657
|
-
}
|
|
658
679
|
const cloudCodeAssist = effectiveGoogleMode(name, prov) === "cloud-code-assist";
|
|
659
680
|
const project = prov.project ?? auth.oauthProjectId;
|
|
660
681
|
if (cloudCodeAssist && !project) return observed(configured, "degraded");
|
|
@@ -683,6 +704,9 @@ export async function fetchProviderModelsWithAuth(
|
|
|
683
704
|
"degraded",
|
|
684
705
|
);
|
|
685
706
|
}
|
|
707
|
+
if (effectiveGoogleMode(name, prov) === "vertex" && !apiKey) {
|
|
708
|
+
return observed(withConfiguredRetention(withVertexDefaultSeed(configured)), "degraded");
|
|
709
|
+
}
|
|
686
710
|
// The captured request predates any refresh, so a refreshing gather rebuilds it
|
|
687
711
|
// from the auth it resolved: the token and its origin, together.
|
|
688
712
|
const request = resolveAuth.kind === "refreshing" && name !== "anthropic2"
|
|
@@ -738,7 +762,9 @@ export async function fetchProviderModelsWithAuth(
|
|
|
738
762
|
// name matches any baseUrl by design. Retargeted or renamed custom rows
|
|
739
763
|
// fetch a different URL and keep the rejection.
|
|
740
764
|
if (!maySendAnthropicDiscovery()) return observed(withConfiguredRetention(failedDiscoveryConfigured), "degraded");
|
|
741
|
-
const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl,
|
|
765
|
+
const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl,
|
|
766
|
+
beforeSend: () => maySendAnthropicDiscovery()
|
|
767
|
+
&& (!vertexSendGuard || (vertexAuth !== undefined && vertexDiscoveryAuthIsCurrent(prov, vertexAuth, headers))) };
|
|
742
768
|
const antigravityObservation = cloudCodeAssist ? captureAntigravityModelObservation() : undefined;
|
|
743
769
|
const res = request.method === "POST"
|
|
744
770
|
? await providerOutboundPost(name, prov, url, {
|
|
@@ -748,7 +774,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
748
774
|
}, outboundDependencies)
|
|
749
775
|
: await providerOutboundGet(name, prov, url, {
|
|
750
776
|
headers,
|
|
751
|
-
signal: AbortSignal.timeout(8000),
|
|
777
|
+
signal: vertexDeadline ?? AbortSignal.timeout(8000),
|
|
752
778
|
}, outboundDependencies);
|
|
753
779
|
const redirectError = await providerRedirectError(res, url);
|
|
754
780
|
if (redirectError) {
|
|
@@ -773,7 +799,8 @@ export async function fetchProviderModelsWithAuth(
|
|
|
773
799
|
const contentType = (
|
|
774
800
|
res.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() || "missing"
|
|
775
801
|
).slice(0, 80);
|
|
776
|
-
const
|
|
802
|
+
const vertexFirstPage = vertexDeadline ? countDiscoveryResponseBytes(res) : undefined;
|
|
803
|
+
const bounded = await readBoundedDiscoveryJson(vertexFirstPage?.response ?? res, discovery.maxResponseBytes);
|
|
777
804
|
if (!bounded.ok) {
|
|
778
805
|
const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
|
|
779
806
|
const diagnostic = bounded.reason === "response_too_large"
|
|
@@ -821,7 +848,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
821
848
|
...(model.effortWireModelIds ? {
|
|
822
849
|
antigravityEffortWireModelIds: model.effortWireModelIds,
|
|
823
850
|
suppressSyntheticMax: true,
|
|
824
|
-
defaultReasoningEffort: model.effortWireModelIds.medium
|
|
851
|
+
defaultReasoningEffort: discoveredAntigravityDefaultEffort(model.id, !!model.effortWireModelIds.medium),
|
|
825
852
|
} : {}),
|
|
826
853
|
...(model.contextWindow ? { contextWindow: model.contextWindow } : {}),
|
|
827
854
|
...(model.inputModalities ? { inputModalities: model.inputModalities } : {}),
|
|
@@ -846,14 +873,24 @@ export async function fetchProviderModelsWithAuth(
|
|
|
846
873
|
markProviderDiscoveryOk(name, live.length);
|
|
847
874
|
return observed(withConfiguredRetention(azureMetadata ? live : forCache, { warnDrops: true }), "authoritative");
|
|
848
875
|
}
|
|
849
|
-
const
|
|
850
|
-
?
|
|
851
|
-
|
|
852
|
-
|
|
876
|
+
const listing = effectiveGoogleMode(name, prov) === "vertex"
|
|
877
|
+
? await collectVertexPublisherModelPages(url, bounded.value,
|
|
878
|
+
{ ...discovery, firstPageBytes: vertexFirstPage?.bytes(), signal: vertexDeadline },
|
|
879
|
+
(pageUrl, signal) => providerOutboundGet(name, prov, pageUrl, { headers, signal }, outboundDependencies))
|
|
880
|
+
: { ok: true as const, value: bounded.value };
|
|
881
|
+
if (!listing.ok) {
|
|
882
|
+
const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
|
|
883
|
+
if (shouldLog) {
|
|
884
|
+
console.warn(
|
|
885
|
+
`[opencodex] Provider model discovery for "${name}" returned an incomplete paginated listing (${listing.diagnostic}) [status=${res.status}, contentType=${contentType}, urlClass=${urlClass}, fallback=${fallback}].`,
|
|
886
|
+
);
|
|
887
|
+
}
|
|
888
|
+
return observed(models, "degraded");
|
|
889
|
+
}
|
|
890
|
+
const googleNative = extractGoogleNativeModelItems(name, prov, listing.value, discovery.maxModels);
|
|
891
|
+
// Native Google discovery wins; a google row served by an OpenAI-compatible
|
|
853
892
|
// gateway keeps the generic data[] / top-level-array contract.
|
|
854
|
-
const extracted =
|
|
855
|
-
? googleAiStudio
|
|
856
|
-
: extractProviderModelItems(bounded.value, discovery);
|
|
893
|
+
const extracted = googleNative ?? extractProviderModelItems(listing.value, discovery);
|
|
857
894
|
if (!extracted.ok) {
|
|
858
895
|
const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
|
|
859
896
|
const diagnostic: Record<ModelDiscoveryResponseFailure, string> = {
|
|
@@ -864,11 +901,18 @@ export async function fetchProviderModelsWithAuth(
|
|
|
864
901
|
};
|
|
865
902
|
if (shouldLog) {
|
|
866
903
|
console.warn(
|
|
867
|
-
`[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) : "."}`,
|
|
904
|
+
`[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, discovery.skipInvalidRows === true) : "."}`,
|
|
868
905
|
);
|
|
869
906
|
}
|
|
870
907
|
return observed(models, "degraded");
|
|
871
908
|
}
|
|
909
|
+
// The operator opted into skipping invalid rows (#7910): say how many, once, never which.
|
|
910
|
+
const skippedInvalidRows = "skippedInvalidRows" in extracted ? extracted.skippedInvalidRows ?? 0 : 0;
|
|
911
|
+
if (shouldWarnSkippedModelRows(name, skippedInvalidRows, extracted.rawCount)) {
|
|
912
|
+
console.warn(
|
|
913
|
+
`[opencodex] Provider model discovery for "${name}" skipped ${skippedInvalidRows} invalid of ${extracted.rawCount} rows (modelDiscovery.skipInvalidRows) [status=${res.status}, urlClass=${urlClass}].`,
|
|
914
|
+
);
|
|
915
|
+
}
|
|
872
916
|
const items = extracted.items;
|
|
873
917
|
// Ollama Cloud enrichment: /v1/models carries no per-model context or capability metadata,
|
|
874
918
|
// so a newly announced id would otherwise publish generic defaults. /api/show fills that
|
|
@@ -4,6 +4,7 @@ import { existsSync, readFileSync } from "node:fs";
|
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { initializeConfigOwnership } from "../../lib/config-ownership";
|
|
6
6
|
import { getConfigDir, loadConfig, ultraFastTierEnabled, websocketsEnabled, withConfigMutationLockSync } from "../../config";
|
|
7
|
+
import { resolveMultiAgentMode } from "../../config/multi-agent-surface";
|
|
7
8
|
import { shouldSyncCodexOnStart } from "../desired-state";
|
|
8
9
|
import { legacyCustomModelCatalogSlugs } from "../custom-model-catalog-migration";
|
|
9
10
|
import { getCodexHome } from "../paths";
|
|
@@ -334,7 +335,7 @@ function writeRetainedCatalogSync({
|
|
|
334
335
|
catalogModelsForMerge,
|
|
335
336
|
);
|
|
336
337
|
const modelPickerOrder = config.modelPickerOrder ?? [];
|
|
337
|
-
const multiAgentMode: MultiAgentMode = config
|
|
338
|
+
const multiAgentMode: MultiAgentMode = resolveMultiAgentMode(config);
|
|
338
339
|
const exactComboSlugs = exactComboCatalogSlugs(config);
|
|
339
340
|
const bareEligibleAccountIds = providerCodexAccountMode(
|
|
340
341
|
OPENAI_CODEX_PROVIDER_ID,
|
|
@@ -791,7 +791,7 @@ async function gatherRoutedModelsUncached(
|
|
|
791
791
|
// ponytail: catalog-scale scan; index ids by provider if catalog growth makes this measurable.
|
|
792
792
|
const aliasDisplayNames = new Map(activeProviders.flatMap(({ name, provider }) => {
|
|
793
793
|
const providerModels = models.filter(model => model.provider === name);
|
|
794
|
-
const aliases = [...effectiveModelAliases(config, provider, providerModels.map(model => model.id))];
|
|
794
|
+
const aliases = [...effectiveModelAliases(config, provider, providerModels.map(model => model.id), name)];
|
|
795
795
|
return aliases.flatMap(([id, { alias }]) => {
|
|
796
796
|
const exact = providerModels.filter(model => model.id === id);
|
|
797
797
|
const matches = exact.length > 0
|
|
@@ -57,6 +57,16 @@ let clientFanout: CatalogChangedClientFanout | null = null;
|
|
|
57
57
|
export function setCatalogAutoRefreshClientFanout(fanout: CatalogChangedClientFanout | null): void {
|
|
58
58
|
clientFanout = fanout;
|
|
59
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Notified after a tick committed a changed catalog. Owned by the link Child-ops scheduler, which registers only while
|
|
62
|
+
* this Home has links, so a Home without links pays one null check. Synchronous and fire-and-forget: the scheduler
|
|
63
|
+
* debounces and does its own work later.
|
|
64
|
+
*/
|
|
65
|
+
export type CatalogChangedLinkFanout = () => void;
|
|
66
|
+
let linkFanout: CatalogChangedLinkFanout | null = null;
|
|
67
|
+
export function setCatalogAutoRefreshLinkFanout(fanout: CatalogChangedLinkFanout | null): void {
|
|
68
|
+
linkFanout = fanout;
|
|
69
|
+
}
|
|
60
70
|
|
|
61
71
|
/** Read only a regular file, with a byte limit even if it grows after the stat. */
|
|
62
72
|
function readBoundedRegularFile(path: string, maxBytes: number): string | null {
|
|
@@ -262,6 +272,7 @@ async function tick(): Promise<void> {
|
|
|
262
272
|
if (entryGeneration !== generation) return;
|
|
263
273
|
recordCatalogAutoRefreshOutcome(outcome.catalogRefresh, outcome.changed, reloadRequired);
|
|
264
274
|
if (outcome.changed) {
|
|
275
|
+
try { linkFanout?.(); } catch { /* the scheduler's 5-minute poll catches the change */ }
|
|
265
276
|
// Privacy scan: no provider names, model ids, paths, or account identifiers.
|
|
266
277
|
console.info(reloadRequired
|
|
267
278
|
? "[catalog-auto-refresh] served model set changed; running Codex sessions keep the old list until restarted (ocx sync --restart-codex)"
|
|
@@ -104,23 +104,45 @@ function parseStoreBody(body: string | null): Store {
|
|
|
104
104
|
|| typeof job.createdAt !== "string" || typeof job.updatedAt !== "string")) throw new Error("invalid_store");
|
|
105
105
|
return value;
|
|
106
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Readers take no lock, and writers replace the ledger with a renamed private temp file. A rename that
|
|
109
|
+
* lands after this read's open unlinks the file it opened (no link left) and makes the path name a
|
|
110
|
+
* newer one; either is a concurrent write, so the read starts over. Each attempt applies every check, a
|
|
111
|
+
* hard-linked file is still refused at once, and a store that is still being replaced at the last
|
|
112
|
+
* attempt is refused like any other unsafe store.
|
|
113
|
+
*/
|
|
114
|
+
const REPLACED_STORE_READ_ATTEMPTS = 5;
|
|
115
|
+
type StoreReadStage = "opened" | "descriptor-checked";
|
|
116
|
+
let storeReadHookForTests: ((stage: StoreReadStage) => void) | null = null;
|
|
117
|
+
/** Test seam: runs inside each read attempt, after the open and after the descriptor checks. */
|
|
118
|
+
export function setCodexCliJobStoreReadHookForTests(hook: ((stage: StoreReadStage) => void) | null): void {
|
|
119
|
+
storeReadHookForTests = hook;
|
|
120
|
+
}
|
|
107
121
|
function readStore(configDir?: string): Store {
|
|
108
122
|
let p: ReturnType<typeof paths>;
|
|
109
123
|
try { p = prepare(configDir); }
|
|
110
124
|
catch (error) { if ((error as NodeJS.ErrnoException).code === "ENOENT") return { version: 1, jobs: [] }; throw error; }
|
|
111
|
-
let
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
125
|
+
for (let attempt = 1; ; attempt++) {
|
|
126
|
+
let fd: number | undefined;
|
|
127
|
+
try {
|
|
128
|
+
fd = openSync(p.file, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
|
|
129
|
+
storeReadHookForTests?.("opened");
|
|
130
|
+
const stat = fstatSync(fd);
|
|
131
|
+
if (!stat.isFile() || stat.size > CODEX_CLI_JOB_STORE_MAX_BYTES || (stat.mode & 0o077) !== 0
|
|
132
|
+
|| stat.uid !== process.geteuid?.() || stat.nlink > 1) throw new Error("unsafe_store");
|
|
133
|
+
storeReadHookForTests?.("descriptor-checked");
|
|
134
|
+
const lexical = lstatSync(p.file);
|
|
135
|
+
if (lexical.isSymbolicLink()) throw new Error("unsafe_store");
|
|
136
|
+
if (stat.nlink === 0 || lexical.dev !== stat.dev || lexical.ino !== stat.ino) {
|
|
137
|
+
if (attempt < REPLACED_STORE_READ_ATTEMPTS) continue;
|
|
138
|
+
throw new Error("unsafe_store");
|
|
139
|
+
}
|
|
140
|
+
const bytes = Buffer.alloc(CODEX_CLI_JOB_STORE_MAX_BYTES + 1);
|
|
141
|
+
const length = readSync(fd, bytes, 0, bytes.length, 0);
|
|
142
|
+
if (length > CODEX_CLI_JOB_STORE_MAX_BYTES) throw new Error("unsafe_store");
|
|
143
|
+
return parseStoreBody(bytes.subarray(0, length).toString("utf8"));
|
|
144
|
+
} finally { if (fd !== undefined) closeSync(fd); }
|
|
145
|
+
}
|
|
124
146
|
}
|
|
125
147
|
function rollbackInitializingLock(p: ReturnType<typeof paths>, lockIdentity: { dev: number; ino: number }, ownerIdentity?: { dev: number; ino: number }) {
|
|
126
148
|
try {
|
|
@@ -451,6 +451,8 @@ export interface CatalogProviderDiscoveryPolicySnapshot {
|
|
|
451
451
|
readonly preferFirst: CatalogDiscoveryPolicyField<readonly ProviderModelDiscoveryPredicate[] | undefined>;
|
|
452
452
|
readonly maxResponseBytes: number;
|
|
453
453
|
readonly maxModels: number;
|
|
454
|
+
/** Operator opt-in `modelDiscovery.skipInvalidRows` (#7910). */
|
|
455
|
+
readonly skipInvalidRows: boolean;
|
|
454
456
|
readonly trustedOpenAiApi: CatalogTrustedOpenAiApiPolicySnapshot;
|
|
455
457
|
}
|
|
456
458
|
|
package/src/codex/convergence.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { join } from "node:path";
|
|
|
4
4
|
import { compareCatalogHealPaths } from "./catalog/heal-observation";
|
|
5
5
|
|
|
6
6
|
import { getConfigDir, saveConfigPreservingClaudeCode, ultraFastTierEnabled, websocketsEnabled, withExpectedConfigGenerationSync } from "../config";
|
|
7
|
+
import { resolveMultiAgentMode } from "../config/multi-agent-surface";
|
|
7
8
|
import { reconcileSuccessfulModelDiscoveries } from "../providers/new-model-policy";
|
|
8
9
|
import { pendingModelSelectionProviders } from "../providers/initial-model-selection";
|
|
9
10
|
import { COMBO_NAMESPACE } from "../combos";
|
|
@@ -276,8 +277,7 @@ function prepareCatalog(
|
|
|
276
277
|
const featured = config.subagentModels ?? [];
|
|
277
278
|
const ordered = orderForSubagents(enabled, featured);
|
|
278
279
|
const modelPickerOrder = config.modelPickerOrder ?? [];
|
|
279
|
-
const multiAgentMode = config
|
|
280
|
-
? config.multiAgentMode : "default";
|
|
280
|
+
const multiAgentMode = resolveMultiAgentMode(config);
|
|
281
281
|
const exactComboSlugs = exactComboCatalogSlugs(config);
|
|
282
282
|
const bareEligibleAccountIds = providerCodexAccountMode(
|
|
283
283
|
OPENAI_CODEX_PROVIDER_ID,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { readFileSync, statSync, type BigIntStats } from 'node:fs';
|
|
2
1
|
import { createHash, randomUUID } from 'node:crypto';
|
|
2
|
+
import { nativeAuthStatStamp, readNativeMainAuthBytesStable } from '../native-main-auth-file';
|
|
3
3
|
import type { UsageIdentity } from './usage-controller';
|
|
4
4
|
|
|
5
5
|
type Credential = { identity: UsageIdentity; accessToken: string };
|
|
@@ -9,14 +9,10 @@ const equal = (a: UsageIdentity, b: UsageIdentity) => a.id === b.id && a.userId
|
|
|
9
9
|
/** Local native credentials remain in memory and are never returned by the public reader. */
|
|
10
10
|
export function createNativeIdentityReader(authPath: string, upstreamFetch: typeof fetch = fetch) {
|
|
11
11
|
const readerId = randomUUID(); let generation = 0, previousSnapshot: string | undefined;
|
|
12
|
-
const stamp = (value: BigIntStats) =>
|
|
13
|
-
`${value.dev}:${value.ino}:${value.size}:${value.mtimeNs}:${value.ctimeNs}`;
|
|
14
12
|
const readCredential = (): Credential => {
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
if (stamp(before) !== stamp(after)) throw new Error('Native credentials changed during read');
|
|
19
|
-
const snapshot = `${stamp(after)}:${createHash('sha256').update(text).digest('hex')}`;
|
|
13
|
+
const { bytes, stat: after } = readNativeMainAuthBytesStable(authPath, 1048576n);
|
|
14
|
+
const text = bytes.toString('utf8');
|
|
15
|
+
const snapshot = `${nativeAuthStatStamp(after)}:${createHash('sha256').update(text).digest('hex')}`;
|
|
20
16
|
if (snapshot !== previousSnapshot) { previousSnapshot = snapshot; generation++; }
|
|
21
17
|
const auth = JSON.parse(text);
|
|
22
18
|
if (auth.auth_mode !== 'chatgpt' || typeof auth.tokens?.id_token !== 'string'
|
package/src/codex/features.ts
CHANGED
|
@@ -1468,9 +1468,9 @@ function activeThreadComment(content: string, v2Enabled: boolean): string | unde
|
|
|
1468
1468
|
let legacy = (entries.find(entry => entry.key === AGENTS_THREAD_LIMIT_KEY) ?? entries[0])?.comment;
|
|
1469
1469
|
for (const entry of entries) legacy = mergeTrailingComments(legacy, entry.comment) || undefined;
|
|
1470
1470
|
const dedicated = tomlTableBody(content, "features.multi_agent_v2")
|
|
1471
|
-
?.match(/^\s*max_concurrent_threads_per_session\s*=\s*\d+(\
|
|
1471
|
+
?.match(/^\s*max_concurrent_threads_per_session\s*=\s*\d+([ \t]*#.*)$/m)?.[1];
|
|
1472
1472
|
const features = tomlTableBody(content, "features");
|
|
1473
|
-
const inlineLine = features?.match(/^\s*multi_agent_v2\s*=\s*\{([^}]*)\}(\
|
|
1473
|
+
const inlineLine = features?.match(/^\s*multi_agent_v2\s*=\s*\{([^}]*)\}([ \t]*#.*)$/m);
|
|
1474
1474
|
const inline = inlineLine && /(?:^|,)\s*max_concurrent_threads_per_session\s*=\s*\d+\s*(?:,|$)/.test(inlineLine[1])
|
|
1475
1475
|
? inlineLine[2]
|
|
1476
1476
|
: undefined;
|
|
@@ -347,6 +347,14 @@ export const HISTORY_RELABEL_STANDS_DOWN = "history_paginated_requires_native_wr
|
|
|
347
347
|
*/
|
|
348
348
|
export const HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE = "history_paginated_openai_requires_native_writer";
|
|
349
349
|
|
|
350
|
+
/**
|
|
351
|
+
* The same paginated `openai` rows, found while the resolved Codex is 0.166 or later (#8191).
|
|
352
|
+
* Those builds resume or list a thread only under the provider it was created with, so the retained
|
|
353
|
+
* root override no longer keeps these rows reachable once the default provider changes. A hard
|
|
354
|
+
* refusal: nothing is relabeled or rewritten, and the transition does not happen.
|
|
355
|
+
*/
|
|
356
|
+
export const HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED = "history_paginated_openai_provider_locked";
|
|
357
|
+
|
|
350
358
|
function assertLegacyHistoryRecord(line: string): void {
|
|
351
359
|
let value: unknown;
|
|
352
360
|
try { value = JSON.parse(line); } catch { throw new CodexHistoryIntegrityError("history_rollout_record_invalid"); }
|
|
@@ -482,6 +490,29 @@ export function preflightCodexHistoryInjection(
|
|
|
482
490
|
}
|
|
483
491
|
}
|
|
484
492
|
|
|
493
|
+
/**
|
|
494
|
+
* Read-only: does this store hold an `openai`-tagged thread Codex has already paginated (#8191)?
|
|
495
|
+
* For a transition whose preflight scans no rows (client compaction relabels nothing) but which
|
|
496
|
+
* still makes `opencodex` the default provider. Null when the store cannot be read.
|
|
497
|
+
*/
|
|
498
|
+
export function hasPaginatedOpenaiThreads(stateDbPath?: string): boolean | null {
|
|
499
|
+
let db: Database | undefined;
|
|
500
|
+
try {
|
|
501
|
+
const resolvedPath = stateDbPath ?? resolveCodexStateDbPath();
|
|
502
|
+
if (!existsSync(resolvedPath)) return false;
|
|
503
|
+
db = openCodexStateForPreflight(resolvedPath);
|
|
504
|
+
const columns = db.query<{ name: string }, []>("PRAGMA table_info(threads)").all();
|
|
505
|
+
if (!columns.some(column => column.name === "history_mode")) return false;
|
|
506
|
+
return db.query<{ hit: number }, []>(
|
|
507
|
+
"SELECT 1 AS hit FROM threads WHERE model_provider = 'openai' AND history_mode = 'paginated' LIMIT 1",
|
|
508
|
+
).get() !== null;
|
|
509
|
+
} catch {
|
|
510
|
+
return null;
|
|
511
|
+
} finally {
|
|
512
|
+
db?.close();
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
|
|
485
516
|
function integrityFailureResult(error: CodexHistoryIntegrityError): CodexHistorySyncResult {
|
|
486
517
|
return {
|
|
487
518
|
rows: error.progress.rows,
|
|
@@ -6,7 +6,7 @@ import type { CodexCliSelectionAsyncParentWrite } from "../cli-update-selection-
|
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Reconcile the native `features.multi_agent_v2` override when an injection carries an
|
|
9
|
-
* explicit
|
|
9
|
+
* explicit pin-driven surface ("v1" or "v2-plaintext").
|
|
10
10
|
*
|
|
11
11
|
* Codex resolves the global v2 feature before catalog-level `multi_agent_version` pins, so a
|
|
12
12
|
* config.toml that still enables `multi_agent_v2` would run v2 sessions under a catalog the
|
|
@@ -15,6 +15,11 @@ import type { CodexCliSelectionAsyncParentWrite } from "../cli-update-selection-
|
|
|
15
15
|
* injection on a previously-v2 Codex home the common trigger. The explicit mode selectors
|
|
16
16
|
* (`ocx v2 mode`, `PUT /api/v2`) already run the same format-preserving transition; this is
|
|
17
17
|
* the injection-side half of that contract.
|
|
18
|
+
*
|
|
19
|
+
* "v2-plaintext" joins the reconcile for a different reason: its whole surface already
|
|
20
|
+
* runs v2, but through catalog pins rather than the global feature. Leaving the flag on
|
|
21
|
+
* would outrank those pins and change the native agent-enable and thread-limit semantics,
|
|
22
|
+
* so the flag is disabled the same way.
|
|
18
23
|
*/
|
|
19
24
|
export type InjectedV1SurfaceReconcile =
|
|
20
25
|
| { ok: true; content: string; changed: boolean }
|
|
@@ -67,7 +72,8 @@ export async function prepareInjectedV1SurfaceReconcile(
|
|
|
67
72
|
config: Pick<OcxConfig, "multiAgentMode"> | undefined,
|
|
68
73
|
options: { validateOnly?: boolean },
|
|
69
74
|
): Promise<PreparedV1SurfaceReconcile | null> {
|
|
70
|
-
|
|
75
|
+
const mode = config?.multiAgentMode;
|
|
76
|
+
if (options.validateOnly || (mode !== "v1" && mode !== "v2-plaintext")) {
|
|
71
77
|
return null;
|
|
72
78
|
}
|
|
73
79
|
const { isMultiAgentV2Enabled, transitionMultiAgentV2 } = await import("../features");
|
|
@@ -115,7 +121,7 @@ export async function prepareInjectedV1SurfaceReconcile(
|
|
|
115
121
|
if (transition.retryable === false) throw new ConfigWriteDestinationChanged(transition.error);
|
|
116
122
|
return {
|
|
117
123
|
ok: false,
|
|
118
|
-
message: `Codex config injection refused: could not reconcile the
|
|
124
|
+
message: `Codex config injection refused: could not reconcile the ${mode} surface with the global multi_agent_v2 feature: ${transition.error}.`,
|
|
119
125
|
};
|
|
120
126
|
}
|
|
121
127
|
return { ok: true, content: readFileSync(CODEX_CONFIG_PATH, "utf-8"), changed: transition.changed };
|
|
@@ -22,7 +22,12 @@
|
|
|
22
22
|
* this proxy — the same guarantee the injector already makes everywhere else about a line
|
|
23
23
|
* it does not own.
|
|
24
24
|
*/
|
|
25
|
-
import {
|
|
25
|
+
import {
|
|
26
|
+
HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE,
|
|
27
|
+
HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED,
|
|
28
|
+
HISTORY_RELABEL_STANDS_DOWN,
|
|
29
|
+
} from "../history-provider";
|
|
30
|
+
import { compareCodexVersions, loadPersistedCodexRuntime, peekCodexRuntimeProcessCache } from "../runtime";
|
|
26
31
|
import { applyEol, setRootOpenaiBaseUrlForTarget, stripInjectedOpenaiBaseUrl } from "./config-toml";
|
|
27
32
|
import type { CodexRoutingTarget } from "./routing-target";
|
|
28
33
|
|
|
@@ -59,6 +64,42 @@ function admissionTokenRefusal(): string {
|
|
|
59
64
|
+ "or set syncResumeHistory to false to accept that those conversations resume against Codex's own OpenAI endpoint.";
|
|
60
65
|
}
|
|
61
66
|
|
|
67
|
+
/**
|
|
68
|
+
* The resolved Codex version without running anything: the process memo when it is fresh, else
|
|
69
|
+
* the persisted selection (`selectedVersion`; the record's `version` field is its schema number).
|
|
70
|
+
* Null when neither knows, which keeps the pre-0.166 behavior.
|
|
71
|
+
*/
|
|
72
|
+
export function passiveCodexVersion(): string | null {
|
|
73
|
+
try {
|
|
74
|
+
const peek = peekCodexRuntimeProcessCache();
|
|
75
|
+
if (peek.kind === "available" && peek.value.runtime.version) return peek.value.runtime.version;
|
|
76
|
+
return loadPersistedCodexRuntime()?.selectedVersion ?? null;
|
|
77
|
+
} catch {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** The first Codex that refuses to resume a thread under another provider (codex-cli 0.166.0-alpha). */
|
|
83
|
+
export const CODEX_PROVIDER_LOCKED_SINCE = "0.166.0-alpha.0";
|
|
84
|
+
|
|
85
|
+
/** True when the known Codex refuses to resume a thread under another provider. */
|
|
86
|
+
export function codexLocksResumeProvider(codexVersion?: string | null): boolean {
|
|
87
|
+
return Boolean(codexVersion) && compareCodexVersions(codexVersion!, CODEX_PROVIDER_LOCKED_SINCE) >= 0;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Named next actions for a home where the retained override cannot work any more. Each is a
|
|
92
|
+
* configuration key the operator already owns; none touches the threads.
|
|
93
|
+
*/
|
|
94
|
+
function providerLockedRefusal(codexVersion: string): string {
|
|
95
|
+
return `Codex config injection refused: ${HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED}. `
|
|
96
|
+
+ "Existing provider definitions and conversation files were preserved. "
|
|
97
|
+
+ `This home has conversations tagged openai whose history Codex has already migrated to its paginated format, and Codex ${codexVersion} (0.166 or later) resumes a conversation only under the provider it was created with. `
|
|
98
|
+
+ "Switching the default provider to opencodex would leave those conversations unable to resume, so nothing was changed. "
|
|
99
|
+
+ "To keep them resumable, leave codexDesktopAuthless and codexClientCompaction off. "
|
|
100
|
+
+ "To switch anyway and accept that those conversations stay with the openai provider, set syncResumeHistory to false.";
|
|
101
|
+
}
|
|
102
|
+
|
|
62
103
|
/**
|
|
63
104
|
* Resolve the transition, retaining the root override when this routing form can own one.
|
|
64
105
|
*
|
|
@@ -71,10 +112,22 @@ export function applyPaginatedOpenaiCompat(
|
|
|
71
112
|
target: CodexRoutingTarget,
|
|
72
113
|
content: string,
|
|
73
114
|
eol: "\r\n" | "\n",
|
|
115
|
+
/** The resolved Codex version when known; null or absent keeps the pre-0.166 retention. */
|
|
116
|
+
codexVersion?: string | null,
|
|
74
117
|
): PaginatedOpenaiCompatDecision {
|
|
75
118
|
if (refusal !== HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE) {
|
|
76
119
|
return { refusal, content, retainedRootOverride: false, message: refusal ? genericRefusal(refusal) : "" };
|
|
77
120
|
}
|
|
121
|
+
// Checked before every other branch: on 0.166+ neither the retained override, an admission
|
|
122
|
+
// token nor a user-owned root line keeps an openai-tagged thread resumable under opencodex.
|
|
123
|
+
if (codexVersion && codexLocksResumeProvider(codexVersion)) {
|
|
124
|
+
return {
|
|
125
|
+
refusal: HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED,
|
|
126
|
+
content,
|
|
127
|
+
retainedRootOverride: false,
|
|
128
|
+
message: providerLockedRefusal(codexVersion),
|
|
129
|
+
};
|
|
130
|
+
}
|
|
78
131
|
if (target.requiresAdmissionToken === true) {
|
|
79
132
|
return { refusal, content, retainedRootOverride: false, message: admissionTokenRefusal() };
|
|
80
133
|
}
|
package/src/codex/inject/plan.ts
CHANGED
|
@@ -12,6 +12,8 @@
|
|
|
12
12
|
import { existsSync, readFileSync } from "node:fs";
|
|
13
13
|
import { websocketsEnabled } from "../../config";
|
|
14
14
|
import {
|
|
15
|
+
hasPaginatedOpenaiThreads,
|
|
16
|
+
HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE,
|
|
15
17
|
HISTORY_RELABEL_STANDS_DOWN,
|
|
16
18
|
preflightCodexHistoryInjection,
|
|
17
19
|
} from "../history-provider";
|
|
@@ -52,7 +54,7 @@ import {
|
|
|
52
54
|
usesProviderTable,
|
|
53
55
|
type CodexRoutingTarget,
|
|
54
56
|
} from "./routing-target";
|
|
55
|
-
import { applyPaginatedOpenaiCompat } from "./paginated-openai-compat";
|
|
57
|
+
import { applyPaginatedOpenaiCompat, codexLocksResumeProvider } from "./paginated-openai-compat";
|
|
56
58
|
|
|
57
59
|
/** Everything the plan needs that is not the config.toml input text. */
|
|
58
60
|
export interface CodexInjectionPlanContext {
|
|
@@ -62,6 +64,12 @@ export interface CodexInjectionPlanContext {
|
|
|
62
64
|
readonly catalogPathOption: string | null | undefined;
|
|
63
65
|
/** Journal reads stay read-only while a client guard owns the write channel. */
|
|
64
66
|
readonly journalReadOnly: boolean;
|
|
67
|
+
/**
|
|
68
|
+
* The resolved Codex version from a passive read, or null when unknown. From 0.166 a paginated
|
|
69
|
+
* openai-tagged row can no longer resume under opencodex, so the table transition is refused
|
|
70
|
+
* instead of retaining the root override (#8191).
|
|
71
|
+
*/
|
|
72
|
+
readonly codexVersion?: string | null;
|
|
65
73
|
}
|
|
66
74
|
|
|
67
75
|
/** The ok-variant of the plan: every derived artifact and reportable warning. */
|
|
@@ -375,7 +383,17 @@ export function deriveCodexInjectionPlan(
|
|
|
375
383
|
* existing provider references resolvable. Existing provider definitions are retained
|
|
376
384
|
* before the witness; no post-commit compensation may overwrite a newer native write.
|
|
377
385
|
*/
|
|
378
|
-
|
|
386
|
+
// Client compaction relabels nothing, so its preflight scans no rows, yet it still makes
|
|
387
|
+
// `opencodex` the default provider. On a Codex that locks resume to the creating provider
|
|
388
|
+
// (#8191), probe the store read-only so the same refusal applies; older or unknown versions
|
|
389
|
+
// keep the retained override and add no read.
|
|
390
|
+
let preflight = historyPreflight();
|
|
391
|
+
if (preflight === null && compactionOnly && preflightTableMode && config?.syncResumeHistory !== false
|
|
392
|
+
&& codexLocksResumeProvider(ctx.codexVersion)
|
|
393
|
+
&& hasPaginatedOpenaiThreads(resolveCodexStateDbPath({ readConfig: () => content })) === true) {
|
|
394
|
+
preflight = HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE;
|
|
395
|
+
}
|
|
396
|
+
const compat = applyPaginatedOpenaiCompat(preflight, routingTarget, content, eol, ctx.codexVersion);
|
|
379
397
|
content = compat.content;
|
|
380
398
|
keepRootOverrideAlongsideTable ||= compat.retainedRootOverride;
|
|
381
399
|
const observedHistoryRefusal = compat.refusal;
|
package/src/codex/inject.ts
CHANGED
|
@@ -49,6 +49,7 @@ import {
|
|
|
49
49
|
} from "./journal";
|
|
50
50
|
import { HISTORY_RELABEL_STANDS_DOWN } from "./history-provider";
|
|
51
51
|
import { formatApplyHistoryFailure } from "./inject/history-failure";
|
|
52
|
+
import { passiveCodexVersion } from "./inject/paginated-openai-compat";
|
|
52
53
|
import {
|
|
53
54
|
deriveCodexHistoryOperation,
|
|
54
55
|
resolveCodexHistoryJobTarget,
|
|
@@ -298,6 +299,7 @@ async function injectCodexConfigImpl(
|
|
|
298
299
|
routingTarget,
|
|
299
300
|
catalogPathOption: options.catalogPath,
|
|
300
301
|
journalReadOnly: !!options.beforeClientWrite,
|
|
302
|
+
codexVersion: passiveCodexVersion(),
|
|
301
303
|
};
|
|
302
304
|
const admittedPlan = deriveCodexInjectionPlan(rawContent, planContext);
|
|
303
305
|
if (admittedPlan.kind === "refused") {
|