@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -0,0 +1,391 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { accessSync, constants, lstatSync, mkdirSync,
|
|
3
|
+
realpathSync, rmSync, writeFileSync } from "node:fs";
|
|
4
|
+
import { tmpdir } from "node:os";
|
|
5
|
+
import { join } from "node:path";
|
|
6
|
+
import { inspectCodexCliInstall, observeCodexCliSelectedCommand, codexCliMutationEvidence, codexCliMutationSelectionMatches,
|
|
7
|
+
type CodexCliInstallProvenanceDeps, type CodexCliInstallReport } from "./cli-install-provenance";
|
|
8
|
+
import { createCodexCliUpdatePlan, createNpmConfigIsolation, isolatedNpmTarget,
|
|
9
|
+
type CodexCliUpdatePlanDeps } from "./cli-update-plan";
|
|
10
|
+
import { codexCliPlatformBacking } from "./cli-install-provenance";
|
|
11
|
+
import { verifyCodexCliArchive,
|
|
12
|
+
verifiedCodexCliContent, type CodexCliArtifact } from "./cli-update-artifacts";
|
|
13
|
+
import { acquireCodexCliApplyLease } from "./cli-update-lease";
|
|
14
|
+
import { scanCodexSessionProcessesAsync } from "./app-server-processes";
|
|
15
|
+
import { observeCodexCliFileSet, observeCodexCliPreimage, sameCodexCliPreimage, codexCliExpectedFiles, sameCodexCliFiles } from "./cli-update-files";
|
|
16
|
+
import type { CodexCliUpdateCommitWindow } from "./cli-update-selection-gate";
|
|
17
|
+
import { createCodexCliApplyStaging, observeCodexCliMutationPaths, sameCodexCliMutationPaths } from "./cli-update-paths";
|
|
18
|
+
import { codexCliUpdateGroupGone } from "./cli-update-recovery";
|
|
19
|
+
|
|
20
|
+
export interface CodexCliApplyResult {
|
|
21
|
+
readonly outcome: "refused" | "applied" | "not_applied" | "ambiguous";
|
|
22
|
+
readonly reason: string;
|
|
23
|
+
readonly planId: string;
|
|
24
|
+
readonly installedVersion: string | null;
|
|
25
|
+
readonly targetVersion: string | null;
|
|
26
|
+
readonly installerExitCode: number | null;
|
|
27
|
+
readonly leaseRetained: boolean;
|
|
28
|
+
readonly verificationPid: number | null;
|
|
29
|
+
readonly cleanupErrors: readonly CodexCliApplyCleanupError[];
|
|
30
|
+
}
|
|
31
|
+
export type CodexCliApplyCleanupError = "lease_release_unverified" | "lease_release_exception" | "staging_cleanup_failed" | "child_cleanup_failed";
|
|
32
|
+
/** Every cleanup phase is attempted even if another fails. Preserve the
|
|
33
|
+
* computed readback outcome and expose path-free cleanup uncertainty separately.
|
|
34
|
+
*/
|
|
35
|
+
export function cleanupCodexCliApply(lease: { release(): boolean } | null, staging?: string) {
|
|
36
|
+
const cleanupErrors: CodexCliApplyCleanupError[] = [];
|
|
37
|
+
let leaseRetained = false;
|
|
38
|
+
try { if (lease && !lease.release()) { leaseRetained = true; cleanupErrors.push("lease_release_unverified"); } }
|
|
39
|
+
catch { leaseRetained = true; cleanupErrors.push("lease_release_exception"); }
|
|
40
|
+
try { if (staging) rmSync(staging, { recursive: true }); }
|
|
41
|
+
catch { cleanupErrors.push("staging_cleanup_failed"); }
|
|
42
|
+
return Object.freeze({ leaseRetained, cleanupErrors: Object.freeze(cleanupErrors) });
|
|
43
|
+
}
|
|
44
|
+
interface VersionResult { readonly terminal: boolean; readonly ok: boolean; readonly pid: number | null }
|
|
45
|
+
export interface CodexCliApplyDeps extends CodexCliUpdatePlanDeps {
|
|
46
|
+
/** Internal Worker lifetime root, never accepted from a request DTO. */
|
|
47
|
+
readonly retainExecution?: (owner: object) => { release(): void };
|
|
48
|
+
/** Trusted native fault-injection seam; never supplied by a request DTO. */
|
|
49
|
+
readonly startWindowsChild?: typeof import("./windows-cli-child").startWindowsCliChild;
|
|
50
|
+
readonly signal?: AbortSignal;
|
|
51
|
+
/**
|
|
52
|
+
* Shared-fence cancellation checkpoint. Unlike signal.aborted this can flip
|
|
53
|
+
* DURING a synchronous section: the commit fence lives in shared memory the
|
|
54
|
+
* parent CASes, so a cancel landing mid-hash is seen at the next checkpoint
|
|
55
|
+
* rather than only on the next event-loop turn.
|
|
56
|
+
*/
|
|
57
|
+
readonly isCancelled?: () => boolean;
|
|
58
|
+
/**
|
|
59
|
+
* The worker holds admission from the final process scan through terminal
|
|
60
|
+
* installer evidence and readback. commit()'s fence CAS is the last check
|
|
61
|
+
* before spawn. Unknown lifetime retains admission until terminal recovery.
|
|
62
|
+
* Absent preserves the ungated in-process behavior tests rely on.
|
|
63
|
+
*/
|
|
64
|
+
readonly commitWindow?: CodexCliUpdateCommitWindow;
|
|
65
|
+
readonly temporaryRoot?: string;
|
|
66
|
+
readonly fetchArtifact?: (artifact: CodexCliArtifact, signal?: AbortSignal) => Promise<Buffer>;
|
|
67
|
+
readonly install?: (invocation: { bin: string; args: readonly string[]; cwd: string; env: NodeJS.ProcessEnv }) => Promise<{ terminal: boolean; exitCode: number | null; recovery?: Promise<void> }>;
|
|
68
|
+
readonly acquireLease?: typeof acquireCodexCliApplyLease;
|
|
69
|
+
readonly verifyVersion?: typeof verifyInstalledCodexVersion;
|
|
70
|
+
}
|
|
71
|
+
/** Only this owned verification child may be stopped. A deadline/kill request
|
|
72
|
+
* is not terminal evidence: without close the installation lease stays held.
|
|
73
|
+
* A new POSIX process group contains the launcher and its native child.
|
|
74
|
+
* CODEX_HOME/HOME/TMPDIR isolate even --version's state writes in staging.
|
|
75
|
+
*/
|
|
76
|
+
export function verifyInstalledCodexVersion(command: string, version: string, cwd: string, env: NodeJS.ProcessEnv,
|
|
77
|
+
recovered?: () => void, spawned?: (pid: number) => void): Promise<VersionResult> {
|
|
78
|
+
const home = join(cwd, "version-home");
|
|
79
|
+
// A setup failure before any child exists is terminal evidence, not an
|
|
80
|
+
// unknown lifetime: return it so the caller's lease stays releasable.
|
|
81
|
+
try {
|
|
82
|
+
mkdirSync(home, { mode: 0o700 });
|
|
83
|
+
} catch {
|
|
84
|
+
return Promise.resolve({ terminal: true, ok: false, pid: null });
|
|
85
|
+
}
|
|
86
|
+
return new Promise(resolve => {
|
|
87
|
+
let settled = false, failed = false, stopping = false, output = "";
|
|
88
|
+
let deadline: ReturnType<typeof setTimeout> | undefined, reap: ReturnType<typeof setTimeout> | undefined;
|
|
89
|
+
let recovery: ReturnType<typeof setInterval> | undefined;
|
|
90
|
+
// A synchronous spawn throw created no child, so it is the same terminal
|
|
91
|
+
// setup evidence; asynchronous spawn errors still arrive as error+close.
|
|
92
|
+
let child: ReturnType<typeof spawn>;
|
|
93
|
+
try {
|
|
94
|
+
child = spawn(command, ["--version"], { cwd, env: { ...env, CODEX_HOME: home, HOME: home, TMPDIR: home,
|
|
95
|
+
XDG_CONFIG_HOME: home, XDG_CACHE_HOME: home, XDG_DATA_HOME: home },
|
|
96
|
+
stdio: ["ignore", "pipe", "ignore"], windowsHide: true, detached: process.platform !== "win32" });
|
|
97
|
+
} catch {
|
|
98
|
+
resolve({ terminal: true, ok: false, pid: null });
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
if (child.pid) spawned?.(child.pid);
|
|
102
|
+
const groupGone = () => {
|
|
103
|
+
if (process.platform === "win32" || !child.pid) return true;
|
|
104
|
+
try { process.kill(-child.pid, 0); return false; }
|
|
105
|
+
catch (error) { return (error as NodeJS.ErrnoException).code === "ESRCH"; }
|
|
106
|
+
};
|
|
107
|
+
const finish = (closed: boolean, code: number | null) => {
|
|
108
|
+
clearTimeout(deadline); clearTimeout(reap);
|
|
109
|
+
const gone = closed && groupGone();
|
|
110
|
+
if (settled) { if (gone) { clearInterval(recovery); recovered?.(); } return; }
|
|
111
|
+
settled = true;
|
|
112
|
+
// Keep observing after the bounded result. A referenced observer lets the
|
|
113
|
+
// worker drain only after recovery; close alone still needs group evidence.
|
|
114
|
+
if (!gone) recovery = setInterval(() => {
|
|
115
|
+
if ((closed || (process.platform !== "win32" && child.pid !== undefined)) && groupGone()) {
|
|
116
|
+
clearInterval(recovery); recovered?.();
|
|
117
|
+
}
|
|
118
|
+
}, 250);
|
|
119
|
+
resolve({ terminal: gone, ok: gone && !failed && code === 0 && output.trim() === `codex-cli ${version}`,
|
|
120
|
+
pid: gone ? null : child.pid ?? null });
|
|
121
|
+
};
|
|
122
|
+
const stop = () => {
|
|
123
|
+
if (stopping) return;
|
|
124
|
+
stopping = true; failed = true;
|
|
125
|
+
// Kill only this invocation's new group, never an existing Codex session.
|
|
126
|
+
try { if (process.platform !== "win32" && child.pid) process.kill(-child.pid, "SIGKILL"); else child.kill("SIGKILL"); }
|
|
127
|
+
catch { /* close/group observation remains the exit proof */ }
|
|
128
|
+
child.stdout?.destroy();
|
|
129
|
+
reap = setTimeout(() => finish(false, null), 1_000);
|
|
130
|
+
};
|
|
131
|
+
child.stdout?.on("data", bytes => {
|
|
132
|
+
if (Buffer.byteLength(output) + bytes.length > 16 * 1024) stop();
|
|
133
|
+
else if (!failed) output += bytes.toString();
|
|
134
|
+
});
|
|
135
|
+
child.once("error", () => { failed = true; });
|
|
136
|
+
child.once("close", code => finish(true, code));
|
|
137
|
+
deadline = setTimeout(stop, 8_000);
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
/** A close event, not a timeout/error alone, settles a spawned npm child's
|
|
141
|
+
* lifetime. Abort during a running child is intentionally deferred: do not
|
|
142
|
+
* kill it or release its lease/staging before terminal readback.
|
|
143
|
+
*/
|
|
144
|
+
function runNpm(invocation: { bin: string; args: readonly string[]; cwd: string; env: NodeJS.ProcessEnv }, capture = false,
|
|
145
|
+
spawned?: (pid: number) => void) {
|
|
146
|
+
return new Promise<{ terminal: boolean; exitCode: number | null; stdout: string; recovery?: Promise<void> }>(resolve => {
|
|
147
|
+
let child: ReturnType<typeof spawn>;
|
|
148
|
+
try {
|
|
149
|
+
child = spawn(invocation.bin, [...invocation.args], { cwd: invocation.cwd, env: invocation.env,
|
|
150
|
+
stdio: ["ignore", capture ? "pipe" : "ignore", "ignore"], windowsHide: true,
|
|
151
|
+
detached: !!spawned && process.platform !== "win32" });
|
|
152
|
+
} catch { resolve({ terminal: true, exitCode: null, stdout: "" }); return; }
|
|
153
|
+
let stdout = "";
|
|
154
|
+
let overflow = false;
|
|
155
|
+
child.stdout?.on("data", chunk => {
|
|
156
|
+
if (stdout.length + chunk.length > 1024 * 1024) overflow = true;
|
|
157
|
+
else if (!overflow) stdout += chunk.toString();
|
|
158
|
+
});
|
|
159
|
+
child.on("error", () => { /* close follows even when spawning failed */ });
|
|
160
|
+
child.once("close", code => {
|
|
161
|
+
const terminal = !spawned || !child.pid || process.platform === "win32" || codexCliUpdateGroupGone(child.pid);
|
|
162
|
+
const recovery = terminal ? undefined : new Promise<void>(done => {
|
|
163
|
+
const observer = setInterval(() => { if (codexCliUpdateGroupGone(child.pid!)) { clearInterval(observer); done(); } }, 250);
|
|
164
|
+
});
|
|
165
|
+
resolve({ terminal, exitCode: overflow ? null : code, stdout, recovery });
|
|
166
|
+
});
|
|
167
|
+
if (child.pid) spawned?.(child.pid);
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
async function packArtifact(artifact: CodexCliArtifact, dir: string, env?: NodeJS.ProcessEnv): Promise<string> {
|
|
171
|
+
const isolation = createNpmConfigIsolation(dir, env);
|
|
172
|
+
const invocation = isolatedNpmTarget(["pack", `${artifact.name}@${artifact.version}`, "--json", "--ignore-scripts",
|
|
173
|
+
"--pack-destination", dir, "--fetch-retries=0", "--fetch-timeout=120000"], isolation);
|
|
174
|
+
if (!invocation) throw new Error("npm_unavailable");
|
|
175
|
+
const packed = await runNpm({ bin: invocation.bin, args: invocation.args, cwd: isolation.dir, env: isolation.env }, true);
|
|
176
|
+
if (packed.exitCode !== 0) throw new Error("artifact_pack_failed");
|
|
177
|
+
const files = JSON.parse(packed.stdout);
|
|
178
|
+
if (!Array.isArray(files) || files.length !== 1 || typeof files[0]?.filename !== "string"
|
|
179
|
+
|| !/^[A-Za-z0-9][A-Za-z0-9._-]*\.tgz$/.test(files[0].filename)) throw new Error("artifact_pack_unverified");
|
|
180
|
+
const path = join(dir, files[0].filename);
|
|
181
|
+
if (realpathSync.native(path) !== path) throw new Error("artifact_pack_unverified");
|
|
182
|
+
return path;
|
|
183
|
+
}
|
|
184
|
+
function freshInspection(deps: CodexCliApplyDeps): CodexCliInstallProvenanceDeps {
|
|
185
|
+
const inspection = { ...(deps.inspectionDeps ?? {}), platform: deps.platform ?? deps.inspectionDeps?.platform,
|
|
186
|
+
observeInstallContent: true };
|
|
187
|
+
return { ...inspection, selectedCommand: observeCodexCliSelectedCommand(inspection) };
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/** POSIX non-shim transaction; Windows dispatches to its separately owned native transaction. */
|
|
191
|
+
export async function applyCodexCliUpdate(planId: string, deps: CodexCliApplyDeps = {}): Promise<CodexCliApplyResult> {
|
|
192
|
+
let installedVersion: string | null = null;
|
|
193
|
+
let targetVersion: string | null = null;
|
|
194
|
+
let exitCode: number | null = null;
|
|
195
|
+
let lease: { release(): boolean } | null = null;
|
|
196
|
+
let keepLease = false;
|
|
197
|
+
let staging: string | undefined;
|
|
198
|
+
let started = false;
|
|
199
|
+
let verificationPid: number | null = null;
|
|
200
|
+
let output: CodexCliApplyResult | undefined;
|
|
201
|
+
let windowHeld = false;
|
|
202
|
+
const recover = () => {
|
|
203
|
+
cleanupCodexCliApply(lease, staging);
|
|
204
|
+
if (windowHeld) deps.commitWindow?.exit();
|
|
205
|
+
};
|
|
206
|
+
const result = (outcome: CodexCliApplyResult["outcome"], reason: string): CodexCliApplyResult =>
|
|
207
|
+
output = { outcome, reason, planId, installedVersion, targetVersion, installerExitCode: exitCode, leaseRetained: keepLease, verificationPid, cleanupErrors: [] };
|
|
208
|
+
// Both cancellation channels are consulted at every checkpoint: the plain
|
|
209
|
+
// AbortSignal for in-process callers and the shared-fence isCancelled for a
|
|
210
|
+
// worker whose cancel lands mid-synchronous-section on the parent's loop.
|
|
211
|
+
const cancelled = (): boolean => deps.signal?.aborted === true || deps.isCancelled?.() === true;
|
|
212
|
+
try {
|
|
213
|
+
if (!/^[0-9a-f]{32}$/.test(planId)) return result("refused", "invalid_plan_id");
|
|
214
|
+
if ((deps.platform ?? process.platform) === "win32") {
|
|
215
|
+
const { applyWindowsCodexCliUpdate } = await import("./cli-update-windows-apply");
|
|
216
|
+
return applyWindowsCodexCliUpdate(planId, deps);
|
|
217
|
+
}
|
|
218
|
+
if (cancelled()) return result("refused", "cancelled");
|
|
219
|
+
const inspect = deps.inspect ?? inspectCodexCliInstall;
|
|
220
|
+
const first = await inspect(freshInspection(deps));
|
|
221
|
+
installedVersion = first.packageVersion;
|
|
222
|
+
const evidence = codexCliMutationEvidence(first);
|
|
223
|
+
if (!first.managed || !evidence || first.shim.status !== "not-tracked") return result("refused", "mutation_evidence_unverified");
|
|
224
|
+
const prefix = realpathSync.native(evidence.prefix);
|
|
225
|
+
if (prefix !== evidence.prefix) return result("refused", "installation_prefix_changed");
|
|
226
|
+
const prefixIdentity = lstatSync(prefix);
|
|
227
|
+
const acquired = (deps.acquireLease ?? acquireCodexCliApplyLease)(prefix);
|
|
228
|
+
if (acquired.kind === "prefix_unsupported") return result("refused", "installation_prefix_unsupported");
|
|
229
|
+
if (acquired.kind === "busy") return result("refused", "installation_busy");
|
|
230
|
+
if (acquired.kind !== "acquired") return result("refused", "installation_lease_unavailable");
|
|
231
|
+
lease = acquired;
|
|
232
|
+
let mutationPaths;
|
|
233
|
+
try { mutationPaths = observeCodexCliMutationPaths(prefix); }
|
|
234
|
+
catch { return result("refused", "installation_paths_untrusted"); }
|
|
235
|
+
const freshPlan = () => createCodexCliUpdatePlan({ ...deps, inspectionDeps: freshInspection(deps) });
|
|
236
|
+
const plan = await freshPlan();
|
|
237
|
+
targetVersion = plan.targetVersion;
|
|
238
|
+
if (!plan.applicable) return result("refused", plan.refusal ?? "plan_refused");
|
|
239
|
+
if (plan.planId !== planId) return result("refused", "plan_changed");
|
|
240
|
+
const artifacts = plan.targetArtifacts;
|
|
241
|
+
if (!artifacts || artifacts.platform !== (deps.platform ?? process.platform)
|
|
242
|
+
|| artifacts.arch !== (deps.inspectionDeps?.arch ?? process.arch)) return result("refused", "target_artifacts_unverified");
|
|
243
|
+
try { staging = createCodexCliApplyStaging(deps.temporaryRoot ?? tmpdir()); }
|
|
244
|
+
catch { return result("refused", "staging_path_untrusted"); }
|
|
245
|
+
const stagingIdentity = lstatSync(staging);
|
|
246
|
+
const paths: string[] = [];
|
|
247
|
+
for (const [index, artifact] of [artifacts.main, artifacts.backing].entries()) {
|
|
248
|
+
let path: string;
|
|
249
|
+
if (deps.fetchArtifact) {
|
|
250
|
+
const bytes = await deps.fetchArtifact(artifact, deps.signal);
|
|
251
|
+
path = join(staging, `${index}.tgz`);
|
|
252
|
+
writeFileSync(path, bytes, { flag: "wx", mode: 0o400 });
|
|
253
|
+
} else path = await packArtifact(artifact, staging, deps.inspectionDeps?.env);
|
|
254
|
+
paths.push(path);
|
|
255
|
+
}
|
|
256
|
+
if (cancelled()) return result("refused", "cancelled");
|
|
257
|
+
const main = await verifyCodexCliArchive(paths[0]!, artifacts.main);
|
|
258
|
+
const backing = await verifyCodexCliArchive(paths[1]!, artifacts.backing);
|
|
259
|
+
const expectedContent = verifiedCodexCliContent(artifacts, main, backing);
|
|
260
|
+
const targetMainRoot = join(prefix, "lib", "node_modules", ...artifacts.main.installName.split("/"));
|
|
261
|
+
const backingRoot = join(prefix, "lib", "node_modules", ...artifacts.backing.installName.split("/"));
|
|
262
|
+
const originalRoots = [evidence.packageRoot, ...(evidence.backingRoot ? [evidence.backingRoot] : []), targetMainRoot, backingRoot];
|
|
263
|
+
const original = observeCodexCliPreimage(originalRoots);
|
|
264
|
+
// Metadata, content, selection and process observation are renewed after
|
|
265
|
+
// potentially slow downloads; the awaited process scan is the last yield
|
|
266
|
+
// before install, and a synchronous identity/preimage/selection guard runs
|
|
267
|
+
// in the same event-loop turn as the spawn.
|
|
268
|
+
const finalPlan = await freshPlan();
|
|
269
|
+
if (!finalPlan.applicable) return result("refused", finalPlan.refusal ?? "plan_refused");
|
|
270
|
+
if (finalPlan.planId !== planId) return result("refused", "plan_changed");
|
|
271
|
+
const beforeInstall = await inspect(freshInspection(deps));
|
|
272
|
+
const selected = codexCliMutationEvidence(beforeInstall);
|
|
273
|
+
const currentPrefix = lstatSync(prefix);
|
|
274
|
+
if (!selected || selected.prefix !== prefix || selected.launcher !== evidence.launcher
|
|
275
|
+
|| selected.canonicalLauncher !== evidence.canonicalLauncher || selected.packageRoot !== evidence.packageRoot
|
|
276
|
+
|| beforeInstall.installContentDigest !== plan.installContentDigest || !beforeInstall.managed
|
|
277
|
+
|| realpathSync.native(prefix) !== prefix || currentPrefix.dev !== prefixIdentity.dev
|
|
278
|
+
|| currentPrefix.ino !== prefixIdentity.ino) return result("refused", "installation_changed");
|
|
279
|
+
if (cancelled()) return result("refused", "cancelled");
|
|
280
|
+
const isolation = createNpmConfigIsolation(staging, deps.inspectionDeps?.env);
|
|
281
|
+
isolation.env.TMPDIR = isolation.env.TEMP = isolation.env.TMP = staging;
|
|
282
|
+
const args = ["install", "-g", "--prefix", prefix, "--offline", "--ignore-scripts", "--omit=optional",
|
|
283
|
+
"--no-audit", "--no-fund", "--package-lock=false", "--update-notifier=false",
|
|
284
|
+
`${artifacts.main.installName}@file:${paths[0]}`, `${artifacts.backing.installName}@file:${paths[1]}`];
|
|
285
|
+
const invocation = isolatedNpmTarget(args, isolation);
|
|
286
|
+
if (!invocation) return result("refused", "npm_unavailable");
|
|
287
|
+
// The shared selection gate serializes this commit window against the
|
|
288
|
+
// parent's own selection writers and session-spawn paths, which a worker
|
|
289
|
+
// realm can no longer exclude just by occupying its own event-loop turn.
|
|
290
|
+
// waitEnter can yield while a parent writer holds the gate, so the final
|
|
291
|
+
// process observation is taken only after the window is held; a gate that
|
|
292
|
+
// stays busy or a cancel that lands first refuses before the spawn.
|
|
293
|
+
const commitWindow = deps.commitWindow;
|
|
294
|
+
if (commitWindow) {
|
|
295
|
+
windowHeld = commitWindow.tryEnter() || await commitWindow.waitEnter();
|
|
296
|
+
if (!windowHeld) return result("refused", cancelled() ? "cancelled" : "installation_busy");
|
|
297
|
+
}
|
|
298
|
+
const lastScan = deps.scanProcessesAsync
|
|
299
|
+
? await deps.scanProcessesAsync(deps.processIo ?? {})
|
|
300
|
+
: deps.scanProcesses
|
|
301
|
+
? deps.scanProcesses(deps.processIo ?? {})
|
|
302
|
+
: await scanCodexSessionProcessesAsync(deps.processIo ?? {});
|
|
303
|
+
if (lastScan.kind !== "observed") return result("refused", "blocked_process_state_unknown");
|
|
304
|
+
if (lastScan.processes.length) return result("refused", "blocked_active_session");
|
|
305
|
+
// Every earlier await could have yielded the event loop to a mutation of
|
|
306
|
+
// the install tree, the prefix or the selected command, so the last turn
|
|
307
|
+
// before spawn re-verifies them synchronously: prefix identity, the
|
|
308
|
+
// byte-level preimage taken before the downloads, the launcher's live
|
|
309
|
+
// canonical selection and the signal. Nothing can interleave between
|
|
310
|
+
// this block and the install invocation on the same event-loop turn,
|
|
311
|
+
// and the held gate keeps the gated parent operations out of the window.
|
|
312
|
+
if (cancelled()) return result("refused", "cancelled");
|
|
313
|
+
try {
|
|
314
|
+
if (!sameCodexCliMutationPaths(mutationPaths, observeCodexCliMutationPaths(prefix))) {
|
|
315
|
+
return result("refused", "installation_paths_untrusted");
|
|
316
|
+
}
|
|
317
|
+
} catch { return result("refused", "installation_paths_untrusted"); }
|
|
318
|
+
try {
|
|
319
|
+
observeCodexCliMutationPaths(staging);
|
|
320
|
+
const stage = lstatSync(staging);
|
|
321
|
+
if (stage.dev !== stagingIdentity.dev || stage.ino !== stagingIdentity.ino) {
|
|
322
|
+
return result("refused", "staging_path_untrusted");
|
|
323
|
+
}
|
|
324
|
+
} catch { return result("refused", "staging_path_untrusted"); }
|
|
325
|
+
const lastPrefix = lstatSync(prefix);
|
|
326
|
+
if (realpathSync.native(prefix) !== prefix || lastPrefix.dev !== prefixIdentity.dev
|
|
327
|
+
|| lastPrefix.ino !== prefixIdentity.ino
|
|
328
|
+
|| !sameCodexCliPreimage(original, observeCodexCliPreimage(originalRoots))
|
|
329
|
+
|| !codexCliMutationSelectionMatches(evidence, freshInspection(deps))) {
|
|
330
|
+
return result("refused", "installation_changed");
|
|
331
|
+
}
|
|
332
|
+
// The commit CAS is the final synchronous guard: a cancel already
|
|
333
|
+
// landed wins and no spawn happens; once COMMITTED, a later cancel is
|
|
334
|
+
// deferred to the live installer's close and readback.
|
|
335
|
+
if (commitWindow && !commitWindow.commit()) return result("refused", "cancelled");
|
|
336
|
+
started = true;
|
|
337
|
+
keepLease = true;
|
|
338
|
+
// Admission remains exclusive through installer termination AND readback.
|
|
339
|
+
// Unknown child lifetime retains both the lease and this process gate.
|
|
340
|
+
const invocationArgs = { bin: invocation.bin, args: invocation.args, cwd: isolation.dir, env: isolation.env };
|
|
341
|
+
const installPromise = deps.install ? deps.install(invocationArgs)
|
|
342
|
+
: runNpm(invocationArgs, false, pid => deps.commitWindow?.childStarted?.(pid));
|
|
343
|
+
const installed = await installPromise;
|
|
344
|
+
exitCode = installed.exitCode;
|
|
345
|
+
if (!installed.terminal) {
|
|
346
|
+
if ("recovery" in installed) void installed.recovery?.then(recover);
|
|
347
|
+
return result("ambiguous", "installer_state_unknown");
|
|
348
|
+
}
|
|
349
|
+
keepLease = false;
|
|
350
|
+
// Readback outranks exit code. Partial or unreadable installs are never retried.
|
|
351
|
+
const after: CodexCliInstallReport = await inspect(freshInspection(deps));
|
|
352
|
+
const afterEvidence = codexCliMutationEvidence(after);
|
|
353
|
+
installedVersion = after.packageVersion;
|
|
354
|
+
const prefixAfter = lstatSync(prefix);
|
|
355
|
+
if (realpathSync.native(prefix) !== prefix || prefixAfter.dev !== prefixIdentity.dev || prefixAfter.ino !== prefixIdentity.ino) {
|
|
356
|
+
return result("ambiguous", "installation_prefix_changed");
|
|
357
|
+
}
|
|
358
|
+
if (after.managed && afterEvidence?.prefix === prefix && afterEvidence.launcher === evidence.launcher
|
|
359
|
+
&& after.packageVersion === targetVersion && after.installContentDigest === expectedContent
|
|
360
|
+
&& sameCodexCliFiles(codexCliExpectedFiles([[afterEvidence.packageRoot, main], [backingRoot, backing]]),
|
|
361
|
+
observeCodexCliFileSet([afterEvidence.packageRoot, backingRoot]))
|
|
362
|
+
&& codexCliMutationSelectionMatches(afterEvidence, freshInspection(deps))) {
|
|
363
|
+
const layout = codexCliPlatformBacking(artifacts.platform, artifacts.arch)!;
|
|
364
|
+
accessSync(afterEvidence.launcher, constants.X_OK);
|
|
365
|
+
accessSync(join(backingRoot, "vendor", layout.triple, "bin", "codex"), constants.X_OK);
|
|
366
|
+
deps.commitWindow?.childStarting?.();
|
|
367
|
+
keepLease = true;
|
|
368
|
+
const version = await (deps.verifyVersion ?? verifyInstalledCodexVersion)(afterEvidence.launcher, targetVersion!, staging, isolation.env,
|
|
369
|
+
recover, pid => deps.commitWindow?.childStarted?.(pid));
|
|
370
|
+
verificationPid = version.pid;
|
|
371
|
+
if (!version.terminal) return result("ambiguous", "version_process_state_unknown");
|
|
372
|
+
keepLease = false;
|
|
373
|
+
if (!version.ok || !codexCliMutationSelectionMatches(afterEvidence, freshInspection(deps))) return result("ambiguous", "version_readback_unverified");
|
|
374
|
+
return result("applied", "verified_target");
|
|
375
|
+
}
|
|
376
|
+
if (afterEvidence?.prefix === prefix && after.managed && after.packageVersion === first.packageVersion
|
|
377
|
+
&& after.installContentDigest === plan.installContentDigest
|
|
378
|
+
&& sameCodexCliPreimage(original, observeCodexCliPreimage(originalRoots))
|
|
379
|
+
&& codexCliMutationSelectionMatches(afterEvidence, freshInspection(deps))) return result("not_applied", "original_install_unchanged");
|
|
380
|
+
return result("ambiguous", "installation_readback_unverified");
|
|
381
|
+
} catch {
|
|
382
|
+
return result(started ? "ambiguous" : "refused", started ? "installer_or_readback_error" : "preparation_failed");
|
|
383
|
+
} finally {
|
|
384
|
+
if (!keepLease) {
|
|
385
|
+
const cleanup = cleanupCodexCliApply(lease, staging);
|
|
386
|
+
if (output) Object.assign(output, cleanup);
|
|
387
|
+
if (windowHeld) deps.commitWindow?.exit();
|
|
388
|
+
}
|
|
389
|
+
if (output) { Object.freeze(output.cleanupErrors); Object.freeze(output); }
|
|
390
|
+
}
|
|
391
|
+
}
|
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { createGunzip } from "node:zlib";
|
|
3
|
+
import { closeSync, constants, createReadStream, fstatSync, lstatSync, openSync } from "node:fs";
|
|
4
|
+
import { Readable, Transform } from "node:stream";
|
|
5
|
+
import { pipeline } from "node:stream/promises";
|
|
6
|
+
import { parseStrictSemver } from "../lib/strict-semver";
|
|
7
|
+
import { codexCliContentFileDigest, codexCliContentSetDigest, codexCliPlatformBacking } from "./cli-install-provenance";
|
|
8
|
+
import { windowsArchivePathValidator, WINDOWS_CODEX_HEADER_BYTES, WINDOWS_CODEX_NATIVE_MEMBER } from "./cli-update-windows-paths";
|
|
9
|
+
|
|
10
|
+
export const CODEX_CLI_REGISTRY = "https://registry.npmjs.org";
|
|
11
|
+
export interface CodexCliArtifact {
|
|
12
|
+
readonly name: string;
|
|
13
|
+
readonly installName: string;
|
|
14
|
+
readonly version: string;
|
|
15
|
+
readonly integrity: string;
|
|
16
|
+
readonly tarball: string;
|
|
17
|
+
}
|
|
18
|
+
export interface CodexCliArtifactSet {
|
|
19
|
+
readonly platform: NodeJS.Platform;
|
|
20
|
+
readonly arch: string;
|
|
21
|
+
readonly main: CodexCliArtifact;
|
|
22
|
+
readonly backing: CodexCliArtifact;
|
|
23
|
+
}
|
|
24
|
+
export function isSha512Integrity(token: string): boolean {
|
|
25
|
+
if (!/^sha512-[A-Za-z0-9+/]{86}==$/.test(token)) return false;
|
|
26
|
+
const digest = Buffer.from(token.slice(7), "base64");
|
|
27
|
+
return digest.length === 64 && "sha512-" + digest.toString("base64") === token;
|
|
28
|
+
}
|
|
29
|
+
export function officialCodexTarball(value: string): boolean {
|
|
30
|
+
try {
|
|
31
|
+
const url = new URL(value);
|
|
32
|
+
return url.origin === CODEX_CLI_REGISTRY && !url.username && !url.password && !url.search && !url.hash;
|
|
33
|
+
} catch { return false; }
|
|
34
|
+
}
|
|
35
|
+
type Metadata = Record<string, any>;
|
|
36
|
+
function artifact(meta: Metadata, installName: string): CodexCliArtifact {
|
|
37
|
+
if (typeof meta.name !== "string" || typeof meta.version !== "string" || !parseStrictSemver(meta.version)
|
|
38
|
+
|| typeof meta.dist?.integrity !== "string" || !isSha512Integrity(meta.dist.integrity)
|
|
39
|
+
|| typeof meta.dist?.tarball !== "string" || !officialCodexTarball(meta.dist.tarball)) throw new Error("artifact_metadata_unverified");
|
|
40
|
+
return Object.freeze({ name: meta.name, installName, version: meta.version,
|
|
41
|
+
integrity: meta.dist.integrity, tarball: meta.dist.tarball });
|
|
42
|
+
}
|
|
43
|
+
/** Only exact optional-package versions or the publisher's exact npm alias are modeled. */
|
|
44
|
+
export function backingReference(main: Metadata, installName: string): { name: string; version: string; spec: string } {
|
|
45
|
+
const dependency = main.optionalDependencies?.[installName];
|
|
46
|
+
const direct = dependency === main.version;
|
|
47
|
+
const alias = `npm:@openai/codex@${main.version}-${installName.slice("@openai/codex-".length)}`;
|
|
48
|
+
if (!direct && dependency !== alias) throw new Error("backing_reference_unverified");
|
|
49
|
+
const name = direct ? installName : "@openai/codex";
|
|
50
|
+
const version = direct ? main.version : alias.slice("npm:@openai/codex@".length);
|
|
51
|
+
return { name, version, spec: `${name}@${version}` };
|
|
52
|
+
}
|
|
53
|
+
/** Main-metadata guard + reference derivation shared by the sync and async set builders. */
|
|
54
|
+
function codexCliArtifactMain(main: Metadata, platform: NodeJS.Platform, arch: string) {
|
|
55
|
+
const layout = codexCliPlatformBacking(platform, arch);
|
|
56
|
+
if (!layout || main.name !== "@openai/codex") throw new Error("artifact_platform_unverified");
|
|
57
|
+
const mainArtifact = artifact(main, "@openai/codex");
|
|
58
|
+
const reference = backingReference(main, layout.package);
|
|
59
|
+
return { layout, mainArtifact, reference };
|
|
60
|
+
}
|
|
61
|
+
function codexCliArtifactFinish(mainArtifact: CodexCliArtifact,
|
|
62
|
+
reference: { name: string; version: string; spec: string },
|
|
63
|
+
layout: { package: string }, backingMeta: Metadata,
|
|
64
|
+
platform: NodeJS.Platform, arch: string): CodexCliArtifactSet {
|
|
65
|
+
const backing = artifact(backingMeta, layout.package);
|
|
66
|
+
if (backing.name !== reference.name || backing.version !== reference.version) throw new Error("backing_metadata_unverified");
|
|
67
|
+
return Object.freeze({ platform, arch, main: mainArtifact, backing });
|
|
68
|
+
}
|
|
69
|
+
export function codexCliArtifactSet(main: Metadata, query: (spec: string) => Metadata,
|
|
70
|
+
platform: NodeJS.Platform, arch: string): CodexCliArtifactSet {
|
|
71
|
+
// Main integrity is refused BEFORE the backing query is issued — the tarball query
|
|
72
|
+
// must never run on already-unverified metadata (integrity gate, 2 queries total).
|
|
73
|
+
const { layout, mainArtifact, reference } = codexCliArtifactMain(main, platform, arch);
|
|
74
|
+
return codexCliArtifactFinish(mainArtifact, reference, layout, query(reference.spec), platform, arch);
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* The request-path twin of {@link codexCliArtifactSet}: the backing query resolves off the
|
|
78
|
+
* event loop, so a waiting registry child cannot stall the proxy. The platform guard and
|
|
79
|
+
* main-artifact check still run before any backing query is issued.
|
|
80
|
+
*/
|
|
81
|
+
export async function codexCliArtifactSetAsync(main: Metadata, query: (spec: string) => Promise<Metadata>,
|
|
82
|
+
platform: NodeJS.Platform, arch: string): Promise<CodexCliArtifactSet> {
|
|
83
|
+
const { layout, mainArtifact, reference } = codexCliArtifactMain(main, platform, arch);
|
|
84
|
+
return codexCliArtifactFinish(mainArtifact, reference, layout, await query(reference.spec), platform, arch);
|
|
85
|
+
}
|
|
86
|
+
export function codexCliArtifactSetDigest(set: CodexCliArtifactSet): string {
|
|
87
|
+
return createHash("sha256").update(JSON.stringify([set.platform, set.arch,
|
|
88
|
+
...[set.main, set.backing].map(file => [file.name, file.installName, file.version, file.integrity, file.tarball])])).digest("hex");
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
export const MAX_CODEX_ARCHIVE_BYTES = 256 * 1024 * 1024;
|
|
92
|
+
export const MAX_CODEX_UNPACKED_BYTES = 512 * 1024 * 1024;
|
|
93
|
+
export const MAX_CODEX_MEMBER_BYTES = 384 * 1024 * 1024;
|
|
94
|
+
export interface CodexArchiveFile { readonly size: number; readonly mode: number; readonly digest: string; readonly bytes: Buffer | null;
|
|
95
|
+
/** Optional bounded prefix from the same integrity-verified member stream, never a second path read. */
|
|
96
|
+
readonly nativePrefix?: Buffer }
|
|
97
|
+
export type CodexArchiveFiles = Map<string, CodexArchiveFile>;
|
|
98
|
+
/** Stream gzip and tar. Only package.json (256 KiB) and the JS entrypoint (1 MiB)
|
|
99
|
+
* are retained; native binaries and other files contribute a streaming digest.
|
|
100
|
+
* Windows x64 opt-in additionally retains at most 4 KiB of its native member.
|
|
101
|
+
* Official 0.163.0 linux-x64: 162,055,867 compressed, 429,938,138 unpacked,
|
|
102
|
+
* largest member 296,865,480 bytes. Limits are independent, not a heap budget.
|
|
103
|
+
*/
|
|
104
|
+
export async function verifyCodexCliArchive(source: Buffer | string, target: CodexCliArtifact,
|
|
105
|
+
options: { windowsX64?: boolean } = {}): Promise<CodexArchiveFiles> {
|
|
106
|
+
if (!isSha512Integrity(target.integrity)) throw new Error("artifact_integrity_mismatch");
|
|
107
|
+
let fd: number | undefined;
|
|
108
|
+
let before: ReturnType<typeof fstatSync> | undefined;
|
|
109
|
+
if (typeof source === "string") {
|
|
110
|
+
fd = openSync(source, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
|
|
111
|
+
try { before = fstatSync(fd); } catch (error) { closeSync(fd); throw error; }
|
|
112
|
+
if (!before.isFile() || before.size > MAX_CODEX_ARCHIVE_BYTES) { closeSync(fd); throw new Error("artifact_file_unverified"); }
|
|
113
|
+
}
|
|
114
|
+
let input: Readable;
|
|
115
|
+
try {
|
|
116
|
+
input = typeof source === "string" ? createReadStream(source, { fd, autoClose: false, emitClose: true, highWaterMark: 64 * 1024 }) : Readable.from([source]);
|
|
117
|
+
} catch (error) { if (fd !== undefined) closeSync(fd); throw error; }
|
|
118
|
+
// The stream exclusively owns fd after construction. In Bun destroy closes
|
|
119
|
+
// even with autoClose:false; that option keeps the fd held through our final
|
|
120
|
+
// identity check, not through an explicit destroy. Never close the raw fd too.
|
|
121
|
+
let inputError: Error | undefined;
|
|
122
|
+
input.on("error", error => { inputError = error; });
|
|
123
|
+
const inputClosed = new Promise<void>(resolve => input.once("close", resolve));
|
|
124
|
+
const archiveHash = createHash("sha512");
|
|
125
|
+
let compressed = 0, unpacked = 0, count = 0, headerSize = 0, padding = 0, trailer = 0;
|
|
126
|
+
let ended = false;
|
|
127
|
+
const header = Buffer.alloc(512);
|
|
128
|
+
const files: CodexArchiveFiles = new Map();
|
|
129
|
+
const names = new Set<string>();
|
|
130
|
+
const windowsName = options.windowsX64 ? windowsArchivePathValidator() : undefined;
|
|
131
|
+
let current: { name: string; size: number; mode: number; remaining: number; keep: boolean;
|
|
132
|
+
chunks: Buffer[]; prefix?: Buffer; hash: ReturnType<typeof createHash> } | undefined;
|
|
133
|
+
let tracker: Transform | undefined, gunzip: ReturnType<typeof createGunzip> | undefined, pumping: Promise<void> | undefined;
|
|
134
|
+
let verified = false;
|
|
135
|
+
try {
|
|
136
|
+
tracker = new Transform({ transform(chunk: Buffer, _encoding, callback) {
|
|
137
|
+
compressed += chunk.length;
|
|
138
|
+
if (compressed > MAX_CODEX_ARCHIVE_BYTES) return callback(new Error("artifact_compressed_limit"));
|
|
139
|
+
archiveHash.update(chunk); callback(null, chunk);
|
|
140
|
+
} });
|
|
141
|
+
gunzip = createGunzip({ chunkSize: 64 * 1024 });
|
|
142
|
+
pumping = pipeline(input, tracker, gunzip);
|
|
143
|
+
void pumping.catch(() => {});
|
|
144
|
+
for await (const data of gunzip) {
|
|
145
|
+
const chunk = Buffer.from(data);
|
|
146
|
+
unpacked += chunk.length;
|
|
147
|
+
if (unpacked > MAX_CODEX_UNPACKED_BYTES) throw new Error("artifact_unpacked_limit");
|
|
148
|
+
let position = 0;
|
|
149
|
+
while (position < chunk.length) {
|
|
150
|
+
if (ended) {
|
|
151
|
+
const tail = chunk.subarray(position);
|
|
152
|
+
if (!tail.every(byte => byte === 0)) throw new Error("artifact_tar_trailing_data");
|
|
153
|
+
trailer += tail.length; break;
|
|
154
|
+
}
|
|
155
|
+
if (padding) { const take = Math.min(padding, chunk.length - position); padding -= take; position += take; continue; }
|
|
156
|
+
if (current) {
|
|
157
|
+
const take = Math.min(current.remaining, chunk.length - position);
|
|
158
|
+
const bytes = chunk.subarray(position, position + take);
|
|
159
|
+
current.hash.update(bytes);
|
|
160
|
+
if (current.keep) current.chunks.push(Buffer.from(bytes));
|
|
161
|
+
const offset = current.size - current.remaining;
|
|
162
|
+
if (current.prefix && offset < current.prefix.length) bytes.copy(current.prefix, offset, 0, current.prefix.length - offset);
|
|
163
|
+
current.remaining -= take; position += take;
|
|
164
|
+
if (!current.remaining) {
|
|
165
|
+
files.set(current.name, { size: current.size, mode: current.mode, digest: current.hash.digest("hex"),
|
|
166
|
+
bytes: current.keep ? Buffer.concat(current.chunks) : null,
|
|
167
|
+
...(current.prefix ? { nativePrefix: current.prefix } : {}) });
|
|
168
|
+
padding = (512 - current.size % 512) % 512; current = undefined;
|
|
169
|
+
}
|
|
170
|
+
continue;
|
|
171
|
+
}
|
|
172
|
+
const take = Math.min(512 - headerSize, chunk.length - position);
|
|
173
|
+
chunk.copy(header, headerSize, position, position + take); position += take; headerSize += take;
|
|
174
|
+
if (headerSize < 512) continue;
|
|
175
|
+
headerSize = 0;
|
|
176
|
+
if (header.every(byte => byte === 0)) { ended = true; continue; }
|
|
177
|
+
const field = (start: number, length: number) => header.subarray(start, start + length).toString("utf8").replace(/\0.*$/s, "");
|
|
178
|
+
const octal = (start: number, length: number) => {
|
|
179
|
+
const value = field(start, length).trim();
|
|
180
|
+
if (!/^[0-7]+$/.test(value)) throw new Error("artifact_tar_invalid");
|
|
181
|
+
return parseInt(value, 8);
|
|
182
|
+
};
|
|
183
|
+
const sum = header.reduce((total, byte, index) => total + (index >= 148 && index < 156 ? 32 : byte), 0);
|
|
184
|
+
if (sum !== octal(148, 8)) throw new Error("artifact_tar_invalid");
|
|
185
|
+
const prefix = field(345, 155);
|
|
186
|
+
const name = (prefix ? prefix + "/" : "") + field(0, 100);
|
|
187
|
+
const type = field(156, 1), size = octal(124, 12), mode = octal(100, 8);
|
|
188
|
+
if (++count > 4096 || !name.startsWith("package/") || /[\\\x00-\x1f]/.test(name)
|
|
189
|
+
|| name.replace(/\/$/, "").split("/").some(part => !part || part === ".." || part === ".") || names.has(name)
|
|
190
|
+
|| !["", "0", "5"].includes(type) || (type === "5" && size !== 0)
|
|
191
|
+
|| (type !== "5" && name.endsWith("/")) || size > MAX_CODEX_MEMBER_BYTES) throw new Error("artifact_tar_invalid");
|
|
192
|
+
names.add(name);
|
|
193
|
+
windowsName?.(name, type === "5");
|
|
194
|
+
if (type === "5") continue;
|
|
195
|
+
const relative = name.slice(8);
|
|
196
|
+
const keep = relative === "package.json" || relative === "bin/codex.js";
|
|
197
|
+
if (keep && size > (relative === "package.json" ? 256 * 1024 : 1024 * 1024)) throw new Error("artifact_metadata_limit");
|
|
198
|
+
current = { name: relative, size, mode, remaining: size, keep, chunks: [],
|
|
199
|
+
...(options.windowsX64 && relative === WINDOWS_CODEX_NATIVE_MEMBER
|
|
200
|
+
? { prefix: Buffer.alloc(Math.min(size, WINDOWS_CODEX_HEADER_BYTES)) } : {}),
|
|
201
|
+
hash: createHash("sha256").update("codex-cli-observed-file-v1\0") };
|
|
202
|
+
if (!size) {
|
|
203
|
+
files.set(relative, { size, mode, digest: current.hash.digest("hex"), bytes: keep ? Buffer.alloc(0) : null }); current = undefined;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
await pumping;
|
|
208
|
+
if (!ended || trailer < 512 || current || padding || headerSize) throw new Error("artifact_tar_truncated");
|
|
209
|
+
if ("sha512-" + archiveHash.digest("base64") !== target.integrity) throw new Error("artifact_integrity_mismatch");
|
|
210
|
+
if (fd !== undefined && before && typeof source === "string") {
|
|
211
|
+
const after = fstatSync(fd), lexical = lstatSync(source);
|
|
212
|
+
if (before.dev !== after.dev || before.ino !== after.ino || before.size !== after.size
|
|
213
|
+
|| before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs || lexical.isSymbolicLink()
|
|
214
|
+
|| lexical.dev !== before.dev || lexical.ino !== before.ino) throw new Error("artifact_file_changed");
|
|
215
|
+
}
|
|
216
|
+
verified = true;
|
|
217
|
+
} finally {
|
|
218
|
+
input.destroy(); tracker?.destroy(); gunzip?.destroy();
|
|
219
|
+
await pumping?.catch(() => {});
|
|
220
|
+
// Reawaiting the pipeline alone does not wait for ReadStream's async close.
|
|
221
|
+
await inputClosed;
|
|
222
|
+
if (verified && inputError) throw new Error("artifact_close_unverified");
|
|
223
|
+
}
|
|
224
|
+
const manifestBytes = files.get("package.json")?.bytes;
|
|
225
|
+
if (!manifestBytes || manifestBytes.length > 256 * 1024 || files.has("npm-shrinkwrap.json") || files.has("package-lock.json")) throw new Error("artifact_manifest_unverified");
|
|
226
|
+
const manifest = JSON.parse(manifestBytes.toString("utf8"));
|
|
227
|
+
if (manifest.name !== target.name || manifest.version !== target.version) throw new Error("artifact_manifest_unverified");
|
|
228
|
+
for (const key of ["dependencies", "peerDependencies", "bundledDependencies", "bundleDependencies"]) {
|
|
229
|
+
if (manifest[key] && Object.keys(manifest[key]).length) throw new Error("artifact_dependency_unverified");
|
|
230
|
+
}
|
|
231
|
+
return files;
|
|
232
|
+
}
|
|
233
|
+
export function verifiedCodexCliContent(set: CodexCliArtifactSet, main: CodexArchiveFiles, backing: CodexArchiveFiles): string {
|
|
234
|
+
const layout = codexCliPlatformBacking(set.platform, set.arch);
|
|
235
|
+
if (!layout) throw new Error("artifact_platform_unverified");
|
|
236
|
+
const manifest = JSON.parse(main.get("package.json")!.bytes!.toString("utf8"));
|
|
237
|
+
const ref = backingReference(manifest, layout.package);
|
|
238
|
+
for (const name of Object.keys(manifest.optionalDependencies ?? {})) {
|
|
239
|
+
if (!/^@openai\/codex-(linux|darwin|win32)-(x64|arm64)$/.test(name)) throw new Error("artifact_dependency_unverified");
|
|
240
|
+
backingReference(manifest, name);
|
|
241
|
+
}
|
|
242
|
+
if (ref.name !== set.backing.name || ref.version !== set.backing.version
|
|
243
|
+
|| (typeof manifest.bin === "string" ? manifest.bin : manifest.bin?.codex)?.replace(/^\.\//, "") !== "bin/codex.js") throw new Error("artifact_backing_unverified");
|
|
244
|
+
const files = [
|
|
245
|
+
{ role: "manifest" as const, file: main.get("package.json") },
|
|
246
|
+
{ role: "entrypoint" as const, file: main.get("bin/codex.js") },
|
|
247
|
+
{ role: "backing-manifest" as const, file: backing.get("package.json") },
|
|
248
|
+
{ role: "backing-binary" as const, file: backing.get(`vendor/${layout.triple}/bin/codex`) },
|
|
249
|
+
];
|
|
250
|
+
const backingManifest = JSON.parse(backing.get("package.json")!.bytes!.toString("utf8"));
|
|
251
|
+
if (backingManifest.exports || backingManifest.bin || Object.keys(backingManifest.optionalDependencies ?? {}).length
|
|
252
|
+
|| files.some(file => !file.file) || !(main.get("bin/codex.js")!.mode & 0o111)
|
|
253
|
+
|| !(backing.get(`vendor/${layout.triple}/bin/codex`)!.mode & 0o111)) throw new Error("artifact_backing_unverified");
|
|
254
|
+
return codexCliContentSetDigest(set.platform, set.arch, layout.triple, "optional-package",
|
|
255
|
+
files.map(file => ({ role: file.role, digest: file.role === "manifest" || file.role === "backing-manifest"
|
|
256
|
+
? codexCliContentFileDigest(file.role, file.file!.bytes!) : file.file!.digest })));
|
|
257
|
+
}
|