@bitkyc08/opencodex 2.93.0 → 2.94.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-BXu4zE8H.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- 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
|
@@ -1,3 +1,7 @@
|
|
|
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";
|
|
4
|
+
import { mirrorDesiredEnabledOntoSnapshot } from "./claude-desktop-config-writers";
|
|
1
5
|
import { ensureManagementClaudeIntercept, interceptStartRefusal } from "./claude-intercept-routes";
|
|
2
6
|
import { persistCommittedDesktopGateway } from "../../claude/desktop-gateway-state";
|
|
3
7
|
import { commitClaudeCodeBlock } from "../../claude/claude-code-block";
|
|
@@ -31,7 +35,7 @@ import { OPENAI_CODEX_PROVIDER_ID } from "../../providers/openai-tiers";
|
|
|
31
35
|
import { inspectDesktop3pConfigLibrary, removeDesktop3pStandardPivot, writeDesktop3pConfig } from "../../claude/desktop-3p";
|
|
32
36
|
import {
|
|
33
37
|
applyDesktopFirstParty, withFirstPartySecretsSettled,
|
|
34
|
-
captureDesktopFirstPartyRollback,
|
|
38
|
+
captureDesktopFirstPartyRollback, rollbackDesktopFirstPartySettled,
|
|
35
39
|
inspectDesktopFirstParty,
|
|
36
40
|
observeClaudeDesktopMode,
|
|
37
41
|
recordClaudeDesktopMode,
|
|
@@ -50,7 +54,7 @@ import { grokConfigPath } from "../../grok/status";
|
|
|
50
54
|
import { assertNativeTeardownOwned } from "../../integrations/native/ownership-preflight";
|
|
51
55
|
import type { CodexNativeRestoreResult } from "../../codex/inject";
|
|
52
56
|
import type { OcxConfig } from "../../types";
|
|
53
|
-
import { getConfigDir
|
|
57
|
+
import { getConfigDir } from "../../config/paths";
|
|
54
58
|
import { jsonResponse } from "../auth-cors";
|
|
55
59
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
56
60
|
import { managementInferencePort, type ManagementContext } from "./context";
|
|
@@ -676,16 +680,22 @@ function pickerCleanupNote(picker: DesktopPickerStatus): string {
|
|
|
676
680
|
}
|
|
677
681
|
|
|
678
682
|
/** Record which Desktop mode is applied; `false` when the config file could not be updated. */
|
|
679
|
-
function persistDesktopModeMarker(config: ManagementContext["config"], desktopMode: ClaudeDesktopMode): boolean {
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
683
|
+
async function persistDesktopModeMarker(config: ManagementContext["config"], desktopMode: ClaudeDesktopMode): Promise<boolean> {
|
|
684
|
+
try {
|
|
685
|
+
return await settleConfigRoot(configRoot(), () => {
|
|
686
|
+
const outcome = mutatePersistedConfig(persisted => {
|
|
687
|
+
const result = recordClaudeDesktopMode(persisted, desktopMode);
|
|
688
|
+
return { changed: result.changed, value: structuredClone(persisted.claudeCode) };
|
|
689
|
+
});
|
|
690
|
+
if (outcome.status === "unavailable") return false;
|
|
691
|
+
adoptPersistedClaudeCode(config, outcome.value);
|
|
692
|
+
// Pin the committed leaf: an unarmed baseline can otherwise retain a stale live mode.
|
|
693
|
+
recordClaudeDesktopMode(config, desktopMode);
|
|
694
|
+
return true;
|
|
695
|
+
});
|
|
696
|
+
} catch {
|
|
697
|
+
return false;
|
|
698
|
+
}
|
|
689
699
|
}
|
|
690
700
|
|
|
691
701
|
let claudeDesktopToggleFlight: Promise<Response> | null = null;
|
|
@@ -695,6 +705,7 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
695
705
|
return refusal(409, "claude-desktop", "config_busy",
|
|
696
706
|
"Another Claude Desktop change is already in flight. Nothing was written — try again in a moment.");
|
|
697
707
|
}
|
|
708
|
+
let committedDesiredEnabled: boolean | undefined;
|
|
698
709
|
claudeDesktopToggleFlight = (async (): Promise<Response> => {
|
|
699
710
|
let body: { enabled?: unknown };
|
|
700
711
|
try {
|
|
@@ -706,14 +717,21 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
706
717
|
if (typeof body.enabled !== "boolean") return jsonResponse({ error: "enabled must be a boolean" }, 400);
|
|
707
718
|
|
|
708
719
|
const { setIntegrationEnabled } = await import("../../codex/desired-state");
|
|
709
|
-
const
|
|
720
|
+
const enabled = body.enabled;
|
|
721
|
+
const persisted = await settleConfigRoot(configRoot(), () => {
|
|
722
|
+
const result = setIntegrationEnabled("claude-desktop", enabled);
|
|
723
|
+
if (result.ok) {
|
|
724
|
+
committedDesiredEnabled = enabled;
|
|
725
|
+
mirrorDesiredEnabledOntoSnapshot(ctx.config, "claude-desktop", enabled);
|
|
726
|
+
}
|
|
727
|
+
return result;
|
|
728
|
+
});
|
|
710
729
|
if (!persisted.ok) {
|
|
711
730
|
return refusal(persisted.retryable ? 409 : 500, "claude-desktop", persisted.retryable ? "config_busy" : "write_failed", persisted.message);
|
|
712
731
|
}
|
|
713
732
|
const desiredEnabled = loadConfig().clientIntegrations?.["claude-desktop"] !== false;
|
|
733
|
+
committedDesiredEnabled = desiredEnabled;
|
|
714
734
|
const current = loadConfig();
|
|
715
|
-
// Publish committed Desktop intent to the live config used by intercept routing.
|
|
716
|
-
ctx.config.clientIntegrations = structuredClone(current.clientIntegrations);
|
|
717
735
|
const fingerprint = current.claudeCode?.desktopProfile?.appliedFingerprint ?? null;
|
|
718
736
|
|
|
719
737
|
if (!body.enabled) {
|
|
@@ -725,7 +743,7 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
725
743
|
return postCommitRefusal(409, "claude-desktop", "write_failed",
|
|
726
744
|
`Claude Code settings could not be read (${firstPartyRemoved.path}); the first-party proxy env was left in place.`, { desiredEnabled });
|
|
727
745
|
}
|
|
728
|
-
const removed = (ctx.deps.removeDesktop3pStandardPivot ?? removeDesktop3pStandardPivot)({ appliedFingerprint:
|
|
746
|
+
const removed = await settleConfigRoot(configRoot(), () => (ctx.deps.removeDesktop3pStandardPivot ?? removeDesktop3pStandardPivot)({ appliedFingerprint: readConfigForAdmittedMutation().claudeCode?.desktopProfile?.appliedFingerprint ?? null }));
|
|
729
747
|
if (removed.kind === "cleanup_incomplete") {
|
|
730
748
|
return postCommitRefusal(500, "claude-desktop", "cleanup_incomplete",
|
|
731
749
|
"Claude Desktop now points at standard mode, but credential cleanup is incomplete.",
|
|
@@ -757,22 +775,30 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
757
775
|
if (started.state.proxyPort !== configured) return jsonResponse({ ok: false, code: "port_mismatch", bound: started.state.proxyPort, configured }, 409);
|
|
758
776
|
// The whole switch runs under the picker lock, in today's order: env first, then gateway cleanup.
|
|
759
777
|
return await runPickerTransition(current, async ops => {
|
|
760
|
-
|
|
761
|
-
const applied = await withFirstPartySecretsSettled(getConfigDir(), () =>
|
|
778
|
+
let rollback!: ReturnType<typeof captureDesktopFirstPartyRollback>;
|
|
779
|
+
const applied = await withFirstPartySecretsSettled(getConfigDir(), () => {
|
|
780
|
+
const fresh = readConfigForAdmittedMutation(); rollback = captureDesktopFirstPartyRollback(fresh); return applyDesktopFirstParty(fresh);
|
|
781
|
+
});
|
|
762
782
|
if (!applied.ok) {
|
|
763
783
|
const reason = applied.reason === "foreign_env" || applied.reason === "intercept_disabled" ? applied.reason : "write_failed";
|
|
764
784
|
return postCommitRefusal(applied.reason === "unreadable" || applied.reason === "ca_unavailable" ? 500 : 409, "claude-desktop", reason,
|
|
765
785
|
firstPartyRefusalMessage(applied.reason, applied.path), { desiredEnabled, ...(applied.diagnostic ? { diagnostic: applied.diagnostic } : {}) });
|
|
766
786
|
}
|
|
787
|
+
let gatewayRemoved = false, modeCommitted = false;
|
|
788
|
+
try {
|
|
767
789
|
const library = inspectDesktop3pConfigLibrary({ appliedFingerprint: fingerprint });
|
|
768
|
-
let gatewayRemoved = false;
|
|
769
790
|
if (library.kind === "gateway_ours" || library.kind === "gateway_drifted") {
|
|
770
|
-
|
|
771
|
-
|
|
791
|
+
let removed: ReturnType<typeof removeDesktop3pStandardPivot>;
|
|
792
|
+
try { removed = await settleConfigRoot(configRoot(), () => (ctx.deps.removeDesktop3pStandardPivot ?? removeDesktop3pStandardPivot)({ appliedFingerprint: readConfigForAdmittedMutation().claudeCode?.desktopProfile?.appliedFingerprint ?? null, replaceWhileEnabled: true })); }
|
|
793
|
+
catch (error) {
|
|
794
|
+
removed = { ok: false, changed: false, kind: "write_failed", libraryPath: library.libraryPath,
|
|
795
|
+
reason: error instanceof WindowsSecretAclSettleTimeoutError ? "acl_settlement_timeout" : "desktop_mutation_failed" };
|
|
796
|
+
}
|
|
797
|
+
if (!removed.ok && !removed.changed && applied.changed && !await rollbackDesktopFirstPartySettled(getConfigDir(), rollback).catch(() => false)) {
|
|
772
798
|
return postCommitRefusal(500, "claude-desktop", "write_failed",
|
|
773
799
|
"Gateway cleanup and first-party settings rollback did not complete.", { desiredEnabled });
|
|
774
800
|
}
|
|
775
|
-
const partialModeWarning = !removed.ok && removed.changed && !persistDesktopModeMarker(ctx.config, "first-party")
|
|
801
|
+
const partialModeWarning = !removed.ok && removed.changed && !await persistDesktopModeMarker(ctx.config, "first-party")
|
|
776
802
|
? " First-party is active but its mode marker was not saved." : "";
|
|
777
803
|
if (removed.kind === "cleanup_incomplete") {
|
|
778
804
|
return postCommitRefusal(500, "claude-desktop", "cleanup_incomplete",
|
|
@@ -785,7 +811,8 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
785
811
|
}
|
|
786
812
|
gatewayRemoved = removed.changed;
|
|
787
813
|
}
|
|
788
|
-
const modeSaved = persistDesktopModeMarker(ctx.config, "first-party");
|
|
814
|
+
const modeSaved = await persistDesktopModeMarker(ctx.config, "first-party");
|
|
815
|
+
modeCommitted = modeSaved;
|
|
789
816
|
const changed = applied.changed || gatewayRemoved;
|
|
790
817
|
// Picker mode is on by default in first-party; only a committed mode turns it on.
|
|
791
818
|
const picker = modeSaved && pickerPreferenceOn(loadConfig())
|
|
@@ -802,6 +829,14 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
802
829
|
modeSaved ? "" : "The first-party mode marker could not be saved to config; status may report the mode as unsaved.",
|
|
803
830
|
].filter(Boolean).join(" "),
|
|
804
831
|
} satisfies NativeToggleEnvelope);
|
|
832
|
+
} catch {
|
|
833
|
+
const retained = gatewayRemoved || modeCommitted;
|
|
834
|
+
const restored = retained || !applied.changed || await rollbackDesktopFirstPartySettled(getConfigDir(), rollback).catch(() => false);
|
|
835
|
+
return postCommitRefusal(500, "claude-desktop", "write_failed",
|
|
836
|
+
retained ? "First-party settings were applied; follow-up did not complete."
|
|
837
|
+
: restored ? "First-party settings were rolled back; Desktop enable intent remains saved." : "first-party settings rollback did not complete",
|
|
838
|
+
{ desiredEnabled });
|
|
839
|
+
}
|
|
805
840
|
});
|
|
806
841
|
}
|
|
807
842
|
|
|
@@ -809,7 +844,7 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
809
844
|
try {
|
|
810
845
|
const fetched = await fetchModels(current);
|
|
811
846
|
return await runPickerTransition(current, async ops => {
|
|
812
|
-
|
|
847
|
+
let latest = loadConfig();
|
|
813
848
|
const latestDesiredEnabled = latest.clientIntegrations?.["claude-desktop"] !== false;
|
|
814
849
|
if (!latestDesiredEnabled) {
|
|
815
850
|
return postCommitRefusal(409, "claude-desktop", "desired_state_changed",
|
|
@@ -817,21 +852,21 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
817
852
|
}
|
|
818
853
|
// Picker mode belongs to first-party: stop terminating claude.ai before the gateway lands.
|
|
819
854
|
const pickerOff = await ops.disableLocked({ persist: false });
|
|
820
|
-
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
nativeContextLimits(latest),
|
|
832
|
-
);
|
|
855
|
+
let writtenProfile: NonNullable<ManagementContext["config"]["claudeCode"]>["desktopProfile"];
|
|
856
|
+
const result = await settleConfigRoot(configRoot(), () => {
|
|
857
|
+
latest = readConfigForAdmittedMutation();
|
|
858
|
+
if (latest.clientIntegrations?.["claude-desktop"] === false) return null;
|
|
859
|
+
writtenProfile = latest.claudeCode?.desktopProfile;
|
|
860
|
+
const routed = filterCatalogVisibleModels(fetched, latest).map(model => ({ provider: model.provider, id: model.id, contextWindow: model.contextWindow }));
|
|
861
|
+
const runtime = (ctx.deps.readRuntimePort ?? readRuntimePort)(process.pid);
|
|
862
|
+
return (ctx.deps.writeDesktop3pConfig ?? writeDesktop3pConfig)(runtime?.port ?? latest.port,
|
|
863
|
+
[...desktopVisibleNativeSlugs(latest)], routed, latest.apiKeys?.[0]?.key, "static", writtenProfile, nativeContextLimits(latest));
|
|
864
|
+
});
|
|
865
|
+
if (result === null) return postCommitRefusal(409, "claude-desktop", "desired_state_changed", "Desktop enable was cancelled because desired state changed to off.", { desiredEnabled: false });
|
|
833
866
|
if (!result.written) return postCommitRefusal(500, "claude-desktop", "write_failed", "Claude Desktop apply failed.", { desiredEnabled: latestDesiredEnabled });
|
|
834
|
-
const committed = persistCommittedDesktopGateway(ctx.config,
|
|
867
|
+
const committed = await settleConfigRoot(configRoot(), () => persistCommittedDesktopGateway(ctx.config, writtenProfile, result.fingerprint)).catch(() => {
|
|
868
|
+
return { ok: false, reason: "unavailable" } as const;
|
|
869
|
+
});
|
|
835
870
|
const stateWarning = committed.ok ? "" : " The committed gateway mode/profile state was not saved.";
|
|
836
871
|
const removed = await removeDesktopFirstPartySettled(loadConfig);
|
|
837
872
|
if (!removed.ok) return postCommitRefusal(500, "claude-desktop", "write_failed", "Gateway applied, but first-party settings cleanup did not complete." + stateWarning, { desiredEnabled: latestDesiredEnabled });
|
|
@@ -851,6 +886,23 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
851
886
|
})();
|
|
852
887
|
try {
|
|
853
888
|
return await claudeDesktopToggleFlight;
|
|
889
|
+
} catch (error) {
|
|
890
|
+
if (committedDesiredEnabled !== undefined) {
|
|
891
|
+
return postCommitRefusal(500, "claude-desktop", "write_failed",
|
|
892
|
+
error instanceof WindowsSecretAclSettleTimeoutError
|
|
893
|
+
? "Claude Desktop intent was saved, but configuration cleanup or apply did not complete because config-directory ACL settlement timed out."
|
|
894
|
+
: "Claude Desktop intent was saved, but configuration cleanup or apply did not complete.",
|
|
895
|
+
{ desiredEnabled: committedDesiredEnabled,
|
|
896
|
+
...(error instanceof WindowsSecretAclSettleTimeoutError && resolveClaudeDesktopApplyMode(ctx.config, observeClaudeDesktopMode(ctx.config)) === "first-party"
|
|
897
|
+
? { diagnostic: { stage: "ca", cause: "ETIMEDOUT" } as const } : {}) });
|
|
898
|
+
}
|
|
899
|
+
if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
|
|
900
|
+
if (resolveClaudeDesktopApplyMode(ctx.config, observeClaudeDesktopMode(ctx.config)) === "first-party") {
|
|
901
|
+
return jsonResponse({ error: "native integration change failed", code: "native_integration_failed", clientId: "claude-desktop",
|
|
902
|
+
reason: "write_failed", message: "Config-directory ACL settlement timed out. Nothing was written.",
|
|
903
|
+
diagnostic: { stage: "ca", cause: "ETIMEDOUT" } }, 500);
|
|
904
|
+
}
|
|
905
|
+
return refusal(500, "claude-desktop", "write_failed", "Config-directory ACL settlement timed out. Nothing was written.");
|
|
854
906
|
} finally {
|
|
855
907
|
claudeDesktopToggleFlight = null;
|
|
856
908
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { hasHumanDashboardSession } from "./consent-session";
|
|
1
2
|
import { isAnthropicOAuthInstance, configuredAnthropicInstance, type AnthropicInstanceId } from "../../providers/anthropic-instance";
|
|
2
3
|
import { resolveAnthropicAccountPoolConfig } from "../../oauth/anthropic-pool-config";
|
|
3
4
|
import { persistAnthropicPoolPatch, writeAnthropicPoolSettings } from "./anthropic-pool-settings";
|
|
@@ -214,12 +215,12 @@ export function revokeApiKeyInProcess(config: OcxConfig, id: string): boolean {
|
|
|
214
215
|
return true;
|
|
215
216
|
}
|
|
216
217
|
|
|
217
|
-
function canStartManagementOAuth(provider: string,
|
|
218
|
-
return provider !== "meta-muse" ||
|
|
218
|
+
function canStartManagementOAuth(provider: string, ctx: ManagementContext): boolean {
|
|
219
|
+
return provider !== "meta-muse" || hasHumanDashboardSession(ctx);
|
|
219
220
|
}
|
|
220
221
|
|
|
221
|
-
function metaMuseConsentRequired(provider: string,
|
|
222
|
-
if (canStartManagementOAuth(provider,
|
|
222
|
+
function metaMuseConsentRequired(provider: string, ctx: ManagementContext): Response | null {
|
|
223
|
+
if (canStartManagementOAuth(provider, ctx)) return null;
|
|
223
224
|
return jsonResponse({
|
|
224
225
|
error: "Meta Muse login requires acknowledgement in the OpenCodex dashboard.",
|
|
225
226
|
code: "oauth_consent_required",
|
|
@@ -246,7 +247,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
246
247
|
if (url.pathname === "/api/oauth/providers" && req.method === "GET") {
|
|
247
248
|
// Discovery reflects this principal's admission; hiding a button is not the
|
|
248
249
|
// consent boundary, which remains independently enforced on both POST routes.
|
|
249
|
-
return jsonResponse({ providers: listOAuthProviders().filter(provider => canStartManagementOAuth(provider,
|
|
250
|
+
return jsonResponse({ providers: listOAuthProviders().filter(provider => canStartManagementOAuth(provider, ctx)) });
|
|
250
251
|
}
|
|
251
252
|
|
|
252
253
|
// API-key "login" providers (open dashboard → paste key). Drives the GUI's key-provider picker.
|
|
@@ -273,7 +274,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
273
274
|
// and reauth skip the import. All management login paths require the dashboard
|
|
274
275
|
// principal before credential acquisition. A raw token proves administration,
|
|
275
276
|
// not acknowledgement; caller-supplied headers are not consent evidence.
|
|
276
|
-
const consentRequired = metaMuseConsentRequired(provider,
|
|
277
|
+
const consentRequired = metaMuseConsentRequired(provider, ctx);
|
|
277
278
|
if (consentRequired) return consentRequired;
|
|
278
279
|
const namespaceCollision = codexAccountNamespaceProviderCollisionError(config.codexAccountNamespaces, provider);
|
|
279
280
|
if (namespaceCollision) return jsonResponse({ error: namespaceCollision }, 409);
|
|
@@ -390,7 +391,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
390
391
|
const body = await readManagementJsonBodyOr(req, {}) as { provider?: string; input?: string; code?: string; flowId?: unknown };
|
|
391
392
|
const provider = (body.provider ?? "").trim().toLowerCase();
|
|
392
393
|
if (!isPublicOAuthProvider(provider)) return jsonResponse({ error: "unknown oauth provider" }, 400);
|
|
393
|
-
const consentRequired = metaMuseConsentRequired(provider,
|
|
394
|
+
const consentRequired = metaMuseConsentRequired(provider, ctx);
|
|
394
395
|
if (consentRequired) return consentRequired;
|
|
395
396
|
const flowId = typeof body.flowId === "string" ? body.flowId : undefined;
|
|
396
397
|
const maskEmails = emailMaskingEnabled(config);
|
|
@@ -173,11 +173,15 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
173
173
|
{ method: "GET", path: "/api/claude-desktop/picker", module: "server/management/claude-desktop-picker-routes", mutates: false },
|
|
174
174
|
{ method: "PUT", path: "/api/claude-desktop/picker", module: "server/management/claude-desktop-picker-routes", mutates: true },
|
|
175
175
|
{ method: "GET", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "Certificate status is available over authenticated HTTP while the desktop compatibility runtime/CLI status contract is integrated." } },
|
|
176
|
-
{ method: "POST", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Certificate setup requires
|
|
176
|
+
{ method: "POST", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Certificate setup requires an operator-paired local dashboard session; raw admin tokens and automatic loopback sessions cannot enroll or remove OS trust." } },
|
|
177
177
|
{ method: "GET", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "Experimental runtime status is authenticated HTTP while the native compatibility UI and CLI contract are integrated." } },
|
|
178
|
-
{ method: "POST", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Native app launch and account-wide UI trial require explicit local dashboard
|
|
178
|
+
{ method: "POST", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Native app launch and account-wide UI trial require explicit confirmation from an operator-paired local dashboard session." } },
|
|
179
179
|
{ method: "GET", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "The persisted startup preference is currently owned by the local desktop compatibility panel." } },
|
|
180
|
-
{ method: "POST", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Saved native observation intent requires an
|
|
180
|
+
{ method: "POST", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Saved native observation intent requires an operator-paired local GUI action and fresh field revision." } },
|
|
181
|
+
// server/management/codex-cli-update-routes
|
|
182
|
+
{ method: "GET", path: "/api/codex/cli-update/plan", module: "server/management/codex-cli-update-routes", mutates: false, exempt: { reason: "local-transport", why: "The CLI runs the same proof-bound plan builder locally; the authenticated route also supplies the dashboard plan." } },
|
|
183
|
+
{ method: "POST", path: "/api/codex/cli-update/apply", module: "server/management/codex-cli-update-routes", mutates: true, exempt: { reason: "session-only", why: "HTTP apply requires a confirmed trusted loopback GUI session; the CLI invokes the same durable job owner locally." } },
|
|
184
|
+
{ method: "GET", path: "/api/codex/cli-update/jobs/{jobId}", module: "server/management/codex-cli-update-routes", mutates: false, mechanism: "regex", exempt: { reason: "local-transport", why: "The CLI status command reads the same protected job record directly and does not use job IDs as authorization." } },
|
|
181
185
|
{ method: "PUT", path: "/api/codex-auth/features/default-mode-request-user-input", module: "server/management/agent-settings-routes", mutates: true },
|
|
182
186
|
{ method: "PUT", path: "/api/effort-caps", module: "server/management/agent-settings-routes", mutates: true },
|
|
183
187
|
{ method: "PUT", path: "/api/grok/selection", module: "server/management/agent-settings-routes", mutates: true },
|
|
@@ -401,6 +405,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
401
405
|
{ method: "POST", path: "/api/routing-profiles/dry-run", module: "server/management/routing-profile-routes", mutates: true },
|
|
402
406
|
{ method: "PUT", path: "/api/routing-profiles", module: "server/management/routing-profile-routes", mutates: true },
|
|
403
407
|
// server/management/session-routes
|
|
408
|
+
{ method: "POST", path: "/api/session/remember", module: "server/management/session-routes", mutates: true, exempt: { reason: "session-only", why: "Explicit admin-token exchange for a revocable HttpOnly device cookie, restricted to a same-origin HTTPS dashboard or loopback. The CLI does not own a browser cookie jar." } },
|
|
404
409
|
{ method: "POST", path: "/api/session/logout", module: "server/management/session-routes", mutates: true, exempt: { reason: "session-only", why: "Logs out the CURRENT gui-session and requires its own Origin and CSRF. There is nothing for a CLI verb to log out of: the CLI holds an admin token, and the admin token is refused here precisely so it cannot end a consent session it never established." } },
|
|
405
410
|
// server/management/sidebar-routes
|
|
406
411
|
{ method: "GET", path: "/api/github/star", module: "server/management/sidebar-routes", mutates: false },
|
|
@@ -2,12 +2,30 @@ import { jsonResponse } from "../auth-cors";
|
|
|
2
2
|
import type { ManagementContext } from "./context";
|
|
3
3
|
|
|
4
4
|
export function handleSessionRoutes(ctx: ManagementContext): Response | null {
|
|
5
|
+
if (ctx.url.pathname === "/api/session/remember" && ctx.req.method === "POST") {
|
|
6
|
+
if (ctx.principal !== "admin-token") return jsonResponse({ error: "Admin token required" }, 403, ctx.req, ctx.config);
|
|
7
|
+
try {
|
|
8
|
+
const remembered = ctx.sessionControl?.rememberDevice?.(ctx.req, ctx.config);
|
|
9
|
+
if (!remembered) return jsonResponse({ error: "Remember requires a direct HTTPS dashboard (or loopback) and matching Origin" }, 403, ctx.req, ctx.config);
|
|
10
|
+
const response = jsonResponse({ session: remembered.session, device: remembered.device }, 200, ctx.req, ctx.config);
|
|
11
|
+
response.headers.set("Set-Cookie", remembered.cookie);
|
|
12
|
+
response.headers.set("Cache-Control", "no-store");
|
|
13
|
+
return response;
|
|
14
|
+
} catch { return jsonResponse({ error: "Could not persist dashboard session" }, 503, ctx.req, ctx.config); }
|
|
15
|
+
}
|
|
5
16
|
if (ctx.url.pathname !== "/api/session/logout" || ctx.req.method !== "POST") return null;
|
|
6
17
|
if (ctx.principal !== "gui-session") {
|
|
7
18
|
return jsonResponse({ error: "GUI session required" }, 403, ctx.req, ctx.config);
|
|
8
19
|
}
|
|
9
|
-
|
|
20
|
+
let expiredCookie: string | null | undefined;
|
|
21
|
+
try { expiredCookie = ctx.sessionControl?.forgetDevice?.(ctx.req, ctx.config); }
|
|
22
|
+
catch { return jsonResponse({ error: "Could not forget dashboard session" }, 503, ctx.req, ctx.config); }
|
|
23
|
+
// Forget may already have revoked every short-lived session belonging to this device.
|
|
24
|
+
if (!ctx.sessionControl?.revokeCurrent(ctx.req) && !expiredCookie) {
|
|
10
25
|
return jsonResponse({ error: "GUI session not found" }, 401, ctx.req, ctx.config);
|
|
11
26
|
}
|
|
12
|
-
|
|
27
|
+
const response = jsonResponse({ ok: true }, 200, ctx.req, ctx.config);
|
|
28
|
+
if (expiredCookie) response.headers.set("Set-Cookie", expiredCookie);
|
|
29
|
+
response.headers.set("Cache-Control", "no-store");
|
|
30
|
+
return response;
|
|
13
31
|
}
|
|
@@ -3,8 +3,16 @@ import { OPENAI_CODEX_PROVIDER_ID } from "../../providers/openai-tiers";
|
|
|
3
3
|
import { routeConcreteModel, routeModel } from "../../router";
|
|
4
4
|
import type { OcxConfig } from "../../types";
|
|
5
5
|
|
|
6
|
+
/** Keep a persisted override small enough for the per-request prefix scan. */
|
|
7
|
+
export const SHADOW_SOURCE_MODEL_LIMIT = 32;
|
|
8
|
+
export const SHADOW_SOURCE_PREFIX_MAX_LENGTH = 128;
|
|
9
|
+
|
|
6
10
|
/** Validate a prospective persisted shadow-call target against its resolved source identities. */
|
|
7
|
-
export function shadowCallTargetError(
|
|
11
|
+
export function shadowCallTargetError(
|
|
12
|
+
config: OcxConfig,
|
|
13
|
+
targetModel: string | undefined,
|
|
14
|
+
sourceModels: unknown = config.shadowCallIntercept?.sourceModels,
|
|
15
|
+
): string | null {
|
|
8
16
|
if (!targetModel) return null;
|
|
9
17
|
|
|
10
18
|
let target;
|
|
@@ -19,7 +27,7 @@ export function shadowCallTargetError(config: OcxConfig, targetModel: string | u
|
|
|
19
27
|
return "model must resolve to a configured provider";
|
|
20
28
|
}
|
|
21
29
|
|
|
22
|
-
const intersectsSource = shadowSourceModels(
|
|
30
|
+
const intersectsSource = shadowSourceModels(sourceModels).some(sourceModel => {
|
|
23
31
|
let source = { providerName: OPENAI_CODEX_PROVIDER_ID, modelId: sourceModel };
|
|
24
32
|
try {
|
|
25
33
|
const resolved = routeConcreteModel(config, sourceModel);
|
|
@@ -33,6 +41,39 @@ export function shadowCallTargetError(config: OcxConfig, targetModel: string | u
|
|
|
33
41
|
: null;
|
|
34
42
|
}
|
|
35
43
|
|
|
44
|
+
/**
|
|
45
|
+
* Validate a new `sourceModels` list before it reaches persisted config.
|
|
46
|
+
* Matching is by bare-model prefix, so provider-qualified entries can never
|
|
47
|
+
* match and a slash is rejected rather than stored as a dead rule.
|
|
48
|
+
*/
|
|
49
|
+
export function shadowCallSourceModelsError(value: unknown): string | null {
|
|
50
|
+
if (!Array.isArray(value)) return "sourceModels must be an array";
|
|
51
|
+
if (value.length === 0) return "sourceModels must contain at least one model prefix";
|
|
52
|
+
if (value.length > SHADOW_SOURCE_MODEL_LIMIT) {
|
|
53
|
+
return `sourceModels must contain at most ${SHADOW_SOURCE_MODEL_LIMIT} model prefixes`;
|
|
54
|
+
}
|
|
55
|
+
const seen = new Set<string>();
|
|
56
|
+
for (const [index, entry] of value.entries()) {
|
|
57
|
+
if (typeof entry !== "string" || entry.trim() === "") {
|
|
58
|
+
return `sourceModels.${index} must be a nonblank model prefix`;
|
|
59
|
+
}
|
|
60
|
+
if (/\s/.test(entry)) return `sourceModels.${index} must not contain whitespace`;
|
|
61
|
+
if (entry.length > SHADOW_SOURCE_PREFIX_MAX_LENGTH) {
|
|
62
|
+
return `sourceModels.${index} must be at most ${SHADOW_SOURCE_PREFIX_MAX_LENGTH} characters`;
|
|
63
|
+
}
|
|
64
|
+
const prefix = entry;
|
|
65
|
+
if (prefix.includes("/")) return `sourceModels.${index} must be a bare model prefix, not a provider-qualified model`;
|
|
66
|
+
if (seen.has(prefix)) return "sourceModels must not contain duplicate prefixes";
|
|
67
|
+
seen.add(prefix);
|
|
68
|
+
}
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/** Trim and deduplicate only after `shadowCallSourceModelsError` accepted the list. */
|
|
73
|
+
export function normalizeShadowCallSourceModels(value: readonly string[]): string[] {
|
|
74
|
+
return [...new Set(value.map(entry => entry.trim()))];
|
|
75
|
+
}
|
|
76
|
+
|
|
36
77
|
/** The shadow-call reference a provider change leaves behind, reported by disable and delete. */
|
|
37
78
|
export interface ShadowInterceptDependency {
|
|
38
79
|
model: string;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { hasHumanDashboardSession } from "./consent-session";
|
|
1
2
|
/**
|
|
2
3
|
* /api/github/star and /api/update/badge — the two cheap polls behind the
|
|
3
4
|
* sidebar's GitHub star and update controls.
|
|
@@ -40,7 +41,7 @@ import type { ManagementContext } from "./context";
|
|
|
40
41
|
* request an agent cannot fabricate, so that is what this now reads.
|
|
41
42
|
*/
|
|
42
43
|
function hasBrowserSessionEvidence(ctx: ManagementContext): boolean {
|
|
43
|
-
return ctx
|
|
44
|
+
return hasHumanDashboardSession(ctx);
|
|
44
45
|
}
|
|
45
46
|
|
|
46
47
|
// Known edge, deliberately fail-closed: a non-loopback operator dashboard that signs
|
|
@@ -61,6 +61,7 @@ import {
|
|
|
61
61
|
isDesktopSupervised,
|
|
62
62
|
} from "../../lib/system-restart-contract";
|
|
63
63
|
import { spawnReplacementStart } from "../restart-replacement";
|
|
64
|
+
import { retireRestartParentOwnership } from "../restart-parent-ownership";
|
|
64
65
|
|
|
65
66
|
export { MEMORY_DRAIN_RESTART_MS, REPLACEMENT_READY_TIMEOUT_MS } from "../../lib/system-restart-contract";
|
|
66
67
|
export { waitForReplacementReady, type ReplacementReadinessIo } from "../restart-replacement";
|
|
@@ -170,13 +171,31 @@ function waitForBoundedSettlement(
|
|
|
170
171
|
}
|
|
171
172
|
|
|
172
173
|
/**
|
|
173
|
-
*
|
|
174
|
-
*
|
|
175
|
-
*
|
|
174
|
+
* Accepted stops and signals permanently veto automatic handoff. Management requests carry
|
|
175
|
+
* separate temporary intents while teardown awaits, so a refusal can release its own intent
|
|
176
|
+
* without clearing another pending stop, an accepted stop, or a signal.
|
|
176
177
|
*/
|
|
177
178
|
let explicitShutdownRequested = false;
|
|
179
|
+
const pendingShutdownIntents = new Set<object>();
|
|
180
|
+
const shutdownIntentWaiters = new Set<() => void>();
|
|
181
|
+
function shutdownIntentChanged(): void {
|
|
182
|
+
const waiters = [...shutdownIntentWaiters];
|
|
183
|
+
shutdownIntentWaiters.clear();
|
|
184
|
+
for (const resolve of waiters) resolve();
|
|
185
|
+
}
|
|
186
|
+
function nextShutdownIntentChange(): Promise<void> {
|
|
187
|
+
return new Promise(resolve => { shutdownIntentWaiters.add(resolve); });
|
|
188
|
+
}
|
|
178
189
|
export function noteExplicitShutdownRequested(): void {
|
|
179
190
|
explicitShutdownRequested = true;
|
|
191
|
+
shutdownIntentChanged();
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
/** Veto automatic handoff while a stop is pending; release only this caller's intent. */
|
|
195
|
+
export function acquireExplicitShutdownIntent(): () => void {
|
|
196
|
+
const intent = {};
|
|
197
|
+
pendingShutdownIntents.add(intent);
|
|
198
|
+
return () => { if (pendingShutdownIntents.delete(intent)) shutdownIntentChanged(); };
|
|
180
199
|
}
|
|
181
200
|
|
|
182
201
|
/** Test seam — reset between tests. */
|
|
@@ -185,6 +204,8 @@ export function setSystemRestartIoForTests(io: SystemRestartIo = {}): void {
|
|
|
185
204
|
restartAccepted = false;
|
|
186
205
|
acceptedDrainGraceMs = MEMORY_DRAIN_RESTART_MS;
|
|
187
206
|
explicitShutdownRequested = false;
|
|
207
|
+
pendingShutdownIntents.clear();
|
|
208
|
+
shutdownIntentChanged();
|
|
188
209
|
}
|
|
189
210
|
|
|
190
211
|
/** The port this process is listening on, or undefined when that cannot be established. */
|
|
@@ -269,6 +290,9 @@ function spawnDetachedStart(
|
|
|
269
290
|
let env: NodeJS.ProcessEnv;
|
|
270
291
|
try {
|
|
271
292
|
env = replacementStartEnvironment(waitForHealthBeforeParentExit);
|
|
293
|
+
// Prepare the sibling handoff while its runtime record still exists. Only completed
|
|
294
|
+
// drain + listener stop may release parent ownership before waiting for child health.
|
|
295
|
+
if (waitForHealthBeforeParentExit) retireRestartParentOwnership(port);
|
|
272
296
|
} catch (err) {
|
|
273
297
|
return Promise.reject(err);
|
|
274
298
|
}
|
|
@@ -281,7 +305,9 @@ async function completeDeferredParentExitHandoff(
|
|
|
281
305
|
port: number | undefined,
|
|
282
306
|
phase: "deadline" | "listener-stop fallback",
|
|
283
307
|
canHandoff: () => boolean = () => true,
|
|
308
|
+
automatic = false,
|
|
284
309
|
): Promise<void> {
|
|
310
|
+
while (automatic && pendingShutdownIntents.size > 0 && !explicitShutdownRequested) await nextShutdownIntentChange();
|
|
285
311
|
if (!canHandoff()) return;
|
|
286
312
|
try {
|
|
287
313
|
await (io.spawnStart ?? spawnDetachedStart)(port, false);
|
|
@@ -304,7 +330,9 @@ async function completeDeadlineRestartHandoff(
|
|
|
304
330
|
port: number | undefined,
|
|
305
331
|
scheduleDeadline: NonNullable<SystemRestartIo["scheduleDeadline"]>,
|
|
306
332
|
canHandoff: () => boolean = () => true,
|
|
333
|
+
automatic = false,
|
|
307
334
|
): Promise<void> {
|
|
335
|
+
while (automatic && pendingShutdownIntents.size > 0 && !explicitShutdownRequested) await nextShutdownIntentChange();
|
|
308
336
|
if (!canHandoff()) return;
|
|
309
337
|
if (handOffToDesktop(io, exitProcess)) return;
|
|
310
338
|
const supervised = (io.isSupervisedServiceChild ?? (() => isSupervisedServiceChild(io)))();
|
|
@@ -330,7 +358,7 @@ async function completeDeadlineRestartHandoff(
|
|
|
330
358
|
}
|
|
331
359
|
// The ordinary child must survive parent exit: a failed/pending socket close
|
|
332
360
|
// or overdue cleanup is completed by process teardown, without a hidden mode.
|
|
333
|
-
await completeDeferredParentExitHandoff(io, exitProcess, port, "deadline", canHandoff);
|
|
361
|
+
await completeDeferredParentExitHandoff(io, exitProcess, port, "deadline", canHandoff, automatic);
|
|
334
362
|
}
|
|
335
363
|
|
|
336
364
|
/**
|
|
@@ -378,6 +406,7 @@ export function acceptSystemRestart(io: SystemRestartIo = restartIo, admission:
|
|
|
378
406
|
pending = false;
|
|
379
407
|
vetoed = true;
|
|
380
408
|
releasePending();
|
|
409
|
+
shutdownIntentChanged();
|
|
381
410
|
});
|
|
382
411
|
const now = io.now ?? Date.now;
|
|
383
412
|
const acceptedAtMs = now();
|
|
@@ -402,12 +431,15 @@ export function acceptSystemRestart(io: SystemRestartIo = restartIo, admission:
|
|
|
402
431
|
}, drainGraceMs);
|
|
403
432
|
}
|
|
404
433
|
schedule(async () => {
|
|
434
|
+
if (vetoed) return;
|
|
435
|
+
// Keep the one admitted restart queued until every temporary stop intent settles.
|
|
436
|
+
while (automatic && pendingShutdownIntents.size > 0 && !explicitShutdownRequested && !vetoed) await nextShutdownIntentChange();
|
|
405
437
|
if (vetoed) return;
|
|
406
438
|
pending = false;
|
|
407
439
|
const canHandoff = () => {
|
|
408
440
|
// Only admission-bound (automatic) restarts yield to an explicit stop; manual restart
|
|
409
441
|
// requests keep their existing semantics.
|
|
410
|
-
if (admission.onAccepted && explicitShutdownRequested) return false;
|
|
442
|
+
if (admission.onAccepted && (explicitShutdownRequested || pendingShutdownIntents.size > 0)) return false;
|
|
411
443
|
try { return admission.beforeScheduledDrain?.() ?? true; }
|
|
412
444
|
catch { return false; } // Unknown ownership is not authority to restart.
|
|
413
445
|
};
|
|
@@ -426,12 +458,14 @@ export function acceptSystemRestart(io: SystemRestartIo = restartIo, admission:
|
|
|
426
458
|
const drainPromise = Promise.resolve().then(
|
|
427
459
|
() => drain(undefined, Math.max(0, drainDeadlineMs - now())),
|
|
428
460
|
);
|
|
429
|
-
|
|
461
|
+
let drainOutcome = await waitForRestartDrain(drainPromise, restartDeadlineMs, now, scheduleDeadline);
|
|
462
|
+
while (automatic && pendingShutdownIntents.size > 0 && !explicitShutdownRequested) await nextShutdownIntentChange();
|
|
430
463
|
if (!canHandoff()) return;
|
|
464
|
+
if (automatic && now() >= restartDeadlineMs) drainOutcome = "deadline";
|
|
431
465
|
const exitProcess = io.exitProcess ?? ((code: number) => { process.exit(code); });
|
|
432
466
|
if (drainOutcome === "deadline") {
|
|
433
467
|
console.warn("Drain-and-restart deadline expired; forcing terminal restart handoff");
|
|
434
|
-
await completeDeadlineRestartHandoff(io, exitProcess, restartPort, scheduleDeadline, canHandoff);
|
|
468
|
+
await completeDeadlineRestartHandoff(io, exitProcess, restartPort, scheduleDeadline, canHandoff, automatic);
|
|
435
469
|
return;
|
|
436
470
|
}
|
|
437
471
|
if (drainOutcome === "failed" || drainOutcome === "rejected") {
|
|
@@ -457,11 +491,17 @@ export function acceptSystemRestart(io: SystemRestartIo = restartIo, admission:
|
|
|
457
491
|
restartPort,
|
|
458
492
|
"listener-stop fallback",
|
|
459
493
|
canHandoff,
|
|
494
|
+
automatic,
|
|
460
495
|
);
|
|
461
496
|
return;
|
|
462
497
|
}
|
|
463
498
|
try {
|
|
499
|
+
while (automatic && pendingShutdownIntents.size > 0 && !explicitShutdownRequested) await nextShutdownIntentChange();
|
|
464
500
|
if (!canHandoff()) return;
|
|
501
|
+
if (automatic && now() >= restartDeadlineMs) {
|
|
502
|
+
await completeDeferredParentExitHandoff(io, exitProcess, restartPort, "deadline", canHandoff, automatic);
|
|
503
|
+
return;
|
|
504
|
+
}
|
|
465
505
|
// A rejected drain has uncertain cleanup ownership, so it uses the same
|
|
466
506
|
// parent-exit handoff as a deadline. Only a fully completed drain waits
|
|
467
507
|
// for replacement health in the old process.
|