@bitkyc08/opencodex 2.93.0 → 2.95.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-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- 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 +27 -7
- 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-project-context.ts +3 -3
- 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 +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- 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/single-system.ts +24 -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/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- 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 +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- 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 +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- 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 +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- 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 +62 -73
- package/src/cli/init.ts +2 -2
- 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/internal-command.ts +29 -2
- 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-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- 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-approval.ts +15 -1
- 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 +86 -23
- 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-api.ts +2 -2
- 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 +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- 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/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- 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-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- 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 +259 -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 +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -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 +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -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 +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- 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 +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- 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/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- 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 +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- 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 +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- 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/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- 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/file-identity.ts +15 -0
- 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-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- 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/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- 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 +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- 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 +242 -0
- package/src/local-credentials/inventory.ts +405 -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/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- 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/antigravity-discovery-diagnostics.ts +65 -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 +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- 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/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- 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/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -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 +21 -45
- package/src/server/index/websocket-handler.ts +10 -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 +455 -549
- 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 +80 -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/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -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 +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- 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/request-log.ts +30 -2
- 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 +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- 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/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -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 +18 -8
- 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 +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -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 +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- 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/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- 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/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -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 +199 -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 +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- 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 +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { ptr } from "bun:ffi";
|
|
3
|
+
import { securityAttributes, wide, WIN64_CHILD_ABI, WindowsChildNative } from "./windows-cli-child-native";
|
|
4
|
+
|
|
5
|
+
/** One overlapped operation and one retained buffer per pipe. Never PeekNamedPipe. */
|
|
6
|
+
export class WindowsChildPipe {
|
|
7
|
+
readonly overlapped = Buffer.alloc(WIN64_CHILD_ABI.overlapped);
|
|
8
|
+
readonly buffer = Buffer.alloc(64 * 1024);
|
|
9
|
+
readonly count = Buffer.alloc(4);
|
|
10
|
+
handle = 0n;
|
|
11
|
+
child = 0n;
|
|
12
|
+
event = 0n;
|
|
13
|
+
pending = false;
|
|
14
|
+
eof = false;
|
|
15
|
+
error = false;
|
|
16
|
+
private connecting = false;
|
|
17
|
+
private disposed = false;
|
|
18
|
+
constructor(readonly native: WindowsChildNative) {}
|
|
19
|
+
open(): void {
|
|
20
|
+
const n = this.native, k = n.k;
|
|
21
|
+
const descriptor = n.privateDescriptor();
|
|
22
|
+
try {
|
|
23
|
+
const sa = securityAttributes(false, descriptor), childSa = securityAttributes(true, descriptor);
|
|
24
|
+
const name = wide(`\\\\.\\pipe\\ocx-child-${randomUUID()}`);
|
|
25
|
+
// Inbound, OVERLAPPED, FIRST_PIPE_INSTANCE; byte stream, REJECT_REMOTE_CLIENTS.
|
|
26
|
+
this.handle = n.keep(k.CreateNamedPipeW!(ptr(name), 0x40080001, 8, 1, 0, this.buffer.length, 0, ptr(sa)));
|
|
27
|
+
this.event = n.keep(k.CreateEventW!(null, 1, 0, null));
|
|
28
|
+
this.overlapped.writeBigUInt64LE(this.event, 24);
|
|
29
|
+
// A known local client connects before ConnectNamedPipe: ERROR_PIPE_CONNECTED is success.
|
|
30
|
+
this.child = n.keep(k.CreateFileW!(ptr(name), 0x40000000, 0, ptr(childSa), 3, 0, 0n));
|
|
31
|
+
if (!k.ConnectNamedPipe!(this.handle, ptr(this.overlapped))) {
|
|
32
|
+
const error = Number(k.GetLastError!());
|
|
33
|
+
if (error === 997) { this.pending = true; this.connecting = true; }
|
|
34
|
+
else if (error !== 535) throw new Error(`windows_child_pipe_connect_${error}`);
|
|
35
|
+
}
|
|
36
|
+
} finally { k.LocalFree!(descriptor); }
|
|
37
|
+
}
|
|
38
|
+
closeChild(): void { if (this.child) { this.native.close(this.child); this.child = 0n; } }
|
|
39
|
+
/** Bounded synchronous work; pending overlapped operations always return immediately. */
|
|
40
|
+
pump(consume: (bytes: Buffer) => void): void {
|
|
41
|
+
if (this.disposed) return;
|
|
42
|
+
if (this.eof) return;
|
|
43
|
+
const k = this.native.k;
|
|
44
|
+
for (let i = 0; i < 4 && !this.eof; i++) {
|
|
45
|
+
let done: number;
|
|
46
|
+
if (this.pending) {
|
|
47
|
+
if (!k.GetOverlappedResult!(this.handle, ptr(this.overlapped), ptr(this.count), 0)) {
|
|
48
|
+
const error = Number(k.GetLastError!());
|
|
49
|
+
if (error === 996) return; // ERROR_IO_INCOMPLETE: retain buffers and operation.
|
|
50
|
+
if (this.overlapped.readBigUInt64LE(0) === 0x103n) { this.error = true; return; }
|
|
51
|
+
this.pending = false; this.finish(error); return;
|
|
52
|
+
}
|
|
53
|
+
this.pending = false;
|
|
54
|
+
if (this.connecting) { this.connecting = false; continue; }
|
|
55
|
+
done = this.count.readUInt32LE();
|
|
56
|
+
} else {
|
|
57
|
+
this.overlapped.fill(0); this.overlapped.writeBigUInt64LE(this.event, 24);
|
|
58
|
+
if (!k.ResetEvent!(this.event)) { this.finish(-1); return; }
|
|
59
|
+
if (!k.ReadFile!(this.handle, ptr(this.buffer), this.buffer.length, ptr(this.count), ptr(this.overlapped))) {
|
|
60
|
+
const error = Number(k.GetLastError!());
|
|
61
|
+
if (error === 997) { this.pending = true; return; }
|
|
62
|
+
this.finish(error); return;
|
|
63
|
+
}
|
|
64
|
+
done = this.count.readUInt32LE();
|
|
65
|
+
}
|
|
66
|
+
if (!done) { this.eof = true; return; }
|
|
67
|
+
consume(this.buffer.subarray(0, done));
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
private finish(error: number): void { this.eof = true; this.error = error !== 109; }
|
|
71
|
+
/** Cancel is only a request. Keep the OVERLAPPED, event and bytes until settlement. */
|
|
72
|
+
async dispose(): Promise<void> {
|
|
73
|
+
if (this.disposed) return;
|
|
74
|
+
this.closeChild();
|
|
75
|
+
if (this.pending) {
|
|
76
|
+
this.native.k.CancelIoEx!(this.handle, ptr(this.overlapped));
|
|
77
|
+
while (this.pending) {
|
|
78
|
+
if (this.native.k.GetOverlappedResult!(this.handle, ptr(this.overlapped), ptr(this.count), 0)
|
|
79
|
+
|| (Number(this.native.k.GetLastError!()) !== 996 && this.overlapped.readBigUInt64LE(0) !== 0x103n)) this.pending = false;
|
|
80
|
+
else await Bun.sleep(5);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (this.handle) this.native.close(this.handle);
|
|
84
|
+
if (this.event) this.native.close(this.event);
|
|
85
|
+
this.disposed = true;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
import { win32 } from "node:path";
|
|
2
|
+
import { ptr } from "bun:ffi";
|
|
3
|
+
import { securityAttributes, wide, WIN64_CHILD_ABI, WindowsChildNative } from "./windows-cli-child-native";
|
|
4
|
+
import { WindowsChildPipe } from "./windows-cli-child-pipe";
|
|
5
|
+
import { startWindowsCliRecoveryGuardian } from "./windows-cli-recovery-guardian";
|
|
6
|
+
import type { CodexCliUpdateNativeRecoveryProof } from "./cli-update-recovery";
|
|
7
|
+
|
|
8
|
+
export type WindowsCliChildPolicy = "installer" | "pack" | "version";
|
|
9
|
+
export function windowsCliChildPolicy(policy: WindowsCliChildPolicy) {
|
|
10
|
+
switch (policy) {
|
|
11
|
+
case "installer": return { captureBytes: 0, deadlineMs: null, reapMs: null, terminate: false } as const;
|
|
12
|
+
case "pack": return { captureBytes: 1024 * 1024, deadlineMs: null, reapMs: null, terminate: false } as const;
|
|
13
|
+
case "version": return { captureBytes: 16 * 1024, deadlineMs: 8000, reapMs: 1000, terminate: true } as const;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export interface WindowsCliChildInvocation {
|
|
17
|
+
readonly executable: string;
|
|
18
|
+
readonly args: readonly string[];
|
|
19
|
+
readonly cwd: string;
|
|
20
|
+
readonly env: Readonly<NodeJS.ProcessEnv>;
|
|
21
|
+
readonly policy: WindowsCliChildPolicy;
|
|
22
|
+
/** Private durable recovery identity, selected before native creation. */
|
|
23
|
+
readonly recoveryJobName?: string;
|
|
24
|
+
readonly recoveryProof?: CodexCliUpdateNativeRecoveryProof;
|
|
25
|
+
}
|
|
26
|
+
export interface WindowsCliChildResult {
|
|
27
|
+
readonly terminal: boolean;
|
|
28
|
+
/** Terminal process/Job accounting does not establish successful handle disposal. */
|
|
29
|
+
readonly cleanupComplete: boolean;
|
|
30
|
+
readonly exitCode: number | null;
|
|
31
|
+
readonly stdout: string;
|
|
32
|
+
readonly overflow: boolean;
|
|
33
|
+
readonly failed: boolean;
|
|
34
|
+
readonly reason: string | null;
|
|
35
|
+
}
|
|
36
|
+
/** CRT argv quoting, with explicit lpApplicationName; never cmd.exe or PATH lookup. */
|
|
37
|
+
export function quoteWindowsChildArg(arg: string): string {
|
|
38
|
+
return '"' + arg.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/g, '$1$1') + '"';
|
|
39
|
+
}
|
|
40
|
+
function validate(invocation: WindowsCliChildInvocation): void {
|
|
41
|
+
const localAbsolute = (value: string) => typeof value === "string" && /^[A-Za-z]:[\\/]/.test(value)
|
|
42
|
+
&& win32.isAbsolute(value) && !value.includes("\0");
|
|
43
|
+
if (!localAbsolute(invocation.executable) || !/\.exe$/i.test(invocation.executable)
|
|
44
|
+
|| !localAbsolute(invocation.cwd) || !Array.isArray(invocation.args)
|
|
45
|
+
|| invocation.args.some(arg => typeof arg !== "string" || arg.includes("\0"))
|
|
46
|
+
|| !windowsCliChildPolicy(invocation.policy)
|
|
47
|
+
|| (invocation.recoveryJobName !== undefined && !/^Global\\ocx-cli-[0-9a-f-]{36}$/.test(invocation.recoveryJobName))) throw new Error("windows_child_invalid_invocation");
|
|
48
|
+
}
|
|
49
|
+
function environmentBlock(env: Readonly<NodeJS.ProcessEnv>, native: WindowsChildNative): Buffer {
|
|
50
|
+
const entries = Object.keys(env).filter(key => env[key] !== undefined).map(key => {
|
|
51
|
+
const value = env[key]!;
|
|
52
|
+
if (!key || /[=\0]/.test(key) || value.includes("\0")) throw new Error("windows_child_invalid_environment");
|
|
53
|
+
return { key: wide(key), entry: `${key}=${value}` };
|
|
54
|
+
});
|
|
55
|
+
// Windows requires case-insensitive ordinal sorting, independent of JS/host locale.
|
|
56
|
+
const compare = (a: typeof entries[number], b: typeof entries[number]) => {
|
|
57
|
+
const result = Number(native.k.CompareStringOrdinal!(ptr(a.key), -1, ptr(b.key), -1, 1));
|
|
58
|
+
if (!result) throw new Error("windows_child_environment_compare_failed");
|
|
59
|
+
return result - 2;
|
|
60
|
+
};
|
|
61
|
+
entries.sort(compare);
|
|
62
|
+
for (let i = 1; i < entries.length; i++) if (compare(entries[i - 1]!, entries[i]!) === 0) throw new Error("windows_child_invalid_environment");
|
|
63
|
+
return Buffer.from(entries.map(item => item.entry).join("\0") + "\0\0", "utf16le");
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Owns an unnamed non-inheritable Job and the original primary process handle.
|
|
68
|
+
* No KILL_ON_JOB_CLOSE, active-process limit, BREAKAWAY, PID reopen, or running abort.
|
|
69
|
+
* A caller must adopt lease/staging ownership BEFORE calling start, and retain this
|
|
70
|
+
* object and those resources whenever wait() returns terminal:false.
|
|
71
|
+
*/
|
|
72
|
+
export class WindowsCliChild {
|
|
73
|
+
readonly pipe: WindowsChildPipe;
|
|
74
|
+
readonly policy: ReturnType<typeof windowsCliChildPolicy>;
|
|
75
|
+
readonly startedAt = Date.now();
|
|
76
|
+
private readonly clockStartedAt = performance.now();
|
|
77
|
+
pid: number | null = null;
|
|
78
|
+
creationTime: string | null = null;
|
|
79
|
+
process = 0n;
|
|
80
|
+
job = 0n;
|
|
81
|
+
recoveryGuardian = 0n;
|
|
82
|
+
setupFailure: string | null = null;
|
|
83
|
+
private stopAt: number | null = null;
|
|
84
|
+
private terminationFailed = false;
|
|
85
|
+
private failed = false;
|
|
86
|
+
private reason: string | null = null;
|
|
87
|
+
private overflow = false;
|
|
88
|
+
private chunks: Buffer[] = [];
|
|
89
|
+
private captured = 0;
|
|
90
|
+
private waiting = false;
|
|
91
|
+
private finished: WindowsCliChildResult | undefined;
|
|
92
|
+
private observedTerminal: { terminal: true; exitCode: number; unknown: false } | undefined;
|
|
93
|
+
private prestartTerminationFailed = false;
|
|
94
|
+
constructor(readonly native: WindowsChildNative, policy: WindowsCliChildPolicy) {
|
|
95
|
+
this.policy = windowsCliChildPolicy(policy); this.pipe = new WindowsChildPipe(native);
|
|
96
|
+
}
|
|
97
|
+
private fail(reason: string): void { this.failed = true; this.reason ??= reason; }
|
|
98
|
+
private consume = (bytes: Buffer): void => {
|
|
99
|
+
const remaining = this.policy.captureBytes - this.captured;
|
|
100
|
+
if (bytes.length > remaining && this.policy.captureBytes) this.overflow = true;
|
|
101
|
+
if (remaining > 0) { const chunk = Buffer.from(bytes.subarray(0, remaining)); this.chunks.push(chunk); this.captured += chunk.length; }
|
|
102
|
+
// Overflow still drains/discards. Only the separate version policy may stop a Job.
|
|
103
|
+
if (this.overflow && this.policy.terminate) this.stop("output_limit");
|
|
104
|
+
};
|
|
105
|
+
private stop(reason: string): void {
|
|
106
|
+
this.fail(reason);
|
|
107
|
+
if (this.stopAt !== null || !this.policy.terminate) return;
|
|
108
|
+
this.stopAt = performance.now();
|
|
109
|
+
if (!this.native.k.TerminateJobObject!(this.job, 1)) this.terminationFailed = true;
|
|
110
|
+
}
|
|
111
|
+
private result(terminal: boolean, exitCode: number | null): WindowsCliChildResult {
|
|
112
|
+
return { terminal, cleanupComplete: terminal && this.native.handles.size === 0 && this.native.borrowedMemory.size === 0,
|
|
113
|
+
exitCode, stdout: Buffer.concat(this.chunks, this.captured).toString("utf8"),
|
|
114
|
+
overflow: this.overflow, failed: this.failed || !!this.setupFailure, reason: this.setupFailure ?? this.reason };
|
|
115
|
+
}
|
|
116
|
+
/** A successful accounting query plus a signaled original process handle, never PID absence or STILL_ACTIVE. */
|
|
117
|
+
observe(): { terminal: boolean; exitCode: number | null; unknown: boolean } {
|
|
118
|
+
if (this.observedTerminal) return this.observedTerminal;
|
|
119
|
+
const k = this.native.k, accounting = Buffer.alloc(WIN64_CHILD_ABI.jobAccounting), code = Buffer.alloc(4);
|
|
120
|
+
const wait = Number(k.WaitForSingleObject!(this.process, 0));
|
|
121
|
+
if (wait !== 0 && wait !== 258) { this.fail("process_wait_failed"); return { terminal: false, exitCode: null, unknown: true }; }
|
|
122
|
+
if (!k.QueryInformationJobObject!(this.job, 1, ptr(accounting), accounting.length, null)) {
|
|
123
|
+
this.fail("job_query_failed"); return { terminal: false, exitCode: null, unknown: true };
|
|
124
|
+
}
|
|
125
|
+
if (wait !== 0 || accounting.readUInt32LE(40) !== 0) return { terminal: false, exitCode: null, unknown: false };
|
|
126
|
+
if (!k.GetExitCodeProcess!(this.process, ptr(code))) {
|
|
127
|
+
this.fail("process_exit_query_failed"); return { terminal: false, exitCode: null, unknown: true };
|
|
128
|
+
}
|
|
129
|
+
return this.observedTerminal = { terminal: true, exitCode: code.readUInt32LE(), unknown: false };
|
|
130
|
+
}
|
|
131
|
+
async wait(): Promise<WindowsCliChildResult> {
|
|
132
|
+
if (this.finished) return this.finished;
|
|
133
|
+
if (!this.process) throw new Error("windows_child_not_created_use_cleanup");
|
|
134
|
+
if (this.waiting) throw new Error("windows_child_wait_already_owned");
|
|
135
|
+
this.waiting = true;
|
|
136
|
+
try {
|
|
137
|
+
for (;;) {
|
|
138
|
+
this.pipe.pump(this.consume);
|
|
139
|
+
if (this.pipe.error) { this.fail("pipe_read_failed"); if (this.policy.terminate) this.stop("pipe_read_failed"); }
|
|
140
|
+
const observed = this.observe();
|
|
141
|
+
if (observed.terminal && this.pipe.eof) {
|
|
142
|
+
if (this.recoveryGuardian) {
|
|
143
|
+
const wait = Number(this.native.k.WaitForSingleObject!(this.recoveryGuardian, 0));
|
|
144
|
+
if (wait === 258) {
|
|
145
|
+
if (this.policy.deadlineMs !== null && performance.now() - this.clockStartedAt
|
|
146
|
+
>= this.policy.deadlineMs + this.policy.reapMs!) {
|
|
147
|
+
this.fail("recovery_observer_state_unknown"); return this.result(false, null);
|
|
148
|
+
}
|
|
149
|
+
await Bun.sleep(5); continue;
|
|
150
|
+
}
|
|
151
|
+
if (wait !== 0) { this.fail("recovery_observer_wait_failed"); return this.result(false, null); }
|
|
152
|
+
this.native.close(this.recoveryGuardian);
|
|
153
|
+
}
|
|
154
|
+
await this.pipe.dispose();
|
|
155
|
+
this.native.close(this.process); this.native.close(this.job);
|
|
156
|
+
const released = this.native.dispose();
|
|
157
|
+
if (!released) this.fail("handle_close_failed");
|
|
158
|
+
return this.finished = this.result(true, observed.exitCode);
|
|
159
|
+
}
|
|
160
|
+
if (observed.unknown || this.terminationFailed || this.prestartTerminationFailed
|
|
161
|
+
|| (this.pipe.error && this.pipe.pending)) return this.result(false, null);
|
|
162
|
+
if (this.policy.deadlineMs !== null && performance.now() - this.clockStartedAt >= this.policy.deadlineMs) this.stop("deadline");
|
|
163
|
+
if (this.stopAt !== null && performance.now() - this.stopAt >= this.policy.reapMs!) return this.result(false, null);
|
|
164
|
+
await Bun.sleep(5);
|
|
165
|
+
}
|
|
166
|
+
} finally { this.waiting = false; }
|
|
167
|
+
}
|
|
168
|
+
/** Not a running-child disposal API: only pre-user-code setup failures may call it. */
|
|
169
|
+
reapUnstarted(): boolean {
|
|
170
|
+
if (!this.setupFailure || !this.process || this.finished || !this.native.handles.has(this.process)) return false;
|
|
171
|
+
this.prestartTerminationFailed = !this.native.k.TerminateProcess!(this.process, 1);
|
|
172
|
+
return !this.prestartTerminationFailed;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
export function startWindowsCliChild(invocation: WindowsCliChildInvocation): WindowsCliChild {
|
|
177
|
+
validate(invocation);
|
|
178
|
+
return startWindowsCliChildWithNative(invocation, new WindowsChildNative());
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/** Internal native dispatch seam; fixtures use the real APIs with single-call faults. */
|
|
182
|
+
export function startWindowsCliChildWithNative(invocation: WindowsCliChildInvocation, native: WindowsChildNative): WindowsCliChild {
|
|
183
|
+
validate(invocation);
|
|
184
|
+
const child = new WindowsCliChild(native, invocation.policy), k = native.k;
|
|
185
|
+
let stdin = 0n, stderr = 0n, thread = 0n, attributes: Buffer | undefined, initialized = false;
|
|
186
|
+
let inheritedHandles: Buffer | undefined;
|
|
187
|
+
try {
|
|
188
|
+
if (invocation.recoveryJobName) {
|
|
189
|
+
const name = wide(invocation.recoveryJobName), descriptor = native.privateDescriptor();
|
|
190
|
+
try {
|
|
191
|
+
const security = securityAttributes(false, descriptor);
|
|
192
|
+
k.SetLastError!(0);
|
|
193
|
+
child.job = native.keep(k.CreateJobObjectW!(ptr(security), ptr(name)));
|
|
194
|
+
// Never adopt a pre-existing object, even inside the current-user boundary.
|
|
195
|
+
if (k.GetLastError!() === 183) throw new Error("windows_child_job_exists");
|
|
196
|
+
} finally { k.LocalFree!(descriptor); }
|
|
197
|
+
} else child.job = native.keep(k.CreateJobObjectW!(null, null));
|
|
198
|
+
child.pipe.open();
|
|
199
|
+
const inheritable = securityAttributes(true), nul = wide("NUL");
|
|
200
|
+
stdin = native.keep(k.CreateFileW!(ptr(nul), 0x80000000, 3, ptr(inheritable), 3, 0, 0n));
|
|
201
|
+
stderr = native.keep(k.CreateFileW!(ptr(nul), 0x40000000, 3, ptr(inheritable), 3, 0, 0n));
|
|
202
|
+
const handles = inheritedHandles = Buffer.alloc(24);
|
|
203
|
+
[stdin, child.pipe.child, stderr].forEach((handle, index) => handles.writeBigUInt64LE(handle, index * 8));
|
|
204
|
+
const size = Buffer.alloc(8);
|
|
205
|
+
k.InitializeProcThreadAttributeList!(null, 1, 0, ptr(size));
|
|
206
|
+
const length = Number(size.readBigUInt64LE());
|
|
207
|
+
if (length < 24 || length > 1024 * 1024) throw new Error("attribute_size");
|
|
208
|
+
attributes = Buffer.alloc(length);
|
|
209
|
+
native.borrowedMemory.add(attributes); native.borrowedMemory.add(handles);
|
|
210
|
+
if (!k.InitializeProcThreadAttributeList!(ptr(attributes), 1, 0, ptr(size))) throw new Error("attribute_init");
|
|
211
|
+
initialized = true;
|
|
212
|
+
if (!k.UpdateProcThreadAttribute!(ptr(attributes), 0, 0x20002n, ptr(handles), 24n, null, null)) throw new Error("attribute_handles");
|
|
213
|
+
const startup = Buffer.alloc(WIN64_CHILD_ABI.startupInfoEx), info = Buffer.alloc(WIN64_CHILD_ABI.processInformation);
|
|
214
|
+
startup.writeUInt32LE(startup.length); startup.writeUInt32LE(0x100, 60);
|
|
215
|
+
[stdin, child.pipe.child, stderr].forEach((handle, index) => startup.writeBigUInt64LE(handle, 80 + index * 8));
|
|
216
|
+
startup.writeBigUInt64LE(BigInt(ptr(attributes)), 104);
|
|
217
|
+
const executable = wide(invocation.executable), command = wide([invocation.executable, ...invocation.args].map(quoteWindowsChildArg).join(" "));
|
|
218
|
+
const cwd = wide(invocation.cwd), env = environmentBlock(invocation.env, native);
|
|
219
|
+
if (command.length > 65534) throw new Error("command_length");
|
|
220
|
+
// CREATE_SUSPENDED | CREATE_UNICODE_ENVIRONMENT | EXTENDED_STARTUPINFO_PRESENT | CREATE_NO_WINDOW.
|
|
221
|
+
// All buffers above remain strongly reachable through CreateProcessW and attribute deletion.
|
|
222
|
+
if (!k.CreateProcessW!(ptr(executable), ptr(command), null, null, 1, 0x08080404, ptr(env), ptr(cwd), ptr(startup), ptr(info))) {
|
|
223
|
+
throw new Error(`create_process_${k.GetLastError!()}`);
|
|
224
|
+
}
|
|
225
|
+
child.process = native.keep(info.readBigUInt64LE(0)); thread = native.keep(info.readBigUInt64LE(8));
|
|
226
|
+
child.pid = info.readUInt32LE(16);
|
|
227
|
+
// Separate FILETIME buffers: creating Buffer subarrays while evaluating FFI
|
|
228
|
+
// arguments can materialize a new backing store in bundled Bun on Windows.
|
|
229
|
+
const creation = Buffer.alloc(8), exit = Buffer.alloc(8), kernel = Buffer.alloc(8), user = Buffer.alloc(8);
|
|
230
|
+
if (!k.GetProcessTimes!(child.process, ptr(creation), ptr(exit), ptr(kernel), ptr(user))) throw new Error("process_times");
|
|
231
|
+
child.creationTime = creation.readBigUInt64LE().toString();
|
|
232
|
+
if (child.creationTime === "0") throw new Error("process_creation_time_unknown");
|
|
233
|
+
if (!k.AssignProcessToJobObject!(child.job, child.process)) throw new Error("job_assignment");
|
|
234
|
+
if (invocation.recoveryProof) child.recoveryGuardian = startWindowsCliRecoveryGuardian(native, child.job, invocation.recoveryProof, invocation.cwd);
|
|
235
|
+
if (Number(k.ResumeThread!(thread)) !== 1) throw new Error("resume_thread");
|
|
236
|
+
} catch (error) {
|
|
237
|
+
child.setupFailure = error instanceof Error ? error.message : "setup_failed";
|
|
238
|
+
if (child.process) child.reapUnstarted();
|
|
239
|
+
} finally {
|
|
240
|
+
if (initialized) k.DeleteProcThreadAttributeList!(ptr(attributes!));
|
|
241
|
+
if (attributes) native.borrowedMemory.delete(attributes);
|
|
242
|
+
if (inheritedHandles) native.borrowedMemory.delete(inheritedHandles);
|
|
243
|
+
child.pipe.closeChild();
|
|
244
|
+
if (stdin) native.close(stdin); if (stderr) native.close(stderr); if (thread) native.close(thread);
|
|
245
|
+
}
|
|
246
|
+
// No await has occurred while any parent-owned inheritable stdio handle was open.
|
|
247
|
+
if (!child.process) {
|
|
248
|
+
// No I/O read is issued until wait(). The connect call is the only possible pending operation.
|
|
249
|
+
// Caller receives the owner for async cancellation/settlement via cleanupUnstartedWindowsChild.
|
|
250
|
+
return child;
|
|
251
|
+
}
|
|
252
|
+
return child;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
/** Setup never launched user code. Preserve owner until pending connect I/O is settled. */
|
|
256
|
+
export async function cleanupUnstartedWindowsChild(child: WindowsCliChild): Promise<boolean> {
|
|
257
|
+
if (child.process || !child.setupFailure) return false;
|
|
258
|
+
await child.pipe.dispose(); if (child.job) child.native.close(child.job);
|
|
259
|
+
return child.native.dispose();
|
|
260
|
+
}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { dirname, basename } from "node:path";
|
|
2
|
+
import { ptr } from "bun:ffi";
|
|
3
|
+
import { resolveTrustedWindowsPowerShellExe } from "../lib/windows-elevation";
|
|
4
|
+
import { withWindowsCliRecoveryStore } from "./cli-update-job-store-windows";
|
|
5
|
+
import type { CodexCliUpdateNativeRecoveryProof } from "./cli-update-recovery";
|
|
6
|
+
import { wide, WindowsChildNative } from "./windows-cli-child-native";
|
|
7
|
+
|
|
8
|
+
// This separate process owns only query access to the installer's Job and a
|
|
9
|
+
// pre-opened private receipt. Failure/early death leaves armed evidence fenced.
|
|
10
|
+
// It starts after assignment, while the primary is still suspended: zero Job
|
|
11
|
+
// members can then mean only that every assigned process has terminated.
|
|
12
|
+
const SCRIPT = String.raw`
|
|
13
|
+
$ErrorActionPreference='Stop'
|
|
14
|
+
try {
|
|
15
|
+
Add-Type -TypeDefinition @'
|
|
16
|
+
using System; using System.Runtime.InteropServices; using System.Threading;
|
|
17
|
+
public static class OcxCliRecovery {
|
|
18
|
+
[DllImport("kernel32.dll")] static extern bool QueryInformationJobObject(IntPtr j,int c,byte[] b,uint n,IntPtr r);
|
|
19
|
+
[DllImport("kernel32.dll")] static extern bool SetFilePointerEx(IntPtr f,long p,IntPtr n,uint m);
|
|
20
|
+
[DllImport("kernel32.dll")] static extern bool SetEndOfFile(IntPtr f);
|
|
21
|
+
[DllImport("kernel32.dll")] static extern bool WriteFile(IntPtr f,byte[] b,uint n,out uint w,IntPtr o);
|
|
22
|
+
[DllImport("kernel32.dll")] static extern bool FlushFileBuffers(IntPtr f);
|
|
23
|
+
public static bool Record(IntPtr job,IntPtr file,byte[] body) {
|
|
24
|
+
byte[] accounting=new byte[48];
|
|
25
|
+
for (;;) {
|
|
26
|
+
if(!QueryInformationJobObject(job,1,accounting,48,IntPtr.Zero))return false;
|
|
27
|
+
if(BitConverter.ToUInt32(accounting,40)==0)break;
|
|
28
|
+
Thread.Sleep(50);
|
|
29
|
+
}
|
|
30
|
+
uint written;
|
|
31
|
+
return SetFilePointerEx(file,0,IntPtr.Zero,0) && SetEndOfFile(file)
|
|
32
|
+
&& WriteFile(file,body,(uint)body.Length,out written,IntPtr.Zero)
|
|
33
|
+
&& written==body.Length && FlushFileBuffers(file);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
'@
|
|
37
|
+
if (![OcxCliRecovery]::Record([IntPtr]::new([long]@JOB@),[IntPtr]::new([long]@FILE@),[Convert]::FromBase64String('@BODY@'))) { exit 3 }
|
|
38
|
+
exit 0
|
|
39
|
+
} catch { exit 4 }
|
|
40
|
+
`;
|
|
41
|
+
|
|
42
|
+
/** No installer start/resume until the scoped receipt observer was created. */
|
|
43
|
+
export function startWindowsCliRecoveryGuardian(native: WindowsChildNative, job: bigint,
|
|
44
|
+
proof: CodexCliUpdateNativeRecoveryProof, temporaryRoot: string): bigint {
|
|
45
|
+
return withWindowsCliRecoveryStore(dirname(dirname(proof.path)), false, io => io.withProofHandle(basename(proof.path), file => {
|
|
46
|
+
const k = native.k, handles = Buffer.alloc(16), size = Buffer.alloc(8);
|
|
47
|
+
const output = Buffer.alloc(8), current = k.GetCurrentProcess!();
|
|
48
|
+
if (!k.DuplicateHandle!(current, job, current, ptr(output), 4, 1, 0)) throw new Error("recovery_job_query_handle");
|
|
49
|
+
const queryJob = native.keep(output.readBigUInt64LE());
|
|
50
|
+
handles.writeBigUInt64LE(queryJob); handles.writeBigUInt64LE(file, 8);
|
|
51
|
+
let attributes: Buffer | undefined, initialized = false;
|
|
52
|
+
try {
|
|
53
|
+
if (!k.SetHandleInformation!(file, 1, 1)) throw new Error("recovery_inheritance");
|
|
54
|
+
k.InitializeProcThreadAttributeList!(null, 1, 0, ptr(size));
|
|
55
|
+
const length = Number(size.readBigUInt64LE());
|
|
56
|
+
if (length < 24 || length > 1048576) throw new Error("recovery_attribute_size");
|
|
57
|
+
attributes = Buffer.alloc(length);
|
|
58
|
+
native.borrowedMemory.add(attributes); native.borrowedMemory.add(handles);
|
|
59
|
+
if (!k.InitializeProcThreadAttributeList!(ptr(attributes), 1, 0, ptr(size))) throw new Error("recovery_attributes");
|
|
60
|
+
initialized = true;
|
|
61
|
+
if (!k.UpdateProcThreadAttribute!(ptr(attributes), 0, 0x20002n, ptr(handles), 16n, null, null)) throw new Error("recovery_handle_list");
|
|
62
|
+
const script = SCRIPT.replace('@JOB@', queryJob.toString()).replace('@FILE@', file.toString())
|
|
63
|
+
.replace('@BODY@', Buffer.from(proof.terminal).toString('base64'));
|
|
64
|
+
const executable = resolveTrustedWindowsPowerShellExe();
|
|
65
|
+
const args = [executable, '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass',
|
|
66
|
+
'-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')];
|
|
67
|
+
const command = wide(args.map(arg => '"' + arg.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/g, '$1$1') + '"').join(' '));
|
|
68
|
+
const exe = wide(executable), cwd = wide(temporaryRoot);
|
|
69
|
+
const systemRoot = dirname(dirname(dirname(dirname(executable))));
|
|
70
|
+
const env = wide(['APPDATA=' + temporaryRoot, 'HOME=' + temporaryRoot, 'LOCALAPPDATA=' + temporaryRoot,
|
|
71
|
+
'PATH=' + systemRoot + '\\System32', 'PSModuleAnalysisCachePath=' + temporaryRoot + '\\guardian-module-analysis-cache',
|
|
72
|
+
'PSModulePath=' + systemRoot + '\\System32\\WindowsPowerShell\\v1.0\\Modules', 'SystemRoot=' + systemRoot,
|
|
73
|
+
'TEMP=' + temporaryRoot, 'TMP=' + temporaryRoot, 'USERPROFILE=' + temporaryRoot, 'WINDIR=' + systemRoot].join('\0') + '\0');
|
|
74
|
+
const startup = Buffer.alloc(112), info = Buffer.alloc(24);
|
|
75
|
+
startup.writeUInt32LE(112); startup.writeBigUInt64LE(BigInt(ptr(attributes)), 104);
|
|
76
|
+
if (!k.CreateProcessW!(ptr(exe), ptr(command), null, null, 1, 0x08080400, ptr(env), ptr(cwd), ptr(startup), ptr(info))) {
|
|
77
|
+
throw new Error("recovery_observer_spawn");
|
|
78
|
+
}
|
|
79
|
+
const processHandle = native.keep(info.readBigUInt64LE());
|
|
80
|
+
native.close(native.keep(info.readBigUInt64LE(8)));
|
|
81
|
+
return processHandle;
|
|
82
|
+
} finally {
|
|
83
|
+
k.SetHandleInformation!(file, 1, 0); native.close(queryJob);
|
|
84
|
+
if (initialized) k.DeleteProcThreadAttributeList!(ptr(attributes!));
|
|
85
|
+
if (attributes) native.borrowedMemory.delete(attributes);
|
|
86
|
+
native.borrowedMemory.delete(handles);
|
|
87
|
+
}
|
|
88
|
+
}));
|
|
89
|
+
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { dlopen, ptr } from "bun:ffi";
|
|
2
|
+
|
|
3
|
+
/** Read-only lifetime proof. Never signals a process, opens a foreign Job for
|
|
4
|
+
* termination, or treats access/query failures as terminal evidence.
|
|
5
|
+
*/
|
|
6
|
+
export function windowsCodexCliChildGone(pid: number, creationTime: string, jobName: string): boolean {
|
|
7
|
+
if (process.platform !== "win32" || process.arch !== "x64" || !Number.isSafeInteger(pid) || pid <= 0
|
|
8
|
+
|| !/^[1-9][0-9]{0,19}$/.test(creationTime) || !/^Global\\ocx-cli-[0-9a-f-]{36}$/.test(jobName)) return false;
|
|
9
|
+
const lib = dlopen("kernel32.dll", {
|
|
10
|
+
OpenJobObjectW: { args: ["u32", "i32", "ptr"], returns: "u64" },
|
|
11
|
+
OpenProcess: { args: ["u32", "i32", "u32"], returns: "u64" },
|
|
12
|
+
GetLastError: { args: [], returns: "u32" },
|
|
13
|
+
QueryInformationJobObject: { args: ["u64", "i32", "ptr", "u32", "ptr"], returns: "i32" },
|
|
14
|
+
GetProcessTimes: { args: ["u64", "ptr", "ptr", "ptr", "ptr"], returns: "i32" },
|
|
15
|
+
WaitForSingleObject: { args: ["u64", "u32"], returns: "u32" },
|
|
16
|
+
CloseHandle: { args: ["u64"], returns: "i32" },
|
|
17
|
+
});
|
|
18
|
+
let job = 0n, processHandle = 0n;
|
|
19
|
+
try {
|
|
20
|
+
const name = Buffer.from(jobName + "\0", "utf16le");
|
|
21
|
+
job = BigInt(lib.symbols.OpenJobObjectW(4, 0, ptr(name))); // JOB_OBJECT_QUERY only
|
|
22
|
+
if (!job) { if (lib.symbols.GetLastError() !== 2) return false; }
|
|
23
|
+
else {
|
|
24
|
+
const accounting = Buffer.alloc(48);
|
|
25
|
+
if (!lib.symbols.QueryInformationJobObject(job, 1, ptr(accounting), 48, null)
|
|
26
|
+
|| accounting.readUInt32LE(40) !== 0) return false;
|
|
27
|
+
}
|
|
28
|
+
processHandle = BigInt(lib.symbols.OpenProcess(0x101000, 0, pid));
|
|
29
|
+
if (!processHandle) return lib.symbols.GetLastError() === 87; // ERROR_INVALID_PARAMETER: PID absent
|
|
30
|
+
const created = Buffer.alloc(8), exited = Buffer.alloc(8), kernel = Buffer.alloc(8), user = Buffer.alloc(8);
|
|
31
|
+
if (!lib.symbols.GetProcessTimes(processHandle, ptr(created), ptr(exited), ptr(kernel), ptr(user))) return false;
|
|
32
|
+
// A reused PID names another lifetime; it cannot keep the original Job alive.
|
|
33
|
+
return created.readBigUInt64LE().toString() !== creationTime || lib.symbols.WaitForSingleObject(processHandle, 0) === 0;
|
|
34
|
+
} finally {
|
|
35
|
+
if (processHandle) lib.symbols.CloseHandle(processHandle);
|
|
36
|
+
if (job) lib.symbols.CloseHandle(job);
|
|
37
|
+
lib.close();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
+
import { win32 } from "node:path";
|
|
2
3
|
import type { Library, Symbols } from "bun:ffi";
|
|
4
|
+
import { MAX_NATIVE_BACKING_BYTES } from "./cli-installation-limits";
|
|
3
5
|
|
|
4
6
|
const KERNEL_SYMBOLS = {
|
|
5
7
|
GetDriveTypeW: { args: ["ptr"], returns: "u32" },
|
|
@@ -7,6 +9,7 @@ const KERNEL_SYMBOLS = {
|
|
|
7
9
|
CreateFileW: { args: ["ptr", "u32", "u32", "ptr", "u32", "u32", "u64"], returns: "u64" },
|
|
8
10
|
GetFileInformationByHandleEx: { args: ["u64", "i32", "ptr", "u32"], returns: "i32" },
|
|
9
11
|
GetFileType: { args: ["u64"], returns: "u32" },
|
|
12
|
+
GetFinalPathNameByHandleW: { args: ["u64", "ptr", "u32", "u32"], returns: "u32" },
|
|
10
13
|
ReadFile: { args: ["u64", "ptr", "u32", "ptr", "ptr"], returns: "i32" },
|
|
11
14
|
CloseHandle: { args: ["u64"], returns: "i32" },
|
|
12
15
|
} as const satisfies Symbols;
|
|
@@ -22,6 +25,12 @@ export interface WindowsInstallationFileRequest {
|
|
|
22
25
|
readonly metadataOnly?: boolean;
|
|
23
26
|
/** Read at most maxBytes from the start instead of refusing an oversized file. */
|
|
24
27
|
readonly prefixOnly?: boolean;
|
|
28
|
+
/** Same held stream, domain-separated archive/readback comparison. Default remains raw SHA-256. */
|
|
29
|
+
readonly installationDigest?: boolean;
|
|
30
|
+
/** Hold a directory rather than a file; requires metadataOnly. */
|
|
31
|
+
readonly directory?: boolean;
|
|
32
|
+
/** Refuse aliases unless the held object's normalized DOS name matches the input. */
|
|
33
|
+
readonly requireCanonicalPath?: boolean;
|
|
25
34
|
}
|
|
26
35
|
export interface WindowsInstallationFileIdentity {
|
|
27
36
|
readonly volumeSerial: string;
|
|
@@ -53,14 +62,27 @@ class InspectionRefusal extends Error {
|
|
|
53
62
|
constructor(readonly reason: Refusal) { super(reason); }
|
|
54
63
|
}
|
|
55
64
|
const MIB = 1024 * 1024;
|
|
65
|
+
// One native backing, the unchanged production Node bound, and at most twelve
|
|
66
|
+
// bounded text requests. This is an I/O ceiling; hash-only buffers stay empty.
|
|
67
|
+
const MAX_REQUEST_BYTES = MAX_NATIVE_BACKING_BYTES + (128 + 12) * MIB;
|
|
56
68
|
const REPARSE = 0x400;
|
|
57
69
|
const DIRECTORY = 0x10;
|
|
58
70
|
const INVALID_HANDLE = 0xffffffffffffffffn;
|
|
71
|
+
/** Compare the normalized DOS long name returned by an already-held handle. */
|
|
72
|
+
export function windowsCanonicalPathMatches(path: string, canonical: string): boolean {
|
|
73
|
+
return canonical.startsWith("\\\\?\\")
|
|
74
|
+
&& canonical.slice(4).toLowerCase() === win32.normalize(path).toLowerCase();
|
|
75
|
+
}
|
|
59
76
|
let openedForTests: (() => void) | undefined;
|
|
60
77
|
/** Runs after handles are held, for real Windows sharing/rename regression fixtures. */
|
|
61
78
|
export function setWindowsInstallationFilesOpenedForTests(callback?: () => void): void {
|
|
62
79
|
openedForTests = callback;
|
|
63
80
|
}
|
|
81
|
+
let readForTests: ((path: string, bytesRead: number) => void) | undefined;
|
|
82
|
+
/** Runs once per request with its streamed content bytes (0 for metadata-only), for read accounting. */
|
|
83
|
+
export function setWindowsInstallationFilesReadForTests(callback?: (path: string, bytesRead: number) => void): void {
|
|
84
|
+
readForTests = callback;
|
|
85
|
+
}
|
|
64
86
|
|
|
65
87
|
function components(path: string): { drive: string; names: string[] } | null {
|
|
66
88
|
if (typeof path !== "string" || path.length > 8192 || !/^[A-Za-z]:[\\/]/.test(path)) return null;
|
|
@@ -81,6 +103,7 @@ function components(path: string): { drive: string; names: string[] } | null {
|
|
|
81
103
|
*/
|
|
82
104
|
export async function inspectWindowsInstallationFiles(
|
|
83
105
|
requests: readonly WindowsInstallationFileRequest[],
|
|
106
|
+
finalize?: (files: Extract<WindowsInstallationFilesResult, { kind: "observed" }>["files"]) => boolean | Promise<boolean>,
|
|
84
107
|
): Promise<WindowsInstallationFilesResult> {
|
|
85
108
|
if (!Array.isArray(requests) || requests.length === 0 || requests.length > 12) {
|
|
86
109
|
return { kind: "refused", reason: "invalid-request" };
|
|
@@ -92,11 +115,15 @@ export async function inspectWindowsInstallationFiles(
|
|
|
92
115
|
|| (request.hashOnly !== undefined && typeof request.hashOnly !== "boolean")
|
|
93
116
|
|| (request.metadataOnly !== undefined && typeof request.metadataOnly !== "boolean")
|
|
94
117
|
|| (request.prefixOnly !== undefined && typeof request.prefixOnly !== "boolean")
|
|
95
|
-
|| request.
|
|
118
|
+
|| (request.installationDigest !== undefined && typeof request.installationDigest !== "boolean")
|
|
119
|
+
|| (request.directory !== undefined && typeof request.directory !== "boolean")
|
|
120
|
+
|| (request.requireCanonicalPath !== undefined && typeof request.requireCanonicalPath !== "boolean")
|
|
121
|
+
|| (request.directory && !request.metadataOnly)
|
|
122
|
+
|| request.maxBytes > (request.hashOnly ? MAX_NATIVE_BACKING_BYTES : MIB)) return null;
|
|
96
123
|
ceiling += request.maxBytes;
|
|
97
124
|
return parsedPath;
|
|
98
125
|
});
|
|
99
|
-
if (parsed.some(path => path === null) || ceiling >
|
|
126
|
+
if (parsed.some(path => path === null) || ceiling > MAX_REQUEST_BYTES) {
|
|
100
127
|
return { kind: "refused", reason: "invalid-request" };
|
|
101
128
|
}
|
|
102
129
|
if (process.platform !== "win32" || process.arch !== "x64") {
|
|
@@ -185,6 +212,17 @@ export async function inspectWindowsInstallationFiles(
|
|
|
185
212
|
return handle;
|
|
186
213
|
};
|
|
187
214
|
const directories = new Map<string, bigint>();
|
|
215
|
+
const checkCanonicalPath = (handle: bigint, path: string): void => {
|
|
216
|
+
const output = Buffer.alloc(32768 * 2);
|
|
217
|
+
// FILE_NAME_NORMALIZED | VOLUME_NAME_DOS: a final long name from the
|
|
218
|
+
// already held, reparse-refusing handle, never realpath/check/reopen.
|
|
219
|
+
const length = k.GetFinalPathNameByHandleW!(handle, ffi.ptr(output), 32768, 0);
|
|
220
|
+
if (!length || length >= 32768) throw new InspectionRefusal("inspection-failed");
|
|
221
|
+
const canonical = output.toString("utf16le", 0, length * 2);
|
|
222
|
+
if (!windowsCanonicalPathMatches(path, canonical)) {
|
|
223
|
+
throw new InspectionRefusal("invalid-request");
|
|
224
|
+
}
|
|
225
|
+
};
|
|
188
226
|
const files = requests.map((request, index) => {
|
|
189
227
|
const { drive, names } = parsed[index]!;
|
|
190
228
|
let parent = root(drive);
|
|
@@ -198,8 +236,9 @@ export async function inspectWindowsInstallationFiles(
|
|
|
198
236
|
}
|
|
199
237
|
parent = handle;
|
|
200
238
|
}
|
|
201
|
-
const handle = relativeOpen(parent, names[names.length - 1]!,
|
|
202
|
-
const identity = inspect(handle,
|
|
239
|
+
const handle = relativeOpen(parent, names[names.length - 1]!, Boolean(request.directory));
|
|
240
|
+
const identity = inspect(handle, Boolean(request.directory));
|
|
241
|
+
if (request.requireCanonicalPath) checkCanonicalPath(handle, request.path);
|
|
203
242
|
if (!request.metadataOnly && !(request.prefixOnly && !request.hashOnly)
|
|
204
243
|
&& identity.size > request.maxBytes) throw new InspectionRefusal("size-limit");
|
|
205
244
|
return { request, handle, identity };
|
|
@@ -207,7 +246,11 @@ export async function inspectWindowsInstallationFiles(
|
|
|
207
246
|
openedForTests?.();
|
|
208
247
|
const observed = files.map(({ request, handle, identity }) => {
|
|
209
248
|
const hash = createHash("sha256");
|
|
210
|
-
if (request.
|
|
249
|
+
if (request.installationDigest) hash.update("codex-cli-observed-file-v1\0");
|
|
250
|
+
if (request.metadataOnly) {
|
|
251
|
+
readForTests?.(request.path, 0);
|
|
252
|
+
return { path: request.path, identity, bytes: new Uint8Array(), digest: "" };
|
|
253
|
+
}
|
|
211
254
|
const truncated = Boolean(request.prefixOnly) && !request.hashOnly && identity.size > request.maxBytes;
|
|
212
255
|
const readLimit = truncated ? request.maxBytes : identity.size;
|
|
213
256
|
const bytes = request.hashOnly ? new Uint8Array() : new Uint8Array(readLimit);
|
|
@@ -228,10 +271,13 @@ export async function inspectWindowsInstallationFiles(
|
|
|
228
271
|
throw new InspectionRefusal("identity-changed");
|
|
229
272
|
}
|
|
230
273
|
}
|
|
274
|
+
readForTests?.(request.path, offset);
|
|
231
275
|
return { path: request.path, identity, bytes, digest: truncated ? "" : hash.digest("hex") };
|
|
232
276
|
});
|
|
277
|
+
if (finalize && !await finalize(observed)) throw new InspectionRefusal("identity-changed");
|
|
233
278
|
for (const file of files) {
|
|
234
|
-
if (
|
|
279
|
+
if (file.request.requireCanonicalPath) checkCanonicalPath(file.handle, file.request.path);
|
|
280
|
+
if (JSON.stringify(inspect(file.handle, Boolean(file.request.directory))) !== JSON.stringify(file.identity)) {
|
|
235
281
|
throw new InspectionRefusal("identity-changed");
|
|
236
282
|
}
|
|
237
283
|
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { win32 } from "node:path";
|
|
2
|
+
import { realpathSync } from "node:fs";
|
|
3
|
+
|
|
4
|
+
/** Synchronous Node hooks cover both CommonJS and ESM, including the entrypoint.
|
|
5
|
+
* Missing hook support fails before npm executes. No fallback to ancestor/global
|
|
6
|
+
* module trees is allowed, even if an absent lookup directory appears later.
|
|
7
|
+
* The hook is an argv-bound data module, never a writable preload on disk.
|
|
8
|
+
*/
|
|
9
|
+
export function windowsNpmExecutionArgs(npmCli: string, args: readonly string[]): string[] {
|
|
10
|
+
const root = realpathSync.native(win32.dirname(win32.dirname(npmCli)));
|
|
11
|
+
const source = [
|
|
12
|
+
'import {registerHooks} from "node:module";',
|
|
13
|
+
'import {fileURLToPath} from "node:url";',
|
|
14
|
+
'import {win32} from "node:path";',
|
|
15
|
+
`const root=${JSON.stringify(root)};`,
|
|
16
|
+
'registerHooks({resolve(specifier,context,nextResolve){',
|
|
17
|
+
'const resolved=nextResolve(specifier,context);',
|
|
18
|
+
'if(resolved.url.startsWith("node:"))return resolved;',
|
|
19
|
+
'if(!resolved.url.startsWith("file:"))throw new Error("npm_module_outside_execution_tree");',
|
|
20
|
+
'const relative=win32.relative(root,fileURLToPath(resolved.url));',
|
|
21
|
+
'if(win32.isAbsolute(relative)||relative.split(win32.sep)[0]==="..")throw new Error("npm_module_outside_execution_tree");',
|
|
22
|
+
'return resolved;}});',
|
|
23
|
+
].join("\n");
|
|
24
|
+
return ["--no-global-search-paths", "--import", `data:text/javascript;base64,${Buffer.from(source).toString("base64")}`, npmCli, ...args];
|
|
25
|
+
}
|