@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -0,0 +1,341 @@
|
|
|
1
|
+
/** OS evidence for native recovery. Names and discovery records never select a trusted image. */
|
|
2
|
+
import { dlopen, ptr } from "bun:ffi";
|
|
3
|
+
import { spawnSync } from "node:child_process";
|
|
4
|
+
import { accessSync, constants, lstatSync, readdirSync, readFileSync, readlinkSync, realpathSync, statSync } from "node:fs";
|
|
5
|
+
import { basename, dirname, join, posix, win32 } from "node:path";
|
|
6
|
+
import { isStandaloneBinary } from "../lib/standalone";
|
|
7
|
+
import { resolveTrustedWindowsPowerShellExe } from "../lib/windows-elevation";
|
|
8
|
+
|
|
9
|
+
export interface RecoveryImage { app: string; cli: string; image: string; trusted: boolean; unsupported?: boolean; macRequirement?: string }
|
|
10
|
+
export interface RecoveryProcess { pid: number; born: string; image: string; app: string }
|
|
11
|
+
export interface RecoveryConnection { serverPort: number; clientPort: number }
|
|
12
|
+
export type RecoveryExecute = (command: string, args: string[], env?: Record<string, string>, captureStderr?: boolean) => string;
|
|
13
|
+
|
|
14
|
+
function executeRecovery(command: string, args: string[], env: Record<string, string> | undefined, captureStderr: boolean | undefined, timeout: number): string {
|
|
15
|
+
const result = spawnSync(command, args, {
|
|
16
|
+
encoding: "utf8", timeout, killSignal: "SIGKILL", maxBuffer: 256 * 1024, windowsHide: true,
|
|
17
|
+
stdio: ["ignore", "pipe", captureStderr ? "pipe" : "ignore"], env: { ...process.env, LC_ALL: "C", ...env },
|
|
18
|
+
});
|
|
19
|
+
if (result.error) throw result.error;
|
|
20
|
+
if (result.status !== 0) throw new Error("OS recovery observation failed");
|
|
21
|
+
return (result.stdout + (captureStderr ? result.stderr : "")).trim();
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const run: RecoveryExecute = (command, args, env, captureStderr) => executeRecovery(command, args, env, captureStderr, 2_000);
|
|
25
|
+
|
|
26
|
+
/** All synchronous OS commands share the caller's remaining proof/connection deadline. */
|
|
27
|
+
export function recoveryExecuteUntil(deadline: () => number, now: () => number): RecoveryExecute {
|
|
28
|
+
return (command, args, env, captureStderr) => {
|
|
29
|
+
const remaining = Math.floor(deadline() - now());
|
|
30
|
+
if (remaining <= 0) throw new Error("native recovery deadline elapsed");
|
|
31
|
+
return executeRecovery(command, args, env, captureStderr, Math.min(2_000, remaining));
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** Bind dynamic validation to the selected sealed executable, including universal binaries. */
|
|
36
|
+
export function macRecoveryRequirement(path: string, execute: RecoveryExecute = run): string {
|
|
37
|
+
const hashes = new Set<string>();
|
|
38
|
+
for (const arch of ["arm64", "x86_64"]) {
|
|
39
|
+
try {
|
|
40
|
+
// codesign writes its signature display to stderr. This is data, never shell source.
|
|
41
|
+
const output = execute("/usr/bin/codesign", ["--display", "--verbose=4", "--arch", arch, path], undefined, true);
|
|
42
|
+
const matches = [...output.matchAll(/^CDHash=([0-9a-f]{40})$/gmi)];
|
|
43
|
+
if (matches.length === 1) hashes.add(matches[0]![1]!.toLowerCase());
|
|
44
|
+
} catch { /* A thin binary has only one of the supported architecture slices. */ }
|
|
45
|
+
}
|
|
46
|
+
if (!hashes.size) throw new Error("native code identity unavailable");
|
|
47
|
+
return `=${[...hashes].map(hash => `cdhash H"${hash}"`).join(" or ")}`;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export function verifyMacRecoveryImage(pid: number, requirement: string | undefined, execute: RecoveryExecute = run): void {
|
|
51
|
+
if (!Number.isSafeInteger(pid) || pid <= 0 || !requirement
|
|
52
|
+
|| !/^=cdhash H"[0-9a-f]{40}"(?: or cdhash H"[0-9a-f]{40}")?$/.test(requirement)) throw new Error("native code identity unavailable");
|
|
53
|
+
execute("/usr/bin/codesign", ["--verify", "--strict", "-R", requirement, String(pid)]);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export function parseMacRecoveryPath(bytes: Uint8Array, length: number): string {
|
|
57
|
+
if (!Number.isInteger(length) || length <= 0 || length >= bytes.length || bytes.indexOf(0) !== length) throw new Error("unverified kernel image path");
|
|
58
|
+
const path = new TextDecoder("utf-8", { fatal: true }).decode(bytes.subarray(0, length));
|
|
59
|
+
if (!posix.isAbsolute(path)) throw new Error("unverified kernel image path");
|
|
60
|
+
return path;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
interface MacRecoveryLibrary {
|
|
64
|
+
symbols: {
|
|
65
|
+
proc_pidpath(pid: number, buffer: ReturnType<typeof ptr>, length: number): number;
|
|
66
|
+
};
|
|
67
|
+
close(): void;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/** Kernel path reads and process probes are separate observations, never name-based evidence. */
|
|
71
|
+
export function macRecoveryPaths(
|
|
72
|
+
library: MacRecoveryLibrary = dlopen("/usr/lib/libproc.dylib", {
|
|
73
|
+
proc_pidpath: { args: ["i32", "ptr", "u32"], returns: "i32" },
|
|
74
|
+
}),
|
|
75
|
+
probe: (pid: number, signal: 0) => unknown = process.kill,
|
|
76
|
+
) {
|
|
77
|
+
return {
|
|
78
|
+
read(pid: number): string | null {
|
|
79
|
+
if (!Number.isSafeInteger(pid) || pid <= 0 || pid > 0x7fffffff) throw new Error("unverified process PID");
|
|
80
|
+
const buffer = new Uint8Array(4096);
|
|
81
|
+
const count = library.symbols.proc_pidpath(pid, ptr(buffer), buffer.length);
|
|
82
|
+
if (count <= 0) {
|
|
83
|
+
// Do not recover an earlier errno through a second FFI call. Only a fresh ESRCH
|
|
84
|
+
// proves that the enumerated PID is gone; alive or inaccessible remains unknown.
|
|
85
|
+
try { probe(pid, 0); }
|
|
86
|
+
catch (error) { if ((error as NodeJS.ErrnoException | null)?.code === "ESRCH") return null; }
|
|
87
|
+
throw new Error("kernel image path unavailable");
|
|
88
|
+
}
|
|
89
|
+
return parseMacRecoveryPath(buffer, count);
|
|
90
|
+
},
|
|
91
|
+
close() { library.close(); },
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function fileIdentity(path: string): string {
|
|
96
|
+
const info = statSync(path, { bigint: true });
|
|
97
|
+
return `${info.dev}:${info.ino}:${info.size}:${info.mtimeNs}:${info.ctimeNs}`;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/** The selected image is a sibling of the executable actually running this compiled CLI. */
|
|
101
|
+
export function recoverySibling(execPath: string, platform: NodeJS.Platform): string | null {
|
|
102
|
+
const path = platform === "win32" ? win32 : posix;
|
|
103
|
+
if (!path.isAbsolute(execPath) || path.basename(execPath).toLowerCase() !== (platform === "win32" ? "ocx.exe" : "ocx")) return null;
|
|
104
|
+
const directory = path.dirname(execPath);
|
|
105
|
+
if (platform === "darwin" && (path.basename(directory) !== "MacOS"
|
|
106
|
+
|| path.basename(path.dirname(directory)) !== "Contents" || !path.dirname(path.dirname(directory)).endsWith(".app"))) return null;
|
|
107
|
+
return path.join(directory, platform === "win32" ? "opencodex-desktop.exe" : "opencodex-desktop");
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
function protectedPosix(path: string, rootOnly = false): boolean {
|
|
111
|
+
const info = lstatSync(path);
|
|
112
|
+
return !info.isSymbolicLink() && (info.isFile() || info.isDirectory()) && (info.mode & 0o022) === 0
|
|
113
|
+
&& (info.uid === 0 || (!rootOnly && info.uid === process.geteuid?.()));
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
function powershell(): string {
|
|
117
|
+
// The established system-directory resolver does not take powershell.exe from PATH.
|
|
118
|
+
return resolveTrustedWindowsPowerShellExe();
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
function windowsRun(script: string, env: Record<string, string>, execute: RecoveryExecute): string {
|
|
122
|
+
const utf8 = "[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new($false); ";
|
|
123
|
+
return execute(powershell(), ["-NoProfile", "-NoLogo", "-NonInteractive", "-Command", utf8 + script], env);
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/** No record, argv or environment variable can nominate an installation. */
|
|
127
|
+
export function recoveryImages(execute: RecoveryExecute = run): RecoveryImage[] {
|
|
128
|
+
const platform = process.platform;
|
|
129
|
+
if (!["linux", "darwin", "win32"].includes(platform)) return [];
|
|
130
|
+
const candidates: { cli: string; app: string; rootOnly: boolean }[] = [];
|
|
131
|
+
if (isStandaloneBinary()) {
|
|
132
|
+
const cli = realpathSync(process.execPath);
|
|
133
|
+
if (platform === "linux" && fileIdentity("/proc/self/exe") !== fileIdentity(cli)) throw new Error("running CLI image changed");
|
|
134
|
+
const app = recoverySibling(cli, platform);
|
|
135
|
+
if (app) candidates.push({ cli, app, rootOnly: false });
|
|
136
|
+
}
|
|
137
|
+
// An npm/source CLI can also credit the admin-installed Debian image. Every parent is
|
|
138
|
+
// checked below; a per-user file or registry entry cannot invent this system installation.
|
|
139
|
+
if (platform === "linux" && !candidates.some(c => c.app === "/usr/bin/opencodex-desktop")) {
|
|
140
|
+
candidates.push({ cli: "/usr/bin/ocx", app: "/usr/bin/opencodex-desktop", rootOnly: true });
|
|
141
|
+
}
|
|
142
|
+
const images: RecoveryImage[] = [];
|
|
143
|
+
for (const candidate of candidates) images.push(recoveryImageCandidate(candidate, platform, execute));
|
|
144
|
+
return images;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/** The OS/path observations a candidate needs; only the derivations, never the decisions. */
|
|
148
|
+
export interface RecoveryImageIo {
|
|
149
|
+
sibling?: (execPath: string, platform: NodeJS.Platform) => string | null;
|
|
150
|
+
identify?: (path: string) => string;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/**
|
|
154
|
+
* Observe one anchored candidate. `unsupported` is earned only by a fully observed and
|
|
155
|
+
* unchanged Windows candidate: unavailable files, thrown observations and identity drift are
|
|
156
|
+
* conflicting evidence, never a platform limitation.
|
|
157
|
+
*/
|
|
158
|
+
export function recoveryImageCandidate(
|
|
159
|
+
candidate: { cli: string; app: string; rootOnly: boolean },
|
|
160
|
+
platform: NodeJS.Platform,
|
|
161
|
+
execute: RecoveryExecute = run,
|
|
162
|
+
io: RecoveryImageIo = {},
|
|
163
|
+
): RecoveryImage {
|
|
164
|
+
const sibling = io.sibling ?? recoverySibling;
|
|
165
|
+
const identify = io.identify ?? fileIdentity;
|
|
166
|
+
const unavailable: RecoveryImage = { app: candidate.app, cli: candidate.cli, image: "unavailable", trusted: false };
|
|
167
|
+
try {
|
|
168
|
+
const app = realpathSync(candidate.app), cli = realpathSync(candidate.cli);
|
|
169
|
+
if (app !== candidate.app || dirname(app) !== dirname(cli) || sibling(cli, platform) !== app
|
|
170
|
+
|| !statSync(app).isFile() || !statSync(cli).isFile()) return unavailable;
|
|
171
|
+
accessSync(app, constants.X_OK); accessSync(cli, constants.X_OK);
|
|
172
|
+
const before = `${identify(app)}|${identify(cli)}`;
|
|
173
|
+
let trusted = false;
|
|
174
|
+
let macRequirement: string | undefined;
|
|
175
|
+
if (platform !== "win32") {
|
|
176
|
+
trusted = protectedPosix(app, candidate.rootOnly) && protectedPosix(cli, candidate.rootOnly)
|
|
177
|
+
&& protectedPosix(dirname(app), candidate.rootOnly);
|
|
178
|
+
if (candidate.rootOnly) {
|
|
179
|
+
for (let directory = dirname(app); directory !== "/"; directory = dirname(directory)) trusted &&= protectedPosix(directory, true);
|
|
180
|
+
}
|
|
181
|
+
if (platform === "darwin" && trusted) {
|
|
182
|
+
const bundle = dirname(dirname(dirname(app)));
|
|
183
|
+
const info = JSON.parse(execute("/usr/bin/plutil", ["-convert", "json", "-o", "-", join(bundle, "Contents", "Info.plist")]));
|
|
184
|
+
trusted = info.CFBundleIdentifier === "com.opencodex.desktop" && info.CFBundleExecutable === "opencodex-desktop";
|
|
185
|
+
if (trusted) {
|
|
186
|
+
execute("/usr/bin/codesign", ["--verify", "--strict", "--deep", bundle]);
|
|
187
|
+
verifyMacRecoveryImage(process.pid, macRecoveryRequirement(cli, execute), execute);
|
|
188
|
+
macRequirement = macRecoveryRequirement(app, execute);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
// Windows path/Authenticode observations cannot bind a live mapped process image to
|
|
193
|
+
// the current file. A running independently selected sibling remains unknown there.
|
|
194
|
+
// The recorded identity is the exact value the stability check compared; a fresh read
|
|
195
|
+
// here could adopt a post-check replacement as verified.
|
|
196
|
+
const afterApp = identify(app), afterCli = identify(cli);
|
|
197
|
+
const unchanged = before === `${afterApp}|${afterCli}`;
|
|
198
|
+
if (!unchanged) trusted = false;
|
|
199
|
+
return { app, cli, image: afterApp, trusted,
|
|
200
|
+
...(platform === "win32" && unchanged ? { unsupported: true } : {}), ...(macRequirement ? { macRequirement } : {}) };
|
|
201
|
+
} catch {
|
|
202
|
+
// A missing/unreadable image can still be mapped by a live process. Preserve the
|
|
203
|
+
// independently derived path for OS exclusion/unknown; it never gets positive credit.
|
|
204
|
+
try { return { ...unavailable, image: identify(candidate.app) }; }
|
|
205
|
+
catch { return unavailable; }
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
/** Parse the kernel start-time field after comm, which can itself contain spaces and ')'. */
|
|
210
|
+
export function linuxRecoveryBirth(stat: string): string {
|
|
211
|
+
const value = stat.slice(stat.lastIndexOf(")") + 2).split(" ")[19];
|
|
212
|
+
if (!value || !/^\d+$/.test(value)) throw new Error("unverified process birth");
|
|
213
|
+
return value;
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
export function recoveryProcesses(images: readonly RecoveryImage[], execute: RecoveryExecute = run): RecoveryProcess[] {
|
|
217
|
+
if (!images.length) return [];
|
|
218
|
+
if (process.platform === "linux") {
|
|
219
|
+
const result: RecoveryProcess[] = [];
|
|
220
|
+
for (const entry of readdirSync("/proc")) {
|
|
221
|
+
if (!/^\d+$/.test(entry)) continue;
|
|
222
|
+
try {
|
|
223
|
+
if (statSync(`/proc/${entry}`).uid !== process.getuid?.()) continue;
|
|
224
|
+
const app = readlinkSync(`/proc/${entry}/exe`);
|
|
225
|
+
const image = images.find(image => image.app === app || `${image.app} (deleted)` === app);
|
|
226
|
+
if (!image) continue;
|
|
227
|
+
if (app.endsWith(" (deleted)") || fileIdentity(`/proc/${entry}/exe`) !== image.image) throw new Error("native image changed");
|
|
228
|
+
result.push({ pid: Number(entry), born: linuxRecoveryBirth(readFileSync(`/proc/${entry}/stat`, "utf8")), image: image.image, app });
|
|
229
|
+
} catch (error) {
|
|
230
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
231
|
+
if (code === "ENOENT" || code === "ESRCH") continue;
|
|
232
|
+
if (code === "EACCES" || code === "EPERM") {
|
|
233
|
+
// Match the existing process inspector: an inaccessible unrelated comm can be
|
|
234
|
+
// excluded; a hidden possible Desktop is an actual unverified OS observation.
|
|
235
|
+
try { if (readFileSync(`/proc/${entry}/comm`, "utf8").trim() !== "opencodex-desktop".slice(0, 15)) continue; } catch { /* unknown */ }
|
|
236
|
+
}
|
|
237
|
+
throw error;
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
return result;
|
|
241
|
+
}
|
|
242
|
+
if (process.platform === "darwin") {
|
|
243
|
+
const output = execute("/bin/ps", ["-U", String(process.getuid!()), "-o", "pid=,lstart="]);
|
|
244
|
+
const result: RecoveryProcess[] = [];
|
|
245
|
+
const paths = macRecoveryPaths();
|
|
246
|
+
try {
|
|
247
|
+
for (const line of output.split("\n")) {
|
|
248
|
+
const row = /^\s*(\d+)\s+(\w{3}\s+\w{3}\s+\d+\s+\d{2}:\d{2}:\d{2}\s+\d{4})\s*$/.exec(line);
|
|
249
|
+
if (!row) { if (line.trim()) throw new Error("unverified process row"); continue; }
|
|
250
|
+
// ps comm is argv[0], so it cannot identify even a candidate executable.
|
|
251
|
+
const path = paths.read(Number(row[1]));
|
|
252
|
+
const image = images.find(image => image.app === path);
|
|
253
|
+
if (image) {
|
|
254
|
+
if (fileIdentity(image.app) !== image.image) throw new Error("native image changed");
|
|
255
|
+
if (image.trusted) verifyMacRecoveryImage(Number(row[1]), image.macRequirement, execute);
|
|
256
|
+
result.push({ pid: Number(row[1]), born: row[2]!, app: image.app, image: image.image });
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
} finally { paths.close(); }
|
|
260
|
+
return result;
|
|
261
|
+
}
|
|
262
|
+
if (process.platform === "win32") {
|
|
263
|
+
const output = windowsRun("$ErrorActionPreference='Stop'; $sid=[System.Security.Principal.WindowsIdentity]::GetCurrent().User.Value; $rows=@(Get-CimInstance Win32_Process -Filter \"Name='opencodex-desktop.exe'\" | ForEach-Object { $owner=Invoke-CimMethod -InputObject $_ -MethodName GetOwnerSid; if ($owner.ReturnValue -ne 0) { throw 'owner unavailable' }; if ($owner.Sid -eq $sid) { [ordered]@{pid=$_.ProcessId; app=$_.ExecutablePath; born=[string]$_.CreationDate.ToUniversalTime().Ticks} } }); ConvertTo-Json -Compress -InputObject $rows", {}, execute);
|
|
264
|
+
const rows: unknown = JSON.parse(output);
|
|
265
|
+
if (!Array.isArray(rows)) throw new Error("unverified process rows");
|
|
266
|
+
return rows.flatMap(row => {
|
|
267
|
+
if (!row || !Number.isSafeInteger(row.pid) || row.pid <= 0 || typeof row.app !== "string" || !/^[1-9]\d{0,19}$/.test(row.born)) throw new Error("unverified process row");
|
|
268
|
+
const image = images.find(image => image.app.toLowerCase() === row.app.toLowerCase());
|
|
269
|
+
if (image && fileIdentity(image.app) !== image.image) throw new Error("native image changed");
|
|
270
|
+
return image ? [{ pid: row.pid, born: row.born, app: image.app, image: image.image }] : [];
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
return [];
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
/** Match an established IPv4 connection, then require the target process to hold its inode. */
|
|
277
|
+
export function linuxRecoverySocket(table: string, connection: RecoveryConnection): string | null {
|
|
278
|
+
const address = (port: number) => `0100007F:${port.toString(16).toUpperCase().padStart(4, "0")}`;
|
|
279
|
+
const rows = table.split("\n").map(line => line.trim().split(/\s+/)).filter(row => row[1] === address(connection.serverPort)
|
|
280
|
+
&& row[2] === address(connection.clientPort) && row[3] === "01");
|
|
281
|
+
return rows.length === 1 && /^\d+$/.test(rows[0]![9] ?? "") ? rows[0]![9]! : null;
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
function linuxHeldSockets(pid: number): Set<string> {
|
|
285
|
+
const inodes = new Set<string>();
|
|
286
|
+
for (const fd of readdirSync(`/proc/${pid}/fd`)) {
|
|
287
|
+
try {
|
|
288
|
+
const match = /^socket:\[(\d+)\]$/.exec(readlinkSync(`/proc/${pid}/fd/${fd}`));
|
|
289
|
+
if (match) inodes.add(match[1]!);
|
|
290
|
+
} catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; }
|
|
291
|
+
}
|
|
292
|
+
return inodes;
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
/** Discovery comes from the target's actual loopback listening sockets, never a locator file. */
|
|
296
|
+
export function linuxRecoveryListeners(table: string, heldInodes: ReadonlySet<string>): number[] {
|
|
297
|
+
const ports = new Set<number>();
|
|
298
|
+
for (const line of table.split("\n")) {
|
|
299
|
+
const row = line.trim().split(/\s+/);
|
|
300
|
+
const address = /^0100007F:([0-9A-F]{4})$/.exec(row[1] ?? "");
|
|
301
|
+
if (address && row[2] === "00000000:0000" && row[3] === "0A" && heldInodes.has(row[9]!)) {
|
|
302
|
+
const port = Number.parseInt(address[1]!, 16);
|
|
303
|
+
if (port > 0) ports.add(port);
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
return [...ports].sort((a, b) => a - b);
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
export function recoveryListenerPorts(process: RecoveryProcess, execute: RecoveryExecute = run): number[] {
|
|
310
|
+
if (globalThis.process.platform === "linux") {
|
|
311
|
+
return linuxRecoveryListeners(readFileSync(`/proc/${process.pid}/net/tcp`, "utf8"), linuxHeldSockets(process.pid));
|
|
312
|
+
}
|
|
313
|
+
if (globalThis.process.platform === "darwin") {
|
|
314
|
+
const output = execute("/usr/sbin/lsof", ["-nP", "-a", "-p", String(process.pid), "-iTCP", "-sTCP:LISTEN", "-FfnT"]);
|
|
315
|
+
const ports = output.split(/\nf/).slice(1).flatMap(record => {
|
|
316
|
+
const port = /^n127\.0\.0\.1:(\d+)$/m.exec(record);
|
|
317
|
+
return port && record.split("\n").includes("TST=LISTEN") ? [Number(port[1])] : [];
|
|
318
|
+
});
|
|
319
|
+
return [...new Set(ports)].sort((a, b) => a - b);
|
|
320
|
+
}
|
|
321
|
+
throw new Error("OS listener observation unavailable");
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
/** The socket stays open during both observations; a listener on the same port is insufficient. */
|
|
325
|
+
export function recoveryConnectionOwner(process: RecoveryProcess, connection: RecoveryConnection, execute: RecoveryExecute = run): string {
|
|
326
|
+
if (globalThis.process.platform === "linux") {
|
|
327
|
+
const inode = linuxRecoverySocket(readFileSync(`/proc/${process.pid}/net/tcp`, "utf8"), connection);
|
|
328
|
+
if (!inode) throw new Error("accepted socket unavailable");
|
|
329
|
+
if (!linuxHeldSockets(process.pid).has(inode)) throw new Error("accepted socket belongs to another process");
|
|
330
|
+
return inode;
|
|
331
|
+
}
|
|
332
|
+
if (globalThis.process.platform === "darwin") {
|
|
333
|
+
const output = execute("/usr/sbin/lsof", ["-nP", "-a", "-p", String(process.pid), "-iTCP", "-sTCP:ESTABLISHED", "-FfnT"]);
|
|
334
|
+
const target = `127.0.0.1:${connection.serverPort}->127.0.0.1:${connection.clientPort}`;
|
|
335
|
+
const records = output.split(/\nf/).slice(1).filter(record => record.split("\n").includes(`n${target}`)
|
|
336
|
+
&& record.split("\n").includes("TST=ESTABLISHED"));
|
|
337
|
+
if (records.length !== 1 || !/^\d+[rwu]?(?:\n|$)/.test(records[0]!)) throw new Error("accepted socket unavailable");
|
|
338
|
+
return records[0]!.split("\n")[0]!;
|
|
339
|
+
}
|
|
340
|
+
throw new Error("OS connection observation unavailable");
|
|
341
|
+
}
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
/** A live native producer, never a filename or process name, preserves an unclaimed recovery. */
|
|
2
|
+
import { randomBytes } from "node:crypto";
|
|
3
|
+
import { realpathSync } from "node:fs";
|
|
4
|
+
import { connect, type Socket } from "node:net";
|
|
5
|
+
import { isAbsolute, resolve, win32 } from "node:path";
|
|
6
|
+
import { getConfigDir } from "../config/paths";
|
|
7
|
+
import { recoveryConnectionOwner, recoveryExecuteUntil, recoveryImages, recoveryListenerPorts, recoveryProcesses,
|
|
8
|
+
type RecoveryConnection, type RecoveryImage, type RecoveryProcess } from "./desktop-recovery-process";
|
|
9
|
+
|
|
10
|
+
const DOMAIN = "ocx-desktop-recovery-v1";
|
|
11
|
+
const PROBE_BUDGET_MS = 8_000;
|
|
12
|
+
const CONNECTION_BUDGET_MS = 750;
|
|
13
|
+
const MAX_RESPONSE_BYTES = 8_512;
|
|
14
|
+
/** An `unsupported` unknown is a platform's structural lack of live-image binding, not conflicting evidence. */
|
|
15
|
+
export type DesktopRecoveryEvidence = { kind: "none" | "recovering" | "stopped" | "unknown"; unsupported?: boolean };
|
|
16
|
+
export interface RecoveryEndpoint { pid: number; port: number }
|
|
17
|
+
interface RecoveryAnswer { pid: number; instance: string; state: "recovering" | "stopped" | "unknown"; home: string | null }
|
|
18
|
+
|
|
19
|
+
/** Rust's Windows canonicalizer uses the verbatim prefix; Node's normalizer does not. */
|
|
20
|
+
export function recoveryHomeIdentity(home: string, platform = process.platform): string {
|
|
21
|
+
if (platform !== "win32") return home;
|
|
22
|
+
const normalized = home.startsWith("\\\\?\\UNC\\") ? `\\\\${home.slice(8)}`
|
|
23
|
+
: home.startsWith("\\\\?\\") ? home.slice(4) : home;
|
|
24
|
+
return win32.normalize(normalized).toLowerCase();
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export function parseRecoveryAnswer(text: string, nonce: string, endpoint: RecoveryEndpoint, instance?: string): RecoveryAnswer {
|
|
28
|
+
if (Buffer.byteLength(text) > MAX_RESPONSE_BYTES || !text.endsWith("\n")) throw new Error("invalid recovery answer");
|
|
29
|
+
const fields = text.slice(0, -1).split(" ");
|
|
30
|
+
if (fields.length !== 6 || fields[0] !== DOMAIN || fields[1] !== nonce || !/^[0-9a-f]{32}$/.test(fields[2]!)
|
|
31
|
+
|| (instance !== undefined && fields[2] !== instance) || fields[3] !== String(endpoint.pid)
|
|
32
|
+
|| !["recovering", "stopped", "unknown"].includes(fields[4]!)) throw new Error("invalid recovery binding");
|
|
33
|
+
const state = fields[4] as RecoveryAnswer["state"];
|
|
34
|
+
const encoded = fields[5]!;
|
|
35
|
+
if (state === "unknown" && encoded === "-") return { pid: endpoint.pid, instance: fields[2]!, state, home: null };
|
|
36
|
+
if (!/^(?:[0-9a-f]{2}){1,4096}$/.test(encoded)) throw new Error("invalid recovery scope");
|
|
37
|
+
const home = new TextDecoder("utf-8", { fatal: true }).decode(Buffer.from(encoded, "hex"));
|
|
38
|
+
if (!isAbsolute(home) || /[\x00\r\n]/.test(home)) throw new Error("invalid recovery scope");
|
|
39
|
+
return { pid: endpoint.pid, instance: fields[2]!, state, home };
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
interface RecoverySession {
|
|
43
|
+
connection: RecoveryConnection;
|
|
44
|
+
ask(nonce: string): Promise<string>;
|
|
45
|
+
close(): void;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
function openRecoverySession(endpoint: RecoveryEndpoint, timeoutMs: number): Promise<RecoverySession> {
|
|
49
|
+
return new Promise((resolveSession, rejectSession) => {
|
|
50
|
+
const socket: Socket = connect({ host: "127.0.0.1", port: endpoint.port, localAddress: "127.0.0.1", family: 4 });
|
|
51
|
+
let pending: { resolve(text: string): void; reject(error: Error): void } | undefined;
|
|
52
|
+
let data = Buffer.alloc(0);
|
|
53
|
+
let failed = false;
|
|
54
|
+
const fail = () => {
|
|
55
|
+
failed = true;
|
|
56
|
+
const error = new Error("native recovery connection unavailable");
|
|
57
|
+
pending?.reject(error); pending = undefined; rejectSession(error); socket.destroy();
|
|
58
|
+
};
|
|
59
|
+
const timer = setTimeout(fail, Math.max(1, timeoutMs));
|
|
60
|
+
socket.on("error", fail);
|
|
61
|
+
socket.on("end", fail);
|
|
62
|
+
socket.on("close", () => { clearTimeout(timer); if (pending) fail(); });
|
|
63
|
+
socket.on("data", bytes => {
|
|
64
|
+
const chunk = typeof bytes === "string" ? Buffer.from(bytes) : bytes;
|
|
65
|
+
if (!pending || data.length + chunk.length > MAX_RESPONSE_BYTES) { fail(); return; }
|
|
66
|
+
data = Buffer.concat([data, chunk]);
|
|
67
|
+
const end = data.indexOf(10);
|
|
68
|
+
if (end < 0) return;
|
|
69
|
+
if (end !== data.length - 1) { fail(); return; }
|
|
70
|
+
const request = pending; pending = undefined;
|
|
71
|
+
request.resolve(data.toString("utf8")); data = Buffer.alloc(0);
|
|
72
|
+
});
|
|
73
|
+
socket.once("connect", () => {
|
|
74
|
+
if (socket.localAddress !== "127.0.0.1" || socket.remoteAddress !== "127.0.0.1" || !socket.localPort) { fail(); return; }
|
|
75
|
+
resolveSession({
|
|
76
|
+
connection: { serverPort: endpoint.port, clientPort: socket.localPort },
|
|
77
|
+
ask: nonce => new Promise((yes, no) => {
|
|
78
|
+
if (failed || socket.destroyed || pending) { no(new Error("native recovery connection closed")); return; }
|
|
79
|
+
pending = { resolve: yes, reject: no };
|
|
80
|
+
socket.write(`${DOMAIN} ${nonce}\n`);
|
|
81
|
+
}),
|
|
82
|
+
close: () => { clearTimeout(timer); socket.destroy(); },
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export interface DesktopRecoveryIo {
|
|
89
|
+
images(): RecoveryImage[];
|
|
90
|
+
processes(images: readonly RecoveryImage[]): RecoveryProcess[];
|
|
91
|
+
listeners(process: RecoveryProcess): number[];
|
|
92
|
+
open(endpoint: RecoveryEndpoint, timeoutMs: number): Promise<RecoverySession>;
|
|
93
|
+
owner(process: RecoveryProcess, connection: RecoveryConnection): string;
|
|
94
|
+
home(): string;
|
|
95
|
+
now(): number;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
const same = (a: RecoveryProcess, b: RecoveryProcess | undefined) => b !== undefined
|
|
99
|
+
&& a.pid === b.pid && a.born === b.born && a.app === b.app && a.image === b.image;
|
|
100
|
+
|
|
101
|
+
/** Positive evidence is tied to an independently selected image, the same OS process and socket. */
|
|
102
|
+
export async function inspectDesktopRecovery(overrides: Partial<DesktopRecoveryIo> = {}): Promise<DesktopRecoveryEvidence> {
|
|
103
|
+
const now = overrides.now ?? performance.now.bind(performance);
|
|
104
|
+
const deadline = now() + PROBE_BUDGET_MS;
|
|
105
|
+
let commandDeadline = deadline;
|
|
106
|
+
const execute = recoveryExecuteUntil(() => commandDeadline, now);
|
|
107
|
+
const io: DesktopRecoveryIo = {
|
|
108
|
+
images: () => recoveryImages(execute), processes: images => recoveryProcesses(images, execute),
|
|
109
|
+
listeners: process => recoveryListenerPorts(process, execute), open: openRecoverySession,
|
|
110
|
+
owner: (process, connection) => recoveryConnectionOwner(process, connection, execute),
|
|
111
|
+
home: () => { try { return realpathSync(getConfigDir()); } catch { return resolve(getConfigDir()); } },
|
|
112
|
+
now, ...overrides,
|
|
113
|
+
};
|
|
114
|
+
try {
|
|
115
|
+
const images = io.images();
|
|
116
|
+
// Untrusted files and endpoint claims are never read, even for a real other-home Desktop.
|
|
117
|
+
if (!images.length) return { kind: "none" };
|
|
118
|
+
const processes = io.processes(images);
|
|
119
|
+
if (!processes.length) return { kind: "none" };
|
|
120
|
+
if (processes.length > 4) return { kind: "unknown" };
|
|
121
|
+
let result: DesktopRecoveryEvidence = { kind: "none" };
|
|
122
|
+
for (const process of processes) {
|
|
123
|
+
const image = images.find(image => image.app === process.app && image.image === process.image);
|
|
124
|
+
if (!image?.trusted) return image?.unsupported === true ? { kind: "unknown", unsupported: true } : { kind: "unknown" };
|
|
125
|
+
let evidence: DesktopRecoveryEvidence = { kind: "unknown" };
|
|
126
|
+
const ports = io.listeners(process);
|
|
127
|
+
if (ports.length > 8 || ports.some(port => !Number.isSafeInteger(port) || port < 1 || port > 65535)) return { kind: "unknown" };
|
|
128
|
+
for (const port of new Set(ports)) {
|
|
129
|
+
const remaining = deadline - io.now();
|
|
130
|
+
if (remaining <= 0) return { kind: "unknown" };
|
|
131
|
+
let session: RecoverySession | undefined;
|
|
132
|
+
try {
|
|
133
|
+
const endpoint = { pid: process.pid, port };
|
|
134
|
+
commandDeadline = Math.min(deadline, io.now() + CONNECTION_BUDGET_MS);
|
|
135
|
+
session = await io.open(endpoint, commandDeadline - io.now());
|
|
136
|
+
// A TCP handshake may finish just before accept() installs the descriptor. Allow
|
|
137
|
+
// two short scheduling turns, never protocol traffic, before requiring its owner.
|
|
138
|
+
let socket: string | undefined;
|
|
139
|
+
for (let attempt = 0; attempt < 3; attempt++) {
|
|
140
|
+
try { socket = io.owner(process, session.connection); break; }
|
|
141
|
+
catch (error) {
|
|
142
|
+
if (attempt === 2 || io.now() >= commandDeadline) throw error;
|
|
143
|
+
await new Promise(resolve => setTimeout(resolve, 10));
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
if (!socket || io.now() >= commandDeadline) throw new Error("native accepted socket unverified");
|
|
147
|
+
const firstNonce = randomBytes(32).toString("hex");
|
|
148
|
+
const first = parseRecoveryAnswer(await session.ask(firstNonce), firstNonce, endpoint);
|
|
149
|
+
if (!same(process, io.processes(images).find(p => p.pid === process.pid))) throw new Error("native instance changed");
|
|
150
|
+
const lastNonce = randomBytes(32).toString("hex");
|
|
151
|
+
const last = parseRecoveryAnswer(await session.ask(lastNonce), lastNonce, endpoint, first.instance);
|
|
152
|
+
if (io.owner(process, session.connection) !== socket
|
|
153
|
+
|| !same(process, io.processes(images).find(p => p.pid === process.pid))
|
|
154
|
+
|| first.home !== last.home || io.now() >= commandDeadline) throw new Error("native recovery changed");
|
|
155
|
+
evidence = !last.home || last.state === "unknown" ? { kind: "unknown" }
|
|
156
|
+
: recoveryHomeIdentity(last.home) !== recoveryHomeIdentity(io.home()) ? { kind: "none" } : { kind: last.state };
|
|
157
|
+
break;
|
|
158
|
+
} catch { /* An unrelated endpoint cannot prove what the independently observed app wants. */ }
|
|
159
|
+
finally { session?.close(); commandDeadline = deadline; }
|
|
160
|
+
}
|
|
161
|
+
if (evidence.kind === "unknown") return evidence;
|
|
162
|
+
if (evidence.kind !== "none") {
|
|
163
|
+
if (result.kind !== "none" && result.kind !== evidence.kind) return { kind: "unknown" };
|
|
164
|
+
result = evidence;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
return result;
|
|
168
|
+
} catch {
|
|
169
|
+
// Only failed OS/installation observations reach here; locator contents grant no veto.
|
|
170
|
+
return { kind: "unknown" };
|
|
171
|
+
}
|
|
172
|
+
}
|
|
@@ -840,10 +840,13 @@ export function isWindowsSchedulerEndBenign(error: unknown): boolean {
|
|
|
840
840
|
* that *succeeds* while the wrapper survives and respawns. That verification lives
|
|
841
841
|
* on the stop-verification path (poll across the restart window), not here.
|
|
842
842
|
*/
|
|
843
|
-
export function stopWindows(): void {
|
|
843
|
+
export function stopWindows(beforeMutation?: () => void): void {
|
|
844
|
+
let refused = false;
|
|
845
|
+
const gate = beforeMutation && (() => { try { beforeMutation(); } catch (error) { refused = true; throw error; } });
|
|
844
846
|
try {
|
|
845
|
-
schtasks(["/end", "/tn", TASK]);
|
|
847
|
+
schtasks(["/end", "/tn", TASK], gate);
|
|
846
848
|
} catch (error) {
|
|
849
|
+
if (refused) throw error;
|
|
847
850
|
if (isWindowsSchedulerEndBenign(error)) return;
|
|
848
851
|
}
|
|
849
852
|
}
|
|
@@ -894,7 +897,7 @@ export function uninstallWindows(): void {
|
|
|
894
897
|
}
|
|
895
898
|
const afterDelete = probeWindowsSchedulerTask(TASK);
|
|
896
899
|
if (afterDelete.status === "present") {
|
|
897
|
-
throw new Error(`Task Scheduler task ${TASK} is still present after delete — refusing to remove service assets.
|
|
900
|
+
throw new Error(`Task Scheduler task ${TASK} is still present after delete — refusing to remove service assets. Run this command from an elevated terminal (Run as administrator): schtasks /delete /tn ${TASK} /f`);
|
|
898
901
|
}
|
|
899
902
|
if (afterDelete.status === "unknown") {
|
|
900
903
|
throw new Error(`Task Scheduler task ${TASK} presence could not be verified after delete — refusing to remove service assets.`);
|
|
@@ -71,7 +71,7 @@ function windowsSchtasks(): string {
|
|
|
71
71
|
|
|
72
72
|
let querySchtasksForTests: ((args: string[]) => string) | null = null;
|
|
73
73
|
|
|
74
|
-
export function querySchtasks(args: string[]): string {
|
|
74
|
+
export function querySchtasks(args: string[], beforeMutation?: () => void): string {
|
|
75
75
|
// The repository preload isolates HOME and OPENCODEX_HOME, but Task Scheduler is
|
|
76
76
|
// machine-global. A partially-faked service test once fell through here and replaced the
|
|
77
77
|
// user's real `opencodex-proxy` task with a launcher inside its temporary test home; the
|
|
@@ -86,8 +86,10 @@ export function querySchtasks(args: string[]): string {
|
|
|
86
86
|
+ "inject the scheduler operation instead of calling the live manager.",
|
|
87
87
|
);
|
|
88
88
|
}
|
|
89
|
-
if (querySchtasksForTests) return querySchtasksForTests(args);
|
|
90
|
-
|
|
89
|
+
if (querySchtasksForTests) { beforeMutation?.(); return querySchtasksForTests(args); }
|
|
90
|
+
const file = windowsSchtasks();
|
|
91
|
+
beforeMutation?.();
|
|
92
|
+
return runFile(file, args);
|
|
91
93
|
}
|
|
92
94
|
|
|
93
95
|
/** Test-only seam for Task Scheduler query used by presence probes. */
|
|
@@ -95,11 +97,28 @@ export function setQuerySchtasksForTests(next: ((args: string[]) => string) | nu
|
|
|
95
97
|
querySchtasksForTests = next;
|
|
96
98
|
}
|
|
97
99
|
|
|
98
|
-
export function schtasks(args: string[]
|
|
100
|
+
export function schtasks(args: string[], control: (() => void) | {
|
|
101
|
+
run?: (args: string[]) => string;
|
|
102
|
+
probeTask?: () => WindowsSchedulerTaskProbe;
|
|
103
|
+
} = {}): string {
|
|
104
|
+
const beforeMutation = typeof control === "function" ? control : undefined;
|
|
105
|
+
const io = typeof control === "function" ? {} : control;
|
|
106
|
+
let refused = false;
|
|
107
|
+
const gate = beforeMutation && (() => { try { beforeMutation(); } catch (error) { refused = true; throw error; } });
|
|
99
108
|
try {
|
|
100
|
-
return querySchtasks(args);
|
|
109
|
+
return io.run ? io.run(args) : querySchtasks(args, gate);
|
|
101
110
|
} catch (error) {
|
|
102
|
-
throw
|
|
111
|
+
if (refused) throw error;
|
|
112
|
+
let taskPresent = false;
|
|
113
|
+
const normalized = args.map(arg => arg.toLowerCase());
|
|
114
|
+
const taskIndex = normalized.indexOf("/tn");
|
|
115
|
+
if (normalized[0] === "/delete" && taskIndex > 0 && normalized[taskIndex + 1] === TASK
|
|
116
|
+
&& error && typeof error === "object" && "status" in error && error.status === 1) {
|
|
117
|
+
try {
|
|
118
|
+
taskPresent = (io.probeTask ?? probeWindowsSchedulerTask)().status === "present";
|
|
119
|
+
} catch { /* An unreadable task is not proof of an access denial. */ }
|
|
120
|
+
}
|
|
121
|
+
throw toWindowsSchtasksError(error, args, taskPresent);
|
|
103
122
|
}
|
|
104
123
|
}
|
|
105
124
|
|
|
@@ -174,6 +193,10 @@ export async function inspectWindowsSchedulerServiceStatus(io: {
|
|
|
174
193
|
}
|
|
175
194
|
|
|
176
195
|
export function schtasksErrorDetail(error: unknown): string {
|
|
196
|
+
if (error && typeof error === "object"
|
|
197
|
+
&& ("status" in error || "stderr" in error || "stdout" in error)) {
|
|
198
|
+
return toWindowsSchtasksError(error, ["/query"]).message;
|
|
199
|
+
}
|
|
177
200
|
return error instanceof Error ? error.message : String(error);
|
|
178
201
|
}
|
|
179
202
|
|
package/src/stall-timeout.ts
CHANGED
|
@@ -43,3 +43,50 @@ export function resolveStallTimeoutSec(configuredSec: number | undefined, option
|
|
|
43
43
|
export function resolveStallTimeoutMs(configuredSec: number | undefined, options: StallTimeoutOptions = {}): number {
|
|
44
44
|
return resolveStallTimeoutSec(configuredSec, options) * 1_000;
|
|
45
45
|
}
|
|
46
|
+
|
|
47
|
+
/** Header-arrival (connect) deadline applied to public upstreams when the operator sets none. */
|
|
48
|
+
export const DEFAULT_CONNECT_TIMEOUT_MS = 200_000;
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Resolve the per-request header-arrival (connect) deadline in milliseconds.
|
|
52
|
+
*
|
|
53
|
+
* This is the budget `fetchWithHeaderTimeout` applies from dispatch until the upstream returns its
|
|
54
|
+
* first response headers — it covers DNS, TCP, TLS, and the wait for response headers, but NOT the
|
|
55
|
+
* body/stream that follows (that is the stall budget, see {@link resolveStallTimeoutMs}).
|
|
56
|
+
*
|
|
57
|
+
* An explicit value always wins: `0` (or any non-positive) disables the deadline everywhere, and a
|
|
58
|
+
* positive value applies verbatim to local and public upstreams alike. Only when the operator left
|
|
59
|
+
* it unset does the destination matter. A local upstream (loopback / private / `.local` / `.lan`,
|
|
60
|
+
* via {@link StallTimeoutOptions.localUpstream}) resolves to disabled (`0`): LM Studio, Ollama, and
|
|
61
|
+
* similar CPU-bound backends can spend minutes in prompt prefill before the first response header
|
|
62
|
+
* arrives on a large prompt, and a flat ceiling would cut that healthy turn. A public upstream
|
|
63
|
+
* keeps the {@link DEFAULT_CONNECT_TIMEOUT_MS} safety deadline.
|
|
64
|
+
*
|
|
65
|
+
* Disabling is expressed as `0`: `fetchWithHeaderTimeout` arms no header clock for a non-positive
|
|
66
|
+
* budget. Client cancellation and any enclosing overall deadline remain authoritative.
|
|
67
|
+
*/
|
|
68
|
+
export function resolveConnectTimeoutMs(configuredMs: number | undefined, options: StallTimeoutOptions = {}): number {
|
|
69
|
+
const { localUpstream = false } = options;
|
|
70
|
+
if (typeof configuredMs === "number" && Number.isFinite(configuredMs)) {
|
|
71
|
+
if (configuredMs <= 0) return 0;
|
|
72
|
+
return Math.max(1, Math.ceil(configuredMs));
|
|
73
|
+
}
|
|
74
|
+
return localUpstream ? 0 : DEFAULT_CONNECT_TIMEOUT_MS;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** Legacy minimum public JSON body-read allowance, independent of the local stall policy. */
|
|
78
|
+
export const MIN_JSON_BODY_READ_MS = 5_000;
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Resolve the total/inactivity budget for reading a buffered non-streaming JSON response body.
|
|
82
|
+
*
|
|
83
|
+
* Local JSON reads use the stall budget for inactivity only; their enclosing signal owns any
|
|
84
|
+
* overall deadline. An unset local budget disables the body clock. Public reads preserve their
|
|
85
|
+
* legacy connect-derived total/inactivity allowance, including the five-second floor, independently
|
|
86
|
+
* of the new local policy. This does not extend the response-header timer into the body phase.
|
|
87
|
+
*/
|
|
88
|
+
export function resolveJsonBodyReadTimeoutMs(configuredSec: number | undefined, options: StallTimeoutOptions = {}, configuredConnectMs?: number): number {
|
|
89
|
+
return options.localUpstream
|
|
90
|
+
? resolveStallTimeoutMs(configuredSec, options)
|
|
91
|
+
: Math.max(configuredConnectMs ?? DEFAULT_CONNECT_TIMEOUT_MS, MIN_JSON_BODY_READ_MS);
|
|
92
|
+
}
|