@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,128 @@
|
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
|
+
import { chmodSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { atomicWriteFileNoFollow, isMissingPathError } from "../config/atomic-write";
|
|
5
|
+
import { withConfigMutationLockSync } from "../config/mutation-lock";
|
|
6
|
+
import { getConfigDir } from "../config/paths";
|
|
7
|
+
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
8
|
+
import { hardenSecretDir } from "../lib/windows-secret-acl";
|
|
9
|
+
import { linkDir, linkStorePath } from "./paths";
|
|
10
|
+
import { isOperationId } from "./operations-journal";
|
|
11
|
+
import { parseLinkStore, readLinkStore, type LinkRecord, type LinkStore } from "./store";
|
|
12
|
+
|
|
13
|
+
/** How the removal that claimed the receipt cleaned up its Child before the commit: a retry must ask for the same. */
|
|
14
|
+
export type LinkRetirementMode = "force" | "disconnect" | "purge";
|
|
15
|
+
/**
|
|
16
|
+
* operationId names the journalled revoke that claimed the receipt: only that operation's replay resumes it (#8416),
|
|
17
|
+
* so a recorded revoke is never credited with, or skips its own cleanup through, another removal's receipt.
|
|
18
|
+
*/
|
|
19
|
+
/**
|
|
20
|
+
* formerOwner names the operation a plain --force took the receipt over from (disownLinkRetirement): that operation may
|
|
21
|
+
* take it back only while the force has provably committed nothing (#8416).
|
|
22
|
+
*/
|
|
23
|
+
export interface LinkRetirement { version: 1; link: LinkRecord; nonce: string; mode?: LinkRetirementMode; operationId?: string; formerOwner?: string }
|
|
24
|
+
export class LinkRetirementError extends Error {
|
|
25
|
+
constructor(message: string) { super(message); this.name = "LinkRetirementError"; }
|
|
26
|
+
}
|
|
27
|
+
const ID = /^lnk_[0-9a-f]{16}$/;
|
|
28
|
+
const NONCE = /^[0-9a-f]{64}$/;
|
|
29
|
+
|
|
30
|
+
function pathFor(id: string, configDir: string): string {
|
|
31
|
+
if (!ID.test(id)) throw new LinkRetirementError("invalid link id");
|
|
32
|
+
return join(linkDir(configDir), `retirement-${id}.json`);
|
|
33
|
+
}
|
|
34
|
+
function parse(text: string, id: string): LinkRetirement {
|
|
35
|
+
let raw: unknown;
|
|
36
|
+
try { raw = JSON.parse(text); } catch { throw new LinkRetirementError("invalid retirement JSON"); }
|
|
37
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new LinkRetirementError("invalid retirement record");
|
|
38
|
+
const value = raw as Record<string, unknown>;
|
|
39
|
+
const keys = Object.keys(value);
|
|
40
|
+
const allowed = new Set(["version", "link", "nonce", "mode", "operationId", "formerOwner"]);
|
|
41
|
+
if (keys.some(key => !allowed.has(key)) || !("link" in value) || value.version !== 1 || typeof value.nonce !== "string" || !NONCE.test(value.nonce)
|
|
42
|
+
|| (value.mode !== undefined && value.mode !== "force" && value.mode !== "disconnect" && value.mode !== "purge")
|
|
43
|
+
|| (value.operationId !== undefined && !isOperationId(value.operationId))
|
|
44
|
+
|| (value.formerOwner !== undefined && (!isOperationId(value.formerOwner) || value.operationId !== undefined))) {
|
|
45
|
+
throw new LinkRetirementError("invalid retirement record");
|
|
46
|
+
}
|
|
47
|
+
let link: LinkRecord;
|
|
48
|
+
try { link = parseLinkStore(JSON.stringify({ version: 1, listenerPort: null, links: [value.link] })).links[0]!; }
|
|
49
|
+
catch { throw new LinkRetirementError("invalid retirement link"); }
|
|
50
|
+
if (link.id !== id) throw new LinkRetirementError("retirement id mismatch");
|
|
51
|
+
return { version: 1, link, nonce: value.nonce, ...(value.mode === undefined ? {} : { mode: value.mode as LinkRetirementMode }),
|
|
52
|
+
...(value.operationId === undefined ? {} : { operationId: value.operationId as string }),
|
|
53
|
+
...(value.formerOwner === undefined ? {} : { formerOwner: value.formerOwner as string }) };
|
|
54
|
+
}
|
|
55
|
+
function sameLink(a: LinkRecord, b: LinkRecord): boolean {
|
|
56
|
+
return JSON.stringify(a) === JSON.stringify(b);
|
|
57
|
+
}
|
|
58
|
+
/** Missing is distinct from malformed; malformed records always throw. */
|
|
59
|
+
export function readLinkRetirement(id: string, configDir: string = getConfigDir()): LinkRetirement | null {
|
|
60
|
+
const path = pathFor(id, configDir);
|
|
61
|
+
let text: string;
|
|
62
|
+
try { text = readFileSync(path, "utf8"); } catch (error) { if (isMissingPathError(error)) return null; throw error; }
|
|
63
|
+
return parse(text, id);
|
|
64
|
+
}
|
|
65
|
+
/** Claims only the still-current full link. A competing or damaged receipt is never replaced. */
|
|
66
|
+
export function claimLinkRetirement(link: LinkRecord, configDir: string = getConfigDir(), readStore?: () => LinkStore, mode?: LinkRetirementMode, operationId?: string): LinkRetirement {
|
|
67
|
+
const candidate = parse(JSON.stringify({ version: 1, link, nonce: randomBytes(32).toString("hex"), ...(mode ? { mode } : {}), ...(operationId ? { operationId } : {}) }), link.id);
|
|
68
|
+
assertNotRealHomeUnderTest(configDir);
|
|
69
|
+
return withConfigMutationLockSync(() => {
|
|
70
|
+
const path = pathFor(candidate.link.id, configDir);
|
|
71
|
+
if (readLinkRetirement(candidate.link.id, configDir)) throw new LinkRetirementError("retirement already claimed");
|
|
72
|
+
const store = readStore ? parseLinkStore(JSON.stringify(readStore())) : readLinkStore(linkStorePath(configDir));
|
|
73
|
+
const current = store.links.find(item => item.id === candidate.link.id);
|
|
74
|
+
if (!current || !sameLink(current, candidate.link)) throw new LinkRetirementError("link identity changed");
|
|
75
|
+
const dir = linkDir(configDir);
|
|
76
|
+
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
77
|
+
if (process.platform === "win32") hardenSecretDir(dir, { required: true });
|
|
78
|
+
else chmodSync(dir, 0o700);
|
|
79
|
+
atomicWriteFileNoFollow(path, `${JSON.stringify(candidate, null, 2)}\n`, undefined, {}, { exclusive: true });
|
|
80
|
+
return candidate;
|
|
81
|
+
}, configDir);
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Take an owned receipt over for a plain --force (#8416): rewrite the exact receipt (same nonce, link and mode) without
|
|
85
|
+
* its operation id, under the config mutation lock, before the force changes anything. From then on the original
|
|
86
|
+
* operation no longer owns it, so a later replay of that operation cannot resume it and be credited with the force's
|
|
87
|
+
* removal. Returns the rewritten receipt, or null when the receipt changed.
|
|
88
|
+
*/
|
|
89
|
+
export function disownLinkRetirement(expected: LinkRetirement, configDir: string = getConfigDir()): LinkRetirement | null {
|
|
90
|
+
const owner = parse(JSON.stringify(expected), expected.link.id);
|
|
91
|
+
assertNotRealHomeUnderTest(configDir);
|
|
92
|
+
return withConfigMutationLockSync(() => {
|
|
93
|
+
const current = readLinkRetirement(owner.link.id, configDir);
|
|
94
|
+
if (!current || current.nonce !== owner.nonce || !sameLink(current.link, owner.link)) return null;
|
|
95
|
+
if (current.operationId === undefined) return current;
|
|
96
|
+
const { operationId: former, ...unowned } = current;
|
|
97
|
+
const next = parse(JSON.stringify({ ...unowned, formerOwner: former }), owner.link.id);
|
|
98
|
+
atomicWriteFileNoFollow(pathFor(owner.link.id, configDir), JSON.stringify(next, null, 2) + "\n");
|
|
99
|
+
return next;
|
|
100
|
+
}, configDir);
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Undo disownLinkRetirement for a plain --force takeover that stopped before its removal began (#8416): give the exact
|
|
104
|
+
* receipt (same nonce and link, still without an owner) back to the operation that claimed it, under the config lock.
|
|
105
|
+
*/
|
|
106
|
+
export function reownLinkRetirement(expected: LinkRetirement, operationId: string, configDir: string = getConfigDir()): boolean {
|
|
107
|
+
const owner = parse(JSON.stringify(expected), expected.link.id);
|
|
108
|
+
assertNotRealHomeUnderTest(configDir);
|
|
109
|
+
return withConfigMutationLockSync(() => {
|
|
110
|
+
const current = readLinkRetirement(owner.link.id, configDir);
|
|
111
|
+
if (!current || current.nonce !== owner.nonce || !sameLink(current.link, owner.link) || current.operationId !== undefined) return false;
|
|
112
|
+
const { formerOwner: _former, ...rest } = current;
|
|
113
|
+
const next = parse(JSON.stringify({ ...rest, operationId }), owner.link.id);
|
|
114
|
+
atomicWriteFileNoFollow(pathFor(owner.link.id, configDir), JSON.stringify(next, null, 2) + "\n");
|
|
115
|
+
return true;
|
|
116
|
+
}, configDir);
|
|
117
|
+
}
|
|
118
|
+
/** Clear only the exact receipt previously read or claimed, under the config mutation lock. */
|
|
119
|
+
export function clearLinkRetirement(expected: LinkRetirement, configDir: string = getConfigDir(), safeToClear?: () => boolean): boolean {
|
|
120
|
+
const owner = parse(JSON.stringify(expected), expected.link.id);
|
|
121
|
+
assertNotRealHomeUnderTest(configDir);
|
|
122
|
+
return withConfigMutationLockSync(() => {
|
|
123
|
+
const current = readLinkRetirement(owner.link.id, configDir);
|
|
124
|
+
if (!current || current.nonce !== owner.nonce || !sameLink(current.link, owner.link) || (safeToClear && !safeToClear())) return false;
|
|
125
|
+
unlinkSync(pathFor(owner.link.id, configDir));
|
|
126
|
+
return true;
|
|
127
|
+
}, configDir);
|
|
128
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/** Ephemeral Home wakeups. The admitted link id, never a caller selector, owns each slot. */
|
|
2
|
+
export const ROUTE_INTENT_WATCH_HEADER = "x-ocx-route-intent-watch";
|
|
3
|
+
export const ROUTE_INTENT_AFTER_HEADER = "x-ocx-route-intent-after";
|
|
4
|
+
export const ROUTE_INTENT_WAKE_HEADER = "x-ocx-route-intent-wake";
|
|
5
|
+
export const ROUTE_INTENT_WATCH_TIMEOUT_MS = 30_000;
|
|
6
|
+
export const ROUTE_INTENT_WATCH_MAX_LINKS = 256;
|
|
7
|
+
export type RouteIntentWake = "notified" | "timeout" | "cancelled" | "busy";
|
|
8
|
+
|
|
9
|
+
export class RouteIntentWatch {
|
|
10
|
+
private readonly waiters = new Map<string, (reason: RouteIntentWake) => void>();
|
|
11
|
+
constructor(private readonly timeoutMs = ROUTE_INTENT_WATCH_TIMEOUT_MS, private readonly maxLinks = ROUTE_INTENT_WATCH_MAX_LINKS) {
|
|
12
|
+
if (!Number.isInteger(timeoutMs) || timeoutMs < 1 || timeoutMs > ROUTE_INTENT_WATCH_TIMEOUT_MS
|
|
13
|
+
|| !Number.isInteger(maxLinks) || maxLinks < 1 || maxLinks > ROUTE_INTENT_WATCH_MAX_LINKS) throw new RangeError("invalid route intent watch bounds");
|
|
14
|
+
}
|
|
15
|
+
get size(): number { return this.waiters.size; }
|
|
16
|
+
wait(linkId: string, signal: AbortSignal): Promise<RouteIntentWake> {
|
|
17
|
+
if (signal.aborted) return Promise.resolve("cancelled");
|
|
18
|
+
if (this.waiters.has(linkId) || this.waiters.size >= this.maxLinks) return Promise.resolve("busy");
|
|
19
|
+
return new Promise(resolve => {
|
|
20
|
+
const finish = (reason: RouteIntentWake) => {
|
|
21
|
+
clearTimeout(timer);
|
|
22
|
+
signal.removeEventListener("abort", abort);
|
|
23
|
+
this.waiters.delete(linkId);
|
|
24
|
+
resolve(reason);
|
|
25
|
+
};
|
|
26
|
+
const abort = () => finish("cancelled");
|
|
27
|
+
const timer = setTimeout(() => finish("timeout"), this.timeoutMs);
|
|
28
|
+
timer.unref();
|
|
29
|
+
this.waiters.set(linkId, finish);
|
|
30
|
+
signal.addEventListener("abort", abort, { once: true });
|
|
31
|
+
if (signal.aborted) abort();
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
/** False means no active watcher accepted the request; it is never an apply acknowledgment. */
|
|
35
|
+
notify(linkId: string): boolean {
|
|
36
|
+
const wake = this.waiters.get(linkId);
|
|
37
|
+
wake?.("notified");
|
|
38
|
+
return wake !== undefined;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
export const homeRouteIntentWatch = new RouteIntentWatch();
|
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
/** Home policy only. No filesystem paths, listener facts, credentials or profile slots. */
|
|
2
|
+
import { createHash } from "node:crypto";
|
|
3
|
+
import { hostname } from "node:os";
|
|
4
|
+
import { EXPORT_CLIENT_IDS } from "../clients/client-ids";
|
|
5
|
+
import type { OcxConfig } from "../types";
|
|
6
|
+
|
|
7
|
+
export const ROUTE_CLIENT_IDS = ["codex", "claude", "claude-desktop", "grok", ...EXPORT_CLIENT_IDS] as const;
|
|
8
|
+
export type RouteClientId = (typeof ROUTE_CLIENT_IDS)[number];
|
|
9
|
+
export interface RouteClientIntent {
|
|
10
|
+
enabled: boolean;
|
|
11
|
+
modelNames?: "alias" | "routed";
|
|
12
|
+
/** Stable Aside user ids, never machine-local profile slots. */
|
|
13
|
+
accounts?: "all" | "none" | string[];
|
|
14
|
+
}
|
|
15
|
+
export interface HomeRouteIntentDocument {
|
|
16
|
+
version: 1;
|
|
17
|
+
home: { name: string; version: string };
|
|
18
|
+
clients: Record<RouteClientId, RouteClientIntent>;
|
|
19
|
+
/**
|
|
20
|
+
* `native` appears only in the Home's own document: the Home's persisted native switch governs
|
|
21
|
+
* that client there. Documents sent to a Child never carry it.
|
|
22
|
+
*/
|
|
23
|
+
sources: Record<RouteClientId, "builtin" | "default" | "device" | "native">;
|
|
24
|
+
/** Device decisions (including inherit) invalidate matching enrollment overrides. */
|
|
25
|
+
clientRevisions?: Partial<Record<RouteClientId, number>>;
|
|
26
|
+
}
|
|
27
|
+
export interface RouteIntentState {
|
|
28
|
+
version: 1;
|
|
29
|
+
defaults: Partial<Record<RouteClientId, RouteClientIntent>>;
|
|
30
|
+
devices: Record<string, Partial<Record<RouteClientId, RouteClientIntent>>>;
|
|
31
|
+
revisions?: Record<string, Partial<Record<RouteClientId, number>>>;
|
|
32
|
+
}
|
|
33
|
+
export interface RouteClientOutcome {
|
|
34
|
+
client: RouteClientId;
|
|
35
|
+
outcome: "current" | "stale" | "not_installed" | "conflict" | "failed";
|
|
36
|
+
/** A Child's off-only opt-out; Home policy remains unchanged. */
|
|
37
|
+
source?: "local";
|
|
38
|
+
target?: string;
|
|
39
|
+
message?: string;
|
|
40
|
+
intentDigest?: string;
|
|
41
|
+
/** Display-only initial selection made during enrollment; never mutates Home policy. */
|
|
42
|
+
initialIntent?: RouteClientIntent;
|
|
43
|
+
initialRevision?: number;
|
|
44
|
+
}
|
|
45
|
+
export const ROUTE_INTENT_DIGEST_PATTERN = /^[0-9a-f]{64}$/;
|
|
46
|
+
export function isRouteClientId(value: unknown): value is RouteClientId {
|
|
47
|
+
return typeof value === "string" && (ROUTE_CLIENT_IDS as readonly string[]).includes(value);
|
|
48
|
+
}
|
|
49
|
+
function record(value: unknown): value is Record<string, unknown> {
|
|
50
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
51
|
+
}
|
|
52
|
+
function keys(value: unknown, required: readonly string[], optional: readonly string[] = []): value is Record<string, unknown> {
|
|
53
|
+
return record(value) && required.every(k => Object.hasOwn(value, k))
|
|
54
|
+
&& Object.keys(value).every(k => required.includes(k) || optional.includes(k));
|
|
55
|
+
}
|
|
56
|
+
function label(value: unknown, max: number): value is string {
|
|
57
|
+
return typeof value === "string" && value.length > 0 && value.length <= max && value === value.trim()
|
|
58
|
+
&& !/[\x00-\x1f\x7f\u202a-\u202e\u2066-\u2069]/u.test(value);
|
|
59
|
+
}
|
|
60
|
+
export function parseRouteClientIntent(value: unknown, client?: RouteClientId): RouteClientIntent | null {
|
|
61
|
+
if (!keys(value, ["enabled"], ["modelNames", "accounts"]) || typeof value.enabled !== "boolean") return null;
|
|
62
|
+
if (Object.hasOwn(value, "modelNames") && value.modelNames !== "alias" && value.modelNames !== "routed") return null;
|
|
63
|
+
const a = value.accounts;
|
|
64
|
+
if (Object.hasOwn(value, "accounts")) {
|
|
65
|
+
if (client !== undefined && client !== "aside") return null;
|
|
66
|
+
if (a !== "all" && a !== "none" && (!Array.isArray(a) || a.length > 128 || a.length === 0
|
|
67
|
+
|| !a.every(id => label(id, 128) && /^[A-Za-z0-9@._+-]+$/.test(id) && !/^u[0-9]+$/i.test(id))
|
|
68
|
+
|| new Set(a).size !== a.length)) return null;
|
|
69
|
+
}
|
|
70
|
+
return { enabled: value.enabled, ...(value.modelNames === undefined ? {} : { modelNames: value.modelNames as "alias" | "routed" }),
|
|
71
|
+
...(a === undefined ? {} : { accounts: Array.isArray(a) ? [...a].sort() : a as "all" | "none" }) };
|
|
72
|
+
}
|
|
73
|
+
export function emptyRouteIntentState(): RouteIntentState {
|
|
74
|
+
return { version: 1, defaults: {}, devices: {} };
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export interface HomeRouteProjectionOptions {
|
|
78
|
+
/**
|
|
79
|
+
* The native client a Home write is deciding right now. The decision is applied through the
|
|
80
|
+
* Home's native switch; every other native client on the Home reads that switch as it is.
|
|
81
|
+
*/
|
|
82
|
+
decidedClient?: RouteClientId;
|
|
83
|
+
/** The decided Home value. Absent, the decided client takes the default Children inherit. */
|
|
84
|
+
decidedIntent?: RouteClientIntent;
|
|
85
|
+
}
|
|
86
|
+
export const HOME_NATIVE_ROUTE_CLIENTS = ["codex", "claude", "grok", "claude-desktop"] as const;
|
|
87
|
+
export type HomeNativeRouteClientId = (typeof HOME_NATIVE_ROUTE_CLIENTS)[number];
|
|
88
|
+
export function isHomeNativeRouteClient(client: RouteClientId): client is HomeNativeRouteClientId {
|
|
89
|
+
return (HOME_NATIVE_ROUTE_CLIENTS as readonly string[]).includes(client);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* The defaults Children inherit for the native clients, captured once from the Home's durable
|
|
94
|
+
* switches. Codex and Claude Code keep their switch meaning (only an explicit `false` is off).
|
|
95
|
+
* Grok and Claude Desktop are never captured on: a Home switch enables them on the Home alone.
|
|
96
|
+
*/
|
|
97
|
+
export function homeNativeRouteDefaults(config: OcxConfig): Record<HomeNativeRouteClientId, RouteClientIntent> {
|
|
98
|
+
return { codex: { enabled: config.clientIntegrations?.codex !== false }, claude: { enabled: config.claudeCode?.enabled !== false },
|
|
99
|
+
grok: { enabled: false }, "claude-desktop": { enabled: false } };
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* Pure projection. Persisted policy is supplied explicitly by the management owner.
|
|
104
|
+
*
|
|
105
|
+
* On the Home itself (`deviceId === "home"`) the native clients follow the Home's own persisted
|
|
106
|
+
* switches with their usual meaning (only an explicit `false` is off), never captured defaults or
|
|
107
|
+
* a `devices.home` entry: ocx restore, Messages off and native toggles change those switches
|
|
108
|
+
* without recording route intent. Children never read those switches: a device override, then the
|
|
109
|
+
* saved default, then the builtin (Codex and Claude Code on, everything else off).
|
|
110
|
+
*/
|
|
111
|
+
export function projectHomeRouteIntent(
|
|
112
|
+
config: OcxConfig, version: string, deviceId?: string, state: RouteIntentState = emptyRouteIntentState(),
|
|
113
|
+
options: HomeRouteProjectionOptions = {},
|
|
114
|
+
): HomeRouteIntentDocument {
|
|
115
|
+
const clients = {} as HomeRouteIntentDocument["clients"];
|
|
116
|
+
const sources = {} as HomeRouteIntentDocument["sources"];
|
|
117
|
+
for (const client of ROUTE_CLIENT_IDS) {
|
|
118
|
+
const home = state.defaults[client];
|
|
119
|
+
if (deviceId === "home" && isHomeNativeRouteClient(client)) {
|
|
120
|
+
const live = client === "claude" ? config.claudeCode?.enabled : config.clientIntegrations?.[client];
|
|
121
|
+
const decided = options.decidedClient === client;
|
|
122
|
+
const enabled = decided ? options.decidedIntent?.enabled ?? home?.enabled ?? (client === "codex" || client === "claude")
|
|
123
|
+
: live !== false;
|
|
124
|
+
clients[client] = { enabled };
|
|
125
|
+
sources[client] = "native";
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
const device = deviceId === undefined ? undefined : state.devices[deviceId]?.[client];
|
|
129
|
+
const chosen = { enabled: client === "codex" || client === "claude", ...home, ...device };
|
|
130
|
+
clients[client] = { ...chosen, ...(Array.isArray(chosen.accounts) ? { accounts: [...chosen.accounts].sort() } : {}) };
|
|
131
|
+
sources[client] = device ? "device" : home ? "default" : "builtin";
|
|
132
|
+
}
|
|
133
|
+
const name = hostname();
|
|
134
|
+
const revisions = deviceId === undefined ? undefined : state.revisions?.[deviceId];
|
|
135
|
+
return { version: 1, home: { name: label(name, 255) ? name : "Home", version }, clients, sources,
|
|
136
|
+
...(revisions && Object.keys(revisions).length ? { clientRevisions: { ...revisions } } : {}) };
|
|
137
|
+
}
|
|
138
|
+
/** `allowNative` is for the Home's own local receipt; a document from a Home never carries it. */
|
|
139
|
+
export function parseHomeRouteIntentDocument(value: unknown, options: { allowNative?: boolean } = {}): HomeRouteIntentDocument | null {
|
|
140
|
+
if (!keys(value, ["version", "home", "clients", "sources"], ["clientRevisions"]) || value.version !== 1
|
|
141
|
+
|| !keys(value.home, ["name", "version"]) || !label(value.home.name, 255) || !label(value.home.version, 64)
|
|
142
|
+
|| !keys(value.clients, ROUTE_CLIENT_IDS) || !keys(value.sources, ROUTE_CLIENT_IDS)) return null;
|
|
143
|
+
const clients = {} as HomeRouteIntentDocument["clients"];
|
|
144
|
+
const sources = {} as HomeRouteIntentDocument["sources"];
|
|
145
|
+
for (const client of ROUTE_CLIENT_IDS) {
|
|
146
|
+
const intent = parseRouteClientIntent(value.clients[client], client);
|
|
147
|
+
const source = value.sources[client];
|
|
148
|
+
if (!intent || (source !== "builtin" && source !== "default" && source !== "device"
|
|
149
|
+
&& !(source === "native" && options.allowNative === true && isHomeNativeRouteClient(client)))) return null;
|
|
150
|
+
clients[client] = intent;
|
|
151
|
+
sources[client] = source;
|
|
152
|
+
}
|
|
153
|
+
const revisions: Partial<Record<RouteClientId, number>> = {};
|
|
154
|
+
if (value.clientRevisions !== undefined) {
|
|
155
|
+
if (!record(value.clientRevisions)) return null;
|
|
156
|
+
for (const [client, revision] of Object.entries(value.clientRevisions)) {
|
|
157
|
+
if (!isRouteClientId(client) || typeof revision !== "number" || !Number.isSafeInteger(revision) || revision < 0) return null;
|
|
158
|
+
revisions[client] = revision;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
return { version: 1, home: { name: value.home.name, version: value.home.version }, clients, sources,
|
|
162
|
+
...(value.clientRevisions === undefined ? {} : { clientRevisions: revisions }) };
|
|
163
|
+
}
|
|
164
|
+
/** Compact JSON: version, ordered clients (enabled/modelNames/accounts), ordered sources. */
|
|
165
|
+
export function routeIntentDigestPayload(document: HomeRouteIntentDocument): string {
|
|
166
|
+
const clients = Object.fromEntries(ROUTE_CLIENT_IDS.map(client => {
|
|
167
|
+
const intent = document.clients[client];
|
|
168
|
+
return [client, { enabled: intent.enabled, ...(intent.modelNames === undefined ? {} : { modelNames: intent.modelNames }),
|
|
169
|
+
...(intent.accounts === undefined ? {} : { accounts: Array.isArray(intent.accounts) ? [...intent.accounts].sort() : intent.accounts }) }];
|
|
170
|
+
}));
|
|
171
|
+
return JSON.stringify({ version: 1, clients, sources: Object.fromEntries(ROUTE_CLIENT_IDS.map(client => [client, document.sources[client]])) });
|
|
172
|
+
}
|
|
173
|
+
export function routeIntentDigest(document: HomeRouteIntentDocument): string {
|
|
174
|
+
return createHash("sha256").update(routeIntentDigestPayload(document), "utf8").digest("hex");
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
export function routeClientIntentDigest(document: HomeRouteIntentDocument, client: RouteClientId): string {
|
|
178
|
+
const intent = parseRouteClientIntent(document.clients[client], client)!;
|
|
179
|
+
return createHash("sha256").update(JSON.stringify({ version: 1, client, intent, source: document.sources[client] }), "utf8").digest("hex");
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
/** Peer outcomes carry closed fields; local diagnostics are never copied onto the wire. */
|
|
183
|
+
export function parseRouteClientOutcomes(value: unknown): RouteClientOutcome[] | null {
|
|
184
|
+
if (!Array.isArray(value) || value.length > ROUTE_CLIENT_IDS.length) return null;
|
|
185
|
+
const seen = new Set<string>();
|
|
186
|
+
const out: RouteClientOutcome[] = [];
|
|
187
|
+
for (const row of value) {
|
|
188
|
+
if (!keys(row, ["client", "outcome"], ["source", "target", "message", "intentDigest", "initialIntent", "initialRevision"]) || !isRouteClientId(row.client)
|
|
189
|
+
|| seen.has(row.client) || !["current", "stale", "not_installed", "conflict", "failed"].includes(row.outcome as string)
|
|
190
|
+
|| (row.source !== undefined && row.source !== "local")
|
|
191
|
+
|| (row.target !== undefined && !label(row.target, 256)) || (row.message !== undefined && !label(row.message, 256))) return null;
|
|
192
|
+
if (row.intentDigest !== undefined && (typeof row.intentDigest !== "string" || !ROUTE_INTENT_DIGEST_PATTERN.test(row.intentDigest))) return null;
|
|
193
|
+
const initialIntent = row.initialIntent === undefined ? undefined : parseRouteClientIntent(row.initialIntent, row.client);
|
|
194
|
+
if (row.initialIntent !== undefined && (!initialIntent || Object.keys(initialIntent).some(key => key !== "enabled") || typeof row.initialRevision !== "number" || !Number.isSafeInteger(row.initialRevision) || row.initialRevision < 0)) return null;
|
|
195
|
+
if (row.initialIntent === undefined && row.initialRevision !== undefined) return null;
|
|
196
|
+
seen.add(row.client);
|
|
197
|
+
out.push({ client: row.client, outcome: row.outcome as RouteClientOutcome["outcome"], ...(row.source === "local" ? { source: "local" as const } : {}),
|
|
198
|
+
...(row.target === undefined ? {} : { target: row.target as string }), ...(row.message === undefined ? {} : { message: row.message as string }),
|
|
199
|
+
...(row.intentDigest === undefined ? {} : { intentDigest: row.intentDigest }),
|
|
200
|
+
...(initialIntent ? { initialIntent, initialRevision: row.initialRevision as number } : {}) });
|
|
201
|
+
}
|
|
202
|
+
return out;
|
|
203
|
+
}
|
|
204
|
+
/** Publish only client identity, disposition and opt-out; target/message can expose local files or secrets. */
|
|
205
|
+
export function routeClientOutcomesForPeer(outcomes: readonly RouteClientOutcome[]): RouteClientOutcome[] {
|
|
206
|
+
return outcomes.map(({ client, outcome, source, target, intentDigest, initialIntent, initialRevision }) => ({ client, outcome, ...(source === "local" ? { source } : {}),
|
|
207
|
+
...(intentDigest ? { intentDigest } : {}), ...(initialIntent ? { initialIntent: { enabled: initialIntent.enabled }, initialRevision } : {}),
|
|
208
|
+
...(client === "aside" && typeof target === "string" && /^u[0-9]+(?:,u[0-9]+)*$/.test(target) && target.length <= 256 ? { target } : {}) }));
|
|
209
|
+
}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The Home's register of readiness proofs for multi-route links (src/link/supervisor.ts). Each proof
|
|
3
|
+
* is a fresh id the supervisor sends, over one route, to the Child, which fetches its own
|
|
4
|
+
* /v1/catalog with the id in LINK_ROUTE_PROOF_HEADER; the Child's link relay carries it to this
|
|
5
|
+
* Home through the tunnel with relay authentication. The hub-link admission path reports an
|
|
6
|
+
* authenticated catalog request carrying the header here (admit). A proof counts only for the
|
|
7
|
+
* link key it was registered for, before its expiry, and while the link's tunnel generation is
|
|
8
|
+
* still the one it was registered under. One entry per link; nothing is persisted or logged.
|
|
9
|
+
*/
|
|
10
|
+
export const LINK_ROUTE_PROOF_HEADER = "x-opencodex-link-route-proof";
|
|
11
|
+
const PROOF_ID = /^[0-9a-f]{32}$/;
|
|
12
|
+
|
|
13
|
+
export function isRouteProofId(value: unknown): value is string {
|
|
14
|
+
return typeof value === "string" && PROOF_ID.test(value);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* The hub-link admission's side of a proof: read LINK_ROUTE_PROOF_HEADER and take it off the request,
|
|
19
|
+
* so nothing handling the request afterwards sees it. A header that cannot be removed is not
|
|
20
|
+
* reported. The id itself is validated by the registry (admit).
|
|
21
|
+
*/
|
|
22
|
+
export function takeRouteProof(req: Request): string | undefined {
|
|
23
|
+
const proof = req.headers.get(LINK_ROUTE_PROOF_HEADER) ?? undefined;
|
|
24
|
+
if (proof === undefined) return undefined;
|
|
25
|
+
try { req.headers.delete(LINK_ROUTE_PROOF_HEADER); } catch { return undefined; }
|
|
26
|
+
return proof;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export interface RouteProofEntry {
|
|
30
|
+
linkId: string;
|
|
31
|
+
apiKeyId: string;
|
|
32
|
+
/** The connection generation of the candidate tunnel (supervisor.connectionGeneration). */
|
|
33
|
+
generation: string;
|
|
34
|
+
proofId: string;
|
|
35
|
+
expiresAt: number;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export interface RouteProofHandle {
|
|
39
|
+
/** True once an authenticated catalog request carrying this id was admitted in time. */
|
|
40
|
+
admitted(): boolean;
|
|
41
|
+
dispose(): void;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export interface RouteProofRegistry {
|
|
45
|
+
register(entry: RouteProofEntry): RouteProofHandle;
|
|
46
|
+
admit(apiKeyId: string, proofId: string): void;
|
|
47
|
+
/** Drop a link's entry (round cancelled, link stopped or removed). */
|
|
48
|
+
forget(linkId: string): void;
|
|
49
|
+
size(): number;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export function createRouteProofRegistry(deps: { now?: () => number; generationOf: (linkId: string) => string | undefined }): RouteProofRegistry {
|
|
53
|
+
const now = deps.now ?? Date.now;
|
|
54
|
+
const byLink = new Map<string, { entry: RouteProofEntry; admitted: boolean }>();
|
|
55
|
+
return {
|
|
56
|
+
register(entry) {
|
|
57
|
+
if (!isRouteProofId(entry.proofId)) throw new Error("invalid route proof id");
|
|
58
|
+
const slot = { entry: { ...entry }, admitted: false };
|
|
59
|
+
byLink.set(entry.linkId, slot);
|
|
60
|
+
return {
|
|
61
|
+
admitted: () => slot.admitted,
|
|
62
|
+
dispose: () => { if (byLink.get(entry.linkId) === slot) byLink.delete(entry.linkId); },
|
|
63
|
+
};
|
|
64
|
+
},
|
|
65
|
+
admit(apiKeyId, proofId) {
|
|
66
|
+
if (!isRouteProofId(proofId)) return;
|
|
67
|
+
for (const slot of byLink.values()) {
|
|
68
|
+
const { entry } = slot;
|
|
69
|
+
if (entry.proofId !== proofId) continue;
|
|
70
|
+
if (entry.apiKeyId !== apiKeyId || now() >= entry.expiresAt) return;
|
|
71
|
+
let generation: string | undefined;
|
|
72
|
+
try { generation = deps.generationOf(entry.linkId); } catch { generation = undefined; }
|
|
73
|
+
if (generation !== entry.generation) return;
|
|
74
|
+
slot.admitted = true;
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
},
|
|
78
|
+
forget(linkId) { byLink.delete(linkId); },
|
|
79
|
+
size: () => byLink.size,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
|