@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { execFile, type ExecFileException } from "node:child_process";
|
|
2
2
|
import { createHash } from "node:crypto";
|
|
3
3
|
import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
4
4
|
import { tmpdir } from "node:os";
|
|
@@ -7,6 +7,12 @@ import { join, resolve } from "node:path";
|
|
|
7
7
|
import { compareStrictSemver, parseStrictSemver } from "../lib/strict-semver";
|
|
8
8
|
import { npmInvocation } from "../update/npm-invocation.mjs";
|
|
9
9
|
import { CODEX_CLI_TRANSPORT_ENV_KEYS } from "../update/codex-cli-update-launch-policy.mjs";
|
|
10
|
+
import { CODEX_CLI_REGISTRY, isSha512Integrity, codexCliArtifactSetAsync, codexCliArtifactSetDigest, type CodexCliArtifactSet } from "./cli-update-artifacts";
|
|
11
|
+
export { CODEX_CLI_REGISTRY } from "./cli-update-artifacts";
|
|
12
|
+
import { windowsCodexCliPlanEvidence, windowsCodexCliToolchainDigest, withWindowsCodexCliPlanToolchain } from "./cli-windows-plan-provenance";
|
|
13
|
+
import { windowsCliApplyPrefixSupported } from "./cli-update-job-store-windows";
|
|
14
|
+
import { windowsInstallNamespaceSupported } from "./cli-update-windows-observation";
|
|
15
|
+
import { windowsNpmExecutionArgs } from "./windows-npm-execution";
|
|
10
16
|
import {
|
|
11
17
|
inspectCodexCliInstall,
|
|
12
18
|
type CodexCliInstallKind,
|
|
@@ -14,7 +20,7 @@ import {
|
|
|
14
20
|
type CodexCliInstallReport,
|
|
15
21
|
} from "./cli-install-provenance";
|
|
16
22
|
import {
|
|
17
|
-
|
|
23
|
+
scanCodexSessionProcessesAsync,
|
|
18
24
|
type CodexAppServerProcessIo,
|
|
19
25
|
type CodexAppServerProcessScan,
|
|
20
26
|
} from "./app-server-processes";
|
|
@@ -43,23 +49,12 @@ import {
|
|
|
43
49
|
export const CODEX_CLI_PACKAGE = "@openai/codex";
|
|
44
50
|
export const CODEX_CLI_UPDATE_SCHEMA_VERSION = 1 as const;
|
|
45
51
|
|
|
46
|
-
/**
|
|
47
|
-
* The one registry this workflow is allowed to resolve, pack and install from.
|
|
48
|
-
*
|
|
49
|
-
* npm view/pack inherit the operator's npm configuration by default, so a project or
|
|
50
|
-
* user .npmrc — or an npm_config_* env var — can redirect "@openai/codex" to another
|
|
51
|
-
* registry whose version query, integrity query and tarball all agree with each
|
|
52
|
-
* other. Every npm call below pins this registry explicitly AND runs with the
|
|
53
|
-
* registry-affecting configuration isolated, so the pinned origin is the only source
|
|
54
|
-
* the evidence can come from.
|
|
55
|
-
*/
|
|
56
|
-
export const CODEX_CLI_REGISTRY = "https://registry.npmjs.org";
|
|
57
|
-
|
|
58
52
|
/** Only the stable channel is exposed; a moving dist-tag is resolved before it is used. */
|
|
59
53
|
export type CodexCliUpdateChannel = "latest";
|
|
60
54
|
|
|
61
55
|
export type CodexCliUpdateRefusal =
|
|
62
56
|
| "windows_inspection_deferred"
|
|
57
|
+
| "windows_apply_disabled"
|
|
63
58
|
| "not_managed"
|
|
64
59
|
| "installed_version_unverified"
|
|
65
60
|
| "install_content_unverified"
|
|
@@ -83,7 +78,7 @@ export interface CodexCliUpdateSession {
|
|
|
83
78
|
}
|
|
84
79
|
|
|
85
80
|
export type CodexCliUpdateTarget =
|
|
86
|
-
| Readonly<{ kind: "resolved"; version: string; integrity: string }>
|
|
81
|
+
| Readonly<{ kind: "resolved"; version: string; integrity: string; artifacts?: CodexCliArtifactSet }>
|
|
87
82
|
| Readonly<{ kind: "unresolved"; reason: string }>;
|
|
88
83
|
|
|
89
84
|
export interface CodexCliUpdatePlan {
|
|
@@ -92,7 +87,7 @@ export interface CodexCliUpdatePlan {
|
|
|
92
87
|
readonly channel: CodexCliUpdateChannel;
|
|
93
88
|
readonly applicable: boolean;
|
|
94
89
|
readonly refusal: CodexCliUpdateRefusal | null;
|
|
95
|
-
/**
|
|
90
|
+
/** Also present for a proven Windows read-only plan whose apply remains disabled. */
|
|
96
91
|
readonly planId: string | null;
|
|
97
92
|
readonly provenance: CodexCliInstallKind;
|
|
98
93
|
readonly managed: boolean;
|
|
@@ -101,6 +96,7 @@ export interface CodexCliUpdatePlan {
|
|
|
101
96
|
readonly location: string | null;
|
|
102
97
|
readonly targetVersion: string | null;
|
|
103
98
|
readonly targetIntegrity: string | null;
|
|
99
|
+
readonly targetArtifacts?: CodexCliArtifactSet;
|
|
104
100
|
readonly session: CodexCliUpdateSession;
|
|
105
101
|
/**
|
|
106
102
|
* The bounded content observation the installation report produced: digest of
|
|
@@ -119,25 +115,17 @@ export interface CodexCliUpdatePlanDeps {
|
|
|
119
115
|
readonly platform?: NodeJS.Platform;
|
|
120
116
|
readonly channel?: CodexCliUpdateChannel;
|
|
121
117
|
readonly scanProcesses?: (io?: CodexAppServerProcessIo) => CodexAppServerProcessScan;
|
|
118
|
+
/** Preferred request-path seam: the real session scan runs its child processes async. */
|
|
119
|
+
readonly scanProcessesAsync?: (io?: CodexAppServerProcessIo) => Promise<CodexAppServerProcessScan>;
|
|
122
120
|
readonly processIo?: CodexAppServerProcessIo;
|
|
123
|
-
readonly resolveTarget?: (channel: CodexCliUpdateChannel) => CodexCliUpdateTarget
|
|
124
|
-
readonly spawnProcess?:
|
|
121
|
+
readonly resolveTarget?: (channel: CodexCliUpdateChannel) => CodexCliUpdateTarget | Promise<CodexCliUpdateTarget>;
|
|
122
|
+
readonly spawnProcess?: CodexCliUpdateSpawn;
|
|
125
123
|
}
|
|
126
124
|
|
|
127
125
|
|
|
128
126
|
const PLAN_ID_LENGTH = 32;
|
|
129
127
|
const PLAN_ID_RE = /^[0-9a-f]{32}$/;
|
|
130
128
|
const REGISTRY_TIMEOUT_MS = 12_000;
|
|
131
|
-
const SHA512_INTEGRITY_RE = /^sha512-[A-Za-z0-9+/]{86}==$/;
|
|
132
|
-
|
|
133
|
-
function isSha512Integrity(token: string): boolean {
|
|
134
|
-
if (!SHA512_INTEGRITY_RE.test(token)) return false;
|
|
135
|
-
const encoded = token.slice("sha512-".length);
|
|
136
|
-
// Base64 decoders accept truncated input and nonzero unused padding bits.
|
|
137
|
-
// Require exactly 64 bytes and the canonical encoding of those same bytes.
|
|
138
|
-
const digest = Buffer.from(encoded, "base64");
|
|
139
|
-
return digest.byteLength === 64 && digest.toString("base64") === encoded;
|
|
140
|
-
}
|
|
141
129
|
|
|
142
130
|
/** The install argv this plan quotes for the operator to read, in argv form. */
|
|
143
131
|
export function codexCliUpdateCommand(version: string): readonly string[] {
|
|
@@ -170,6 +158,8 @@ export function codexCliUpdatePlanId(bound: {
|
|
|
170
158
|
readonly channel: CodexCliUpdateChannel;
|
|
171
159
|
readonly targetVersion: string;
|
|
172
160
|
readonly targetIntegrity: string;
|
|
161
|
+
readonly targetArtifactsDigest?: string;
|
|
162
|
+
readonly toolchainDigest?: string;
|
|
173
163
|
}): string {
|
|
174
164
|
// Ordered pairs, not object key order: the digest must not depend on how a caller
|
|
175
165
|
// happened to build the record.
|
|
@@ -187,6 +177,8 @@ export function codexCliUpdatePlanId(bound: {
|
|
|
187
177
|
];
|
|
188
178
|
const hash = createHash("sha256");
|
|
189
179
|
for (const [key, value] of fields) hash.update(`${key}=${value}\n`);
|
|
180
|
+
if (bound.targetArtifactsDigest) hash.update(`targetArtifactsDigest=${bound.targetArtifactsDigest}\n`);
|
|
181
|
+
if (bound.toolchainDigest) hash.update(`toolchainDigest=${bound.toolchainDigest}\n`);
|
|
190
182
|
return hash.digest("hex").slice(0, PLAN_ID_LENGTH);
|
|
191
183
|
}
|
|
192
184
|
|
|
@@ -317,7 +309,7 @@ interface NpmConfigIsolation {
|
|
|
317
309
|
* and the env filter removes the env-var channel. What remains is exactly the pinned
|
|
318
310
|
* --registry flag plus proxy/CA values captured before project dotenv loading.
|
|
319
311
|
*/
|
|
320
|
-
function createNpmConfigIsolation(dir?: string, boundEnv?: NodeJS.ProcessEnv): NpmConfigIsolation {
|
|
312
|
+
export function createNpmConfigIsolation(dir?: string, boundEnv?: NodeJS.ProcessEnv): NpmConfigIsolation {
|
|
321
313
|
const ownsRoot = dir === undefined;
|
|
322
314
|
const root = dir ?? mkdtempSync(join(tmpdir(), "ocx-codex-cli-meta-"));
|
|
323
315
|
try {
|
|
@@ -330,6 +322,7 @@ function createNpmConfigIsolation(dir?: string, boundEnv?: NodeJS.ProcessEnv): N
|
|
|
330
322
|
const env = codexCliUpdateBoundEnv(boundEnv);
|
|
331
323
|
// npm enables Node's compile cache itself. Dropping the ambient output path
|
|
332
324
|
// alone recreates <tmpdir>/node-compile-cache outside this owned lifetime.
|
|
325
|
+
// The version verification child inherits this same controlled path.
|
|
333
326
|
env.NODE_COMPILE_CACHE = resolve(root, "node-compile-cache");
|
|
334
327
|
return { dir: root, npmrc, globalNpmrc, cache, env };
|
|
335
328
|
} catch (error) {
|
|
@@ -351,7 +344,7 @@ function isolatedNpmArgs(args: readonly string[], isolation: NpmConfigIsolation)
|
|
|
351
344
|
];
|
|
352
345
|
}
|
|
353
346
|
|
|
354
|
-
function isolatedNpmTarget(args: readonly string[], isolation: NpmConfigIsolation): NpmTarget | null {
|
|
347
|
+
export function isolatedNpmTarget(args: readonly string[], isolation: NpmConfigIsolation): NpmTarget | null {
|
|
355
348
|
const target = npmTarget(isolatedNpmArgs(args, isolation), isolation.env);
|
|
356
349
|
if (!target) return null;
|
|
357
350
|
return {
|
|
@@ -361,6 +354,96 @@ function isolatedNpmTarget(args: readonly string[], isolation: NpmConfigIsolatio
|
|
|
361
354
|
};
|
|
362
355
|
}
|
|
363
356
|
|
|
357
|
+
/** The option fields one registry-metadata query passes to its spawn. */
|
|
358
|
+
export interface CodexCliUpdateSpawnOptions {
|
|
359
|
+
readonly encoding: "utf8";
|
|
360
|
+
readonly timeout: number;
|
|
361
|
+
readonly maxBuffer?: number;
|
|
362
|
+
readonly windowsHide: true;
|
|
363
|
+
readonly cwd?: string;
|
|
364
|
+
readonly env?: NodeJS.ProcessEnv;
|
|
365
|
+
readonly windowsVerbatimArguments?: boolean;
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
/** The fields a resolver reads off one spawn result; sync injections may carry more. */
|
|
369
|
+
export interface CodexCliUpdateSpawnResult {
|
|
370
|
+
readonly status: number | null;
|
|
371
|
+
readonly stdout: string;
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
/**
|
|
375
|
+
* One registry-metadata invocation. The production runner is asynchronous so a slow
|
|
376
|
+
* npm cannot park the proxy event loop; a synchronous SpawnSync-shaped injection
|
|
377
|
+
* remains assignable, so tests asserting argv/env without real I/O are unchanged.
|
|
378
|
+
*/
|
|
379
|
+
export type CodexCliUpdateSpawn = (
|
|
380
|
+
bin: string,
|
|
381
|
+
args: readonly string[],
|
|
382
|
+
options: CodexCliUpdateSpawnOptions,
|
|
383
|
+
) => CodexCliUpdateSpawnResult | Promise<CodexCliUpdateSpawnResult>;
|
|
384
|
+
|
|
385
|
+
/**
|
|
386
|
+
* A single bounded registry child whose wait happens off the event loop.
|
|
387
|
+
*
|
|
388
|
+
* The previous spawnSync blocked the whole proxy for up to the per-query deadline:
|
|
389
|
+
* a slow registry stalled unrelated requests and streaming for seconds at a time,
|
|
390
|
+
* and the background apply repeated the same stall. The observable contract is
|
|
391
|
+
* unchanged — status null on timeout or spawn failure, stdout bounded by
|
|
392
|
+
* maxBuffer — but only the awaited caller observes the child.
|
|
393
|
+
*/
|
|
394
|
+
export function spawnCodexCliUpdateMetadata(
|
|
395
|
+
bin: string,
|
|
396
|
+
args: readonly string[],
|
|
397
|
+
options: CodexCliUpdateSpawnOptions,
|
|
398
|
+
): Promise<CodexCliUpdateSpawnResult> {
|
|
399
|
+
return new Promise(resolve => {
|
|
400
|
+
let timedOut = false;
|
|
401
|
+
let deadline: ReturnType<typeof setTimeout> | undefined;
|
|
402
|
+
let child: ReturnType<typeof execFile>;
|
|
403
|
+
try {
|
|
404
|
+
// execFile's callback is the only terminal observation: it runs after the
|
|
405
|
+
// child terminated and its piped stdio was fully consumed, so this result —
|
|
406
|
+
// and the caller's isolation cleanup in its finally — never outrun a live
|
|
407
|
+
// child, and no arbitrary reap window can fake completion. encoding "utf8"
|
|
408
|
+
// decodes the buffered output once, so a multibyte character split across
|
|
409
|
+
// OS pipe chunks stays intact, while maxBuffer bounds both captured
|
|
410
|
+
// streams in bytes exactly like spawnSync did. This proves only the
|
|
411
|
+
// child's own termination; any descendants it left behind are outside the
|
|
412
|
+
// observation, as they were under spawnSync.
|
|
413
|
+
child = execFile(bin, [...args], {
|
|
414
|
+
encoding: "utf8",
|
|
415
|
+
timeout: options.timeout,
|
|
416
|
+
maxBuffer: options.maxBuffer ?? 1024 * 1024,
|
|
417
|
+
killSignal: "SIGKILL",
|
|
418
|
+
windowsHide: true,
|
|
419
|
+
cwd: options.cwd,
|
|
420
|
+
env: options.env,
|
|
421
|
+
windowsVerbatimArguments: options.windowsVerbatimArguments ?? false,
|
|
422
|
+
}, (error: ExecFileException | null, stdout: string) => {
|
|
423
|
+
if (deadline) clearTimeout(deadline);
|
|
424
|
+
// spawnSync reported status null whenever the child was signal-killed
|
|
425
|
+
// (timeout or maxBuffer) or never spawned; a numeric error.code is the
|
|
426
|
+
// plain exit code. timedOut is latched so a late code-0 close after the
|
|
427
|
+
// deadline still refuses, matching the synchronous timeout lane.
|
|
428
|
+
const status = timedOut ? null
|
|
429
|
+
: error === null ? 0
|
|
430
|
+
: typeof error.code === "number" ? error.code : null;
|
|
431
|
+
resolve(Object.freeze({ status, stdout }));
|
|
432
|
+
});
|
|
433
|
+
} catch {
|
|
434
|
+
resolve(Object.freeze({ status: null, stdout: "" }));
|
|
435
|
+
return;
|
|
436
|
+
}
|
|
437
|
+
// A deadline of our own keeps the same per-query bound even on a runtime
|
|
438
|
+
// that does not honor execFile's timeout option. It only latches the
|
|
439
|
+
// refusal and signals the child; resolution still waits for the callback.
|
|
440
|
+
deadline = setTimeout(() => {
|
|
441
|
+
timedOut = true;
|
|
442
|
+
try { child.kill("SIGKILL"); } catch { /* the close event still settles */ }
|
|
443
|
+
}, options.timeout);
|
|
444
|
+
});
|
|
445
|
+
}
|
|
446
|
+
|
|
364
447
|
/**
|
|
365
448
|
* Resolve the channel to one exact version plus its sha512 integrity token.
|
|
366
449
|
*
|
|
@@ -369,12 +452,12 @@ function isolatedNpmTarget(args: readonly string[], isolation: NpmConfigIsolatio
|
|
|
369
452
|
* acceptable for a foreign package we are about to install on the operator's behalf, so
|
|
370
453
|
* every failure lane here is a refusal.
|
|
371
454
|
*/
|
|
372
|
-
export function resolveCodexCliUpdateTarget(
|
|
455
|
+
export async function resolveCodexCliUpdateTarget(
|
|
373
456
|
channel: CodexCliUpdateChannel,
|
|
374
|
-
spawn:
|
|
457
|
+
spawn: CodexCliUpdateSpawn = spawnCodexCliUpdateMetadata,
|
|
375
458
|
/** Proof-bound pre-dotenv PATH/PATHEXT and proxy/CA env; absent settings stay absent. */
|
|
376
459
|
boundEnv?: NodeJS.ProcessEnv,
|
|
377
|
-
): CodexCliUpdateTarget {
|
|
460
|
+
): Promise<CodexCliUpdateTarget> {
|
|
378
461
|
// The pinned registry and the isolation directory together are the boundary: the
|
|
379
462
|
// version, the integrity token and the tarball URL all come from npmjs or the
|
|
380
463
|
// target is unresolved — a redirected answer can never be the evidence.
|
|
@@ -387,7 +470,7 @@ export function resolveCodexCliUpdateTarget(
|
|
|
387
470
|
return Object.freeze({ kind: "unresolved" as const, reason: "npm configuration isolation setup failed" });
|
|
388
471
|
}
|
|
389
472
|
try {
|
|
390
|
-
const runView = (field: string, spec: string):
|
|
473
|
+
const runView = async (field: string, spec: string): Promise<CodexCliUpdateSpawnResult | null> => {
|
|
391
474
|
const target = isolatedNpmTarget(["view", spec, field], isolation);
|
|
392
475
|
if (!target) return null;
|
|
393
476
|
return spawn(target.bin, target.args, {
|
|
@@ -398,7 +481,7 @@ export function resolveCodexCliUpdateTarget(
|
|
|
398
481
|
});
|
|
399
482
|
};
|
|
400
483
|
|
|
401
|
-
const versionRun = runView("version", `${CODEX_CLI_PACKAGE}@${channel}`);
|
|
484
|
+
const versionRun = await runView("version", `${CODEX_CLI_PACKAGE}@${channel}`);
|
|
402
485
|
if (!versionRun) return Object.freeze({ kind: "unresolved" as const, reason: "npm executable was not found on a trusted PATH entry" });
|
|
403
486
|
// status === null covers a timeout as well as a spawn failure.
|
|
404
487
|
if (versionRun.status !== 0) {
|
|
@@ -409,7 +492,7 @@ export function resolveCodexCliUpdateTarget(
|
|
|
409
492
|
return Object.freeze({ kind: "unresolved" as const, reason: "registry returned no exact version" });
|
|
410
493
|
}
|
|
411
494
|
|
|
412
|
-
const integrityRun = runView("dist.integrity", `${CODEX_CLI_PACKAGE}@${version}`);
|
|
495
|
+
const integrityRun = await runView("dist.integrity", `${CODEX_CLI_PACKAGE}@${version}`);
|
|
413
496
|
if (!integrityRun) return Object.freeze({ kind: "unresolved" as const, reason: "npm executable was not found on a trusted PATH entry" });
|
|
414
497
|
if (integrityRun.status !== 0) {
|
|
415
498
|
return Object.freeze({ kind: "unresolved" as const, reason: `registry integrity query failed (status ${integrityRun.status ?? "timeout"})` });
|
|
@@ -424,7 +507,7 @@ export function resolveCodexCliUpdateTarget(
|
|
|
424
507
|
// The digest binds the tarball's CONTENT; this binds its ORIGIN. A registry
|
|
425
508
|
// answer whose tarball lives outside the pinned registry is not the artifact
|
|
426
509
|
// the plan approved, even if its sha512 matched.
|
|
427
|
-
const tarballRun = runView("dist.tarball", `${CODEX_CLI_PACKAGE}@${version}`);
|
|
510
|
+
const tarballRun = await runView("dist.tarball", `${CODEX_CLI_PACKAGE}@${version}`);
|
|
428
511
|
if (!tarballRun) return Object.freeze({ kind: "unresolved" as const, reason: "npm executable was not found on a trusted PATH entry" });
|
|
429
512
|
if (tarballRun.status !== 0) {
|
|
430
513
|
return Object.freeze({ kind: "unresolved" as const, reason: `registry tarball query failed (status ${tarballRun.status ?? "timeout"})` });
|
|
@@ -447,6 +530,39 @@ export function resolveCodexCliUpdateTarget(
|
|
|
447
530
|
}
|
|
448
531
|
}
|
|
449
532
|
|
|
533
|
+
/** Resolve both exact archives, including the publisher's platform-package alias. */
|
|
534
|
+
export async function resolveCodexCliUpdateArtifactTarget(channel: CodexCliUpdateChannel,
|
|
535
|
+
spawn: CodexCliUpdateSpawn = spawnCodexCliUpdateMetadata, boundEnv?: NodeJS.ProcessEnv,
|
|
536
|
+
platform: NodeJS.Platform = process.platform, arch: string = process.arch,
|
|
537
|
+
windowsToolchain?: { readonly node: string; readonly npmCli: string }): Promise<CodexCliUpdateTarget> {
|
|
538
|
+
let isolation: NpmConfigIsolation | undefined;
|
|
539
|
+
try {
|
|
540
|
+
isolation = createNpmConfigIsolation(undefined, boundEnv);
|
|
541
|
+
const query = async (spec: string) => {
|
|
542
|
+
const args = isolatedNpmArgs(["view", spec, "--json"], isolation!);
|
|
543
|
+
const invocation = windowsToolchain
|
|
544
|
+
? { bin: windowsToolchain.node, args: windowsNpmExecutionArgs(windowsToolchain.npmCli, args), options: { cwd: isolation!.dir, env: isolation!.env } }
|
|
545
|
+
: isolatedNpmTarget(["view", spec, "--json"], isolation!);
|
|
546
|
+
if (!invocation) throw new Error("npm unavailable");
|
|
547
|
+
const result = await spawn(invocation.bin, invocation.args, { encoding: "utf8", timeout: REGISTRY_TIMEOUT_MS,
|
|
548
|
+
maxBuffer: 1024 * 1024, windowsHide: true, ...invocation.options });
|
|
549
|
+
if (result.status !== 0) throw new Error("registry query failed");
|
|
550
|
+
return JSON.parse(result.stdout);
|
|
551
|
+
};
|
|
552
|
+
const latest = await query(`${CODEX_CLI_PACKAGE}@${channel}`);
|
|
553
|
+
if (!parseStrictSemver(latest.version)) throw new Error("target version unavailable");
|
|
554
|
+
const pinned = await query(`${CODEX_CLI_PACKAGE}@${latest.version}`);
|
|
555
|
+
if (pinned.version !== latest.version) throw new Error("target version drift");
|
|
556
|
+
const artifacts = await codexCliArtifactSetAsync(pinned, query, platform, arch);
|
|
557
|
+
return Object.freeze({ kind: "resolved", version: artifacts.main.version,
|
|
558
|
+
integrity: artifacts.main.integrity, artifacts });
|
|
559
|
+
} catch {
|
|
560
|
+
return Object.freeze({ kind: "unresolved", reason: "main/platform artifact metadata unverified" });
|
|
561
|
+
} finally {
|
|
562
|
+
if (isolation) { try { rmSync(isolation.dir, { recursive: true }); } catch { /* owned metadata residue */ } }
|
|
563
|
+
}
|
|
564
|
+
}
|
|
565
|
+
|
|
450
566
|
function refusedPlan(
|
|
451
567
|
refusal: CodexCliUpdateRefusal,
|
|
452
568
|
report: CodexCliInstallReport,
|
|
@@ -494,11 +610,10 @@ export async function createCodexCliUpdatePlan(deps: CodexCliUpdatePlanDeps = {}
|
|
|
494
610
|
// pays the bounded content read; a bare ownership check leaves it unobserved.
|
|
495
611
|
const report = await inspect({ ...(deps.inspectionDeps ?? {}), observeInstallContent: true });
|
|
496
612
|
|
|
497
|
-
//
|
|
498
|
-
//
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
if (platform === "win32" || report.reason === "windows_inspection_deferred") {
|
|
613
|
+
// Windows planning requires private evidence from the production handle-bound
|
|
614
|
+
// predicate. A synthetic/copyable public managed flag cannot open this lane.
|
|
615
|
+
const windowsEvidence = windowsCodexCliPlanEvidence(report);
|
|
616
|
+
if ((platform === "win32" && !windowsEvidence) || report.reason === "windows_inspection_deferred") {
|
|
502
617
|
return refusedPlan("windows_inspection_deferred", report, channel, null, NOT_EVALUATED);
|
|
503
618
|
}
|
|
504
619
|
if (!report.managed || report.provenance !== "npm-global") {
|
|
@@ -525,8 +640,12 @@ export async function createCodexCliUpdatePlan(deps: CodexCliUpdatePlanDeps = {}
|
|
|
525
640
|
// When the caller had no trusted snapshot, inspectionDeps.env is the fail-closed
|
|
526
641
|
// { PATH: "" } form, so this resolution cannot silently fall back to ambient.
|
|
527
642
|
const resolveTarget = deps.resolveTarget
|
|
528
|
-
?? (ch =>
|
|
529
|
-
|
|
643
|
+
?? (ch => resolveCodexCliUpdateArtifactTarget(ch, deps.spawnProcess ?? spawnCodexCliUpdateMetadata, deps.inspectionDeps?.env,
|
|
644
|
+
platform, windowsEvidence?.arch ?? deps.inspectionDeps?.arch ?? process.arch, windowsEvidence ?? undefined));
|
|
645
|
+
const target = windowsEvidence
|
|
646
|
+
? await withWindowsCodexCliPlanToolchain(report, () => resolveTarget(channel))
|
|
647
|
+
?? Object.freeze({ kind: "unresolved" as const, reason: "Windows toolchain identity changed" })
|
|
648
|
+
: await resolveTarget(channel);
|
|
530
649
|
if (target.kind !== "resolved") {
|
|
531
650
|
return refusedPlan("target_unresolved", report, channel, target, NOT_EVALUATED);
|
|
532
651
|
}
|
|
@@ -545,7 +664,13 @@ export async function createCodexCliUpdatePlan(deps: CodexCliUpdatePlanDeps = {}
|
|
|
545
664
|
return refusedPlan("target_not_newer", report, channel, target, NOT_EVALUATED);
|
|
546
665
|
}
|
|
547
666
|
|
|
548
|
-
|
|
667
|
+
// The request-path scan keeps registry and process-table waits off the event loop;
|
|
668
|
+
// a synchronous injection remains honored for tests that never spawn a real child.
|
|
669
|
+
const scan = deps.scanProcessesAsync
|
|
670
|
+
? await deps.scanProcessesAsync(deps.processIo ?? {})
|
|
671
|
+
: deps.scanProcesses
|
|
672
|
+
? deps.scanProcesses(deps.processIo ?? {})
|
|
673
|
+
: await scanCodexSessionProcessesAsync(deps.processIo ?? {});
|
|
549
674
|
if (scan.kind !== "observed") {
|
|
550
675
|
// An unreadable process table is not "no sessions". `listCodexAppServerProcesses`
|
|
551
676
|
// maps that failure to an empty list because its kill contract must never signal a
|
|
@@ -557,12 +682,17 @@ export async function createCodexCliUpdatePlan(deps: CodexCliUpdatePlanDeps = {}
|
|
|
557
682
|
return refusedPlan("blocked_active_session", report, channel, target, Object.freeze({ state: "active" as const, matches }));
|
|
558
683
|
}
|
|
559
684
|
|
|
685
|
+
const applicable = platform !== "win32" || (!!windowsEvidence && windowsEvidence.arch === "x64"
|
|
686
|
+
&& target.artifacts?.platform === "win32" && target.artifacts.arch === "x64"
|
|
687
|
+
&& process.platform === "win32" && process.arch === "x64"
|
|
688
|
+
&& windowsInstallNamespaceSupported(windowsEvidence.prefix)
|
|
689
|
+
&& await windowsCliApplyPrefixSupported(windowsEvidence.prefix));
|
|
560
690
|
return Object.freeze({
|
|
561
691
|
schemaVersion: CODEX_CLI_UPDATE_SCHEMA_VERSION,
|
|
562
692
|
package: CODEX_CLI_PACKAGE,
|
|
563
693
|
channel,
|
|
564
|
-
applicable
|
|
565
|
-
refusal: null,
|
|
694
|
+
applicable,
|
|
695
|
+
refusal: applicable ? null : "windows_apply_disabled",
|
|
566
696
|
planId: codexCliUpdatePlanId({
|
|
567
697
|
platform,
|
|
568
698
|
provenance: report.provenance,
|
|
@@ -572,6 +702,8 @@ export async function createCodexCliUpdatePlan(deps: CodexCliUpdatePlanDeps = {}
|
|
|
572
702
|
channel,
|
|
573
703
|
targetVersion: target.version,
|
|
574
704
|
targetIntegrity: target.integrity,
|
|
705
|
+
targetArtifactsDigest: target.artifacts ? codexCliArtifactSetDigest(target.artifacts) : undefined,
|
|
706
|
+
toolchainDigest: windowsCodexCliToolchainDigest(report),
|
|
575
707
|
}),
|
|
576
708
|
provenance: report.provenance,
|
|
577
709
|
managed: report.managed,
|
|
@@ -580,6 +712,7 @@ export async function createCodexCliUpdatePlan(deps: CodexCliUpdatePlanDeps = {}
|
|
|
580
712
|
location: report.location,
|
|
581
713
|
targetVersion: target.version,
|
|
582
714
|
targetIntegrity: target.integrity,
|
|
715
|
+
...(target.artifacts ? { targetArtifacts: target.artifacts } : {}),
|
|
583
716
|
session: Object.freeze({ state: "none" as const, matches: 0 }),
|
|
584
717
|
installContentDigest: report.installContentDigest,
|
|
585
718
|
command: codexCliUpdateCommand(target.version),
|