@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
package/src/client/connect.ts
CHANGED
|
@@ -2,11 +2,14 @@ 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 {
|
|
@@ -28,9 +31,13 @@ import {
|
|
|
28
31
|
type CodexRoutingTarget,
|
|
29
32
|
} from "../codex/inject";
|
|
30
33
|
import {
|
|
34
|
+
JOURNAL_PATH,
|
|
35
|
+
adoptJournalForClient,
|
|
36
|
+
journalHandoverIncomplete,
|
|
31
37
|
journalOwner,
|
|
32
38
|
restoreJournalState,
|
|
33
39
|
} from "../codex/journal";
|
|
40
|
+
import { readCodexHomeJournal } from "../codex/codex-home-owner";
|
|
34
41
|
import { DEFAULT_CATALOG_PATH, getCodexHome } from "../codex/paths";
|
|
35
42
|
import {
|
|
36
43
|
readServiceApiTokenState,
|
|
@@ -76,7 +83,7 @@ import {
|
|
|
76
83
|
} from "./state";
|
|
77
84
|
import { assertClientCatalogCompatible, type CatalogCompatibilityDeps } from "./catalog-compatibility";
|
|
78
85
|
import {
|
|
79
|
-
assertClientSyncExpectation, ClientSyncExpectationError, isClientSyncLockBusy, type ClientSyncExpectation,
|
|
86
|
+
assertClientSyncExpectation, assertDisconnectLinkExpectation, ClientSyncExpectationError, isClientSyncLockBusy, type ClientSyncExpectation,
|
|
80
87
|
} from "./sync-expectation";
|
|
81
88
|
import { overlayHomeCodexSettings } from "../link/codex-settings";
|
|
82
89
|
import {
|
|
@@ -94,9 +101,17 @@ import {
|
|
|
94
101
|
type LinkHomeDeps,
|
|
95
102
|
} from "./link-home";
|
|
96
103
|
import { hubStateCachePath } from "./hub-state";
|
|
97
|
-
import { ClientLinkStateError, clearClientLinkState, readClientLinkState } from "./link-state";
|
|
104
|
+
import { ClientLinkStateError, clearClientLinkState, readChildLinkMarker, readClientLinkState } from "./link-state";
|
|
98
105
|
import { isLinkPort } from "../link/ports";
|
|
99
|
-
import { clientSyncRuntimeGuard, ClientSyncRuntimeError } from "./sync-runtime";
|
|
106
|
+
import { assertRouteIntentPort, clientSyncRuntimeGuard, ClientSyncRuntimeError } from "./sync-runtime";
|
|
107
|
+
import { prepareConnectedRouteIntent, initialConnectRouteIntent, connectedRouteSelectedClients, applyConnectedRouteIntent } from "../integrations/route-intent-connected";
|
|
108
|
+
import { clearRouteIntentReceipt, clearRouteIntentUnappliedProof, readRouteIntentReceiptStrict, writeRouteIntentUnappliedProof } from "../integrations/route-intent-state";
|
|
109
|
+
import type { RouteIntentReceipt } from "../integrations/route-intent-contract";
|
|
110
|
+
import { clearHomeRouteIntentRecord } from "./link-home";
|
|
111
|
+
import { clearInitialRouteIntent, recordInitialRouteIntent } from "../integrations/route-intent-initial";
|
|
112
|
+
import { cleanupConnectedRouteIntent } from "../integrations/route-intent-disconnect";
|
|
113
|
+
import { nativeIntentOriginalsPath, readNativeIntentOriginals, restoreNativeIntentOriginals } from "./route-intent-native-originals";
|
|
114
|
+
import { clearFileIntentOriginals } from "./route-intent-file-originals";
|
|
100
115
|
|
|
101
116
|
class RotationRecoveryRequiredError extends Error {
|
|
102
117
|
constructor(message: string, options?: ErrorOptions) {
|
|
@@ -110,6 +125,8 @@ export interface ConnectOptions {
|
|
|
110
125
|
managementUrl?: string;
|
|
111
126
|
credential: OneTimeConnectCredential | LinkClientCredential;
|
|
112
127
|
selectedClients: OcxConnectedClientId[];
|
|
128
|
+
/** Provisioning selection retained until Home revises that client's device policy. */
|
|
129
|
+
selectedClientsExplicit?: boolean;
|
|
113
130
|
managementTransport: "direct" | "relay";
|
|
114
131
|
transport?: "hub" | "link";
|
|
115
132
|
link?: { tunnelPort: number; linkId: string };
|
|
@@ -454,7 +471,10 @@ async function rotateConnectedClientKeyHeld(
|
|
|
454
471
|
const desktop = inspectRemoteDesktopStore(desktopOwner(connection));
|
|
455
472
|
if (["conflict", "unsafe", "pending"].includes(desktop.kind)) throw new Error("desktop_lifecycle_recovery_required");
|
|
456
473
|
// Establish legacy fallback ownership and reject edited projections BEFORE hub issuance.
|
|
457
|
-
|
|
474
|
+
// The remote Desktop store writes under the config root with required ACLs, so it admits
|
|
475
|
+
// after overlapping config-root ACL work (#7815); a timeout here refuses before the hub.
|
|
476
|
+
const unchanged = connection;
|
|
477
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => alignDesktopCredential(held, unchanged, current.fingerprint, current));
|
|
458
478
|
withConfigMutationLockSync(() => {
|
|
459
479
|
assertClientConnectionUnchanged(connection!);
|
|
460
480
|
const orphan = readTokenBackupState();
|
|
@@ -486,7 +506,10 @@ async function rotateConnectedClientKeyHeld(
|
|
|
486
506
|
assertRotationCandidates(connection!, current.fingerprint, current.fingerprint);
|
|
487
507
|
return replaceServiceApiTokenFile(rotation.key);
|
|
488
508
|
});
|
|
489
|
-
|
|
509
|
+
// Still before the hub commit: an admission timeout takes the ordinary rollback below.
|
|
510
|
+
const marking = connection;
|
|
511
|
+
await withConfigDirHardeningSettled(getConfigDir(), () =>
|
|
512
|
+
alignDesktopCredential(held, marking, current.fingerprint, { token: rotation.key, fingerprint: replacement.fingerprint }));
|
|
490
513
|
if (!await probeClientKeyId(connection.serverUrl, rotation.key, connection.apiKeyId, { fetchImpl: deps.fetchImpl })) {
|
|
491
514
|
throw new Error("new client key admission probe was refused");
|
|
492
515
|
}
|
|
@@ -605,7 +628,9 @@ async function connectClientUnlocked(
|
|
|
605
628
|
let priorCatalog: CatalogSnapshot | null = null;
|
|
606
629
|
let writtenCatalogFingerprint: string | null = null;
|
|
607
630
|
let injectionCommitted = false;
|
|
631
|
+
let restoreNativeIntent = false;
|
|
608
632
|
let committed = false;
|
|
633
|
+
let initialSelectionWritten = false;
|
|
609
634
|
// Before any catalog, journal, client-state or credential write: `CODEX_HOME` is shared with the
|
|
610
635
|
// live proxy a sibling instance runs beside, and connecting re-points it (`sibling-start.ts`).
|
|
611
636
|
if (siblingOfLivePort() !== null) throw new Error(siblingSkipMessage());
|
|
@@ -636,6 +661,7 @@ async function connectClientUnlocked(
|
|
|
636
661
|
// Only link mode needs the local port before the hub is contacted; hub mode keeps reading config
|
|
637
662
|
// after the catalog download, so its stderr order (catalog refusal first) is unchanged.
|
|
638
663
|
const earlyConfig = linkMode ? loadConfig() : undefined;
|
|
664
|
+
if (earlyConfig) assertRouteIntentPort(earlyConfig.port);
|
|
639
665
|
if (earlyConfig && (!Number.isInteger(earlyConfig.port) || earlyConfig.port < 1 || earlyConfig.port > 65535)) {
|
|
640
666
|
throw new Error("link mode requires a valid local config port");
|
|
641
667
|
}
|
|
@@ -721,37 +747,62 @@ async function connectClientUnlocked(
|
|
|
721
747
|
assertClientCatalogCompatible(catalog.body, deps.catalogCompatibility);
|
|
722
748
|
writtenCatalogFingerprint = withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
723
749
|
assertActiveConnectingState(persisted.fingerprint);
|
|
750
|
+
mkdirSync(dirname(DEFAULT_CATALOG_PATH), { recursive: true });
|
|
724
751
|
atomicWriteFile(DEFAULT_CATALOG_PATH, catalog.body);
|
|
725
752
|
return sha256(catalog.body);
|
|
726
753
|
}), deps.lifecycleLockDeps);
|
|
727
754
|
|
|
728
755
|
const config = earlyConfig ?? loadConfig();
|
|
756
|
+
const routeIntent = initialConnectRouteIntent(linkMode && linkMetadata
|
|
757
|
+
? await prepareConnectedRouteIntent({ transport: "link", link: linkMetadata, apiKeyId }, admissionToken, deps.linkHome,
|
|
758
|
+
() => assertActiveConnectingState(persisted.fingerprint)) : undefined,
|
|
759
|
+
options.selectedClients, options.selectedClientsExplicit);
|
|
760
|
+
const selectedClients = connectedRouteSelectedClients(routeIntent, options.selectedClients);
|
|
729
761
|
const target = routingTarget(serverUrl, linkMode ? config.port : undefined, config);
|
|
730
762
|
// A link Child writes the Home's OpenCodex-owned Codex settings, not its own (#6957). A read
|
|
731
763
|
// that fails here keeps the local values; the next `ocx sync` applies the Home's.
|
|
732
764
|
// Read only: the record is written after the connection commits, so a rollback leaves none.
|
|
733
|
-
const homeSettings = linkMode && linkMetadata &&
|
|
765
|
+
const homeSettings = linkMode && linkMetadata && selectedClients.includes("codex")
|
|
734
766
|
? await fetchHomeCodexSettings({ transport: "link", link: linkMetadata, apiKeyId }, admissionToken, deps.linkHome)
|
|
735
767
|
: undefined;
|
|
736
768
|
const injectConfig = {
|
|
737
769
|
...(homeSettings?.kind === "fresh" ? overlayHomeCodexSettings(config, homeSettings.document.settings) : config),
|
|
738
770
|
syncResumeHistory: false,
|
|
739
771
|
};
|
|
740
|
-
const
|
|
772
|
+
const beforeCodexWrite = () => {
|
|
773
|
+
assertActiveConnectingState(persisted.fingerprint);
|
|
774
|
+
if (routeIntent && (!connectedRouteSelectedClients(routeIntent, options.selectedClients).includes("codex")
|
|
775
|
+
|| loadConfig().port !== config.port)) throw new Error("Codex route intent or runtime changed; retry connect");
|
|
776
|
+
};
|
|
777
|
+
if (!options.noSync && routeIntent && selectedClients.includes("codex") && existsSync(getCodexHome())) {
|
|
778
|
+
const { persistNativeRouteIntent } = await import("./route-intent-apply");
|
|
779
|
+
// Armed before publication: the write-ahead originals record can exist even when the
|
|
780
|
+
// config write or its bookkeeping throws, and rollback must still put the field back.
|
|
781
|
+
restoreNativeIntent = true;
|
|
782
|
+
withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
783
|
+
beforeCodexWrite();
|
|
784
|
+
// Home intent owns a selected installed client, including a standalone OFF. Keep
|
|
785
|
+
// compensation field-scoped: a failed enrollment restores the recorded standalone
|
|
786
|
+
// value, keeps a later edit by the person, and keeps disjoint config changes.
|
|
787
|
+
persistNativeRouteIntent("codex", true, beforeCodexWrite, injectConfig, true);
|
|
788
|
+
}), deps.lifecycleLockDeps);
|
|
789
|
+
}
|
|
790
|
+
const preflight = !selectedClients.includes("codex") || (routeIntent && !existsSync(getCodexHome()))
|
|
791
|
+
? { success: true, message: "Codex is not selected or installed" } : await injectCodexConfig(config.port, injectConfig, {
|
|
741
792
|
validateOnly: true,
|
|
742
793
|
routingTarget: target,
|
|
743
794
|
catalogPath: DEFAULT_CATALOG_PATH,
|
|
744
795
|
journalOwner: { kind: "client", apiKeyId },
|
|
745
|
-
beforeClientWrite:
|
|
796
|
+
beforeClientWrite: beforeCodexWrite,
|
|
746
797
|
});
|
|
747
798
|
if (!preflight.success) throw new Error(preflight.message);
|
|
748
799
|
|
|
749
|
-
if (!options.noSync &&
|
|
800
|
+
if (!options.noSync && selectedClients.includes("codex") && (!routeIntent || existsSync(getCodexHome()))) {
|
|
750
801
|
const injected = await injectCodexConfig(config.port, injectConfig, {
|
|
751
802
|
routingTarget: target,
|
|
752
803
|
catalogPath: DEFAULT_CATALOG_PATH,
|
|
753
804
|
journalOwner: { kind: "client", apiKeyId },
|
|
754
|
-
beforeClientWrite:
|
|
805
|
+
beforeClientWrite: beforeCodexWrite,
|
|
755
806
|
});
|
|
756
807
|
if (!injected.success || injected.status === "skipped") throw new Error(injected.message);
|
|
757
808
|
injectionCommitted = true;
|
|
@@ -763,7 +814,7 @@ async function connectClientUnlocked(
|
|
|
763
814
|
serverUrl,
|
|
764
815
|
managementUrl,
|
|
765
816
|
managementTransport: options.managementTransport,
|
|
766
|
-
selectedClients: [...
|
|
817
|
+
selectedClients: [...selectedClients],
|
|
767
818
|
tokenEnv: "OPENCODEX_API_AUTH_TOKEN",
|
|
768
819
|
apiKeyId,
|
|
769
820
|
tokenFingerprint: persisted.fingerprint,
|
|
@@ -779,10 +830,34 @@ async function connectClientUnlocked(
|
|
|
779
830
|
};
|
|
780
831
|
withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
781
832
|
assertActiveConnectingState(persisted.fingerprint);
|
|
833
|
+
if (linkMetadata && options.selectedClientsExplicit) {
|
|
834
|
+
recordInitialRouteIntent(linkMetadata.linkId, routeIntent?.document, options.selectedClients);
|
|
835
|
+
initialSelectionWritten = true;
|
|
836
|
+
}
|
|
837
|
+
// No route apply has begun for this connection; the first one removes this proof.
|
|
838
|
+
if (linkMetadata) writeRouteIntentUnappliedProof(linkMetadata.linkId, connection.connectedAt);
|
|
782
839
|
clearClientConnectPending(persisted.fingerprint);
|
|
783
840
|
commitClientConnection(connection);
|
|
784
841
|
committed = true;
|
|
785
842
|
}), deps.lifecycleLockDeps);
|
|
843
|
+
// Only now does the routing belong to this connection: take over a journal another owner wrote
|
|
844
|
+
// (src/codex/journal.ts adoptJournalForClient). A failure keeps the connection; sync retries.
|
|
845
|
+
if (injectionCommitted) {
|
|
846
|
+
try {
|
|
847
|
+
const adoption = adoptJournalForClient(apiKeyId, () => {
|
|
848
|
+
// Under the Codex lock: still this committed connection (same owner and link) and its
|
|
849
|
+
// token, or write nothing. The stored record is normalized, so identity is compared.
|
|
850
|
+
assertNoClientDisconnectPending();
|
|
851
|
+
const current = readClientConnectionState();
|
|
852
|
+
if (current.kind !== "connected" || !sameClientConnectionOwner(current.value, connection)
|
|
853
|
+
|| current.value.link?.linkId !== connection.link?.linkId) throw new Error("client_connection_changed");
|
|
854
|
+
const token = readServiceApiTokenState();
|
|
855
|
+
if (token.kind !== "present" || token.fingerprint !== connection.tokenFingerprint) throw new Error("client_token_changed");
|
|
856
|
+
});
|
|
857
|
+
if (journalHandoverIncomplete(adoption)) console.warn(FOREIGN_JOURNAL_WARNING);
|
|
858
|
+
}
|
|
859
|
+
catch { console.warn("Warning: the Codex journal could not be handed to this connection; run 'ocx sync' so a supervised restart keeps Codex routing."); }
|
|
860
|
+
}
|
|
786
861
|
// Recorded only when the injection that applied it ran (not with --no-sync). The connection is
|
|
787
862
|
// already committed, so a failed record write must not reach the rollback below: it is a
|
|
788
863
|
// warning, and `ocx status` reports no recorded apply until `ocx sync` writes one.
|
|
@@ -795,6 +870,25 @@ async function connectClientUnlocked(
|
|
|
795
870
|
console.warn("Warning: the Home's Codex settings were applied, but the apply record was not written; run 'ocx sync' to record it.");
|
|
796
871
|
}
|
|
797
872
|
}
|
|
873
|
+
if (!options.noSync && routeIntent) {
|
|
874
|
+
// The connection is committed: nothing from here on may reach the enrollment rollback below,
|
|
875
|
+
// including a lifecycle lock another operation holds now or a connection it already changed.
|
|
876
|
+
// Either one leaves the route apply to the next sync, which reconciles the current connection.
|
|
877
|
+
try {
|
|
878
|
+
const appliedConnection = withClientLifecycleSync(() => {
|
|
879
|
+
const current = readClientConnectionState();
|
|
880
|
+
if (current.kind !== "connected" || !Bun.deepEquals(current.value, connection, true)) throw new Error("client_connection_changed");
|
|
881
|
+
return current.value;
|
|
882
|
+
}, deps.lifecycleLockDeps);
|
|
883
|
+
await applyConnectedRouteIntent(connection, admissionToken, routeIntent, {
|
|
884
|
+
codexApplied: injectionCommitted, lifecycleLockDeps: deps.lifecycleLockDeps, beforeWrite: () => {
|
|
885
|
+
deps.signal?.throwIfAborted(); assertClientConnectionUnchanged(appliedConnection);
|
|
886
|
+
const token = readServiceApiTokenState();
|
|
887
|
+
if (token.kind !== "present" || token.fingerprint !== connection.tokenFingerprint) throw new Error("client_token_changed");
|
|
888
|
+
},
|
|
889
|
+
}, deps.linkHome);
|
|
890
|
+
} catch { console.warn("Warning: local route intent needs reconciliation; run 'ocx route to sync'."); }
|
|
891
|
+
}
|
|
798
892
|
return connection;
|
|
799
893
|
} catch (error) {
|
|
800
894
|
const rollbackFailures: string[] = [];
|
|
@@ -805,10 +899,27 @@ async function connectClientUnlocked(
|
|
|
805
899
|
try {
|
|
806
900
|
withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
807
901
|
assertNoClientDisconnectPending();
|
|
902
|
+
if (initialSelectionWritten && !committed && linkMetadata) {
|
|
903
|
+
try { clearInitialRouteIntent(linkMetadata.linkId); }
|
|
904
|
+
catch { rollbackFailures.push("initial route selection rollback unavailable"); }
|
|
905
|
+
}
|
|
906
|
+
// Bound to a connection that never committed, so it could never match; remove it anyway.
|
|
907
|
+
if (!committed && linkMetadata) { try { clearRouteIntentUnappliedProof(); } catch { /* matches nothing */ } }
|
|
908
|
+
let nativeRestoreFailed = false;
|
|
909
|
+
if (restoreNativeIntent && !committed && pendingConnectFingerprint) {
|
|
910
|
+
const fingerprint = pendingConnectFingerprint;
|
|
911
|
+
try { restoreNativeIntentOriginals(() => assertConnectingState(fingerprint)); }
|
|
912
|
+
catch {
|
|
913
|
+
// Like disconnect, keep the token (and the marker proving it is this attempt's) until the
|
|
914
|
+
// standalone switches are back; ocx disconnect finishes this rollback.
|
|
915
|
+
nativeRestoreFailed = true;
|
|
916
|
+
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.`);
|
|
917
|
+
}
|
|
918
|
+
}
|
|
808
919
|
if (priorCatalog && writtenCatalogFingerprint && !restoreCatalogSnapshot(priorCatalog, writtenCatalogFingerprint)) {
|
|
809
920
|
rollbackFailures.push("catalog rollback did not match the written artifact");
|
|
810
921
|
}
|
|
811
|
-
if (pendingConnectFingerprint) {
|
|
922
|
+
if (pendingConnectFingerprint && !nativeRestoreFailed) {
|
|
812
923
|
const removed = removeServiceApiTokenFileIfOwned(pendingConnectFingerprint);
|
|
813
924
|
if (removed === "changed") rollbackFailures.push("service token changed during rollback");
|
|
814
925
|
// Final commit may fail after this attempt already cleared its marker under the same lock.
|
|
@@ -839,6 +950,7 @@ async function connectClientUnlocked(
|
|
|
839
950
|
}
|
|
840
951
|
|
|
841
952
|
export interface ConnectedSyncResult {
|
|
953
|
+
routeIntent?: RouteIntentReceipt;
|
|
842
954
|
catalogWritten: boolean;
|
|
843
955
|
cacheSynced: boolean;
|
|
844
956
|
injected: boolean;
|
|
@@ -848,6 +960,8 @@ export interface ConnectedSyncResult {
|
|
|
848
960
|
appliedRecord?: HomeCodexSettingsRecord;
|
|
849
961
|
/** The Home's settings were injected but their record could not be written (OCX-6). */
|
|
850
962
|
applyRecordFailed?: true;
|
|
963
|
+
/** Routing was injected but the Codex journal stayed with its previous owner; sync again. */
|
|
964
|
+
journalHandoverFailed?: true;
|
|
851
965
|
/**
|
|
852
966
|
* The connection this sync ran under, read inside its lock and compare-and-swapped on every
|
|
853
967
|
* write. Callers decide link-vs-hub wording and restart ownership from this, never from a read
|
|
@@ -858,6 +972,8 @@ export interface ConnectedSyncResult {
|
|
|
858
972
|
|
|
859
973
|
export interface ConnectedSyncOptions {
|
|
860
974
|
restartCodex?: boolean;
|
|
975
|
+
overwriteConflict?: boolean;
|
|
976
|
+
overwriteClient?: import("../link/route-intent").RouteClientId;
|
|
861
977
|
/**
|
|
862
978
|
* #7694: refuse unless this is the connection found under the lock. A mismatch throws
|
|
863
979
|
* `ClientSyncExpectationError` before any request or write.
|
|
@@ -930,17 +1046,21 @@ async function syncConnectedClientUnlocked(
|
|
|
930
1046
|
// with one it cannot. Refusing leaves the connection and the existing catalog exactly as
|
|
931
1047
|
// they were, which is the known-good state.
|
|
932
1048
|
if (downloaded) assertClientCatalogCompatible(downloaded.body, deps.catalogCompatibility);
|
|
1049
|
+
const routeIntent = await prepareConnectedRouteIntent(initial.connection, initial.token.token, deps.linkHome, () => {
|
|
1050
|
+
initial.assertRuntimeCurrent(); assertClientConnectionUnchanged(initial.connection);
|
|
1051
|
+
});
|
|
933
1052
|
const next = withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
934
1053
|
initial.assertRuntimeCurrent();
|
|
935
1054
|
assertClientConnectionUnchanged(initial.connection);
|
|
936
1055
|
const token = readServiceApiTokenState();
|
|
937
1056
|
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);
|
|
1057
|
+
if (!downloaded) validLocalCatalog();
|
|
1058
|
+
else atomicWriteFile(DEFAULT_CATALOG_PATH, downloaded.body);
|
|
940
1059
|
const updated = {
|
|
941
1060
|
...initial.connection,
|
|
942
|
-
|
|
943
|
-
|
|
1061
|
+
selectedClients: [...connectedRouteSelectedClients(routeIntent, initial.connection.selectedClients)],
|
|
1062
|
+
...(downloaded ? { catalogFingerprint: createHash("sha256").update(downloaded.body).digest("base64url"),
|
|
1063
|
+
catalogSyncedAt: (deps.now ?? (() => new Date()))().toISOString() } : {}),
|
|
944
1064
|
};
|
|
945
1065
|
commitClientConnection(updated);
|
|
946
1066
|
return updated;
|
|
@@ -948,6 +1068,7 @@ async function syncConnectedClientUnlocked(
|
|
|
948
1068
|
// Read-only: injection invokes this while N/C are held. Acquiring L here would invert C→L.
|
|
949
1069
|
const beforeClientWrite = () => {
|
|
950
1070
|
initial.assertRuntimeCurrent();
|
|
1071
|
+
if (isLinkConnection(next)) assertRouteIntentPort(loadConfig().port);
|
|
951
1072
|
assertClientConnectionUnchanged(next);
|
|
952
1073
|
const token = readServiceApiTokenState();
|
|
953
1074
|
if (next.pendingOperation || token.kind !== "present" || token.fingerprint !== next.tokenFingerprint) throw new Error("client_token_changed");
|
|
@@ -957,7 +1078,14 @@ async function syncConnectedClientUnlocked(
|
|
|
957
1078
|
let homeSettings: HomeCodexSettingsSource | undefined;
|
|
958
1079
|
let appliedRecord: HomeCodexSettingsRecord | undefined;
|
|
959
1080
|
let applyRecordFailed = false;
|
|
960
|
-
|
|
1081
|
+
let journalHandoverFailed = false;
|
|
1082
|
+
if (next.selectedClients.includes("codex") && (!routeIntent || existsSync(getCodexHome()))) {
|
|
1083
|
+
const beforeCodexWrite = () => {
|
|
1084
|
+
beforeClientWrite();
|
|
1085
|
+
if (routeIntent && !connectedRouteSelectedClients(routeIntent, next.selectedClients).includes("codex")) {
|
|
1086
|
+
throw new Error("Codex route intent changed; retry sync");
|
|
1087
|
+
}
|
|
1088
|
+
};
|
|
961
1089
|
let config = loadConfig();
|
|
962
1090
|
// #6957: a link Child applies the Home's OpenCodex-owned Codex settings with the catalog.
|
|
963
1091
|
if (isLinkConnection(next)) {
|
|
@@ -971,13 +1099,31 @@ async function syncConnectedClientUnlocked(
|
|
|
971
1099
|
withClientWrite(() => withdrawChangingHomeCodexSettingsRecord(linkId, document));
|
|
972
1100
|
}
|
|
973
1101
|
}
|
|
1102
|
+
// Off persisted false. Reconcile the effective Home intent before the injector rereads
|
|
1103
|
+
// that durable gate, retaining local opt-outs and the owner/runtime/token commit fences.
|
|
1104
|
+
if (routeIntent) {
|
|
1105
|
+
const { persistNativeRouteIntent } = await import("./route-intent-apply");
|
|
1106
|
+
withClientLifecycleSync(() => persistNativeRouteIntent("codex", true, beforeCodexWrite, config, true), deps.lifecycleLockDeps);
|
|
1107
|
+
}
|
|
974
1108
|
const result = await injectCodexConfig(config.port, { ...config, syncResumeHistory: false }, {
|
|
975
1109
|
routingTarget: routingTarget(next.serverUrl, isLinkConnection(next) ? config.port : undefined, config), catalogPath: DEFAULT_CATALOG_PATH,
|
|
976
|
-
journalOwner: { kind: "client", apiKeyId: next.apiKeyId }, beforeClientWrite,
|
|
1110
|
+
journalOwner: { kind: "client", apiKeyId: next.apiKeyId }, beforeClientWrite: beforeCodexWrite,
|
|
977
1111
|
});
|
|
978
1112
|
if (!result.success || result.status === "skipped") throw new Error(result.message);
|
|
979
|
-
injected =
|
|
980
|
-
|
|
1113
|
+
injected = result.configApplied !== false;
|
|
1114
|
+
// An external provider can preserve config.toml without applying even the same Home digest.
|
|
1115
|
+
// Withdraw any previous receipt under the current connection fence before reporting parity.
|
|
1116
|
+
if (!injected && next.link) withClientWrite(clearHomeCodexSettingsRecord);
|
|
1117
|
+
if (injected) {
|
|
1118
|
+
// A committed connection re-injected: own the journal too (retries a takeover connect missed),
|
|
1119
|
+
// under the same connection guard as the injection, so a stale sync claims nothing.
|
|
1120
|
+
try {
|
|
1121
|
+
const adoption = adoptJournalForClient(next.apiKeyId, beforeCodexWrite);
|
|
1122
|
+
// No journal or another client's means the routing is not this connection's to keep.
|
|
1123
|
+
if (journalHandoverIncomplete(adoption)) journalHandoverFailed = true;
|
|
1124
|
+
} catch { journalHandoverFailed = true; }
|
|
1125
|
+
}
|
|
1126
|
+
if (injected && homeSettings && next.link) {
|
|
981
1127
|
const linkId = next.link.linkId;
|
|
982
1128
|
const settings = homeSettings;
|
|
983
1129
|
try {
|
|
@@ -992,6 +1138,9 @@ async function syncConnectedClientUnlocked(
|
|
|
992
1138
|
}
|
|
993
1139
|
}
|
|
994
1140
|
}
|
|
1141
|
+
const routeReceipt = await applyConnectedRouteIntent(next, initial.token.token, routeIntent,
|
|
1142
|
+
{ beforeWrite: beforeClientWrite, codexApplied: injected, lifecycleLockDeps: deps.lifecycleLockDeps,
|
|
1143
|
+
overwriteConflict: options.overwriteConflict, overwriteClient: options.overwriteClient }, deps.linkHome);
|
|
995
1144
|
const cacheSynced = withClientLifecycleSync(() => {
|
|
996
1145
|
// Acquire K before the guarded C commit; never acquire K from inside C.
|
|
997
1146
|
const owningHome = getCodexHome();
|
|
@@ -1001,10 +1150,12 @@ async function syncConnectedClientUnlocked(
|
|
|
1001
1150
|
return result.kind === "completed" && result.value;
|
|
1002
1151
|
}, deps.lifecycleLockDeps);
|
|
1003
1152
|
return {
|
|
1004
|
-
catalogWritten: downloaded !== undefined, cacheSynced, injected, stale,
|
|
1153
|
+
catalogWritten: downloaded !== undefined, cacheSynced, injected, stale: stale || routeReceipt?.catalogPending === true || routeIntent?.stale === true,
|
|
1005
1154
|
...(homeSettings ? { homeSettings } : {}),
|
|
1006
1155
|
...(appliedRecord ? { appliedRecord } : {}),
|
|
1007
1156
|
...(applyRecordFailed ? { applyRecordFailed } : {}),
|
|
1157
|
+
...(routeReceipt ? { routeIntent: routeReceipt } : {}),
|
|
1158
|
+
...(journalHandoverFailed ? { journalHandoverFailed: true as const } : {}),
|
|
1008
1159
|
connection: next,
|
|
1009
1160
|
};
|
|
1010
1161
|
}
|
|
@@ -1046,6 +1197,8 @@ function disconnectAtLeast(receipt: DesktopDisconnectReceipt, phase: DesktopDisc
|
|
|
1046
1197
|
return DISCONNECT_PHASES.indexOf(receipt.phase) >= DISCONNECT_PHASES.indexOf(phase);
|
|
1047
1198
|
}
|
|
1048
1199
|
|
|
1200
|
+
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.";
|
|
1201
|
+
|
|
1049
1202
|
function catalogIsRecordedPrior(connection: OcxClientConnectionConfig, snapshot: CatalogSnapshot): boolean {
|
|
1050
1203
|
return snapshot.kind === "file" && !!connection.priorCatalog
|
|
1051
1204
|
&& snapshot.fingerprint === sha256(Buffer.from(connection.priorCatalog, "base64").toString("utf8"));
|
|
@@ -1069,30 +1222,142 @@ function verifyDisconnectCatalog(receipt: DesktopDisconnectReceipt): void {
|
|
|
1069
1222
|
}
|
|
1070
1223
|
}
|
|
1071
1224
|
|
|
1072
|
-
function restoreConnectedCodex(connection: OcxClientConnectionConfig):
|
|
1073
|
-
|
|
1074
|
-
const owner = journalOwner();
|
|
1225
|
+
function restoreConnectedCodex(connection: OcxClientConnectionConfig, receipt: DesktopDisconnectReceipt, recoverConfig = false): string | undefined {
|
|
1226
|
+
const inspection = readCodexHomeJournal(JOURNAL_PATH);
|
|
1227
|
+
const owner = journalOwner({ readOnly: true });
|
|
1228
|
+
const explicitOwner = inspection.kind === "read" ? inspection.journal.owner as Record<string, unknown> | undefined : undefined;
|
|
1229
|
+
const invalidOwner = explicitOwner !== undefined && (!explicitOwner || typeof explicitOwner !== "object" || Array.isArray(explicitOwner)
|
|
1230
|
+
|| !(explicitOwner.kind === "client" && typeof explicitOwner.apiKeyId === "string" && explicitOwner.apiKeyId.length > 0
|
|
1231
|
+
|| explicitOwner.kind === "process" && typeof explicitOwner.pid === "number" && Number.isSafeInteger(explicitOwner.pid) && explicitOwner.pid > 0));
|
|
1232
|
+
if (inspection.kind === "unknown" || invalidOwner || (inspection.kind === "read" && owner === null)) {
|
|
1233
|
+
throw new Error("disconnect refused: Codex journal ownership is unknown; journal and connection credentials were retained");
|
|
1234
|
+
}
|
|
1235
|
+
// Deselection records desired state, not completed cleanup. A failed off still leaves
|
|
1236
|
+
// this client's journal to drain; an unrelated process journal grants no such authority.
|
|
1237
|
+
if (!connection.selectedClients.includes("codex") && owner?.kind !== "client") {
|
|
1238
|
+
if (inspection.kind === "missing" && isCodexRoutingInjected()) {
|
|
1239
|
+
throw new Error("disconnect refused: Codex routing is injected but no journal records the original state");
|
|
1240
|
+
}
|
|
1241
|
+
return;
|
|
1242
|
+
}
|
|
1075
1243
|
if (owner && owner.kind === "client" && owner.apiKeyId !== connection.apiKeyId) {
|
|
1076
1244
|
throw new Error("disconnect refused: Codex journal ownership conflicts with the connected key");
|
|
1077
1245
|
}
|
|
1078
1246
|
if (owner !== null) {
|
|
1079
|
-
|
|
1247
|
+
const restored = restoreJournalState({ preserveConfigEdits: true,
|
|
1248
|
+
...(recoverConfig ? { recoverConfigForClient: connection.apiKeyId } : {}),
|
|
1249
|
+
beforeWrite: () => {
|
|
1250
|
+
const state = readClientConnectionState(), currentReceipt = readDesktopDisconnectReceipt();
|
|
1251
|
+
const token = readServiceApiTokenState();
|
|
1252
|
+
if (state.kind !== "connected" || JSON.stringify(state.value) !== JSON.stringify(connection)
|
|
1253
|
+
|| currentReceipt.kind !== "valid" || JSON.stringify(currentReceipt.value) !== JSON.stringify(receipt)
|
|
1254
|
+
|| token.kind !== "present" || token.fingerprint !== receipt.tokenFingerprint) throw new Error("client_disconnect_owner_changed");
|
|
1255
|
+
},
|
|
1256
|
+
});
|
|
1257
|
+
if (!restored.complete) throw new Error(
|
|
1258
|
+
"disconnect refused: Codex journal restore was partial; journal and connection credentials were retained. "
|
|
1259
|
+
+ "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). "
|
|
1260
|
+
+ "Unknown ownership and edited or unverified profiles remain refused.",
|
|
1261
|
+
);
|
|
1262
|
+
return restored.recoveryBackupDir;
|
|
1080
1263
|
} else if (isCodexRoutingInjected()) {
|
|
1081
1264
|
throw new Error("disconnect refused: Codex routing is injected but no journal records the original state");
|
|
1082
1265
|
}
|
|
1083
1266
|
}
|
|
1084
1267
|
|
|
1268
|
+
/**
|
|
1269
|
+
* `ocx disconnect --expect-link <id>`: refuse unless this machine is connected to that link (the same
|
|
1270
|
+
* check `ocx sync --expect-link` makes), read-only under the client lifecycle and config locks. A Home's
|
|
1271
|
+
* delayed revoke of an old link then cannot disconnect a newer one. Throws ClientSyncExpectationError.
|
|
1272
|
+
*/
|
|
1273
|
+
export function assertDisconnectExpectation(linkId: string, deps: Pick<ClientConnectDeps, "lifecycleLockDeps"> = {}): void {
|
|
1274
|
+
withClientLifecycleSync(() => withConfigMutationLockSync(() => assertHomeInitiatedDisconnect(linkId)), deps.lifecycleLockDeps);
|
|
1275
|
+
}
|
|
1276
|
+
|
|
1277
|
+
/**
|
|
1278
|
+
* The link expectation, then the Home-initiated check: a Home sends --expect-link only for Home-initiated links, and
|
|
1279
|
+
* a client-initiated one needs the client-link teardown that path skips. Its sidecar, or the marker that survives a
|
|
1280
|
+
* lost sidecar, naming this link refuses it (client_initiated_link); an unreadable sidecar or marker refuses too.
|
|
1281
|
+
* When this link's own unfinished disconnect is on record (the expectation let it resume), the refusal says
|
|
1282
|
+
* disconnect_pending instead: an earlier attempt may have cleaned part of the Child, and the Home must count the
|
|
1283
|
+
* cleanup as attempted. Read-only; the caller holds the client lifecycle and config mutation locks.
|
|
1284
|
+
*/
|
|
1285
|
+
function assertHomeInitiatedDisconnect(linkId: string): void {
|
|
1286
|
+
assertDisconnectLinkExpectation(linkId);
|
|
1287
|
+
let reason: "client_initiated_link" | "invalid_state" | null;
|
|
1288
|
+
// An unreadable sidecar or marker refuses as invalid_state: it proves nothing about who joined.
|
|
1289
|
+
try {
|
|
1290
|
+
const marker = readChildLinkMarker();
|
|
1291
|
+
reason = marker.kind === "unreadable" ? "invalid_state"
|
|
1292
|
+
: readClientLinkState()?.linkId === linkId || (marker.kind === "link" && marker.linkId === linkId) ? "client_initiated_link" : null;
|
|
1293
|
+
} catch { reason = "invalid_state"; }
|
|
1294
|
+
if (!reason) return;
|
|
1295
|
+
const receipt = readDesktopDisconnectReceipt();
|
|
1296
|
+
throw new ClientSyncExpectationError({ kind: "link", linkId }, receipt.kind === "valid" && receipt.value.phase !== "complete" ? "disconnect_pending" : reason);
|
|
1297
|
+
}
|
|
1298
|
+
|
|
1299
|
+
/**
|
|
1300
|
+
* A disconnected machine with no unfinished disconnect can still hold the standalone native
|
|
1301
|
+
* switches an interrupted or failed enrollment displaced, and the token that enrollment kept
|
|
1302
|
+
* because it could not restore them. Plain `ocx disconnect` restores the switches, then removes
|
|
1303
|
+
* that token only while the pending-connect marker proves it is the enrollment's own.
|
|
1304
|
+
* `ocx disconnect --orphaned-token` never touches the record.
|
|
1305
|
+
*/
|
|
1306
|
+
function drainLoneNativeIntentOriginals(lifecycleLockDeps?: ClientLifecycleLockDeps): {
|
|
1307
|
+
restored: true; tokenRemoved: boolean; catalogRemoved: false; catalogRestored: false; apiKeyId: string; restartRequired: false; nativeIntentOnly: true;
|
|
1308
|
+
} | null {
|
|
1309
|
+
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.`);
|
|
1310
|
+
return withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
1311
|
+
const read = readDesktopDisconnectReceipt();
|
|
1312
|
+
if (read.kind === "unsafe" || (read.kind === "valid" && read.value.phase !== "complete")) return null;
|
|
1313
|
+
if (readClientConnectionState().kind !== "disconnected") return null;
|
|
1314
|
+
let present: boolean;
|
|
1315
|
+
try { present = readNativeIntentOriginals() !== null; } catch (error) { throw refused(error); }
|
|
1316
|
+
if (!present) return null;
|
|
1317
|
+
try {
|
|
1318
|
+
restoreNativeIntentOriginals(() => {
|
|
1319
|
+
assertNoClientDisconnectPending();
|
|
1320
|
+
if (readClientConnectionState().kind !== "disconnected") throw new Error("client_connection_changed");
|
|
1321
|
+
});
|
|
1322
|
+
} catch (error) { throw refused(error); }
|
|
1323
|
+
const token = readServiceApiTokenState();
|
|
1324
|
+
let tokenRemoved = false;
|
|
1325
|
+
if (token.kind === "present" && pendingClientConnectMayOwnToken(token.fingerprint)) {
|
|
1326
|
+
const removed = removeServiceApiTokenFileIfOwned(token.fingerprint);
|
|
1327
|
+
if (removed === "changed") throw new Error("client_token_changed");
|
|
1328
|
+
tokenRemoved = removed === "removed";
|
|
1329
|
+
clearClientConnectPending(token.fingerprint);
|
|
1330
|
+
}
|
|
1331
|
+
return { restored: true, tokenRemoved, catalogRemoved: false, catalogRestored: false, apiKeyId: "", restartRequired: false, nativeIntentOnly: true };
|
|
1332
|
+
}), lifecycleLockDeps);
|
|
1333
|
+
}
|
|
1334
|
+
|
|
1085
1335
|
export async function disconnectClient(
|
|
1086
|
-
options: { keepCatalog?: boolean; expectedOwner?: DesktopRemoteOwner } = {},
|
|
1336
|
+
options: { keepCatalog?: boolean; expectedOwner?: DesktopRemoteOwner; expectLink?: string; recoverConfig?: boolean } = {},
|
|
1087
1337
|
deps: Pick<ClientConnectDeps, "lifecycleLockDeps"> = {},
|
|
1088
1338
|
): Promise<{
|
|
1089
1339
|
restored: boolean; tokenRemoved: boolean; catalogRemoved: boolean; catalogRestored: boolean; apiKeyId: string;
|
|
1090
1340
|
desktopRestoration?: "owned_projection" | "standard_fallback" | "selection_preserved";
|
|
1091
1341
|
restartRequired: boolean;
|
|
1342
|
+
recoveryBackupDir?: string;
|
|
1343
|
+
/** Only standalone native switches an interrupted enrollment displaced were restored. */
|
|
1344
|
+
nativeIntentOnly?: true;
|
|
1092
1345
|
}> {
|
|
1093
1346
|
if (siblingOfLivePort() !== null) throw new Error(siblingSkipMessage());
|
|
1347
|
+
// A link-bound disconnect changes nothing on a machine that is not connected to that link, so it never drains here.
|
|
1348
|
+
if (!options.expectedOwner && options.expectLink === undefined) {
|
|
1349
|
+
// It restores config-root switches under the lifecycle lock, so it admits after overlapping
|
|
1350
|
+
// config-root ACL work like both phases below (#7815).
|
|
1351
|
+
const drained = await withConfigDirHardeningSettled(getConfigDir(), () => drainLoneNativeIntentOriginals(deps.lifecycleLockDeps));
|
|
1352
|
+
if (drained) return drained;
|
|
1353
|
+
}
|
|
1094
1354
|
const keepCatalog = options.keepCatalog === true;
|
|
1095
|
-
|
|
1355
|
+
// Both phases write the disconnect receipt and the remote Desktop store under the config root
|
|
1356
|
+
// with required ACLs, so each admits after overlapping config-root ACL work (#7815). A timeout
|
|
1357
|
+
// before phase 1 writes nothing; one before phase 2 leaves the prepared receipt it resumes from.
|
|
1358
|
+
const prepared = await withConfigDirHardeningSettled(getConfigDir(), () => withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1359
|
+
// Checked first, under the same locks, before anything is read for writing or written.
|
|
1360
|
+
if (options.expectLink !== undefined) assertHomeInitiatedDisconnect(options.expectLink);
|
|
1096
1361
|
const read = readDesktopDisconnectReceipt();
|
|
1097
1362
|
if (read.kind === "unsafe") throw new Error("client_disconnect_receipt_unsafe");
|
|
1098
1363
|
const state = readClientConnectionState();
|
|
@@ -1118,7 +1383,10 @@ export async function disconnectClient(
|
|
|
1118
1383
|
}
|
|
1119
1384
|
if (!receipt) {
|
|
1120
1385
|
const desktop = inspectRemoteDesktopStore(desktopOwner(connection));
|
|
1121
|
-
if (desktop.
|
|
1386
|
+
if (desktop.reason === "root_without_state") {
|
|
1387
|
+
throw new Error(`desktop_lifecycle_unsafe: ${desktop.path} exists but holds no Claude Desktop remote state or disconnect receipt (a leftover or renamed file), so disconnect cannot tell what it would restore. Move that folder aside, then run ocx disconnect again.`);
|
|
1388
|
+
}
|
|
1389
|
+
if (desktop.kind === "unsafe" || desktop.kind === "conflict") throw new Error(`desktop_lifecycle_unsafe: the Claude Desktop remote profile store could not be verified (${desktop.kind}); nothing was changed.`);
|
|
1122
1390
|
preflightDisconnectCatalog(connection, keepCatalog);
|
|
1123
1391
|
receipt = { version: 1, owner: desktopOwner(connection), tokenFingerprint: connection.tokenFingerprint, keepCatalog, phase: "prepared" };
|
|
1124
1392
|
writeDesktopDisconnectReceipt(held, previous, receipt);
|
|
@@ -1128,15 +1396,21 @@ export async function disconnectClient(
|
|
|
1128
1396
|
}
|
|
1129
1397
|
if (!receipt || receipt.keepCatalog !== keepCatalog) throw new Error("client_disconnect_options_changed");
|
|
1130
1398
|
return { receipt, connection };
|
|
1131
|
-
}), deps.lifecycleLockDeps);
|
|
1399
|
+
}), deps.lifecycleLockDeps));
|
|
1132
1400
|
|
|
1401
|
+
// This sibling step owns only file integrations; failures retain the prepared receipt/token.
|
|
1402
|
+
if (prepared.connection?.transport === "link" && !disconnectAtLeast(prepared.receipt, "desktop_restored")) {
|
|
1403
|
+
// It writes the route receipt and file integrations under the config root, so it admits after
|
|
1404
|
+
// overlapping config-root ACL work like both disconnect phases (#7815).
|
|
1405
|
+
const connection = prepared.connection;
|
|
1406
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => cleanupConnectedRouteIntent(connection, prepared.receipt, deps.lifecycleLockDeps, options.recoverConfig === true));
|
|
1407
|
+
}
|
|
1133
1408
|
// The prepared receipt blocks even a sync queued for its actual N/C injection commit.
|
|
1134
1409
|
// Codex-only restore MUST stay outside L; it never invokes Desktop cleanup.
|
|
1135
|
-
|
|
1136
|
-
restoreConnectedCodex(prepared.connection);
|
|
1137
|
-
}
|
|
1410
|
+
const recoveryBackupDir = prepared.connection && !disconnectAtLeast(prepared.receipt, "desktop_restored")
|
|
1411
|
+
? restoreConnectedCodex(prepared.connection, prepared.receipt, options.recoverConfig === true) : undefined;
|
|
1138
1412
|
|
|
1139
|
-
return withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1413
|
+
return withConfigDirHardeningSettled(getConfigDir(), () => withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1140
1414
|
const read = readDesktopDisconnectReceipt();
|
|
1141
1415
|
if (read.kind !== "valid" || JSON.stringify(read.value) !== JSON.stringify(prepared.receipt)) {
|
|
1142
1416
|
throw new Error("client_disconnect_receipt_changed");
|
|
@@ -1185,6 +1459,18 @@ export async function disconnectClient(
|
|
|
1185
1459
|
}
|
|
1186
1460
|
advance("catalog_settled", { catalogAfter: catalogAfterState() });
|
|
1187
1461
|
} else verifyDisconnectCatalog(receipt);
|
|
1462
|
+
if (connection?.transport === "link" && !disconnectAtLeast(receipt, "removing_token")) {
|
|
1463
|
+
if (connection.link) clearInitialRouteIntent(connection.link.linkId);
|
|
1464
|
+
clearHomeRouteIntentRecord();
|
|
1465
|
+
// Its clients were restored by the route cleanup above, which phase gating never reruns.
|
|
1466
|
+
clearFileIntentOriginals();
|
|
1467
|
+
if (readRouteIntentReceiptStrict()?.linkId === connection.link?.linkId) clearRouteIntentReceipt();
|
|
1468
|
+
clearRouteIntentUnappliedProof();
|
|
1469
|
+
}
|
|
1470
|
+
// Standalone native switches come back before the token that displaced them is removed.
|
|
1471
|
+
// The record is machine-scoped, so any transport drains one a crashed enrollment left.
|
|
1472
|
+
// The locks and the receipt checked above already fence this; a retry is idempotent.
|
|
1473
|
+
if (!disconnectAtLeast(receipt, "removing_token")) restoreNativeIntentOriginals(() => {});
|
|
1188
1474
|
if (!disconnectAtLeast(receipt, "removing_token")) advance("removing_token");
|
|
1189
1475
|
const tokenRemoval = removeServiceApiTokenFileIfOwned(receipt.tokenFingerprint);
|
|
1190
1476
|
if (tokenRemoval === "changed") throw new Error("client_token_changed");
|
|
@@ -1208,12 +1494,13 @@ export async function disconnectClient(
|
|
|
1208
1494
|
requireDesktopResult(finishRemoteDesktopCleanup(held, receipt.owner));
|
|
1209
1495
|
if (receipt.phase !== "complete") advance("complete");
|
|
1210
1496
|
return {
|
|
1497
|
+
...(recoveryBackupDir ? { recoveryBackupDir } : {}),
|
|
1211
1498
|
restored: true, tokenRemoved: tokenRemoval === "removed",
|
|
1212
1499
|
catalogRemoved: !keepCatalog, catalogRestored: !keepCatalog && receipt.catalogAfter?.kind === "file",
|
|
1213
1500
|
apiKeyId: receipt.owner.apiKeyId, restartRequired: desktop.restartRequired,
|
|
1214
1501
|
...(desktop.restoration ? { desktopRestoration: desktop.restoration } : {}),
|
|
1215
1502
|
};
|
|
1216
|
-
}), deps.lifecycleLockDeps);
|
|
1503
|
+
}), deps.lifecycleLockDeps));
|
|
1217
1504
|
}
|
|
1218
1505
|
|
|
1219
1506
|
/**
|