@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { readConfigForAdmittedMutation } from "../../config/persisted-mutation";
|
|
2
|
+
import { getConfigDir as configRoot, withConfigDirHardeningSettled as settleConfigRoot } from "../../config/paths";
|
|
3
|
+
import { WindowsSecretAclSettleTimeoutError } from "../../lib/windows-secret-acl";
|
|
1
4
|
import { MAIN_ACCOUNT_HARD_LOCK_MIN_PERCENT } from "../../codex/quota-types";
|
|
2
5
|
import { resolveMainAccountHardLockThresholds } from "../../codex/main-account-hard-lock";
|
|
3
6
|
import { getMainAccountExternalUsageWarning } from "../../codex/main-account-external-usage";
|
|
@@ -45,7 +48,7 @@ import {
|
|
|
45
48
|
import { removeCredential } from "../../oauth/store";
|
|
46
49
|
import { providerDestinationResolvedError } from "../../lib/destination-policy";
|
|
47
50
|
import { isStreamMode } from "../../lib/bun-stream-caps";
|
|
48
|
-
import { shadowSourceModels } from "../../lib/shadow-call";
|
|
51
|
+
import { isDefaultShadowSourceModels, shadowSourceModelOptions, shadowSourceModels } from "../../lib/shadow-call";
|
|
49
52
|
import {
|
|
50
53
|
configureAppOwnedMemoryBudget,
|
|
51
54
|
enforceAppOwnedMemoryBudget,
|
|
@@ -121,7 +124,11 @@ import {
|
|
|
121
124
|
type DebugFlag,
|
|
122
125
|
} from "../../lib/debug-settings";
|
|
123
126
|
import type { OcxClaudeCodeConfig, OcxConfig, OcxCustomModel, OcxProviderConfig } from "../../types";
|
|
124
|
-
import {
|
|
127
|
+
import {
|
|
128
|
+
normalizeShadowCallSourceModels,
|
|
129
|
+
shadowCallSourceModelsError,
|
|
130
|
+
shadowCallTargetError,
|
|
131
|
+
} from "./shadow-call-validation";
|
|
125
132
|
import { autoReviewOverrideConfigError } from "../../config/provider-validation";
|
|
126
133
|
import { ConfigWritePublishedError } from "../../config/persist-unlocked";
|
|
127
134
|
import { drainAndShutdown } from "../lifecycle";
|
|
@@ -148,6 +155,17 @@ function quotaAutoRefreshSettings(config: OcxConfig) {
|
|
|
148
155
|
]));
|
|
149
156
|
}
|
|
150
157
|
|
|
158
|
+
/** The complete shadow-call settings body shared by GET and a successful PUT. */
|
|
159
|
+
function shadowCallSettingsResponse(config: OcxConfig) {
|
|
160
|
+
const sci = config.shadowCallIntercept ?? {};
|
|
161
|
+
return {
|
|
162
|
+
enabled: sci.enabled === true,
|
|
163
|
+
model: sci.model ?? "",
|
|
164
|
+
sourceModels: shadowSourceModels(sci.sourceModels),
|
|
165
|
+
sourceModelOptions: shadowSourceModelOptions(sci.sourceModels),
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
|
|
151
169
|
async function sidecarVisionResponseSettings(config: OcxConfig): Promise<{
|
|
152
170
|
model: string;
|
|
153
171
|
reasoning: string;
|
|
@@ -274,10 +292,10 @@ export async function syncEnabledClientIntegrations(
|
|
|
274
292
|
const models = await (deps.fetchAllModels ?? fetchAllModels)(config);
|
|
275
293
|
// Serialized with Desktop mode transitions (picker lock): a first-party switch cannot interleave.
|
|
276
294
|
const { runPickerTransition } = await import("./claude-desktop-picker-routes");
|
|
277
|
-
await runPickerTransition(config,
|
|
295
|
+
await runPickerTransition(config, () => settleConfigRoot(configRoot(), () => {
|
|
278
296
|
// Discovery admits a concurrent OFF or settings edit. Re-read outside C:
|
|
279
297
|
// the writer facade owns L and its final desired-state check under L→C.
|
|
280
|
-
const latest =
|
|
298
|
+
const latest = readConfigForAdmittedMutation();
|
|
281
299
|
// Discovery awaited: the mode may have changed meanwhile. Re-resolve on the fresh read,
|
|
282
300
|
// immediately before the writer, so a first-party switch during fetchAllModels still wins.
|
|
283
301
|
if (stale()) return;
|
|
@@ -314,7 +332,7 @@ export async function syncEnabledClientIntegrations(
|
|
|
314
332
|
: { client: "claude-desktop", ok: true, changed: true });
|
|
315
333
|
}
|
|
316
334
|
}
|
|
317
|
-
});
|
|
335
|
+
}));
|
|
318
336
|
} catch (error) {
|
|
319
337
|
out.push({ client: "claude-desktop", ok: false, reason: error instanceof Error ? error.message : String(error) });
|
|
320
338
|
}
|
|
@@ -331,8 +349,8 @@ export async function syncEnabledClientIntegrations(
|
|
|
331
349
|
config,
|
|
332
350
|
port,
|
|
333
351
|
}, unattended
|
|
334
|
-
? ["mcode", "pi", "aside", "raycast", "omo", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai"]
|
|
335
|
-
: ["mcode", "pi", "aside", "raycast", "omo", "cline", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai"],
|
|
352
|
+
? ["mcode", "pi", "aside", "raycast", "omo", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "hermes", "t3code"]
|
|
353
|
+
: ["mcode", "pi", "aside", "raycast", "omo", "cline", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "hermes", "t3code"],
|
|
336
354
|
...unattended ? [{ refreshOnly: true, admit }] as const : []));
|
|
337
355
|
|
|
338
356
|
return out;
|
|
@@ -357,6 +375,14 @@ function publicVisionSidecarSettings(
|
|
|
357
375
|
|
|
358
376
|
/** Serve validated settings and publish catalog-affecting changes after persistence. */
|
|
359
377
|
export async function handleConfigRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
378
|
+
try { return await handleConfigRoutesImpl(ctx); }
|
|
379
|
+
catch (error) {
|
|
380
|
+
if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
|
|
381
|
+
return jsonResponse({ error: "Could not save settings", code: "write_failed", diagnostic: { stage: "ca", cause: "ETIMEDOUT" } }, 500);
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response | null> {
|
|
360
386
|
const { req, url, config, deps, convergeCodexCatalog, syncClaudeAgentDefsBestEffort } = ctx;
|
|
361
387
|
const readStartupHealth = deps.getCachedStartupHealth ?? getCachedStartupHealth;
|
|
362
388
|
// Settings only seed the dashboard chip; /api/startup-health owns the bounded fresh read.
|
|
@@ -600,13 +626,7 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
600
626
|
|| percent < MAIN_ACCOUNT_HARD_LOCK_MIN_PERCENT || percent > 100)) {
|
|
601
627
|
return jsonResponse({ error: "codexMainAccountHardLockThresholds requires integer short/long percentages from 80 to 100" }, 400);
|
|
602
628
|
}
|
|
603
|
-
|
|
604
|
-
hardLockThresholds = { ...config.codexMainAccountHardLockThresholds,
|
|
605
|
-
...(value as NonNullable<OcxConfig["codexMainAccountHardLockThresholds"]>) };
|
|
606
|
-
const defaults = resolveMainAccountHardLockThresholds(undefined);
|
|
607
|
-
if ((hardLockThresholds.short ?? defaults.short) > (hardLockThresholds.long ?? defaults.long)) {
|
|
608
|
-
return jsonResponse({ error: "codexMainAccountHardLockThresholds short must not exceed long" }, 400);
|
|
609
|
-
}
|
|
629
|
+
hardLockThresholds = { ...(value as NonNullable<OcxConfig["codexMainAccountHardLockThresholds"]>) };
|
|
610
630
|
}
|
|
611
631
|
// null clears the section, like compactionRouting; a present section must fully parse.
|
|
612
632
|
const hardLockFallback = body.codexMainAccountHardLockFallback == null
|
|
@@ -666,163 +686,178 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
666
686
|
)) {
|
|
667
687
|
return jsonResponse({ error: `appOwnedMemoryBudgetMb must be an integer from ${MIN_APP_OWNED_MEMORY_BUDGET_MB} to ${MAX_APP_OWNED_MEMORY_BUDGET_MB}` }, 400);
|
|
668
688
|
}
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
codexAccountNamespaces: config.codexAccountNamespaces,
|
|
678
|
-
hasCodexAccountNamespaces: Object.hasOwn(config, "codexAccountNamespaces"),
|
|
679
|
-
codexAccountPickerEnabled: config.codexAccountPickerEnabled,
|
|
680
|
-
hasCodexAccountPickerEnabled: Object.hasOwn(config, "codexAccountPickerEnabled"),
|
|
681
|
-
codexQuotaAutoRefresh: config.codexQuotaAutoRefresh,
|
|
682
|
-
hasCodexQuotaAutoRefresh: Object.hasOwn(config, "codexQuotaAutoRefresh"),
|
|
683
|
-
oauthOpenBrowser: config.oauthOpenBrowser,
|
|
684
|
-
hasOauthOpenBrowser: Object.hasOwn(config, "oauthOpenBrowser"),
|
|
685
|
-
showCodexCredits: config.showCodexCredits,
|
|
686
|
-
hasShowCodexCredits: Object.hasOwn(config, "showCodexCredits"),
|
|
687
|
-
ultraFastTier: config.ultraFastTier,
|
|
688
|
-
hasUltraFastTier: Object.hasOwn(config, "ultraFastTier"),
|
|
689
|
-
fastRows: config.fastRows,
|
|
690
|
-
hasFastRows: Object.hasOwn(config, "fastRows"),
|
|
691
|
-
codexMainAccountHardLockThresholds: config.codexMainAccountHardLockThresholds,
|
|
692
|
-
hasCodexMainAccountHardLockThresholds: Object.hasOwn(config, "codexMainAccountHardLockThresholds"),
|
|
693
|
-
codexMainAccountHardLock: config.codexMainAccountHardLock,
|
|
694
|
-
hasCodexMainAccountHardLock: Object.hasOwn(config, "codexMainAccountHardLock"),
|
|
695
|
-
codexMainAccountHardLockFallback: config.codexMainAccountHardLockFallback,
|
|
696
|
-
hasCodexMainAccountHardLockFallback: Object.hasOwn(config, "codexMainAccountHardLockFallback"),
|
|
697
|
-
codexDesktopAuthless: config.codexDesktopAuthless,
|
|
698
|
-
hasCodexDesktopAuthless: Object.hasOwn(config, "codexDesktopAuthless"),
|
|
699
|
-
codexClientCompaction: config.codexClientCompaction,
|
|
700
|
-
hasCodexClientCompaction: Object.hasOwn(config, "codexClientCompaction"),
|
|
701
|
-
};
|
|
702
|
-
const pickerWasEnabled = codexAccountPickerEnabled(config);
|
|
703
|
-
let pickerIsEnabled = pickerWasEnabled;
|
|
704
|
-
const authlessWasEnabled = config.codexDesktopAuthless === true;
|
|
705
|
-
const clientCompactionWasEnabled = config.codexClientCompaction === true;
|
|
706
|
-
const fastRowsWasEnabled = config.fastRows !== false;
|
|
707
|
-
try {
|
|
708
|
-
if (typeof body.codexAutoStart === "boolean") {
|
|
709
|
-
config.codexAutoStart = body.codexAutoStart;
|
|
689
|
+
let pickerWasEnabled = false, pickerIsEnabled = false;
|
|
690
|
+
let authlessIsEnabled = false, clientCompactionIsEnabled = false, fastRowsIsEnabled = false;
|
|
691
|
+
let desktopSwitchesChanged = false, fastRowsChanged = false;
|
|
692
|
+
const refusal = await settleConfigRoot(configRoot(), () => {
|
|
693
|
+
if (hardLockThresholds) {
|
|
694
|
+
hardLockThresholds = { ...config.codexMainAccountHardLockThresholds, ...hardLockThresholds };
|
|
695
|
+
const defaults = resolveMainAccountHardLockThresholds(undefined);
|
|
696
|
+
if ((hardLockThresholds.short ?? defaults.short) > (hardLockThresholds.long ?? defaults.long)) return jsonResponse({ error: "codexMainAccountHardLockThresholds short must not exceed long" }, 400);
|
|
710
697
|
}
|
|
711
|
-
if (body.streamMode !== undefined) {
|
|
712
|
-
if (body.streamMode === "auto") {
|
|
713
|
-
deleteConfigTopLevelKey(config, "streamMode");
|
|
714
|
-
} else {
|
|
715
|
-
config.streamMode = body.streamMode as "legacy-tee" | "eager-relay";
|
|
716
|
-
}
|
|
717
|
-
}
|
|
718
|
-
if (typeof body.appOwnedMemoryBudgetMb === "number") {
|
|
719
|
-
config.appOwnedMemoryBudgetMb = body.appOwnedMemoryBudgetMb;
|
|
720
|
-
}
|
|
721
|
-
if (body.codexAccountPickerEnabled === true) {
|
|
722
|
-
config.codexAccountPickerEnabled = true;
|
|
723
|
-
initializeDefaultCodexAccountNamespaces(config);
|
|
724
|
-
} else if (body.codexAccountPickerEnabled === false) {
|
|
725
|
-
config.codexAccountPickerEnabled = false;
|
|
726
|
-
}
|
|
727
|
-
if (typeof body.showCodexCredits === "boolean") config.showCodexCredits = body.showCodexCredits;
|
|
728
|
-
if (typeof body.oauthOpenBrowser === "boolean") {
|
|
729
|
-
config.oauthOpenBrowser = body.oauthOpenBrowser;
|
|
730
|
-
}
|
|
731
|
-
// Off deletes the key rather than persisting `false`: absent is the documented
|
|
732
|
-
// default, and a written `false` would survive as a decision nobody made.
|
|
733
|
-
if (body.ultraFastTier === true) config.ultraFastTier = true;
|
|
734
|
-
else if (body.ultraFastTier === false) deleteConfigTopLevelKey(config, "ultraFastTier");
|
|
735
|
-
if (body.fastRows === false) config.fastRows = false;
|
|
736
|
-
else if (body.fastRows === true) deleteConfigTopLevelKey(config, "fastRows");
|
|
737
|
-
// Inverted from the pair above because the default is on (#5694): off is the persisted
|
|
738
|
-
// decision, so it writes `false`, while on deletes the key and returns to the default.
|
|
739
|
-
if (hardLockThresholds !== undefined) config.codexMainAccountHardLockThresholds = { ...hardLockThresholds };
|
|
740
|
-
if (body.codexMainAccountHardLock === false) config.codexMainAccountHardLock = false;
|
|
741
|
-
else if (body.codexMainAccountHardLock === true) deleteConfigTopLevelKey(config, "codexMainAccountHardLock");
|
|
742
|
-
if (hardLockFallback === null) deleteConfigTopLevelKey(config, "codexMainAccountHardLockFallback");
|
|
743
|
-
else if (hardLockFallback?.success) config.codexMainAccountHardLockFallback = hardLockFallback.data;
|
|
744
|
-
if (body.codexDesktopAuthless === true) config.codexDesktopAuthless = true;
|
|
745
|
-
else if (body.codexDesktopAuthless === false) deleteConfigTopLevelKey(config, "codexDesktopAuthless");
|
|
746
|
-
if (body.codexClientCompaction === true) config.codexClientCompaction = true;
|
|
747
|
-
else if (body.codexClientCompaction === false) deleteConfigTopLevelKey(config, "codexClientCompaction");
|
|
748
|
-
if (compactionRouting === null) deleteConfigTopLevelKey(config, "compactionRouting");
|
|
749
|
-
else if (compactionRouting?.success) config.compactionRouting = compactionRouting.data;
|
|
750
|
-
if (compactionRecovery === null) deleteConfigTopLevelKey(config, "compactionRecovery");
|
|
751
|
-
else if (compactionRecovery?.success) config.compactionRecovery = compactionRecovery.data;
|
|
752
|
-
if (reasoningRetention === null) deleteConfigTopLevelKey(config, "reasoningRetention");
|
|
753
|
-
else if (reasoningRetention?.success) config.reasoningRetention = reasoningRetention.data;
|
|
754
|
-
// Null clears both phases; the GUI sends that when neither row names a model.
|
|
755
|
-
if (memoryModels === null) deleteConfigTopLevelKey(config, "memoryModels");
|
|
756
|
-
else if (memoryModels?.success) config.memoryModels = memoryModels.data;
|
|
757
698
|
if (quotaAutoRefreshChange) {
|
|
758
699
|
const { id, window, enabled } = quotaAutoRefreshChange;
|
|
759
|
-
|
|
760
|
-
if (enabled)
|
|
761
|
-
else delete setting[window];
|
|
762
|
-
const all = { ...(config.codexQuotaAutoRefresh ?? {}) };
|
|
763
|
-
if (Object.keys(setting).length > 0) all[id] = setting;
|
|
764
|
-
else delete all[id];
|
|
765
|
-
if (Object.keys(all).length > 0) config.codexQuotaAutoRefresh = all;
|
|
766
|
-
else deleteConfigTopLevelKey(config, "codexQuotaAutoRefresh");
|
|
700
|
+
if (id !== MAIN_CODEX_ACCOUNT_ID && !(config.codexAccounts ?? []).some(account => isSelectableCodexPoolAccount(account) && account.id === id)) return jsonResponse({ error: "Account not found" }, 404);
|
|
701
|
+
if (enabled && !codexQuotaAutoRefreshStatus(config, id, getAccountQuota(id))[window === "fiveHour" ? "fiveHourAvailable" : "weeklyAvailable"]) return jsonResponse({ error: "Quota window is not available for this account" }, 409);
|
|
767
702
|
}
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
config.
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
config
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
config
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
config.
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
config
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
config.
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
config
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
config.
|
|
803
|
-
|
|
804
|
-
|
|
805
|
-
|
|
806
|
-
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
703
|
+
pickerWasEnabled = codexAccountPickerEnabled(config);
|
|
704
|
+
const authlessWasEnabled = config.codexDesktopAuthless === true;
|
|
705
|
+
const clientCompactionWasEnabled = config.codexClientCompaction === true;
|
|
706
|
+
const fastRowsWasEnabled = config.fastRows !== false;
|
|
707
|
+
const restoreCompactionRouting = captureConfigTopLevelRollback(config, ["compactionRouting", "compactionRecovery", "memoryModels", "reasoningRetention"]);
|
|
708
|
+
const previousSettings = {
|
|
709
|
+
codexAutoStart: config.codexAutoStart,
|
|
710
|
+
hasCodexAutoStart: Object.hasOwn(config, "codexAutoStart"),
|
|
711
|
+
streamMode: config.streamMode,
|
|
712
|
+
hasStreamMode: Object.hasOwn(config, "streamMode"),
|
|
713
|
+
appOwnedMemoryBudgetMb: config.appOwnedMemoryBudgetMb,
|
|
714
|
+
hasAppOwnedMemoryBudgetMb: Object.hasOwn(config, "appOwnedMemoryBudgetMb"),
|
|
715
|
+
codexAccountNamespaces: config.codexAccountNamespaces,
|
|
716
|
+
hasCodexAccountNamespaces: Object.hasOwn(config, "codexAccountNamespaces"),
|
|
717
|
+
codexAccountPickerEnabled: config.codexAccountPickerEnabled,
|
|
718
|
+
hasCodexAccountPickerEnabled: Object.hasOwn(config, "codexAccountPickerEnabled"),
|
|
719
|
+
codexQuotaAutoRefresh: config.codexQuotaAutoRefresh,
|
|
720
|
+
hasCodexQuotaAutoRefresh: Object.hasOwn(config, "codexQuotaAutoRefresh"),
|
|
721
|
+
oauthOpenBrowser: config.oauthOpenBrowser,
|
|
722
|
+
hasOauthOpenBrowser: Object.hasOwn(config, "oauthOpenBrowser"),
|
|
723
|
+
showCodexCredits: config.showCodexCredits,
|
|
724
|
+
hasShowCodexCredits: Object.hasOwn(config, "showCodexCredits"),
|
|
725
|
+
ultraFastTier: config.ultraFastTier,
|
|
726
|
+
hasUltraFastTier: Object.hasOwn(config, "ultraFastTier"),
|
|
727
|
+
fastRows: config.fastRows,
|
|
728
|
+
hasFastRows: Object.hasOwn(config, "fastRows"),
|
|
729
|
+
codexMainAccountHardLockThresholds: config.codexMainAccountHardLockThresholds,
|
|
730
|
+
hasCodexMainAccountHardLockThresholds: Object.hasOwn(config, "codexMainAccountHardLockThresholds"),
|
|
731
|
+
codexMainAccountHardLock: config.codexMainAccountHardLock,
|
|
732
|
+
hasCodexMainAccountHardLock: Object.hasOwn(config, "codexMainAccountHardLock"),
|
|
733
|
+
codexMainAccountHardLockFallback: config.codexMainAccountHardLockFallback,
|
|
734
|
+
hasCodexMainAccountHardLockFallback: Object.hasOwn(config, "codexMainAccountHardLockFallback"),
|
|
735
|
+
codexDesktopAuthless: config.codexDesktopAuthless,
|
|
736
|
+
hasCodexDesktopAuthless: Object.hasOwn(config, "codexDesktopAuthless"),
|
|
737
|
+
codexClientCompaction: config.codexClientCompaction,
|
|
738
|
+
hasCodexClientCompaction: Object.hasOwn(config, "codexClientCompaction"),
|
|
739
|
+
};
|
|
740
|
+
try {
|
|
741
|
+
if (typeof body.codexAutoStart === "boolean") {
|
|
742
|
+
config.codexAutoStart = body.codexAutoStart;
|
|
743
|
+
}
|
|
744
|
+
if (body.streamMode !== undefined) {
|
|
745
|
+
if (body.streamMode === "auto") {
|
|
746
|
+
deleteConfigTopLevelKey(config, "streamMode");
|
|
747
|
+
} else {
|
|
748
|
+
config.streamMode = body.streamMode as "legacy-tee" | "eager-relay";
|
|
749
|
+
}
|
|
750
|
+
}
|
|
751
|
+
if (typeof body.appOwnedMemoryBudgetMb === "number") {
|
|
752
|
+
config.appOwnedMemoryBudgetMb = body.appOwnedMemoryBudgetMb;
|
|
753
|
+
}
|
|
754
|
+
if (body.codexAccountPickerEnabled === true) {
|
|
755
|
+
config.codexAccountPickerEnabled = true;
|
|
756
|
+
initializeDefaultCodexAccountNamespaces(config);
|
|
757
|
+
} else if (body.codexAccountPickerEnabled === false) {
|
|
758
|
+
config.codexAccountPickerEnabled = false;
|
|
759
|
+
}
|
|
760
|
+
if (typeof body.showCodexCredits === "boolean") config.showCodexCredits = body.showCodexCredits;
|
|
761
|
+
if (typeof body.oauthOpenBrowser === "boolean") {
|
|
762
|
+
config.oauthOpenBrowser = body.oauthOpenBrowser;
|
|
763
|
+
}
|
|
764
|
+
// Off deletes the key rather than persisting `false`: absent is the documented
|
|
765
|
+
// default, and a written `false` would survive as a decision nobody made.
|
|
766
|
+
if (body.ultraFastTier === true) config.ultraFastTier = true;
|
|
767
|
+
else if (body.ultraFastTier === false) deleteConfigTopLevelKey(config, "ultraFastTier");
|
|
768
|
+
if (body.fastRows === false) config.fastRows = false;
|
|
769
|
+
else if (body.fastRows === true) deleteConfigTopLevelKey(config, "fastRows");
|
|
770
|
+
// Inverted from the pair above because the default is on (#5694): off is the persisted
|
|
771
|
+
// decision, so it writes `false`, while on deletes the key and returns to the default.
|
|
772
|
+
if (hardLockThresholds !== undefined) config.codexMainAccountHardLockThresholds = { ...hardLockThresholds };
|
|
773
|
+
if (body.codexMainAccountHardLock === false) config.codexMainAccountHardLock = false;
|
|
774
|
+
else if (body.codexMainAccountHardLock === true) deleteConfigTopLevelKey(config, "codexMainAccountHardLock");
|
|
775
|
+
if (hardLockFallback === null) deleteConfigTopLevelKey(config, "codexMainAccountHardLockFallback");
|
|
776
|
+
else if (hardLockFallback?.success) config.codexMainAccountHardLockFallback = hardLockFallback.data;
|
|
777
|
+
if (body.codexDesktopAuthless === true) config.codexDesktopAuthless = true;
|
|
778
|
+
else if (body.codexDesktopAuthless === false) deleteConfigTopLevelKey(config, "codexDesktopAuthless");
|
|
779
|
+
if (body.codexClientCompaction === true) config.codexClientCompaction = true;
|
|
780
|
+
else if (body.codexClientCompaction === false) deleteConfigTopLevelKey(config, "codexClientCompaction");
|
|
781
|
+
if (compactionRouting === null) deleteConfigTopLevelKey(config, "compactionRouting");
|
|
782
|
+
else if (compactionRouting?.success) config.compactionRouting = compactionRouting.data;
|
|
783
|
+
if (compactionRecovery === null) deleteConfigTopLevelKey(config, "compactionRecovery");
|
|
784
|
+
else if (compactionRecovery?.success) config.compactionRecovery = compactionRecovery.data;
|
|
785
|
+
if (reasoningRetention === null) deleteConfigTopLevelKey(config, "reasoningRetention");
|
|
786
|
+
else if (reasoningRetention?.success) config.reasoningRetention = reasoningRetention.data;
|
|
787
|
+
// Null clears both phases; the GUI sends that when neither row names a model.
|
|
788
|
+
if (memoryModels === null) deleteConfigTopLevelKey(config, "memoryModels");
|
|
789
|
+
else if (memoryModels?.success) config.memoryModels = memoryModels.data;
|
|
790
|
+
if (quotaAutoRefreshChange) {
|
|
791
|
+
const { id, window, enabled } = quotaAutoRefreshChange;
|
|
792
|
+
const setting = { ...(config.codexQuotaAutoRefresh?.[id] ?? {}) };
|
|
793
|
+
if (enabled) setting[window] = true;
|
|
794
|
+
else delete setting[window];
|
|
795
|
+
const all = { ...(config.codexQuotaAutoRefresh ?? {}) };
|
|
796
|
+
if (Object.keys(setting).length > 0) all[id] = setting;
|
|
797
|
+
else delete all[id];
|
|
798
|
+
if (Object.keys(all).length > 0) config.codexQuotaAutoRefresh = all;
|
|
799
|
+
else deleteConfigTopLevelKey(config, "codexQuotaAutoRefresh");
|
|
800
|
+
}
|
|
801
|
+
pickerIsEnabled = codexAccountPickerEnabled(config);
|
|
802
|
+
(deps.saveConfigPreservingClaudeCode ?? saveConfigPreservingClaudeCode)(config);
|
|
803
|
+
authlessIsEnabled = config.codexDesktopAuthless === true;
|
|
804
|
+
clientCompactionIsEnabled = config.codexClientCompaction === true;
|
|
805
|
+
fastRowsIsEnabled = config.fastRows !== false;
|
|
806
|
+
fastRowsChanged = fastRowsWasEnabled !== fastRowsIsEnabled;
|
|
807
|
+
desktopSwitchesChanged = authlessWasEnabled !== authlessIsEnabled || clientCompactionWasEnabled !== clientCompactionIsEnabled;
|
|
808
|
+
} catch (error) {
|
|
809
|
+
if (previousSettings.hasCodexAutoStart) config.codexAutoStart = previousSettings.codexAutoStart;
|
|
810
|
+
else deleteConfigTopLevelKey(config, "codexAutoStart");
|
|
811
|
+
if (previousSettings.hasStreamMode) config.streamMode = previousSettings.streamMode;
|
|
812
|
+
else deleteConfigTopLevelKey(config, "streamMode");
|
|
813
|
+
if (previousSettings.hasAppOwnedMemoryBudgetMb) {
|
|
814
|
+
config.appOwnedMemoryBudgetMb = previousSettings.appOwnedMemoryBudgetMb;
|
|
815
|
+
} else deleteConfigTopLevelKey(config, "appOwnedMemoryBudgetMb");
|
|
816
|
+
if (previousSettings.hasCodexAccountNamespaces) {
|
|
817
|
+
config.codexAccountNamespaces = previousSettings.codexAccountNamespaces;
|
|
818
|
+
} else deleteConfigTopLevelKey(config, "codexAccountNamespaces");
|
|
819
|
+
if (previousSettings.hasCodexAccountPickerEnabled) {
|
|
820
|
+
config.codexAccountPickerEnabled = previousSettings.codexAccountPickerEnabled;
|
|
821
|
+
} else deleteConfigTopLevelKey(config, "codexAccountPickerEnabled");
|
|
822
|
+
if (previousSettings.hasCodexQuotaAutoRefresh) {
|
|
823
|
+
config.codexQuotaAutoRefresh = previousSettings.codexQuotaAutoRefresh;
|
|
824
|
+
} else deleteConfigTopLevelKey(config, "codexQuotaAutoRefresh");
|
|
825
|
+
if (previousSettings.hasShowCodexCredits) config.showCodexCredits = previousSettings.showCodexCredits;
|
|
826
|
+
else deleteConfigTopLevelKey(config, "showCodexCredits");
|
|
827
|
+
if (previousSettings.hasOauthOpenBrowser) {
|
|
828
|
+
config.oauthOpenBrowser = previousSettings.oauthOpenBrowser;
|
|
829
|
+
} else deleteConfigTopLevelKey(config, "oauthOpenBrowser");
|
|
830
|
+
if (previousSettings.hasUltraFastTier) {
|
|
831
|
+
config.ultraFastTier = previousSettings.ultraFastTier;
|
|
832
|
+
} else deleteConfigTopLevelKey(config, "ultraFastTier");
|
|
833
|
+
if (previousSettings.hasFastRows) {
|
|
834
|
+
config.fastRows = previousSettings.fastRows;
|
|
835
|
+
} else deleteConfigTopLevelKey(config, "fastRows");
|
|
836
|
+
if (previousSettings.hasCodexMainAccountHardLockThresholds) {
|
|
837
|
+
config.codexMainAccountHardLockThresholds = previousSettings.codexMainAccountHardLockThresholds;
|
|
838
|
+
} else deleteConfigTopLevelKey(config, "codexMainAccountHardLockThresholds");
|
|
839
|
+
if (previousSettings.hasCodexMainAccountHardLock) {
|
|
840
|
+
config.codexMainAccountHardLock = previousSettings.codexMainAccountHardLock;
|
|
841
|
+
} else deleteConfigTopLevelKey(config, "codexMainAccountHardLock");
|
|
842
|
+
if (previousSettings.hasCodexMainAccountHardLockFallback) {
|
|
843
|
+
config.codexMainAccountHardLockFallback = previousSettings.codexMainAccountHardLockFallback;
|
|
844
|
+
} else deleteConfigTopLevelKey(config, "codexMainAccountHardLockFallback");
|
|
845
|
+
if (previousSettings.hasCodexDesktopAuthless) {
|
|
846
|
+
config.codexDesktopAuthless = previousSettings.codexDesktopAuthless;
|
|
847
|
+
} else deleteConfigTopLevelKey(config, "codexDesktopAuthless");
|
|
848
|
+
if (previousSettings.hasCodexClientCompaction) {
|
|
849
|
+
config.codexClientCompaction = previousSettings.codexClientCompaction;
|
|
850
|
+
} else deleteConfigTopLevelKey(config, "codexClientCompaction");
|
|
851
|
+
restoreCompactionRouting();
|
|
852
|
+
throw error;
|
|
853
|
+
}
|
|
854
|
+
return null;
|
|
855
|
+
});
|
|
856
|
+
if (refusal) return refusal;
|
|
816
857
|
if (typeof body.appOwnedMemoryBudgetMb === "number") {
|
|
817
858
|
configureAppOwnedMemoryBudget(resolveAppOwnedMemoryBudgetBytes(body.appOwnedMemoryBudgetMb));
|
|
818
859
|
enforceAppOwnedMemoryBudget();
|
|
819
860
|
}
|
|
820
|
-
const authlessIsEnabled = config.codexDesktopAuthless === true;
|
|
821
|
-
const clientCompactionIsEnabled = config.codexClientCompaction === true;
|
|
822
|
-
const fastRowsIsEnabled = config.fastRows !== false;
|
|
823
|
-
const fastRowsChanged = fastRowsWasEnabled !== fastRowsIsEnabled;
|
|
824
|
-
const desktopSwitchesChanged = authlessWasEnabled !== authlessIsEnabled
|
|
825
|
-
|| clientCompactionWasEnabled !== clientCompactionIsEnabled;
|
|
826
861
|
// Catalog convergence is not config injection, and the comment that used to sit here said
|
|
827
862
|
// it was. `convergeCodexCatalog` rejects any scope but `catalog` and never reaches the
|
|
828
863
|
// injector, which is why flipping either switch left `config.toml` in its old shape until
|
|
@@ -937,11 +972,22 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
937
972
|
// Resolve the systemd-scope launcher before spawning: the first request
|
|
938
973
|
// would otherwise run up to four sequential five-second probes inside
|
|
939
974
|
// spawnSync on the shared event loop.
|
|
940
|
-
const { resolveSystemdRunAsync } = await import("../../update/worker-launch");
|
|
975
|
+
const { resolveSystemdRunAsync, dashboardRestartRefusal } = await import("../../update/worker-launch");
|
|
941
976
|
const systemdRun = process.platform === "linux" && process.env.INVOCATION_ID
|
|
942
977
|
? await resolveSystemdRunAsync()
|
|
943
978
|
: undefined;
|
|
944
|
-
|
|
979
|
+
const restart = body.restart !== false;
|
|
980
|
+
// Refuse before any package mutation, with or without restart: the update stops the proxy
|
|
981
|
+
// first, so a worker that dies with the service cgroup, or a restart aimed at a unit that
|
|
982
|
+
// does not own this proxy, leaves the dashboard down (#7967).
|
|
983
|
+
// Only an update that would actually run is refused; an unavailable update or a source
|
|
984
|
+
// checkout keeps its own refusal from startUpdateJob.
|
|
985
|
+
if (checked.canUpdate) {
|
|
986
|
+
const { TASK } = await import("../../service/state");
|
|
987
|
+
const refusal = (deps.dashboardRestartRefusal ?? dashboardRestartRefusal)({ systemdRun, unitName: TASK });
|
|
988
|
+
if (refusal) return jsonResponse({ error: refusal, code: "update_restart_unsupervised" }, 409);
|
|
989
|
+
}
|
|
990
|
+
return jsonResponse({ ok: true, job: startUpdateJob(channel, restart, {
|
|
945
991
|
checkForUpdateFn: () => checked,
|
|
946
992
|
spawnWorkerFn: (jobId, runChannel, runRestart) =>
|
|
947
993
|
spawnGuiUpdateWorker(jobId, runChannel, runRestart, { resolveSystemdRun: () => systemdRun }),
|
|
@@ -955,8 +1001,8 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
955
1001
|
}
|
|
956
1002
|
|
|
957
1003
|
if (url.pathname === "/api/update/status" && req.method === "GET") {
|
|
958
|
-
const {
|
|
959
|
-
const job =
|
|
1004
|
+
const { readUpdateJobForStatus } = await import("../../update/job");
|
|
1005
|
+
const job = readUpdateJobForStatus(url.searchParams.get("jobId"));
|
|
960
1006
|
if (!job) return jsonResponse({ error: "update job not found" }, 404);
|
|
961
1007
|
return jsonResponse({ ok: true, job });
|
|
962
1008
|
}
|
|
@@ -1004,11 +1050,6 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
1004
1050
|
};
|
|
1005
1051
|
};
|
|
1006
1052
|
const WEB_SEARCH_BACKENDS_UNION = ["openai", "anthropic", "xai", "gemini", "exa"] as const;
|
|
1007
|
-
const instanceError = anthropicSidecarPatchError(config, {
|
|
1008
|
-
...(body.webSearch ? { webSearchSidecar: body.webSearch } : {}),
|
|
1009
|
-
...(body.vision ? { visionSidecar: body.vision } : {}),
|
|
1010
|
-
});
|
|
1011
|
-
if (instanceError) return jsonResponse({ error: instanceError }, 400);
|
|
1012
1053
|
if (body.webSearch && body.webSearch.backend !== undefined && body.webSearch.backend !== null
|
|
1013
1054
|
&& !WEB_SEARCH_BACKENDS_UNION.includes(body.webSearch.backend as never)) {
|
|
1014
1055
|
return jsonResponse({ error: "webSearch.backend must be openai, anthropic, xai, gemini, exa, or null" }, 400);
|
|
@@ -1045,189 +1086,208 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
1045
1086
|
if (body.vision?.reasoning !== undefined && !isVisionReasoningEffort(body.vision.reasoning)) {
|
|
1046
1087
|
return jsonResponse({ error: `vision.reasoning must be ${VISION_REASONING_EFFORTS.join(", ")}` }, 400);
|
|
1047
1088
|
}
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
|
|
1054
|
-
|
|
1055
|
-
const
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
//
|
|
1061
|
-
//
|
|
1062
|
-
//
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
if (
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1089
|
+
const evidenceState = JSON.stringify(config);
|
|
1090
|
+
const visionEvidence = typeof body.vision?.model === "string" && body.vision.model !== ""
|
|
1091
|
+
? await visionCandidateRows({ ...config, visionSidecar: sidecarSettingsAfterPatch(config.visionSidecar, body.vision) }) : undefined;
|
|
1092
|
+
const webEvidence = body.webSearch && (body.webSearch.model !== undefined || body.webSearch.backend !== undefined || body.webSearch.anthropicInstance !== undefined)
|
|
1093
|
+
? await webSearchCandidateRows({ ...config, webSearchSidecar: sidecarSettingsAfterPatch(config.webSearchSidecar, body.webSearch) }) : undefined;
|
|
1094
|
+
const committed = await settleConfigRoot(configRoot(), () => {
|
|
1095
|
+
if ((visionEvidence || webEvidence) && JSON.stringify(config) !== evidenceState) return jsonResponse({ error: "Sidecar validation state changed during discovery", code: "config_changed" }, 409);
|
|
1096
|
+
const instanceError = anthropicSidecarPatchError(config, {
|
|
1097
|
+
...(body.webSearch ? { webSearchSidecar: body.webSearch } : {}),
|
|
1098
|
+
...(body.vision ? { visionSidecar: body.vision } : {}),
|
|
1099
|
+
});
|
|
1100
|
+
if (instanceError) return jsonResponse({ error: instanceError }, 400);
|
|
1101
|
+
// Reject ONLY a model we can prove is blind. An id nothing knows about stays
|
|
1102
|
+
// allowed: the operator may be ahead of our catalog, and the runtime never
|
|
1103
|
+
// required catalog membership (`tests/vision/vision-reasoning-contract.test.ts`
|
|
1104
|
+
// pins `custom-vision` → 200). The catalog is read ONCE and reused for the
|
|
1105
|
+
// rejection body, so a 400 cannot cost two provider fetches.
|
|
1106
|
+
if (body.vision && typeof body.vision.model === "string" && body.vision.model !== "") {
|
|
1107
|
+
const requested = body.vision.model;
|
|
1108
|
+
const candidates = visionEvidence!;
|
|
1109
|
+
const hint = body.vision.backend === "anthropic" || body.vision.backend === "openai"
|
|
1110
|
+
|| body.vision.backend === "routed"
|
|
1111
|
+
? body.vision.backend
|
|
1112
|
+
: config.visionSidecar?.backend;
|
|
1113
|
+
// Coherence (roadmap 170 r2): the forward/OAuth executors POST the model
|
|
1114
|
+
// string VERBATIM, so a namespaced id on those backends persists a wire
|
|
1115
|
+
// id they cannot run; and "routed" without a namespace cannot route.
|
|
1116
|
+
const effectiveBackend = hint ?? "openai";
|
|
1117
|
+
const namespaced = requested.includes("/");
|
|
1118
|
+
if (namespaced && effectiveBackend !== "routed") {
|
|
1119
|
+
return jsonResponse({ error: `vision.model "${requested}" is provider-namespaced; it requires vision.backend "routed"` }, 400);
|
|
1120
|
+
}
|
|
1121
|
+
if (!namespaced && effectiveBackend === "routed") {
|
|
1122
|
+
return jsonResponse({ error: `vision.backend "routed" requires a provider-namespaced vision.model ("provider/model"); got "${requested}"` }, 400);
|
|
1123
|
+
}
|
|
1124
|
+
if (visionDescriberIsProvablyBlind(config, requested, candidates, hint)) {
|
|
1125
|
+
return jsonResponse(visionDescriberRejection("vision.model", requested, config, candidates), 400);
|
|
1126
|
+
}
|
|
1073
1127
|
}
|
|
1074
|
-
}
|
|
1075
1128
|
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1087
|
-
|
|
1129
|
+
let normalizedVisionReasoning: ReturnType<typeof normalizeVisionReasoningForModel>;
|
|
1130
|
+
let visionReasoningTouched = false;
|
|
1131
|
+
if (body.vision && (body.vision.model !== undefined || body.vision.reasoning !== undefined)) {
|
|
1132
|
+
visionReasoningTouched = true;
|
|
1133
|
+
const model = typeof body.vision.model === "string"
|
|
1134
|
+
? (body.vision.model === "" ? "gpt-5.6-luna" : body.vision.model)
|
|
1135
|
+
: (config.visionSidecar?.model || "gpt-5.6-luna");
|
|
1136
|
+
const sourceReasoning = body.vision.reasoning ?? config.visionSidecar?.reasoning;
|
|
1137
|
+
normalizedVisionReasoning = sourceReasoning === undefined
|
|
1138
|
+
? undefined
|
|
1139
|
+
: normalizeVisionReasoningForModel(model, sourceReasoning);
|
|
1140
|
+
}
|
|
1088
1141
|
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
|
|
1102
|
-
|
|
1103
|
-
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
|
|
1110
|
-
|
|
1111
|
-
|
|
1112
|
-
|
|
1113
|
-
|
|
1114
|
-
|
|
1115
|
-
|
|
1142
|
+
// Read BEFORE the mutation below: the Codex-side key follows the switch, and a flip is the
|
|
1143
|
+
// only case that owes a config.toml rewrite.
|
|
1144
|
+
const webSearchEnabledBefore = config.webSearchSidecar?.enabled !== false;
|
|
1145
|
+
const visionEnabledBefore = config.visionSidecar?.enabled !== false;
|
|
1146
|
+
let webSearchCandidate: OcxConfig["webSearchSidecar"];
|
|
1147
|
+
if (body.webSearch) {
|
|
1148
|
+
const pairTouched = body.webSearch.model !== undefined || body.webSearch.backend !== undefined || body.webSearch.anthropicInstance !== undefined;
|
|
1149
|
+
// Validate against the backend the caller SUBMITTED, across the whole
|
|
1150
|
+
// union — not just openai/anthropic (#2457). The union check above has
|
|
1151
|
+
// already refused unknown literals, so a surviving string is a member;
|
|
1152
|
+
// Array.includes does not narrow, hence the cast. Falling back to the
|
|
1153
|
+
// stored backend for xai/gemini/exa both rejected legal pairs and
|
|
1154
|
+
// accepted illegal ones: a submitted gemini was checked against a stored
|
|
1155
|
+
// openai. null means "unset the backend", and unset resolves to openai.
|
|
1156
|
+
const submittedBackend = body.webSearch.backend;
|
|
1157
|
+
const effectiveBackend = typeof submittedBackend === "string"
|
|
1158
|
+
&& WEB_SEARCH_BACKENDS_UNION.includes(submittedBackend as never)
|
|
1159
|
+
? submittedBackend as typeof WEB_SEARCH_BACKENDS_UNION[number]
|
|
1160
|
+
: submittedBackend === null
|
|
1161
|
+
? "openai"
|
|
1162
|
+
: config.webSearchSidecar?.backend ?? "openai";
|
|
1163
|
+
const effectiveModel = typeof body.webSearch.model === "string"
|
|
1164
|
+
? body.webSearch.model || undefined
|
|
1165
|
+
: config.webSearchSidecar?.model;
|
|
1166
|
+
if (pairTouched && effectiveModel) {
|
|
1167
|
+
const candidates = webEvidence!;
|
|
1168
|
+
if (webSearchModelIsRejected(effectiveBackend, effectiveModel, candidates)) {
|
|
1169
|
+
return jsonResponse(webSearchModelRejection("webSearch.model", effectiveBackend, effectiveModel, candidates), 400);
|
|
1170
|
+
}
|
|
1116
1171
|
}
|
|
1117
|
-
|
|
1118
|
-
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
else webSearchCandidate.model = body.webSearch.model;
|
|
1124
|
-
}
|
|
1125
|
-
if (body.webSearch.backend === null) delete webSearchCandidate.backend;
|
|
1126
|
-
else if (WEB_SEARCH_BACKENDS_UNION.includes(body.webSearch.backend as never)) {
|
|
1127
|
-
webSearchCandidate.backend = body.webSearch.backend as typeof WEB_SEARCH_BACKENDS_UNION[number];
|
|
1128
|
-
}
|
|
1129
|
-
if (typeof body.webSearch.reasoning === "string") webSearchCandidate.reasoning = body.webSearch.reasoning;
|
|
1130
|
-
// Operator secret for the exa backend: string sets, empty string clears. The GET
|
|
1131
|
-
// payload deliberately never carries it and redact.ts strips the key from logs.
|
|
1132
|
-
if (typeof body.webSearch.exaApiKey === "string") {
|
|
1133
|
-
if (body.webSearch.exaApiKey === "") delete webSearchCandidate.exaApiKey;
|
|
1134
|
-
else webSearchCandidate.exaApiKey = body.webSearch.exaApiKey;
|
|
1135
|
-
}
|
|
1136
|
-
// Opt-in x_search block (L7): null clears; an object is doc-validated before persisting.
|
|
1137
|
-
if (body.webSearch.xSearch === null) delete webSearchCandidate.xSearch;
|
|
1138
|
-
else if (body.webSearch.xSearch !== undefined) {
|
|
1139
|
-
if (!isPlainRecord(body.webSearch.xSearch)) {
|
|
1140
|
-
return jsonResponse({ error: "webSearch.xSearch must be an object or null" }, 400);
|
|
1172
|
+
webSearchCandidate = { ...config.webSearchSidecar };
|
|
1173
|
+
if (body.webSearch.anthropicInstance === null) delete webSearchCandidate.anthropicInstance;
|
|
1174
|
+
else if (isAnthropicInstanceId(body.webSearch.anthropicInstance)) webSearchCandidate.anthropicInstance = body.webSearch.anthropicInstance;
|
|
1175
|
+
if (typeof body.webSearch.model === "string") {
|
|
1176
|
+
if (body.webSearch.model === "") delete webSearchCandidate.model;
|
|
1177
|
+
else webSearchCandidate.model = body.webSearch.model;
|
|
1141
1178
|
}
|
|
1142
|
-
|
|
1143
|
-
|
|
1144
|
-
|
|
1145
|
-
"allowedXHandles",
|
|
1146
|
-
"excludedXHandles",
|
|
1147
|
-
"fromDate",
|
|
1148
|
-
"toDate",
|
|
1149
|
-
]);
|
|
1150
|
-
const unknownKey = Object.keys(x).find(key => !allowedXSearchKeys.has(key));
|
|
1151
|
-
if (unknownKey !== undefined) {
|
|
1152
|
-
return jsonResponse({ error: `webSearch.xSearch.${unknownKey} is not a supported field` }, 400);
|
|
1179
|
+
if (body.webSearch.backend === null) delete webSearchCandidate.backend;
|
|
1180
|
+
else if (WEB_SEARCH_BACKENDS_UNION.includes(body.webSearch.backend as never)) {
|
|
1181
|
+
webSearchCandidate.backend = body.webSearch.backend as typeof WEB_SEARCH_BACKENDS_UNION[number];
|
|
1153
1182
|
}
|
|
1154
|
-
if (
|
|
1155
|
-
|
|
1183
|
+
if (typeof body.webSearch.reasoning === "string") webSearchCandidate.reasoning = body.webSearch.reasoning;
|
|
1184
|
+
// Operator secret for the exa backend: string sets, empty string clears. The GET
|
|
1185
|
+
// payload deliberately never carries it and redact.ts strips the key from logs.
|
|
1186
|
+
if (typeof body.webSearch.exaApiKey === "string") {
|
|
1187
|
+
if (body.webSearch.exaApiKey === "") delete webSearchCandidate.exaApiKey;
|
|
1188
|
+
else webSearchCandidate.exaApiKey = body.webSearch.exaApiKey;
|
|
1156
1189
|
}
|
|
1157
|
-
|
|
1158
|
-
|
|
1159
|
-
|
|
1160
|
-
|
|
1190
|
+
// Opt-in x_search block (L7): null clears; an object is doc-validated before persisting.
|
|
1191
|
+
if (body.webSearch.xSearch === null) delete webSearchCandidate.xSearch;
|
|
1192
|
+
else if (body.webSearch.xSearch !== undefined) {
|
|
1193
|
+
if (!isPlainRecord(body.webSearch.xSearch)) {
|
|
1194
|
+
return jsonResponse({ error: "webSearch.xSearch must be an object or null" }, 400);
|
|
1161
1195
|
}
|
|
1162
|
-
|
|
1163
|
-
|
|
1164
|
-
|
|
1165
|
-
|
|
1196
|
+
const x = body.webSearch.xSearch as Record<string, unknown>;
|
|
1197
|
+
const allowedXSearchKeys = new Set([
|
|
1198
|
+
"enabled",
|
|
1199
|
+
"allowedXHandles",
|
|
1200
|
+
"excludedXHandles",
|
|
1201
|
+
"fromDate",
|
|
1202
|
+
"toDate",
|
|
1203
|
+
]);
|
|
1204
|
+
const unknownKey = Object.keys(x).find(key => !allowedXSearchKeys.has(key));
|
|
1205
|
+
if (unknownKey !== undefined) {
|
|
1206
|
+
return jsonResponse({ error: `webSearch.xSearch.${unknownKey} is not a supported field` }, 400);
|
|
1207
|
+
}
|
|
1208
|
+
if (x.enabled !== undefined && typeof x.enabled !== "boolean") {
|
|
1209
|
+
return jsonResponse({ error: "webSearch.xSearch.enabled must be a boolean" }, 400);
|
|
1210
|
+
}
|
|
1211
|
+
for (const field of ["allowedXHandles", "excludedXHandles"] as const) {
|
|
1212
|
+
const value = x[field];
|
|
1213
|
+
if (value !== undefined && (!Array.isArray(value) || !value.every(handle => typeof handle === "string"))) {
|
|
1214
|
+
return jsonResponse({ error: `webSearch.xSearch.${field} must be an array of strings` }, 400);
|
|
1215
|
+
}
|
|
1216
|
+
}
|
|
1217
|
+
for (const field of ["fromDate", "toDate"] as const) {
|
|
1218
|
+
if (x[field] !== undefined && typeof x[field] !== "string") {
|
|
1219
|
+
return jsonResponse({ error: `webSearch.xSearch.${field} must be an ISO-8601 date (YYYY-MM-DD)` }, 400);
|
|
1220
|
+
}
|
|
1166
1221
|
}
|
|
1222
|
+
const candidate = {
|
|
1223
|
+
...(x.enabled === true ? { enabled: true } : {}),
|
|
1224
|
+
...(x.allowedXHandles !== undefined ? { allowedXHandles: x.allowedXHandles as string[] } : {}),
|
|
1225
|
+
...(x.excludedXHandles !== undefined ? { excludedXHandles: x.excludedXHandles as string[] } : {}),
|
|
1226
|
+
...(x.fromDate !== undefined ? { fromDate: x.fromDate as string } : {}),
|
|
1227
|
+
...(x.toDate !== undefined ? { toDate: x.toDate as string } : {}),
|
|
1228
|
+
};
|
|
1229
|
+
const invalid = validateXaiSearchOptions({
|
|
1230
|
+
xSearch: candidate.enabled,
|
|
1231
|
+
allowedXHandles: candidate.allowedXHandles,
|
|
1232
|
+
excludedXHandles: candidate.excludedXHandles,
|
|
1233
|
+
fromDate: candidate.fromDate,
|
|
1234
|
+
toDate: candidate.toDate,
|
|
1235
|
+
});
|
|
1236
|
+
if (invalid) return jsonResponse({ error: `webSearch.xSearch invalid: ${invalid}` }, 400);
|
|
1237
|
+
webSearchCandidate.xSearch = candidate;
|
|
1238
|
+
}
|
|
1239
|
+
if (typeof body.webSearch.streamRoutedModelOutput === "boolean") {
|
|
1240
|
+
// `false` is the default — drop the key so config files stay minimal.
|
|
1241
|
+
if (body.webSearch.streamRoutedModelOutput) webSearchCandidate.streamRoutedModelOutput = true;
|
|
1242
|
+
else delete webSearchCandidate.streamRoutedModelOutput;
|
|
1243
|
+
}
|
|
1244
|
+
if (typeof body.webSearch.enabled === "boolean") {
|
|
1245
|
+
// `true` is the default — drop the key so a disable/re-enable cycle does not rewrite the
|
|
1246
|
+
// file, exactly like the Vision master switch.
|
|
1247
|
+
if (body.webSearch.enabled) delete webSearchCandidate.enabled;
|
|
1248
|
+
else webSearchCandidate.enabled = false;
|
|
1167
1249
|
}
|
|
1168
|
-
const candidate = {
|
|
1169
|
-
...(x.enabled === true ? { enabled: true } : {}),
|
|
1170
|
-
...(x.allowedXHandles !== undefined ? { allowedXHandles: x.allowedXHandles as string[] } : {}),
|
|
1171
|
-
...(x.excludedXHandles !== undefined ? { excludedXHandles: x.excludedXHandles as string[] } : {}),
|
|
1172
|
-
...(x.fromDate !== undefined ? { fromDate: x.fromDate as string } : {}),
|
|
1173
|
-
...(x.toDate !== undefined ? { toDate: x.toDate as string } : {}),
|
|
1174
|
-
};
|
|
1175
|
-
const invalid = validateXaiSearchOptions({
|
|
1176
|
-
xSearch: candidate.enabled,
|
|
1177
|
-
allowedXHandles: candidate.allowedXHandles,
|
|
1178
|
-
excludedXHandles: candidate.excludedXHandles,
|
|
1179
|
-
fromDate: candidate.fromDate,
|
|
1180
|
-
toDate: candidate.toDate,
|
|
1181
|
-
});
|
|
1182
|
-
if (invalid) return jsonResponse({ error: `webSearch.xSearch invalid: ${invalid}` }, 400);
|
|
1183
|
-
webSearchCandidate.xSearch = candidate;
|
|
1184
|
-
}
|
|
1185
|
-
if (typeof body.webSearch.streamRoutedModelOutput === "boolean") {
|
|
1186
|
-
// `false` is the default — drop the key so config files stay minimal.
|
|
1187
|
-
if (body.webSearch.streamRoutedModelOutput) webSearchCandidate.streamRoutedModelOutput = true;
|
|
1188
|
-
else delete webSearchCandidate.streamRoutedModelOutput;
|
|
1189
|
-
}
|
|
1190
|
-
if (typeof body.webSearch.enabled === "boolean") {
|
|
1191
|
-
// `true` is the default — drop the key so a disable/re-enable cycle does not rewrite the
|
|
1192
|
-
// file, exactly like the Vision master switch.
|
|
1193
|
-
if (body.webSearch.enabled) delete webSearchCandidate.enabled;
|
|
1194
|
-
else webSearchCandidate.enabled = false;
|
|
1195
|
-
}
|
|
1196
|
-
config.webSearchSidecar = webSearchCandidate;
|
|
1197
|
-
}
|
|
1198
|
-
if (body.vision) {
|
|
1199
|
-
config.visionSidecar = { ...config.visionSidecar };
|
|
1200
|
-
if (body.vision.anthropicInstance === null) delete config.visionSidecar.anthropicInstance;
|
|
1201
|
-
else if (isAnthropicInstanceId(body.vision.anthropicInstance)) config.visionSidecar.anthropicInstance = body.vision.anthropicInstance;
|
|
1202
|
-
if (typeof body.vision.model === "string") {
|
|
1203
|
-
if (body.vision.model === "") delete config.visionSidecar.model;
|
|
1204
|
-
else config.visionSidecar.model = body.vision.model;
|
|
1205
|
-
}
|
|
1206
|
-
if (body.vision.backend === null) delete config.visionSidecar.backend;
|
|
1207
|
-
else if (body.vision.backend === "openai" || body.vision.backend === "anthropic"
|
|
1208
|
-
|| body.vision.backend === "routed") {
|
|
1209
|
-
config.visionSidecar.backend = body.vision.backend;
|
|
1210
|
-
}
|
|
1211
|
-
if (typeof body.vision.maxDescriptionsPerTurn === "number") {
|
|
1212
|
-
config.visionSidecar.maxDescriptionsPerTurn = body.vision.maxDescriptionsPerTurn;
|
|
1213
|
-
}
|
|
1214
|
-
if (typeof body.vision.enabled === "boolean") {
|
|
1215
|
-
// `true` is the default — drop the key so disable/re-enable does not rewrite the file.
|
|
1216
|
-
if (body.vision.enabled) delete config.visionSidecar.enabled;
|
|
1217
|
-
else config.visionSidecar.enabled = false;
|
|
1218
|
-
}
|
|
1219
|
-
if (typeof body.vision.timeoutMs === "number") {
|
|
1220
|
-
config.visionSidecar.timeoutMs = body.vision.timeoutMs;
|
|
1221
1250
|
}
|
|
1222
|
-
|
|
1223
|
-
|
|
1224
|
-
|
|
1251
|
+
const visionCandidate = { ...config.visionSidecar };
|
|
1252
|
+
if (body.vision) {
|
|
1253
|
+
if (body.vision.anthropicInstance === null) delete visionCandidate.anthropicInstance;
|
|
1254
|
+
else if (isAnthropicInstanceId(body.vision.anthropicInstance)) visionCandidate.anthropicInstance = body.vision.anthropicInstance;
|
|
1255
|
+
if (typeof body.vision.model === "string") {
|
|
1256
|
+
if (body.vision.model === "") delete visionCandidate.model;
|
|
1257
|
+
else visionCandidate.model = body.vision.model;
|
|
1258
|
+
}
|
|
1259
|
+
if (body.vision.backend === null) delete visionCandidate.backend;
|
|
1260
|
+
else if (body.vision.backend === "openai" || body.vision.backend === "anthropic"
|
|
1261
|
+
|| body.vision.backend === "routed") {
|
|
1262
|
+
visionCandidate.backend = body.vision.backend;
|
|
1263
|
+
}
|
|
1264
|
+
if (typeof body.vision.maxDescriptionsPerTurn === "number") {
|
|
1265
|
+
visionCandidate.maxDescriptionsPerTurn = body.vision.maxDescriptionsPerTurn;
|
|
1266
|
+
}
|
|
1267
|
+
if (typeof body.vision.enabled === "boolean") {
|
|
1268
|
+
// `true` is the default — drop the key so disable/re-enable does not rewrite the file.
|
|
1269
|
+
if (body.vision.enabled) delete visionCandidate.enabled;
|
|
1270
|
+
else visionCandidate.enabled = false;
|
|
1271
|
+
}
|
|
1272
|
+
if (typeof body.vision.timeoutMs === "number") {
|
|
1273
|
+
visionCandidate.timeoutMs = body.vision.timeoutMs;
|
|
1274
|
+
}
|
|
1275
|
+
if (visionReasoningTouched) {
|
|
1276
|
+
if (normalizedVisionReasoning === undefined) delete visionCandidate.reasoning;
|
|
1277
|
+
else visionCandidate.reasoning = normalizedVisionReasoning;
|
|
1278
|
+
}
|
|
1225
1279
|
}
|
|
1226
|
-
|
|
1227
|
-
|
|
1280
|
+
|
|
1281
|
+
if (webSearchCandidate) config.webSearchSidecar = webSearchCandidate;
|
|
1282
|
+
if (body.vision) config.visionSidecar = visionCandidate;
|
|
1283
|
+
saveConfigPreservingClaudeCode(config);
|
|
1284
|
+
return { visionEnabledChanged: visionEnabledBefore !== (config.visionSidecar?.enabled !== false),
|
|
1285
|
+
webSearchEnabledChanged: typeof body.webSearch?.enabled === "boolean" && webSearchEnabledBefore !== (config.webSearchSidecar?.enabled !== false) };
|
|
1286
|
+
});
|
|
1287
|
+
if (committed instanceof Response) return committed;
|
|
1228
1288
|
// Publish the changed attachment affordance to both the managed catalog and Codex cache.
|
|
1229
1289
|
// Use the existing bounded catalog-only path after persistence, outside the config lock.
|
|
1230
|
-
const catalogRefresh =
|
|
1290
|
+
const catalogRefresh = committed.visionEnabledChanged
|
|
1231
1291
|
? await convergeCodexCatalog()
|
|
1232
1292
|
: undefined;
|
|
1233
1293
|
// The sidecar's own switch is only half of what "off" means: Codex keeps declaring its native
|
|
@@ -1235,8 +1295,7 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
1235
1295
|
// is the one the model reaches for — which is why an MCP search server needs the client-side
|
|
1236
1296
|
// key off too. The injection owns that root key, and a write that cannot happen is reported
|
|
1237
1297
|
// (the Desktop switches' contract) instead of being stored as if it had.
|
|
1238
|
-
const webSearchEnabledChanged =
|
|
1239
|
-
&& webSearchEnabledBefore !== (config.webSearchSidecar?.enabled !== false);
|
|
1298
|
+
const webSearchEnabledChanged = committed.webSearchEnabledChanged;
|
|
1240
1299
|
const codexWebSearch: CodexDesktopSwitchApply = webSearchEnabledChanged
|
|
1241
1300
|
? await applyCodexConfigInjection(config)
|
|
1242
1301
|
: { applied: false, reason: "not_requested", retryable: false };
|
|
@@ -1266,46 +1325,60 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
1266
1325
|
}
|
|
1267
1326
|
|
|
1268
1327
|
if (url.pathname === "/api/shadow-call-settings" && req.method === "GET") {
|
|
1269
|
-
|
|
1270
|
-
return jsonResponse({
|
|
1271
|
-
enabled: sci.enabled === true,
|
|
1272
|
-
model: sci.model ?? "",
|
|
1273
|
-
sourceModels: shadowSourceModels(sci.sourceModels),
|
|
1274
|
-
});
|
|
1328
|
+
return jsonResponse(shadowCallSettingsResponse(config));
|
|
1275
1329
|
}
|
|
1276
1330
|
|
|
1277
1331
|
if (url.pathname === "/api/shadow-call-settings" && req.method === "PUT") {
|
|
1278
1332
|
let raw: unknown;
|
|
1279
1333
|
try { raw = await readManagementJsonBody(req); } catch (error) { rethrowManagementBodyTooLarge(error); return jsonResponse({ error: "invalid JSON body" }, 400); }
|
|
1280
1334
|
if (!isPlainRecord(raw)) return jsonResponse({ error: "body must be a JSON object" }, 400);
|
|
1281
|
-
const body = raw as { enabled?: unknown; model?: unknown };
|
|
1335
|
+
const body = raw as { enabled?: unknown; model?: unknown; sourceModels?: unknown };
|
|
1282
1336
|
if (body.enabled !== undefined && typeof body.enabled !== "boolean") {
|
|
1283
1337
|
return jsonResponse({ error: "enabled must be a boolean" }, 400);
|
|
1284
1338
|
}
|
|
1285
1339
|
if (body.model !== undefined && typeof body.model !== "string") {
|
|
1286
1340
|
return jsonResponse({ error: "model must be a string" }, 400);
|
|
1287
1341
|
}
|
|
1288
|
-
const
|
|
1289
|
-
? body.
|
|
1290
|
-
|
|
1291
|
-
|
|
1292
|
-
|
|
1293
|
-
|
|
1294
|
-
|
|
1295
|
-
|
|
1296
|
-
|
|
1297
|
-
|
|
1298
|
-
|
|
1299
|
-
|
|
1300
|
-
|
|
1301
|
-
|
|
1302
|
-
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
|
|
1306
|
-
|
|
1307
|
-
|
|
1342
|
+
const refusal = await settleConfigRoot(configRoot(), () => {
|
|
1343
|
+
const sourceModelsError = body.sourceModels === undefined ? null : shadowCallSourceModelsError(body.sourceModels);
|
|
1344
|
+
if (sourceModelsError) {
|
|
1345
|
+
return jsonResponse({ error: sourceModelsError, code: "shadow_call_source_invalid" }, 400);
|
|
1346
|
+
}
|
|
1347
|
+
const nextSourceModels = body.sourceModels === undefined
|
|
1348
|
+
? undefined
|
|
1349
|
+
: normalizeShadowCallSourceModels(body.sourceModels as string[]);
|
|
1350
|
+
const candidateModel = typeof body.model === "string"
|
|
1351
|
+
? body.model
|
|
1352
|
+
: body.enabled === true || body.sourceModels !== undefined
|
|
1353
|
+
? config.shadowCallIntercept?.model
|
|
1354
|
+
: undefined;
|
|
1355
|
+
const targetError = shadowCallTargetError(config, candidateModel, nextSourceModels ?? config.shadowCallIntercept?.sourceModels);
|
|
1356
|
+
if (targetError) {
|
|
1357
|
+
return jsonResponse({ error: targetError, code: "shadow_call_target_invalid" }, 400);
|
|
1358
|
+
}
|
|
1359
|
+
const rollback = captureConfigTopLevelRollback(config, ["shadowCallIntercept"]);
|
|
1360
|
+
try {
|
|
1361
|
+
config.shadowCallIntercept = { ...config.shadowCallIntercept };
|
|
1362
|
+
if (typeof body.enabled === "boolean") config.shadowCallIntercept.enabled = body.enabled;
|
|
1363
|
+
if (typeof body.model === "string") {
|
|
1364
|
+
if (body.model === "") delete config.shadowCallIntercept.model;
|
|
1365
|
+
else config.shadowCallIntercept.model = body.model;
|
|
1366
|
+
}
|
|
1367
|
+
if (nextSourceModels) {
|
|
1368
|
+
// Drop a list that merely restates the built-in set, so future client
|
|
1369
|
+
// versions can move the defaults without pinning them here.
|
|
1370
|
+
if (isDefaultShadowSourceModels(nextSourceModels)) delete config.shadowCallIntercept.sourceModels;
|
|
1371
|
+
else config.shadowCallIntercept.sourceModels = nextSourceModels;
|
|
1372
|
+
}
|
|
1373
|
+
(deps.saveConfigPreservingClaudeCode ?? saveConfigPreservingClaudeCode)(config);
|
|
1374
|
+
} catch (error) {
|
|
1375
|
+
if (!(error instanceof ConfigWritePublishedError)) rollback();
|
|
1376
|
+
throw error;
|
|
1377
|
+
}
|
|
1378
|
+
return null;
|
|
1308
1379
|
});
|
|
1380
|
+
if (refusal) return refusal;
|
|
1381
|
+
return jsonResponse({ ok: true, ...shadowCallSettingsResponse(config) });
|
|
1309
1382
|
}
|
|
1310
1383
|
|
|
1311
1384
|
if (url.pathname === "/api/auto-review-settings" && req.method === "GET") {
|
|
@@ -1320,24 +1393,26 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
1320
1393
|
const body = raw as { enabled?: unknown; model?: unknown };
|
|
1321
1394
|
const shapeError = autoReviewOverrideConfigError(body, "body");
|
|
1322
1395
|
if (shapeError) return jsonResponse({ error: shapeError }, 400);
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
|
|
1326
|
-
|
|
1327
|
-
|
|
1328
|
-
|
|
1329
|
-
|
|
1330
|
-
|
|
1396
|
+
await settleConfigRoot(configRoot(), () => {
|
|
1397
|
+
const rollback = captureConfigTopLevelRollback(config, ["autoReviewOverride"]);
|
|
1398
|
+
try {
|
|
1399
|
+
config.autoReviewOverride = { ...config.autoReviewOverride };
|
|
1400
|
+
if (typeof body.enabled === "boolean") config.autoReviewOverride.enabled = body.enabled;
|
|
1401
|
+
if (typeof body.model === "string") {
|
|
1402
|
+
const trimmed = body.model.trim();
|
|
1403
|
+
if (trimmed === "") delete config.autoReviewOverride.model;
|
|
1404
|
+
else config.autoReviewOverride.model = trimmed;
|
|
1405
|
+
}
|
|
1406
|
+
(deps.saveConfigPreservingClaudeCode ?? saveConfigPreservingClaudeCode)(config);
|
|
1407
|
+
} catch (error) {
|
|
1408
|
+
if (!(error instanceof ConfigWritePublishedError)) rollback();
|
|
1409
|
+
throw error;
|
|
1331
1410
|
}
|
|
1332
|
-
|
|
1333
|
-
} catch (error) {
|
|
1334
|
-
if (!(error instanceof ConfigWritePublishedError)) rollback();
|
|
1335
|
-
throw error;
|
|
1336
|
-
}
|
|
1411
|
+
});
|
|
1337
1412
|
// The catalog carries the reviewer stamps, so the new selector has to reach it now; the
|
|
1338
1413
|
// disposition travels in the body like every other catalog-affecting route.
|
|
1339
1414
|
const catalogRefresh = await convergeCodexCatalog();
|
|
1340
|
-
const override = config.autoReviewOverride;
|
|
1415
|
+
const override = config.autoReviewOverride ?? {};
|
|
1341
1416
|
return jsonResponse({ ok: true, enabled: override.enabled === true, model: override.model ?? "", catalogRefresh });
|
|
1342
1417
|
}
|
|
1343
1418
|
return null;
|