@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
package/src/server/ws-bridge.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { isolateCodexPoolAccountHeaders } from "../codex/forward-transport-headers";
|
|
2
|
+
import { isUntypedBareUpstreamError } from "./bare-upstream-error";
|
|
2
3
|
import type { NativeResponseControl } from "./responses/native-response-control";
|
|
4
|
+
import type { HandleResponsesOptions } from "./responses/core-options";
|
|
3
5
|
import type { ServerWebSocket } from "bun";
|
|
4
6
|
import { responsesJsonEventSequence } from "./responses-json-events";
|
|
5
7
|
import { FORWARD_HEADERS } from "../adapters/openai-responses";
|
|
@@ -8,7 +10,8 @@ import { headersForCodexAuthContext } from "../codex/auth-context";
|
|
|
8
10
|
import type { ResponsesTerminalStatus } from "../bridge";
|
|
9
11
|
import type { DataPlaneAdmission } from "./auth-cors";
|
|
10
12
|
import type { AdmissionLease, AdmissionReservation } from "../lib/admission";
|
|
11
|
-
import { BoundedSseFrameBuffer } from "./sse-frame-buffer";
|
|
13
|
+
import { BoundedSseFrameBuffer, MAX_CLIENT_SSE_FRAME_BYTES } from "./sse-frame-buffer";
|
|
14
|
+
import type { LinkTrafficFlow } from "../link/traffic";
|
|
12
15
|
import { sseDataPayload as parseSseBlock } from "./sse-payload-rewrite";
|
|
13
16
|
import { safeResponseHeaders } from "./safe-response-headers";
|
|
14
17
|
import type { AudioSocketTarget } from "./audio-dictation";
|
|
@@ -18,6 +21,7 @@ import { isProxyError } from "../lib/client-error-body";
|
|
|
18
21
|
import { WORKFLOW_LOCAL_REFUSAL_HEADER } from "../lib/workflow-budget";
|
|
19
22
|
import { NativeContinuationRefusalError } from "./responses/native-continuation-refusal";
|
|
20
23
|
import type { UsageClient } from "../usage/client";
|
|
24
|
+
import { LINK_WS_LIMITS, linkPumpTimer, linkPumpWaitObserver } from "./index/link-websocket-limits";
|
|
21
25
|
|
|
22
26
|
export { safeResponseHeaders } from "./safe-response-headers";
|
|
23
27
|
|
|
@@ -40,6 +44,8 @@ export interface WsData {
|
|
|
40
44
|
* attribution.
|
|
41
45
|
*/
|
|
42
46
|
admission?: DataPlaneAdmission;
|
|
47
|
+
/** Local-only loopback replay identity; revalidated each turn without retaining its secret. */
|
|
48
|
+
replayPrincipal?: HandleResponsesOptions["replayPrincipal"];
|
|
43
49
|
authContext?: CodexAuthContext; // last resolved account decision for observability/registry cleanup
|
|
44
50
|
cancel?: () => void; // cancels the in-flight stream reader/fetch
|
|
45
51
|
turnId?: number; // monotonically increasing per socket; prevents stale frames after replacement turns
|
|
@@ -77,6 +83,29 @@ export interface WsData {
|
|
|
77
83
|
/** Turn/account ownership retained for the complete sideband socket lifetime. */
|
|
78
84
|
liveTurnAdmissionLease?: AdmissionLease;
|
|
79
85
|
admissionLease?: AdmissionReservation<ServerWebSocket<WsData>>;
|
|
86
|
+
/** Set only on Remote Link sockets: native steering and injection are unavailable there. */
|
|
87
|
+
nativeControlDisabled?: boolean;
|
|
88
|
+
/** Present only on a Remote Link socket (src/server/index/link-websocket.ts). */
|
|
89
|
+
link?: LinkSocketBinding;
|
|
90
|
+
/** Remote Link sockets only: one observer per admitted turn, by the handler's turn id. */
|
|
91
|
+
linkTurnObserver?: (turnId: number) => import("./link-turn").LinkTurnObserver;
|
|
92
|
+
/** Remote Link sockets only: the turn's cleanup ran, so its capture entry goes. */
|
|
93
|
+
linkTurnEnded?: (turnId: number) => void;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/** The verified identity and lease owner of one Remote Link socket; no secret is kept. */
|
|
97
|
+
export interface LinkSocketBinding {
|
|
98
|
+
readonly linkId: string;
|
|
99
|
+
readonly keyId: string;
|
|
100
|
+
readonly fingerprint: string;
|
|
101
|
+
/** Set once the socket is fenced (revoked or switched off); later frames are dropped. */
|
|
102
|
+
fenced: boolean;
|
|
103
|
+
/** Releases every lease of the upgrade exactly once, from the close callback. */
|
|
104
|
+
readonly leases: { closed(): void };
|
|
105
|
+
/** Set by the link pump while it waits for Bun's drain; the link handler calls it on drain and close. */
|
|
106
|
+
drained?: () => void;
|
|
107
|
+
/** This socket's flow in the Home's per-link traffic book: message payload bytes each way (link-websocket.ts). */
|
|
108
|
+
traffic?: LinkTrafficFlow;
|
|
80
109
|
}
|
|
81
110
|
|
|
82
111
|
export interface LiveSidebandUpstreamFailure {
|
|
@@ -112,12 +141,14 @@ export function buildResponsesWsData(
|
|
|
112
141
|
admissionLease?: AdmissionReservation<ServerWebSocket<WsData>>,
|
|
113
142
|
sessionLaneId?: string,
|
|
114
143
|
client?: UsageClient,
|
|
144
|
+
replayPrincipal?: HandleResponsesOptions["replayPrincipal"],
|
|
115
145
|
): WsData {
|
|
116
146
|
// Auth is handshake-time only on this path: the per-frame contexts have no
|
|
117
147
|
// request headers left to re-resolve from, so the decision rides along here.
|
|
118
148
|
return {
|
|
119
149
|
headers,
|
|
120
150
|
admission,
|
|
151
|
+
...(replayPrincipal ? { replayPrincipal } : {}),
|
|
121
152
|
...(client ? { client } : {}),
|
|
122
153
|
...(admissionLease ? { admissionLease } : {}),
|
|
123
154
|
...(sessionLaneId ? { sessionLaneId } : {}),
|
|
@@ -192,6 +223,9 @@ export function sendTextFrame(ws: ServerWebSocket<WsData>, payload: string): voi
|
|
|
192
223
|
const result = ws.send(payload);
|
|
193
224
|
if (result === 0) throw new WsSendDroppedError();
|
|
194
225
|
// Bun returns -1 when queued with backpressure. That is accepted; a later 0 is the hard failure.
|
|
226
|
+
// A link socket counts what Bun took, queued or written; a local socket has no flow and pays one property read.
|
|
227
|
+
const flow = ws.data.link?.traffic;
|
|
228
|
+
if (flow) flow.fromHome(Buffer.byteLength(payload));
|
|
195
229
|
}
|
|
196
230
|
|
|
197
231
|
export function sendJsonFrame(ws: ServerWebSocket<WsData>, payload: Record<string, unknown>): void {
|
|
@@ -269,6 +303,8 @@ export async function pumpResponsesSseToWebSocket(
|
|
|
269
303
|
untilEof?: boolean;
|
|
270
304
|
onTerminal?: ResponsesTerminalReporter;
|
|
271
305
|
onSsePayload?: ResponsesPayloadObserver;
|
|
306
|
+
/** The body is the upstream itself (native control), so no relay tail follows a bare envelope. */
|
|
307
|
+
rawUpstream?: boolean;
|
|
272
308
|
} = {},
|
|
273
309
|
): Promise<void> {
|
|
274
310
|
const reader = sseStream.getReader();
|
|
@@ -282,10 +318,55 @@ export async function pumpResponsesSseToWebSocket(
|
|
|
282
318
|
};
|
|
283
319
|
const cancel = () => {
|
|
284
320
|
clientCancelled = true;
|
|
321
|
+
wakeLinkWait?.();
|
|
285
322
|
void reader.cancel().catch(() => {});
|
|
286
323
|
};
|
|
287
324
|
ws.data.cancel = cancel;
|
|
288
325
|
|
|
326
|
+
// Remote Link sockets only (design T4 6.2): after a send that leaves more than the threshold
|
|
327
|
+
// buffered, wait for Bun's drain before the next event, even within one upstream chunk, and feed
|
|
328
|
+
// the framer one bounded slice of a chunk at a time. Local sockets keep the single synchronous loop.
|
|
329
|
+
const link = ws.data.link;
|
|
330
|
+
let wakeLinkWait: (() => void) | undefined;
|
|
331
|
+
let linkStopped = false;
|
|
332
|
+
const waitForLinkDrain = async (): Promise<void> => {
|
|
333
|
+
if (!link || ws.getBufferedAmount() <= LINK_WS_LIMITS.sendThresholdBytes) return;
|
|
334
|
+
let stalled = false;
|
|
335
|
+
const observer = linkPumpWaitObserver();
|
|
336
|
+
observer?.(true);
|
|
337
|
+
await new Promise<void>(resolve => {
|
|
338
|
+
const clock = linkPumpTimer();
|
|
339
|
+
// One deadline for the whole wait, however many drain callbacks arrive before it ends.
|
|
340
|
+
const timer = clock.start(() => { stalled = true; done(); }, LINK_WS_LIMITS.sendStallMs);
|
|
341
|
+
function done(): void {
|
|
342
|
+
clock.stop(timer);
|
|
343
|
+
if (link!.drained === drained) link!.drained = undefined;
|
|
344
|
+
if (wakeLinkWait === done) wakeLinkWait = undefined;
|
|
345
|
+
resolve();
|
|
346
|
+
}
|
|
347
|
+
// Bun's drain means "ready for more", not "below the threshold": re-check on every callback.
|
|
348
|
+
function drained(): void {
|
|
349
|
+
if (!clientCancelled && ws.readyState === OPEN && ws.getBufferedAmount() > LINK_WS_LIMITS.sendThresholdBytes) return;
|
|
350
|
+
done();
|
|
351
|
+
}
|
|
352
|
+
link.drained = drained;
|
|
353
|
+
wakeLinkWait = done;
|
|
354
|
+
});
|
|
355
|
+
observer?.(false);
|
|
356
|
+
if (stalled && !clientCancelled) {
|
|
357
|
+
try { ws.close(1011, "link websocket send stalled"); } catch { /* already closing */ }
|
|
358
|
+
throw new WsSendDroppedError();
|
|
359
|
+
}
|
|
360
|
+
};
|
|
361
|
+
const slicesOf = (chunk: Uint8Array): Uint8Array[] => {
|
|
362
|
+
if (!link || chunk.byteLength <= LINK_WS_LIMITS.framerSliceBytes) return [chunk];
|
|
363
|
+
const slices: Uint8Array[] = [];
|
|
364
|
+
for (let offset = 0; offset < chunk.byteLength; offset += LINK_WS_LIMITS.framerSliceBytes) {
|
|
365
|
+
slices.push(chunk.subarray(offset, offset + LINK_WS_LIMITS.framerSliceBytes));
|
|
366
|
+
}
|
|
367
|
+
return slices;
|
|
368
|
+
};
|
|
369
|
+
|
|
289
370
|
const decoder = new TextDecoder();
|
|
290
371
|
const framer = new BoundedSseFrameBuffer();
|
|
291
372
|
let terminalSeen = false;
|
|
@@ -294,12 +375,22 @@ export async function pumpResponsesSseToWebSocket(
|
|
|
294
375
|
const handlePayload = (payload: string): boolean => {
|
|
295
376
|
if (!isCurrent()) return true;
|
|
296
377
|
if (payload === "[DONE]") return false;
|
|
297
|
-
try {
|
|
298
|
-
options.onSsePayload?.(payload);
|
|
299
|
-
} catch {
|
|
300
|
-
/* payload observation must not affect WebSocket delivery */
|
|
301
|
-
}
|
|
302
378
|
const type = payloadType(payload);
|
|
379
|
+
let untypedBare = false;
|
|
380
|
+
if (!type) {
|
|
381
|
+
try { untypedBare = isUntypedBareUpstreamError(JSON.parse(payload)); } catch { /* protocol error below */ }
|
|
382
|
+
}
|
|
383
|
+
// A relayed stream follows an untyped envelope with its own response.failed, so the envelope
|
|
384
|
+
// waits for it. A raw upstream body has no such tail: the envelope stays the protocol error
|
|
385
|
+
// it always was and is not recorded as a verdict the client never received.
|
|
386
|
+
if (!(untypedBare && options.rawUpstream)) {
|
|
387
|
+
try {
|
|
388
|
+
options.onSsePayload?.(payload);
|
|
389
|
+
} catch {
|
|
390
|
+
/* payload observation must not affect WebSocket delivery */
|
|
391
|
+
}
|
|
392
|
+
}
|
|
393
|
+
if (untypedBare && !options.rawUpstream) return false;
|
|
303
394
|
if (!type) {
|
|
304
395
|
reportTerminal("incomplete");
|
|
305
396
|
sendProtocolError(ws, 502, "Invalid JSON payload in upstream SSE frame");
|
|
@@ -322,14 +413,22 @@ export async function pumpResponsesSseToWebSocket(
|
|
|
322
413
|
};
|
|
323
414
|
|
|
324
415
|
try {
|
|
325
|
-
while (!terminalSeen) {
|
|
416
|
+
reading: while (!terminalSeen) {
|
|
326
417
|
const { done, value } = await reader.read();
|
|
327
418
|
if (done) break;
|
|
328
|
-
for (const
|
|
329
|
-
const
|
|
330
|
-
|
|
419
|
+
for (const slice of slicesOf(value)) {
|
|
420
|
+
for (const frame of framer.feed(slice)) {
|
|
421
|
+
const payload = parseSseBlock(decoder.decode(frame.block));
|
|
422
|
+
if (payload && handlePayload(payload)) continue reading;
|
|
423
|
+
if (link) {
|
|
424
|
+
await waitForLinkDrain();
|
|
425
|
+
if (clientCancelled || ws.readyState !== OPEN) { linkStopped = true; break reading; }
|
|
426
|
+
}
|
|
427
|
+
}
|
|
331
428
|
}
|
|
332
429
|
}
|
|
430
|
+
// A link pump stopped by a cancel or close mid-chunk has nothing left to deliver or report.
|
|
431
|
+
if (linkStopped) return;
|
|
333
432
|
const tail = framer.finish();
|
|
334
433
|
if (!terminalSeen && tail.byteLength > 0) {
|
|
335
434
|
const payload = parseSseBlock(decoder.decode(tail));
|
|
@@ -394,6 +493,81 @@ export function sendResponsesJsonAsEvents(
|
|
|
394
493
|
onTerminal?.(finalStatus);
|
|
395
494
|
}
|
|
396
495
|
|
|
496
|
+
/**
|
|
497
|
+
* Remote Link sockets only (design T4 6.2): wait until the send buffer is at or below the threshold, re-checking on
|
|
498
|
+
* every drain callback, under one stall deadline for the whole wait. A stall closes the socket with 1011 and throws,
|
|
499
|
+
* as the SSE pump does; a closed socket or a cancelled turn ends the wait, and only a live, current turn's stall
|
|
500
|
+
* closes the socket.
|
|
501
|
+
*/
|
|
502
|
+
async function waitForLinkSendRoom(ws: ServerWebSocket<WsData>, turn: { cancelled: boolean; wake?: () => void; isCurrent: () => boolean }): Promise<void> {
|
|
503
|
+
const link = ws.data.link;
|
|
504
|
+
if (!link || turn.cancelled || ws.getBufferedAmount() <= LINK_WS_LIMITS.sendThresholdBytes) return;
|
|
505
|
+
let stalled = false;
|
|
506
|
+
const observer = linkPumpWaitObserver();
|
|
507
|
+
observer?.(true);
|
|
508
|
+
await new Promise<void>(resolve => {
|
|
509
|
+
const clock = linkPumpTimer();
|
|
510
|
+
const timer = clock.start(() => { stalled = true; done(); }, LINK_WS_LIMITS.sendStallMs);
|
|
511
|
+
function done(): void {
|
|
512
|
+
clock.stop(timer);
|
|
513
|
+
if (link!.drained === drained) link!.drained = undefined;
|
|
514
|
+
if (turn.wake === done) turn.wake = undefined;
|
|
515
|
+
resolve();
|
|
516
|
+
}
|
|
517
|
+
function drained(): void {
|
|
518
|
+
if (!turn.cancelled && ws.readyState === OPEN && ws.getBufferedAmount() > LINK_WS_LIMITS.sendThresholdBytes) return;
|
|
519
|
+
done();
|
|
520
|
+
}
|
|
521
|
+
link.drained = drained;
|
|
522
|
+
turn.wake = done;
|
|
523
|
+
});
|
|
524
|
+
observer?.(false);
|
|
525
|
+
if (stalled && !turn.cancelled && turn.isCurrent()) {
|
|
526
|
+
try { ws.close(1011, "link websocket send stalled"); } catch { /* already closing */ }
|
|
527
|
+
throw new WsSendDroppedError();
|
|
528
|
+
}
|
|
529
|
+
}
|
|
530
|
+
|
|
531
|
+
/**
|
|
532
|
+
* sendResponsesJsonAsEvents for a link socket: each synthesized event waits for send room first, the turn's cancel
|
|
533
|
+
* (supersession or close) ends that wait, and an event larger than the client frame limit is never sent: the turn
|
|
534
|
+
* ends incomplete with the 502 error frame the SSE pump sends for an oversized upstream frame.
|
|
535
|
+
*/
|
|
536
|
+
async function sendResponsesJsonAsLinkEvents(
|
|
537
|
+
ws: ServerWebSocket<WsData>,
|
|
538
|
+
response: Record<string, unknown>,
|
|
539
|
+
isCurrent: () => boolean,
|
|
540
|
+
onTerminal?: ResponsesTerminalReporter,
|
|
541
|
+
onPayload?: ResponsesPayloadObserver,
|
|
542
|
+
): Promise<void> {
|
|
543
|
+
const finalStatus = response.status === "failed" || response.status === "incomplete" ? response.status : "completed";
|
|
544
|
+
const turn: { cancelled: boolean; wake?: () => void; isCurrent: () => boolean } = { cancelled: false, isCurrent };
|
|
545
|
+
const previous = ws.data.cancel;
|
|
546
|
+
const cancel = () => {
|
|
547
|
+
turn.cancelled = true;
|
|
548
|
+
turn.wake?.();
|
|
549
|
+
previous?.();
|
|
550
|
+
};
|
|
551
|
+
ws.data.cancel = cancel;
|
|
552
|
+
try {
|
|
553
|
+
for (const frame of responsesJsonEventSequence(response)) {
|
|
554
|
+
await waitForLinkSendRoom(ws, turn);
|
|
555
|
+
if (turn.cancelled || !isCurrent() || ws.readyState !== OPEN) return;
|
|
556
|
+
const text = JSON.stringify(frame);
|
|
557
|
+
if (Buffer.byteLength(text) > MAX_CLIENT_SSE_FRAME_BYTES) {
|
|
558
|
+
onTerminal?.("incomplete");
|
|
559
|
+
sendJsonFrame(ws, buildWsErrorFrame(502, protocolError("synthesized response event exceeded " + MAX_CLIENT_SSE_FRAME_BYTES + " bytes")));
|
|
560
|
+
return;
|
|
561
|
+
}
|
|
562
|
+
try { onPayload?.(text); } catch { /* payload observation must not affect WebSocket delivery */ }
|
|
563
|
+
sendTextFrame(ws, text);
|
|
564
|
+
}
|
|
565
|
+
onTerminal?.(finalStatus);
|
|
566
|
+
} finally {
|
|
567
|
+
if (ws.data.cancel === cancel) ws.data.cancel = previous;
|
|
568
|
+
}
|
|
569
|
+
}
|
|
570
|
+
|
|
397
571
|
function errorPayloadFromText(text: string): Record<string, unknown> {
|
|
398
572
|
try {
|
|
399
573
|
const json = JSON.parse(text) as { error?: unknown };
|
|
@@ -417,6 +591,7 @@ export async function sendResponseToWebSocket(
|
|
|
417
591
|
untilEof?: boolean;
|
|
418
592
|
onTerminal?: ResponsesTerminalReporter;
|
|
419
593
|
onSsePayload?: ResponsesPayloadObserver;
|
|
594
|
+
rawUpstream?: boolean;
|
|
420
595
|
} = {},
|
|
421
596
|
): Promise<void> {
|
|
422
597
|
if (!isCurrent()) {
|
|
@@ -451,6 +626,7 @@ export async function sendResponseToWebSocket(
|
|
|
451
626
|
untilEof: options.untilEof,
|
|
452
627
|
onTerminal: options.onTerminal,
|
|
453
628
|
onSsePayload: options.onSsePayload,
|
|
629
|
+
rawUpstream: options.rawUpstream,
|
|
454
630
|
});
|
|
455
631
|
return;
|
|
456
632
|
}
|
|
@@ -459,7 +635,8 @@ export async function sendResponseToWebSocket(
|
|
|
459
635
|
const text = await response.text();
|
|
460
636
|
if (!isCurrent()) return;
|
|
461
637
|
const json = JSON.parse(text) as Record<string, unknown>;
|
|
462
|
-
|
|
638
|
+
if (ws.data.link) await sendResponsesJsonAsLinkEvents(ws, json, isCurrent, options.onTerminal, options.onSsePayload);
|
|
639
|
+
else sendResponsesJsonAsEvents(ws, json, options.onTerminal, options.onSsePayload);
|
|
463
640
|
return;
|
|
464
641
|
}
|
|
465
642
|
|
|
@@ -474,6 +651,7 @@ export async function sendResponseToWebSocket(
|
|
|
474
651
|
untilEof: options.untilEof,
|
|
475
652
|
onTerminal: options.onTerminal,
|
|
476
653
|
onSsePayload: options.onSsePayload,
|
|
654
|
+
rawUpstream: options.rawUpstream,
|
|
477
655
|
});
|
|
478
656
|
return;
|
|
479
657
|
}
|
|
@@ -483,7 +661,8 @@ export async function sendResponseToWebSocket(
|
|
|
483
661
|
const trimmed = text.trim();
|
|
484
662
|
if (trimmed.startsWith("{")) {
|
|
485
663
|
const json = JSON.parse(trimmed) as Record<string, unknown>;
|
|
486
|
-
|
|
664
|
+
if (ws.data.link) await sendResponsesJsonAsLinkEvents(ws, json, isCurrent, options.onTerminal, options.onSsePayload);
|
|
665
|
+
else sendResponsesJsonAsEvents(ws, json, options.onTerminal, options.onSsePayload);
|
|
487
666
|
return;
|
|
488
667
|
}
|
|
489
668
|
|
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ocx service stop / uninstall / remove on Windows (#7771, 030 "Where it sits").
|
|
3
|
+
*
|
|
4
|
+
* - stop: Part A instead of stopWindows; a result other than stopped/absent refuses and
|
|
5
|
+
* leaves the proxy alone. Then a teardown receipt is claimed before the tracked proxy is
|
|
6
|
+
* stopped, so the proxy defers the shared teardown to this command. When the claim fails
|
|
7
|
+
* while this home owns the shared teardown, no undeferred child stop is sent: a wrapper
|
|
8
|
+
* appearing later could relaunch the proxy after its own teardown ran. Part B replaces
|
|
9
|
+
* the legacy survivor check after a Part A stopped. With an absent Part A every candidate
|
|
10
|
+
* endpoint must be proven dead before restore; the receipt is kept otherwise.
|
|
11
|
+
* - uninstall / remove: Part A before the task is deleted (a looping wrapper used to
|
|
12
|
+
* outlive its task, #764), refusing on anything but stopped/absent, then a receipt that
|
|
13
|
+
* carries Part A's record before the tracked proxy stop (Part A leaves the task
|
|
14
|
+
* registered, so a receipt-less POST answers 409 respawnable_service), then Part B. The
|
|
15
|
+
* receipt is kept until the caller's restore succeeds.
|
|
16
|
+
*/
|
|
17
|
+
import { clearPendingTeardown, claimPendingTeardown } from "../config/pending-teardown";
|
|
18
|
+
import { readClientConnectionState } from "../client/state";
|
|
19
|
+
import type { ProbeEndpoint } from "../cli/uninstall-plan";
|
|
20
|
+
import { probeEndpointLiveness, type EndpointLiveness } from "../server/proxy-liveness";
|
|
21
|
+
import { resolveTrackedProxyTarget, stopTrackedProxyForServiceCommand } from "./orchestration";
|
|
22
|
+
import {
|
|
23
|
+
confirmWindowsServiceStop,
|
|
24
|
+
describeWindowsPartA,
|
|
25
|
+
describeWindowsPartB,
|
|
26
|
+
endpointsAllDead,
|
|
27
|
+
runWindowsServiceStopPartA,
|
|
28
|
+
windowsPartARecord,
|
|
29
|
+
windowsRemovalEndpoints,
|
|
30
|
+
windowsServiceStopPort,
|
|
31
|
+
windowsStopAdmission,
|
|
32
|
+
windowsStopRemainingMs,
|
|
33
|
+
} from "./windows-service-stop";
|
|
34
|
+
import { WINDOWS_STOP_CAPS } from "./windows-stop-budget";
|
|
35
|
+
|
|
36
|
+
export interface WindowsServiceStopCommandIo {
|
|
37
|
+
ownsSharedTeardown?: () => boolean;
|
|
38
|
+
claim?: typeof claimPendingTeardown;
|
|
39
|
+
stopTracked?: typeof stopTrackedProxyForServiceCommand;
|
|
40
|
+
resolveTarget?: typeof resolveTrackedProxyTarget;
|
|
41
|
+
/**
|
|
42
|
+
* Tri-state probe of an endpoint. Only a definitive "dead" on EVERY candidate permits
|
|
43
|
+
* deleting the task; "live" and "unknown" refuse and keep the receipt.
|
|
44
|
+
*/
|
|
45
|
+
endpointLiveness?: (endpoint: { hostname: string; port: number }) => Promise<EndpointLiveness>;
|
|
46
|
+
/**
|
|
47
|
+
* Every endpoint this home could be serving on, for the absent-Part-A proof. Defaults to
|
|
48
|
+
* `endpointsToProve(readRuntimePort(), loadConfig())` — the set `ocx uninstall` proves.
|
|
49
|
+
*/
|
|
50
|
+
endpoints?: () => ProbeEndpoint[];
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** Shared teardown belongs to this home unless a client connection owns the routing. */
|
|
54
|
+
function ownsSharedTeardownByDefault(): boolean {
|
|
55
|
+
try {
|
|
56
|
+
return readClientConnectionState().kind !== "connected";
|
|
57
|
+
} catch {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function withNonce(nonce: string | undefined): { ok: true; nonce?: string } {
|
|
63
|
+
return nonce ? { ok: true, nonce } : { ok: true };
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Everything ocx service stop does before its restore. ok=false means the command fails
|
|
68
|
+
* and restores nothing; nonce is the receipt to complete once the restore succeeded.
|
|
69
|
+
*/
|
|
70
|
+
export async function windowsServiceStopBeforeRestore(io: WindowsServiceStopCommandIo = {}): Promise<{ ok: boolean; nonce?: string }> {
|
|
71
|
+
const port = windowsServiceStopPort();
|
|
72
|
+
const partA = await runWindowsServiceStopPartA({ admission: windowsStopAdmission({ orphanDiscovery: true }) });
|
|
73
|
+
if (partA.outcome !== "stopped" && partA.outcome !== "absent") {
|
|
74
|
+
console.error("❌ service stop did not take effect: the Windows service could not be proven stopped (" + partA.outcome + ").");
|
|
75
|
+
console.error(" " + describeWindowsPartA(partA));
|
|
76
|
+
console.error(" The proxy was left running and native Codex was NOT restored.");
|
|
77
|
+
return { ok: false };
|
|
78
|
+
}
|
|
79
|
+
let nonce: string | undefined;
|
|
80
|
+
const target = await (io.resolveTarget ?? resolveTrackedProxyTarget)();
|
|
81
|
+
if (target && (io.ownsSharedTeardown ?? ownsSharedTeardownByDefault)()) {
|
|
82
|
+
if (!target.endpoint) { console.error("❌ service stop cannot defer teardown without the target's endpoint."); return { ok: false }; }
|
|
83
|
+
try {
|
|
84
|
+
nonce = (io.claim ?? claimPendingTeardown)(target.endpoint, "exact", process.pid, undefined, windowsPartARecord(partA)).nonce;
|
|
85
|
+
} catch (error) {
|
|
86
|
+
console.error("❌ service stop could not record its deferred-teardown receipt: " + (error instanceof Error ? error.message : String(error)));
|
|
87
|
+
console.error(" The proxy was left running: stopping it without the receipt would let it tear down client config while a wrapper can still relaunch it.");
|
|
88
|
+
return { ok: false };
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
const endpoints = partA.outcome === "absent" ? (io.endpoints ?? windowsRemovalEndpoints)() : [];
|
|
92
|
+
if (target?.endpoint && partA.outcome === "absent" && !endpoints.some(e => e.hostname === target.endpoint!.hostname && e.port === target.endpoint!.port)) endpoints.push(target.endpoint);
|
|
93
|
+
await (io.stopTracked ?? stopTrackedProxyForServiceCommand)({
|
|
94
|
+
target,
|
|
95
|
+
...(nonce ? { deferSharedTeardownNonce: nonce } : {}),
|
|
96
|
+
skipPortWait: partA.outcome === "stopped",
|
|
97
|
+
orphanDiscoveryCapMs: WINDOWS_STOP_CAPS.orphanDiscovery,
|
|
98
|
+
});
|
|
99
|
+
if (partA.outcome === "absent") {
|
|
100
|
+
const proof = await endpointsAllDead(endpoints, io.endpointLiveness ?? probeEndpointLiveness);
|
|
101
|
+
if (proof.dead) return withNonce(nonce);
|
|
102
|
+
console.error(proof.live.length ? "❌ service stop did not take effect: a proxy is still listening on port " + proof.live.join(", ") + "."
|
|
103
|
+
: "❌ service stop did not take effect: endpoint liveness could not be confirmed on port " + proof.unknown.join(", ") + ".");
|
|
104
|
+
console.error(" Native Codex was NOT restored; the teardown receipt is kept for a later stop.");
|
|
105
|
+
return { ok: false };
|
|
106
|
+
}
|
|
107
|
+
const partB = await confirmWindowsServiceStop({ port: target?.endpoint?.port ?? port, remainingMs: windowsStopRemainingMs() });
|
|
108
|
+
if (partB.outcome === "freed") return withNonce(nonce);
|
|
109
|
+
if (partB.outcome === "port-held-by-foreign") {
|
|
110
|
+
console.warn("⚠️ " + describeWindowsPartB(partB));
|
|
111
|
+
return withNonce(nonce);
|
|
112
|
+
}
|
|
113
|
+
console.error("❌ service stop did not take effect: " + describeWindowsPartB(partB));
|
|
114
|
+
console.error(" Native Codex was NOT restored; the teardown receipt is kept so a later stop can finish it.");
|
|
115
|
+
return { ok: false };
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/** After a successful restore: the obligation the receipt recorded is discharged. */
|
|
119
|
+
export function completeWindowsServiceStopReceipt(nonce: string | undefined, clear: (nonce: string) => boolean = clearPendingTeardown): void {
|
|
120
|
+
if (!nonce) return;
|
|
121
|
+
if (!clear(nonce)) console.warn("⚠️ The deferred-teardown receipt could not be removed; the next 'ocx stop' will finish it.");
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* ocx service uninstall / remove: stop and confirm before the task is deleted.
|
|
126
|
+
*
|
|
127
|
+
* Part A leaves the scheduler task registered, so a receipt-less POST still answers
|
|
128
|
+
* `respawnable_service` (409) and the uninstall then refuses with the proxy left running.
|
|
129
|
+
* The receipt is therefore claimed with Part A's record before the child stop, exactly as
|
|
130
|
+
* `ocx service stop` does, and kept until the caller's restore succeeds.
|
|
131
|
+
*/
|
|
132
|
+
export async function windowsServiceRemovalStop(
|
|
133
|
+
io: Pick<WindowsServiceStopCommandIo, "stopTracked" | "resolveTarget" | "ownsSharedTeardown" | "claim" | "endpointLiveness" | "endpoints"> = {},
|
|
134
|
+
): Promise<{ ok: boolean; nonce?: string }> {
|
|
135
|
+
const port = windowsServiceStopPort();
|
|
136
|
+
const partA = await runWindowsServiceStopPartA({ admission: windowsStopAdmission({ orphanDiscovery: true }) });
|
|
137
|
+
if (partA.outcome !== "stopped" && partA.outcome !== "absent") {
|
|
138
|
+
console.error("❌ Service uninstall refused: the Windows service could not be proven stopped (" + partA.outcome + "), so the task was not deleted.");
|
|
139
|
+
console.error(" " + describeWindowsPartA(partA));
|
|
140
|
+
return { ok: false };
|
|
141
|
+
}
|
|
142
|
+
let nonce: string | undefined;
|
|
143
|
+
const target = await (io.resolveTarget ?? resolveTrackedProxyTarget)();
|
|
144
|
+
const endpoints = partA.outcome === "absent" ? (io.endpoints ?? windowsRemovalEndpoints)() : [];
|
|
145
|
+
if (target?.endpoint && partA.outcome === "absent" && !endpoints.some(e => e.hostname === target.endpoint!.hostname && e.port === target.endpoint!.port)) endpoints.push(target.endpoint);
|
|
146
|
+
if (target && (io.ownsSharedTeardown ?? ownsSharedTeardownByDefault)()) {
|
|
147
|
+
if (!target.endpoint) { console.error("❌ Service uninstall cannot defer teardown without the target's endpoint."); return { ok: false }; }
|
|
148
|
+
try {
|
|
149
|
+
nonce = (io.claim ?? claimPendingTeardown)(target.endpoint, "exact", process.pid, undefined, windowsPartARecord(partA)).nonce;
|
|
150
|
+
} catch (error) {
|
|
151
|
+
console.error("❌ Service uninstall could not record its deferred-teardown receipt: " + (error instanceof Error ? error.message : String(error)));
|
|
152
|
+
console.error(" The proxy was left running: stopping it without the receipt would let it tear down client config while the task can still relaunch it.");
|
|
153
|
+
return { ok: false };
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
await (io.stopTracked ?? stopTrackedProxyForServiceCommand)({
|
|
157
|
+
target,
|
|
158
|
+
...(nonce ? { deferSharedTeardownNonce: nonce } : {}),
|
|
159
|
+
skipPortWait: partA.outcome === "stopped",
|
|
160
|
+
orphanDiscoveryCapMs: WINDOWS_STOP_CAPS.orphanDiscovery,
|
|
161
|
+
});
|
|
162
|
+
if (partA.outcome === "absent") {
|
|
163
|
+
// "absent" says no manager is registered, not that nothing is serving. `findLiveProxy`
|
|
164
|
+
// inside the tracked stop can return null when its discovery cap runs out while the
|
|
165
|
+
// endpoint is live, and `proxyStillLiveAfterStop` returns that same null for a probe
|
|
166
|
+
// that timed out or failed — which the old branch read as success. Ask the endpoints
|
|
167
|
+
// themselves, tri-state, and delete the task only when EVERY candidate is definitively
|
|
168
|
+
// "dead": the receipt endpoint is only one of the addresses this home can serve on, and
|
|
169
|
+
// a stale runtime record pointing at a closed port used to prove removal while the
|
|
170
|
+
// configured port had a live listener. No respawn hold: with no manager registered
|
|
171
|
+
// there is nothing to relaunch the proxy.
|
|
172
|
+
const proof = await endpointsAllDead(endpoints, io.endpointLiveness ?? probeEndpointLiveness);
|
|
173
|
+
if (proof.dead) return withNonce(nonce);
|
|
174
|
+
console.error(proof.live.length > 0
|
|
175
|
+
? "❌ Service uninstall refused: a proxy is still listening on port " + proof.live.join(", ") + "."
|
|
176
|
+
: "❌ Service uninstall refused: the endpoint on port " + (proof.unknown.join(", ") || port) + " could not be confirmed down.");
|
|
177
|
+
console.error(" The task was not deleted. Stop that proxy, then re-run 'ocx service uninstall'.");
|
|
178
|
+
return { ok: false };
|
|
179
|
+
}
|
|
180
|
+
const partB = await confirmWindowsServiceStop({ port: target?.endpoint?.port ?? port, remainingMs: windowsStopRemainingMs() });
|
|
181
|
+
if (partB.outcome === "freed") return withNonce(nonce);
|
|
182
|
+
if (partB.outcome === "port-held-by-foreign") {
|
|
183
|
+
console.warn("⚠️ " + describeWindowsPartB(partB));
|
|
184
|
+
return withNonce(nonce);
|
|
185
|
+
}
|
|
186
|
+
console.error("❌ Service uninstall refused: " + describeWindowsPartB(partB) + " The task was not deleted.");
|
|
187
|
+
console.error(" The teardown receipt is kept so a later stop can finish it.");
|
|
188
|
+
return { ok: false };
|
|
189
|
+
}
|
package/src/service/cli.ts
CHANGED
|
@@ -15,7 +15,7 @@ import { collectServiceStatusJson } from "./status-json";
|
|
|
15
15
|
import { assertServiceAuthEnvironment } from "./auth-preflight";
|
|
16
16
|
import { assertServiceEnvironmentMatchesInstall } from "./guards";
|
|
17
17
|
import { resolveServiceListenPort } from "./definition";
|
|
18
|
-
import { reportServiceServing } from "./health";
|
|
18
|
+
import { reportServiceServing, servingRuntimePid } from "./health";
|
|
19
19
|
import { platformOps, proxyStillLiveAfterStop, stopTrackedProxyForServiceCommand, installServiceSafely, installFreshWindowsSchedulerSafely, removeServiceInstallState, isServiceInstalled } from "./orchestration";
|
|
20
20
|
import { repairService } from "./repair";
|
|
21
21
|
import type { ServiceRepairVerb } from "./repair";
|
|
@@ -32,6 +32,7 @@ import { runServiceClaim } from "./claim";
|
|
|
32
32
|
import { createSupervisionLatch, desktopServiceCommandRefusal } from "./desktop-command-guard";
|
|
33
33
|
import { linuxServiceBootHint } from "./linux-linger";
|
|
34
34
|
import { diagnoseDesktopStartup, desktopLoginStatusSummary } from "./desktop-startup";
|
|
35
|
+
import { completeWindowsServiceStopReceipt, windowsServiceRemovalStop, windowsServiceStopBeforeRestore } from "./cli-windows-stop";
|
|
35
36
|
|
|
36
37
|
/**
|
|
37
38
|
* `restart` is NO LONGER folded into `repair`.
|
|
@@ -276,6 +277,11 @@ export async function serviceCommand(...args: (string | undefined)[]): Promise<v
|
|
|
276
277
|
// repaired and serving on port 10100" — and the checkmark was the false half: the
|
|
277
278
|
// existing registration had been restarted, not repaired (#4914).
|
|
278
279
|
let repairError: unknown;
|
|
280
|
+
// A restart must end with a different runtime answering. The pid that answers now is what
|
|
281
|
+
// the serving check compares against; a surviving wrapper's old child still answers healthz
|
|
282
|
+
// and used to be reported as "restarted and serving" (#7771). Repair may keep a healthy
|
|
283
|
+
// runtime by design, so only restart asks for a replacement.
|
|
284
|
+
const replacing = verb === "restart" ? await servingRuntimePid() : null;
|
|
279
285
|
try {
|
|
280
286
|
await repairService({ verb, supervisionLatch });
|
|
281
287
|
} catch (error) {
|
|
@@ -286,7 +292,7 @@ export async function serviceCommand(...args: (string | undefined)[]): Promise<v
|
|
|
286
292
|
// defect class this unit exists to close. Windows bakes its port into the
|
|
287
293
|
// scheduler wrapper or the WinSW XML, both of which installedServiceListenPort()
|
|
288
294
|
// now reads.
|
|
289
|
-
await reportServiceServing(verb === "restart" ? "restarted" : "repaired", {}, repairError);
|
|
295
|
+
await reportServiceServing(verb === "restart" ? "restarted" : "repaired", { replacing }, repairError);
|
|
290
296
|
if (repairError !== undefined) process.exitCode = 1;
|
|
291
297
|
return;
|
|
292
298
|
}
|
|
@@ -393,17 +399,26 @@ export async function serviceCommand(...args: (string | undefined)[]): Promise<v
|
|
|
393
399
|
}
|
|
394
400
|
case "stop": {
|
|
395
401
|
assertServiceEnvironmentMatchesInstall();
|
|
396
|
-
//
|
|
397
|
-
//
|
|
398
|
-
|
|
399
|
-
|
|
402
|
+
// Windows (#7771): Part A, the teardown receipt, the tracked proxy and Part B, with the
|
|
403
|
+
// restore below only after all of them; the receipt completes once the restore ran.
|
|
404
|
+
let windowsReceipt: string | undefined;
|
|
405
|
+
if (process.platform === "win32") {
|
|
406
|
+
const checked = await windowsServiceStopBeforeRestore();
|
|
407
|
+
if (!checked.ok) { process.exitCode = 1; break; }
|
|
408
|
+
windowsReceipt = checked.nonce;
|
|
409
|
+
} else {
|
|
410
|
+
// Only stop what is actually installed. The unguarded call ran a real `launchctl unload`
|
|
411
|
+
// (and its Linux twin) even with nothing installed.
|
|
412
|
+
if (ops.status() !== null || isServiceInstalled()) {
|
|
413
|
+
ops.stop();
|
|
414
|
+
}
|
|
415
|
+
await stopTrackedProxyForServiceCommand();
|
|
400
416
|
}
|
|
401
|
-
await stopTrackedProxyForServiceCommand();
|
|
402
417
|
{
|
|
403
418
|
// Verify rather than trust the stop command: a surviving wrapper respawns its child
|
|
404
419
|
// seconds later, and restoring native Codex on top of a live proxy is the failure #764
|
|
405
|
-
// reports as "stop reports success without stopping the proxy".
|
|
406
|
-
const survivor = await proxyStillLiveAfterStop();
|
|
420
|
+
// reports as "stop reports success without stopping the proxy". Windows confirmed it above.
|
|
421
|
+
const survivor = process.platform === "win32" ? null : await proxyStillLiveAfterStop();
|
|
407
422
|
if (survivor) {
|
|
408
423
|
console.error(
|
|
409
424
|
`❌ service stop did not take effect: a proxy is still listening on port ${survivor.port}.`
|
|
@@ -436,6 +451,8 @@ export async function serviceCommand(...args: (string | undefined)[]): Promise<v
|
|
|
436
451
|
console.error(`⚠️ ${grok.message}`);
|
|
437
452
|
process.exitCode = 1;
|
|
438
453
|
}
|
|
454
|
+
// The shared teardown ran; only then is the receipt's obligation discharged.
|
|
455
|
+
if (restore.success && grok.ok) completeWindowsServiceStopReceipt(windowsReceipt);
|
|
439
456
|
}
|
|
440
457
|
break;
|
|
441
458
|
}
|
|
@@ -460,10 +477,20 @@ export async function serviceCommand(...args: (string | undefined)[]): Promise<v
|
|
|
460
477
|
case "uninstall":
|
|
461
478
|
case "remove":
|
|
462
479
|
assertServiceEnvironmentMatchesInstall();
|
|
463
|
-
|
|
464
|
-
|
|
480
|
+
// #7771: the removal's receipt is claimed before the child stop and discharged only
|
|
481
|
+
// after the shared restore below, exactly like `ocx service stop`.
|
|
482
|
+
let windowsRemovalReceipt: string | undefined;
|
|
483
|
+
if (process.platform === "win32") {
|
|
484
|
+
// #7771: a task deleted under a live `:loop` wrapper leaves it relaunching the proxy.
|
|
485
|
+
const removal = await windowsServiceRemovalStop();
|
|
486
|
+
if (!removal.ok) process.exit(1);
|
|
487
|
+
windowsRemovalReceipt = removal.nonce;
|
|
488
|
+
} else {
|
|
489
|
+
try { ops.stop(); } catch (err) {
|
|
490
|
+
console.warn(`⚠️ Service stop failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
491
|
+
}
|
|
492
|
+
await stopTrackedProxyForServiceCommand();
|
|
465
493
|
}
|
|
466
|
-
await stopTrackedProxyForServiceCommand();
|
|
467
494
|
try {
|
|
468
495
|
ops.uninstall();
|
|
469
496
|
} catch (err) {
|
|
@@ -486,6 +513,8 @@ export async function serviceCommand(...args: (string | undefined)[]): Promise<v
|
|
|
486
513
|
console.error(`⚠️ ${grok.message}`);
|
|
487
514
|
process.exitCode = 1;
|
|
488
515
|
}
|
|
516
|
+
// The shared teardown ran; only then is the receipt's obligation discharged.
|
|
517
|
+
if (restore.success && grok.ok) completeWindowsServiceStopReceipt(windowsRemovalReceipt);
|
|
489
518
|
}
|
|
490
519
|
removeServiceInstallState();
|
|
491
520
|
const tokenCleanup = removeServiceTokenAfterUninstall();
|