@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
import { accessSync, constants, lstatSync, readlinkSync, type Stats } from "node:fs";
|
|
2
|
+
import { dirname } from "node:path";
|
|
3
|
+
/**
|
|
4
|
+
* An explicit SSH route for a Home-initiated link (structure/remote-link.md, "Explicit route"): the
|
|
5
|
+
* ProxyCommand, user and port ssh uses for the link's alias. ssh-argv passes them on the command line,
|
|
6
|
+
* where ssh takes them before anything in ssh_config, so a later ssh_config edit cannot move the link.
|
|
7
|
+
*
|
|
8
|
+
* These values reach ssh's argv, and ssh runs ProxyCommand as "exec <command>" through the user's
|
|
9
|
+
* shell, so only a closed form is accepted (refused, never repaired):
|
|
10
|
+
* - proxyCommand: 1-1024 ASCII characters; 1-32 words separated by exactly one space. The first word is
|
|
11
|
+
* an absolute POSIX path ("/" then letters, digits and . _ + - /), so neither PATH nor an "exec -flag"
|
|
12
|
+
* can change what runs. Every later word uses only letters, digits and . _ / : @ + , = - and does not
|
|
13
|
+
* start with "=" (zsh expands a leading "="). Nothing else: no quote, backslash, $ or backquote, no
|
|
14
|
+
* ; & | < > ( ) { } [ ] * ? ! # ~, no % (ssh expands %h, %p, %r and %n from values ssh_config controls),
|
|
15
|
+
* no tab, newline, NUL or non-ASCII character.
|
|
16
|
+
* - user: a letter or "_" then up to 31 letters, digits, ".", "_" or "-".
|
|
17
|
+
* - port: an integer from 1 to 65535.
|
|
18
|
+
* - identityFile (optional, link.route/2): the private key the link authenticates with. An absolute POSIX path of 2-1024
|
|
19
|
+
* characters, "/" then letters, digits and . _ + - /, already normal (no empty, "." or ".." segment, no trailing "/").
|
|
20
|
+
* ssh expands ~, %-tokens and ${VAR} in IdentityFile and splits an -o value at whitespace or a quote; none of those
|
|
21
|
+
* characters is accepted, so the path reaches ssh as written. With it, ssh offers that key alone: IdentitiesOnly=yes,
|
|
22
|
+
* IdentityAgent=none, IdentityFile=<path>. Without it, nothing changes.
|
|
23
|
+
* The path forms are POSIX only, so a Windows Home cannot use an explicit route yet.
|
|
24
|
+
*/
|
|
25
|
+
|
|
26
|
+
export interface ExplicitRoute {
|
|
27
|
+
proxyCommand: string;
|
|
28
|
+
user: string;
|
|
29
|
+
port: number;
|
|
30
|
+
/** The only key ssh offers for this link (link.route/2); absent, ssh authenticates as before. */
|
|
31
|
+
identityFile?: string;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export type ExplicitRouteRefusal = "shape" | "proxy_command_form" | "user_form" | "port_form" | "identity_file_form";
|
|
35
|
+
|
|
36
|
+
const KEYS = ["port", "proxyCommand", "user"];
|
|
37
|
+
const KEYS_WITH_IDENTITY = ["identityFile", "port", "proxyCommand", "user"];
|
|
38
|
+
export const EXPLICIT_ROUTE_MAX_IDENTITY_FILE = 1024;
|
|
39
|
+
const PROGRAM = /^\/[A-Za-z0-9._+\/-]*$/;
|
|
40
|
+
const WORD = /^[A-Za-z0-9._\/:@+,-][A-Za-z0-9._\/:@+,=-]*$/;
|
|
41
|
+
const USER = /^[A-Za-z_][A-Za-z0-9_.-]{0,31}$/;
|
|
42
|
+
export const EXPLICIT_ROUTE_MAX_COMMAND = 1024;
|
|
43
|
+
export const EXPLICIT_ROUTE_MAX_WORDS = 32;
|
|
44
|
+
|
|
45
|
+
function isProxyCommand(value: string): boolean {
|
|
46
|
+
if (value.length < 1 || value.length > EXPLICIT_ROUTE_MAX_COMMAND) return false;
|
|
47
|
+
const words = value.split(" ");
|
|
48
|
+
if (words.length > EXPLICIT_ROUTE_MAX_WORDS || !PROGRAM.test(words[0]!)) return false;
|
|
49
|
+
return words.slice(1).every(word => WORD.test(word));
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function isIdentityFile(value: unknown): value is string {
|
|
53
|
+
if (typeof value !== "string" || value.length < 2 || value.length > EXPLICIT_ROUTE_MAX_IDENTITY_FILE || !PROGRAM.test(value)) return false;
|
|
54
|
+
return value.slice(1).split("/").every(segment => segment !== "" && segment !== "." && segment !== "..");
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export function checkExplicitRoute(value: unknown): { ok: true; route: ExplicitRoute } | { ok: false; reason: ExplicitRouteRefusal } {
|
|
58
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return { ok: false, reason: "shape" };
|
|
59
|
+
const raw = value as Record<string, unknown>;
|
|
60
|
+
const keys = Object.keys(raw).sort().join(",");
|
|
61
|
+
if ((keys !== KEYS.join(",") && keys !== KEYS_WITH_IDENTITY.join(",")) || typeof raw.proxyCommand !== "string" || typeof raw.user !== "string") {
|
|
62
|
+
return { ok: false, reason: "shape" };
|
|
63
|
+
}
|
|
64
|
+
if (!isProxyCommand(raw.proxyCommand)) return { ok: false, reason: "proxy_command_form" };
|
|
65
|
+
if (!USER.test(raw.user)) return { ok: false, reason: "user_form" };
|
|
66
|
+
if (typeof raw.port !== "number" || !Number.isInteger(raw.port) || raw.port < 1 || raw.port > 65535) return { ok: false, reason: "port_form" };
|
|
67
|
+
if ("identityFile" in raw && !isIdentityFile(raw.identityFile)) return { ok: false, reason: "identity_file_form" };
|
|
68
|
+
// The key is added last, and only when given: a route without it is the exact object (and digest) it was before.
|
|
69
|
+
return { ok: true, route: { proxyCommand: raw.proxyCommand, user: raw.user, port: raw.port, ...("identityFile" in raw ? { identityFile: raw.identityFile as string } : {}) } };
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/** The route when the value is an accepted form, otherwise null. */
|
|
73
|
+
export function parseExplicitRoute(value: unknown): ExplicitRoute | null {
|
|
74
|
+
const checked = checkExplicitRoute(value);
|
|
75
|
+
return checked.ok ? checked.route : null;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/** Both absent, or the same values, the identity file included (both without one counts as the same). */
|
|
79
|
+
export function sameExplicitRoute(left: ExplicitRoute | null | undefined, right: ExplicitRoute | null | undefined): boolean {
|
|
80
|
+
if (!left || !right) return !left && !right;
|
|
81
|
+
return left.proxyCommand === right.proxyCommand && left.user === right.user && left.port === right.port && left.identityFile === right.identityFile;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* The ssh options of a route. ProxyUseFdpass=no keeps an ssh_config "ProxyUseFdpass yes" from changing
|
|
86
|
+
* how the proxy command's output is used. With an identity file, ssh offers that key alone: IdentitiesOnly=yes drops the
|
|
87
|
+
* default ~/.ssh/id_* files, IdentityAgent=none keeps the agent's keys out, and IdentityFile names the one key, each as
|
|
88
|
+
* one argument. Throws for a value that is not an accepted form.
|
|
89
|
+
*/
|
|
90
|
+
export function explicitRouteSshOptions(route: ExplicitRoute): string[] {
|
|
91
|
+
const checked = checkExplicitRoute(route);
|
|
92
|
+
if (!checked.ok) throw new ExplicitRouteError(checked.reason);
|
|
93
|
+
return [
|
|
94
|
+
"-o", "ProxyCommand=" + checked.route.proxyCommand,
|
|
95
|
+
"-o", "ProxyUseFdpass=no",
|
|
96
|
+
"-o", "User=" + checked.route.user,
|
|
97
|
+
"-o", "Port=" + String(checked.route.port),
|
|
98
|
+
...(checked.route.identityFile === undefined ? [] : ["-o", "IdentitiesOnly=yes", "-o", "IdentityAgent=none", "-o", "IdentityFile=" + checked.route.identityFile]),
|
|
99
|
+
];
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
export type IdentityFileProblem = "identity_file_missing" | "identity_file_not_regular" | "identity_file_permissions" | "identity_file_directory"
|
|
103
|
+
| "identity_file_ancestor" | "identity_file_unreadable" | "identity_file_unsupported_platform";
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* What to fix for each refusal, written here once: the management API answers it as the message and the CLI prints it with
|
|
107
|
+
* the code and hint. None names the path or a part of it.
|
|
108
|
+
*/
|
|
109
|
+
export const IDENTITY_FILE_GUIDANCE: Readonly<Record<IdentityFileProblem, string>> = {
|
|
110
|
+
identity_file_missing: "The identity file does not exist.",
|
|
111
|
+
identity_file_not_regular: "The identity file must be a regular file, not a symlink or a directory.",
|
|
112
|
+
identity_file_permissions: "The identity file must be owned by this user with no group or other permissions (chmod 600 on it). Use a key file of this user's own; never chown another user's or the system's key.",
|
|
113
|
+
identity_file_directory: "The directory that holds the identity file must be owned by this user or root and not writable by group or others. Move the key to a path that passes; if a tool chose the path, run chmod go-w on that tool's own private folder or have it use a path that passes. Never change a shared or system directory such as /tmp, even when the Home runs as root.",
|
|
114
|
+
identity_file_ancestor: "Every directory above the identity file must be owned by this user or root and not writable by group or others unless sticky, and every symlink on its path must be owned by this user or root; a folder made under umask 002 is group-writable. Run chmod go-w on such a private folder of this user's or of the tool that chose the path, or use a path that passes. Never change a shared or system directory or another user's symlink, even as root.",
|
|
115
|
+
identity_file_unreadable: "This user cannot read the identity file or a directory on its path, or the path is too long or has too many symlinks. Use a shorter path without symlink loops; fix read access only on this user's own file or folder.",
|
|
116
|
+
identity_file_unsupported_platform: "A Windows Home does not support an identity file yet.",
|
|
117
|
+
};
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* Whether an identity file is usable as the link's key, decided from its metadata alone: the file is never opened or read.
|
|
121
|
+
* It must be a regular file (a symlink is refused, so the path names the key itself), owned by this user with no group or
|
|
122
|
+
* other permission bits (ssh ignores a key file of its owner that others can read, and the link would then fail public-key
|
|
123
|
+
* authentication with nothing pointing at the cause), and readable by this user. Its directory must be owned by this user or
|
|
124
|
+
* root and not writable by group or others (a world-writable sticky directory such as /tmp is refused too:
|
|
125
|
+
* identity_file_directory). Every other directory the path passes through as it resolves, the directories holding its
|
|
126
|
+
* symlinks and their targets included, must be owned by this user or root and not writable by group or others unless it is
|
|
127
|
+
* sticky, and every symlink on the path must be owned by this user or root (identity_file_ancestor). A group-writable
|
|
128
|
+
* directory is refused even when the group is the user's own, as sshd's StrictModes does. It is a check of metadata at
|
|
129
|
+
* request time: ssh opens the path later, and a change this user or root makes in between is not caught. Null when usable.
|
|
130
|
+
* lstat is a parameter only so a test can give a symlink another owner.
|
|
131
|
+
* A Windows Home refuses every identity file before looking at it: the accepted form is a POSIX path, which Windows resolves
|
|
132
|
+
* against the current drive, and owner and mode bits there say nothing about the file's ACL.
|
|
133
|
+
*/
|
|
134
|
+
export function identityFileProblem(path: string, platform: NodeJS.Platform = process.platform, lstat: (path: string) => Stats = lstatSync): IdentityFileProblem | null {
|
|
135
|
+
if (platform === "win32") return "identity_file_unsupported_platform";
|
|
136
|
+
let stat;
|
|
137
|
+
try { stat = lstat(path); } catch (error) {
|
|
138
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
139
|
+
return code === "ENOENT" || code === "ENOTDIR" ? "identity_file_missing" : "identity_file_unreadable";
|
|
140
|
+
}
|
|
141
|
+
if (stat.isSymbolicLink() || !stat.isFile()) return "identity_file_not_regular";
|
|
142
|
+
if (typeof process.getuid === "function" && stat.uid !== process.getuid()) return "identity_file_permissions";
|
|
143
|
+
if ((stat.mode & 0o077) !== 0) return "identity_file_permissions";
|
|
144
|
+
const directory = resolvedDirectory(dirname(path), lstat);
|
|
145
|
+
if (typeof directory === "string") return directory;
|
|
146
|
+
if ((directory.mode & 0o022) !== 0) return "identity_file_directory";
|
|
147
|
+
try { accessSync(path, constants.R_OK); } catch { return "identity_file_unreadable"; }
|
|
148
|
+
return null;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
const MAX_SYMLINKS = 40;
|
|
152
|
+
|
|
153
|
+
/** Owned by this user or root. */
|
|
154
|
+
function trustedOwner(stat: Stats): boolean {
|
|
155
|
+
return typeof process.getuid !== "function" || stat.uid === process.getuid() || stat.uid === 0;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/** Owned by this user or root, and not writable by group or others unless sticky. */
|
|
159
|
+
function safeDirectory(stat: Stats): boolean {
|
|
160
|
+
return trustedOwner(stat) && ((stat.mode & 0o022) === 0 || (stat.mode & 0o1000) !== 0);
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
/**
|
|
164
|
+
* Resolves an absolute directory path one entry at a time, as the kernel does, and checks every directory it passes
|
|
165
|
+
* through with safeDirectory (the root, each directory on the way, the directory holding each symlink and each symlink's
|
|
166
|
+
* target) and every symlink's owner. A failure at the final directory is identity_file_directory, anywhere above it
|
|
167
|
+
* identity_file_ancestor. Answers the final directory's metadata, or the problem.
|
|
168
|
+
*/
|
|
169
|
+
function resolvedDirectory(path: string, lstat: (path: string) => Stats): Stats | IdentityFileProblem {
|
|
170
|
+
const failed = (error: unknown): IdentityFileProblem => {
|
|
171
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
172
|
+
return code === "ENOENT" || code === "ENOTDIR" ? "identity_file_missing" : "identity_file_unreadable";
|
|
173
|
+
};
|
|
174
|
+
try {
|
|
175
|
+
let current = "/";
|
|
176
|
+
let stat = lstat(current);
|
|
177
|
+
const pending = path.split("/").filter(name => name !== "" && name !== ".");
|
|
178
|
+
if (!safeDirectory(stat)) return pending.length === 0 ? "identity_file_directory" : "identity_file_ancestor";
|
|
179
|
+
let links = 0;
|
|
180
|
+
while (pending.length > 0) {
|
|
181
|
+
const name = pending.shift()!;
|
|
182
|
+
// After a symlink target's "..", the pending count can name the wrong level in the hint; the refusal itself still holds.
|
|
183
|
+
if (name === "..") { current = dirname(current); stat = lstat(current); continue; }
|
|
184
|
+
const next = current === "/" ? "/" + name : current + "/" + name;
|
|
185
|
+
const entry = lstat(next);
|
|
186
|
+
if (entry.isSymbolicLink()) {
|
|
187
|
+
// A link another user owns can be repointed by them, even in a sticky directory.
|
|
188
|
+
if (!trustedOwner(entry)) return "identity_file_ancestor";
|
|
189
|
+
if (++links > MAX_SYMLINKS) return "identity_file_unreadable";
|
|
190
|
+
const target = readlinkSync(next);
|
|
191
|
+
if (target.startsWith("/")) { current = "/"; stat = lstat(current); }
|
|
192
|
+
pending.unshift(...target.split("/").filter(part => part !== "" && part !== "."));
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
if (!entry.isDirectory()) return "identity_file_missing";
|
|
196
|
+
if (!safeDirectory(entry)) return pending.length === 0 ? "identity_file_directory" : "identity_file_ancestor";
|
|
197
|
+
current = next;
|
|
198
|
+
stat = entry;
|
|
199
|
+
}
|
|
200
|
+
return stat;
|
|
201
|
+
} catch (error) { return failed(error); }
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
export class ExplicitRouteError extends Error {
|
|
205
|
+
constructor(readonly reason: ExplicitRouteRefusal) {
|
|
206
|
+
super("invalid explicit route: " + reason);
|
|
207
|
+
this.name = "ExplicitRouteError";
|
|
208
|
+
}
|
|
209
|
+
}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import type { LinkRecoveryTarget } from "./operation-recovery-slot";
|
|
3
|
+
import { requireRemotePlatform } from "./remote-platform";
|
|
4
|
+
import { PURGE_KEPT_IN_USE_MARKER, remoteManagedPurgeDisconnectArgv, remoteRecoverReceiptArgv } from "./remote-plant";
|
|
5
|
+
import { MANAGED_PURGE_CHILD_MISSING_MARKER } from "./remote-windows";
|
|
6
|
+
import { checkRouteTrust } from "./route-trust";
|
|
7
|
+
import { buildExecArgv } from "./ssh-argv";
|
|
8
|
+
import type { SshRunner } from "./ssh-runner";
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* ocx link recover's remote step (lane O5): run the managed planted ocx-child's
|
|
12
|
+
* "disconnect --purge --json --expect-link <id>" over the target's alias, with the link known_hosts
|
|
13
|
+
* pinned to the recorded host key. Only the alias is used, never a sibling route, so the command
|
|
14
|
+
* reaches the machine whose key the link confirmed. Cleanup is proven only by the Child's exit 0
|
|
15
|
+
* report that names this link with restored: true and says the planted binary was removed, or was
|
|
16
|
+
* kept with the in-use marker because another home's relay runs from it (the link's own state is
|
|
17
|
+
* clean either way), or, when that report was lost after the purge, by the durable receipt the Child wrote for this link
|
|
18
|
+
* ($OPENCODEX_HOME/link-receipts/<id>.json). Absence of files alone proves nothing. Hints are fixed
|
|
19
|
+
* words: the machine's own text never reaches the caller.
|
|
20
|
+
*/
|
|
21
|
+
export type LinkRecoverOutcome =
|
|
22
|
+
/** purged false: the Child restored its state for the link but kept the shared planted binary for another home's relay. */
|
|
23
|
+
| { readonly ok: true; readonly purged: boolean }
|
|
24
|
+
| { readonly ok: false; readonly status: number; readonly code: string; readonly message: string; readonly hint?: string };
|
|
25
|
+
|
|
26
|
+
/** Child exit codes of detach --expect-link (native/ocx-child/src/cli.rs). */
|
|
27
|
+
const EXIT_USAGE = 2;
|
|
28
|
+
const EXIT_CONFLICT = 5;
|
|
29
|
+
const EXIT_RESIDUAL = 6;
|
|
30
|
+
const SSH_TRANSPORT_FAILURE = 255;
|
|
31
|
+
/** Record names the Child reports; anything else is not echoed. */
|
|
32
|
+
const RECORDS = new Set(["codex-home-owner", "child-state", "attach-rollback", "codex-journal", "link-key", "catalog-backup"]);
|
|
33
|
+
|
|
34
|
+
interface ExpectLinkReport {
|
|
35
|
+
restored?: unknown;
|
|
36
|
+
outcome?: unknown;
|
|
37
|
+
linkId?: unknown;
|
|
38
|
+
purged?: unknown;
|
|
39
|
+
record?: unknown;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/** The last JSON object line of the Child's stdout, or null. */
|
|
43
|
+
export function parseExpectLinkReport(stdout: string): ExpectLinkReport | null {
|
|
44
|
+
for (const raw of stdout.split(/\r?\n/).reverse()) {
|
|
45
|
+
const line = raw.trim();
|
|
46
|
+
if (!line.startsWith("{")) continue;
|
|
47
|
+
try {
|
|
48
|
+
const parsed: unknown = JSON.parse(line);
|
|
49
|
+
if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return parsed as ExpectLinkReport;
|
|
50
|
+
} catch { /* not the report line */ }
|
|
51
|
+
}
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function recordHint(report: ExpectLinkReport | null): string | undefined {
|
|
56
|
+
return typeof report?.record === "string" && RECORDS.has(report.record) ? report.record : undefined;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export async function recoverRemoteChild(
|
|
60
|
+
runner: Pick<SshRunner, "run">,
|
|
61
|
+
target: LinkRecoveryTarget,
|
|
62
|
+
knownHostsFile: string,
|
|
63
|
+
): Promise<LinkRecoverOutcome> {
|
|
64
|
+
const failed = (message: string, hint: string): LinkRecoverOutcome => ({ ok: false, status: 502, code: "remote_recover_failed", message, hint });
|
|
65
|
+
// With an explicit route (O6) its ProxyCommand, user and port go on the command line; otherwise
|
|
66
|
+
// the alias alone, with the pinned host key either way.
|
|
67
|
+
const route = target.explicitRoute ?? null;
|
|
68
|
+
const exec = (argv: string[]) => runner.run(buildExecArgv({ alias: target.alias, argv, knownHostsFile, route }), { timeoutMs: 30_000 });
|
|
69
|
+
let trusted: string;
|
|
70
|
+
try { trusted = readFileSync(knownHostsFile, "utf8"); } catch { trusted = ""; }
|
|
71
|
+
const trust = checkRouteTrust(trusted, target.alias, target.hostKeyFingerprint);
|
|
72
|
+
if (!trust.ok) {
|
|
73
|
+
return trust.code === "trust_file_unexpected"
|
|
74
|
+
? { ok: false, status: 409, code: "trust_file_unexpected", message: "The link known_hosts file has a pattern, host-list, marker or malformed line; remove that line, then try again." }
|
|
75
|
+
: { ok: false, status: 409, code: "host_key_changed", message: "The link known_hosts file no longer trusts the host key this link recorded for its alias, so the machine was not contacted." };
|
|
76
|
+
}
|
|
77
|
+
let platform = target.remotePlatform;
|
|
78
|
+
if (!platform) {
|
|
79
|
+
try { platform = await requireRemotePlatform(runner, target.alias, route, knownHostsFile); } catch { return failed("The Child's platform could not be determined, so recovery was not attempted.", "platform_unknown"); }
|
|
80
|
+
}
|
|
81
|
+
let result;
|
|
82
|
+
try { result = await exec(remoteManagedPurgeDisconnectArgv(platform, target.linkId)); } catch { return failed("The Child could not be reached.", "ssh_failed"); }
|
|
83
|
+
const report = parseExpectLinkReport(result.stdout);
|
|
84
|
+
if (result.code === EXIT_RESIDUAL && report?.outcome === "residual") {
|
|
85
|
+
return { ok: false, status: 409, code: "child_residual", message: "The Child keeps state this command does not restore (an ownership record without a link id, state missing beside its record, or an interrupted attach of another link), and nothing was changed. Do not run a plain ocx-child detach on that machine: it would also restore and remove a link an interrupted attach left. When the machine is gone or its cleanup cannot be proven, a person on this Home can run ocx link recover --forget --link-id <id> --yes.", ...(recordHint(report) ? { hint: recordHint(report) } : {}) };
|
|
86
|
+
}
|
|
87
|
+
if (result.code === EXIT_CONFLICT && report?.outcome === "conflict") {
|
|
88
|
+
return { ok: false, status: 409, code: "child_conflict", message: "The Child belongs to another link or OpenCodex home, or its records cannot be read; nothing was changed.", ...(recordHint(report) ? { hint: recordHint(report) } : {}) };
|
|
89
|
+
}
|
|
90
|
+
if (result.code === EXIT_USAGE) {
|
|
91
|
+
return { ok: false, status: 409, code: "child_recover_unsupported", message: "The planted ocx-child predates detach --expect-link, so it cannot check which link it belongs to, and nothing was changed. Do not run its plain detach on that machine: its status cannot show an interrupted attach of another link, which a plain detach would restore and then remove. Leave the machine: recover cannot confirm its cleanup with this build. Once the machine is gone, or a person on that machine has checked and cleaned its ocx-child records by hand, a person on this Home can run ocx link recover --forget --link-id " + target.linkId + " --yes." };
|
|
92
|
+
}
|
|
93
|
+
if (result.code !== 0) {
|
|
94
|
+
if (result.stderr.includes(MANAGED_PURGE_CHILD_MISSING_MARKER)) {
|
|
95
|
+
// A purge whose answer was lost already removed the binary: settle only on the durable receipt
|
|
96
|
+
// of the restore, written before that purge. The missing binary is the purge's own evidence.
|
|
97
|
+
let stored;
|
|
98
|
+
try { stored = await exec(remoteRecoverReceiptArgv(platform, target.linkId)); } catch { return failed("The Child could not be reached.", "ssh_failed"); }
|
|
99
|
+
const receipt = stored.code === 0 ? parseExpectLinkReport(stored.stdout) as (ExpectLinkReport & { schema?: unknown }) | null : null;
|
|
100
|
+
if (!receipt || receipt.schema !== "ocx.child.detach-receipt/1" || receipt.linkId !== target.linkId || receipt.restored !== true) {
|
|
101
|
+
return failed("No planted ocx-child was found in the managed directory and no cleanup receipt for this link exists, so cleanup could not be proven.", "managed_child_missing");
|
|
102
|
+
}
|
|
103
|
+
return { ok: true, purged: true };
|
|
104
|
+
}
|
|
105
|
+
return failed(result.code === SSH_TRANSPORT_FAILURE ? "The Child could not be reached." : "The Child could not be recovered.", result.code === SSH_TRANSPORT_FAILURE ? "ssh_failed" : "child_failed");
|
|
106
|
+
}
|
|
107
|
+
if (report?.restored !== true || report.linkId !== target.linkId) return failed("The Child did not report a cleanup bound to this link.", "receipt_unbound");
|
|
108
|
+
// The link's own state is clean; the binary stays only because another home's relay runs from it,
|
|
109
|
+
// which no repeat would change. That settles the tombstone.
|
|
110
|
+
if (report.purged !== true && result.stderr.includes(PURGE_KEPT_IN_USE_MARKER)) return { ok: true, purged: false };
|
|
111
|
+
if (report.purged !== true) return failed("The Child was cleaned but did not report removing the planted ocx-child binary.", "purge_incomplete");
|
|
112
|
+
return { ok: true, purged: true };
|
|
113
|
+
}
|
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
export const LINK_MANAGEMENT_PREFIX = "/v1/link-management";
|
|
17
17
|
/** The Home's OpenCodex-owned Codex settings a Child applies when it syncs. */
|
|
18
18
|
export const LINK_CODEX_SETTINGS_PATH = `${LINK_MANAGEMENT_PREFIX}/codex-settings`;
|
|
19
|
+
export const LINK_ROUTE_INTENT_PATH = `${LINK_MANAGEMENT_PREFIX}/route-intent`;
|
|
20
|
+
export const LINK_ROUTE_CATALOG_PATH = `${LINK_MANAGEMENT_PREFIX}/route-catalog`;
|
|
19
21
|
|
|
20
22
|
export const LINK_MANAGEMENT_READ_PATHS: readonly string[] = [
|
|
21
23
|
"/api/system/health",
|
|
@@ -71,7 +73,7 @@ export function linkManagementTarget(url: URL): URL | null {
|
|
|
71
73
|
/** Home side: may the hub-link listener dispatch this request to the link management handler? */
|
|
72
74
|
export function linkManagementRouteAllowed(url: URL, req: Request): boolean {
|
|
73
75
|
if (req.headers.has("upgrade")) return false;
|
|
74
|
-
if (url.pathname === LINK_CODEX_SETTINGS_PATH) return req.method === "GET" && url.search === "";
|
|
76
|
+
if (url.pathname === LINK_CODEX_SETTINGS_PATH || url.pathname === LINK_ROUTE_INTENT_PATH || url.pathname === LINK_ROUTE_CATALOG_PATH) return req.method === "GET" && url.search === "";
|
|
75
77
|
const target = linkManagementTarget(url);
|
|
76
78
|
return target !== null && linkManagementReadAllowed(req.method, target.pathname, target.searchParams);
|
|
77
79
|
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import type { ExplicitRoute } from "./explicit-route";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Core-owned slot through which the enrollment journal (lane O1, ocx link add --operation-id) lets
|
|
5
|
+
* ocx link recover --operation-id find the Child an enrollment left behind before it reached
|
|
6
|
+
* links.json. Nothing registers here until that journal ships; recover then answers
|
|
7
|
+
* operation_journal_unavailable.
|
|
8
|
+
*
|
|
9
|
+
* Contract for the journal: lookup answers the operation's reserved link id, alias, pinned host-key
|
|
10
|
+
* fingerprint and platform when its outcome is residual (or unknown with a reserved link id);
|
|
11
|
+
* settle is called after the Child's receipt proved cleanup, so the journal can record that and
|
|
12
|
+
* start its retention clock. Both run synchronously and never touch SSH.
|
|
13
|
+
*/
|
|
14
|
+
export interface LinkRecoveryTarget {
|
|
15
|
+
linkId: string;
|
|
16
|
+
alias: string;
|
|
17
|
+
hostKeyFingerprint: string;
|
|
18
|
+
remotePlatform?: "posix" | "windows";
|
|
19
|
+
/** The link's explicit route (O6), or absent for an ssh_config alias. */
|
|
20
|
+
explicitRoute?: ExplicitRoute;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export type OperationRecoveryLookup =
|
|
24
|
+
| { kind: "target"; target: LinkRecoveryTarget }
|
|
25
|
+
| { kind: "not_found" }
|
|
26
|
+
| { kind: "not_residual" };
|
|
27
|
+
|
|
28
|
+
export interface OperationRecoveryResolver {
|
|
29
|
+
lookup(operationId: string): OperationRecoveryLookup;
|
|
30
|
+
settle(operationId: string): void;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
let registered: OperationRecoveryResolver | null = null;
|
|
34
|
+
|
|
35
|
+
/** Register the journal's resolver; returns the unregister function. */
|
|
36
|
+
export function registerOperationRecoveryResolver(resolver: OperationRecoveryResolver): () => void {
|
|
37
|
+
registered = resolver;
|
|
38
|
+
return () => { if (registered === resolver) registered = null; };
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** The registered resolver, or null when no enrollment journal is available. */
|
|
42
|
+
export function operationRecoveryResolver(): OperationRecoveryResolver | null {
|
|
43
|
+
return registered;
|
|
44
|
+
}
|