@bitkyc08/opencodex 2.100.2 → 2.100.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/client/connect.ts
CHANGED
|
@@ -2,23 +2,27 @@ import { createHash } from "node:crypto";
|
|
|
2
2
|
import {
|
|
3
3
|
existsSync,
|
|
4
4
|
lstatSync,
|
|
5
|
+
mkdirSync,
|
|
5
6
|
readFileSync,
|
|
6
7
|
unlinkSync,
|
|
7
8
|
} from "node:fs";
|
|
8
9
|
import { hostname } from "node:os";
|
|
10
|
+
import { dirname } from "node:path";
|
|
9
11
|
import { atomicWriteFile, loadConfig, withConfigMutationLockSync } from "../config";
|
|
12
|
+
import { getConfigDir, withConfigDirHardeningSettled } from "../config/paths";
|
|
10
13
|
import { claudeDesktopIntegrationEnabledNow } from "../codex/desired-state";
|
|
11
14
|
import { siblingOfLivePort, siblingSkipMessage } from "../codex/sibling-start";
|
|
12
15
|
import {
|
|
13
|
-
inspectRemoteDesktopStore, readDesktopDisconnectReceipt, writeDesktopDisconnectReceipt,
|
|
16
|
+
inspectRemoteDesktopStore, readDesktopDisconnectReceipt, writeDesktopDisconnectReceipt, removeDesktopDisconnectReceipt,
|
|
14
17
|
replaceRemoteDesktopCredential, restoreRemoteDesktopStore, finishRemoteDesktopCleanup,
|
|
15
18
|
type DesktopDisconnectReceipt, type DesktopRemoteOwner, type DesktopStoreResult,
|
|
16
19
|
} from "../claude/desktop-remote-store";
|
|
17
20
|
import {
|
|
18
|
-
withClientLifecycle, withClientLifecycleSync,
|
|
21
|
+
withClientDisconnectAttempt, withClientLifecycle, withClientLifecycleSync,
|
|
19
22
|
type ClientLifecycleHeld, type ClientLifecycleLockDeps,
|
|
20
23
|
} from "./lifecycle-lock";
|
|
21
24
|
import { invalidateCodexModelsCache, invalidateCodexModelsCacheWithPermit } from "../codex/catalog/sync";
|
|
25
|
+
import { desktopLifecycleRefusal } from "./desktop-refusal";
|
|
22
26
|
import { withCatalogWriteSerialization } from "../codex/catalog-write-serialization";
|
|
23
27
|
import {
|
|
24
28
|
injectCodexConfig,
|
|
@@ -28,9 +32,13 @@ import {
|
|
|
28
32
|
type CodexRoutingTarget,
|
|
29
33
|
} from "../codex/inject";
|
|
30
34
|
import {
|
|
35
|
+
JOURNAL_PATH,
|
|
36
|
+
adoptJournalForClient,
|
|
37
|
+
journalHandoverIncomplete,
|
|
31
38
|
journalOwner,
|
|
32
39
|
restoreJournalState,
|
|
33
40
|
} from "../codex/journal";
|
|
41
|
+
import { readCodexHomeJournal } from "../codex/codex-home-owner";
|
|
34
42
|
import { DEFAULT_CATALOG_PATH, getCodexHome } from "../codex/paths";
|
|
35
43
|
import {
|
|
36
44
|
readServiceApiTokenState,
|
|
@@ -76,7 +84,7 @@ import {
|
|
|
76
84
|
} from "./state";
|
|
77
85
|
import { assertClientCatalogCompatible, type CatalogCompatibilityDeps } from "./catalog-compatibility";
|
|
78
86
|
import {
|
|
79
|
-
assertClientSyncExpectation, ClientSyncExpectationError, isClientSyncLockBusy, type ClientSyncExpectation,
|
|
87
|
+
assertClientSyncExpectation, assertDisconnectLinkExpectation, ClientSyncExpectationError, isClientSyncLockBusy, type ClientSyncExpectation,
|
|
80
88
|
} from "./sync-expectation";
|
|
81
89
|
import { overlayHomeCodexSettings } from "../link/codex-settings";
|
|
82
90
|
import {
|
|
@@ -94,9 +102,17 @@ import {
|
|
|
94
102
|
type LinkHomeDeps,
|
|
95
103
|
} from "./link-home";
|
|
96
104
|
import { hubStateCachePath } from "./hub-state";
|
|
97
|
-
import { ClientLinkStateError, clearClientLinkState, readClientLinkState } from "./link-state";
|
|
105
|
+
import { ClientLinkStateError, clearClientLinkState, readChildLinkMarker, readClientLinkState } from "./link-state";
|
|
98
106
|
import { isLinkPort } from "../link/ports";
|
|
99
|
-
import { clientSyncRuntimeGuard, ClientSyncRuntimeError } from "./sync-runtime";
|
|
107
|
+
import { assertRouteIntentPort, clientSyncRuntimeGuard, ClientSyncRuntimeError } from "./sync-runtime";
|
|
108
|
+
import { prepareConnectedRouteIntent, initialConnectRouteIntent, connectedRouteSelectedClients, applyConnectedRouteIntent } from "../integrations/route-intent-connected";
|
|
109
|
+
import { clearRouteIntentReceipt, clearRouteIntentUnappliedProof, readRouteIntentReceiptStrict, writeRouteIntentUnappliedProof } from "../integrations/route-intent-state";
|
|
110
|
+
import type { RouteIntentReceipt } from "../integrations/route-intent-contract";
|
|
111
|
+
import { clearHomeRouteIntentRecord } from "./link-home";
|
|
112
|
+
import { clearInitialRouteIntent, recordInitialRouteIntent } from "../integrations/route-intent-initial";
|
|
113
|
+
import { cleanupConnectedRouteIntent } from "../integrations/route-intent-disconnect";
|
|
114
|
+
import { nativeIntentOriginalsPath, readNativeIntentOriginals, restoreNativeIntentOriginals } from "./route-intent-native-originals";
|
|
115
|
+
import { clearFileIntentOriginals } from "./route-intent-file-originals";
|
|
100
116
|
|
|
101
117
|
class RotationRecoveryRequiredError extends Error {
|
|
102
118
|
constructor(message: string, options?: ErrorOptions) {
|
|
@@ -110,6 +126,8 @@ export interface ConnectOptions {
|
|
|
110
126
|
managementUrl?: string;
|
|
111
127
|
credential: OneTimeConnectCredential | LinkClientCredential;
|
|
112
128
|
selectedClients: OcxConnectedClientId[];
|
|
129
|
+
/** Provisioning selection retained until Home revises that client's device policy. */
|
|
130
|
+
selectedClientsExplicit?: boolean;
|
|
113
131
|
managementTransport: "direct" | "relay";
|
|
114
132
|
transport?: "hub" | "link";
|
|
115
133
|
link?: { tunnelPort: number; linkId: string };
|
|
@@ -454,7 +472,10 @@ async function rotateConnectedClientKeyHeld(
|
|
|
454
472
|
const desktop = inspectRemoteDesktopStore(desktopOwner(connection));
|
|
455
473
|
if (["conflict", "unsafe", "pending"].includes(desktop.kind)) throw new Error("desktop_lifecycle_recovery_required");
|
|
456
474
|
// Establish legacy fallback ownership and reject edited projections BEFORE hub issuance.
|
|
457
|
-
|
|
475
|
+
// The remote Desktop store writes under the config root with required ACLs, so it admits
|
|
476
|
+
// after overlapping config-root ACL work (#7815); a timeout here refuses before the hub.
|
|
477
|
+
const unchanged = connection;
|
|
478
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => alignDesktopCredential(held, unchanged, current.fingerprint, current));
|
|
458
479
|
withConfigMutationLockSync(() => {
|
|
459
480
|
assertClientConnectionUnchanged(connection!);
|
|
460
481
|
const orphan = readTokenBackupState();
|
|
@@ -486,7 +507,10 @@ async function rotateConnectedClientKeyHeld(
|
|
|
486
507
|
assertRotationCandidates(connection!, current.fingerprint, current.fingerprint);
|
|
487
508
|
return replaceServiceApiTokenFile(rotation.key);
|
|
488
509
|
});
|
|
489
|
-
|
|
510
|
+
// Still before the hub commit: an admission timeout takes the ordinary rollback below.
|
|
511
|
+
const marking = connection;
|
|
512
|
+
await withConfigDirHardeningSettled(getConfigDir(), () =>
|
|
513
|
+
alignDesktopCredential(held, marking, current.fingerprint, { token: rotation.key, fingerprint: replacement.fingerprint }));
|
|
490
514
|
if (!await probeClientKeyId(connection.serverUrl, rotation.key, connection.apiKeyId, { fetchImpl: deps.fetchImpl })) {
|
|
491
515
|
throw new Error("new client key admission probe was refused");
|
|
492
516
|
}
|
|
@@ -605,7 +629,9 @@ async function connectClientUnlocked(
|
|
|
605
629
|
let priorCatalog: CatalogSnapshot | null = null;
|
|
606
630
|
let writtenCatalogFingerprint: string | null = null;
|
|
607
631
|
let injectionCommitted = false;
|
|
632
|
+
let restoreNativeIntent = false;
|
|
608
633
|
let committed = false;
|
|
634
|
+
let initialSelectionWritten = false;
|
|
609
635
|
// Before any catalog, journal, client-state or credential write: `CODEX_HOME` is shared with the
|
|
610
636
|
// live proxy a sibling instance runs beside, and connecting re-points it (`sibling-start.ts`).
|
|
611
637
|
if (siblingOfLivePort() !== null) throw new Error(siblingSkipMessage());
|
|
@@ -636,6 +662,7 @@ async function connectClientUnlocked(
|
|
|
636
662
|
// Only link mode needs the local port before the hub is contacted; hub mode keeps reading config
|
|
637
663
|
// after the catalog download, so its stderr order (catalog refusal first) is unchanged.
|
|
638
664
|
const earlyConfig = linkMode ? loadConfig() : undefined;
|
|
665
|
+
if (earlyConfig) assertRouteIntentPort(earlyConfig.port);
|
|
639
666
|
if (earlyConfig && (!Number.isInteger(earlyConfig.port) || earlyConfig.port < 1 || earlyConfig.port > 65535)) {
|
|
640
667
|
throw new Error("link mode requires a valid local config port");
|
|
641
668
|
}
|
|
@@ -721,37 +748,62 @@ async function connectClientUnlocked(
|
|
|
721
748
|
assertClientCatalogCompatible(catalog.body, deps.catalogCompatibility);
|
|
722
749
|
writtenCatalogFingerprint = withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
723
750
|
assertActiveConnectingState(persisted.fingerprint);
|
|
751
|
+
mkdirSync(dirname(DEFAULT_CATALOG_PATH), { recursive: true });
|
|
724
752
|
atomicWriteFile(DEFAULT_CATALOG_PATH, catalog.body);
|
|
725
753
|
return sha256(catalog.body);
|
|
726
754
|
}), deps.lifecycleLockDeps);
|
|
727
755
|
|
|
728
756
|
const config = earlyConfig ?? loadConfig();
|
|
757
|
+
const routeIntent = initialConnectRouteIntent(linkMode && linkMetadata
|
|
758
|
+
? await prepareConnectedRouteIntent({ transport: "link", link: linkMetadata, apiKeyId }, admissionToken, deps.linkHome,
|
|
759
|
+
() => assertActiveConnectingState(persisted.fingerprint)) : undefined,
|
|
760
|
+
options.selectedClients, options.selectedClientsExplicit);
|
|
761
|
+
const selectedClients = connectedRouteSelectedClients(routeIntent, options.selectedClients);
|
|
729
762
|
const target = routingTarget(serverUrl, linkMode ? config.port : undefined, config);
|
|
730
763
|
// A link Child writes the Home's OpenCodex-owned Codex settings, not its own (#6957). A read
|
|
731
764
|
// that fails here keeps the local values; the next `ocx sync` applies the Home's.
|
|
732
765
|
// Read only: the record is written after the connection commits, so a rollback leaves none.
|
|
733
|
-
const homeSettings = linkMode && linkMetadata &&
|
|
766
|
+
const homeSettings = linkMode && linkMetadata && selectedClients.includes("codex")
|
|
734
767
|
? await fetchHomeCodexSettings({ transport: "link", link: linkMetadata, apiKeyId }, admissionToken, deps.linkHome)
|
|
735
768
|
: undefined;
|
|
736
769
|
const injectConfig = {
|
|
737
770
|
...(homeSettings?.kind === "fresh" ? overlayHomeCodexSettings(config, homeSettings.document.settings) : config),
|
|
738
771
|
syncResumeHistory: false,
|
|
739
772
|
};
|
|
740
|
-
const
|
|
773
|
+
const beforeCodexWrite = () => {
|
|
774
|
+
assertActiveConnectingState(persisted.fingerprint);
|
|
775
|
+
if (routeIntent && (!connectedRouteSelectedClients(routeIntent, options.selectedClients).includes("codex")
|
|
776
|
+
|| loadConfig().port !== config.port)) throw new Error("Codex route intent or runtime changed; retry connect");
|
|
777
|
+
};
|
|
778
|
+
if (!options.noSync && routeIntent && selectedClients.includes("codex") && existsSync(getCodexHome())) {
|
|
779
|
+
const { persistNativeRouteIntent } = await import("./route-intent-apply");
|
|
780
|
+
// Armed before publication: the write-ahead originals record can exist even when the
|
|
781
|
+
// config write or its bookkeeping throws, and rollback must still put the field back.
|
|
782
|
+
restoreNativeIntent = true;
|
|
783
|
+
withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
784
|
+
beforeCodexWrite();
|
|
785
|
+
// Home intent owns a selected installed client, including a standalone OFF. Keep
|
|
786
|
+
// compensation field-scoped: a failed enrollment restores the recorded standalone
|
|
787
|
+
// value, keeps a later edit by the person, and keeps disjoint config changes.
|
|
788
|
+
persistNativeRouteIntent("codex", true, beforeCodexWrite, injectConfig, true);
|
|
789
|
+
}), deps.lifecycleLockDeps);
|
|
790
|
+
}
|
|
791
|
+
const preflight = !selectedClients.includes("codex") || (routeIntent && !existsSync(getCodexHome()))
|
|
792
|
+
? { success: true, message: "Codex is not selected or installed" } : await injectCodexConfig(config.port, injectConfig, {
|
|
741
793
|
validateOnly: true,
|
|
742
794
|
routingTarget: target,
|
|
743
795
|
catalogPath: DEFAULT_CATALOG_PATH,
|
|
744
796
|
journalOwner: { kind: "client", apiKeyId },
|
|
745
|
-
beforeClientWrite:
|
|
797
|
+
beforeClientWrite: beforeCodexWrite,
|
|
746
798
|
});
|
|
747
799
|
if (!preflight.success) throw new Error(preflight.message);
|
|
748
800
|
|
|
749
|
-
if (!options.noSync &&
|
|
801
|
+
if (!options.noSync && selectedClients.includes("codex") && (!routeIntent || existsSync(getCodexHome()))) {
|
|
750
802
|
const injected = await injectCodexConfig(config.port, injectConfig, {
|
|
751
803
|
routingTarget: target,
|
|
752
804
|
catalogPath: DEFAULT_CATALOG_PATH,
|
|
753
805
|
journalOwner: { kind: "client", apiKeyId },
|
|
754
|
-
beforeClientWrite:
|
|
806
|
+
beforeClientWrite: beforeCodexWrite,
|
|
755
807
|
});
|
|
756
808
|
if (!injected.success || injected.status === "skipped") throw new Error(injected.message);
|
|
757
809
|
injectionCommitted = true;
|
|
@@ -763,7 +815,7 @@ async function connectClientUnlocked(
|
|
|
763
815
|
serverUrl,
|
|
764
816
|
managementUrl,
|
|
765
817
|
managementTransport: options.managementTransport,
|
|
766
|
-
selectedClients: [...
|
|
818
|
+
selectedClients: [...selectedClients],
|
|
767
819
|
tokenEnv: "OPENCODEX_API_AUTH_TOKEN",
|
|
768
820
|
apiKeyId,
|
|
769
821
|
tokenFingerprint: persisted.fingerprint,
|
|
@@ -779,10 +831,34 @@ async function connectClientUnlocked(
|
|
|
779
831
|
};
|
|
780
832
|
withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
781
833
|
assertActiveConnectingState(persisted.fingerprint);
|
|
834
|
+
if (linkMetadata && options.selectedClientsExplicit) {
|
|
835
|
+
recordInitialRouteIntent(linkMetadata.linkId, routeIntent?.document, options.selectedClients);
|
|
836
|
+
initialSelectionWritten = true;
|
|
837
|
+
}
|
|
838
|
+
// No route apply has begun for this connection; the first one removes this proof.
|
|
839
|
+
if (linkMetadata) writeRouteIntentUnappliedProof(linkMetadata.linkId, connection.connectedAt);
|
|
782
840
|
clearClientConnectPending(persisted.fingerprint);
|
|
783
841
|
commitClientConnection(connection);
|
|
784
842
|
committed = true;
|
|
785
843
|
}), deps.lifecycleLockDeps);
|
|
844
|
+
// Only now does the routing belong to this connection: take over a journal another owner wrote
|
|
845
|
+
// (src/codex/journal.ts adoptJournalForClient). A failure keeps the connection; sync retries.
|
|
846
|
+
if (injectionCommitted) {
|
|
847
|
+
try {
|
|
848
|
+
const adoption = adoptJournalForClient(apiKeyId, () => {
|
|
849
|
+
// Under the Codex lock: still this committed connection (same owner and link) and its
|
|
850
|
+
// token, or write nothing. The stored record is normalized, so identity is compared.
|
|
851
|
+
assertNoClientDisconnectPending();
|
|
852
|
+
const current = readClientConnectionState();
|
|
853
|
+
if (current.kind !== "connected" || !sameClientConnectionOwner(current.value, connection)
|
|
854
|
+
|| current.value.link?.linkId !== connection.link?.linkId) throw new Error("client_connection_changed");
|
|
855
|
+
const token = readServiceApiTokenState();
|
|
856
|
+
if (token.kind !== "present" || token.fingerprint !== connection.tokenFingerprint) throw new Error("client_token_changed");
|
|
857
|
+
});
|
|
858
|
+
if (journalHandoverIncomplete(adoption)) console.warn(FOREIGN_JOURNAL_WARNING);
|
|
859
|
+
}
|
|
860
|
+
catch { console.warn("Warning: the Codex journal could not be handed to this connection; run 'ocx sync' so a supervised restart keeps Codex routing."); }
|
|
861
|
+
}
|
|
786
862
|
// Recorded only when the injection that applied it ran (not with --no-sync). The connection is
|
|
787
863
|
// already committed, so a failed record write must not reach the rollback below: it is a
|
|
788
864
|
// warning, and `ocx status` reports no recorded apply until `ocx sync` writes one.
|
|
@@ -795,6 +871,25 @@ async function connectClientUnlocked(
|
|
|
795
871
|
console.warn("Warning: the Home's Codex settings were applied, but the apply record was not written; run 'ocx sync' to record it.");
|
|
796
872
|
}
|
|
797
873
|
}
|
|
874
|
+
if (!options.noSync && routeIntent) {
|
|
875
|
+
// The connection is committed: nothing from here on may reach the enrollment rollback below,
|
|
876
|
+
// including a lifecycle lock another operation holds now or a connection it already changed.
|
|
877
|
+
// Either one leaves the route apply to the next sync, which reconciles the current connection.
|
|
878
|
+
try {
|
|
879
|
+
const appliedConnection = withClientLifecycleSync(() => {
|
|
880
|
+
const current = readClientConnectionState();
|
|
881
|
+
if (current.kind !== "connected" || !Bun.deepEquals(current.value, connection, true)) throw new Error("client_connection_changed");
|
|
882
|
+
return current.value;
|
|
883
|
+
}, deps.lifecycleLockDeps);
|
|
884
|
+
await applyConnectedRouteIntent(connection, admissionToken, routeIntent, {
|
|
885
|
+
codexApplied: injectionCommitted, lifecycleLockDeps: deps.lifecycleLockDeps, beforeWrite: () => {
|
|
886
|
+
deps.signal?.throwIfAborted(); assertClientConnectionUnchanged(appliedConnection);
|
|
887
|
+
const token = readServiceApiTokenState();
|
|
888
|
+
if (token.kind !== "present" || token.fingerprint !== connection.tokenFingerprint) throw new Error("client_token_changed");
|
|
889
|
+
},
|
|
890
|
+
}, deps.linkHome);
|
|
891
|
+
} catch { console.warn("Warning: local route intent needs reconciliation; run 'ocx route to sync'."); }
|
|
892
|
+
}
|
|
798
893
|
return connection;
|
|
799
894
|
} catch (error) {
|
|
800
895
|
const rollbackFailures: string[] = [];
|
|
@@ -805,10 +900,27 @@ async function connectClientUnlocked(
|
|
|
805
900
|
try {
|
|
806
901
|
withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
807
902
|
assertNoClientDisconnectPending();
|
|
903
|
+
if (initialSelectionWritten && !committed && linkMetadata) {
|
|
904
|
+
try { clearInitialRouteIntent(linkMetadata.linkId); }
|
|
905
|
+
catch { rollbackFailures.push("initial route selection rollback unavailable"); }
|
|
906
|
+
}
|
|
907
|
+
// Bound to a connection that never committed, so it could never match; remove it anyway.
|
|
908
|
+
if (!committed && linkMetadata) { try { clearRouteIntentUnappliedProof(); } catch { /* matches nothing */ } }
|
|
909
|
+
let nativeRestoreFailed = false;
|
|
910
|
+
if (restoreNativeIntent && !committed && pendingConnectFingerprint) {
|
|
911
|
+
const fingerprint = pendingConnectFingerprint;
|
|
912
|
+
try { restoreNativeIntentOriginals(() => assertConnectingState(fingerprint)); }
|
|
913
|
+
catch {
|
|
914
|
+
// Like disconnect, keep the token (and the marker proving it is this attempt's) until the
|
|
915
|
+
// standalone switches are back; ocx disconnect finishes this rollback.
|
|
916
|
+
nativeRestoreFailed = true;
|
|
917
|
+
rollbackFailures.push(`Standalone native switches were not restored, so the enrollment token was kept. Repair the config or ${nativeIntentOriginalsPath()}, then run ocx disconnect to finish the rollback.`);
|
|
918
|
+
}
|
|
919
|
+
}
|
|
808
920
|
if (priorCatalog && writtenCatalogFingerprint && !restoreCatalogSnapshot(priorCatalog, writtenCatalogFingerprint)) {
|
|
809
921
|
rollbackFailures.push("catalog rollback did not match the written artifact");
|
|
810
922
|
}
|
|
811
|
-
if (pendingConnectFingerprint) {
|
|
923
|
+
if (pendingConnectFingerprint && !nativeRestoreFailed) {
|
|
812
924
|
const removed = removeServiceApiTokenFileIfOwned(pendingConnectFingerprint);
|
|
813
925
|
if (removed === "changed") rollbackFailures.push("service token changed during rollback");
|
|
814
926
|
// Final commit may fail after this attempt already cleared its marker under the same lock.
|
|
@@ -839,6 +951,7 @@ async function connectClientUnlocked(
|
|
|
839
951
|
}
|
|
840
952
|
|
|
841
953
|
export interface ConnectedSyncResult {
|
|
954
|
+
routeIntent?: RouteIntentReceipt;
|
|
842
955
|
catalogWritten: boolean;
|
|
843
956
|
cacheSynced: boolean;
|
|
844
957
|
injected: boolean;
|
|
@@ -848,6 +961,8 @@ export interface ConnectedSyncResult {
|
|
|
848
961
|
appliedRecord?: HomeCodexSettingsRecord;
|
|
849
962
|
/** The Home's settings were injected but their record could not be written (OCX-6). */
|
|
850
963
|
applyRecordFailed?: true;
|
|
964
|
+
/** Routing was injected but the Codex journal stayed with its previous owner; sync again. */
|
|
965
|
+
journalHandoverFailed?: true;
|
|
851
966
|
/**
|
|
852
967
|
* The connection this sync ran under, read inside its lock and compare-and-swapped on every
|
|
853
968
|
* write. Callers decide link-vs-hub wording and restart ownership from this, never from a read
|
|
@@ -858,6 +973,8 @@ export interface ConnectedSyncResult {
|
|
|
858
973
|
|
|
859
974
|
export interface ConnectedSyncOptions {
|
|
860
975
|
restartCodex?: boolean;
|
|
976
|
+
overwriteConflict?: boolean;
|
|
977
|
+
overwriteClient?: import("../link/route-intent").RouteClientId;
|
|
861
978
|
/**
|
|
862
979
|
* #7694: refuse unless this is the connection found under the lock. A mismatch throws
|
|
863
980
|
* `ClientSyncExpectationError` before any request or write.
|
|
@@ -930,17 +1047,21 @@ async function syncConnectedClientUnlocked(
|
|
|
930
1047
|
// with one it cannot. Refusing leaves the connection and the existing catalog exactly as
|
|
931
1048
|
// they were, which is the known-good state.
|
|
932
1049
|
if (downloaded) assertClientCatalogCompatible(downloaded.body, deps.catalogCompatibility);
|
|
1050
|
+
const routeIntent = await prepareConnectedRouteIntent(initial.connection, initial.token.token, deps.linkHome, () => {
|
|
1051
|
+
initial.assertRuntimeCurrent(); assertClientConnectionUnchanged(initial.connection);
|
|
1052
|
+
});
|
|
933
1053
|
const next = withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
934
1054
|
initial.assertRuntimeCurrent();
|
|
935
1055
|
assertClientConnectionUnchanged(initial.connection);
|
|
936
1056
|
const token = readServiceApiTokenState();
|
|
937
1057
|
if (token.kind !== "present" || token.fingerprint !== initial.token.fingerprint) throw new Error("client_token_changed");
|
|
938
|
-
if (!downloaded)
|
|
939
|
-
atomicWriteFile(DEFAULT_CATALOG_PATH, downloaded.body);
|
|
1058
|
+
if (!downloaded) validLocalCatalog();
|
|
1059
|
+
else atomicWriteFile(DEFAULT_CATALOG_PATH, downloaded.body);
|
|
940
1060
|
const updated = {
|
|
941
1061
|
...initial.connection,
|
|
942
|
-
|
|
943
|
-
|
|
1062
|
+
selectedClients: [...connectedRouteSelectedClients(routeIntent, initial.connection.selectedClients)],
|
|
1063
|
+
...(downloaded ? { catalogFingerprint: createHash("sha256").update(downloaded.body).digest("base64url"),
|
|
1064
|
+
catalogSyncedAt: (deps.now ?? (() => new Date()))().toISOString() } : {}),
|
|
944
1065
|
};
|
|
945
1066
|
commitClientConnection(updated);
|
|
946
1067
|
return updated;
|
|
@@ -948,6 +1069,7 @@ async function syncConnectedClientUnlocked(
|
|
|
948
1069
|
// Read-only: injection invokes this while N/C are held. Acquiring L here would invert C→L.
|
|
949
1070
|
const beforeClientWrite = () => {
|
|
950
1071
|
initial.assertRuntimeCurrent();
|
|
1072
|
+
if (isLinkConnection(next)) assertRouteIntentPort(loadConfig().port);
|
|
951
1073
|
assertClientConnectionUnchanged(next);
|
|
952
1074
|
const token = readServiceApiTokenState();
|
|
953
1075
|
if (next.pendingOperation || token.kind !== "present" || token.fingerprint !== next.tokenFingerprint) throw new Error("client_token_changed");
|
|
@@ -957,7 +1079,14 @@ async function syncConnectedClientUnlocked(
|
|
|
957
1079
|
let homeSettings: HomeCodexSettingsSource | undefined;
|
|
958
1080
|
let appliedRecord: HomeCodexSettingsRecord | undefined;
|
|
959
1081
|
let applyRecordFailed = false;
|
|
960
|
-
|
|
1082
|
+
let journalHandoverFailed = false;
|
|
1083
|
+
if (next.selectedClients.includes("codex") && (!routeIntent || existsSync(getCodexHome()))) {
|
|
1084
|
+
const beforeCodexWrite = () => {
|
|
1085
|
+
beforeClientWrite();
|
|
1086
|
+
if (routeIntent && !connectedRouteSelectedClients(routeIntent, next.selectedClients).includes("codex")) {
|
|
1087
|
+
throw new Error("Codex route intent changed; retry sync");
|
|
1088
|
+
}
|
|
1089
|
+
};
|
|
961
1090
|
let config = loadConfig();
|
|
962
1091
|
// #6957: a link Child applies the Home's OpenCodex-owned Codex settings with the catalog.
|
|
963
1092
|
if (isLinkConnection(next)) {
|
|
@@ -971,13 +1100,31 @@ async function syncConnectedClientUnlocked(
|
|
|
971
1100
|
withClientWrite(() => withdrawChangingHomeCodexSettingsRecord(linkId, document));
|
|
972
1101
|
}
|
|
973
1102
|
}
|
|
1103
|
+
// Off persisted false. Reconcile the effective Home intent before the injector rereads
|
|
1104
|
+
// that durable gate, retaining local opt-outs and the owner/runtime/token commit fences.
|
|
1105
|
+
if (routeIntent) {
|
|
1106
|
+
const { persistNativeRouteIntent } = await import("./route-intent-apply");
|
|
1107
|
+
withClientLifecycleSync(() => persistNativeRouteIntent("codex", true, beforeCodexWrite, config, true), deps.lifecycleLockDeps);
|
|
1108
|
+
}
|
|
974
1109
|
const result = await injectCodexConfig(config.port, { ...config, syncResumeHistory: false }, {
|
|
975
1110
|
routingTarget: routingTarget(next.serverUrl, isLinkConnection(next) ? config.port : undefined, config), catalogPath: DEFAULT_CATALOG_PATH,
|
|
976
|
-
journalOwner: { kind: "client", apiKeyId: next.apiKeyId }, beforeClientWrite,
|
|
1111
|
+
journalOwner: { kind: "client", apiKeyId: next.apiKeyId }, beforeClientWrite: beforeCodexWrite,
|
|
977
1112
|
});
|
|
978
1113
|
if (!result.success || result.status === "skipped") throw new Error(result.message);
|
|
979
|
-
injected =
|
|
980
|
-
|
|
1114
|
+
injected = result.configApplied !== false;
|
|
1115
|
+
// An external provider can preserve config.toml without applying even the same Home digest.
|
|
1116
|
+
// Withdraw any previous receipt under the current connection fence before reporting parity.
|
|
1117
|
+
if (!injected && next.link) withClientWrite(clearHomeCodexSettingsRecord);
|
|
1118
|
+
if (injected) {
|
|
1119
|
+
// A committed connection re-injected: own the journal too (retries a takeover connect missed),
|
|
1120
|
+
// under the same connection guard as the injection, so a stale sync claims nothing.
|
|
1121
|
+
try {
|
|
1122
|
+
const adoption = adoptJournalForClient(next.apiKeyId, beforeCodexWrite);
|
|
1123
|
+
// No journal or another client's means the routing is not this connection's to keep.
|
|
1124
|
+
if (journalHandoverIncomplete(adoption)) journalHandoverFailed = true;
|
|
1125
|
+
} catch { journalHandoverFailed = true; }
|
|
1126
|
+
}
|
|
1127
|
+
if (injected && homeSettings && next.link) {
|
|
981
1128
|
const linkId = next.link.linkId;
|
|
982
1129
|
const settings = homeSettings;
|
|
983
1130
|
try {
|
|
@@ -992,6 +1139,9 @@ async function syncConnectedClientUnlocked(
|
|
|
992
1139
|
}
|
|
993
1140
|
}
|
|
994
1141
|
}
|
|
1142
|
+
const routeReceipt = await applyConnectedRouteIntent(next, initial.token.token, routeIntent,
|
|
1143
|
+
{ beforeWrite: beforeClientWrite, codexApplied: injected, lifecycleLockDeps: deps.lifecycleLockDeps,
|
|
1144
|
+
overwriteConflict: options.overwriteConflict, overwriteClient: options.overwriteClient }, deps.linkHome);
|
|
995
1145
|
const cacheSynced = withClientLifecycleSync(() => {
|
|
996
1146
|
// Acquire K before the guarded C commit; never acquire K from inside C.
|
|
997
1147
|
const owningHome = getCodexHome();
|
|
@@ -1001,10 +1151,12 @@ async function syncConnectedClientUnlocked(
|
|
|
1001
1151
|
return result.kind === "completed" && result.value;
|
|
1002
1152
|
}, deps.lifecycleLockDeps);
|
|
1003
1153
|
return {
|
|
1004
|
-
catalogWritten: downloaded !== undefined, cacheSynced, injected, stale,
|
|
1154
|
+
catalogWritten: downloaded !== undefined, cacheSynced, injected, stale: stale || routeReceipt?.catalogPending === true || routeIntent?.stale === true,
|
|
1005
1155
|
...(homeSettings ? { homeSettings } : {}),
|
|
1006
1156
|
...(appliedRecord ? { appliedRecord } : {}),
|
|
1007
1157
|
...(applyRecordFailed ? { applyRecordFailed } : {}),
|
|
1158
|
+
...(routeReceipt ? { routeIntent: routeReceipt } : {}),
|
|
1159
|
+
...(journalHandoverFailed ? { journalHandoverFailed: true as const } : {}),
|
|
1008
1160
|
connection: next,
|
|
1009
1161
|
};
|
|
1010
1162
|
}
|
|
@@ -1046,6 +1198,8 @@ function disconnectAtLeast(receipt: DesktopDisconnectReceipt, phase: DesktopDisc
|
|
|
1046
1198
|
return DISCONNECT_PHASES.indexOf(receipt.phase) >= DISCONNECT_PHASES.indexOf(phase);
|
|
1047
1199
|
}
|
|
1048
1200
|
|
|
1201
|
+
const FOREIGN_JOURNAL_WARNING = "Warning: the Codex journal belongs to an earlier connection, so the next OpenCodex restart restores native Codex routing. After that restart, run 'ocx sync --restart-codex' to point Codex at this connection again.";
|
|
1202
|
+
|
|
1049
1203
|
function catalogIsRecordedPrior(connection: OcxClientConnectionConfig, snapshot: CatalogSnapshot): boolean {
|
|
1050
1204
|
return snapshot.kind === "file" && !!connection.priorCatalog
|
|
1051
1205
|
&& snapshot.fingerprint === sha256(Buffer.from(connection.priorCatalog, "base64").toString("utf8"));
|
|
@@ -1069,30 +1223,193 @@ function verifyDisconnectCatalog(receipt: DesktopDisconnectReceipt): void {
|
|
|
1069
1223
|
}
|
|
1070
1224
|
}
|
|
1071
1225
|
|
|
1072
|
-
function restoreConnectedCodex(connection: OcxClientConnectionConfig):
|
|
1073
|
-
|
|
1074
|
-
const owner = journalOwner();
|
|
1226
|
+
function restoreConnectedCodex(connection: OcxClientConnectionConfig, receipt: DesktopDisconnectReceipt, recoverConfig = false): string | undefined {
|
|
1227
|
+
const inspection = readCodexHomeJournal(JOURNAL_PATH);
|
|
1228
|
+
const owner = journalOwner({ readOnly: true });
|
|
1229
|
+
const explicitOwner = inspection.kind === "read" ? inspection.journal.owner as Record<string, unknown> | undefined : undefined;
|
|
1230
|
+
const invalidOwner = explicitOwner !== undefined && (!explicitOwner || typeof explicitOwner !== "object" || Array.isArray(explicitOwner)
|
|
1231
|
+
|| !(explicitOwner.kind === "client" && typeof explicitOwner.apiKeyId === "string" && explicitOwner.apiKeyId.length > 0
|
|
1232
|
+
|| explicitOwner.kind === "process" && typeof explicitOwner.pid === "number" && Number.isSafeInteger(explicitOwner.pid) && explicitOwner.pid > 0));
|
|
1233
|
+
if (inspection.kind === "unknown" || invalidOwner || (inspection.kind === "read" && owner === null)) {
|
|
1234
|
+
throw new Error("disconnect refused: Codex journal ownership is unknown; journal and connection credentials were retained");
|
|
1235
|
+
}
|
|
1236
|
+
// Deselection records desired state, not completed cleanup. A failed off still leaves
|
|
1237
|
+
// this client's journal to drain; an unrelated process journal grants no such authority.
|
|
1238
|
+
if (!connection.selectedClients.includes("codex") && owner?.kind !== "client") {
|
|
1239
|
+
if (inspection.kind === "missing" && isCodexRoutingInjected()) {
|
|
1240
|
+
throw new Error("disconnect refused: Codex routing is injected but no journal records the original state");
|
|
1241
|
+
}
|
|
1242
|
+
return;
|
|
1243
|
+
}
|
|
1075
1244
|
if (owner && owner.kind === "client" && owner.apiKeyId !== connection.apiKeyId) {
|
|
1076
1245
|
throw new Error("disconnect refused: Codex journal ownership conflicts with the connected key");
|
|
1077
1246
|
}
|
|
1078
1247
|
if (owner !== null) {
|
|
1079
|
-
|
|
1248
|
+
const restored = restoreJournalState({ preserveConfigEdits: true,
|
|
1249
|
+
...(recoverConfig ? { recoverConfigForClient: connection.apiKeyId } : {}),
|
|
1250
|
+
beforeWrite: () => {
|
|
1251
|
+
const state = readClientConnectionState(), currentReceipt = readDesktopDisconnectReceipt();
|
|
1252
|
+
const token = readServiceApiTokenState();
|
|
1253
|
+
if (state.kind !== "connected" || JSON.stringify(state.value) !== JSON.stringify(connection)
|
|
1254
|
+
|| currentReceipt.kind !== "valid" || JSON.stringify(currentReceipt.value) !== JSON.stringify(receipt)
|
|
1255
|
+
|| token.kind !== "present" || token.fingerprint !== receipt.tokenFingerprint) throw new Error("client_disconnect_owner_changed");
|
|
1256
|
+
},
|
|
1257
|
+
});
|
|
1258
|
+
if (!restored.complete) throw new Error(
|
|
1259
|
+
"disconnect refused: Codex journal restore was partial; journal and connection credentials were retained. "
|
|
1260
|
+
+ "Retry 'ocx disconnect --recover-config --yes' to privately back up current Codex config/profile and restore only evidenced OCX-owned fields (retain --keep-catalog if originally requested). "
|
|
1261
|
+
+ "Unknown ownership and edited or unverified profiles remain refused.",
|
|
1262
|
+
);
|
|
1263
|
+
return restored.recoveryBackupDir;
|
|
1080
1264
|
} else if (isCodexRoutingInjected()) {
|
|
1081
1265
|
throw new Error("disconnect refused: Codex routing is injected but no journal records the original state");
|
|
1082
1266
|
}
|
|
1083
1267
|
}
|
|
1084
1268
|
|
|
1269
|
+
/**
|
|
1270
|
+
* Abort a disconnect that failed before its commit point.
|
|
1271
|
+
*
|
|
1272
|
+
* Until `desktop_restored` the receipt records intent only, so removing it returns the Child to a plain
|
|
1273
|
+
* connected state; left in place it made every client start refuse with client_disconnect_pending
|
|
1274
|
+
* until someone moved the folder aside by hand. A receipt this attempt wrote is removed outright:
|
|
1275
|
+
* D excludes other disconnects and every Desktop writer refuses while it exists. A receipt an
|
|
1276
|
+
* earlier run left (including one stuck by an older release) is removed only while the Desktop
|
|
1277
|
+
* store shows no restore has started; that run may have stopped inside the Desktop restore before
|
|
1278
|
+
* it could record desktop_restored, and then the receipt is the gate a retry needs.
|
|
1279
|
+
*
|
|
1280
|
+
* On a link Child the route-intent drain runs before the Codex restore, so by then the file
|
|
1281
|
+
* integrations the link routed may already be off. That is not undone here: the connection stays,
|
|
1282
|
+
* and the runtime's next route-intent apply turns them back on, as it does after any Home change.
|
|
1283
|
+
*/
|
|
1284
|
+
function abortPreparedDisconnect(
|
|
1285
|
+
prepared: { receipt: DesktopDisconnectReceipt; created: boolean; connection: OcxClientConnectionConfig | null },
|
|
1286
|
+
error: unknown,
|
|
1287
|
+
deps: Pick<ClientConnectDeps, "lifecycleLockDeps">,
|
|
1288
|
+
): Error {
|
|
1289
|
+
const base = error instanceof Error ? error.message : String(error);
|
|
1290
|
+
let outcome: "removed" | "desktop_started";
|
|
1291
|
+
try {
|
|
1292
|
+
outcome = withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1293
|
+
if (!prepared.created && !UNTOUCHED_DESKTOP.has(inspectRemoteDesktopStore(prepared.receipt.owner).kind)) return "desktop_started" as const;
|
|
1294
|
+
removeDesktopDisconnectReceipt(held, prepared.receipt);
|
|
1295
|
+
return "removed" as const;
|
|
1296
|
+
}), deps.lifecycleLockDeps);
|
|
1297
|
+
} catch {
|
|
1298
|
+
return new Error(`${base}. The disconnect receipt could not be rolled back; run ocx disconnect again to finish it or roll it back.`, { cause: error });
|
|
1299
|
+
}
|
|
1300
|
+
const drained = prepared.connection?.transport === "link"
|
|
1301
|
+
? " File integrations this link routed may already be off; the runtime's next route-intent apply turns them back on." : "";
|
|
1302
|
+
return new Error(outcome === "removed"
|
|
1303
|
+
? `${base}. The disconnect was rolled back: this Child is still connected and its runtime can start.${drained}`
|
|
1304
|
+
: `${base}. A Claude Desktop restore had already started under this disconnect, so its receipt was kept; once the cause above is fixed, run ocx disconnect again to finish it.`, { cause: error });
|
|
1305
|
+
}
|
|
1306
|
+
|
|
1307
|
+
/** Desktop store states an interrupted disconnect cannot have produced: no restore has begun. */
|
|
1308
|
+
const UNTOUCHED_DESKTOP: ReadonlySet<string> = new Set(["absent", "active", "legacy_current_connection"]);
|
|
1309
|
+
|
|
1310
|
+
/**
|
|
1311
|
+
* `ocx disconnect --expect-link <id>`: refuse unless this machine is connected to that link (the same
|
|
1312
|
+
* check `ocx sync --expect-link` makes), read-only under the client lifecycle and config locks. A Home's
|
|
1313
|
+
* delayed revoke of an old link then cannot disconnect a newer one. Throws ClientSyncExpectationError.
|
|
1314
|
+
*/
|
|
1315
|
+
export function assertDisconnectExpectation(linkId: string, deps: Pick<ClientConnectDeps, "lifecycleLockDeps"> = {}): void {
|
|
1316
|
+
withClientLifecycleSync(() => withConfigMutationLockSync(() => assertHomeInitiatedDisconnect(linkId)), deps.lifecycleLockDeps);
|
|
1317
|
+
}
|
|
1318
|
+
|
|
1319
|
+
/**
|
|
1320
|
+
* The link expectation, then the Home-initiated check: a Home sends --expect-link only for Home-initiated links, and
|
|
1321
|
+
* a client-initiated one needs the client-link teardown that path skips. Its sidecar, or the marker that survives a
|
|
1322
|
+
* lost sidecar, naming this link refuses it (client_initiated_link); an unreadable sidecar or marker refuses too.
|
|
1323
|
+
* When this link's own unfinished disconnect is on record (the expectation let it resume), the refusal says
|
|
1324
|
+
* disconnect_pending instead: an earlier attempt may have cleaned part of the Child, and the Home must count the
|
|
1325
|
+
* cleanup as attempted. Read-only; the caller holds the client lifecycle and config mutation locks.
|
|
1326
|
+
*/
|
|
1327
|
+
function assertHomeInitiatedDisconnect(linkId: string): void {
|
|
1328
|
+
assertDisconnectLinkExpectation(linkId);
|
|
1329
|
+
let reason: "client_initiated_link" | "invalid_state" | null;
|
|
1330
|
+
// An unreadable sidecar or marker refuses as invalid_state: it proves nothing about who joined.
|
|
1331
|
+
try {
|
|
1332
|
+
const marker = readChildLinkMarker();
|
|
1333
|
+
reason = marker.kind === "unreadable" ? "invalid_state"
|
|
1334
|
+
: readClientLinkState()?.linkId === linkId || (marker.kind === "link" && marker.linkId === linkId) ? "client_initiated_link" : null;
|
|
1335
|
+
} catch { reason = "invalid_state"; }
|
|
1336
|
+
if (!reason) return;
|
|
1337
|
+
const receipt = readDesktopDisconnectReceipt();
|
|
1338
|
+
throw new ClientSyncExpectationError({ kind: "link", linkId }, receipt.kind === "valid" && receipt.value.phase !== "complete" ? "disconnect_pending" : reason);
|
|
1339
|
+
}
|
|
1340
|
+
|
|
1341
|
+
/**
|
|
1342
|
+
* A disconnected machine with no unfinished disconnect can still hold the standalone native
|
|
1343
|
+
* switches an interrupted or failed enrollment displaced, and the token that enrollment kept
|
|
1344
|
+
* because it could not restore them. Plain `ocx disconnect` restores the switches, then removes
|
|
1345
|
+
* that token only while the pending-connect marker proves it is the enrollment's own.
|
|
1346
|
+
* `ocx disconnect --orphaned-token` never touches the record.
|
|
1347
|
+
*/
|
|
1348
|
+
function drainLoneNativeIntentOriginals(lifecycleLockDeps?: ClientLifecycleLockDeps): {
|
|
1349
|
+
restored: true; tokenRemoved: boolean; catalogRemoved: false; catalogRestored: false; apiKeyId: string; restartRequired: false; nativeIntentOnly: true;
|
|
1350
|
+
} | null {
|
|
1351
|
+
const refused = (error: unknown) => new Error(`disconnect refused: the standalone native switches recorded in ${nativeIntentOriginalsPath()} were not restored (${error instanceof Error ? error.message : String(error)}). Repair the config or that record (remove it only after setting the switches by hand), then rerun ocx disconnect.`);
|
|
1352
|
+
return withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
1353
|
+
const read = readDesktopDisconnectReceipt();
|
|
1354
|
+
if (read.kind === "unsafe" || (read.kind === "valid" && read.value.phase !== "complete")) return null;
|
|
1355
|
+
if (readClientConnectionState().kind !== "disconnected") return null;
|
|
1356
|
+
let present: boolean;
|
|
1357
|
+
try { present = readNativeIntentOriginals() !== null; } catch (error) { throw refused(error); }
|
|
1358
|
+
if (!present) return null;
|
|
1359
|
+
try {
|
|
1360
|
+
restoreNativeIntentOriginals(() => {
|
|
1361
|
+
assertNoClientDisconnectPending();
|
|
1362
|
+
if (readClientConnectionState().kind !== "disconnected") throw new Error("client_connection_changed");
|
|
1363
|
+
});
|
|
1364
|
+
} catch (error) { throw refused(error); }
|
|
1365
|
+
const token = readServiceApiTokenState();
|
|
1366
|
+
let tokenRemoved = false;
|
|
1367
|
+
if (token.kind === "present" && pendingClientConnectMayOwnToken(token.fingerprint)) {
|
|
1368
|
+
const removed = removeServiceApiTokenFileIfOwned(token.fingerprint);
|
|
1369
|
+
if (removed === "changed") throw new Error("client_token_changed");
|
|
1370
|
+
tokenRemoved = removed === "removed";
|
|
1371
|
+
clearClientConnectPending(token.fingerprint);
|
|
1372
|
+
}
|
|
1373
|
+
return { restored: true, tokenRemoved, catalogRemoved: false, catalogRestored: false, apiKeyId: "", restartRequired: false, nativeIntentOnly: true };
|
|
1374
|
+
}), lifecycleLockDeps);
|
|
1375
|
+
}
|
|
1376
|
+
|
|
1085
1377
|
export async function disconnectClient(
|
|
1086
|
-
options:
|
|
1378
|
+
options: Parameters<typeof disconnectClientAttempt>[0] = {},
|
|
1379
|
+
deps: Pick<ClientConnectDeps, "lifecycleLockDeps"> = {},
|
|
1380
|
+
): ReturnType<typeof disconnectClientAttempt> {
|
|
1381
|
+
// The attempt lock is a file under the config directory: wait for parent ACL admission first,
|
|
1382
|
+
// as every other phase does, so nothing is created under a directory still being hardened.
|
|
1383
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => undefined);
|
|
1384
|
+
return withClientDisconnectAttempt(() => disconnectClientAttempt(options, deps), deps.lifecycleLockDeps);
|
|
1385
|
+
}
|
|
1386
|
+
|
|
1387
|
+
async function disconnectClientAttempt(
|
|
1388
|
+
options: { keepCatalog?: boolean; expectedOwner?: DesktopRemoteOwner; expectLink?: string; recoverConfig?: boolean } = {},
|
|
1087
1389
|
deps: Pick<ClientConnectDeps, "lifecycleLockDeps"> = {},
|
|
1088
1390
|
): Promise<{
|
|
1089
1391
|
restored: boolean; tokenRemoved: boolean; catalogRemoved: boolean; catalogRestored: boolean; apiKeyId: string;
|
|
1090
1392
|
desktopRestoration?: "owned_projection" | "standard_fallback" | "selection_preserved";
|
|
1091
1393
|
restartRequired: boolean;
|
|
1394
|
+
recoveryBackupDir?: string;
|
|
1395
|
+
/** Only standalone native switches an interrupted enrollment displaced were restored. */
|
|
1396
|
+
nativeIntentOnly?: true;
|
|
1092
1397
|
}> {
|
|
1093
1398
|
if (siblingOfLivePort() !== null) throw new Error(siblingSkipMessage());
|
|
1399
|
+
// A link-bound disconnect changes nothing on a machine that is not connected to that link, so it never drains here.
|
|
1400
|
+
if (!options.expectedOwner && options.expectLink === undefined) {
|
|
1401
|
+
// It restores config-root switches under the lifecycle lock, so it admits after overlapping
|
|
1402
|
+
// config-root ACL work like both phases below (#7815).
|
|
1403
|
+
const drained = await withConfigDirHardeningSettled(getConfigDir(), () => drainLoneNativeIntentOriginals(deps.lifecycleLockDeps));
|
|
1404
|
+
if (drained) return drained;
|
|
1405
|
+
}
|
|
1094
1406
|
const keepCatalog = options.keepCatalog === true;
|
|
1095
|
-
|
|
1407
|
+
// Both phases write the disconnect receipt and the remote Desktop store under the config root
|
|
1408
|
+
// with required ACLs, so each admits after overlapping config-root ACL work (#7815). A timeout
|
|
1409
|
+
// before phase 1 writes nothing; one before phase 2 leaves the prepared receipt it resumes from.
|
|
1410
|
+
const prepared = await withConfigDirHardeningSettled(getConfigDir(), () => withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1411
|
+
// Checked first, under the same locks, before anything is read for writing or written.
|
|
1412
|
+
if (options.expectLink !== undefined) assertHomeInitiatedDisconnect(options.expectLink);
|
|
1096
1413
|
const read = readDesktopDisconnectReceipt();
|
|
1097
1414
|
if (read.kind === "unsafe") throw new Error("client_disconnect_receipt_unsafe");
|
|
1098
1415
|
const state = readClientConnectionState();
|
|
@@ -1102,6 +1419,7 @@ export async function disconnectClient(
|
|
|
1102
1419
|
throw new Error("client_disconnect_expected_owner_changed");
|
|
1103
1420
|
}
|
|
1104
1421
|
let receipt = previous;
|
|
1422
|
+
let created = false;
|
|
1105
1423
|
let connection: OcxClientConnectionConfig | null = null;
|
|
1106
1424
|
if (state.kind === "connected") {
|
|
1107
1425
|
connection = state.value;
|
|
@@ -1118,25 +1436,35 @@ export async function disconnectClient(
|
|
|
1118
1436
|
}
|
|
1119
1437
|
if (!receipt) {
|
|
1120
1438
|
const desktop = inspectRemoteDesktopStore(desktopOwner(connection));
|
|
1121
|
-
if (desktop.kind === "unsafe" || desktop.kind === "conflict") throw new Error(
|
|
1439
|
+
if (desktop.kind === "unsafe" || desktop.kind === "conflict") throw new Error(desktopLifecycleRefusal(desktop));
|
|
1122
1440
|
preflightDisconnectCatalog(connection, keepCatalog);
|
|
1123
1441
|
receipt = { version: 1, owner: desktopOwner(connection), tokenFingerprint: connection.tokenFingerprint, keepCatalog, phase: "prepared" };
|
|
1124
1442
|
writeDesktopDisconnectReceipt(held, previous, receipt);
|
|
1443
|
+
created = true;
|
|
1125
1444
|
}
|
|
1126
1445
|
} else if (state.kind !== "disconnected" || !receipt || !disconnectAtLeast(receipt, "clearing_connection")) {
|
|
1127
1446
|
throw new Error("disconnect refused: no recoverable connected state; if this is not a Hub and no admission secret or installed service uses the token, inspect it and use ocx disconnect --orphaned-token --yes");
|
|
1128
1447
|
}
|
|
1129
1448
|
if (!receipt || receipt.keepCatalog !== keepCatalog) throw new Error("client_disconnect_options_changed");
|
|
1130
|
-
return { receipt, connection };
|
|
1131
|
-
}), deps.lifecycleLockDeps);
|
|
1449
|
+
return { receipt, connection, created };
|
|
1450
|
+
}), deps.lifecycleLockDeps));
|
|
1132
1451
|
|
|
1452
|
+
// This sibling step owns only file integrations; failures retain the prepared receipt/token.
|
|
1453
|
+
if (prepared.connection?.transport === "link" && !disconnectAtLeast(prepared.receipt, "desktop_restored")) {
|
|
1454
|
+
// It writes the route receipt and file integrations under the config root, so it admits after
|
|
1455
|
+
// overlapping config-root ACL work like both disconnect phases (#7815).
|
|
1456
|
+
const connection = prepared.connection;
|
|
1457
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => cleanupConnectedRouteIntent(connection, prepared.receipt, deps.lifecycleLockDeps, options.recoverConfig === true));
|
|
1458
|
+
}
|
|
1133
1459
|
// The prepared receipt blocks even a sync queued for its actual N/C injection commit.
|
|
1134
1460
|
// Codex-only restore MUST stay outside L; it never invokes Desktop cleanup.
|
|
1461
|
+
let recoveryBackupDir: string | undefined;
|
|
1135
1462
|
if (prepared.connection && !disconnectAtLeast(prepared.receipt, "desktop_restored")) {
|
|
1136
|
-
restoreConnectedCodex(prepared.connection);
|
|
1463
|
+
try { recoveryBackupDir = restoreConnectedCodex(prepared.connection, prepared.receipt, options.recoverConfig === true); }
|
|
1464
|
+
catch (error) { throw abortPreparedDisconnect(prepared, error, deps); }
|
|
1137
1465
|
}
|
|
1138
1466
|
|
|
1139
|
-
return withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1467
|
+
return withConfigDirHardeningSettled(getConfigDir(), () => withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1140
1468
|
const read = readDesktopDisconnectReceipt();
|
|
1141
1469
|
if (read.kind !== "valid" || JSON.stringify(read.value) !== JSON.stringify(prepared.receipt)) {
|
|
1142
1470
|
throw new Error("client_disconnect_receipt_changed");
|
|
@@ -1185,6 +1513,18 @@ export async function disconnectClient(
|
|
|
1185
1513
|
}
|
|
1186
1514
|
advance("catalog_settled", { catalogAfter: catalogAfterState() });
|
|
1187
1515
|
} else verifyDisconnectCatalog(receipt);
|
|
1516
|
+
if (connection?.transport === "link" && !disconnectAtLeast(receipt, "removing_token")) {
|
|
1517
|
+
if (connection.link) clearInitialRouteIntent(connection.link.linkId);
|
|
1518
|
+
clearHomeRouteIntentRecord();
|
|
1519
|
+
// Its clients were restored by the route cleanup above, which phase gating never reruns.
|
|
1520
|
+
clearFileIntentOriginals();
|
|
1521
|
+
if (readRouteIntentReceiptStrict()?.linkId === connection.link?.linkId) clearRouteIntentReceipt();
|
|
1522
|
+
clearRouteIntentUnappliedProof();
|
|
1523
|
+
}
|
|
1524
|
+
// Standalone native switches come back before the token that displaced them is removed.
|
|
1525
|
+
// The record is machine-scoped, so any transport drains one a crashed enrollment left.
|
|
1526
|
+
// The locks and the receipt checked above already fence this; a retry is idempotent.
|
|
1527
|
+
if (!disconnectAtLeast(receipt, "removing_token")) restoreNativeIntentOriginals(() => {});
|
|
1188
1528
|
if (!disconnectAtLeast(receipt, "removing_token")) advance("removing_token");
|
|
1189
1529
|
const tokenRemoval = removeServiceApiTokenFileIfOwned(receipt.tokenFingerprint);
|
|
1190
1530
|
if (tokenRemoval === "changed") throw new Error("client_token_changed");
|
|
@@ -1208,12 +1548,13 @@ export async function disconnectClient(
|
|
|
1208
1548
|
requireDesktopResult(finishRemoteDesktopCleanup(held, receipt.owner));
|
|
1209
1549
|
if (receipt.phase !== "complete") advance("complete");
|
|
1210
1550
|
return {
|
|
1551
|
+
...(recoveryBackupDir ? { recoveryBackupDir } : {}),
|
|
1211
1552
|
restored: true, tokenRemoved: tokenRemoval === "removed",
|
|
1212
1553
|
catalogRemoved: !keepCatalog, catalogRestored: !keepCatalog && receipt.catalogAfter?.kind === "file",
|
|
1213
1554
|
apiKeyId: receipt.owner.apiKeyId, restartRequired: desktop.restartRequired,
|
|
1214
1555
|
...(desktop.restoration ? { desktopRestoration: desktop.restoration } : {}),
|
|
1215
1556
|
};
|
|
1216
|
-
}), deps.lifecycleLockDeps);
|
|
1557
|
+
}), deps.lifecycleLockDeps));
|
|
1217
1558
|
}
|
|
1218
1559
|
|
|
1219
1560
|
/**
|