@bitkyc08/opencodex 2.100.2 → 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-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.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-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- 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 +3 -3
- 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/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- 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/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 +43 -8
- package/src/claude/auth-detect.ts +21 -33
- 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/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- 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 +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- 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 +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- 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 +218 -40
- 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 +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -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 +28 -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 -15
- package/src/cli/sync-fanout.ts +74 -19
- 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-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.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 +22 -3
- 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-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- 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.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 +23 -1
- 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 +25 -5
- package/src/combos/failover.ts +330 -2
- 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/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- 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/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- 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 +28 -2
- 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-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- 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 +12 -3
- 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/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 +50 -10
- 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 +172 -24
- 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 +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -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/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- 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/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 +24 -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 +7 -0
- 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.ts +3 -0
- 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.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- 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-rename-fields.ts +3 -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/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- 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 +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -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/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- 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 +2 -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 +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- 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/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -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 +97 -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/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 +145 -43
- 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 +83 -7
- package/src/server/management/link-routes.ts +553 -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 +36 -13
- 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 +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -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 +17 -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-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 +5 -7
- 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 +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -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 +74 -73
- 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 +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- 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/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -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/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -2,8 +2,8 @@ import { getMainAccountExternalUsageWarning, type MainAccountExternalUsageWarnin
|
|
|
2
2
|
import { codexCreditsDtoField, hasCodexCreditsObservation, pruneCodexCredits } from "../credits";
|
|
3
3
|
import type { CodexCredits } from "../credits";
|
|
4
4
|
import { codexAccountLogLabel } from "../account-label";
|
|
5
|
-
import { poolQuotaHistoryIdentity, getCodexAccountCredential, getValidCodexToken, isCodexAccountGenerationLive, readCodexAccountRecord } from "../account-store";
|
|
6
|
-
import { getAccountQuota, isCodexQuotaExhausted, setAccountQuotaFromParsed, withoutRetiredCodexQuota } from "../quota";
|
|
5
|
+
import { codexAccountRecordFromSnapshot, loadCodexAccountRecordSnapshot, poolQuotaHistoryIdentity, poolQuotaHistoryIdentityOf, getCodexAccountCredential, getValidCodexToken, isCodexAccountGenerationLive, readCodexAccountRecord } from "../account-store";
|
|
6
|
+
import { getAccountQuota, getAccountWeeklyQuotaConflicts, isCodexQuotaExhausted, setAccountQuotaFromParsed, withoutRetiredCodexQuota } from "../quota";
|
|
7
7
|
import type { StoredAccountQuota } from "../quota";
|
|
8
8
|
import { ConfigMutationLockError, mutatePersistedConfig } from "../../config";
|
|
9
9
|
import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
|
|
@@ -23,6 +23,7 @@ import { getMainAccountHardLockStatus } from "../main-account-hard-lock";
|
|
|
23
23
|
import type { MainAccountHardLockStatus } from "../main-account-hard-lock";
|
|
24
24
|
import { emailMaskingEnabled, projectEmail } from "../../lib/privacy";
|
|
25
25
|
import type { CodexAccount, OcxConfig } from "../../types";
|
|
26
|
+
import type { CodexAccountCredentialRecord } from "../../types";
|
|
26
27
|
import { oauthAccountHealthFields, projectCodexAccountHealth } from "../../oauth/health";
|
|
27
28
|
import type { OAuthAccountHealth, OAuthHealthLabel } from "../../oauth/health";
|
|
28
29
|
import { isSelectableCodexPoolAccount } from "../account-id";
|
|
@@ -105,6 +106,15 @@ export type CodexAccountReauthReason =
|
|
|
105
106
|
| "unauthorized"
|
|
106
107
|
| "forbidden";
|
|
107
108
|
|
|
109
|
+
/** One store read for a lone row; same fail-closed shape as `poolQuotaHistoryIdentity`. */
|
|
110
|
+
function readPoolRecordOnce(accountId: string): CodexAccountCredentialRecord | null {
|
|
111
|
+
try {
|
|
112
|
+
return codexAccountRecordFromSnapshot(loadCodexAccountRecordSnapshot(), accountId);
|
|
113
|
+
} catch {
|
|
114
|
+
return null;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
108
118
|
export function poolAccountDto(
|
|
109
119
|
config: OcxConfig,
|
|
110
120
|
account: CodexAccount,
|
|
@@ -114,6 +124,11 @@ export function poolAccountDto(
|
|
|
114
124
|
priority: number,
|
|
115
125
|
maskEmails: boolean,
|
|
116
126
|
upstreamAccountKey?: string,
|
|
127
|
+
/**
|
|
128
|
+
* This account's credential record from the caller's one store snapshot. A roster listing
|
|
129
|
+
* passes it so the row costs no store read; a lone caller omits it and the row reads once.
|
|
130
|
+
*/
|
|
131
|
+
storeRecord?: CodexAccountCredentialRecord | null,
|
|
117
132
|
): CodexAuthAccountDto {
|
|
118
133
|
const plan = codexPlanValue(account.plan);
|
|
119
134
|
const quota = quotaForPlan(quotaResult.quota, plan);
|
|
@@ -139,6 +154,8 @@ export function poolAccountDto(
|
|
|
139
154
|
// account took their model away and why, so name the cause they actually have to act on.
|
|
140
155
|
const reauthReason: CodexAccountReauthReason | undefined = rawReauthReason ?? (health.status === "reauth_required" ? health.reason : undefined);
|
|
141
156
|
const duplicateMain = configuredCodexMainDuplicate(config, account.id);
|
|
157
|
+
const record = storeRecord !== undefined ? storeRecord : readPoolRecordOnce(account.id);
|
|
158
|
+
const weeklyQuotaConflicts = getAccountWeeklyQuotaConflicts(account.id, record);
|
|
142
159
|
return {
|
|
143
160
|
id: account.id,
|
|
144
161
|
slotId: account.id,
|
|
@@ -156,7 +173,8 @@ export function poolAccountDto(
|
|
|
156
173
|
creditsAfterLimit: codexAccountUsesCreditsAfterLimit(config, account.id),
|
|
157
174
|
useRemainingQuota: codexAccountUsesRemainingQuota(config, account.id),
|
|
158
175
|
quota: quota ? { ...quota } : null,
|
|
159
|
-
...
|
|
176
|
+
...(weeklyQuotaConflicts.length > 0 ? { weeklyQuotaConflicts } : {}),
|
|
177
|
+
...codexCreditsDtoField(config, account.id, poolQuotaHistoryIdentityOf(record) ?? null),
|
|
160
178
|
needsReauth: needsReauth || health.status === "reauth_required",
|
|
161
179
|
...(reauthReason !== undefined ? { reauthReason } : {}),
|
|
162
180
|
...(duplicateMain ? {
|
|
@@ -194,6 +212,8 @@ export interface CodexAuthAccountDto {
|
|
|
194
212
|
creditsAfterLimit?: boolean;
|
|
195
213
|
useRemainingQuota?: boolean;
|
|
196
214
|
quota: (StoredAccountQuota | (Omit<StoredAccountQuota, "updatedAt"> & { updatedAt: number })) | null;
|
|
215
|
+
/** Live weekly windows this account reported in contradiction (#8574); display only. */
|
|
216
|
+
weeklyQuotaConflicts?: import("../quota-window-conflict").WeeklyWindowConflict[];
|
|
197
217
|
credits?: CodexCredits;
|
|
198
218
|
needsReauth?: boolean;
|
|
199
219
|
/**
|
|
@@ -352,6 +372,9 @@ export async function listCodexAuthAccountsSnapshot(
|
|
|
352
372
|
});
|
|
353
373
|
reconcileFreshPoolAccountPlans(runtimeConfig, planUpdates);
|
|
354
374
|
|
|
375
|
+
// One store snapshot for every row's history identity and credential generation, read after
|
|
376
|
+
// the probes settle so a refresh during them is already visible.
|
|
377
|
+
const storeRecords = loadCodexAccountRecordSnapshot();
|
|
355
378
|
const withQuota = refreshedPool.flatMap(({ accountId, quotaResult }) => {
|
|
356
379
|
const currentAccount = configuredPoolAccount(runtimeConfig, accountId);
|
|
357
380
|
if (!currentAccount) return [];
|
|
@@ -365,6 +388,8 @@ export async function listCodexAuthAccountsSnapshot(
|
|
|
365
388
|
isCodexAccountPaused(runtimeConfig, accountId),
|
|
366
389
|
getCodexAccountPriority(runtimeConfig, accountId),
|
|
367
390
|
maskEmails,
|
|
391
|
+
undefined,
|
|
392
|
+
codexAccountRecordFromSnapshot(storeRecords, accountId),
|
|
368
393
|
)];
|
|
369
394
|
}
|
|
370
395
|
const resultGeneration = quotaResult.credentialGeneration ?? quotaResult.freshCredentialGeneration;
|
|
@@ -392,6 +417,7 @@ export async function listCodexAuthAccountsSnapshot(
|
|
|
392
417
|
maskEmails,
|
|
393
418
|
codexUpstreamAccountKey(identitySecret, verifiedAccountId,
|
|
394
419
|
user.conflict ? undefined : user.userId),
|
|
420
|
+
codexAccountRecordFromSnapshot(storeRecords, accountId),
|
|
395
421
|
)];
|
|
396
422
|
});
|
|
397
423
|
const projectSnapshot = (mainRefreshRefused = false): CodexAuthAccountsSnapshot => {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { readFileSync } from "node:fs";
|
|
2
1
|
import { join } from "node:path";
|
|
3
2
|
import { getCodexAccountCredential } from "./account-store";
|
|
4
3
|
import { loadConfig } from "../config";
|
|
@@ -7,7 +6,7 @@ import { extractAccountId } from "../oauth/chatgpt";
|
|
|
7
6
|
import { isSelectableCodexPoolAccount, MAIN_CODEX_ACCOUNT_ID } from "./account-id";
|
|
8
7
|
import { codexPlanKey } from "./plan";
|
|
9
8
|
import { getObservedMainCodexCollisionIdentity, sameCodexCollisionIdentity, type CodexCollisionIdentity } from "./collision-identity";
|
|
10
|
-
import {
|
|
9
|
+
import { readNativeMainAuthBytes } from "./native-main-auth-file";
|
|
11
10
|
|
|
12
11
|
export interface CodexTokens {
|
|
13
12
|
access_token: string;
|
|
@@ -25,6 +24,25 @@ export type CodexTokenReadResult =
|
|
|
25
24
|
| { status: "ok"; tokens: CodexTokens }
|
|
26
25
|
| { status: "missing" | "invalid" | "unreadable" };
|
|
27
26
|
|
|
27
|
+
function parseCodexTokens(raw: string): CodexTokenReadResult {
|
|
28
|
+
try {
|
|
29
|
+
const j = JSON.parse(raw) as {
|
|
30
|
+
tokens?: { access_token?: string; account_id?: string; id_token?: string };
|
|
31
|
+
};
|
|
32
|
+
if (!j?.tokens?.access_token) return { status: "invalid" };
|
|
33
|
+
return {
|
|
34
|
+
status: "ok",
|
|
35
|
+
tokens: {
|
|
36
|
+
access_token: j.tokens.access_token,
|
|
37
|
+
account_id: j.tokens.account_id ?? "",
|
|
38
|
+
id_token: j.tokens.id_token,
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
} catch {
|
|
42
|
+
return { status: "invalid" };
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
28
46
|
function hasErrnoCode(error: unknown, code: string): boolean {
|
|
29
47
|
return typeof error === "object" && error !== null && "code" in error
|
|
30
48
|
&& (error as { code?: unknown }).code === code;
|
|
@@ -45,28 +63,11 @@ export function readCodexTokensResult(
|
|
|
45
63
|
): CodexTokenReadResult {
|
|
46
64
|
let raw: string;
|
|
47
65
|
try {
|
|
48
|
-
raw = options?.bounded === true
|
|
49
|
-
? readBounded(authPath, MAX_AUTH_BYTES).toString("utf-8")
|
|
50
|
-
: readFileSync(authPath, "utf-8");
|
|
66
|
+
raw = readNativeMainAuthBytes(authPath, options?.bounded === true ? "bounded" : "plain").toString("utf-8");
|
|
51
67
|
} catch (error) {
|
|
52
68
|
return { status: hasErrnoCode(error, "ENOENT") ? "missing" : "unreadable" };
|
|
53
69
|
}
|
|
54
|
-
|
|
55
|
-
const j = JSON.parse(raw) as {
|
|
56
|
-
tokens?: { access_token?: string; account_id?: string; id_token?: string };
|
|
57
|
-
};
|
|
58
|
-
if (!j?.tokens?.access_token) return { status: "invalid" };
|
|
59
|
-
return {
|
|
60
|
-
status: "ok",
|
|
61
|
-
tokens: {
|
|
62
|
-
access_token: j.tokens.access_token,
|
|
63
|
-
account_id: j.tokens.account_id ?? "",
|
|
64
|
-
id_token: j.tokens.id_token,
|
|
65
|
-
},
|
|
66
|
-
};
|
|
67
|
-
} catch {
|
|
68
|
-
return { status: "invalid" };
|
|
69
|
-
}
|
|
70
|
+
return parseCodexTokens(raw);
|
|
70
71
|
}
|
|
71
72
|
|
|
72
73
|
/**
|
|
@@ -132,7 +133,7 @@ export function readMainAuth(authPath = join(resolveCodexHomeDir(), "auth.json")
|
|
|
132
133
|
const main = readCodexTokensResult(authPath, { bounded: true });
|
|
133
134
|
if (main.status !== "invalid") return main;
|
|
134
135
|
try {
|
|
135
|
-
const j: unknown = JSON.parse(
|
|
136
|
+
const j: unknown = JSON.parse(readNativeMainAuthBytes(authPath, "bounded").toString("utf-8"));
|
|
136
137
|
if (j === null || typeof j !== "object" || Array.isArray(j)) return main;
|
|
137
138
|
const envelope = j as { auth_mode?: unknown; OPENAI_API_KEY?: unknown; tokens?: unknown };
|
|
138
139
|
const apiKeyOnly = envelope.tokens == null
|
|
@@ -25,7 +25,7 @@ import {
|
|
|
25
25
|
import { isAccountNeedsReauth, markAccountNeedsReauth } from "./account-runtime-state";
|
|
26
26
|
import { ConfigMutationLockError } from "../config";
|
|
27
27
|
import { NativeProfileError } from "./native-profile-types";
|
|
28
|
-
import { codexAccountUnusableReason, isCodexAccountUsable } from "./account-usability";
|
|
28
|
+
import { codexAccountUnusableReason, codexPoolOnlyExcludesMain, isCodexAccountUsable } from "./account-usability";
|
|
29
29
|
import { reconcileMainCodexAccountRuntimeState } from "./account-lifecycle";
|
|
30
30
|
import {
|
|
31
31
|
MAIN_CODEX_ACCOUNT_ID,
|
|
@@ -1109,6 +1109,10 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1109
1109
|
throw new CodexReserveUnavailableError();
|
|
1110
1110
|
}
|
|
1111
1111
|
const fixedAccountId = reserve ? MAIN_CODEX_ACCOUNT_ID : options.accountId;
|
|
1112
|
+
// #7410: automatic Pool resolution under `codexPool.poolOnly` never serves native main. Explicit
|
|
1113
|
+
// selectors (fixed account, Reserve) and Direct mode are operator choices outside the policy.
|
|
1114
|
+
// Read from the routing config, the same object the shared usability decision reads.
|
|
1115
|
+
const poolOnlyApplies = mode === "pool" && fixedAccountId === undefined && codexPoolOnlyExcludesMain(config);
|
|
1112
1116
|
const quotaScope = codexQuotaScopeForModel(options.modelId);
|
|
1113
1117
|
// Pool pins and fallback must not resurrect an observed main credential that is cooling
|
|
1114
1118
|
// down. Unrelated caller-owned credentials and explicit Direct keep their own policy.
|
|
@@ -1226,7 +1230,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1226
1230
|
// is the one exception where that exclusion is selection evidence in the opposite direction.
|
|
1227
1231
|
// Validate the caller's own gated-model roster before using it, and fall through to a Pool model
|
|
1228
1232
|
// detour when it lacks the grant. This branch performs no physical-main credential read.
|
|
1229
|
-
if (preserveRequestOwnedMainPin()) {
|
|
1233
|
+
if (!poolOnlyApplies && preserveRequestOwnedMainPin()) {
|
|
1230
1234
|
const callerEntitled = !options.modelId
|
|
1231
1235
|
|| !ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(options.modelId)
|
|
1232
1236
|
|| await (
|
|
@@ -1306,6 +1310,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1306
1310
|
// A fileless login can change identity even while its previous expiry observation is usable.
|
|
1307
1311
|
// The selector discovers it before identity-bound quota or hard-lock policy; dispatch still revalidates it.
|
|
1308
1312
|
if (selectionAdmission && !nativeMainReadsForbidden && !options.isMainAccountTokenLive
|
|
1313
|
+
&& !poolOnlyApplies
|
|
1309
1314
|
&& (fixedAccountId === undefined || fixedAccountId === MAIN_CODEX_ACCOUNT_ID)
|
|
1310
1315
|
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1311
1316
|
&& !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
|
|
@@ -1317,7 +1322,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1317
1322
|
} catch (cause) { mainDiscoveryFailure = cause; }
|
|
1318
1323
|
options.signal?.throwIfAborted();
|
|
1319
1324
|
}
|
|
1320
|
-
const excludeAccountIds = nativeMainReadsForbidden
|
|
1325
|
+
const excludeAccountIds = nativeMainReadsForbidden || poolOnlyApplies
|
|
1321
1326
|
? new Set([MAIN_CODEX_ACCOUNT_ID])
|
|
1322
1327
|
: undefined;
|
|
1323
1328
|
const mainModelGrantUnobserved = excludeAccountIds?.has(MAIN_CODEX_ACCOUNT_ID) === true;
|
|
@@ -1354,6 +1359,8 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1354
1359
|
);
|
|
1355
1360
|
eligibility.deniedModelAccountIds = deniedModelAccountIds;
|
|
1356
1361
|
const selectionOptions = {
|
|
1362
|
+
// A fixed selector (exact account, Reserve) is outside the pool-only policy (#7410).
|
|
1363
|
+
explicitAccountSelector: fixedAccountId !== undefined,
|
|
1357
1364
|
// Temporary switch drain keeps the candidate until the atomic claim rejects
|
|
1358
1365
|
// it. Retained recovery makes main wholly ineligible so pool routing continues.
|
|
1359
1366
|
nativeMainSelectionOnly,
|
|
@@ -1416,6 +1423,11 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1416
1423
|
const selected = resolution.status === "selected" ? resolution.accountId : null;
|
|
1417
1424
|
affinityDecision = selected ? honestAffinityDecision(resolution.affinity, affinityKey, selected, quotaScope, options.modelId, requestScopedMainCredential && config.codexPool?.requestOwnedAffinity !== true) : resolution.affinity;
|
|
1418
1425
|
transientProbe = resolution.status === "selected" ? resolution.transientProbe : undefined;
|
|
1426
|
+
// Every selector that can still name main (sentinels, preserved actives) ends here.
|
|
1427
|
+
if (selected === MAIN_CODEX_ACCOUNT_ID && poolOnlyApplies) {
|
|
1428
|
+
releaseTransientProbeGrant();
|
|
1429
|
+
throw new CodexPoolAuthenticationError();
|
|
1430
|
+
}
|
|
1419
1431
|
// Main now takes part in ordering when the request carries its own main bearer (#5019), so
|
|
1420
1432
|
// selection can name it outright rather than only through the no-candidate fallback below.
|
|
1421
1433
|
// Serve that selection from the credential the request arrived with: the read fence above
|
|
@@ -1441,6 +1453,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1441
1453
|
if (
|
|
1442
1454
|
requestScopedMainCredential
|
|
1443
1455
|
&& fixedAccountId === undefined
|
|
1456
|
+
&& !poolOnlyApplies
|
|
1444
1457
|
&& !(callerMatchesObservedMain(headers) && policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID))
|
|
1445
1458
|
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1446
1459
|
) {
|
|
@@ -1471,7 +1484,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1471
1484
|
if (nativeMainReadsForbidden && !options.excludeAccountId) {
|
|
1472
1485
|
throw new CodexMainProfileDrainingError();
|
|
1473
1486
|
}
|
|
1474
|
-
if (!nativeMainReadsForbidden && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1487
|
+
if (!nativeMainReadsForbidden && !poolOnlyApplies && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1475
1488
|
&& !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
|
|
1476
1489
|
&& (!modelEligibleAccountIds || modelEligibleAccountIds.has(MAIN_CODEX_ACCOUNT_ID))) {
|
|
1477
1490
|
assertMainAccountPolicy(policy);
|
|
@@ -1607,7 +1620,7 @@ async function resolveCodexAuthContextUnannotated(
|
|
|
1607
1620
|
// The selector can retain the configured Pool account when no stored
|
|
1608
1621
|
// alternate is eligible. A validated caller may still serve this request,
|
|
1609
1622
|
// just as it can after an upstream rejection, without changing Pool state.
|
|
1610
|
-
if (requestScopedMainCredential && fixedAccountId === undefined
|
|
1623
|
+
if (requestScopedMainCredential && fixedAccountId === undefined && !poolOnlyApplies
|
|
1611
1624
|
&& !(callerMatchesObservedMain(headers) && policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID))
|
|
1612
1625
|
&& options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
|
|
1613
1626
|
&& !callerIsCooledPoolAccount(headers, config, accountId)) {
|
|
@@ -1931,6 +1944,8 @@ export function headersForCodexAuthContext(
|
|
|
1931
1944
|
|
|
1932
1945
|
export function isCodexAuthContextUsable(ctx: CodexAuthContext, config: OcxConfig): boolean {
|
|
1933
1946
|
if (ctx.kind === "main") return true;
|
|
1934
|
-
if (ctx.kind === "main-pool")
|
|
1947
|
+
if (ctx.kind === "main-pool") {
|
|
1948
|
+
return isCodexAccountUsable(config, ctx.accountId, ctx.fixedAccount === true ? { explicitAccountSelector: true } : undefined);
|
|
1949
|
+
}
|
|
1935
1950
|
return isCodexAccountUsable(config, ctx.accountId) && isCodexAccountGenerationLive(ctx.accountId, ctx.generation);
|
|
1936
1951
|
}
|
|
@@ -33,6 +33,7 @@ import {
|
|
|
33
33
|
} from "../../oauth";
|
|
34
34
|
import { getAccountSet } from "../../oauth/store";
|
|
35
35
|
import { mayResolveModelsOAuth } from "../../oauth/model-discovery-auth";
|
|
36
|
+
import { buildVertexProviderModelsRequest } from "../../providers/google-vertex-model-discovery";
|
|
36
37
|
import type { OcxConfig, OcxProviderConfig } from "../../types";
|
|
37
38
|
import { modelInList } from "../../types";
|
|
38
39
|
import { CODEX_REASONING_LEVELS, codexEffortRank, configuredReasoningEfforts, modelRecordValue, sanitizeCodexReasoningEfforts } from "../../reasoning-effort";
|
|
@@ -129,6 +130,8 @@ export interface ModelsAuthResolution {
|
|
|
129
130
|
readonly oauthGeneration?: string;
|
|
130
131
|
readonly oauthApiBaseUrl?: string;
|
|
131
132
|
readonly oauthProjectId?: string;
|
|
133
|
+
/** Vertex discovery credential bound to its authority (passive gathers). */
|
|
134
|
+
readonly vertexAuth?: import("../../providers/google-vertex-model-discovery").VertexDiscoveryAuth;
|
|
132
135
|
}
|
|
133
136
|
|
|
134
137
|
export type ModelsAuthResolver =
|
|
@@ -332,6 +335,7 @@ export function captureTrustedOpenAiApiPolicy(
|
|
|
332
335
|
});
|
|
333
336
|
}
|
|
334
337
|
|
|
338
|
+
/** Capture credential-free and sentinel-bearing model discovery requests for flight deduplication. */
|
|
335
339
|
export function captureModelsRequest(
|
|
336
340
|
name: string,
|
|
337
341
|
provider: OcxProviderConfig,
|
|
@@ -339,8 +343,10 @@ export function captureModelsRequest(
|
|
|
339
343
|
workbuddy?: import("../../oauth/types").WorkBuddyOAuthMetadata,
|
|
340
344
|
): CapturedModelsRequest {
|
|
341
345
|
const observed = { oauthApiBaseUrl, workbuddy };
|
|
342
|
-
const withoutCredential =
|
|
343
|
-
|
|
346
|
+
const withoutCredential = buildVertexProviderModelsRequest(name, provider, undefined)
|
|
347
|
+
?? buildModelsRequest(provider, undefined, name, observed);
|
|
348
|
+
const withCredential = buildVertexProviderModelsRequest(name, provider, REQUEST_CREDENTIAL_SENTINEL)
|
|
349
|
+
?? buildModelsRequest(provider, REQUEST_CREDENTIAL_SENTINEL, name, observed);
|
|
344
350
|
const method = withoutCredential.method ?? "GET";
|
|
345
351
|
if (withoutCredential.url !== withCredential.url || method !== (withCredential.method ?? "GET")) {
|
|
346
352
|
throw new TypeError(`Provider model discovery URL for ${name} depends on credential bytes.`);
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { VendorContextInference } from "./vendor-context";
|
|
2
|
+
import type { MultiAgentMode } from "../../types/multi-agent";
|
|
3
|
+
export type { MultiAgentMode } from "../../types/multi-agent";
|
|
2
4
|
import { retainedNativeInheritanceTemplate } from "./native-template";
|
|
3
5
|
export { findSupportedNativeTemplate } from "./native-template";
|
|
4
6
|
import { isCodexControlPlaneModel } from "../control-plane-models";
|
|
@@ -594,8 +596,6 @@ export function ensureStrictCatalogFields(
|
|
|
594
596
|
return ensureAutoCompactTokenLimit(entry);
|
|
595
597
|
}
|
|
596
598
|
|
|
597
|
-
export type MultiAgentMode = "v1" | "default" | "v2";
|
|
598
|
-
|
|
599
599
|
export interface MultiAgentModeOptions {
|
|
600
600
|
/** Caller-owned source metadata already defines the default for these projected rows. */
|
|
601
601
|
preserveDefaultMultiAgentVersion?: (entry: RawEntry) => boolean;
|
|
@@ -665,6 +665,9 @@ export function applyRoutedCodexToolMode(
|
|
|
665
665
|
* `keepNativeChatGptOnV1` only applies when `mode === "v2"`. It leaves Sol/Terra
|
|
666
666
|
* (and other ChatGPT-native rows) on v1 so a native parent can still spawn a
|
|
667
667
|
* routed child. See issue #92.
|
|
668
|
+
*
|
|
669
|
+
* `"v2-plaintext"` stamps every row v2, ChatGPT-native rows included -- the mode is
|
|
670
|
+
* the plaintext-delivery opt-in, so no native/routed split applies.
|
|
668
671
|
*/
|
|
669
672
|
export function applyMultiAgentMode(
|
|
670
673
|
entries: RawEntry[],
|
|
@@ -743,9 +746,10 @@ export function applyMultiAgentMode(
|
|
|
743
746
|
}
|
|
744
747
|
return entries;
|
|
745
748
|
}
|
|
749
|
+
const forcedVersion = mode === "v2-plaintext" ? "v2" : mode;
|
|
746
750
|
for (const entry of entries) {
|
|
747
751
|
recordMultiAgentOrigin(entry);
|
|
748
|
-
entry.multi_agent_version =
|
|
752
|
+
entry.multi_agent_version = forcedVersion;
|
|
749
753
|
}
|
|
750
754
|
return entries;
|
|
751
755
|
}
|
|
@@ -53,7 +53,7 @@ import {
|
|
|
53
53
|
} from "../../providers/service-tier";
|
|
54
54
|
import type { FastPolicyAuthority } from "../../providers/fastwire";
|
|
55
55
|
import { effectiveGoogleMode, getProviderRegistryEntry, providerMatchesRegistryTransport, registryEntryForProviderDestination } from "../../providers/registry";
|
|
56
|
-
import { parseAntigravityAvailableModels, registerAntigravityDiscoveredWireModels } from "../../providers/antigravity-models";
|
|
56
|
+
import { discoveredAntigravityDefaultEffort, parseAntigravityAvailableModels, registerAntigravityDiscoveredWireModels } from "../../providers/antigravity-models";
|
|
57
57
|
import { captureAntigravityModelObservation, recordAntigravityAccountRoster } from "../../providers/antigravity-account-roster";
|
|
58
58
|
import { antigravityActiveAccountCurrent, discoverAntigravitySiblings } from "./antigravity-discovery";
|
|
59
59
|
import { applyProviderContextCap, providerContextCap, resolveUnknownRoutedContextWindow } from "../../providers/context-cap";
|
|
@@ -100,7 +100,16 @@ import {
|
|
|
100
100
|
type ProviderModelsApiItem,
|
|
101
101
|
type ResolvedProviderModelDiscovery,
|
|
102
102
|
} from "../../providers/model-discovery";
|
|
103
|
-
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";
|
|
104
113
|
import { applyConfiguredHeadersLast, fetchOllamaShowEnrichment, ollamaShowEnrichable } from "../../providers/ollama-show";
|
|
105
114
|
import upstreamModelsSnapshot from "../data/upstream-models.json";
|
|
106
115
|
import { createAdmissionGate, ResourceAdmissionError, type AdmissionMetrics } from "../../lib/admission";
|
|
@@ -144,6 +153,7 @@ export interface ProviderModelsResult {
|
|
|
144
153
|
}
|
|
145
154
|
export const refreshingModelsAuthResolver: ModelsAuthResolver = { kind: "refreshing" };
|
|
146
155
|
|
|
156
|
+
/** Build a synchronous non-refreshing credential resolver from a captured auth-store buffer. */
|
|
147
157
|
export function observedModelsAuthResolver(
|
|
148
158
|
authStoreBuffer: Uint8Array | null,
|
|
149
159
|
outcomes: CatalogGatherProviderAuthOutcome[],
|
|
@@ -153,7 +163,9 @@ export function observedModelsAuthResolver(
|
|
|
153
163
|
resolve(name, provider) {
|
|
154
164
|
if (provider.authMode === "forward") return { apiKey: undefined, observed: true };
|
|
155
165
|
if (provider.authMode !== "oauth") {
|
|
156
|
-
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 } : {}) };
|
|
157
169
|
}
|
|
158
170
|
|
|
159
171
|
const observation: OAuthActiveTokenObservation = mayResolveModelsOAuth(name, provider)
|
|
@@ -274,6 +286,9 @@ export async function fetchProviderModelsWithAuth(
|
|
|
274
286
|
}
|
|
275
287
|
return observed(configured, "authoritative");
|
|
276
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;
|
|
277
292
|
const auth: ModelsAuthResolution = prov.authMode === "oauth" && !mayResolveModelsOAuth(name, prov)
|
|
278
293
|
? { apiKey: undefined, observed: resolveAuth.kind === "observed" }
|
|
279
294
|
: captured.observedAuth ?? (resolveAuth.kind === "refreshing"
|
|
@@ -290,9 +305,17 @@ export async function fetchProviderModelsWithAuth(
|
|
|
290
305
|
...(snapshot.projectId ? { oauthProjectId: snapshot.projectId } : {}),
|
|
291
306
|
}))
|
|
292
307
|
.catch(() => ({ apiKey: undefined, observed: false }))
|
|
293
|
-
: {
|
|
308
|
+
: {
|
|
309
|
+
apiKey: effectiveGoogleMode(name, prov) === "vertex"
|
|
310
|
+
? (vertexAuth = await resolveVertexDiscoveryAuth(prov, vertexDeadline))?.token
|
|
311
|
+
: await resolveModelsAuthToken(name, prov),
|
|
312
|
+
observed: false,
|
|
313
|
+
}
|
|
294
314
|
: resolveAuth.resolve(name, prov));
|
|
295
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";
|
|
296
319
|
if ((prov.authMode === "oauth" && !apiKey) || isProviderApiKeyPaused(prov)) {
|
|
297
320
|
return observed(configured, "degraded");
|
|
298
321
|
}
|
|
@@ -681,6 +704,9 @@ export async function fetchProviderModelsWithAuth(
|
|
|
681
704
|
"degraded",
|
|
682
705
|
);
|
|
683
706
|
}
|
|
707
|
+
if (effectiveGoogleMode(name, prov) === "vertex" && !apiKey) {
|
|
708
|
+
return observed(withConfiguredRetention(withVertexDefaultSeed(configured)), "degraded");
|
|
709
|
+
}
|
|
684
710
|
// The captured request predates any refresh, so a refreshing gather rebuilds it
|
|
685
711
|
// from the auth it resolved: the token and its origin, together.
|
|
686
712
|
const request = resolveAuth.kind === "refreshing" && name !== "anthropic2"
|
|
@@ -736,7 +762,9 @@ export async function fetchProviderModelsWithAuth(
|
|
|
736
762
|
// name matches any baseUrl by design. Retargeted or renamed custom rows
|
|
737
763
|
// fetch a different URL and keep the rejection.
|
|
738
764
|
if (!maySendAnthropicDiscovery()) return observed(withConfiguredRetention(failedDiscoveryConfigured), "degraded");
|
|
739
|
-
const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl,
|
|
765
|
+
const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl,
|
|
766
|
+
beforeSend: () => maySendAnthropicDiscovery()
|
|
767
|
+
&& (!vertexSendGuard || (vertexAuth !== undefined && vertexDiscoveryAuthIsCurrent(prov, vertexAuth, headers))) };
|
|
740
768
|
const antigravityObservation = cloudCodeAssist ? captureAntigravityModelObservation() : undefined;
|
|
741
769
|
const res = request.method === "POST"
|
|
742
770
|
? await providerOutboundPost(name, prov, url, {
|
|
@@ -746,7 +774,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
746
774
|
}, outboundDependencies)
|
|
747
775
|
: await providerOutboundGet(name, prov, url, {
|
|
748
776
|
headers,
|
|
749
|
-
signal: AbortSignal.timeout(8000),
|
|
777
|
+
signal: vertexDeadline ?? AbortSignal.timeout(8000),
|
|
750
778
|
}, outboundDependencies);
|
|
751
779
|
const redirectError = await providerRedirectError(res, url);
|
|
752
780
|
if (redirectError) {
|
|
@@ -771,7 +799,8 @@ export async function fetchProviderModelsWithAuth(
|
|
|
771
799
|
const contentType = (
|
|
772
800
|
res.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() || "missing"
|
|
773
801
|
).slice(0, 80);
|
|
774
|
-
const
|
|
802
|
+
const vertexFirstPage = vertexDeadline ? countDiscoveryResponseBytes(res) : undefined;
|
|
803
|
+
const bounded = await readBoundedDiscoveryJson(vertexFirstPage?.response ?? res, discovery.maxResponseBytes);
|
|
775
804
|
if (!bounded.ok) {
|
|
776
805
|
const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
|
|
777
806
|
const diagnostic = bounded.reason === "response_too_large"
|
|
@@ -819,7 +848,7 @@ export async function fetchProviderModelsWithAuth(
|
|
|
819
848
|
...(model.effortWireModelIds ? {
|
|
820
849
|
antigravityEffortWireModelIds: model.effortWireModelIds,
|
|
821
850
|
suppressSyntheticMax: true,
|
|
822
|
-
defaultReasoningEffort: model.effortWireModelIds.medium
|
|
851
|
+
defaultReasoningEffort: discoveredAntigravityDefaultEffort(model.id, !!model.effortWireModelIds.medium),
|
|
823
852
|
} : {}),
|
|
824
853
|
...(model.contextWindow ? { contextWindow: model.contextWindow } : {}),
|
|
825
854
|
...(model.inputModalities ? { inputModalities: model.inputModalities } : {}),
|
|
@@ -844,14 +873,24 @@ export async function fetchProviderModelsWithAuth(
|
|
|
844
873
|
markProviderDiscoveryOk(name, live.length);
|
|
845
874
|
return observed(withConfiguredRetention(azureMetadata ? live : forCache, { warnDrops: true }), "authoritative");
|
|
846
875
|
}
|
|
847
|
-
const
|
|
848
|
-
?
|
|
849
|
-
|
|
850
|
-
|
|
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
|
|
851
892
|
// gateway keeps the generic data[] / top-level-array contract.
|
|
852
|
-
const extracted =
|
|
853
|
-
? googleAiStudio
|
|
854
|
-
: extractProviderModelItems(bounded.value, discovery);
|
|
893
|
+
const extracted = googleNative ?? extractProviderModelItems(listing.value, discovery);
|
|
855
894
|
if (!extracted.ok) {
|
|
856
895
|
const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
|
|
857
896
|
const diagnostic: Record<ModelDiscoveryResponseFailure, string> = {
|
|
@@ -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 {
|
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,
|