@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
|
@@ -1,14 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
|
+
import { isRouteClientId, ROUTE_CLIENT_IDS } from "../../link/route-intent";
|
|
3
|
+
import { seedRouteDeviceClients, reconcileHomeRouteDevices } from "../../routing/home-route-intent";
|
|
4
|
+
import { probe, confirmHost, apply, serialized } from "./link-enrollment";
|
|
5
|
+
import { fail, pairedSession, auth, port, isRecord, exactBody, runnerFor, readStoreFor, writeStoreFor, knownHostsFile, issueKey, revokeKeyIdempotent, compensateNewLink, reconcileLinkListener, type LinkRouteState } from "./link-route-state";
|
|
3
6
|
export type { LinkRouteState, PendingLinkHost, ConfirmedLinkHost, LinkRouteListener } from "./link-route-state";
|
|
4
7
|
import { requireRemotePlatform } from "../../link/remote-platform";
|
|
5
|
-
import { purgeDisconnectRemote } from "../../link/remote-plant";
|
|
8
|
+
import { CHILD_USAGE_EXIT, classifyBoundRefusal, purgeDisconnectRemote } from "../../link/remote-plant";
|
|
6
9
|
import { assertSshAlias, buildExecArgv, remoteOcxArgv } from "../../link/ssh-argv";
|
|
7
10
|
import { clearCompensationFailed, compensationPath, readCompensation } from "../../link/compensation";
|
|
11
|
+
import { LinkTombstoneLimitError, readTombstones, recordTombstone, removeOwnTombstone, tombstoneNamesAlias, tombstonesPath, type LinkTombstone } from "../../link/tombstones";
|
|
8
12
|
import { loadHostCandidates } from "../../link/ssh-config";
|
|
9
|
-
import { newLinkId, type LinkStore } from "../../link/store";
|
|
13
|
+
import { effectiveLinkRoutes, newLinkId, type LinkStore } from "../../link/store";
|
|
14
|
+
import { claimLinkRetirement, clearLinkRetirement, disownLinkRetirement, readLinkRetirement, reownLinkRetirement, type LinkRetirement, type LinkRetirementMode } from "../../link/retirement";
|
|
10
15
|
import { sshFailureHint, sshRunnerErrorHint } from "../../link/ssh-runner";
|
|
11
|
-
import { attachLinkPeers, attachLinkTunnelDiagnostics, projectLinkStatus, type LinkStatusDto } from "../../link/status-projection";
|
|
16
|
+
import { attachLinkPeers, attachLinkRoutes, attachLinkTransport, attachLinkTunnelDiagnostics, projectLinkStatus, type LinkStatusDto } from "../../link/status-projection";
|
|
12
17
|
import { homeLinkChildParity } from "../../link/child-parity";
|
|
13
18
|
import { codexSettingsDigest, projectHomeCodexSettings } from "../../link/codex-settings";
|
|
14
19
|
import { localLinkPeer } from "../../link/compatibility";
|
|
@@ -20,9 +25,12 @@ import { clientLinkStatusIdentity } from "../../client/link-status";
|
|
|
20
25
|
import { clientLinkTunnelStatus } from "../../client/link-tunnel";
|
|
21
26
|
import { withConfigMutationLockSync } from "../../config/mutation-lock";
|
|
22
27
|
import type { ManagementContext } from "./context";
|
|
23
|
-
import { readManagementJsonBodyOr } from "./body";
|
|
28
|
+
import { readManagementJsonBodyOr, readOptionalManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
29
|
+
import { linkDiagnosticsResponse } from "./link-diagnostics-route";
|
|
24
30
|
import { type IssuedApiKey } from "./oauth-account-routes";
|
|
25
31
|
import { acceptSystemRestart, resolveListenPort } from "./system-restart";
|
|
32
|
+
import { cleanupRecorded, journalInUse, journalOpenFailure, journalPathFor, journalUnreadable, NO_REVOKE_JOURNAL, openRevokeConflict, openRevokeJournal, replayOperation, resumedRevokeJournal, retirementOwner, revokeOperationDigest, fenceRetirementOwnerForForce, settleResumedRevoke, underAliasLock, type ForceTakeover, type RevokeJournal } from "./link-operation";
|
|
33
|
+
import { findOperation, isOperationId, readOperationsJournal, revokeSuspendingLink } from "../../link/operations-journal";
|
|
26
34
|
|
|
27
35
|
const LINK_ID = /^lnk_[0-9a-f]{16}$/;
|
|
28
36
|
const isLinkPath = (path: string): boolean => path === "/api/link" || path.startsWith("/api/link/");
|
|
@@ -75,9 +83,12 @@ async function candidates(ctx: ManagementContext): Promise<Response> {
|
|
|
75
83
|
}
|
|
76
84
|
|
|
77
85
|
async function issue(ctx: ManagementContext): Promise<Response> {
|
|
78
|
-
const
|
|
86
|
+
const raw = await readManagementJsonBodyOr(ctx.req, null);
|
|
87
|
+
const body = exactBody(raw, isRecord(raw) && Object.hasOwn(raw, "selectedClients") ? ["alias", "tunnelPort", "selectedClients"] : ["alias", "tunnelPort"]);
|
|
79
88
|
if (!body || typeof body.alias !== "string" || !isLinkPort(body.tunnelPort)) return fail("invalid_body", "alias and tunnelPort are required.", 400);
|
|
80
89
|
try { assertSshAlias(body.alias); } catch { return fail("invalid_alias", "alias must be a valid SSH host alias.", 400); }
|
|
90
|
+
const selection = body.selectedClients;
|
|
91
|
+
if (selection !== undefined && (!Array.isArray(selection) || selection.length === 0 || selection.length > ROUTE_CLIENT_IDS.length || !selection.every(isRouteClientId) || new Set(selection).size !== selection.length)) return fail("invalid_body", "selectedClients must contain unique supported clients", 400);
|
|
81
92
|
let issued: IssuedApiKey;
|
|
82
93
|
try { issued = issueKey(ctx, `link:${body.alias}`); }
|
|
83
94
|
catch { return fail("key_issue_failed", "The link key could not be issued.", 503); }
|
|
@@ -105,6 +116,7 @@ async function issue(ctx: ManagementContext): Promise<Response> {
|
|
|
105
116
|
const compensation = await compensateNewLink(ctx, state, record);
|
|
106
117
|
return compensation ?? fail("link_exists", "A link for this alias already exists.", 409);
|
|
107
118
|
}
|
|
119
|
+
withConfigMutationLockSync(() => seedRouteDeviceClients(ctx.config, ctx.version, id, selection as import("../../link/route-intent").RouteClientId[] | undefined, readStoreFor(ctx).links.map(link => link.id)));
|
|
108
120
|
await state.listener.ensureStarted();
|
|
109
121
|
if (state.listener.status().state !== "listening") {
|
|
110
122
|
failureCode = "listener_unavailable";
|
|
@@ -191,33 +203,351 @@ async function reconnect(ctx: ManagementContext, state: LinkRouteState, id: stri
|
|
|
191
203
|
await state.listener.ensureStarted();
|
|
192
204
|
if (state.listener.status().state !== "listening") return fail("listener_unavailable", "The link listener is unavailable.", 503);
|
|
193
205
|
await state.supervisor.ensureStarted();
|
|
194
|
-
|
|
206
|
+
const restarted = await state.supervisor.reconnect(id);
|
|
207
|
+
if (restarted === "suspended") return suspendedRefusal(ctx, id);
|
|
208
|
+
if (!restarted) return fail("link_unavailable", "The link tunnel could not be restarted.", 503);
|
|
195
209
|
} catch {
|
|
196
210
|
return fail("link_unavailable", "The link tunnel could not be restarted.", 503);
|
|
197
211
|
}
|
|
198
212
|
return Response.json({ linkId: id });
|
|
199
213
|
}
|
|
200
214
|
|
|
215
|
+
/** 409 link_suspended: an unsettled revoke keeps the tunnel down (revokeSuspendsLink); the answer names it and the way out. */
|
|
216
|
+
function suspendedRefusal(ctx: ManagementContext, id: string): Response {
|
|
217
|
+
const suspension = revokeSuspendingLink(journalPathFor(ctx), id);
|
|
218
|
+
const headers = { "cache-control": "no-store" };
|
|
219
|
+
if (!suspension) {
|
|
220
|
+
return Response.json({ error: { code: "link_suspended", message: "An unsettled revoke keeps this link's tunnel down; see ocx link operations." } }, { status: 409, headers });
|
|
221
|
+
}
|
|
222
|
+
const op = suspension.operationId;
|
|
223
|
+
const resolve = "ocx link operations resolve --operation-id " + op + " --yes";
|
|
224
|
+
const message = suspension.state === "unknown"
|
|
225
|
+
? "Revoke operation " + op + " ended unknown and may have disconnected or purged the Child, so this link's tunnel stays down. Check the Child, then run: " + resolve
|
|
226
|
+
: "Revoke operation " + op + " did not record its outcome (the Home stopped or the revoke failed before writing it), so this link's tunnel stays down. Repeat it with the flags of the first attempt: ocx link revoke --link-id " + id + " --operation-id " + op + ", with --purge only if the first attempt had it (the journal keeps only a digest of the flags, so a different --purge answers operation_mismatch); if it then ends unknown, run: " + resolve;
|
|
227
|
+
return Response.json({ error: { code: "link_suspended", message }, operationId: op, operationState: suspension.state }, { status: 409, headers });
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
function validRemoveBody(payload: unknown): payload is Record<string, unknown> {
|
|
231
|
+
return isRecord(payload)
|
|
232
|
+
&& !Object.keys(payload).some(key => key !== "force" && key !== "purge" && key !== "operationId")
|
|
233
|
+
&& (payload.force === undefined || typeof payload.force === "boolean")
|
|
234
|
+
&& (payload.purge === undefined || typeof payload.purge === "boolean")
|
|
235
|
+
&& !(payload.force === true && payload.purge === true)
|
|
236
|
+
&& (payload.operationId === undefined || isOperationId(payload.operationId));
|
|
237
|
+
}
|
|
238
|
+
|
|
201
239
|
async function remove(ctx: ManagementContext, state: LinkRouteState, id: string): Promise<Response> {
|
|
202
240
|
if (!LINK_ID.test(id)) return fail("invalid_link_id", "The link id is invalid.", 400);
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
const payload = body === null ? {} : body;
|
|
208
|
-
if (!isRecord(payload)
|
|
209
|
-
|| Object.keys(payload).some(key => key !== "force" && key !== "purge")
|
|
210
|
-
|| (payload.force !== undefined && typeof payload.force !== "boolean")
|
|
211
|
-
|| (payload.purge !== undefined && typeof payload.purge !== "boolean")
|
|
212
|
-
|| (payload.force === true && payload.purge === true)) {
|
|
241
|
+
let payload: unknown;
|
|
242
|
+
try { payload = await readOptionalManagementJsonBody(ctx.req); }
|
|
243
|
+
catch (error) {
|
|
244
|
+
rethrowManagementBodyTooLarge(error);
|
|
213
245
|
return fail("invalid_body", "force and purge must be booleans and cannot both be true.", 400);
|
|
214
246
|
}
|
|
215
|
-
|
|
216
|
-
const
|
|
217
|
-
const
|
|
247
|
+
if (payload === null || payload === undefined) payload = {};
|
|
248
|
+
const valid = validRemoveBody(payload);
|
|
249
|
+
const body = (valid ? payload : {}) as Record<string, unknown>;
|
|
250
|
+
const force = valid && body.force === true, purge = valid && body.purge === true;
|
|
251
|
+
// ocx link revoke --operation-id (structure/remote-link.md, "Operation journal"): a recorded revoke replays even
|
|
252
|
+
// after its link is gone, under the lock of the alias it recorded.
|
|
253
|
+
const operation = valid && typeof body.operationId === "string" ? { id: body.operationId, digest: revokeOperationDigest({ linkId: id, purge, force }) } : null;
|
|
254
|
+
if (operation) {
|
|
255
|
+
let recordedAlias: string | undefined;
|
|
256
|
+
try { recordedAlias = findOperation(readOperationsJournal(journalPathFor(ctx)), operation.id)?.alias; } catch {
|
|
257
|
+
return journalUnreadable();
|
|
258
|
+
}
|
|
259
|
+
if (recordedAlias !== undefined) {
|
|
260
|
+
// Another write may prune the entry between that read and the replay: then this is a first revoke after all,
|
|
261
|
+
// run below once the replay has released the alias lock.
|
|
262
|
+
const notRecorded = new Response(null, { status: 204 });
|
|
263
|
+
const replayed = await underAliasLock(ctx, recordedAlias, true, async () =>
|
|
264
|
+
(await resumeRetirementBeforeReplay(ctx, state, id, operation, force, purge, true)) ?? (await replayOperation(ctx, state, operation, "revoke")) ?? notRecorded);
|
|
265
|
+
if (replayed !== notRecorded) return replayed;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
// An interrupted removal resumes from its retirement receipt even after the record is gone.
|
|
269
|
+
const target = readRemovalTarget(ctx, id);
|
|
270
|
+
if ("response" in target) return target.response;
|
|
271
|
+
// A queued or running job would keep opening SSH sessions to a Child this removal disconnects, so removal takes the
|
|
272
|
+
// link's job admission lock before its first teardown await and holds it to the end: a job submitted meanwhile gets
|
|
273
|
+
// 409 (single link) or a busy item, and a link a job already holds is refused here, before anything is stopped.
|
|
274
|
+
const { childOpsEngineFor } = await import("./link-child-ops-routes");
|
|
275
|
+
const releaseLink = childOpsEngineFor(state).reserve(id);
|
|
276
|
+
if (!releaseLink) return fail("link_operation_in_progress", "A Child operation is running on this link; wait for it to finish, then remove the link.", 409);
|
|
277
|
+
// The body is judged after the reservation, as it was before revokes were journalled (404, then 409, then 400).
|
|
278
|
+
if (!valid) { releaseLink(); return fail("invalid_body", "force and purge must be booleans and cannot both be true.", 400); }
|
|
279
|
+
try {
|
|
280
|
+
// Enrollment and revoke of one alias are serialized: a force revoke cannot run between a purge and its receipt.
|
|
281
|
+
// Also whenever a tombstone names this alias: recover may run against that machine under the alias lock.
|
|
282
|
+
const admitted = operation !== null || journalInUse(ctx) || tombstoneNamesAlias(target.record.alias);
|
|
283
|
+
// A journalled revoke, and every revoke once this Home journals, also takes the per-alias operation set that apply
|
|
284
|
+
// holds for its whole run, so an apply and a revoke of one alias never overlap in this runtime.
|
|
285
|
+
const exclusive = (action: () => Promise<Response>) => admitted ? serialized(state, target.record.alias, action) : action();
|
|
286
|
+
return await underAliasLock(ctx, target.record.alias, admitted, () => exclusive(async () => {
|
|
287
|
+
if (operation) {
|
|
288
|
+
const resumed = await resumeRetirementBeforeReplay(ctx, state, id, operation, force, purge, false);
|
|
289
|
+
if (resumed) return resumed;
|
|
290
|
+
const replay = await replayOperation(ctx, state, operation, "revoke");
|
|
291
|
+
if (replay) return replay;
|
|
292
|
+
}
|
|
293
|
+
// A plain --force may finish any receipt (foreignRetirement). Its refusals run first, before anything changes. Then its
|
|
294
|
+
// owner, if open or unknown, is fenced for the whole takeover (fenceRetirementOwnerForForce) and the receipt is disowned,
|
|
295
|
+
// so the owner is never credited with this removal and a link the force could not remove stays suspended; a takeover
|
|
296
|
+
// that stops before its removal begins restores the owner as it was. A damaged journal does not stop a plain force
|
|
297
|
+
// (as on dev): its owner cannot be fenced, but the receipt is still disowned. A readable journal whose owner cannot
|
|
298
|
+
// be fenced refuses before the receipt changes hands.
|
|
299
|
+
const plainForce = !operation && force;
|
|
300
|
+
let forceReceipt: ReturnType<typeof readLinkRetirement> = null;
|
|
301
|
+
let ownerId: string | undefined;
|
|
302
|
+
let journalReadable = true;
|
|
303
|
+
if (plainForce) {
|
|
304
|
+
try { forceReceipt = readLinkRetirement(id); } catch { return fail("link_remove_failed", "The link retirement could not be read.", 503); }
|
|
305
|
+
if (forceReceipt) {
|
|
306
|
+
try { ownerId = retirementOwner(readOperationsJournal(journalPathFor(ctx)), forceReceipt, true)?.operationId; } catch { journalReadable = false; }
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
const open = openRevokeConflict(ctx, id, operation?.id ?? ownerId, plainForce);
|
|
310
|
+
if (open) return open;
|
|
311
|
+
let fresh = readRemovalTarget(ctx, id);
|
|
312
|
+
if ("response" in fresh) return fresh.response;
|
|
313
|
+
const owned = foreignRetirement(ctx, fresh.receipt, operation?.id, force);
|
|
314
|
+
if (owned) return owned;
|
|
315
|
+
let takeover: ForceTakeover | null = null;
|
|
316
|
+
let disownedReceipt: LinkRetirement | null = null;
|
|
317
|
+
try {
|
|
318
|
+
if (plainForce && forceReceipt) {
|
|
319
|
+
if (journalReadable) {
|
|
320
|
+
try { takeover = fenceRetirementOwnerForForce(ctx, forceReceipt); } catch {
|
|
321
|
+
return fail("operation_journal_failed", "The unfinished revoke that owns this link's removal could not be settled; nothing was changed. Retry the request.", 500);
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
let disowned: boolean;
|
|
325
|
+
try {
|
|
326
|
+
if (forceReceipt.operationId === undefined) disowned = true;
|
|
327
|
+
else { disownedReceipt = disownLinkRetirement(forceReceipt); disowned = disownedReceipt !== null; }
|
|
328
|
+
} catch { disowned = false; }
|
|
329
|
+
if (!disowned) return fail("link_changed", "The link changed during removal.", 409);
|
|
330
|
+
fresh = readRemovalTarget(ctx, id);
|
|
331
|
+
if ("response" in fresh) return fresh.response;
|
|
332
|
+
}
|
|
333
|
+
let journal: RevokeJournal = takeover?.journal ?? NO_REVOKE_JOURNAL;
|
|
334
|
+
if (operation) {
|
|
335
|
+
try { journal = openRevokeJournal(ctx, operation, fresh.record.alias, id); } catch (error) {
|
|
336
|
+
return journalOpenFailure(error);
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
try { return await journal.finish(await removeReserved(ctx, state, id, fresh.record, fresh.receipt, force, purge, journal)); } finally { journal.release(); }
|
|
340
|
+
} finally {
|
|
341
|
+
if (takeover) {
|
|
342
|
+
if (takeover.began) {
|
|
343
|
+
try { takeover.settle(); } catch { /* the owner stays open: suspended, and replayed on repeat */ }
|
|
344
|
+
} else {
|
|
345
|
+
// The removal never reached the tunnel: the receipt goes back to its owner and the owner is restored as it was.
|
|
346
|
+
try { if (disownedReceipt && forceReceipt?.operationId) reownLinkRetirement(disownedReceipt, forceReceipt.operationId); } catch { /* a plain force can still finish it */ }
|
|
347
|
+
try { takeover.abandon(); } catch { /* the owner stays open: suspended, and replayed on repeat */ }
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
}));
|
|
352
|
+
} finally { releaseLink(); }
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
const removalMode = (force: boolean, purge: boolean): LinkRetirementMode => force ? "force" : purge ? "purge" : "disconnect";
|
|
356
|
+
|
|
357
|
+
/**
|
|
358
|
+
* A fresh removal that meets an interrupted removal's receipt continues it only under the same identity (#8416).
|
|
359
|
+
* While the owning entry is journalled, only that operation continues it (its replay resumes the receipt and settles
|
|
360
|
+
* the entry from its own evidence); anything else would be credited with a removal, or a Child purge, it never ran
|
|
361
|
+
* and would clear the receipt the owner settles from. A receipt with no owner, or whose owning entry the journal has
|
|
362
|
+
* pruned, has no evidence any new journal entry could truthfully settle from, not even one reusing the old id: only a
|
|
363
|
+
* plain revoke, which writes no journal and claims no outcome, may finish it.
|
|
364
|
+
* A plain --force may finish any receipt: it removes the link and its key locally, claims no Child cleanup, writes no
|
|
365
|
+
* journal and leaves an owning entry with the outcome it recorded. It is the way out when the recorded cleanup cannot
|
|
366
|
+
* be repeated (a purge already removed the Child's executable).
|
|
367
|
+
*/
|
|
368
|
+
function foreignRetirement(ctx: ManagementContext, receipt: ReturnType<typeof readLinkRetirement>, operationId: string | undefined, force: boolean): Response | null {
|
|
369
|
+
if (!receipt || (operationId === undefined && force)) return null;
|
|
370
|
+
let ownerJournalled = false;
|
|
371
|
+
if (receipt.operationId !== undefined) {
|
|
372
|
+
try { ownerJournalled = retirementOwner(readOperationsJournal(journalPathFor(ctx)), receipt) !== undefined; } catch {
|
|
373
|
+
return journalUnreadable();
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
if (ownerJournalled) {
|
|
377
|
+
return receipt.operationId === operationId ? null
|
|
378
|
+
: fail("link_retirement_owned", `This link's removal was interrupted under operation ${receipt.operationId}; repeat it with --operation-id ${receipt.operationId} to finish it, or remove it locally with --force and no --operation-id.`, 409);
|
|
379
|
+
}
|
|
380
|
+
return operationId === undefined ? null
|
|
381
|
+
: fail("link_retirement_owned", "This link's removal was interrupted with no journalled operation left to settle it; repeat ocx link revoke without --operation-id (with --force if its Child cleanup cannot run again) to finish it.", 409);
|
|
382
|
+
}
|
|
383
|
+
|
|
384
|
+
/**
|
|
385
|
+
* Before a recorded revoke replays its outcome, finish the retirement it left behind (#8416). A revoke interrupted
|
|
386
|
+
* after its record removal, or one whose post-commit cleanup failed, would otherwise replay as committed (or unknown)
|
|
387
|
+
* with the retired device's route intent, the listener reconciliation and the receipt still pending. The cleanup
|
|
388
|
+
* resumes in the receipt's own mode; once it finishes, a revoke whose removal intent preceded the record's
|
|
389
|
+
* disappearance is settled as committed. Returns the cleanup's failure, or null to replay.
|
|
390
|
+
*
|
|
391
|
+
* A resume takes the link's Child-job reservation first (unless the caller already holds it), as a fresh removal
|
|
392
|
+
* does: a job admitted after the restart must not run while the resume revokes its key. While the record is still
|
|
393
|
+
* listed (the process died after claiming the receipt), the resumed revoke and removal are marked on this entry.
|
|
394
|
+
* Only this operation's own receipt, in the mode it asked for, is resumed: a receipt another removal claimed
|
|
395
|
+
* (another operation, or none) leaves the recorded outcome to replay as it stands.
|
|
396
|
+
*/
|
|
397
|
+
async function resumeRetirementBeforeReplay(
|
|
398
|
+
ctx: ManagementContext, state: LinkRouteState, id: string, operation: { id: string; digest: string }, force: boolean, purge: boolean, reserve: boolean,
|
|
399
|
+
): Promise<Response | null> {
|
|
400
|
+
let receipt: ReturnType<typeof readLinkRetirement>;
|
|
401
|
+
let recordListed: boolean;
|
|
218
402
|
try {
|
|
219
|
-
|
|
403
|
+
const op = findOperation(readOperationsJournal(journalPathFor(ctx)), operation.id);
|
|
404
|
+
if (!op || op.kind !== "revoke" || op.digest !== operation.digest || op.linkId !== id) return null;
|
|
405
|
+
receipt = readLinkRetirement(id);
|
|
406
|
+
recordListed = readStoreFor(ctx).links.some(link => link.id === id);
|
|
407
|
+
} catch { return fail("link_remove_failed", "The link retirement could not be read.", 503); }
|
|
408
|
+
// A plain --force took this operation's receipt over and stopped (or died) before committing anything: the record is still
|
|
409
|
+
// listed and its key still present, so the force removed nothing and this operation takes its receipt back and finishes
|
|
410
|
+
// from its own evidence. Once the force has revoked the key or removed the record, the receipt stays the force's.
|
|
411
|
+
if (receipt && receipt.operationId === undefined && receipt.formerOwner === operation.id && receipt.mode === removalMode(force, purge)
|
|
412
|
+
&& recordListed && (ctx.config.apiKeys ?? []).some(key => key.id === receipt!.link.apiKeyId)) {
|
|
413
|
+
try {
|
|
414
|
+
if (reownLinkRetirement(receipt, operation.id)) receipt = readLinkRetirement(id);
|
|
415
|
+
} catch { return fail("link_remove_failed", "The link retirement could not be updated.", 503); }
|
|
416
|
+
}
|
|
417
|
+
// Another identity's receipt is left alone; replay then cannot settle committed while it is outstanding (recoverRevoke).
|
|
418
|
+
if (!receipt || receipt.operationId !== operation.id || receipt.mode !== removalMode(force, purge)) return null;
|
|
419
|
+
let releaseLink: (() => void) | null = null;
|
|
420
|
+
if (reserve) {
|
|
421
|
+
const { childOpsEngineFor } = await import("./link-child-ops-routes");
|
|
422
|
+
releaseLink = childOpsEngineFor(state).reserve(id);
|
|
423
|
+
if (!releaseLink) return fail("link_operation_in_progress", "A Child operation is running on this link; wait for it to finish, then remove the link.", 409);
|
|
424
|
+
}
|
|
425
|
+
try {
|
|
426
|
+
const resumed = await removeReserved(ctx, state, id, receipt.link, receipt, force, purge, resumedRevokeJournal(ctx, operation.id, recordListed));
|
|
427
|
+
if (resumed.status === 200) return null;
|
|
428
|
+
try { await settleResumedRevoke(ctx, operation.id, resumed); } catch { /* the entry stays open: suspended, and replayed on repeat */ }
|
|
429
|
+
return resumed;
|
|
430
|
+
} finally { releaseLink?.(); }
|
|
431
|
+
}
|
|
432
|
+
|
|
433
|
+
/** The link a removal acts on: its retirement receipt (an interrupted removal) or its stored record. */
|
|
434
|
+
function readRemovalTarget(ctx: ManagementContext, id: string):
|
|
435
|
+
| { record: LinkStore["links"][number]; receipt: ReturnType<typeof readLinkRetirement> }
|
|
436
|
+
| { response: Response } {
|
|
437
|
+
let receipt: ReturnType<typeof readLinkRetirement>;
|
|
438
|
+
let found: LinkStore["links"][number] | undefined;
|
|
439
|
+
try {
|
|
440
|
+
receipt = readLinkRetirement(id);
|
|
441
|
+
found = readStoreFor(ctx).links.find(link => link.id === id);
|
|
442
|
+
} catch { return { response: fail("link_remove_failed", "The link retirement could not be read.", 503) }; }
|
|
443
|
+
if (!found && !receipt) return { response: fail("link_not_found", "The link was not found.", 404) };
|
|
444
|
+
if (receipt && found && JSON.stringify(found) !== JSON.stringify(receipt.link)) return { response: fail("link_changed", "The link changed during removal.", 409) };
|
|
445
|
+
return { record: receipt?.link ?? { ...found! }, receipt };
|
|
446
|
+
}
|
|
447
|
+
|
|
448
|
+
|
|
449
|
+
// What each link-bound refusal means and what to do; fixed text, never the Child's own output.
|
|
450
|
+
const BOUND_REFUSAL_MESSAGES: Record<string, string> = Object.assign(Object.create(null) as Record<string, string>, {
|
|
451
|
+
child_link_mismatch: "The Child refused because of who it belongs to or what state it is in, so nothing was disconnected and the link was kept. Do not disconnect it there. Check it with ocx connect status --json (on a lightweight Child, connect status --json of its planted ocx-child, ~/.cache/opencodex/bin/ocx-child, or in Command Prompt on Windows %LOCALAPPDATA%\\opencodex\\bin\\ocx-child.exe, or %USERPROFILE%\\.cache\\opencodex\\bin\\ocx-child.exe where LOCALAPPDATA is not set): if it shows another link, a hub or another Home, or no connection, revoke this link with --force once any enrollment of this link has finished. If it shows this link's id, a connect or key rotation of it may be in progress: let it finish on the Child, then revoke again; if the same answer comes back, revoke this link with --force once any enrollment of this link has finished. If its state cannot be read, repair it on the Child, then revoke again; if you cannot, or the machine cannot be reached, revoke this link with --force once any enrollment of this link has finished.",
|
|
452
|
+
child_residual: "The lightweight Child keeps records it cannot restore, so nothing was disconnected and the link was kept. Do not run a plain ocx-child detach on it: an interrupted attach of another link can be what is left, and a plain detach would remove that link too. Revoke this link with --force.",
|
|
453
|
+
child_disconnect_pending: "The Child has an unfinished disconnect it could not tie to this link and may be partly cleaned; the link was kept. Check it with ocx connect status --json, which cannot say whose disconnect it is: only if it shows no connection, finish it there with ocx disconnect, then revoke again. If it shows any link, a hub or another Home, if its state cannot be read, or if the machine cannot be reached, leave it and revoke this link with --force. If ocx disconnect refuses the receipt as unsafe, revoke with --force too.",
|
|
454
|
+
expect_link_unsupported: "The Child runs an ocx or ocx-child older than --expect-link and another Home-initiated link of this Home may reach the same machine, so it was not disconnected without the link check; the link was kept. Update OpenCodex on a full install, then revoke again (an older planted ocx-child cannot be updated from this Home). Otherwise revoke this link with --force. Revoking the other link instead is no way out unless you mean to end it: no status check can show it is stale (an attach of it still in progress can show no link or an earlier one, and state that cannot be read shows none), under the same pinned host key its revoke is refused the same way, and through a shared route it disconnects the machine if the machine runs that link.",
|
|
455
|
+
});
|
|
456
|
+
|
|
457
|
+
// A forced revoke of an ephemeral Child refused for its tombstone. Either answer comes before this attempt revoked a key or
|
|
458
|
+
// removed a record, and a forced revoke never contacts the Child; an earlier attempt of a resumed revoke may have done more.
|
|
459
|
+
// At the commit-time check this attempt has already stopped the tunnel, so it names only the key, the record and the Child.
|
|
460
|
+
const tombstoneLimit = (): Response => fail("tombstone_limit", "Too many forced revokes are waiting for cleanup; this attempt revoked no key, removed no record and did not contact the Child. Recover them (ocx link recover --link-id <id>; ocx link recover --list shows them), or have a person on this Home run ocx link recover --forget --link-id <id> --yes for a machine that is gone or whose cleanup cannot be proven.", 409);
|
|
461
|
+
const tombstoneWriteFailed = (): Response => fail("tombstone_write_failed", "The tombstone a forced revoke of an ephemeral Child needs could not be written, so this attempt revoked no key and removed no record.", 503);
|
|
462
|
+
|
|
463
|
+
async function removeReserved(
|
|
464
|
+
ctx: ManagementContext,
|
|
465
|
+
state: LinkRouteState,
|
|
466
|
+
id: string,
|
|
467
|
+
record: LinkStore["links"][number],
|
|
468
|
+
initialReceipt: ReturnType<typeof readLinkRetirement>,
|
|
469
|
+
force: boolean,
|
|
470
|
+
purge: boolean,
|
|
471
|
+
journal: RevokeJournal,
|
|
472
|
+
): Promise<Response> {
|
|
473
|
+
let receipt = initialReceipt;
|
|
474
|
+
// A receipt is never evidence that the Child was cleaned up (#8416): while the record is listed the cleanup runs
|
|
475
|
+
// again unless the owning journal entry recorded it (cleanupRecorded), as a removal on dev always runs it. Once the
|
|
476
|
+
// record is gone the commit already followed a cleanup, and the receipt only drives the local post-commit work.
|
|
477
|
+
let listed: boolean;
|
|
478
|
+
try { listed = readStoreFor(ctx).links.some(link => link.id === id); } catch { return fail("link_remove_failed", "The link store could not be read.", 503); }
|
|
479
|
+
const cleanupDone = receipt !== null && (!listed || cleanupRecorded(ctx, receipt));
|
|
480
|
+
// A retry asking for another cleanup than the one the receipt stands for, where that cleanup will not run again, would
|
|
481
|
+
// report success without it, so it is refused before anything is stopped. --force asks for no cleanup and is allowed.
|
|
482
|
+
if (receipt && cleanupDone && !force && record.direction === "hub-initiated" && (receipt.mode ?? "force") !== removalMode(force, purge)) {
|
|
483
|
+
return fail("link_retirement_mode_mismatch", `This link's removal was interrupted after its ${receipt.mode ?? "force"} cleanup; repeat it with the same options, or with --force, to finish it.`, 409);
|
|
484
|
+
}
|
|
485
|
+
// An intent that cannot be written stops the revoke before its effect, answered with the operation id.
|
|
486
|
+
const journalFailed = (): Response => Response.json({
|
|
487
|
+
error: { code: "operation_journal_failed", message: "The link operation journal could not be written; the step after it did not run." },
|
|
488
|
+
...(journal.operationId ? { operationId: journal.operationId } : {}),
|
|
489
|
+
}, { status: 500, headers: { "cache-control": "no-store" } });
|
|
490
|
+
const intend = (effect: "remote_cleanup" | "key_revoked" | "record_removed"): boolean => {
|
|
491
|
+
try { journal.intent(effect); return true; } catch { return false; }
|
|
492
|
+
};
|
|
493
|
+
const cleanup = !cleanupDone && !force && record.direction === "hub-initiated";
|
|
494
|
+
// A forced revoke leaves an ephemeral Child uncleaned. Its tombstone is durable before the first intent (key_revoked
|
|
495
|
+
// for a force revoke) and before the tunnel stops, so ocx link recover can still reach and clean that machine;
|
|
496
|
+
// without it, refuse with nothing touched.
|
|
497
|
+
// Only a forced revoke that will remove a still-listed record writes one: a resumed retirement whose record is already
|
|
498
|
+
// gone relies on the tombstone the original force wrote (#8416), and must not recreate one recover may have settled.
|
|
499
|
+
const tombstoned = force && listed && record.direction === "hub-initiated" && record.childKind === "ephemeral" && Boolean(record.hostKeyFingerprint);
|
|
500
|
+
// A revoke that does not commit keeps the link, so the tombstone it wrote must go too: beside a live link it would
|
|
501
|
+
// only count toward the cap (recover refuses it as link_present). Only that exact tombstone, and only while the link
|
|
502
|
+
// still exists: another process may have committed its own forced revoke. The finally below drops it on every way
|
|
503
|
+
// out before the commit, a throw included.
|
|
504
|
+
let written: LinkTombstone | null = null;
|
|
505
|
+
let committed = false;
|
|
506
|
+
const dropOwnTombstone = (): void => {
|
|
507
|
+
if (!written) return;
|
|
508
|
+
const own = written;
|
|
509
|
+
try { withConfigMutationLockSync(() => { removeOwnTombstone(own, readStoreFor(ctx).links.some(link => link.id === id), tombstonesPath()); }); } catch { /* the link remains; recover refuses link_present */ }
|
|
510
|
+
};
|
|
511
|
+
// The tombstone this forced revoke needs when its record goes; the commit step makes sure one is there.
|
|
512
|
+
let needed: LinkTombstone | null = null;
|
|
513
|
+
if (tombstoned && record.hostKeyFingerprint) {
|
|
514
|
+
const tombstone: LinkTombstone = {
|
|
515
|
+
linkId: id, alias: record.alias, hostKeyFingerprint: record.hostKeyFingerprint,
|
|
516
|
+
...(record.remotePlatform ? { remotePlatform: record.remotePlatform } : {}),
|
|
517
|
+
...(record.routes ? { routes: [...record.routes] } : {}),
|
|
518
|
+
...(record.explicitRoute ? { explicitRoute: { ...record.explicitRoute } } : {}),
|
|
519
|
+
...(record.exclusive ? { exclusive: true as const } : {}),
|
|
520
|
+
revokedAt: new Date((ctx.deps.now ?? Date.now)()).toISOString(),
|
|
521
|
+
attempt: randomBytes(8).toString("hex"),
|
|
522
|
+
};
|
|
523
|
+
needed = tombstone;
|
|
524
|
+
// A tombstone already there for this link (a forced revoke in flight in another runtime, or one that died) is kept,
|
|
525
|
+
// and this attempt owns none: it then has nothing to drop if it does not commit.
|
|
526
|
+
try { if (withConfigMutationLockSync(() => recordTombstone(tombstone, tombstonesPath())) === "recorded") written = tombstone; } catch (error) {
|
|
527
|
+
if (error instanceof LinkTombstoneLimitError) {
|
|
528
|
+
// No state claim: an earlier, interrupted attempt of a resumed revoke may already have revoked the key and stopped the tunnel,
|
|
529
|
+
// and this one may have taken its receipt back (reownLinkRetirement), so it names only what this attempt left alone.
|
|
530
|
+
return fail("tombstone_limit", "Too many forced revokes are waiting for cleanup; this attempt did not touch the link, its key or the Child. Recover them (ocx link recover --link-id <id>; ocx link recover --list shows them), or have a person on this Home run ocx link recover --forget --link-id <id> --yes for machines that are gone.", 409);
|
|
531
|
+
}
|
|
532
|
+
// The file may already be written (a chmod or the lock's COMMIT failed after it); the link stays, so this
|
|
533
|
+
// attempt's tombstone, if any, goes too. Its random attempt token makes that removal touch nothing else.
|
|
534
|
+
written = tombstone;
|
|
535
|
+
dropOwnTombstone();
|
|
536
|
+
return tombstoneWriteFailed();
|
|
537
|
+
}
|
|
538
|
+
}
|
|
539
|
+
// The first intent (cleanup, or the key for a force revoke) is written before stopLink: a failed write leaves the
|
|
540
|
+
// tunnel as it was and nothing has been touched.
|
|
541
|
+
if (!intend(cleanup ? "remote_cleanup" : "key_revoked")) { dropOwnTombstone(); return journalFailed(); }
|
|
542
|
+
// Taken inside the try, so a hold that throws is covered by the finally (the tombstone drop) like any later step.
|
|
543
|
+
let release: (() => void) | undefined;
|
|
544
|
+
// Set when this revoke restarts the tunnel itself after a cleanup that never ran; every other way out leaves it down.
|
|
545
|
+
let restarted = false;
|
|
546
|
+
try {
|
|
547
|
+
release = state.supervisor.holdLink?.(id);
|
|
548
|
+
if (listed) await state.supervisor.stopLink(id);
|
|
220
549
|
const restartTunnel = async (): Promise<void> => {
|
|
550
|
+
restarted = true;
|
|
221
551
|
release?.();
|
|
222
552
|
try {
|
|
223
553
|
await state.supervisor.ensureStarted();
|
|
@@ -226,44 +556,165 @@ async function remove(ctx: ManagementContext, state: LinkRouteState, id: string)
|
|
|
226
556
|
console.warn(`[link] tunnel restart failed linkId=${id}: ${error instanceof Error ? error.message : String(error)}`);
|
|
227
557
|
}
|
|
228
558
|
};
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
559
|
+
// A cleanup that failed before the Child's disconnect ran changed nothing there: the tunnel restarts (a journalled
|
|
560
|
+
// revoke settles failed_clean). Any other failure (a timeout, a nonzero exit, no purge report) may have disconnected
|
|
561
|
+
// or purged the Child, so a journalled revoke leaves the tunnel down, unknown, and the supervisor keeps it down until
|
|
562
|
+
// the operation is resolved (revokeSuspendsLink). A plain revoke restarts the tunnel either way, as before.
|
|
563
|
+
const cleanupFailed = async (failure: Response, attempted: boolean): Promise<Response> => {
|
|
564
|
+
// A resumed retirement keeps the tunnel down even when this attempt never ran: an earlier one may have (keepsTunnelDown).
|
|
565
|
+
if ((attempted || journal.keepsTunnelDown) && journal.operationId !== undefined) return failure;
|
|
566
|
+
if (!attempted) journal.cleanupNotRun();
|
|
567
|
+
await restartTunnel();
|
|
568
|
+
return failure;
|
|
569
|
+
};
|
|
570
|
+
const disconnectFailed = (hint: string | undefined) => fail("remote_disconnect_failed", BOUND_REFUSAL_MESSAGES[hint ?? ""] ?? "The remote client could not be disconnected.", 502, hint);
|
|
571
|
+
// True once the Child confirmed this link before cleaning (--expect-link). A revoke never settles a tombstone, bound or
|
|
572
|
+
// not: beside a listed link one belongs to a forced revoke still in flight in another process (or one that died), and
|
|
573
|
+
// removing it here could lose the only recovery evidence for a Child that revoke leaves attached. ocx link recover
|
|
574
|
+
// settles it once the link is gone, under the alias lock and bound to the link.
|
|
575
|
+
let linkBound = false;
|
|
576
|
+
const unboundStillSafe = (): boolean => {
|
|
577
|
+
const links = readStoreFor(ctx).links;
|
|
578
|
+
const wanted = record.alias.toLowerCase();
|
|
579
|
+
// Enrollment refuses a second link with this primary alias, so the machine another link may own now is found by
|
|
580
|
+
// its pinned key (the same machine enrolled under another alias or address) or by a route naming this alias.
|
|
581
|
+
return links.some(link => link.id === id)
|
|
582
|
+
&& !links.some(link => link.id !== id && link.direction === "hub-initiated" && (
|
|
583
|
+
(Boolean(record.hostKeyFingerprint) && link.hostKeyFingerprint === record.hostKeyFingerprint)
|
|
584
|
+
|| [link.alias, ...effectiveLinkRoutes(link)].some(route => route.toLowerCase() === wanted)));
|
|
585
|
+
};
|
|
586
|
+
if (cleanup) {
|
|
587
|
+
const runner = runnerFor(ctx);
|
|
588
|
+
let platform: Awaited<ReturnType<typeof requireRemotePlatform>>;
|
|
589
|
+
try { platform = record.remotePlatform ?? await requireRemotePlatform(runner, record.alias, record.explicitRoute ?? null, knownHostsFile(ctx)); } catch (error) {
|
|
590
|
+
return cleanupFailed(disconnectFailed(sshRunnerErrorHint(error)), false);
|
|
591
|
+
}
|
|
592
|
+
if (purge) {
|
|
593
|
+
let purged: Awaited<ReturnType<typeof purgeDisconnectRemote>>;
|
|
594
|
+
try { purged = await purgeDisconnectRemote(runner, record.alias, record.explicitRoute ?? null, knownHostsFile(ctx), platform, record.childKind, id, unboundStillSafe); } catch (error) {
|
|
595
|
+
return cleanupFailed(disconnectFailed(sshRunnerErrorHint(error)), true);
|
|
596
|
+
}
|
|
597
|
+
if (!purged.ok) return cleanupFailed(fail(purged.code, (purged.hint !== undefined ? BOUND_REFUSAL_MESSAGES[purged.hint] : undefined) ?? purged.message, purged.status, purged.hint), purged.notAttempted !== true);
|
|
598
|
+
// purgeDisconnectRemote is ok only when the managed ocx-child reported purged:true over this link's route. The
|
|
599
|
+
// receipt must be durable before the link goes; if it cannot be written, stop here (unknown) and leave the
|
|
600
|
+
// tunnel down, since the Child it would reach is purged.
|
|
601
|
+
try { journal.done("remote_cleanup", { purged: true, linkId: id }); } catch { return journalFailed(); }
|
|
602
|
+
} else {
|
|
603
|
+
const disconnectArgv = (bound: boolean) => buildExecArgv({ alias: record.alias, argv: remoteOcxArgv(bound ? ["disconnect", "--expect-link", id] : ["disconnect"], platform), knownHostsFile: knownHostsFile(ctx), route: record.explicitRoute ?? null });
|
|
604
|
+
let result: Awaited<ReturnType<typeof runner.run>>;
|
|
605
|
+
linkBound = true;
|
|
606
|
+
try { result = await runner.run(disconnectArgv(true), { timeoutMs: 30_000 }); } catch (error) {
|
|
607
|
+
return cleanupFailed(disconnectFailed(sshRunnerErrorHint(error)), true);
|
|
608
|
+
}
|
|
609
|
+
// An ocx or ocx-child older than --expect-link rejects it as a usage error (exit 2) before acting on the link.
|
|
610
|
+
// The unbound retry is the old behaviour, so it runs only while no other Home-initiated link of this Home may
|
|
611
|
+
// reach the same machine (same pinned key, or this alias among its routes; re-read now). The machine enrolled
|
|
612
|
+
// with another Home, or under a new host key, stays outside what this Home can see.
|
|
613
|
+
if (result.code === CHILD_USAGE_EXIT) {
|
|
614
|
+
if (!unboundStillSafe()) return cleanupFailed(disconnectFailed("expect_link_unsupported"), false);
|
|
615
|
+
linkBound = false;
|
|
616
|
+
try { result = await runner.run(disconnectArgv(false), { timeoutMs: 30_000 }); } catch (error) {
|
|
617
|
+
return cleanupFailed(disconnectFailed(sshRunnerErrorHint(error)), true);
|
|
244
618
|
}
|
|
245
619
|
}
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
620
|
+
// A link-bound refusal recognised as one changed nothing on the Child: another link (or a hub, or no connection)
|
|
621
|
+
// owns it now (5), or an ocx-child keeps state it cannot restore (6). The tunnel restarts and the link stays. An
|
|
622
|
+
// unfinished disconnect the Child could not prove is this link's may have been partly cleaned by an earlier
|
|
623
|
+
// attempt: a cleanup attempted, never failed_clean. Any other exit 5 or 6 falls through as attempted.
|
|
624
|
+
const refusal = linkBound ? classifyBoundRefusal(result.code, result.stderr, id) : null;
|
|
625
|
+
if (refusal === "pending") return cleanupFailed(disconnectFailed("child_disconnect_pending"), true);
|
|
626
|
+
if (refusal === "mismatch" || refusal === "residual") return cleanupFailed(disconnectFailed(refusal === "mismatch" ? "child_link_mismatch" : "child_residual"), false);
|
|
627
|
+
if (result.code !== 0) return cleanupFailed(disconnectFailed(sshFailureHint(result.stderr)), true);
|
|
628
|
+
journal.done("remote_cleanup");
|
|
249
629
|
}
|
|
250
630
|
}
|
|
251
|
-
if (!
|
|
252
|
-
let next: LinkStore;
|
|
631
|
+
if (cleanup && !intend("key_revoked")) return journalFailed();
|
|
253
632
|
try {
|
|
254
|
-
|
|
633
|
+
if (!receipt) {
|
|
634
|
+
try { receipt = claimLinkRetirement(record, undefined, () => readStoreFor(ctx), removalMode(force, purge), journal.operationId); }
|
|
635
|
+
catch {
|
|
636
|
+
const latest = readStoreFor(ctx).links.find(link => link.id === id);
|
|
637
|
+
if (!latest || JSON.stringify(latest) !== JSON.stringify(record)) {
|
|
638
|
+
// A journalled revoke whose Child cleanup ran (or a resumed one) leaves the tunnel down: the Child may already be
|
|
639
|
+
// disconnected or purged, and the revoke settles unknown, which keeps the link suspended. A plain revoke, or one
|
|
640
|
+
// that ran no cleanup, restarts it as before.
|
|
641
|
+
if (!((cleanup || journal.keepsTunnelDown) && journal.operationId !== undefined)) await restartTunnel();
|
|
642
|
+
dropOwnTombstone();
|
|
643
|
+
return fail("link_changed", "The link changed during removal.", 409);
|
|
644
|
+
}
|
|
645
|
+
dropOwnTombstone();
|
|
646
|
+
return fail("link_remove_failed", "The link retirement could not be claimed.", 503);
|
|
647
|
+
}
|
|
648
|
+
}
|
|
649
|
+
const owner = receipt;
|
|
650
|
+
// The key revoke and the record removal commit in one locked step; the operation journal (its own writes take the
|
|
651
|
+
// same, reentrant lock) records each intent before its effect and each completion after it.
|
|
652
|
+
const result = withConfigMutationLockSync(() => {
|
|
653
|
+
const currentReceipt = readLinkRetirement(id);
|
|
654
|
+
if (!currentReceipt || currentReceipt.nonce !== owner.nonce || JSON.stringify(currentReceipt.link) !== JSON.stringify(owner.link)) return "changed" as const;
|
|
255
655
|
const latest = readStoreFor(ctx);
|
|
256
|
-
const
|
|
257
|
-
if (
|
|
258
|
-
|
|
656
|
+
const active = latest.links.find(link => link.id === id);
|
|
657
|
+
if (active && JSON.stringify(active) !== JSON.stringify(record)) return "changed" as const;
|
|
658
|
+
// A tombstone this attempt kept may have been dropped since by its owner, a forced revoke that failed in another
|
|
659
|
+
// runtime. Under the lock that removes the record, before the key goes, one must be there: else this attempt
|
|
660
|
+
// writes its own (and owns it), or stops with the link and key intact; the tunnel is already stopped and this
|
|
661
|
+
// attempt's retirement receipt stays claimed, so a repeat of this revoke resumes it.
|
|
662
|
+
if (active && needed) {
|
|
663
|
+
const own = needed;
|
|
664
|
+
let present: boolean;
|
|
665
|
+
try { present = readTombstones(tombstonesPath()).tombstones.some(t => t.linkId === id); } catch { return "tombstone_failed" as const; }
|
|
666
|
+
if (!present) {
|
|
667
|
+
// A write that throws after the file landed (its chmod) still leaves this attempt's tombstone: own it, so the
|
|
668
|
+
// non-ok path drops it by its token.
|
|
669
|
+
try { if (recordTombstone(own, tombstonesPath()) === "recorded") written = own; } catch (error) {
|
|
670
|
+
if (error instanceof LinkTombstoneLimitError) return "tombstone_limit" as const;
|
|
671
|
+
written = own;
|
|
672
|
+
return "tombstone_failed" as const;
|
|
673
|
+
}
|
|
674
|
+
}
|
|
675
|
+
}
|
|
676
|
+
if (active && (ctx.config.apiKeys ?? []).some(key => key.id === record.apiKeyId) && !revokeKeyIdempotent(ctx, record.apiKeyId)) return "revoke_failed" as const;
|
|
677
|
+
journal.done("key_revoked");
|
|
678
|
+
if (!intend("record_removed")) return "journal_failed" as const;
|
|
679
|
+
if (active) writeStoreFor(ctx, { ...latest, links: latest.links.filter(link => link.id !== id) });
|
|
680
|
+
journal.done("record_removed");
|
|
681
|
+
reconcileHomeRouteDevices(readStoreFor(ctx).links.map(link => link.id));
|
|
682
|
+
return "ok" as const;
|
|
259
683
|
});
|
|
684
|
+
// A revoke that does not commit keeps the link, so the tombstone it wrote goes too (only while the link still exists).
|
|
685
|
+
if (result !== "ok") dropOwnTombstone();
|
|
686
|
+
if (result === "journal_failed") return journalFailed();
|
|
687
|
+
if (result === "changed") return fail("link_changed", "The link changed during removal.", 409);
|
|
688
|
+
if (result === "tombstone_failed") return tombstoneWriteFailed();
|
|
689
|
+
if (result === "tombstone_limit") return tombstoneLimit();
|
|
690
|
+
if (result === "revoke_failed") return fail("key_revoke_failed", "The link key could not be revoked.", 502);
|
|
691
|
+
committed = true;
|
|
692
|
+
// Same task as the commit: an open link WebSocket must not outlive its link (design T4 2.4).
|
|
693
|
+
state.listener.closeLinkSockets?.(id);
|
|
260
694
|
clearCompensationFailed(id, compensationPath());
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
695
|
+
state.compensationFailures?.delete(id);
|
|
696
|
+
await state.supervisor.reload();
|
|
697
|
+
await reconcileLinkListener(ctx, state.listener);
|
|
698
|
+
try { journal.beforeReceiptCleared?.(); } catch {
|
|
699
|
+
return fail("operation_journal_failed", "The link removal finished, but its operation journal could not be updated; repeat the request.", 500);
|
|
700
|
+
}
|
|
701
|
+
if (!clearLinkRetirement(owner, undefined, () => !readStoreFor(ctx).links.some(link => link.id === id))) return fail("link_remove_failed", "The link retirement changed during removal.", 503);
|
|
702
|
+
} catch {
|
|
703
|
+
dropOwnTombstone();
|
|
704
|
+
// The record can already be gone when a later step (route-intent reconciliation, the
|
|
705
|
+
// listener) fails. Its sockets close then too, in this task, rather than at the next sweep.
|
|
706
|
+
try { if (!readStoreFor(ctx).links.some(link => link.id === id)) state.listener.closeLinkSockets?.(id); }
|
|
707
|
+
catch { /* the store is unreadable; the per-message reauthorization still refuses its frames */ }
|
|
708
|
+
return fail("link_remove_failed", "The link record could not be removed.", 503);
|
|
709
|
+
}
|
|
265
710
|
return Response.json({ linkId: id });
|
|
266
|
-
} finally {
|
|
711
|
+
} finally {
|
|
712
|
+
if (!committed) dropOwnTombstone();
|
|
713
|
+
// The hold goes before finish writes the outcome. A revoke that leaves the tunnel down drops its live mark first, so a
|
|
714
|
+
// reload in between already finds its open entry suspended (revokeSuspendsLink); this is synchronous, nothing interleaves.
|
|
715
|
+
if (!restarted) journal.release();
|
|
716
|
+
release?.();
|
|
717
|
+
}
|
|
267
718
|
}
|
|
268
719
|
|
|
269
720
|
export async function handleLinkRoutes(ctx: ManagementContext, suppliedState?: LinkRouteState): Promise<Response | null> {
|
|
@@ -282,6 +733,14 @@ export async function handleLinkRoutes(ctx: ManagementContext, suppliedState?: L
|
|
|
282
733
|
if (!state) return fail("link_unavailable", "The link lifecycle is unavailable.", 503);
|
|
283
734
|
return handleJoin(ctx, state);
|
|
284
735
|
}
|
|
736
|
+
// A file read that needs no link lifecycle, so a runtime whose link supervisor is unavailable
|
|
737
|
+
// still shows what its tunnels recorded. Same authority as GET /api/link/status. A connected
|
|
738
|
+
// Child serves the same read from src/client/machine-listener.ts.
|
|
739
|
+
if (url.pathname === "/api/link/diagnostics" && req.method === "GET") {
|
|
740
|
+
const denied = auth(ctx, "either");
|
|
741
|
+
if (denied) return denied;
|
|
742
|
+
return linkDiagnosticsResponse(url);
|
|
743
|
+
}
|
|
285
744
|
const state = suppliedState ?? stateFor(ctx);
|
|
286
745
|
if (!state) return fail("link_unavailable", "The link lifecycle is unavailable.", 503);
|
|
287
746
|
if (url.pathname === "/api/link/status" && req.method === "GET") {
|
|
@@ -310,8 +769,27 @@ export async function handleLinkRoutes(ctx: ManagementContext, suppliedState?: L
|
|
|
310
769
|
attachLinkPeers(dto, localLinkPeer(packageVersion("0.0.0"), buildPeerFeatures()),
|
|
311
770
|
linkId => state.listener.peerObservation?.(linkId) ?? { observed: null, refused: null });
|
|
312
771
|
}
|
|
772
|
+
// The same opt-in for the body bytes each link carried (#3023).
|
|
773
|
+
if (url.searchParams.get("traffic") === "1") {
|
|
774
|
+
const { attachLinkTrafficForState } = await import("./link-traffic-status");
|
|
775
|
+
attachLinkTrafficForState(dto, state);
|
|
776
|
+
}
|
|
313
777
|
// The same opt-in for each Home-initiated tunnel's retry progress and last failure cause.
|
|
314
778
|
if (url.searchParams.get("diagnostics") === "1") attachLinkTunnelDiagnostics(dto, supervisorStates);
|
|
779
|
+
// The same opt-in for the route each multi-route link uses and why the others rest.
|
|
780
|
+
if (url.searchParams.get("routes") === "1") attachLinkRoutes(dto, supervisorStates);
|
|
781
|
+
// The same opt-in for each row's live link WebSocket counters and hold count (design 9.3).
|
|
782
|
+
if (url.searchParams.get("transport") === "1") {
|
|
783
|
+
attachLinkTransport(dto, linkId => state.listener.linkTransport?.(linkId) ?? null, linkId => {
|
|
784
|
+
const held = state.listener.linkHolds?.(linkId) ?? null;
|
|
785
|
+
return held ? held.holds.length + (held.unknown ? 1 : 0) : 0;
|
|
786
|
+
});
|
|
787
|
+
}
|
|
788
|
+
// The same opt-in for each Home row's Child versions, catalog freshness, activity and operations.
|
|
789
|
+
if (url.searchParams.get("children") === "1" && dto.role === "home") {
|
|
790
|
+
const { attachLinkChildOpsForState } = await import("./link-child-ops-routes");
|
|
791
|
+
attachLinkChildOpsForState(dto, state, store, (ctx.deps.now ?? Date.now)());
|
|
792
|
+
}
|
|
315
793
|
// A dashboard session also learns why it cannot join as a Child. The admin-token answer stays
|
|
316
794
|
// the exact K16 document that `ocx link status` validates key by key.
|
|
317
795
|
const denial = ctx.principal === "gui-session" ? joinDenied(ctx) : null;
|
|
@@ -344,7 +822,41 @@ export async function handleLinkRoutes(ctx: ManagementContext, suppliedState?: L
|
|
|
344
822
|
if (denied) return denied;
|
|
345
823
|
return issue(ctx);
|
|
346
824
|
}
|
|
825
|
+
// Before the DELETE matcher, which would read "operations" as a link id.
|
|
826
|
+
if (path === "/api/link/operations" || path.startsWith("/api/link/operations/")) {
|
|
827
|
+
const denied = auth(ctx, "either");
|
|
828
|
+
if (denied) return denied;
|
|
829
|
+
const { handleLinkOperationRoutes } = await import("./link-operation");
|
|
830
|
+
return handleLinkOperationRoutes(ctx);
|
|
831
|
+
}
|
|
832
|
+
if (url.pathname === "/api/link/recover" && req.method === "POST") {
|
|
833
|
+
const denied = auth(ctx, "either");
|
|
834
|
+
if (denied) return denied;
|
|
835
|
+
const { handleLinkRecover } = await import("./link-recover-route");
|
|
836
|
+
return handleLinkRecover(ctx, state);
|
|
837
|
+
}
|
|
838
|
+
if (url.pathname === "/api/link/recover" && req.method === "GET") {
|
|
839
|
+
const denied = auth(ctx, "either");
|
|
840
|
+
if (denied) return denied;
|
|
841
|
+
const { handleLinkRecoverList } = await import("./link-recover-route");
|
|
842
|
+
return handleLinkRecoverList();
|
|
843
|
+
}
|
|
844
|
+
// Before the reconnect and DELETE matchers, which would read "children" as a link id.
|
|
845
|
+
if (path.startsWith("/api/link/children/")) {
|
|
846
|
+
const { handleLinkChildOpsRoutes } = await import("./link-child-ops-routes");
|
|
847
|
+
return handleLinkChildOpsRoutes(ctx, state);
|
|
848
|
+
}
|
|
347
849
|
const reconnectPath = req.method === "POST" ? /^\/api\/link\/([^/]+)\/reconnect$/.exec(path) : null;
|
|
850
|
+
// Before the DELETE matcher, which would read "<id>/routes" as a link id.
|
|
851
|
+
const routesPath = req.method === "GET" || req.method === "POST" ? /^\/api\/link\/([^/]+)\/routes$/.exec(path) : null;
|
|
852
|
+
if (routesPath) {
|
|
853
|
+
const denied = auth(ctx, "either");
|
|
854
|
+
if (denied) return denied;
|
|
855
|
+
let id: string;
|
|
856
|
+
try { id = decodeURIComponent(routesPath[1]!); } catch { return fail("invalid_link_id", "The link id is invalid.", 400); }
|
|
857
|
+
const { handleLinkRouteEdit } = await import("./link-route-edit");
|
|
858
|
+
return handleLinkRouteEdit(ctx, state, id);
|
|
859
|
+
}
|
|
348
860
|
if (reconnectPath) {
|
|
349
861
|
const denied = auth(ctx, "either");
|
|
350
862
|
if (denied) return denied;
|