@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
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { serviceApiTokenFingerprint } from "../../lib/service-secrets";
|
|
2
|
-
import type { Server } from "bun";
|
|
2
|
+
import type { Server, WebSocketHandler } from "bun";
|
|
3
3
|
import type { OcxConfig } from "../../types";
|
|
4
|
+
import type { RequestPolicyView } from "../auth-cors";
|
|
5
|
+
import type { WsData } from "../ws-bridge";
|
|
6
|
+
import { linkResponsesWebsocketEnabled } from "../../config/feature-flags";
|
|
4
7
|
import {
|
|
5
8
|
createClaudeInterceptLifecycle,
|
|
6
9
|
type ClaudeInterceptLifecycle,
|
|
@@ -23,8 +26,12 @@ import { startJevQuotaActivation } from "../../combos/jev-quota-activation";
|
|
|
23
26
|
import { createLocalControlListener } from "./local-control-listener";
|
|
24
27
|
import { createCatalogPullRecorder, type CatalogPull, type CatalogPullRecorder } from "../../link/child-catalog-freshness";
|
|
25
28
|
import type { LinkActivitySnapshot } from "../../link/child-activity";
|
|
29
|
+
import type { CatalogRevisionMonitor } from "../../link/child-catalog-freshness";
|
|
30
|
+
import type { ChildOpsHostBinding } from "../../link/child-ops-host";
|
|
31
|
+
import { createRouteProofRegistry } from "../../link/route-proof";
|
|
26
32
|
export { LINK_INGRESS_HOSTNAME } from "./link-listener";
|
|
27
33
|
import type { ServerIngress } from "./serve-options";
|
|
34
|
+
import { linkHomeFeatures } from "../../remote/features";
|
|
28
35
|
|
|
29
36
|
export interface OptionalListenerStartContext<T> {
|
|
30
37
|
startProxy?: typeof import("../../claude/intercept/connect-proxy").startConnectProxy;
|
|
@@ -33,6 +40,9 @@ export interface OptionalListenerStartContext<T> {
|
|
|
33
40
|
requestedPort?: number;
|
|
34
41
|
maxRequestBodySize: number;
|
|
35
42
|
dispatch: (req: Request, server: Server<T>) => Promise<Response>;
|
|
43
|
+
/** The shared Responses WebSocket handler and the hub-link policy, for the link WebSocket. */
|
|
44
|
+
websocket?: WebSocketHandler<WsData>;
|
|
45
|
+
linkPolicy?: () => RequestPolicyView;
|
|
36
46
|
}
|
|
37
47
|
|
|
38
48
|
export interface OptionalListenerSet<T> {
|
|
@@ -41,10 +51,19 @@ export interface OptionalListenerSet<T> {
|
|
|
41
51
|
ingressOf(server: Server<T>): ServerIngress | undefined;
|
|
42
52
|
linkRouteAllowed(url: URL, req: Request): boolean;
|
|
43
53
|
linkAdmissionKeyIds(): ReadonlySet<string>;
|
|
44
|
-
onAuthenticatedCatalog(listener: (apiKeyId: string) => void): () => void;
|
|
45
|
-
notifyAuthenticatedCatalog(apiKeyId: string): void;
|
|
54
|
+
onAuthenticatedCatalog(listener: (apiKeyId: string, routeProofId?: string) => void): () => void;
|
|
55
|
+
notifyAuthenticatedCatalog(apiKeyId: string, routeProofId?: string): void;
|
|
46
56
|
peerObservation(linkId: string): import("../../link/peer-report").LinkPeerEntry;
|
|
47
57
|
linkActivity(linkId: string, now: number): LinkActivitySnapshot;
|
|
58
|
+
/** Close one link's Responses WebSockets with 4401; the revoke route calls it after its commit. */
|
|
59
|
+
closeLinkSockets(linkId: string): number;
|
|
60
|
+
/** The link's WebSocket activity holds and their reasons; null when nothing holds it (D8). */
|
|
61
|
+
linkHolds(linkId: string): import("../../link/ws-activity-holds").LinkHoldsSummary | null;
|
|
62
|
+
/** The operator's clear of one link's activity holds (D8). */
|
|
63
|
+
clearLinkHolds(linkId: string): import("../../link/ws-activity-holds").ClearHoldsResult;
|
|
64
|
+
/** The link's live WebSocket counters (design 9.3). */
|
|
65
|
+
linkTransport(linkId: string): import("../../link/status-projection").LinkWsCounters;
|
|
66
|
+
linkTraffic(linkId: string): import("../../link/traffic").LinkTrafficCounters;
|
|
48
67
|
/** The last relayed catalog pull of a link in this process; null before start or before any pull. */
|
|
49
68
|
catalogPull(linkId: string): CatalogPull | null;
|
|
50
69
|
/** Write every catalog pull still held in memory; a failed write is logged and kept for the next attempt. */
|
|
@@ -65,16 +84,33 @@ export interface OptionalListenerSet<T> {
|
|
|
65
84
|
stop(): Promise<void>;
|
|
66
85
|
}
|
|
67
86
|
|
|
68
|
-
|
|
87
|
+
/** The Child-ops host and the status rows' catalog monitor, loaded together on a Home with links (050). */
|
|
88
|
+
export type ChildOpsHostLoader = () => Promise<{
|
|
89
|
+
startChildOpsHost: (binding: ChildOpsHostBinding) => () => void;
|
|
90
|
+
catalogRevision: () => CatalogRevisionMonitor;
|
|
91
|
+
}>;
|
|
92
|
+
|
|
93
|
+
/** Dynamic imports only: a Home without links never loads src/link/child-ops-* (INV-LINK-CHILD-OPS-01). */
|
|
94
|
+
const loadChildOpsHost: ChildOpsHostLoader = async () => {
|
|
95
|
+
const [host, routes] = await Promise.all([import("../../link/child-ops-host"), import("../management/link-child-ops-routes")]);
|
|
96
|
+
return { startChildOpsHost: host.startChildOpsHost, catalogRevision: routes.catalogRevisionForRoutes };
|
|
97
|
+
};
|
|
98
|
+
|
|
99
|
+
export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {},
|
|
100
|
+
childOps: { load?: ChildOpsHostLoader } = {}): OptionalListenerSet<T> {
|
|
69
101
|
const claudeIntercept: ClaudeInterceptLifecycle<T> = createClaudeInterceptLifecycle<T>();
|
|
70
102
|
const linkListener: LinkListenerLifecycle<T> = createLinkListenerLifecycle<T>(linkDeps);
|
|
71
103
|
const localControl = createLocalControlListener<T>();
|
|
72
104
|
let activeConfig: OcxConfig | undefined;
|
|
73
105
|
let stopJevQuotaActivation: (() => void) | undefined;
|
|
106
|
+
// Readiness proofs of multi-route candidates: registered by the supervisor, admitted by the
|
|
107
|
+
// hub-link catalog admission below, valid only under the link's current tunnel generation.
|
|
108
|
+
const routeProofs = createRouteProofRegistry({ generationOf: linkId => supervisor.connectionGeneration?.(linkId) });
|
|
74
109
|
const supervisor = createLinkSupervisor({
|
|
75
110
|
// Tunnel state changes and their causes reach <configDir>/link/diagnostics.jsonl (bounded).
|
|
76
111
|
diagnostic: recordLinkDiagnostic,
|
|
77
112
|
flushDiagnostics: flushLinkDiagnostics,
|
|
113
|
+
routeProof: routeProofs,
|
|
78
114
|
apiKeys: () => activeConfig?.apiKeys ?? [],
|
|
79
115
|
revokeApiKey: id => {
|
|
80
116
|
if (!activeConfig) return false;
|
|
@@ -92,9 +128,42 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
92
128
|
},
|
|
93
129
|
});
|
|
94
130
|
let unregisterSupervisorAdmission: (() => void) | undefined;
|
|
131
|
+
let unregisterRouteProofs: (() => void) | undefined;
|
|
95
132
|
let supervisorStop: (() => Promise<void>) | undefined;
|
|
96
133
|
let catalogPulls: CatalogPullRecorder | undefined;
|
|
97
134
|
let unregisterCatalogPulls: (() => void) | undefined;
|
|
135
|
+
let stopChildOps: (() => void) | undefined;
|
|
136
|
+
// Bumped by stop() and by every "not owned" sync, so an import still in flight cannot start a host afterwards.
|
|
137
|
+
let childOpsGeneration = 0;
|
|
138
|
+
/**
|
|
139
|
+
* The Child-ops host runs exactly while the link listener owns its socket, which it does only when links.json has
|
|
140
|
+
* links. start() stays synchronous: the import is not awaited (the startServer no-await window, AGENTS.md).
|
|
141
|
+
*/
|
|
142
|
+
const syncChildOpsHost = (): void => {
|
|
143
|
+
if (!linkListenerOwnsTarget(linkListener.status())) {
|
|
144
|
+
childOpsGeneration += 1;
|
|
145
|
+
stopChildOps?.();
|
|
146
|
+
stopChildOps = undefined;
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
if (stopChildOps) return;
|
|
150
|
+
const generation = ++childOpsGeneration;
|
|
151
|
+
void (childOps.load ?? loadChildOpsHost)()
|
|
152
|
+
.then(loaded => {
|
|
153
|
+
if (generation !== childOpsGeneration || stopChildOps || !activeConfig || !linkListenerOwnsTarget(linkListener.status())) return;
|
|
154
|
+
const config = activeConfig;
|
|
155
|
+
stopChildOps = loaded.startChildOpsHost({
|
|
156
|
+
config: () => activeConfig ?? config,
|
|
157
|
+
supervisorStatus: () => supervisor.status(),
|
|
158
|
+
listenerStatus: () => linkListener.status(),
|
|
159
|
+
activity: (linkId, now) => linkListener.linkActivity(linkId, now),
|
|
160
|
+
catalogRevision: loaded.catalogRevision,
|
|
161
|
+
peer: linkId => linkListener.peerObservation(linkId),
|
|
162
|
+
});
|
|
163
|
+
})
|
|
164
|
+
// A host that fails to load leaves manual operations working and the status rows unchanged.
|
|
165
|
+
.catch(error => { console.warn(`[link] child ops host did not start error=${error instanceof Error ? error.name : "unknown"}`); });
|
|
166
|
+
};
|
|
98
167
|
|
|
99
168
|
return {
|
|
100
169
|
ensureClaudeIntercept: () => claudeIntercept.ensure(),
|
|
@@ -113,9 +182,14 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
113
182
|
|| linkChildParityRouteAllowed(url, req),
|
|
114
183
|
linkAdmissionKeyIds: () => linkListener.linkAdmissionKeyIds(),
|
|
115
184
|
onAuthenticatedCatalog: listener => linkListener.onAuthenticatedCatalog(listener),
|
|
116
|
-
notifyAuthenticatedCatalog: apiKeyId => linkListener.notifyAuthenticatedCatalog(apiKeyId),
|
|
185
|
+
notifyAuthenticatedCatalog: (apiKeyId, routeProofId) => linkListener.notifyAuthenticatedCatalog(apiKeyId, routeProofId),
|
|
117
186
|
peerObservation: linkId => linkListener.peerObservation(linkId),
|
|
118
187
|
linkActivity: (linkId, now) => linkListener.linkActivity(linkId, now),
|
|
188
|
+
closeLinkSockets: linkId => linkListener.closeLinkSockets(linkId),
|
|
189
|
+
linkHolds: linkId => linkListener.linkHolds(linkId),
|
|
190
|
+
clearLinkHolds: linkId => linkListener.clearLinkHolds(linkId),
|
|
191
|
+
linkTransport: linkId => linkListener.linkTransport(linkId),
|
|
192
|
+
linkTraffic: linkId => linkListener.linkTraffic(linkId),
|
|
119
193
|
catalogPull: linkId => catalogPulls?.pulled(linkId) ?? null,
|
|
120
194
|
flushCatalogPulls: () => { catalogPulls?.flush(); },
|
|
121
195
|
status: () => linkListener.status(),
|
|
@@ -126,6 +200,12 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
126
200
|
localControl.start({ config: ctx.config, publicPort: ctx.publicPort, dispatch: ctx.dispatch });
|
|
127
201
|
linkListener.start({ dispatch: ctx.dispatch, maxRequestBodySize: ctx.maxRequestBodySize,
|
|
128
202
|
connectionGeneration: linkId => supervisor.connectionGeneration?.(linkId),
|
|
203
|
+
homeFeatures: () => linkHomeFeatures(activeConfig),
|
|
204
|
+
...(ctx.websocket && ctx.linkPolicy ? { responsesWebsocket: {
|
|
205
|
+
handler: ctx.websocket,
|
|
206
|
+
enabled: () => activeConfig !== undefined && linkResponsesWebsocketEnabled(activeConfig),
|
|
207
|
+
policy: ctx.linkPolicy,
|
|
208
|
+
} } : {}),
|
|
129
209
|
keyFingerprints: apiKeyId => {
|
|
130
210
|
const entry = activeConfig?.apiKeys?.find(candidate => candidate.id === apiKeyId);
|
|
131
211
|
if (!entry?.key) return [];
|
|
@@ -136,11 +216,15 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
136
216
|
},
|
|
137
217
|
});
|
|
138
218
|
unregisterSupervisorAdmission ??= linkListener.onAuthenticatedCatalog(apiKeyId => supervisor.notifyAuthenticatedRequest?.(apiKeyId));
|
|
219
|
+
unregisterRouteProofs ??= linkListener.onAuthenticatedCatalog((apiKeyId, routeProofId) => {
|
|
220
|
+
if (routeProofId !== undefined) routeProofs.admit(apiKeyId, routeProofId);
|
|
221
|
+
});
|
|
139
222
|
// Only the hub-link relay fires this, so a Home without links records nothing.
|
|
140
223
|
catalogPulls ??= createCatalogPullRecorder({ storePath: linkDeps.storePath });
|
|
141
224
|
unregisterCatalogPulls ??= linkListener.onCatalogServed(served => catalogPulls!.record(served));
|
|
142
225
|
if (linkListenerOwnsTarget(linkListener.status())) {
|
|
143
226
|
supervisor.start();
|
|
227
|
+
syncChildOpsHost();
|
|
144
228
|
}
|
|
145
229
|
supervisorStop = () => supervisor.stop();
|
|
146
230
|
claudeIntercept.start({
|
|
@@ -157,8 +241,8 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
157
241
|
abortStart() {
|
|
158
242
|
try { localControl.abort(); } catch { /* the startup error is the one worth reporting */ }
|
|
159
243
|
},
|
|
160
|
-
ensureStarted: () => linkListener.ensureStarted(),
|
|
161
|
-
close: () => linkListener.close(),
|
|
244
|
+
ensureStarted: () => linkListener.ensureStarted().then(() => syncChildOpsHost()),
|
|
245
|
+
close: () => linkListener.close().then(() => syncChildOpsHost()),
|
|
162
246
|
registerSupervisorStop(stop) {
|
|
163
247
|
supervisorStop = stop;
|
|
164
248
|
return () => {
|
|
@@ -174,6 +258,10 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
174
258
|
// the lease were still held by this live pid it would read as a live owner and that
|
|
175
259
|
// successor would refuse the port for good.
|
|
176
260
|
try { await localControl.stop(); } catch (error) { failure = error; }
|
|
261
|
+
// Synchronous: no automatic Child job is submitted once the supervisor starts tearing tunnels down.
|
|
262
|
+
childOpsGeneration += 1;
|
|
263
|
+
stopChildOps?.();
|
|
264
|
+
stopChildOps = undefined;
|
|
177
265
|
if (supervisorStop) {
|
|
178
266
|
try { await supervisorStop(); } catch (error) { failure ??= error; }
|
|
179
267
|
}
|
|
@@ -181,6 +269,8 @@ export function createOptionalListenerSet<T>(linkDeps: LinkListenerDeps = {}): O
|
|
|
181
269
|
try { await claudeIntercept.stop(); } catch (error) { failure ??= error; }
|
|
182
270
|
unregisterSupervisorAdmission?.();
|
|
183
271
|
unregisterSupervisorAdmission = undefined;
|
|
272
|
+
unregisterRouteProofs?.();
|
|
273
|
+
unregisterRouteProofs = undefined;
|
|
184
274
|
unregisterCatalogPulls?.();
|
|
185
275
|
unregisterCatalogPulls = undefined;
|
|
186
276
|
catalogPulls?.flush();
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import type { OcxConfig } from "../../types";
|
|
2
|
+
import { routeIntentDigest, ROUTE_INTENT_DIGEST_PATTERN } from "../../link/route-intent";
|
|
3
|
+
import { homeRouteIntentWatch, ROUTE_INTENT_AFTER_HEADER, ROUTE_INTENT_WAKE_HEADER, ROUTE_INTENT_WATCH_HEADER } from "../../link/route-intent-watch";
|
|
4
|
+
import { projectChildRouteIntent } from "../../routing/home-route-intent";
|
|
5
|
+
import { linkStorePath } from "../../link/paths";
|
|
6
|
+
import { readLinkStore } from "../../link/store";
|
|
7
|
+
|
|
8
|
+
function refused(status: number, error: string): Response {
|
|
9
|
+
return Response.json({ error }, { status, headers: { "cache-control": "no-store" } });
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Called only after the shared exact GET/no-query/no-upgrade gate. `readmit` repeats the
|
|
13
|
+
* listener's key admission against current policy and returns the key id it admits now.
|
|
14
|
+
*/
|
|
15
|
+
export async function readLinkRouteIntent(req: Request, config: OcxConfig, version: string, admittedKeyId?: string,
|
|
16
|
+
readmit?: () => string | undefined): Promise<Response> {
|
|
17
|
+
if (!admittedKeyId) return refused(403, "link_key_required");
|
|
18
|
+
const watch = req.headers.get(ROUTE_INTENT_WATCH_HEADER);
|
|
19
|
+
const after = req.headers.get(ROUTE_INTENT_AFTER_HEADER);
|
|
20
|
+
if ((watch !== null && watch !== "1") || (after !== null && (watch !== "1" || !ROUTE_INTENT_DIGEST_PATTERN.test(after)))) {
|
|
21
|
+
return refused(400, "invalid_route_intent_watch");
|
|
22
|
+
}
|
|
23
|
+
try {
|
|
24
|
+
const ownedLink = () => {
|
|
25
|
+
const links = readLinkStore(linkStorePath()).links.filter(link => link.apiKeyId === admittedKeyId);
|
|
26
|
+
return links.length === 1 ? links[0]!.id : null;
|
|
27
|
+
};
|
|
28
|
+
const linkId = ownedLink();
|
|
29
|
+
if (!linkId) return refused(403, "link_mismatch");
|
|
30
|
+
const project = () => projectChildRouteIntent(config, version, linkId);
|
|
31
|
+
let document = project();
|
|
32
|
+
let wakeReason: "changed" | "notified" | "timeout" = "changed";
|
|
33
|
+
if (watch === "1" && after === routeIntentDigest(document)) {
|
|
34
|
+
const wake = await homeRouteIntentWatch.wait(linkId, req.signal);
|
|
35
|
+
if (wake === "cancelled") return refused(499, "route_intent_watch_cancelled");
|
|
36
|
+
if (wake === "busy") return refused(429, "route_intent_watch_busy");
|
|
37
|
+
wakeReason = wake;
|
|
38
|
+
// Trust, the key itself and effective policy can all have changed during the wait.
|
|
39
|
+
if (readmit && readmit() !== admittedKeyId) return refused(403, "link_key_required");
|
|
40
|
+
if (ownedLink() !== linkId) return refused(403, "link_mismatch");
|
|
41
|
+
document = project();
|
|
42
|
+
}
|
|
43
|
+
if (req.signal.aborted) return refused(499, "route_intent_watch_cancelled");
|
|
44
|
+
return Response.json(document, { headers: { "cache-control": "no-store", [ROUTE_INTENT_WATCH_HEADER]: "1",
|
|
45
|
+
...(watch === "1" ? { [ROUTE_INTENT_WAKE_HEADER]: wakeReason } : {}) } });
|
|
46
|
+
} catch { return refused(503, "route_intent_unavailable"); }
|
|
47
|
+
}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import type { Server } from "bun";
|
|
2
|
+
import type { StartServerDeps } from "./startup-warnings";
|
|
3
|
+
import { isClaudeInterceptedPath } from "../../claude/intercept/listener";
|
|
4
|
+
import type { WsData } from "../ws-bridge";
|
|
5
|
+
import {
|
|
6
|
+
isLoopbackHostname,
|
|
7
|
+
type RequestPolicyView,
|
|
8
|
+
} from "../auth-cors";
|
|
9
|
+
import type { ActiveTurnLease } from "../lifecycle";
|
|
10
|
+
import type { OcxConfig } from "../../types";
|
|
11
|
+
import type { LiveCallBindings } from "../live-call-bindings";
|
|
12
|
+
import type { ManagementApiDeps } from "../management-api";
|
|
13
|
+
import type {
|
|
14
|
+
ManagementAuthState,
|
|
15
|
+
ManagementSessionControl,
|
|
16
|
+
} from "../management-auth";
|
|
17
|
+
import type { PackageTreeIntegrityGuard } from "../../lib/package-tree-integrity";
|
|
18
|
+
import type { ReadinessGate } from "../readiness";
|
|
19
|
+
import type { WorkflowRefusalLog } from "../workflow-refusal";
|
|
20
|
+
import type { AdmittedHttpTurnOptions } from "../admitted-http-turn";
|
|
21
|
+
|
|
22
|
+
export type ServerIngress = "public" | "unauthenticated-loopback" | "hub-management" | "claude-intercept" | "hub-link" | "local-control";
|
|
23
|
+
|
|
24
|
+
export function trustedLoopbackForIngress(ingress: ServerIngress, hostname: string): boolean {
|
|
25
|
+
return ingress === "unauthenticated-loopback" || ingress === "local-control"
|
|
26
|
+
|| (ingress === "public" && isLoopbackHostname(hostname));
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Routes the Claude intercept TLS listener may reach. Everything else on that socket is relayed
|
|
31
|
+
* to the real upstream by the listener itself, so a request that lands here with another path
|
|
32
|
+
* is a bug, not a client — refuse it.
|
|
33
|
+
*/
|
|
34
|
+
export function claudeInterceptRouteAllowed(url: URL, req: Request): boolean {
|
|
35
|
+
return isClaudeInterceptedPath(url.pathname, req.method);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export interface ServeOptionsContext {
|
|
39
|
+
readonly server: Server<WsData>;
|
|
40
|
+
readonly boundPort: number | null;
|
|
41
|
+
readonly remoteWorkspaceStopping: boolean;
|
|
42
|
+
|
|
43
|
+
drainingResponse: (req: Request, policy: RequestPolicyView) => Response;
|
|
44
|
+
ingressForServer: (requestServer: Server<WsData>) => ServerIngress;
|
|
45
|
+
loopbackRouteAllowed: (url: URL, req: Request) => boolean;
|
|
46
|
+
managementIngressRouteAllowed: (url: URL, req: Request) => boolean;
|
|
47
|
+
linkRouteAllowed: (url: URL, req: Request) => boolean;
|
|
48
|
+
/** A key-admitted catalog request; routeProofId is a multi-route readiness proof it carried (src/link/route-proof.ts). */
|
|
49
|
+
onAuthenticatedCatalog: (apiKeyId: string, routeProofId?: string) => void;
|
|
50
|
+
linkPolicy: () => RequestPolicyView;
|
|
51
|
+
packageTreeChangedResponse: (
|
|
52
|
+
req: Request,
|
|
53
|
+
policy: RequestPolicyView,
|
|
54
|
+
message: string,
|
|
55
|
+
) => Response;
|
|
56
|
+
serverBusyResponse: (
|
|
57
|
+
req: Request,
|
|
58
|
+
resource: string,
|
|
59
|
+
policy: RequestPolicyView,
|
|
60
|
+
) => Response;
|
|
61
|
+
runAdmittedHttpTurn: (
|
|
62
|
+
req: Request,
|
|
63
|
+
policy: RequestPolicyView,
|
|
64
|
+
work: (lease: ActiveTurnLease) => Promise<Response>,
|
|
65
|
+
refusalLog?: WorkflowRefusalLog,
|
|
66
|
+
options?: AdmittedHttpTurnOptions,
|
|
67
|
+
) => Promise<Response>;
|
|
68
|
+
|
|
69
|
+
config: OcxConfig;
|
|
70
|
+
inboundBodyLimitBytes: number;
|
|
71
|
+
listenPort: number;
|
|
72
|
+
liveCallBindings: LiveCallBindings;
|
|
73
|
+
loadRemoteWorkspaceRuntime: () => Promise<
|
|
74
|
+
typeof import("../../remote-control/workspace-runtime")
|
|
75
|
+
>;
|
|
76
|
+
localAttestationSecret: string;
|
|
77
|
+
loopbackPolicy: () => RequestPolicyView;
|
|
78
|
+
managementApiDeps: ManagementApiDeps;
|
|
79
|
+
managementAuth: ManagementAuthState;
|
|
80
|
+
managementSessionControl: ManagementSessionControl;
|
|
81
|
+
packageTreeIntegrity: PackageTreeIntegrityGuard;
|
|
82
|
+
readinessGate: ReadinessGate;
|
|
83
|
+
|
|
84
|
+
deps: StartServerDeps;
|
|
85
|
+
port: number | undefined;
|
|
86
|
+
}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { messagesUnknownEndpointMessage } from "../../lib/messages-error-body";
|
|
2
2
|
import type { Server, ServerWebSocket } from "bun";
|
|
3
|
+
import {
|
|
4
|
+
claudeInterceptRouteAllowed,
|
|
5
|
+
trustedLoopbackForIngress,
|
|
6
|
+
type ServeOptionsContext,
|
|
7
|
+
} from "./serve-contract";
|
|
3
8
|
import { modelAliasIdPromoter } from "./model-alias-id";
|
|
4
|
-
import type { StartServerDeps } from "./startup-warnings";
|
|
5
9
|
import { isLinkManagementPath } from "../../link/management-routes";
|
|
10
|
+
import { takeRouteProof } from "../../link/route-proof";
|
|
6
11
|
import {
|
|
7
12
|
GUI_PAIRING_EXCHANGE_BODY_LIMIT,
|
|
8
13
|
REMOTE_WORKSPACE_PAIRING_BODY_LIMIT,
|
|
@@ -28,7 +33,6 @@ import {
|
|
|
28
33
|
} from "./startup-warnings";
|
|
29
34
|
|
|
30
35
|
import { remoteWorkspaceEnabled } from "../../remote-control/workspace-activation";
|
|
31
|
-
import { isClaudeInterceptedPath } from "../../claude/intercept/listener";
|
|
32
36
|
import { markActivity } from "../../lib/sidecar-tracker";
|
|
33
37
|
import { knownModelIdsForProvider } from "../../router";
|
|
34
38
|
import {
|
|
@@ -99,11 +103,13 @@ import {
|
|
|
99
103
|
isAllowedManagementOrigin,
|
|
100
104
|
isApiAuthRequired,
|
|
101
105
|
isLoopbackHostname,
|
|
106
|
+
markDashboardProxyPeer,
|
|
102
107
|
markTrustedHubManagementRequest,
|
|
103
108
|
jsonResponse,
|
|
104
109
|
admissionFields,
|
|
105
110
|
resolveApiAuth,
|
|
106
111
|
resolveResponsesApiAuth,
|
|
112
|
+
resolveFilteredReplayPrincipal,
|
|
107
113
|
type RequestPolicyView,
|
|
108
114
|
withCors,
|
|
109
115
|
withManagementCors,
|
|
@@ -148,7 +154,6 @@ import {
|
|
|
148
154
|
} from "../audio-live";
|
|
149
155
|
import {
|
|
150
156
|
EXTERNAL_CALL_PREFIX,
|
|
151
|
-
type LiveCallBindings,
|
|
152
157
|
} from "../live-call-bindings";
|
|
153
158
|
import { clearableDeadline } from "../../lib/abort";
|
|
154
159
|
import { handleSearch } from "../search";
|
|
@@ -168,8 +173,6 @@ import {
|
|
|
168
173
|
issueGuiSession,
|
|
169
174
|
managementPrincipal,
|
|
170
175
|
requireManagementAuth,
|
|
171
|
-
type ManagementAuthState,
|
|
172
|
-
type ManagementSessionControl,
|
|
173
176
|
} from "../management-auth";
|
|
174
177
|
import {
|
|
175
178
|
LOCAL_ATTESTATION_CHALLENGE_HEADER,
|
|
@@ -183,6 +186,7 @@ import { LOCAL_ASIDE_SYNC_CAPABILITY_VERSION } from "../../lib/local-aside-sync-
|
|
|
183
186
|
import {
|
|
184
187
|
GUI_PAIR_CAPABILITY_VERSION,
|
|
185
188
|
GUI_PAIR_PATH,
|
|
189
|
+
DESKTOP_GUI_PAIR_PATH,
|
|
186
190
|
} from "../../lib/gui-pair-capability";
|
|
187
191
|
import {
|
|
188
192
|
GuiPairingGrantRateLimitError,
|
|
@@ -200,12 +204,7 @@ import {
|
|
|
200
204
|
catalogFastRowEligible,
|
|
201
205
|
expandFastRow,
|
|
202
206
|
} from "../fast-row";
|
|
203
|
-
import type { OcxConfig } from "../../types";
|
|
204
207
|
import { classifyUsageClient } from "../../usage/client";
|
|
205
|
-
import type { PackageTreeIntegrityGuard } from "../../lib/package-tree-integrity";
|
|
206
|
-
import type { ReadinessGate } from "../readiness";
|
|
207
|
-
import type { WorkflowRefusalLog } from "../workflow-refusal";
|
|
208
|
-
import type { AdmittedHttpTurnOptions } from "../admitted-http-turn";
|
|
209
208
|
import { isOllamaNativePath } from "../ollama-native-paths";
|
|
210
209
|
import { ollamaError } from "../ollama-inbound";
|
|
211
210
|
import { dispatchOllamaRoute } from "./ollama-routes";
|
|
@@ -220,70 +219,12 @@ import { withCallerSessionIdentity } from "../caller-session-identity";
|
|
|
220
219
|
import { agentAssertionUnsupportedResponse, hasAgentAssertionAuthorization } from "../../lib/authorization-scheme";
|
|
221
220
|
import { runTurnStateCallerScope } from "../turn-state-handles";
|
|
222
221
|
|
|
223
|
-
export
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
/**
|
|
231
|
-
* Routes the Claude intercept TLS listener may reach. Everything else on that socket is relayed
|
|
232
|
-
* to the real upstream by the listener itself, so a request that lands here with another path
|
|
233
|
-
* is a bug, not a client — refuse it.
|
|
234
|
-
*/
|
|
235
|
-
export function claudeInterceptRouteAllowed(url: URL, req: Request): boolean {
|
|
236
|
-
return isClaudeInterceptedPath(url.pathname, req.method);
|
|
237
|
-
}
|
|
238
|
-
|
|
239
|
-
export interface ServeOptionsContext {
|
|
240
|
-
readonly server: Server<WsData>;
|
|
241
|
-
readonly boundPort: number | null;
|
|
242
|
-
readonly remoteWorkspaceStopping: boolean;
|
|
243
|
-
|
|
244
|
-
drainingResponse: (req: Request, policy: RequestPolicyView) => Response;
|
|
245
|
-
ingressForServer: (requestServer: Server<WsData>) => ServerIngress;
|
|
246
|
-
loopbackRouteAllowed: (url: URL, req: Request) => boolean;
|
|
247
|
-
managementIngressRouteAllowed: (url: URL, req: Request) => boolean;
|
|
248
|
-
linkRouteAllowed: (url: URL, req: Request) => boolean;
|
|
249
|
-
onAuthenticatedCatalog: (apiKeyId: string) => void;
|
|
250
|
-
linkPolicy: () => RequestPolicyView;
|
|
251
|
-
packageTreeChangedResponse: (
|
|
252
|
-
req: Request,
|
|
253
|
-
policy: RequestPolicyView,
|
|
254
|
-
message: string,
|
|
255
|
-
) => Response;
|
|
256
|
-
serverBusyResponse: (
|
|
257
|
-
req: Request,
|
|
258
|
-
resource: string,
|
|
259
|
-
policy: RequestPolicyView,
|
|
260
|
-
) => Response;
|
|
261
|
-
runAdmittedHttpTurn: (
|
|
262
|
-
req: Request,
|
|
263
|
-
policy: RequestPolicyView,
|
|
264
|
-
work: (lease: ActiveTurnLease) => Promise<Response>,
|
|
265
|
-
refusalLog?: WorkflowRefusalLog,
|
|
266
|
-
options?: AdmittedHttpTurnOptions,
|
|
267
|
-
) => Promise<Response>;
|
|
268
|
-
|
|
269
|
-
config: OcxConfig;
|
|
270
|
-
inboundBodyLimitBytes: number;
|
|
271
|
-
listenPort: number;
|
|
272
|
-
liveCallBindings: LiveCallBindings;
|
|
273
|
-
loadRemoteWorkspaceRuntime: () => Promise<
|
|
274
|
-
typeof import("../../remote-control/workspace-runtime")
|
|
275
|
-
>;
|
|
276
|
-
localAttestationSecret: string;
|
|
277
|
-
loopbackPolicy: () => RequestPolicyView;
|
|
278
|
-
managementApiDeps: ManagementApiDeps;
|
|
279
|
-
managementAuth: ManagementAuthState;
|
|
280
|
-
managementSessionControl: ManagementSessionControl;
|
|
281
|
-
packageTreeIntegrity: PackageTreeIntegrityGuard;
|
|
282
|
-
readinessGate: ReadinessGate;
|
|
283
|
-
|
|
284
|
-
deps: StartServerDeps;
|
|
285
|
-
port: number | undefined;
|
|
286
|
-
}
|
|
222
|
+
export {
|
|
223
|
+
claudeInterceptRouteAllowed,
|
|
224
|
+
trustedLoopbackForIngress,
|
|
225
|
+
type ServerIngress,
|
|
226
|
+
type ServeOptionsContext,
|
|
227
|
+
} from "./serve-contract";
|
|
287
228
|
|
|
288
229
|
export function createServeOptions(ctx: ServeOptionsContext) {
|
|
289
230
|
const {
|
|
@@ -330,9 +271,9 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
330
271
|
const ingress = ingressForServer(requestServer);
|
|
331
272
|
// Bind management-origin trust to the actual Bun listener object resolved above.
|
|
332
273
|
// Neither Host nor any X-Forwarded-* header can manufacture this process-local mark.
|
|
333
|
-
if (ingress === "hub-management" && config.runtimeRole === "hub")
|
|
334
|
-
|
|
335
|
-
|
|
274
|
+
if (ingress === "hub-management" && config.runtimeRole === "hub") markTrustedHubManagementRequest(req);
|
|
275
|
+
// #8338: the kernel-observed peer, so the configured standalone dashboard proxy can be verified.
|
|
276
|
+
else if (ingress === "public" && config.dashboardTrustedProxy !== undefined) markDashboardProxyPeer(req, requestServer.requestIP(req)?.address);
|
|
336
277
|
const requestUrl = codexCompatibleUrl(req.url);
|
|
337
278
|
const linkPolicyView = ingress === "hub-link" ? linkPolicy() : undefined;
|
|
338
279
|
// The unauthenticated loopback listener (#1102) serves a fixed allowlist and nothing
|
|
@@ -388,9 +329,8 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
388
329
|
if (ingress === "hub-link") {
|
|
389
330
|
const admission = resolveApiAuth(req, policy);
|
|
390
331
|
if (!admission) return withCors(formatErrorResponse(401, "authentication_error", "opencodex API key required"), req, policy);
|
|
391
|
-
if (requestUrl.pathname === "/v1/catalog" && requestUrl.search === ""
|
|
392
|
-
&&
|
|
393
|
-
&& admission.kind === "configured") onAuthenticatedCatalog(admission.keyId);
|
|
332
|
+
if (requestUrl.pathname === "/v1/catalog" && requestUrl.search === "" && (req.method === "GET" || req.method === "HEAD")
|
|
333
|
+
&& admission.kind === "configured") onAuthenticatedCatalog(admission.keyId, takeRouteProof(req));
|
|
394
334
|
// #6957: the Child's read-only view of this Home. Admitted by the link key above and by
|
|
395
335
|
// the shared table in src/link/management-routes.ts; never reachable on another ingress.
|
|
396
336
|
if (isLinkManagementPath(requestUrl.pathname)) {
|
|
@@ -398,6 +338,7 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
398
338
|
return withCors(await handleLinkManagementRequest(
|
|
399
339
|
req, requestUrl, config, requestManagementApiDeps, managementSessionControl,
|
|
400
340
|
admission.kind === "configured" ? admission.keyId : undefined,
|
|
341
|
+
() => { const current = resolveApiAuth(req, linkPolicy()); return current?.kind === "configured" ? current.keyId : undefined; },
|
|
401
342
|
), req, policy);
|
|
402
343
|
}
|
|
403
344
|
}
|
|
@@ -628,17 +569,19 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
628
569
|
}
|
|
629
570
|
const websocketLease = tryReserveCodexWebSocket();
|
|
630
571
|
if (!websocketLease) return serverBusyResponse(req, "Codex WebSockets", policy);
|
|
572
|
+
const forwardHeaders = selectForwardHeaders(req.headers);
|
|
573
|
+
const replayPrincipal = resolveFilteredReplayPrincipal(req, config, admission, forwardHeaders);
|
|
631
574
|
// Upgrade on the server that RECEIVED this request, not the captured `server`
|
|
632
575
|
// binding. They are the same object for the public listener, but the
|
|
633
576
|
// unauthenticated loopback listener (#1102) is a second Bun.serve, and handing its
|
|
634
577
|
// request to the public server's upgrade would fail or cross sockets.
|
|
635
578
|
if (requestServer.upgrade(req, {
|
|
636
579
|
data: buildResponsesWsData(
|
|
637
|
-
|
|
580
|
+
forwardHeaders,
|
|
638
581
|
admission,
|
|
639
582
|
websocketLease,
|
|
640
583
|
sessionLaneIdFromRequest(req.headers),
|
|
641
|
-
classifyUsageClient(req.headers),
|
|
584
|
+
classifyUsageClient(req.headers), replayPrincipal,
|
|
642
585
|
),
|
|
643
586
|
})) return undefined as unknown as Response;
|
|
644
587
|
websocketLease.release();
|
|
@@ -726,7 +669,10 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
726
669
|
// gate used. Consent-bearing routes need this: request headers are forgeable
|
|
727
670
|
// by anything holding the admin token, the credential is not.
|
|
728
671
|
const principal = managementPrincipal(req, managementAuth, config, localManagementAuth) ?? undefined;
|
|
729
|
-
if (url.pathname === GUI_PAIR_PATH) {
|
|
672
|
+
if (url.pathname === GUI_PAIR_PATH || url.pathname === DESKTOP_GUI_PAIR_PATH) {
|
|
673
|
+
if (url.pathname === DESKTOP_GUI_PAIR_PATH && (!trustedLoopbackForIngress(ingress, config.hostname ?? "127.0.0.1")
|
|
674
|
+
|| !["127.0.0.1", "::1", "::ffff:127.0.0.1"].includes(requestServer.requestIP(req)?.address ?? "")
|
|
675
|
+
|| localManagementAuth.port !== config.port)) return Response.json({ error: "desktop_authorization_required" }, { status: 403 });
|
|
730
676
|
if (req.method !== "POST" || principal !== "gui-pair-capability" || !managementAuth.available) {
|
|
731
677
|
return withManagementCors(Response.json({ error: "GUI pairing capability required" }, { status: 403 }), req, config);
|
|
732
678
|
}
|
|
@@ -747,7 +693,9 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
747
693
|
}
|
|
748
694
|
}
|
|
749
695
|
const mgmtResponse = await handleManagementAPI(req, url, config, requestManagementApiDeps, principal, managementSessionControl, {
|
|
750
|
-
trustedLoopback: trustedLoopbackForIngress(ingress, config.hostname ?? "127.0.0.1")
|
|
696
|
+
trustedLoopback: trustedLoopbackForIngress(ingress, config.hostname ?? "127.0.0.1")
|
|
697
|
+
&& (!url.pathname.startsWith("/api/codex/desktop-compatibility/")
|
|
698
|
+
|| ["127.0.0.1", "::1", "::ffff:127.0.0.1"].includes(requestServer.requestIP(req)?.address ?? "")),
|
|
751
699
|
guiSessionIssuance: managementSessionIssuance(req, managementAuth),
|
|
752
700
|
});
|
|
753
701
|
// A local read capability authenticates the request; sign its single-use nonce so the
|
|
@@ -878,13 +826,13 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
878
826
|
}
|
|
879
827
|
// Role gate AFTER admission, deliberately: answering an unauthenticated caller would
|
|
880
828
|
// turn this into a free "is that machine a hub?" probe. A standalone or client install
|
|
881
|
-
// gains no surface
|
|
829
|
+
// gains no public surface — only a hub or an active `hub-link` listener serves it.
|
|
882
830
|
//
|
|
883
831
|
// Built, not formatErrorResponse'd, for the same reason /v1/catalog builds its 404: the
|
|
884
832
|
// code has to distinguish "this route exists and this host is not a hub" from "this
|
|
885
833
|
// build has no such route", which is the difference between admission proof and a
|
|
886
834
|
// vacuous pass in tests/server/api-key-attribution.test.ts.
|
|
887
|
-
if (config.runtimeRole !== "hub") {
|
|
835
|
+
if (config.runtimeRole !== "hub" && ingress !== "hub-link") {
|
|
888
836
|
return withCors(
|
|
889
837
|
new Response(JSON.stringify({
|
|
890
838
|
error: {
|
|
@@ -1270,6 +1218,7 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1270
1218
|
config,
|
|
1271
1219
|
provider,
|
|
1272
1220
|
knownModelIdsForProvider(m.provider, provider, config),
|
|
1221
|
+
m.provider,
|
|
1273
1222
|
).get(m.id)
|
|
1274
1223
|
: undefined;
|
|
1275
1224
|
const effectiveId = !isCombo && !fastModelId && effective
|
|
@@ -1515,6 +1464,7 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1515
1464
|
advisorAdmissionPolicy,
|
|
1516
1465
|
onRequestBodyRead: () => disableResponsesRequestTimeout(req, requestServer),
|
|
1517
1466
|
abortSignal: req.signal,
|
|
1467
|
+
comboSelectionKeepalive: {},
|
|
1518
1468
|
onFirstOutput: () => recordFirstOutput(logCtx, start),
|
|
1519
1469
|
onNativePassthroughTerminal: status => {
|
|
1520
1470
|
finalizeNativePassthroughLog(httpStatusForRequestLogTerminal(status, logCtx), {
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { currentServiceHomes, serviceStatePathsForOpenCodexHome } from "../../service";
|
|
2
|
+
import type { OcxConfig } from "../../types";
|
|
3
|
+
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
2
4
|
import {
|
|
3
5
|
createWindowsTaskListingCache,
|
|
4
6
|
inspectNativeCodexOwnership,
|
|
@@ -142,6 +144,8 @@ export function withRequestLogId(response: Response, requestId: string): Respons
|
|
|
142
144
|
}
|
|
143
145
|
|
|
144
146
|
export interface StartServerDeps {
|
|
147
|
+
/** Test-only observer of what the hub-link admission reports to the link listener (route proofs). */
|
|
148
|
+
observeAuthenticatedCatalog?: (apiKeyId: string, routeProofId?: string) => void;
|
|
145
149
|
/** Test-only CONNECT binder; permits kernel-assigned ports without probe-and-release races. */
|
|
146
150
|
startClaudeInterceptProxy?: typeof import("../../claude/intercept/connect-proxy").startConnectProxy;
|
|
147
151
|
/** Test-only seam; production always initializes its own management credential state. */
|
|
@@ -266,8 +270,10 @@ export function resolveInboundBodyLimitWithWarning(config: { maxInboundBodyBytes
|
|
|
266
270
|
return limit;
|
|
267
271
|
}
|
|
268
272
|
|
|
269
|
-
export function warnPlaintextV2AgentMessagesStartup(
|
|
270
|
-
|
|
273
|
+
export function warnPlaintextV2AgentMessagesStartup(
|
|
274
|
+
config: Pick<OcxConfig, "multiAgentMode" | "plaintextV2AgentMessages">,
|
|
275
|
+
): void {
|
|
276
|
+
if (!isPlaintextV2AgentMessagesEnabled(config)) return;
|
|
271
277
|
console.warn("⚠️ Experimental plaintext V2 agent messages are enabled.");
|
|
272
278
|
console.warn(" Eligible ChatGPT collaboration calls may carry plaintext message arguments. HTTPS remains encrypted, but task text may be retained in Codex history, selected providers, and local response/debug state.");
|
|
273
279
|
console.warn(" This depends on undocumented ChatGPT and Codex behavior; it does not decrypt existing tasks.");
|