@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -9,6 +9,7 @@ import { ensureManagementClaudeIntercept, interceptStartRefusal, interceptStatus
|
|
|
9
9
|
import { persistCommittedDesktopGateway } from "../../claude/desktop-gateway-state";
|
|
10
10
|
import { captureDesktopAppliedMarker, commitDesktopAppliedMarker } from "../../claude/desktop-applied-marker";
|
|
11
11
|
import { isPassiveRead } from "../../lib/passive-read";
|
|
12
|
+
import { captureHomeRouteDefaultsBeforeHomeSwitch } from "../../routing/home-route-capture";
|
|
12
13
|
import { randomUUID } from "node:crypto";
|
|
13
14
|
import { readFileSync } from "node:fs";
|
|
14
15
|
import { dirname } from "node:path";
|
|
@@ -18,6 +19,7 @@ import type { CatalogModel } from "../../codex/catalog";
|
|
|
18
19
|
import { catalogModelSlug, filterCatalogVisibleModels, invalidateCodexModelsCache, nativeContextLimits, nativeModelRows, uniqueCatalogModelsForPublicList } from "../../codex/catalog";
|
|
19
20
|
import { mergeModelPinnedEfforts, modelPinnedEffortsConfigError } from "../../config/provider-validation";
|
|
20
21
|
import { MULTI_AGENT_SURFACE_ADVISORY_VERSION, multiAgentSurfaceAdvisory, resolveMultiAgentMode } from "../../config/multi-agent-surface";
|
|
22
|
+
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
21
23
|
import { captureConfigTopLevelRollback, parsedConfigRebaseDeletionKeys, projectConfigRebaseProvenance } from "../../config/rebase-provenance";
|
|
22
24
|
import { anthropicSidecarPatchError } from "../../config/schema/anthropic-account-pool";
|
|
23
25
|
import { isAnthropicInstanceId } from "../../providers/anthropic-instance-id";
|
|
@@ -294,6 +296,8 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
294
296
|
multiAgentMode: resolveMultiAgentMode(config),
|
|
295
297
|
multiAgentSurfaceAdvisory: multiAgentSurfaceAdvisory(config),
|
|
296
298
|
keepNativeChatGptOnV1: config.keepNativeChatGptOnV1 === true,
|
|
299
|
+
plaintextAgentMessagesEnabled: isPlaintextV2AgentMessagesEnabled(config),
|
|
300
|
+
supportsPlaintextV2Mode: true,
|
|
297
301
|
agentsEnabled: getAgentsEnabled(),
|
|
298
302
|
agentsMaxDepth: getAgentsMaxDepth(),
|
|
299
303
|
subagentDeveloperInstructions: getSubagentDeveloperInstructions(),
|
|
@@ -301,7 +305,9 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
301
305
|
multiAgentModeHintRecommendation: MULTI_AGENT_MODE_HINT_RECOMMENDATION,
|
|
302
306
|
// max_depth is V1-only upstream; this is the global-flag statement, derived
|
|
303
307
|
// server-side so no client can present it as an effective V2 limit.
|
|
304
|
-
|
|
308
|
+
// 'v2-plaintext' keeps the flag off but still runs the V2 surface through
|
|
309
|
+
// catalog pins, so the V1 limit does not apply there either.
|
|
310
|
+
agentsMaxDepthAppliesWhenV2Disabled: !enabled && resolveMultiAgentMode(config) !== "v2-plaintext",
|
|
305
311
|
});
|
|
306
312
|
}
|
|
307
313
|
if (url.pathname === "/api/v2" && req.method === "PUT") {
|
|
@@ -315,6 +321,7 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
315
321
|
subagentDeveloperInstructions?: unknown;
|
|
316
322
|
multiAgentModeHintText?: unknown;
|
|
317
323
|
multiAgentSurfaceAdvisoryAcknowledged?: unknown;
|
|
324
|
+
plaintextAgentMessagesAcknowledged?: unknown;
|
|
318
325
|
};
|
|
319
326
|
try { body = await readManagementJsonBody(req); } catch (error) { rethrowManagementBodyTooLarge(error); return jsonResponse({ error: "invalid JSON body" }, 400); }
|
|
320
327
|
const wantsFlag = body.enabled !== undefined;
|
|
@@ -326,12 +333,13 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
326
333
|
const wantsSubagentInstructions = body.subagentDeveloperInstructions !== undefined;
|
|
327
334
|
const wantsModeHintText = body.multiAgentModeHintText !== undefined;
|
|
328
335
|
const wantsAdvisoryAck = body.multiAgentSurfaceAdvisoryAcknowledged !== undefined;
|
|
336
|
+
const wantsPlaintextAck = body.plaintextAgentMessagesAcknowledged !== undefined;
|
|
329
337
|
if (!wantsFlag && !wantsThreads && !wantsMode && !wantsKeepNative && !wantsAgentsEnabled && !wantsMaxDepth && !wantsSubagentInstructions && !wantsModeHintText && !wantsAdvisoryAck) {
|
|
330
338
|
return jsonResponse({ error: "body must set enabled, multiAgentMode, keepNativeChatGptOnV1, maxConcurrentThreadsPerSession, agentsEnabled, agentsMaxDepth, subagentDeveloperInstructions, multiAgentModeHintText, and/or multiAgentSurfaceAdvisoryAcknowledged" }, 400);
|
|
331
339
|
}
|
|
332
340
|
if (wantsFlag && typeof body.enabled !== "boolean") return jsonResponse({ error: "body.enabled must be a boolean" }, 400);
|
|
333
|
-
if (wantsMode && body.multiAgentMode !== "v1" && body.multiAgentMode !== "default" && body.multiAgentMode !== "v2") {
|
|
334
|
-
return jsonResponse({ error: "body.multiAgentMode must be 'v1', 'default', or 'v2'" }, 400);
|
|
341
|
+
if (wantsMode && body.multiAgentMode !== "v1" && body.multiAgentMode !== "default" && body.multiAgentMode !== "v2" && body.multiAgentMode !== "v2-plaintext") {
|
|
342
|
+
return jsonResponse({ error: "body.multiAgentMode must be 'v1', 'default', 'v2', or 'v2-plaintext'" }, 400);
|
|
335
343
|
}
|
|
336
344
|
if (wantsKeepNative && typeof body.keepNativeChatGptOnV1 !== "boolean") {
|
|
337
345
|
return jsonResponse({ error: "body.keepNativeChatGptOnV1 must be a boolean" }, 400);
|
|
@@ -367,26 +375,38 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
367
375
|
if (wantsAdvisoryAck && typeof body.multiAgentSurfaceAdvisoryAcknowledged !== "boolean") {
|
|
368
376
|
return jsonResponse({ error: "body.multiAgentSurfaceAdvisoryAcknowledged must be a boolean" }, 400);
|
|
369
377
|
}
|
|
370
|
-
|
|
378
|
+
if (wantsPlaintextAck && typeof body.plaintextAgentMessagesAcknowledged !== "boolean") {
|
|
379
|
+
return jsonResponse({ error: "body.plaintextAgentMessagesAcknowledged must be a boolean" }, 400);
|
|
380
|
+
}
|
|
381
|
+
const mode = wantsMode ? body.multiAgentMode as "v1" | "default" | "v2" | "v2-plaintext" : undefined;
|
|
371
382
|
const readModePlan = () => {
|
|
372
383
|
const effectiveMode = mode ?? config.multiAgentMode ?? "default";
|
|
373
384
|
const effectiveKeepNative = wantsKeepNative
|
|
374
385
|
? body.keepNativeChatGptOnV1 === true
|
|
375
386
|
: config.keepNativeChatGptOnV1 === true;
|
|
376
387
|
const hybridPinActive = effectiveMode === "v2" && effectiveKeepNative;
|
|
377
|
-
const
|
|
388
|
+
const pinDrivenV2 = hybridPinActive || effectiveMode === "v2-plaintext";
|
|
389
|
+
const pinConflict = effectiveMode === "v2-plaintext"
|
|
390
|
+
? "body.enabled=true conflicts with multiAgentMode 'v2-plaintext': Codex's global multi_agent_v2 override outranks catalog pins"
|
|
391
|
+
: "body.enabled=true conflicts with keepNativeChatGptOnV1: Codex's global multi_agent_v2 override outranks catalog pins";
|
|
392
|
+
const modeFlag = mode === "v2" ? !hybridPinActive : mode === "v1" || mode === "v2-plaintext" ? false : undefined;
|
|
378
393
|
if (wantsFlag && modeFlag !== undefined && body.enabled !== modeFlag) {
|
|
379
394
|
return jsonResponse({
|
|
380
|
-
error:
|
|
381
|
-
?
|
|
395
|
+
error: pinDrivenV2
|
|
396
|
+
? pinConflict
|
|
382
397
|
: `body.enabled conflicts with multiAgentMode '${mode}'`,
|
|
383
398
|
}, 400);
|
|
384
399
|
}
|
|
385
|
-
if (wantsFlag && body.enabled === true &&
|
|
400
|
+
if (wantsFlag && body.enabled === true && pinDrivenV2) {
|
|
386
401
|
return jsonResponse({
|
|
387
|
-
error:
|
|
402
|
+
error: pinConflict,
|
|
388
403
|
}, 400);
|
|
389
404
|
}
|
|
405
|
+
// Recheck consent against the admitted state as well as the initial snapshot.
|
|
406
|
+
if (mode === "v2-plaintext" && resolveMultiAgentMode(config) !== "v2-plaintext"
|
|
407
|
+
&& body.plaintextAgentMessagesAcknowledged !== true) {
|
|
408
|
+
return jsonResponse({ error: "body.multiAgentMode 'v2-plaintext' requires plaintextAgentMessagesAcknowledged === true: native v2 collaboration messages are delivered as plaintext on the canonical ChatGPT route" }, 400);
|
|
409
|
+
}
|
|
390
410
|
const requestedFlag = wantsFlag
|
|
391
411
|
? body.enabled as boolean
|
|
392
412
|
: modeFlag ?? (wantsKeepNative && hybridPinActive ? false : undefined);
|
|
@@ -457,6 +477,9 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
457
477
|
else config.multiAgentMode = mode;
|
|
458
478
|
saveConfigPreservingClaudeCode(config);
|
|
459
479
|
warnings.push(`Multi-agent mode set to '${mode}'. Applies to new sessions.`);
|
|
480
|
+
if (mode === "v2-plaintext" && config.keepNativeChatGptOnV1 === true) {
|
|
481
|
+
warnings.push("keepNativeChatGptOnV1 is stored but inactive under 'v2-plaintext': ChatGPT-native rows are pinned on v2.");
|
|
482
|
+
}
|
|
460
483
|
}
|
|
461
484
|
if (wantsKeepNative) {
|
|
462
485
|
if (body.keepNativeChatGptOnV1 === true) config.keepNativeChatGptOnV1 = true;
|
|
@@ -465,6 +488,8 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
465
488
|
warnings.push(body.keepNativeChatGptOnV1 === true
|
|
466
489
|
? (effectiveMode === "v2"
|
|
467
490
|
? "ChatGPT-native models stay on v1 while other models use v2. Applies to new sessions."
|
|
491
|
+
: effectiveMode === "v2-plaintext"
|
|
492
|
+
? "keepNativeChatGptOnV1 is stored but inactive under 'v2-plaintext': ChatGPT-native rows are pinned on v2. Applies to new sessions."
|
|
468
493
|
: "keepNativeChatGptOnV1 is stored but inactive until multi-agent mode is v2. Applies to new sessions.")
|
|
469
494
|
: "ChatGPT-native models follow the selected v1/v2/base surface. Applies to new sessions.");
|
|
470
495
|
}
|
|
@@ -527,12 +552,14 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
527
552
|
multiAgentMode: resolveMultiAgentMode(config),
|
|
528
553
|
multiAgentSurfaceAdvisory: multiAgentSurfaceAdvisory(config),
|
|
529
554
|
keepNativeChatGptOnV1: config.keepNativeChatGptOnV1 === true,
|
|
555
|
+
plaintextAgentMessagesEnabled: isPlaintextV2AgentMessagesEnabled(config),
|
|
556
|
+
supportsPlaintextV2Mode: true,
|
|
530
557
|
agentsEnabled: getAgentsEnabled(),
|
|
531
558
|
agentsMaxDepth: getAgentsMaxDepth(),
|
|
532
559
|
subagentDeveloperInstructions: getSubagentDeveloperInstructions(),
|
|
533
560
|
multiAgentModeHintText: getMultiAgentModeHintText(),
|
|
534
561
|
multiAgentModeHintRecommendation: MULTI_AGENT_MODE_HINT_RECOMMENDATION,
|
|
535
|
-
agentsMaxDepthAppliesWhenV2Disabled: !enabled,
|
|
562
|
+
agentsMaxDepthAppliesWhenV2Disabled: !enabled && resolveMultiAgentMode(config) !== "v2-plaintext",
|
|
536
563
|
warnings,
|
|
537
564
|
catalogRefresh,
|
|
538
565
|
});
|
|
@@ -1121,9 +1148,9 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
1121
1148
|
const { claudeInterceptProxyPort } = await import("../../claude/intercept/runtime");
|
|
1122
1149
|
const configured = claudeInterceptProxyPort(config, config.port ?? 10100);
|
|
1123
1150
|
if (started.state.proxyPort !== configured) return jsonResponse({ ok: false, code: "port_mismatch", bound: started.state.proxyPort, configured }, 409);
|
|
1124
|
-
const {
|
|
1151
|
+
const { setHomeIntegrationEnabled } = await import("../../routing/home-route-capture");
|
|
1125
1152
|
const desired = await withFirstPartySecretsSettled(configRoot(), () => {
|
|
1126
|
-
const result =
|
|
1153
|
+
const result = setHomeIntegrationEnabled("claude-desktop", true);
|
|
1127
1154
|
if (result.ok) mirrorDesiredEnabledOntoSnapshot(config, "claude-desktop", true);
|
|
1128
1155
|
return result;
|
|
1129
1156
|
});
|
|
@@ -1212,9 +1239,10 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
1212
1239
|
}
|
|
1213
1240
|
});
|
|
1214
1241
|
}
|
|
1215
|
-
const {
|
|
1242
|
+
const { claudeDesktopIntegrationEnabled } = await import("../../codex/desired-state");
|
|
1243
|
+
const { setHomeIntegrationEnabled } = await import("../../routing/home-route-capture");
|
|
1216
1244
|
const desired = await settleConfigRoot(configRoot(), () => {
|
|
1217
|
-
const result =
|
|
1245
|
+
const result = setHomeIntegrationEnabled("claude-desktop", true);
|
|
1218
1246
|
if (result.ok) mirrorDesiredEnabledOntoSnapshot(config, "claude-desktop", true);
|
|
1219
1247
|
return result;
|
|
1220
1248
|
});
|
|
@@ -1534,9 +1562,11 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
1534
1562
|
// Auto is a RESOLUTION, recomputed per request — never stored state. Detection is
|
|
1535
1563
|
// daemon-side, so it cannot see a key exported only in the user's terminal; the
|
|
1536
1564
|
// GUI labels the badge with detectionScope for exactly that reason.
|
|
1537
|
-
const { defaultAuthDetectDeps, detectClaudeAuth, ownAdmissionTokens } = await import("../../claude/auth-detect");
|
|
1565
|
+
const { defaultAuthDetectDeps, detectClaudeAuth, ownAdmissionTokens, resolveClaudeKeychainPresence } = await import("../../claude/auth-detect");
|
|
1538
1566
|
const { authModeIntent, resolveClaudeAuthMode } = await import("../../claude/auth-mode");
|
|
1539
|
-
|
|
1567
|
+
// Awaited, never spawned synchronously: a blocked Keychain lookup must not stall /healthz (#8161).
|
|
1568
|
+
const keychainPresence = await resolveClaudeKeychainPresence(config.claudeCode?.authMode);
|
|
1569
|
+
const authDetection = detectClaudeAuth(defaultAuthDetectDeps(process.env, ownAdmissionTokens(config), keychainPresence));
|
|
1540
1570
|
const resolvedAuthMode = resolveClaudeAuthMode(config, authDetection);
|
|
1541
1571
|
const contextWindows = buildClaudeContextWindows(
|
|
1542
1572
|
[...visibleNativeSlugs(config)],
|
|
@@ -1841,6 +1871,10 @@ async function handleAgentSettingsRoutesImpl(ctx: ManagementContext): Promise<Re
|
|
|
1841
1871
|
const prepared = prepareClaudeCodePatch(config, body);
|
|
1842
1872
|
if (prepared instanceof Response) return prepared;
|
|
1843
1873
|
const { next, nextFastMode } = prepared;
|
|
1874
|
+
// The Claude toggle is this Home's alone: freeze what Children inherit before it moves, and
|
|
1875
|
+
// refuse before anything changes when that cannot be saved.
|
|
1876
|
+
const captureRefused = body.enabled !== undefined ? captureHomeRouteDefaultsBeforeHomeSwitch() : null;
|
|
1877
|
+
if (captureRefused) return jsonResponse({ error: captureRefused.message, code: "route_intent_unavailable" }, captureRefused.retryable ? 409 : 500);
|
|
1844
1878
|
// Stamps the auth-mode migration sentinel on EVERY persist of this block. Without it,
|
|
1845
1879
|
// choosing Auto (which DELETES authMode) or merely toggling Claude on (App.tsx PUTs
|
|
1846
1880
|
// `{enabled}` alone and creates the block) would be converted into a sticky manual
|
|
@@ -56,7 +56,7 @@ const MESSAGES = {
|
|
|
56
56
|
grant_not_usable: "This reset grant cannot be used right now.",
|
|
57
57
|
operation_identity_mismatch: "This operation belongs to another account or grant.",
|
|
58
58
|
in_flight: "This reset is still being processed.",
|
|
59
|
-
unresolved_prior_operation: "An earlier reset attempt
|
|
59
|
+
unresolved_prior_operation: "An earlier reset attempt on this account is not confirmed yet.",
|
|
60
60
|
unknown_outcome_expired: "This attempt can no longer be retried; re-read the account.",
|
|
61
61
|
unknown_outcome: "The reset did not answer; its outcome is unknown.",
|
|
62
62
|
journal_write_failed: "The reset answered but could not be recorded; its outcome is unknown here.",
|
|
@@ -11,6 +11,8 @@ import { mainAccountHardLockFallbackSchema } from "../../config/schema/main-acco
|
|
|
11
11
|
import { anthropicSidecarPatchError } from "../../config/schema/anthropic-account-pool";
|
|
12
12
|
import { isAnthropicInstanceId } from "../../providers/anthropic-instance-id";
|
|
13
13
|
import { captureConfigTopLevelRollback } from "../../config/rebase-provenance";
|
|
14
|
+
import { adoptReserveCapabilityMigration, isCodexReserveEnabled, RESERVE_CAPABILITY_MIGRATION_VERSION } from "../../config/reserve-capability";
|
|
15
|
+
import { readConfigFileSnapshot } from "../../config/diagnostics";
|
|
14
16
|
import type { IntegrationClientId } from "../../integrations/registry";
|
|
15
17
|
import { randomUUID } from "node:crypto";
|
|
16
18
|
import { isDeepStrictEqual } from "node:util";
|
|
@@ -470,6 +472,8 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
470
472
|
showCodexCredits: config.showCodexCredits === true,
|
|
471
473
|
// Absent means off (today's Design B injection), so the GUI/CLI render a plain switch.
|
|
472
474
|
codexDesktopAuthless: config.codexDesktopAuthless === true,
|
|
475
|
+
// Luna Reserve's own switch (#4961); before its one-time seed it still reads the legacy flag.
|
|
476
|
+
codexReserveEnabled: isCodexReserveEnabled(config),
|
|
473
477
|
// Absent keeps Design B remote compaction; true selects the dedicated provider identity.
|
|
474
478
|
codexClientCompaction: config.codexClientCompaction === true,
|
|
475
479
|
codexDesktopSwitches: describeCodexDesktopSwitches(config, await observedCodexDesktopSwitchApply()),
|
|
@@ -571,6 +575,7 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
571
575
|
codexMainAccountHardLockThresholds?: unknown;
|
|
572
576
|
codexMainAccountHardLockFallback?: unknown;
|
|
573
577
|
codexDesktopAuthless?: unknown;
|
|
578
|
+
codexReserveEnabled?: unknown;
|
|
574
579
|
codexClientCompaction?: unknown;
|
|
575
580
|
compactionRouting?: unknown;
|
|
576
581
|
compactionRecovery?: unknown;
|
|
@@ -590,12 +595,13 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
590
595
|
&& body.codexMainAccountHardLockThresholds === undefined
|
|
591
596
|
&& body.codexMainAccountHardLockFallback === undefined
|
|
592
597
|
&& body.codexDesktopAuthless === undefined
|
|
598
|
+
&& body.codexReserveEnabled === undefined
|
|
593
599
|
&& body.codexClientCompaction === undefined
|
|
594
600
|
&& body.compactionRouting === undefined
|
|
595
601
|
&& body.compactionRecovery === undefined
|
|
596
602
|
&& body.reasoningRetention === undefined
|
|
597
603
|
&& body.memoryModels === undefined) {
|
|
598
|
-
return jsonResponse({ error: "provide codexAutoStart, streamMode, appOwnedMemoryBudgetMb, codexAccountPickerEnabled, codexQuotaAutoRefresh, oauthOpenBrowser, showCodexCredits, ultraFastTier, fastRows, codexMainAccountHardLock, codexMainAccountHardLockThresholds, codexMainAccountHardLockFallback, codexDesktopAuthless, codexClientCompaction, compactionRouting, compactionRecovery, reasoningRetention, or memoryModels" }, 400);
|
|
604
|
+
return jsonResponse({ error: "provide codexAutoStart, streamMode, appOwnedMemoryBudgetMb, codexAccountPickerEnabled, codexQuotaAutoRefresh, oauthOpenBrowser, showCodexCredits, ultraFastTier, fastRows, codexMainAccountHardLock, codexMainAccountHardLockThresholds, codexMainAccountHardLockFallback, codexDesktopAuthless, codexReserveEnabled, codexClientCompaction, compactionRouting, compactionRecovery, reasoningRetention, or memoryModels" }, 400);
|
|
599
605
|
}
|
|
600
606
|
if (body.codexAutoStart !== undefined && typeof body.codexAutoStart !== "boolean") {
|
|
601
607
|
return jsonResponse({ error: "codexAutoStart boolean is required" }, 400);
|
|
@@ -644,6 +650,9 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
644
650
|
if (body.codexDesktopAuthless !== undefined && typeof body.codexDesktopAuthless !== "boolean") {
|
|
645
651
|
return jsonResponse({ error: "codexDesktopAuthless boolean is required" }, 400);
|
|
646
652
|
}
|
|
653
|
+
if (body.codexReserveEnabled !== undefined && typeof body.codexReserveEnabled !== "boolean") {
|
|
654
|
+
return jsonResponse({ error: "codexReserveEnabled boolean is required" }, 400);
|
|
655
|
+
}
|
|
647
656
|
if (body.codexClientCompaction !== undefined && typeof body.codexClientCompaction !== "boolean") {
|
|
648
657
|
return jsonResponse({ error: "codexClientCompaction boolean is required" }, 400);
|
|
649
658
|
}
|
|
@@ -694,7 +703,7 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
694
703
|
}
|
|
695
704
|
let pickerWasEnabled = false, pickerIsEnabled = false;
|
|
696
705
|
let authlessIsEnabled = false, clientCompactionIsEnabled = false, fastRowsIsEnabled = false;
|
|
697
|
-
let desktopSwitchesChanged = false, fastRowsChanged = false;
|
|
706
|
+
let desktopSwitchesChanged = false, fastRowsChanged = false, reserveIsEnabled = false, reserveChanged = false;
|
|
698
707
|
const refusal = await settleConfigRoot(configRoot(), () => {
|
|
699
708
|
if (hardLockThresholds) {
|
|
700
709
|
hardLockThresholds = { ...config.codexMainAccountHardLockThresholds, ...hardLockThresholds };
|
|
@@ -708,6 +717,7 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
708
717
|
}
|
|
709
718
|
pickerWasEnabled = codexAccountPickerEnabled(config);
|
|
710
719
|
const authlessWasEnabled = config.codexDesktopAuthless === true;
|
|
720
|
+
const reserveWasEnabled = isCodexReserveEnabled(config);
|
|
711
721
|
const clientCompactionWasEnabled = config.codexClientCompaction === true;
|
|
712
722
|
const fastRowsWasEnabled = config.fastRows !== false;
|
|
713
723
|
const restoreCompactionRouting = captureConfigTopLevelRollback(config, ["compactionRouting", "compactionRecovery", "memoryModels", "reasoningRetention"]);
|
|
@@ -740,6 +750,10 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
740
750
|
hasCodexMainAccountHardLockFallback: Object.hasOwn(config, "codexMainAccountHardLockFallback"),
|
|
741
751
|
codexDesktopAuthless: config.codexDesktopAuthless,
|
|
742
752
|
hasCodexDesktopAuthless: Object.hasOwn(config, "codexDesktopAuthless"),
|
|
753
|
+
codexReserveEnabled: config.codexReserveEnabled,
|
|
754
|
+
hasCodexReserveEnabled: Object.hasOwn(config, "codexReserveEnabled"),
|
|
755
|
+
codexReserveMigration: config.codexReserveMigration,
|
|
756
|
+
hasCodexReserveMigration: Object.hasOwn(config, "codexReserveMigration"),
|
|
743
757
|
codexClientCompaction: config.codexClientCompaction,
|
|
744
758
|
hasCodexClientCompaction: Object.hasOwn(config, "codexClientCompaction"),
|
|
745
759
|
};
|
|
@@ -780,6 +794,13 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
780
794
|
else if (body.codexMainAccountHardLock === true) deleteConfigTopLevelKey(config, "codexMainAccountHardLock");
|
|
781
795
|
if (hardLockFallback === null) deleteConfigTopLevelKey(config, "codexMainAccountHardLockFallback");
|
|
782
796
|
else if (hardLockFallback?.success) config.codexMainAccountHardLockFallback = hardLockFallback.data;
|
|
797
|
+
// An explicit Reserve choice is the operator's decision (#4961); an explicit false is persisted.
|
|
798
|
+
// An authless-only change is not seeded here: the writer seeds from the file under its lock,
|
|
799
|
+
// so a stale live object cannot overwrite another process's Reserve decision.
|
|
800
|
+
if (typeof body.codexReserveEnabled === "boolean") {
|
|
801
|
+
config.codexReserveEnabled = body.codexReserveEnabled;
|
|
802
|
+
config.codexReserveMigration = RESERVE_CAPABILITY_MIGRATION_VERSION;
|
|
803
|
+
}
|
|
783
804
|
if (body.codexDesktopAuthless === true) config.codexDesktopAuthless = true;
|
|
784
805
|
else if (body.codexDesktopAuthless === false) deleteConfigTopLevelKey(config, "codexDesktopAuthless");
|
|
785
806
|
if (body.codexClientCompaction === true) config.codexClientCompaction = true;
|
|
@@ -807,6 +828,8 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
807
828
|
pickerIsEnabled = codexAccountPickerEnabled(config);
|
|
808
829
|
(deps.saveConfigPreservingClaudeCode ?? saveConfigPreservingClaudeCode)(config);
|
|
809
830
|
authlessIsEnabled = config.codexDesktopAuthless === true;
|
|
831
|
+
reserveIsEnabled = isCodexReserveEnabled(config);
|
|
832
|
+
reserveChanged = reserveWasEnabled !== reserveIsEnabled;
|
|
810
833
|
clientCompactionIsEnabled = config.codexClientCompaction === true;
|
|
811
834
|
fastRowsIsEnabled = config.fastRows !== false;
|
|
812
835
|
fastRowsChanged = fastRowsWasEnabled !== fastRowsIsEnabled;
|
|
@@ -851,6 +874,17 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
851
874
|
if (previousSettings.hasCodexDesktopAuthless) {
|
|
852
875
|
config.codexDesktopAuthless = previousSettings.codexDesktopAuthless;
|
|
853
876
|
} else deleteConfigTopLevelKey(config, "codexDesktopAuthless");
|
|
877
|
+
// Once the file was published it is the authority: adopt its Reserve fields, since the
|
|
878
|
+
// failure may have come before the writer adopted the projection it wrote.
|
|
879
|
+
if (error instanceof ConfigWritePublishedError) {
|
|
880
|
+
const published = readConfigFileSnapshot();
|
|
881
|
+
if (published.diagnostics.source === "file") adoptReserveCapabilityMigration(config, published.diagnostics.config);
|
|
882
|
+
} else {
|
|
883
|
+
if (previousSettings.hasCodexReserveEnabled) config.codexReserveEnabled = previousSettings.codexReserveEnabled;
|
|
884
|
+
else deleteConfigTopLevelKey(config, "codexReserveEnabled");
|
|
885
|
+
if (previousSettings.hasCodexReserveMigration) config.codexReserveMigration = previousSettings.codexReserveMigration;
|
|
886
|
+
else deleteConfigTopLevelKey(config, "codexReserveMigration");
|
|
887
|
+
}
|
|
854
888
|
if (previousSettings.hasCodexClientCompaction) {
|
|
855
889
|
config.codexClientCompaction = previousSettings.codexClientCompaction;
|
|
856
890
|
} else deleteConfigTopLevelKey(config, "codexClientCompaction");
|
|
@@ -869,7 +903,8 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
869
903
|
// injector, which is why flipping either switch left `config.toml` in its old shape until
|
|
870
904
|
// a separate `ocx sync` (#4809). Both halves are needed when a Desktop switch changes; a
|
|
871
905
|
// picker-only update still refreshes just the catalog.
|
|
872
|
-
|
|
906
|
+
// A Reserve change adds or removes the account-qualified Reserve row; config.toml is unaffected.
|
|
907
|
+
const catalogRefresh = pickerWasEnabled !== pickerIsEnabled || desktopSwitchesChanged || fastRowsChanged || reserveChanged
|
|
873
908
|
? await convergeCodexCatalog()
|
|
874
909
|
: undefined;
|
|
875
910
|
if (fastRowsChanged) {
|
|
@@ -902,6 +937,7 @@ async function handleConfigRoutesImpl(ctx: ManagementContext): Promise<Response
|
|
|
902
937
|
catalogRefreshPending,
|
|
903
938
|
fastRows: config.fastRows !== false,
|
|
904
939
|
codexDesktopAuthless: authlessIsEnabled,
|
|
940
|
+
codexReserveEnabled: reserveIsEnabled,
|
|
905
941
|
codexClientCompaction: clientCompactionIsEnabled,
|
|
906
942
|
codexDesktopSwitches,
|
|
907
943
|
compactionRouting: config.compactionRouting ?? null,
|
|
@@ -159,12 +159,19 @@ export interface ManagementApiDeps {
|
|
|
159
159
|
codexPromptPaths?: CodexPromptPaths;
|
|
160
160
|
/** Link seams are getters so the optional listener and supervisor are singletons. */
|
|
161
161
|
linkSupervisor?: () => LinkSupervisor;
|
|
162
|
-
linkListener?: () => Pick<LinkListenerLifecycle<unknown>, "ensureStarted" | "status" | "close" | "onAuthenticatedCatalog"> & Partial<Pick<LinkListenerLifecycle<unknown>, "peerObservation">> & Partial<Pick<import("../index/optional-listeners").OptionalListenerSet<unknown>, "ensureClaudeIntercept" | "claudeInterceptOutcome" | "linkActivity" | "catalogPull" | "flushCatalogPulls">>;
|
|
162
|
+
linkListener?: () => Pick<LinkListenerLifecycle<unknown>, "ensureStarted" | "status" | "close" | "onAuthenticatedCatalog"> & Partial<Pick<LinkListenerLifecycle<unknown>, "peerObservation">> & Partial<Pick<import("../index/optional-listeners").OptionalListenerSet<unknown>, "ensureClaudeIntercept" | "claudeInterceptOutcome" | "linkActivity" | "linkTraffic" | "catalogPull" | "flushCatalogPulls">>;
|
|
163
163
|
readLinkStore?: () => LinkStore;
|
|
164
164
|
writeLinkStore?: (store: LinkStore) => void;
|
|
165
165
|
linkKnownHostsPath?: () => string;
|
|
166
166
|
sshRunner?: SshRunner;
|
|
167
|
-
|
|
167
|
+
/** id: the key id an operation reserved before issuing it (src/server/management/link-operation.ts). */
|
|
168
|
+
issueApiKey?: (config: OcxConfig, name: string, id?: string) => IssuedApiKey;
|
|
169
|
+
/** The operation journal (src/link/operations-journal.ts); defaults to <configDir>/link/operations.json. */
|
|
170
|
+
linkOperationsPath?: () => string;
|
|
171
|
+
/** The per-alias lock (src/link/alias-lock.ts): directory, clock, sleep and wait bound. */
|
|
172
|
+
linkAliasLock?: import("../../link/alias-lock").AliasLockDeps;
|
|
173
|
+
/** Called before an operation's effect mark is written; a throw stands for a failed journal write (tests). */
|
|
174
|
+
linkOperationMarkHook?: (effect: string, phase: "intent" | "done") => void;
|
|
168
175
|
revokeApiKey?: (config: OcxConfig, id: string) => boolean;
|
|
169
176
|
loadLinkCandidates?: () => Array<{ alias: string; source: "ssh_config" | "tailscale" }>;
|
|
170
177
|
resolveChildBinarySource?: typeof import("../../link/child-binary-source").resolveChildBinarySource;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { desktopGuiOrigin, hasDesktopForwardingHeaders } from "../../lib/desktop-gui-origin";
|
|
2
|
+
import { DESKTOP_AUTHORIZATION_PATH } from "../gui-desktop-authorization";
|
|
3
|
+
import { jsonResponse } from "../auth-cors";
|
|
4
|
+
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
5
|
+
import { hasHumanDashboardSession } from "./consent-session";
|
|
6
|
+
import type { ManagementContext } from "./context";
|
|
7
|
+
|
|
8
|
+
function localDesktopBrowser(ctx: ManagementContext): boolean {
|
|
9
|
+
return ctx.principal === "gui-session" && ctx.trustedLoopbackIngress
|
|
10
|
+
&& (ctx.deps.liveListenPort?.() ?? ctx.config.port) === ctx.config.port
|
|
11
|
+
&& !hasDesktopForwardingHeaders(ctx.req)
|
|
12
|
+
&& desktopGuiOrigin(ctx.config, ctx.url.origin) === ctx.url.origin;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function requireDesktopAuthorization(ctx: ManagementContext): Response | null {
|
|
16
|
+
const livePort = ctx.deps.liveListenPort?.() ?? ctx.config.port;
|
|
17
|
+
const authorized = ctx.sessionControl?.canMutateLocalDesktop?.(ctx.req,
|
|
18
|
+
livePort === ctx.config.port ? ctx.config : { ...ctx.config, port: livePort });
|
|
19
|
+
return localDesktopBrowser(ctx) && authorized
|
|
20
|
+
? null : jsonResponse({ error: "desktop_authorization_required" }, 403);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export async function handleDesktopAuthorization(ctx: ManagementContext): Promise<Response | null> {
|
|
24
|
+
if (ctx.url.pathname !== DESKTOP_AUTHORIZATION_PATH) return null;
|
|
25
|
+
if (ctx.req.method === "GET") return jsonResponse({ ok: true,
|
|
26
|
+
supported: localDesktopBrowser(ctx), authorized: requireDesktopAuthorization(ctx) === null,
|
|
27
|
+
rememberedSession: ctx.guiSessionIssuance === "remembered-admin" });
|
|
28
|
+
if (ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
29
|
+
// A remembered-admin session is the durable admin token in a cookie: it proves possession,
|
|
30
|
+
// not that the operator is at this machine. Refuse it here, before the body is read, so the
|
|
31
|
+
// step-up is closed to it by issuance rather than by a downstream record comparison.
|
|
32
|
+
if (!localDesktopBrowser(ctx) || !hasHumanDashboardSession(ctx)
|
|
33
|
+
|| !ctx.sessionControl?.isCurrent(ctx.req, ctx.config)) return jsonResponse({ error: "desktop_authorization_required" }, 403);
|
|
34
|
+
let body: unknown;
|
|
35
|
+
try { body = await readManagementJsonBody(ctx.req); }
|
|
36
|
+
catch (error) { rethrowManagementBodyTooLarge(error); return jsonResponse({ error: "invalid_json" }, 400); }
|
|
37
|
+
if (!body || typeof body !== "object" || Array.isArray(body) || Object.keys(body).length !== 1
|
|
38
|
+
|| !("grant" in body) || typeof body.grant !== "string") return jsonResponse({ error: "invalid_request" }, 400);
|
|
39
|
+
return localDesktopBrowser(ctx) && ctx.sessionControl?.authorizeLocalDesktop?.(ctx.req, ctx.config, body.grant)
|
|
40
|
+
? jsonResponse({ ok: true, authorized: true }) : jsonResponse({ error: "desktop_authorization_required" }, 403);
|
|
41
|
+
}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
import { jsonResponse } from "../auth-cors";
|
|
2
2
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
3
3
|
import type { ManagementContext } from "./context";
|
|
4
|
-
import { isAuthorizedDesktopCompatibilityMutation } from "./desktop-compatibility-authorization";
|
|
5
4
|
import type { DesktopCertificateService } from "../../codex/desktop-compatibility/certificate-service";
|
|
5
|
+
import { handleDesktopAuthorization, requireDesktopAuthorization } from "./desktop-authorization";
|
|
6
6
|
|
|
7
7
|
const PATH = "/api/codex/desktop-compatibility/certificate";
|
|
8
8
|
let service: DesktopCertificateService | undefined;
|
|
9
9
|
|
|
10
10
|
export async function handleDesktopCompatibilityRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
11
|
+
const authorization = await handleDesktopAuthorization(ctx); if (authorization) return authorization;
|
|
11
12
|
if (ctx.url.pathname !== PATH) return null;
|
|
12
13
|
if (ctx.req.method !== "GET" && ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
13
|
-
//
|
|
14
|
-
// This
|
|
15
|
-
if (ctx.req.method === "POST"
|
|
16
|
-
return jsonResponse({ error: "local_dashboard_confirmation_required" }, 403);
|
|
17
|
-
}
|
|
14
|
+
// Fresh private-home Desktop authority precedes persisted key or CurrentUser Root mutations.
|
|
15
|
+
// This remains an owner-write boundary, not protection against arbitrary same-user code.
|
|
16
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
18
17
|
let action: "prepare" | "trust" | "remove-trust" | "renew" | undefined, fingerprint: string | undefined;
|
|
19
18
|
if (ctx.req.method === "POST") {
|
|
20
19
|
let body: unknown;
|
|
@@ -31,13 +30,15 @@ export async function handleDesktopCompatibilityRoutes(ctx: ManagementContext):
|
|
|
31
30
|
if (action === "prepare" && value.fingerprint !== undefined) return jsonResponse({ error: "unexpected_fingerprint" }, 400);
|
|
32
31
|
fingerprint = value.fingerprint as string | undefined;
|
|
33
32
|
}
|
|
34
|
-
const
|
|
33
|
+
const module = ctx.deps.desktopCertificateService || service ? null : await import("../../codex/desktop-compatibility/certificate-service");
|
|
34
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
35
|
+
const controller = ctx.deps.desktopCertificateService ?? (service ??= module!.createDesktopCertificateService());
|
|
35
36
|
try {
|
|
36
37
|
const status = action === "prepare" ? await controller.prepare()
|
|
37
38
|
: action === "trust" ? await controller.trust(fingerprint!)
|
|
38
39
|
: action === "renew" ? await controller.renew(fingerprint!)
|
|
39
40
|
: action === "remove-trust" ? await controller.removeTrust(fingerprint!) : await controller.status();
|
|
40
|
-
return jsonResponse({ ok: true, certificate: { ...status, mutationAuthorized:
|
|
41
|
+
return jsonResponse({ ok: true, certificate: { ...status, mutationAuthorized: requireDesktopAuthorization(ctx) === null } });
|
|
41
42
|
} catch (error) {
|
|
42
43
|
const code = error && typeof error === "object" && "code" in error ? String(error.code) : "operation_failed";
|
|
43
44
|
const allowed = new Set(["unsupported", "busy", "not_prepared", "fingerprint_changed", "app_running", "runtime_running", "app_state_unknown", "trust_unknown", "trust_not_applied",
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { jsonResponse } from "../auth-cors";
|
|
2
2
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
3
3
|
import type { ManagementContext } from "./context";
|
|
4
|
-
import { isAuthorizedDesktopCompatibilityMutation } from "./desktop-compatibility-authorization";
|
|
5
4
|
import type { DesktopCompatibilityRuntime } from "../../codex/desktop-compatibility/runtime";
|
|
5
|
+
import { requireDesktopAuthorization } from "./desktop-authorization";
|
|
6
6
|
|
|
7
7
|
const PATH = "/api/codex/desktop-compatibility/runtime";
|
|
8
8
|
const ERROR_CODES = new Set(["busy", "unsupported", "test_environment", "stopping", "build_unverified", "egress_proxy_invalid",
|
|
@@ -12,7 +12,7 @@ const ERROR_CODES = new Set(["busy", "unsupported", "test_environment", "stoppin
|
|
|
12
12
|
export async function handleDesktopCompatibilityRuntimeRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
13
13
|
if (ctx.url.pathname !== PATH) return null;
|
|
14
14
|
if (ctx.req.method !== "GET" && ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
15
|
-
if (ctx.req.method === "POST"
|
|
15
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
16
16
|
let action: "start" | "stop" | "observe" | "apply" | "launch" | undefined;
|
|
17
17
|
if (ctx.req.method === "POST") {
|
|
18
18
|
let body: unknown;
|
|
@@ -26,6 +26,7 @@ export async function handleDesktopCompatibilityRuntimeRoutes(ctx: ManagementCon
|
|
|
26
26
|
action = value.action as typeof action;
|
|
27
27
|
}
|
|
28
28
|
const module = ctx.deps.desktopCompatibilityRuntime ? null : await import("../../codex/desktop-compatibility/service");
|
|
29
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
29
30
|
const service: DesktopCompatibilityRuntime = ctx.deps.desktopCompatibilityRuntime ?? module!.getDesktopCompatibilityRuntime();
|
|
30
31
|
if (module) ctx.deps.onDesktopCompatibilityShutdown?.(module.shutdownDesktopCompatibility);
|
|
31
32
|
try {
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { jsonResponse } from "../auth-cors";
|
|
2
2
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
3
3
|
import type { ManagementContext } from "./context";
|
|
4
|
-
import {
|
|
4
|
+
import { requireDesktopAuthorization } from "./desktop-authorization";
|
|
5
5
|
|
|
6
6
|
const PATH = "/api/codex/desktop-compatibility/settings";
|
|
7
7
|
export async function handleDesktopCompatibilitySettingsRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
8
8
|
if (ctx.url.pathname !== PATH) return null;
|
|
9
9
|
if (ctx.req.method !== "GET" && ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405);
|
|
10
|
-
if (ctx.req.method === "POST"
|
|
10
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
11
11
|
let update: { startOnProxyStart: boolean; revision: string } | undefined;
|
|
12
12
|
if (ctx.req.method === "POST") {
|
|
13
13
|
let body: unknown;
|
|
@@ -19,7 +19,9 @@ export async function handleDesktopCompatibilitySettingsRoutes(ctx: ManagementCo
|
|
|
19
19
|
|| typeof value.startOnProxyStart !== "boolean" || typeof value.revision !== "string" || !/^[a-f0-9]{64}$/.test(value.revision)) return jsonResponse({ error: "invalid_request" }, 400);
|
|
20
20
|
update = { startOnProxyStart: value.startOnProxyStart, revision: value.revision };
|
|
21
21
|
}
|
|
22
|
-
const
|
|
22
|
+
const module = ctx.deps.desktopStartupSettings ? null : await import("../../codex/desktop-compatibility/startup-settings");
|
|
23
|
+
if (ctx.req.method === "POST") { const denied = requireDesktopAuthorization(ctx); if (denied) return denied; }
|
|
24
|
+
const service = ctx.deps.desktopStartupSettings ?? module!.createDesktopStartupSettings({ liveConfig: ctx.config });
|
|
23
25
|
try { return jsonResponse({ ok: true, settings: update ? service.set(update.startOnProxyStart, update.revision) : service.status() }); }
|
|
24
26
|
catch (error) {
|
|
25
27
|
const code = error instanceof Error ? error.message.replace(/^desktop_compatibility_settings_/, "") : "operation_unconfirmed";
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Home-only file integration writes under route intent: the dashboard toggle, an integration
|
|
3
|
+
* restore and every Aside profile change. Each is the Home's own decision. Before it writes, a
|
|
4
|
+
* linked Home refuses an unreadable route-intent.json and saves every default its Children inherit
|
|
5
|
+
* (src/routing/home-route-intent.ts), so the write cannot move one. Afterwards, once the Home uses
|
|
6
|
+
* route intent, the result is recorded as a `devices.home` entry so `ocx sync` keeps it; that entry
|
|
7
|
+
* is the Home's own row and never a default a Child inherits. A Home with no link saves no default,
|
|
8
|
+
* and when its route-intent.json cannot be read it records nothing either: `ocx sync` cannot read
|
|
9
|
+
* that file, so it cannot undo the write.
|
|
10
|
+
*/
|
|
11
|
+
import { readConfigDiagnostics } from "../../config";
|
|
12
|
+
import { isRouteClientId, type RouteClientIntent } from "../../link/route-intent";
|
|
13
|
+
import { captureRefusal, homeHasLinks } from "../../routing/home-route-capture";
|
|
14
|
+
import { deriveHomeAsideIntent, HomeAsideIntentDerivationError, initializeHomeRouteIntentDefaults, recordHomeAsideDecision } from "../../routing/home-route-intent";
|
|
15
|
+
import { homeRouteIntentInUse, readRouteIntentState, recordHomeFileIntegrationDecision, routeIntentStatePath, RouteIntentStateUnreadableError } from "../../routing/route-intent-state";
|
|
16
|
+
import type { OcxConfig } from "../../types";
|
|
17
|
+
import { jsonResponse } from "../auth-cors";
|
|
18
|
+
import type { ManagementContext } from "./context";
|
|
19
|
+
|
|
20
|
+
const ASIDE_UNRESOLVED = "Existing Aside ownership could not be resolved to stable userIds, so this Home decision could not be kept by ocx sync; nothing was changed. Repair the Aside accounts.json manifest and its stable userIds, or choose an explicit Home Aside intent with ocx route to aside on|off --device home, then retry.";
|
|
21
|
+
|
|
22
|
+
function durableConfig(config: OcxConfig): OcxConfig {
|
|
23
|
+
const latest = readConfigDiagnostics();
|
|
24
|
+
return latest.source === "file" && !latest.error ? latest.config : config;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** On a Home with no link an unreadable route-intent.json means there is nothing this write may record. */
|
|
28
|
+
function unlinkedUnreadableState(): boolean {
|
|
29
|
+
if (homeHasLinks()) return false;
|
|
30
|
+
try { readRouteIntentState(); return false; }
|
|
31
|
+
catch (error) {
|
|
32
|
+
if (error instanceof RouteIntentStateUnreadableError) return true;
|
|
33
|
+
throw error;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function refusal(ctx: ManagementContext, clientId: string | undefined, error: unknown): Response {
|
|
38
|
+
const client = clientId === undefined ? {} : { clientId };
|
|
39
|
+
if (error instanceof HomeAsideIntentDerivationError) {
|
|
40
|
+
return jsonResponse({ error: ASIDE_UNRESOLVED, code: "route_intent_aside_unresolved", ...client }, 409, ctx.req, ctx.config);
|
|
41
|
+
}
|
|
42
|
+
if (error instanceof RouteIntentStateUnreadableError) {
|
|
43
|
+
return jsonResponse({ error: error.message, code: "route_intent_unavailable", ...client }, 500, ctx.req, ctx.config);
|
|
44
|
+
}
|
|
45
|
+
const refused = captureRefusal(error);
|
|
46
|
+
return jsonResponse({ error: refused.message, code: "route_intent_unavailable", ...client, retryable: refused.retryable },
|
|
47
|
+
refused.retryable ? 409 : 500, ctx.req, ctx.config);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Runs before the write; a refusal means nothing changed. `asideEnabling` names the Aside profiles
|
|
52
|
+
* the write may enable, so one without a stable userId refuses now instead of after the write.
|
|
53
|
+
*/
|
|
54
|
+
export function prepareHomeIntegrationDecision(ctx: ManagementContext, clientId: string | undefined,
|
|
55
|
+
asideEnabling?: readonly number[] | "all"): Response | null {
|
|
56
|
+
try {
|
|
57
|
+
if (unlinkedUnreadableState()) return null;
|
|
58
|
+
readRouteIntentState();
|
|
59
|
+
// The durable config already carries the switches another process may have changed; the live
|
|
60
|
+
// one is never cloned here (it can hold runtime-only values).
|
|
61
|
+
initializeHomeRouteIntentDefaults(durableConfig(ctx.config), ctx.version, undefined, { whenLinked: true });
|
|
62
|
+
if (asideEnabling !== undefined && homeRouteIntentInUse(readRouteIntentState())) {
|
|
63
|
+
deriveHomeAsideIntent(durableConfig(ctx.config), { extraProfileIds: asideEnabling });
|
|
64
|
+
}
|
|
65
|
+
return null;
|
|
66
|
+
} catch (error) {
|
|
67
|
+
return refusal(ctx, clientId, error);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* Runs after a successful write and returns the response to send. A file client's decision is
|
|
73
|
+
* `intent`; Aside's is derived from the profiles the Home owns now.
|
|
74
|
+
*/
|
|
75
|
+
export function recordHomeIntegrationDecision(ctx: ManagementContext, clientId: string, success: Response,
|
|
76
|
+
intent?: () => RouteClientIntent): Response {
|
|
77
|
+
try {
|
|
78
|
+
if (unlinkedUnreadableState()) return success;
|
|
79
|
+
if (clientId === "aside") recordHomeAsideDecision(durableConfig(ctx.config));
|
|
80
|
+
else if (isRouteClientId(clientId) && intent) recordHomeFileIntegrationDecision(clientId, intent());
|
|
81
|
+
return success;
|
|
82
|
+
} catch (error) {
|
|
83
|
+
const reason = error instanceof HomeAsideIntentDerivationError
|
|
84
|
+
? "its Aside profiles could not be named by stable userIds"
|
|
85
|
+
: `route intent in ${routeIntentStatePath()} could not record it`;
|
|
86
|
+
return jsonResponse({ error: `The ${clientId} integration was changed, but ${reason}, so ocx sync may undo it. Inspect it, fix or remove it, then make the change again.`,
|
|
87
|
+
code: "route_intent_unavailable", clientId, integrationChanged: true }, 500, ctx.req, ctx.config);
|
|
88
|
+
}
|
|
89
|
+
}
|