@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,467 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Live dependencies of the checked Windows service stop (#7771, 060 "PR2: caller wiring").
|
|
3
|
+
*
|
|
4
|
+
* Part A (src/service/windows-checked-stop.ts) and Part B (src/service/windows-stop-confirm.ts)
|
|
5
|
+
* take every effect injected. This module is the production side of those seams: capped
|
|
6
|
+
* asynchronous schtasks and sc.exe calls, the evidence snapshot with native creation times
|
|
7
|
+
* (src/service/windows-process-evidence.ts), the checked terminate, the bind-time exit watch,
|
|
8
|
+
* the listening-port sampler and the listener identity check.
|
|
9
|
+
*
|
|
10
|
+
* The bind snapshot MUST be windowsProcessSnapshot: on x64 it overlays the native creation
|
|
11
|
+
* time, which is the exact value the handle terminate compares. A CIM-only snapshot carries
|
|
12
|
+
* a millisecond-truncated CIM time, the terminate then answers "reused" and Part A treats a
|
|
13
|
+
* live wrapper as exited.
|
|
14
|
+
*
|
|
15
|
+
* Windows ARM64 ships the STRICT variant (050 "Rollout", step 3): no ARM64 device run has
|
|
16
|
+
* happened, so a terminate there is "unavailable" and Part A reports unknown with
|
|
17
|
+
* evidence-unreadable instead of killing through the bounded PowerShell fallback. The
|
|
18
|
+
* fallback stays in the evidence module, unreachable until the constant below flips after
|
|
19
|
+
* the 040 ARM64 device case is run.
|
|
20
|
+
*/
|
|
21
|
+
import { execFile } from "node:child_process";
|
|
22
|
+
import { existsSync } from "node:fs";
|
|
23
|
+
import { join } from "node:path";
|
|
24
|
+
|
|
25
|
+
import { inspectOcxStartProcessIdentity, readPid, verifyPidIdentity, type OcxStartIdentityObservation } from "../config/process-state";
|
|
26
|
+
import { isProcessAlive } from "../lib/process-control";
|
|
27
|
+
import { isTestHomeGuardArmed } from "../lib/test-home-guard";
|
|
28
|
+
import { resolveTrustedWindowsPowerShellExe, resolveTrustedWindowsSchtasksExe, resolveTrustedWindowsSystemDirectory, toWindowsSchtasksError } from "../lib/windows-elevation";
|
|
29
|
+
import { WINSW_SERVICE_ID, winswExePath, type WinswStatus } from "../lib/winsw";
|
|
30
|
+
import { decodeWindowsTextBytes } from "../lib/windows-text";
|
|
31
|
+
import { parseScQcBinaryPathName, scBinaryPathNamesExecutable } from "../service-manager-probe";
|
|
32
|
+
import { parseListenPidsFromNetstat, type ListenPidScan } from "../server/port-reclaim";
|
|
33
|
+
import { dropWindowsTcpRowsForLocalPort } from "../server/windows-tcp-drop";
|
|
34
|
+
import { TASK, windowsLauncherVbsPath, windowsServiceScriptPath } from "./state";
|
|
35
|
+
import { ancestorWrapperPids } from "./windows-guarded-manager";
|
|
36
|
+
import type { WindowsCheckedStopDeps, WindowsTaskEndResult, WindowsWinswScmState, WindowsWinswStopResult } from "./windows-checked-stop";
|
|
37
|
+
import {
|
|
38
|
+
openWindowsProcessWatch,
|
|
39
|
+
readScheduleServicePid,
|
|
40
|
+
terminateWindowsProcessBound,
|
|
41
|
+
windowsProcessSnapshot,
|
|
42
|
+
type WindowsStopProcessEntry,
|
|
43
|
+
} from "./windows-process-evidence";
|
|
44
|
+
import { windowsProcessNative, type WindowsProcessNativeApi, type WindowsTerminateResult } from "./windows-process-native";
|
|
45
|
+
import type { WindowsListenerIdentity, WindowsPortSample, WindowsStopConfirmDeps } from "./windows-stop-confirm";
|
|
46
|
+
import { windowsSchedulerCsvIncludesTask } from "./windows-scheduler";
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* 050: without an ARM64 device run, ARM64 ships strict. Flip only after the 040 ARM64 device
|
|
50
|
+
* case passes; the bounded PowerShell terminate in windows-process-evidence.ts then runs.
|
|
51
|
+
*/
|
|
52
|
+
export const WINDOWS_ARM64_BOUNDED_TERMINATE_ENABLED = false;
|
|
53
|
+
|
|
54
|
+
export interface WindowsStopCommandResult {
|
|
55
|
+
status: number | null;
|
|
56
|
+
stdout: string;
|
|
57
|
+
stderr: string;
|
|
58
|
+
timedOut: boolean;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/** One spawned helper; tests inject it, production runs execFile with a hard timeout. */
|
|
62
|
+
export type WindowsStopCommandRunner = (
|
|
63
|
+
program: "schtasks" | "sc" | "powershell",
|
|
64
|
+
args: string[],
|
|
65
|
+
timeoutMs: number,
|
|
66
|
+
) => Promise<WindowsStopCommandResult>;
|
|
67
|
+
|
|
68
|
+
function programPath(program: "schtasks" | "sc" | "powershell"): string {
|
|
69
|
+
if (program === "schtasks") return resolveTrustedWindowsSchtasksExe();
|
|
70
|
+
if (program === "powershell") return resolveTrustedWindowsPowerShellExe();
|
|
71
|
+
const file = join(resolveTrustedWindowsSystemDirectory(), "sc.exe");
|
|
72
|
+
if (!existsSync(file)) throw new Error("sc.exe was not found in the trusted system directory.");
|
|
73
|
+
return file;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
export const liveWindowsStopCommandRunner: WindowsStopCommandRunner = (program, args, timeoutMs) => new Promise(resolve => {
|
|
77
|
+
// execFile reads a 0 timeout as "no timeout": a deadline-derived fraction is floored, and a
|
|
78
|
+
// timeout that floors to 0 spawns nothing (the same rule as terminateWindowsProcessBound).
|
|
79
|
+
const timeout = Math.floor(timeoutMs);
|
|
80
|
+
if (!(timeout > 0)) {
|
|
81
|
+
resolve({ status: null, stdout: "", stderr: "", timedOut: true });
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
// Task Scheduler and the SCM are machine-global: an armed test process may only observe.
|
|
85
|
+
// `sc query` and `sc qc` only read the SCM row and its registration.
|
|
86
|
+
const mutating = program === "schtasks"
|
|
87
|
+
? args[0]?.toLowerCase() !== "/query"
|
|
88
|
+
: program === "sc" && !["query", "qc"].includes((args[0] ?? "").toLowerCase());
|
|
89
|
+
if (isTestHomeGuardArmed() && mutating) {
|
|
90
|
+
resolve({ status: null, stdout: "", stderr: "refusing a machine-global service mutation from an armed test process", timedOut: false });
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
let file: string;
|
|
94
|
+
try {
|
|
95
|
+
file = programPath(program);
|
|
96
|
+
} catch (error) {
|
|
97
|
+
resolve({ status: null, stdout: "", stderr: error instanceof Error ? error.message : String(error), timedOut: false });
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
execFile(file, args, { encoding: "buffer", timeout, windowsHide: true, maxBuffer: 1024 * 1024 },
|
|
101
|
+
(error, stdout, stderr) => {
|
|
102
|
+
const text = (value: Buffer | string | undefined): string =>
|
|
103
|
+
value === undefined ? "" : typeof value === "string" ? value : decodeWindowsTextBytes(value);
|
|
104
|
+
const failure = error as (NodeJS.ErrnoException & { killed?: boolean; signal?: string | null; code?: number | string }) | null;
|
|
105
|
+
resolve({
|
|
106
|
+
status: failure ? (typeof failure.code === "number" ? failure.code : null) : 0,
|
|
107
|
+
stdout: text(stdout),
|
|
108
|
+
stderr: text(stderr),
|
|
109
|
+
timedOut: !!failure?.killed && failure.signal !== null,
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
/** schtasks /end, mapped: already stopped is not-running; access denied is denied. */
|
|
115
|
+
export function classifyTaskEnd(result: WindowsStopCommandResult): WindowsTaskEndResult {
|
|
116
|
+
if (result.timedOut) return "failed";
|
|
117
|
+
if (result.status === 0) return "ended";
|
|
118
|
+
const error = Object.assign(new Error(result.stderr || result.stdout), { status: result.status, stderr: result.stderr, stdout: result.stdout });
|
|
119
|
+
const detail = (result.stderr + "\n" + result.stdout).toLowerCase();
|
|
120
|
+
if (detail.includes("no running instance") || detail.includes("not currently running") || detail.includes("0x41330")) return "not-running";
|
|
121
|
+
return toWindowsSchtasksError(error, ["/end", "/tn", TASK]).reason === "access-denied" ? "denied" : "failed";
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/** schtasks /query /fo CSV /nh status column. Localized values fall back to PowerShell. */
|
|
125
|
+
export function parseTaskCsvState(csv: string): "running" | "not-running" | "unknown" {
|
|
126
|
+
for (const line of csv.split(/\r?\n/)) {
|
|
127
|
+
if (!windowsSchedulerCsvIncludesTask(line, TASK)) continue;
|
|
128
|
+
const fields = [...line.matchAll(/"([^"]*)"/g)].map(match => match[1]!.trim());
|
|
129
|
+
const status = fields[fields.length - 1] ?? "";
|
|
130
|
+
if (/^running$/i.test(status)) return "running";
|
|
131
|
+
if (/^(ready|disabled|queued)$/i.test(status)) return "not-running";
|
|
132
|
+
return "unknown";
|
|
133
|
+
}
|
|
134
|
+
return "unknown";
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
/** sc.exe query: the numeric STATE and the 1060 "does not exist" code are not localized. */
|
|
138
|
+
export function parseScQueryState(result: WindowsStopCommandResult): WindowsWinswScmState {
|
|
139
|
+
const text = result.stdout + "\n" + result.stderr;
|
|
140
|
+
if (/\b1060\b/.test(text)) return "nonexistent";
|
|
141
|
+
if (result.timedOut || result.status !== 0) return "unknown";
|
|
142
|
+
const state = /^\s*STATE\s*:\s*(\d+)/m.exec(text);
|
|
143
|
+
if (!state) return "unknown";
|
|
144
|
+
const value = Number(state[1]);
|
|
145
|
+
if (value === 1) return "stopped";
|
|
146
|
+
if (value === 4) return "running";
|
|
147
|
+
if (value >= 2 && value <= 7) return "pending";
|
|
148
|
+
return "unknown";
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/** sc.exe stop without waiting: 1062 (not started) is fine, 5 is denied. */
|
|
152
|
+
export function classifyScStop(result: WindowsStopCommandResult): WindowsWinswStopResult {
|
|
153
|
+
if (result.timedOut) return "failed";
|
|
154
|
+
const text = result.stdout + "\n" + result.stderr;
|
|
155
|
+
if (result.status === 0 || /\b1062\b/.test(text) || /\b1060\b/.test(text)) return "sent";
|
|
156
|
+
if (/\bFAILED 5\b/.test(text) || result.status === 5) return "denied";
|
|
157
|
+
return "failed";
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
export function winswStatusFromScState(state: WindowsWinswScmState): WinswStatus {
|
|
161
|
+
if (state === "nonexistent") return "nonexistent";
|
|
162
|
+
if (state === "stopped") return "stopped";
|
|
163
|
+
// A pending service is still an active manager: Part A stops it and polls.
|
|
164
|
+
if (state === "running" || state === "pending") return "started";
|
|
165
|
+
return "unknown";
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
export function windowsStopCanonicalPaths(): string[] {
|
|
169
|
+
return [windowsLauncherVbsPath(), windowsServiceScriptPath()];
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
/**
|
|
173
|
+
* The terminate Part A uses. terminateWindowsProcessBound runs the PowerShell fallback by
|
|
174
|
+
* itself whenever the native API is missing (ARM64, or an x64 whose DLL load failed), so the
|
|
175
|
+
* strict variant is enforced HERE (060 "ARM64 decision for PR2"): without the native
|
|
176
|
+
* primitive the answer is "unavailable" and the fallback is never reached.
|
|
177
|
+
*/
|
|
178
|
+
export async function windowsStopTerminate(
|
|
179
|
+
pid: number,
|
|
180
|
+
startTime: number,
|
|
181
|
+
timeoutMs: number,
|
|
182
|
+
io: { native?: () => WindowsProcessNativeApi | null; terminate?: typeof terminateWindowsProcessBound } = {},
|
|
183
|
+
): Promise<WindowsTerminateResult> {
|
|
184
|
+
if ((io.native ?? windowsProcessNative)() === null && !WINDOWS_ARM64_BOUNDED_TERMINATE_ENABLED) return { status: "unavailable" };
|
|
185
|
+
return (io.terminate ?? terminateWindowsProcessBound)(pid, startTime, { timeoutMs });
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
/** Floor a deadline-derived timeout; null when it floors to 0 (nothing may be spawned). */
|
|
189
|
+
export function wholeTimeoutMs(timeoutMs: number): number | null {
|
|
190
|
+
const floored = Math.floor(timeoutMs);
|
|
191
|
+
return floored > 0 ? floored : null;
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
/** The evidence snapshot with a floored timeout; 0 ms reads nothing (null, unreadable). */
|
|
195
|
+
export function windowsStopSnapshot(timeoutMs: number): Promise<WindowsStopProcessEntry[] | null> {
|
|
196
|
+
const whole = wholeTimeoutMs(timeoutMs);
|
|
197
|
+
return whole === null ? Promise.resolve(null) : windowsProcessSnapshot({ timeoutMs: whole });
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
/**
|
|
201
|
+
* Does the stopping process descend from a wrapper carrying this home's launcher or
|
|
202
|
+
* service-script path? The binding rule excludes the stopper itself but not its ancestors,
|
|
203
|
+
* so such a stop would end its own supervision chain (structure/ops/windows-checked-stop.md,
|
|
204
|
+
* "Who may run Part A").
|
|
205
|
+
*/
|
|
206
|
+
export function stopperUnderHomeWrapper(
|
|
207
|
+
processes: readonly WindowsStopProcessEntry[],
|
|
208
|
+
canonicalPaths: readonly string[],
|
|
209
|
+
selfPid: number = process.pid,
|
|
210
|
+
): boolean {
|
|
211
|
+
return ancestorWrapperPids(selfPid, processes, canonicalPaths).length > 0;
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
export interface WindowsCheckedStopLiveOptions {
|
|
215
|
+
run?: WindowsStopCommandRunner;
|
|
216
|
+
/**
|
|
217
|
+
* The `sc.exe qc` query that proves the registered WinSW service runs THIS installation's
|
|
218
|
+
* executable. Defaults to the capped runner; tests inject it.
|
|
219
|
+
*/
|
|
220
|
+
scQcRun?: (timeoutMs: number) => Promise<WindowsStopCommandResult>;
|
|
221
|
+
/** Checked before every manager command (the route's cap, the updater's authorizer). */
|
|
222
|
+
gate?: () => boolean;
|
|
223
|
+
snapshot?: (timeoutMs: number) => Promise<readonly WindowsStopProcessEntry[] | null>;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
/**
|
|
227
|
+
* Is the registered WinSW service this installation's?
|
|
228
|
+
*
|
|
229
|
+
* `sc stop opencodex-proxy-native` names a fixed ID, so a successful `sc query` is evidence
|
|
230
|
+
* that SOMETHING is registered, not that it is ours: another installation's WinSW service
|
|
231
|
+
* under the same ID would be stopped by this home's Part A. The registered
|
|
232
|
+
* `BINARY_PATH_NAME` must name this home's WinSW executable, the same proof the guarded
|
|
233
|
+
* manager path uses (`windowsWinswServiceInfo` + `commandLineHasPathToken`). Unreadable is
|
|
234
|
+
* unknown; a foreign executable is `nonexistent`, which keeps Part A from stopping it.
|
|
235
|
+
*/
|
|
236
|
+
export function classifyWinswOwnership(
|
|
237
|
+
qc: WindowsStopCommandResult | null,
|
|
238
|
+
winswExe: string = winswExePath(),
|
|
239
|
+
): WinswStatus | "foreign" {
|
|
240
|
+
if (qc === null || qc.timedOut || qc.status !== 0) return "unknown";
|
|
241
|
+
const binaryPathName = parseScQcBinaryPathName(qc.stdout);
|
|
242
|
+
if (binaryPathName === null) return "unknown";
|
|
243
|
+
return scBinaryPathNamesExecutable(binaryPathName, winswExe) ? "started" : "foreign";
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
/** The identity-checked proxy child, or null. */
|
|
247
|
+
export function windowsStopChildPid(): number | null {
|
|
248
|
+
try {
|
|
249
|
+
const pid = readPid();
|
|
250
|
+
return pid !== null && verifyPidIdentity(pid) === pid ? pid : null;
|
|
251
|
+
} catch {
|
|
252
|
+
return null;
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
export function windowsCheckedStopLiveDeps(options: WindowsCheckedStopLiveOptions = {}): WindowsCheckedStopDeps {
|
|
257
|
+
const run = options.run ?? liveWindowsStopCommandRunner;
|
|
258
|
+
const gate = options.gate ?? (() => true);
|
|
259
|
+
const scQuery = async (timeoutMs: number) => parseScQueryState(await run("sc", ["query", WINSW_SERVICE_ID], timeoutMs));
|
|
260
|
+
const scQcRun = options.scQcRun ?? (async (timeoutMs: number) => run("sc", ["qc", WINSW_SERVICE_ID], timeoutMs));
|
|
261
|
+
return {
|
|
262
|
+
canonicalPaths: windowsStopCanonicalPaths(),
|
|
263
|
+
childPid: windowsStopChildPid(),
|
|
264
|
+
async probeScheduler(timeoutMs) {
|
|
265
|
+
const started = Date.now();
|
|
266
|
+
const direct = await run("schtasks", ["/query", "/tn", TASK], timeoutMs);
|
|
267
|
+
if (direct.status === 0 && direct.stdout.includes(TASK)) return { status: "present" };
|
|
268
|
+
const listing = await run("schtasks", ["/query", "/fo", "CSV"], Math.max(1, timeoutMs - (Date.now() - started)));
|
|
269
|
+
if (listing.status !== 0 || listing.timedOut) return { status: "unknown", detail: "the Task Scheduler query did not answer" };
|
|
270
|
+
return windowsSchedulerCsvIncludesTask(listing.stdout, TASK) ? { status: "present" } : { status: "absent" };
|
|
271
|
+
},
|
|
272
|
+
async probeWinsw(timeoutMs) {
|
|
273
|
+
// One cap covers both reads: the ownership query gets only what the state query left.
|
|
274
|
+
const started = Date.now();
|
|
275
|
+
const state = await scQuery(timeoutMs);
|
|
276
|
+
const status = winswStatusFromScState(state);
|
|
277
|
+
// Absence, and anything already unreadable, needs no ownership read.
|
|
278
|
+
if (status !== "started") return status;
|
|
279
|
+
const remaining = Math.floor(timeoutMs - (Date.now() - started));
|
|
280
|
+
if (remaining < 1) return "unknown";
|
|
281
|
+
const qc = await scQcRun(remaining);
|
|
282
|
+
const ownership = classifyWinswOwnership(qc);
|
|
283
|
+
// Foreign is `nonexistent` for Part A: a manager this home must not stop.
|
|
284
|
+
if (ownership === "foreign") return "nonexistent";
|
|
285
|
+
return ownership === "unknown" ? "unknown" : status;
|
|
286
|
+
},
|
|
287
|
+
enumerate: timeoutMs => (options.snapshot ?? windowsStopSnapshot)(timeoutMs),
|
|
288
|
+
scheduleServicePid: timeoutMs => {
|
|
289
|
+
const whole = wholeTimeoutMs(timeoutMs);
|
|
290
|
+
return whole === null ? null : readScheduleServicePid({ timeoutMs: whole });
|
|
291
|
+
},
|
|
292
|
+
async endTask(timeoutMs) {
|
|
293
|
+
if (!gate()) return "failed";
|
|
294
|
+
return classifyTaskEnd(await run("schtasks", ["/end", "/tn", TASK], timeoutMs));
|
|
295
|
+
},
|
|
296
|
+
async taskState(timeoutMs) {
|
|
297
|
+
const started = Date.now();
|
|
298
|
+
const csv = await run("schtasks", ["/query", "/tn", TASK, "/fo", "CSV", "/nh"], timeoutMs);
|
|
299
|
+
const parsed = csv.status === 0 ? parseTaskCsvState(csv.stdout) : "unknown";
|
|
300
|
+
if (parsed !== "unknown") return parsed;
|
|
301
|
+
// A localized status word: ask Get-ScheduledTask, whose State is an enum name.
|
|
302
|
+
const left = timeoutMs - (Date.now() - started);
|
|
303
|
+
if (left <= 0) return "unknown";
|
|
304
|
+
const ps = await run("powershell", ["-NoProfile", "-NoLogo", "-NonInteractive", "-Command",
|
|
305
|
+
"(Get-ScheduledTask -TaskName '" + TASK + "' -TaskPath '\\' -ErrorAction Stop).State"], left);
|
|
306
|
+
const state = ps.stdout.trim();
|
|
307
|
+
if (/^running$/i.test(state)) return "running";
|
|
308
|
+
if (/^(ready|disabled|queued)$/i.test(state)) return "not-running";
|
|
309
|
+
return "unknown";
|
|
310
|
+
},
|
|
311
|
+
async winswStop(timeoutMs) {
|
|
312
|
+
if (!gate()) return "failed";
|
|
313
|
+
return classifyScStop(await run("sc", ["stop", WINSW_SERVICE_ID], timeoutMs));
|
|
314
|
+
},
|
|
315
|
+
winswState: scQuery,
|
|
316
|
+
proxyAlive: () => {
|
|
317
|
+
const pid = windowsStopChildPid();
|
|
318
|
+
return pid === null ? false : isProcessAlive(pid);
|
|
319
|
+
},
|
|
320
|
+
openWatch: (pid, startTime) => openWindowsProcessWatch(pid, startTime),
|
|
321
|
+
terminate: (pid, startTime, timeoutMs) => windowsStopTerminate(pid, startTime, timeoutMs),
|
|
322
|
+
};
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
/** One listener scan, bounded by the caller's timeout; a scan that misses it is unreadable. */
|
|
326
|
+
export type WindowsStopPortScan = (port: number, timeoutMs: number) => ListenPidScan | Promise<ListenPidScan>;
|
|
327
|
+
|
|
328
|
+
const WINDOWS_STOP_SCAN_MAX_BUFFER = 4 * 1024 * 1024;
|
|
329
|
+
|
|
330
|
+
/**
|
|
331
|
+
* The production listener scan: netstat -ano through execFile with the caller's timeout.
|
|
332
|
+
*
|
|
333
|
+
* `netstat -ano` is asked directly rather than through `cmd /c chcp 437`: the locale-safe
|
|
334
|
+
* wildcard-foreign rule in parseListenEntriesFromNetstat already recognizes a listen row, and
|
|
335
|
+
* running the program itself means the timeout terminates the only helper spawned. The table
|
|
336
|
+
* is read from the trusted System32 path — SystemRoot is caller-controlled.
|
|
337
|
+
*/
|
|
338
|
+
export function scanWindowsStopListenPids(port: number, timeoutMs: number): Promise<ListenPidScan> {
|
|
339
|
+
const whole = wholeTimeoutMs(timeoutMs);
|
|
340
|
+
if (whole === null) return Promise.resolve({ ok: false, error: "no positive timeout to sample with" });
|
|
341
|
+
let netstat: string;
|
|
342
|
+
try {
|
|
343
|
+
netstat = join(resolveTrustedWindowsSystemDirectory(), "netstat.exe");
|
|
344
|
+
} catch (error) {
|
|
345
|
+
return Promise.resolve({ ok: false, error: error instanceof Error ? error.message : String(error) });
|
|
346
|
+
}
|
|
347
|
+
return new Promise(resolve => {
|
|
348
|
+
// execFile's timeout terminates the helper; the callback then answers unreadable.
|
|
349
|
+
execFile(netstat, ["-ano", "-p", "tcp"], {
|
|
350
|
+
encoding: "buffer",
|
|
351
|
+
timeout: whole,
|
|
352
|
+
killSignal: "SIGKILL",
|
|
353
|
+
windowsHide: true,
|
|
354
|
+
maxBuffer: WINDOWS_STOP_SCAN_MAX_BUFFER,
|
|
355
|
+
}, (error, stdout) => {
|
|
356
|
+
if (error) {
|
|
357
|
+
resolve({ ok: false, error: error.message });
|
|
358
|
+
return;
|
|
359
|
+
}
|
|
360
|
+
const text = typeof stdout === "string" ? stdout : decodeWindowsTextBytes(stdout);
|
|
361
|
+
resolve({ ok: true, pids: parseListenPidsFromNetstat(text, port) });
|
|
362
|
+
});
|
|
363
|
+
});
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
/**
|
|
367
|
+
* One port sample, capped by `timeoutMs`. A listener whose owner has exited is cleared like
|
|
368
|
+
* reclaimListenPort does.
|
|
369
|
+
*
|
|
370
|
+
* A scan that does not answer within the budget is "unknown": Part B's closing sample is
|
|
371
|
+
* bounded (030 "Time budget"), and a synchronous scan both ignored that cap and could stall
|
|
372
|
+
* the stop for the helper's own 5 s. The timeout is floored and a value below 1 ms samples
|
|
373
|
+
* nothing, because execFile reads 0 as unlimited — the same rule as the command runner.
|
|
374
|
+
*/
|
|
375
|
+
export async function sampleWindowsStopPort(
|
|
376
|
+
port: number,
|
|
377
|
+
timeoutMs: number,
|
|
378
|
+
io: {
|
|
379
|
+
scan?: WindowsStopPortScan;
|
|
380
|
+
alive?: (pid: number) => boolean;
|
|
381
|
+
/** Clears the ghost rows of the exited owners only; never another program's rows. */
|
|
382
|
+
drop?: (port: number, ownerPids: readonly number[]) => unknown;
|
|
383
|
+
selfPid?: number;
|
|
384
|
+
} = {},
|
|
385
|
+
): Promise<WindowsPortSample> {
|
|
386
|
+
const whole = wholeTimeoutMs(timeoutMs);
|
|
387
|
+
if (whole === null) return { state: "unknown" };
|
|
388
|
+
const scan = await runBoundedScan(port, whole, io.scan ?? scanWindowsStopListenPids);
|
|
389
|
+
if (scan === null || !scan.ok) return { state: "unknown" };
|
|
390
|
+
const pids = scan.pids.filter(pid => pid !== (io.selfPid ?? process.pid));
|
|
391
|
+
if (pids.length === 0) return { state: "free" };
|
|
392
|
+
const alive = io.alive ?? isProcessAlive;
|
|
393
|
+
const live = pids.filter(pid => alive(pid));
|
|
394
|
+
if (live.length === 0) {
|
|
395
|
+
// Clear only the ghost rows the exited PID(s) left: a program that took the port after
|
|
396
|
+
// the scan owns its rows, and resetting them would break a connection this stop does not own.
|
|
397
|
+
try {
|
|
398
|
+
(io.drop ?? ((target: number, owners: readonly number[]) => dropWindowsTcpRowsForLocalPort(target, undefined, owners)))(port, pids);
|
|
399
|
+
} catch { /* the next sample decides */ }
|
|
400
|
+
}
|
|
401
|
+
return { state: "listening", ownerPid: live[0] ?? pids[0] ?? null };
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
/** Resolve null once the budget is spent; a scan that never answers cannot hold the stop. */
|
|
405
|
+
function runBoundedScan(port: number, timeoutMs: number, scan: WindowsStopPortScan): Promise<ListenPidScan | null> {
|
|
406
|
+
return new Promise(resolve => {
|
|
407
|
+
let settled = false;
|
|
408
|
+
const finish = (result: ListenPidScan | null): void => {
|
|
409
|
+
if (settled) return;
|
|
410
|
+
settled = true;
|
|
411
|
+
clearTimeout(timer);
|
|
412
|
+
resolve(result);
|
|
413
|
+
};
|
|
414
|
+
const timer = setTimeout(() => finish(null), timeoutMs);
|
|
415
|
+
timer.unref?.();
|
|
416
|
+
let pending: ListenPidScan | Promise<ListenPidScan>;
|
|
417
|
+
try {
|
|
418
|
+
pending = scan(port, timeoutMs);
|
|
419
|
+
} catch {
|
|
420
|
+
finish(null);
|
|
421
|
+
return;
|
|
422
|
+
}
|
|
423
|
+
Promise.resolve(pending).then(finish, () => finish(null));
|
|
424
|
+
});
|
|
425
|
+
}
|
|
426
|
+
|
|
427
|
+
/**
|
|
428
|
+
* ours = an opencodex process (the respawned proxy); exited = its owner is gone.
|
|
429
|
+
*
|
|
430
|
+
* Tri-state (#7771): only a positive "mismatch" is foreign. `verifyPidIdentity` collapses
|
|
431
|
+
* "not an ocx process" and "the probe could not answer" into the same null, and a probe that
|
|
432
|
+
* cannot read another account's or an elevated process's command line is not evidence that
|
|
433
|
+
* another program holds the port — Part B would then report portHeldByForeign and let the
|
|
434
|
+
* caller restore shared config with the proxy possibly still alive. Unreadable stays unknown.
|
|
435
|
+
*/
|
|
436
|
+
export function identifyWindowsStopListener(
|
|
437
|
+
ownerPid: number | null,
|
|
438
|
+
io: {
|
|
439
|
+
alive?: (pid: number) => boolean;
|
|
440
|
+
identity?: (pid: number) => OcxStartIdentityObservation;
|
|
441
|
+
} = {},
|
|
442
|
+
): WindowsListenerIdentity {
|
|
443
|
+
if (ownerPid === null) return "unknown";
|
|
444
|
+
if (!(io.alive ?? isProcessAlive)(ownerPid)) return "exited";
|
|
445
|
+
try {
|
|
446
|
+
const observed = (io.identity ?? inspectOcxStartProcessIdentity)(ownerPid);
|
|
447
|
+
if (observed === "match") return "ours";
|
|
448
|
+
return observed === "mismatch" ? "foreign" : "unknown";
|
|
449
|
+
} catch {
|
|
450
|
+
return "unknown";
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
export function windowsStopConfirmLiveDeps(
|
|
455
|
+
port: number,
|
|
456
|
+
remainingMs: number,
|
|
457
|
+
options: { snapshot?: (timeoutMs: number) => Promise<readonly WindowsStopProcessEntry[] | null> } = {},
|
|
458
|
+
): WindowsStopConfirmDeps {
|
|
459
|
+
return {
|
|
460
|
+
port,
|
|
461
|
+
remainingMs,
|
|
462
|
+
canonicalPaths: windowsStopCanonicalPaths(),
|
|
463
|
+
samplePort: (samplePort, timeoutMs) => sampleWindowsStopPort(samplePort, timeoutMs),
|
|
464
|
+
identifyListener: (_port, ownerPid) => identifyWindowsStopListener(ownerPid),
|
|
465
|
+
enumerate: timeoutMs => (options.snapshot ?? windowsStopSnapshot)(timeoutMs),
|
|
466
|
+
};
|
|
467
|
+
}
|