@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.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 +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -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/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- 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/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- 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/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- 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 +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- 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 +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.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 +178 -0
- package/src/cli/dispatch.ts +61 -13
- 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 +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- 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 +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -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 +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- 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-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- 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 +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- 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 +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -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-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- 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/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- 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 +4 -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/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- 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 +86 -15
- 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 +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- 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/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- 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/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- 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 +52 -9
- 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 +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -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/budget.ts +23 -5
- 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 +50 -6
- 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/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- 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 +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- 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-billing-refusal.ts +27 -3
- 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 +515 -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 +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/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/workbuddy.ts +6 -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/workbuddy-credit-balance.ts +125 -16
- 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/effort-history.ts +732 -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/history/integrity.ts +41 -4
- 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 +111 -3
- 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 +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- 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 +196 -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 +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- 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 +149 -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 +39 -3
- 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 +192 -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 +58 -18
- 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 +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- 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/static-catalog-probe.ts +33 -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 +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- 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 +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- 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/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- 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-selection-keepalive.ts +254 -0
- 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 +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- 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 +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- 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 +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- 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 +19 -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/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- 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/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- 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 +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -4,28 +4,32 @@ import { classifyChildUpdatePlan, mapUpdateApplyExit, parseChildUpdatePlan, PLAN
|
|
|
4
4
|
type UpdateApplyVerdict } from "./child-update-contract";
|
|
5
5
|
|
|
6
6
|
export type SshResult = { code: number; stdout: string; stderr: string };
|
|
7
|
-
export type GatedRefusal = "child-ocx-lacks-expect-link" | "child-ocx-lacks-orchestrated-update" | "child-ocx-version-unknown" | "child-ocx-ephemeral"
|
|
7
|
+
export type GatedRefusal = "child-ocx-lacks-expect-link" | "child-ocx-lacks-orchestrated-update" | "child-ocx-version-unknown" | "child-ocx-ephemeral"
|
|
8
|
+
| "child-node-unavailable" | "child-gate-failed";
|
|
8
9
|
export type GatedFraming =
|
|
9
10
|
| { kind: "transport"; reason: "ssh-failed" | "child-ocx-not-found" | "child-ocx-not-contained" | "child-platform-unsupported" }
|
|
10
11
|
| { kind: "refused"; reason: GatedRefusal }
|
|
11
|
-
| { kind: "ran"; code: number; selectedVersion: string; entry: "pair" | "binary" | null; childNowMs: number | null;
|
|
12
|
+
| { kind: "ran"; code: number; selectedVersion: string; entry: "pair" | "binary" | null; childNowMs: number | null;
|
|
13
|
+
launcher: "available" | "unavailable" | "exec" | null; payload: string; lastStderrLine: string | undefined }
|
|
12
14
|
| { kind: "invalid" };
|
|
13
15
|
|
|
14
16
|
function assertHomeVersion(version: string): void {
|
|
15
17
|
if (version.length > 128 || !parseStrictSemver(version)) throw new LinkSshArgumentError("invalid Home version");
|
|
16
18
|
}
|
|
17
|
-
const UPDATE_GATE = { minVersion: "2.97.0", lacksMarker: "child-ocx-lacks-orchestrated-update", acceptEphemeral: false, reportEntry: true, reportClock: false
|
|
19
|
+
const UPDATE_GATE = { minVersion: "2.97.0", lacksMarker: "child-ocx-lacks-orchestrated-update", acceptEphemeral: false, reportEntry: true, reportClock: false,
|
|
20
|
+
launcher: "none" } as const;
|
|
18
21
|
|
|
19
22
|
/**
|
|
20
23
|
* Never mutates an install: below 2.97.0 the gate exits 121 before update runs, and update --plan only computes.
|
|
21
24
|
* Not free of side effects on every Child: without a census pair (an npm/pnpm Child whose service never recorded one)
|
|
22
25
|
* the script execs the ocx shim, so the Node launcher's ordinary bootstrap runs first (sync-guard bookkeeping, Bun
|
|
23
26
|
* resolution; the Desktop handoff is disabled), exactly as for every pinned sync already sent to that Child. The probe
|
|
24
|
-
* prints the Child's clock so the apply deadline can be set in the Child's time
|
|
27
|
+
* prints the Child's clock so the apply deadline can be set in the Child's time, and (A4) reports whether a Node that
|
|
28
|
+
* could run the package launcher answers --version; it always plans through the served entry, whatever that report says.
|
|
25
29
|
*/
|
|
26
30
|
export function remoteUpdatePlanArgv(homeVersion: string, platform: "posix" | "windows"): string[] {
|
|
27
31
|
assertHomeVersion(homeVersion);
|
|
28
|
-
return remoteGatedOcxArgv({ ...UPDATE_GATE, reportClock: true, args: ["update", "--plan", "--json", "--version", homeVersion] }, platform);
|
|
32
|
+
return remoteGatedOcxArgv({ ...UPDATE_GATE, reportClock: true, launcher: "report", args: ["update", "--plan", "--json", "--version", homeVersion] }, platform);
|
|
29
33
|
}
|
|
30
34
|
|
|
31
35
|
/**
|
|
@@ -33,19 +37,24 @@ export function remoteUpdatePlanArgv(homeVersion: string, platform: "posix" | "w
|
|
|
33
37
|
* A token starting with "-" cannot pass the Child's --expect-plan parser (orchestrated-arguments.mjs refuses a value
|
|
34
38
|
* that looks like a flag), so it is omitted; the apply stays pinned by --version, bounded by --not-after, serialized
|
|
35
39
|
* by the Child's update mutex and refused on downgrade. Only the plan-consistency check is lost for that token.
|
|
40
|
+
* viaLauncher (A4): the caller sets it only for a plan whose installer is npm or pnpm; the apply then runs through
|
|
41
|
+
* <node> <root>/bin/ocx.mjs of the served package, or exits 121 child-node-unavailable before anything runs.
|
|
36
42
|
*/
|
|
37
|
-
export function remoteUpdateApplyArgv(input: { homeVersion: string; planToken: string; notAfter: number
|
|
43
|
+
export function remoteUpdateApplyArgv(input: { homeVersion: string; planToken: string; notAfter: number; viaLauncher: boolean },
|
|
44
|
+
platform: "posix" | "windows"): string[] {
|
|
38
45
|
if (platform === "windows") throw new LinkSshArgumentError("unsupported:windows-apply");
|
|
39
46
|
assertHomeVersion(input.homeVersion);
|
|
40
47
|
if (!PLAN_TOKEN_PATTERN.test(input.planToken)) throw new LinkSshArgumentError("invalid plan token");
|
|
41
48
|
if (!Number.isSafeInteger(input.notAfter) || input.notAfter <= 0) throw new LinkSshArgumentError("invalid deadline");
|
|
49
|
+
if (typeof input.viaLauncher !== "boolean") throw new LinkSshArgumentError("invalid launcher route");
|
|
42
50
|
const expectPlan = input.planToken.startsWith("-") ? [] : ["--expect-plan", input.planToken];
|
|
43
|
-
return remoteGatedOcxArgv({ ...UPDATE_GATE, args: ["update", "--yes", "--json", "--version", input.homeVersion,
|
|
51
|
+
return remoteGatedOcxArgv({ ...UPDATE_GATE, launcher: input.viaLauncher ? "apply" : "none", args: ["update", "--yes", "--json", "--version", input.homeVersion,
|
|
44
52
|
...expectPlan, "--not-after", String(input.notAfter)] }, platform);
|
|
45
53
|
}
|
|
46
54
|
|
|
47
|
-
const REFUSAL = /^ocx-fanout:(child-ocx-lacks-expect-link|child-ocx-lacks-orchestrated-update|child-ocx-version-unknown|child-ocx-ephemeral)$/;
|
|
55
|
+
const REFUSAL = /^ocx-fanout:(child-ocx-lacks-expect-link|child-ocx-lacks-orchestrated-update|child-ocx-version-unknown|child-ocx-ephemeral|child-node-unavailable)$/;
|
|
48
56
|
const CHILD_NOW = "ocx-fanout:child-now:";
|
|
57
|
+
const LAUNCHER = "ocx-fanout:launcher:";
|
|
49
58
|
|
|
50
59
|
/**
|
|
51
60
|
* The framing classifySyncResult applies, generalised to every gated command. A run is recognised by exactly one
|
|
@@ -73,8 +82,12 @@ export function readGatedFraming(result: SshResult): GatedFraming {
|
|
|
73
82
|
// Capture any value and validate it afterwards, so a malformed clock makes the framing invalid instead of absent.
|
|
74
83
|
const clocks = lines.filter(line => line.startsWith(CHILD_NOW)).map(line => line.slice(CHILD_NOW.length));
|
|
75
84
|
if (clocks.length > 1 || (clocks.length === 1 && (!/^[0-9]{10,16}$/.test(clocks[0]!) || !Number.isSafeInteger(Number(clocks[0]))))) return { kind: "invalid" };
|
|
85
|
+
// A4: at most one launcher line, from a closed set; anything else breaks the framing like a malformed clock does.
|
|
86
|
+
const launchers = lines.filter(line => line.startsWith(LAUNCHER)).map(line => line.slice(LAUNCHER.length));
|
|
87
|
+
if (launchers.length > 1 || (launchers.length === 1 && !/^(available|unavailable|exec)$/.test(launchers[0]!))) return { kind: "invalid" };
|
|
76
88
|
return { kind: "ran", code, selectedVersion: selected[0]![1]!, entry: entries.length ? (entries[0]!.slice("ocx-fanout:entry:".length) as "pair" | "binary") : null,
|
|
77
|
-
childNowMs: clocks.length ? Number(clocks[0]) : null,
|
|
89
|
+
childNowMs: clocks.length ? Number(clocks[0]) : null, launcher: launchers.length ? launchers[0] as "available" | "unavailable" | "exec" : null,
|
|
90
|
+
payload: out.slice(delimiters[0]! + 1).join("\n").trim(), lastStderrLine: last };
|
|
78
91
|
}
|
|
79
92
|
|
|
80
93
|
export type PlanProbeVerdict =
|
|
@@ -99,7 +112,9 @@ export function classifyUpdatePlanProbe(result: SshResult, ctx: { homeVersion: s
|
|
|
99
112
|
if (!parsed.ok) return { kind: "failed", reason: parsed.reason };
|
|
100
113
|
const entry = framing.entry ?? (ctx.platform === "windows" ? "binary" : null);
|
|
101
114
|
return { kind: "plan", selectedVersion: framing.selectedVersion, childNowMs: framing.childNowMs,
|
|
102
|
-
|
|
115
|
+
// A plan never execs the launcher; an exec line here is treated as no report.
|
|
116
|
+
classification: classifyChildUpdatePlan(parsed.value, { homeVersion: ctx.homeVersion, desktopUpdateRequest: ctx.desktopUpdateRequest, entry,
|
|
117
|
+
launcher: framing.launcher === "exec" ? null : framing.launcher }) };
|
|
103
118
|
}
|
|
104
119
|
|
|
105
120
|
export function classifyUpdateApply(result: SshResult): UpdateApplyVerdict {
|
|
@@ -109,7 +124,10 @@ export function classifyUpdateApply(result: SshResult): UpdateApplyVerdict {
|
|
|
109
124
|
: { state: "failed", reason: framing.reason, suppressTarget: false, reobserve: false };
|
|
110
125
|
if (framing.kind === "refused") return framing.reason === "child-ocx-ephemeral"
|
|
111
126
|
? { state: "unsupported", reason: "ephemeral", suppressTarget: false, reobserve: false }
|
|
112
|
-
|
|
127
|
+
// A4: the npm/pnpm launcher route found no Node on the Child; nothing ran.
|
|
128
|
+
: framing.reason === "child-node-unavailable"
|
|
129
|
+
? { state: "owner-action", reason: "launcher-node-missing", suppressTarget: false, reobserve: false }
|
|
130
|
+
: { state: "owner-action", reason: framing.reason === "child-gate-failed" ? "child-gate-failed" : "legacy-ocx", suppressTarget: false, reobserve: false };
|
|
113
131
|
// Framing broken after a command may have run: never assume it did not.
|
|
114
132
|
if (framing.kind === "invalid") return { state: "uncertain", reason: "child-output-invalid", suppressTarget: false, reobserve: true };
|
|
115
133
|
return mapUpdateApplyExit(framing.code, framing.payload);
|
|
@@ -52,7 +52,8 @@ export interface ChildObservationsFile {
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
const LINK_ID = /^lnk_[0-9a-f]{16}$/;
|
|
55
|
-
|
|
55
|
+
// Underscores: the sync classifier's reasons carry the Child's own mismatch token (child-link-mismatch:other_link).
|
|
56
|
+
const REASON = /^[a-z][a-z0-9:_-]{0,79}$/;
|
|
56
57
|
const STATE = /^[a-z][a-z0-9-]{0,63}$/;
|
|
57
58
|
const OPAQUE_ID = /^[A-Za-z0-9_.:-]{1,128}$/;
|
|
58
59
|
const SOURCES: ReadonlySet<string> = new Set(["plan", "inspect", "peer"]);
|
|
@@ -74,7 +74,7 @@ export async function observeChild(record: LinkRecord, deps: ObserveDeps): Promi
|
|
|
74
74
|
try { platform = record.remotePlatform ?? await deps.platformOf(record); } catch { return outcome("offline", "platform-unknown"); }
|
|
75
75
|
let argv: string[];
|
|
76
76
|
try {
|
|
77
|
-
argv = buildExecArgv({ alias: record.alias, knownHostsFile: deps.knownHostsFile, argv: remoteUpdatePlanArgv(deps.homeVersion, platform) });
|
|
77
|
+
argv = buildExecArgv({ alias: record.alias, knownHostsFile: deps.knownHostsFile, argv: remoteUpdatePlanArgv(deps.homeVersion, platform), route: record.explicitRoute ?? null });
|
|
78
78
|
} catch (error) {
|
|
79
79
|
if (error instanceof LinkSshArgumentError && error.message === "windows-command-too-long") return outcome("failed", "windows-command-too-long");
|
|
80
80
|
if (error instanceof LinkSshArgumentError && error.message === "invalid Home version") return outcome("failed", "home-version-invalid");
|
|
@@ -104,7 +104,7 @@ export async function observeChild(record: LinkRecord, deps: ObserveDeps): Promi
|
|
|
104
104
|
if (platform === "posix") {
|
|
105
105
|
source = "inspect";
|
|
106
106
|
try {
|
|
107
|
-
const inspected = await deps.inspect(deps.runner, record.alias, deps.knownHostsFile, "posix");
|
|
107
|
+
const inspected = await deps.inspect(deps.runner, record.alias, record.explicitRoute ?? null, deps.knownHostsFile, "posix");
|
|
108
108
|
installedVersion = parseOcxVersion(inspected?.ocxVersionLine ?? "");
|
|
109
109
|
} catch { installedVersion = null; }
|
|
110
110
|
} else {
|
|
@@ -1,162 +1,230 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
|
-
import {
|
|
3
|
-
import type {
|
|
4
|
-
import type
|
|
2
|
+
import { parseStrictSemver } from "../lib/strict-semver";
|
|
3
|
+
import type { ChildObservation, ChildOperationSummary } from "./child-observations";
|
|
4
|
+
import { CHILD_JOB_SCHEMA, type ChildJob, type ChildJobItem, type ChildOp, type ChildOpsEnv, type ChildRestart,
|
|
5
|
+
type ChildTrigger, type ItemOutcome, type ItemRunner } from "./child-ops-types";
|
|
6
|
+
import { runObserveItem, runRestartCodexItem, runSyncItem, runUpdateItem } from "./child-ops-runners";
|
|
7
|
+
import type { LinkRecord } from "./store";
|
|
8
|
+
|
|
9
|
+
export { CHILD_JOB_SCHEMA } from "./child-ops-types";
|
|
10
|
+
export const CHILD_OPS_CONCURRENCY = 3;
|
|
11
|
+
/** Update items run one at a time across the engine; each also takes one of the CHILD_OPS_CONCURRENCY places. */
|
|
12
|
+
export const CHILD_OPS_UPDATE_CONCURRENCY = 1;
|
|
13
|
+
export const CHILD_JOB_RETENTION_MS = 60 * 60 * 1000;
|
|
14
|
+
export const CHILD_JOB_RETENTION_COUNT = 32;
|
|
15
|
+
/** The CLI's job validator keeps strings up to this length; a longer hint would make the whole document unreadable. */
|
|
16
|
+
const HINT_MAX = 256;
|
|
17
|
+
|
|
18
|
+
/** ignoreActivity (D8) is honoured only on a manual request; the route accepts it only with one link and a restart. */
|
|
19
|
+
export interface ChildOpRequest { op: ChildOp; linkIds: readonly string[] | "all"; restart: ChildRestart; trigger: ChildTrigger; ignoreActivity?: true }
|
|
20
|
+
export type SubmitRefusal = "link_not_found" | "link_not_home_initiated" | "link_operation_in_progress" | "no_eligible_links";
|
|
21
|
+
export type SubmitResult = { ok: true; job: ChildJob } | { ok: false; code: SubmitRefusal; linkId: string | null };
|
|
22
|
+
export interface ChildJobHold { jobId: string; op: ChildOp; state: "queued" | "running" }
|
|
5
23
|
|
|
6
|
-
// ChildOp is declared once, in child-observations.ts; wp2 admits "observe" only. 030 moves the job types to
|
|
7
|
-
// child-ops-types.ts and extends this engine with its runners.
|
|
8
|
-
export type ChildItemState = "queued" | "running" | "succeeded" | "up-to-date" | "busy" | "offline" | "refused"
|
|
9
|
-
| "owner-action" | "unsupported" | "failed" | "uncertain";
|
|
10
|
-
export interface ChildJobItem {
|
|
11
|
-
linkId: string; alias: string; state: ChildItemState; reason: string | null; hint?: string;
|
|
12
|
-
fromVersion?: string; toVersion?: string; startedAt: string | null; finishedAt: string | null;
|
|
13
|
-
}
|
|
14
|
-
export interface ChildJob {
|
|
15
|
-
schema: "ocx.link.child-job/1"; jobId: string; op: ChildOp; trigger: "manual" | "auto";
|
|
16
|
-
restart: "none" | "app-server" | "codex"; state: "queued" | "running" | "done"; createdAt: string; finishedAt: string | null; items: ChildJobItem[];
|
|
17
|
-
}
|
|
18
|
-
export type SubmitResult = { ok: true; job: ChildJob } | { ok: false; code: "link_not_found" | "link_operation_in_progress" | "no_eligible_links" };
|
|
19
24
|
export interface ChildOpsEngine {
|
|
20
|
-
|
|
25
|
+
/** Synchronous admission: locks are taken before it returns, so a DELETE racing it sees them. */
|
|
26
|
+
submit(request: ChildOpRequest, env: ChildOpsEnv): SubmitResult;
|
|
21
27
|
/** A structuredClone snapshot. */
|
|
22
28
|
job(jobId: string): ChildJob | undefined;
|
|
23
|
-
activeJob(linkId: string):
|
|
24
|
-
/**
|
|
29
|
+
activeJob(linkId: string): ChildJobHold | null;
|
|
30
|
+
/**
|
|
31
|
+
* Take the link's admission lock for a non-job holder (link removal). Returns null when a job holds the link;
|
|
32
|
+
* otherwise a release function. While reserved, a single-link submit answers link_operation_in_progress and a
|
|
33
|
+
* multi-link item for the link ends busy, exactly as for a link a job holds. Synchronous, like submit.
|
|
34
|
+
*/
|
|
35
|
+
reserve(linkId: string): (() => void) | null;
|
|
36
|
+
/** Resolves with a clone of the finished job, or null when the id is unknown or already pruned (wp5 scheduler). */
|
|
37
|
+
whenDone(jobId: string): Promise<ChildJob | null>;
|
|
38
|
+
/** Resolves once no job of this engine is queued or running. Tests and shutdown only. */
|
|
25
39
|
settled(): Promise<void>;
|
|
26
40
|
}
|
|
27
41
|
|
|
28
|
-
export
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
42
|
+
export interface ChildOpsEngineOptions {
|
|
43
|
+
runners?: Partial<Record<ChildOp, ItemRunner>>;
|
|
44
|
+
jobId?: () => string;
|
|
45
|
+
/** Default and maximum CHILD_OPS_CONCURRENCY. */
|
|
46
|
+
concurrency?: number;
|
|
47
|
+
}
|
|
32
48
|
|
|
49
|
+
const DONE: ReadonlySet<string> = new Set(["succeeded", "up-to-date", "busy", "offline", "refused", "owner-action", "unsupported", "failed", "uncertain"]);
|
|
33
50
|
const errorName = (error: unknown): string => error instanceof Error ? error.name : "unknown";
|
|
51
|
+
const iso = (env: ChildOpsEnv): string => new Date(env.now()).toISOString();
|
|
52
|
+
const strictVersion = (value: string | undefined): value is string => typeof value === "string" && value.length <= 128 && parseStrictSemver(value) !== null;
|
|
53
|
+
|
|
54
|
+
/** 010's persisted slice; called after finishedAt is set. A version the cache would refuse ("unknown") is left out. */
|
|
55
|
+
export function summarize(job: ChildJob, item: ChildJobItem): ChildOperationSummary {
|
|
56
|
+
return { op: job.op, jobId: job.jobId, state: item.state, reason: item.reason, finishedAt: item.finishedAt!,
|
|
57
|
+
...(strictVersion(item.fromVersion) ? { fromVersion: item.fromVersion } : {}),
|
|
58
|
+
...(strictVersion(item.toVersion) ? { toVersion: item.toVersion } : {}) };
|
|
59
|
+
}
|
|
34
60
|
|
|
35
61
|
/**
|
|
36
|
-
* The D11 job model: one in-memory registry, one
|
|
37
|
-
* of
|
|
38
|
-
* keeps each Child's last result. Items carry closed tokens, never remote text.
|
|
39
|
-
* each submit and read.
|
|
62
|
+
* The D11 job model: one in-memory registry, one lock per link per Home process, at most three items running across
|
|
63
|
+
* every job and at most one of them an update, finished jobs kept one hour and at most 32. A Home restart loses the
|
|
64
|
+
* jobs only; the observation cache keeps each Child's last result. Items carry closed tokens, never remote text.
|
|
65
|
+
* No timers: retention is applied on each submit and read, on each job's own env clock.
|
|
40
66
|
*/
|
|
41
|
-
export function createChildOpsEngine(
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
const
|
|
48
|
-
const newJobId = deps.jobId ?? (() => `ljob_${randomBytes(8).toString("hex")}`);
|
|
49
|
-
const concurrency = Math.max(1, deps.concurrency ?? CHILD_OPS_CONCURRENCY);
|
|
50
|
-
const jobs = new Map<string, ChildJob>();
|
|
51
|
-
const locks = new Map<string, string>();
|
|
67
|
+
export function createChildOpsEngine(options: ChildOpsEngineOptions = {}): ChildOpsEngine {
|
|
68
|
+
const runners: Record<ChildOp, ItemRunner> = { observe: runObserveItem, sync: runSyncItem, "restart-codex": runRestartCodexItem,
|
|
69
|
+
update: runUpdateItem, ...options.runners };
|
|
70
|
+
const newJobId = options.jobId ?? (() => `ljob_${randomBytes(8).toString("hex")}`);
|
|
71
|
+
const concurrency = Math.max(1, Math.min(options.concurrency ?? CHILD_OPS_CONCURRENCY, CHILD_OPS_CONCURRENCY));
|
|
72
|
+
const jobs = new Map<string, { job: ChildJob; env: ChildOpsEnv }>();
|
|
73
|
+
const locks = new Map<string, string>(); // linkId -> jobId
|
|
52
74
|
const idle = new Set<() => void>();
|
|
53
|
-
//
|
|
54
|
-
const
|
|
75
|
+
// A running job is never pruned (prune drops done jobs only), so every waiter is resolved by finishJob.
|
|
76
|
+
const waiters = new Map<string, Array<(job: ChildJob) => void>>();
|
|
77
|
+
// One engine-wide FIFO: the bound is on SSH sessions from this Home, not per job.
|
|
78
|
+
const pending: Array<{ job: ChildJob; item: ChildJobItem; env: ChildOpsEnv }> = [];
|
|
55
79
|
let active = 0;
|
|
80
|
+
let activeUpdates = 0;
|
|
81
|
+
let reservations = 0;
|
|
56
82
|
|
|
57
|
-
const write = (linkId: string, patch: Partial<ChildObservation>): void => {
|
|
58
|
-
try {
|
|
59
|
-
// The
|
|
83
|
+
const write = (env: ChildOpsEnv, linkId: string, patch: Partial<ChildObservation>): void => {
|
|
84
|
+
try { env.writeObservation(linkId, patch); } catch (error) {
|
|
85
|
+
// The env contract is "never throws"; this guards an env that breaks it. The job document carries the result.
|
|
60
86
|
console.warn(`[link] child observation write failed linkId=${linkId} error=${errorName(error)}`);
|
|
61
87
|
}
|
|
62
88
|
};
|
|
63
|
-
const running = (): boolean => [...jobs.values()].some(job => job.state !== "done");
|
|
89
|
+
const running = (): boolean => [...jobs.values()].some(({ job }) => job.state !== "done");
|
|
64
90
|
const prune = (): void => {
|
|
65
|
-
const
|
|
66
|
-
const finished
|
|
67
|
-
|
|
68
|
-
const
|
|
69
|
-
for (const job of kept.slice(0, Math.max(0, kept.length - CHILD_JOB_RETENTION_COUNT))) jobs.delete(job.jobId);
|
|
91
|
+
const finished = [...jobs.values()].filter(({ job }) => job.state === "done");
|
|
92
|
+
for (const { job, env } of finished) if (Date.parse(job.finishedAt!) < env.now() - CHILD_JOB_RETENTION_MS) jobs.delete(job.jobId);
|
|
93
|
+
const kept = finished.filter(({ job }) => jobs.has(job.jobId)).sort((a, b) => Date.parse(a.job.finishedAt!) - Date.parse(b.job.finishedAt!));
|
|
94
|
+
for (const { job } of kept.slice(0, Math.max(0, kept.length - CHILD_JOB_RETENTION_COUNT))) jobs.delete(job.jobId);
|
|
70
95
|
};
|
|
71
|
-
/**
|
|
72
|
-
const finishItem = (job: ChildJob, item: ChildJobItem,
|
|
73
|
-
item
|
|
74
|
-
item.
|
|
75
|
-
item.finishedAt =
|
|
96
|
+
/** ran = false: the item never touched its link (busy, child-initiated), so it writes no lastOperation. */
|
|
97
|
+
const finishItem = (job: ChildJob, item: ChildJobItem, env: ChildOpsEnv, outcome: ItemOutcome, ran = true): void => {
|
|
98
|
+
Object.assign(item, outcome);
|
|
99
|
+
if (item.hint !== undefined && item.hint.length > HINT_MAX) item.hint = item.hint.slice(0, HINT_MAX);
|
|
100
|
+
item.finishedAt = iso(env);
|
|
76
101
|
if (!ran) return;
|
|
77
102
|
if (locks.get(item.linkId) === job.jobId) locks.delete(item.linkId);
|
|
78
|
-
|
|
79
|
-
write(item.linkId, { lastOperation: summary });
|
|
103
|
+
write(env, item.linkId, { lastOperation: summarize(job, item) });
|
|
80
104
|
};
|
|
81
|
-
const finishJob = (job: ChildJob): void => {
|
|
105
|
+
const finishJob = (job: ChildJob, env: ChildOpsEnv): void => {
|
|
82
106
|
if (job.state === "done" || job.items.some(item => item.state === "queued" || item.state === "running")) return;
|
|
83
107
|
job.state = "done";
|
|
84
|
-
job.finishedAt =
|
|
108
|
+
job.finishedAt = iso(env);
|
|
109
|
+
const resolvers = waiters.get(job.jobId);
|
|
110
|
+
if (resolvers) { waiters.delete(job.jobId); for (const resolve of resolvers) resolve(structuredClone(job)); }
|
|
85
111
|
if (!running()) { for (const resolve of idle) resolve(); idle.clear(); }
|
|
86
112
|
};
|
|
87
|
-
const runItem = async (job: ChildJob, item: ChildJobItem): Promise<void> => {
|
|
113
|
+
const runItem = async (job: ChildJob, item: ChildJobItem, env: ChildOpsEnv): Promise<void> => {
|
|
88
114
|
item.state = "running";
|
|
89
|
-
item.startedAt =
|
|
115
|
+
item.startedAt = iso(env);
|
|
90
116
|
if (job.state === "queued") job.state = "running";
|
|
91
117
|
let record: LinkRecord | undefined;
|
|
92
|
-
try { record =
|
|
93
|
-
if (!record) { finishItem(job, item, "refused", "link-removed"); return; }
|
|
94
|
-
let outcome:
|
|
95
|
-
try { outcome = await
|
|
96
|
-
console.warn(`[link] child
|
|
97
|
-
|
|
98
|
-
return;
|
|
118
|
+
try { record = env.readStore().links.find(link => link.id === item.linkId); } catch { record = undefined; }
|
|
119
|
+
if (!record) { finishItem(job, item, env, { state: "refused", reason: "link-removed" }); return; }
|
|
120
|
+
let outcome: ItemOutcome;
|
|
121
|
+
try { outcome = await runners[job.op](record, job, env); } catch (error) {
|
|
122
|
+
console.warn(`[link] child ${job.op} failed linkId=${item.linkId} error=${errorName(error)}`);
|
|
123
|
+
outcome = { state: "failed", reason: "internal-error" };
|
|
99
124
|
}
|
|
100
|
-
|
|
101
|
-
finishItem(job, item, outcome.state, outcome.reason);
|
|
125
|
+
finishItem(job, item, env, DONE.has(outcome.state) ? outcome : { state: "failed", reason: "internal-error" });
|
|
102
126
|
};
|
|
103
127
|
const pump = (): void => {
|
|
104
|
-
|
|
105
|
-
|
|
128
|
+
// FIFO across jobs; an update waiting for the update place does not hold up the items behind it.
|
|
129
|
+
for (let index = 0; index < pending.length && active < concurrency;) {
|
|
130
|
+
const entry = pending[index]!;
|
|
131
|
+
const update = entry.job.op === "update";
|
|
132
|
+
if (update && activeUpdates >= CHILD_OPS_UPDATE_CONCURRENCY) { index += 1; continue; }
|
|
133
|
+
pending.splice(index, 1);
|
|
106
134
|
active += 1;
|
|
107
|
-
|
|
135
|
+
if (update) activeUpdates += 1;
|
|
136
|
+
void runItem(entry.job, entry.item, entry.env).finally(() => {
|
|
108
137
|
active -= 1;
|
|
109
|
-
|
|
138
|
+
if (update) activeUpdates -= 1;
|
|
139
|
+
finishJob(entry.job, entry.env);
|
|
110
140
|
pump();
|
|
111
141
|
});
|
|
112
142
|
}
|
|
113
143
|
};
|
|
114
144
|
|
|
115
145
|
return {
|
|
116
|
-
submit(request) {
|
|
146
|
+
submit(request, env) {
|
|
117
147
|
prune();
|
|
118
|
-
const store =
|
|
148
|
+
const store = env.readStore();
|
|
119
149
|
let records: LinkRecord[];
|
|
120
150
|
if (request.linkIds === "all") {
|
|
121
151
|
records = store.links;
|
|
122
|
-
if (records.length === 0) return { ok: false, code: "no_eligible_links" };
|
|
152
|
+
if (records.length === 0) return { ok: false, code: "no_eligible_links", linkId: null };
|
|
123
153
|
} else {
|
|
124
154
|
records = [];
|
|
125
155
|
for (const linkId of request.linkIds) {
|
|
126
156
|
const record = store.links.find(link => link.id === linkId);
|
|
127
|
-
if (!record) return { ok: false, code: "link_not_found" };
|
|
157
|
+
if (!record) return { ok: false, code: "link_not_found", linkId };
|
|
128
158
|
records.push(record);
|
|
129
159
|
}
|
|
130
|
-
|
|
160
|
+
const only = records.length === 1 ? records[0]! : null;
|
|
161
|
+
// observe answers a client-initiated link itself without SSH (020); the other ops need the Home's SSH trust.
|
|
162
|
+
if (only && request.op !== "observe" && only.direction === "client-initiated") return { ok: false, code: "link_not_home_initiated", linkId: only.id };
|
|
163
|
+
if (only && locks.has(only.id)) return { ok: false, code: "link_operation_in_progress", linkId: only.id };
|
|
131
164
|
}
|
|
132
|
-
const
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
165
|
+
const job: ChildJob = { schema: CHILD_JOB_SCHEMA, jobId: newJobId(), op: request.op, trigger: request.trigger,
|
|
166
|
+
restart: request.restart, ...(request.ignoreActivity === true && request.trigger === "manual" ? { ignoreActivity: true as const } : {}),
|
|
167
|
+
state: "queued", createdAt: iso(env), finishedAt: null,
|
|
168
|
+
items: records.map(record => ({ linkId: record.id, alias: record.alias, state: "queued" as const, reason: null,
|
|
136
169
|
startedAt: null, finishedAt: null })) };
|
|
137
|
-
jobs.set(jobId, job);
|
|
138
|
-
|
|
139
|
-
if (locks.has(item.linkId)) finishItem(job, item, "busy", "link-operation-in-progress", false);
|
|
140
|
-
else
|
|
141
|
-
|
|
170
|
+
jobs.set(job.jobId, { job, env });
|
|
171
|
+
job.items.forEach((item, index) => {
|
|
172
|
+
if (locks.has(item.linkId)) finishItem(job, item, env, { state: "busy", reason: "link-operation-in-progress" }, false);
|
|
173
|
+
else if (request.op !== "observe" && records[index]!.direction === "client-initiated") {
|
|
174
|
+
finishItem(job, item, env, { state: "unsupported", reason: "child-initiated" }, false);
|
|
175
|
+
} else { locks.set(item.linkId, job.jobId); pending.push({ job, item, env }); }
|
|
176
|
+
});
|
|
142
177
|
pump();
|
|
143
|
-
finishJob(job);
|
|
178
|
+
finishJob(job, env);
|
|
144
179
|
return { ok: true, job: structuredClone(job) };
|
|
145
180
|
},
|
|
146
181
|
job(jobId) {
|
|
147
182
|
prune();
|
|
148
|
-
const
|
|
149
|
-
return
|
|
183
|
+
const entry = jobs.get(jobId);
|
|
184
|
+
return entry ? structuredClone(entry.job) : undefined;
|
|
150
185
|
},
|
|
151
186
|
activeJob(linkId) {
|
|
152
187
|
const jobId = locks.get(linkId);
|
|
153
|
-
const job = jobId ? jobs.get(jobId) : undefined;
|
|
188
|
+
const job = jobId ? jobs.get(jobId)?.job : undefined;
|
|
154
189
|
if (!job || job.state === "done") return null;
|
|
155
190
|
return { jobId: job.jobId, op: job.op, state: job.state };
|
|
156
191
|
},
|
|
192
|
+
reserve(linkId) {
|
|
193
|
+
if (locks.has(linkId)) return null;
|
|
194
|
+
// Never a job id (those start ljob_), so activeJob reads null and no job finish releases it.
|
|
195
|
+
const token = `reservation:${++reservations}`;
|
|
196
|
+
locks.set(linkId, token);
|
|
197
|
+
let released = false;
|
|
198
|
+
return () => {
|
|
199
|
+
if (released) return;
|
|
200
|
+
released = true;
|
|
201
|
+
if (locks.get(linkId) === token) locks.delete(linkId);
|
|
202
|
+
};
|
|
203
|
+
},
|
|
204
|
+
whenDone(jobId) {
|
|
205
|
+
const entry = jobs.get(jobId);
|
|
206
|
+
if (!entry) return Promise.resolve(null);
|
|
207
|
+
if (entry.job.state === "done") return Promise.resolve(structuredClone(entry.job));
|
|
208
|
+
return new Promise<ChildJob | null>(resolve => {
|
|
209
|
+
const list = waiters.get(jobId) ?? [];
|
|
210
|
+
list.push(resolve);
|
|
211
|
+
waiters.set(jobId, list);
|
|
212
|
+
});
|
|
213
|
+
},
|
|
157
214
|
settled() {
|
|
158
215
|
if (!running()) return Promise.resolve();
|
|
159
216
|
return new Promise<void>(resolve => { idle.add(resolve); });
|
|
160
217
|
},
|
|
161
218
|
};
|
|
162
219
|
}
|
|
220
|
+
|
|
221
|
+
let shared: ChildOpsEngine | null = null;
|
|
222
|
+
/** One engine per Home process, shared by the routes (wp3) and the scheduler (wp5, wp7). */
|
|
223
|
+
export function sharedChildOpsEngine(): ChildOpsEngine {
|
|
224
|
+
return shared ??= createChildOpsEngine();
|
|
225
|
+
}
|
|
226
|
+
/** Tests that reach the routes through handleManagementAPI cannot set LinkRouteState.childOps; they await
|
|
227
|
+
* sharedChildOpsEngine().settled() and call this in afterEach. Precedent: resetQuotaResetActivationForTests. */
|
|
228
|
+
export function resetSharedChildOpsEngineForTests(): void {
|
|
229
|
+
shared = null;
|
|
230
|
+
}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { readLinkStore } from "./store";
|
|
2
|
+
import { childObservationsPath, linkKnownHostsPath, linkStorePath } from "./paths";
|
|
3
|
+
import { createSshRunner, type SshRunner } from "./ssh-runner";
|
|
4
|
+
import { projectLinkStatus } from "./status-projection";
|
|
5
|
+
import type { LinkTunnelStatus } from "./supervisor";
|
|
6
|
+
import { sharedChildOpsEngine } from "./child-ops-engine";
|
|
7
|
+
import type { ChildOpsEnv } from "./child-ops-types";
|
|
8
|
+
import { createChildOpsScheduler, type ChildOpsScheduler } from "./child-ops-scheduler";
|
|
9
|
+
import { readChildPolicy } from "./child-policy";
|
|
10
|
+
import type { CatalogRevisionMonitor } from "./child-catalog-freshness";
|
|
11
|
+
import { isLinkIdle, type LinkActivitySnapshot } from "./child-activity";
|
|
12
|
+
import { observeChild, type ObserveDeps } from "./child-observe";
|
|
13
|
+
import { inspectRemoteChildRuntime } from "./remote-plant";
|
|
14
|
+
import { requireRemotePlatform } from "./remote-platform";
|
|
15
|
+
import { patchChildObservation, readChildObservations, updateChildObservations } from "./child-observations";
|
|
16
|
+
import { homeLinkChildParity, type LinkChildParity } from "./child-parity";
|
|
17
|
+
import { codexSettingsDigest, projectHomeCodexSettings } from "./codex-settings";
|
|
18
|
+
import { packageVersion } from "../lib/package-version";
|
|
19
|
+
import { setCatalogAutoRefreshLinkFanout } from "../codex/catalog-auto-refresh";
|
|
20
|
+
import type { OcxConfig } from "../types";
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* The running Home's Child-ops host (050): builds the engine env and the catalog fan-out scheduler. Loaded only by a
|
|
24
|
+
* dynamic import from optional-listeners.ts once the link listener owns its socket (INV-LINK-CHILD-OPS-01).
|
|
25
|
+
*/
|
|
26
|
+
export interface ChildOpsHostBinding {
|
|
27
|
+
config: () => OcxConfig;
|
|
28
|
+
supervisorStatus: () => readonly LinkTunnelStatus[];
|
|
29
|
+
listenerStatus: () => { state: "off" | "listening" | "failed"; port: number | null };
|
|
30
|
+
/** 020's listener linkActivity; null when the listener has no activity book (never idle). */
|
|
31
|
+
activity: (linkId: string, now: number) => LinkActivitySnapshot | null;
|
|
32
|
+
/** 020's catalogRevisionForRoutes() singleton, handed over by optional-listeners (src/link cannot import it). */
|
|
33
|
+
catalogRevision: () => CatalogRevisionMonitor;
|
|
34
|
+
/** 020's listener peerObservation. */
|
|
35
|
+
peer: ObserveDeps["peer"];
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** The scheduler's revision view over 020's monitor: recompute() is true when the etag moved since it last looked. */
|
|
39
|
+
export function schedulerRevision(monitor: CatalogRevisionMonitor) {
|
|
40
|
+
let seen: string | null | undefined;
|
|
41
|
+
return {
|
|
42
|
+
current: (): { etag: string | null; changedAt: number | null } => {
|
|
43
|
+
const revision = monitor.current();
|
|
44
|
+
return revision ? { etag: revision.etag, changedAt: revision.changedAt } : { etag: null, changedAt: null };
|
|
45
|
+
},
|
|
46
|
+
async recompute(): Promise<boolean> {
|
|
47
|
+
const etag = monitor.current()?.etag ?? null;
|
|
48
|
+
const changed = seen !== undefined && etag !== seen;
|
|
49
|
+
seen = etag;
|
|
50
|
+
return changed;
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** Revision 4 (4529521968): the etag a Home-run sync last delivered; a GET of /v1/catalog never sets it. */
|
|
56
|
+
export function syncedEtagFor(linkId: string): string | null {
|
|
57
|
+
return readChildObservations(childObservationsPath()).children[linkId]?.catalogSyncedEtag ?? null;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* The Child's applied settings digest, only while its runtime started at or after that apply (#8557 review). A sync on a
|
|
62
|
+
* Child whose runtime predates its last apply restarts that runtime even when the settings did not change
|
|
63
|
+
* (restartRuntimeAfterApply), which would cut a busy Child's relayed streams. Both times are the Child's own clock.
|
|
64
|
+
*/
|
|
65
|
+
export function runtimeCurrentDigest(parity: LinkChildParity): string | null {
|
|
66
|
+
const { appliedCodexSettingsDigest: digest, lastApplyAt, runtimeStartedAt } = parity;
|
|
67
|
+
return digest !== null && lastApplyAt !== null && runtimeStartedAt !== null && runtimeStartedAt >= lastApplyAt ? digest : null;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const errorName = (error: unknown): string => error instanceof Error ? error.name : "unknown";
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* One env shape for the routes (030 childOpsEnvFor) and this host; idleAfterMs is the policy value. Revision 4
|
|
74
|
+
* (4529522063): with digests, autoSyncAllowed is the scheduler's own rule (idle, or settings already equal), asked
|
|
75
|
+
* again by runSyncItem when each automatic item starts.
|
|
76
|
+
*/
|
|
77
|
+
export function hostChildOpsEnv(binding: ChildOpsHostBinding, runner: Pick<SshRunner, "run">,
|
|
78
|
+
digests?: { home: () => string | null; child: (linkId: string) => string | null }): ChildOpsEnv {
|
|
79
|
+
const store = () => readLinkStore(linkStorePath());
|
|
80
|
+
const hosts = linkKnownHostsPath();
|
|
81
|
+
const version = packageVersion("0.0.0");
|
|
82
|
+
// Read on every check, not captured: the scheduler reuses one env across sync groups, and a policy change between
|
|
83
|
+
// them must apply to the next idle decision (#8557 review).
|
|
84
|
+
const idleAfterMs = (): number => readChildPolicy().policy.idleAfterMs;
|
|
85
|
+
const env: ChildOpsEnv = {
|
|
86
|
+
readStore: store, runner, knownHostsFile: hosts, homeVersion: version, now: Date.now, sleep: ms => Bun.sleep(ms),
|
|
87
|
+
// projectLinkStatus's default compensation read; the route state's in-memory compensationFailures are not visible
|
|
88
|
+
// here, and such a link is mid-removal: its item fails or reports offline, which the backoff absorbs.
|
|
89
|
+
wireState: linkId => projectLinkStatus(store(), binding.supervisorStatus(), binding.listenerStatus(), binding.config())
|
|
90
|
+
.links.find(link => link.id === linkId)?.state ?? null,
|
|
91
|
+
activity: linkId => {
|
|
92
|
+
const now = Date.now();
|
|
93
|
+
const snapshot = binding.activity(linkId, now);
|
|
94
|
+
return snapshot ? { inFlight: snapshot.inFlight, idle: isLinkIdle(snapshot, now, idleAfterMs()) } : null;
|
|
95
|
+
},
|
|
96
|
+
observe: record => observeChild(record, { runner, knownHostsFile: hosts, homeVersion: version, peer: binding.peer,
|
|
97
|
+
platformOf: link => requireRemotePlatform(runner, link.alias, link.explicitRoute ?? null, hosts), inspect: inspectRemoteChildRuntime,
|
|
98
|
+
now: () => new Date() }),
|
|
99
|
+
readObservation: linkId => readChildObservations(childObservationsPath()).children[linkId] ?? null,
|
|
100
|
+
// ChildOpsEnv contract: never throws (child-ops-types.ts); same shape as childOpsEnvFor.
|
|
101
|
+
writeObservation: (linkId, patch) => {
|
|
102
|
+
try { updateChildObservations(file => patchChildObservation(file, linkId, patch, new Date())); }
|
|
103
|
+
catch (error) { console.warn(`[link] child observation write failed linkId=${linkId} error=${errorName(error)}`); }
|
|
104
|
+
},
|
|
105
|
+
catalogEtag: () => { try { return binding.catalogRevision().current()?.etag ?? null; } catch { return null; } },
|
|
106
|
+
};
|
|
107
|
+
if (digests) env.autoSyncAllowed = linkId => {
|
|
108
|
+
if (env.activity(linkId)?.idle === true) return true;
|
|
109
|
+
const home = digests.home();
|
|
110
|
+
return home !== null && digests.child(linkId) === home;
|
|
111
|
+
};
|
|
112
|
+
return env;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
/** Starts the scheduler and returns its stop. wp5 sets no afterPoll: no update job starts here (070 adds the sweep). */
|
|
116
|
+
export function startChildOpsHost(binding: ChildOpsHostBinding): () => void {
|
|
117
|
+
const runner = createSshRunner();
|
|
118
|
+
const version = packageVersion("0.0.0");
|
|
119
|
+
const unref = <T>(handle: T): T => { (handle as { unref?: () => void }).unref?.(); return handle; };
|
|
120
|
+
const homeDigest = (): string | null => {
|
|
121
|
+
try { return codexSettingsDigest(projectHomeCodexSettings(binding.config(), version).settings); } catch { return null; }
|
|
122
|
+
};
|
|
123
|
+
const childDigest = (linkId: string): string | null => runtimeCurrentDigest(homeLinkChildParity.get(linkId));
|
|
124
|
+
const scheduler: ChildOpsScheduler = createChildOpsScheduler({
|
|
125
|
+
engine: sharedChildOpsEngine(), env: () => hostChildOpsEnv(binding, runner, { home: homeDigest, child: childDigest }),
|
|
126
|
+
readPolicy: () => readChildPolicy(),
|
|
127
|
+
revision: schedulerRevision(binding.catalogRevision()),
|
|
128
|
+
syncedEtag: syncedEtagFor,
|
|
129
|
+
homeDigest, childDigest,
|
|
130
|
+
peerVersion: linkId => binding.peer(linkId).observed?.version ?? null,
|
|
131
|
+
isClientRuntime: () => binding.config().runtimeRole === "client",
|
|
132
|
+
setCatalogChangedSlot: setCatalogAutoRefreshLinkFanout,
|
|
133
|
+
setTimeout: (fn, ms) => unref(setTimeout(fn, ms)), clearTimeout: handle => clearTimeout(handle as ReturnType<typeof setTimeout>),
|
|
134
|
+
setInterval: (fn, ms) => unref(setInterval(fn, ms)), clearInterval: handle => clearInterval(handle as ReturnType<typeof setInterval>),
|
|
135
|
+
});
|
|
136
|
+
scheduler.start();
|
|
137
|
+
return () => scheduler.stop();
|
|
138
|
+
}
|