@bitkyc08/opencodex 2.93.0 → 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-BXu4zE8H.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-CizjBqyk.js +0 -58
- 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
|
@@ -0,0 +1,235 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared commit fence and selection gate for the Codex CLI update worker.
|
|
3
|
+
*
|
|
4
|
+
* The update's last synchronous turn (final process scan, prefix/preimage/
|
|
5
|
+
* selection guards, installer spawn) runs inside a Worker realm now, so the
|
|
6
|
+
* old same-event-loop-turn argument no longer excludes the parent's own
|
|
7
|
+
* selection-mutating operations or its session-spawn paths. Two shared-memory
|
|
8
|
+
* primitives carry that exclusion across realms:
|
|
9
|
+
*
|
|
10
|
+
* - FENCE (one per dispatched job): the parent's only cancellation word is
|
|
11
|
+
* PREPARING -> CANCELLED, and the worker's only commit word is
|
|
12
|
+
* PREPARING -> COMMITTED. Exactly one compareExchange wins. A cancel that
|
|
13
|
+
* lands first is observed by the worker's isCancelled checkpoints and by
|
|
14
|
+
* the commit CAS losing; a commit that lands first means the npm spawn
|
|
15
|
+
* already happened and a late cancel is deferred to readback.
|
|
16
|
+
*
|
|
17
|
+
* - GATE (one process-wide holder plus generation counter): PARENT_WRITE belongs to the five
|
|
18
|
+
* parent selection writers (runtime pin persist/clear, shim install/
|
|
19
|
+
* auto-restore/uninstall) and the two parent session-spawn paths (remote
|
|
20
|
+
* workspace child, desktop relaunch). A unique worker generation is taken by the
|
|
21
|
+
* update worker through installer termination and post-install readback.
|
|
22
|
+
* Writers report busy rather than wait: a synchronous parent writer
|
|
23
|
+
* must never park the event loop behind it. The gate is intentionally one
|
|
24
|
+
* cell for the whole process rather than per-configDir: alias/junction/case
|
|
25
|
+
* spellings of the same target must not split the exclusion, so a writer on
|
|
26
|
+
* a different configDir can also see busy until the installation settles.
|
|
27
|
+
*
|
|
28
|
+
* This module claims nothing about processes it does not own: an external
|
|
29
|
+
* installer, a late descendant of an earlier child, or an OS snapshot race
|
|
30
|
+
* stays the documented residual it always was.
|
|
31
|
+
*/
|
|
32
|
+
|
|
33
|
+
import { codexCliUpdateRecoveryBlocksAdmission } from "./cli-update-recovery";
|
|
34
|
+
import type { CodexCliUpdateNativeChildIdentity, CodexCliUpdateNativeRecoveryProof } from "./cli-update-recovery";
|
|
35
|
+
|
|
36
|
+
export const CODEX_CLI_UPDATE_FENCE_PREPARING = 0;
|
|
37
|
+
export const CODEX_CLI_UPDATE_FENCE_CANCELLED = 1;
|
|
38
|
+
export const CODEX_CLI_UPDATE_FENCE_COMMITTED = 2;
|
|
39
|
+
export const CODEX_CLI_UPDATE_FENCE_RECOVERING = 3;
|
|
40
|
+
|
|
41
|
+
export const CODEX_CLI_UPDATE_GATE_FREE = 0;
|
|
42
|
+
export const CODEX_CLI_UPDATE_GATE_PARENT_WRITE = 1;
|
|
43
|
+
export const CODEX_CLI_UPDATE_GATE_WORKER_COMMIT = 2;
|
|
44
|
+
|
|
45
|
+
/** Bounded wait for a parent writer's window; the worker then refuses busy. */
|
|
46
|
+
const WORKER_COMMIT_WAIT_DEADLINE_MS = 30_000;
|
|
47
|
+
|
|
48
|
+
export class CodexCliSelectionMutationBusyError extends Error {
|
|
49
|
+
constructor(message = "codex_cli_selection_busy") {
|
|
50
|
+
super(message);
|
|
51
|
+
this.name = "CodexCliSelectionMutationBusyError";
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
let selectionGate: SharedArrayBuffer | null = null;
|
|
56
|
+
|
|
57
|
+
/** One process-wide holder and monotonic generation counter shared across realms. */
|
|
58
|
+
export function codexCliUpdateSelectionGate(): SharedArrayBuffer {
|
|
59
|
+
selectionGate ??= new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 2);
|
|
60
|
+
return selectionGate;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** Test seam: drop the cell so each case starts from FREE on a fresh buffer. */
|
|
64
|
+
export function resetCodexCliSelectionGatesForTests(): void {
|
|
65
|
+
selectionGate = null;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/** Per-job fence: decision, current child pgid (0 = unpublished), terminal proof. */
|
|
69
|
+
export function createCodexCliUpdateFence(): SharedArrayBuffer {
|
|
70
|
+
return new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 3);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** The holder word IS the generation: one CAS releases exactly one owner. */
|
|
74
|
+
export function allocateCodexCliUpdateGateOwner(buffer: SharedArrayBuffer): number {
|
|
75
|
+
const view = new Int32Array(buffer);
|
|
76
|
+
for (;;) {
|
|
77
|
+
const sequence = Atomics.load(view, 1);
|
|
78
|
+
if (sequence >= 0x7ffffffd) throw new Error("cli_update_gate_generation_exhausted");
|
|
79
|
+
if (Atomics.compareExchange(view, 1, sequence, sequence + 1) === sequence) {
|
|
80
|
+
return sequence + CODEX_CLI_UPDATE_GATE_WORKER_COMMIT;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
export function releaseCodexCliUpdateGateOwner(buffer: SharedArrayBuffer, owner: number): void {
|
|
85
|
+
Atomics.compareExchange(new Int32Array(buffer), 0, owner, CODEX_CLI_UPDATE_GATE_FREE);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/** Parent cancel word. True only when this CAS took PREPARING -> CANCELLED. */
|
|
89
|
+
export function cancelCodexCliUpdateFence(fence: SharedArrayBuffer): boolean {
|
|
90
|
+
return Atomics.compareExchange(new Int32Array(fence), 0,
|
|
91
|
+
CODEX_CLI_UPDATE_FENCE_PREPARING, CODEX_CLI_UPDATE_FENCE_CANCELLED) === CODEX_CLI_UPDATE_FENCE_PREPARING;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* The worker-side cancellation checkpoint fed to apply's isCancelled hook.
|
|
96
|
+
* COMMITTED is deliberately not "cancelled": once the commit CAS lands the
|
|
97
|
+
* installer is a live child whose close must be observed, not a cancel.
|
|
98
|
+
*/
|
|
99
|
+
export function codexCliUpdateIsCancelled(fence: SharedArrayBuffer): () => boolean {
|
|
100
|
+
const view = new Int32Array(fence);
|
|
101
|
+
return () => Atomics.load(view, 0) === CODEX_CLI_UPDATE_FENCE_CANCELLED;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
export interface CodexCliSelectionParentWrite {
|
|
105
|
+
readonly entered: boolean;
|
|
106
|
+
/** Idempotent release; safe to call from both branches of a spawn attempt. */
|
|
107
|
+
exit(): void;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* Non-blocking acquisition for the parent selection writers and session-spawn
|
|
112
|
+
* paths. entered === false means a commit window (or another writer) is in
|
|
113
|
+
* flight and the caller must surface busy immediately, never wait.
|
|
114
|
+
*/
|
|
115
|
+
export function beginCodexCliSelectionParentWrite(): CodexCliSelectionParentWrite {
|
|
116
|
+
if (codexCliUpdateRecoveryBlocksAdmission()) return Object.freeze({ entered: false, exit() {} });
|
|
117
|
+
const view = new Int32Array(codexCliUpdateSelectionGate());
|
|
118
|
+
if (Atomics.compareExchange(view, 0, CODEX_CLI_UPDATE_GATE_FREE, CODEX_CLI_UPDATE_GATE_PARENT_WRITE)
|
|
119
|
+
!== CODEX_CLI_UPDATE_GATE_FREE) {
|
|
120
|
+
return Object.freeze({ entered: false, exit() { /* nothing held */ } });
|
|
121
|
+
}
|
|
122
|
+
let held = true;
|
|
123
|
+
return Object.freeze({
|
|
124
|
+
entered: true,
|
|
125
|
+
exit() {
|
|
126
|
+
if (!held) return;
|
|
127
|
+
held = false;
|
|
128
|
+
Atomics.store(view, 0, CODEX_CLI_UPDATE_GATE_FREE);
|
|
129
|
+
},
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/**
|
|
134
|
+
* The worker's installation window. tryEnter covers the uncontended same-turn
|
|
135
|
+
* case; waitEnter is the bounded retry for a held parent write. commit() is
|
|
136
|
+
* the fence CAS issued in the same event-loop turn as the installer spawn;
|
|
137
|
+
* exit() releases the gate after terminal installer evidence and readback.
|
|
138
|
+
* Unknown installer/verifier lifetime intentionally leaves admission closed.
|
|
139
|
+
*/
|
|
140
|
+
export interface CodexCliUpdateCommitWindow {
|
|
141
|
+
tryEnter(): boolean;
|
|
142
|
+
waitEnter(): Promise<boolean>;
|
|
143
|
+
commit(): boolean;
|
|
144
|
+
childStarting?(jobName?: string): CodexCliUpdateNativeRecoveryProof | void;
|
|
145
|
+
childStarted?(pid: number, identity?: CodexCliUpdateNativeChildIdentity): void;
|
|
146
|
+
exit(): void;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
export function createWorkerCommitWindow(options: {
|
|
150
|
+
readonly gate: SharedArrayBuffer;
|
|
151
|
+
readonly fence: SharedArrayBuffer;
|
|
152
|
+
readonly owner?: number;
|
|
153
|
+
readonly recovery?: { arm(jobName?: string): CodexCliUpdateNativeRecoveryProof | void; child(pid: number, identity?: CodexCliUpdateNativeChildIdentity): void; terminal(): void };
|
|
154
|
+
readonly deadlineMs?: number;
|
|
155
|
+
/** Test seam: observe/back-off without real sleeps. */
|
|
156
|
+
readonly sleep?: (ms: number) => Promise<void>;
|
|
157
|
+
}): CodexCliUpdateCommitWindow {
|
|
158
|
+
const gate = new Int32Array(options.gate);
|
|
159
|
+
const fence = new Int32Array(options.fence);
|
|
160
|
+
const owner = options.owner ?? allocateCodexCliUpdateGateOwner(options.gate);
|
|
161
|
+
const deadlineMs = options.deadlineMs ?? WORKER_COMMIT_WAIT_DEADLINE_MS;
|
|
162
|
+
const sleep = options.sleep ?? (ms => new Promise<void>(resolve => setTimeout(resolve, ms)));
|
|
163
|
+
const cancelled = () => Atomics.load(fence, 0) === CODEX_CLI_UPDATE_FENCE_CANCELLED;
|
|
164
|
+
let held = false;
|
|
165
|
+
let cleanupRetry: ReturnType<typeof setInterval> | undefined;
|
|
166
|
+
const release = () => {
|
|
167
|
+
try { options.recovery?.terminal(); }
|
|
168
|
+
catch { return false; }
|
|
169
|
+
held = false;
|
|
170
|
+
releaseCodexCliUpdateGateOwner(options.gate, owner);
|
|
171
|
+
return true;
|
|
172
|
+
};
|
|
173
|
+
return Object.freeze({
|
|
174
|
+
tryEnter() {
|
|
175
|
+
if (cancelled()) return false;
|
|
176
|
+
if (!held
|
|
177
|
+
&& Atomics.compareExchange(gate, 0, CODEX_CLI_UPDATE_GATE_FREE, owner)
|
|
178
|
+
=== CODEX_CLI_UPDATE_GATE_FREE) {
|
|
179
|
+
held = true;
|
|
180
|
+
}
|
|
181
|
+
if (held && cancelled()) { held = false; releaseCodexCliUpdateGateOwner(options.gate, owner); }
|
|
182
|
+
return held;
|
|
183
|
+
},
|
|
184
|
+
async waitEnter() {
|
|
185
|
+
const deadline = Date.now() + deadlineMs;
|
|
186
|
+
while (!held && !cancelled()) {
|
|
187
|
+
if (Atomics.compareExchange(gate, 0, CODEX_CLI_UPDATE_GATE_FREE, owner)
|
|
188
|
+
=== CODEX_CLI_UPDATE_GATE_FREE) {
|
|
189
|
+
held = true;
|
|
190
|
+
if (cancelled()) { held = false; releaseCodexCliUpdateGateOwner(options.gate, owner); }
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
193
|
+
if (Date.now() >= deadline) break;
|
|
194
|
+
await sleep(1);
|
|
195
|
+
}
|
|
196
|
+
return held;
|
|
197
|
+
},
|
|
198
|
+
commit() {
|
|
199
|
+
if (!held || Atomics.load(gate, 0) !== owner || cancelled()) return false;
|
|
200
|
+
options.recovery?.arm(); // durable uncertainty precedes any possible spawn
|
|
201
|
+
return Atomics.compareExchange(fence, 0, CODEX_CLI_UPDATE_FENCE_PREPARING, CODEX_CLI_UPDATE_FENCE_COMMITTED)
|
|
202
|
+
=== CODEX_CLI_UPDATE_FENCE_PREPARING;
|
|
203
|
+
},
|
|
204
|
+
childStarting(jobName?: string) {
|
|
205
|
+
Atomics.store(fence, 1, 0);
|
|
206
|
+
// Publish uncertainty BEFORE competing with parent recovery's seal.
|
|
207
|
+
// A close notification may precede full thread exit; no next child can
|
|
208
|
+
// start after the parent has sealed COMMITTED for recovery.
|
|
209
|
+
if (Atomics.compareExchange(fence, 0, CODEX_CLI_UPDATE_FENCE_COMMITTED, CODEX_CLI_UPDATE_FENCE_COMMITTED)
|
|
210
|
+
!== CODEX_CLI_UPDATE_FENCE_COMMITTED) throw new Error("cli_update_owner_recovering");
|
|
211
|
+
const proof = options.recovery?.arm(jobName);
|
|
212
|
+
// Close may seal RECOVERING while durable arming is in progress. No native
|
|
213
|
+
// successor may start after that seal, even if arming observed a marker.
|
|
214
|
+
if (Atomics.load(fence, 0) !== CODEX_CLI_UPDATE_FENCE_COMMITTED || Atomics.load(gate, 0) !== owner) {
|
|
215
|
+
throw new Error("cli_update_owner_recovering");
|
|
216
|
+
}
|
|
217
|
+
return proof;
|
|
218
|
+
},
|
|
219
|
+
childStarted(pid: number, identity?: CodexCliUpdateNativeChildIdentity) {
|
|
220
|
+
// Publication follows spawn in the same turn. Death in the gap stays unknown.
|
|
221
|
+
options.recovery?.child(pid, identity);
|
|
222
|
+
Atomics.store(fence, 1, pid);
|
|
223
|
+
},
|
|
224
|
+
exit() {
|
|
225
|
+
if (!held) return;
|
|
226
|
+
// Caller has proven no child remains. Publish that proof even if the
|
|
227
|
+
// durable receipt temporarily cannot be written; parent close can retry.
|
|
228
|
+
Atomics.store(fence, 2, 1);
|
|
229
|
+
if (release() || cleanupRetry) return;
|
|
230
|
+
cleanupRetry = setInterval(() => {
|
|
231
|
+
if (release()) clearInterval(cleanupRetry);
|
|
232
|
+
}, 250);
|
|
233
|
+
},
|
|
234
|
+
});
|
|
235
|
+
}
|
|
@@ -0,0 +1,308 @@
|
|
|
1
|
+
import { writeFileSync } from "node:fs";
|
|
2
|
+
import { randomUUID } from "node:crypto";
|
|
3
|
+
import { win32 } from "node:path";
|
|
4
|
+
import type { CodexCliApplyDeps, CodexCliApplyResult, CodexCliApplyCleanupError } from "./cli-update-apply";
|
|
5
|
+
import { createCodexCliUpdatePlan, createNpmConfigIsolation } from "./cli-update-plan";
|
|
6
|
+
import { inspectCodexCliInstall, observeCodexCliSelectedCommand } from "./cli-install-provenance";
|
|
7
|
+
import { holdWindowsCodexCliPlanToolchain, windowsCodexCliPlanEvidence, windowsCodexCliSelectionMatches } from "./cli-windows-plan-provenance";
|
|
8
|
+
import { openWindowsCliApplyAuthority, WindowsCliToolchainCleanupError, type WindowsApplyAcquisition } from "./cli-update-job-store-windows";
|
|
9
|
+
import { flushWindowsSecretAclReapsBeforeRemoval } from "../lib/windows-secret-acl";
|
|
10
|
+
import { verifyWindowsCodexCliLayout, matchesWindowsCodexCliLayout } from "./cli-update-windows-layout";
|
|
11
|
+
import { observeWindowsInstall, sameWindowsInstall, sameWindowsPreservedEntries, windowsCodexOwnedPath,
|
|
12
|
+
type WindowsInstallSnapshot } from "./cli-update-windows-observation";
|
|
13
|
+
import { scanCodexSessionProcesses } from "./app-server-processes";
|
|
14
|
+
import { startWindowsCliChild, cleanupUnstartedWindowsChild, type WindowsCliChild,
|
|
15
|
+
type WindowsCliChildInvocation, type WindowsCliChildResult } from "./windows-cli-child";
|
|
16
|
+
import { windowsNpmExecutionArgs } from "./windows-npm-execution";
|
|
17
|
+
|
|
18
|
+
type Authority = Awaited<ReturnType<typeof openWindowsCliApplyAuthority>>;
|
|
19
|
+
type Toolchain = NonNullable<Awaited<ReturnType<typeof holdWindowsCodexCliPlanToolchain>>>;
|
|
20
|
+
interface Owner { retention?: { release(): void }; authority: Authority; staging: string; toolchain: Toolchain | null; child?: WindowsCliChild;
|
|
21
|
+
recover?: () => Promise<boolean> }
|
|
22
|
+
// Strong owners survive an uncertain native wait and the HTTP/CLI caller returning.
|
|
23
|
+
// Never collect these as ordinary cleanup, infer terminal from a PID, or start a retry.
|
|
24
|
+
const retained = new Set<Owner>();
|
|
25
|
+
/** Explicit same-process reconciliation, using only the retained original native
|
|
26
|
+
* process/Job handles. Never retry installation or infer termination from a PID.
|
|
27
|
+
*/
|
|
28
|
+
export async function recoverWindowsCodexCliInstallations(): Promise<number> {
|
|
29
|
+
let recovered = 0;
|
|
30
|
+
for (const owner of retained) if (await owner.recover?.()) recovered++;
|
|
31
|
+
return recovered;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function npmArgs(args: readonly string[], isolation: ReturnType<typeof createNpmConfigIsolation>) {
|
|
35
|
+
return [...args, "--registry=https://registry.npmjs.org", `--userconfig=${isolation.npmrc}`,
|
|
36
|
+
`--globalconfig=${isolation.globalNpmrc}`, `--cache=${isolation.cache}`];
|
|
37
|
+
}
|
|
38
|
+
function expectedDirectories(files: readonly { relativePath: string }[], snapshot: WindowsInstallSnapshot): boolean {
|
|
39
|
+
const expected = new Set<string>();
|
|
40
|
+
for (const file of files) {
|
|
41
|
+
const parts = file.relativePath.split("/");
|
|
42
|
+
for (let i = 3; i < parts.length; i++) expected.add(parts.slice(0, i).join("/"));
|
|
43
|
+
}
|
|
44
|
+
const directories = snapshot.directories.filter(dir => windowsCodexOwnedPath(dir.split(":")[0]!));
|
|
45
|
+
return directories.length === expected.size && [...expected].every(path =>
|
|
46
|
+
directories.some(directory => directory.startsWith(path + ":")));
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** Explicit apply only. Shared prefix entries are bounded preservation obligations; ARM64 refuses.
|
|
50
|
+
* Outcomes describe the scoped installation's observed state, never filesystem-wide no-I/O.
|
|
51
|
+
* The existing admission layer owns confirmed/planId and durable result persistence.
|
|
52
|
+
*/
|
|
53
|
+
export async function applyWindowsCodexCliUpdate(planId: string, deps: CodexCliApplyDeps): Promise<CodexCliApplyResult> {
|
|
54
|
+
const cancelled = () => deps.signal?.aborted === true || deps.isCancelled?.() === true;
|
|
55
|
+
let owner: Owner | undefined, uncertain = false, cleanupPending = false, installerStarted = false;
|
|
56
|
+
let ownerRegistrationPending = false;
|
|
57
|
+
let installationWindowHeld = false;
|
|
58
|
+
let recoveryAllowed = false;
|
|
59
|
+
let installedVersion: string | null = null, targetVersion: string | null = null, exitCode: number | null = null;
|
|
60
|
+
let verificationPid: number | null = null, output: CodexCliApplyResult | undefined;
|
|
61
|
+
const finish = (outcome: CodexCliApplyResult["outcome"], reason: string): CodexCliApplyResult => output = {
|
|
62
|
+
outcome, reason, planId, installedVersion, targetVersion, installerExitCode: exitCode,
|
|
63
|
+
leaseRetained: uncertain || cleanupPending || ownerRegistrationPending, verificationPid, cleanupErrors: cleanupPending ? ["child_cleanup_failed"] : [],
|
|
64
|
+
};
|
|
65
|
+
const inspection = () => {
|
|
66
|
+
const input = { ...deps.inspectionDeps, platform: "win32" as const, observeInstallContent: true };
|
|
67
|
+
return { ...input, selectedCommand: observeCodexCliSelectedCommand(input) };
|
|
68
|
+
};
|
|
69
|
+
const inspect = () => (deps.inspect ?? inspectCodexCliInstall)(inspection());
|
|
70
|
+
const plan = () => createCodexCliUpdatePlan({ ...deps, platform: "win32", inspectionDeps: inspection() });
|
|
71
|
+
const settle = async (child: WindowsCliChild): Promise<WindowsCliChildResult> => {
|
|
72
|
+
if (!owner) throw new Error("ownership_required");
|
|
73
|
+
|
|
74
|
+
if (!child.process) {
|
|
75
|
+
const cleaned = await cleanupUnstartedWindowsChild(child);
|
|
76
|
+
uncertain = false; cleanupPending = !cleaned;
|
|
77
|
+
if (cleaned) owner.child = undefined;
|
|
78
|
+
return { terminal: true, cleanupComplete: cleaned, exitCode: null, stdout: "", failed: true, overflow: false, reason: child.setupFailure };
|
|
79
|
+
}
|
|
80
|
+
const result = await child.wait();
|
|
81
|
+
uncertain = !result.terminal;
|
|
82
|
+
cleanupPending = result.terminal && !result.cleanupComplete;
|
|
83
|
+
if (result.terminal && result.cleanupComplete) owner.child = undefined;
|
|
84
|
+
return result;
|
|
85
|
+
};
|
|
86
|
+
const startOwned = (invocation: WindowsCliChildInvocation): WindowsCliChild => {
|
|
87
|
+
if (!owner || owner.child) throw new Error("child_cleanup_pending");
|
|
88
|
+
uncertain = true; // A throwing start may already have created native resources.
|
|
89
|
+
const jobName = installerStarted ? `Global\\ocx-cli-${randomUUID()}` : undefined;
|
|
90
|
+
const proof = jobName ? deps.commitWindow?.childStarting?.(jobName) : undefined;
|
|
91
|
+
const child = owner.child = (deps.startWindowsChild ?? startWindowsCliChild)({ ...invocation,
|
|
92
|
+
recoveryJobName: jobName, recoveryProof: proof || undefined });
|
|
93
|
+
if (jobName && child.pid && child.creationTime) deps.commitWindow?.childStarted?.(child.pid,
|
|
94
|
+
{ jobName, creationTime: child.creationTime });
|
|
95
|
+
return child;
|
|
96
|
+
};
|
|
97
|
+
const run = async (invocation: WindowsCliChildInvocation): Promise<WindowsCliChildResult> => {
|
|
98
|
+
if (!owner) throw new Error("ownership_required");
|
|
99
|
+
await owner.authority.verify();
|
|
100
|
+
if (!installerStarted && cancelled()) throw new Error("cancelled");
|
|
101
|
+
return settle(startOwned(invocation));
|
|
102
|
+
};
|
|
103
|
+
try {
|
|
104
|
+
if (!/^[0-9a-f]{32}$/.test(planId)) return finish("refused", "invalid_plan_id");
|
|
105
|
+
if (process.platform !== "win32" || process.arch !== "x64") return finish("refused", "windows_inspection_deferred");
|
|
106
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
107
|
+
const first = await inspect(), evidence = windowsCodexCliPlanEvidence(first);
|
|
108
|
+
installedVersion = first.packageVersion;
|
|
109
|
+
if (!first.managed || !evidence || evidence.arch !== "x64") return finish("refused", "mutation_evidence_unverified");
|
|
110
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
111
|
+
const initialPlan = await plan(); targetVersion = initialPlan.targetVersion;
|
|
112
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
113
|
+
if (!initialPlan.applicable) return finish("refused", initialPlan.refusal ?? "plan_refused");
|
|
114
|
+
if (initialPlan.planId !== planId) return finish("refused", "plan_changed");
|
|
115
|
+
const artifacts = initialPlan.targetArtifacts;
|
|
116
|
+
if (!artifacts || artifacts.platform !== "win32" || artifacts.arch !== "x64") return finish("refused", "target_artifacts_unverified");
|
|
117
|
+
// Root the acquisition anchor before await/Owner registration. If registration
|
|
118
|
+
// throws, the Worker token still owns any acquired authority through this anchor.
|
|
119
|
+
const anchor: { acquisition?: WindowsApplyAcquisition; authority?: Authority; owner?: Owner } = {};
|
|
120
|
+
const retention = deps.retainExecution?.(anchor);
|
|
121
|
+
let authority: Authority;
|
|
122
|
+
try {
|
|
123
|
+
authority = anchor.authority = await openWindowsCliApplyAuthority(evidence.prefix, true,
|
|
124
|
+
acquisition => { anchor.acquisition = acquisition; });
|
|
125
|
+
} catch (error) {
|
|
126
|
+
// Authority's finally has already attempted cleanup, without retrying failed pins.
|
|
127
|
+
// A rejected acquisition can still own handles even though no Authority was returned.
|
|
128
|
+
if (anchor.acquisition && !anchor.acquisition.releaseIfClean(retention)) {
|
|
129
|
+
ownerRegistrationPending = true;
|
|
130
|
+
return finish("ambiguous", "installer_or_readback_error");
|
|
131
|
+
}
|
|
132
|
+
if (!anchor.acquisition) retention?.release(); // Native load/validation failed before any ctx existed.
|
|
133
|
+
return finish("refused", error instanceof Error && error.message === "job_store_busy"
|
|
134
|
+
? "installation_busy" : "installation_prefix_unsupported");
|
|
135
|
+
}
|
|
136
|
+
ownerRegistrationPending = true;
|
|
137
|
+
owner = anchor.owner = { retention, authority, staging: win32.join(authority.lock, "stage"), toolchain: null };
|
|
138
|
+
retained.add(owner);
|
|
139
|
+
ownerRegistrationPending = false;
|
|
140
|
+
let recovering = false, recoveryTerminal = false;
|
|
141
|
+
owner.recover = async () => {
|
|
142
|
+
if (!recoveryAllowed || recovering || !owner || (!recoveryTerminal
|
|
143
|
+
&& (!uncertain || !owner.child || !owner.child.process || !owner.child.observe().terminal))) return false;
|
|
144
|
+
recovering = true;
|
|
145
|
+
try {
|
|
146
|
+
if (!recoveryTerminal) {
|
|
147
|
+
const settled = await settle(owner.child!);
|
|
148
|
+
if (!settled.terminal || !settled.cleanupComplete) return false;
|
|
149
|
+
recoveryTerminal = true; // Survives transient authority/readback failure.
|
|
150
|
+
}
|
|
151
|
+
// Readback is required before reopening the shared installation, even
|
|
152
|
+
// though this recovery never upgrades the earlier ambiguous job result.
|
|
153
|
+
await owner.authority.verify();
|
|
154
|
+
await observeWindowsInstall(evidence.prefix); await inspect();
|
|
155
|
+
if (installationWindowHeld) { deps.commitWindow!.exit(); installationWindowHeld = false; }
|
|
156
|
+
await flushWindowsSecretAclReapsBeforeRemoval(owner.staging);
|
|
157
|
+
await owner.authority.removeStaging();
|
|
158
|
+
if (owner.toolchain && !await owner.toolchain.release()) return false;
|
|
159
|
+
await owner.authority.release();
|
|
160
|
+
if (!owner.authority.resourcesReleased) return false;
|
|
161
|
+
retained.delete(owner); owner.retention?.release(); return true;
|
|
162
|
+
} catch { return false; } finally { recovering = false; }
|
|
163
|
+
};
|
|
164
|
+
await authority.createStaging();
|
|
165
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
166
|
+
owner.toolchain = await holdWindowsCodexCliPlanToolchain(first);
|
|
167
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
168
|
+
if (!owner.toolchain) return finish("refused", "npm_unavailable");
|
|
169
|
+
const isolation = createNpmConfigIsolation(owner.staging, deps.inspectionDeps?.env);
|
|
170
|
+
// Include Windows temp/profile names: no npm or version cache may fall back to a live home.
|
|
171
|
+
const env = { ...isolation.env, HOME: owner.staging, USERPROFILE: owner.staging, TEMP: owner.staging,
|
|
172
|
+
TMP: owner.staging, TMPDIR: owner.staging, APPDATA: owner.staging, LOCALAPPDATA: owner.staging, CODEX_HOME: owner.staging };
|
|
173
|
+
const invoke = (args: readonly string[], policy: WindowsCliChildInvocation["policy"]) => run({
|
|
174
|
+
executable: evidence.node, args: windowsNpmExecutionArgs(evidence.npmCli, npmArgs(args, isolation)), cwd: isolation.dir, env, policy,
|
|
175
|
+
});
|
|
176
|
+
const archives: string[] = [];
|
|
177
|
+
for (const [index, artifact] of [artifacts.main, artifacts.backing].entries()) {
|
|
178
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
179
|
+
let path: string;
|
|
180
|
+
if (deps.fetchArtifact) {
|
|
181
|
+
path = win32.join(owner.staging, `${index}.tgz`);
|
|
182
|
+
writeFileSync(path, await deps.fetchArtifact(artifact, deps.signal), { flag: "wx" });
|
|
183
|
+
} else {
|
|
184
|
+
const packed = await invoke(["pack", `${artifact.name}@${artifact.version}`, "--json", "--ignore-scripts",
|
|
185
|
+
"--pack-destination", owner.staging, "--fetch-retries=0", "--fetch-timeout=120000"], "pack");
|
|
186
|
+
if (!packed.terminal) return finish("ambiguous", "installer_state_unknown");
|
|
187
|
+
if (cleanupPending) return finish("ambiguous", "child_cleanup_unverified");
|
|
188
|
+
if (packed.failed || packed.overflow || packed.exitCode !== 0) throw new Error("pack_failed");
|
|
189
|
+
const names = JSON.parse(packed.stdout);
|
|
190
|
+
if (!Array.isArray(names) || names.length !== 1 || !/^[A-Za-z0-9][A-Za-z0-9._-]*\.tgz$/.test(names[0]?.filename)) throw new Error("pack_unverified");
|
|
191
|
+
path = win32.join(owner.staging, names[0].filename);
|
|
192
|
+
}
|
|
193
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
194
|
+
archives.push(path);
|
|
195
|
+
}
|
|
196
|
+
const layout = await verifyWindowsCodexCliLayout(artifacts, archives[0]!, archives[1]!);
|
|
197
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
198
|
+
const original = await observeWindowsInstall(evidence.prefix);
|
|
199
|
+
const fresh = await plan();
|
|
200
|
+
if (!fresh.applicable) return finish("refused", fresh.refusal ?? "plan_refused");
|
|
201
|
+
if (fresh.planId !== planId) return finish("refused", "plan_changed");
|
|
202
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
203
|
+
const args = ["install", "-g", "--prefix", evidence.prefix, "--offline", "--ignore-scripts", "--omit=optional",
|
|
204
|
+
"--no-audit", "--no-fund", "--package-lock=false", "--update-notifier=false",
|
|
205
|
+
`${artifacts.main.installName}@file:${archives[0]}`, `${artifacts.backing.installName}@file:${archives[1]}`];
|
|
206
|
+
const invocation: WindowsCliChildInvocation = { executable: evidence.node,
|
|
207
|
+
args: windowsNpmExecutionArgs(evidence.npmCli, npmArgs(args, isolation)), cwd: isolation.dir, env, policy: "installer" };
|
|
208
|
+
const window = deps.commitWindow;
|
|
209
|
+
let nativeChild: WindowsCliChild | undefined;
|
|
210
|
+
let injectedInstall: Promise<{ terminal: boolean; exitCode: number | null }> | undefined;
|
|
211
|
+
if (window) {
|
|
212
|
+
installationWindowHeld = window.tryEnter() || await window.waitEnter();
|
|
213
|
+
if (!installationWindowHeld) return finish("refused", cancelled() ? "cancelled" : "installation_busy");
|
|
214
|
+
}
|
|
215
|
+
// Renew all observations after gate acquisition, including asynchronous ACLs.
|
|
216
|
+
// Acquisition is bounded; the Windows observation window is not short by guarantee.
|
|
217
|
+
if (cancelled()) return finish("refused", "cancelled");
|
|
218
|
+
await owner.authority.verify();
|
|
219
|
+
const before = await inspect(), selected = windowsCodexCliPlanEvidence(before);
|
|
220
|
+
if (!selected || JSON.stringify(selected) !== JSON.stringify(evidence)
|
|
221
|
+
|| before.installContentDigest !== initialPlan.installContentDigest
|
|
222
|
+
|| !sameWindowsInstall(original, await observeWindowsInstall(evidence.prefix))) return finish("refused", "installation_changed");
|
|
223
|
+
const scan = (deps.scanProcesses ?? scanCodexSessionProcesses)(deps.processIo ?? {});
|
|
224
|
+
if (scan.kind !== "observed") return finish("refused", "blocked_process_state_unknown");
|
|
225
|
+
if (scan.processes.length) return finish("refused", "blocked_active_session");
|
|
226
|
+
// No await from these held-identity/selection checks through CAS and native start.
|
|
227
|
+
owner.authority.verifyIdentitySync();
|
|
228
|
+
if (!windowsCodexCliSelectionMatches(before, inspection())) return finish("refused", "installation_changed");
|
|
229
|
+
if (cancelled() || (window && !window.commit())) return finish("refused", "cancelled");
|
|
230
|
+
installerStarted = true; // CAS is the irrevocable start decision, not spawn success.
|
|
231
|
+
uncertain = true;
|
|
232
|
+
// Trusted injection must begin its start synchronously, like native Create/Assign/Resume.
|
|
233
|
+
if (deps.install) injectedInstall = deps.install({ bin: invocation.executable,
|
|
234
|
+
args: invocation.args, cwd: invocation.cwd, env: invocation.env });
|
|
235
|
+
else nativeChild = startOwned(invocation);
|
|
236
|
+
const installed = nativeChild ? await settle(nativeChild) : await injectedInstall!;
|
|
237
|
+
uncertain = !installed.terminal; exitCode = installed.exitCode;
|
|
238
|
+
if (uncertain) return finish("ambiguous", "installer_state_unknown");
|
|
239
|
+
if (cleanupPending) return finish("ambiguous", "child_cleanup_unverified");
|
|
240
|
+
await owner.authority.verify();
|
|
241
|
+
const observed = await observeWindowsInstall(evidence.prefix);
|
|
242
|
+
const after = await inspect(), afterEvidence = windowsCodexCliPlanEvidence(after);
|
|
243
|
+
installedVersion = after.packageVersion;
|
|
244
|
+
const selectedAfter = after.managed && afterEvidence && afterEvidence.prefix === evidence.prefix
|
|
245
|
+
&& windowsCodexCliSelectionMatches(first, inspection())
|
|
246
|
+
&& afterEvidence.launcher === evidence.launcher && afterEvidence.nodeEvidence === evidence.nodeEvidence
|
|
247
|
+
&& afterEvidence.npmEvidence === evidence.npmEvidence;
|
|
248
|
+
if (!selectedAfter) return finish("ambiguous", "installation_readback_unverified");
|
|
249
|
+
if (after.packageVersion === targetVersion && sameWindowsPreservedEntries(original, observed)
|
|
250
|
+
&& expectedDirectories(layout.files, observed)
|
|
251
|
+
&& afterEvidence.backingRoot === win32.join(evidence.prefix, layout.backingRoot)
|
|
252
|
+
&& matchesWindowsCodexCliLayout(layout, observed.files.filter(file => windowsCodexOwnedPath(file.relativePath)))) {
|
|
253
|
+
const version = await run({ executable: evidence.node, args: [win32.join(evidence.prefix, layout.mainRoot, "bin/codex.js"), "--version"],
|
|
254
|
+
cwd: owner.staging, env, policy: "version" });
|
|
255
|
+
verificationPid = version.terminal ? null : owner.child?.pid ?? null;
|
|
256
|
+
if (!version.terminal) return finish("ambiguous", "version_process_state_unknown");
|
|
257
|
+
if (cleanupPending) return finish("ambiguous", "child_cleanup_unverified");
|
|
258
|
+
if (version.failed || version.overflow || version.exitCode !== 0 || version.stdout.trim() !== `codex-cli ${targetVersion}`) {
|
|
259
|
+
return finish("ambiguous", "version_readback_unverified");
|
|
260
|
+
}
|
|
261
|
+
const final = await inspect(); await owner.authority.verify();
|
|
262
|
+
if (!windowsCodexCliSelectionMatches(after, inspection()) || final.installContentDigest !== after.installContentDigest
|
|
263
|
+
|| !sameWindowsInstall(observed, await observeWindowsInstall(evidence.prefix))) {
|
|
264
|
+
return finish("ambiguous", "version_readback_unverified");
|
|
265
|
+
}
|
|
266
|
+
return finish("applied", "verified_target");
|
|
267
|
+
}
|
|
268
|
+
if (after.packageVersion === first.packageVersion && after.installContentDigest === first.installContentDigest
|
|
269
|
+
&& sameWindowsInstall(original, observed)) return finish("not_applied", "original_install_unchanged");
|
|
270
|
+
return finish("ambiguous", "installation_readback_unverified");
|
|
271
|
+
} catch (error) {
|
|
272
|
+
if (error instanceof WindowsCliToolchainCleanupError) {
|
|
273
|
+
deps.retainExecution?.(error.acquisition);
|
|
274
|
+
ownerRegistrationPending = true; cleanupPending = true;
|
|
275
|
+
return finish("ambiguous", "installer_or_readback_error");
|
|
276
|
+
}
|
|
277
|
+
if (!installerStarted && !uncertain && !ownerRegistrationPending && cancelled()) return finish("refused", "cancelled");
|
|
278
|
+
if (!installerStarted && !uncertain && !ownerRegistrationPending && error instanceof Error
|
|
279
|
+
&& ["cancelled", "installation_changed", "blocked_process_state_unknown", "blocked_active_session"].includes(error.message)) {
|
|
280
|
+
return finish("refused", error.message);
|
|
281
|
+
}
|
|
282
|
+
return finish(installerStarted || uncertain || ownerRegistrationPending ? "ambiguous" : "refused",
|
|
283
|
+
installerStarted || uncertain || ownerRegistrationPending ? "installer_or_readback_error" : "preparation_failed");
|
|
284
|
+
} finally {
|
|
285
|
+
recoveryAllowed = true;
|
|
286
|
+
// Readback (including the version child's descendants) is inside exclusion.
|
|
287
|
+
// Unknown lifetime retains the exact window instead of reopening parent paths.
|
|
288
|
+
if (installationWindowHeld && !uncertain && !cleanupPending) deps.commitWindow!.exit();
|
|
289
|
+
if (owner && !uncertain && !cleanupPending) {
|
|
290
|
+
const errors: CodexCliApplyCleanupError[] = [];
|
|
291
|
+
let resourcesReleased = true;
|
|
292
|
+
try {
|
|
293
|
+
await flushWindowsSecretAclReapsBeforeRemoval(owner.staging);
|
|
294
|
+
await owner.authority.removeStaging();
|
|
295
|
+
} catch { errors.push("staging_cleanup_failed"); resourcesReleased = false; }
|
|
296
|
+
try { if (owner.toolchain && !await owner.toolchain.release()) {
|
|
297
|
+
errors.push("lease_release_unverified"); resourcesReleased = false;
|
|
298
|
+
} }
|
|
299
|
+
catch { errors.push("lease_release_exception"); resourcesReleased = false; }
|
|
300
|
+
try { if (!await owner.authority.release()) errors.push("lease_release_unverified"); }
|
|
301
|
+
catch { errors.push("lease_release_exception"); }
|
|
302
|
+
resourcesReleased &&= owner.authority.resourcesReleased;
|
|
303
|
+
if (resourcesReleased) { retained.delete(owner); ownerRegistrationPending = false; owner.retention?.release(); }
|
|
304
|
+
if (output) Object.assign(output, { cleanupErrors: errors, leaseRetained: !resourcesReleased });
|
|
305
|
+
}
|
|
306
|
+
if (output) { Object.freeze(output.cleanupErrors); Object.freeze(output); }
|
|
307
|
+
}
|
|
308
|
+
}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { backingReference, codexCliArtifactSet, codexCliArtifactSetDigest, verifyCodexCliArchive,
|
|
3
|
+
type CodexArchiveFiles, type CodexCliArtifactSet } from "./cli-update-artifacts";
|
|
4
|
+
import { WINDOWS_CODEX_HEADER_BYTES, WINDOWS_CODEX_NATIVE_MEMBER } from "./cli-update-windows-paths";
|
|
5
|
+
|
|
6
|
+
export interface WindowsCodexExpectedFile { readonly relativePath: string; readonly size: number; readonly digest: string }
|
|
7
|
+
export interface WindowsCodexArchiveLayout {
|
|
8
|
+
readonly schemaVersion: 1;
|
|
9
|
+
readonly applicable: false;
|
|
10
|
+
readonly mutationAuthority: false;
|
|
11
|
+
readonly platform: "win32";
|
|
12
|
+
readonly arch: "x64";
|
|
13
|
+
readonly nativeHeader: "PE32+-AMD64";
|
|
14
|
+
readonly shimContract: "npm-cmd-shim-8-node";
|
|
15
|
+
readonly mainRoot: "node_modules/@openai/codex";
|
|
16
|
+
readonly backingRoot: "node_modules/@openai/codex-win32-x64";
|
|
17
|
+
readonly nativePath: string;
|
|
18
|
+
readonly artifactsDigest: string;
|
|
19
|
+
readonly contentDigest: string;
|
|
20
|
+
readonly files: readonly WindowsCodexExpectedFile[];
|
|
21
|
+
}
|
|
22
|
+
const MAIN = "node_modules/@openai/codex", BACKING = "node_modules/@openai/codex-win32-x64";
|
|
23
|
+
const PACKAGE = "@openai/codex-win32-x64";
|
|
24
|
+
// Exact cmd-shim@8.0.0 (ISC) output for the supported node shebang/global-prefix linkage.
|
|
25
|
+
// Independent captured outputs live in tests/fixtures/codex-windows-npm-shims.json.
|
|
26
|
+
// This is a readback contract, not a shim writer or a claim about every npm version.
|
|
27
|
+
const SHIMS: readonly WindowsCodexExpectedFile[] = [
|
|
28
|
+
{ relativePath: "codex", size: 421, digest: "e4cfdce20603991a0cc30e79b7080277f934100a317f9c8b2779c0a2f8213ab2" },
|
|
29
|
+
{ relativePath: "codex.cmd", size: 341, digest: "0ea5e45d176e31ed39d5b9aad97b58afd6b41f40023508ae5362e151335db803" },
|
|
30
|
+
{ relativePath: "codex.ps1", size: 869, digest: "1f82c9b7d42cb3293d459d7304e67f9da76297d1cc33230a3f786c297ee0cc6a" },
|
|
31
|
+
];
|
|
32
|
+
const object = (value: unknown): value is Record<string, any> => !!value && typeof value === "object" && !Array.isArray(value);
|
|
33
|
+
function manifest(files: CodexArchiveFiles): Record<string, any> {
|
|
34
|
+
const bytes = files.get("package.json")?.bytes;
|
|
35
|
+
const value: unknown = bytes && JSON.parse(bytes.toString("utf8"));
|
|
36
|
+
if (!object(value)) throw new Error("artifact_manifest_unverified");
|
|
37
|
+
return value;
|
|
38
|
+
}
|
|
39
|
+
function validateNative(files: CodexArchiveFiles): void {
|
|
40
|
+
const native = files.get(WINDOWS_CODEX_NATIVE_MEMBER), prefix = native?.nativePrefix;
|
|
41
|
+
if (!native || !prefix || prefix.length !== Math.min(native.size, WINDOWS_CODEX_HEADER_BYTES)
|
|
42
|
+
|| prefix.length < 64 || prefix.toString("ascii", 0, 2) !== "MZ") throw new Error("artifact_windows_native_unverified");
|
|
43
|
+
const pe = prefix.readUInt32LE(60);
|
|
44
|
+
if (pe < 64 || pe > prefix.length - 26 || prefix.toString("ascii", pe, pe + 4) !== "PE\0\0"
|
|
45
|
+
|| prefix.readUInt16LE(pe + 4) !== 0x8664 || !prefix.readUInt16LE(pe + 6)
|
|
46
|
+
|| prefix.readUInt16LE(pe + 20) < 2 || pe + 24 + prefix.readUInt16LE(pe + 20) > native.size
|
|
47
|
+
|| !(prefix.readUInt16LE(pe + 22) & 2) || (prefix.readUInt16LE(pe + 22) & 0x2000)
|
|
48
|
+
|| prefix.readUInt16LE(pe + 24) !== 0x20b) throw new Error("artifact_windows_native_unverified");
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** Read-only artifact verification. Relative paths never select a live prefix or grant write authority.
|
|
52
|
+
* Uses the existing Windows package/Node lookup contract's sibling optional-package lane only.
|
|
53
|
+
* PE header evidence is not a signature, complete image validation or execution proof.
|
|
54
|
+
*/
|
|
55
|
+
export async function verifyWindowsCodexCliLayout(set: CodexCliArtifactSet, mainSource: Buffer | string,
|
|
56
|
+
backingSource: Buffer | string): Promise<WindowsCodexArchiveLayout> {
|
|
57
|
+
if (set.platform !== "win32" || set.arch !== "x64" || set.main.name !== "@openai/codex"
|
|
58
|
+
|| set.main.installName !== "@openai/codex" || set.backing.installName !== PACKAGE) throw new Error("artifact_platform_unverified");
|
|
59
|
+
const main = await verifyCodexCliArchive(mainSource, set.main, { windowsX64: true });
|
|
60
|
+
const backing = await verifyCodexCliArchive(backingSource, set.backing, { windowsX64: true });
|
|
61
|
+
const pkg = manifest(main), platform = manifest(backing);
|
|
62
|
+
// Reuse metadata origin/version and exact direct/alias linkage checks, rather than trusting a structural DTO.
|
|
63
|
+
codexCliArtifactSet({ ...pkg, dist: { integrity: set.main.integrity, tarball: set.main.tarball } },
|
|
64
|
+
() => ({ ...platform, dist: { integrity: set.backing.integrity, tarball: set.backing.tarball } }), "win32", "x64");
|
|
65
|
+
for (const name of Object.keys(pkg.optionalDependencies ?? {})) {
|
|
66
|
+
if (!/^@openai\/codex-(linux|darwin|win32)-(x64|arm64)$/.test(name)) throw new Error("artifact_dependency_unverified");
|
|
67
|
+
backingReference(pkg, name);
|
|
68
|
+
}
|
|
69
|
+
const bin = typeof pkg.bin === "string" ? pkg.bin
|
|
70
|
+
: object(pkg.bin) && Object.keys(pkg.bin).length === 1 ? pkg.bin.codex : null;
|
|
71
|
+
const entry = main.get("bin/codex.js")?.bytes;
|
|
72
|
+
if (typeof bin !== "string" || bin.replace(/^\.\//, "") !== "bin/codex.js" || !entry
|
|
73
|
+
|| entry.toString("utf8").split(/\r?\n/, 1)[0] !== "#!/usr/bin/env node"
|
|
74
|
+
|| platform.exports !== undefined || platform.bin !== undefined || Object.keys(platform.optionalDependencies ?? {}).length
|
|
75
|
+
|| (platform.os !== undefined && (!Array.isArray(platform.os) || platform.os.length !== 1 || platform.os[0] !== "win32"))
|
|
76
|
+
|| (platform.cpu !== undefined && (!Array.isArray(platform.cpu) || platform.cpu.length !== 1 || platform.cpu[0] !== "x64"))) {
|
|
77
|
+
throw new Error("artifact_backing_unverified");
|
|
78
|
+
}
|
|
79
|
+
validateNative(backing);
|
|
80
|
+
const files: WindowsCodexExpectedFile[] = SHIMS.map(file => ({ ...file }));
|
|
81
|
+
for (const [root, archive] of [[MAIN, main], [BACKING, backing]] as const) {
|
|
82
|
+
for (const [relative, proof] of archive) {
|
|
83
|
+
// npm aliases are installed as explicit sibling packages. No embedded package may shadow that lookup.
|
|
84
|
+
if (relative.split("/").some(part => part.toLowerCase() === "node_modules")) throw new Error("artifact_backing_unverified");
|
|
85
|
+
files.push({ relativePath: `${root}/${relative}`, size: proof.size, digest: proof.digest });
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
files.sort((a, b) => a.relativePath < b.relativePath ? -1 : a.relativePath > b.relativePath ? 1 : 0);
|
|
89
|
+
const artifactsDigest = codexCliArtifactSetDigest(set);
|
|
90
|
+
const contentDigest = createHash("sha256").update("codex-cli-windows-layout-v1\0")
|
|
91
|
+
.update(JSON.stringify([artifactsDigest, files])).digest("hex");
|
|
92
|
+
return Object.freeze({ schemaVersion: 1, applicable: false, mutationAuthority: false, platform: "win32", arch: "x64",
|
|
93
|
+
nativeHeader: "PE32+-AMD64", shimContract: "npm-cmd-shim-8-node", mainRoot: MAIN, backingRoot: BACKING,
|
|
94
|
+
nativePath: `${BACKING}/${WINDOWS_CODEX_NATIVE_MEMBER}`, artifactsDigest, contentDigest,
|
|
95
|
+
files: Object.freeze(files.map(file => Object.freeze(file))) });
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/** Compare the two package roots and three shim paths, not unrelated files in the global prefix.
|
|
99
|
+
* No filesystem reads, mode guesses or partial matches.
|
|
100
|
+
* The caller still owes held-file/linkage/selection proof; equal content is not mutation authority.
|
|
101
|
+
*/
|
|
102
|
+
export function matchesWindowsCodexCliLayout(expected: WindowsCodexArchiveLayout,
|
|
103
|
+
observed: readonly WindowsCodexExpectedFile[]): boolean {
|
|
104
|
+
if (expected.files.length !== observed.length) return false;
|
|
105
|
+
const actual = new Map(observed.map(file => [file.relativePath, file]));
|
|
106
|
+
return actual.size === observed.length && expected.files.every(file => {
|
|
107
|
+
const other = actual.get(file.relativePath);
|
|
108
|
+
return other?.size === file.size && other.digest === file.digest;
|
|
109
|
+
});
|
|
110
|
+
}
|