@bitkyc08/opencodex 2.100.1 → 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-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.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-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +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 +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- 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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- 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 +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- 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 +314 -0
- 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 +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +29 -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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-readiness.ts +16 -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-status.ts +76 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- 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-types.ts +2 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- 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/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- 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 +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- 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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- 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 +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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/account-resume-health.ts +60 -0
- 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 +25 -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 +51 -1
- 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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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/config-routes.ts +7 -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 +218 -0
- 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 +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -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 +22 -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-failure-detail.ts +59 -1
- 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 +40 -51
- 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 +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -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 +99 -106
- 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 +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- 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/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -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/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
import type { OcxConfig } from "../../types";
|
|
2
|
+
/** Home-owned route decisions. This management surface is never added to the link relay. */
|
|
3
|
+
import { jsonResponse } from "../auth-cors";
|
|
4
|
+
import { managementInferencePort, type ManagementContext } from "./context";
|
|
5
|
+
import { readManagementJsonBody, managementBodyTooLargeResponse } from "./body";
|
|
6
|
+
import { readLinkStore, type LinkRecord } from "../../link/store";
|
|
7
|
+
import { linkStorePath } from "../../link/paths";
|
|
8
|
+
import { homeLinkChildParity } from "../../link/child-parity";
|
|
9
|
+
import { homeRouteIntentWatch } from "../../link/route-intent-watch";
|
|
10
|
+
import { ROUTE_CLIENT_IDS, isHomeNativeRouteClient, parseRouteClientIntent, type HomeNativeRouteClientId, type RouteClientId, type RouteClientIntent, type RouteClientOutcome } from "../../link/route-intent";
|
|
11
|
+
import { clearRouteClientIntent, readRouteIntentState, recordHomeNativeDecision, RouteIntentStateUnreadableError, setRouteClientIntent } from "../../routing/route-intent-state";
|
|
12
|
+
import { HomeAsideIntentDerivationError, initializeHomeRouteIntentDefaults, readHomeRouteIntentStateAsideTolerant, reconcileHomeRouteDevices } from "../../routing/home-route-intent";
|
|
13
|
+
import { captureHomeRouteDefaults, homeHasLinks } from "../../routing/home-route-capture";
|
|
14
|
+
import { EPHEMERAL_NO_ROUTE_INTENT, routeToAsideUnresolved, routeToDeviceStatus, unsupportedRouteToDevice, type RouteToStatus, type RouteToSyncRow } from "../../routing/route-to-status";
|
|
15
|
+
import { projectHomeRouteIntent } from "../../link/route-intent";
|
|
16
|
+
import { refreshRouteNativeSettings, withDurableRouteNativeSettings } from "../../routing/route-to-live-settings";
|
|
17
|
+
import { withLinkApply, LinkApplyBusyError } from "../../client/link-home";
|
|
18
|
+
import { withConfigMutationLockSync } from "../../config/mutation-lock";
|
|
19
|
+
|
|
20
|
+
export interface RouteToRouteDeps {
|
|
21
|
+
applyHome?: (ctx: ManagementContext, overwriteConflict: boolean, overwriteClient?: RouteClientId) => Promise<RouteClientOutcome[]>;
|
|
22
|
+
/** Isolated transaction test seam; production uses the shared local materializer. */
|
|
23
|
+
materializeHome?: (config: OcxConfig, version: string, overwriteConflict: boolean, overwriteClient?: RouteClientId) => Promise<RouteClientOutcome[]>;
|
|
24
|
+
syncChild?: (link: LinkRecord, ctx: ManagementContext, overwriteConflict: boolean, overwriteClient?: RouteClientId) => Promise<Omit<RouteToSyncRow, "id">>;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function devices(ctx: ManagementContext): LinkRecord[] {
|
|
28
|
+
// Unlike an empty store, unreadable trust metadata must never select another device.
|
|
29
|
+
return (ctx.deps.readLinkStore?.() ?? readLinkStore(linkStorePath())).links;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/** An ephemeral ocx-child never reads route intent: nothing addresses it as a route device. */
|
|
33
|
+
function ephemeral(link: LinkRecord | undefined): boolean {
|
|
34
|
+
return link?.childKind === "ephemeral";
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function resolveDevice(value: string | undefined, links: LinkRecord[]): string | undefined {
|
|
38
|
+
if (value === undefined) return undefined;
|
|
39
|
+
if (value === "home" || value === "this") return "home";
|
|
40
|
+
const exact = links.find(link => link.id === value);
|
|
41
|
+
if (exact) return exact.id;
|
|
42
|
+
const matches = links.filter(link => link.alias === value);
|
|
43
|
+
if (matches.length > 1) throw new Error("ambiguous_device");
|
|
44
|
+
if (!matches.length) throw new Error("unknown_device");
|
|
45
|
+
return matches[0]!.id;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
async function view(ctx: ManagementContext, selected?: string): Promise<RouteToStatus> {
|
|
49
|
+
const links = devices(ctx);
|
|
50
|
+
const selection = selected === "all" ? "all" : resolveDevice(selected ?? "home", links);
|
|
51
|
+
const rows: RouteToStatus["devices"] = [];
|
|
52
|
+
const warnings: string[] = [];
|
|
53
|
+
if (selection === "all" || selection === "home") {
|
|
54
|
+
const { readHomeRouteToStatus, HOME_ASIDE_UNRESOLVED_MESSAGE } = await import("../../routing/route-to-local");
|
|
55
|
+
const home = readHomeRouteToStatus(ctx.config, ctx.version);
|
|
56
|
+
if (home.clients.some(row => row.intent === "unresolved")) warnings.push(HOME_ASIDE_UNRESOLVED_MESSAGE);
|
|
57
|
+
rows.push(home);
|
|
58
|
+
}
|
|
59
|
+
// Read once: a Child without its own Aside entry inherits the same unresolved default.
|
|
60
|
+
let inherited: ReturnType<typeof readHomeRouteIntentStateAsideTolerant> | undefined;
|
|
61
|
+
for (const link of links) {
|
|
62
|
+
if (selection !== "all" && selection !== link.id) continue;
|
|
63
|
+
if (ephemeral(link)) { rows.push(unsupportedRouteToDevice(link.id, link.alias)); continue; }
|
|
64
|
+
const peer = homeLinkChildParity.get(link.id);
|
|
65
|
+
inherited ??= readHomeRouteIntentStateAsideTolerant(ctx.config);
|
|
66
|
+
const row = routeToDeviceStatus(link.id, link.alias, projectHomeRouteIntent(ctx.config, ctx.version, link.id, inherited.state),
|
|
67
|
+
peer.routeClientOutcomes ?? [], peer.appliedRouteIntentDigest ?? null);
|
|
68
|
+
rows.push(inherited.asideUnresolved && inherited.state.devices[link.id]?.aside === undefined ? routeToAsideUnresolved(row) : row);
|
|
69
|
+
}
|
|
70
|
+
return { schema: "ocx.route-to/1", devices: rows, ...(warnings.length ? { warnings } : {}) };
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
async function applyHome(ctx: ManagementContext, overwriteConflict: boolean, deps: RouteToRouteDeps, overwriteClient?: RouteClientId, commit?: () => void,
|
|
74
|
+
onlyClient?: RouteClientId, onlyIntent?: () => RouteClientIntent | undefined, homeAsideDecision = false): Promise<RouteClientOutcome[]> {
|
|
75
|
+
if (deps.applyHome) return withLinkApply(async () => { commit?.(); return deps.applyHome!(ctx, overwriteConflict, overwriteClient); });
|
|
76
|
+
const { syncHomeRouteTo } = await import("../../routing/route-to-local");
|
|
77
|
+
const local = { ...ctx.config, port: managementInferencePort(ctx) };
|
|
78
|
+
const outcomes = deps.materializeHome
|
|
79
|
+
? await withLinkApply(async () => { commit?.(); return deps.materializeHome!(local, ctx.version, overwriteConflict, overwriteClient); })
|
|
80
|
+
: await syncHomeRouteTo(local, ctx.version, overwriteConflict, overwriteClient, commit, { onlyClient, onlyIntent, homeAsideDecision });
|
|
81
|
+
refreshRouteNativeSettings(ctx.config);
|
|
82
|
+
return outcomes;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function record(value: unknown): value is Record<string, unknown> {
|
|
86
|
+
return !!value && typeof value === "object" && !Array.isArray(value);
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/** The Home's durable native switch for a client (absent is on), as another process may have left it. */
|
|
90
|
+
function durableHomeSwitch(config: OcxConfig, client: HomeNativeRouteClientId): boolean {
|
|
91
|
+
const durable = withDurableRouteNativeSettings(config);
|
|
92
|
+
return client === "claude" ? durable.claudeCode?.enabled !== false : durable.clientIntegrations?.[client] !== false;
|
|
93
|
+
}
|
|
94
|
+
function parseWrite(value: unknown): { client: RouteClientId; action: "on" | "off" | "inherit"; device?: string; intent: RouteClientIntent; overwriteConflict: boolean } | null {
|
|
95
|
+
if (!record(value) || Object.keys(value).some(key => !["client", "action", "device", "accounts", "modelNames", "overwriteConflict"].includes(key))) return null;
|
|
96
|
+
if (!(ROUTE_CLIENT_IDS as readonly unknown[]).includes(value.client) || typeof value.action !== "string" || !["on", "off", "inherit"].includes(value.action)) return null;
|
|
97
|
+
if (value.device !== undefined && (typeof value.device !== "string" || !value.device.trim())) return null;
|
|
98
|
+
if (value.overwriteConflict !== undefined && typeof value.overwriteConflict !== "boolean") return null;
|
|
99
|
+
if (value.modelNames !== undefined && value.modelNames !== "alias" && value.modelNames !== "routed") return null;
|
|
100
|
+
if (value.modelNames !== undefined && value.client !== "hermes" && value.client !== "commandcode") return null;
|
|
101
|
+
if (value.action === "inherit" && (!value.device || value.accounts !== undefined || value.modelNames !== undefined || value.overwriteConflict !== undefined)) return null;
|
|
102
|
+
if (value.action === "off" && value.overwriteConflict === true) return null;
|
|
103
|
+
const intent = parseRouteClientIntent({ enabled: value.action === "on", ...(value.accounts === undefined ? {} : { accounts: value.accounts }),
|
|
104
|
+
...(value.modelNames === undefined ? {} : { modelNames: value.modelNames }) }, value.client as RouteClientId);
|
|
105
|
+
if (!intent) return null;
|
|
106
|
+
return { client: value.client as RouteClientId, action: value.action as "on" | "off" | "inherit",
|
|
107
|
+
...(value.device === undefined ? {} : { device: value.device as string }), overwriteConflict: value.overwriteConflict === true,
|
|
108
|
+
intent };
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** Bounded body parsing and one device resolution precede every persisted write. */
|
|
112
|
+
export async function handleRouteToRoutes(ctx: ManagementContext, deps: RouteToRouteDeps = {}): Promise<Response | null> {
|
|
113
|
+
const { url, req, config } = ctx;
|
|
114
|
+
if (!["/api/route-to", "/api/route-to/sync"].includes(url.pathname)) return null;
|
|
115
|
+
const reply = (body: unknown, status = 200): Response => {
|
|
116
|
+
const response = jsonResponse(body, status, req, config);
|
|
117
|
+
response.headers.set("cache-control", "no-store");
|
|
118
|
+
return response;
|
|
119
|
+
};
|
|
120
|
+
const unsupported = (link: LinkRecord): Response => reply({ error: `${link.alias} runs the ephemeral ocx-child, which never reads route intent, so nothing was changed. ocx sync refreshes its Home catalog.`,
|
|
121
|
+
code: "route_intent_unsupported", reason: EPHEMERAL_NO_ROUTE_INTENT, device: link.id }, 409);
|
|
122
|
+
if (config.runtimeRole === "client") return reply({ error: "Route-to decisions are owned by the Home", code: "link_child_read_only" }, 403);
|
|
123
|
+
let desiredCommitted = false;
|
|
124
|
+
// A Home native decision is its switch: what the durable switch read before this write.
|
|
125
|
+
let nativeBefore: { client: HomeNativeRouteClientId; enabled: boolean } | undefined;
|
|
126
|
+
try {
|
|
127
|
+
if (url.pathname === "/api/route-to" && req.method === "GET") {
|
|
128
|
+
if ([...url.searchParams.keys()].some(key => key !== "device") || url.searchParams.getAll("device").length > 1) return reply({ error: "invalid_request" }, 400);
|
|
129
|
+
return reply(await view(ctx, url.searchParams.get("device") ?? undefined));
|
|
130
|
+
}
|
|
131
|
+
if (url.pathname === "/api/route-to") {
|
|
132
|
+
if (req.method !== "PUT") return reply({ error: "method_not_allowed" }, 405);
|
|
133
|
+
}
|
|
134
|
+
if (url.pathname === "/api/route-to/sync") {
|
|
135
|
+
if (req.method !== "POST") return reply({ error: "method_not_allowed" }, 405);
|
|
136
|
+
}
|
|
137
|
+
const sync = url.pathname.endsWith("/sync");
|
|
138
|
+
let body: unknown;
|
|
139
|
+
try { body = await readManagementJsonBody(req); }
|
|
140
|
+
catch (error) { return managementBodyTooLargeResponse(error, req, config) ?? reply({ error: "invalid_request" }, 400); }
|
|
141
|
+
if (sync) {
|
|
142
|
+
if (!record(body) || Object.keys(body).some(key => !["device", "overwriteConflict"].includes(key))
|
|
143
|
+
|| (body.device !== undefined && (typeof body.device !== "string" || !body.device.trim()))
|
|
144
|
+
|| (body.overwriteConflict !== undefined && typeof body.overwriteConflict !== "boolean")) return reply({ error: "invalid_request" }, 400);
|
|
145
|
+
const links = devices(ctx);
|
|
146
|
+
const selected = body.device === "all" ? "all" : resolveDevice(body.device as string | undefined ?? "home", links);
|
|
147
|
+
const only = links.find(link => link.id === selected);
|
|
148
|
+
if (ephemeral(only)) return unsupported(only!);
|
|
149
|
+
if (selected === "all" || selected === "home") await applyHome(ctx, body.overwriteConflict === true, deps);
|
|
150
|
+
const syncs: RouteToSyncRow[] = [];
|
|
151
|
+
for (const link of links) {
|
|
152
|
+
if (selected !== "all" && selected !== link.id) continue;
|
|
153
|
+
if (ephemeral(link)) { syncs.push({ id: link.id, state: "unsupported", reason: EPHEMERAL_NO_ROUTE_INTENT }); continue; }
|
|
154
|
+
const run = deps.syncChild ?? (await import("../../routing/route-to-sync-child")).syncRouteToChild;
|
|
155
|
+
syncs.push({ id: link.id, ...await run(link, ctx, body.overwriteConflict === true) });
|
|
156
|
+
}
|
|
157
|
+
return reply({ ...await view(ctx, body.device as string | undefined), syncs }, syncs.some(row => row.state === "failed") ? 502 : 200);
|
|
158
|
+
}
|
|
159
|
+
const write = parseWrite(body);
|
|
160
|
+
if (!write) return reply({ error: "invalid_request" }, 400);
|
|
161
|
+
const selected = resolveDevice(write.device, devices(ctx));
|
|
162
|
+
const target = devices(ctx).find(link => link.id === selected);
|
|
163
|
+
if (ephemeral(target)) return unsupported(target!);
|
|
164
|
+
// On the Home itself a native client's decision is its native switch, written by the apply below.
|
|
165
|
+
const homeNative = selected === "home" && isHomeNativeRouteClient(write.client) ? write.client : undefined;
|
|
166
|
+
const switchBefore = homeNative ? durableHomeSwitch(ctx.config, homeNative) : undefined;
|
|
167
|
+
// `ocx route to aside on|off --device home` decides the Home alone. A plain default write
|
|
168
|
+
// still refuses an unresolved Aside default, because that one decides what Children inherit.
|
|
169
|
+
const homeAsideDecision = selected === "home" && write.client === "aside" && write.action !== "inherit";
|
|
170
|
+
if (homeNative) nativeBefore = { client: homeNative, enabled: switchBefore! };
|
|
171
|
+
const commit = () => withConfigMutationLockSync(() => {
|
|
172
|
+
// A Home native decision on a Home with no link is only its switch: like every Home-only
|
|
173
|
+
// switch writer there, it leaves route-intent.json alone. Until defaults are saved a Home
|
|
174
|
+
// inherit takes the builtin.
|
|
175
|
+
const routeIntentUntouched = homeNative !== undefined && !homeHasLinks();
|
|
176
|
+
if (!routeIntentUntouched) {
|
|
177
|
+
reconcileHomeRouteDevices(devices(ctx).map(link => link.id));
|
|
178
|
+
// A Home-only decision captures the Children's native defaults only once the Home has a link.
|
|
179
|
+
// An explicit Home Aside decision must not guess a Child default from unresolved ownership.
|
|
180
|
+
const asideDecided = homeAsideDecision || (write.client === "aside" && readRouteIntentState().devices.home?.aside !== undefined);
|
|
181
|
+
if (!asideDecided) {
|
|
182
|
+
initializeHomeRouteIntentDefaults(withDurableRouteNativeSettings(ctx.config), ctx.version, selected === undefined ? write.client : undefined,
|
|
183
|
+
{ whenLinked: selected === "home" });
|
|
184
|
+
} else if (selected === "home") {
|
|
185
|
+
// Capture resolvable ownership before applying the Home decision can change it.
|
|
186
|
+
try { initializeHomeRouteIntentDefaults(withDurableRouteNativeSettings(ctx.config), ctx.version, undefined, { whenLinked: true }); }
|
|
187
|
+
catch (error) {
|
|
188
|
+
if (!(error instanceof HomeAsideIntentDerivationError)) throw error;
|
|
189
|
+
captureHomeRouteDefaults(undefined, { whenLinked: true });
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
if (homeNative) { if (!routeIntentUntouched) recordHomeNativeDecision(homeNative); }
|
|
194
|
+
else if (write.action === "inherit") clearRouteClientIntent(write.client, selected!);
|
|
195
|
+
else setRouteClientIntent(write.client, write.intent, selected);
|
|
196
|
+
// A Home native decision is committed only once the apply writes its switch (below).
|
|
197
|
+
if (!homeNative) desiredCommitted = true;
|
|
198
|
+
// Desired state remains committed if subsequent reconciliation fails.
|
|
199
|
+
if (selected === undefined) for (const link of devices(ctx)) { if (!ephemeral(link)) homeRouteIntentWatch.notify(link.id); }
|
|
200
|
+
else if (selected !== "home") homeRouteIntentWatch.notify(selected);
|
|
201
|
+
});
|
|
202
|
+
// A default is also the Home's desired state. A device write waits for that Child's tick.
|
|
203
|
+
// A Home inherit for a native client sets its switch to the default Children inherit.
|
|
204
|
+
let decided: RouteClientOutcome | undefined;
|
|
205
|
+
if (selected === undefined || selected === "home") {
|
|
206
|
+
decided = (await applyHome(ctx, write.overwriteConflict, deps, write.client, commit, write.client,
|
|
207
|
+
homeNative && write.action !== "inherit" ? () => write.intent : undefined, homeAsideDecision)).find(row => row.client === write.client);
|
|
208
|
+
} else commit();
|
|
209
|
+
if (selected && selected !== "home" && write.overwriteConflict) {
|
|
210
|
+
const link = devices(ctx).find(row => row.id === selected)!;
|
|
211
|
+
const run = deps.syncChild ?? (await import("../../routing/route-to-sync-child")).syncRouteToChild;
|
|
212
|
+
const result = await run(link, ctx, true, write.client);
|
|
213
|
+
return reply({ ...await view(ctx, write.device), syncs: [{ id: selected, ...result }] }, result.state === "failed" ? 502 : 200);
|
|
214
|
+
}
|
|
215
|
+
const status = await view(ctx, write.device);
|
|
216
|
+
if (decided?.outcome === "conflict" || decided?.outcome === "failed") {
|
|
217
|
+
// A refused or failed native apply leaves the Home switch, and so the rebuilt row, as it was.
|
|
218
|
+
// Report this apply's own outcome rather than the rebuilt row's stale reading of it.
|
|
219
|
+
const row = status.devices.find(device => device.id === "home")?.clients.find(entry => entry.client === write.client);
|
|
220
|
+
if (row) row.applied = decided.outcome;
|
|
221
|
+
const detail = decided.message ? `: ${decided.message}` : "";
|
|
222
|
+
// A Home native decision is its switch. Most refusals come after the apply saved it (an
|
|
223
|
+
// external Codex provider, an incomplete Grok block, a changed Desktop profile), so the durable
|
|
224
|
+
// switch, not the outcome, says whether anything was saved. First-party Desktop refuses first.
|
|
225
|
+
if (homeNative) {
|
|
226
|
+
const saved = durableHomeSwitch(ctx.config, homeNative) !== switchBefore;
|
|
227
|
+
return reply({ ...status, error: saved
|
|
228
|
+
? `The Home's ${write.client} switch was saved, but applying it ended in ${decided.outcome}${detail}`
|
|
229
|
+
: `The Home did not apply ${write.client} (${decided.outcome})${detail}`,
|
|
230
|
+
code: "route_apply_unresolved", desiredCommitted: saved }, 409);
|
|
231
|
+
}
|
|
232
|
+
// A default or a non-native devices.home override is route policy saved before the apply.
|
|
233
|
+
return reply({ ...status, error: `${desiredCommitted ? "Route policy was saved, but the" : "The"} Home did not apply ${write.client} (${decided.outcome})${detail}`,
|
|
234
|
+
code: "route_apply_unresolved", desiredCommitted }, 409);
|
|
235
|
+
}
|
|
236
|
+
return reply(status);
|
|
237
|
+
} catch (error) {
|
|
238
|
+
if (error instanceof LinkApplyBusyError) return reply({ error: desiredCommitted
|
|
239
|
+
? "Route policy was committed, but local apply is busy; retry sync"
|
|
240
|
+
: "Another Home apply is running; no route policy was written", code: "route_apply_busy", desiredCommitted }, 409);
|
|
241
|
+
// Names the file the operator has to fix or remove; nothing else from the local exception.
|
|
242
|
+
if (error instanceof RouteIntentStateUnreadableError) return reply({ error: desiredCommitted
|
|
243
|
+
? `Route policy was saved, but route intent in ${error.path} could not be read afterwards. Inspect it, fix or remove it, then retry sync.`
|
|
244
|
+
: error.message, code: "route_intent_unavailable", desiredCommitted }, 500);
|
|
245
|
+
if (error instanceof Error && error.message === "ambiguous_device") return reply({ error: "ambiguous device alias: use an exact link id", code: "ambiguous_device" }, 409);
|
|
246
|
+
if (error instanceof Error && error.message === "unknown_device") return reply({ error: "unknown device: use home, this, or a link id or alias from ocx link status", code: "unknown_device" }, 404);
|
|
247
|
+
// Do not project paths, config bytes, or transport credentials from a local exception. Say
|
|
248
|
+
// what was saved before the failure: route policy, or the Home's native switch.
|
|
249
|
+
let switchSaved = false;
|
|
250
|
+
try { switchSaved = nativeBefore !== undefined && durableHomeSwitch(ctx.config, nativeBefore.client) !== nativeBefore.enabled; }
|
|
251
|
+
catch { /* An unreadable switch proves nothing was saved. */ }
|
|
252
|
+
const saved = desiredCommitted || switchSaved;
|
|
253
|
+
return reply({ error: switchSaved ? `The Home's ${nativeBefore!.client} switch was saved, but applying it failed; inspect the local integration status and retry sync`
|
|
254
|
+
: desiredCommitted ? "Route policy was saved, but applying it failed; inspect the local integration status and retry sync"
|
|
255
|
+
: "Route-to state could not be read or applied; inspect the local integration status and retry", code: "route_to_failed", desiredCommitted: saved }, 500);
|
|
256
|
+
}
|
|
257
|
+
}
|
|
@@ -54,6 +54,7 @@ import { withSiblingMarker } from "../../codex/sibling-start";
|
|
|
54
54
|
import { issueSiblingHandoff } from "../../codex/sibling-handoff";
|
|
55
55
|
import { readRuntimePort } from "../../config/process-state";
|
|
56
56
|
import { spendLedgerRestartEnvironment } from "../../lib/spend-ledger-owner";
|
|
57
|
+
import { SUPERVISOR_MARKER_ENVS } from "../../lib/supervisor-markers";
|
|
57
58
|
import {
|
|
58
59
|
DESKTOP_RESTART_EXIT_CODE,
|
|
59
60
|
DESKTOP_SUPERVISED_ENV,
|
|
@@ -275,8 +276,9 @@ export function replacementStartEnvironment(
|
|
|
275
276
|
// A sibling's replacement stays a sibling even if the owner is down while it probes.
|
|
276
277
|
const sourceEnv: NodeJS.ProcessEnv = withSiblingMarker(process.env, issueSiblingHandoff);
|
|
277
278
|
delete sourceEnv.OCX_SERVICE;
|
|
278
|
-
// A detached replacement is not the desktop app's child
|
|
279
|
-
|
|
279
|
+
// A detached replacement is not the desktop app's child, nor a service manager's or the Windows
|
|
280
|
+
// wrapper's; it must never exit to a supervisor that is not waiting on it.
|
|
281
|
+
for (const name of SUPERVISOR_MARKER_ENVS) delete sourceEnv[name];
|
|
280
282
|
return spendLedgerRestartEnvironment(
|
|
281
283
|
sourceEnv,
|
|
282
284
|
waitForHealthBeforeParentExit ? undefined : parentPid,
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
readUsageFilterCandidatesPassive,
|
|
16
16
|
requestUsageFilterIndexRebuild,
|
|
17
17
|
resetUsageFilterIndexForTests,
|
|
18
|
+
UsageFilterIndexPageError,
|
|
18
19
|
type UsageFilterCandidateRead,
|
|
19
20
|
type UsageFilterIndexQuery,
|
|
20
21
|
type UsageFilterIndexSnapshot,
|
|
@@ -110,7 +111,6 @@ const MAX_REBUILD_ATTEMPTS = 2;
|
|
|
110
111
|
const MAX_FILTER_INDEX_ATTEMPTS = 3;
|
|
111
112
|
// Selected rows are folded in bounded batches, so a filter that matches most of a large ledger
|
|
112
113
|
// costs the same peak memory as the streaming scan it replaces.
|
|
113
|
-
const FILTER_ROW_READ_BATCH = 2_000;
|
|
114
114
|
const MAX_RETAINED_FILTERED_AGGREGATES = 4;
|
|
115
115
|
|
|
116
116
|
let retainedAggregate: RetainedUsageAggregate | null = null;
|
|
@@ -396,7 +396,7 @@ function filterStats(
|
|
|
396
396
|
): UsageFilterQueryStats {
|
|
397
397
|
return {
|
|
398
398
|
totalRows: read.snapshot.indexedRows,
|
|
399
|
-
candidateRows: read.
|
|
399
|
+
candidateRows: read.candidateRows,
|
|
400
400
|
scope: update,
|
|
401
401
|
ingestedRows: read.snapshot.ingestedRows,
|
|
402
402
|
ingestPasses: read.snapshot.ingestPasses,
|
|
@@ -465,33 +465,45 @@ async function readCandidates(
|
|
|
465
465
|
: readUsageFilterCandidates(query);
|
|
466
466
|
}
|
|
467
467
|
|
|
468
|
+
/**
|
|
469
|
+
* Folds every candidate page into the accumulator, yielding between pages and re-reading rows
|
|
470
|
+
* against the snapshot identity; closes the reader when done.
|
|
471
|
+
*/
|
|
468
472
|
async function accumulateCandidates(
|
|
469
473
|
accumulator: UsageSummaryAccumulator,
|
|
470
474
|
read: UsageFilterCandidateRead,
|
|
471
475
|
filter: NormalizedUsageFilter,
|
|
472
476
|
): Promise<void> {
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
offsets
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
477
|
+
try {
|
|
478
|
+
let first = true;
|
|
479
|
+
for (;;) {
|
|
480
|
+
// Candidate selection and row decoding are synchronous bounded chunks. A timer yield
|
|
481
|
+
// between them prevents a broad authenticated query from monopolizing the event loop.
|
|
482
|
+
if (!first) await new Promise<void>(resolve => setTimeout(resolve, 0));
|
|
483
|
+
const offsets = read.nextPage();
|
|
484
|
+
if (!first && offsets.length === 0) break;
|
|
485
|
+
first = false;
|
|
486
|
+
const rows = await readUsageLedgerRowsAtOffsets({
|
|
487
|
+
offsets,
|
|
488
|
+
expectedIdentityKey: read.snapshot.identityKey,
|
|
489
|
+
// The offsets belong to this index snapshot. If the ledger moved since the snapshot,
|
|
490
|
+
// the reader re-validates the boundary before trusting any of them, and a rewrite of
|
|
491
|
+
// the indexed tail becomes a rebuild instead of a silently different row set.
|
|
492
|
+
expectedRevisionKey: usageLogRevisionKey(read.snapshot.revision),
|
|
493
|
+
expectedProcessedThroughBytes: read.snapshot.indexedOffset,
|
|
494
|
+
expectedProcessedThroughDigest: read.snapshot.processedThroughDigest,
|
|
495
|
+
// The physical size at publish time; a torn suffix makes it larger than the boundary.
|
|
496
|
+
expectedFileSize: read.snapshot.revision?.size,
|
|
497
|
+
});
|
|
498
|
+
if (rows.unreadableOffsets.length > 0) {
|
|
499
|
+
// Serving only the rows that happened to parse would silently under-report the filter.
|
|
500
|
+
throw new UsageFilterIndexCorruptError();
|
|
501
|
+
}
|
|
502
|
+
for (const entry of rows.entries) accumulator.add(entry);
|
|
503
|
+
if (offsets.length === 0) break;
|
|
493
504
|
}
|
|
494
|
-
|
|
505
|
+
} finally {
|
|
506
|
+
read.close();
|
|
495
507
|
}
|
|
496
508
|
// Without a source filter the reported span covers the whole ledger, including rows this
|
|
497
509
|
// filter never selected. A source filter derives its span from the rows that match it, so
|
|
@@ -626,57 +638,80 @@ async function appendFilteredAggregate(
|
|
|
626
638
|
}
|
|
627
639
|
}
|
|
628
640
|
|
|
641
|
+
/**
|
|
642
|
+
* Serves the filtered report from the retained aggregate, appending new candidates or rebuilding
|
|
643
|
+
* as needed; a candidate-page failure clears the retained state and retries the streaming scan.
|
|
644
|
+
*/
|
|
629
645
|
async function refreshFilteredAggregate(
|
|
630
646
|
key: string,
|
|
631
647
|
filter: NormalizedUsageFilter,
|
|
632
648
|
window?: UsageTimeWindow,
|
|
633
649
|
): Promise<UsageAggregateResult> {
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
650
|
+
try {
|
|
651
|
+
return await withFilterIndexRetry(async () => {
|
|
652
|
+
const overlayVersion = userCostOverlayVersion();
|
|
653
|
+
const timeZone = currentTimeZone();
|
|
654
|
+
const state = retainedFilteredAggregates.get(key);
|
|
655
|
+
if (!state
|
|
656
|
+
|| state.overlayVersion !== overlayVersion
|
|
657
|
+
|| state.timeZone !== timeZone
|
|
658
|
+
|| state.indexGeneration === null) {
|
|
659
|
+
return rebuildFilteredAggregate(key, filter, window, overlayVersion, timeZone);
|
|
660
|
+
}
|
|
661
|
+
const read = await readCandidates({
|
|
662
|
+
...filterQuery(filter, window),
|
|
663
|
+
afterOffset: state.processedThroughBytes,
|
|
664
|
+
});
|
|
665
|
+
if (!read) {
|
|
666
|
+
retainedFilteredAggregates.delete(key);
|
|
667
|
+
return rebuildFilteredAggregate(key, filter, window, overlayVersion, timeZone);
|
|
668
|
+
}
|
|
669
|
+
if (state.indexGeneration !== read.snapshot.generation
|
|
670
|
+
|| state.identityKey !== read.snapshot.identityKey
|
|
671
|
+
|| state.processedThroughBytes > read.snapshot.indexedOffset) {
|
|
672
|
+
// This branch never pages, so it owns closing the reader before the rebuild discards it.
|
|
673
|
+
read.close();
|
|
674
|
+
retainedFilteredAggregates.delete(key);
|
|
675
|
+
return rebuildFilteredAggregate(key, filter, window, overlayVersion, timeZone);
|
|
676
|
+
}
|
|
677
|
+
if (state.processedThroughBytes === read.snapshot.indexedOffset) {
|
|
678
|
+
// Even an unchanged retained projection validates the ledger against the snapshot, so a
|
|
679
|
+
// rewrite in the window between the index refresh and this return is not served stale.
|
|
680
|
+
try {
|
|
681
|
+
await readUsageLedgerRowsAtOffsets({
|
|
682
|
+
offsets: [],
|
|
683
|
+
expectedIdentityKey: read.snapshot.identityKey,
|
|
684
|
+
expectedRevisionKey: usageLogRevisionKey(read.snapshot.revision),
|
|
685
|
+
expectedProcessedThroughBytes: read.snapshot.indexedOffset,
|
|
686
|
+
expectedProcessedThroughDigest: read.snapshot.processedThroughDigest,
|
|
687
|
+
expectedFileSize: read.snapshot.revision?.size,
|
|
688
|
+
});
|
|
689
|
+
} finally {
|
|
690
|
+
// This branch never pages, so it owns closing the reader before publishing its stats.
|
|
691
|
+
read.close();
|
|
692
|
+
}
|
|
693
|
+
state.retainedAt = Date.now();
|
|
694
|
+
// Whole-ledger diagnostics can move without the boundary moving: a torn oversized or
|
|
695
|
+
// malformed suffix is observed by every append scan and never advances the offset.
|
|
696
|
+
state.usageIncomplete = read.snapshot.oversizedRows > 0;
|
|
697
|
+
state.usageInvalidRows = read.snapshot.invalidRows > 0;
|
|
698
|
+
state.revision = read.snapshot.revision;
|
|
699
|
+
state.revisionKey = usageLogRevisionKey(read.snapshot.revision);
|
|
700
|
+
return publishFilteredAggregate(key, state, "unchanged", read);
|
|
701
|
+
}
|
|
702
|
+
return appendFilteredAggregate(key, state, filter, read, overlayVersion, timeZone);
|
|
647
703
|
});
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
if (state.indexGeneration !== read.snapshot.generation
|
|
653
|
-
|| state.identityKey !== read.snapshot.identityKey
|
|
654
|
-
|| state.processedThroughBytes > read.snapshot.indexedOffset) {
|
|
704
|
+
} catch (error) {
|
|
705
|
+
if (error instanceof UsageFilterIndexPageError) {
|
|
706
|
+
// A page failed after its reader was handed out: the index cannot serve this query,
|
|
707
|
+
// so answer from the authoritative ledger scan instead of failing the request.
|
|
655
708
|
retainedFilteredAggregates.delete(key);
|
|
656
|
-
return
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
// Even an unchanged retained projection validates the ledger against the snapshot, so a
|
|
660
|
-
// rewrite in the window between the index refresh and this return is not served stale.
|
|
661
|
-
await readUsageLedgerRowsAtOffsets({
|
|
662
|
-
offsets: [],
|
|
663
|
-
expectedIdentityKey: read.snapshot.identityKey,
|
|
664
|
-
expectedRevisionKey: usageLogRevisionKey(read.snapshot.revision),
|
|
665
|
-
expectedProcessedThroughBytes: read.snapshot.indexedOffset,
|
|
666
|
-
expectedProcessedThroughDigest: read.snapshot.processedThroughDigest,
|
|
667
|
-
expectedFileSize: read.snapshot.revision?.size,
|
|
668
|
-
});
|
|
669
|
-
state.retainedAt = Date.now();
|
|
670
|
-
// Whole-ledger diagnostics can move without the boundary moving: a torn oversized or
|
|
671
|
-
// malformed suffix is observed by every append scan and never advances the offset.
|
|
672
|
-
state.usageIncomplete = read.snapshot.oversizedRows > 0;
|
|
673
|
-
state.usageInvalidRows = read.snapshot.invalidRows > 0;
|
|
674
|
-
state.revision = read.snapshot.revision;
|
|
675
|
-
state.revisionKey = usageLogRevisionKey(read.snapshot.revision);
|
|
676
|
-
return publishFilteredAggregate(key, state, "unchanged", read);
|
|
709
|
+
return withFilterIndexRetry(() =>
|
|
710
|
+
rebuildFilteredAggregateStreaming(key, filter, window, userCostOverlayVersion(), currentTimeZone()),
|
|
711
|
+
);
|
|
677
712
|
}
|
|
678
|
-
|
|
679
|
-
}
|
|
713
|
+
throw error;
|
|
714
|
+
}
|
|
680
715
|
}
|
|
681
716
|
|
|
682
717
|
function jevStatsResultFrom(
|
|
@@ -176,6 +176,12 @@ async function handleFallbackRoutesOnDemand(ctx: ManagementContext): Promise<Res
|
|
|
176
176
|
return handleFallbackRoutes(ctx);
|
|
177
177
|
}
|
|
178
178
|
|
|
179
|
+
async function handleRouteToRoutesOnDemand(ctx: ManagementContext): Promise<Response | null> {
|
|
180
|
+
if (!pathInManagementNamespace(ctx.url.pathname, "/api/route-to")) return null;
|
|
181
|
+
const { handleRouteToRoutes } = await import("./management/route-to-routes");
|
|
182
|
+
return handleRouteToRoutes(ctx);
|
|
183
|
+
}
|
|
184
|
+
|
|
179
185
|
/**
|
|
180
186
|
* Lazy like the Lab and routing-profile handlers, and for the same recorded reason: this file is
|
|
181
187
|
* mounted for every dashboard request, so a static import would put the workflow-budget ledger
|
|
@@ -376,6 +382,7 @@ export async function handleManagementAPI(
|
|
|
376
382
|
?? (await handleLowQuotaRoutesOnDemand(ctx))
|
|
377
383
|
?? (await handleQuotaPoolRoutesOnDemand(ctx))
|
|
378
384
|
?? (await handleFallbackRoutesOnDemand(ctx))
|
|
385
|
+
?? (await handleRouteToRoutesOnDemand(ctx))
|
|
379
386
|
?? (await handleWorkflowBudgetRoutesOnDemand(ctx))
|
|
380
387
|
?? (await handleCodexAgentRoleRoutesOnDemand(ctx))
|
|
381
388
|
?? (await handleProtocolRoutesOnDemand(ctx))
|
|
@@ -450,7 +457,12 @@ export async function handleManagementAPI(
|
|
|
450
457
|
// touched and point at its tray, whose Stop it honours (#3008 refuses an undone stop the same way).
|
|
451
458
|
const desktopRefusal = desktopSupervisedStopRefusal(principal);
|
|
452
459
|
if (desktopRefusal) return jsonResponse(desktopRefusal, 409, req, config);
|
|
453
|
-
|
|
460
|
+
// Only a receipt for the port this listener is actually bound to defers its teardown (#8416);
|
|
461
|
+
// before it serves there is no such port, and no receipt is honoured.
|
|
462
|
+
const { boundServerPort } = await import("./lifecycle");
|
|
463
|
+
const servedPort = boundServerPort();
|
|
464
|
+
const ownsThisReceipt = (nonce: string | null) => deferralMatchesReceipt(nonce, servedPort);
|
|
465
|
+
const holdsReceipt = deferralHonored(url, ownsThisReceipt);
|
|
454
466
|
// A sibling never runs under a service manager, and the installed service is the live
|
|
455
467
|
// owner's: asking the manager to stop from here would refuse, or boot the owner's job out.
|
|
456
468
|
const sibling = siblingOfLivePort() !== null;
|
|
@@ -495,7 +507,9 @@ export async function handleManagementAPI(
|
|
|
495
507
|
}
|
|
496
508
|
let serviceStop: import("../service").ServiceStopOutcome;
|
|
497
509
|
try {
|
|
498
|
-
|
|
510
|
+
// #7771: on Windows the route skips Part A for a receipt that records it, caps it at
|
|
511
|
+
// 6 s for one that does not, and sweeps a deleted task's stray wrapper in 4 s.
|
|
512
|
+
serviceStop = sibling ? "absent" : await (await import("./stop-service-route")).routeServiceStop(url, holdsReceipt);
|
|
499
513
|
} catch (err) {
|
|
500
514
|
if (isServiceOwnershipError(err)) {
|
|
501
515
|
// The installed service belongs to another CODEX_HOME/OPENCODEX_HOME: it would respawn
|
|
@@ -528,7 +542,7 @@ export async function handleManagementAPI(
|
|
|
528
542
|
// syncCleanup skips this when OCX_SERVICE is set (so a crash/respawn keeps the fence),
|
|
529
543
|
// which is exactly why an intentional stop has to do it here — unless the caller is
|
|
530
544
|
// `ocx stop`, which does it itself once the proxy is proven down.
|
|
531
|
-
const teardown = await performStopTeardown(url, { ownsReceipt:
|
|
545
|
+
const teardown = await performStopTeardown(url, { ownsReceipt: ownsThisReceipt });
|
|
532
546
|
if (teardown.sharedTeardown === "refused") return jsonResponse(teardown, 409, req, config);
|
|
533
547
|
noteExplicitShutdownRequested(); // Accepted stops and signals remain irreversible.
|
|
534
548
|
setTimeout(async () => {
|
|
@@ -55,6 +55,7 @@ import {
|
|
|
55
55
|
GUI_PAIR_EXPIRES_AT_HEADER,
|
|
56
56
|
GUI_PAIR_NONCE_HEADER,
|
|
57
57
|
GUI_PAIR_PATH,
|
|
58
|
+
DESKTOP_GUI_PAIR_PATH,
|
|
58
59
|
parseExpectedGuiPairPid,
|
|
59
60
|
verifyGuiPairCapability,
|
|
60
61
|
} from "../lib/gui-pair-capability";
|
|
@@ -75,6 +76,7 @@ import { hasLocalDesktopSnapshotCapability } from "./local-desktop-snapshot-auth
|
|
|
75
76
|
import { forgetGuiDevice, rememberGuiDevice, rememberedGuiSessionIsCurrent, resumeGuiDevice } from "./persistent-gui-session";
|
|
76
77
|
import { hasLocalAccountSwitchCapability } from "./local-account-switch-auth";
|
|
77
78
|
import { authorizationCredential } from "../lib/authorization-scheme";
|
|
79
|
+
import { authorizeDesktopSession, desktopSessionAuthorized } from "./gui-desktop-authorization";
|
|
78
80
|
export type { GuiSessionBootstrap, GuiSessionRequestContext } from "./gui-session";
|
|
79
81
|
|
|
80
82
|
const LOCAL_READ_REPLAY_LIMIT = 256;
|
|
@@ -278,6 +280,8 @@ export function managementSessionIssuance(
|
|
|
278
280
|
export interface ManagementSessionControl {
|
|
279
281
|
rememberDevice?(req: Request, config: OcxConfig): ReturnType<typeof rememberGuiDevice>;
|
|
280
282
|
forgetDevice?(req: Request, config: OcxConfig): string | null;
|
|
283
|
+
canMutateLocalDesktop?(req: Request, config: OcxConfig): boolean;
|
|
284
|
+
authorizeLocalDesktop?(req: Request, config: OcxConfig, grant: string): boolean;
|
|
281
285
|
revokeCurrent(req: Request): boolean;
|
|
282
286
|
/** Revalidate a long-lived request against current authority, without cached admission or renewal. */
|
|
283
287
|
isCurrent(req: Request, config: OcxConfig): boolean;
|
|
@@ -305,6 +309,14 @@ export function createManagementSessionControl(state: ManagementAuthState): Mana
|
|
|
305
309
|
return {
|
|
306
310
|
rememberDevice(req, config) { return state.available ? rememberGuiDevice(req, config, state) : null; },
|
|
307
311
|
forgetDevice(req, config) { return state.available ? forgetGuiDevice(req, config, state) : null; },
|
|
312
|
+
canMutateLocalDesktop(req, config): boolean {
|
|
313
|
+
const session = state.available ? state.sessions.get(requestManagementCredential(req) ?? "") : undefined;
|
|
314
|
+
return !!session && desktopSessionAuthorized(req, config, session) && currentSession(req, config) === session;
|
|
315
|
+
},
|
|
316
|
+
authorizeLocalDesktop(req, config, grant): boolean {
|
|
317
|
+
const session = currentSession(req, config);
|
|
318
|
+
return !!session && state.available && authorizeDesktopSession(req, config, state, session, grant);
|
|
319
|
+
},
|
|
308
320
|
isCurrent(req: Request, config: OcxConfig): boolean {
|
|
309
321
|
if (!state.available) return false;
|
|
310
322
|
const credential = requestManagementCredential(req);
|
|
@@ -514,7 +526,7 @@ function hasGuiPairCapability(
|
|
|
514
526
|
} catch {
|
|
515
527
|
return false;
|
|
516
528
|
}
|
|
517
|
-
if (url.pathname !== GUI_PAIR_PATH || url.search !== "") return false;
|
|
529
|
+
if ((url.pathname !== GUI_PAIR_PATH && url.pathname !== DESKTOP_GUI_PAIR_PATH) || url.search !== "") return false;
|
|
518
530
|
const contentLength = req.headers.get("content-length");
|
|
519
531
|
if (contentLength !== "0" || req.headers.has("transfer-encoding")) return false;
|
|
520
532
|
const expectedPid = parseExpectedGuiPairPid(req.headers.get(GUI_PAIR_EXPECTED_PID_HEADER));
|