@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,435 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Part A of the checked Windows service stop (#7771, 030 "Steps"): stop the manager, end
|
|
3
|
+
* the bound wrappers, then prove the manager inactive and every bound wrapper exited.
|
|
4
|
+
*
|
|
5
|
+
* Part A covers the manager and the wrappers only. The proxy child is stopped afterwards
|
|
6
|
+
* by the caller's graceful path (it may refuse, and a refusal forbids a forced stop), and
|
|
7
|
+
* the port is confirmed by Part B (src/service/windows-stop-confirm.ts).
|
|
8
|
+
*
|
|
9
|
+
* 1. Probe registration (task, WinSW; 2 s caps). An unreadable answer is unknown with
|
|
10
|
+
* nothing changed. With nothing registered, one enumeration (5 s) looks for a stray
|
|
11
|
+
* wrapper of a deleted task; unreadable, or nothing found, is absent.
|
|
12
|
+
* With a task registered or a stray sweep running, the Schedule host PID is read (2 s).
|
|
13
|
+
* Admission runs here, after the probe and before anything changes.
|
|
14
|
+
* 2. Bind (src/service/windows-stop-binding.ts) and open an exit watch per wrapper.
|
|
15
|
+
* 3. Ask the manager: schtasks /end (2 s); WinSW a non-waiting stop (2 s) and an SCM poll
|
|
16
|
+
* capped at <stoptimeout> + 2 s. Denied is denied; an overrun is unknown; neither goes on.
|
|
17
|
+
* 4. Terminate the bound survivors through the checked primitive, deepest first.
|
|
18
|
+
* 5. Wait on the bind-time watches (steps 4 and 5 share 3 s), then read the manager state
|
|
19
|
+
* once (1 s). No enumeration and no PowerShell run in the wait.
|
|
20
|
+
*
|
|
21
|
+
* Every external effect is injected; nothing here touches the machine by itself, and
|
|
22
|
+
* nothing calls it yet.
|
|
23
|
+
*/
|
|
24
|
+
import type { WinswStatus } from "../lib/winsw";
|
|
25
|
+
import type { WindowsProcessWatch, WindowsTerminateResult } from "./windows-process-native";
|
|
26
|
+
import type { WindowsStopProcessEntry } from "./windows-process-evidence";
|
|
27
|
+
import type { WindowsSchedulerTaskProbe } from "./windows-scheduler";
|
|
28
|
+
import { bindWindowsStopWrappers, type WindowsBoundWrapper, type WindowsStopBinding } from "./windows-stop-binding";
|
|
29
|
+
import {
|
|
30
|
+
DEFAULT_WINSW_STOP_TIMEOUT_MS,
|
|
31
|
+
WINDOWS_STOP_CAPS,
|
|
32
|
+
windowsStopWorstCase,
|
|
33
|
+
type WindowsStopBudgetInput,
|
|
34
|
+
} from "./windows-stop-budget";
|
|
35
|
+
|
|
36
|
+
type MaybePromise<T> = T | Promise<T>;
|
|
37
|
+
|
|
38
|
+
/** Monotonic clock and cancellable sleep; tests inject a virtual one. */
|
|
39
|
+
export interface WindowsStopClock {
|
|
40
|
+
now(): number;
|
|
41
|
+
sleep(ms: number, signal?: AbortSignal): Promise<void>;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export const windowsStopClock: WindowsStopClock = {
|
|
45
|
+
now: () => performance.now(),
|
|
46
|
+
sleep: (ms, signal) => new Promise(resolve => {
|
|
47
|
+
if (signal?.aborted) {
|
|
48
|
+
resolve();
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
const done = (): void => {
|
|
52
|
+
clearTimeout(timer);
|
|
53
|
+
signal?.removeEventListener("abort", done);
|
|
54
|
+
resolve();
|
|
55
|
+
};
|
|
56
|
+
const timer = setTimeout(done, Math.max(0, ms));
|
|
57
|
+
signal?.addEventListener("abort", done, { once: true });
|
|
58
|
+
}),
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
export type WindowsStopReason = "access-denied" | "evidence-unreadable" | "unbound-wrapper" | "unverified-budget";
|
|
62
|
+
export type WindowsCheckedStopOutcome = "absent" | "stopped" | "survived" | "denied" | "unknown" | "unverified-budget";
|
|
63
|
+
export type WindowsTaskEndResult = "ended" | "not-running" | "denied" | "failed";
|
|
64
|
+
export type WindowsWinswStopResult = "sent" | "denied" | "failed";
|
|
65
|
+
export type WindowsWinswScmState = "stopped" | "running" | "pending" | "nonexistent" | "unknown";
|
|
66
|
+
|
|
67
|
+
export interface WindowsCheckedStopDeps {
|
|
68
|
+
clock?: WindowsStopClock;
|
|
69
|
+
/** This home's canonical launcher VBS and service script paths. */
|
|
70
|
+
canonicalPaths: readonly string[];
|
|
71
|
+
/** The identity-checked proxy child (readPid), when known. */
|
|
72
|
+
childPid: number | null;
|
|
73
|
+
selfPid?: number;
|
|
74
|
+
probeScheduler(timeoutMs: number): MaybePromise<WindowsSchedulerTaskProbe>;
|
|
75
|
+
probeWinsw(timeoutMs: number): MaybePromise<WinswStatus>;
|
|
76
|
+
enumerate(timeoutMs: number): MaybePromise<readonly WindowsStopProcessEntry[] | null>;
|
|
77
|
+
scheduleServicePid(timeoutMs: number): MaybePromise<number | null>;
|
|
78
|
+
endTask(timeoutMs: number): MaybePromise<WindowsTaskEndResult>;
|
|
79
|
+
/** Running state of the task (schtasks /query); the final manager-state read. */
|
|
80
|
+
taskState(timeoutMs: number): MaybePromise<"running" | "not-running" | "unknown">;
|
|
81
|
+
winswStop(timeoutMs: number): MaybePromise<WindowsWinswStopResult>;
|
|
82
|
+
winswState(timeoutMs: number): MaybePromise<WindowsWinswScmState>;
|
|
83
|
+
/** The WinSW definition's <stoptimeout>; 20 s for the generated one. */
|
|
84
|
+
winswStopTimeoutMs?: number;
|
|
85
|
+
/** After WinSW reports stopped: is the proxy still alive? null = cannot tell. */
|
|
86
|
+
proxyAlive(timeoutMs: number): MaybePromise<boolean | null>;
|
|
87
|
+
openWatch(pid: number, startTime: number): MaybePromise<WindowsProcessWatch>;
|
|
88
|
+
terminate(pid: number, startTime: number, timeoutMs: number): MaybePromise<WindowsTerminateResult>;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
export interface WindowsStopAdmission {
|
|
92
|
+
/** Absolute deadline on the deps clock. */
|
|
93
|
+
deadlineAt: number;
|
|
94
|
+
budget: Omit<WindowsStopBudgetInput, "managers" | "enumerationReused">;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
export interface WindowsCheckedStopOptions {
|
|
98
|
+
/** A snapshot that already ran (guarded: revalidateManager's), reused for the bind. */
|
|
99
|
+
bindSnapshot?: readonly WindowsStopProcessEntry[];
|
|
100
|
+
admission?: WindowsStopAdmission;
|
|
101
|
+
/** Throws to refuse. Runs at entry, before each manager stop (/end, the WinSW stop) and before each terminate. */
|
|
102
|
+
authorize?: () => MaybePromise<void>;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
export interface WindowsCheckedStopResult {
|
|
106
|
+
outcome: WindowsCheckedStopOutcome;
|
|
107
|
+
reason: WindowsStopReason | null;
|
|
108
|
+
/** Fixed text for logs and output; it never carries a path or a command line. */
|
|
109
|
+
detail: string;
|
|
110
|
+
registration: { scheduler: "present" | "absent" | "unknown"; winsw: WinswStatus };
|
|
111
|
+
/** The bound set (pid + creation time) for the later receipt record. */
|
|
112
|
+
bound: WindowsBoundWrapper[];
|
|
113
|
+
unbound: number[];
|
|
114
|
+
terminated: number[];
|
|
115
|
+
/** True once a manager stop or a terminate was attempted. */
|
|
116
|
+
changed: boolean;
|
|
117
|
+
budget?: { requiredMs: number; remainingMs: number };
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/** The authorizer refused; partial says what had already happened. */
|
|
121
|
+
export class WindowsCheckedStopRefusedError extends Error {
|
|
122
|
+
constructor(readonly partial: WindowsCheckedStopResult, options: { cause: unknown }) {
|
|
123
|
+
super("The checked Windows service stop was refused by its authorizer.", options);
|
|
124
|
+
this.name = "WindowsCheckedStopRefusedError";
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
const C = WINDOWS_STOP_CAPS;
|
|
129
|
+
const WINSW_POLL_INTERVAL_MS = 250;
|
|
130
|
+
const WATCH_POLL_INTERVAL_MS = 100;
|
|
131
|
+
const TIMED_OUT = Symbol("timed-out");
|
|
132
|
+
|
|
133
|
+
type Capped<T> = { ok: true; value: T } | { ok: false; timedOut: boolean };
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Run one step under a cap. The race ends the wait for an asynchronous dependency; the
|
|
137
|
+
* elapsed check catches one that blocked past the cap anyway. Either is an overrun.
|
|
138
|
+
*/
|
|
139
|
+
export async function runCapped<T>(
|
|
140
|
+
clock: WindowsStopClock,
|
|
141
|
+
capMs: number,
|
|
142
|
+
run: (timeoutMs: number) => MaybePromise<T>,
|
|
143
|
+
): Promise<Capped<T>> {
|
|
144
|
+
if (capMs <= 0) return { ok: false, timedOut: true };
|
|
145
|
+
const started = clock.now();
|
|
146
|
+
const abort = new AbortController();
|
|
147
|
+
const work = Promise.resolve().then(() => run(capMs));
|
|
148
|
+
work.catch(() => undefined);
|
|
149
|
+
try {
|
|
150
|
+
const value = await Promise.race([work, clock.sleep(capMs, abort.signal).then(() => TIMED_OUT)]);
|
|
151
|
+
if (value === TIMED_OUT || clock.now() - started > capMs) return { ok: false, timedOut: true };
|
|
152
|
+
return { ok: true, value: value as T };
|
|
153
|
+
} catch {
|
|
154
|
+
return { ok: false, timedOut: false };
|
|
155
|
+
} finally {
|
|
156
|
+
abort.abort();
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
export async function stopWindowsServiceChecked(
|
|
161
|
+
deps: WindowsCheckedStopDeps,
|
|
162
|
+
options: WindowsCheckedStopOptions = {},
|
|
163
|
+
): Promise<WindowsCheckedStopResult> {
|
|
164
|
+
const clock = deps.clock ?? windowsStopClock;
|
|
165
|
+
const watches = new Map<number, Extract<WindowsProcessWatch, { status: "open" }>>();
|
|
166
|
+
const result: WindowsCheckedStopResult = {
|
|
167
|
+
outcome: "unknown", reason: null, detail: "",
|
|
168
|
+
registration: { scheduler: "unknown", winsw: "unknown" },
|
|
169
|
+
bound: [], unbound: [], terminated: [], changed: false,
|
|
170
|
+
};
|
|
171
|
+
const finish = (outcome: WindowsCheckedStopOutcome, reason: WindowsStopReason | null, detail: string) => {
|
|
172
|
+
result.outcome = outcome;
|
|
173
|
+
result.reason = reason;
|
|
174
|
+
result.detail = detail;
|
|
175
|
+
return result;
|
|
176
|
+
};
|
|
177
|
+
const authorize = async (): Promise<void> => {
|
|
178
|
+
if (!options.authorize) return;
|
|
179
|
+
try {
|
|
180
|
+
await options.authorize();
|
|
181
|
+
} catch (cause) {
|
|
182
|
+
throw new WindowsCheckedStopRefusedError({ ...result, detail: "the authorizer refused the stop" }, { cause });
|
|
183
|
+
}
|
|
184
|
+
};
|
|
185
|
+
try {
|
|
186
|
+
await authorize();
|
|
187
|
+
|
|
188
|
+
// Step 1: registration.
|
|
189
|
+
const [scheduler, winsw] = await Promise.all([
|
|
190
|
+
runCapped(clock, C.registrationProbe, deps.probeScheduler),
|
|
191
|
+
runCapped(clock, C.registrationProbe, deps.probeWinsw),
|
|
192
|
+
]);
|
|
193
|
+
result.registration = {
|
|
194
|
+
scheduler: scheduler.ok && scheduler.value.status !== "unknown" ? scheduler.value.status : "unknown",
|
|
195
|
+
winsw: winsw.ok ? winsw.value : "unknown",
|
|
196
|
+
};
|
|
197
|
+
if (result.registration.scheduler === "unknown" || result.registration.winsw === "unknown") {
|
|
198
|
+
return finish("unknown", "evidence-unreadable", "the service registration could not be read");
|
|
199
|
+
}
|
|
200
|
+
const taskRegistered = result.registration.scheduler === "present";
|
|
201
|
+
const winswRegistered = result.registration.winsw !== "nonexistent";
|
|
202
|
+
const winswStarted = result.registration.winsw === "started";
|
|
203
|
+
const readSchedulePid = async (): Promise<number | null> => {
|
|
204
|
+
const pid = await runCapped(clock, C.scheduleServicePid, deps.scheduleServicePid);
|
|
205
|
+
return pid.ok ? pid.value : null;
|
|
206
|
+
};
|
|
207
|
+
const bindContext = {
|
|
208
|
+
canonicalPaths: deps.canonicalPaths,
|
|
209
|
+
childPid: deps.childPid,
|
|
210
|
+
selfPid: deps.selfPid ?? process.pid,
|
|
211
|
+
};
|
|
212
|
+
|
|
213
|
+
let binding: WindowsStopBinding | null = null;
|
|
214
|
+
let schedulePid: number | null = null;
|
|
215
|
+
const stray = !taskRegistered && !winswRegistered;
|
|
216
|
+
if (stray) {
|
|
217
|
+
const snapshot = await runCapped(clock, C.enumeration, deps.enumerate);
|
|
218
|
+
// Nothing registered and nothing readable: today's best-effort sweep skips too.
|
|
219
|
+
if (!snapshot.ok || snapshot.value === null) {
|
|
220
|
+
return finish("absent", null, "no service is registered; the process list could not be read");
|
|
221
|
+
}
|
|
222
|
+
schedulePid = await readSchedulePid();
|
|
223
|
+
binding = bindWindowsStopWrappers({
|
|
224
|
+
...bindContext, processes: snapshot.value, taskRegistered: false, managerRegistered: false,
|
|
225
|
+
scheduleServicePid: schedulePid,
|
|
226
|
+
});
|
|
227
|
+
if (binding.bound.length === 0 && binding.unbound.length === 0 && binding.unreadable.length === 0) {
|
|
228
|
+
return finish("absent", null, "no service is registered and no wrapper of this home is running");
|
|
229
|
+
}
|
|
230
|
+
// Neither of these changes anything, so neither waits for admission.
|
|
231
|
+
result.unbound = binding.unbound.map(entry => entry.pid);
|
|
232
|
+
if (binding.unreadable.length > 0) {
|
|
233
|
+
return finish("unknown", "evidence-unreadable", "a possible wrapper of this home has unreadable evidence");
|
|
234
|
+
}
|
|
235
|
+
if (binding.bound.length === 0) {
|
|
236
|
+
return await unboundOnlyVerdict(binding, deps, watches)
|
|
237
|
+
? finish("survived", "unbound-wrapper", "a wrapper of this home is running but cannot be tied to a manager")
|
|
238
|
+
: finish("absent", null, "no service is registered and no wrapper of this home is running");
|
|
239
|
+
}
|
|
240
|
+
} else if (taskRegistered) {
|
|
241
|
+
schedulePid = await readSchedulePid();
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
// Admission: everything still to come must fit before anything changes.
|
|
245
|
+
if (options.admission) {
|
|
246
|
+
const budget = windowsStopWorstCase({
|
|
247
|
+
...options.admission.budget,
|
|
248
|
+
managers: { scheduler: taskRegistered, winsw: winswStarted, stray },
|
|
249
|
+
enumerationReused: stray || options.bindSnapshot !== undefined,
|
|
250
|
+
winswStopTimeoutMs: options.admission.budget.winswStopTimeoutMs ?? deps.winswStopTimeoutMs,
|
|
251
|
+
});
|
|
252
|
+
const remainingMs = options.admission.deadlineAt - clock.now();
|
|
253
|
+
result.budget = { requiredMs: budget.totalMs, remainingMs };
|
|
254
|
+
if (remainingMs < budget.totalMs) {
|
|
255
|
+
return finish("unverified-budget", "unverified-budget", "the remaining time cannot hold the worst case of the stop");
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
// Step 2: bind.
|
|
260
|
+
if (taskRegistered || winswRegistered) {
|
|
261
|
+
let processes = options.bindSnapshot ?? null;
|
|
262
|
+
if (processes === null) {
|
|
263
|
+
const snapshot = await runCapped(clock, C.enumeration, deps.enumerate);
|
|
264
|
+
if (!snapshot.ok || snapshot.value === null) {
|
|
265
|
+
return finish("unknown", "evidence-unreadable", "the process list could not be read");
|
|
266
|
+
}
|
|
267
|
+
processes = snapshot.value;
|
|
268
|
+
}
|
|
269
|
+
binding = bindWindowsStopWrappers({
|
|
270
|
+
...bindContext, processes, taskRegistered, managerRegistered: true,
|
|
271
|
+
scheduleServicePid: schedulePid,
|
|
272
|
+
});
|
|
273
|
+
}
|
|
274
|
+
if (binding) {
|
|
275
|
+
result.unbound = binding.unbound.map(entry => entry.pid);
|
|
276
|
+
if (binding.unreadable.length > 0) {
|
|
277
|
+
return finish("unknown", "evidence-unreadable", "a possible wrapper of this home has unreadable evidence");
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
const targets: WindowsBoundWrapper[] = [];
|
|
281
|
+
for (const wrapper of binding?.bound ?? []) {
|
|
282
|
+
const watch = await deps.openWatch(wrapper.pid, wrapper.startTime);
|
|
283
|
+
if (watch.status === "gone" || watch.status === "reused") continue;
|
|
284
|
+
if (watch.status === "denied") {
|
|
285
|
+
return finish("denied", "access-denied", "a bound wrapper cannot be opened by this account");
|
|
286
|
+
}
|
|
287
|
+
if (watch.status === "open") watches.set(wrapper.pid, watch);
|
|
288
|
+
targets.push(wrapper);
|
|
289
|
+
}
|
|
290
|
+
result.bound = targets;
|
|
291
|
+
const unboundWatches = new Map<number, WindowsProcessWatch>();
|
|
292
|
+
for (const entry of binding?.unbound ?? []) {
|
|
293
|
+
if (entry.startTime === null) continue;
|
|
294
|
+
const watch = await deps.openWatch(entry.pid, entry.startTime);
|
|
295
|
+
unboundWatches.set(entry.pid, watch);
|
|
296
|
+
if (watch.status === "open") watches.set(entry.pid, watch);
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
// Step 3: ask the manager.
|
|
300
|
+
if (taskRegistered) {
|
|
301
|
+
// The updater re-checks its authority right before the manager stop, as before each terminate.
|
|
302
|
+
await authorize();
|
|
303
|
+
result.changed = true;
|
|
304
|
+
const ended = await runCapped(clock, C.taskEnd, deps.endTask);
|
|
305
|
+
if (!ended.ok) return finish("unknown", "evidence-unreadable", "the task end command did not answer within its cap");
|
|
306
|
+
if (ended.value === "denied") return finish("denied", "access-denied", "ending the task was denied");
|
|
307
|
+
if (ended.value === "failed") return finish("unknown", "evidence-unreadable", "the task end command failed");
|
|
308
|
+
}
|
|
309
|
+
if (winswStarted) {
|
|
310
|
+
await authorize();
|
|
311
|
+
result.changed = true;
|
|
312
|
+
const stop = await runCapped(clock, C.winswStopCommand, deps.winswStop);
|
|
313
|
+
if (!stop.ok) return finish("unknown", "evidence-unreadable", "the native service stop did not answer within its cap");
|
|
314
|
+
if (stop.value === "denied") return finish("denied", "access-denied", "stopping the native service was denied");
|
|
315
|
+
if (stop.value === "failed") return finish("unknown", "evidence-unreadable", "the native service stop failed");
|
|
316
|
+
const pollEnd = clock.now() + (deps.winswStopTimeoutMs ?? DEFAULT_WINSW_STOP_TIMEOUT_MS) + C.winswPollMargin;
|
|
317
|
+
for (;;) {
|
|
318
|
+
const left = pollEnd - clock.now();
|
|
319
|
+
const state = await runCapped(clock, Math.min(C.managerState, left), deps.winswState);
|
|
320
|
+
if (state.ok && (state.value === "stopped" || state.value === "nonexistent")) break;
|
|
321
|
+
if (pollEnd - clock.now() <= 0) {
|
|
322
|
+
return finish("unknown", "evidence-unreadable", "the native service did not report stopped within its stop timeout");
|
|
323
|
+
}
|
|
324
|
+
await clock.sleep(Math.min(WINSW_POLL_INTERVAL_MS, pollEnd - clock.now()));
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
// Steps 4 and 5: terminate the bound survivors, then wait on the bind-time watches.
|
|
329
|
+
const windowEnd = clock.now() + C.terminateAndWait;
|
|
330
|
+
const exited = new Map<number, boolean>();
|
|
331
|
+
for (const wrapper of targets) {
|
|
332
|
+
if (watches.get(wrapper.pid)?.exited() === true) {
|
|
333
|
+
exited.set(wrapper.pid, true);
|
|
334
|
+
continue;
|
|
335
|
+
}
|
|
336
|
+
await authorize();
|
|
337
|
+
result.changed = true;
|
|
338
|
+
const outcome = await runCapped(clock, windowEnd - clock.now(),
|
|
339
|
+
timeoutMs => deps.terminate(wrapper.pid, wrapper.startTime, timeoutMs));
|
|
340
|
+
if (!outcome.ok) return finish("unknown", "evidence-unreadable", "terminating a bound wrapper did not answer within its cap");
|
|
341
|
+
const status = outcome.value.status;
|
|
342
|
+
if (status === "denied") return finish("denied", "access-denied", "terminating a bound wrapper was denied");
|
|
343
|
+
if (status === "unavailable") return finish("unknown", "evidence-unreadable", "a bound wrapper could not be terminated");
|
|
344
|
+
if (status === "terminated") {
|
|
345
|
+
result.terminated.push(wrapper.pid);
|
|
346
|
+
if (outcome.value.exited === true) exited.set(wrapper.pid, true);
|
|
347
|
+
} else {
|
|
348
|
+
// gone, or reused: the bound process no longer exists either way, and a reused PID
|
|
349
|
+
// is a different process that is left untouched.
|
|
350
|
+
exited.set(wrapper.pid, true);
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
const pending = (): WindowsBoundWrapper[] => targets.filter(wrapper => {
|
|
354
|
+
if (exited.get(wrapper.pid)) return false;
|
|
355
|
+
if (watches.get(wrapper.pid)?.exited() === true) {
|
|
356
|
+
exited.set(wrapper.pid, true);
|
|
357
|
+
return false;
|
|
358
|
+
}
|
|
359
|
+
return true;
|
|
360
|
+
});
|
|
361
|
+
while (pending().length > 0 && clock.now() < windowEnd) {
|
|
362
|
+
await clock.sleep(Math.min(WATCH_POLL_INTERVAL_MS, windowEnd - clock.now()));
|
|
363
|
+
}
|
|
364
|
+
let boundAlive = false;
|
|
365
|
+
let unreadable = false;
|
|
366
|
+
for (const wrapper of pending()) {
|
|
367
|
+
const state = watches.get(wrapper.pid)?.exited();
|
|
368
|
+
if (state === false) boundAlive = true;
|
|
369
|
+
else unreadable = true;
|
|
370
|
+
}
|
|
371
|
+
|
|
372
|
+
// Step 5: the manager state, read once.
|
|
373
|
+
let managerActive = false;
|
|
374
|
+
if (taskRegistered) {
|
|
375
|
+
const state = await runCapped(clock, C.managerState, deps.taskState);
|
|
376
|
+
if (state.ok && state.value === "running") managerActive = true;
|
|
377
|
+
else if (!state.ok || state.value === "unknown") unreadable = true;
|
|
378
|
+
}
|
|
379
|
+
if (winswStarted) {
|
|
380
|
+
const stepEnd = clock.now() + C.managerState;
|
|
381
|
+
const state = await runCapped(clock, C.managerState, deps.winswState);
|
|
382
|
+
if (state.ok && (state.value === "running" || state.value === "pending")) managerActive = true;
|
|
383
|
+
else if (!state.ok || state.value === "unknown") unreadable = true;
|
|
384
|
+
const alive = await runCapped(clock, stepEnd - clock.now(), deps.proxyAlive);
|
|
385
|
+
if (alive.ok && alive.value === true) managerActive = true;
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
const unboundAlive = binding ? unboundStillAlive(binding, unboundWatches) : false;
|
|
389
|
+
if (unboundAlive) {
|
|
390
|
+
return finish("survived", "unbound-wrapper", "a wrapper of this home is running but cannot be tied to a manager");
|
|
391
|
+
}
|
|
392
|
+
if (boundAlive || managerActive) return finish("survived", null, "the manager or a bound wrapper is still running");
|
|
393
|
+
if (unreadable) return finish("unknown", "evidence-unreadable", "the stop could not be verified");
|
|
394
|
+
return finish("stopped", null, "the manager is stopped and every bound wrapper has exited");
|
|
395
|
+
} finally {
|
|
396
|
+
for (const watch of watches.values()) {
|
|
397
|
+
try { watch.close(); } catch { /* closing a handle cannot change the verdict */ }
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
/** An unbound wrapper counts as alive unless its watch proves it exited. */
|
|
403
|
+
function unboundStillAlive(binding: WindowsStopBinding, watches: ReadonlyMap<number, WindowsProcessWatch>): boolean {
|
|
404
|
+
return binding.unbound.some(entry => {
|
|
405
|
+
const watch = watches.get(entry.pid);
|
|
406
|
+
if (!watch) return true;
|
|
407
|
+
if (watch.status === "gone" || watch.status === "reused") return false;
|
|
408
|
+
return watch.status !== "open" || watch.exited() !== true;
|
|
409
|
+
});
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
/** Stray path with nothing bound: are the unbound wrappers still there? Read-only. */
|
|
413
|
+
async function unboundOnlyVerdict(
|
|
414
|
+
binding: WindowsStopBinding,
|
|
415
|
+
deps: WindowsCheckedStopDeps,
|
|
416
|
+
opened: Map<number, Extract<WindowsProcessWatch, { status: "open" }>>,
|
|
417
|
+
): Promise<boolean> {
|
|
418
|
+
const watches = new Map<number, WindowsProcessWatch>();
|
|
419
|
+
for (const entry of binding.unbound) {
|
|
420
|
+
if (entry.startTime === null) continue;
|
|
421
|
+
const watch = await deps.openWatch(entry.pid, entry.startTime);
|
|
422
|
+
watches.set(entry.pid, watch);
|
|
423
|
+
if (watch.status === "open") opened.set(entry.pid, watch);
|
|
424
|
+
}
|
|
425
|
+
return unboundStillAlive(binding, watches);
|
|
426
|
+
}
|
|
427
|
+
|
|
428
|
+
/** The updater's variant: the authorizer runs at entry, before each manager stop and before every terminate. */
|
|
429
|
+
export function guardedStopWindowsServiceChecked(
|
|
430
|
+
authorize: () => MaybePromise<void>,
|
|
431
|
+
deps: WindowsCheckedStopDeps,
|
|
432
|
+
options: Omit<WindowsCheckedStopOptions, "authorize"> = {},
|
|
433
|
+
): Promise<WindowsCheckedStopResult> {
|
|
434
|
+
return stopWindowsServiceChecked(deps, { ...options, authorize });
|
|
435
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
// Leaf module: whole-token path matching on a process command line, shared by the guarded
|
|
2
|
+
// manager inspection, the checked-stop binding rule and Part B without an import cycle.
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* True when path appears in commandLine as a COMPLETE token — the same boundary
|
|
6
|
+
* rule the windows-service-wrappers kill list uses, ported so the read-only proof
|
|
7
|
+
* cannot accept a substring hit. A quoted path inside an argument string counts;
|
|
8
|
+
* a suffix or prefix glued to it does not.
|
|
9
|
+
*/
|
|
10
|
+
export function commandLineHasPathToken(commandLine: string | null | undefined, path: string): boolean {
|
|
11
|
+
if (!commandLine || !path) return false;
|
|
12
|
+
const haystack = commandLine.toLowerCase();
|
|
13
|
+
const needle = path.toLowerCase();
|
|
14
|
+
const boundary = (ch: string | undefined): boolean => ch === undefined || /[\s"']/.test(ch);
|
|
15
|
+
let index = 0;
|
|
16
|
+
for (;;) {
|
|
17
|
+
index = haystack.indexOf(needle, index);
|
|
18
|
+
if (index < 0) return false;
|
|
19
|
+
const end = index + needle.length;
|
|
20
|
+
if (boundary(haystack[index - 1]) && boundary(haystack[end])) return true;
|
|
21
|
+
index = end;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
@@ -29,9 +29,15 @@ import { cachedCurrentWindowsIdentity, resolveCurrentWindowsPrincipal, WINDOWS_P
|
|
|
29
29
|
import { statusWinswRaw, winswExePath, WINSW_SERVICE_ID, type WinswStatus } from "../lib/winsw";
|
|
30
30
|
import type { GuardedManagerStopped, GuardedManagerTarget } from "./guarded-manager-target";
|
|
31
31
|
import { TASK, windowsLauncherVbsPath, windowsServiceScriptPath } from "./state";
|
|
32
|
+
import { bindWindowsStopWrappers } from "./windows-stop-binding";
|
|
32
33
|
import { probeWindowsSchedulerTask, querySchtasks, type WindowsSchedulerTaskProbe } from "./windows-scheduler";
|
|
33
34
|
import { windowsWscript } from "./windows-wscript";
|
|
34
35
|
import { windowsTaskRegistrationHealthy, windowsTaskRegistrationRefreshableLegacy } from "./windows-taskxml";
|
|
36
|
+
import { commandLineHasPathToken } from "./windows-command-line-token";
|
|
37
|
+
|
|
38
|
+
// Re-exported for existing importers; the function lives in a leaf module to keep the binding rule
|
|
39
|
+
// (windows-stop-binding.ts) free of an import cycle with this inspection.
|
|
40
|
+
export { commandLineHasPathToken };
|
|
35
41
|
|
|
36
42
|
/** Runtime table of one Win32 process; a null parent means the chain is unreadable. */
|
|
37
43
|
export interface WindowsProcessEntry {
|
|
@@ -57,7 +63,14 @@ export interface WindowsWinswServiceInfo {
|
|
|
57
63
|
* default implementation exits early off win32, mirroring probeWindowsSchedulerTask.
|
|
58
64
|
*/
|
|
59
65
|
export interface WindowsGuardedManagerDeps {
|
|
66
|
+
/**
|
|
67
|
+
* The table may carry creation times (windowsProcessSnapshot, #7771): only then can a
|
|
68
|
+
* surviving wrapper of a not-running task be bound (bound-stray). A table without them
|
|
69
|
+
* leaves every such wrapper unreadable, which stays unknown.
|
|
70
|
+
*/
|
|
60
71
|
winProcs?: () => WindowsProcessEntry[] | null;
|
|
72
|
+
/** The Task Scheduler service host PID from the SCM, for the binding rule's lineage. */
|
|
73
|
+
winSchedulePid?: () => number | null;
|
|
61
74
|
winTaskXml?: () => string;
|
|
62
75
|
winTaskState?: () => WindowsTaskState;
|
|
63
76
|
/**
|
|
@@ -216,26 +229,6 @@ export function currentWindowsTaskUserIds(): readonly string[] | null {
|
|
|
216
229
|
}
|
|
217
230
|
}
|
|
218
231
|
|
|
219
|
-
/**
|
|
220
|
-
* True when path appears in commandLine as a COMPLETE token — the same boundary
|
|
221
|
-
* rule the windows-service-wrappers kill list uses, ported so the read-only proof
|
|
222
|
-
* cannot accept a substring hit. A quoted path inside an argument string counts;
|
|
223
|
-
* a suffix or prefix glued to it does not.
|
|
224
|
-
*/
|
|
225
|
-
export function commandLineHasPathToken(commandLine: string | null | undefined, path: string): boolean {
|
|
226
|
-
if (!commandLine || !path) return false;
|
|
227
|
-
const haystack = commandLine.toLowerCase();
|
|
228
|
-
const needle = path.toLowerCase();
|
|
229
|
-
const boundary = (ch: string | undefined): boolean => ch === undefined || /[\s"']/.test(ch);
|
|
230
|
-
let index = 0;
|
|
231
|
-
for (;;) {
|
|
232
|
-
index = haystack.indexOf(needle, index);
|
|
233
|
-
if (index < 0) return false;
|
|
234
|
-
const end = index + needle.length;
|
|
235
|
-
if (boundary(haystack[index - 1]) && boundary(haystack[end])) return true;
|
|
236
|
-
index = end;
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
232
|
|
|
240
233
|
function resolveWindowsDeps(deps: WindowsGuardedManagerDeps, live: boolean): ResolvedWindowsDeps {
|
|
241
234
|
// "live" is false whenever the caller simulated platform win32 (tests or a future
|
|
@@ -257,6 +250,7 @@ function resolveWindowsDeps(deps: WindowsGuardedManagerDeps, live: boolean): Res
|
|
|
257
250
|
winScriptPath: deps.winScriptPath ?? windowsServiceScriptPath,
|
|
258
251
|
winLauncherPath: deps.winLauncherPath ?? windowsLauncherVbsPath,
|
|
259
252
|
winWinswExePath: deps.winWinswExePath ?? winswExePath,
|
|
253
|
+
winSchedulePid: deps.winSchedulePid ?? (() => null),
|
|
260
254
|
};
|
|
261
255
|
}
|
|
262
256
|
|
|
@@ -380,8 +374,42 @@ export function unreadableWrappersOfManager(managerPid: number, processes: reado
|
|
|
380
374
|
}).map(entry => entry.pid);
|
|
381
375
|
}
|
|
382
376
|
|
|
383
|
-
function unknown(reason: string): GuardedManagerTarget {
|
|
384
|
-
return { kind: "unknown", reason };
|
|
377
|
+
function unknown(reason: string, stopReason?: "unbound-wrapper" | "evidence-unreadable"): GuardedManagerTarget {
|
|
378
|
+
return stopReason ? { kind: "unknown", reason, stopReason } : { kind: "unknown", reason };
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
/**
|
|
382
|
+
* A registered task that is not running, with wrappers of this home still alive (#7771,
|
|
383
|
+
* 030 "Guarded (consent) path"). The checked stop's binding rule decides: when every
|
|
384
|
+
* surviving wrapper is bound (wrapper image, this home's path token, lineage, a creation
|
|
385
|
+
* time) the state is bound-stray and reaches Part A; anything it cannot bind stays
|
|
386
|
+
* unknown, naming unbound-wrapper or evidence-unreadable.
|
|
387
|
+
*/
|
|
388
|
+
function bindStrayWrappers(
|
|
389
|
+
approvedPid: number,
|
|
390
|
+
processes: readonly WindowsProcessEntry[],
|
|
391
|
+
strays: readonly number[],
|
|
392
|
+
io: ResolvedWindowsDeps,
|
|
393
|
+
): GuardedManagerTarget {
|
|
394
|
+
const binding = bindWindowsStopWrappers({
|
|
395
|
+
processes: processes.map(entry => ({ ...entry, startTime: (entry as { startTime?: number | null }).startTime ?? null })),
|
|
396
|
+
canonicalPaths: wrapperPaths(io),
|
|
397
|
+
childPid: approvedPid,
|
|
398
|
+
taskRegistered: true,
|
|
399
|
+
managerRegistered: true,
|
|
400
|
+
scheduleServicePid: io.winSchedulePid(),
|
|
401
|
+
});
|
|
402
|
+
if (binding.unreadable.length > 0) {
|
|
403
|
+
return unknown("a surviving scheduler wrapper has unreadable evidence", "evidence-unreadable");
|
|
404
|
+
}
|
|
405
|
+
const bound = new Set(binding.bound.map(wrapper => wrapper.pid));
|
|
406
|
+
if (binding.unbound.length > 0 || strays.some(pid => !bound.has(pid))) {
|
|
407
|
+
return unknown("a surviving scheduler wrapper could not be tied to the registered task", "unbound-wrapper");
|
|
408
|
+
}
|
|
409
|
+
return {
|
|
410
|
+
kind: "bound-stray", pid: approvedPid, backend: "scheduler", childNeedsSeparateStop: true,
|
|
411
|
+
wrappers: binding.bound.map(wrapper => ({ pid: wrapper.pid, startTime: wrapper.startTime })),
|
|
412
|
+
};
|
|
385
413
|
}
|
|
386
414
|
|
|
387
415
|
function inspectWindowsSchedulerManager(
|
|
@@ -394,16 +422,14 @@ function inspectWindowsSchedulerManager(
|
|
|
394
422
|
const ancestors = ancestorWrapperPids(approvedPid, processes, paths);
|
|
395
423
|
const strays = wrapperProcessesAlive(processes, paths);
|
|
396
424
|
if (unreadableAncestorWrapperPids(approvedPid, processes).length > 0) {
|
|
397
|
-
return unknown("a possible scheduler wrapper has an unreadable command line");
|
|
425
|
+
return unknown("a possible scheduler wrapper has an unreadable command line", "evidence-unreadable");
|
|
398
426
|
}
|
|
399
|
-
// A registration that cannot run anything owes only the stray-wrapper check
|
|
400
|
-
//
|
|
401
|
-
//
|
|
402
|
-
// registered can respawn the proxy, while a surviving wrapper still can —
|
|
403
|
-
// schtasks /end would report success on the inert task and leave it alive.
|
|
427
|
+
// A registration that cannot run anything owes only the stray-wrapper check: nothing
|
|
428
|
+
// registered can respawn the proxy, while a surviving wrapper still can — schtasks /end
|
|
429
|
+
// would report success on the inert task and leave it alive.
|
|
404
430
|
const inertVerdict = (): GuardedManagerTarget => strays.length === 0
|
|
405
431
|
? { kind: "absent" }
|
|
406
|
-
: unknown("a surviving scheduler wrapper could not be tied to the registered task");
|
|
432
|
+
: unknown("a surviving scheduler wrapper could not be tied to the registered task", "unbound-wrapper");
|
|
407
433
|
const state = io.winTaskState();
|
|
408
434
|
if (state === "unknown") {
|
|
409
435
|
// Missing vs unreadable: the state query also fails for a task deleted
|
|
@@ -413,7 +439,24 @@ function inspectWindowsSchedulerManager(
|
|
|
413
439
|
? inertVerdict()
|
|
414
440
|
: unknown("the registered task's running state could not be proven");
|
|
415
441
|
}
|
|
416
|
-
if (state === "not-running")
|
|
442
|
+
if (state === "not-running") {
|
|
443
|
+
// Only a registration that is provably this installation's definition may promote its
|
|
444
|
+
// survivors to bound-stray (#7771). The state word alone says the task is inert; it does
|
|
445
|
+
// not say the task is ours — a same-named foreign task would otherwise make this home's
|
|
446
|
+
// hand-started wrappers terminable. Reading the definition costs nothing when nothing
|
|
447
|
+
// survived, so a clean inert task keeps the absent verdict without a read.
|
|
448
|
+
if (strays.length === 0) return { kind: "absent" };
|
|
449
|
+
let xml: string;
|
|
450
|
+
try {
|
|
451
|
+
xml = io.winTaskXml();
|
|
452
|
+
} catch {
|
|
453
|
+
return unknown("the Task Scheduler registration of the surviving wrappers could not be read", "evidence-unreadable");
|
|
454
|
+
}
|
|
455
|
+
if (!io.winRegistrationOurs(xml, io.winTaskUserIds())) {
|
|
456
|
+
return unknown("the registered task is not a recognized OpenCodex definition");
|
|
457
|
+
}
|
|
458
|
+
return bindStrayWrappers(approvedPid, processes, strays, io);
|
|
459
|
+
}
|
|
417
460
|
// Only the running path needs the registered definition: an unreadable
|
|
418
461
|
// registration cannot prove the task is ours, but it must not hold an
|
|
419
462
|
// otherwise-provable inert verdict unknown.
|
|
@@ -502,21 +545,21 @@ export function inspectWindowsGuardedManager(
|
|
|
502
545
|
const processes = io.winProcs();
|
|
503
546
|
if (processes === null) return unknown("the Windows process list could not be read");
|
|
504
547
|
if (unreadableAncestorWrapperPids(approvedPid, processes).length > 0) {
|
|
505
|
-
return unknown("a possible scheduler wrapper has an unreadable command line");
|
|
548
|
+
return unknown("a possible scheduler wrapper has an unreadable command line", "evidence-unreadable");
|
|
506
549
|
}
|
|
507
550
|
return wrapperProcessesAlive(processes, wrapperPaths(io)).length === 0
|
|
508
551
|
? { kind: "absent" }
|
|
509
|
-
: unknown("a surviving scheduler wrapper could not be tied to an installed manager");
|
|
552
|
+
: unknown("a surviving scheduler wrapper could not be tied to an installed manager", "unbound-wrapper");
|
|
510
553
|
}
|
|
511
554
|
// scheduler absent + winsw nonexistent — still have to rule out a detached wrapper.
|
|
512
555
|
const processes = io.winProcs();
|
|
513
556
|
if (processes === null) return unknown("the Windows process list could not be read");
|
|
514
557
|
if (unreadableAncestorWrapperPids(approvedPid, processes).length > 0) {
|
|
515
|
-
return unknown("a possible scheduler wrapper has an unreadable command line");
|
|
558
|
+
return unknown("a possible scheduler wrapper has an unreadable command line", "evidence-unreadable");
|
|
516
559
|
}
|
|
517
560
|
return wrapperProcessesAlive(processes, wrapperPaths(io)).length === 0
|
|
518
561
|
? { kind: "absent" }
|
|
519
|
-
: unknown("a surviving scheduler wrapper could not be tied to an installed manager");
|
|
562
|
+
: unknown("a surviving scheduler wrapper could not be tied to an installed manager", "unbound-wrapper");
|
|
520
563
|
}
|
|
521
564
|
|
|
522
565
|
export interface WindowsGuardedStopDeps {
|