@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
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The link known_hosts file as a route edit must find it (structure/remote-link.md, "Routes"). It is
|
|
3
|
+
* private and written only by putKnownHost, one "<alias> <keytype> <base64>" line per alias; releases
|
|
4
|
+
* before HashKnownHosts=no was passed to the probe (#6891) recorded that line hashed ("|1|salt|hash")
|
|
5
|
+
* on a Home whose ssh_config hashes known_hosts. With HostKeyAlias=<alias>, OpenSSH looks a key up
|
|
6
|
+
* under the alias alone: it compares plain names without case, and it lowercases the alias before
|
|
7
|
+
* hashing it, so a hashed line matches exactly when it is HMAC-SHA1(salt, lowercased alias). A link
|
|
8
|
+
* trusts exactly its record's key only when every line matching the alias that way carries that key
|
|
9
|
+
* and no line is a pattern, list, [host]:port form or marker that could match it too.
|
|
10
|
+
*/
|
|
11
|
+
import { createHash, createHmac } from "node:crypto";
|
|
12
|
+
import { isSshAlias } from "./ssh-argv";
|
|
13
|
+
|
|
14
|
+
export type RouteTrustCheck = { ok: true; line: string } | { ok: false; code: "pin_mismatch" | "trust_file_unexpected" };
|
|
15
|
+
|
|
16
|
+
const KEY_TYPE = /^[a-z0-9][a-z0-9@.-]{0,63}$/;
|
|
17
|
+
const BASE64 = /^[A-Za-z0-9+/]+={0,2}$/;
|
|
18
|
+
// OpenSSH's hashed host field: a 20-byte salt and a 20-byte HMAC-SHA1, both in base64.
|
|
19
|
+
const HASHED = /^\|1\|([A-Za-z0-9+/]{27}=)\|([A-Za-z0-9+/]{27}=)$/;
|
|
20
|
+
|
|
21
|
+
/** OpenSSH's SHA256 fingerprint of a public key blob given in base64. */
|
|
22
|
+
export function keyFingerprint(base64: string): string {
|
|
23
|
+
return "SHA256:" + createHash("sha256").update(Buffer.from(base64, "base64")).digest("base64").replace(/=+$/, "");
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function hostField(line: string): string {
|
|
27
|
+
return line.trim().split(/\s+/)[0] ?? "";
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** Does this host field name alias for an OpenSSH lookup with HostKeyAlias=<alias>? */
|
|
31
|
+
function hostMatches(host: string, alias: string): boolean {
|
|
32
|
+
const hashed = HASHED.exec(host);
|
|
33
|
+
if (!hashed) return host.toLowerCase() === alias.toLowerCase();
|
|
34
|
+
return createHmac("sha1", Buffer.from(hashed[1]!, "base64")).update(alias.toLowerCase()).digest("base64") === hashed[2];
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function meaningful(line: string): boolean {
|
|
38
|
+
const trimmed = line.trim();
|
|
39
|
+
return trimmed !== "" && !trimmed.startsWith("#");
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Whole-file check, then the lines that match alias (plain without case, or hashed), which must all
|
|
44
|
+
* carry one key: the key OpenSSH will accept for it. Any pattern, host list, [host]:port form, marker
|
|
45
|
+
* or malformed hashed field fails the whole file; a well-formed hashed line for another name is
|
|
46
|
+
* another host's line.
|
|
47
|
+
*/
|
|
48
|
+
export function aliasTrustLine(text: string, alias: string): RouteTrustCheck {
|
|
49
|
+
const lines = text.split(/\r?\n/).filter(meaningful);
|
|
50
|
+
for (const line of lines) {
|
|
51
|
+
const [host, type, key] = line.trim().split(/\s+/);
|
|
52
|
+
// isSshAlias admits no * ? ! , | and no leading [ or @, so a valid host field is one literal name.
|
|
53
|
+
if (!host || !type || !key || !(isSshAlias(host) || HASHED.test(host)) || !KEY_TYPE.test(type) || !BASE64.test(key)) return { ok: false, code: "trust_file_unexpected" };
|
|
54
|
+
}
|
|
55
|
+
const matches = lines.filter(line => hostMatches(hostField(line), alias));
|
|
56
|
+
if (matches.length === 0) return { ok: false, code: "pin_mismatch" };
|
|
57
|
+
// OpenSSH accepts any matching line, so several lines are one pin only when they all carry the same
|
|
58
|
+
// key: legacy files hold a hashed line per confirmation, or a hashed line beside a later plain one.
|
|
59
|
+
const keyOf = (line: string) => line.trim().split(/\s+/).slice(1, 3).join(" ");
|
|
60
|
+
const pinned = keyOf(matches[0]!);
|
|
61
|
+
return matches.every(line => keyOf(line) === pinned) ? { ok: true, line: matches[0]!.trim() } : { ok: false, code: "pin_mismatch" };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** aliasTrustLine, and that one line's key has the pinned fingerprint. */
|
|
65
|
+
export function checkRouteTrust(text: string, alias: string, fingerprint: string | null): RouteTrustCheck {
|
|
66
|
+
const found = aliasTrustLine(text, alias);
|
|
67
|
+
if (!found.ok) return found;
|
|
68
|
+
if (fingerprint === null) return { ok: false, code: "pin_mismatch" };
|
|
69
|
+
const key = found.line.split(/\s+/)[2]!;
|
|
70
|
+
return keyFingerprint(key) === fingerprint ? found : { ok: false, code: "pin_mismatch" };
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** The file's meaningful lines without any line OpenSSH would use for alias (any case, or hashed). */
|
|
74
|
+
export function withoutAliasLines(text: string, alias: string): string[] {
|
|
75
|
+
// Every line OpenSSH would use for the alias goes, a hashed one included, so a confirmation replaces it.
|
|
76
|
+
return text.split(/\r?\n/).filter(line => line && !hostMatches(hostField(line), alias) && !line.startsWith(alias + ","));
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
export type ConfirmedLineTrust = "trusted" | "trust_file_unexpected" | "key_changed";
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Does the file still trust exactly the key a confirmation wrote for alias? It must pass the same
|
|
83
|
+
* whole-file check as a route edit (`trust_file_unexpected` otherwise: OpenCodex writes this file
|
|
84
|
+
* only with plain one-alias lines, so another shape is a hand edit this check cannot rule out), and
|
|
85
|
+
* every line for the alias, which may be several (a legacy hashed line beside a later plain one),
|
|
86
|
+
* must carry the confirmed key type and key (`key_changed` otherwise). The probe computed the
|
|
87
|
+
* confirmed fingerprint from the line it wrote (ssh-keygen -l), so that line carries it.
|
|
88
|
+
*/
|
|
89
|
+
export function confirmedLineTrust(text: string, alias: string, confirmedLine: string): ConfirmedLineTrust {
|
|
90
|
+
const found = aliasTrustLine(text, alias);
|
|
91
|
+
if (!found.ok) return found.code === "trust_file_unexpected" ? "trust_file_unexpected" : "key_changed";
|
|
92
|
+
// The host field may be another spelling of the alias (putKnownHost replaces every case variant);
|
|
93
|
+
// the key type and key are what OpenSSH will accept.
|
|
94
|
+
return found.line.split(/\s+/).slice(1, 3).join(" ") === confirmedLine.trim().split(/\s+/).slice(1, 3).join(" ") ? "trusted" : "key_changed";
|
|
95
|
+
}
|
|
96
|
+
|
package/src/link/ssh-argv.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isRouteClientId, type RouteClientId } from "./route-intent";
|
|
1
2
|
/**
|
|
2
3
|
* Argument vectors for the system OpenSSH client used by machine links.
|
|
3
4
|
*
|
|
@@ -19,7 +20,8 @@
|
|
|
19
20
|
*/
|
|
20
21
|
|
|
21
22
|
import { isAbsolute } from "node:path";
|
|
22
|
-
import {
|
|
23
|
+
import { ExplicitRouteError, explicitRouteSshOptions, type ExplicitRoute } from "./explicit-route";
|
|
24
|
+
import { POWERSHELL_ENCODED_MAX, PowerShellCommandTooLongError, ROUTE_OVERWRITE_MIN_CHILD_VERSION, windowsGatedOcxArgv, windowsOcxArgv, windowsOverwriteSyncArgv } from "./remote-windows";
|
|
23
25
|
|
|
24
26
|
export type TunnelDirection = "R" | "L";
|
|
25
27
|
|
|
@@ -67,8 +69,40 @@ function optionPath(path: string): string {
|
|
|
67
69
|
return /\s/.test(path) ? `"${path}"` : path;
|
|
68
70
|
}
|
|
69
71
|
|
|
70
|
-
|
|
72
|
+
/** ERROR everywhere; DEBUG1 only for a tunnel spawned while opt-in SSH capture is on (src/link/ssh-capture.ts). */
|
|
73
|
+
export type SshLogLevel = "ERROR" | "DEBUG1";
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* The link's explicit route (src/link/explicit-route.ts) as command-line options, which ssh takes before
|
|
77
|
+
* anything in ssh_config. It names how to reach the link's own alias, so it is refused with any other
|
|
78
|
+
* destination; null adds nothing, which is the argv of a link without one.
|
|
79
|
+
*/
|
|
80
|
+
function routeOptions(route: ExplicitRoute | null | undefined, alias: string, destination: string): RouteArgs {
|
|
81
|
+
if (!route) return NO_ROUTE;
|
|
82
|
+
if (destination !== alias) throw new LinkSshArgumentError("an explicit route reaches the link alias only");
|
|
83
|
+
try {
|
|
84
|
+
// Decided by the route itself, never by what its options happen to be: a link with a route reads no ssh_config.
|
|
85
|
+
return { configFile: ["-F", "none"], options: explicitRouteSshOptions(route) };
|
|
86
|
+
} catch (error) {
|
|
87
|
+
if (error instanceof ExplicitRouteError) throw new LinkSshArgumentError(error.message);
|
|
88
|
+
throw error;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* What a route adds to the argv. configFile is ["-F", "none"] for every explicit route and comes first: an explicit route
|
|
94
|
+
* names the transport, user and port and the host key is pinned, so such a link reads no ssh_config at all (list-valued
|
|
95
|
+
* settings such as forwards, SendEnv and IdentityFile would add to ours, a RemoteCommand would break every exec, and no
|
|
96
|
+
* option can remove a configured forward from the tunnel). A route's identity file (link.route/2) narrows what remains:
|
|
97
|
+
* with -F none the defaults still offer the agent's keys and ~/.ssh/id_*, so IdentitiesOnly=yes and IdentityAgent=none
|
|
98
|
+
* leave that one IdentityFile. Links without a route keep reading the owner's ssh_config, which is how they reach their host.
|
|
99
|
+
*/
|
|
100
|
+
interface RouteArgs { configFile: readonly string[]; options: readonly string[] }
|
|
101
|
+
const NO_ROUTE: RouteArgs = { configFile: [], options: [] };
|
|
102
|
+
|
|
103
|
+
function commonOptions(alias: string, knownHostsFile: string, strict: "yes" | "accept-new", logLevel: SshLogLevel, route: RouteArgs): string[] {
|
|
71
104
|
return [
|
|
105
|
+
...route.configFile,
|
|
72
106
|
"-o", "BatchMode=yes",
|
|
73
107
|
"-o", "ConnectTimeout=10",
|
|
74
108
|
"-o", "ServerAliveInterval=15",
|
|
@@ -87,12 +121,18 @@ function commonOptions(alias: string, knownHostsFile: string, strict: "yes" | "a
|
|
|
87
121
|
"-o", "ForwardAgent=no",
|
|
88
122
|
"-o", "ForwardX11=no",
|
|
89
123
|
"-o", "PermitLocalCommand=no",
|
|
90
|
-
"-o",
|
|
124
|
+
"-o", `LogLevel=${logLevel}`,
|
|
125
|
+
...route.options,
|
|
91
126
|
];
|
|
92
127
|
}
|
|
93
128
|
|
|
94
129
|
export interface TunnelArgvOptions {
|
|
95
130
|
alias: string;
|
|
131
|
+
/**
|
|
132
|
+
* Where ssh connects, when it is another route to the same machine. HostKeyAlias stays alias, so
|
|
133
|
+
* the route is checked against the key pinned for the link. Omitted: alias (today's argv).
|
|
134
|
+
*/
|
|
135
|
+
destination?: string;
|
|
96
136
|
/** "R": listen on the remote host and reach this host. "L": listen here and reach the remote host. */
|
|
97
137
|
direction: TunnelDirection;
|
|
98
138
|
/** Port the forward listens on (remote for "R", local for "L"). */
|
|
@@ -100,37 +140,55 @@ export interface TunnelArgvOptions {
|
|
|
100
140
|
/** Port the forward connects to on the other side's 127.0.0.1. */
|
|
101
141
|
targetPort: number;
|
|
102
142
|
knownHostsFile: string;
|
|
143
|
+
/** Defaults to ERROR. DEBUG1 is requested only by opt-in SSH capture; the argv is otherwise unchanged. */
|
|
144
|
+
logLevel?: SshLogLevel;
|
|
145
|
+
/**
|
|
146
|
+
* The link's explicit route, or null. Required so every caller decides: a Home-initiated link passes
|
|
147
|
+
* its record's explicitRoute (absent: null); Child-initiated and messaging commands pass null.
|
|
148
|
+
*/
|
|
149
|
+
route: ExplicitRoute | null;
|
|
103
150
|
}
|
|
104
151
|
|
|
105
152
|
export function buildTunnelArgv(options: TunnelArgvOptions): string[] {
|
|
106
153
|
const alias = assertSshAlias(options.alias);
|
|
154
|
+
const destination = assertSshAlias(options.destination ?? alias);
|
|
107
155
|
const bind = assertPort(options.bindPort, "bindPort");
|
|
108
156
|
const target = assertPort(options.targetPort, "targetPort");
|
|
109
157
|
if (options.direction !== "R" && options.direction !== "L") throw new LinkSshArgumentError("direction must be R or L");
|
|
158
|
+
const logLevel = options.logLevel ?? "ERROR";
|
|
159
|
+
if (logLevel !== "ERROR" && logLevel !== "DEBUG1") throw new LinkSshArgumentError("logLevel must be ERROR or DEBUG1");
|
|
110
160
|
return [
|
|
111
161
|
"ssh", "-N", "-T",
|
|
112
|
-
...commonOptions(alias, options.knownHostsFile, "yes"),
|
|
162
|
+
...commonOptions(alias, options.knownHostsFile, "yes", logLevel, routeOptions(options.route, alias, destination)),
|
|
113
163
|
"-o", "ExitOnForwardFailure=yes",
|
|
114
164
|
`-${options.direction}`, `127.0.0.1:${bind}:127.0.0.1:${target}`,
|
|
115
|
-
"--",
|
|
165
|
+
"--", destination,
|
|
116
166
|
];
|
|
117
167
|
}
|
|
118
168
|
|
|
119
169
|
export interface ExecArgvOptions {
|
|
120
170
|
alias: string;
|
|
171
|
+
/** Another route to the same machine; HostKeyAlias stays alias. Omitted: alias. */
|
|
172
|
+
destination?: string;
|
|
121
173
|
/** Remote argv. The command must be sh; its arguments are quoted for the remote shell. */
|
|
122
174
|
argv: readonly string[];
|
|
123
175
|
knownHostsFile: string;
|
|
176
|
+
/**
|
|
177
|
+
* The link's explicit route, or null. Required so every caller decides: a Home-initiated link passes
|
|
178
|
+
* its record's explicitRoute (absent: null); Child-initiated and messaging commands pass null.
|
|
179
|
+
*/
|
|
180
|
+
route: ExplicitRoute | null;
|
|
124
181
|
}
|
|
125
182
|
|
|
126
183
|
export function buildExecArgv(options: ExecArgvOptions): string[] {
|
|
127
184
|
const alias = assertSshAlias(options.alias);
|
|
185
|
+
const destination = assertSshAlias(options.destination ?? alias);
|
|
128
186
|
if (options.argv.length === 0) throw new LinkSshArgumentError("remote argv must not be empty");
|
|
129
187
|
return [
|
|
130
188
|
"ssh", "-T",
|
|
131
|
-
...commonOptions(alias, options.knownHostsFile, "yes"),
|
|
189
|
+
...commonOptions(alias, options.knownHostsFile, "yes", "ERROR", routeOptions(options.route, alias, destination)),
|
|
132
190
|
"-o", "ClearAllForwardings=yes",
|
|
133
|
-
"--",
|
|
191
|
+
"--", destination,
|
|
134
192
|
quoteRemote(options.argv),
|
|
135
193
|
];
|
|
136
194
|
}
|
|
@@ -141,40 +199,47 @@ export const REMOTE_COMMAND_NOT_FOUND = 127;
|
|
|
141
199
|
export const REMOTE_PLATFORM_UNSUPPORTED = 125;
|
|
142
200
|
|
|
143
201
|
/**
|
|
144
|
-
*
|
|
145
|
-
*
|
|
146
|
-
*
|
|
147
|
-
*
|
|
148
|
-
*
|
|
149
|
-
*
|
|
150
|
-
* `command`, one or two absolute paths without quotes or backslashes, is read; any other shape
|
|
151
|
-
* falls through. Desktop binaries then precede PATH candidates; each candidate must run --version
|
|
152
|
-
* successfully. A missing runnable ocx exits 127.
|
|
153
|
-
*/
|
|
154
|
-
/**
|
|
155
|
-
* Reads the first \`command\` of \`serving-runtimes.json\` (#8359): one or two absolute paths without
|
|
156
|
-
* quotes or backslashes, printed one per line, from a file of at most 64 KiB. Any other shape fails.
|
|
202
|
+
* Reads the first record's \`command\` of \`serving-runtimes.json\` (#8359): one or two absolute paths
|
|
203
|
+
* without quotes or backslashes, printed one per line, from a file of at most 64 KiB. The file must
|
|
204
|
+
* be the complete document in the layout its only writer produces (\`JSON.stringify(_, null, 2)\` in
|
|
205
|
+
* src/config/serving-runtimes.ts): a first record without \`command\` never borrows a later record's,
|
|
206
|
+
* and a file cut off anywhere before its closing brace prints nothing. Any other shape fails, and an
|
|
207
|
+
* unreadable file or a missing awk fails without writing to stderr.
|
|
157
208
|
* Shared by the ocx discovery, pinned sync and runtime inspection scripts.
|
|
158
209
|
*/
|
|
159
210
|
export const REMOTE_SERVED_RUNTIME = `served_runtime() {
|
|
160
|
-
|
|
161
|
-
|
|
211
|
+
# The count below reports wc's status, never dd's: a missing dd or an unreadable file ends here,
|
|
212
|
+
# and a dd that fails anyway counts zero bytes, which is refused like an oversized census.
|
|
213
|
+
[ -f "$1" ] && [ -r "$1" ] && command -v dd >/dev/null 2>&1 || return 1
|
|
214
|
+
served_size=$( { dd if="$1" bs=65537 count=1 2>/dev/null | wc -c; } 2>/dev/null ) || return 1
|
|
215
|
+
[ "$served_size" -gt 0 ] 2>/dev/null && [ "$served_size" -le 65536 ] 2>/dev/null || return 1
|
|
162
216
|
awk '
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
{
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
217
|
+
{ prev = last; last = $0 }
|
|
218
|
+
bad || done { next }
|
|
219
|
+
NR == 1 { if ($0 != "{") bad = 1; next }
|
|
220
|
+
NR == 2 { if ($0 != " \\"runtimes\\": [") bad = 1; next }
|
|
221
|
+
NR == 3 { if ($0 != " {") bad = 1; next }
|
|
222
|
+
inside {
|
|
223
|
+
if ($0 == " ]" || $0 == " ],") { inside = 0; closed = 1; next }
|
|
224
|
+
line = $0; sub(/,$/, "", line)
|
|
225
|
+
if (line !~ /^ "\\/[^"\\\\]*"$/ || ++count > 2) { bad = 1; next }
|
|
226
|
+
path[count] = substr(line, 10, length(line) - 10); next
|
|
227
|
+
}
|
|
228
|
+
$0 == " \\"command\\": [" { if (closed) bad = 1; else inside = 1; next }
|
|
229
|
+
$0 == " }" || $0 == " }," { done = 1 }
|
|
230
|
+
END {
|
|
231
|
+
if (bad || !done || !closed || !count || prev != " ]" || last != "}") exit 1
|
|
232
|
+
for (i = 1; i <= count; i++) print path[i]
|
|
169
233
|
}
|
|
170
|
-
|
|
171
|
-
' "$1"
|
|
234
|
+
' "$1" 2>/dev/null
|
|
172
235
|
}
|
|
173
236
|
`;
|
|
174
237
|
|
|
175
238
|
/**
|
|
176
239
|
* Tries the served install with \`attempt\`, which must read \`$served_bin\` and honour \`$ocx_entry\`:
|
|
177
240
|
* a compiled binary runs alone, and a package pair runs as \`bun <entry>\` only while the entry exists.
|
|
241
|
+
* The unquoted \`OCX_SERVED\` heredoc is safe only because \`served_runtime\` prints paths without
|
|
242
|
+
* quotes, backslashes or newlines; relaxing that character class would let a path expand or split.
|
|
178
243
|
*/
|
|
179
244
|
export function remoteServedRuntimeAttempt(attempt: string): string {
|
|
180
245
|
return `served_bin= served_entry=
|
|
@@ -192,6 +257,17 @@ OCX_SERVED
|
|
|
192
257
|
fi`;
|
|
193
258
|
}
|
|
194
259
|
|
|
260
|
+
/**
|
|
261
|
+
* The remote sh script for every ocx call. `quoteRemote` single-quotes it, so the login shell
|
|
262
|
+
* passes it through untouched and `$HOME`/`$PATH` expand in the remote `sh`; the arguments reach
|
|
263
|
+
* ocx as `"$@"` without another round of parsing. After an ephemeral ocx-child, the install that
|
|
264
|
+
* last started serving this home comes first, whatever its version (#8359): every `ocx start` that binds records its own
|
|
265
|
+
* relaunch argv at the front of `serving-runtimes.json` (src/config/serving-runtimes.ts), `[ocx]`
|
|
266
|
+
* for a compiled binary or `[bun, cli/index.ts]` for a package install. Only the first entry's
|
|
267
|
+
* `command`, one or two absolute paths without quotes or backslashes, is read; any other shape
|
|
268
|
+
* falls through. Desktop binaries then precede PATH candidates; each candidate must run --version
|
|
269
|
+
* successfully. A missing runnable ocx exits 127.
|
|
270
|
+
*/
|
|
195
271
|
const REMOTE_OCX_CANDIDATES = `ocx_entry=
|
|
196
272
|
${REMOTE_SERVED_RUNTIME}run_ocx_child() {
|
|
197
273
|
for candidate in "$HOME/.local/bin/ocx-child" "$HOME/.cache/opencodex/bin/ocx-child"; do
|
|
@@ -239,6 +315,11 @@ export interface ProbeArgvOptions {
|
|
|
239
315
|
alias: string;
|
|
240
316
|
/** An empty, private, temporary file. The probe records the offered host key here. */
|
|
241
317
|
tempKnownHostsFile: string;
|
|
318
|
+
/**
|
|
319
|
+
* The link's explicit route, or null. Required so every caller decides: a Home-initiated link passes
|
|
320
|
+
* its record's explicitRoute (absent: null); Child-initiated and messaging commands pass null.
|
|
321
|
+
*/
|
|
322
|
+
route: ExplicitRoute | null;
|
|
242
323
|
}
|
|
243
324
|
|
|
244
325
|
/**
|
|
@@ -250,13 +331,44 @@ export function buildProbeArgv(options: ProbeArgvOptions): string[] {
|
|
|
250
331
|
const alias = assertSshAlias(options.alias);
|
|
251
332
|
return [
|
|
252
333
|
"ssh", "-T",
|
|
253
|
-
...commonOptions(alias, options.tempKnownHostsFile, "accept-new"),
|
|
334
|
+
...commonOptions(alias, options.tempKnownHostsFile, "accept-new", "ERROR", routeOptions(options.route, alias, alias)),
|
|
254
335
|
"-o", "ClearAllForwardings=yes",
|
|
255
336
|
"--", alias,
|
|
256
337
|
"echo ocx-link-probe",
|
|
257
338
|
];
|
|
258
339
|
}
|
|
259
340
|
|
|
341
|
+
export interface RouteProbeArgvOptions {
|
|
342
|
+
/** The link's alias: the name its host key is pinned under. */
|
|
343
|
+
alias: string;
|
|
344
|
+
/** The route being tried. */
|
|
345
|
+
destination: string;
|
|
346
|
+
/** The link known_hosts file. It is only read: the route must offer the key already pinned. */
|
|
347
|
+
knownHostsFile: string;
|
|
348
|
+
/**
|
|
349
|
+
* The link's explicit route, or null. Required so every caller decides: a Home-initiated link passes
|
|
350
|
+
* its record's explicitRoute (absent: null); Child-initiated and messaging commands pass null.
|
|
351
|
+
*/
|
|
352
|
+
route: ExplicitRoute | null;
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
/**
|
|
356
|
+
* Does this route reach the pinned machine and accept our key? Strict host-key checking against
|
|
357
|
+
* the link file under HostKeyAlias=alias: a route that answers with any other key fails with "Host
|
|
358
|
+
* key verification failed" and nothing is learned or written. Success prints exactly ocx-link-probe.
|
|
359
|
+
*/
|
|
360
|
+
export function buildRouteProbeArgv(options: RouteProbeArgvOptions): string[] {
|
|
361
|
+
const alias = assertSshAlias(options.alias);
|
|
362
|
+
const destination = assertSshAlias(options.destination);
|
|
363
|
+
return [
|
|
364
|
+
"ssh", "-T",
|
|
365
|
+
...commonOptions(alias, options.knownHostsFile, "yes", "ERROR", routeOptions(options.route, alias, destination)),
|
|
366
|
+
"-o", "ClearAllForwardings=yes",
|
|
367
|
+
"--", destination,
|
|
368
|
+
"echo ocx-link-probe",
|
|
369
|
+
];
|
|
370
|
+
}
|
|
371
|
+
|
|
260
372
|
/**
|
|
261
373
|
* Locale-independent Windows check for a host whose SSH shell is cmd.exe or PowerShell. Both run
|
|
262
374
|
* `cmd /c echo %OS%`, and cmd expands it to `Windows_NT` regardless of display language. The
|
|
@@ -265,13 +377,14 @@ export function buildProbeArgv(options: ProbeArgvOptions): string[] {
|
|
|
265
377
|
export const WINDOWS_OS_PROBE = "cmd /c echo %OS%";
|
|
266
378
|
|
|
267
379
|
/** Run WINDOWS_OS_PROBE against an already trusted (pinned or just-probed) host key only. */
|
|
268
|
-
export function buildWindowsProbeArgv(options: { alias: string; knownHostsFile: string }): string[] {
|
|
380
|
+
export function buildWindowsProbeArgv(options: { alias: string; knownHostsFile: string; destination?: string; route: ExplicitRoute | null }): string[] {
|
|
269
381
|
const alias = assertSshAlias(options.alias);
|
|
382
|
+
const destination = assertSshAlias(options.destination ?? alias);
|
|
270
383
|
return [
|
|
271
384
|
"ssh", "-T",
|
|
272
|
-
...commonOptions(alias, options.knownHostsFile, "yes"),
|
|
385
|
+
...commonOptions(alias, options.knownHostsFile, "yes", "ERROR", routeOptions(options.route, alias, destination)),
|
|
273
386
|
"-o", "ClearAllForwardings=yes",
|
|
274
|
-
"--",
|
|
387
|
+
"--", destination,
|
|
275
388
|
WINDOWS_OS_PROBE,
|
|
276
389
|
];
|
|
277
390
|
}
|
|
@@ -304,15 +417,93 @@ export function quoteRemote(argv: readonly string[]): string {
|
|
|
304
417
|
}).join(" ");
|
|
305
418
|
}
|
|
306
419
|
|
|
307
|
-
|
|
420
|
+
/** Minimum served ocx for a gated command. Closed set: the literals are spliced into awk and PowerShell. */
|
|
421
|
+
export { ROUTE_OVERWRITE_MIN_CHILD_VERSION };
|
|
422
|
+
export type GatedMinVersion = "2.93.0" | "2.97.0" | "2.100.0";
|
|
423
|
+
export type GatedLacksMarker = "child-ocx-lacks-expect-link" | "child-ocx-lacks-orchestrated-update" | "child-ocx-lacks-overwrite";
|
|
424
|
+
export interface GatedOcxCommand {
|
|
425
|
+
minVersion: GatedMinVersion;
|
|
426
|
+
lacksMarker: GatedLacksMarker;
|
|
427
|
+
/** false: a selected ocx-child exits 121 with ocx-fanout:child-ocx-ephemeral before args run. */
|
|
428
|
+
acceptEphemeral: boolean;
|
|
429
|
+
/** true: print ocx-fanout:entry:pair|binary on stderr right after the selection marker. */
|
|
430
|
+
reportEntry: boolean;
|
|
431
|
+
/** true: print ocx-fanout:child-now:<epoch-ms> (the Child's own clock) after the entry marker. Plan probe only. */
|
|
432
|
+
reportClock: boolean;
|
|
433
|
+
/** With acceptEphemeral, print ocx-fanout:selected-kind:ocx-child when the selected candidate is ocx-child.
|
|
434
|
+
* Set only by remotePinnedSyncArgv when a restart is requested (ocx-child ignores the restart flags). */
|
|
435
|
+
reportSelectedKind?: boolean;
|
|
436
|
+
/**
|
|
437
|
+
* A4: what the script does with the Node launcher of a package install whose census pair sits under node_modules.
|
|
438
|
+
* "none": nothing. "report": print ocx-fanout:launcher:available|unavailable (the plan probe; never exits for it).
|
|
439
|
+
* "apply": exec <node> <root>/bin/ocx.mjs with the arguments, or exit 121 child-node-unavailable when no Node answers.
|
|
440
|
+
* A closed union spliced as a literal; only the Home's parsed plan (installer npm or pnpm) chooses "apply".
|
|
441
|
+
*/
|
|
442
|
+
launcher: "none" | "report" | "apply";
|
|
443
|
+
args: readonly string[];
|
|
444
|
+
}
|
|
445
|
+
export const GATED_VERSION_PARTS: Readonly<Record<GatedMinVersion, readonly [string, string, string]>> = {
|
|
446
|
+
"2.93.0": ["2", "93", "0"], "2.97.0": ["2", "97", "0"], "2.100.0": ["2", "100", "0"],
|
|
447
|
+
};
|
|
448
|
+
const LACKS_MARKERS: ReadonlySet<string> = new Set(["child-ocx-lacks-expect-link", "child-ocx-lacks-orchestrated-update", "child-ocx-lacks-overwrite"]);
|
|
449
|
+
export const LINK_ID_PATTERN = /^lnk_[0-9a-f]{16}$/;
|
|
450
|
+
|
|
451
|
+
function assertGated(cmd: GatedOcxCommand): readonly [string, string, string] {
|
|
452
|
+
const parts = Object.hasOwn(GATED_VERSION_PARTS, cmd.minVersion) ? GATED_VERSION_PARTS[cmd.minVersion] : undefined;
|
|
453
|
+
if (!parts || !LACKS_MARKERS.has(cmd.lacksMarker)) throw new LinkSshArgumentError("invalid gated ocx command");
|
|
454
|
+
if (cmd.args.length === 0 || cmd.args.some(arg => arg.includes("\0"))) throw new LinkSshArgumentError("invalid gated ocx arguments");
|
|
455
|
+
if (cmd.launcher !== "none" && cmd.launcher !== "report" && cmd.launcher !== "apply") throw new LinkSshArgumentError("invalid gated ocx launcher");
|
|
456
|
+
return parts;
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
/**
|
|
460
|
+
* The pinned script for one gate: select a candidate, read its version inside the remote script, refuse below the
|
|
461
|
+
* minimum, then exec it with "$@". OCX_NO_DESKTOP_HANDOFF=1 makes a package launcher answer --version for itself and
|
|
462
|
+
* run the command itself, so a Desktop handoff can never pass the gate on behalf of an older launcher.
|
|
463
|
+
* With launcher "report" or "apply" and a census pair under node_modules that ships bin/ocx.mjs, the script looks for a
|
|
464
|
+
* Node that answers --version within 10 s (the npm prefix's bin/node first, then PATH) before the temp dir is removed.
|
|
465
|
+
*/
|
|
466
|
+
function remoteGatedScript(cmd: GatedOcxCommand): string {
|
|
467
|
+
const [major, minor, patch] = assertGated(cmd);
|
|
468
|
+
const overwriteEphemeral = cmd.lacksMarker === "child-ocx-lacks-overwrite" ? `
|
|
469
|
+
case "\${c##*/}" in ocx-child*) printf '%s\\n' 'ocx-fanout:child-ephemeral-no-overwrite' >&2; exit 121;; esac` : "";
|
|
470
|
+
const ephemeral = cmd.acceptEphemeral || overwriteEphemeral ? "" : `
|
|
471
|
+
case "\${c##*/}" in ocx-child*) printf '%s\\n' 'ocx-fanout:child-ocx-ephemeral' >&2; exit 121;; esac`;
|
|
472
|
+
// Only a pinned sync that carries a restart asks for this, so the plain sync's stderr stays exact.
|
|
473
|
+
const kind = cmd.acceptEphemeral && cmd.reportSelectedKind ? `
|
|
474
|
+
case "\${c##*/}" in ocx-child*) printf '%s\\n' 'ocx-fanout:selected-kind:ocx-child' >&2;; esac` : "";
|
|
475
|
+
const entry = cmd.reportEntry ? `
|
|
476
|
+
if [ -n "$ocx_entry" ]; then printf '%s\\n' 'ocx-fanout:entry:pair' >&2; else printf '%s\\n' 'ocx-fanout:entry:binary' >&2; fi` : "";
|
|
477
|
+
// Seconds resolution is enough for a 120 s window; a date(1) that prints nothing numeric prints no marker.
|
|
478
|
+
const clock = cmd.reportClock ? `
|
|
479
|
+
now=$(date +%s 2>/dev/null); case "$now" in ''|*[!0-9]*) ;; *) printf 'ocx-fanout:child-now:%s000\\n' "$now" >&2;; esac` : "";
|
|
480
|
+
return `export PATH="$PATH:$HOME/.bun/bin:$HOME/.local/bin:/opt/homebrew/bin:/usr/local/bin"
|
|
481
|
+
export OCX_NO_DESKTOP_HANDOFF=1
|
|
308
482
|
case "$(uname -s 2>/dev/null)" in Windows*|MSYS*|MINGW*|CYGWIN*) exit ${REMOTE_PLATFORM_UNSUPPORTED};; esac
|
|
309
483
|
umask 077
|
|
310
484
|
dir=$(mktemp -d "\${TMPDIR:-/tmp}/ocx-fanout.XXXXXXXX") || exit 127
|
|
311
485
|
tmp=$dir/version; ready=$dir/ready
|
|
312
486
|
trap 'rm -rf "$dir"' EXIT HUP INT TERM
|
|
487
|
+
launcher=${cmd.launcher}
|
|
488
|
+
node_ok() {
|
|
489
|
+
( ulimit -c 0; exec "$1" --version ) >/dev/null 2>&1 & np=$!
|
|
490
|
+
( sleep 10 & ntimer=$!; trap 'kill "$ntimer" 2>/dev/null; wait "$ntimer" 2>/dev/null; exit' TERM HUP INT; : > "$ready"; wait "$ntimer" 2>/dev/null; kill -9 "$np" 2>/dev/null ) >/dev/null 2>&1 & nwd=$!
|
|
491
|
+
while [ ! -f "$ready" ]; do kill -0 "$nwd" 2>/dev/null || break; sleep 0.01 >/dev/null 2>&1; done
|
|
492
|
+
{ wait "$np"; nstatus=$?; } 2>/dev/null
|
|
493
|
+
kill "$nwd" 2>/dev/null; wait "$nwd" 2>/dev/null; rm -f "$ready"
|
|
494
|
+
[ "$nstatus" -eq 0 ]
|
|
495
|
+
}
|
|
496
|
+
find_launcher_node() {
|
|
497
|
+
node_bin=
|
|
498
|
+
case "$1" in */lib/node_modules/@bitkyc08/opencodex)
|
|
499
|
+
n=\${1%/lib/node_modules/@bitkyc08/opencodex}/bin/node
|
|
500
|
+
if [ -x "$n" ] && node_ok "$n"; then node_bin=$n; return 0; fi;; esac
|
|
501
|
+
n=$(command -v node 2>/dev/null) && [ -x "$n" ] && node_ok "$n" && node_bin=$n
|
|
502
|
+
return 0
|
|
503
|
+
}
|
|
313
504
|
try_ocx() {
|
|
314
505
|
c=$1; shift
|
|
315
|
-
[ -x "$c" ] || return
|
|
506
|
+
[ -x "$c" ] || return${overwriteEphemeral}
|
|
316
507
|
( ulimit -c 0; ulimit -f 1; exec "$c" \${ocx_entry:+"$ocx_entry"} --version ) >"$tmp" 2>/dev/null & vp=$!
|
|
317
508
|
( sleep 10 & timer=$!; trap 'kill "$timer" 2>/dev/null; wait "$timer" 2>/dev/null; exit' TERM HUP INT; : > "$ready"; wait "$timer" 2>/dev/null; kill -9 "$vp" 2>/dev/null ) >/dev/null 2>&1 & watchdog=$!
|
|
318
509
|
while [ ! -f "$ready" ]; do kill -0 "$watchdog" 2>/dev/null || break; sleep 0.01 >/dev/null 2>&1; done
|
|
@@ -335,22 +526,73 @@ try_ocx() {
|
|
|
335
526
|
dash=index(v,"-"); if(dash) { pre=substr(v,dash+1); v=substr(v,1,dash-1); if(!idlist(pre,1)) {result=2; next} }
|
|
336
527
|
if(split(v,a,/\\./)!=3) { result=2; next }
|
|
337
528
|
for(i=1;i<=3;i++) if(a[i] !~ /^(0|[1-9][0-9]*)$/) { result=2; next }
|
|
338
|
-
c=cmp(a[1],"
|
|
529
|
+
c=cmp(a[1],"${major}"); if(!c)c=cmp(a[2],"${minor}"); if(!c)c=cmp(a[3],"${patch}"); if(c<0 || (!c && dash))result=1
|
|
339
530
|
}
|
|
340
531
|
NR>1 {result=2}
|
|
341
532
|
END {exit result}
|
|
342
533
|
' 2>/dev/null
|
|
343
534
|
status=$?
|
|
344
|
-
if [ "$status" -eq 1 ]; then printf '%s\\n' 'ocx-fanout
|
|
345
|
-
if [ "$status" -ne 0 ]; then printf '%s\\n' 'ocx-fanout:child-ocx-version-unknown' >&2; exit 121; fi
|
|
535
|
+
if [ "$status" -eq 1 ]; then printf '%s\\n' 'ocx-fanout:${cmd.lacksMarker}' >&2; exit 121; fi
|
|
536
|
+
if [ "$status" -ne 0 ]; then printf '%s\\n' 'ocx-fanout:child-ocx-version-unknown' >&2; exit 121; fi${ephemeral}
|
|
537
|
+
root=; [ -n "$ocx_entry" ] && root=\${ocx_entry%/src/cli/index.ts}
|
|
538
|
+
case "$root" in */node_modules/*) [ -f "$root/bin/ocx.mjs" ] || root=;; *) root=;; esac
|
|
539
|
+
node_bin=; if [ -n "$root" ] && [ "$launcher" != none ]; then find_launcher_node "$root"; fi
|
|
346
540
|
rm -rf "$dir"; trap - EXIT HUP INT TERM
|
|
347
|
-
printf 'ocx-fanout:selected:%s\\n' "$version" >&2
|
|
541
|
+
printf 'ocx-fanout:selected:%s\\n' "$version" >&2${kind}${entry}${clock}
|
|
542
|
+
if [ -n "$root" ] && [ "$launcher" = report ]; then
|
|
543
|
+
if [ -n "$node_bin" ]; then printf '%s\\n' 'ocx-fanout:launcher:available' >&2
|
|
544
|
+
else printf '%s\\n' 'ocx-fanout:launcher:unavailable' >&2; fi
|
|
545
|
+
fi
|
|
546
|
+
if [ -n "$root" ] && [ "$launcher" = apply ]; then
|
|
547
|
+
[ -n "$node_bin" ] || { printf '%s\\n' 'ocx-fanout:child-node-unavailable' >&2; exit 121; }
|
|
548
|
+
printf '%s\\n' 'ocx-fanout:launcher:exec' >&2
|
|
549
|
+
printf '%s\\n' 'ocx-fanout:stdout-begin'
|
|
550
|
+
unset OCX_UPDATE_ORCHESTRATED_CHILD
|
|
551
|
+
exec "$node_bin" "$root/bin/ocx.mjs" "$@"
|
|
552
|
+
fi
|
|
348
553
|
printf '%s\\n' 'ocx-fanout:stdout-begin'
|
|
349
|
-
exec "$c" \${ocx_entry:+"$ocx_entry"}
|
|
554
|
+
exec "$c" \${ocx_entry:+"$ocx_entry"} "$@"
|
|
350
555
|
}
|
|
351
556
|
${REMOTE_OCX_CANDIDATES}
|
|
352
557
|
exit ${REMOTE_COMMAND_NOT_FOUND}`;
|
|
558
|
+
}
|
|
559
|
+
|
|
560
|
+
export function remoteGatedOcxArgv(cmd: GatedOcxCommand, platform: "posix" | "windows" = "posix"): string[] {
|
|
561
|
+
const versionParts = assertGated(cmd);
|
|
562
|
+
if (platform === "windows") {
|
|
563
|
+
// A dropped channel kills the orchestrating parent with the Job, so no Windows apply is ever built (D20).
|
|
564
|
+
// Only a plan is ever built for Windows: an update spelled without --plan (or a future mutating flag) is refused.
|
|
565
|
+
if (cmd.args[0] === "update" && (!cmd.args.includes("--plan") || cmd.args.includes("--yes"))) throw new LinkSshArgumentError("unsupported:windows-apply");
|
|
566
|
+
try {
|
|
567
|
+
return windowsGatedOcxArgv({ ...cmd, versionParts });
|
|
568
|
+
} catch (error) {
|
|
569
|
+
if (error instanceof PowerShellCommandTooLongError) throw new LinkSshArgumentError("windows-command-too-long");
|
|
570
|
+
throw error;
|
|
571
|
+
}
|
|
572
|
+
}
|
|
573
|
+
return ["sh", "-c", remoteGatedScript(cmd), "ocx", ...cmd.args];
|
|
574
|
+
}
|
|
353
575
|
|
|
354
|
-
export
|
|
355
|
-
|
|
576
|
+
export type ChildRestartRequest = "app-server" | "codex";
|
|
577
|
+
export interface PinnedSyncOptions { restart?: ChildRestartRequest; overwrite?: boolean; overwriteClient?: RouteClientId }
|
|
578
|
+
const RESTART_FLAG: Readonly<Record<ChildRestartRequest, string>> = { "app-server": "--restart-app-server-only", codex: "--restart-codex" };
|
|
579
|
+
|
|
580
|
+
export function remotePinnedSyncArgv(linkId: string, platform: "posix" | "windows" = "posix", opts: PinnedSyncOptions | boolean = {}, overwriteClient?: RouteClientId): string[] {
|
|
581
|
+
if (typeof opts === "boolean") opts = { overwrite: opts, ...(overwriteClient !== undefined ? { overwriteClient } : {}) };
|
|
582
|
+
else if (overwriteClient !== undefined) throw new LinkSshArgumentError("invalid overwrite client");
|
|
583
|
+
const overwrite = opts.overwrite === true;
|
|
584
|
+
overwriteClient = opts.overwriteClient;
|
|
585
|
+
if (overwriteClient !== undefined && (!overwrite || !isRouteClientId(overwriteClient))) throw new LinkSshArgumentError("invalid overwrite client");
|
|
586
|
+
if (!LINK_ID_PATTERN.test(linkId)) throw new LinkSshArgumentError("invalid link id");
|
|
587
|
+
if (opts.restart !== undefined && !Object.hasOwn(RESTART_FLAG, opts.restart)) throw new LinkSshArgumentError("invalid restart request");
|
|
588
|
+
// D20: the Home never sends a restart to a Windows Child.
|
|
589
|
+
if (opts.restart !== undefined && platform === "windows") throw new LinkSshArgumentError("unsupported:windows-restart");
|
|
590
|
+
const restart = opts.restart === undefined ? [] : [RESTART_FLAG[opts.restart]];
|
|
591
|
+
if (overwrite && platform === "windows") {
|
|
592
|
+
try { return windowsOverwriteSyncArgv(linkId, true, overwriteClient); }
|
|
593
|
+
catch (error) { if (error instanceof PowerShellCommandTooLongError) throw new LinkSshArgumentError("windows-command-too-long"); throw error; }
|
|
594
|
+
}
|
|
595
|
+
return remoteGatedOcxArgv({ minVersion: overwrite ? "2.100.0" : "2.93.0", lacksMarker: overwrite ? "child-ocx-lacks-overwrite" : "child-ocx-lacks-expect-link", acceptEphemeral: !overwrite,
|
|
596
|
+
reportEntry: false, reportClock: false, reportSelectedKind: restart.length > 0, launcher: "none",
|
|
597
|
+
args: ["sync", "--expect-link", linkId, "--json", ...restart, ...(overwrite ? ["--overwrite-conflict"] : []), ...(overwriteClient ? ["--overwrite-client", overwriteClient] : [])] }, platform);
|
|
356
598
|
}
|