@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- 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 +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -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.ts +31 -14
- 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/google-antigravity-wire.ts +7 -5
- 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/zed.ts +3 -0
- 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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- 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 +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.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 +168 -0
- package/src/cli/dispatch.ts +54 -12
- 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 +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- 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 +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -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 +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- 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-restart-client.ts +3 -2
- 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 +321 -34
- 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 +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -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-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-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- 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/retained-sync.ts +2 -1
- 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 +2 -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/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- 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 +23 -1
- 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 +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- 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/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- 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/redact.ts +84 -8
- 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 +14 -4
- 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 +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -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/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 +46 -2
- 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/claude-keychain-read.ts +78 -68
- 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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- 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-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 +510 -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 +3 -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-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/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/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/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 +98 -0
- 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 +2 -1
- package/src/server/configured-credentials.ts +37 -5
- 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 +190 -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 +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- 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 +137 -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/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 +173 -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 +36 -13
- 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 +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- 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/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 +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- 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 +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- 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/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-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 +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- 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 +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- 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 +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- 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 +14 -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/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/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- 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 +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -75,6 +75,7 @@ import {
|
|
|
75
75
|
admissionFields,
|
|
76
76
|
resolveApiAuth,
|
|
77
77
|
resolveResponsesApiAuth,
|
|
78
|
+
isContextPrincipalCurrent,
|
|
78
79
|
type RequestPolicyView,
|
|
79
80
|
withCors,
|
|
80
81
|
withManagementCors,
|
|
@@ -92,7 +93,7 @@ import {
|
|
|
92
93
|
} from "../live";
|
|
93
94
|
import type { ServeOptionsContext } from "./serve-options";
|
|
94
95
|
import type { RequestMetricsRecorder } from "../request-metrics";
|
|
95
|
-
import { resolveInboundBodyLimitBytes } from "../request-decompress";
|
|
96
|
+
import { attachParsedRequestBody, resolveInboundBodyLimitBytes } from "../request-decompress";
|
|
96
97
|
import { responseToolOwnership } from "../responses/response-tool-ownership";
|
|
97
98
|
import { runTurnStateCallerScope } from "../turn-state-handles";
|
|
98
99
|
import { admitHttpWorkflowTurn, workflowDecisionRefusalResponse } from "../workflow-refusal";
|
|
@@ -230,6 +231,9 @@ export function createWebsocketHandler(
|
|
|
230
231
|
}
|
|
231
232
|
if (frame.type === "response.inject" || frame.type === "response.steer" || (frame.type === "response.create" && ws.data.nativeControl)) {
|
|
232
233
|
try {
|
|
234
|
+
// Remote Link sockets never carry native control (design T4 1.1); the link wrapper has
|
|
235
|
+
// already re-checked this frame's authorization before it reached the shared handler.
|
|
236
|
+
if (ws.data.nativeControlDisabled && frame.type !== "response.create") throw new NativeSteeringError("native_control_unavailable_on_link", "Native response control is unavailable on a Remote Link WebSocket.");
|
|
233
237
|
if (frame.type === "response.inject") {
|
|
234
238
|
if (!ws.data.nativeControl?.inject) throw new NativeSteeringError("injection_not_supported", "Native injection is disabled or unavailable on this route.");
|
|
235
239
|
ws.data.nativeControl.inject(frame);
|
|
@@ -262,7 +266,7 @@ export function createWebsocketHandler(
|
|
|
262
266
|
try {
|
|
263
267
|
const idleMs = typeof config.stallTimeoutSec === "number" && Number.isFinite(config.stallTimeoutSec)
|
|
264
268
|
? Math.max(1, config.stallTimeoutSec) * 1000 : 300_000;
|
|
265
|
-
const mode = nativeResponseControlMode(frame, config);
|
|
269
|
+
const mode = ws.data.nativeControlDisabled ? undefined : nativeResponseControlMode(frame, config);
|
|
266
270
|
nativeControl = mode === "injection" ? new NativeInjectionChannel(frame, idleMs, config.maxUpstreamBodyBytes)
|
|
267
271
|
: mode === "steering" ? new NativeSteeringChannel(frame, idleMs, config.maxUpstreamBodyBytes) : undefined;
|
|
268
272
|
} catch {
|
|
@@ -342,11 +346,18 @@ export function createWebsocketHandler(
|
|
|
342
346
|
const baseHeaders = ws.data.headers ?? new Headers();
|
|
343
347
|
const fwd = new Headers({ "content-type": "application/json" });
|
|
344
348
|
baseHeaders.forEach((value, key) => fwd.set(key, value));
|
|
349
|
+
// A Remote Link socket hands the pipeline the create it parsed (#8600): serializing it into the request and
|
|
350
|
+
// parsing it back would hold two more request-sized copies for the turn. Local sockets keep the request body.
|
|
351
|
+
// turnBody is a shallow copy: preparation's in-place edits to nested input reach frame.input too, which the
|
|
352
|
+
// socket's activity book reads again later, for the array's identity and each result's type and ids only.
|
|
353
|
+
const turnBody = { ...payload, stream: true };
|
|
354
|
+
const linkSocket = ws.data.link !== undefined;
|
|
345
355
|
const req = new Request("http://localhost/v1/responses", {
|
|
346
356
|
method: "POST",
|
|
347
357
|
headers: fwd,
|
|
348
|
-
body: JSON.stringify(
|
|
358
|
+
...(linkSocket ? {} : { body: JSON.stringify(turnBody) }),
|
|
349
359
|
});
|
|
360
|
+
if (linkSocket) attachParsedRequestBody(req, turnBody);
|
|
350
361
|
try {
|
|
351
362
|
// A socket can be the first ingress for a root. Admit every inference frame,
|
|
352
363
|
// then keep its workflow lease with the turn until terminal output or cancellation.
|
|
@@ -360,12 +371,19 @@ export function createWebsocketHandler(
|
|
|
360
371
|
if (workflow?.admitted) turnAdmissionLease.attach(workflow.lease);
|
|
361
372
|
ws.data.nativeControl = nativeControl;
|
|
362
373
|
let terminalRecorder: ((status: ResponsesTerminalStatus, httpStatusOverride?: number) => void) | undefined;
|
|
374
|
+
const retainedPrincipal = ws.data.replayPrincipal;
|
|
375
|
+
const replayPrincipal = retainedPrincipal && (isContextPrincipalCurrent(retainedPrincipal.clientPrincipalId, config)
|
|
376
|
+
? retainedPrincipal : { clientPrincipalId: undefined });
|
|
363
377
|
const response = await handleResponses(req, config, logCtx, {
|
|
364
378
|
advisorAdmissionPolicy,
|
|
365
379
|
...(wsAdmission ? { admission: wsAdmission } : {}),
|
|
380
|
+
// Keep an empty holder after revocation: a different forwarded bearer
|
|
381
|
+
// must not become this connection's retained replay owner.
|
|
382
|
+
...(replayPrincipal ? { replayPrincipal } : {}),
|
|
366
383
|
forceEmptyResponseId: true,
|
|
367
384
|
inboundTransport: "websocket",
|
|
368
385
|
nativeControl,
|
|
386
|
+
...(ws.data.linkTurnObserver ? { linkTurn: ws.data.linkTurnObserver(turnId) } : {}),
|
|
369
387
|
abortSignal: turnAbort.signal,
|
|
370
388
|
turnAdmissionLease,
|
|
371
389
|
onFirstOutput: () => recordFirstOutput(logCtx, start),
|
|
@@ -381,12 +399,15 @@ export function createWebsocketHandler(
|
|
|
381
399
|
logCtx.causeHint = "transport-ambiguous";
|
|
382
400
|
logCtx.terminalSource = "synthetic";
|
|
383
401
|
}
|
|
402
|
+
// Remote Link holds release only for a turn every admission accepted (link-websocket.ts).
|
|
403
|
+
if (response.ok) ws.data.responsesActivity?.notifyAccepted(frame.input);
|
|
384
404
|
const observeLog = nativeControl?.relayActive
|
|
385
405
|
? createNativeSteeringLogObserver(logCtx, () => recordFirstOutput(logCtx, start))
|
|
386
406
|
: (payload: string) => inspectResponseLogSsePayload(logCtx, payload);
|
|
387
407
|
const providerExecuted = responseToolOwnership(response);
|
|
388
408
|
await sendResponseToWebSocket(ws, response, isCurrent, {
|
|
389
|
-
|
|
409
|
+
// A native-control body is the upstream itself, with no relay tail behind it.
|
|
410
|
+
untilEof: nativeControl?.relayActive === true, rawUpstream: nativeControl?.relayActive === true,
|
|
390
411
|
onSsePayload: payload => {
|
|
391
412
|
ws.data.responsesActivity?.observePayload(payload, providerExecuted);
|
|
392
413
|
observeLog(payload);
|
|
@@ -445,6 +466,7 @@ export function createWebsocketHandler(
|
|
|
445
466
|
turnAdmissionLease.release();
|
|
446
467
|
if (ws.data.nativeControl === nativeControl) ws.data.nativeControl = undefined;
|
|
447
468
|
if (!logged && turnAbort.signal.aborted) finalizeLog(499);
|
|
469
|
+
ws.data.linkTurnEnded?.(turnId);
|
|
448
470
|
if (ws.data.cancel === cancelTurn) ws.data.cancel = undefined;
|
|
449
471
|
}
|
|
450
472
|
});
|
package/src/server/index.ts
CHANGED
|
@@ -50,6 +50,7 @@ import {
|
|
|
50
50
|
} from "../codex/auth-api";
|
|
51
51
|
import { activateResetCreditAutoRedeem } from "../codex/reset-credit-auto-redeem";
|
|
52
52
|
import { registerCodexQuotaAutoRefreshWorker } from "../codex/quota-auto-refresh";
|
|
53
|
+
import { registerAnthropicCooldownRecoveryProbeWorker } from "../providers/quota/anthropic-cooldown-recovery-worker";
|
|
53
54
|
import {
|
|
54
55
|
reconcileLiveStateStores,
|
|
55
56
|
setLiveStateStoreConfig,
|
|
@@ -610,6 +611,7 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
610
611
|
const linkPolicy = (): RequestPolicyView => requestPolicyView(config, LINK_INGRESS_HOSTNAME, { allowedKeyIds: optionalListeners.linkAdmissionKeyIds() });
|
|
611
612
|
let backgroundLifecycle: ReturnType<typeof acquireServerBackgroundLifecycle> | null = null;
|
|
612
613
|
let unregisterQuotaAutoRefresh: (() => void) | null = null;
|
|
614
|
+
let unregisterAnthropicCooldownRecovery: (() => void) | null = null;
|
|
613
615
|
let remoteWorkspaceStopping = false;
|
|
614
616
|
let remoteWorkspaceShutdown: (() => Promise<void>) | undefined;
|
|
615
617
|
let desktopCompatibilityStartup: ReturnType<typeof scheduleDesktopCompatibilityStartup> | undefined;
|
|
@@ -636,6 +638,7 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
636
638
|
backgroundLifecycle = acquireServerBackgroundLifecycle(applyPolicy, config);
|
|
637
639
|
unregisterQuotaAutoRefresh = (deps.registerCodexQuotaAutoRefreshWorker
|
|
638
640
|
?? registerCodexQuotaAutoRefreshWorker)(config);
|
|
641
|
+
unregisterAnthropicCooldownRecovery = registerAnthropicCooldownRecoveryProbeWorker(config);
|
|
639
642
|
// Poll external pricing edits; the startup catch releases this owner-scoped lease.
|
|
640
643
|
userCostOverlayReconciler = startUserCostOverlayReconciler({ liveConfig: config });
|
|
641
644
|
const serveOptions = createServeOptions({
|
|
@@ -643,7 +646,8 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
643
646
|
ingressForServer,
|
|
644
647
|
loopbackRouteAllowed,
|
|
645
648
|
managementIngressRouteAllowed,
|
|
646
|
-
linkRouteAllowed: optionalListeners.linkRouteAllowed, linkPolicy,
|
|
649
|
+
linkRouteAllowed: optionalListeners.linkRouteAllowed, linkPolicy,
|
|
650
|
+
onAuthenticatedCatalog: (apiKeyId, routeProofId) => { optionalListeners.notifyAuthenticatedCatalog(apiKeyId, routeProofId); deps.observeAuthenticatedCatalog?.(apiKeyId, routeProofId); },
|
|
647
651
|
packageTreeChangedResponse,
|
|
648
652
|
serverBusyResponse,
|
|
649
653
|
runAdmittedHttpTurn,
|
|
@@ -710,9 +714,10 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
710
714
|
}
|
|
711
715
|
configureInboundBodyBudget(config.maxConcurrentInboundBodyBytes);
|
|
712
716
|
optionalListeners.start({ config, publicPort: server.port ?? listenPort, requestedPort: listenPort, startProxy: deps.startClaudeInterceptProxy,
|
|
713
|
-
maxRequestBodySize: inboundBodyLimitBytes, dispatch: (req, requestServer) => serveOptions.fetch(req, requestServer) });
|
|
717
|
+
maxRequestBodySize: inboundBodyLimitBytes, dispatch: (req, requestServer) => serveOptions.fetch(req, requestServer), websocket: serveOptions.websocket, linkPolicy });
|
|
714
718
|
} catch (error) {
|
|
715
719
|
unregisterQuotaAutoRefresh?.();
|
|
720
|
+
unregisterAnthropicCooldownRecovery?.();
|
|
716
721
|
userCostOverlayReconciler?.stop();
|
|
717
722
|
backgroundLifecycle?.releaseAfterFailedStart();
|
|
718
723
|
void nativeMainLifecycle.release();
|
|
@@ -758,6 +763,7 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
758
763
|
userCostOverlayReconciler?.stop();
|
|
759
764
|
} finally {
|
|
760
765
|
unregisterQuotaAutoRefresh?.();
|
|
766
|
+
unregisterAnthropicCooldownRecovery?.();
|
|
761
767
|
}
|
|
762
768
|
},
|
|
763
769
|
],
|
|
@@ -831,6 +837,10 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
831
837
|
.catch(() => {}));
|
|
832
838
|
}
|
|
833
839
|
|
|
840
|
+
// Remote Link (lane O2): after an upgrade of a packaged install, cache the ocx-child builds its package's digests
|
|
841
|
+
// vouch for. Background work that never delays listen; until a release ships digests it fetches nothing and only creates ocx-child-builds/ with its baseline marker.
|
|
842
|
+
if ((config.runtimeRole ?? "standalone") !== "client") void trackBackgroundWork("ocx-child-cache-fill", import("../link/child-binary-cache-start").then(fill => fill.startChildBinaryCacheFill(config.runtimeRole)).catch(() => {}));
|
|
843
|
+
|
|
834
844
|
// Opt-in storage policy (default OFF). Never blocks listen; cancellable on shutdown.
|
|
835
845
|
backgroundLifecycle.scheduleStartupRun();
|
|
836
846
|
|
|
@@ -171,6 +171,8 @@ export async function deliverClientEncodedResponse(input: ClientEncodedDelivery)
|
|
|
171
171
|
recordBufferedDelivery: false,
|
|
172
172
|
// The client never receives this body, and its Chat/Messages wire has no envelope field.
|
|
173
173
|
omitHiddenReasoningEnvelope: true,
|
|
174
|
+
// Keep the client's raw text: completion fingerprints compare it with what the client resends.
|
|
175
|
+
escapeMemoryCitationTags: false,
|
|
174
176
|
});
|
|
175
177
|
} catch {
|
|
176
178
|
return undefined;
|
|
@@ -1,6 +1,42 @@
|
|
|
1
|
+
import { carryPacedStream, isPacedStream, PACED_READ_AHEAD_BYTES } from "../lib/paced-stream";
|
|
2
|
+
|
|
1
3
|
/** Read-ahead allowance, not a lifetime limit on SSE inspection or delivery. */
|
|
2
4
|
export const MAX_INSPECTION_READ_AHEAD_BYTES = 32 * 1024 * 1024;
|
|
3
5
|
|
|
6
|
+
/**
|
|
7
|
+
* Relay a body in slices of at most `maxChunkBytes`, reading the source only when the last slice was taken.
|
|
8
|
+
*
|
|
9
|
+
* Every relay stage with a queue of one chunk then holds one slice instead of one source chunk, and the slices are
|
|
10
|
+
* views of the chunk the source handed over, never copies. Bytes, order and errors pass through unchanged; a cancel
|
|
11
|
+
* reaches the source.
|
|
12
|
+
*/
|
|
13
|
+
export function sliceChunks(source: ReadableStream<Uint8Array>, maxChunkBytes: number): ReadableStream<Uint8Array> {
|
|
14
|
+
if (!Number.isSafeInteger(maxChunkBytes) || maxChunkBytes <= 0) throw new RangeError("Slice size must be a positive safe integer");
|
|
15
|
+
const reader = source.getReader();
|
|
16
|
+
let pending: Uint8Array | undefined;
|
|
17
|
+
return new ReadableStream<Uint8Array>({
|
|
18
|
+
async pull(controller) {
|
|
19
|
+
try {
|
|
20
|
+
while (pending === undefined) {
|
|
21
|
+
const next = await reader.read();
|
|
22
|
+
if (next.done) { controller.close(); return; }
|
|
23
|
+
if (next.value.byteLength > 0) pending = next.value;
|
|
24
|
+
}
|
|
25
|
+
const slice = pending.subarray(0, maxChunkBytes);
|
|
26
|
+
pending = pending.byteLength > maxChunkBytes ? pending.subarray(maxChunkBytes) : undefined;
|
|
27
|
+
controller.enqueue(slice);
|
|
28
|
+
} catch (error) {
|
|
29
|
+
pending = undefined;
|
|
30
|
+
controller.error(error);
|
|
31
|
+
}
|
|
32
|
+
},
|
|
33
|
+
cancel(reason) {
|
|
34
|
+
pending = undefined;
|
|
35
|
+
return reader.cancel(reason);
|
|
36
|
+
},
|
|
37
|
+
}, { highWaterMark: 0 });
|
|
38
|
+
}
|
|
39
|
+
|
|
4
40
|
export interface InspectionTeeOptions {
|
|
5
41
|
/** Release pacing so the inspection owner's existing bounded drain can run. */
|
|
6
42
|
clientGoneSignal?: AbortSignal;
|
|
@@ -21,7 +57,8 @@ export function teeWithBoundedInspection(
|
|
|
21
57
|
source: ReadableStream<Uint8Array>,
|
|
22
58
|
options: InspectionTeeOptions = {},
|
|
23
59
|
): [ReadableStream<Uint8Array>, ReadableStream<Uint8Array>] {
|
|
24
|
-
|
|
60
|
+
// A paced source (#8601) lets inspection lead its client by one chunk instead of the allowance.
|
|
61
|
+
const limit = options.maxReadAheadBytes ?? (isPacedStream(source) ? PACED_READ_AHEAD_BYTES : MAX_INSPECTION_READ_AHEAD_BYTES);
|
|
25
62
|
if (!Number.isSafeInteger(limit) || limit <= 0) {
|
|
26
63
|
throw new RangeError("Inspection read-ahead limit must be a positive safe integer");
|
|
27
64
|
}
|
|
@@ -103,5 +140,5 @@ export function teeWithBoundedInspection(
|
|
|
103
140
|
},
|
|
104
141
|
}, { highWaterMark: 0 });
|
|
105
142
|
};
|
|
106
|
-
return [wrap(client, true), wrap(inspection, false)];
|
|
143
|
+
return [carryPacedStream(source, wrap(client, true)), wrap(inspection, false)];
|
|
107
144
|
}
|
package/src/server/lifecycle.ts
CHANGED
|
@@ -64,6 +64,8 @@ let serverStartupReleaseFlights = new WeakMap<ReturnType<typeof Bun.serve>, Prom
|
|
|
64
64
|
let releaseServerStartupLifecycleImpl: typeof releaseNativeMainStartupLifecycle = releaseNativeMainStartupLifecycle;
|
|
65
65
|
|
|
66
66
|
export function setServerRef(server: ReturnType<typeof Bun.serve> | undefined): void { _serverRef = server; }
|
|
67
|
+
/** The port the main listener is actually bound to, or null before it serves. */
|
|
68
|
+
export function boundServerPort(): number | null { return _serverRef?.port ?? null; }
|
|
67
69
|
/**
|
|
68
70
|
* Legacy/test-only drain control. Production scoped operations must use a lease,
|
|
69
71
|
* while process shutdown uses the irreversible shutdown latch.
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The seam between the Responses pipeline and Remote Link activity holds (design T4 section 5).
|
|
3
|
+
*
|
|
4
|
+
* A link turn may carry an observer: a link WebSocket passes one in handleResponses options, and a
|
|
5
|
+
* relayed HTTP request carries a short-lived random token header the link relay registered. The
|
|
6
|
+
* pipeline reports the expanded input right after continuation expansion and before any upstream
|
|
7
|
+
* I/O, and the final request log reports the terminal status and whether the terminal came from the
|
|
8
|
+
* upstream. No content leaves this module: observers hash what they need. Nothing here runs for a
|
|
9
|
+
* request that carries no observer.
|
|
10
|
+
*
|
|
11
|
+
* While the link WebSocket feature is on, an observer also describes the request for the request log
|
|
12
|
+
* (design T4 section 9.1): its transport and hashed thread and turn refs. This module records the
|
|
13
|
+
* continuation outcome on the log context as `link`, so the final row carries it.
|
|
14
|
+
*/
|
|
15
|
+
import type { LinkContinuationReason, LinkRequestLogCarrier, LinkTransport } from "../usage/link-log-fields";
|
|
16
|
+
|
|
17
|
+
/** What a link observer contributes to the request log; null when it describes nothing. */
|
|
18
|
+
export interface LinkTurnLogFields { transport: LinkTransport; first: boolean; threadRef?: string; turnRef?: string }
|
|
19
|
+
|
|
20
|
+
export interface LinkTurnObserver {
|
|
21
|
+
/**
|
|
22
|
+
* The request body after continuation expansion. chain "unexpanded" means previous_response_id was
|
|
23
|
+
* left for the upstream: the body is only a delta, so it is never a fingerprint and never matches one.
|
|
24
|
+
*/
|
|
25
|
+
expanded(body: unknown, chain?: LinkTurnChain): void;
|
|
26
|
+
/** Expansion failed (continuation miss); a capture cannot be made. */
|
|
27
|
+
expansionFailed(): void;
|
|
28
|
+
/** The turn's final request log: its terminal status, and "synthetic" when the proxy made it. */
|
|
29
|
+
terminal(status: string | undefined, source: string | undefined): void;
|
|
30
|
+
/** Request-log fields; present only while the link WebSocket feature is on. */
|
|
31
|
+
logFields?(body: unknown): LinkTurnLogFields | null;
|
|
32
|
+
/**
|
|
33
|
+
* Set only while the link WebSocket feature is on (#8601): the turn's upstream body is read only as its client drains,
|
|
34
|
+
* so a stalled link reader holds about one upstream chunk instead of the pipeline's inspection read-ahead.
|
|
35
|
+
*/
|
|
36
|
+
pacedReads?: boolean;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** The continuation outcome preparation saw: expanded locally, left for the upstream, or none sent. */
|
|
40
|
+
export type LinkTurnChain = "chained" | "unexpanded" | "none";
|
|
41
|
+
|
|
42
|
+
export const LINK_TURN_HEADER = "x-opencodex-link-turn";
|
|
43
|
+
|
|
44
|
+
/** A paced link turn's upstream chunks are relayed in slices of at most this size, so each relay stage holds one slice. */
|
|
45
|
+
export const LINK_PACED_SLICE_BYTES = 256 * 1024;
|
|
46
|
+
|
|
47
|
+
const byToken = new Map<string, LinkTurnObserver>();
|
|
48
|
+
const byLog = new WeakMap<object, LinkTurnObserver>();
|
|
49
|
+
|
|
50
|
+
/** Registers an observer for one relayed request; the caller sets the returned token as LINK_TURN_HEADER. */
|
|
51
|
+
export function registerLinkTurnToken(observer: LinkTurnObserver): string {
|
|
52
|
+
const bytes = new Uint8Array(16);
|
|
53
|
+
crypto.getRandomValues(bytes);
|
|
54
|
+
const token = [...bytes].map(byte => byte.toString(16).padStart(2, "0")).join("");
|
|
55
|
+
byToken.set(token, observer);
|
|
56
|
+
return token;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** Drops a token the pipeline never claimed (a request refused before preparation). */
|
|
60
|
+
export function releaseLinkTurnToken(token: string): void {
|
|
61
|
+
byToken.delete(token);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** Registered tokens no pipeline has claimed or the relay released yet (bounded by requests in flight). */
|
|
65
|
+
export function pendingLinkTurnTokens(): number {
|
|
66
|
+
return byToken.size;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
function claim(explicit: LinkTurnObserver | undefined, req: Request): LinkTurnObserver | undefined {
|
|
70
|
+
const token = req.headers.get(LINK_TURN_HEADER);
|
|
71
|
+
if (token !== null) {
|
|
72
|
+
// Never forwarded: the header exists only between the link relay and this point.
|
|
73
|
+
try { req.headers.delete(LINK_TURN_HEADER); } catch { /* immutable headers carry nothing further */ }
|
|
74
|
+
}
|
|
75
|
+
if (explicit) return explicit;
|
|
76
|
+
if (!token) return undefined;
|
|
77
|
+
const observer = byToken.get(token);
|
|
78
|
+
byToken.delete(token);
|
|
79
|
+
return observer;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
function describe(observer: LinkTurnObserver, logCtx: object, body: unknown, outcome: { continuation: "chained" | "full" | "miss"; reason?: LinkContinuationReason } | ((first: boolean) => { continuation: "full"; reason: LinkContinuationReason })): void {
|
|
83
|
+
let fields: LinkTurnLogFields | null = null;
|
|
84
|
+
try { fields = observer.logFields?.(body) ?? null; } catch { fields = null; }
|
|
85
|
+
if (!fields) return;
|
|
86
|
+
const resolved = typeof outcome === "function" ? outcome(fields.first) : outcome;
|
|
87
|
+
(logCtx as LinkRequestLogCarrier).link = {
|
|
88
|
+
transport: fields.transport, continuation: resolved.continuation,
|
|
89
|
+
...(resolved.reason ? { continuationReason: resolved.reason } : {}),
|
|
90
|
+
...(fields.threadRef ? { threadRef: fields.threadRef } : {}),
|
|
91
|
+
...(fields.turnRef ? { turnRef: fields.turnRef } : {}),
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* Right after continuation expansion succeeded, before upstream I/O. An unexpanded continuation goes
|
|
97
|
+
* to an upstream that owns the history (chained) unless preparation refuses it (markLinkTurnMissing).
|
|
98
|
+
*/
|
|
99
|
+
export function observeLinkTurnExpansion(explicit: LinkTurnObserver | undefined, req: Request, logCtx: object, body: unknown, chain: LinkTurnChain = "none"): void {
|
|
100
|
+
const observer = claim(explicit, req);
|
|
101
|
+
if (!observer) return;
|
|
102
|
+
byLog.set(logCtx, observer);
|
|
103
|
+
describe(observer, logCtx, body, chain === "none"
|
|
104
|
+
? (first: boolean) => ({ continuation: "full" as const, reason: first ? "first" as const : "client" as const })
|
|
105
|
+
: { continuation: "chained" });
|
|
106
|
+
try { observer.expanded(body, chain); } catch { /* an observer never breaks the turn */ }
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/** Continuation expansion failed: a miss with the replay failure's reason. */
|
|
110
|
+
export function failLinkTurnExpansion(explicit: LinkTurnObserver | undefined, req: Request, logCtx: object, body?: unknown, reason?: LinkContinuationReason): void {
|
|
111
|
+
const observer = claim(explicit, req);
|
|
112
|
+
if (!observer) return;
|
|
113
|
+
byLog.set(logCtx, observer);
|
|
114
|
+
describe(observer, logCtx, body, { continuation: "miss", ...(reason ? { reason } : {}) });
|
|
115
|
+
try { observer.expansionFailed(); } catch { /* an observer never breaks the turn */ }
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/** Preparation refused an unexpanded continuation (the history is nowhere): a miss, reason missing. */
|
|
119
|
+
export function markLinkTurnMissing(logCtx: object): void {
|
|
120
|
+
const link = (logCtx as LinkRequestLogCarrier).link;
|
|
121
|
+
if (link) (logCtx as LinkRequestLogCarrier).link = { ...link, continuation: "miss", continuationReason: "missing" };
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/** Whether a link turn bound to this context reads its upstream only as its client drains; false for every other request. */
|
|
125
|
+
export function linkTurnPacesReads(logCtx: object): boolean {
|
|
126
|
+
return byLog.get(logCtx)?.pacedReads === true;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/** Called by the final request log of every turn; a no-op unless a link turn bound this context. */
|
|
130
|
+
export function notifyLinkTurnFinal(logCtx: object, status: string | undefined): void {
|
|
131
|
+
const observer = byLog.get(logCtx);
|
|
132
|
+
if (!observer) return;
|
|
133
|
+
byLog.delete(logCtx);
|
|
134
|
+
const source = (logCtx as { terminalSource?: unknown }).terminalSource;
|
|
135
|
+
try { observer.terminal(status, typeof source === "string" ? source : undefined); } catch { /* never breaks logging */ }
|
|
136
|
+
}
|
|
137
|
+
|
|
@@ -23,10 +23,12 @@ import {
|
|
|
23
23
|
isCurrentAdvisorContextSharingConsent,
|
|
24
24
|
isValidAdvisorEffort,
|
|
25
25
|
isValidAdvisorPolicy,
|
|
26
|
+
isValidAdvisorContextMode,
|
|
26
27
|
isValidAdvisorTaskLimit,
|
|
27
28
|
resolveAdvisorSettings,
|
|
28
29
|
type AdvisorEffort,
|
|
29
30
|
type AdvisorPolicy,
|
|
31
|
+
type AdvisorContextMode,
|
|
30
32
|
} from "../../advisor/settings";
|
|
31
33
|
import { advisorActivityStore } from "../../advisor/activity";
|
|
32
34
|
|
|
@@ -37,6 +39,7 @@ interface AdvisorPatch {
|
|
|
37
39
|
model?: string;
|
|
38
40
|
effort?: AdvisorEffort;
|
|
39
41
|
policy?: AdvisorPolicy;
|
|
42
|
+
contextMode?: AdvisorContextMode;
|
|
40
43
|
timeoutMs?: number;
|
|
41
44
|
maxConsultationsPerTask?: number;
|
|
42
45
|
/** "v1" records current consent. null removes it. Enabling does not imply this field. */
|
|
@@ -46,7 +49,7 @@ interface AdvisorPatch {
|
|
|
46
49
|
|
|
47
50
|
type ParsedPatch = { ok: true; patch: AdvisorPatch } | { ok: false; code: string; message: string };
|
|
48
51
|
|
|
49
|
-
const PATCH_KEYS = new Set(["enabled", "model", "effort", "policy", "timeoutMs", "maxConsultationsPerTask", "contextSharingConsent", "reset"]);
|
|
52
|
+
const PATCH_KEYS = new Set(["enabled", "model", "effort", "policy", "contextMode", "timeoutMs", "maxConsultationsPerTask", "contextSharingConsent", "reset"]);
|
|
50
53
|
|
|
51
54
|
type Rec = Record<string, unknown>;
|
|
52
55
|
function isRec(value: unknown): value is Rec {
|
|
@@ -58,7 +61,7 @@ export function parseAdvisorSettingsPatch(body: unknown): ParsedPatch {
|
|
|
58
61
|
if (!isRec(body)) return { ok: false, code: "invalid_body", message: "body must be a JSON object" };
|
|
59
62
|
if (Object.keys(body).length === 0) return { ok: false, code: "empty_body", message: "body must set at least one supported advisor setting or reset" };
|
|
60
63
|
for (const key of Object.keys(body)) {
|
|
61
|
-
if (!PATCH_KEYS.has(key)) return { ok: false, code: "unknown_field", message: "body accepts only enabled, model, effort, policy, timeoutMs, maxConsultationsPerTask, contextSharingConsent and reset" };
|
|
64
|
+
if (!PATCH_KEYS.has(key)) return { ok: false, code: "unknown_field", message: "body accepts only enabled, model, effort, policy, contextMode, timeoutMs, maxConsultationsPerTask, contextSharingConsent and reset" };
|
|
62
65
|
}
|
|
63
66
|
const patch: AdvisorPatch = {};
|
|
64
67
|
if (body.reset !== undefined) {
|
|
@@ -96,6 +99,10 @@ export function parseAdvisorSettingsPatch(body: unknown): ParsedPatch {
|
|
|
96
99
|
}
|
|
97
100
|
patch.policy = body.policy;
|
|
98
101
|
}
|
|
102
|
+
if (body.contextMode !== undefined) {
|
|
103
|
+
if (!isValidAdvisorContextMode(body.contextMode)) return { ok: false, code: "invalid_context_mode", message: 'contextMode must be "context" or "question-only"' };
|
|
104
|
+
patch.contextMode = body.contextMode;
|
|
105
|
+
}
|
|
99
106
|
if (body.timeoutMs !== undefined) {
|
|
100
107
|
if (typeof body.timeoutMs !== "number" || !Number.isFinite(body.timeoutMs) || body.timeoutMs < 1_000 || body.timeoutMs > 600_000) {
|
|
101
108
|
return { ok: false, code: "invalid_timeout", message: "timeoutMs must be a number between 1000 and 600000" };
|
|
@@ -148,6 +155,7 @@ function applyPatchInMemory(config: ManagementContext["config"], patch: AdvisorP
|
|
|
148
155
|
if (patch.model !== undefined) current.model = patch.model;
|
|
149
156
|
if (patch.effort !== undefined) current.effort = patch.effort;
|
|
150
157
|
if (patch.policy !== undefined) current.policy = patch.policy;
|
|
158
|
+
if (patch.contextMode !== undefined) current.contextMode = patch.contextMode;
|
|
151
159
|
if (patch.timeoutMs !== undefined) current.timeoutMs = patch.timeoutMs;
|
|
152
160
|
if (patch.maxConsultationsPerTask !== undefined) current.maxConsultationsPerTask = patch.maxConsultationsPerTask;
|
|
153
161
|
if (patch.contextSharingConsent === null) delete current.contextSharingConsent;
|
|
@@ -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.",
|