@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/cli/sync-command.ts
CHANGED
|
@@ -10,13 +10,23 @@ import { readLinkStore } from "../link/store";
|
|
|
10
10
|
import { linkKnownHostsPath, linkStorePath } from "../link/paths";
|
|
11
11
|
import { buildExecArgv, remotePinnedSyncArgv } from "../link/ssh-argv";
|
|
12
12
|
import { requireRemotePlatformFramed } from "../link/remote-platform";
|
|
13
|
+
import { pinnedSyncRanNothing, syncThenRestart, type PinnedRun } from "../link/sync-then-restart";
|
|
14
|
+
import type { ChildRestart } from "../link/child-ops-types";
|
|
13
15
|
import { FanoutProcessError, fanoutSshRunner, runFanoutProcess } from "./sync-fanout-process";
|
|
14
16
|
import { readHomeLinkStatus } from "./sync-link-status";
|
|
15
|
-
import { classifySyncResult, fanoutExitCode, renderFanoutHuman, renderFanoutJson, runHomeFanout, REMOTE_LINK_SYNC_MESSAGE, STALE_REMOTE_CATALOG_MESSAGE, type HomeResult } from "./sync-fanout";
|
|
17
|
+
import { classifySyncResult, fanoutExitCode, renderFanoutHuman, renderFanoutJson, restartNote, runHomeFanout, REMOTE_LINK_SYNC_MESSAGE, STALE_REMOTE_CATALOG_MESSAGE, type ChildResult, type HomeResult } from "./sync-fanout";
|
|
16
18
|
|
|
17
19
|
export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
|
|
18
20
|
const flags = parseSyncFanoutFlags(deps.args.slice(1));
|
|
19
21
|
if (!flags.ok) { console.error(flags.message); return 2; }
|
|
22
|
+
if (flags.children) {
|
|
23
|
+
// D16: an unknown id is a usage error before the Home sync changes anything.
|
|
24
|
+
let known: Set<string>;
|
|
25
|
+
try { known = new Set(readLinkStore(linkStorePath()).links.map(link => link.id)); }
|
|
26
|
+
catch { console.error("--child cannot be checked: the Remote Link store could not be read."); return 2; }
|
|
27
|
+
const unknown = flags.children.find(id => !known.has(id));
|
|
28
|
+
if (unknown) { console.error(`--child ${unknown} is not a link on this Home (see ocx link status).`); return 2; }
|
|
29
|
+
}
|
|
20
30
|
const originalLog = console.log;
|
|
21
31
|
if (flags.json) console.log = (...args: unknown[]) => console.error(...args);
|
|
22
32
|
let applicable = false, catalogCurrent = false;
|
|
@@ -50,7 +60,8 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
|
|
|
50
60
|
if (expectation || clientState.kind === "connected") {
|
|
51
61
|
try {
|
|
52
62
|
const { syncConnectedClient } = await import("../client/connect");
|
|
53
|
-
const result = await syncConnectedClient(expectation ? {
|
|
63
|
+
const result = await syncConnectedClient({ restartCodex, ...(expectation ? { expect: expectation } : {}),
|
|
64
|
+
...(syncArgs.includes("--overwrite-conflict") ? { overwriteConflict: true, ...(flags.overwriteClient ? { overwriteClient: flags.overwriteClient } : {}) } : {}) });
|
|
54
65
|
if (expectation) {
|
|
55
66
|
// The root preflight skipped the shim repair for a pinned sync; the identity held, so
|
|
56
67
|
// run it now, as an unpinned sync would have.
|
|
@@ -75,13 +86,25 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
|
|
|
75
86
|
for (const line of describeHomeCodexSettings(settings.document.settings)) console.log(` ${terminalSafeText(line)}`);
|
|
76
87
|
}
|
|
77
88
|
}
|
|
89
|
+
if (result.routeIntent) {
|
|
90
|
+
for (const row of result.routeIntent.outcomes) {
|
|
91
|
+
if (row.outcome === "current") continue;
|
|
92
|
+
console.error(`Route to ${row.client}: ${row.outcome}.`);
|
|
93
|
+
if (row.outcome !== "not_installed") process.exitCode = 1;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
78
96
|
await handleConnectedSyncCatalogWrite(result, restartScope);
|
|
79
97
|
if (result.applyRecordFailed) {
|
|
80
98
|
console.error("The Home's Codex settings were applied, but the apply record could not be written; the client runtime was not restarted. Run 'ocx sync' again.");
|
|
81
99
|
process.exitCode = 1;
|
|
82
100
|
}
|
|
101
|
+
if (result.journalHandoverFailed) {
|
|
102
|
+
console.error("Codex routing was applied, but the Codex journal could not be handed to this connection (the Codex config was busy or changed, or the journal belongs to an earlier connection), so the client runtime was not restarted: the next OpenCodex restart could restore native routing. Run 'ocx sync' again; if it repeats, run 'ocx sync --restart-codex' after that restart.");
|
|
103
|
+
process.exitCode = 1;
|
|
104
|
+
}
|
|
83
105
|
// OCX-6: a link Child's runtime must have started after the apply it serves under.
|
|
84
|
-
|
|
106
|
+
// Not after a failed handover: that restart is the one that would undo this routing.
|
|
107
|
+
if (link && result.appliedRecord && !result.journalHandoverFailed) {
|
|
85
108
|
const { applyRestartMessage, restartRuntimeAfterApply } = await import("./link-apply-restart");
|
|
86
109
|
const { sameClientConnectionOwner } = await import("../client/state");
|
|
87
110
|
const applied = result.connection;
|
|
@@ -172,10 +195,13 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
|
|
|
172
195
|
},
|
|
173
196
|
config,
|
|
174
197
|
port: live.port,
|
|
175
|
-
}, ["mcode", "
|
|
198
|
+
}, ["mcode", "raycast", "omo", "cline", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "hermes", "t3code"]));
|
|
176
199
|
} catch (error) {
|
|
177
200
|
console.warn(`Client integrations were not refreshed: ${error instanceof Error ? error.message : String(error)}`);
|
|
178
201
|
}
|
|
202
|
+
// Pi's raw nested selectors are proven by the serving proxy, so its refresh runs there.
|
|
203
|
+
const { refreshPiThroughServer } = await import("./pi-sync");
|
|
204
|
+
results.push(...await refreshPiThroughServer({ findLiveProxy: async () => live }));
|
|
179
205
|
}
|
|
180
206
|
// Even without a live proxy, report why Aside could not sync. Its server
|
|
181
207
|
// owner is never bypassed, and another client's failure cannot hide it.
|
|
@@ -191,6 +217,18 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
|
|
|
191
217
|
else if (result.reason) console.warn(`${label} integration was not refreshed: ${result.reason}${result.residual ? " Recovery did not finish." : ""}${result.snapshotPath ? ` Backup: ${result.snapshotPath}` : ""}`);
|
|
192
218
|
}
|
|
193
219
|
}
|
|
220
|
+
if (synced.status !== "refused") {
|
|
221
|
+
const { homeRouteIntentInUse, readRouteIntentState } = await import("../routing/route-intent-state");
|
|
222
|
+
if (homeRouteIntentInUse(readRouteIntentState())) {
|
|
223
|
+
const { syncHomeRouteTo } = await import("../routing/route-to-local");
|
|
224
|
+
const { packageVersion } = await import("../lib/package-version");
|
|
225
|
+
const outcomes = await syncHomeRouteTo({ ...deps.loadConfig(), ...(live ? { port: live.port } : {}) }, packageVersion("0.0.0"), syncArgs.includes("--overwrite-conflict"), flags.overwriteClient,
|
|
226
|
+
undefined, { onAsideUnresolved: message => console.warn(message) });
|
|
227
|
+
for (const row of outcomes) {
|
|
228
|
+
if (row.outcome !== "current" && row.outcome !== "not_installed") { console.error(`${row.client}: ${row.outcome}`); code = 1; }
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
194
232
|
return code || (typeof process.exitCode === "number" ? process.exitCode : 0);
|
|
195
233
|
};
|
|
196
234
|
let code: number;
|
|
@@ -206,24 +244,41 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
|
|
|
206
244
|
if (code !== 0) state = "failed";
|
|
207
245
|
const document = await runHomeFanout({
|
|
208
246
|
home: { state, exit: code }, catalogCurrent, localOnly: flags.localOnly, applicable,
|
|
247
|
+
selected: flags.children === null ? null : new Set(flags.children), restartChildren: flags.restartChildren,
|
|
209
248
|
readStore: () => readLinkStore(linkStorePath()), readLinkStatus: () => readHomeLinkStatus(),
|
|
210
|
-
runChild: async (link, deadline) => {
|
|
249
|
+
runChild: async (link, deadline, options) => {
|
|
211
250
|
const runner = fanoutSshRunner(deadline);
|
|
212
251
|
let platform: "posix" | "windows";
|
|
213
|
-
try { platform = link.remotePlatform ?? await requireRemotePlatformFramed(runner, link.alias, linkKnownHostsPath()); }
|
|
252
|
+
try { platform = link.remotePlatform ?? await requireRemotePlatformFramed(runner, link.alias, link.explicitRoute ?? null, linkKnownHostsPath()); }
|
|
214
253
|
catch (error) {
|
|
215
254
|
if (error instanceof FanoutProcessError && (error.reason === "deadline-exceeded" || error.reason === "termination-unconfirmed")) return { state: "timed-out", reason: error.reason, exit: null };
|
|
216
255
|
return { state: "failed", reason: "platform-probe-failed", exit: null };
|
|
217
256
|
}
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
257
|
+
type Run = { state: ChildResult["state"]; reason: string | null; exit: number | null; executable?: "ocx-child" };
|
|
258
|
+
// An ephemeral ocx-child gets the plain catalog sync: it never reads route intent, so it
|
|
259
|
+
// has nothing to overwrite and refuses the flags.
|
|
260
|
+
const overwrite = link.childKind !== "ephemeral" && deps.args.includes("--overwrite-conflict");
|
|
261
|
+
const overwriteOptions = overwrite ? { overwrite: true, ...(flags.overwriteClient ? { overwriteClient: flags.overwriteClient } : {}) } : {};
|
|
262
|
+
const runPinned = async (restart: ChildRestart): Promise<PinnedRun<Run>> => {
|
|
263
|
+
// Revision 6: with the shared deadline spent before the restarting sync, nothing is sent to the Child.
|
|
264
|
+
if (restart !== "none" && deadline - Date.now() <= 0) return { sync: { state: "timed-out", reason: "deadline-exceeded", exit: null }, notRun: true };
|
|
265
|
+
try {
|
|
266
|
+
const result = await runFanoutProcess(buildExecArgv({ alias: link.alias, knownHostsFile: linkKnownHostsPath(), route: link.explicitRoute ?? null,
|
|
267
|
+
argv: remotePinnedSyncArgv(link.id, platform, { ...(restart === "none" ? {} : { restart }), ...overwriteOptions }) }), { timeoutMs: Math.max(0, deadline - Date.now()) });
|
|
268
|
+
const verdict = classifySyncResult(result, { expectSelectedKind: restart !== "none" });
|
|
269
|
+
return { sync: { ...verdict, exit: result.code }, notRun: pinnedSyncRanNothing(verdict, result) };
|
|
270
|
+
} catch (error) {
|
|
271
|
+
if (!(error instanceof FanoutProcessError)) throw error;
|
|
272
|
+
const timedOut = error.reason === "deadline-exceeded" || error.reason === "termination-unconfirmed";
|
|
273
|
+
return { sync: { state: timedOut ? "timed-out" : "failed", reason: error.reason, exit: null }, notRun: error.reason === "ssh-spawn-failed" };
|
|
274
|
+
}
|
|
275
|
+
};
|
|
276
|
+
const done = await syncThenRestart({ requested: options.restart ?? "none", platform, childKind: link.childKind,
|
|
277
|
+
runPinned, readActivity: options.readActivity });
|
|
278
|
+
// Pick the public fields: executable, withheld and second never reach ocx.sync.fanout/1.
|
|
279
|
+
const note = restartNote(done);
|
|
280
|
+
return note === null ? { state: done.sync.state, reason: done.sync.reason, exit: done.sync.exit }
|
|
281
|
+
: { state: "synced", reason: note, exit: done.sync.exit };
|
|
227
282
|
},
|
|
228
283
|
});
|
|
229
284
|
if (flags.json) originalLog(renderFanoutJson(document));
|
package/src/cli/sync-fanout.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import type { LinkRecord, LinkStore } from "../link/store";
|
|
2
|
+
import type { ChildRestartRequest } from "../link/ssh-argv";
|
|
3
|
+
import type { SyncThenRestart } from "../link/sync-then-restart";
|
|
2
4
|
import type { LinkStatusPayload } from "./link";
|
|
3
5
|
import { LinkStatusError } from "./sync-link-status";
|
|
6
|
+
import { childSkipHint } from "../link/sync-fanout-classify";
|
|
4
7
|
|
|
5
8
|
export { classifySyncResult, classifyVersionProbe, parseOcxVersion, REMOTE_LINK_SYNC_MESSAGE,
|
|
6
9
|
STALE_REMOTE_CATALOG_MESSAGE, type ChildVerdict } from "../link/sync-fanout-classify";
|
|
@@ -9,22 +12,19 @@ export const SYNC_FANOUT_PARTIAL_EXIT = 6;
|
|
|
9
12
|
export type HomeResult = { state: "synced" | "stale" | "skipped" | "failed"; exit: number };
|
|
10
13
|
export type ChildResult = { linkId: string; alias: string; state: "synced" | "skipped" | "failed" | "timed-out"; reason: string | null; exit: number | null; hint?: string };
|
|
11
14
|
export type FanoutDocument = { schema: "ocx.sync.fanout/1"; home: HomeResult; fanout: { state: "ran" | "disabled" | "not-applicable" | "failed"; reason: string | null }; children: ChildResult[] };
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
if (reason === "child-link-mismatch:disconnected" || reason === "child-link-mismatch:other_link") return "Please re-link this Child to this Home, then retry sync.";
|
|
18
|
-
if (reason?.startsWith("child-link-mismatch")) return "Check the Child's Remote Link connection and re-link it to this Home if needed, then retry sync.";
|
|
19
|
-
if (reason === "child-ocx-version-unknown") return "Check the Child's selected OpenCodex installation and version, then retry sync.";
|
|
20
|
-
if (reason === "child-platform-unsupported") return "Check the Child's platform and Remote Link setup before retrying sync.";
|
|
21
|
-
return "Check the Child's sync status and retry sync.";
|
|
22
|
-
}
|
|
15
|
+
/** The reason on a synced row whose requested restart did not certainly happen (040 decision 1). Each one exits 6. */
|
|
16
|
+
export type RestartNote = "restart-skipped:link-active" | "restart-skipped:activity-unknown" | "restart-skipped:windows"
|
|
17
|
+
| "restart-unsupported:ocx-child" | "restart-not-run" | "restart-result-unknown";
|
|
18
|
+
/** readActivity: a fresh status read for this link; null when unknown (D5: unknown is never idle). */
|
|
19
|
+
export type ChildRunOptions = { restart?: ChildRestartRequest; readActivity: () => Promise<{ inFlight: number } | null> };
|
|
23
20
|
|
|
24
21
|
export async function runHomeFanout(deps: {
|
|
25
22
|
home: HomeResult; catalogCurrent: boolean; localOnly?: boolean; applicable?: boolean;
|
|
23
|
+
/** null or absent: every link. Otherwise only these ids run; the rest read skipped/not-selected. */
|
|
24
|
+
selected?: ReadonlySet<string> | null;
|
|
25
|
+
restartChildren?: ChildRestartRequest | null;
|
|
26
26
|
readStore: () => LinkStore; readLinkStatus: () => Promise<LinkStatusPayload>;
|
|
27
|
-
runChild: (link: LinkRecord, deadline: number) => Promise<Omit<ChildResult, "linkId" | "alias">>;
|
|
27
|
+
runChild: (link: LinkRecord, deadline: number, options: ChildRunOptions) => Promise<Omit<ChildResult, "linkId" | "alias">>;
|
|
28
28
|
now?: () => number; deadlineMs?: number; concurrency?: number; terminationGraceMs?: number;
|
|
29
29
|
}): Promise<FanoutDocument> {
|
|
30
30
|
const result: FanoutDocument = { schema: "ocx.sync.fanout/1", home: deps.home, fanout: { state: deps.localOnly ? "disabled" : "not-applicable", reason: null }, children: [] };
|
|
@@ -34,17 +34,21 @@ export async function runHomeFanout(deps: {
|
|
|
34
34
|
if (!store.links.length) return result;
|
|
35
35
|
result.fanout.state = "ran";
|
|
36
36
|
const classify = (link: LinkRecord, state: ChildResult["state"], reason: string | null, exit: number | null = null): ChildResult => ({ linkId: link.id, alias: link.alias, state, reason, exit });
|
|
37
|
-
|
|
37
|
+
// Revision 6: selection is applied first in every branch, so an unselected link always reads not-selected.
|
|
38
|
+
const unselected = (link: LinkRecord): boolean => deps.selected != null && !deps.selected.has(link.id);
|
|
39
|
+
const rowFor = (link: LinkRecord, state: ChildResult["state"], reason: string | null): ChildResult =>
|
|
40
|
+
unselected(link) ? classify(link, "skipped", "not-selected") : classify(link, state, reason);
|
|
41
|
+
result.children = store.links.map(link => rowFor(link, "skipped", link.direction === "client-initiated" ? "client-initiated-link" : "home-catalog-not-current"));
|
|
38
42
|
const skipReason = deps.home.state === "failed" || deps.home.exit !== 0 ? "home-sync-failed" : deps.home.state === "skipped" ? "home-sync-skipped" : !deps.catalogCurrent ? "home-catalog-not-current" : null;
|
|
39
43
|
if (skipReason) {
|
|
40
|
-
result.children = store.links.map(link =>
|
|
44
|
+
result.children = store.links.map(link => rowFor(link, "skipped", link.direction === "client-initiated" ? "client-initiated-link" : skipReason));
|
|
41
45
|
return result;
|
|
42
46
|
}
|
|
43
47
|
let status: LinkStatusPayload;
|
|
44
48
|
try { status = await deps.readLinkStatus(); }
|
|
45
49
|
catch (error) {
|
|
46
50
|
const reason = error instanceof LinkStatusError ? error.reason : "home-link-status-unavailable";
|
|
47
|
-
result.children = store.links.map(link => link.direction === "client-initiated" ?
|
|
51
|
+
result.children = store.links.map(link => link.direction === "client-initiated" ? rowFor(link, "skipped", "client-initiated-link") : rowFor(link, reason === "home-runtime-not-running" ? "skipped" : "failed", reason));
|
|
48
52
|
return result;
|
|
49
53
|
}
|
|
50
54
|
let cursor = 0;
|
|
@@ -53,21 +57,35 @@ export async function runHomeFanout(deps: {
|
|
|
53
57
|
const index = cursor++;
|
|
54
58
|
const link = store.links[index];
|
|
55
59
|
if (!link) return;
|
|
56
|
-
if (link.direction === "client-initiated") continue;
|
|
60
|
+
if (unselected(link) || link.direction === "client-initiated") continue;
|
|
57
61
|
const wire = status.links.find(row => row.id === link.id);
|
|
58
62
|
if (!wire) { result.children[index] = classify(link, "skipped", "link-not-in-runtime"); continue; }
|
|
59
63
|
if (wire.state !== "connected") { result.children[index] = classify(link, "skipped", `tunnel-${wire.state}`); continue; }
|
|
64
|
+
// A Child operation (wp2/wp3 job) holds this Child: an intentional skip, no hint, no exit 6.
|
|
65
|
+
if (wire.child?.activeJob) { result.children[index] = classify(link, "skipped", "child-busy"); continue; }
|
|
66
|
+
// Decision 3 / 4529522035: a fresh read per Child, never the first one; a failed read or a row without child is unknown.
|
|
67
|
+
let unknownCause: ActivityUnknownCause = "read-failed";
|
|
68
|
+
const readActivity = async (): Promise<{ inFlight: number } | null> => {
|
|
69
|
+
let fresh: LinkStatusPayload;
|
|
70
|
+
try { fresh = await deps.readLinkStatus(); } catch { unknownCause = "read-failed"; return null; }
|
|
71
|
+
const row = fresh.links.find(candidate => candidate.id === link.id);
|
|
72
|
+
if (!row) { unknownCause = "read-failed"; return null; }
|
|
73
|
+
if (!row.child) { unknownCause = "absent"; return null; }
|
|
74
|
+
return row.child.activity;
|
|
75
|
+
};
|
|
76
|
+
const options: ChildRunOptions = deps.restartChildren ? { restart: deps.restartChildren, readActivity } : { readActivity };
|
|
60
77
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
61
78
|
try {
|
|
62
79
|
const budget = deps.deadlineMs ?? 180_000;
|
|
63
80
|
const child = await Promise.race([
|
|
64
|
-
deps.runChild(link, (deps.now ?? Date.now)() + budget),
|
|
81
|
+
deps.runChild(link, (deps.now ?? Date.now)() + budget, options),
|
|
65
82
|
new Promise<Omit<ChildResult, "linkId" | "alias">>(resolve => {
|
|
66
83
|
timer = setTimeout(() => resolve({ state: "timed-out", reason: "termination-unconfirmed", exit: null }), budget + (deps.terminationGraceMs ?? 3000));
|
|
67
84
|
}),
|
|
68
85
|
]);
|
|
69
86
|
// Build the row from the schema's own fields, so an extra key on a runner's result never reaches ocx.sync.fanout/1.
|
|
70
|
-
const hint = child.state === "skipped" ? childSkipHint(child.reason, link.alias)
|
|
87
|
+
const hint = child.state === "skipped" ? childSkipHint(child.reason, link.alias)
|
|
88
|
+
: child.state === "synced" && child.reason?.startsWith("restart-") ? childRestartHint(child.reason, link, deps.restartChildren ?? "app-server", unknownCause) : child.hint;
|
|
71
89
|
result.children[index] = { linkId: link.id, alias: link.alias, state: child.state, reason: child.reason, exit: child.exit, ...(hint === undefined ? {} : { hint }) };
|
|
72
90
|
} catch { result.children[index] = classify(link, "failed", "internal-error"); }
|
|
73
91
|
finally { if (timer !== undefined) clearTimeout(timer); }
|
|
@@ -77,9 +95,46 @@ export async function runHomeFanout(deps: {
|
|
|
77
95
|
return result;
|
|
78
96
|
}
|
|
79
97
|
|
|
98
|
+
/** Maps the shared sequence's result to a synced row's reason; null keeps the row as the sync reported it. */
|
|
99
|
+
export function restartNote(done: SyncThenRestart<{ state: string; reason: string | null }>): RestartNote | null {
|
|
100
|
+
if (!done.restart) return null;
|
|
101
|
+
// Reached only after a successful plain sync; done.sync is then the restarting sync's verdict.
|
|
102
|
+
if (done.restartUnknown) return "restart-result-unknown";
|
|
103
|
+
// Any failed plain sync keeps its own row, including on Windows or ocx-child (those are checked first).
|
|
104
|
+
if (done.sync.state !== "synced") return null;
|
|
105
|
+
switch (done.withheld) {
|
|
106
|
+
case undefined: case "sync-failed": return null;
|
|
107
|
+
case "platform": return "restart-skipped:windows";
|
|
108
|
+
case "ocx-child": return "restart-unsupported:ocx-child";
|
|
109
|
+
case "activity-unknown": return "restart-skipped:activity-unknown";
|
|
110
|
+
case "link-active": return "restart-skipped:link-active";
|
|
111
|
+
case "second-not-run": return "restart-not-run";
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
type ActivityUnknownCause = "absent" | "read-failed";
|
|
116
|
+
|
|
117
|
+
function childRestartHint(reason: string, link: LinkRecord, restart: ChildRestartRequest, cause: ActivityUnknownCause): string | undefined {
|
|
118
|
+
const retry = `ocx sync --child ${link.id} --restart-children${restart === "codex" ? "=codex --yes" : ""}`;
|
|
119
|
+
switch (reason as RestartNote) {
|
|
120
|
+
case "restart-skipped:link-active": return `A model request was running on ${link.alias}; its Codex was not restarted. Retry when it is idle: ${retry}.`;
|
|
121
|
+
case "restart-skipped:activity-unknown": return cause === "absent"
|
|
122
|
+
? `This Home's OpenCodex runtime did not report ${link.alias}'s activity; restart or update it, then retry ${retry}.`
|
|
123
|
+
: `The Home could not read ${link.alias}'s activity (the status read failed or timed out); retry ${retry}.`;
|
|
124
|
+
case "restart-skipped:windows": return "Codex restarts over SSH are not supported on Windows Children; restart Codex on that machine.";
|
|
125
|
+
case "restart-unsupported:ocx-child": return "ocx-child does not restart Codex; restart the Codex app or its app-servers on that machine.";
|
|
126
|
+
case "restart-not-run": return `The restart was not sent to ${link.alias}; check its sync status and retry ${retry}.`;
|
|
127
|
+
case "restart-result-unknown": return `The restart was sent to ${link.alias} but its result is unknown; check Codex on that machine.`;
|
|
128
|
+
default: return undefined;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
80
132
|
export function fanoutExitCode(document: FanoutDocument): number {
|
|
81
133
|
if (document.home.exit !== 0) return document.home.exit;
|
|
82
|
-
return document.fanout.state === "failed" || document.children.some(child => child.state === "failed" || child.state === "timed-out"
|
|
134
|
+
return document.fanout.state === "failed" || document.children.some(child => child.state === "failed" || child.state === "timed-out"
|
|
135
|
+
|| (child.state === "skipped" && child.hint !== undefined)
|
|
136
|
+
// A requested restart that did not certainly happen (040 decision 2).
|
|
137
|
+
|| (child.state === "synced" && child.reason?.startsWith("restart-") === true)) ? SYNC_FANOUT_PARTIAL_EXIT : 0;
|
|
83
138
|
}
|
|
84
139
|
|
|
85
140
|
export function renderFanoutJson(document: FanoutDocument): string { return JSON.stringify(document); }
|
package/src/cli/sync-flags.ts
CHANGED
|
@@ -1,10 +1,47 @@
|
|
|
1
|
-
|
|
1
|
+
import { isRouteClientId, type RouteClientId } from "../link/route-intent";
|
|
2
|
+
import type { ChildRestartRequest } from "../link/ssh-argv";
|
|
3
|
+
|
|
4
|
+
export type SyncFanoutFlags = {
|
|
5
|
+
ok: true; localOnly: boolean; json: boolean;
|
|
6
|
+
overwriteClient?: RouteClientId;
|
|
7
|
+
/** null: every link (today's behaviour). Otherwise the deduplicated ids given with --child. */
|
|
8
|
+
children: readonly string[] | null;
|
|
9
|
+
restartChildren: ChildRestartRequest | null;
|
|
10
|
+
} | { ok: false; message: string };
|
|
11
|
+
|
|
12
|
+
const LINK_ID = /^lnk_[0-9a-f]{16}$/;
|
|
2
13
|
|
|
3
14
|
export function parseSyncFanoutFlags(args: readonly string[]): SyncFanoutFlags {
|
|
4
|
-
for (const flag of ["--local-only", "--json"]) {
|
|
15
|
+
for (const flag of ["--local-only", "--json", "--overwrite-conflict"]) {
|
|
5
16
|
if (args.filter(arg => arg === flag).length > 1 || args.some(arg => arg.startsWith(`${flag}=`))) {
|
|
6
17
|
return { ok: false, message: `ocx sync accepts ${flag} once without a value.` };
|
|
7
18
|
}
|
|
8
19
|
}
|
|
9
|
-
|
|
20
|
+
const selectors = args.flatMap((arg, index) => arg === "--overwrite-client" ? [args[index + 1]] : arg.startsWith("--overwrite-client=") ? [arg.slice(19)] : []);
|
|
21
|
+
if (selectors.length > 1 || (selectors.length && (!args.includes("--overwrite-conflict") || !isRouteClientId(selectors[0])))) {
|
|
22
|
+
return { ok: false, message: "--overwrite-client needs one supported client and --overwrite-conflict." };
|
|
23
|
+
}
|
|
24
|
+
const children: string[] = [];
|
|
25
|
+
let restart: ChildRestartRequest | null = null, restartSeen = false;
|
|
26
|
+
for (let i = 0; i < args.length; i++) {
|
|
27
|
+
const arg = args[i]!;
|
|
28
|
+
if (arg === "--child" || arg.startsWith("--child=")) {
|
|
29
|
+
const value = arg === "--child" ? args[++i] : arg.slice("--child=".length);
|
|
30
|
+
if (value === undefined || !LINK_ID.test(value)) return { ok: false, message: "--child needs a link id of the form lnk_ followed by 16 hex digits (see ocx link status)." };
|
|
31
|
+
if (!children.includes(value)) children.push(value);
|
|
32
|
+
} else if (arg === "--restart-children" || arg.startsWith("--restart-children=")) {
|
|
33
|
+
if (restartSeen) return { ok: false, message: "ocx sync accepts --restart-children once." };
|
|
34
|
+
restartSeen = true;
|
|
35
|
+
const value = arg === "--restart-children" ? "app-server" : arg.slice("--restart-children=".length);
|
|
36
|
+
if (value !== "app-server" && value !== "codex") return { ok: false, message: "--restart-children accepts app-server (default) or codex." };
|
|
37
|
+
restart = value;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
const localOnly = args.includes("--local-only");
|
|
41
|
+
if (localOnly && (children.length > 0 || restartSeen)) return { ok: false, message: "--local-only disables fan-out; it cannot be combined with --child or --restart-children." };
|
|
42
|
+
if (restart === "codex" && !args.includes("--yes")) {
|
|
43
|
+
return { ok: false, message: "--restart-children=codex quits and relaunches the Codex app on each selected Child and ends its conversations; pass --yes." };
|
|
44
|
+
}
|
|
45
|
+
return { ok: true, localOnly, json: args.includes("--json"), children: children.length ? children : null, restartChildren: restart,
|
|
46
|
+
...(selectors.length ? { overwriteClient: selectors[0] as RouteClientId } : {}) };
|
|
10
47
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { runningProxyUpdateHeaders } from "../oauth/login-cli";
|
|
2
2
|
import { runtimeBaseUrl, RuntimeApiError } from "./runtime-api";
|
|
3
3
|
import { validateStatus, type LinkStatusPayload } from "./link";
|
|
4
|
+
import { validateChildOps } from "./link-status-child";
|
|
4
5
|
|
|
5
6
|
export type LinkStatusFailure = "home-runtime-not-running" | "home-link-status-unauthorized" | "home-link-status-timeout" | "home-link-status-unavailable" | "home-link-status-invalid";
|
|
6
7
|
export class LinkStatusError extends Error {
|
|
@@ -26,14 +27,29 @@ export async function readHomeLinkStatus(deadlineMs = 5000, deps: {
|
|
|
26
27
|
if (controller.signal.aborted) throw new LinkStatusError("home-link-status-timeout");
|
|
27
28
|
if (!base) throw new LinkStatusError("home-runtime-not-running");
|
|
28
29
|
let response: Response;
|
|
29
|
-
|
|
30
|
+
// wp2: children=1 adds each row's child block (activity, active job); an older Home ignores the query.
|
|
31
|
+
try { response = await (deps.fetchImpl ?? fetch)(`${base}/api/link/status?children=1`, { headers: (deps.headers ?? runningProxyUpdateHeaders)(), signal: controller.signal }); }
|
|
30
32
|
catch (cause) { throw new LinkStatusError("home-link-status-unavailable", { cause }); }
|
|
31
33
|
if (response.status === 401 || response.status === 403) throw new LinkStatusError("home-link-status-unauthorized");
|
|
32
34
|
if (!response.ok) throw new LinkStatusError("home-link-status-unavailable");
|
|
33
35
|
let text: string;
|
|
34
36
|
try { text = await response.text(); } catch (cause) { throw new LinkStatusError("home-link-status-unavailable", { cause }); }
|
|
35
|
-
try { return validateStatus(JSON.parse(text)); } catch (cause) { throw new LinkStatusError("home-link-status-invalid", { cause }); }
|
|
37
|
+
try { return validateStatus(withoutInvalidChildBlocks(JSON.parse(text))); } catch (cause) { throw new LinkStatusError("home-link-status-invalid", { cause }); }
|
|
36
38
|
};
|
|
37
39
|
try { return await Promise.race([work(), timeout]); }
|
|
38
40
|
finally { if (timer !== undefined) clearTimeout(timer); controller.abort(); }
|
|
39
41
|
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* 040 Revision 6: a row whose child block fails validation reads as a row without one (no busy skip, restarts withheld
|
|
45
|
+
* as activity-unknown); it never fails the whole status read, so the other rows keep their results.
|
|
46
|
+
*/
|
|
47
|
+
function withoutInvalidChildBlocks(value: unknown): unknown {
|
|
48
|
+
if (!value || typeof value !== "object" || !Array.isArray((value as { links?: unknown }).links)) return value;
|
|
49
|
+
const links = (value as { links: unknown[] }).links.map((row, index) => {
|
|
50
|
+
if (!row || typeof row !== "object" || Array.isArray(row) || !Object.hasOwn(row, "child")) return row;
|
|
51
|
+
try { validateChildOps((row as { child: unknown }).child, index); return row; }
|
|
52
|
+
catch { const { child: _dropped, ...rest } = row as Record<string, unknown>; return rest; }
|
|
53
|
+
});
|
|
54
|
+
return { ...value, links };
|
|
55
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getConfigDir } from "../config/paths";
|
|
2
|
-
import { acquireSyncGuard, inspectUpdateMarker, inspectUpdateSyncMutex, parentHoldsSyncMutex, refuseSync } from "../update/sync-update-mutex";
|
|
2
|
+
import { acquireSyncGuard, inspectUpdateMarker, inspectUpdateSyncMutex, parentHoldsSyncMutex, refuseSync, staleUpdateMarkerHint } from "../update/sync-update-mutex";
|
|
3
3
|
|
|
4
4
|
/** Hold the home-scoped update/sync mutex until the complete sync operation settles. */
|
|
5
5
|
export async function withSyncUpdateGuard(run: () => Promise<number>, args: readonly string[] = []): Promise<number> {
|
|
@@ -9,7 +9,12 @@ export async function withSyncUpdateGuard(run: () => Promise<number>, args: read
|
|
|
9
9
|
while (!parentHoldsSyncMutex(home) && Date.now() < deadline) await new Promise(resolve => setTimeout(resolve, 20));
|
|
10
10
|
if (!parentHoldsSyncMutex(home)) return refuseSync(inspectUpdateSyncMutex(home) === "sync" ? "sync-in-progress" : "update-in-flight", args);
|
|
11
11
|
}
|
|
12
|
-
if (parentHoldsSyncMutex(home))
|
|
12
|
+
if (parentHoldsSyncMutex(home)) {
|
|
13
|
+
const detail: { witnessless?: boolean } = {};
|
|
14
|
+
return inspectUpdateMarker(home, { detail }) === "free"
|
|
15
|
+
? await run()
|
|
16
|
+
: refuseSync("update-in-flight", args, detail.witnessless ? staleUpdateMarkerHint(home) : []);
|
|
17
|
+
}
|
|
13
18
|
const lease = acquireSyncGuard(home, args);
|
|
14
19
|
if (lease.kind === "refused") return lease.exit;
|
|
15
20
|
try {
|
|
@@ -226,13 +226,14 @@ export async function requestBoundSystemRestart(
|
|
|
226
226
|
* A client runtime under the desktop app or a service answers 409 `restart_supervised` and keeps
|
|
227
227
|
* serving (OCX-6). Read that small body and return the validated supervisor, or null.
|
|
228
228
|
*/
|
|
229
|
-
async function supervisedRefusal(response: Response): Promise<"service" | "desktop" | null> {
|
|
229
|
+
async function supervisedRefusal(response: Response): Promise<"service" | "desktop" | "service-unproven" | null> {
|
|
230
230
|
try {
|
|
231
231
|
const read = await readBoundedResponseBytes(response, { maxBytes: 1024, signal: AbortSignal.timeout(SYSTEM_RESTART_REQUEST_TIMEOUT_MS) });
|
|
232
232
|
if (read.oversized) return null;
|
|
233
233
|
const body = JSON.parse(new TextDecoder().decode(read.bytes)) as { error?: { code?: unknown; supervisor?: unknown } } | null;
|
|
234
234
|
if (body?.error?.code !== RESTART_SUPERVISED_ERROR) return null;
|
|
235
|
-
|
|
235
|
+
const supervisor = body.error.supervisor;
|
|
236
|
+
return supervisor === "service" || supervisor === "desktop" || supervisor === "service-unproven" ? supervisor : null;
|
|
236
237
|
} catch {
|
|
237
238
|
return null;
|
|
238
239
|
}
|
|
@@ -24,26 +24,75 @@ export type UninstallObservation = {
|
|
|
24
24
|
/** Service removal outcome, or null when the step threw. */
|
|
25
25
|
serviceRemoval: "absent" | "removed" | "failed" | null;
|
|
26
26
|
/**
|
|
27
|
-
*
|
|
27
|
+
* Was the restart window verified AFTER removal? Needed after an older CLI's
|
|
28
|
+
* `stopped-respawnable` and, on Windows, after every `stopped`: there it is Part B of the
|
|
29
|
+
* checked stop (#7771), which proves the port stays free and no wrapper came back.
|
|
28
30
|
*
|
|
29
31
|
* Deleting the registration does not prove an already-running `:loop` wrapper died —
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
+
* `ocx stop` confirms across the window; uninstall has to do the same before it may take
|
|
33
|
+
* shared config down (#764).
|
|
32
34
|
*/
|
|
33
35
|
respawnWindowVerified: boolean;
|
|
34
36
|
};
|
|
35
37
|
|
|
36
|
-
|
|
38
|
+
/** Whether the restart window must be verified before shared config may come down. */
|
|
39
|
+
export function respawnWindowRequired(
|
|
40
|
+
o: Pick<UninstallObservation, "serviceStop">,
|
|
41
|
+
platform: NodeJS.Platform = process.platform,
|
|
42
|
+
): boolean {
|
|
43
|
+
return o.serviceStop === "stopped-respawnable" || (platform === "win32" && o.serviceStop === "stopped");
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* Whether the uninstall may remove the installed manager.
|
|
48
|
+
*
|
|
49
|
+
* On Windows the removal deletes a Task Scheduler registration and stops/deletes a WinSW
|
|
50
|
+
* service. Both are only safe once Part A proved the manager stopped or that none is
|
|
51
|
+
* registered: `ocx service uninstall` refuses in the same states, and removing the
|
|
52
|
+
* registration of a manager that could not be stopped hides the reason the proxy may
|
|
53
|
+
* come back instead of fixing it. Other platforms remove after their own stop attempt, as
|
|
54
|
+
* before.
|
|
55
|
+
*/
|
|
56
|
+
export function serviceRemovalAllowed(
|
|
57
|
+
o: Pick<UninstallObservation, "serviceStop">,
|
|
58
|
+
platform: NodeJS.Platform = process.platform,
|
|
59
|
+
): boolean {
|
|
60
|
+
if (platform !== "win32") return true;
|
|
61
|
+
return o.serviceStop === "stopped" || o.serviceStop === "absent";
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export function sharedTeardownAuthorized(o: UninstallObservation, platform: NodeJS.Platform = process.platform): boolean {
|
|
37
65
|
if (o.serviceStop === null) return false;
|
|
38
66
|
// "absent" and a clean stop are the only service states that prove nothing is managing
|
|
39
67
|
// the proxy.
|
|
40
68
|
if (o.serviceStop === "failed" || o.serviceStop === "state-unknown") return false;
|
|
41
69
|
// Removing the registration is not the same as proving the running wrapper is gone.
|
|
42
|
-
if (o
|
|
70
|
+
if (respawnWindowRequired(o, platform) && !o.respawnWindowVerified) return false;
|
|
43
71
|
if (o.serviceRemoval === null || o.serviceRemoval === "failed") return false;
|
|
44
72
|
return o.proxyProvenDown;
|
|
45
73
|
}
|
|
46
74
|
|
|
75
|
+
/**
|
|
76
|
+
* The "service removed" step: gate, then remove.
|
|
77
|
+
*
|
|
78
|
+
* Kept beside the rule so the command body stays a call, and so the refusal is testable
|
|
79
|
+
* without reading `handleUninstall`. A refused gate throws, which the step records as a
|
|
80
|
+
* failure and which keeps the shared teardown blocked.
|
|
81
|
+
*/
|
|
82
|
+
export function uninstallServiceRemoval(
|
|
83
|
+
o: Pick<UninstallObservation, "serviceStop">,
|
|
84
|
+
remove: () => "absent" | "removed" | "failed",
|
|
85
|
+
platform: NodeJS.Platform = process.platform,
|
|
86
|
+
): "absent" | "removed" | "failed" {
|
|
87
|
+
if (!serviceRemovalAllowed(o, platform)) {
|
|
88
|
+
throw new Error(
|
|
89
|
+
"the service manager could not be proven stopped, so its registration was left in place; "
|
|
90
|
+
+ "resolve the 'service stopped' failure, then rerun 'ocx uninstall'",
|
|
91
|
+
);
|
|
92
|
+
}
|
|
93
|
+
return remove();
|
|
94
|
+
}
|
|
95
|
+
|
|
47
96
|
/** An endpoint an uninstall must account for before shared config comes down. */
|
|
48
97
|
export type ProbeEndpoint = { hostname: string; port: number };
|
|
49
98
|
|
|
@@ -93,3 +142,26 @@ export async function everyEndpointProvenDownAsync(
|
|
|
93
142
|
const results = await Promise.all(endpoints.map(e => probe(e)));
|
|
94
143
|
return results.every(result => result === "dead");
|
|
95
144
|
}
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* The uninstall's "nothing answers on any endpoint this home could serve" proof, with the
|
|
148
|
+
* candidate set captured NOW. The proxy stop removes the runtime record (and a stopped proxy
|
|
149
|
+
* may remove its own), so a set read after the stop would silently drop the stopped proxy's
|
|
150
|
+
* port. Every candidate, not just the preferred one: a stale runtime record pointing at a
|
|
151
|
+
* closed port would otherwise "prove" a live proxy on the configured port is gone. Any
|
|
152
|
+
* failure to read or probe is not proof.
|
|
153
|
+
*/
|
|
154
|
+
export function captureUninstallEndpointProof(
|
|
155
|
+
readCandidates: () => ProbeEndpoint[],
|
|
156
|
+
probe: (e: ProbeEndpoint) => Promise<"live" | "dead" | "unknown"> | "live" | "dead" | "unknown",
|
|
157
|
+
): () => Promise<boolean> {
|
|
158
|
+
let candidates: ProbeEndpoint[] | null = null;
|
|
159
|
+
try { candidates = readCandidates(); } catch { candidates = null; }
|
|
160
|
+
return async () => {
|
|
161
|
+
try {
|
|
162
|
+
return candidates !== null && await everyEndpointProvenDownAsync(candidates, probe);
|
|
163
|
+
} catch {
|
|
164
|
+
return false;
|
|
165
|
+
}
|
|
166
|
+
};
|
|
167
|
+
}
|