@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
type ManagementAuthState,
|
|
12
12
|
} from "../server/management-auth";
|
|
13
13
|
import { resolveInboundBodyLimitBytes } from "../server/request-decompress";
|
|
14
|
+
import { LINK_DIAGNOSTICS_ROUTE, linkDiagnosticsResponse } from "../server/management/link-diagnostics-route";
|
|
14
15
|
import type { OcxClientConnectionConfig, OcxConfig } from "../types";
|
|
15
16
|
import { disconnectClient, syncConnectedClient } from "./connect";
|
|
16
17
|
import { isLinkConnection, readClientConnectionState } from "./state";
|
|
@@ -19,8 +20,11 @@ import { MACHINE_GUI_ORIGIN_HEADER, requireMachineAuth } from "./machine-auth";
|
|
|
19
20
|
import { HUB_RELAY_REQUEST_BODY_MAX_BYTES, relayHubManagementRequest } from "./hub-relay";
|
|
20
21
|
import { createLinkKeySource, handleLinkIngress, type LinkIngress, type LinkKeySourceDeps } from "./link-ingress";
|
|
21
22
|
import type { LinkTunnelGate } from "./link-relay";
|
|
23
|
+
import { createLinkWebsocketRelay, type LinkWebsocketRelayDeps } from "./link-websocket";
|
|
22
24
|
import { readClientLinkState, type ClientLinkState } from "./link-state";
|
|
23
|
-
import { projectClientLinkChild, type ClientLinkSidecarRead } from "./link-status";
|
|
25
|
+
import { projectClientLinkChild, projectClientLinkRow, type ClientLinkSidecarRead } from "./link-status";
|
|
26
|
+
import { attachLinkTraffic } from "../link/status-projection";
|
|
27
|
+
import { childLinkTraffic } from "../link/traffic";
|
|
24
28
|
import type { ClientLinkSupervisorStatus } from "./link-tunnel";
|
|
25
29
|
import type { LinkReadiness } from "./link-readiness";
|
|
26
30
|
import { packageVersion } from "../lib/package-version";
|
|
@@ -69,6 +73,8 @@ export interface MachineListenerDeps {
|
|
|
69
73
|
linkTunnel?: LinkTunnelGate;
|
|
70
74
|
/** Link mode: relay seams (deadline clock and byte cap). */
|
|
71
75
|
linkRelay?: LinkIngress["relay"];
|
|
76
|
+
/** Link mode: seams of the Responses WebSocket over the link (release gate, timers, limits). */
|
|
77
|
+
linkWebsocket?: Partial<LinkWebsocketRelayDeps>;
|
|
72
78
|
/**
|
|
73
79
|
* Link mode: whether relayed requests can be served now. `GET /readyz` answers 503 `pending`
|
|
74
80
|
* with `link.reason` while it is not; `/healthz` is unaffected (`link-readiness.ts`).
|
|
@@ -107,8 +113,8 @@ export function machineRouteAllowed(url: URL, req: Request, relayEnabled: boolea
|
|
|
107
113
|
// The bound restart. Only a capability signed for this exact process admits it (see the handler).
|
|
108
114
|
if (req.method === SYSTEM_RESTART_METHOD && path === SYSTEM_RESTART_PATH) return true;
|
|
109
115
|
if ((req.method === "GET" || req.method === "HEAD") && (path === "/api/machine/status" || path === "/api/machine/clients" || path === "/api/machine/shim")) return true;
|
|
110
|
-
// The
|
|
111
|
-
if (linkMode && (req.method === "GET" || req.method === "HEAD") && path === "/api/link/status") return true;
|
|
116
|
+
// The link routes a connected Child serves: its own read-only link status and diagnostics.
|
|
117
|
+
if (linkMode && (req.method === "GET" || req.method === "HEAD") && (path === "/api/link/status" || path === LINK_DIAGNOSTICS_ROUTE)) return true;
|
|
112
118
|
if (req.method === "POST" && (path === "/api/machine/sync" || path === "/api/machine/shim" || path === "/api/machine/disconnect")) return true;
|
|
113
119
|
if (relayEnabled && path.startsWith("/api/machine/hub-relay/")) return true;
|
|
114
120
|
// Known machine endpoints are admitted for every method so an unsupported
|
|
@@ -157,6 +163,18 @@ export function startMachineListener(
|
|
|
157
163
|
// Link mode only. Everything is resolved once here, so a relayed request reads no file and
|
|
158
164
|
// builds no policy: the key is cached, the loopback policy is fixed at bind like the listener.
|
|
159
165
|
const inboundBodyLimit = resolveInboundBodyLimitBytes(config.maxInboundBodyBytes);
|
|
166
|
+
// Link mode only: Codex's upgrade tries the link only when the relay's wanted() lets it (the Child's
|
|
167
|
+
// release gate is open, no opt-out, and the Home's last applied answer is not off; a cached off still tries while
|
|
168
|
+
// the relay drains for a restart); otherwise it keeps today's 426. A tried upgrade can still end in 426 or the
|
|
169
|
+
// transient 503 (link-websocket.ts).
|
|
170
|
+
const linkWebsocket = linkMode
|
|
171
|
+
? createLinkWebsocketRelay({
|
|
172
|
+
tunnel: deps.linkTunnel, diagnostic: recordLinkDiagnostic,
|
|
173
|
+
// D4: read once at start, like the rest of this listener's config.
|
|
174
|
+
optOut: () => config.linkResponsesWebsocketOptOut === true,
|
|
175
|
+
...deps.linkWebsocket,
|
|
176
|
+
})
|
|
177
|
+
: null;
|
|
160
178
|
const linkIngress: LinkIngress | null = linkMode
|
|
161
179
|
? {
|
|
162
180
|
tunnelPort: connection.link!.tunnelPort,
|
|
@@ -165,15 +183,18 @@ export function startMachineListener(
|
|
|
165
183
|
policy: requestPolicyView(config, "127.0.0.1"),
|
|
166
184
|
linkKey: deps.linkKeySource ?? createLinkKeySource(connection.tokenFingerprint, deps.linkKey),
|
|
167
185
|
relay: { diagnostic: recordLinkDiagnostic, fetchImpl: deps.fetchImpl, bodyLimitBytes: inboundBodyLimit, tunnel: deps.linkTunnel, ...deps.linkRelay },
|
|
186
|
+
...(linkWebsocket ? { websocket: linkWebsocket } : {}),
|
|
168
187
|
}
|
|
169
188
|
: null;
|
|
170
|
-
|
|
189
|
+
const server = (deps.serve ?? (options => Bun.serve(options)))({
|
|
171
190
|
port: port ?? config.port ?? 10100,
|
|
172
191
|
hostname: "127.0.0.1",
|
|
173
192
|
// A hub client relays only bounded management calls. A link Child carries the Codex data
|
|
174
193
|
// plane, so it admits what a standalone listener admits and keeps its idle limit.
|
|
175
194
|
maxRequestBodySize: linkMode ? inboundBodyLimit : HUB_RELAY_REQUEST_BODY_MAX_BYTES,
|
|
176
195
|
...(linkMode ? { idleTimeout: LINK_LISTENER_IDLE_TIMEOUT_SECONDS } : {}),
|
|
196
|
+
// Only an upgrade the link WebSocket admitted ever reaches server.upgrade (link-websocket.ts).
|
|
197
|
+
...(linkWebsocket ? { websocket: linkWebsocket.handler() } : {}),
|
|
177
198
|
async fetch(req: Request, server: Server<unknown>) {
|
|
178
199
|
const url = new URL(req.url);
|
|
179
200
|
if (linkIngress) {
|
|
@@ -251,7 +272,7 @@ export function startMachineListener(
|
|
|
251
272
|
else hubReachability = "online";
|
|
252
273
|
return response;
|
|
253
274
|
}
|
|
254
|
-
if (url.pathname.startsWith("/api/machine/") || (linkMode && url.pathname === "/api/link/status")) {
|
|
275
|
+
if (url.pathname.startsWith("/api/machine/") || (linkMode && (url.pathname === "/api/link/status" || url.pathname === LINK_DIAGNOSTICS_ROUTE))) {
|
|
255
276
|
const authError = requireManagementAuth(req, managementAuth, config);
|
|
256
277
|
if (authError) return authError;
|
|
257
278
|
if (managementPrincipal(req, managementAuth, config) !== "gui-session") {
|
|
@@ -268,10 +289,23 @@ export function startMachineListener(
|
|
|
268
289
|
if (req.method !== "GET" && req.method !== "HEAD") {
|
|
269
290
|
return Response.json({ error: "opencodex machine changes require the local CLI" }, { status: 403 });
|
|
270
291
|
}
|
|
292
|
+
// This Child's own bounded tunnel evidence, read from its file; never relayed to the Home.
|
|
293
|
+
if (url.pathname === LINK_DIAGNOSTICS_ROUTE) return linkDiagnosticsResponse(url);
|
|
271
294
|
if (url.pathname === "/api/link/status") {
|
|
272
295
|
// A Child never joins again from here, so the dashboard reads `joinAvailable: false`.
|
|
273
|
-
const
|
|
274
|
-
|
|
296
|
+
const sidecar = readSidecarSafely(readSidecar);
|
|
297
|
+
const status = projectClientLinkChild(sidecar, deps.linkStatus?.() ?? { kind: "stopped" }, Date.now());
|
|
298
|
+
// Opt-in (#3023): this Child's link as a row, with the bytes its link transport carried.
|
|
299
|
+
if (url.searchParams.get("traffic") === "1" && connection.link) {
|
|
300
|
+
// One sidecar read per status read: the Home's name is needed only when there is none,
|
|
301
|
+
// and then only from the Home's published settings.
|
|
302
|
+
status.links = [projectClientLinkRow({ ...connection, link: connection.link }, sidecar, status.child, Date.now(),
|
|
303
|
+
undefined, sidecar === null ? linkHomeName(connection, () => null) : null)];
|
|
304
|
+
attachLinkTraffic(status, id => childLinkTraffic.snapshot(id));
|
|
305
|
+
}
|
|
306
|
+
// Opt-in (design 9.3): this Child's own link WebSocket counters.
|
|
307
|
+
const transport = url.searchParams.get("transport") === "1" && linkWebsocket ? { websocket: linkWebsocket.counters() } : {};
|
|
308
|
+
return Response.json({ ...status, joinAvailable: false, ...transport }, { headers: { "Cache-Control": "no-store" } });
|
|
275
309
|
}
|
|
276
310
|
return await handleMachineApi(req, url, connection, machineApiDeps) ?? json404(req);
|
|
277
311
|
}
|
|
@@ -302,6 +336,13 @@ export function startMachineListener(
|
|
|
302
336
|
return json404(req);
|
|
303
337
|
},
|
|
304
338
|
} as Parameters<typeof Bun.serve>[0]);
|
|
339
|
+
if (linkWebsocket) {
|
|
340
|
+
// Any stop, graceful or forced, closes the link sockets first (1001 on both legs): Codex reconnects
|
|
341
|
+
// to whatever serves next, and a graceful drain never waits on an idle Codex socket.
|
|
342
|
+
const stop = server.stop.bind(server);
|
|
343
|
+
server.stop = ((closeActiveConnections?: boolean) => { linkWebsocket.closeAll(); return stop(closeActiveConnections); }) as typeof server.stop;
|
|
344
|
+
}
|
|
345
|
+
return server;
|
|
305
346
|
}
|
|
306
347
|
|
|
307
348
|
/**
|
|
@@ -0,0 +1,293 @@
|
|
|
1
|
+
/** Production native adapters for the common Home/Child local intent controller. */
|
|
2
|
+
import { existsSync } from "node:fs";
|
|
3
|
+
import { homedir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import type { ExportModel } from "../clients/config-export";
|
|
6
|
+
import { loadConfig, mutatePersistedConfig, withConfigMutationLockSync } from "../config";
|
|
7
|
+
import { readConfigForAdmittedMutation } from "../config/persisted-mutation";
|
|
8
|
+
import { commitClaudeCodeBlock } from "../claude/claude-code-block";
|
|
9
|
+
import { localInferenceDestination } from "../lib/local-destinations";
|
|
10
|
+
import { persistCommittedDesktopGateway } from "../claude/desktop-gateway-state";
|
|
11
|
+
import { captureDesktopAppliedMarker, commitDesktopAppliedMarker } from "../claude/desktop-applied-marker";
|
|
12
|
+
import { localClientSyncAllowed } from "../codex/desired-state";
|
|
13
|
+
import { materializeRouteIntent, type RouteClientOutcome, type RouteIntentApplyInput, type RouteIntentReceipt } from "../integrations/route-intent";
|
|
14
|
+
import type { HomeRouteIntentDocument, RouteClientId, RouteClientIntent } from "../link/route-intent";
|
|
15
|
+
import type { OcxConfig } from "../types";
|
|
16
|
+
import { assertNoClientDisconnectPending, readClientConnectionState, sameClientConnectionOwner } from "./state";
|
|
17
|
+
import { withClientLifecycle, withClientLifecycleSync, type ClientLifecycleLockDeps } from "./lifecycle-lock";
|
|
18
|
+
import { assertRouteIntentPort } from "./sync-runtime";
|
|
19
|
+
import { resolveApiSurfaceSettings } from "../protocols/settings";
|
|
20
|
+
import { nativeIntentFields, prepareNativeIntentWrite, publishNativeIntentWrite } from "./route-intent-native-originals";
|
|
21
|
+
|
|
22
|
+
export interface LocalRouteIntentOptions extends Pick<RouteIntentApplyInput,
|
|
23
|
+
"overwriteConflict" | "overwriteClient" | "beforeWrite" | "statePath" | "store" | "home" | "env" | "now" | "onlyClients" | "retainSkippedOutcomes"> {
|
|
24
|
+
/** Connect/sync already applied the Home's Codex settings through the existing injector. */
|
|
25
|
+
codexApplied?: boolean;
|
|
26
|
+
lifecycleLockDeps?: ClientLifecycleLockDeps;
|
|
27
|
+
/** The native client a Home write is deciding; only it may change a Home native switch. */
|
|
28
|
+
decidedClient?: RouteClientId;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* The Home's own native switch, read rather than decided by this apply (a sync, or a write for
|
|
33
|
+
* another client). It is never rewritten here; only the client's owned artifacts follow it.
|
|
34
|
+
*/
|
|
35
|
+
function liveHomeSwitch(document: HomeRouteIntentDocument, client: RouteClientId, options: LocalRouteIntentOptions): boolean {
|
|
36
|
+
return document.sources[client] === "native" && options.decidedClient !== client && readClientConnectionState().kind !== "connected";
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* An enabled Home Grok or Desktop switch nobody is deciding right now gets exactly the startup
|
|
41
|
+
* behavior: Grok follows the startup gate and Desktop only refreshes a gateway profile OpenCodex
|
|
42
|
+
* already owns. The outcome is "current": the switch is satisfied without creating anything.
|
|
43
|
+
*/
|
|
44
|
+
function implicitHomeIntent(document: HomeRouteIntentDocument, client: RouteClientId, intent: RouteClientIntent, options: LocalRouteIntentOptions): boolean {
|
|
45
|
+
return intent.enabled && liveHomeSwitch(document, client, options);
|
|
46
|
+
}
|
|
47
|
+
const IMPLICIT_DESKTOP_MESSAGE = "No OpenCodex-owned Claude Desktop profile to refresh; choose ocx route to claude-desktop on to create one";
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* First-party Desktop already routes through OpenCodex, so an enabled intent is satisfied without
|
|
51
|
+
* a write. Turning it off changes the Desktop mode, which only its own transaction may do.
|
|
52
|
+
*/
|
|
53
|
+
function firstPartyDesktopOutcome(enabled: boolean, target?: string): RouteClientOutcome {
|
|
54
|
+
const base = { client: "claude-desktop" as const, ...(target === undefined ? {} : { target }) };
|
|
55
|
+
if (enabled) return { ...base, outcome: "current", message: "Claude Desktop first-party mode already routes through OpenCodex" };
|
|
56
|
+
const command = readClientConnectionState().kind === "connected"
|
|
57
|
+
? "switch modes with ocx claude desktop apply --gateway, then run ocx route to sync"
|
|
58
|
+
: "turn it off with ocx integrations native claude-desktop off";
|
|
59
|
+
return { ...base, outcome: "conflict", message: `Claude Desktop is in first-party mode; ${command}` };
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Caller holds the lifecycle fence; the config coordinator rechecks guard before each commit.
|
|
64
|
+
* `recordStandalone` is true only for a Child's link write: it records the standalone value
|
|
65
|
+
* write-ahead so disconnect or a failed enrollment can restore it. Home writes are the
|
|
66
|
+
* operator's own decisions and are not recorded.
|
|
67
|
+
*/
|
|
68
|
+
export function persistNativeRouteIntent(client: "codex" | "claude" | "claude-desktop" | "grok", enabled: boolean, guard: () => void, snapshot: OcxConfig,
|
|
69
|
+
recordStandalone: boolean): OcxConfig {
|
|
70
|
+
const now = new Date();
|
|
71
|
+
const apply = (config: OcxConfig): boolean => {
|
|
72
|
+
const previous = client === "claude" ? config.claudeCode?.enabled !== false : config.clientIntegrations?.[client] !== false;
|
|
73
|
+
if (previous === enabled) return false;
|
|
74
|
+
if (client === "claude") {
|
|
75
|
+
// The legacy flag also supplied the shared Messages API default. A local opt-out
|
|
76
|
+
// must preserve that preexisting exposure for other devices and Desktop clients.
|
|
77
|
+
if (!enabled && resolveApiSurfaceSettings(config).messages.source === "claude-code-legacy") {
|
|
78
|
+
config.apiSurfaces = { ...config.apiSurfaces, messages: { enabled: resolveApiSurfaceSettings(config).messages.enabled } };
|
|
79
|
+
}
|
|
80
|
+
commitClaudeCodeBlock(config, { ...config.claudeCode, enabled }, now);
|
|
81
|
+
}
|
|
82
|
+
else config.clientIntegrations = { ...config.clientIntegrations, [client]: enabled };
|
|
83
|
+
return true;
|
|
84
|
+
};
|
|
85
|
+
const result = withConfigMutationLockSync(() => {
|
|
86
|
+
let recorded = false;
|
|
87
|
+
if (recordStandalone) {
|
|
88
|
+
guard();
|
|
89
|
+
const base = readConfigForAdmittedMutation(), planned = structuredClone(base);
|
|
90
|
+
if (apply(planned)) recorded = prepareNativeIntentWrite(nativeIntentFields(base), nativeIntentFields(planned));
|
|
91
|
+
}
|
|
92
|
+
const outcome = mutatePersistedConfig(config => {
|
|
93
|
+
guard();
|
|
94
|
+
return { changed: apply(config), value: config };
|
|
95
|
+
});
|
|
96
|
+
if (outcome.status !== "unavailable" && recorded) publishNativeIntentWrite(nativeIntentFields(outcome.value));
|
|
97
|
+
return outcome;
|
|
98
|
+
});
|
|
99
|
+
if (result.status === "unavailable") throw new Error(`Local native route intent could not be persisted (${result.reason})`);
|
|
100
|
+
if (client === "claude") {
|
|
101
|
+
snapshot.claudeCode = { ...snapshot.claudeCode, enabled,
|
|
102
|
+
...(result.value.claudeCode?.authModeMigratedAt ? { authModeMigratedAt: result.value.claudeCode.authModeMigratedAt } : {}) };
|
|
103
|
+
if (result.value.apiSurfaces?.messages !== undefined) snapshot.apiSurfaces = { ...snapshot.apiSurfaces, messages: { ...result.value.apiSurfaces.messages } };
|
|
104
|
+
}
|
|
105
|
+
else if (result.value.clientIntegrations) snapshot.clientIntegrations = { ...result.value.clientIntegrations };
|
|
106
|
+
else delete snapshot.clientIntegrations;
|
|
107
|
+
return result.value;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
async function applyNative(
|
|
111
|
+
input: RouteIntentApplyInput, options: LocalRouteIntentOptions, client: "codex" | "claude" | "claude-desktop" | "grok", intent: RouteClientIntent,
|
|
112
|
+
): Promise<RouteClientOutcome> {
|
|
113
|
+
const guard = input.beforeWrite!;
|
|
114
|
+
const home = input.home ?? homedir();
|
|
115
|
+
const env = input.env ?? process.env;
|
|
116
|
+
const desktopMode = client === "claude-desktop" ? await import("../claude/desktop-first-party") : undefined;
|
|
117
|
+
const homeSwitch = liveHomeSwitch(input.document, client, options);
|
|
118
|
+
// The committed flag reaches the caller's working snapshot too. The management owner mirrors
|
|
119
|
+
// these individual flags onto its live config; a copied request config cannot do that for it.
|
|
120
|
+
const committedConfig = withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
121
|
+
guard();
|
|
122
|
+
if (desktopMode) {
|
|
123
|
+
const current = loadConfig();
|
|
124
|
+
if (desktopMode.resolveClaudeDesktopMode(current, desktopMode.observeClaudeDesktopMode(current)) === "first-party") return null;
|
|
125
|
+
}
|
|
126
|
+
if (homeSwitch) return loadConfig();
|
|
127
|
+
// Only a connected Child's write displaces a standalone value; the Home owns its own flags.
|
|
128
|
+
return persistNativeRouteIntent(client, intent.enabled, guard, input.config, readClientConnectionState().kind === "connected");
|
|
129
|
+
}), options.lifecycleLockDeps);
|
|
130
|
+
if (committedConfig === null) return firstPartyDesktopOutcome(intent.enabled);
|
|
131
|
+
if (client === "codex") {
|
|
132
|
+
const { getCodexHome, CODEX_CONFIG_PATH, DEFAULT_CATALOG_PATH } = await import("../codex/paths");
|
|
133
|
+
const { injectCodexConfig, restoreNativeCodexAsync, currentExternalCodexModelProvider, isCodexRoutingInjected } = await import("../codex/inject");
|
|
134
|
+
const target = CODEX_CONFIG_PATH;
|
|
135
|
+
guard();
|
|
136
|
+
if (!existsSync(getCodexHome())) return { client, target, outcome: intent.enabled ? "not_installed" : "current" };
|
|
137
|
+
if (intent.enabled && options.codexApplied) return { client, target, outcome: "current" };
|
|
138
|
+
const externalProvider = currentExternalCodexModelProvider();
|
|
139
|
+
if (externalProvider) {
|
|
140
|
+
const { approvedCodexProviders } = await import("../codex/provider-routing");
|
|
141
|
+
if (!approvedCodexProviders().includes(externalProvider)) return { client, target, outcome: intent.enabled ? "conflict" : "current", message: "Codex has an external provider" };
|
|
142
|
+
}
|
|
143
|
+
if (!intent.enabled && !isCodexRoutingInjected()) return { client, target, outcome: "current" };
|
|
144
|
+
const config = committedConfig;
|
|
145
|
+
if (!intent.enabled) {
|
|
146
|
+
const result = await restoreNativeCodexAsync({ withWriteGuard: work => withConfigMutationLockSync(() => { guard(); return work(); }) });
|
|
147
|
+
return { client, target, outcome: result.success ? "current" : "failed", message: result.message };
|
|
148
|
+
}
|
|
149
|
+
const state = readClientConnectionState();
|
|
150
|
+
const result = await injectCodexConfig(input.config.port, { ...config, syncResumeHistory: false }, {
|
|
151
|
+
catalogPath: DEFAULT_CATALOG_PATH, beforeClientWrite: guard,
|
|
152
|
+
...(state.kind === "connected" ? { journalOwner: { kind: "client" as const, apiKeyId: state.value.apiKeyId },
|
|
153
|
+
routingTarget: { baseUrl: `http://127.0.0.1:${input.config.port}/v1`, requiresAdmissionToken: false, tokenEnv: "OPENCODEX_API_AUTH_TOKEN" as const } } : {}),
|
|
154
|
+
});
|
|
155
|
+
return { client, target, outcome: result.success && result.status !== "skipped" ? "current" : "failed", message: result.message };
|
|
156
|
+
}
|
|
157
|
+
if (client === "claude") {
|
|
158
|
+
const target = env.CLAUDE_CONFIG_DIR || join(home, ".claude");
|
|
159
|
+
if (!existsSync(target)) return { client, target, outcome: intent.enabled ? "not_installed" : "current" };
|
|
160
|
+
if (!intent.enabled) {
|
|
161
|
+
const { injectClaudeAgentDefs } = await import("../claude/agents-inject");
|
|
162
|
+
const cleaned = withClientLifecycleSync(() => { guard(); return injectClaudeAgentDefs(committedConfig, {}, target); }, options.lifecycleLockDeps);
|
|
163
|
+
if (cleaned === null) return { client, target, outcome: "failed", message: "Owned Claude agent definitions could not be removed" };
|
|
164
|
+
}
|
|
165
|
+
// Claude Code uses the existing launcher and selectedClients gate; no foreign config is copied.
|
|
166
|
+
return { client, target, outcome: "current" };
|
|
167
|
+
}
|
|
168
|
+
if (client === "grok") {
|
|
169
|
+
const { injectGrokConfig, stripGrokConfig } = await import("../grok/inject");
|
|
170
|
+
const { inspectGrokConfig } = await import("../grok/inspect");
|
|
171
|
+
const grokHome = env.GROK_HOME || join(home, ".grok");
|
|
172
|
+
const target = join(grokHome, "config.toml");
|
|
173
|
+
if (implicitHomeIntent(input.document, client, intent, options) && !localClientSyncAllowed(input.config)) {
|
|
174
|
+
return { client, target, outcome: "current", message: "Grok sync is gated on this Home, as it is at startup" };
|
|
175
|
+
}
|
|
176
|
+
return withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
177
|
+
guard();
|
|
178
|
+
const state = inspectGrokConfig({ grokHome });
|
|
179
|
+
if (state.kind === "not_installed") return { client, target, outcome: intent.enabled ? "not_installed" : "current" };
|
|
180
|
+
if (state.kind === "orphaned_marker") return { client, target, outcome: "conflict", message: "Grok managed block is incomplete" };
|
|
181
|
+
if (!intent.enabled && state.kind === "absent") return { client, target, outcome: "current" };
|
|
182
|
+
const destination = localInferenceDestination(input.config, input.config.port);
|
|
183
|
+
if (intent.enabled && destination.requiresAdmissionToken) return { client, target, outcome: "failed", message: "Grok requires a credential-free local listener" };
|
|
184
|
+
const result = intent.enabled ? injectGrokConfig(destination.port, input.models.map(model => ({
|
|
185
|
+
id: model.namespaced, name: model.displayName, contextWindow: model.contextWindow,
|
|
186
|
+
reasoningEfforts: model.reasoningEfforts, defaultReasoningEffort: model.defaultReasoningEffort,
|
|
187
|
+
})), { grokHome, hostname: "127.0.0.1" }) : stripGrokConfig({ grokHome });
|
|
188
|
+
return { client, target, outcome: result.ok && !result.skippedReason ? "current" : "failed", message: result.message };
|
|
189
|
+
}), options.lifecycleLockDeps);
|
|
190
|
+
}
|
|
191
|
+
const desktop = await import("../claude/desktop-3p");
|
|
192
|
+
guard();
|
|
193
|
+
// The durable marker: a caller's snapshot can predate a Desktop apply by another process.
|
|
194
|
+
const inspected = desktop.inspectDesktop3pConfigLibrary({ appliedFingerprint: committedConfig.claudeCode?.desktopProfile?.appliedFingerprint });
|
|
195
|
+
const target = inspected.selectedProfilePath ?? inspected.libraryPath;
|
|
196
|
+
if (inspected.kind === "not_installed") return { client, target, outcome: intent.enabled ? "not_installed" : "current" };
|
|
197
|
+
const state = readClientConnectionState();
|
|
198
|
+
// Connected profiles carry their own owner/projection evidence, not the standalone marker.
|
|
199
|
+
if (!intent.enabled && state.kind === "connected") {
|
|
200
|
+
guard();
|
|
201
|
+
const result = desktop.removeDesktop3pStandardPivot({ lifecycleLockDeps: options.lifecycleLockDeps });
|
|
202
|
+
return { client, target, outcome: result.ok ? "current" : result.reason === "conflict" ? "conflict" : "failed" };
|
|
203
|
+
}
|
|
204
|
+
const firstParty = (config: OcxConfig) => desktopMode!.resolveClaudeDesktopMode(config, desktopMode!.observeClaudeDesktopMode(config)) === "first-party";
|
|
205
|
+
const modeConflict: RouteClientOutcome = { client, target, outcome: "conflict", message: "Claude Desktop first-party mode needs its existing mode-switch transaction" };
|
|
206
|
+
if (intent.enabled && state.kind === "connected") {
|
|
207
|
+
const { applyRemoteDesktopStore } = await import("../claude/desktop-remote-store");
|
|
208
|
+
const { readServiceApiTokenState } = await import("../lib/service-secrets");
|
|
209
|
+
const models = desktop.generateDesktop3pModels(input.models.filter(model => model.native).map(model => model.id),
|
|
210
|
+
input.models.filter(model => !model.native).map(model => ({ provider: model.provider, id: model.id, contextWindow: model.contextWindow })));
|
|
211
|
+
return withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
212
|
+
guard();
|
|
213
|
+
if (firstParty(loadConfig())) return firstPartyDesktopOutcome(true, target);
|
|
214
|
+
const token = readServiceApiTokenState();
|
|
215
|
+
if (token.kind !== "present") return { client, target, outcome: "failed", message: "Child service credential is unavailable" };
|
|
216
|
+
const result = applyRemoteDesktopStore(held, {
|
|
217
|
+
owner: { serverUrl: state.value.serverUrl, apiKeyId: state.value.apiKeyId, connectedAt: state.value.connectedAt },
|
|
218
|
+
expectedTokenFingerprint: token.fingerprint, baseUrl: `http://127.0.0.1:${input.config.port}`,
|
|
219
|
+
apiKey: "opencodex-loopback", mode: "static", models, localListener: true, overwriteConflict: options.overwriteConflict,
|
|
220
|
+
});
|
|
221
|
+
return { client, target: result.ok ? result.path ?? target : target, outcome: result.ok ? "current" : result.reason === "conflict" ? "conflict" : "failed" };
|
|
222
|
+
}), options.lifecycleLockDeps);
|
|
223
|
+
}
|
|
224
|
+
if (!intent.enabled && inspected.kind === "no_owned_state") return { client, target, outcome: "current" };
|
|
225
|
+
const appliedFingerprint = committedConfig.claudeCode?.desktopProfile?.appliedFingerprint;
|
|
226
|
+
const refreshOnly = implicitHomeIntent(input.document, client, intent, options);
|
|
227
|
+
const changedProfile = ["unsafe", "broken", "gateway_drifted"].includes(inspected.kind);
|
|
228
|
+
if (changedProfile && refreshOnly) {
|
|
229
|
+
// Only an OpenCodex-owned profile can have changed under a refresh. An unreadable library or one
|
|
230
|
+
// selecting another app's profile was never ours, so the refresh has nothing to do there.
|
|
231
|
+
const owned = inspected.ownedProfileActive === true || (inspected.ownedProfileActive === null && !!appliedFingerprint);
|
|
232
|
+
if (!owned) return { client, target, outcome: "current", message: IMPLICIT_DESKTOP_MESSAGE };
|
|
233
|
+
// A refresh never takes over a changed profile, even with overwrite: that is a decided write.
|
|
234
|
+
return { client, target, outcome: "conflict",
|
|
235
|
+
message: "Claude Desktop ownership or profile changed; replace it with ocx route to claude-desktop on --device home --overwrite-conflict" };
|
|
236
|
+
}
|
|
237
|
+
if (changedProfile && !options.overwriteConflict) return { client, target, outcome: "conflict", message: "Claude Desktop ownership or profile changed" };
|
|
238
|
+
// Only an absent or untouched profile satisfies a refresh-only switch.
|
|
239
|
+
if (refreshOnly && (inspected.kind !== "gateway_ours" || !appliedFingerprint)) return { client, target, outcome: "current", message: IMPLICIT_DESKTOP_MESSAGE };
|
|
240
|
+
if (!intent.enabled) {
|
|
241
|
+
guard();
|
|
242
|
+
const result = desktop.removeDesktop3pStandardPivot({ appliedFingerprint: committedConfig.claudeCode?.desktopProfile?.appliedFingerprint, lifecycleLockDeps: options.lifecycleLockDeps });
|
|
243
|
+
return { client, target, outcome: result.ok ? "current" : "failed" };
|
|
244
|
+
}
|
|
245
|
+
const { getClaudePickerController } = await import("../claude/intercept/runtime");
|
|
246
|
+
const { runDesktopTransition } = await import("../claude/desktop-picker");
|
|
247
|
+
// Mode switches share picker exclusion in-process and L→C across CLI/server writers.
|
|
248
|
+
// Keep the file write and marker together, reusing the existing writer with this lease.
|
|
249
|
+
return runDesktopTransition<RouteClientOutcome>(getClaudePickerController(), async () => withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
250
|
+
guard();
|
|
251
|
+
const config = loadConfig();
|
|
252
|
+
if (firstParty(config)) return firstPartyDesktopOutcome(true, target);
|
|
253
|
+
const profile = config.claudeCode?.desktopProfile;
|
|
254
|
+
const result = desktop.writeDesktop3pConfig(input.config.port,
|
|
255
|
+
input.models.filter(model => model.native).map(model => model.id),
|
|
256
|
+
input.models.filter(model => !model.native).map(model => ({ provider: model.provider, id: model.id, contextWindow: model.contextWindow })),
|
|
257
|
+
undefined, "static", profile, undefined, options.lifecycleLockDeps,
|
|
258
|
+
refreshOnly ? { appliedFingerprint: appliedFingerprint!, admit: () => !firstParty(loadConfig()) } : undefined, held);
|
|
259
|
+
if (refreshOnly && result.reason === "desktop_refresh_only_skipped") return { client, target, outcome: "current", message: IMPLICIT_DESKTOP_MESSAGE };
|
|
260
|
+
if (!result.written) return { client, target, outcome: "failed", message: result.reason ?? "Claude Desktop writer refused" };
|
|
261
|
+
guard();
|
|
262
|
+
if (firstParty(loadConfig())) return modeConflict;
|
|
263
|
+
if (refreshOnly) {
|
|
264
|
+
// A refresh keeps the existing mode; only the applied marker follows the new bytes.
|
|
265
|
+
const marked = commitDesktopAppliedMarker(captureDesktopAppliedMarker(profile), result.fingerprint!);
|
|
266
|
+
return { client, target, outcome: marked.status !== "unavailable" && marked.value ? "current" : "failed" };
|
|
267
|
+
}
|
|
268
|
+
const recorded = persistCommittedDesktopGateway(config, config.claudeCode?.desktopProfile, result.fingerprint, current => !firstParty(current));
|
|
269
|
+
return { client, target, outcome: recorded.ok ? "current" : "failed" };
|
|
270
|
+
}), options.lifecycleLockDeps), { config: committedConfig });
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
export function materializeLocalRouteIntent(
|
|
274
|
+
config: OcxConfig, document: HomeRouteIntentDocument, models: readonly ExportModel[], options: LocalRouteIntentOptions = {},
|
|
275
|
+
): Promise<RouteIntentReceipt> {
|
|
276
|
+
const expected = readClientConnectionState();
|
|
277
|
+
const configuredPort = loadConfig().port;
|
|
278
|
+
const beforeWrite = () => {
|
|
279
|
+
options.beforeWrite?.();
|
|
280
|
+
assertRouteIntentPort(config.port);
|
|
281
|
+
if (loadConfig().port !== configuredPort) throw new Error("client_runtime_changed");
|
|
282
|
+
assertNoClientDisconnectPending();
|
|
283
|
+
const current = readClientConnectionState();
|
|
284
|
+
if (expected.kind === "connected" ? current.kind !== "connected" || !sameClientConnectionOwner(current.value, expected.value)
|
|
285
|
+
: current.kind !== expected.kind || current.kind !== "disconnected") throw new Error("client_connection_changed");
|
|
286
|
+
};
|
|
287
|
+
const input: RouteIntentApplyInput = { config, document: structuredClone(document), models: structuredClone([...models]), ...options, beforeWrite,
|
|
288
|
+
...(expected.kind === "connected" && expected.value.link ? { linkId: expected.value.link.linkId } : {}),
|
|
289
|
+
localOff: expected.kind === "connected" && expected.value.transport === "link" ? undefined : [] };
|
|
290
|
+
return materializeRouteIntent({ ...input, withFileWrites: work => withClientLifecycle(work, options.lifecycleLockDeps),
|
|
291
|
+
withReceiptWrite: write => withClientLifecycleSync(() => { beforeWrite(); write(); }, options.lifecycleLockDeps),
|
|
292
|
+
applyNative: (client, intent) => applyNative(input, { ...options, overwriteConflict: options.overwriteConflict === true && (options.overwriteClient === undefined || options.overwriteClient === client) }, client, intent) });
|
|
293
|
+
}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* File integrations a linked Child owned before linking.
|
|
3
|
+
*
|
|
4
|
+
* A Child applying its Home's route intent disables, refreshes or creates file-integration blocks.
|
|
5
|
+
* Without this record, disconnect cannot tell a block the link created from one the person had
|
|
6
|
+
* set up on their own, and removed both. At the first link apply, before any client changes, the
|
|
7
|
+
* Child records which file clients had an ownership record (with their model-name policy). The
|
|
8
|
+
* record is private, bound to the link that captured it, and carries no paths or secrets.
|
|
9
|
+
*
|
|
10
|
+
* Disconnect restores those clients to their standalone state: a client the link left owned is
|
|
11
|
+
* kept as is, a client the link disabled is applied again, and a client the person changed in the
|
|
12
|
+
* meantime (a local opt-out, or a block of their own) is left alone. Clients the link created keep
|
|
13
|
+
* the ordinary cleanup. Aside profiles are not recorded and keep that cleanup too.
|
|
14
|
+
*
|
|
15
|
+
* Callers hold the client lifecycle lock; reads are strict, so a damaged record refuses the
|
|
16
|
+
* disconnect instead of silently dropping a standalone integration.
|
|
17
|
+
*/
|
|
18
|
+
import { chmodSync, lstatSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
|
|
19
|
+
import { join } from "node:path";
|
|
20
|
+
import { atomicWriteFile, isMissingPathError } from "../config/atomic-write";
|
|
21
|
+
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
22
|
+
import { hardenSecretDir } from "../lib/windows-secret-acl";
|
|
23
|
+
import { linkDir } from "../link/paths";
|
|
24
|
+
import { ROUTE_CLIENT_IDS, type RouteClientId } from "../link/route-intent";
|
|
25
|
+
|
|
26
|
+
type ModelNames = "alias" | "routed";
|
|
27
|
+
export interface FileIntentOriginals {
|
|
28
|
+
version: 1;
|
|
29
|
+
linkId: string;
|
|
30
|
+
clients: Partial<Record<RouteClientId, { modelNames?: ModelNames }>>;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
const RECORD_MAX_BYTES = 16 * 1024;
|
|
34
|
+
const NOT_FILE_CLIENTS: readonly RouteClientId[] = ["codex", "claude", "claude-desktop", "grok", "aside"];
|
|
35
|
+
const FILE_CLIENTS = ROUTE_CLIENT_IDS.filter(client => !NOT_FILE_CLIENTS.includes(client));
|
|
36
|
+
const isRecord = (value: unknown): value is Record<string, unknown> => value !== null && typeof value === "object" && !Array.isArray(value);
|
|
37
|
+
|
|
38
|
+
export function fileIntentOriginalsPath(): string { return join(linkDir(), "file-intent-originals.json"); }
|
|
39
|
+
|
|
40
|
+
const unsafe = (): never => {
|
|
41
|
+
throw new Error(`File integration originals record is unreadable; inspect or remove ${fileIntentOriginalsPath()} and retry`);
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
function parse(value: unknown): FileIntentOriginals {
|
|
45
|
+
if (!isRecord(value) || value.version !== 1 || typeof value.linkId !== "string" || !/^lnk_[0-9a-f]{16}$/.test(value.linkId)
|
|
46
|
+
|| !isRecord(value.clients) || Object.keys(value).length !== 3) return unsafe();
|
|
47
|
+
for (const [client, entry] of Object.entries(value.clients)) {
|
|
48
|
+
if (!(FILE_CLIENTS as readonly string[]).includes(client) || !isRecord(entry)
|
|
49
|
+
|| Object.keys(entry).some(key => key !== "modelNames")
|
|
50
|
+
|| (entry.modelNames !== undefined && entry.modelNames !== "alias" && entry.modelNames !== "routed")) return unsafe();
|
|
51
|
+
}
|
|
52
|
+
return value as unknown as FileIntentOriginals;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** Missing reads as null; a present but malformed record refuses. */
|
|
56
|
+
export function readFileIntentOriginals(): FileIntentOriginals | null {
|
|
57
|
+
let stat;
|
|
58
|
+
try { stat = lstatSync(fileIntentOriginalsPath()); } catch (error) { if (isMissingPathError(error)) return null; throw error; }
|
|
59
|
+
if (!stat.isFile() || stat.size > RECORD_MAX_BYTES) return unsafe();
|
|
60
|
+
let value: unknown;
|
|
61
|
+
try { value = JSON.parse(readFileSync(fileIntentOriginalsPath(), "utf8")); } catch { return unsafe(); }
|
|
62
|
+
return parse(value);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
function writeRecord(record: FileIntentOriginals): void {
|
|
66
|
+
parse(record);
|
|
67
|
+
const dir = linkDir();
|
|
68
|
+
assertNotRealHomeUnderTest(join(dir, ".."));
|
|
69
|
+
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
70
|
+
if (process.platform === "win32") hardenSecretDir(dir, { required: true });
|
|
71
|
+
else chmodSync(dir, 0o700);
|
|
72
|
+
atomicWriteFile(fileIntentOriginalsPath(), `${JSON.stringify(record, null, 2)}\n`);
|
|
73
|
+
if (process.platform !== "win32") chmodSync(fileIntentOriginalsPath(), 0o600);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
export function clearFileIntentOriginals(): void {
|
|
77
|
+
assertNotRealHomeUnderTest(join(linkDir(), ".."));
|
|
78
|
+
try { unlinkSync(fileIntentOriginalsPath()); } catch (error) { if (!isMissingPathError(error)) throw error; }
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Write-ahead capture for a link's first apply. `firstApply` is false once a route receipt bound
|
|
83
|
+
* to a link exists, so clients a link created are never recorded as standalone. A record from
|
|
84
|
+
* another link is stale and is replaced.
|
|
85
|
+
*/
|
|
86
|
+
export function captureFileIntentOriginals(linkId: string, firstApply: boolean,
|
|
87
|
+
owners: Partial<Record<string, { modelNames?: ModelNames } | undefined>>): void {
|
|
88
|
+
const existing = readFileIntentOriginals();
|
|
89
|
+
if (existing?.linkId === linkId || !firstApply) return;
|
|
90
|
+
const clients: FileIntentOriginals["clients"] = {};
|
|
91
|
+
for (const client of FILE_CLIENTS) {
|
|
92
|
+
const owner = owners[client];
|
|
93
|
+
if (owner) clients[client] = owner.modelNames ? { modelNames: owner.modelNames } : {};
|
|
94
|
+
}
|
|
95
|
+
if (Object.keys(clients).length === 0) { if (existing) clearFileIntentOriginals(); return; }
|
|
96
|
+
writeRecord({ version: 1, linkId, clients });
|
|
97
|
+
}
|