@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.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 +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -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/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- 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/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- 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/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- 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 +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- 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 +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.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 +178 -0
- package/src/cli/dispatch.ts +61 -13
- 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 +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- 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 +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -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 +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- 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-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- 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 +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- 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 +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -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-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- 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/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- 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 +4 -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/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- 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 +86 -15
- 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 +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- 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/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- 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/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- 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 +52 -9
- 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 +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -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/budget.ts +23 -5
- 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 +50 -6
- 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/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- 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 +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- 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-billing-refusal.ts +27 -3
- 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 +515 -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 +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/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/workbuddy.ts +6 -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/workbuddy-credit-balance.ts +125 -16
- 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/effort-history.ts +732 -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/history/integrity.ts +41 -4
- 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 +111 -3
- 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 +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- 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 +196 -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 +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- 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 +149 -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 +39 -3
- 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 +192 -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 +58 -18
- 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 +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- 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/static-catalog-probe.ts +33 -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 +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- 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 +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- 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/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- 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-selection-keepalive.ts +254 -0
- 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 +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- 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 +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- 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 +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- 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 +19 -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/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- 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/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- 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 +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { isIP } from "node:net";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* `dashboardTrustedProxy` (#8338): the one reverse proxy a standalone dashboard may sit behind
|
|
6
|
+
* and still remember devices. Pure parsing shared by the load schema, the live-write check and
|
|
7
|
+
* the request path, so every reader applies the same rules. Nothing here trusts a header.
|
|
8
|
+
*/
|
|
9
|
+
export const DASHBOARD_TRUSTED_PROXY_HEADERS = ["x-forwarded-host", "x-forwarded-proto"] as const;
|
|
10
|
+
export type DashboardTrustedProxyHeader = typeof DASHBOARD_TRUSTED_PROXY_HEADERS[number];
|
|
11
|
+
export const MAX_DASHBOARD_PROXY_ADDRESSES = 16;
|
|
12
|
+
|
|
13
|
+
export interface DashboardTrustedProxySettings {
|
|
14
|
+
/** Canonical `https://host[:port]` origin the browser uses. */
|
|
15
|
+
origin: string;
|
|
16
|
+
/** The origin's host as `URL.host` spells it (lowercase, default port removed). */
|
|
17
|
+
host: string;
|
|
18
|
+
/** Normalized peer addresses of the proxy hop. */
|
|
19
|
+
addresses: ReadonlySet<string>;
|
|
20
|
+
trust: ReadonlySet<DashboardTrustedProxyHeader>;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** One IP literal in the form `requestIP()` reports, or null. IPv4-mapped IPv6 reads as IPv4. */
|
|
24
|
+
export function normalizeProxyAddress(value: string): string | null {
|
|
25
|
+
const raw = value.trim();
|
|
26
|
+
const version = isIP(raw);
|
|
27
|
+
if (version === 4) return raw;
|
|
28
|
+
if (version !== 6) return null;
|
|
29
|
+
let host: string;
|
|
30
|
+
try { host = new URL(`http://[${raw}]/`).hostname.slice(1, -1); } catch { return null; }
|
|
31
|
+
const mapped = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(host);
|
|
32
|
+
if (mapped) {
|
|
33
|
+
const high = Number.parseInt(mapped[1]!, 16);
|
|
34
|
+
const low = Number.parseInt(mapped[2]!, 16);
|
|
35
|
+
return [high >> 8, high & 255, low >> 8, low & 255].join(".");
|
|
36
|
+
}
|
|
37
|
+
return host;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** A parsed setting, or the reason it is unusable. Unknown fields are refused. */
|
|
41
|
+
export function parseDashboardTrustedProxy(value: unknown): DashboardTrustedProxySettings | string {
|
|
42
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return "must be an object";
|
|
43
|
+
const record = value as Record<string, unknown>;
|
|
44
|
+
const unknown = Object.keys(record).find(key => key !== "origin" && key !== "proxyAddresses" && key !== "trustHeaders");
|
|
45
|
+
if (unknown !== undefined) return `contains an unsupported field: ${unknown}`;
|
|
46
|
+
const { origin, proxyAddresses, trustHeaders } = record;
|
|
47
|
+
if (typeof origin !== "string" || origin.includes("*")) return "origin must be one exact https origin (no wildcards)";
|
|
48
|
+
let parsed: URL;
|
|
49
|
+
try { parsed = new URL(origin); } catch { return "origin must be one exact https origin (no wildcards)"; }
|
|
50
|
+
// The URL parser decodes %2A, so the raw-string check alone would let an encoded wildcard through.
|
|
51
|
+
if (parsed.hostname.includes("*")) return "origin must be one exact https origin (no wildcards)";
|
|
52
|
+
if (parsed.protocol !== "https:") return "origin must use https";
|
|
53
|
+
if (parsed.username || parsed.password || parsed.pathname !== "/" || parsed.search || parsed.hash || !parsed.hostname) {
|
|
54
|
+
return "origin must be an origin without credentials, path, query, or fragment";
|
|
55
|
+
}
|
|
56
|
+
if (!Array.isArray(proxyAddresses) || proxyAddresses.length === 0 || proxyAddresses.length > MAX_DASHBOARD_PROXY_ADDRESSES) {
|
|
57
|
+
return `proxyAddresses must list 1 to ${MAX_DASHBOARD_PROXY_ADDRESSES} proxy IP addresses`;
|
|
58
|
+
}
|
|
59
|
+
const addresses = new Set<string>();
|
|
60
|
+
for (const entry of proxyAddresses) {
|
|
61
|
+
const address = typeof entry === "string" ? normalizeProxyAddress(entry) : null;
|
|
62
|
+
if (!address) return "proxyAddresses must be exact IP addresses (no ranges, wildcards, or host names)";
|
|
63
|
+
addresses.add(address);
|
|
64
|
+
}
|
|
65
|
+
const trust = new Set<DashboardTrustedProxyHeader>();
|
|
66
|
+
if (trustHeaders !== undefined) {
|
|
67
|
+
if (!Array.isArray(trustHeaders)) return "trustHeaders must be a list";
|
|
68
|
+
for (const header of trustHeaders) {
|
|
69
|
+
const name = typeof header === "string" ? header.toLowerCase() : "";
|
|
70
|
+
if (!(DASHBOARD_TRUSTED_PROXY_HEADERS as readonly string[]).includes(name)) {
|
|
71
|
+
return "trustHeaders may contain only x-forwarded-host and x-forwarded-proto";
|
|
72
|
+
}
|
|
73
|
+
trust.add(name as DashboardTrustedProxyHeader);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return { origin: parsed.origin, host: parsed.host, addresses, trust };
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** Load schema: keeps the operator's spelling and refuses anything the parser refuses. */
|
|
80
|
+
export const dashboardTrustedProxySchema = z.unknown().superRefine((value, ctx) => {
|
|
81
|
+
const parsed = parseDashboardTrustedProxy(value);
|
|
82
|
+
if (typeof parsed === "string") ctx.addIssue({ code: "custom", message: parsed });
|
|
83
|
+
}) as unknown as z.ZodType<{ origin: string; proxyAddresses: string[]; trustHeaders?: DashboardTrustedProxyHeader[] }>;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { aliasTemplateError } from "../providers/alias-template";
|
|
2
|
+
import { parseDashboardTrustedProxy } from "./dashboard-trusted-proxy";
|
|
1
3
|
import { readExistingSpendSalt, spendPoolAliasesError, validatePoolAliasOwners } from "../lib/spend-pool-alias-validation";
|
|
2
4
|
import { isSubagentModelEntry, rawSubagentModelForce } from "./subagent-models";
|
|
3
5
|
import { validRemainingQuotaAccountIds } from "../codex/account-use-remaining";
|
|
@@ -9,6 +11,7 @@ import * as z from "zod/v4";
|
|
|
9
11
|
import { compactionRecoveryConfigError } from "./schema/compaction-recovery";
|
|
10
12
|
import { nativeReasoningRetentionConfigError } from "./schema/native-reasoning-retention";
|
|
11
13
|
import { WORKFLOW_BUDGET_SHAPE_HINT, workflowBudgetConfigError } from "./schema/workflow-budget";
|
|
14
|
+
import { ROUTED_CATALOG_DEFAULTS_SHAPE_HINT, routedCatalogDefaultsConfigError } from "./schema/routed-catalog-defaults";
|
|
12
15
|
import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility";
|
|
13
16
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
14
17
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
@@ -149,6 +152,7 @@ function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown): Conf
|
|
|
149
152
|
if (blockedModelRedirectsError(rawParsed)) warnings.push("blockedModelRedirects ignored: expected a map of nonempty model keys to nonempty string targets");
|
|
150
153
|
if (nativeReasoningRetentionConfigError(rawParsed)) warnings.push("nativeReasoningRetention ignored: expected only optional boolean modelSwitch and accountSwitch fields; both remain off");
|
|
151
154
|
if (workflowBudgetConfigError(rawParsed)) warnings.push("workflowBudget ignored: " + WORKFLOW_BUDGET_SHAPE_HINT + "; the built-in ceilings remain");
|
|
155
|
+
if (routedCatalogDefaultsConfigError(rawParsed)) warnings.push("routedCatalogDefaults ignored: " + ROUTED_CATALOG_DEFAULTS_SHAPE_HINT + "; routed catalog rows keep their derived values");
|
|
152
156
|
if (mainAccountHardLockFallbackError(rawParsed)) warnings.push("codexMainAccountHardLockFallback ignored: expected a nonblank model selector and an optional declared reasoningEffort");
|
|
153
157
|
if (fallbackPolicyError(rawParsed)) warnings.push("fallback partly ignored: expected boolean model/provider switches, providers/routes/devices maps of them, and devices.<id>.localFallback; ignored leaves keep today's fallback behavior");
|
|
154
158
|
const quotaAutoRefreshWarning = degradedCodexQuotaAutoRefreshWarning(rawParsed, normalized);
|
|
@@ -626,6 +630,30 @@ export function loopbackCompanionBindError(
|
|
|
626
630
|
+ "loopback bind already admits local callers without a credential.";
|
|
627
631
|
}
|
|
628
632
|
|
|
633
|
+
/** #8338: the persisted schema drops a malformed trusted-proxy block; a live write gets the reason. */
|
|
634
|
+
function dashboardTrustedProxyConfigError(value: unknown): string | null {
|
|
635
|
+
const raw = rawConfigRecord(value);
|
|
636
|
+
if (!raw || !Object.hasOwn(raw, "dashboardTrustedProxy") || raw.dashboardTrustedProxy === undefined) return null;
|
|
637
|
+
const parsed = parseDashboardTrustedProxy(raw.dashboardTrustedProxy);
|
|
638
|
+
return typeof parsed === "string" ? `schema_invalid: dashboardTrustedProxy: ${parsed}` : null;
|
|
639
|
+
}
|
|
640
|
+
|
|
641
|
+
/**
|
|
642
|
+
* #7705: load drops a hand-edited template that does not validate; a live write that carries one
|
|
643
|
+
* (a provider-wide save, `ocx config set`) gets the same reason the alias-template route gives.
|
|
644
|
+
*/
|
|
645
|
+
function providerAliasTemplateConfigError(value: unknown): string | null {
|
|
646
|
+
const providers = rawConfigRecord(rawConfigRecord(value)?.providers);
|
|
647
|
+
if (!providers) return null;
|
|
648
|
+
for (const [name, provider] of Object.entries(providers)) {
|
|
649
|
+
const template = rawConfigRecord(provider)?.aliasTemplate;
|
|
650
|
+
if (template === undefined) continue;
|
|
651
|
+
const problem = typeof template === "string" ? aliasTemplateError(template) : "template must be a string";
|
|
652
|
+
if (problem) return `schema_invalid: providers.${name}.aliasTemplate: ${problem}`;
|
|
653
|
+
}
|
|
654
|
+
return null;
|
|
655
|
+
}
|
|
656
|
+
|
|
629
657
|
/**
|
|
630
658
|
* Validate the hub management ingress at the live-write boundary.
|
|
631
659
|
*
|
|
@@ -752,6 +780,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
752
780
|
?? fallbackPolicyError(value)
|
|
753
781
|
?? nativeReasoningRetentionConfigError(value)
|
|
754
782
|
?? workflowBudgetConfigError(value)
|
|
783
|
+
?? routedCatalogDefaultsConfigError(value)
|
|
755
784
|
?? mainAccountHardLockFallbackError(value)
|
|
756
785
|
?? compactionRecoveryConfigError(value) ?? desktopCompatibilityConfigError(value) ?? configReasoningPinsConfigError(value)
|
|
757
786
|
?? blankHostnameError(value)
|
|
@@ -785,6 +814,8 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
785
814
|
?? clientRolePairError(value)
|
|
786
815
|
?? loopbackListenerPortError(value)
|
|
787
816
|
?? managementIngressConfigError(value)
|
|
817
|
+
?? providerAliasTemplateConfigError(value)
|
|
818
|
+
?? dashboardTrustedProxyConfigError(value)
|
|
788
819
|
?? metricsExportConfigError(value)
|
|
789
820
|
?? serviceHealthRecoveryConfigError(value)
|
|
790
821
|
?? telemetryConfigError(value)
|
|
@@ -4,6 +4,15 @@ export function websocketsEnabled(config: Pick<OcxConfig, "websockets">): boolea
|
|
|
4
4
|
return config.websockets === true;
|
|
5
5
|
}
|
|
6
6
|
|
|
7
|
+
/**
|
|
8
|
+
* The Responses WebSocket over a Remote Link, Home side. It needs the Home's own WebSocket switch
|
|
9
|
+
* as well as its own: websockets is the owner's consent to the WebSocket pipeline, and this one adds
|
|
10
|
+
* linked Children to it. Both are read with === true, so an absent or malformed key means off.
|
|
11
|
+
*/
|
|
12
|
+
export function linkResponsesWebsocketEnabled(config: Pick<OcxConfig, "websockets" | "linkResponsesWebsocket">): boolean {
|
|
13
|
+
return config.websockets === true && config.linkResponsesWebsocket === true;
|
|
14
|
+
}
|
|
15
|
+
|
|
7
16
|
/**
|
|
8
17
|
* Opt-in Ultra Fast, read with the house `=== true` idiom so an absent key and a
|
|
9
18
|
* malformed one both mean off.
|
|
@@ -2,7 +2,8 @@ import { observeAccountAutoPauseRevisions, snapshotAutoPauseFingerprints } from
|
|
|
2
2
|
import type { OcxConfig, OcxProviderConfig, ProviderCostOverlay } from "../types";
|
|
3
3
|
import { configReasoningPinsConfigError } from "./provider-validation";
|
|
4
4
|
import { carryPersistedTelemetry } from "./telemetry-carry";
|
|
5
|
-
import {
|
|
5
|
+
import { adoptPersistedConfigMigrations, projectPersistedConfigMigrations } from "./persisted-projections";
|
|
6
|
+
import { RESERVE_CAPABILITY_KEYS } from "./reserve-capability";
|
|
6
7
|
import { refreshPreservedProviderOwner } from "../usage/user-cost-overlays";
|
|
7
8
|
import { refreshConfigDerivedRegistries } from "./derived-registries";
|
|
8
9
|
import {
|
|
@@ -99,7 +100,8 @@ function applyModelCostRowReplacement(config: OcxConfig): void {
|
|
|
99
100
|
*/
|
|
100
101
|
export function adoptPersistedModelDiscovery(
|
|
101
102
|
config: OcxConfig,
|
|
102
|
-
persisted: Pick<OcxConfig, "modelDiscovery" | "disabledModels"
|
|
103
|
+
persisted: Pick<OcxConfig, "modelDiscovery" | "disabledModels">
|
|
104
|
+
& { selectedModels?: Record<string, string[] | undefined> },
|
|
103
105
|
): void {
|
|
104
106
|
config.modelDiscovery = structuredClone(persisted.modelDiscovery);
|
|
105
107
|
config.disabledModels = structuredClone(persisted.disabledModels);
|
|
@@ -108,6 +110,14 @@ export function adoptPersistedModelDiscovery(
|
|
|
108
110
|
baseline.modelDiscovery = structuredClone(persisted.modelDiscovery);
|
|
109
111
|
baseline.disabledModels = structuredClone(persisted.disabledModels);
|
|
110
112
|
}
|
|
113
|
+
// `admit` (#8236) widens a provider's committed selection. Move live and baseline together so
|
|
114
|
+
// the running catalog shows the arrival and a later save does not read the old list as an edit.
|
|
115
|
+
for (const [name, selected] of Object.entries(persisted.selectedModels ?? {})) {
|
|
116
|
+
const live = config.providers[name];
|
|
117
|
+
if (live) live.selectedModels = structuredClone(selected);
|
|
118
|
+
const base = baseline?.providers[name];
|
|
119
|
+
if (base) base.selectedModels = structuredClone(selected);
|
|
120
|
+
}
|
|
111
121
|
}
|
|
112
122
|
|
|
113
123
|
/** Adopt the committed Advisor subtree without advancing unrelated pending live intent. */
|
|
@@ -589,6 +599,8 @@ export function saveConfigPreservingClaudeCode(config: OcxConfig): void {
|
|
|
589
599
|
...(provenanceExists
|
|
590
600
|
? Object.keys(persistedDiagnostics.config as unknown as Record<string, unknown>)
|
|
591
601
|
: []),
|
|
602
|
+
// An absent Reserve value reads as off, so a disk-only value is never left behind.
|
|
603
|
+
...RESERVE_CAPABILITY_KEYS,
|
|
592
604
|
]);
|
|
593
605
|
for (const key of Object.keys(persistedDiagnostics.config as unknown as Record<string, unknown>)) {
|
|
594
606
|
if (!rebaseableKeys.has(key)) skipped.add(key);
|
|
@@ -631,7 +643,7 @@ export function saveConfigPreservingClaudeCode(config: OcxConfig): void {
|
|
|
631
643
|
if (diskDeletedKeys.size) durableProjection.configRebaseProvenance = { version: 1,
|
|
632
644
|
deletedTopLevelKeys: [...new Set([...configRebaseDeletionKeys(durableProjection), ...diskDeletedKeys])].sort() };
|
|
633
645
|
const provenanceProjection = projectConfigRebaseProvenance(durableProjection);
|
|
634
|
-
const projectedConfig =
|
|
646
|
+
const projectedConfig = projectPersistedConfigMigrations(
|
|
635
647
|
onDisk,
|
|
636
648
|
durableProjection,
|
|
637
649
|
);
|
|
@@ -652,7 +664,7 @@ export function saveConfigPreservingClaudeCode(config: OcxConfig): void {
|
|
|
652
664
|
} else {
|
|
653
665
|
persist(projectedConfig);
|
|
654
666
|
}
|
|
655
|
-
|
|
667
|
+
adoptPersistedConfigMigrations(config, projectedConfig);
|
|
656
668
|
captureLiveTopologyBaseline(config);
|
|
657
669
|
if (claudeCodeBaseline.has(config)) {
|
|
658
670
|
claudeCodeBaseline.set(config, structuredClone(config.claudeCode));
|
|
@@ -5,6 +5,7 @@ import { join } from "node:path";
|
|
|
5
5
|
import { compactionRecoveryConfigError } from "./schema/compaction-recovery";
|
|
6
6
|
import { nativeReasoningRetentionConfigError } from "./schema/native-reasoning-retention";
|
|
7
7
|
import { workflowBudgetConfigError } from "./schema/workflow-budget";
|
|
8
|
+
import { routedCatalogDefaultsConfigError } from "./schema/routed-catalog-defaults";
|
|
8
9
|
import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility";
|
|
9
10
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
10
11
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
@@ -27,6 +28,7 @@ import { isPassiveRead } from "../lib/passive-read";
|
|
|
27
28
|
import { redactSecretString } from "../lib/redact";
|
|
28
29
|
import { isValidProviderName } from "./provider-name";
|
|
29
30
|
import { MODEL_ALIAS_PATTERN } from "../providers/default-aliases";
|
|
31
|
+
import { aliasTemplateError } from "../providers/alias-template";
|
|
30
32
|
import { MODEL_DISCOVERY_MAX_MODELS } from "../providers/model-discovery-limits";
|
|
31
33
|
import { getProviderRegistryEntry, providerMatchesRegistryTransport, registryModelServiceTierCapabilityApplies } from "../providers/registry";
|
|
32
34
|
import { providerFastSwitchOff } from "../providers/fast-opt-in";
|
|
@@ -140,6 +142,7 @@ export function warnDegradedCompactionRouting(rawParsed: unknown, validated: Ocx
|
|
|
140
142
|
export function warnDegradedTopLevelOptIns(rawParsed: unknown, validated: OcxConfig): void {
|
|
141
143
|
if (nativeReasoningRetentionConfigError(rawParsed)) console.warn("⚠️ invalid nativeReasoningRetention disabled; model and account switch allowances remain off");
|
|
142
144
|
if (workflowBudgetConfigError(rawParsed)) console.warn("⚠️ invalid workflowBudget ignored; the built-in workflow ceilings stay in force");
|
|
145
|
+
if (routedCatalogDefaultsConfigError(rawParsed)) console.warn("⚠️ invalid routedCatalogDefaults ignored; routed catalog rows keep their derived values");
|
|
143
146
|
setCodexWsReuseAcrossTurns(validated.codexWsReuseAcrossTurns === true);
|
|
144
147
|
const retentionWarning = degradedReasoningRetentionWarning(rawParsed, validated);
|
|
145
148
|
if (retentionWarning) console.warn(retentionWarning);
|
|
@@ -244,6 +247,10 @@ export function sanitizeRetryOn429ForLoad(parsed: unknown, warn: (message: strin
|
|
|
244
247
|
const safeProviderName = JSON.stringify(redactSecretString(name));
|
|
245
248
|
if (!provider || typeof provider !== "object" || Array.isArray(provider)) continue;
|
|
246
249
|
const p = provider as Record<string, unknown>;
|
|
250
|
+
if (p.cacheAffinity !== undefined && !["auto", "session", "turn", "off"].includes(p.cacheAffinity as string)) {
|
|
251
|
+
delete p.cacheAffinity;
|
|
252
|
+
warn(`⚠️ config.json providers.${safeProviderName}.cacheAffinity is invalid — ignoring the field`);
|
|
253
|
+
}
|
|
247
254
|
const policy = p.retryOn429;
|
|
248
255
|
if (policy === undefined) continue;
|
|
249
256
|
if (!policy || typeof policy !== "object" || Array.isArray(policy)) {
|
|
@@ -1032,7 +1039,13 @@ export function sanitizeAliasesForLoad(raw: unknown, warn: (message: string) =>
|
|
|
1032
1039
|
const comboAliases = new Set(Object.values((root.combos as Record<string, { alias?: unknown }> | undefined) ?? {})
|
|
1033
1040
|
.map(combo => typeof combo?.alias === "string" ? combo.alias.toLowerCase() : "").filter(Boolean));
|
|
1034
1041
|
const accountNamespaces = new Set(Object.keys((root.codexAccountNamespaces as Record<string, unknown> | undefined) ?? {}).map(name => name.toLowerCase()));
|
|
1035
|
-
for (const provider of Object.
|
|
1042
|
+
for (const [providerName, provider] of Object.entries(providers)) {
|
|
1043
|
+
// #7705: a hand-edited template that would not validate loses only itself, not the config.
|
|
1044
|
+
if (provider.aliasTemplate !== undefined
|
|
1045
|
+
&& (typeof provider.aliasTemplate !== "string" || aliasTemplateError(provider.aliasTemplate) !== null)) {
|
|
1046
|
+
warn(`Ignoring invalid alias template for provider ${providerName} in config.json`);
|
|
1047
|
+
delete provider.aliasTemplate;
|
|
1048
|
+
}
|
|
1036
1049
|
const alias = provider.alias;
|
|
1037
1050
|
if (typeof alias !== "string" || !isValidProviderName(alias)
|
|
1038
1051
|
|| providerNames.has(alias.toLowerCase()) || claimedProviders.has(alias.toLowerCase())
|
|
@@ -18,7 +18,22 @@ export const SUBAGENT_SURFACE_GUIDE_URL = "https://opencodex.me/guides/subagent-
|
|
|
18
18
|
* What changed in this release is the written default, not this resolution.
|
|
19
19
|
*/
|
|
20
20
|
export function resolveMultiAgentMode(config: Pick<OcxConfig, "multiAgentMode">): MultiAgentMode {
|
|
21
|
-
return config.multiAgentMode === "v1" || config.multiAgentMode === "v2"
|
|
21
|
+
return config.multiAgentMode === "v1" || config.multiAgentMode === "v2" || config.multiAgentMode === "v2-plaintext"
|
|
22
|
+
? config.multiAgentMode
|
|
23
|
+
: "default";
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Whether v2 collaboration messages are compiled to plaintext on the canonical
|
|
28
|
+
* ChatGPT forward route. Two independent opt-ins activate it: the standalone
|
|
29
|
+
* experimental `plaintextV2AgentMessages` flag, and mode `"v2-plaintext"`, which is
|
|
30
|
+
* itself the operator's explicit consent. Mode transitions never rewrite the flag,
|
|
31
|
+
* and the flag alone never changes the resolved mode.
|
|
32
|
+
*/
|
|
33
|
+
export function isPlaintextV2AgentMessagesEnabled(
|
|
34
|
+
config: Pick<OcxConfig, "multiAgentMode" | "plaintextV2AgentMessages">,
|
|
35
|
+
): boolean {
|
|
36
|
+
return config.plaintextV2AgentMessages === true || resolveMultiAgentMode(config) === "v2-plaintext";
|
|
22
37
|
}
|
|
23
38
|
|
|
24
39
|
type AdvisoryConfig = Pick<OcxConfig, "multiAgentMode" | "multiAgentSurfaceAdvisoryVersion">;
|
|
@@ -27,12 +42,20 @@ type AdvisoryConfig = Pick<OcxConfig, "multiAgentMode" | "multiAgentSurfaceAdvis
|
|
|
27
42
|
* True when this install should be told once that v1 is now the default surface.
|
|
28
43
|
*
|
|
29
44
|
* A v1 install is silent because it has nothing to decide. A fresh install is silent
|
|
30
|
-
* because `getDefaultConfig()` writes the current version alongside the v1 default.
|
|
31
|
-
*
|
|
32
|
-
*
|
|
45
|
+
* because `getDefaultConfig()` writes the current version alongside the v1 default.
|
|
46
|
+
*
|
|
47
|
+
* A "v2-plaintext" install is silent too: the mode explicitly opts into a different
|
|
48
|
+
* native-to-routed delivery mechanism, and entering it required the
|
|
49
|
+
* dedicated plaintext acknowledgement, so re-raising the generic "v1 recommended" notice
|
|
50
|
+
* would repeat a decision the operator just made. The stored advisory version is left
|
|
51
|
+
* alone, so leaving the mode for base or v2 still raises an unanswered advisory.
|
|
52
|
+
*
|
|
53
|
+
* What is left is the case this exists for: an install that predates the change and is
|
|
54
|
+
* running base or v2, where a ChatGPT-native parent cannot hand a task to a routed child.
|
|
33
55
|
*/
|
|
34
56
|
export function multiAgentSurfaceAdvisoryRequired(config: AdvisoryConfig): boolean {
|
|
35
|
-
|
|
57
|
+
const mode = resolveMultiAgentMode(config);
|
|
58
|
+
if (mode === "v1" || mode === "v2-plaintext") return false;
|
|
36
59
|
return (config.multiAgentSurfaceAdvisoryVersion ?? 0) < MULTI_AGENT_SURFACE_ADVISORY_VERSION;
|
|
37
60
|
}
|
|
38
61
|
|
|
@@ -63,6 +63,20 @@ export type PendingTeardownReceipt = {
|
|
|
63
63
|
* replacement ever comes up, the next `ocx stop` finishes it like any abandoned receipt.
|
|
64
64
|
*/
|
|
65
65
|
handover?: "update-restart";
|
|
66
|
+
/**
|
|
67
|
+
* Windows checked stop (#7771): what the owner's Part A did before it sent the stop.
|
|
68
|
+
* /api/stop skips its own Part A only for a receipt carrying this record whose manager
|
|
69
|
+
* is still the registered one; a receipt without it (an older CLI, or one written
|
|
70
|
+
* before Part A) gets the route's own capped Part A. Readers that predate it ignore it.
|
|
71
|
+
*/
|
|
72
|
+
partA?: PendingTeardownPartA;
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
/** The Part A record of a teardown receipt: the outcome, the manager, the ended wrappers. */
|
|
76
|
+
export type PendingTeardownPartA = {
|
|
77
|
+
partA: "stopped" | "absent";
|
|
78
|
+
manager: { scheduler: boolean; winsw: boolean };
|
|
79
|
+
wrappers: { pid: number; startTime: number }[];
|
|
66
80
|
};
|
|
67
81
|
|
|
68
82
|
/**
|
|
@@ -130,6 +144,7 @@ export function claimPendingTeardown(
|
|
|
130
144
|
endpointSource: "exact" | "guessed",
|
|
131
145
|
ownerPid: number = process.pid,
|
|
132
146
|
handover?: "update-restart",
|
|
147
|
+
partA?: PendingTeardownPartA | null,
|
|
133
148
|
): PendingTeardownReceipt {
|
|
134
149
|
const dir = getConfigDir();
|
|
135
150
|
assertNotRealHomeUnderTest(dir);
|
|
@@ -137,11 +152,44 @@ export function claimPendingTeardown(
|
|
|
137
152
|
const receipt: PendingTeardownReceipt = {
|
|
138
153
|
ownerPid, nonce, createdAt: new Date().toISOString(), endpoint, endpointSource,
|
|
139
154
|
...(handover ? { handover } : {}),
|
|
155
|
+
...(partA ? { partA } : {}),
|
|
140
156
|
};
|
|
141
157
|
atomicWriteFile(pendingTeardownPathFor(nonce), JSON.stringify(receipt, null, 2) + "\n");
|
|
142
158
|
return receipt;
|
|
143
159
|
}
|
|
144
160
|
|
|
161
|
+
/**
|
|
162
|
+
* Add the Part A record to a receipt this process claimed before Part A ran (the guarded
|
|
163
|
+
* stop and an update handover claim first). Only the owner's own valid receipt is
|
|
164
|
+
* rewritten; anything else is left alone and reported as false.
|
|
165
|
+
*/
|
|
166
|
+
export function recordPendingTeardownPartA(nonce: string, partA: PendingTeardownPartA, ownerPid: number = process.pid): boolean {
|
|
167
|
+
const read = readPendingTeardown(nonce);
|
|
168
|
+
if (read.state !== "valid" || read.receipt.ownerPid !== ownerPid) return false;
|
|
169
|
+
assertNotRealHomeUnderTest(getConfigDir());
|
|
170
|
+
atomicWriteFile(pendingTeardownPathFor(nonce), JSON.stringify({ ...read.receipt, partA }, null, 2) + "\n");
|
|
171
|
+
return true;
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
/** The Part A record of the receipt a request names, when it is present and well formed. */
|
|
175
|
+
export function pendingTeardownPartA(nonce: string | null): PendingTeardownPartA | null {
|
|
176
|
+
if (!nonce || !NONCE_RE.test(nonce)) return null;
|
|
177
|
+
const read = readPendingTeardown(nonce);
|
|
178
|
+
if (read.state !== "valid") return null;
|
|
179
|
+
const record = read.receipt.partA as unknown;
|
|
180
|
+
if (!record || typeof record !== "object") return null;
|
|
181
|
+
const value = record as Record<string, unknown>;
|
|
182
|
+
const manager = value.manager as Record<string, unknown> | undefined;
|
|
183
|
+
const ok = (value.partA === "stopped" || value.partA === "absent")
|
|
184
|
+
&& !!manager && typeof manager === "object"
|
|
185
|
+
&& typeof manager.scheduler === "boolean" && typeof manager.winsw === "boolean"
|
|
186
|
+
&& Array.isArray(value.wrappers)
|
|
187
|
+
&& value.wrappers.every(entry => !!entry && typeof entry === "object"
|
|
188
|
+
&& Number.isSafeInteger((entry as { pid?: unknown }).pid)
|
|
189
|
+
&& Number.isFinite((entry as { startTime?: unknown }).startTime));
|
|
190
|
+
return ok ? read.receipt.partA! : null;
|
|
191
|
+
}
|
|
192
|
+
|
|
145
193
|
export function readPendingTeardown(nonce: string): PendingTeardownRead {
|
|
146
194
|
if (!NONCE_RE.test(nonce)) return { state: "missing" };
|
|
147
195
|
let raw: string;
|
|
@@ -332,10 +380,19 @@ export function isPendingTeardownAbandoned(
|
|
|
332
380
|
return !isAlive(read.receipt.ownerPid);
|
|
333
381
|
}
|
|
334
382
|
|
|
335
|
-
/**
|
|
336
|
-
|
|
383
|
+
/**
|
|
384
|
+
* Does this request name an obligation that exists, is readable, and is about this proxy?
|
|
385
|
+
*
|
|
386
|
+
* A receipt records the endpoint its stop was sent to. With `servedPort`, only a receipt naming
|
|
387
|
+
* that port defers this proxy's teardown, so a nonce claimed for one proxy cannot be spent on
|
|
388
|
+
* another listening elsewhere: that stop would defer an obligation the receipt does not describe,
|
|
389
|
+
* and the receipt's owner could release it without knowing (#8416).
|
|
390
|
+
*/
|
|
391
|
+
export function deferralMatchesReceipt(nonce: string | null, servedPort?: number | null): boolean {
|
|
337
392
|
if (!nonce || !NONCE_RE.test(nonce)) return false;
|
|
338
|
-
|
|
393
|
+
const read = readPendingTeardown(nonce);
|
|
394
|
+
if (read.state !== "valid") return false;
|
|
395
|
+
return servedPort === undefined || (servedPort !== null && read.receipt.endpoint.port === servedPort);
|
|
339
396
|
}
|
|
340
397
|
|
|
341
398
|
/** Does this request name a valid obligation that an update handed to its replacement (#7423)? */
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { OcxConfig } from "../types";
|
|
2
|
-
import {
|
|
2
|
+
import { projectPersistedConfigMigrations } from "./persisted-projections";
|
|
3
3
|
import { readConfigFileSnapshot, type ConfigFileSnapshot } from "./diagnostics";
|
|
4
4
|
import { bumpGenerationForCooperatingConfigWrite, withConfigMutationLockSync } from "./mutation-lock";
|
|
5
5
|
import { persistConfigUnlocked } from "./persist-unlocked";
|
|
@@ -89,7 +89,7 @@ export function mutatePersistedConfig<T>(
|
|
|
89
89
|
continue;
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
const projected =
|
|
92
|
+
const projected = projectPersistedConfigMigrations(
|
|
93
93
|
commitBase.diagnostics.config,
|
|
94
94
|
projectConfigRebaseProvenance(confirmedConfig),
|
|
95
95
|
);
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { OcxConfig } from "../types";
|
|
2
|
+
import { adoptCustomModelCatalogMigration, projectCustomModelCatalogMigration } from "../codex/custom-model-catalog-migration";
|
|
3
|
+
import { adoptReserveCapabilityMigration, projectReserveCapabilityMigration } from "./reserve-capability";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Every one-time migration a whole-config write must carry, projected against the same pre-write
|
|
7
|
+
* document. Writers call this once instead of each migration separately, so a new migration cannot
|
|
8
|
+
* be wired into some write paths and silently missed by others.
|
|
9
|
+
*/
|
|
10
|
+
export function projectPersistedConfigMigrations(persisted: unknown, candidate: OcxConfig): OcxConfig {
|
|
11
|
+
return projectReserveCapabilityMigration(persisted, projectCustomModelCatalogMigration(persisted, candidate));
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/** Copy the migration state a successful projected write established onto the live object. */
|
|
15
|
+
export function adoptPersistedConfigMigrations(target: OcxConfig, projected: OcxConfig): void {
|
|
16
|
+
adoptCustomModelCatalogMigration(target, projected);
|
|
17
|
+
adoptReserveCapabilityMigration(target, projected);
|
|
18
|
+
}
|