@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
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 +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
import type { DesktopAppInstall, DesktopExec, DesktopProcess } from "../desktop-app/types";
|
|
1
|
+
import type { DesktopAppInstall, DesktopAsyncExec, DesktopExec, DesktopProcess } from "../desktop-app/types";
|
|
2
|
+
import { READ_WINDOWS_DESKTOP_PAYLOAD, windowsDesktopPayloadEnv } from "../desktop-app/windows-command-payload";
|
|
2
3
|
import { resolveTrustedWindowsPowerShellExe } from "../../lib/windows-elevation";
|
|
3
4
|
import { WINDOWS_ACTIVATION_SOURCE } from "./windows-activation-source";
|
|
4
5
|
import { readDesktopCompatibilityLaunch } from "./runtime-ownership";
|
|
6
|
+
import type { VerifiedDesktopPackage } from "./installed-build";
|
|
7
|
+
import { CLOSE_WINDOWS_PACKAGE_FILES, CODEX_PACKAGE_FAMILY, MEASURE_WINDOWS_PACKAGE_FILES,
|
|
8
|
+
OPEN_WINDOWS_PACKAGE_FILES, WINDOWS_PACKAGE_PROOF_FUNCTIONS } from "./windows-package-proof";
|
|
5
9
|
|
|
6
10
|
/** Only the feature's loopback PAC endpoint may become a launch argument. */
|
|
7
11
|
export function validatedCompatibilityPacUrl(value: string): string {
|
|
@@ -14,35 +18,40 @@ export function validatedCompatibilityPacUrl(value: string): string {
|
|
|
14
18
|
return url.href;
|
|
15
19
|
}
|
|
16
20
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const pac = validatedCompatibilityPacUrl(pacUrl);
|
|
21
|
-
if (!/^OpenAI\.Codex(?:Beta)?_[A-Za-z0-9]+$/.test(install.id) || install.relaunch !== `${install.id}!App`) {
|
|
22
|
-
throw new Error("desktop_compatibility_invalid_package");
|
|
23
|
-
}
|
|
24
|
-
return [
|
|
25
|
-
"$ErrorActionPreference='Stop'",
|
|
26
|
-
`$family=${literal(install.id)}; $root=${literal(install.root)}; $pac=${literal(pac)}`,
|
|
27
|
-
`$p=Get-AppxPackage -Name ${literal(install.id.split("_")[0]!)}`,
|
|
28
|
-
"$p=@($p|Where-Object {$_.PackageFamilyName -eq $family -and $_.InstallLocation -ieq $root})",
|
|
29
|
-
"if($p.Count -ne 1){throw 'Package changed'}; $p=$p[0]",
|
|
30
|
-
"$manifest=Get-AppxPackageManifest -Package $p.PackageFullName",
|
|
31
|
-
"$entry=@($manifest.Package.Applications.Application|Where-Object {$_.Id -eq 'App' -and $_.Executable.Replace('/','\\') -ieq 'app\\ChatGPT.exe'})",
|
|
32
|
-
"if($entry.Count -ne 1){throw 'Application entry changed'}",
|
|
21
|
+
export const WINDOWS_COMPATIBILITY_ACTIVATION_SCRIPT = [
|
|
22
|
+
WINDOWS_PACKAGE_PROOF_FUNCTIONS,
|
|
23
|
+
READ_WINDOWS_DESKTOP_PAYLOAD,
|
|
33
24
|
"Add-Type -TypeDefinition @'", WINDOWS_ACTIVATION_SOURCE, "'@",
|
|
25
|
+
"$family=$payload.family; $root=$payload.root; $pac=$payload.pac; $fullName=$payload.fullName",
|
|
26
|
+
"$hash=$payload.hash; $manifestHash=$payload.manifestHash; $ancestryHash=$payload.ancestryHash; $thumbprint=$payload.thumbprint",
|
|
27
|
+
"$imageIdentity=$payload.imageIdentity",
|
|
28
|
+
"$p=Get-DesktopPackage",
|
|
29
|
+
"if($p.PackageFullName -cne $fullName -or $p.InstallLocation -ine $root){throw 'Verified package changed before launch'}",
|
|
30
|
+
"try {",
|
|
31
|
+
OPEN_WINDOWS_PACKAGE_FILES,
|
|
32
|
+
MEASURE_WINDOWS_PACKAGE_FILES,
|
|
33
|
+
"if($executableHash -cne $hash -or $executableIdentity -cne $imageIdentity -or $digest -cne $manifestHash -or $ancestry -cne $ancestryHash -or $signature.SignerCertificate.Thumbprint -cne $thumbprint){throw 'Verified package files changed before launch'}",
|
|
34
34
|
"$pidValue=[OpenCodexPackageActivation]::Activate($family+'!App','--proxy-pac-url='+$pac)",
|
|
35
|
-
"
|
|
35
|
+
"$processHandle=[OpenCodexPackageActivation]::OpenActivatedProcess($pidValue)",
|
|
36
|
+
"try {",
|
|
37
|
+
"$image=[OpenCodexPackageActivation]::ImageOf($processHandle,$fullName)",
|
|
36
38
|
"$running=Get-CimInstance Win32_Process -Filter ('ProcessId='+$pidValue)",
|
|
37
|
-
|
|
38
|
-
"
|
|
39
|
-
|
|
39
|
+
String.raw`if(-not $running -or $image -ine $exePath -or $running.ExecutablePath -ine $image -or $running.CommandLine -notmatch ('(?:^|[\s"])--proxy-pac-url='+[regex]::Escape($pac)+'(?:$|[\s"])')){throw 'Launch arguments or image not observed'}`,
|
|
40
|
+
"Assert-DesktopPackageFiles",
|
|
41
|
+
// The process's kernel-reported image path must name the still-held, verified file.
|
|
42
|
+
"$imageHash=Get-DesktopPackageHash $exeStream",
|
|
43
|
+
"if($imageHash -cne $hash){throw 'Activated image digest changed'}",
|
|
44
|
+
"[pscustomobject]@{pid=[int]$pidValue;packageFullName=$fullName;executableHash=$imageHash;verified=$true}|ConvertTo-Json -Compress",
|
|
45
|
+
"} finally {$processHandle.Dispose()}",
|
|
46
|
+
"} finally {", CLOSE_WINDOWS_PACKAGE_FILES, "}",
|
|
40
47
|
].join("\n");
|
|
41
|
-
}
|
|
42
48
|
|
|
49
|
+
function matchesInstall(build: VerifiedDesktopPackage, install: DesktopAppInstall): boolean {
|
|
50
|
+
return build.id === install.id && build.relaunch === install.relaunch && build.root.toLowerCase() === install.root.toLowerCase();
|
|
51
|
+
}
|
|
43
52
|
|
|
44
53
|
/** Preserve only the current runtime's PAC and lifetime, never trust a URL shape alone. */
|
|
45
|
-
export function captureWindowsCompatibilityContext(processes: readonly DesktopProcess[]): Record<string, string> {
|
|
54
|
+
export function captureWindowsCompatibilityContext(processes: readonly DesktopProcess[], install: DesktopAppInstall): Record<string, string> {
|
|
46
55
|
const members = new Set(processes.map(entry => entry.pid));
|
|
47
56
|
const urls = new Set<string>();
|
|
48
57
|
for (const entry of processes.filter(value => !members.has(value.parentPid))) {
|
|
@@ -57,30 +66,61 @@ export function captureWindowsCompatibilityContext(processes: readonly DesktopPr
|
|
|
57
66
|
if (urls.size > 1) throw new Error("desktop_compatibility_conflicting_launch_context");
|
|
58
67
|
if (urls.size === 0) return {};
|
|
59
68
|
const pacUrl = [...urls][0]!, owner = readDesktopCompatibilityLaunch();
|
|
60
|
-
if (!owner || owner.pacUrl !== pacUrl
|
|
61
|
-
|
|
69
|
+
if (!owner || owner.pacUrl !== pacUrl || !matchesInstall(owner.build, install)) {
|
|
70
|
+
throw new Error("desktop_compatibility_launch_owner_unverified");
|
|
71
|
+
}
|
|
72
|
+
return { codexCompatibilityPacUrl: pacUrl, codexCompatibilityGeneration: owner.generation, codexCompatibilityBuildRevision: String(owner.revision) };
|
|
62
73
|
}
|
|
63
74
|
|
|
64
75
|
/** Recheck after the asynchronous stop ladder: identical endpoints can belong to a new runtime. */
|
|
65
|
-
export function assertWindowsCompatibilityContext(context: Record<string, string
|
|
76
|
+
export function assertWindowsCompatibilityContext(context: Record<string, string>, install: DesktopAppInstall) {
|
|
66
77
|
const owner = readDesktopCompatibilityLaunch();
|
|
67
|
-
if (!owner || owner.pacUrl !== context.codexCompatibilityPacUrl || owner.generation !== context.codexCompatibilityGeneration
|
|
78
|
+
if (!owner || owner.pacUrl !== context.codexCompatibilityPacUrl || owner.generation !== context.codexCompatibilityGeneration
|
|
79
|
+
|| String(owner.revision) !== context.codexCompatibilityBuildRevision || !matchesInstall(owner.build, install)) {
|
|
68
80
|
throw new Error("desktop_compatibility_launch_owner_unverified");
|
|
69
81
|
}
|
|
82
|
+
return owner;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function activationEnvironment(build: VerifiedDesktopPackage, pacUrl: string) {
|
|
86
|
+
const pac = validatedCompatibilityPacUrl(pacUrl);
|
|
87
|
+
if (build.id !== CODEX_PACKAGE_FAMILY || build.relaunch !== `${build.id}!App`) {
|
|
88
|
+
throw new Error("desktop_compatibility_invalid_package");
|
|
89
|
+
}
|
|
90
|
+
return windowsDesktopPayloadEnv({ family: build.id, root: build.root, pac, fullName: build.packageFullName,
|
|
91
|
+
hash: build.executableHash, manifestHash: build.manifestDigest, ancestryHash: build.ancestryIdentity,
|
|
92
|
+
thumbprint: build.signerThumbprint, imageIdentity: build.executableIdentity });
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
export function activateWindowsCodexCompatibility(exec: DesktopExec, build: VerifiedDesktopPackage, pacUrl: string): { pid: number; packageFullName: string } {
|
|
96
|
+
const env = activationEnvironment(build, pacUrl);
|
|
97
|
+
let text: string;
|
|
98
|
+
try { text = exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_COMPATIBILITY_ACTIVATION_SCRIPT],
|
|
99
|
+
{ timeout: 15_000, windowsHide: true, env }); }
|
|
100
|
+
catch { throw new Error("desktop_compatibility_activation_unverified"); }
|
|
101
|
+
return parseActivationResult(text, build);
|
|
70
102
|
}
|
|
71
103
|
|
|
72
|
-
export function
|
|
73
|
-
|
|
104
|
+
export async function activateWindowsCodexCompatibilityAsync(exec: DesktopAsyncExec, build: VerifiedDesktopPackage,
|
|
105
|
+
pacUrl: string, signal?: AbortSignal): Promise<{ pid: number; packageFullName: string }> {
|
|
106
|
+
const env = activationEnvironment(build, pacUrl);
|
|
74
107
|
let text: string;
|
|
75
|
-
try { text = exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command",
|
|
108
|
+
try { text = await exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_COMPATIBILITY_ACTIVATION_SCRIPT],
|
|
109
|
+
{ timeout: 15_000, windowsHide: true, env, signal }); }
|
|
76
110
|
catch { throw new Error("desktop_compatibility_activation_unverified"); }
|
|
111
|
+
if (signal?.aborted) throw new Error("desktop_compatibility_activation_unverified");
|
|
112
|
+
return parseActivationResult(text, build);
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
function parseActivationResult(text: string, build: VerifiedDesktopPackage): { pid: number; packageFullName: string } {
|
|
77
116
|
let result: unknown;
|
|
78
117
|
try { result = JSON.parse(text.trim().split(/\r?\n/).at(-1) ?? ""); }
|
|
79
118
|
catch { throw new Error("desktop_compatibility_activation_unverified"); }
|
|
80
119
|
if (!result || typeof result !== "object" || Array.isArray(result)) throw new Error("desktop_compatibility_activation_unverified");
|
|
81
120
|
const value = result as Record<string, unknown>;
|
|
82
121
|
if (value.verified !== true || !Number.isSafeInteger(value.pid) || Number(value.pid) <= 0
|
|
83
|
-
||
|
|
84
|
-
|
|
85
|
-
|
|
122
|
+
|| value.packageFullName !== build.packageFullName || value.executableHash !== build.executableHash) {
|
|
123
|
+
throw new Error("desktop_compatibility_activation_unverified");
|
|
124
|
+
}
|
|
125
|
+
return { pid: Number(value.pid), packageFullName: build.packageFullName };
|
|
86
126
|
}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
|
|
1
|
+
import { execFile } from "node:child_process";
|
|
2
|
+
import { windowsDefaultExec, windowsDesktopAppAdapter, WINDOWS_PACKAGE_PROCESS_SCRIPT, parseWindowsPackageProcesses } from "../desktop-app/windows";
|
|
3
|
+
import type { DesktopAsyncExec, DesktopExec } from "../desktop-app/types";
|
|
4
|
+
import { resolveTrustedWindowsPowerShellExe } from "../../lib/windows-elevation";
|
|
5
|
+
import { windowsDesktopPayloadEnv } from "../desktop-app/windows-command-payload";
|
|
6
|
+
import type { VerifiedDesktopPackage } from "./installed-build";
|
|
7
|
+
import { activateWindowsCodexCompatibility, activateWindowsCodexCompatibilityAsync, validatedCompatibilityPacUrl } from "./windows-package-command";
|
|
8
|
+
export { validatedCompatibilityPacUrl } from "./windows-package-command";
|
|
5
9
|
|
|
6
10
|
export interface CompatibilityLaunchIo {
|
|
7
11
|
exec?: DesktopExec;
|
|
@@ -12,17 +16,45 @@ export type CompatibilityLaunchResult =
|
|
|
12
16
|
| { status: "refused"; reason: "unsupported_platform" | "test_environment" | "package_unavailable" | "app_running" | "process_probe_failed" | "activation_failed" };
|
|
13
17
|
|
|
14
18
|
/** Never quits an app, launches the raw EXE, changes login or installs a watcher. */
|
|
15
|
-
export function launchWindowsCodexCompatibility(pacUrl: string, io: CompatibilityLaunchIo = {}): CompatibilityLaunchResult {
|
|
19
|
+
export function launchWindowsCodexCompatibility(pacUrl: string, build: VerifiedDesktopPackage | null, io: CompatibilityLaunchIo = {}): CompatibilityLaunchResult {
|
|
16
20
|
validatedCompatibilityPacUrl(pacUrl);
|
|
17
21
|
if ((io.platform ?? process.platform) !== "win32") return { status: "refused", reason: "unsupported_platform" };
|
|
18
22
|
if (process.env.OCX_TEST_HOME_GUARD === "1" && !io.exec) return { status: "refused", reason: "test_environment" };
|
|
23
|
+
if (!build) return { status: "refused", reason: "package_unavailable" };
|
|
19
24
|
const exec = io.exec ?? windowsDefaultExec;
|
|
20
|
-
const
|
|
21
|
-
if (!install) return { status: "refused", reason: "package_unavailable" };
|
|
22
|
-
const processes = windowsDesktopAppAdapter.listProcesses(exec, install);
|
|
25
|
+
const processes = windowsDesktopAppAdapter.listProcesses(exec, build);
|
|
23
26
|
if (processes === null) return { status: "refused", reason: "process_probe_failed" };
|
|
24
27
|
if (processes.length > 0) return { status: "refused", reason: "app_running" };
|
|
25
28
|
try {
|
|
26
|
-
return { status: "started", ...activateWindowsCodexCompatibility(exec,
|
|
29
|
+
return { status: "started", ...activateWindowsCodexCompatibility(exec, build, pacUrl) };
|
|
27
30
|
} catch { return { status: "refused", reason: "activation_failed" }; }
|
|
28
31
|
}
|
|
32
|
+
|
|
33
|
+
/** Abort and timeout settle only after the child closes, so Stop can drain ownership. */
|
|
34
|
+
export const windowsCompatibilityAsyncExec: DesktopAsyncExec = (file, args, options) => new Promise((resolve, reject) => {
|
|
35
|
+
let completed = false, closed = false, output = "", failure: Error | null = null;
|
|
36
|
+
const finish = () => { if (completed && closed) { if (failure) reject(failure); else resolve(output); } };
|
|
37
|
+
const child = execFile(file, [...args], { ...options, encoding: "utf8", maxBuffer: 65536 }, (error, stdout) => {
|
|
38
|
+
failure = error; output = stdout; completed = true; finish();
|
|
39
|
+
});
|
|
40
|
+
child.once("close", () => { closed = true; finish(); });
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
/** Runtime launch owns asynchronous process discovery and the full package proof. */
|
|
44
|
+
export async function launchWindowsCodexCompatibilityAsync(pacUrl: string, build: VerifiedDesktopPackage | null,
|
|
45
|
+
io: { execAsync?: DesktopAsyncExec; platform?: string; signal?: AbortSignal } = {}): Promise<CompatibilityLaunchResult> {
|
|
46
|
+
validatedCompatibilityPacUrl(pacUrl);
|
|
47
|
+
if ((io.platform ?? process.platform) !== "win32") return { status: "refused", reason: "unsupported_platform" };
|
|
48
|
+
if (process.env.OCX_TEST_HOME_GUARD === "1" && !io.execAsync) return { status: "refused", reason: "test_environment" };
|
|
49
|
+
if (!build) return { status: "refused", reason: "package_unavailable" };
|
|
50
|
+
const exec = io.execAsync ?? windowsCompatibilityAsyncExec;
|
|
51
|
+
try {
|
|
52
|
+
if (io.signal?.aborted) return { status: "refused", reason: "activation_failed" };
|
|
53
|
+
const stdout = await exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_PACKAGE_PROCESS_SCRIPT],
|
|
54
|
+
{ timeout: 10_000, windowsHide: true, env: windowsDesktopPayloadEnv({ root: build.root }), signal: io.signal });
|
|
55
|
+
if (io.signal?.aborted) return { status: "refused", reason: "activation_failed" };
|
|
56
|
+
if (parseWindowsPackageProcesses(stdout, build).length > 0) return { status: "refused", reason: "app_running" };
|
|
57
|
+
} catch { return { status: "refused", reason: "process_probe_failed" }; }
|
|
58
|
+
try { return { status: "started", ...await activateWindowsCodexCompatibilityAsync(exec, build, pacUrl, io.signal) }; }
|
|
59
|
+
catch { return { status: "refused", reason: "activation_failed" }; }
|
|
60
|
+
}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
export const CODEX_PACKAGE_FAMILY = "OpenAI.Codex_2p2nqsd0c76g0";
|
|
2
|
+
// Store package identity and PE code-signing identity are distinct.
|
|
3
|
+
export const CODEX_STORE_PUBLISHER = "CN=50BDFD77-8903-4850-9FFE-6E8522F64D5B";
|
|
4
|
+
export const CODEX_EXECUTABLE_SIGNER = 'CN="OpenAI OpCo, LLC", O="OpenAI OpCo, LLC", L=San Francisco, S=California, C=US';
|
|
5
|
+
|
|
6
|
+
/** Shared only with owned-path fixtures. Checked again while the image and manifest handles are held. */
|
|
7
|
+
export const DESKTOP_PACKAGE_PATH_GUARD_SCRIPT = [
|
|
8
|
+
"function Assert-DesktopPackagePath([string]$Path){",
|
|
9
|
+
String.raw`if($Path.Length -gt 8192 -or $Path -notmatch '^[A-Za-z]:\\' -or [IO.Path]::GetFullPath($Path) -ine $Path){throw 'Noncanonical package path'}`,
|
|
10
|
+
String.raw`$volume=[IO.Path]::GetPathRoot($Path); $current=$volume; $parts=@($Path.Substring($volume.Length).Split('\')|Where-Object {$_ -ne ''})`,
|
|
11
|
+
"if($parts.Count -gt 128){throw 'Package ancestry too deep'}; $seen=[Collections.Generic.List[string]]::new()",
|
|
12
|
+
"for($i=-1;$i -lt $parts.Count;$i++){",
|
|
13
|
+
"if($i -ge 0){$current=Join-Path $current $parts[$i]}; $item=Get-Item -LiteralPath $current -Force",
|
|
14
|
+
"if(($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -or ($i -lt $parts.Count-1 -and -not $item.PSIsContainer)){throw 'Reparse package ancestry'}",
|
|
15
|
+
"$seen.Add($item.FullName.ToLowerInvariant()+':'+$item.CreationTimeUtc.Ticks)",
|
|
16
|
+
"}; return ($seen -join '|')",
|
|
17
|
+
"}",
|
|
18
|
+
].join("; ");
|
|
19
|
+
|
|
20
|
+
const WINDOWS_PACKAGE_FILE_SOURCE = String.raw`using System;
|
|
21
|
+
using System.IO;
|
|
22
|
+
using System.Runtime.InteropServices;
|
|
23
|
+
using System.Text;
|
|
24
|
+
using Microsoft.Win32.SafeHandles;
|
|
25
|
+
|
|
26
|
+
public static class OpenCodexPackageFile {
|
|
27
|
+
[DllImport("kernel32.dll", CharSet=CharSet.Unicode, ExactSpelling=true, SetLastError=true)]
|
|
28
|
+
private static extern uint GetFinalPathNameByHandleW(SafeFileHandle file, StringBuilder path, uint capacity, uint flags);
|
|
29
|
+
public static void AssertPath(FileStream stream, string expected) {
|
|
30
|
+
var path = new StringBuilder(32768);
|
|
31
|
+
uint length = GetFinalPathNameByHandleW(stream.SafeFileHandle, path, (uint)path.Capacity, 0);
|
|
32
|
+
if (length == 0 || length >= path.Capacity ||
|
|
33
|
+
!String.Equals(path.ToString(), @"\\?\" + expected, StringComparison.OrdinalIgnoreCase))
|
|
34
|
+
throw new IOException("Unexpected package file path");
|
|
35
|
+
}
|
|
36
|
+
}`;
|
|
37
|
+
|
|
38
|
+
/** Windows PowerShell 5.1 uses the system AppX module and the .NET Framework WinRT projection. */
|
|
39
|
+
export const WINDOWS_PACKAGE_PROOF_FUNCTIONS = [
|
|
40
|
+
"$ErrorActionPreference='Stop'; $env:PSModulePath=Join-Path $PSHOME 'Modules'",
|
|
41
|
+
"Import-Module Appx -ErrorAction Stop",
|
|
42
|
+
DESKTOP_PACKAGE_PATH_GUARD_SCRIPT,
|
|
43
|
+
"Add-Type -TypeDefinition @'", WINDOWS_PACKAGE_FILE_SOURCE, "'@",
|
|
44
|
+
"function Get-DesktopPackage {",
|
|
45
|
+
"$packages=@(Get-AppxPackage -Name OpenAI.Codex -PackageTypeFilter Main)",
|
|
46
|
+
"if($packages.Count -ne 1){throw 'Package not unique'}; $package=$packages[0]",
|
|
47
|
+
`if($package.PackageFamilyName -cne '${CODEX_PACKAGE_FAMILY}' -or $package.Publisher -cne '${CODEX_STORE_PUBLISHER}' -or $package.SignatureKind -ne 'Store' -or $package.Status -ne 'Ok' -or $package.IsDevelopmentMode -ne $false){throw 'Untrusted package registration'}`,
|
|
48
|
+
"if([IO.Path]::GetFileName($package.InstallLocation) -cne $package.PackageFullName){throw 'Unexpected package root'}",
|
|
49
|
+
"return $package",
|
|
50
|
+
"}",
|
|
51
|
+
"function Assert-DesktopPackageContent($Package) {",
|
|
52
|
+
"Add-Type -AssemblyName System.Runtime.WindowsRuntime",
|
|
53
|
+
"$manager=[Windows.Management.Deployment.PackageManager,Windows.Management.Deployment,ContentType=WindowsRuntime]::new()",
|
|
54
|
+
"$installed=$manager.FindPackageForUser('', $Package.PackageFullName)",
|
|
55
|
+
"if(-not $installed -or $installed.Id.FullName -cne $Package.PackageFullName -or $installed.InstalledLocation.Path -ine $Package.InstallLocation -or $installed.SignatureKind -ne 'Store' -or -not $installed.Status.VerifyIsOK()){throw 'Package deployment changed'}",
|
|
56
|
+
// Use the OS integrity check for authenticated package contents, including the signed block map.
|
|
57
|
+
'$asTask=[System.WindowsRuntimeSystemExtensions].GetMethods()|Where-Object {$_.Name -eq "AsTask" -and $_.GetParameters().Count -eq 1 -and $_.GetParameters()[0].ParameterType.Name -ceq \'IAsyncOperation`1\'}',
|
|
58
|
+
"$task=$asTask.MakeGenericMethod([bool]).Invoke($null, @($installed.VerifyContentIntegrityAsync()))",
|
|
59
|
+
"if($task.GetAwaiter().GetResult() -ne $true){throw 'Package content integrity check failed'}",
|
|
60
|
+
"}",
|
|
61
|
+
"function Get-DesktopPackageHash([IO.Stream]$Stream) {",
|
|
62
|
+
"$Stream.Position=0; $sha=[Security.Cryptography.SHA256]::Create()",
|
|
63
|
+
"try{return ([BitConverter]::ToString($sha.ComputeHash($Stream))).Replace('-','').ToLowerInvariant()}finally{$sha.Dispose()}",
|
|
64
|
+
"}",
|
|
65
|
+
"function Assert-DesktopPackageFiles {",
|
|
66
|
+
"if((Assert-DesktopPackagePath $exePath) -cne $exeChain -or (Assert-DesktopPackagePath $manifestPath) -cne $manifestChain){throw 'Package ancestry changed'}",
|
|
67
|
+
"[OpenCodexPackageFile]::AssertPath($exeStream,$exePath); [OpenCodexPackageFile]::AssertPath($manifestStream,$manifestPath)",
|
|
68
|
+
"$again=Get-DesktopPackage",
|
|
69
|
+
"if($again.PackageFullName -cne $p.PackageFullName -or $again.InstallLocation -ine $p.InstallLocation){throw 'Package changed during proof'}",
|
|
70
|
+
"}",
|
|
71
|
+
].join("\n");
|
|
72
|
+
|
|
73
|
+
// The caller closes both handles in a finally block, including when the second open fails.
|
|
74
|
+
export const OPEN_WINDOWS_PACKAGE_FILES = [
|
|
75
|
+
String.raw`$exePath=Join-Path $p.InstallLocation 'app\ChatGPT.exe'; $manifestPath=Join-Path $p.InstallLocation 'AppxManifest.xml'`,
|
|
76
|
+
"$exeChain=Assert-DesktopPackagePath $exePath; $manifestChain=Assert-DesktopPackagePath $manifestPath",
|
|
77
|
+
"$exeStream=[IO.File]::Open($exePath,'Open','Read','Read')",
|
|
78
|
+
"$manifestStream=[IO.File]::Open($manifestPath,'Open','Read','Read')",
|
|
79
|
+
"Assert-DesktopPackageFiles",
|
|
80
|
+
"if($exeStream.Length -lt 1 -or $exeStream.Length -gt 1073741824 -or $manifestStream.Length -lt 1 -or $manifestStream.Length -gt 1048576){throw 'Unexpected package file size'}",
|
|
81
|
+
].join("\n");
|
|
82
|
+
|
|
83
|
+
/** Read only after OPEN_WINDOWS_PACKAGE_FILES validated the manifest path and holds it read-locked. */
|
|
84
|
+
const READ_WINDOWS_PACKAGE_MANIFEST = [
|
|
85
|
+
"$manifest=Get-AppxPackageManifest -Package $p.PackageFullName",
|
|
86
|
+
"$entry=@($manifest.Package.Applications.Application|Where-Object {$_.Id -ceq 'App'})",
|
|
87
|
+
String.raw`if($entry.Count -ne 1 -or $entry[0].Executable.Replace('/','\') -ine 'app\ChatGPT.exe'){throw 'Unexpected application entry'}; $entry=$entry[0]`,
|
|
88
|
+
"if($manifest.Package.Identity.Name -cne 'OpenAI.Codex' -or $manifest.Package.Identity.Publisher -cne $p.Publisher -or $manifest.Package.Identity.Version -cne [string]$p.Version){throw 'Unexpected manifest identity'}",
|
|
89
|
+
].join("\n");
|
|
90
|
+
|
|
91
|
+
export const MEASURE_WINDOWS_PACKAGE_FILES = [
|
|
92
|
+
READ_WINDOWS_PACKAGE_MANIFEST,
|
|
93
|
+
"Assert-DesktopPackageContent $p",
|
|
94
|
+
"$signature=Get-AuthenticodeSignature -LiteralPath $exePath",
|
|
95
|
+
`if($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -cne '${CODEX_EXECUTABLE_SIGNER}'){throw 'Untrusted executable signer'}`,
|
|
96
|
+
"$digest=Get-DesktopPackageHash $manifestStream; $executableHash=Get-DesktopPackageHash $exeStream",
|
|
97
|
+
"$exe=Get-Item -LiteralPath $exePath",
|
|
98
|
+
"$executableIdentity=[string]$exeStream.Length+':'+$exe.CreationTimeUtc.Ticks+':'+$exe.LastWriteTimeUtc.Ticks",
|
|
99
|
+
"$sha=[Security.Cryptography.SHA256]::Create()",
|
|
100
|
+
"try{$ancestry=([BitConverter]::ToString($sha.ComputeHash([Text.Encoding]::UTF8.GetBytes($exeChain+'|'+$manifestChain)))).Replace('-','').ToLowerInvariant()}finally{$sha.Dispose()}",
|
|
101
|
+
"Assert-DesktopPackageFiles",
|
|
102
|
+
].join("\n");
|
|
103
|
+
|
|
104
|
+
export const CLOSE_WINDOWS_PACKAGE_FILES = "if($manifestStream){$manifestStream.Dispose()}; if($exeStream){$exeStream.Dispose()}";
|
|
@@ -14,8 +14,9 @@ import {
|
|
|
14
14
|
} from "../injected-marker";
|
|
15
15
|
import {
|
|
16
16
|
CODEX_CONFIG_PATH,
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
defaultCodexCatalogPathForConfig,
|
|
18
|
+
resolveCodexCatalogPath,
|
|
19
|
+
sameCodexCatalogPath,
|
|
19
20
|
tomlString,
|
|
20
21
|
} from "../paths";
|
|
21
22
|
import { normalizeStructuralWhitespace, rootAssignmentKey, rootSourceLines, sourceAssignment, sourceAssignmentSpan, sourceText, type SourceLine } from "../toml-source-lines";
|
|
@@ -493,43 +494,64 @@ export function setRootModelProvider(content: string): string {
|
|
|
493
494
|
return insertRootSourceLines(content, ['model_provider = "opencodex"']);
|
|
494
495
|
}
|
|
495
496
|
|
|
496
|
-
|
|
497
|
+
interface CatalogBindingOwner {
|
|
498
|
+
configPath?: string;
|
|
499
|
+
journaledPath?: string | null;
|
|
500
|
+
}
|
|
501
|
+
|
|
502
|
+
function ownedCatalogPath(binding: string, owner: CatalogBindingOwner): string | null {
|
|
503
|
+
const configPath = owner.configPath ?? CODEX_CONFIG_PATH;
|
|
504
|
+
const defaultPath = defaultCodexCatalogPathForConfig(configPath);
|
|
505
|
+
if (sameCodexCatalogPath(configPath, binding, defaultPath)) return defaultPath;
|
|
506
|
+
const journaled = owner.journaledPath;
|
|
507
|
+
return journaled && sameCodexCatalogPath(configPath, binding, journaled)
|
|
508
|
+
? resolveCodexCatalogPath(configPath, journaled) : null;
|
|
509
|
+
}
|
|
510
|
+
|
|
511
|
+
function* catalogAssignments(lines: SourceLine[], rootEnd: number) {
|
|
512
|
+
for (let i = 0; i < rootEnd; i++) {
|
|
513
|
+
if (!lines[i].structural || rootAssignmentKey(lines[i].text) !== "model_catalog_json") continue;
|
|
514
|
+
const assignment = sourceAssignment(lines, i, rootEnd);
|
|
515
|
+
const value = assignment?.value;
|
|
516
|
+
yield { start: i, end: assignment?.end ?? i + 1, binding: typeof value === "string" ? value : null };
|
|
517
|
+
}
|
|
518
|
+
}
|
|
519
|
+
|
|
520
|
+
function readRootModelCatalogPath(content: string, owner: CatalogBindingOwner): string | null {
|
|
497
521
|
const { lines, rootEnd } = rootSourceLines(content);
|
|
498
|
-
let
|
|
499
|
-
for (
|
|
500
|
-
if (
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
if (!isOpencodexCatalogPath(catalogPath)) return catalogPath;
|
|
504
|
-
ownedCatalogPath ??= catalogPath;
|
|
522
|
+
let owned: string | null = null;
|
|
523
|
+
for (const { binding } of catalogAssignments(lines, rootEnd)) {
|
|
524
|
+
if (binding === null) continue;
|
|
525
|
+
if (!ownedCatalogPath(binding, owner)) return binding;
|
|
526
|
+
owned ??= binding;
|
|
505
527
|
}
|
|
506
|
-
return
|
|
528
|
+
return owned;
|
|
507
529
|
}
|
|
508
530
|
|
|
509
|
-
export function
|
|
531
|
+
export function updateRootModelCatalogPath(content: string, binding: string | null, owner: CatalogBindingOwner = {}):
|
|
532
|
+
{ content: string; injectedBinding: string | null } {
|
|
510
533
|
const { bom, lines, rootEnd } = rootSourceLines(content);
|
|
511
|
-
const
|
|
512
|
-
const ownedAssignments: number[] = [];
|
|
534
|
+
const ownedLines = new Set<number>();
|
|
513
535
|
let hasUserAssignment = false;
|
|
514
|
-
for (
|
|
515
|
-
if (
|
|
516
|
-
|
|
517
|
-
if (existing !== null && isOpencodexCatalogPath(existing)) {
|
|
518
|
-
ownedAssignments.push(i);
|
|
536
|
+
for (const existing of catalogAssignments(lines, rootEnd)) {
|
|
537
|
+
if (existing.binding && ownedCatalogPath(existing.binding, owner)) {
|
|
538
|
+
for (let line = existing.start; line < existing.end; line++) ownedLines.add(line);
|
|
519
539
|
} else {
|
|
520
540
|
hasUserAssignment = true;
|
|
521
541
|
}
|
|
522
542
|
}
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
543
|
+
const injectedBinding = hasUserAssignment ? null : binding;
|
|
544
|
+
const kept = lines.filter((_, i) => !ownedLines.has(i));
|
|
545
|
+
if (injectedBinding === null) return { content: bom + sourceText(kept), injectedBinding };
|
|
546
|
+
|
|
547
|
+
const key = "model_catalog_json = " + tomlString(injectedBinding);
|
|
548
|
+
const firstOwned = ownedLines.values().next().value;
|
|
549
|
+
if (firstOwned === undefined) {
|
|
550
|
+
return { content: insertRootSourceLines(content, [key]), injectedBinding };
|
|
526
551
|
}
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
return bom + sourceText(lines.filter((_, index) => !duplicates.has(index)));
|
|
531
|
-
}
|
|
532
|
-
return insertRootSourceLines(content, [key]);
|
|
552
|
+
const eol = lines[firstOwned].eol;
|
|
553
|
+
kept.splice(firstOwned, 0, { text: key, eol, structural: true });
|
|
554
|
+
return { content: bom + sourceText(kept), injectedBinding };
|
|
533
555
|
}
|
|
534
556
|
|
|
535
557
|
export function removeProfileSection(content: string): string {
|
|
@@ -599,18 +621,8 @@ export function ensureFastModeFeature(content: string, fastMode?: boolean): stri
|
|
|
599
621
|
return bom + sourceText(lines);
|
|
600
622
|
}
|
|
601
623
|
|
|
602
|
-
function
|
|
603
|
-
return
|
|
604
|
-
}
|
|
605
|
-
|
|
606
|
-
export function stripOpencodexCatalogPath(content: string): string {
|
|
607
|
-
const { bom, lines, rootEnd } = rootSourceLines(content);
|
|
608
|
-
return bom + sourceText(lines
|
|
609
|
-
.filter((line, index) => {
|
|
610
|
-
if (index >= rootEnd || !line.structural) return true;
|
|
611
|
-
const path = rootTomlString(line.text, "model_catalog_json");
|
|
612
|
-
return path === null || !isOpencodexCatalogPath(path);
|
|
613
|
-
}));
|
|
624
|
+
export function stripOpencodexCatalogPath(content: string, owner: CatalogBindingOwner = {}): string {
|
|
625
|
+
return updateRootModelCatalogPath(content, null, owner).content;
|
|
614
626
|
}
|
|
615
627
|
|
|
616
628
|
export function buildProfileFile(port: number, catalogPath?: string | null, supportsWebsockets?: boolean, includeApiAuthHeader?: boolean, hostname?: string, fastMode?: boolean): string;
|
|
@@ -763,44 +775,26 @@ function topLevelTableNamesOf(content: string): Set<string> {
|
|
|
763
775
|
export function chooseCatalogPathForInjection(
|
|
764
776
|
content: string,
|
|
765
777
|
requested?: string | null,
|
|
778
|
+
owner: CatalogBindingOwner = {},
|
|
766
779
|
): string | null {
|
|
767
|
-
|
|
780
|
+
const configPath = owner.configPath ?? CODEX_CONFIG_PATH;
|
|
781
|
+
if (requested !== undefined) return requested ? resolveCodexCatalogPath(configPath, requested) : null;
|
|
768
782
|
|
|
769
|
-
const existing = readRootModelCatalogPath(content);
|
|
783
|
+
const existing = readRootModelCatalogPath(content, owner);
|
|
770
784
|
if (existing) {
|
|
771
|
-
const
|
|
772
|
-
if (!
|
|
773
|
-
|
|
785
|
+
const owned = ownedCatalogPath(existing, owner);
|
|
786
|
+
if (!owned) return resolveCodexCatalogPath(configPath, existing);
|
|
787
|
+
if (existsSync(owned)) return owned;
|
|
774
788
|
}
|
|
775
789
|
|
|
776
|
-
|
|
790
|
+
const defaultPath = defaultCodexCatalogPathForConfig(configPath);
|
|
791
|
+
return existsSync(defaultPath) ? defaultPath : null;
|
|
777
792
|
}
|
|
778
793
|
|
|
779
|
-
/**
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
*
|
|
786
|
-
* Injection already repairs it — the chooser refuses a missing owned path and the caller strips
|
|
787
|
-
* the stale line. That only helps someone who runs opencodex again, and the whole difficulty of
|
|
788
|
-
* this state is that Codex is the thing that stopped working, so nothing prompts them to. This
|
|
789
|
-
* predicate exists so the CLI can say it out loud.
|
|
790
|
-
*
|
|
791
|
-
* A user-owned catalog assignment wins here exactly as it does during injection: if they named
|
|
792
|
-
* the file, its absence is theirs to explain, and we do not claim it.
|
|
793
|
-
*
|
|
794
|
-
* Ownership is decided by basename, which is a weak test — a file the user happens to name
|
|
795
|
-
* `opencodex-catalog.json` is read as ours wherever it sits. That is deliberate rather than
|
|
796
|
-
* overlooked: it is the same test injection already applies, and a detector that drew the line
|
|
797
|
-
* somewhere else would report a state injection would then treat differently. Tightening it is a
|
|
798
|
-
* change to injection, not to this.
|
|
799
|
-
*/
|
|
800
|
-
export function missingOwnedCatalogPath(content: string): string | null {
|
|
801
|
-
const existing = readRootModelCatalogPath(content);
|
|
802
|
-
if (!existing) return null;
|
|
803
|
-
const resolved = resolveCodexConfigPath(existing);
|
|
804
|
-
if (!isOpencodexCatalogPath(resolved)) return null;
|
|
805
|
-
return existsSync(resolved) ? null : existing;
|
|
794
|
+
/** Diagnose a missing default catalog, which prevents Codex from loading the config (#5261). */
|
|
795
|
+
export function missingOwnedCatalogPath(content: string, configPath = CODEX_CONFIG_PATH): string | null {
|
|
796
|
+
const owner = { configPath };
|
|
797
|
+
const existing = readRootModelCatalogPath(content, owner);
|
|
798
|
+
const owned = existing ? ownedCatalogPath(existing, owner) : null;
|
|
799
|
+
return owned && !existsSync(owned) ? owned : null;
|
|
806
800
|
}
|
package/src/codex/inject/plan.ts
CHANGED
|
@@ -21,10 +21,11 @@ import {
|
|
|
21
21
|
journaledInjectedRootValues,
|
|
22
22
|
journaledInjectedRootWebSearch,
|
|
23
23
|
journaledInjectedSubagentDefaults,
|
|
24
|
+
journaledOwnedCatalogBinding,
|
|
24
25
|
journaledReplacedRootWebSearch,
|
|
25
26
|
} from "../journal";
|
|
26
27
|
import { REALTIME_WS_BASE_URL_KEY, stripJournaledOpenaiBaseUrl } from "../injected-marker";
|
|
27
|
-
import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH, resolveCodexStateDbPath } from "../paths";
|
|
28
|
+
import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH, codexCatalogBindingForPath, resolveCodexStateDbPath } from "../paths";
|
|
28
29
|
import { transformManagedSubagentDefaults, type WrittenSubagentDefaults } from "../subagent-defaults";
|
|
29
30
|
import type { OcxConfig } from "../../types";
|
|
30
31
|
import type { CodexWriteCandidate } from "../write-coordination";
|
|
@@ -39,13 +40,12 @@ import {
|
|
|
39
40
|
normalizeServiceTier,
|
|
40
41
|
preserveUnmanagedProfileKeys,
|
|
41
42
|
removeProfileSection,
|
|
42
|
-
setRootModelCatalogPath,
|
|
43
43
|
setRootModelProvider,
|
|
44
44
|
setRootOpenaiBaseUrlForTarget,
|
|
45
45
|
setRootRealtimeWsBaseUrl,
|
|
46
46
|
stripExistingModelProvider,
|
|
47
47
|
stripInjectedOpenaiBaseUrl,
|
|
48
|
-
|
|
48
|
+
updateRootModelCatalogPath,
|
|
49
49
|
} from "./config-toml";
|
|
50
50
|
import { hasOcxProviderTable, removeOcxSection } from "./remove";
|
|
51
51
|
import {
|
|
@@ -87,6 +87,7 @@ export interface CodexInjectionPlanOk {
|
|
|
87
87
|
profileSource: string | null;
|
|
88
88
|
/** The resolved catalog path, never the raw option. */
|
|
89
89
|
catalogPath: string | null;
|
|
90
|
+
injectedCatalogBinding: string | null;
|
|
90
91
|
providerTableMode: boolean;
|
|
91
92
|
keepRootOverrideAlongsideTable: boolean;
|
|
92
93
|
keptUserBaseUrl: boolean;
|
|
@@ -227,13 +228,12 @@ export function deriveCodexInjectionPlan(
|
|
|
227
228
|
);
|
|
228
229
|
content = webSearch.content;
|
|
229
230
|
|
|
230
|
-
const
|
|
231
|
-
|
|
232
|
-
|
|
231
|
+
const catalogOwner = { journaledPath: journaledOwnedCatalogBinding({ readOnly: ctx.journalReadOnly }) };
|
|
232
|
+
const catalogPath = chooseCatalogPathForInjection(content, ctx.catalogPathOption, catalogOwner);
|
|
233
|
+
const catalog = updateRootModelCatalogPath(
|
|
234
|
+
content, catalogPath && codexCatalogBindingForPath(CODEX_CONFIG_PATH, catalogPath), catalogOwner,
|
|
233
235
|
);
|
|
234
|
-
content =
|
|
235
|
-
? setRootModelCatalogPath(content, catalogPath)
|
|
236
|
-
: stripOpencodexCatalogPath(content);
|
|
236
|
+
content = catalog.content;
|
|
237
237
|
|
|
238
238
|
// Provider-table form: non-loopback admission or an explicit Desktop policy.
|
|
239
239
|
const providerTableMode = usesProviderTable(routingTarget);
|
|
@@ -345,7 +345,7 @@ export function deriveCodexInjectionPlan(
|
|
|
345
345
|
profileSource,
|
|
346
346
|
buildProfileFileForTarget(
|
|
347
347
|
routingTarget,
|
|
348
|
-
catalogPath,
|
|
348
|
+
catalogPath && codexCatalogBindingForPath(CODEX_PROFILE_PATH, catalogPath),
|
|
349
349
|
websocketsForRoutingTarget(config, routingTarget),
|
|
350
350
|
config?.fastMode,
|
|
351
351
|
config?.codexProviderDisplayName,
|
|
@@ -428,6 +428,7 @@ export function deriveCodexInjectionPlan(
|
|
|
428
428
|
profileContent,
|
|
429
429
|
profileSource,
|
|
430
430
|
catalogPath,
|
|
431
|
+
injectedCatalogBinding: catalog.injectedBinding,
|
|
431
432
|
providerTableMode,
|
|
432
433
|
keepRootOverrideAlongsideTable,
|
|
433
434
|
keptUserBaseUrl,
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
journaledInjectedRootValues,
|
|
15
15
|
journaledInjectedRootWebSearch,
|
|
16
16
|
journaledInjectedSubagentDefaults,
|
|
17
|
+
journaledOwnedCatalogBinding,
|
|
17
18
|
journaledReplacedRootWebSearch,
|
|
18
19
|
} from "../journal";
|
|
19
20
|
import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH } from "../paths";
|
|
@@ -93,6 +94,7 @@ function stripOpencodexConfigResult(
|
|
|
93
94
|
journaledRootWebSearch: string | null = null,
|
|
94
95
|
journaledReplacedWebSearch: string | null = null,
|
|
95
96
|
journaledSubagentDefaults: WrittenSubagentDefaults | null = null,
|
|
97
|
+
journaledCatalogBinding: string | null = null,
|
|
96
98
|
): StripOpencodexConfigResult {
|
|
97
99
|
let out = content;
|
|
98
100
|
const hadRootOcxProvider =
|
|
@@ -133,7 +135,7 @@ function stripOpencodexConfigResult(
|
|
|
133
135
|
// A marked value the user edited after injection is theirs (#7425) and survives restore.
|
|
134
136
|
const managedDefaults = transformManagedSubagentDefaults(out, null, journaledSubagentDefaults);
|
|
135
137
|
if (managedDefaults.ok) out = managedDefaults.content;
|
|
136
|
-
out = stripOpencodexCatalogPath(out);
|
|
138
|
+
out = stripOpencodexCatalogPath(out, { journaledPath: journaledCatalogBinding });
|
|
137
139
|
return {
|
|
138
140
|
content: normalizeStructuralWhitespace(out),
|
|
139
141
|
managedDefaultsError: !managedDefaults.ok ? managedDefaults.error : null,
|
|
@@ -252,6 +254,7 @@ export function removeCodexConfig(
|
|
|
252
254
|
journaledRootWebSearch,
|
|
253
255
|
journaledReplaced,
|
|
254
256
|
journaledInjectedSubagentDefaults(),
|
|
257
|
+
journaledOwnedCatalogBinding(),
|
|
255
258
|
);
|
|
256
259
|
// Captured from the pre-strip bytes: the strip is what removes the table, so reading it
|
|
257
260
|
// afterwards would find nothing.
|
package/src/codex/inject.ts
CHANGED
|
@@ -519,6 +519,7 @@ async function injectCodexConfigImpl(
|
|
|
519
519
|
// This is the catalog artifact selected for this injection, even when config.toml
|
|
520
520
|
// already points at that path and therefore needs no textual rewrite.
|
|
521
521
|
injectedCatalogPath: plan.catalogPath,
|
|
522
|
+
injectedCatalogBinding: plan.injectedCatalogBinding,
|
|
522
523
|
}, hooks));
|
|
523
524
|
historyArtifactStageForTests?.("after-artifacts");
|
|
524
525
|
// Detect migration throughout the artifact transaction, not just at entry.
|