@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { LINK_REQUEST_ZSTD_FEATURE, parseLinkHomeFeatures } from "../link/request-compression";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* What each Home said it serves on its last verified relay-auth answer, per link, in this process.
|
|
5
|
+
* It decides only whether a Child prepares a compressed body; the connection that carries the body
|
|
6
|
+
* confirms the feature again before it is used. Bounded to 256 links.
|
|
7
|
+
*/
|
|
8
|
+
const MAX_LINKS = 256;
|
|
9
|
+
const homes = new Map<string, readonly string[]>();
|
|
10
|
+
|
|
11
|
+
export function recordLinkHomeFeatures(linkId: string, header: string | null): readonly string[] | null {
|
|
12
|
+
const features = parseLinkHomeFeatures(header);
|
|
13
|
+
homes.delete(linkId);
|
|
14
|
+
if (features) {
|
|
15
|
+
homes.set(linkId, features);
|
|
16
|
+
if (homes.size > MAX_LINKS) homes.delete(homes.keys().next().value!);
|
|
17
|
+
}
|
|
18
|
+
return features;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function linkHomeAcceptsRequestZstd(linkId: string): boolean {
|
|
22
|
+
return homes.get(linkId)?.includes(LINK_REQUEST_ZSTD_FEATURE) === true;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export function forgetLinkHomeFeaturesForTests(): void {
|
|
26
|
+
homes.clear();
|
|
27
|
+
}
|
package/src/client/link-home.ts
CHANGED
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
* process that took the tunnel port never sees the key.
|
|
8
8
|
*/
|
|
9
9
|
import { chmodSync, lstatSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
|
|
10
|
-
import { join } from "node:path";
|
|
10
|
+
import { dirname, join } from "node:path";
|
|
11
|
+
import { parseHomeRouteIntentDocument, parseRouteClientOutcomes, ROUTE_CLIENT_IDS, routeIntentDigest, routeClientOutcomesForPeer, type HomeRouteIntentDocument, type RouteClientOutcome } from "../link/route-intent";
|
|
11
12
|
import { atomicWriteFile, isMissingPathError } from "../config/atomic-write";
|
|
12
13
|
import { readBoundedResponseBytes } from "../lib/bounded-body";
|
|
13
14
|
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
@@ -20,6 +21,7 @@ import {
|
|
|
20
21
|
import { LINK_CHILD_PARITY_PATH, type LinkChildParityReport } from "../link/child-parity";
|
|
21
22
|
import {
|
|
22
23
|
LINK_CODEX_SETTINGS_PATH,
|
|
24
|
+
LINK_ROUTE_INTENT_PATH,
|
|
23
25
|
LINK_MANAGEMENT_PREFIX,
|
|
24
26
|
linkManagementReadAllowed,
|
|
25
27
|
} from "../link/management-routes";
|
|
@@ -336,19 +338,22 @@ export function recordHomeCodexSettings(
|
|
|
336
338
|
|
|
337
339
|
/**
|
|
338
340
|
* Tell the Home what this Child last applied and when its runtime started (OCX-6). Resolves to
|
|
339
|
-
* `"accepted"`, `"unsupported"` for a Home that predates the route,
|
|
341
|
+
* `"accepted"`, `"unsupported"` for a Home that predates the route, `"schema-rejected"`
|
|
342
|
+
* for a payload/schema refusal, or `"failed"` for every other refusal/transport failure.
|
|
340
343
|
*/
|
|
341
344
|
export async function sendLinkChildParityReport(
|
|
342
345
|
connection: LinkHomeConnection,
|
|
343
346
|
admissionKey: string,
|
|
344
347
|
report: LinkChildParityReport,
|
|
345
348
|
deps: LinkHomeDeps = {},
|
|
346
|
-
): Promise<"accepted" | "unsupported" | "failed"> {
|
|
349
|
+
): Promise<"accepted" | "unsupported" | "schema-rejected" | "failed"> {
|
|
347
350
|
let response: Response;
|
|
348
351
|
try {
|
|
349
352
|
const target = linkTarget(connection, admissionKey);
|
|
350
353
|
const destination = `http://127.0.0.1:${target.tunnelPort}${LINK_CHILD_PARITY_PATH}`;
|
|
351
|
-
const body = JSON.stringify(report
|
|
354
|
+
const body = JSON.stringify({ ...report, ...(report.routeClientOutcomes === undefined ? {} : {
|
|
355
|
+
routeClientOutcomes: routeClientOutcomesForPeer(report.routeClientOutcomes),
|
|
356
|
+
}) });
|
|
352
357
|
const request: RequestInit = {
|
|
353
358
|
method: "POST",
|
|
354
359
|
headers: {
|
|
@@ -367,5 +372,88 @@ export async function sendLinkChildParityReport(
|
|
|
367
372
|
}
|
|
368
373
|
try { await response.body?.cancel(); } catch { /* best effort */ }
|
|
369
374
|
if (response.status === 404) return "unsupported";
|
|
375
|
+
if ([400, 413, 422].includes(response.status)) return "schema-rejected";
|
|
370
376
|
return response.status === 204 ? "accepted" : "failed";
|
|
371
377
|
}
|
|
378
|
+
|
|
379
|
+
export interface HomeRouteIntentRecord {
|
|
380
|
+
linkId: string;
|
|
381
|
+
fetchedAt: string;
|
|
382
|
+
appliedAt: string;
|
|
383
|
+
document: HomeRouteIntentDocument;
|
|
384
|
+
appliedRouteIntentDigest: string | null;
|
|
385
|
+
routeClientOutcomes: RouteClientOutcome[];
|
|
386
|
+
}
|
|
387
|
+
export function homeRouteIntentPath(): string { return join(linkDir(), "home-route-intent.json"); }
|
|
388
|
+
function completedRouteIntentDigest(document: HomeRouteIntentDocument, outcomes: RouteClientOutcome[]): string | null {
|
|
389
|
+
return outcomes.length === ROUTE_CLIENT_IDS.length && new Set(outcomes.map(row => row.client)).size === ROUTE_CLIENT_IDS.length
|
|
390
|
+
&& outcomes.every(row => row.outcome === "current" && !(row.source === "local" && document.clients[row.client].enabled))
|
|
391
|
+
? routeIntentDigest(document) : null;
|
|
392
|
+
}
|
|
393
|
+
function parseHomeRouteIntentRecord(value: unknown, linkId: string): HomeRouteIntentRecord | null {
|
|
394
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return null;
|
|
395
|
+
const raw = value as Record<string, unknown>;
|
|
396
|
+
const fields = ["linkId", "fetchedAt", "appliedAt", "document", "appliedRouteIntentDigest", "routeClientOutcomes"];
|
|
397
|
+
if (Object.keys(raw).length !== fields.length || Object.keys(raw).some(key => !fields.includes(key))
|
|
398
|
+
|| raw.linkId !== linkId || !/^lnk_[0-9a-f]{16}$/.test(linkId) || !isIsoTimestamp(raw.fetchedAt) || !isIsoTimestamp(raw.appliedAt)) return null;
|
|
399
|
+
const document = parseHomeRouteIntentDocument(raw.document);
|
|
400
|
+
const outcomes = parseRouteClientOutcomes(raw.routeClientOutcomes);
|
|
401
|
+
if (!document || !outcomes || raw.appliedRouteIntentDigest !== completedRouteIntentDigest(document, outcomes)) return null;
|
|
402
|
+
return { linkId, fetchedAt: raw.fetchedAt, appliedAt: raw.appliedAt, document,
|
|
403
|
+
appliedRouteIntentDigest: raw.appliedRouteIntentDigest as string | null, routeClientOutcomes: outcomes };
|
|
404
|
+
}
|
|
405
|
+
export function readHomeRouteIntentRecord(linkId: string, path = homeRouteIntentPath()): HomeRouteIntentRecord | null {
|
|
406
|
+
try {
|
|
407
|
+
const stat = lstatSync(path);
|
|
408
|
+
if (!stat.isFile() || stat.size > RECORD_MAX_BYTES) return null;
|
|
409
|
+
return parseHomeRouteIntentRecord(JSON.parse(readFileSync(path, "utf8")), linkId);
|
|
410
|
+
} catch { return null; }
|
|
411
|
+
}
|
|
412
|
+
export function writeHomeRouteIntentRecord(record: HomeRouteIntentRecord, path = homeRouteIntentPath()): void {
|
|
413
|
+
const parsed = parseHomeRouteIntentRecord(record, record.linkId);
|
|
414
|
+
if (!parsed) throw new Error("invalid Home route intent receipt");
|
|
415
|
+
const dir = dirname(path);
|
|
416
|
+
assertNotRealHomeUnderTest(dir);
|
|
417
|
+
const body = `${JSON.stringify(parsed, null, 2)}\n`;
|
|
418
|
+
if (Buffer.byteLength(body) > RECORD_MAX_BYTES) throw new Error("Home route intent receipt too large");
|
|
419
|
+
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
420
|
+
if (process.platform === "win32") hardenSecretDir(dir, { required: true });
|
|
421
|
+
else chmodSync(dir, 0o700);
|
|
422
|
+
atomicWriteFile(path, body);
|
|
423
|
+
if (process.platform !== "win32") chmodSync(path, 0o600);
|
|
424
|
+
}
|
|
425
|
+
export function clearHomeRouteIntentRecord(path = homeRouteIntentPath()): void {
|
|
426
|
+
assertNotRealHomeUnderTest(dirname(path));
|
|
427
|
+
try { unlinkSync(path); } catch (error) { if (!isMissingPathError(error)) throw error; }
|
|
428
|
+
}
|
|
429
|
+
/** Call only after the materializer has collected the outcomes; partial apply never claims the digest. */
|
|
430
|
+
export function homeRouteIntentReceipt(
|
|
431
|
+
linkId: string, document: HomeRouteIntentDocument, fetchedAt: string, appliedAt: string, routeClientOutcomes: RouteClientOutcome[],
|
|
432
|
+
previous: HomeRouteIntentRecord | null = readHomeRouteIntentRecord(linkId),
|
|
433
|
+
): HomeRouteIntentRecord {
|
|
434
|
+
const digest = completedRouteIntentDigest(document, routeClientOutcomes);
|
|
435
|
+
const unchanged = digest !== null && previous?.linkId === linkId && previous.appliedRouteIntentDigest === digest;
|
|
436
|
+
return { linkId, document, fetchedAt, appliedAt: unchanged ? previous.appliedAt : appliedAt,
|
|
437
|
+
appliedRouteIntentDigest: digest, routeClientOutcomes };
|
|
438
|
+
}
|
|
439
|
+
export type HomeRouteIntentFetch = { kind: "fresh"; document: HomeRouteIntentDocument } | { kind: "unsupported" } | { kind: "failed"; reason: string };
|
|
440
|
+
export async function fetchHomeRouteIntent(connection: LinkHomeConnection, admissionKey: string, deps: LinkHomeDeps = {}): Promise<HomeRouteIntentFetch> {
|
|
441
|
+
let response: Response;
|
|
442
|
+
try {
|
|
443
|
+
const target = linkTarget(connection, admissionKey);
|
|
444
|
+
const destination = `http://127.0.0.1:${target.tunnelPort}${LINK_ROUTE_INTENT_PATH}`;
|
|
445
|
+
const request: RequestInit = { method: "GET", headers: { accept: "application/json", authorization: `Bearer ${admissionKey}` },
|
|
446
|
+
redirect: "manual", signal: AbortSignal.timeout(deps.timeoutMs ?? READ_TIMEOUT_MS) };
|
|
447
|
+
response = deps.fetchImpl ? await deps.fetchImpl(destination, request) : await fetchBoundLinkRelay(target, destination, request);
|
|
448
|
+
} catch { return { kind: "failed", reason: "the Home route intent is unreachable" }; }
|
|
449
|
+
if (!response.ok) {
|
|
450
|
+
try { await response.body?.cancel(); } catch { /* best effort */ }
|
|
451
|
+
return response.status === 404 ? { kind: "unsupported" } : { kind: "failed", reason: `the Home answered HTTP ${response.status}` };
|
|
452
|
+
}
|
|
453
|
+
try {
|
|
454
|
+
const read = await readBoundedResponseBytes(response, { maxBytes: SETTINGS_MAX_BYTES, signal: AbortSignal.timeout(deps.timeoutMs ?? READ_TIMEOUT_MS) });
|
|
455
|
+
if (read.oversized) return { kind: "failed", reason: "the Home route intent exceeded the allowed size" };
|
|
456
|
+
const document = parseHomeRouteIntentDocument(JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(read.bytes)));
|
|
457
|
+
return document ? { kind: "fresh", document } : { kind: "failed", reason: "the Home returned an unreadable route intent document" };
|
|
458
|
+
} catch { return { kind: "failed", reason: "the Home returned an unreadable route intent document" }; }
|
|
459
|
+
}
|
|
@@ -4,6 +4,7 @@ import { readServiceApiTokenState, type ServiceApiTokenState } from "../lib/serv
|
|
|
4
4
|
import { linkRouteAllowed } from "../link/routes";
|
|
5
5
|
import { isAllowedRequestOrigin, type RequestPolicyView } from "../server/auth-cors";
|
|
6
6
|
import { relayLinkDataRequest, type LinkRelayDeps } from "./link-relay";
|
|
7
|
+
import type { LinkWebsocketRelay } from "./link-websocket";
|
|
7
8
|
|
|
8
9
|
/** How often an unavailable link key is looked for again. A valid key is never re-read. */
|
|
9
10
|
export const LINK_KEY_RETRY_MS = 1_000;
|
|
@@ -49,10 +50,22 @@ export interface LinkIngress {
|
|
|
49
50
|
policy: RequestPolicyView;
|
|
50
51
|
linkKey: () => string | null;
|
|
51
52
|
relay?: LinkRelayDeps;
|
|
53
|
+
/**
|
|
54
|
+
* The Responses WebSocket over the link (link-websocket.ts). It is tried only when it wants the
|
|
55
|
+
* upgrade (the Child's release gate is open, no opt-out, and the Home's last applied answer for the link
|
|
56
|
+
* did not say off; with no answer yet since start the upgrade tries); otherwise the
|
|
57
|
+
* upgrade keeps the 426 below, with no network I/O.
|
|
58
|
+
*/
|
|
59
|
+
websocket?: Pick<LinkWebsocketRelay, "wanted" | "upgrade">;
|
|
52
60
|
}
|
|
53
61
|
|
|
54
62
|
const RESPONSES_WEBSOCKET_DISABLED = "Responses WebSocket transport is disabled; use HTTP";
|
|
55
63
|
|
|
64
|
+
/** The answer codex-rs turns into an HTTP fallback for the rest of its session (C1); every link WebSocket fallback uses it. */
|
|
65
|
+
export function upgradeRequiredResponse(): Response {
|
|
66
|
+
return formatErrorResponse(426, "upgrade_required", RESPONSES_WEBSOCKET_DISABLED);
|
|
67
|
+
}
|
|
68
|
+
|
|
56
69
|
/**
|
|
57
70
|
* Lift Bun's per-request idle timer for a relayed request, as the standalone does on its data
|
|
58
71
|
* routes (`disableResponsesRequestTimeout`). Without it the listener's idle limit cuts a quiet
|
|
@@ -71,7 +84,8 @@ function liftRequestIdleTimer(req: Request, server: Pick<Server<unknown>, "timeo
|
|
|
71
84
|
* owns and returns null for everything else, which the listener handles as before.
|
|
72
85
|
*
|
|
73
86
|
* - A `/v1/responses` WebSocket upgrade gets 426, the answer codex-rs turns into an HTTP
|
|
74
|
-
* fallback
|
|
87
|
+
* fallback, unless the link WebSocket wants it (link-websocket.ts): then it is carried over the link
|
|
88
|
+
* or, on any failure, answered with the same 426 (or 503 while the tunnel reconnects).
|
|
75
89
|
* - Every relayed route passes the standalone loopback Host/Origin gate before any upstream
|
|
76
90
|
* fetch, so a rebinding or cross-site browser page cannot reach the Home through this port.
|
|
77
91
|
* - Without the committed link key nothing is fetched, and the caller gets
|
|
@@ -83,7 +97,7 @@ export function handleLinkIngress(
|
|
|
83
97
|
req: Request,
|
|
84
98
|
url: URL,
|
|
85
99
|
ingress: LinkIngress,
|
|
86
|
-
server?: Pick<Server<unknown>, "timeout">,
|
|
100
|
+
server?: Pick<Server<unknown>, "timeout"> & Partial<Pick<Server<unknown>, "upgrade">>,
|
|
87
101
|
): Response | Promise<Response> | null {
|
|
88
102
|
const upgrade = req.headers.get("upgrade");
|
|
89
103
|
if (upgrade !== null) {
|
|
@@ -91,7 +105,11 @@ export function handleLinkIngress(
|
|
|
91
105
|
if (!isAllowedRequestOrigin(req, ingress.policy)) {
|
|
92
106
|
return formatErrorResponse(403, "origin_rejected", "WebSocket upgrade blocked: non-local Origin");
|
|
93
107
|
}
|
|
94
|
-
|
|
108
|
+
if (ingress.websocket && server?.upgrade && ingress.websocket.wanted(ingress.linkId)) {
|
|
109
|
+
liftRequestIdleTimer(req, server);
|
|
110
|
+
return ingress.websocket.upgrade(req, server as Server<unknown>, ingress) as Promise<Response>;
|
|
111
|
+
}
|
|
112
|
+
return upgradeRequiredResponse();
|
|
95
113
|
}
|
|
96
114
|
if (url.pathname === "/readyz" || !linkRouteAllowed(url, req)) return null;
|
|
97
115
|
if (!isAllowedRequestOrigin(req, ingress.policy)) {
|
package/src/client/link-join.ts
CHANGED
|
@@ -179,6 +179,7 @@ async function revokeIssuedLink(deps: ClientLinkJoinDeps, linkId: string, alias
|
|
|
179
179
|
alias,
|
|
180
180
|
argv: remoteOcxArgv(["link", "revoke", "--link-id", linkId]),
|
|
181
181
|
knownHostsFile: deps.knownHostsFile,
|
|
182
|
+
route: null,
|
|
182
183
|
}),
|
|
183
184
|
{ timeoutMs: JOIN_REVOKE_TIMEOUT_MS },
|
|
184
185
|
);
|
|
@@ -316,14 +317,22 @@ export async function joinHome(deps: ClientLinkJoinDeps, input: { alias: string
|
|
|
316
317
|
const thisAlias = localAlias(deps);
|
|
317
318
|
let result: SshRunResult;
|
|
318
319
|
try {
|
|
319
|
-
|
|
320
|
+
const issue = (selectedClients?: OcxConnectedClientId[]) => deps.runner.run(
|
|
320
321
|
buildExecArgv({
|
|
321
322
|
alias: input.alias,
|
|
322
|
-
argv: remoteOcxArgv(["link", "issue", "--alias", thisAlias, "--tunnel-port", String(tunnelPort), "--json"]),
|
|
323
|
+
argv: remoteOcxArgv(["link", "issue", "--alias", thisAlias, "--tunnel-port", String(tunnelPort), ...(selectedClients ? ["--clients", selectedClients.join(",")] : []), "--json"]),
|
|
323
324
|
knownHostsFile: deps.knownHostsFile,
|
|
325
|
+
route: null,
|
|
324
326
|
}),
|
|
325
327
|
{ timeoutMs: JOIN_REVOKE_TIMEOUT_MS },
|
|
326
328
|
);
|
|
329
|
+
result = await issue(deps.selectedClients);
|
|
330
|
+
// The older CLI rejects unknown arguments before issuing a key. Retry only that
|
|
331
|
+
// definite no-write result; keep the selection for the Child's existing fallback.
|
|
332
|
+
if (deps.selectedClients && result.code === 2 && !result.stdout.trim()
|
|
333
|
+
&& /^(?:Error: )?Unexpected argument\(s\): --clients(?:\s|$)/m.test(result.stderr)) {
|
|
334
|
+
result = await issue();
|
|
335
|
+
}
|
|
327
336
|
} catch (error) {
|
|
328
337
|
throw new ClientLinkJoinError("join_issue_failed", undefined, sshRunnerErrorHint(error));
|
|
329
338
|
}
|
|
@@ -383,6 +392,7 @@ export async function joinHome(deps: ClientLinkJoinDeps, input: { alias: string
|
|
|
383
392
|
transport: "link",
|
|
384
393
|
link: { tunnelPort, linkId: issued.linkId },
|
|
385
394
|
selectedClients: deps.selectedClients ?? ["codex", "claude"],
|
|
395
|
+
selectedClientsExplicit: deps.selectedClients !== undefined,
|
|
386
396
|
managementTransport: "direct",
|
|
387
397
|
}, {
|
|
388
398
|
fetchImpl: deps.fetchImpl,
|
|
@@ -8,9 +8,12 @@
|
|
|
8
8
|
* predates the route (404) is not asked again. Timers are unref'd and never keep the process alive.
|
|
9
9
|
*/
|
|
10
10
|
import { codexSettingsDigest } from "../link/codex-settings";
|
|
11
|
+
import { routeClientOutcomesForPeer, routeIntentDigest, type RouteClientId } from "../link/route-intent";
|
|
12
|
+
import type { RouteIntentReceipt } from "../integrations/route-intent-contract";
|
|
13
|
+
import { effectiveRouteIntent, readLocalRouteIntentOff, readRouteIntentReceiptStrict } from "../integrations/route-intent-state";
|
|
11
14
|
import type { LinkChildParityReport } from "../link/child-parity";
|
|
12
15
|
import type { OcxClientConnectionConfig } from "../types";
|
|
13
|
-
import { readHomeCodexSettingsRecord, sendLinkChildParityReport, type HomeCodexSettingsRecord } from "./link-home";
|
|
16
|
+
import { readHomeCodexSettingsRecord, readHomeRouteIntentRecord, sendLinkChildParityReport, type HomeCodexSettingsRecord, type HomeRouteIntentRecord } from "./link-home";
|
|
14
17
|
|
|
15
18
|
export const LINK_PARITY_RETRY_MS = [2_000, 5_000, 15_000, 30_000, 60_000] as const;
|
|
16
19
|
export const LINK_PARITY_PERIOD_MS = 60_000;
|
|
@@ -25,6 +28,7 @@ function nextReportSequence(): number {
|
|
|
25
28
|
export interface LinkParityReporter {
|
|
26
29
|
start(): void;
|
|
27
30
|
stop(): void;
|
|
31
|
+
requestReport(): void;
|
|
28
32
|
}
|
|
29
33
|
|
|
30
34
|
export interface LinkParityReporterDeps {
|
|
@@ -33,6 +37,9 @@ export interface LinkParityReporterDeps {
|
|
|
33
37
|
/** ISO start time of this runtime. */
|
|
34
38
|
runtimeStartedAt: string;
|
|
35
39
|
readRecord?: (linkId: string) => HomeCodexSettingsRecord | null;
|
|
40
|
+
readRouteRecord?: (linkId: string) => HomeRouteIntentRecord | null;
|
|
41
|
+
readCommonReceipt?: () => RouteIntentReceipt | null;
|
|
42
|
+
readLocalOff?: () => RouteClientId[];
|
|
36
43
|
send?: typeof sendLinkChildParityReport;
|
|
37
44
|
setTimer?: (callback: () => void, ms: number) => unknown;
|
|
38
45
|
clearTimer?: (timer: unknown) => void;
|
|
@@ -44,18 +51,24 @@ export function linkChildParityReport(
|
|
|
44
51
|
runtimeStartedAt: string,
|
|
45
52
|
record: HomeCodexSettingsRecord | null,
|
|
46
53
|
sequence: number = nextReportSequence(),
|
|
54
|
+
routeRecord?: HomeRouteIntentRecord | null,
|
|
47
55
|
): LinkChildParityReport | null {
|
|
48
56
|
const linkId = connection.link?.linkId;
|
|
49
57
|
const started = Date.parse(runtimeStartedAt);
|
|
50
58
|
if (!linkId || !Number.isFinite(started)) return null;
|
|
51
59
|
const applied = record ? Date.parse(record.appliedAt) : Number.NaN;
|
|
52
|
-
|
|
60
|
+
const report: LinkChildParityReport = Number.isFinite(applied)
|
|
53
61
|
? { linkId, lastApplyAt: applied, runtimeStartedAt: started, appliedCodexSettingsDigest: codexSettingsDigest(record!.document.settings), sequence }
|
|
54
62
|
: { linkId, lastApplyAt: null, runtimeStartedAt: started, appliedCodexSettingsDigest: null, sequence };
|
|
63
|
+
return routeRecord?.linkId === linkId ? { ...report, appliedRouteIntentDigest: routeRecord.appliedRouteIntentDigest,
|
|
64
|
+
routeClientOutcomes: routeClientOutcomesForPeer(routeRecord.routeClientOutcomes) } : report;
|
|
55
65
|
}
|
|
56
66
|
|
|
57
67
|
export function createLinkParityReporter(deps: LinkParityReporterDeps): LinkParityReporter {
|
|
58
68
|
const readRecord = deps.readRecord ?? readHomeCodexSettingsRecord;
|
|
69
|
+
const readRouteRecord = deps.readRouteRecord ?? readHomeRouteIntentRecord;
|
|
70
|
+
const readCommonReceipt = deps.readCommonReceipt ?? readRouteIntentReceiptStrict;
|
|
71
|
+
const readLocalOff = deps.readLocalOff ?? readLocalRouteIntentOff;
|
|
59
72
|
const send = deps.send ?? sendLinkChildParityReport;
|
|
60
73
|
const setTimer = deps.setTimer ?? ((callback: () => void, ms: number) => {
|
|
61
74
|
const timer = setTimeout(callback, ms);
|
|
@@ -66,6 +79,8 @@ export function createLinkParityReporter(deps: LinkParityReporterDeps): LinkPari
|
|
|
66
79
|
let timer: unknown;
|
|
67
80
|
let stopped = true;
|
|
68
81
|
let failures = 0;
|
|
82
|
+
let inFlight = false;
|
|
83
|
+
let rerun = false;
|
|
69
84
|
|
|
70
85
|
const schedule = (ms: number) => {
|
|
71
86
|
if (stopped) return;
|
|
@@ -75,20 +90,51 @@ export function createLinkParityReporter(deps: LinkParityReporterDeps): LinkPari
|
|
|
75
90
|
const tick = async (): Promise<void> => {
|
|
76
91
|
timer = undefined;
|
|
77
92
|
if (stopped) return;
|
|
93
|
+
if (inFlight) { rerun = true; return; }
|
|
94
|
+
inFlight = true;
|
|
95
|
+
let delay: number = LINK_PARITY_PERIOD_MS;
|
|
96
|
+
try {
|
|
78
97
|
const key = deps.linkKey();
|
|
79
98
|
const linkId = deps.connection.link?.linkId;
|
|
80
99
|
let record: HomeCodexSettingsRecord | null = null;
|
|
81
100
|
try { record = linkId ? readRecord(linkId) : null; } catch { record = null; }
|
|
82
|
-
|
|
83
|
-
|
|
101
|
+
let routeRecord: HomeRouteIntentRecord | null = null;
|
|
102
|
+
try {
|
|
103
|
+
routeRecord = linkId ? readRouteRecord(linkId) : null;
|
|
104
|
+
const common = readCommonReceipt();
|
|
105
|
+
const effective = common ? effectiveRouteIntent(common.document, undefined, readLocalOff()) : null;
|
|
106
|
+
if (!routeRecord || routeRecord.linkId !== linkId || !common || common.linkId !== linkId || common.catalogPending
|
|
107
|
+
|| routeIntentDigest(common.document) !== routeIntentDigest(routeRecord.document)
|
|
108
|
+
|| common.appliedRouteIntentDigest !== routeRecord.appliedRouteIntentDigest
|
|
109
|
+
|| !Bun.deepEquals(common.clients, effective?.clients, true) || !Bun.deepEquals(common.sources, effective?.sources, true)
|
|
110
|
+
|| !Bun.deepEquals(routeClientOutcomesForPeer(common.outcomes), routeClientOutcomesForPeer(routeRecord.routeClientOutcomes), true)) {
|
|
111
|
+
routeRecord = null;
|
|
112
|
+
}
|
|
113
|
+
} catch { routeRecord = null; }
|
|
114
|
+
const base = linkChildParityReport(deps.connection, deps.runtimeStartedAt, record, nextReportSequence(), routeRecord);
|
|
115
|
+
// Omission is not a withdrawal for peers retaining their last route confirmation.
|
|
116
|
+
const report = base && !routeRecord ? { ...base, appliedRouteIntentDigest: null, routeClientOutcomes: [] } : base;
|
|
117
|
+
let outcome = key && report ? await send(deps.connection, key, report).catch(() => "failed" as const) : "failed";
|
|
118
|
+
if (key && report && outcome === "schema-rejected" && report.routeClientOutcomes !== undefined) {
|
|
119
|
+
const { appliedRouteIntentDigest: _digest, routeClientOutcomes: _outcomes, ...baseReport } = report;
|
|
120
|
+
outcome = await send(deps.connection, key, baseReport).catch(() => "failed" as const);
|
|
121
|
+
}
|
|
84
122
|
if (outcome === "unsupported") { stopped = true; return; }
|
|
85
123
|
if (outcome === "accepted") {
|
|
86
124
|
failures = 0;
|
|
87
|
-
schedule(LINK_PARITY_PERIOD_MS);
|
|
88
125
|
return;
|
|
89
126
|
}
|
|
90
127
|
failures = Math.min(failures + 1, LINK_PARITY_RETRY_MS.length - 1);
|
|
91
|
-
|
|
128
|
+
delay = LINK_PARITY_RETRY_MS[failures]!;
|
|
129
|
+
} catch {
|
|
130
|
+
failures = Math.min(failures + 1, LINK_PARITY_RETRY_MS.length - 1);
|
|
131
|
+
delay = LINK_PARITY_RETRY_MS[failures]!;
|
|
132
|
+
} finally {
|
|
133
|
+
inFlight = false;
|
|
134
|
+
const immediate = rerun;
|
|
135
|
+
rerun = false;
|
|
136
|
+
schedule(immediate ? 0 : delay);
|
|
137
|
+
}
|
|
92
138
|
};
|
|
93
139
|
|
|
94
140
|
return {
|
|
@@ -102,6 +148,14 @@ export function createLinkParityReporter(deps: LinkParityReporterDeps): LinkPari
|
|
|
102
148
|
stopped = true;
|
|
103
149
|
if (timer !== undefined) clearTimer(timer);
|
|
104
150
|
timer = undefined;
|
|
151
|
+
rerun = false;
|
|
152
|
+
},
|
|
153
|
+
requestReport() {
|
|
154
|
+
if (stopped) return;
|
|
155
|
+
if (timer !== undefined) clearTimer(timer);
|
|
156
|
+
timer = undefined;
|
|
157
|
+
if (inFlight) rerun = true;
|
|
158
|
+
else void tick();
|
|
105
159
|
},
|
|
106
160
|
};
|
|
107
161
|
}
|