@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
2
|
inspectCodexCliInstall,
|
|
3
|
-
observeCodexCliSelectedCommand,
|
|
4
3
|
type CodexCliInstallProvenanceDeps,
|
|
5
4
|
type CodexCliInstallReport,
|
|
6
5
|
} from "../codex/cli-install-provenance";
|
|
@@ -13,30 +12,41 @@ import type {
|
|
|
13
12
|
CodexCliInstallationTargetDerivation,
|
|
14
13
|
} from "../codex/cli-installation-targets";
|
|
15
14
|
import {
|
|
16
|
-
createCodexCliUpdatePlan,
|
|
17
15
|
type CodexCliUpdateChannel,
|
|
18
16
|
type CodexCliUpdatePlan,
|
|
19
17
|
type CodexCliUpdatePlanDeps,
|
|
20
18
|
} from "../codex/cli-update-plan";
|
|
19
|
+
import { runCodexCliUpdateApplyInWorker, runCodexCliUpdatePlanInWorker } from "../codex/cli-update-job-worker";
|
|
21
20
|
import {
|
|
22
21
|
type ResolveCodexRuntimeDeps,
|
|
23
22
|
type ResolveCodexRuntimeResult,
|
|
24
23
|
} from "../codex/runtime";
|
|
25
24
|
import { CliUsageError, isJsonOption, printData, runCliAction } from "./runtime-api";
|
|
25
|
+
import { codexCliUpdateInspectionDeps } from "../codex/cli-update-inspection-context";
|
|
26
|
+
export { codexCliUpdateInspectionDeps } from "../codex/cli-update-inspection-context";
|
|
26
27
|
import { trustedNodeLauncherContext } from "./launcher-context";
|
|
28
|
+
import type { CodexCliApplyDeps, CodexCliApplyResult } from "../codex/cli-update-apply";
|
|
29
|
+
import { randomUUID } from "node:crypto";
|
|
30
|
+
import { admitCodexCliUpdateJob, readCodexCliUpdateJob, runCodexCliUpdateJob } from "../codex/cli-update-job";
|
|
31
|
+
import { CodexCliJobResultPersistenceError, normalizeCodexCliJobResult } from "../codex/cli-update-job-execution";
|
|
27
32
|
|
|
28
33
|
export const CODEX_CLI_UPDATE_USAGE = `Usage:
|
|
29
34
|
ocx system codex-cli-update check [--json]
|
|
30
35
|
ocx system codex-cli-update attest [--json]
|
|
31
36
|
ocx system codex-cli-update attest --candidate <absolute-path> --npm-prefix <absolute-path> --npm-cli <absolute-path> --node <absolute-path> [--json]
|
|
32
|
-
ocx system codex-cli-update plan [--channel latest] [--json]
|
|
37
|
+
ocx system codex-cli-update plan [--channel latest] [--json]
|
|
38
|
+
ocx system codex-cli-update apply --plan-id <32-hex> --yes [--request-id <key>] [--json]
|
|
39
|
+
ocx system codex-cli-update status <job-id> [--json]`;
|
|
33
40
|
|
|
34
41
|
export type ParsedCodexCliUpdateArgs =
|
|
35
42
|
| Readonly<{ action: "check"; json: boolean }>
|
|
36
43
|
| Readonly<{ action: "plan"; json: boolean; channel: CodexCliUpdateChannel }>
|
|
44
|
+
| Readonly<{ action: "apply"; json: boolean; planId: string; requestId: string }>
|
|
45
|
+
| Readonly<{ action: "status"; json: boolean; jobId: string }>
|
|
37
46
|
| Readonly<{ json: boolean; attest: CodexCliInstallationIdentityInput | "selected" }>;
|
|
38
47
|
|
|
39
48
|
export interface CodexCliUpdateCommandDeps {
|
|
49
|
+
readonly readJob?: typeof readCodexCliUpdateJob;
|
|
40
50
|
readonly inspectInstall?: (deps: CodexCliInstallProvenanceDeps) => Promise<CodexCliInstallReport>;
|
|
41
51
|
readonly inspectIdentity?: (input: CodexCliInstallationIdentityInput) => Promise<CodexCliInstallationIdentityReport>;
|
|
42
52
|
readonly deriveInstallationInput?: (
|
|
@@ -44,6 +54,7 @@ export interface CodexCliUpdateCommandDeps {
|
|
|
44
54
|
) => Promise<CodexCliInstallationTargetDerivation>;
|
|
45
55
|
readonly createPlan?: (deps: CodexCliUpdatePlanDeps) => Promise<CodexCliUpdatePlan>;
|
|
46
56
|
readonly resolveSelectedRuntime?: (deps: ResolveCodexRuntimeDeps) => ResolveCodexRuntimeResult;
|
|
57
|
+
readonly applyUpdate?: (planId: string, deps: CodexCliApplyDeps) => Promise<CodexCliApplyResult>;
|
|
47
58
|
}
|
|
48
59
|
|
|
49
60
|
function identitySummary(report: CodexCliInstallationIdentityReport): string[] {
|
|
@@ -93,7 +104,7 @@ function planSummary(plan: CodexCliUpdatePlan): string[] {
|
|
|
93
104
|
`session: ${plan.session.state}${plan.session.matches === null ? "" : ` (${plan.session.matches})`}`,
|
|
94
105
|
];
|
|
95
106
|
if (plan.planId) lines.push(`plan: ${plan.planId}`);
|
|
96
|
-
if (plan.command) lines.push(`command: ${plan.command.join(" ")} (indicative —
|
|
107
|
+
if (plan.command) lines.push(`command: ${plan.command.join(" ")} (indicative — apply verifies both packed archives and installs their local files)`);
|
|
97
108
|
return lines;
|
|
98
109
|
}
|
|
99
110
|
|
|
@@ -161,8 +172,44 @@ export function parseCodexCliUpdateArgs(argv: readonly string[]): ParsedCodexCli
|
|
|
161
172
|
}) });
|
|
162
173
|
}
|
|
163
174
|
const action = rest[0];
|
|
164
|
-
if (action !== "check" && action !== "plan") {
|
|
165
|
-
throw new CliUsageError("codex-cli-update action must be check, attest or
|
|
175
|
+
if (action !== "check" && action !== "plan" && action !== "apply" && action !== "status") {
|
|
176
|
+
throw new CliUsageError("codex-cli-update action must be check, attest, plan, apply or status", CODEX_CLI_UPDATE_USAGE);
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
if (action === "apply") {
|
|
180
|
+
let planId: string | undefined;
|
|
181
|
+
let requestId: string = randomUUID();
|
|
182
|
+
let seenRequestId = false;
|
|
183
|
+
let yes = false;
|
|
184
|
+
for (let index = 1; index < rest.length;) {
|
|
185
|
+
const token = rest[index]!;
|
|
186
|
+
if (token === "--yes" && !yes) { yes = true; index++; continue; }
|
|
187
|
+
if (isOption(token, "plan-id") && planId === undefined) {
|
|
188
|
+
const value = optionValue(rest, index, "plan-id");
|
|
189
|
+
planId = value.value;
|
|
190
|
+
index = value.next;
|
|
191
|
+
continue;
|
|
192
|
+
}
|
|
193
|
+
if (isOption(token, "request-id") && !seenRequestId) {
|
|
194
|
+
const value = optionValue(rest, index, "request-id");
|
|
195
|
+
requestId = value.value; seenRequestId = true; index = value.next; continue;
|
|
196
|
+
}
|
|
197
|
+
throw new CliUsageError("unsupported or duplicate apply option", CODEX_CLI_UPDATE_USAGE);
|
|
198
|
+
}
|
|
199
|
+
if (!yes || !planId || !/^[0-9a-f]{32}$/.test(planId)) {
|
|
200
|
+
throw new CliUsageError("apply requires --plan-id <32 lowercase hex> and --yes", CODEX_CLI_UPDATE_USAGE);
|
|
201
|
+
}
|
|
202
|
+
if (!/^[A-Za-z0-9._:-]{8,128}$/.test(requestId)) {
|
|
203
|
+
throw new CliUsageError("--request-id must be 8-128 safe characters", CODEX_CLI_UPDATE_USAGE);
|
|
204
|
+
}
|
|
205
|
+
return Object.freeze({ action, json, planId, requestId });
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
if (action === "status") {
|
|
209
|
+
if (rest.length !== 2 || !/^[0-9a-f-]{36}$/.test(rest[1]!)) {
|
|
210
|
+
throw new CliUsageError("status requires one job id", CODEX_CLI_UPDATE_USAGE);
|
|
211
|
+
}
|
|
212
|
+
return Object.freeze({ action, json, jobId: rest[1]! });
|
|
166
213
|
}
|
|
167
214
|
|
|
168
215
|
if (action === "check") {
|
|
@@ -203,44 +250,6 @@ export function parseCodexCliUpdateArgs(argv: readonly string[]): ParsedCodexCli
|
|
|
203
250
|
* evidence, not selected-runtime admission. A direct Bun or source launch has no such
|
|
204
251
|
* proof, so nothing ambient or persisted is inspected at all.
|
|
205
252
|
*/
|
|
206
|
-
function inspectionDeps(commandDeps: CodexCliUpdateCommandDeps): CodexCliInstallProvenanceDeps {
|
|
207
|
-
const trusted = trustedNodeLauncherContext()?.codexCliInspectionEnv;
|
|
208
|
-
if (!trusted || trusted.managerRoots === null) return { env: { PATH: "" }, configDir: "." };
|
|
209
|
-
// Attestation also requires the runtime resolver to pick the snapshot's
|
|
210
|
-
// candidate. probeVersion: false keeps this read-only — no codex --version
|
|
211
|
-
// executes on a check/plan path — while still refusing attestation when the
|
|
212
|
-
// resolver would settle on a different executable.
|
|
213
|
-
const selectedCommand = observeCodexCliSelectedCommand({
|
|
214
|
-
env: {
|
|
215
|
-
CODEX_CLI_PATH: trusted.codexCliPath ?? undefined,
|
|
216
|
-
PATH: trusted.path ?? undefined,
|
|
217
|
-
PATHEXT: trusted.pathExt ?? undefined,
|
|
218
|
-
},
|
|
219
|
-
configDir: trusted.configDir,
|
|
220
|
-
}, commandDeps.resolveSelectedRuntime);
|
|
221
|
-
return {
|
|
222
|
-
env: {
|
|
223
|
-
...trusted.managerRoots,
|
|
224
|
-
...trusted.transportEnv,
|
|
225
|
-
CODEX_CLI_PATH: trusted.codexCliPath ?? undefined,
|
|
226
|
-
PATH: trusted.path ?? undefined,
|
|
227
|
-
PATHEXT: trusted.pathExt ?? undefined,
|
|
228
|
-
// The lookup seeds the inspection models against the launch-time
|
|
229
|
-
// capture; ambient values are never consulted.
|
|
230
|
-
HOME: trusted.home ?? undefined,
|
|
231
|
-
NODE_PATH: trusted.nodePath ?? undefined,
|
|
232
|
-
},
|
|
233
|
-
configDir: trusted.configDir,
|
|
234
|
-
// Content observation picks the platform backing by the Node launcher's
|
|
235
|
-
// arch, which can differ from this Bun process's under Rosetta.
|
|
236
|
-
arch: trusted.arch ?? undefined,
|
|
237
|
-
// The snapshot is proof-bound to the launcher, but the report may only attest
|
|
238
|
-
// the environment candidate when the resolver picks the same canonical path —
|
|
239
|
-
// managed requires both.
|
|
240
|
-
selectionAttested: true,
|
|
241
|
-
selectedCommand,
|
|
242
|
-
};
|
|
243
|
-
}
|
|
244
253
|
|
|
245
254
|
export async function handleCodexCliUpdateCommand(
|
|
246
255
|
argv: readonly string[],
|
|
@@ -259,6 +268,11 @@ export async function handleCodexCliUpdateCommand(
|
|
|
259
268
|
}
|
|
260
269
|
// A refusal or an unapplied update is a legitimate answer rather than a crash, so the
|
|
261
270
|
// outcome exit code is decided here and only a thrown error is left to runCliAction.
|
|
271
|
+
let resultCode = 0;
|
|
272
|
+
const unavailableJob = () => {
|
|
273
|
+
printData({ error: "job_unavailable" }, parsed.json, ["Codex CLI update job was not found or is unavailable."]);
|
|
274
|
+
resultCode = 1;
|
|
275
|
+
};
|
|
262
276
|
const code = await runCliAction(async () => {
|
|
263
277
|
if ("attest" in parsed) {
|
|
264
278
|
let report: CodexCliInstallationIdentityReport;
|
|
@@ -291,19 +305,59 @@ export async function handleCodexCliUpdateCommand(
|
|
|
291
305
|
return;
|
|
292
306
|
}
|
|
293
307
|
if (parsed.action === "check") {
|
|
294
|
-
const report = await (deps.inspectInstall ?? inspectCodexCliInstall)(
|
|
308
|
+
const report = await (deps.inspectInstall ?? inspectCodexCliInstall)(codexCliUpdateInspectionDeps(deps));
|
|
295
309
|
printData(report, parsed.json, installSummary(report));
|
|
296
310
|
return;
|
|
297
311
|
}
|
|
312
|
+
if (parsed.action === "status") {
|
|
313
|
+
let job: Awaited<ReturnType<typeof readCodexCliUpdateJob>>;
|
|
314
|
+
try { job = await (deps.readJob ?? readCodexCliUpdateJob)(parsed.jobId); }
|
|
315
|
+
catch { unavailableJob(); return; }
|
|
316
|
+
if (!job) { unavailableJob(); return; }
|
|
317
|
+
printData(job, parsed.json, [`job: ${job.jobId}`, `status: ${job.status}`, `outcome: ${job.outcome ?? "pending"}`,
|
|
318
|
+
`reason: ${job.reason ?? "none"}`, `owner-state: ${job.ownerState}`]);
|
|
319
|
+
return;
|
|
320
|
+
}
|
|
298
321
|
if (parsed.action === "plan") {
|
|
299
|
-
const plan = await (deps.createPlan ??
|
|
322
|
+
const plan = await (deps.createPlan ?? ((planDeps: CodexCliUpdatePlanDeps) =>
|
|
323
|
+
runCodexCliUpdatePlanInWorker({ channel: planDeps.channel })))({
|
|
300
324
|
channel: parsed.channel,
|
|
301
|
-
inspectionDeps:
|
|
325
|
+
inspectionDeps: codexCliUpdateInspectionDeps(deps),
|
|
302
326
|
inspect: deps.inspectInstall,
|
|
303
327
|
});
|
|
304
328
|
printData(plan, parsed.json, planSummary(plan));
|
|
305
329
|
return;
|
|
306
330
|
}
|
|
331
|
+
if (parsed.action === "apply") {
|
|
332
|
+
const admitted = await admitCodexCliUpdateJob({ requestId: parsed.requestId, planId: parsed.planId, confirmed: true });
|
|
333
|
+
const apply = deps.applyUpdate
|
|
334
|
+
?? ((planId: string) => runCodexCliUpdateApplyInWorker(planId, { jobId: admitted.job.jobId }));
|
|
335
|
+
let job: Awaited<ReturnType<typeof runCodexCliUpdateJob>>;
|
|
336
|
+
try {
|
|
337
|
+
job = admitted.kind === "accepted"
|
|
338
|
+
? await runCodexCliUpdateJob(admitted.job.jobId, admitted.generation,
|
|
339
|
+
() => apply(parsed.planId, { inspectionDeps: codexCliUpdateInspectionDeps(deps) }))
|
|
340
|
+
: admitted.job;
|
|
341
|
+
} catch (error) {
|
|
342
|
+
if (!(error instanceof CodexCliJobResultPersistenceError)) throw error;
|
|
343
|
+
// Preserve the computed outcome without claiming durable completion or
|
|
344
|
+
// retrying work. Project fixed fields, never the raw result/error object.
|
|
345
|
+
const safe = normalizeCodexCliJobResult(error.result);
|
|
346
|
+
const receipt = { error: "job_result_persistence_failed", jobId: admitted.job.jobId,
|
|
347
|
+
outcome: safe.outcome, reason: safe.reason, leaseRetained: safe.leaseRetained,
|
|
348
|
+
cleanupErrors: safe.cleanupErrors };
|
|
349
|
+
printData(receipt, parsed.json, [`job: ${receipt.jobId}`,
|
|
350
|
+
"persistence: unverified (job_result_persistence_failed)", `outcome: ${receipt.outcome}`,
|
|
351
|
+
`reason: ${receipt.reason}`, `lease-retained: ${receipt.leaseRetained}`,
|
|
352
|
+
`cleanup-errors: ${receipt.cleanupErrors.join(", ") || "none"}`]);
|
|
353
|
+
resultCode = 1;
|
|
354
|
+
return;
|
|
355
|
+
}
|
|
356
|
+
if (!job) { unavailableJob(); return; }
|
|
357
|
+
printData(job, parsed.json, [`job: ${job.jobId}`, `status: ${job.status}`, `outcome: ${job.outcome ?? "pending"}`,
|
|
358
|
+
`reason: ${job.reason ?? "none"}`, `owner-state: ${job.ownerState}`]);
|
|
359
|
+
resultCode = job.status === "applied" ? 0 : 1;
|
|
360
|
+
}
|
|
307
361
|
});
|
|
308
|
-
return code;
|
|
362
|
+
return code || resultCode;
|
|
309
363
|
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { lstatSync, realpathSync, statSync } from "node:fs";
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import { dirname, join, resolve } from "node:path";
|
|
4
|
+
import { isDeepStrictEqual } from "node:util";
|
|
5
|
+
import { readConfigDiagnostics, websocketsEnabled } from "../config";
|
|
6
|
+
import { readBoundedCodexConfig } from "../codex/inject/bounded-config-reader";
|
|
7
|
+
import { buildProviderTableBlockForTarget } from "../codex/inject/config-toml";
|
|
8
|
+
import { standaloneCodexRoutingTarget, validateCodexRoutingTarget } from "../codex/inject/routing-target";
|
|
9
|
+
import { readClientConnectionState } from "../client/state";
|
|
10
|
+
import { codexHasOtherTokenConsumers, codexTokenConfigShapeIsSafe } from "./codex-launch-policy";
|
|
11
|
+
import { codexLaunchHomeIsOwned, codexLaunchProjectAliasIsOwned, codexLaunchSystemNamespaceIsSafe } from "./codex-launch-ownership";
|
|
12
|
+
import type { CodexTokenRefusal, CodexTokenRefusalReporter } from "./codex-launch-diagnostics";
|
|
13
|
+
|
|
14
|
+
/** Resolve once; the credential verifier and child must use this exact directory. */
|
|
15
|
+
export function resolveCodexLaunchHome(env: Record<string, string | undefined>): string | null {
|
|
16
|
+
try {
|
|
17
|
+
// Object spread loses Windows process.env's case-insensitive lookup. Refuse
|
|
18
|
+
// noncanonical aliases rather than pass conflicting names to CreateProcess.
|
|
19
|
+
if (process.platform === "win32" && Object.keys(env).some(key => key !== "CODEX_HOME" && key.toUpperCase() === "CODEX_HOME")) return null;
|
|
20
|
+
// Explicit values are native literal paths: no tilde expansion or whitespace trim.
|
|
21
|
+
// An implicit managed home is safe only when also made explicit for the child.
|
|
22
|
+
const userHome = (process.platform === "win32" ? env.USERPROFILE : env.HOME) || homedir();
|
|
23
|
+
const raw = env.CODEX_HOME === undefined ? join(userHome, ".codex") : env.CODEX_HOME;
|
|
24
|
+
if (!raw.trim()) return null;
|
|
25
|
+
const home = realpathSync(resolve(raw));
|
|
26
|
+
return statSync(home).isDirectory() ? home : null;
|
|
27
|
+
} catch { return null; }
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** Config classification is a startup hint; credentials need an independently bound destination. */
|
|
31
|
+
export function codexCredentialDestinationIsTrusted(home: string, systemNamespaceDirectory?: string, report?: CodexTokenRefusalReporter): boolean {
|
|
32
|
+
const refuse = (reason: CodexTokenRefusal): false => { report?.(reason); return false; };
|
|
33
|
+
try {
|
|
34
|
+
if (!codexLaunchHomeIsOwned(home)) return refuse("ownership");
|
|
35
|
+
if (!codexLaunchSystemNamespaceIsSafe(systemNamespaceDirectory, report)) return false;
|
|
36
|
+
const additionalLayers = [join(home, "auth.json"), join(home, "managed_config.toml"), join(home, "requirements.toml")];
|
|
37
|
+
if (process.platform !== "win32") additionalLayers.push("/etc/codex/config.toml", "/etc/codex/managed_config.toml", "/etc/codex/requirements.toml");
|
|
38
|
+
for (const path of additionalLayers) {
|
|
39
|
+
try { lstatSync(path); return refuse("additionalLayer"); }
|
|
40
|
+
catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") return refuse("layerInspection"); }
|
|
41
|
+
}
|
|
42
|
+
const diagnostics = readConfigDiagnostics();
|
|
43
|
+
if (diagnostics.error || diagnostics.source === "fallback") return refuse("installationConfig");
|
|
44
|
+
const cfg = diagnostics.config;
|
|
45
|
+
let target = standaloneCodexRoutingTarget(cfg.port, cfg);
|
|
46
|
+
if (cfg.runtimeRole === "client") {
|
|
47
|
+
// Direct clients bind to persisted connection state; link clients use an authless relay.
|
|
48
|
+
const connection = readClientConnectionState();
|
|
49
|
+
if (connection.kind !== "connected" || connection.value.transport === "link") return refuse("connection");
|
|
50
|
+
target = validateCodexRoutingTarget({ baseUrl: `${connection.value.serverUrl}/v1`, requiresAdmissionToken: true, tokenEnv: "OPENCODEX_API_AUTH_TOKEN" });
|
|
51
|
+
}
|
|
52
|
+
const url = new URL(target.baseUrl);
|
|
53
|
+
if (!target.requiresAdmissionToken) return refuse("admission");
|
|
54
|
+
if (url.protocol !== "http:" || !["127.0.0.1", "[::1]"].includes(url.hostname)) return refuse("loopback");
|
|
55
|
+
const content = readBoundedCodexConfig(join(home, "config.toml"));
|
|
56
|
+
if (content === null) return refuse("configRead");
|
|
57
|
+
const config = Bun.TOML.parse(content) as Record<string, unknown>;
|
|
58
|
+
if (codexHasOtherTokenConsumers(config)) return refuse("consumers");
|
|
59
|
+
if (!codexTokenConfigShapeIsSafe(config)) return refuse("configShape");
|
|
60
|
+
// This native feature resolves OS/PAC routes without honoring NO_PROXY.
|
|
61
|
+
const features = config.features as Record<string, unknown> | undefined;
|
|
62
|
+
if (features?.respect_system_proxy !== undefined && features.respect_system_proxy !== false) return refuse("systemProxy");
|
|
63
|
+
// Codex layers project configs and profiles after the home. Without proving those layers,
|
|
64
|
+
// conservatively leave authentication to the user's environment.
|
|
65
|
+
if (config.profile !== undefined || config.model_provider !== "opencodex") return refuse("provider");
|
|
66
|
+
for (const key of ["openai_base_url", "experimental_realtime_ws_base_url"]) {
|
|
67
|
+
if (config[key] !== undefined && config[key] !== target.baseUrl) return refuse("rootUrl");
|
|
68
|
+
}
|
|
69
|
+
for (let directory = process.cwd(); ; directory = dirname(directory)) {
|
|
70
|
+
const projectConfig = join(directory, ".codex", "config.toml");
|
|
71
|
+
try {
|
|
72
|
+
lstatSync(projectConfig);
|
|
73
|
+
// Same-file aliases qualify only when their lexical entries and redirect
|
|
74
|
+
// targets are protected against replacement by another principal.
|
|
75
|
+
try { if (realpathSync(projectConfig) !== realpathSync(join(home, "config.toml"))
|
|
76
|
+
|| !codexLaunchProjectAliasIsOwned(projectConfig)) return refuse("project"); }
|
|
77
|
+
catch { return refuse("project"); }
|
|
78
|
+
} catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") return refuse("layerInspection"); }
|
|
79
|
+
// A nested .git need not be Codex's root: custom project_root_markers can select
|
|
80
|
+
// an outer workspace. Without proving that selection, inspect every ancestor.
|
|
81
|
+
if (dirname(directory) === directory) break;
|
|
82
|
+
}
|
|
83
|
+
const providers = config.model_providers as Record<string, unknown> | undefined;
|
|
84
|
+
const provider = providers?.opencodex as Record<string, unknown> | undefined;
|
|
85
|
+
const expected = (Bun.TOML.parse(buildProviderTableBlockForTarget(target, websocketsEnabled(cfg))) as { model_providers: { opencodex: Record<string, unknown> } }).model_providers.opencodex;
|
|
86
|
+
// Display names are cosmetic; every transport and credential-bearing field must match
|
|
87
|
+
// the block emitted by our writer for this installation/connection.
|
|
88
|
+
if (!provider || typeof provider.name !== "string") return refuse("providerTransport");
|
|
89
|
+
const { name: _name, ...transport } = provider;
|
|
90
|
+
const { name: _expectedName, ...expectedTransport } = expected;
|
|
91
|
+
return isDeepStrictEqual(transport, expectedTransport) || refuse("providerTransport");
|
|
92
|
+
} catch { return refuse("inspection"); }
|
|
93
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { extname, win32 } from "node:path";
|
|
2
|
+
import { readBoundedProjectConfig } from "../codex/project-config-warnings";
|
|
3
|
+
import { buildWindowsCodexShim, SHIM_MARKER } from "../codex/shim-templates";
|
|
4
|
+
import type { BunRuntimeSource } from "../lib/bun-runtime";
|
|
5
|
+
|
|
6
|
+
export const CODEX_UNVERIFIED_SHIM = "opencodex: cannot verify Codex shim bypass; launch refused. Run 'ocx codex-shim install' to refresh an obsolete shim, or select the native Codex executable.";
|
|
7
|
+
|
|
8
|
+
/** A content check for the generated CMD control flow, not Windows backing-file provenance. */
|
|
9
|
+
export function codexCommandCanBypass(selected: string, env: Record<string, string | undefined>, platform = process.platform): boolean {
|
|
10
|
+
if (platform !== "win32" || ![".cmd", ".bat"].includes(extname(selected).toLowerCase())) return true;
|
|
11
|
+
const content = readBoundedProjectConfig(selected);
|
|
12
|
+
if (content === null) return false;
|
|
13
|
+
// Ordinary npm launchers remain ordinary executable code. Managed/obsolete wrappers must
|
|
14
|
+
// prove the whole emitted control flow, including the unique terminal bypass destination.
|
|
15
|
+
if (!content.includes(SHIM_MARKER) && !/OCX_|OPENCODEX_API_AUTH_TOKEN|service-api-token/i.test(content)) return true;
|
|
16
|
+
const source = /^set "OCX_BUN_RUNTIME_SOURCE=(override|bundled|process|standalone)"\r?$/m.exec(content)?.[1] as BunRuntimeSource | undefined;
|
|
17
|
+
if (!source) return false;
|
|
18
|
+
const normalize = (text: string): string | null => {
|
|
19
|
+
let invalid = false;
|
|
20
|
+
const normalized = text.replace(/\r\n/g, "\n").replace(/^set "(OCX_REAL_CODEX|OCX_BUN|OCX_CLI|OCX_API_TOKEN_FILE|OCX_BUN_RUNTIME_PATH)=([^"\n]*)"$/gm, (_line, key: string, raw: string) => {
|
|
21
|
+
const expanded = raw.replace(/^%(USERPROFILE|LOCALAPPDATA|APPDATA)%/i, (_prefix, variable: string) => env[variable.toUpperCase()] ?? "");
|
|
22
|
+
// Restrict substitutions to literal local paths. Refuse CMD expansion, separators,
|
|
23
|
+
// delayed expansion and control bytes rather than interpreting batch escaping.
|
|
24
|
+
if (!/^[a-z]:[\\/]/i.test(expanded) || !win32.isAbsolute(expanded) || /[%!^&|<>"\x00-\x1f\x7f]/.test(expanded)) invalid = true;
|
|
25
|
+
return `set "${key}=<local-path>"`;
|
|
26
|
+
});
|
|
27
|
+
return invalid ? null : normalized;
|
|
28
|
+
};
|
|
29
|
+
const expected = buildWindowsCodexShim("C:\\ocx\\codex.cmd", "C:\\ocx\\bun.exe", "C:\\ocx\\cli.ts", source);
|
|
30
|
+
const actual = normalize(content);
|
|
31
|
+
return actual !== null && actual === normalize(expected);
|
|
32
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/** Fixed reasons only: never interpolate configuration, exceptions or credential paths. */
|
|
2
|
+
export const CODEX_TOKEN_REFUSALS = {
|
|
3
|
+
args: "arguments are outside the audited allowlist",
|
|
4
|
+
environment: "environment contains a proxy or unaudited credential control",
|
|
5
|
+
home: "Codex home cannot be resolved unambiguously",
|
|
6
|
+
ownership: "Codex home/config ownership or mutation protection could not be verified",
|
|
7
|
+
systemConfig: "machine Codex configuration adds an unaudited system layer",
|
|
8
|
+
systemNamespace: "machine Codex namespace protection could not be verified",
|
|
9
|
+
systemNamespaceWritable: "machine Codex namespace allows other principals to create or replace configuration",
|
|
10
|
+
additionalLayer: "home or system configuration adds an unaudited authentication/managed/requirements layer",
|
|
11
|
+
layerInspection: "additional configuration layers could not be inspected",
|
|
12
|
+
installationConfig: "OpenCodex configuration could not be verified",
|
|
13
|
+
connection: "client connection is unavailable or uses an authless link relay",
|
|
14
|
+
admission: "configured route does not require an admission credential",
|
|
15
|
+
loopback: "configured destination is not an HTTP loopback listener",
|
|
16
|
+
configRead: "Codex configuration could not be read within the inspection limit",
|
|
17
|
+
consumers: "configuration has additional credential consumers",
|
|
18
|
+
configShape: "configuration contains unaudited keys or values",
|
|
19
|
+
systemProxy: "configuration enables an unaudited system proxy transport",
|
|
20
|
+
provider: "configuration selects a profile or a different provider",
|
|
21
|
+
rootUrl: "configuration overrides the managed loopback URL",
|
|
22
|
+
project: "project configuration adds an unaudited layer",
|
|
23
|
+
providerTransport: "provider transport does not match the managed loopback provider",
|
|
24
|
+
inspection: "credential destination inspection failed",
|
|
25
|
+
destination: "credential destination could not be verified",
|
|
26
|
+
credential: "installation service credential is unavailable or invalid",
|
|
27
|
+
collision: "service credential matches a management credential",
|
|
28
|
+
} as const;
|
|
29
|
+
export type CodexTokenRefusal = keyof typeof CODEX_TOKEN_REFUSALS;
|
|
30
|
+
export type CodexTokenRefusalReporter = (reason: CodexTokenRefusal) => void;
|
|
31
|
+
|
|
32
|
+
export function codexTokenWithheldDiagnostic(reason: CodexTokenRefusal): string {
|
|
33
|
+
const remedy = process.platform === "win32" && reason === "systemNamespaceWritable"
|
|
34
|
+
? ". Default ProgramData creation rights are insufficient. The system Codex configuration folder under ProgramData must exist and be writable only by Administrators/SYSTEM, with its ancestors protected against replacement by other users. Ask an administrator to review the directory policy. opencodex never changes ACLs itself. Alternatively, supply your own key by exporting OPENCODEX_API_AUTH_TOKEN, which ocx codex leaves untouched. Launching without a fresh token."
|
|
35
|
+
: ". Launching without a fresh token.";
|
|
36
|
+
return `OpenCodex: automatic service token withheld; ${CODEX_TOKEN_REFUSALS[reason]}${remedy}`;
|
|
37
|
+
}
|