@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
|
@@ -159,12 +159,19 @@ export interface ManagementApiDeps {
|
|
|
159
159
|
codexPromptPaths?: CodexPromptPaths;
|
|
160
160
|
/** Link seams are getters so the optional listener and supervisor are singletons. */
|
|
161
161
|
linkSupervisor?: () => LinkSupervisor;
|
|
162
|
-
linkListener?: () => Pick<LinkListenerLifecycle<unknown>, "ensureStarted" | "status" | "close" | "onAuthenticatedCatalog"> & Partial<Pick<LinkListenerLifecycle<unknown>, "peerObservation">> & Partial<Pick<import("../index/optional-listeners").OptionalListenerSet<unknown>, "ensureClaudeIntercept" | "claudeInterceptOutcome" | "linkActivity" | "catalogPull" | "flushCatalogPulls">>;
|
|
162
|
+
linkListener?: () => Pick<LinkListenerLifecycle<unknown>, "ensureStarted" | "status" | "close" | "onAuthenticatedCatalog"> & Partial<Pick<LinkListenerLifecycle<unknown>, "peerObservation">> & Partial<Pick<import("../index/optional-listeners").OptionalListenerSet<unknown>, "ensureClaudeIntercept" | "claudeInterceptOutcome" | "linkActivity" | "linkTraffic" | "catalogPull" | "flushCatalogPulls">>;
|
|
163
163
|
readLinkStore?: () => LinkStore;
|
|
164
164
|
writeLinkStore?: (store: LinkStore) => void;
|
|
165
165
|
linkKnownHostsPath?: () => string;
|
|
166
166
|
sshRunner?: SshRunner;
|
|
167
|
-
|
|
167
|
+
/** id: the key id an operation reserved before issuing it (src/server/management/link-operation.ts). */
|
|
168
|
+
issueApiKey?: (config: OcxConfig, name: string, id?: string) => IssuedApiKey;
|
|
169
|
+
/** The operation journal (src/link/operations-journal.ts); defaults to <configDir>/link/operations.json. */
|
|
170
|
+
linkOperationsPath?: () => string;
|
|
171
|
+
/** The per-alias lock (src/link/alias-lock.ts): directory, clock, sleep and wait bound. */
|
|
172
|
+
linkAliasLock?: import("../../link/alias-lock").AliasLockDeps;
|
|
173
|
+
/** Called before an operation's effect mark is written; a throw stands for a failed journal write (tests). */
|
|
174
|
+
linkOperationMarkHook?: (effect: string, phase: "intent" | "done") => void;
|
|
168
175
|
revokeApiKey?: (config: OcxConfig, id: string) => boolean;
|
|
169
176
|
loadLinkCandidates?: () => Array<{ alias: string; source: "ssh_config" | "tailscale" }>;
|
|
170
177
|
resolveChildBinarySource?: typeof import("../../link/child-binary-source").resolveChildBinarySource;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { desktopGuiOrigin, hasDesktopForwardingHeaders } from "../../lib/desktop-gui-origin";
|
|
2
|
+
import { DESKTOP_AUTHORIZATION_PATH } from "../gui-desktop-authorization";
|
|
3
|
+
import { jsonResponse } from "../auth-cors";
|
|
4
|
+
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
5
|
+
import { hasHumanDashboardSession } from "./consent-session";
|
|
6
|
+
import type { ManagementContext } from "./context";
|
|
7
|
+
|
|
8
|
+
function localDesktopBrowser(ctx: ManagementContext): boolean {
|
|
9
|
+
return ctx.principal === "gui-session" && ctx.trustedLoopbackIngress
|
|
10
|
+
&& (ctx.deps.liveListenPort?.() ?? ctx.config.port) === ctx.config.port
|
|
11
|
+
&& !hasDesktopForwardingHeaders(ctx.req)
|
|
12
|
+
&& desktopGuiOrigin(ctx.config, ctx.url.origin) === ctx.url.origin;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function requireDesktopAuthorization(ctx: ManagementContext): Response | null {
|
|
16
|
+
const livePort = ctx.deps.liveListenPort?.() ?? ctx.config.port;
|
|
17
|
+
const authorized = ctx.sessionControl?.canMutateLocalDesktop?.(ctx.req,
|
|
18
|
+
livePort === ctx.config.port ? ctx.config : { ...ctx.config, port: livePort });
|
|
19
|
+
return localDesktopBrowser(ctx) && authorized
|
|
20
|
+
? null : jsonResponse({ error: "desktop_authorization_required" }, 403);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export async function handleDesktopAuthorization(ctx: ManagementContext): Promise<Response | null> {
|
|
24
|
+
if (ctx.url.pathname !== DESKTOP_AUTHORIZATION_PATH) return null;
|
|
25
|
+
if (ctx.req.method === "GET") return jsonResponse({ ok: true,
|
|
26
|
+
supported: localDesktopBrowser(ctx), authorized: requireDesktopAuthorization(ctx) === null,
|
|
27
|
+
rememberedSession: ctx.guiSessionIssuance === "remembered-admin" });
|
|
28
|
+
if (ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
29
|
+
// A remembered-admin session is the durable admin token in a cookie: it proves possession,
|
|
30
|
+
// not that the operator is at this machine. Refuse it here, before the body is read, so the
|
|
31
|
+
// step-up is closed to it by issuance rather than by a downstream record comparison.
|
|
32
|
+
if (!localDesktopBrowser(ctx) || !hasHumanDashboardSession(ctx)
|
|
33
|
+
|| !ctx.sessionControl?.isCurrent(ctx.req, ctx.config)) return jsonResponse({ error: "desktop_authorization_required" }, 403);
|
|
34
|
+
let body: unknown;
|
|
35
|
+
try { body = await readManagementJsonBody(ctx.req); }
|
|
36
|
+
catch (error) { rethrowManagementBodyTooLarge(error); return jsonResponse({ error: "invalid_json" }, 400); }
|
|
37
|
+
if (!body || typeof body !== "object" || Array.isArray(body) || Object.keys(body).length !== 1
|
|
38
|
+
|| !("grant" in body) || typeof body.grant !== "string") return jsonResponse({ error: "invalid_request" }, 400);
|
|
39
|
+
return localDesktopBrowser(ctx) && ctx.sessionControl?.authorizeLocalDesktop?.(ctx.req, ctx.config, body.grant)
|
|
40
|
+
? jsonResponse({ ok: true, authorized: true }) : jsonResponse({ error: "desktop_authorization_required" }, 403);
|
|
41
|
+
}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
import { jsonResponse } from "../auth-cors";
|
|
2
2
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
3
3
|
import type { ManagementContext } from "./context";
|
|
4
|
-
import { isAuthorizedDesktopCompatibilityMutation } from "./desktop-compatibility-authorization";
|
|
5
4
|
import type { DesktopCertificateService } from "../../codex/desktop-compatibility/certificate-service";
|
|
5
|
+
import { handleDesktopAuthorization, requireDesktopAuthorization } from "./desktop-authorization";
|
|
6
6
|
|
|
7
7
|
const PATH = "/api/codex/desktop-compatibility/certificate";
|
|
8
8
|
let service: DesktopCertificateService | undefined;
|
|
9
9
|
|
|
10
10
|
export async function handleDesktopCompatibilityRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
11
|
+
const authorization = await handleDesktopAuthorization(ctx); if (authorization) return authorization;
|
|
11
12
|
if (ctx.url.pathname !== PATH) return null;
|
|
12
13
|
if (ctx.req.method !== "GET" && ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
13
|
-
//
|
|
14
|
-
// This
|
|
15
|
-
if (ctx.req.method === "POST"
|
|
16
|
-
return jsonResponse({ error: "local_dashboard_confirmation_required" }, 403);
|
|
17
|
-
}
|
|
14
|
+
// Fresh private-home Desktop authority precedes persisted key or CurrentUser Root mutations.
|
|
15
|
+
// This remains an owner-write boundary, not protection against arbitrary same-user code.
|
|
16
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
18
17
|
let action: "prepare" | "trust" | "remove-trust" | "renew" | undefined, fingerprint: string | undefined;
|
|
19
18
|
if (ctx.req.method === "POST") {
|
|
20
19
|
let body: unknown;
|
|
@@ -31,13 +30,15 @@ export async function handleDesktopCompatibilityRoutes(ctx: ManagementContext):
|
|
|
31
30
|
if (action === "prepare" && value.fingerprint !== undefined) return jsonResponse({ error: "unexpected_fingerprint" }, 400);
|
|
32
31
|
fingerprint = value.fingerprint as string | undefined;
|
|
33
32
|
}
|
|
34
|
-
const
|
|
33
|
+
const module = ctx.deps.desktopCertificateService || service ? null : await import("../../codex/desktop-compatibility/certificate-service");
|
|
34
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
35
|
+
const controller = ctx.deps.desktopCertificateService ?? (service ??= module!.createDesktopCertificateService());
|
|
35
36
|
try {
|
|
36
37
|
const status = action === "prepare" ? await controller.prepare()
|
|
37
38
|
: action === "trust" ? await controller.trust(fingerprint!)
|
|
38
39
|
: action === "renew" ? await controller.renew(fingerprint!)
|
|
39
40
|
: action === "remove-trust" ? await controller.removeTrust(fingerprint!) : await controller.status();
|
|
40
|
-
return jsonResponse({ ok: true, certificate: { ...status, mutationAuthorized:
|
|
41
|
+
return jsonResponse({ ok: true, certificate: { ...status, mutationAuthorized: requireDesktopAuthorization(ctx) === null } });
|
|
41
42
|
} catch (error) {
|
|
42
43
|
const code = error && typeof error === "object" && "code" in error ? String(error.code) : "operation_failed";
|
|
43
44
|
const allowed = new Set(["unsupported", "busy", "not_prepared", "fingerprint_changed", "app_running", "runtime_running", "app_state_unknown", "trust_unknown", "trust_not_applied",
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { jsonResponse } from "../auth-cors";
|
|
2
2
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
3
3
|
import type { ManagementContext } from "./context";
|
|
4
|
-
import { isAuthorizedDesktopCompatibilityMutation } from "./desktop-compatibility-authorization";
|
|
5
4
|
import type { DesktopCompatibilityRuntime } from "../../codex/desktop-compatibility/runtime";
|
|
5
|
+
import { requireDesktopAuthorization } from "./desktop-authorization";
|
|
6
6
|
|
|
7
7
|
const PATH = "/api/codex/desktop-compatibility/runtime";
|
|
8
8
|
const ERROR_CODES = new Set(["busy", "unsupported", "test_environment", "stopping", "build_unverified", "egress_proxy_invalid",
|
|
@@ -12,7 +12,7 @@ const ERROR_CODES = new Set(["busy", "unsupported", "test_environment", "stoppin
|
|
|
12
12
|
export async function handleDesktopCompatibilityRuntimeRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
13
13
|
if (ctx.url.pathname !== PATH) return null;
|
|
14
14
|
if (ctx.req.method !== "GET" && ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
15
|
-
if (ctx.req.method === "POST"
|
|
15
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
16
16
|
let action: "start" | "stop" | "observe" | "apply" | "launch" | undefined;
|
|
17
17
|
if (ctx.req.method === "POST") {
|
|
18
18
|
let body: unknown;
|
|
@@ -26,6 +26,7 @@ export async function handleDesktopCompatibilityRuntimeRoutes(ctx: ManagementCon
|
|
|
26
26
|
action = value.action as typeof action;
|
|
27
27
|
}
|
|
28
28
|
const module = ctx.deps.desktopCompatibilityRuntime ? null : await import("../../codex/desktop-compatibility/service");
|
|
29
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
29
30
|
const service: DesktopCompatibilityRuntime = ctx.deps.desktopCompatibilityRuntime ?? module!.getDesktopCompatibilityRuntime();
|
|
30
31
|
if (module) ctx.deps.onDesktopCompatibilityShutdown?.(module.shutdownDesktopCompatibility);
|
|
31
32
|
try {
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { jsonResponse } from "../auth-cors";
|
|
2
2
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
3
3
|
import type { ManagementContext } from "./context";
|
|
4
|
-
import {
|
|
4
|
+
import { requireDesktopAuthorization } from "./desktop-authorization";
|
|
5
5
|
|
|
6
6
|
const PATH = "/api/codex/desktop-compatibility/settings";
|
|
7
7
|
export async function handleDesktopCompatibilitySettingsRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
8
8
|
if (ctx.url.pathname !== PATH) return null;
|
|
9
9
|
if (ctx.req.method !== "GET" && ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
10
|
-
if (ctx.req.method === "POST"
|
|
10
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
11
11
|
let update: { startOnProxyStart: boolean; revision: string } | undefined;
|
|
12
12
|
if (ctx.req.method === "POST") {
|
|
13
13
|
let body: unknown;
|
|
@@ -19,7 +19,9 @@ export async function handleDesktopCompatibilitySettingsRoutes(ctx: ManagementCo
|
|
|
19
19
|
|| typeof value.startOnProxyStart !== "boolean" || typeof value.revision !== "string" || !/^[a-f0-9]{64}$/.test(value.revision)) return jsonResponse({ error: "invalid_request" }, 400);
|
|
20
20
|
update = { startOnProxyStart: value.startOnProxyStart, revision: value.revision };
|
|
21
21
|
}
|
|
22
|
-
const
|
|
22
|
+
const module = ctx.deps.desktopStartupSettings ? null : await import("../../codex/desktop-compatibility/startup-settings");
|
|
23
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
24
|
+
const service = ctx.deps.desktopStartupSettings ?? module!.createDesktopStartupSettings({ liveConfig: ctx.config });
|
|
23
25
|
try { return jsonResponse({ ok: true, settings: update ? service.set(update.startOnProxyStart, update.revision) : service.status() }); }
|
|
24
26
|
catch (error) {
|
|
25
27
|
const code = error instanceof Error ? error.message.replace(/^desktop_compatibility_settings_/, "") : "operation_unconfirmed";
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Home-only file integration writes under route intent: the dashboard toggle, an integration
|
|
3
|
+
* restore and every Aside profile change. Each is the Home's own decision. Before it writes, a
|
|
4
|
+
* linked Home refuses an unreadable route-intent.json and saves every default its Children inherit
|
|
5
|
+
* (src/routing/home-route-intent.ts), so the write cannot move one. Afterwards, once the Home uses
|
|
6
|
+
* route intent, the result is recorded as a `devices.home` entry so `ocx sync` keeps it; that entry
|
|
7
|
+
* is the Home's own row and never a default a Child inherits. A Home with no link saves no default,
|
|
8
|
+
* and when its route-intent.json cannot be read it records nothing either: `ocx sync` cannot read
|
|
9
|
+
* that file, so it cannot undo the write.
|
|
10
|
+
*/
|
|
11
|
+
import { readConfigDiagnostics } from "../../config";
|
|
12
|
+
import { isRouteClientId, type RouteClientIntent } from "../../link/route-intent";
|
|
13
|
+
import { captureRefusal, homeHasLinks } from "../../routing/home-route-capture";
|
|
14
|
+
import { deriveHomeAsideIntent, HomeAsideIntentDerivationError, initializeHomeRouteIntentDefaults, recordHomeAsideDecision } from "../../routing/home-route-intent";
|
|
15
|
+
import { homeRouteIntentInUse, readRouteIntentState, recordHomeFileIntegrationDecision, routeIntentStatePath, RouteIntentStateUnreadableError } from "../../routing/route-intent-state";
|
|
16
|
+
import type { OcxConfig } from "../../types";
|
|
17
|
+
import { jsonResponse } from "../auth-cors";
|
|
18
|
+
import type { ManagementContext } from "./context";
|
|
19
|
+
|
|
20
|
+
const ASIDE_UNRESOLVED = "Existing Aside ownership could not be resolved to stable userIds, so this Home decision could not be kept by ocx sync; nothing was changed. Repair the Aside accounts.json manifest and its stable userIds, or choose an explicit Home Aside intent with ocx route to aside on|off --device home, then retry.";
|
|
21
|
+
|
|
22
|
+
function durableConfig(config: OcxConfig): OcxConfig {
|
|
23
|
+
const latest = readConfigDiagnostics();
|
|
24
|
+
return latest.source === "file" && !latest.error ? latest.config : config;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** On a Home with no link an unreadable route-intent.json means there is nothing this write may record. */
|
|
28
|
+
function unlinkedUnreadableState(): boolean {
|
|
29
|
+
if (homeHasLinks()) return false;
|
|
30
|
+
try { readRouteIntentState(); return false; }
|
|
31
|
+
catch (error) {
|
|
32
|
+
if (error instanceof RouteIntentStateUnreadableError) return true;
|
|
33
|
+
throw error;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function refusal(ctx: ManagementContext, clientId: string | undefined, error: unknown): Response {
|
|
38
|
+
const client = clientId === undefined ? {} : { clientId };
|
|
39
|
+
if (error instanceof HomeAsideIntentDerivationError) {
|
|
40
|
+
return jsonResponse({ error: ASIDE_UNRESOLVED, code: "route_intent_aside_unresolved", ...client }, 409, ctx.req, ctx.config);
|
|
41
|
+
}
|
|
42
|
+
if (error instanceof RouteIntentStateUnreadableError) {
|
|
43
|
+
return jsonResponse({ error: error.message, code: "route_intent_unavailable", ...client }, 500, ctx.req, ctx.config);
|
|
44
|
+
}
|
|
45
|
+
const refused = captureRefusal(error);
|
|
46
|
+
return jsonResponse({ error: refused.message, code: "route_intent_unavailable", ...client, retryable: refused.retryable },
|
|
47
|
+
refused.retryable ? 409 : 500, ctx.req, ctx.config);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Runs before the write; a refusal means nothing changed. `asideEnabling` names the Aside profiles
|
|
52
|
+
* the write may enable, so one without a stable userId refuses now instead of after the write.
|
|
53
|
+
*/
|
|
54
|
+
export function prepareHomeIntegrationDecision(ctx: ManagementContext, clientId: string | undefined,
|
|
55
|
+
asideEnabling?: readonly number[] | "all"): Response | null {
|
|
56
|
+
try {
|
|
57
|
+
if (unlinkedUnreadableState()) return null;
|
|
58
|
+
readRouteIntentState();
|
|
59
|
+
// The durable config already carries the switches another process may have changed; the live
|
|
60
|
+
// one is never cloned here (it can hold runtime-only values).
|
|
61
|
+
initializeHomeRouteIntentDefaults(durableConfig(ctx.config), ctx.version, undefined, { whenLinked: true });
|
|
62
|
+
if (asideEnabling !== undefined && homeRouteIntentInUse(readRouteIntentState())) {
|
|
63
|
+
deriveHomeAsideIntent(durableConfig(ctx.config), { extraProfileIds: asideEnabling });
|
|
64
|
+
}
|
|
65
|
+
return null;
|
|
66
|
+
} catch (error) {
|
|
67
|
+
return refusal(ctx, clientId, error);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* Runs after a successful write and returns the response to send. A file client's decision is
|
|
73
|
+
* `intent`; Aside's is derived from the profiles the Home owns now.
|
|
74
|
+
*/
|
|
75
|
+
export function recordHomeIntegrationDecision(ctx: ManagementContext, clientId: string, success: Response,
|
|
76
|
+
intent?: () => RouteClientIntent): Response {
|
|
77
|
+
try {
|
|
78
|
+
if (unlinkedUnreadableState()) return success;
|
|
79
|
+
if (clientId === "aside") recordHomeAsideDecision(durableConfig(ctx.config));
|
|
80
|
+
else if (isRouteClientId(clientId) && intent) recordHomeFileIntegrationDecision(clientId, intent());
|
|
81
|
+
return success;
|
|
82
|
+
} catch (error) {
|
|
83
|
+
const reason = error instanceof HomeAsideIntentDerivationError
|
|
84
|
+
? "its Aside profiles could not be named by stable userIds"
|
|
85
|
+
: `route intent in ${routeIntentStatePath()} could not record it`;
|
|
86
|
+
return jsonResponse({ error: `The ${clientId} integration was changed, but ${reason}, so ocx sync may undo it. Inspect it, fix or remove it, then make the change again.`,
|
|
87
|
+
code: "route_intent_unavailable", clientId, integrationChanged: true }, 500, ctx.req, ctx.config);
|
|
88
|
+
}
|
|
89
|
+
}
|