@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
|
@@ -1,22 +1,29 @@
|
|
|
1
|
-
import { findLiveProxy, SERVICE_STOP_LIVENESS } from "../server/proxy-liveness";
|
|
1
|
+
import { findLiveProxy, proveLiveProxyOwnedByHome, proxyIdentityAt, SERVICE_STOP_LIVENESS } from "../server/proxy-liveness";
|
|
2
2
|
import { existsSync, unlinkSync } from "node:fs";
|
|
3
3
|
import { durableBunRuntime, type DurableBunRuntime } from "../lib/bun-runtime";
|
|
4
4
|
import { assertSelectedRuntimeWritable, type RuntimePreflightDeps } from "../lib/bun-runtime-preflight";
|
|
5
5
|
import { getConfigDir } from "../config";
|
|
6
|
-
import { readPid, removePid, removeRuntimePort, verifyPidIdentity } from "../config/process-state";
|
|
6
|
+
import { readPid, readRuntimePort, removePid, removeRuntimePort, verifyPidIdentity } from "../config/process-state";
|
|
7
7
|
import { isWslRuntime } from "../codex/home";
|
|
8
8
|
import { isProcessAlive, stopProxy } from "../lib/process-control";
|
|
9
9
|
import { randomUUID } from "node:crypto";
|
|
10
|
-
import { startWinswService, stopWinswService, statusWinswRaw, uninstallWinswService, winswStatusSummary, type WinswStatus } from "../lib/winsw";
|
|
10
|
+
import { startWinswService, stopWinswService, statusWinswRaw, uninstallWinswService, WINSW_SERVICE_ID, winswExePath, winswStatusSummary, type WinswStatus } from "../lib/winsw";
|
|
11
|
+
import { queryWinswBinaryPathName, scBinaryPathNamesExecutable } from "../service-manager-probe";
|
|
11
12
|
import { diagnoseService } from "./diagnostics";
|
|
12
|
-
import type { ServiceDiagnostic } from "./diagnostics";
|
|
13
13
|
import { assertServiceEnvironmentMatchesInstall } from "./guards";
|
|
14
14
|
import { runLaunchctl, launchdEvictionTargets, launchctlBootoutBenign, probeLaunchdLoadState, installLaunchd, startLaunchd, stopLaunchd, statusLaunchd, uninstallLaunchd } from "./launchd";
|
|
15
15
|
import { assertSchedulerRegistrationBeforeStart } from "./repair";
|
|
16
16
|
import { SERVICE_MANAGED_ENV, TASK, plistPath, removeServiceInstallStateRecords, writeServiceInstallState } from "./state";
|
|
17
17
|
import type { ServiceBackend } from "./state";
|
|
18
18
|
import { unitPath, isSystemd, installSystemd, startSystemd, stopSystemd, statusSystemd, uninstallSystemd, systemdServiceInstallCleanupOps } from "./systemd";
|
|
19
|
-
import { writeWindowsSchedulerAssets, stageWindowsSchedulerRegistrationXml, removeWindowsSchedulerRegistrationStage, registerFreshWindowsSchedulerTask, recordWindowsSchedulerOwnership, removeNativeWindowsServiceForScheduler, commitWindowsInstall, commitWindowsNativeInstall, type WindowsServiceInstallDeps, startWindows, isWindowsSchedulerEndBenign, stopWindows,
|
|
19
|
+
import { writeWindowsSchedulerAssets, stageWindowsSchedulerRegistrationXml, removeWindowsSchedulerRegistrationStage, registerFreshWindowsSchedulerTask, recordWindowsSchedulerOwnership, removeNativeWindowsServiceForScheduler, commitWindowsInstall, commitWindowsNativeInstall, type WindowsServiceInstallDeps, startWindows, isWindowsSchedulerEndBenign, stopWindows, statusWindows, statusWindowsXml, uninstallWindows } from "./windows-ops";
|
|
20
|
+
import type { WindowsCheckedStopResult } from "./windows-checked-stop";
|
|
21
|
+
import { WINDOWS_STOP_CAPS } from "./windows-stop-budget";
|
|
22
|
+
import type { WindowsStopConfirmResult } from "./windows-stop-confirm";
|
|
23
|
+
import { claimPendingTeardown, clearPendingTeardown, type PendingTeardownReceipt } from "../config/pending-teardown";
|
|
24
|
+
import { probeEndpointLiveness, type EndpointLiveness } from "../server/proxy-liveness";
|
|
25
|
+
import type { ProbeEndpoint } from "../cli/uninstall-plan";
|
|
26
|
+
import { confirmWindowsServiceStop, describeWindowsPartA, describeWindowsPartB, endpointsAllDead, runWindowsServiceStopPartA, serviceStopOutcomeFromWindows, windowsPartARecord, windowsRemovalEndpoints, windowsServiceStopPort, windowsStopAdmission, windowsStopRemainingMs, type WindowsPartARequest } from "./windows-service-stop";
|
|
20
27
|
import { schtasks, probeWindowsSchedulerTask, rollbackWindowsSchedulerTaskOwnedByAttempt, settleDelay } from "./windows-scheduler";
|
|
21
28
|
import type { WindowsSchedulerTaskProbe } from "./windows-scheduler";
|
|
22
29
|
import { windowsTaskRegistrationOwnedByAttempt, windowsTaskRegistrationHealthy } from "./windows-taskxml";
|
|
@@ -24,6 +31,8 @@ import { win32 } from "node:path";
|
|
|
24
31
|
import { launchdGuiDomain } from "./launchd";
|
|
25
32
|
import { LABEL } from "./state";
|
|
26
33
|
import { assertNoDesktopSupervision, createSupervisionLatch, type SupervisionInspector, type SupervisionLatch } from "./desktop-command-guard";
|
|
34
|
+
import type { HeldRestartReceipt } from "./restart-proxy-stop";
|
|
35
|
+
import { readClientConnectionState } from "../client/state";
|
|
27
36
|
|
|
28
37
|
type ServiceOps = {
|
|
29
38
|
install: (runtime: DurableBunRuntime) => void | Promise<void>; start: () => void; stop: () => void;
|
|
@@ -191,12 +200,72 @@ export async function proxyStillLiveAfterStop(deps: {
|
|
|
191
200
|
}
|
|
192
201
|
}
|
|
193
202
|
|
|
194
|
-
|
|
203
|
+
/**
|
|
204
|
+
* How long orphan discovery may take when the caller does not name a cap.
|
|
205
|
+
*
|
|
206
|
+
* Seven seconds is the legacy multi-candidate window. It stays the default so macOS and
|
|
207
|
+
* Linux stops behave exactly as before; a Windows caller that admitted a budget
|
|
208
|
+
* (030 "Time budget") passes its own 3 s cap instead.
|
|
209
|
+
*/
|
|
210
|
+
export const DEFAULT_ORPHAN_DISCOVERY_MS = 7_000;
|
|
211
|
+
|
|
212
|
+
type TrackedProxyStop = (pid: number, endpoint: { hostname: string; port: number } | null) => Promise<unknown>;
|
|
213
|
+
|
|
214
|
+
/** How the tracked proxy is stopped: the deferral receipt and the Windows port wait. */
|
|
215
|
+
export interface TrackedProxyStopIo {
|
|
216
|
+
/** Pre-resolved Windows target; null means there is no child to stop. */
|
|
217
|
+
target?: TrackedProxyTarget | null;
|
|
218
|
+
/** ocx service stop on Windows: the claimed receipt, so the proxy defers its teardown. */
|
|
219
|
+
deferSharedTeardownNonce?: string;
|
|
220
|
+
/** Part B follows and owns the port wait (030), so stopProxy skips its own. */
|
|
221
|
+
skipPortWait?: boolean;
|
|
222
|
+
/**
|
|
223
|
+
* Cap on the identity-checked orphan discovery that follows the tracked stop.
|
|
224
|
+
*
|
|
225
|
+
* The checked Windows stop admits `WINDOWS_STOP_CAPS.orphanDiscovery` (3 s) for this step
|
|
226
|
+
* (030 "Time budget"), and Part B runs inside the same deadline: discovery that spent the
|
|
227
|
+
* legacy 7 s would overrun the budget admission had just proven. Omitted keeps 7 s.
|
|
228
|
+
*/
|
|
229
|
+
orphanDiscoveryCapMs?: number;
|
|
230
|
+
/** Replaces the plain stop of each target (the scheduler restart's receipt-backed, attested stop). */
|
|
231
|
+
stop?: TrackedProxyStop;
|
|
232
|
+
/** Throw when a proxy still answers that this home cannot verify, instead of leaving it alone silently. */
|
|
233
|
+
refuseUnverifiedLive?: boolean;
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
export interface TrackedProxyTarget {
|
|
237
|
+
pid: number;
|
|
238
|
+
endpoint: { hostname: string; port: number } | null;
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
/** Resolve once before claiming a receipt, so its endpoint is the stop's endpoint. */
|
|
242
|
+
export async function resolveTrackedProxyTarget(): Promise<TrackedProxyTarget | null> {
|
|
243
|
+
const pid = verifiedKillTarget(readPid());
|
|
244
|
+
if (pid !== null && isProcessAlive(pid)) {
|
|
245
|
+
const runtime = readRuntimePort(pid);
|
|
246
|
+
return { pid, endpoint: runtime?.port ? { hostname: runtime.hostname ?? "127.0.0.1", port: runtime.port } : null };
|
|
247
|
+
}
|
|
248
|
+
const live = await findLiveProxy({ ...SERVICE_STOP_LIVENESS, deadlineAt: Date.now() + WINDOWS_STOP_CAPS.orphanDiscovery, acceptPackageTreeFenced: true });
|
|
249
|
+
if (!live) return null;
|
|
250
|
+
const livePid = verifiedKillTarget(live.pid);
|
|
251
|
+
if (livePid === null) throw new Error("A live proxy was found but its process identity could not be verified.");
|
|
252
|
+
return { pid: livePid, endpoint: { hostname: live.hostname ?? "127.0.0.1", port: live.port } };
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
export async function stopTrackedProxyIfRunning(io: TrackedProxyStopIo = {}): Promise<TrackedProxyCleanupResult> {
|
|
256
|
+
if (io.target !== undefined) {
|
|
257
|
+
if (!io.target) return "none";
|
|
258
|
+
await stopProxy(io.target.pid, { ...io, ...(io.target.endpoint ? { runtimeEndpoint: io.target.endpoint } : {}) });
|
|
259
|
+
removePid(io.target.pid);
|
|
260
|
+
removeRuntimePort(io.target.pid);
|
|
261
|
+
return "stopped";
|
|
262
|
+
}
|
|
195
263
|
let stopped = false;
|
|
196
264
|
const pid = readPid();
|
|
197
265
|
const trackedKillPid = verifiedKillTarget(pid);
|
|
198
266
|
if (trackedKillPid !== null && isProcessAlive(trackedKillPid)) {
|
|
199
|
-
await
|
|
267
|
+
if (io.stop) await io.stop(trackedKillPid, null);
|
|
268
|
+
else await stopProxy(trackedKillPid, io);
|
|
200
269
|
removePid(trackedKillPid);
|
|
201
270
|
removeRuntimePort(trackedKillPid);
|
|
202
271
|
stopped = true;
|
|
@@ -206,27 +275,129 @@ async function stopTrackedProxyIfRunning(): Promise<TrackedProxyCleanupResult> {
|
|
|
206
275
|
}
|
|
207
276
|
// Orphan recovery: the pid file can be missing/stale while the service wrapper keeps
|
|
208
277
|
// a live proxy running — mirror `ocx stop`'s identity-checked findLiveProxy fallback.
|
|
209
|
-
// Cap multi-candidate discovery so stop cleanup cannot hang for three full retry budgets
|
|
278
|
+
// Cap multi-candidate discovery so stop cleanup cannot hang for three full retry budgets,
|
|
279
|
+
// and let a caller that admitted a budget name its own cap (#7771).
|
|
210
280
|
const live = await findLiveProxy({
|
|
211
281
|
...SERVICE_STOP_LIVENESS,
|
|
212
|
-
deadlineAt: Date.now() +
|
|
282
|
+
deadlineAt: Date.now() + (io.orphanDiscoveryCapMs ?? DEFAULT_ORPHAN_DISCOVERY_MS),
|
|
213
283
|
acceptPackageTreeFenced: true,
|
|
214
284
|
});
|
|
215
285
|
const liveKillPid = verifiedKillTarget(live?.pid);
|
|
216
|
-
if (liveKillPid !== null) {
|
|
217
|
-
await
|
|
286
|
+
if (live && liveKillPid !== null) {
|
|
287
|
+
if (io.stop) await io.stop(liveKillPid, { hostname: live.probeHostname ?? live.hostname ?? "127.0.0.1", port: live.port });
|
|
288
|
+
else await stopProxy(liveKillPid, io);
|
|
218
289
|
removePid(liveKillPid);
|
|
219
290
|
removeRuntimePort(liveKillPid);
|
|
220
291
|
stopped = true;
|
|
292
|
+
} else if (live && io.refuseUnverifiedLive) {
|
|
293
|
+
throw new Error("A proxy still answers for this home, but its process could not be verified as this home's proxy, so it was not stopped.");
|
|
221
294
|
}
|
|
222
295
|
if (stopped) return "stopped";
|
|
223
296
|
if (pid) return "stale";
|
|
224
297
|
return "none";
|
|
225
298
|
}
|
|
226
299
|
|
|
227
|
-
|
|
300
|
+
/**
|
|
301
|
+
* The tracked-proxy stop of a scheduler restart (#8416): receipt-backed, so the proxy's own respawn
|
|
302
|
+
* refusal does not apply to the restart that verifies the window, and refusing an unverifiable
|
|
303
|
+
* survivor so the caller can stop before it removes the wrappers that supervise it.
|
|
304
|
+
*/
|
|
305
|
+
export async function stopTrackedProxyForServiceRestart(
|
|
306
|
+
hold: (receipt: HeldRestartReceipt) => void,
|
|
307
|
+
deps: { linkChild?: () => boolean } = {},
|
|
308
|
+
): Promise<TrackedProxyCleanupResult> {
|
|
309
|
+
const { stopProxyForServiceRestart } = await import("./restart-proxy-stop");
|
|
310
|
+
// Re-decided before every stop, not only before the restart began: a Link connection or a Child
|
|
311
|
+
// that started meanwhile must not be stopped through a deferral that keeps its route.
|
|
312
|
+
assertNotLinkChildForRestart(deps.linkChild);
|
|
313
|
+
return stopTrackedProxyIfRunning({
|
|
314
|
+
stop: async pid => { assertNotLinkChildForRestart(deps.linkChild); return stopProxyForServiceRestart(pid, hold); },
|
|
315
|
+
refuseUnverifiedLive: true,
|
|
316
|
+
});
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
const LINK_CHILD_RESTART_REFUSAL = "Nothing was changed, and this Child keeps serving under its existing task. 'ocx service restart' does not restart a Child connected over a Remote Link under Task Scheduler: "
|
|
320
|
+
+ "stopping its proxy keeps Codex routed to the Child's unauthenticated loopback port, which another local process could take if the restart then failed.";
|
|
321
|
+
|
|
322
|
+
function linkChildConnected(read?: () => boolean): boolean {
|
|
323
|
+
try {
|
|
324
|
+
return (read ?? (() => {
|
|
325
|
+
const state = readClientConnectionState();
|
|
326
|
+
return state.kind === "connected" && state.value.transport === "link";
|
|
327
|
+
}))();
|
|
328
|
+
} catch {
|
|
329
|
+
throw new Error("The client connection state could not be read, so the restart cannot tell whether this is a linked Child; nothing was stopped.");
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
function assertNotLinkChildForRestart(read?: () => boolean): void {
|
|
334
|
+
if (linkChildConnected(read)) throw new Error(LINK_CHILD_RESTART_REFUSAL);
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
/**
|
|
338
|
+
* Whether a replacement serves the endpoint a scheduler restart's receipt names. Client routing
|
|
339
|
+
* still names that endpoint, so only this home's freshly published runtime record counts: it must
|
|
340
|
+
* name that port and a pid other than the stopped ones, the listener there must answer healthy (a
|
|
341
|
+
* package-tree-fenced proxy cannot serve requests) as that pid, and it must prove possession of the
|
|
342
|
+
* record's attestation secret for a fresh challenge. A listener that merely names some live pid in
|
|
343
|
+
* an unattested /healthz never releases a receipt. Bounded; false is not proof of failure, only that
|
|
344
|
+
* the restart cannot release the receipt on the replacement's behalf.
|
|
345
|
+
*/
|
|
346
|
+
export async function schedulerReplacementServing(
|
|
347
|
+
endpoint: { hostname: string; port: number },
|
|
348
|
+
stoppedPids: readonly number[],
|
|
349
|
+
deps: {
|
|
350
|
+
readRecord?: () => { pid: number; port: number } | null;
|
|
351
|
+
identityAt?: (endpoint: { hostname: string; port: number }, pid: number) => Promise<{ pid: number | null; packageTreeFenced?: true } | null>;
|
|
352
|
+
prove?: (pid: number, endpoint: { hostname: string; port: number }) => Promise<boolean>;
|
|
353
|
+
sleep?: (ms: number) => Promise<void>;
|
|
354
|
+
now?: () => number;
|
|
355
|
+
windowMs?: number;
|
|
356
|
+
} = {},
|
|
357
|
+
): Promise<boolean> {
|
|
358
|
+
const now = deps.now ?? Date.now;
|
|
359
|
+
const sleep = deps.sleep ?? ((ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms)));
|
|
360
|
+
const deadline = now() + (deps.windowMs ?? 30_000);
|
|
361
|
+
const readRecord = deps.readRecord ?? (() => readRuntimePort());
|
|
362
|
+
const identityAt = deps.identityAt ?? ((target, pid) => proxyIdentityAt(target.port, { hostname: target.hostname, expectedPid: pid }, { ...SERVICE_STOP_LIVENESS, deadlineAt: deadline }));
|
|
363
|
+
const prove = deps.prove ?? (async (pid, target) =>
|
|
364
|
+
await proveLiveProxyOwnedByHome({ pid, port: target.port, hostname: target.hostname, source: "runtime" }, { ...SERVICE_STOP_LIVENESS, deadlineAt: deadline }) === "proven");
|
|
365
|
+
for (;;) {
|
|
366
|
+
try {
|
|
367
|
+
const record = readRecord();
|
|
368
|
+
if (record && record.port === endpoint.port && !stoppedPids.includes(record.pid)) {
|
|
369
|
+
const identity = await identityAt(endpoint, record.pid);
|
|
370
|
+
if (identity && !identity.packageTreeFenced && identity.pid === record.pid && await prove(record.pid, endpoint)) return true;
|
|
371
|
+
}
|
|
372
|
+
} catch {
|
|
373
|
+
// A probe failure is not proof either way; keep looking until the deadline.
|
|
374
|
+
}
|
|
375
|
+
if (now() >= deadline) return false;
|
|
376
|
+
await sleep(1000);
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
/**
|
|
381
|
+
* Refuse a scheduler restart of a live Child connected over a Remote Link, before anything changes.
|
|
382
|
+
*
|
|
383
|
+
* Its proxy can only be stopped by a deferred stop that keeps Codex routed to the Child's loopback
|
|
384
|
+
* listener, which accepts unauthenticated local requests. If the restart then failed, nothing would
|
|
385
|
+
* bind that port again and another local process could take it. A Link Child whose proxy is not
|
|
386
|
+
* running has nothing to stop here; every later stop decides again (stopTrackedProxyForServiceRestart).
|
|
387
|
+
*/
|
|
388
|
+
export async function assertSchedulerRestartTargetAllowed(deps: {
|
|
389
|
+
linkChild?: () => boolean;
|
|
390
|
+
findProxy?: () => Promise<unknown | null>;
|
|
391
|
+
} = {}): Promise<void> {
|
|
392
|
+
if (!linkChildConnected(deps.linkChild)) return;
|
|
393
|
+
const live = await (deps.findProxy ?? (() => findLiveProxy({ ...SERVICE_STOP_LIVENESS, acceptPackageTreeFenced: true })))();
|
|
394
|
+
if (!live) return;
|
|
395
|
+
throw new Error(LINK_CHILD_RESTART_REFUSAL);
|
|
396
|
+
}
|
|
397
|
+
|
|
398
|
+
export async function stopTrackedProxyForServiceCommand(io: TrackedProxyStopIo = {}): Promise<TrackedProxyCleanupResult> {
|
|
228
399
|
try {
|
|
229
|
-
return await stopTrackedProxyIfRunning();
|
|
400
|
+
return await stopTrackedProxyIfRunning(io);
|
|
230
401
|
} catch (err) {
|
|
231
402
|
console.error(`⚠️ Failed to stop proxy: ${err instanceof Error ? err.message : String(err)}`);
|
|
232
403
|
return "none";
|
|
@@ -236,17 +407,68 @@ export async function stopTrackedProxyForServiceCommand(): Promise<TrackedProxyC
|
|
|
236
407
|
export interface ServiceInstallPreparationDeps extends RuntimePreflightDeps {
|
|
237
408
|
inspectSupervision?: SupervisionInspector;
|
|
238
409
|
supervisionLatch?: SupervisionLatch;
|
|
239
|
-
diagnose?: () => ServiceDiagnostic;
|
|
240
410
|
managerOps?: (backend: ServiceBackend) => ServiceInstallCleanupOps | null;
|
|
241
411
|
/**
|
|
242
|
-
*
|
|
243
|
-
*
|
|
412
|
+
* Windows: Part A of the checked stop (#7771) for every registered manager and the
|
|
413
|
+
* bound wrappers of this home. Replaces the manager stops plus the best-effort sweep.
|
|
244
414
|
*/
|
|
245
|
-
|
|
246
|
-
|
|
415
|
+
windowsPartA?: (request: WindowsPartARequest) => Promise<WindowsCheckedStopResult>;
|
|
416
|
+
/** Windows: Part B after the tracked-proxy stop; the port must be free and stay free. */
|
|
417
|
+
windowsPartB?: (request: { port: number; remainingMs: number }) => Promise<WindowsStopConfirmResult>;
|
|
418
|
+
/**
|
|
419
|
+
* Windows: the port the stopped proxy was serving, resolved ONCE before Part A (#7771).
|
|
420
|
+
*
|
|
421
|
+
* Resolving it after the tracked cleanup reads a runtime record the cleanup just deleted,
|
|
422
|
+
* so Part B confirmed the wrapper's port while the proxy's own port was never checked.
|
|
423
|
+
*/
|
|
424
|
+
windowsStopPort?: () => number;
|
|
425
|
+
/** Receives the deferral nonce so the wrapper's POST does not run the teardown. */
|
|
426
|
+
stopTrackedProxy?: (io?: TrackedProxyStopIo) => Promise<unknown>;
|
|
427
|
+
resolveTarget?: typeof resolveTrackedProxyTarget;
|
|
428
|
+
claimTeardown?: typeof claimPendingTeardown;
|
|
429
|
+
clearTeardown?: (nonce: string) => boolean;
|
|
430
|
+
/** Every endpoint an absent-manager install must prove down, resolved once. */
|
|
431
|
+
installEndpoints?: () => ProbeEndpoint[];
|
|
432
|
+
endpointLiveness?: (endpoint: ProbeEndpoint) => Promise<EndpointLiveness>;
|
|
247
433
|
platform?: NodeJS.Platform;
|
|
248
434
|
}
|
|
249
435
|
|
|
436
|
+
/**
|
|
437
|
+
* What an install preparation left behind.
|
|
438
|
+
*
|
|
439
|
+
* `deferredTeardownNonce` exists on Windows when the install stopped a target: it stopped
|
|
440
|
+
* the old proxy with the shared teardown deferred, so it owes the receipt. The install that
|
|
441
|
+
* replaces the proxy keeps shared config pointed at OpenCodex and completes the receipt
|
|
442
|
+
* after the new service is installed and started; a failed install leaves it for the next
|
|
443
|
+
* `ocx stop` to finish.
|
|
444
|
+
*/
|
|
445
|
+
export interface ServiceInstallPreparationResult {
|
|
446
|
+
deferredTeardownNonce?: string;
|
|
447
|
+
}
|
|
448
|
+
|
|
449
|
+
/**
|
|
450
|
+
* Claim the deferred-teardown receipt the install's tracked stop will name.
|
|
451
|
+
*
|
|
452
|
+
* Part A leaves the scheduler task registered, so a receipt-less POST answers 409
|
|
453
|
+
* `respawnable_service` and the stop throws while the old proxy keeps serving. The
|
|
454
|
+
* receipt is claimed with Part A's record before the POST, exactly as `ocx service stop`
|
|
455
|
+
* does; without it no undeferred stop is sent.
|
|
456
|
+
*/
|
|
457
|
+
function claimInstallTeardownReceipt(
|
|
458
|
+
deps: ServiceInstallPreparationDeps,
|
|
459
|
+
partA: WindowsCheckedStopResult,
|
|
460
|
+
endpoint: { hostname: string; port: number },
|
|
461
|
+
): PendingTeardownReceipt {
|
|
462
|
+
try {
|
|
463
|
+
return (deps.claimTeardown ?? claimPendingTeardown)(endpoint, "exact", process.pid, undefined, windowsPartARecord(partA));
|
|
464
|
+
} catch (error) {
|
|
465
|
+
throw new Error(
|
|
466
|
+
"The deferred-teardown receipt could not be recorded, so the proxy was left running and nothing was replaced: "
|
|
467
|
+
+ (error instanceof Error ? error.message : String(error)),
|
|
468
|
+
);
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
|
|
250
472
|
/**
|
|
251
473
|
* Stop every manager that could own the install port, then stop the tracked
|
|
252
474
|
* standalone listener. Any unknown status or cleanup failure rejects, so callers
|
|
@@ -255,48 +477,86 @@ export interface ServiceInstallPreparationDeps extends RuntimePreflightDeps {
|
|
|
255
477
|
export async function prepareServiceInstall(
|
|
256
478
|
requestedBackend: ServiceBackend,
|
|
257
479
|
deps: ServiceInstallPreparationDeps = {},
|
|
258
|
-
): Promise<
|
|
480
|
+
): Promise<ServiceInstallPreparationResult> {
|
|
259
481
|
const latch = deps.supervisionLatch ?? createSupervisionLatch();
|
|
260
482
|
assertNoDesktopSupervision(deps.inspectSupervision, latch);
|
|
261
|
-
const diagnostic = (deps.diagnose ?? diagnoseService)();
|
|
262
483
|
const platform = deps.platform ?? process.platform;
|
|
484
|
+
if (platform === "win32") {
|
|
485
|
+
// Resolve the stopped proxy's port BEFORE anything removes its runtime record: Part B
|
|
486
|
+
// has to confirm that port, and the wrapper's port is only a fallback (#7771).
|
|
487
|
+
const stopPort = (deps.windowsStopPort ?? windowsServiceStopPort)();
|
|
488
|
+
// Part A stops whichever managers are registered (both on a conflicting install) and
|
|
489
|
+
// ends the bound wrappers, or refuses with nothing deleted or replaced (#7771). It
|
|
490
|
+
// also covers a registration deleted mid-uninstall that left a detached wrapper
|
|
491
|
+
// looping: with nothing registered it binds no orphan, and an unbound survivor
|
|
492
|
+
// refuses instead of being killed by path alone.
|
|
493
|
+
const partA = await (deps.windowsPartA ?? runWindowsServiceStopPartA)({
|
|
494
|
+
admission: windowsStopAdmission({ orphanDiscovery: true }),
|
|
495
|
+
});
|
|
496
|
+
if (partA.outcome !== "stopped" && partA.outcome !== "absent") {
|
|
497
|
+
throw new Error(`The installed Windows service could not be proven stopped (${partA.outcome}); nothing was replaced. ${describeWindowsPartA(partA)}`);
|
|
498
|
+
}
|
|
499
|
+
// With no manager registered, Part B is skipped and the tracked stop can come back
|
|
500
|
+
// "none" after its discovery cap while an unresponsive proxy still holds the port.
|
|
501
|
+
// Resolve the candidates now: the cleanup below deletes the runtime record that is one
|
|
502
|
+
// of them. Nothing may be published over a candidate that is not definitively dead.
|
|
503
|
+
const absentProofEndpoints = partA.outcome === "absent"
|
|
504
|
+
? (deps.installEndpoints ?? windowsRemovalEndpoints)()
|
|
505
|
+
: [];
|
|
506
|
+
const target = await (deps.resolveTarget ?? resolveTrackedProxyTarget)();
|
|
507
|
+
if (target?.endpoint && partA.outcome === "absent" && !absentProofEndpoints.some(e => e.hostname === target.endpoint!.hostname && e.port === target.endpoint!.port)) absentProofEndpoints.push(target.endpoint);
|
|
508
|
+
let nonce: string | undefined;
|
|
509
|
+
if (target) {
|
|
510
|
+
// Before the tracked stop: a receipt-less POST would answer 409 and abort the install
|
|
511
|
+
// while the old proxy kept serving.
|
|
512
|
+
if (!target.endpoint) throw new Error("The target endpoint is unavailable, so deferred teardown cannot be recorded.");
|
|
513
|
+
nonce = claimInstallTeardownReceipt(deps, partA, target.endpoint).nonce;
|
|
514
|
+
}
|
|
515
|
+
// Part B owns the port wait after a stopped manager (030 "Time budget").
|
|
516
|
+
await (deps.stopTrackedProxy ?? ((io?: TrackedProxyStopIo) => stopTrackedProxyIfRunning(io ?? {
|
|
517
|
+
skipPortWait: partA.outcome === "stopped",
|
|
518
|
+
orphanDiscoveryCapMs: WINDOWS_STOP_CAPS.orphanDiscovery,
|
|
519
|
+
})))({
|
|
520
|
+
target,
|
|
521
|
+
...(nonce ? { deferSharedTeardownNonce: nonce } : {}),
|
|
522
|
+
skipPortWait: partA.outcome === "stopped",
|
|
523
|
+
orphanDiscoveryCapMs: WINDOWS_STOP_CAPS.orphanDiscovery,
|
|
524
|
+
});
|
|
525
|
+
if (partA.outcome === "stopped") {
|
|
526
|
+
const partB = await (deps.windowsPartB ?? confirmWindowsServiceStop)({
|
|
527
|
+
port: target?.endpoint?.port ?? stopPort,
|
|
528
|
+
remainingMs: windowsStopRemainingMs(),
|
|
529
|
+
});
|
|
530
|
+
if (partB.outcome !== "freed") {
|
|
531
|
+
throw new Error(`The service port is not free after the stop; nothing was published or started. ${describeWindowsPartB(partB)}`);
|
|
532
|
+
}
|
|
533
|
+
return { deferredTeardownNonce: nonce };
|
|
534
|
+
}
|
|
535
|
+
if (partA.outcome === "absent") {
|
|
536
|
+
const proof = await endpointsAllDead(absentProofEndpoints, deps.endpointLiveness ?? probeEndpointLiveness);
|
|
537
|
+
if (!proof.dead) {
|
|
538
|
+
throw new Error(proof.live.length > 0
|
|
539
|
+
? `A proxy is still listening on port ${proof.live.join(", ")}; nothing was published or started. Check for a manually started proxy, then retry.`
|
|
540
|
+
: `The endpoint on port ${(proof.unknown.join(", ") || stopPort)} could not be confirmed down; nothing was published or started. Check for a manually started proxy, then retry.`);
|
|
541
|
+
}
|
|
542
|
+
}
|
|
543
|
+
return nonce ? { deferredTeardownNonce: nonce } : {};
|
|
544
|
+
}
|
|
263
545
|
const resolveOps = deps.managerOps ?? platformServiceInstallCleanupOps;
|
|
264
546
|
const backends: ServiceBackend[] = [];
|
|
265
547
|
const addBackend = (backend: ServiceBackend) => {
|
|
266
548
|
if (!backends.includes(backend)) backends.push(backend);
|
|
267
549
|
};
|
|
268
|
-
|
|
269
|
-
if (platform === "win32") {
|
|
270
|
-
// The recorded backend owns the old installation and must be stopped first.
|
|
271
|
-
// A conflicting diagnostic means both managers exist, so stop both even when
|
|
272
|
-
// the requested backend happens to match the recorded one.
|
|
273
|
-
if (diagnostic.backend === "scheduler" || diagnostic.backend === "native") {
|
|
274
|
-
addBackend(diagnostic.backend);
|
|
275
|
-
if (diagnostic.conflict) addBackend(diagnostic.backend === "scheduler" ? "native" : "scheduler");
|
|
276
|
-
}
|
|
277
|
-
addBackend(requestedBackend);
|
|
278
|
-
} else {
|
|
279
|
-
addBackend(requestedBackend);
|
|
280
|
-
}
|
|
550
|
+
addBackend(requestedBackend);
|
|
281
551
|
|
|
282
552
|
for (const backend of backends) {
|
|
283
553
|
const manager = resolveOps(backend);
|
|
284
554
|
if (!manager) throw new Error(`Background service manager is unavailable for ${backend}.`);
|
|
285
555
|
if (manager.status() !== null) manager.stop();
|
|
286
556
|
}
|
|
287
|
-
if (platform === "win32") {
|
|
288
|
-
// `schtasks /end` ends the task instance but leaves the cmd `:loop` wrapper
|
|
289
|
-
// alive to respawn the proxy mid-install — the same survivor
|
|
290
|
-
// `ocx stop` kills via killWindowsServiceWrapperProcesses. Run it
|
|
291
|
-
// after every manager has been asked to stop and before the tracked-proxy
|
|
292
|
-
// kill so a child respawned in that gap is still caught below. It also runs
|
|
293
|
-
// when no manager stop happened: a registration deleted mid-uninstall can
|
|
294
|
-
// leave the detached wrapper looping. A manager stop that refused propagates
|
|
295
|
-
// above before this runs, so the respawner of a still-running service is
|
|
296
|
-
// never killed.
|
|
297
|
-
(deps.killServiceWrappers ?? killWindowsServiceWrapperProcesses)();
|
|
298
|
-
}
|
|
299
557
|
await (deps.stopTrackedProxy ?? stopTrackedProxyIfRunning)();
|
|
558
|
+
// No manager deferral off Windows: the launchd/systemd stop is down when it reports so.
|
|
559
|
+
return {};
|
|
300
560
|
}
|
|
301
561
|
|
|
302
562
|
export async function installServiceSafely(
|
|
@@ -309,9 +569,16 @@ export async function installServiceSafely(
|
|
|
309
569
|
const runtime = Object.freeze({ ...(deps.selectRuntime ?? durableBunRuntime)() });
|
|
310
570
|
const configDir = (deps.configDir ?? getConfigDir)();
|
|
311
571
|
(deps.assertRuntimeWritable ?? assertSelectedRuntimeWritable)(runtime, configDir, { platform: deps.platform, rootWasAbsent: !existsSync(configDir) });
|
|
312
|
-
await prepareServiceInstall(requestedBackend, { ...deps, supervisionLatch: latch });
|
|
572
|
+
const prepared = await prepareServiceInstall(requestedBackend, { ...deps, supervisionLatch: latch });
|
|
313
573
|
assertNoDesktopSupervision(deps.inspectSupervision, latch);
|
|
314
574
|
await install(runtime);
|
|
575
|
+
// The new service is installed and started, so shared config stays pointed at OpenCodex
|
|
576
|
+
// and the deferral is discharged. An install failure above throws before this line and
|
|
577
|
+
// keeps the receipt for the next stop.
|
|
578
|
+
const nonce = prepared.deferredTeardownNonce;
|
|
579
|
+
if (nonce && !(deps.clearTeardown ?? clearPendingTeardown)(nonce)) {
|
|
580
|
+
console.warn("⚠️ The deferred-teardown receipt could not be removed; the next 'ocx stop' will finish it.");
|
|
581
|
+
}
|
|
315
582
|
}
|
|
316
583
|
|
|
317
584
|
export interface FreshWindowsSchedulerInstallDeps extends RuntimePreflightDeps {
|
|
@@ -320,7 +587,7 @@ export interface FreshWindowsSchedulerInstallDeps extends RuntimePreflightDeps {
|
|
|
320
587
|
stageRegistrationXml?: (attemptNonce: string) => string;
|
|
321
588
|
register?: (xmlPath: string, attemptNonce: string) => Promise<void>;
|
|
322
589
|
recordOwnership?: () => boolean;
|
|
323
|
-
prepare?: () => Promise<void>;
|
|
590
|
+
prepare?: () => Promise<ServiceInstallPreparationResult | void>;
|
|
324
591
|
removeNativeService?: () => void;
|
|
325
592
|
publishAssets?: (runtime: DurableBunRuntime) => void;
|
|
326
593
|
verifyBeforeRun?: (attemptNonce: string) => void | Promise<void>;
|
|
@@ -402,7 +669,7 @@ export async function installFreshWindowsSchedulerSafely(
|
|
|
402
669
|
);
|
|
403
670
|
}
|
|
404
671
|
(deps.assertRuntimeWritable ?? assertSelectedRuntimeWritable)(runtime, configDir, { platform: deps.platform, rootWasAbsent: false });
|
|
405
|
-
await prepare();
|
|
672
|
+
const prepared = await prepare();
|
|
406
673
|
assertNoDesktopSupervision(deps.inspectSupervision, latch);
|
|
407
674
|
removeNativeService();
|
|
408
675
|
publishAssets(runtime);
|
|
@@ -411,6 +678,13 @@ export async function installFreshWindowsSchedulerSafely(
|
|
|
411
678
|
runTask();
|
|
412
679
|
started = true;
|
|
413
680
|
writeState(runtime);
|
|
681
|
+
// A prepare that stopped an old manager claimed the deferral receipt; the replacement
|
|
682
|
+
// is running now, so shared config stays pointed at OpenCodex and the obligation is
|
|
683
|
+
// discharged. A failure above keeps it for the next stop.
|
|
684
|
+
const nonce = prepared && "deferredTeardownNonce" in prepared ? prepared.deferredTeardownNonce : undefined;
|
|
685
|
+
if (nonce && !clearPendingTeardown(nonce)) {
|
|
686
|
+
console.warn("⚠️ The deferred-teardown receipt could not be removed; the next 'ocx stop' will finish it.");
|
|
687
|
+
}
|
|
414
688
|
} catch (error) {
|
|
415
689
|
const detail = error instanceof Error ? error.message : String(error);
|
|
416
690
|
if (registered && !started) {
|
|
@@ -514,11 +788,12 @@ export function installedServiceRespawnRisk(
|
|
|
514
788
|
* install (#3008).
|
|
515
789
|
*/
|
|
516
790
|
/**
|
|
517
|
-
* `stopped-respawnable`
|
|
791
|
+
* `stopped-respawnable` was Task Scheduler specifically: `schtasks /end` ends the task
|
|
518
792
|
* instance while the `cmd :loop` wrapper survives and respawns its child seconds later
|
|
519
|
-
* (#764).
|
|
520
|
-
*
|
|
521
|
-
*
|
|
793
|
+
* (#764). Since the checked Windows stop (#7771) no current backend returns it: Windows
|
|
794
|
+
* reports `stopped` only after Part A ended the manager and every bound wrapper, and its
|
|
795
|
+
* callers then run Part B unconditionally. The value stays for documents and receipts
|
|
796
|
+
* written by older CLIs, which callers still read.
|
|
522
797
|
*/
|
|
523
798
|
/**
|
|
524
799
|
* `state-unknown` is kept apart from `failed` because the remedies differ. A manager that
|
|
@@ -528,46 +803,41 @@ export function installedServiceRespawnRisk(
|
|
|
528
803
|
*/
|
|
529
804
|
export type ServiceStopOutcome = "absent" | "stopped" | "stopped-respawnable" | "failed" | "state-unknown";
|
|
530
805
|
|
|
531
|
-
|
|
806
|
+
/** The outcome plus, on Windows, the Part A result behind it (reason, bound wrappers). */
|
|
807
|
+
export interface ServiceStopReport {
|
|
808
|
+
outcome: ServiceStopOutcome;
|
|
809
|
+
windows: WindowsCheckedStopResult | null;
|
|
810
|
+
}
|
|
811
|
+
|
|
812
|
+
/**
|
|
813
|
+
* Stop whatever manager is installed. On Windows this is Part A of the checked stop
|
|
814
|
+
* (#7771): both backends are probed, the registered managers stopped and the bound
|
|
815
|
+
* wrappers ended and waited for, with admission against the caller's deadline. The proxy
|
|
816
|
+
* child is left to the caller's graceful stop, and the caller runs Part B after it.
|
|
817
|
+
*/
|
|
818
|
+
export async function stopServiceIfInstalledReport(
|
|
819
|
+
request: WindowsPartARequest = {},
|
|
820
|
+
platform: NodeJS.Platform = process.platform,
|
|
821
|
+
): Promise<ServiceStopReport> {
|
|
532
822
|
assertServiceEnvironmentMatchesInstall();
|
|
533
|
-
if (
|
|
823
|
+
if (platform === "darwin") {
|
|
534
824
|
if (existsSync(plistPath())) {
|
|
535
|
-
try { stopLaunchd(); return "stopped"; } catch { return "failed"; }
|
|
536
|
-
}
|
|
537
|
-
} else if (process.platform === "win32") {
|
|
538
|
-
// Query BOTH backends regardless of state: a failed switch or stale state can leave
|
|
539
|
-
// two managers installed, and either one would respawn the proxy after `ocx stop`.
|
|
540
|
-
let stopped = false;
|
|
541
|
-
let failed = false;
|
|
542
|
-
let schedulerStopped = false;
|
|
543
|
-
let stateUnknown = false;
|
|
544
|
-
// `probeWindowsSchedulerTask` is tri-state on purpose: a query that THROWS is not the
|
|
545
|
-
// same as a task that is absent, and treating it as absent lets a live scheduler
|
|
546
|
-
// survive a "successful" stop.
|
|
547
|
-
const probe = probeWindowsSchedulerTask();
|
|
548
|
-
if (probe.status === "present") {
|
|
549
|
-
if (stopWindowsChecked()) { stopped = true; schedulerStopped = true; }
|
|
550
|
-
else failed = true;
|
|
551
|
-
} else if (probe.status === "unknown") {
|
|
552
|
-
// Not "failed": nothing refused to stop. The query itself could not answer, which is
|
|
553
|
-
// a different problem with a different fix.
|
|
554
|
-
stateUnknown = true;
|
|
825
|
+
try { stopLaunchd(); return { outcome: "stopped", windows: null }; } catch { return { outcome: "failed", windows: null }; }
|
|
555
826
|
}
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
// `schtasks /end`
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
// safe to update over.
|
|
565
|
-
const outcome = classifyWindowsServiceStop({ stopped, failed, schedulerStopped, stateUnknown });
|
|
566
|
-
if (outcome !== "absent") return outcome;
|
|
567
|
-
} else if (process.platform === "linux" && isSystemd() && existsSync(unitPath())) {
|
|
568
|
-
try { stopSystemd(); return "stopped"; } catch { return "failed"; }
|
|
827
|
+
} else if (platform === "win32") {
|
|
828
|
+
// Both backends are probed regardless of state (a failed switch can leave two), an
|
|
829
|
+
// unreadable probe is state-unknown and never absence, and a wrapper that survives
|
|
830
|
+
// `schtasks /end` is ended through the binding rule instead of a path-only sweep.
|
|
831
|
+
const windows = await runWindowsServiceStopPartA(request);
|
|
832
|
+
return { outcome: serviceStopOutcomeFromWindows(windows), windows };
|
|
833
|
+
} else if (platform === "linux" && isSystemd() && existsSync(unitPath())) {
|
|
834
|
+
try { stopSystemd(); return { outcome: "stopped", windows: null }; } catch { return { outcome: "failed", windows: null }; }
|
|
569
835
|
}
|
|
570
|
-
return "absent";
|
|
836
|
+
return { outcome: "absent", windows: null };
|
|
837
|
+
}
|
|
838
|
+
|
|
839
|
+
export async function stopServiceIfInstalledDetailed(request: WindowsPartARequest = {}): Promise<ServiceStopOutcome> {
|
|
840
|
+
return (await stopServiceIfInstalledReport(request)).outcome;
|
|
571
841
|
}
|
|
572
842
|
|
|
573
843
|
/** Delete install-state files; stale state would make `ocx update` "reinstall" a service that no longer exists. */
|
|
@@ -581,8 +851,17 @@ type UninstallServiceHooksForTests = {
|
|
|
581
851
|
probeWindowsTask: () => WindowsSchedulerTaskProbe;
|
|
582
852
|
uninstallWindowsTask: () => void;
|
|
583
853
|
nativeStatus: () => WinswStatus;
|
|
854
|
+
/**
|
|
855
|
+
* Is the registered `opencodex-proxy-native` service THIS home's? `sc stop/delete` name a
|
|
856
|
+
* fixed ID, so a registration is not evidence of ownership — another installation's
|
|
857
|
+
* WinSW service under the same ID would be stopped and deleted here. Production reads
|
|
858
|
+
* `sc qc` BINARY_PATH_NAME and compares it with this home's executable.
|
|
859
|
+
*/
|
|
860
|
+
nativeOwnership?: () => "owned" | "foreign" | "unknown";
|
|
584
861
|
uninstallNative: () => void;
|
|
585
862
|
removeInstallState: () => void;
|
|
863
|
+
launchdPlistPath?: () => string;
|
|
864
|
+
uninstallLaunchd?: () => void;
|
|
586
865
|
};
|
|
587
866
|
|
|
588
867
|
let uninstallServiceHooksForTests: UninstallServiceHooksForTests | null = null;
|
|
@@ -607,13 +886,42 @@ export function setUninstallServiceHooksForTests(hooks: UninstallServiceHooksFor
|
|
|
607
886
|
*/
|
|
608
887
|
export type ServiceUninstallOutcome = "absent" | "removed" | "failed";
|
|
609
888
|
|
|
889
|
+
/**
|
|
890
|
+
* Does the registered WinSW service run this home's executable?
|
|
891
|
+
*
|
|
892
|
+
* The same proof the guarded manager and Part A use (`sc qc` `BINARY_PATH_NAME`), reduced to
|
|
893
|
+
* the three answers removal needs: this home's (`owned`), another's (`foreign`), or one that
|
|
894
|
+
* could not be read (`unknown`, which refuses).
|
|
895
|
+
*/
|
|
896
|
+
function winswOwnershipOfThisHome(
|
|
897
|
+
query: () => string | null = queryWinswBinaryPathName,
|
|
898
|
+
): "owned" | "foreign" | "unknown" {
|
|
899
|
+
let binaryPathName: string | null;
|
|
900
|
+
try {
|
|
901
|
+
binaryPathName = query();
|
|
902
|
+
} catch {
|
|
903
|
+
return "unknown";
|
|
904
|
+
}
|
|
905
|
+
if (binaryPathName === null) return "unknown";
|
|
906
|
+
return scBinaryPathNamesExecutable(binaryPathName, winswExePath()) ? "owned" : "foreign";
|
|
907
|
+
}
|
|
908
|
+
|
|
909
|
+
/**
|
|
910
|
+
* Remove installed manager assets, including orphaned launchd recovery files.
|
|
911
|
+
* Keep install state on removal failure; Windows refusal and unknown probes may throw.
|
|
912
|
+
*/
|
|
610
913
|
export function uninstallServiceDetailed(): ServiceUninstallOutcome {
|
|
611
914
|
const hooks = uninstallServiceHooksForTests;
|
|
612
915
|
(hooks?.assertEnvironment ?? assertServiceEnvironmentMatchesInstall)();
|
|
613
916
|
const platform = hooks?.platform ?? process.platform;
|
|
614
917
|
if (platform === "darwin") {
|
|
615
|
-
|
|
616
|
-
|
|
918
|
+
const p = (hooks?.launchdPlistPath ?? plistPath)();
|
|
919
|
+
if ([p, `${p}.prev`, `${p}.pending`].some(path => existsSync(path))) {
|
|
920
|
+
try {
|
|
921
|
+
(hooks?.uninstallLaunchd ?? uninstallLaunchd)();
|
|
922
|
+
(hooks?.removeInstallState ?? removeServiceInstallState)();
|
|
923
|
+
return "removed";
|
|
924
|
+
} catch { return "failed"; }
|
|
617
925
|
}
|
|
618
926
|
} else if (platform === "win32") {
|
|
619
927
|
let removed = false;
|
|
@@ -621,11 +929,30 @@ export function uninstallServiceDetailed(): ServiceUninstallOutcome {
|
|
|
621
929
|
if (scheduler.status === "unknown") {
|
|
622
930
|
throw new Error(`Could not determine Task Scheduler state: ${scheduler.detail}`);
|
|
623
931
|
}
|
|
932
|
+
// Every probe runs before the first destructive step. The task used to be deleted first,
|
|
933
|
+
// so an unreadable `sc qc` left a half-removed install: no scheduler task to retry from,
|
|
934
|
+
// native registration still on disk, and no way back (#7771 round 9).
|
|
935
|
+
const nativeStatus = (hooks?.nativeStatus ?? statusWinswRaw)();
|
|
936
|
+
if (nativeStatus === "unknown") {
|
|
937
|
+
throw new Error("Native service status could not be verified.");
|
|
938
|
+
}
|
|
939
|
+
let ownership: "owned" | "foreign" | "unknown" | null = null;
|
|
940
|
+
if (nativeStatus !== "nonexistent") {
|
|
941
|
+
// Re-prove ownership right before the destructive step: `sc qc` may have changed
|
|
942
|
+
// since the install-state read, and a foreign registration must survive an uninstall
|
|
943
|
+
// of this home. Unreadable is not a licence to delete — fail closed and keep state.
|
|
944
|
+
ownership = (hooks?.nativeOwnership ?? winswOwnershipOfThisHome)();
|
|
945
|
+
if (ownership === "unknown") {
|
|
946
|
+
throw new Error(
|
|
947
|
+
`The native service registration's ownership could not be verified (sc qc ${WINSW_SERVICE_ID}); refusing to remove it. Check 'sc query ${WINSW_SERVICE_ID}' and retry.`,
|
|
948
|
+
);
|
|
949
|
+
}
|
|
950
|
+
}
|
|
624
951
|
if (scheduler.status === "present") {
|
|
625
952
|
(hooks?.uninstallWindowsTask ?? uninstallWindows)();
|
|
626
953
|
removed = true;
|
|
627
954
|
}
|
|
628
|
-
if (
|
|
955
|
+
if (ownership === "owned") {
|
|
629
956
|
(hooks?.uninstallNative ?? uninstallWinswService)();
|
|
630
957
|
removed = true;
|
|
631
958
|
}
|