@bitkyc08/opencodex 2.100.5 → 2.100.6
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 +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -12,11 +12,7 @@
|
|
|
12
12
|
* a millisecond-truncated CIM time, the terminate then answers "reused" and Part A treats a
|
|
13
13
|
* live wrapper as exited.
|
|
14
14
|
*
|
|
15
|
-
*
|
|
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.
|
|
15
|
+
* Without a native API, Part A refuses direct termination and reports evidence-unreadable.
|
|
20
16
|
*/
|
|
21
17
|
import { execFile } from "node:child_process";
|
|
22
18
|
import { existsSync } from "node:fs";
|
|
@@ -25,7 +21,7 @@ import { join } from "node:path";
|
|
|
25
21
|
import { inspectOcxStartProcessIdentity, readPid, verifyPidIdentity, type OcxStartIdentityObservation } from "../config/process-state";
|
|
26
22
|
import { isProcessAlive } from "../lib/process-control";
|
|
27
23
|
import { isTestHomeGuardArmed } from "../lib/test-home-guard";
|
|
28
|
-
import { resolveTrustedWindowsPowerShellExe, resolveTrustedWindowsSchtasksExe, resolveTrustedWindowsSystemDirectory
|
|
24
|
+
import { resolveTrustedWindowsPowerShellExe, resolveTrustedWindowsSchtasksExe, resolveTrustedWindowsSystemDirectory } from "../lib/windows-elevation";
|
|
29
25
|
import { WINSW_SERVICE_ID, winswExePath, type WinswStatus } from "../lib/winsw";
|
|
30
26
|
import { decodeWindowsTextBytes } from "../lib/windows-text";
|
|
31
27
|
import { parseScQcBinaryPathName, scBinaryPathNamesExecutable } from "../service-manager-probe";
|
|
@@ -33,7 +29,7 @@ import { parseListenPidsFromNetstat, type ListenPidScan } from "../server/port-r
|
|
|
33
29
|
import { dropWindowsTcpRowsForLocalPort } from "../server/windows-tcp-drop";
|
|
34
30
|
import { TASK, windowsLauncherVbsPath, windowsServiceScriptPath } from "./state";
|
|
35
31
|
import { ancestorWrapperPids } from "./windows-guarded-manager";
|
|
36
|
-
import type { WindowsCheckedStopDeps,
|
|
32
|
+
import type { WindowsCheckedStopDeps, WindowsWinswScmState, WindowsWinswStopResult } from "./windows-checked-stop";
|
|
37
33
|
import {
|
|
38
34
|
openWindowsProcessWatch,
|
|
39
35
|
readScheduleServicePid,
|
|
@@ -44,12 +40,7 @@ import {
|
|
|
44
40
|
import { windowsProcessNative, type WindowsProcessNativeApi, type WindowsTerminateResult } from "./windows-process-native";
|
|
45
41
|
import type { WindowsListenerIdentity, WindowsPortSample, WindowsStopConfirmDeps } from "./windows-stop-confirm";
|
|
46
42
|
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;
|
|
43
|
+
import { WINDOWS_TASK_INSTANCE_STOP_SCRIPT, verifyWindowsTaskStopProof } from "./windows-task-instance-stop";
|
|
53
44
|
|
|
54
45
|
export interface WindowsStopCommandResult {
|
|
55
46
|
status: number | null;
|
|
@@ -63,6 +54,7 @@ export type WindowsStopCommandRunner = (
|
|
|
63
54
|
program: "schtasks" | "sc" | "powershell",
|
|
64
55
|
args: string[],
|
|
65
56
|
timeoutMs: number,
|
|
57
|
+
authorizeProof?: (line: string) => boolean | Promise<boolean>,
|
|
66
58
|
) => Promise<WindowsStopCommandResult>;
|
|
67
59
|
|
|
68
60
|
function programPath(program: "schtasks" | "sc" | "powershell"): string {
|
|
@@ -73,9 +65,9 @@ function programPath(program: "schtasks" | "sc" | "powershell"): string {
|
|
|
73
65
|
return file;
|
|
74
66
|
}
|
|
75
67
|
|
|
76
|
-
export const liveWindowsStopCommandRunner: WindowsStopCommandRunner = (program, args, timeoutMs) => new Promise(resolve => {
|
|
68
|
+
export const liveWindowsStopCommandRunner: WindowsStopCommandRunner = (program, args, timeoutMs, authorizeProof) => new Promise(resolve => {
|
|
77
69
|
// execFile reads a 0 timeout as "no timeout": a deadline-derived fraction is floored, and a
|
|
78
|
-
// timeout that floors to 0 spawns nothing
|
|
70
|
+
// timeout that floors to 0 spawns nothing.
|
|
79
71
|
const timeout = Math.floor(timeoutMs);
|
|
80
72
|
if (!(timeout > 0)) {
|
|
81
73
|
resolve({ status: null, stdout: "", stderr: "", timedOut: true });
|
|
@@ -83,9 +75,9 @@ export const liveWindowsStopCommandRunner: WindowsStopCommandRunner = (program,
|
|
|
83
75
|
}
|
|
84
76
|
// Task Scheduler and the SCM are machine-global: an armed test process may only observe.
|
|
85
77
|
// `sc query` and `sc qc` only read the SCM row and its registration.
|
|
86
|
-
const mutating = program === "schtasks"
|
|
78
|
+
const mutating = authorizeProof !== undefined || (program === "schtasks"
|
|
87
79
|
? args[0]?.toLowerCase() !== "/query"
|
|
88
|
-
: program === "sc" && !["query", "qc"].includes((args[0] ?? "").toLowerCase());
|
|
80
|
+
: program === "sc" && !["query", "qc"].includes((args[0] ?? "").toLowerCase()));
|
|
89
81
|
if (isTestHomeGuardArmed() && mutating) {
|
|
90
82
|
resolve({ status: null, stdout: "", stderr: "refusing a machine-global service mutation from an armed test process", timedOut: false });
|
|
91
83
|
return;
|
|
@@ -97,7 +89,7 @@ export const liveWindowsStopCommandRunner: WindowsStopCommandRunner = (program,
|
|
|
97
89
|
resolve({ status: null, stdout: "", stderr: error instanceof Error ? error.message : String(error), timedOut: false });
|
|
98
90
|
return;
|
|
99
91
|
}
|
|
100
|
-
execFile(file, args, { encoding: "buffer", timeout, windowsHide: true, maxBuffer: 1024 * 1024 },
|
|
92
|
+
const helper = execFile(file, args, { encoding: "buffer", timeout, windowsHide: true, maxBuffer: 1024 * 1024 },
|
|
101
93
|
(error, stdout, stderr) => {
|
|
102
94
|
const text = (value: Buffer | string | undefined): string =>
|
|
103
95
|
value === undefined ? "" : typeof value === "string" ? value : decodeWindowsTextBytes(value);
|
|
@@ -109,18 +101,24 @@ export const liveWindowsStopCommandRunner: WindowsStopCommandRunner = (program,
|
|
|
109
101
|
timedOut: !!failure?.killed && failure.signal !== null,
|
|
110
102
|
});
|
|
111
103
|
});
|
|
104
|
+
if (authorizeProof) {
|
|
105
|
+
let pending = "";
|
|
106
|
+
const onProof = async (chunk: Buffer): Promise<void> => {
|
|
107
|
+
pending += chunk.toString("latin1");
|
|
108
|
+
const end = pending.indexOf("\n");
|
|
109
|
+
if (end < 0) return;
|
|
110
|
+
helper.stdout?.off("data", onProof);
|
|
111
|
+
let approved = false;
|
|
112
|
+
try {
|
|
113
|
+
approved = await authorizeProof(pending.slice(0, end).replace(/\r$/, ""));
|
|
114
|
+
} catch { /* An authorizer failure leaves stdin unapproved. */ }
|
|
115
|
+
helper.stdin?.end(approved ? "stop\n" : "\n");
|
|
116
|
+
};
|
|
117
|
+
helper.stdin?.on("error", () => { /* execFile reports the helper's exit or timeout. */ });
|
|
118
|
+
helper.stdout?.on("data", onProof);
|
|
119
|
+
}
|
|
112
120
|
});
|
|
113
121
|
|
|
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
122
|
/**
|
|
125
123
|
* Status words of `schtasks /query /fo CSV /nh`. schtasks localizes the column from its .mui
|
|
126
124
|
* resources, and the PowerShell fallback cannot start inside Part A's 1 s manager-state cap on a
|
|
@@ -128,17 +126,16 @@ export function classifyTaskEnd(result: WindowsStopCommandResult): WindowsTaskEn
|
|
|
128
126
|
* System32\zh-CN\schtasks.exe.mui, ko-KR from two machines. Any other word stays unknown and
|
|
129
127
|
* falls back to Get-ScheduledTask's locale-independent State enum.
|
|
130
128
|
*/
|
|
131
|
-
|
|
132
|
-
const
|
|
133
|
-
|
|
134
|
-
const LOCALIZED_ACCESS_DENIED = /拒绝访问|액세스가 거부/;
|
|
129
|
+
// A queued instance can launch after Part A. Only ready and disabled prove inactivity.
|
|
130
|
+
const TASK_CSV_ACTIVE = new Set(["running", "queued", "正在运行", "已排队", "실행 중"]);
|
|
131
|
+
const TASK_CSV_NOT_RUNNING = new Set(["ready", "disabled", "就绪", "已禁用", "준비"]);
|
|
135
132
|
|
|
136
133
|
export function parseTaskCsvState(csv: string): "running" | "not-running" | "unknown" {
|
|
137
134
|
for (const line of csv.split(/\r?\n/)) {
|
|
138
135
|
if (!windowsSchedulerCsvIncludesTask(line, TASK)) continue;
|
|
139
136
|
const fields = [...line.matchAll(/"([^"]*)"/g)].map(match => match[1]!.trim());
|
|
140
137
|
const status = (fields[fields.length - 1] ?? "").normalize("NFC").toLowerCase();
|
|
141
|
-
if (
|
|
138
|
+
if (TASK_CSV_ACTIVE.has(status)) return "running";
|
|
142
139
|
if (TASK_CSV_NOT_RUNNING.has(status)) return "not-running";
|
|
143
140
|
return "unknown";
|
|
144
141
|
}
|
|
@@ -181,10 +178,7 @@ export function windowsStopCanonicalPaths(): string[] {
|
|
|
181
178
|
}
|
|
182
179
|
|
|
183
180
|
/**
|
|
184
|
-
* The terminate Part A uses.
|
|
185
|
-
* itself whenever the native API is missing (ARM64, or an x64 whose DLL load failed), so the
|
|
186
|
-
* strict variant is enforced HERE (060 "ARM64 decision for PR2"): without the native
|
|
187
|
-
* primitive the answer is "unavailable" and the fallback is never reached.
|
|
181
|
+
* The terminate Part A uses. Without a native process handle, no termination is attempted.
|
|
188
182
|
*/
|
|
189
183
|
export async function windowsStopTerminate(
|
|
190
184
|
pid: number,
|
|
@@ -192,7 +186,7 @@ export async function windowsStopTerminate(
|
|
|
192
186
|
timeoutMs: number,
|
|
193
187
|
io: { native?: () => WindowsProcessNativeApi | null; terminate?: typeof terminateWindowsProcessBound } = {},
|
|
194
188
|
): Promise<WindowsTerminateResult> {
|
|
195
|
-
if ((io.native ?? windowsProcessNative)() === null
|
|
189
|
+
if ((io.native ?? windowsProcessNative)() === null) return { status: "unavailable" };
|
|
196
190
|
return (io.terminate ?? terminateWindowsProcessBound)(pid, startTime, { timeoutMs });
|
|
197
191
|
}
|
|
198
192
|
|
|
@@ -229,7 +223,7 @@ export interface WindowsCheckedStopLiveOptions {
|
|
|
229
223
|
* executable. Defaults to the capped runner; tests inject it.
|
|
230
224
|
*/
|
|
231
225
|
scQcRun?: (timeoutMs: number) => Promise<WindowsStopCommandResult>;
|
|
232
|
-
/**
|
|
226
|
+
/** The outer cap, checked before a manager stop and again after Scheduler proof. */
|
|
233
227
|
gate?: () => boolean;
|
|
234
228
|
snapshot?: (timeoutMs: number) => Promise<readonly WindowsStopProcessEntry[] | null>;
|
|
235
229
|
}
|
|
@@ -300,21 +294,32 @@ export function windowsCheckedStopLiveDeps(options: WindowsCheckedStopLiveOption
|
|
|
300
294
|
const whole = wholeTimeoutMs(timeoutMs);
|
|
301
295
|
return whole === null ? null : readScheduleServicePid({ timeoutMs: whole });
|
|
302
296
|
},
|
|
303
|
-
async endTask(timeoutMs) {
|
|
297
|
+
async endTask(timeoutMs, authorize) {
|
|
304
298
|
if (!gate()) return "failed";
|
|
305
|
-
const
|
|
306
|
-
const
|
|
307
|
-
const
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
299
|
+
const deadline = performance.now() + Math.floor(timeoutMs);
|
|
300
|
+
const withinDeadline = () => performance.now() < deadline && gate();
|
|
301
|
+
const launcher = windowsLauncherVbsPath();
|
|
302
|
+
const script = Buffer.from(WINDOWS_TASK_INSTANCE_STOP_SCRIPT, "utf16le").toString("base64");
|
|
303
|
+
let approved = false;
|
|
304
|
+
let refusal: { cause: unknown } | undefined;
|
|
305
|
+
const ended = await run("powershell", ["-NoProfile", "-NoLogo", "-NonInteractive", "-EncodedCommand", script], timeoutMs,
|
|
306
|
+
async line => {
|
|
307
|
+
if (!verifyWindowsTaskStopProof(line, launcher) || !withinDeadline()) return false;
|
|
308
|
+
try {
|
|
309
|
+
await authorize?.();
|
|
310
|
+
} catch (cause) {
|
|
311
|
+
refusal = { cause };
|
|
312
|
+
return false;
|
|
313
|
+
}
|
|
314
|
+
approved = withinDeadline();
|
|
315
|
+
return approved;
|
|
316
|
+
});
|
|
317
|
+
if (refusal) throw refusal.cause;
|
|
318
|
+
if (ended.timedOut || ended.status !== 0) return "failed";
|
|
319
|
+
const verdict = ended.stdout.trim().split(/\r?\n/).at(-1);
|
|
320
|
+
if (verdict === "unverified-registration" || verdict === "denied") return verdict;
|
|
321
|
+
if (approved && (verdict === "ended" || verdict === "not-running")) return verdict;
|
|
322
|
+
return "failed";
|
|
318
323
|
},
|
|
319
324
|
async taskState(timeoutMs) {
|
|
320
325
|
const started = Date.now();
|
|
@@ -327,8 +332,8 @@ export function windowsCheckedStopLiveDeps(options: WindowsCheckedStopLiveOption
|
|
|
327
332
|
const ps = await run("powershell", ["-NoProfile", "-NoLogo", "-NonInteractive", "-Command",
|
|
328
333
|
"(Get-ScheduledTask -TaskName '" + TASK + "' -TaskPath '\\' -ErrorAction Stop).State"], left);
|
|
329
334
|
const state = ps.stdout.trim();
|
|
330
|
-
if (/^running$/i.test(state)) return "running";
|
|
331
|
-
if (/^(ready|disabled
|
|
335
|
+
if (/^(running|queued)$/i.test(state)) return "running";
|
|
336
|
+
if (/^(ready|disabled)$/i.test(state)) return "not-running";
|
|
332
337
|
return "unknown";
|
|
333
338
|
},
|
|
334
339
|
async winswStop(timeoutMs) {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* With a task registered or a stray sweep running, the Schedule host PID is read (2 s).
|
|
13
13
|
* Admission runs here, after the probe and before anything changes.
|
|
14
14
|
* 2. Bind (src/service/windows-stop-binding.ts) and open an exit watch per wrapper.
|
|
15
|
-
* 3. Ask the manager:
|
|
15
|
+
* 3. Ask the manager: verified Task Scheduler instances (2 s); WinSW a non-waiting stop (2 s) and an SCM poll
|
|
16
16
|
* capped at <stoptimeout> + 2 s. Denied is denied; an overrun is unknown; neither goes on.
|
|
17
17
|
* 4. Terminate the bound survivors through the checked primitive, deepest first.
|
|
18
18
|
* 5. Wait on the bind-time watches (steps 4 and 5 share 3 s), then read the manager state
|
|
@@ -25,7 +25,7 @@ import type { WinswStatus } from "../lib/winsw";
|
|
|
25
25
|
import type { WindowsProcessWatch, WindowsTerminateResult } from "./windows-process-native";
|
|
26
26
|
import type { WindowsStopProcessEntry } from "./windows-process-evidence";
|
|
27
27
|
import type { WindowsSchedulerTaskProbe } from "./windows-scheduler";
|
|
28
|
-
import { bindWindowsStopWrappers, type WindowsBoundWrapper, type WindowsStopBinding } from "./windows-stop-binding";
|
|
28
|
+
import { bindWindowsStopWrappers, WRAPPER_OWNER_REFUSAL, type WindowsBoundWrapper, type WindowsStopBinding } from "./windows-stop-binding";
|
|
29
29
|
import {
|
|
30
30
|
DEFAULT_WINSW_STOP_TIMEOUT_MS,
|
|
31
31
|
WINDOWS_STOP_CAPS,
|
|
@@ -60,7 +60,7 @@ export const windowsStopClock: WindowsStopClock = {
|
|
|
60
60
|
|
|
61
61
|
export type WindowsStopReason = "access-denied" | "evidence-unreadable" | "unbound-wrapper" | "unverified-budget";
|
|
62
62
|
export type WindowsCheckedStopOutcome = "absent" | "stopped" | "survived" | "denied" | "unknown" | "unverified-budget";
|
|
63
|
-
export type WindowsTaskEndResult = "ended" | "not-running" | "denied" | "failed";
|
|
63
|
+
export type WindowsTaskEndResult = "ended" | "not-running" | "denied" | "failed" | "unverified-registration";
|
|
64
64
|
export type WindowsWinswStopResult = "sent" | "denied" | "failed";
|
|
65
65
|
export type WindowsWinswScmState = "stopped" | "running" | "pending" | "nonexistent" | "unknown";
|
|
66
66
|
|
|
@@ -75,7 +75,8 @@ export interface WindowsCheckedStopDeps {
|
|
|
75
75
|
probeWinsw(timeoutMs: number): MaybePromise<WinswStatus>;
|
|
76
76
|
enumerate(timeoutMs: number): MaybePromise<readonly WindowsStopProcessEntry[] | null>;
|
|
77
77
|
scheduleServicePid(timeoutMs: number): MaybePromise<number | null>;
|
|
78
|
-
|
|
78
|
+
/** Reauthorize after the Scheduler proof and before releasing the instance stop. */
|
|
79
|
+
endTask(timeoutMs: number, authorize?: () => MaybePromise<void>): MaybePromise<WindowsTaskEndResult>;
|
|
79
80
|
/** Running state of the task (schtasks /query); the final manager-state read. */
|
|
80
81
|
taskState(timeoutMs: number): MaybePromise<"running" | "not-running" | "unknown">;
|
|
81
82
|
winswStop(timeoutMs: number): MaybePromise<WindowsWinswStopResult>;
|
|
@@ -98,7 +99,7 @@ export interface WindowsCheckedStopOptions {
|
|
|
98
99
|
/** A snapshot that already ran (guarded: revalidateManager's), reused for the bind. */
|
|
99
100
|
bindSnapshot?: readonly WindowsStopProcessEntry[];
|
|
100
101
|
admission?: WindowsStopAdmission;
|
|
101
|
-
/** Throws to refuse.
|
|
102
|
+
/** Throws to refuse. Also runs after Scheduler proof, before the helper can stop any instance. */
|
|
102
103
|
authorize?: () => MaybePromise<void>;
|
|
103
104
|
}
|
|
104
105
|
|
|
@@ -135,6 +136,7 @@ type Capped<T> = { ok: true; value: T } | { ok: false; timedOut: boolean };
|
|
|
135
136
|
/**
|
|
136
137
|
* Run one step under a cap. The race ends the wait for an asynchronous dependency; the
|
|
137
138
|
* elapsed check catches one that blocked past the cap anyway. Either is an overrun.
|
|
139
|
+
* A typed authorizer refusal propagates with the stop's partial result.
|
|
138
140
|
*/
|
|
139
141
|
export async function runCapped<T>(
|
|
140
142
|
clock: WindowsStopClock,
|
|
@@ -150,7 +152,8 @@ export async function runCapped<T>(
|
|
|
150
152
|
const value = await Promise.race([work, clock.sleep(capMs, abort.signal).then(() => TIMED_OUT)]);
|
|
151
153
|
if (value === TIMED_OUT || clock.now() - started > capMs) return { ok: false, timedOut: true };
|
|
152
154
|
return { ok: true, value: value as T };
|
|
153
|
-
} catch {
|
|
155
|
+
} catch (error) {
|
|
156
|
+
if (error instanceof WindowsCheckedStopRefusedError) throw error;
|
|
154
157
|
return { ok: false, timedOut: false };
|
|
155
158
|
} finally {
|
|
156
159
|
abort.abort();
|
|
@@ -224,6 +227,9 @@ export async function stopWindowsServiceChecked(
|
|
|
224
227
|
...bindContext, processes: snapshot.value, taskRegistered: false, managerRegistered: false,
|
|
225
228
|
scheduleServicePid: schedulePid,
|
|
226
229
|
});
|
|
230
|
+
if (binding.ownershipUnverified.length > 0) {
|
|
231
|
+
return finish("unknown", "evidence-unreadable", WRAPPER_OWNER_REFUSAL);
|
|
232
|
+
}
|
|
227
233
|
if (binding.bound.length === 0 && binding.unbound.length === 0 && binding.unreadable.length === 0) {
|
|
228
234
|
return finish("absent", null, "no service is registered and no wrapper of this home is running");
|
|
229
235
|
}
|
|
@@ -273,6 +279,9 @@ export async function stopWindowsServiceChecked(
|
|
|
273
279
|
}
|
|
274
280
|
if (binding) {
|
|
275
281
|
result.unbound = binding.unbound.map(entry => entry.pid);
|
|
282
|
+
if (binding.ownershipUnverified.length > 0) {
|
|
283
|
+
return finish("unknown", "evidence-unreadable", WRAPPER_OWNER_REFUSAL);
|
|
284
|
+
}
|
|
276
285
|
if (binding.unreadable.length > 0) {
|
|
277
286
|
return finish("unknown", "evidence-unreadable", "a possible wrapper of this home has unreadable evidence");
|
|
278
287
|
}
|
|
@@ -298,10 +307,15 @@ export async function stopWindowsServiceChecked(
|
|
|
298
307
|
|
|
299
308
|
// Step 3: ask the manager.
|
|
300
309
|
if (taskRegistered) {
|
|
301
|
-
//
|
|
310
|
+
// Check before launching the helper, then again at its mutation boundary.
|
|
302
311
|
await authorize();
|
|
303
|
-
|
|
304
|
-
|
|
312
|
+
const ended = await runCapped(clock, C.taskEnd,
|
|
313
|
+
timeoutMs => deps.endTask(timeoutMs, options.authorize ? authorize : undefined));
|
|
314
|
+
if (ended.ok && ended.value === "unverified-registration") {
|
|
315
|
+
return finish("unknown", "evidence-unreadable",
|
|
316
|
+
"the scheduled task's launcher, run-as account, or running instances could not be verified for this installation and Windows account. Confirm them in Task Scheduler and stop the task from its owning Windows session");
|
|
317
|
+
}
|
|
318
|
+
result.changed = !ended.ok || ended.value !== "not-running";
|
|
305
319
|
if (!ended.ok) return finish("unknown", "evidence-unreadable", "the task end command did not answer within its cap");
|
|
306
320
|
if (ended.value === "denied") return finish("denied", "access-denied", "ending the task was denied");
|
|
307
321
|
if (ended.value === "failed") return finish("unknown", "evidence-unreadable", "the task end command failed");
|
|
@@ -340,7 +354,11 @@ export async function stopWindowsServiceChecked(
|
|
|
340
354
|
if (!outcome.ok) return finish("unknown", "evidence-unreadable", "terminating a bound wrapper did not answer within its cap");
|
|
341
355
|
const status = outcome.value.status;
|
|
342
356
|
if (status === "denied") return finish("denied", "access-denied", "terminating a bound wrapper was denied");
|
|
343
|
-
if (status === "
|
|
357
|
+
if (status === "owner-unverified") return finish("unknown", "evidence-unreadable", WRAPPER_OWNER_REFUSAL);
|
|
358
|
+
if (status === "unavailable") {
|
|
359
|
+
return finish("unknown", "evidence-unreadable",
|
|
360
|
+
"the wrapper's exit could not be confirmed without a verified process handle. Check it from its owning Windows session using Task Manager, stop it if it is still running, then retry");
|
|
361
|
+
}
|
|
344
362
|
if (status === "terminated") {
|
|
345
363
|
result.terminated.push(wrapper.pid);
|
|
346
364
|
if (outcome.value.exited === true) exited.set(wrapper.pid, true);
|
|
@@ -425,7 +443,7 @@ async function unboundOnlyVerdict(
|
|
|
425
443
|
return unboundStillAlive(binding, watches);
|
|
426
444
|
}
|
|
427
445
|
|
|
428
|
-
/** The updater's variant:
|
|
446
|
+
/** The updater's variant: authorize at entry and at each stop or terminate boundary. */
|
|
429
447
|
export function guardedStopWindowsServiceChecked(
|
|
430
448
|
authorize: () => MaybePromise<void>,
|
|
431
449
|
deps: WindowsCheckedStopDeps,
|
|
@@ -29,11 +29,12 @@ 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
|
+
import { bindWindowsStopWrappers, WRAPPER_OWNER_REFUSAL } from "./windows-stop-binding";
|
|
33
33
|
import { probeWindowsSchedulerTask, querySchtasks, type WindowsSchedulerTaskProbe } from "./windows-scheduler";
|
|
34
34
|
import { windowsWscript } from "./windows-wscript";
|
|
35
35
|
import { windowsTaskRegistrationHealthy, windowsTaskRegistrationRefreshableLegacy } from "./windows-taskxml";
|
|
36
36
|
import { commandLineHasPathToken } from "./windows-command-line-token";
|
|
37
|
+
import { parseWindowsProcessSnapshot, windowsProcessSnapshotScript } from "./windows-process-evidence";
|
|
37
38
|
|
|
38
39
|
// Re-exported for existing importers; the function lives in a leaf module to keep the binding rule
|
|
39
40
|
// (windows-stop-binding.ts) free of an import cycle with this inspection.
|
|
@@ -45,6 +46,8 @@ export interface WindowsProcessEntry {
|
|
|
45
46
|
parentPid: number | null;
|
|
46
47
|
name: string | null;
|
|
47
48
|
commandLine: string | null;
|
|
49
|
+
/** False proves the same account; true proves a different user account; otherwise unverified. */
|
|
50
|
+
foreignOwner?: boolean | null;
|
|
48
51
|
}
|
|
49
52
|
|
|
50
53
|
/** Get-ScheduledTask State, collapsed to what the stop decision needs. */
|
|
@@ -115,28 +118,10 @@ function runPowerShell(command: string): string {
|
|
|
115
118
|
export function windowsProcessList(): WindowsProcessEntry[] | null {
|
|
116
119
|
if (process.platform !== "win32") return null;
|
|
117
120
|
try {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
)
|
|
121
|
-
|
|
122
|
-
if (!trimmed) return [];
|
|
123
|
-
const parsed: unknown = JSON.parse(trimmed);
|
|
124
|
-
const rows = Array.isArray(parsed) ? parsed : [parsed];
|
|
125
|
-
const entries: WindowsProcessEntry[] = [];
|
|
126
|
-
for (const row of rows) {
|
|
127
|
-
if (typeof row !== "object" || row === null) continue;
|
|
128
|
-
const record = row as { ProcessId?: unknown; ParentProcessId?: unknown; Name?: unknown; CommandLine?: unknown };
|
|
129
|
-
const pid = Number(record.ProcessId);
|
|
130
|
-
const parent = Number(record.ParentProcessId);
|
|
131
|
-
if (!Number.isSafeInteger(pid) || pid <= 0) continue;
|
|
132
|
-
entries.push({
|
|
133
|
-
pid,
|
|
134
|
-
parentPid: Number.isSafeInteger(parent) && parent > 0 ? parent : null,
|
|
135
|
-
name: typeof record.Name === "string" ? record.Name : null,
|
|
136
|
-
commandLine: typeof record.CommandLine === "string" ? record.CommandLine : null,
|
|
137
|
-
});
|
|
138
|
-
}
|
|
139
|
-
return entries;
|
|
121
|
+
// Share owner evidence, but do not add creation-time/terminate authority to this
|
|
122
|
+
// inspection-only table. Part A still requires windowsProcessSnapshot's native overlay.
|
|
123
|
+
return parseWindowsProcessSnapshot(runPowerShell(windowsProcessSnapshotScript(POWERSHELL_TIMEOUT_MS)))
|
|
124
|
+
?.map(({ pid, parentPid, name, commandLine, foreignOwner }) => ({ pid, parentPid, name, commandLine, foreignOwner })) ?? null;
|
|
140
125
|
} catch {
|
|
141
126
|
return null;
|
|
142
127
|
}
|
|
@@ -300,7 +285,7 @@ export function ancestorWrapperPids(
|
|
|
300
285
|
const parent = entry.parentPid;
|
|
301
286
|
if (parent === null || parent <= 0) break;
|
|
302
287
|
const parentEntry = byPid.get(parent);
|
|
303
|
-
if (parentEntry?.commandLine
|
|
288
|
+
if (parentEntry?.commandLine && parentEntry.foreignOwner !== true
|
|
304
289
|
&& canonicalPaths.some(path => commandLineHasPathToken(parentEntry.commandLine, path))) {
|
|
305
290
|
found.push(parent);
|
|
306
291
|
}
|
|
@@ -322,7 +307,7 @@ export function wrapperProcessesAlive(
|
|
|
322
307
|
canonicalPaths: readonly string[],
|
|
323
308
|
): number[] {
|
|
324
309
|
return processes
|
|
325
|
-
.filter(entry => entry.pid !== process.pid && entry.commandLine
|
|
310
|
+
.filter(entry => entry.pid !== process.pid && entry.foreignOwner !== true && entry.commandLine
|
|
326
311
|
&& canonicalPaths.some(path => commandLineHasPathToken(entry.commandLine, path)))
|
|
327
312
|
.map(entry => entry.pid);
|
|
328
313
|
}
|
|
@@ -335,7 +320,7 @@ export function wrapperProcessesAlive(
|
|
|
335
320
|
* guarded stop unreachable on an ordinary desktop.
|
|
336
321
|
*/
|
|
337
322
|
function isUnreadableWrapperCandidate(entry: WindowsProcessEntry): boolean {
|
|
338
|
-
return !entry.commandLine?.trim() && /^(?:wscript|cscript|cmd)\.exe$/i.test(entry.name ?? "");
|
|
323
|
+
return entry.foreignOwner !== true && !entry.commandLine?.trim() && /^(?:wscript|cscript|cmd)\.exe$/i.test(entry.name ?? "");
|
|
339
324
|
}
|
|
340
325
|
|
|
341
326
|
/** Unreadable wrapper candidates among pid's ancestors, nearest first. */
|
|
@@ -399,6 +384,9 @@ function bindStrayWrappers(
|
|
|
399
384
|
managerRegistered: true,
|
|
400
385
|
scheduleServicePid: io.winSchedulePid(),
|
|
401
386
|
});
|
|
387
|
+
if (binding.ownershipUnverified.length > 0) {
|
|
388
|
+
return unknown(WRAPPER_OWNER_REFUSAL, "evidence-unreadable");
|
|
389
|
+
}
|
|
402
390
|
if (binding.unreadable.length > 0) {
|
|
403
391
|
return unknown("a surviving scheduler wrapper has unreadable evidence", "evidence-unreadable");
|
|
404
392
|
}
|