@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worker-thread entry for one Codex CLI update plan or apply job.
|
|
3
|
+
*
|
|
4
|
+
* The parent owns admission and the durable job ledger; this realm owns the
|
|
5
|
+
* heavy inspection, hashing, staging and installer lifetime. The mutation
|
|
6
|
+
* evidence WeakMap is per-realm, which is exactly why the whole plan/apply
|
|
7
|
+
* must run here rather than only its hashing: report objects and their
|
|
8
|
+
* internal evidence cannot cross the realm boundary together.
|
|
9
|
+
*
|
|
10
|
+
* The message carries the allowlisted launcher snapshot (never the parent's
|
|
11
|
+
* trusted context) plus two shared-memory cells: the process-wide selection
|
|
12
|
+
* GATE the worker holds for its short final window, and the per-job FENCE
|
|
13
|
+
* whose PREPARING -> CANCELLED / PREPARING -> COMMITTED compare-exchanges
|
|
14
|
+
* decide cancel-vs-spawn atomically. A "cancel" message aborts the real
|
|
15
|
+
* AbortSignal handed to apply's fetchArtifact path — the asynchronous half
|
|
16
|
+
* of cancellation; the fence remains the synchronous-section half, and a
|
|
17
|
+
* cancel that loses the commit CAS is never posted. Any other second
|
|
18
|
+
* message is ignored: one worker runs exactly one job and then closes, so
|
|
19
|
+
* a late duplicate or a stale generation cannot attach new work to a dying
|
|
20
|
+
* realm.
|
|
21
|
+
*/
|
|
22
|
+
import { createCodexCliUpdatePlan, type CodexCliUpdateChannel, type CodexCliUpdatePlan } from "./cli-update-plan";
|
|
23
|
+
import { applyCodexCliUpdate, type CodexCliApplyResult } from "./cli-update-apply";
|
|
24
|
+
import {
|
|
25
|
+
codexCliUpdateInspectionDepsFromSnapshot,
|
|
26
|
+
type CodexCliUpdateInspectionSnapshot,
|
|
27
|
+
} from "./cli-update-inspection-context";
|
|
28
|
+
import { codexCliUpdateIsCancelled, createWorkerCommitWindow } from "./cli-update-selection-gate";
|
|
29
|
+
import { recoverWindowsCodexCliInstallations } from "./cli-update-windows-apply";
|
|
30
|
+
import { WindowsCliToolchainCleanupError } from "./cli-update-job-store-windows";
|
|
31
|
+
import { createCodexCliUpdateRecovery } from "./cli-update-recovery";
|
|
32
|
+
|
|
33
|
+
export interface CodexCliUpdateWorkerRunMessage {
|
|
34
|
+
readonly type: "run";
|
|
35
|
+
readonly requestId: string;
|
|
36
|
+
readonly jobId: string;
|
|
37
|
+
readonly operation: "plan" | "apply";
|
|
38
|
+
readonly planId?: string;
|
|
39
|
+
readonly channel?: CodexCliUpdateChannel;
|
|
40
|
+
/** Frozen allowlisted launcher snapshot; never supplemented from ambient env. */
|
|
41
|
+
readonly snapshot: CodexCliUpdateInspectionSnapshot;
|
|
42
|
+
/** Process-wide selection gate cell (see cli-update-selection-gate). */
|
|
43
|
+
readonly gate: SharedArrayBuffer;
|
|
44
|
+
/** Per-job cancel/commit fence cell. */
|
|
45
|
+
readonly fence: SharedArrayBuffer;
|
|
46
|
+
readonly owner?: number;
|
|
47
|
+
/** Env snapshot: a Worker may not observe parent mutations on every platform. */
|
|
48
|
+
readonly env?: { readonly CODEX_HOME?: string; readonly OPENCODEX_HOME?: string };
|
|
49
|
+
}
|
|
50
|
+
/** Same generation/recovery binding for each production worker execution. */
|
|
51
|
+
export function createCodexCliWorkerCommitWindow(message: Pick<CodexCliUpdateWorkerRunMessage,
|
|
52
|
+
"gate" | "fence" | "owner" | "requestId">) {
|
|
53
|
+
return createWorkerCommitWindow({ gate: message.gate, fence: message.fence, owner: message.owner,
|
|
54
|
+
recovery: createCodexCliUpdateRecovery(message.requestId) });
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** Async half of cancellation; the fence CAS is the synchronous half. */
|
|
58
|
+
export interface CodexCliUpdateWorkerCancelMessage {
|
|
59
|
+
readonly type: "cancel";
|
|
60
|
+
readonly requestId?: string;
|
|
61
|
+
readonly jobId?: string;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export type CodexCliUpdateWorkerReply =
|
|
65
|
+
| { readonly type: "done"; readonly requestId: string; readonly jobId: string;
|
|
66
|
+
readonly operation: "plan"; readonly plan: CodexCliUpdatePlan }
|
|
67
|
+
| { readonly type: "done"; readonly requestId: string; readonly jobId: string;
|
|
68
|
+
readonly operation: "apply"; readonly result: CodexCliApplyResult }
|
|
69
|
+
| { readonly type: "error"; readonly requestId: string; readonly jobId: string;
|
|
70
|
+
readonly message: string };
|
|
71
|
+
|
|
72
|
+
function isSharedBuffer(value: unknown): value is SharedArrayBuffer {
|
|
73
|
+
return typeof SharedArrayBuffer !== "undefined"
|
|
74
|
+
&& value instanceof SharedArrayBuffer
|
|
75
|
+
&& value.byteLength >= Int32Array.BYTES_PER_ELEMENT;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
function isRunMessage(data: unknown): data is CodexCliUpdateWorkerRunMessage {
|
|
79
|
+
if (!data || typeof data !== "object" || Array.isArray(data)) return false;
|
|
80
|
+
const o = data as Record<string, unknown>;
|
|
81
|
+
return o.type === "run"
|
|
82
|
+
&& typeof o.requestId === "string"
|
|
83
|
+
&& typeof o.jobId === "string"
|
|
84
|
+
&& (o.operation === "plan" || o.operation === "apply")
|
|
85
|
+
&& (o.planId === undefined || typeof o.planId === "string")
|
|
86
|
+
&& (o.channel === undefined || o.channel === "latest")
|
|
87
|
+
&& (o.snapshot === null || (typeof o.snapshot === "object" && !Array.isArray(o.snapshot)))
|
|
88
|
+
&& isSharedBuffer(o.gate)
|
|
89
|
+
&& o.gate.byteLength >= Int32Array.BYTES_PER_ELEMENT * 2
|
|
90
|
+
&& isSharedBuffer(o.fence) && o.fence.byteLength >= Int32Array.BYTES_PER_ELEMENT * 3
|
|
91
|
+
&& (o.owner === undefined || (Number.isSafeInteger(o.owner) && (o.owner as number) >= 2));
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
declare const self: Worker;
|
|
95
|
+
|
|
96
|
+
// One real AbortSignal per realm for apply's fetchArtifact path; aborting it
|
|
97
|
+
// is idempotent, so a cancel that arrives before the run still refuses the
|
|
98
|
+
// apply at its first checkpoint via signal.aborted.
|
|
99
|
+
const applyAbort = new AbortController();
|
|
100
|
+
let ran = false;
|
|
101
|
+
let runIdentity: { requestId: string; jobId: string } | undefined;
|
|
102
|
+
// A raw Win32 handle is not a Bun event-loop reference. Keep the run-once
|
|
103
|
+
// handler AND exact resource roots until their terminal cleanup releases them.
|
|
104
|
+
export function createCodexCliWorkerLifetime(detach: () => void) {
|
|
105
|
+
let executionFinished = false;
|
|
106
|
+
let detached = false;
|
|
107
|
+
const retainedExecutions = new Set<object>();
|
|
108
|
+
const maybeDetach = () => {
|
|
109
|
+
if (executionFinished && !detached && retainedExecutions.size === 0) { detached = true; detach(); }
|
|
110
|
+
};
|
|
111
|
+
return {
|
|
112
|
+
retain(owner: object): { release(): void } {
|
|
113
|
+
const token = { owner };
|
|
114
|
+
retainedExecutions.add(token);
|
|
115
|
+
return { release() { if (retainedExecutions.delete(token)) maybeDetach(); } };
|
|
116
|
+
},
|
|
117
|
+
finish() { executionFinished = true; maybeDetach(); },
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
const lifetime = createCodexCliWorkerLifetime(() => { self.onmessage = null; });
|
|
121
|
+
|
|
122
|
+
// Guarded so the module can be imported directly by tests without a Worker host.
|
|
123
|
+
if (typeof Bun !== "undefined" && Bun.isMainThread === false
|
|
124
|
+
&& typeof self !== "undefined" && typeof self.postMessage === "function") {
|
|
125
|
+
self.onmessage = async (event: MessageEvent<unknown>) => {
|
|
126
|
+
const data = event.data;
|
|
127
|
+
if (data && typeof data === "object" && !Array.isArray(data)
|
|
128
|
+
&& (data as { type?: unknown }).type === "recover"
|
|
129
|
+
&& runIdentity && (data as { requestId?: unknown }).requestId === runIdentity.requestId
|
|
130
|
+
&& (data as { jobId?: unknown }).jobId === runIdentity.jobId) {
|
|
131
|
+
await recoverWindowsCodexCliInstallations();
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
if (data && typeof data === "object" && !Array.isArray(data)
|
|
135
|
+
&& (data as CodexCliUpdateWorkerCancelMessage).type === "cancel") {
|
|
136
|
+
applyAbort.abort();
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
if (ran || !isRunMessage(data)) return;
|
|
140
|
+
ran = true;
|
|
141
|
+
const message = data;
|
|
142
|
+
runIdentity = { requestId: message.requestId, jobId: message.jobId };
|
|
143
|
+
try {
|
|
144
|
+
// Home overrides apply before anything resolves a home-derived path in
|
|
145
|
+
// this realm; they are transport for the job, never snapshot fields.
|
|
146
|
+
if (message.env?.CODEX_HOME) process.env.CODEX_HOME = message.env.CODEX_HOME;
|
|
147
|
+
if (message.env?.OPENCODEX_HOME) process.env.OPENCODEX_HOME = message.env.OPENCODEX_HOME;
|
|
148
|
+
const inspectionDeps = codexCliUpdateInspectionDepsFromSnapshot(message.snapshot);
|
|
149
|
+
if (message.operation === "plan") {
|
|
150
|
+
const plan = await createCodexCliUpdatePlan({
|
|
151
|
+
channel: message.channel ?? "latest",
|
|
152
|
+
inspectionDeps,
|
|
153
|
+
});
|
|
154
|
+
self.postMessage({
|
|
155
|
+
type: "done", requestId: message.requestId, jobId: message.jobId,
|
|
156
|
+
operation: "plan", plan,
|
|
157
|
+
} satisfies CodexCliUpdateWorkerReply);
|
|
158
|
+
} else {
|
|
159
|
+
if (typeof message.planId !== "string") throw new Error("cli_update_worker_missing_plan_id");
|
|
160
|
+
const result = await applyCodexCliUpdate(message.planId, {
|
|
161
|
+
inspectionDeps,
|
|
162
|
+
signal: applyAbort.signal,
|
|
163
|
+
isCancelled: codexCliUpdateIsCancelled(message.fence),
|
|
164
|
+
commitWindow: createCodexCliWorkerCommitWindow(message),
|
|
165
|
+
retainExecution: owner => lifetime.retain(owner),
|
|
166
|
+
});
|
|
167
|
+
self.postMessage({
|
|
168
|
+
type: "done", requestId: message.requestId, jobId: message.jobId,
|
|
169
|
+
operation: "apply", result,
|
|
170
|
+
} satisfies CodexCliUpdateWorkerReply);
|
|
171
|
+
}
|
|
172
|
+
} catch (error) {
|
|
173
|
+
if (error instanceof WindowsCliToolchainCleanupError) lifetime.retain(error.acquisition);
|
|
174
|
+
self.postMessage({
|
|
175
|
+
type: "error", requestId: message.requestId, jobId: message.jobId,
|
|
176
|
+
message: error instanceof Error ? error.message : "cli_update_worker_failed",
|
|
177
|
+
} satisfies CodexCliUpdateWorkerReply);
|
|
178
|
+
} finally {
|
|
179
|
+
// Bun 1.4.4 has no self.close(). Drop the handler only when native owners
|
|
180
|
+
// have released every token; referenced child/I/O work must also drain.
|
|
181
|
+
// The parent's close event is not proof that every OS descendant exited.
|
|
182
|
+
lifetime.finish();
|
|
183
|
+
}
|
|
184
|
+
};
|
|
185
|
+
}
|
|
@@ -0,0 +1,268 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { win32 } from "node:path";
|
|
3
|
+
import { parseStrictSemver } from "../lib/strict-semver";
|
|
4
|
+
import { npmCodexCommandShim } from "./cli-installation-identity";
|
|
5
|
+
import { MAX_NATIVE_BACKING_BYTES } from "./cli-installation-limits";
|
|
6
|
+
import { deriveCodexCliInstallationInput } from "./cli-installation-targets";
|
|
7
|
+
import type { CodexCliInstallProvenanceDeps, CodexCliInstallReport } from "./cli-install-provenance";
|
|
8
|
+
import { resolveCodexRuntime } from "./runtime";
|
|
9
|
+
import { inspectWindowsInstallationFiles as inspectFiles, type WindowsInstallationFilesResult } from "./windows-installation-files";
|
|
10
|
+
|
|
11
|
+
// Every plan observation refuses alternate names, including aliases of ancestors.
|
|
12
|
+
const inspectWindowsInstallationFiles: typeof inspectFiles = (requests, finalize) =>
|
|
13
|
+
inspectFiles(requests.map(request => ({ ...request, requireCanonicalPath: true })), finalize);
|
|
14
|
+
|
|
15
|
+
async function withCanonicalExclusionRoots<R>(roots: readonly string[], run: () => Promise<R>,
|
|
16
|
+
onRefusal?: (reason: Extract<WindowsInstallationFilesResult, { kind: "refused" }>["reason"]) => void): Promise<R | null> {
|
|
17
|
+
if (!roots.length) return run();
|
|
18
|
+
let result: R | null = null;
|
|
19
|
+
// Keep every exclusion open across the observation/query; validate each batch
|
|
20
|
+
// under the native reader's existing request ceiling without dropping a root.
|
|
21
|
+
const observed = await inspectWindowsInstallationFiles(roots.slice(0, 12).map(path => ({
|
|
22
|
+
path: win32.normalize(path), maxBytes: 0, metadataOnly: true, directory: true,
|
|
23
|
+
})), async () => {
|
|
24
|
+
result = await withCanonicalExclusionRoots(roots.slice(12), run, onRefusal); return result !== null;
|
|
25
|
+
});
|
|
26
|
+
if (observed.kind === "refused") onRefusal?.(observed.reason);
|
|
27
|
+
return observed.kind === "observed" ? result : null;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
import { openWindowsCliToolchainAuthority, WindowsCliToolchainCleanupError } from "./cli-update-job-store-windows";
|
|
31
|
+
|
|
32
|
+
/** Private plan evidence. Explicit `attest` observations never enter this map. */
|
|
33
|
+
interface WindowsPlanEvidence { readonly node: string; readonly npmCli: string; readonly arch: "x64" | "arm64";
|
|
34
|
+
readonly prefix: string; readonly launcher: string; readonly backingRoot: string;
|
|
35
|
+
readonly envPath: string | undefined; readonly envPathExt: string | undefined;
|
|
36
|
+
readonly nodeEvidence: string; readonly npmEvidence: string; readonly exclusionRoots: readonly string[] }
|
|
37
|
+
const evidence = new WeakMap<CodexCliInstallReport, WindowsPlanEvidence>();
|
|
38
|
+
const toolchainDigests = new WeakMap<CodexCliInstallReport, string>();
|
|
39
|
+
type WindowsPlanRefusalGate = "selection" | "exclusion-roots" | "local-node" | "derivation"
|
|
40
|
+
| "launcher-arch" | "excluded-layout" | "initial-observation" | "initial-content"
|
|
41
|
+
| "backing-selection" | "final-observation" | "shim-content" | "manifest-identity"
|
|
42
|
+
| "node-identity" | "backing-content" | "exception";
|
|
43
|
+
type WindowsPlanRefusalReason = Extract<WindowsInstallationFilesResult, { kind: "refused" }>["reason"]
|
|
44
|
+
| Extract<Awaited<ReturnType<typeof deriveCodexCliInstallationInput>>, { kind: "unavailable" }>["reason"];
|
|
45
|
+
interface WindowsPlanRefusal { readonly gate: WindowsPlanRefusalGate; readonly reason?: WindowsPlanRefusalReason }
|
|
46
|
+
const refusals = new WeakMap<CodexCliInstallReport, WindowsPlanRefusal>();
|
|
47
|
+
/** Test diagnostics only: fixed codes, never paths, exception messages or public report fields. */
|
|
48
|
+
export const windowsCodexCliPlanRefusalForTests = (report: CodexCliInstallReport): WindowsPlanRefusal | null => refusals.get(report) ?? null;
|
|
49
|
+
export const windowsCodexCliToolchainDigest = (report: CodexCliInstallReport): string | undefined => toolchainDigests.get(report);
|
|
50
|
+
export const windowsCodexCliPlanEvidence = (report: CodexCliInstallReport): WindowsPlanEvidence | null => evidence.get(report) ?? null;
|
|
51
|
+
const hash = (value: string): string => createHash("sha256").update(value).digest("hex");
|
|
52
|
+
type File = Extract<WindowsInstallationFilesResult, { kind: "observed" }>["files"][number];
|
|
53
|
+
const id = (file: File): string => JSON.stringify([file.path, file.identity, file.digest]);
|
|
54
|
+
const sameWindowsPath = (left: string, right: string): boolean => win32.resolve(left).toLowerCase() === win32.resolve(right).toLowerCase();
|
|
55
|
+
function selectedWindowsOverride(candidate: string, env: NodeJS.ProcessEnv, configDir?: string): boolean {
|
|
56
|
+
return env.CODEX_CLI_PATH?.trim() === candidate && resolveCodexRuntime({ platform: "win32", env, configDir,
|
|
57
|
+
probeVersion: false, discoverAlternatives: false, existsSync: path => path === candidate,
|
|
58
|
+
readFileSync: () => { throw new Error("state not required for explicit override"); },
|
|
59
|
+
readdirSync: () => [], statSync: () => { throw new Error("discovery disabled"); },
|
|
60
|
+
}).runtime.command === candidate;
|
|
61
|
+
}
|
|
62
|
+
/** Synchronous selection fence after the last awaited authority check, before native start. */
|
|
63
|
+
export function windowsCodexCliSelectionMatches(report: CodexCliInstallReport, deps: CodexCliInstallProvenanceDeps): boolean {
|
|
64
|
+
const captured = evidence.get(report), env = deps.env;
|
|
65
|
+
return !!captured && !!env && deps.selectionAttested === true && env.PATH === captured.envPath
|
|
66
|
+
&& env.PATHEXT === captured.envPathExt && selectedWindowsOverride(captured.launcher, env, deps.configDir);
|
|
67
|
+
}
|
|
68
|
+
/** Metadata queries execute only while the observed Node/npm and ancestors deny replacement. */
|
|
69
|
+
export async function withWindowsCodexCliPlanToolchain<R>(report: CodexCliInstallReport,
|
|
70
|
+
run: () => R): Promise<Awaited<R> | null> {
|
|
71
|
+
const toolchain = evidence.get(report);
|
|
72
|
+
if (!toolchain) return null;
|
|
73
|
+
return withCanonicalExclusionRoots(toolchain.exclusionRoots, async () => {
|
|
74
|
+
let authority;
|
|
75
|
+
try { authority = await openWindowsCliToolchainAuthority(toolchain.node, win32.dirname(win32.dirname(toolchain.npmCli)), true); }
|
|
76
|
+
catch (error) { if (error instanceof WindowsCliToolchainCleanupError) throw error; return null; }
|
|
77
|
+
let result: Awaited<R> | null = null;
|
|
78
|
+
try { const observed = await inspectWindowsInstallationFiles([
|
|
79
|
+
{ path: toolchain.node, maxBytes: 128 * 1024 * 1024, hashOnly: true },
|
|
80
|
+
{ path: toolchain.npmCli, maxBytes: 256 * 1024 },
|
|
81
|
+
], async files => {
|
|
82
|
+
if (id(files[0]!) !== toolchain.nodeEvidence || id(files[1]!) !== toolchain.npmEvidence) return false;
|
|
83
|
+
toolchainDigests.set(report, authority.digest);
|
|
84
|
+
result = await run(); return true;
|
|
85
|
+
});
|
|
86
|
+
return observed.kind === "observed" ? result : null;
|
|
87
|
+
} finally { if (!await authority.release()) throw new Error("toolchain_release_unverified"); }
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/** Transfer a held toolchain observation to a transaction, including unknown child lifetimes. */
|
|
92
|
+
export async function holdWindowsCodexCliPlanToolchain(report: CodexCliInstallReport) {
|
|
93
|
+
const toolchain = evidence.get(report);
|
|
94
|
+
if (!toolchain) return null;
|
|
95
|
+
let authority;
|
|
96
|
+
try { authority = await openWindowsCliToolchainAuthority(toolchain.node, win32.dirname(win32.dirname(toolchain.npmCli)), true); }
|
|
97
|
+
catch (error) { if (error instanceof WindowsCliToolchainCleanupError) throw error; return null; }
|
|
98
|
+
const admitted = Promise.withResolvers<boolean>();
|
|
99
|
+
const release = Promise.withResolvers<void>();
|
|
100
|
+
const observing = withCanonicalExclusionRoots(toolchain.exclusionRoots, () => inspectWindowsInstallationFiles([
|
|
101
|
+
{ path: toolchain.node, maxBytes: 128 * 1024 * 1024, hashOnly: true },
|
|
102
|
+
{ path: toolchain.npmCli, maxBytes: 256 * 1024 },
|
|
103
|
+
], async files => {
|
|
104
|
+
if (id(files[0]!) !== toolchain.nodeEvidence || id(files[1]!) !== toolchain.npmEvidence) return false;
|
|
105
|
+
admitted.resolve(true);
|
|
106
|
+
await release.promise;
|
|
107
|
+
return true;
|
|
108
|
+
}));
|
|
109
|
+
void observing.then(() => admitted.resolve(false), () => admitted.resolve(false));
|
|
110
|
+
if (!await admitted.promise) { await authority.release(); return null; }
|
|
111
|
+
return { async release() { release.resolve(); const observed = await observing;
|
|
112
|
+
return await authority.release() && observed?.kind === "observed"; } };
|
|
113
|
+
}
|
|
114
|
+
const json = (file: File): Record<string, unknown> | null => {
|
|
115
|
+
try { const item = JSON.parse(Buffer.from(file.bytes).toString("utf8"));
|
|
116
|
+
return item && typeof item === "object" && !Array.isArray(item) ? item : null;
|
|
117
|
+
} catch { return null; }
|
|
118
|
+
};
|
|
119
|
+
const entry = (item: Record<string, unknown>, name: string): unknown => typeof item.bin === "string" ? item.bin
|
|
120
|
+
: item.bin && typeof item.bin === "object" ? (item.bin as Record<string, unknown>)[name] : null;
|
|
121
|
+
function peArch(bytes: Uint8Array): "x64" | "arm64" | null {
|
|
122
|
+
const b = Buffer.from(bytes);
|
|
123
|
+
if (b.length < 64 || b.toString("ascii", 0, 2) !== "MZ") return null;
|
|
124
|
+
const offset = b.readUInt32LE(60);
|
|
125
|
+
if (offset > b.length - 6 || b.toString("ascii", offset, offset + 4) !== "PE\0\0") return null;
|
|
126
|
+
return b.readUInt16LE(offset + 4) === 0x8664 ? "x64" : b.readUInt16LE(offset + 4) === 0xaa64 ? "arm64" : null;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Read-only supported subset: a proof-captured absolute standard npm cmd-shim
|
|
131
|
+
* override, its global-prefix package, a held-bound Node/npm toolchain, and the
|
|
132
|
+
* in-prefix optional backing. When the prefix has no node.exe, the toolchain is
|
|
133
|
+
* the npm pair the captured PATH resolves — the updater's own metadata vehicle,
|
|
134
|
+
* never a claim about which interpreter a later codex.cmd invocation resolves:
|
|
135
|
+
* the shim's bare `node` falls through to the ambient invocation working
|
|
136
|
+
* directory, which no launcher snapshot can prove. A separate toolchain
|
|
137
|
+
* therefore also requires the launcher arch anchor, keeping the backing lane
|
|
138
|
+
* tied to the selection instead of to an arbitrary PATH hit.
|
|
139
|
+
*/
|
|
140
|
+
export async function inspectWindowsCodexCliPlanInstall(
|
|
141
|
+
deps: CodexCliInstallProvenanceDeps, fallback: CodexCliInstallReport, excluded: (path: string) => boolean,
|
|
142
|
+
exclusionRoots: readonly string[] = [],
|
|
143
|
+
): Promise<CodexCliInstallReport> {
|
|
144
|
+
const refuse = (gate: WindowsPlanRefusalGate, reason?: WindowsPlanRefusalReason): CodexCliInstallReport => {
|
|
145
|
+
refusals.set(fallback, Object.freeze(reason === undefined ? { gate } : { gate, reason }));
|
|
146
|
+
return fallback;
|
|
147
|
+
};
|
|
148
|
+
const env = deps.env ?? {};
|
|
149
|
+
const candidate = env.CODEX_CLI_PATH?.trim();
|
|
150
|
+
if (!deps.selectionAttested || !candidate || !/^[a-z]:[\\/]/i.test(candidate)
|
|
151
|
+
|| win32.basename(candidate) !== "codex.cmd"
|
|
152
|
+
|| (deps.selectedCommand != null && deps.selectedCommand !== candidate)) return refuse("selection");
|
|
153
|
+
if (exclusionRoots.length) {
|
|
154
|
+
const roots = Object.freeze([...exclusionRoots]);
|
|
155
|
+
let reason: WindowsPlanRefusalReason | undefined;
|
|
156
|
+
const report = await withCanonicalExclusionRoots(roots,
|
|
157
|
+
() => inspectWindowsCodexCliPlanInstall(deps, fallback, excluded), value => { reason ??= value; });
|
|
158
|
+
if (report) {
|
|
159
|
+
const toolchain = evidence.get(report);
|
|
160
|
+
if (toolchain) evidence.set(report, Object.freeze({ ...toolchain, exclusionRoots: roots }));
|
|
161
|
+
}
|
|
162
|
+
return report ?? refuse("exclusion-roots", reason);
|
|
163
|
+
}
|
|
164
|
+
// The bounded content read is opt-in: a bare ownership check holds the same
|
|
165
|
+
// reparse-refusing handles; only bounded ownership/header reads remain.
|
|
166
|
+
const observe = deps.observeInstallContent === true;
|
|
167
|
+
const prefix = win32.dirname(candidate);
|
|
168
|
+
const localNodePath = win32.join(prefix, "node.exe");
|
|
169
|
+
const localNode = await inspectWindowsInstallationFiles([{ path: localNodePath, maxBytes: 0, metadataOnly: true }]);
|
|
170
|
+
if (localNode.kind === "refused" && localNode.reason !== "not-found") return refuse("local-node", localNode.reason);
|
|
171
|
+
const selectedPath = env.PATH;
|
|
172
|
+
const selectedPathExt = env.PATHEXT;
|
|
173
|
+
const derivation = await deriveCodexCliInstallationInput({
|
|
174
|
+
codexCliPath: candidate, path: selectedPath ?? null, pathExt: selectedPathExt ?? null,
|
|
175
|
+
}, { platform: "win32" });
|
|
176
|
+
if (derivation.kind !== "derived" || derivation.input.candidate !== candidate
|
|
177
|
+
|| derivation.input.npmPrefix !== prefix) return refuse("derivation", derivation.kind === "unavailable" ? derivation.reason : undefined);
|
|
178
|
+
const node = derivation.input.node;
|
|
179
|
+
const npmCli = derivation.input.npmCli;
|
|
180
|
+
const npmRoot = win32.dirname(win32.dirname(npmCli));
|
|
181
|
+
const pathNode = !sameWindowsPath(node, localNodePath);
|
|
182
|
+
// A prefix-local node.exe is provably the shim's own interpreter; a PATH-resolved
|
|
183
|
+
// separate toolchain is bound as the updater's metadata vehicle only. Without the
|
|
184
|
+
// launcher arch the toolchain's arch cannot be tied to the selection at all, so a
|
|
185
|
+
// separate toolchain stays refused rather than claim an unanchored backing lane.
|
|
186
|
+
if (pathNode && !deps.arch) return refuse("launcher-arch");
|
|
187
|
+
const root = win32.join(prefix, "node_modules", "@openai", "codex");
|
|
188
|
+
const manifest = win32.join(root, "package.json");
|
|
189
|
+
const npmManifest = win32.join(npmRoot, "package.json");
|
|
190
|
+
const bin = win32.join(root, "bin", "codex.js");
|
|
191
|
+
const paths = [candidate, node, npmCli, root];
|
|
192
|
+
if (prefix === win32.parse(prefix).root || paths.some(excluded)) return refuse("excluded-layout");
|
|
193
|
+
// Only already handle-observed files can pass the real resolver's existence
|
|
194
|
+
// predicate. The explicit override wins before saved-state/shim/PATH candidates.
|
|
195
|
+
const selected = () => selectedWindowsOverride(candidate, env, deps.configDir);
|
|
196
|
+
try {
|
|
197
|
+
const first = await inspectWindowsInstallationFiles([
|
|
198
|
+
{ path: manifest, maxBytes: 256 * 1024 }, { path: npmManifest, maxBytes: 256 * 1024 },
|
|
199
|
+
{ path: node, maxBytes: 4096, prefixOnly: true },
|
|
200
|
+
]);
|
|
201
|
+
if (first.kind !== "observed") return refuse("initial-observation", first.reason);
|
|
202
|
+
const initial = new Map(first.files.map(file => [file.path, file]));
|
|
203
|
+
const main = json(initial.get(manifest)!); const npm = json(initial.get(npmManifest)!);
|
|
204
|
+
const arch = peArch(initial.get(node)!.bytes);
|
|
205
|
+
if (!main || main.name !== "@openai/codex" || typeof main.version !== "string" || !parseStrictSemver(main.version)
|
|
206
|
+
|| entry(main, "codex") !== "bin/codex.js" || !npm || npm.name !== "npm"
|
|
207
|
+
|| typeof npm.version !== "string" || !parseStrictSemver(npm.version) || entry(npm, "npm") !== "bin/npm-cli.js"
|
|
208
|
+
|| !arch || (deps.arch && deps.arch !== arch)) return refuse("initial-content");
|
|
209
|
+
const pkg = `@openai/codex-win32-${arch}`;
|
|
210
|
+
const triple = arch === "x64" ? "x86_64-pc-windows-msvc" : "aarch64-pc-windows-msvc";
|
|
211
|
+
// Node's nearest-first package lookup, bounded to this independent prefix.
|
|
212
|
+
const lanes = [win32.join(root, "bin", "node_modules"), win32.join(root, "node_modules"),
|
|
213
|
+
win32.join(prefix, "node_modules", "@openai", "node_modules"), win32.join(prefix, "node_modules")];
|
|
214
|
+
let backingRefusal: WindowsPlanRefusalReason | undefined;
|
|
215
|
+
const backingSelection = async (): Promise<string | null> => {
|
|
216
|
+
for (const lane of lanes) {
|
|
217
|
+
const path = win32.join(lane, pkg, "package.json");
|
|
218
|
+
const probe = await inspectWindowsInstallationFiles([{ path, maxBytes: 0, metadataOnly: true }]);
|
|
219
|
+
if (probe.kind === "observed") return path;
|
|
220
|
+
if (probe.reason !== "not-found") { backingRefusal = probe.reason; return null; }
|
|
221
|
+
}
|
|
222
|
+
return null; // No global module lookup or vendor fallback adoption.
|
|
223
|
+
};
|
|
224
|
+
const backingManifest = await backingSelection();
|
|
225
|
+
if (!backingManifest) return refuse("backing-selection", backingRefusal ?? "not-found");
|
|
226
|
+
const native = win32.join(win32.dirname(backingManifest), "vendor", triple, "bin", "codex.exe");
|
|
227
|
+
// Ownership requires the manifests, shim and backing manifest bytes plus the
|
|
228
|
+
// bounded Node header read above; entrypoint, npm CLI, Node and native
|
|
229
|
+
// contents only feed the opt-in digest, so they stay metadata-held without it.
|
|
230
|
+
const owned = (path: string) => ({ path, maxBytes: 256 * 1024 });
|
|
231
|
+
const bound = (path: string) => observe ? { path, maxBytes: 256 * 1024 } : { path, maxBytes: 0, metadataOnly: true };
|
|
232
|
+
const requests = [owned(manifest), owned(npmManifest), owned(candidate), bound(bin), bound(npmCli), owned(backingManifest)];
|
|
233
|
+
const final = await inspectWindowsInstallationFiles([...requests,
|
|
234
|
+
observe
|
|
235
|
+
? { path: node, maxBytes: 128 * 1024 * 1024, hashOnly: true }
|
|
236
|
+
: { path: node, maxBytes: 0, metadataOnly: true },
|
|
237
|
+
observe
|
|
238
|
+
? { path: native, maxBytes: MAX_NATIVE_BACKING_BYTES, hashOnly: true }
|
|
239
|
+
: { path: native, maxBytes: 0, metadataOnly: true },
|
|
240
|
+
], async () => selected() && env.PATH === selectedPath && env.PATHEXT === selectedPathExt
|
|
241
|
+
&& await deriveCodexCliInstallationInput({ codexCliPath: candidate,
|
|
242
|
+
path: selectedPath ?? null, pathExt: selectedPathExt ?? null }, { platform: "win32" })
|
|
243
|
+
.then(current => current.kind === "derived" && current.input.candidate === candidate
|
|
244
|
+
&& current.input.npmPrefix === prefix && current.input.node === node && current.input.npmCli === npmCli)
|
|
245
|
+
&& await backingSelection() === backingManifest);
|
|
246
|
+
if (final.kind !== "observed") return refuse("final-observation", backingRefusal ?? final.reason);
|
|
247
|
+
const files = new Map(final.files.map(file => [file.path, file]));
|
|
248
|
+
if (!npmCodexCommandShim(files.get(candidate)!.bytes)) return refuse("shim-content");
|
|
249
|
+
for (const path of [manifest, npmManifest]) if (id(initial.get(path)!) !== id(files.get(path)!)) return refuse("manifest-identity");
|
|
250
|
+
if (JSON.stringify(initial.get(node)!.identity) !== JSON.stringify(files.get(node)!.identity)) return refuse("node-identity");
|
|
251
|
+
const backing = json(files.get(backingManifest)!);
|
|
252
|
+
if (!backing || "exports" in backing || ![pkg, "@openai/codex"].includes(String(backing.name))
|
|
253
|
+
|| ![main.version, `${main.version}-win32-${arch}`].includes(String(backing.version))) return refuse("backing-content");
|
|
254
|
+
const content = observe ? hash(JSON.stringify(["windows-npm-read-only-plan-v3", arch, prefix, candidate, node, npmCli,
|
|
255
|
+
...final.files.map(file => [file.path, file.identity, file.digest])])) : null;
|
|
256
|
+
const report: CodexCliInstallReport = Object.freeze({ ...fallback, managed: true, selectionAttested: true,
|
|
257
|
+
provenance: "npm-global", reason: "managed_npm_global", packageVersion: main.version,
|
|
258
|
+
versionEvidence: Object.freeze({ kind: "package-manifest" }), installDigest: hash(prefix),
|
|
259
|
+
installContentDigest: content, shim: Object.freeze({ status: "not-tracked", backingKind: null }),
|
|
260
|
+
evidence: Object.freeze(["package_manifest", "package_manifest_digest",
|
|
261
|
+
...(content ? ["install_content_digest" as const] : []), "global_npm_layout"] as const),
|
|
262
|
+
});
|
|
263
|
+
evidence.set(report, Object.freeze({ node, npmCli, arch, prefix, launcher: candidate,
|
|
264
|
+
envPath: selectedPath, envPathExt: selectedPathExt,
|
|
265
|
+
backingRoot: win32.dirname(backingManifest), nodeEvidence: id(files.get(node)!), npmEvidence: id(files.get(npmCli)!), exclusionRoots: Object.freeze([]) }));
|
|
266
|
+
return report;
|
|
267
|
+
} catch { return refuse("exception"); }
|
|
268
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { closeSync, constants, fstatSync, lstatSync, openSync, readSync, realpathSync, statSync } from "node:fs";
|
|
2
2
|
import { dirname, isAbsolute, join, resolve } from "node:path";
|
|
3
3
|
import { getConfigDir } from "../config/paths";
|
|
4
|
+
import { sameFileIdentity } from "../lib/file-identity";
|
|
4
5
|
import { samePathIdentity } from "./user-identity";
|
|
5
6
|
|
|
6
7
|
export const CODEX_HOME_JOURNAL_FILE = "opencodex-journal.json";
|
|
@@ -55,21 +56,21 @@ function validJournal(value: unknown): value is Record<string, unknown> {
|
|
|
55
56
|
export function readCodexHomeJournal(journalPath: string): CodexHomeJournalInspection {
|
|
56
57
|
let fd: number | undefined;
|
|
57
58
|
try {
|
|
58
|
-
const before = lstatSync(journalPath);
|
|
59
|
-
if (!before.isFile() || before.isSymbolicLink() || before.size > MAX_JOURNAL_BYTES) return { kind: "unknown" };
|
|
59
|
+
const before = lstatSync(journalPath, { bigint: true });
|
|
60
|
+
if (!before.isFile() || before.isSymbolicLink() || before.size > BigInt(MAX_JOURNAL_BYTES)) return { kind: "unknown" };
|
|
60
61
|
fd = openSync(journalPath, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0));
|
|
61
|
-
const opened = fstatSync(fd);
|
|
62
|
-
if (!opened.isFile() || opened.size > MAX_JOURNAL_BYTES || before
|
|
63
|
-
const bytes = Buffer.alloc(opened.size + 1);
|
|
62
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
63
|
+
if (!opened.isFile() || opened.size > BigInt(MAX_JOURNAL_BYTES) || !sameFileIdentity(before, opened)) return { kind: "unknown" };
|
|
64
|
+
const bytes = Buffer.alloc(Number(opened.size) + 1);
|
|
64
65
|
let length = 0;
|
|
65
66
|
while (length < bytes.length) {
|
|
66
67
|
const count = readSync(fd, bytes, length, bytes.length - length, null);
|
|
67
68
|
if (!count) break;
|
|
68
69
|
length += count;
|
|
69
70
|
}
|
|
70
|
-
const after = lstatSync(journalPath);
|
|
71
|
-
if (length !== opened.size || !after.isFile() || after
|
|
72
|
-
|| after.size !== opened.size || after.
|
|
71
|
+
const after = lstatSync(journalPath, { bigint: true });
|
|
72
|
+
if (BigInt(length) !== opened.size || !after.isFile() || !sameFileIdentity(after, opened)
|
|
73
|
+
|| after.size !== opened.size || after.mtimeNs !== opened.mtimeNs || after.ctimeNs !== opened.ctimeNs) return { kind: "unknown" };
|
|
73
74
|
const journal: unknown = JSON.parse(bytes.subarray(0, length).toString("utf8"));
|
|
74
75
|
return validJournal(journal) ? { kind: "read", journal } : { kind: "unknown" };
|
|
75
76
|
} catch (error) {
|
package/src/codex/convergence.ts
CHANGED
|
@@ -37,7 +37,6 @@ import {
|
|
|
37
37
|
import {
|
|
38
38
|
catalogBackupPathFor,
|
|
39
39
|
catalogHasRoutedEntries,
|
|
40
|
-
findSupportedNativeTemplate,
|
|
41
40
|
legacyCatalogBackupPath,
|
|
42
41
|
nativeMultiAgentDefaults,
|
|
43
42
|
parseCatalogJson,
|
|
@@ -64,6 +63,7 @@ import {
|
|
|
64
63
|
nativeContextLimits,
|
|
65
64
|
shouldIncludeAccountBoundNativeOpenAi,
|
|
66
65
|
shouldIncludeNativeOpenAi,
|
|
66
|
+
shouldUpgradeToUpstreamEntry,
|
|
67
67
|
} from "./catalog/metadata";
|
|
68
68
|
import {
|
|
69
69
|
trustedAccountBoundNativeCatalogSlug,
|
|
@@ -78,6 +78,8 @@ import { codexRuntimeStatePath, peekCodexRuntimeProcessCache } from "./runtime";
|
|
|
78
78
|
import { codexAccountNamespaceEntries, isMainCodexAccountTarget } from "./account-namespaces";
|
|
79
79
|
import { MAIN_CODEX_ACCOUNT_ID } from "./main-account";
|
|
80
80
|
import { applyNativeAccessPrograms } from "./catalog/access-programs";
|
|
81
|
+
import { advanceNativeInheritanceTemplate, captureNativeInheritanceTemplate } from "./catalog/native-template";
|
|
82
|
+
import { omitDisabledNativeCatalogEntries } from "./catalog/native-omission";
|
|
81
83
|
import {
|
|
82
84
|
availableAccountGatedNativeModels,
|
|
83
85
|
codexModelEntitlementStateForAccount,
|
|
@@ -269,7 +271,7 @@ function prepareCatalog(
|
|
|
269
271
|
): RawCatalog {
|
|
270
272
|
const catalog = JSON.parse(JSON.stringify(source.catalog)) as RawCatalog;
|
|
271
273
|
// Strict selector: an unknown bare row must never become the routed template (#2813).
|
|
272
|
-
const template =
|
|
274
|
+
const template = captureNativeInheritanceTemplate(catalog, config.omitDisabledNativeModels === true);
|
|
273
275
|
const enabled = filterCatalogVisibleModels(routedModels, config);
|
|
274
276
|
const featured = config.subagentModels ?? [];
|
|
275
277
|
const ordered = orderForSubagents(enabled, featured);
|
|
@@ -296,6 +298,13 @@ function prepareCatalog(
|
|
|
296
298
|
...desktopAllowlistSuppressedNativeSlugs(config),
|
|
297
299
|
...[...ACCOUNT_GATED_NATIVE_OPENAI_MODELS].filter(slug => !availableBareGatedNativeSlugs.has(slug)),
|
|
298
300
|
]);
|
|
301
|
+
// An omitted source still needs the same upgrade/normalization as a visible native.
|
|
302
|
+
// Keep independent combo-alias and entitlement suppression authoritative.
|
|
303
|
+
if (template && shouldUpgradeToUpstreamEntry(template)
|
|
304
|
+
&& (!ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(String(template.slug)) || availableBareGatedNativeSlugs.has(String(template.slug)))
|
|
305
|
+
&& !desktopAllowlistSuppressedNativeSlugs({ ...config, omitDisabledNativeModels: false }).has(String(template.slug))) {
|
|
306
|
+
suppressedBareNativeSlugs.delete(String(template.slug));
|
|
307
|
+
}
|
|
299
308
|
const hasPhysicalComboProvider = Object.hasOwn(config.providers, COMBO_NAMESPACE);
|
|
300
309
|
const enabledProviders = Object.entries(config.providers).filter(([, provider]) => provider.disabled !== true);
|
|
301
310
|
const includeNativeOpenAi = shouldIncludeNativeOpenAi(config);
|
|
@@ -416,12 +425,13 @@ function prepareCatalog(
|
|
|
416
425
|
: null,
|
|
417
426
|
);
|
|
418
427
|
finalizeAutoReviewModelOverride(mergedModels, catalogModels, config);
|
|
428
|
+
advanceNativeInheritanceTemplate(catalog, mergedModels, shouldUpgradeToUpstreamEntry);
|
|
419
429
|
// The second writer of this file. A dashboard model toggle, a combo edit, or a Codex account
|
|
420
430
|
// login reaches `convergeCodexCatalog` and commits through `fixedCommit`, never through
|
|
421
431
|
// `writeRetainedCatalogSync`, so the #4730 uniqueness guard has to stand here too or the same
|
|
422
432
|
// `source-invalid` rejection returns by a different route. Silent because this merge runs under
|
|
423
433
|
// `warningPolicy: "suppress"`.
|
|
424
|
-
catalog.models = enforceCatalogSlugUniqueness(mergedModels, false);
|
|
434
|
+
catalog.models = enforceCatalogSlugUniqueness(omitDisabledNativeCatalogEntries(mergedModels, config), false);
|
|
425
435
|
return catalog;
|
|
426
436
|
}
|
|
427
437
|
|
|
@@ -12,11 +12,13 @@ import {
|
|
|
12
12
|
realpathSync,
|
|
13
13
|
renameSync,
|
|
14
14
|
type Stats,
|
|
15
|
+
type BigIntStats,
|
|
15
16
|
} from "node:fs";
|
|
16
17
|
import { join } from "node:path";
|
|
17
18
|
import { pathToFileURL } from "node:url";
|
|
18
19
|
|
|
19
20
|
import { Database, constants as sqliteConstants } from "bun:sqlite";
|
|
21
|
+
import { sameFileIdentity, type FileIdentity as NodeIdentity } from "../lib/file-identity";
|
|
20
22
|
|
|
21
23
|
import { resolveCodexHomeDir } from "./home";
|
|
22
24
|
import {
|
|
@@ -33,7 +35,11 @@ import {
|
|
|
33
35
|
const IMMUTABLE_READONLY_FLAGS =
|
|
34
36
|
sqliteConstants.SQLITE_OPEN_READONLY | sqliteConstants.SQLITE_OPEN_URI;
|
|
35
37
|
|
|
36
|
-
export type FileIdentity = Pick<Stats, "
|
|
38
|
+
export type FileIdentity = NodeIdentity & Pick<Stats, "size" | "mtimeMs" | "ctimeMs">;
|
|
39
|
+
|
|
40
|
+
function milliseconds(ns: bigint): number {
|
|
41
|
+
return Number(ns / 1_000_000_000n) * 1000 + Number(ns % 1_000_000_000n) / 1e6;
|
|
42
|
+
}
|
|
37
43
|
|
|
38
44
|
export interface CodexCoordinatorDiagnosticEvidence {
|
|
39
45
|
sizeBytes: number;
|
|
@@ -66,15 +72,14 @@ function errorCode(error: unknown): string {
|
|
|
66
72
|
}
|
|
67
73
|
|
|
68
74
|
function sameIdentity(left: FileIdentity, right: FileIdentity): boolean {
|
|
69
|
-
return left
|
|
70
|
-
&& left.ino === right.ino
|
|
75
|
+
return sameFileIdentity(left, right)
|
|
71
76
|
&& left.size === right.size
|
|
72
77
|
&& left.mtimeMs === right.mtimeMs
|
|
73
78
|
&& left.ctimeMs === right.ctimeMs;
|
|
74
79
|
}
|
|
75
80
|
|
|
76
81
|
function sameNodeAndSize(left: FileIdentity, right: FileIdentity): boolean {
|
|
77
|
-
return left
|
|
82
|
+
return sameFileIdentity(left, right) && left.size === right.size;
|
|
78
83
|
}
|
|
79
84
|
|
|
80
85
|
function coordinatorPathWithoutCreation(): { kind: "absent"; path: string | null } | { kind: "path"; path: string } {
|
|
@@ -113,9 +118,9 @@ function inspectTarget(
|
|
|
113
118
|
path: string,
|
|
114
119
|
options: { allowSqliteSidecars?: boolean } = {},
|
|
115
120
|
): { kind: "absent" } | { kind: "file"; identity: FileIdentity } | { kind: "unsafe"; reason: string } {
|
|
116
|
-
let entry:
|
|
121
|
+
let entry: BigIntStats;
|
|
117
122
|
try {
|
|
118
|
-
entry = lstatSync(path);
|
|
123
|
+
entry = lstatSync(path, { bigint: true });
|
|
119
124
|
} catch (cause) {
|
|
120
125
|
if (errorCode(cause) === "ENOENT") return { kind: "absent" };
|
|
121
126
|
return { kind: "unsafe", reason: "the coordinator file cannot be inspected" };
|
|
@@ -132,7 +137,7 @@ function inspectTarget(
|
|
|
132
137
|
}
|
|
133
138
|
if (process.platform !== "win32") {
|
|
134
139
|
const uid = process.getuid?.();
|
|
135
|
-
if (uid === undefined || entry.uid !== uid || (entry.mode & 0o777) !== 0o600) {
|
|
140
|
+
if (uid === undefined || Number(entry.uid) !== uid || (Number(entry.mode) & 0o777) !== 0o600) {
|
|
136
141
|
return { kind: "unsafe", reason: "the coordinator file has unsafe ownership or permissions" };
|
|
137
142
|
}
|
|
138
143
|
}
|
|
@@ -143,7 +148,8 @@ function inspectTarget(
|
|
|
143
148
|
}
|
|
144
149
|
}
|
|
145
150
|
}
|
|
146
|
-
return { kind: "file", identity: entry
|
|
151
|
+
return { kind: "file", identity: { dev: entry.dev, ino: entry.ino, size: Number(entry.size),
|
|
152
|
+
mtimeMs: milliseconds(entry.mtimeNs), ctimeMs: milliseconds(entry.ctimeNs) } };
|
|
147
153
|
}
|
|
148
154
|
|
|
149
155
|
function classifyOpenedDatabase(
|
|
@@ -284,7 +284,7 @@ export async function runDesktopRestartHandoff(
|
|
|
284
284
|
try {
|
|
285
285
|
const restart = io.restart
|
|
286
286
|
? io.restart(false)
|
|
287
|
-
: (await import("../desktop-app-restart")).
|
|
287
|
+
: await (await import("../desktop-app-restart")).restartCodexDesktopAppAsync({
|
|
288
288
|
allowHandoff: false,
|
|
289
289
|
lock: io.lock,
|
|
290
290
|
});
|