@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
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `ocx uninstall`'s proxy stop, extracted from `handleUninstall` so the decision is
|
|
3
|
+
* callable rather than only readable (#7771, #3008).
|
|
4
|
+
*
|
|
5
|
+
* The step has two jobs that used to be implicit in the command body: find the proxy
|
|
6
|
+
* (tracked pid, or an identity-checked orphan), and stop it without letting a wrapper
|
|
7
|
+
* relaunch it after shared client config has already been restored.
|
|
8
|
+
*
|
|
9
|
+
* On Windows the stop is deferred exactly as `ocx stop` and `ocx service stop` do it: a
|
|
10
|
+
* teardown receipt is claimed BEFORE the child stop and its nonce travels on the POST, so
|
|
11
|
+
* the proxy does not restore shared client config while a Task Scheduler wrapper can still
|
|
12
|
+
* relaunch it. The caller discharges the receipt only after Part B and its own restore
|
|
13
|
+
* succeeded; otherwise it stays on disk for recovery.
|
|
14
|
+
*
|
|
15
|
+
* A Part A that did not end stopped/absent still gets the graceful POST — the proxy may be
|
|
16
|
+
* running and a graceful stop is always preferable — but never the forced fallback: a
|
|
17
|
+
* `taskkill /T /F` under a manager that would not stop is the one outcome the checked stop
|
|
18
|
+
* exists to prevent.
|
|
19
|
+
*/
|
|
20
|
+
import { claimPendingTeardown, type PendingTeardownPartA } from "../config/pending-teardown";
|
|
21
|
+
import { readRuntimePort } from "../config/process-state";
|
|
22
|
+
import type { GracefulStopIo } from "../lib/process-control";
|
|
23
|
+
|
|
24
|
+
export interface UninstallProxyStopIo {
|
|
25
|
+
platform: NodeJS.Platform;
|
|
26
|
+
/** Detailed Part A outcome, or null when the service-stop step threw. */
|
|
27
|
+
serviceStop: "absent" | "stopped" | "stopped-respawnable" | "failed" | "state-unknown" | null;
|
|
28
|
+
readPid: () => number | null;
|
|
29
|
+
findLiveProxy: () => Promise<{ pid?: number | null; port: number; hostname?: string } | null>;
|
|
30
|
+
/** Tri-state proof that nothing answers on any endpoint this home could serve. */
|
|
31
|
+
endpointProvenDown: () => Promise<boolean>;
|
|
32
|
+
/** The Part A record the receipt carries, so /api/stop skips a second Part A. */
|
|
33
|
+
partARecord?: () => PendingTeardownPartA | null;
|
|
34
|
+
claim?: (
|
|
35
|
+
endpoint: { hostname: string; port: number },
|
|
36
|
+
source: "exact" | "guessed",
|
|
37
|
+
ownerPid: number,
|
|
38
|
+
handover: "update-restart" | undefined,
|
|
39
|
+
partA: PendingTeardownPartA | null,
|
|
40
|
+
) => { nonce: string };
|
|
41
|
+
/** The tracked target's own runtime record; null when there is none for that pid. */
|
|
42
|
+
runtimeEndpointFor?: (pid: number) => { hostname: string; port: number } | null;
|
|
43
|
+
stop: (pid: number, io: GracefulStopIo) => Promise<boolean>;
|
|
44
|
+
removeTracked: (pid: number) => void;
|
|
45
|
+
/** Whether Part B owns the Windows port wait (#7771). */
|
|
46
|
+
portWaitOwned: () => boolean;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export interface UninstallProxyStopResult {
|
|
50
|
+
changed: boolean;
|
|
51
|
+
provenDown: boolean;
|
|
52
|
+
/** The deferred-teardown receipt this step claimed, for the caller to discharge. */
|
|
53
|
+
nonce?: string;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** The runtime record a tracked pid wrote, which is the only exact endpoint it can be reached on. */
|
|
57
|
+
function trackedRuntimeEndpoint(pid: number): { hostname: string; port: number } | null {
|
|
58
|
+
const runtime = readRuntimePort(pid);
|
|
59
|
+
return runtime?.port ? { hostname: runtime.hostname ?? "127.0.0.1", port: runtime.port } : null;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export async function stopUninstallProxy(io: UninstallProxyStopIo): Promise<UninstallProxyStopResult> {
|
|
63
|
+
const windows = io.platform === "win32";
|
|
64
|
+
// Part A not stopped/absent means a manager may still be running and could respawn the
|
|
65
|
+
// proxy. The graceful POST is still worth sending; the forced fallback is not.
|
|
66
|
+
const partAProven = io.serviceStop === "stopped" || io.serviceStop === "stopped-respawnable" || io.serviceStop === "absent";
|
|
67
|
+
const forbidForcedFallback = windows && !partAProven;
|
|
68
|
+
// An unconfirmed stop normally still leaves this step's proof to the respawn window that
|
|
69
|
+
// follows. With the forced ladder forbidden it must not: the process may be alive, and the
|
|
70
|
+
// Part A failure the caller already recorded is what keeps shared config up.
|
|
71
|
+
//
|
|
72
|
+
// An unconfirmed stop is also NOT evidence that this home's proxy is down. `stopProxy`
|
|
73
|
+
// answers false without contacting the endpoint when the tracked pid is already dead, so
|
|
74
|
+
// "the tracked proxy is gone" and "nothing else is serving on this home's ports" are two
|
|
75
|
+
// different claims; Part A saying `absent`/`stopped` covers only the manager it saw. A
|
|
76
|
+
// different proxy on the configured port would otherwise be missed, and shared config
|
|
77
|
+
// restored under it (#3008). The tri-state probe the discovery path already requires is
|
|
78
|
+
// what settles it, and only a definitive "nothing answers anywhere" keeps the proof.
|
|
79
|
+
const confirmed = async (stopped: boolean): Promise<boolean> => {
|
|
80
|
+
// A confirmed stop proves the tracked proxy down, nothing more. After an "absent" Part A on
|
|
81
|
+
// Windows no Part B follows, so a second proxy on another candidate endpoint would go
|
|
82
|
+
// unseen and shared config would be restored under it (#3008): every candidate has to
|
|
83
|
+
// answer definitively dead. After "stopped", Part B confirms the port instead.
|
|
84
|
+
if (stopped) return !(windows && io.serviceStop === "absent") || await io.endpointProvenDown();
|
|
85
|
+
if (forbidForcedFallback) return false;
|
|
86
|
+
return await io.endpointProvenDown();
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
// Resolve the target BEFORE anything is recorded. The receipt is an obligation on a
|
|
90
|
+
// specific address, so claiming it from a runtime record the stop never contacts — or
|
|
91
|
+
// before knowing whether a stop will happen at all — writes a promise nobody can
|
|
92
|
+
// discharge: recovery probes exactly the endpoint the receipt names.
|
|
93
|
+
let target: { pid: number; tracked: boolean; endpoint: { hostname: string; port: number } | null };
|
|
94
|
+
const pid = io.readPid();
|
|
95
|
+
if (pid) {
|
|
96
|
+
target = { pid, tracked: true, endpoint: (io.runtimeEndpointFor ?? trackedRuntimeEndpoint)(pid) };
|
|
97
|
+
} else {
|
|
98
|
+
// A missing pid file is not proof that nothing is serving: a proxy can outlive its
|
|
99
|
+
// record (crash, manual delete, corrupt file), which is exactly why `ocx stop` falls
|
|
100
|
+
// back to identity-checked discovery. Without this, uninstall restored shared config
|
|
101
|
+
// and reported success while that proxy kept running (#3008).
|
|
102
|
+
const live = await io.findLiveProxy();
|
|
103
|
+
if (!live) {
|
|
104
|
+
// A miss is not proof: `findLiveProxy` collapses a timeout and a transport failure
|
|
105
|
+
// into the same null as a dead endpoint. Ask the tri-state probe, which only says
|
|
106
|
+
// "dead" for a refused connection or a definitive non-OpenCodex answer (#3008).
|
|
107
|
+
const provenDown = await io.endpointProvenDown();
|
|
108
|
+
if (!provenDown) {
|
|
109
|
+
throw new Error("no proxy could be found, but its endpoint could not be confirmed down either; confirm nothing is serving, then rerun");
|
|
110
|
+
}
|
|
111
|
+
// Nothing will be stopped, so nothing may be deferred.
|
|
112
|
+
return { changed: false, provenDown };
|
|
113
|
+
}
|
|
114
|
+
if (!live.pid) {
|
|
115
|
+
throw new Error(`a proxy is answering on port ${live.port} but no process id could be resolved for it; stop it from the home that started it, then rerun`);
|
|
116
|
+
}
|
|
117
|
+
// A discovered proxy answers where discovery found it, which is the only address a stop
|
|
118
|
+
// can reach it on — not whatever a stale runtime record happens to say.
|
|
119
|
+
target = { pid: live.pid, tracked: false, endpoint: { hostname: live.hostname ?? "127.0.0.1", port: live.port } };
|
|
120
|
+
}
|
|
121
|
+
// A receipt exists to carry a deferred teardown across the POST. Without an exact endpoint
|
|
122
|
+
// there is no POST to defer: `stopProxy` falls to its own path, and a "guessed" receipt
|
|
123
|
+
// would name an address no stop contacted while recovery then refuses to finish it.
|
|
124
|
+
let nonce: string | undefined;
|
|
125
|
+
if (windows && target.endpoint) {
|
|
126
|
+
try {
|
|
127
|
+
nonce = (io.claim ?? claimPendingTeardown)(target.endpoint, "exact", process.pid, undefined, (io.partARecord ?? (() => null))()).nonce;
|
|
128
|
+
} catch (error) {
|
|
129
|
+
// Without the receipt the proxy performs its own teardown during the stop, which is
|
|
130
|
+
// the pre-#3008 behaviour — and on Windows a wrapper can relaunch it afterwards, so
|
|
131
|
+
// client config would already be restored under a live proxy. Refuse instead.
|
|
132
|
+
throw new Error(
|
|
133
|
+
"the deferred-teardown receipt could not be recorded, so the proxy was left running: "
|
|
134
|
+
+ (error instanceof Error ? error.message : String(error)),
|
|
135
|
+
);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
const stopIo: GracefulStopIo = {
|
|
139
|
+
skipPortWait: io.portWaitOwned(),
|
|
140
|
+
...(nonce ? { deferSharedTeardownNonce: nonce } : {}),
|
|
141
|
+
...(forbidForcedFallback ? { allowForcedFallback: false } : {}),
|
|
142
|
+
// The same endpoint the receipt names, so the POST and the obligation cannot diverge.
|
|
143
|
+
...(target.endpoint ? { runtimeEndpoint: target.endpoint } : {}),
|
|
144
|
+
};
|
|
145
|
+
const provenDown = await confirmed(await io.stop(target.pid, stopIo));
|
|
146
|
+
// Only a proven stop cleared the record it names. Removing it after a POST that timed out
|
|
147
|
+
// drops the only pointer to a process that may still be running, and reporting the step as
|
|
148
|
+
// changed would claim a state that was never observed. `provenDown` is how the caller
|
|
149
|
+
// learns it must record the failure (it keeps the shared teardown up).
|
|
150
|
+
if (target.tracked && provenDown) io.removeTracked(target.pid);
|
|
151
|
+
return { changed: target.tracked ? provenDown : true, provenDown, ...(nonce ? { nonce } : {}) };
|
|
152
|
+
}
|
package/src/cli/v2-input.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { CliUsageError } from "./runtime-api";
|
|
2
2
|
|
|
3
|
-
type V2Controls = { json: boolean; live: boolean; acknowledge: boolean };
|
|
3
|
+
type V2Controls = { json: boolean; live: boolean; acknowledge: boolean; plaintextAcknowledged?: true };
|
|
4
4
|
export type V2ParsedCommand = V2Controls & (
|
|
5
5
|
| { verb: "status" | "on" | "off" }
|
|
6
|
-
| { verb: "mode"; value: "v1" | "default" | "v2" }
|
|
6
|
+
| { verb: "mode"; value: "v1" | "default" | "v2" | "v2-plaintext" }
|
|
7
7
|
| { verb: "keep-native-v1"; value: boolean }
|
|
8
8
|
| { verb: "threads"; value: number }
|
|
9
9
|
| { verb: "mode-hint"; value: string | null }
|
|
10
10
|
);
|
|
11
11
|
|
|
12
|
-
export const V2_USAGE = "Usage: ocx v2 [status|on|off|mode <v1|default|v2>|keep-native-v1 <on|off>|threads <n>|mode-hint <text|--clear>] [--live] [--json]\nFor literal reserved hint text: ocx v2 mode-hint [--live] [--json] -- <text>\nOnly live mode accepts --acknowledge-surface-advisory.";
|
|
12
|
+
export const V2_USAGE = "Usage: ocx v2 [status|on|off|mode <v1|default|v2|v2-plaintext>|keep-native-v1 <on|off>|threads <n>|mode-hint <text|--clear>] [--live] [--json]\nEntering v2-plaintext requires --acknowledge-plaintext-agent-messages: task text may remain in history, provider requests and local response/debug state. Catalog pins affect new sessions; enabled compilation also affects subsequent eligible canonical ChatGPT requests from existing V2 sessions. Existing ciphertext is not decrypted, stored history is not rewritten, and disabling does not delete retained copies.\nFor literal reserved hint text: ocx v2 mode-hint [--live] [--json] -- <text>\nOnly live mode accepts --acknowledge-surface-advisory.";
|
|
13
13
|
|
|
14
14
|
/** Parse all controls before touching native/config state. A terminator protects literal hints. */
|
|
15
15
|
export function parseV2Command(argv: readonly string[]): V2ParsedCommand {
|
|
@@ -20,8 +20,9 @@ export function parseV2Command(argv: readonly string[]): V2ParsedCommand {
|
|
|
20
20
|
const operands: string[] = [];
|
|
21
21
|
for (const arg of prefix) {
|
|
22
22
|
const flag = arg === "--json" ? "json" : arg === "--live" ? "live"
|
|
23
|
-
: arg === "--acknowledge-surface-advisory" ? "acknowledge"
|
|
24
|
-
|
|
23
|
+
: arg === "--acknowledge-surface-advisory" ? "acknowledge"
|
|
24
|
+
: arg === "--acknowledge-plaintext-agent-messages" ? "plaintextAcknowledged" : undefined;
|
|
25
|
+
if (["--json=", "--live=", "--acknowledge-surface-advisory=", "--acknowledge-plaintext-agent-messages="].some(prefix => arg.startsWith(prefix))) {
|
|
25
26
|
throw new CliUsageError("v2: control flags do not take values; use -- for literal hint text", V2_USAGE);
|
|
26
27
|
}
|
|
27
28
|
if (flag) {
|
|
@@ -34,6 +35,9 @@ export function parseV2Command(argv: readonly string[]): V2ParsedCommand {
|
|
|
34
35
|
if (controls.acknowledge && (!controls.live || verb !== "mode")) {
|
|
35
36
|
invalid("v2: advisory acknowledgment requires explicit live mode");
|
|
36
37
|
}
|
|
38
|
+
if (controls.plaintextAcknowledged && (verb !== "mode" || operands[0]?.trim().toLowerCase() !== "v2-plaintext")) {
|
|
39
|
+
invalid("v2: plaintext acknowledgment applies only to mode v2-plaintext");
|
|
40
|
+
}
|
|
37
41
|
if (boundary >= 0 && (verb !== "mode-hint" || operands.length !== 0 || suffix.length !== 1)) {
|
|
38
42
|
invalid("v2: the terminator requires exactly one literal mode-hint operand");
|
|
39
43
|
}
|
|
@@ -50,7 +54,7 @@ export function parseV2Command(argv: readonly string[]): V2ParsedCommand {
|
|
|
50
54
|
return { ...controls, verb, value: boundary < 0 && raw === "--clear" ? null : raw };
|
|
51
55
|
}
|
|
52
56
|
const value = raw.trim().toLowerCase();
|
|
53
|
-
if (verb === "mode" && (value === "v1" || value === "default" || value === "v2")) {
|
|
57
|
+
if (verb === "mode" && (value === "v1" || value === "default" || value === "v2" || value === "v2-plaintext")) {
|
|
54
58
|
return { ...controls, verb, value };
|
|
55
59
|
}
|
|
56
60
|
if (verb === "keep-native-v1" && (value === "on" || value === "off")) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { loadConfig } from "../config";
|
|
2
|
-
import { multiAgentSurfaceAdvisory, resolveMultiAgentMode } from "../config/multi-agent-surface";
|
|
2
|
+
import { isPlaintextV2AgentMessagesEnabled, multiAgentSurfaceAdvisory, resolveMultiAgentMode } from "../config/multi-agent-surface";
|
|
3
3
|
import { getAgentsEnabled, getAgentsMaxDepth, getLogicalMaxThreads, getMultiAgentModeHintText,
|
|
4
4
|
getSubagentDeveloperInstructions, hasAgentsMaxThreads, isMultiAgentV2Enabled } from "../codex/features";
|
|
5
5
|
import { MULTI_AGENT_MODE_HINT_RECOMMENDATION } from "../codex/multi-agent-mode-policy";
|
|
@@ -11,10 +11,11 @@ export function localV2State(isEnabled = isMultiAgentV2Enabled, hasMaxThreads =
|
|
|
11
11
|
const config = loadConfig();
|
|
12
12
|
const enabled = isEnabled();
|
|
13
13
|
return { enabled, agentsMaxThreadsConflict: enabled && hasMaxThreads(),
|
|
14
|
+
supportsPlaintextV2Mode: true, plaintextAgentMessagesEnabled: isPlaintextV2AgentMessagesEnabled(config),
|
|
14
15
|
multiAgentMode: resolveMultiAgentMode(config), keepNativeChatGptOnV1: config.keepNativeChatGptOnV1 === true,
|
|
15
16
|
multiAgentSurfaceAdvisory: multiAgentSurfaceAdvisory(config), maxConcurrentThreadsPerSession: getLogicalMaxThreads(),
|
|
16
17
|
agentsEnabled: getAgentsEnabled(), agentsMaxDepth: getAgentsMaxDepth(),
|
|
17
|
-
agentsMaxDepthAppliesWhenV2Disabled: !enabled, subagentDeveloperInstructions: getSubagentDeveloperInstructions(),
|
|
18
|
+
agentsMaxDepthAppliesWhenV2Disabled: !enabled && config.multiAgentMode !== "v2-plaintext", subagentDeveloperInstructions: getSubagentDeveloperInstructions(),
|
|
18
19
|
multiAgentModeHintText: getMultiAgentModeHintText(), multiAgentModeHintRecommendation: MULTI_AGENT_MODE_HINT_RECOMMENDATION };
|
|
19
20
|
}
|
|
20
21
|
|
package/src/cli/v2-runtime.ts
CHANGED
|
@@ -7,8 +7,8 @@ import type { V2ParsedCommand } from "./v2-input";
|
|
|
7
7
|
function record(value: unknown): value is Record<string, unknown> {
|
|
8
8
|
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
9
9
|
}
|
|
10
|
-
function mode(value: unknown): value is "v1" | "default" | "v2" {
|
|
11
|
-
return value === "v1" || value === "default" || value === "v2";
|
|
10
|
+
function mode(value: unknown): value is "v1" | "default" | "v2" | "v2-plaintext" {
|
|
11
|
+
return value === "v1" || value === "default" || value === "v2" || value === "v2-plaintext";
|
|
12
12
|
}
|
|
13
13
|
function nullableString(value: unknown): value is string | null { return value === null || typeof value === "string"; }
|
|
14
14
|
|
|
@@ -16,6 +16,11 @@ function nullableString(value: unknown): value is string | null { return value =
|
|
|
16
16
|
function stateDto(value: unknown): Record<string, unknown> {
|
|
17
17
|
if (!record(value) || !mode(value.multiAgentMode)) throw new Error("Invalid v2 state");
|
|
18
18
|
const result: Record<string, unknown> = { multiAgentMode: value.multiAgentMode };
|
|
19
|
+
for (const key of ["supportsPlaintextV2Mode", "plaintextAgentMessagesEnabled"] as const) {
|
|
20
|
+
if (value[key] !== undefined && typeof value[key] !== "boolean") throw new Error("Invalid plaintext capability");
|
|
21
|
+
if (value[key] !== undefined) result[key] = value[key];
|
|
22
|
+
}
|
|
23
|
+
if (value.multiAgentMode === "v2-plaintext" && (value.supportsPlaintextV2Mode !== true || value.plaintextAgentMessagesEnabled !== true || value.enabled !== false)) throw new Error("Unverified plaintext V2 state");
|
|
19
24
|
for (const key of ["enabled", "agentsMaxThreadsConflict", "keepNativeChatGptOnV1", "agentsMaxDepthAppliesWhenV2Disabled"] as const) {
|
|
20
25
|
if (typeof value[key] !== "boolean") throw new Error("Invalid v2 boolean");
|
|
21
26
|
result[key] = value[key];
|
|
@@ -46,6 +51,7 @@ function bodyFor(parsed: V2ParsedCommand): Record<string, unknown> {
|
|
|
46
51
|
switch (parsed.verb) {
|
|
47
52
|
case "on": case "off": return { enabled: parsed.verb === "on" };
|
|
48
53
|
case "mode": return { multiAgentMode: parsed.value,
|
|
54
|
+
...(parsed.plaintextAcknowledged ? { plaintextAgentMessagesAcknowledged: true } : {}),
|
|
49
55
|
...(parsed.acknowledge ? { multiAgentSurfaceAdvisoryAcknowledged: true } : {}) };
|
|
50
56
|
case "keep-native-v1": return { keepNativeChatGptOnV1: parsed.value };
|
|
51
57
|
case "threads": return { maxConcurrentThreadsPerSession: parsed.value };
|
|
@@ -70,11 +76,12 @@ export async function handleV2RuntimeCommand(parsed: V2ParsedCommand, deps: Runt
|
|
|
70
76
|
throw error;
|
|
71
77
|
}
|
|
72
78
|
const state = stateDto(response);
|
|
79
|
+
if (parsed.verb === "mode" && parsed.value === "v2-plaintext" && state.multiAgentMode !== "v2-plaintext") throw new Error("Plaintext V2 mode was not confirmed by the selected runtime");
|
|
73
80
|
const lines = [`multi_agent_v2: ${state.enabled ? "ON" : "OFF"}`, `multi_agent_mode: ${state.multiAgentMode}`,
|
|
74
81
|
`keep_native_chatgpt_on_v1: ${state.keepNativeChatGptOnV1 ? "ON" : "OFF"}`,
|
|
75
82
|
`max_threads: ${state.maxConcurrentThreadsPerSession ?? "unset"}`,
|
|
76
83
|
`agents.enabled: ${state.agentsEnabled ?? "unset (upstream default)"}`,
|
|
77
|
-
`agents.max_depth: ${state.agentsMaxDepth ?? "unset"}${state.enabled ? " (V1-only — ignored
|
|
84
|
+
`agents.max_depth: ${state.agentsMaxDepth ?? "unset"}${state.enabled || state.multiAgentMode === "v2-plaintext" ? " (V1-only — ignored by V2 sessions)" : ""}`,
|
|
78
85
|
`subagent_developer_instructions: ${JSON.stringify(state.subagentDeveloperInstructions)}`,
|
|
79
86
|
`multi_agent_mode_hint_text: ${JSON.stringify(state.multiAgentModeHintText)}`];
|
|
80
87
|
if (state.agentsMaxThreadsConflict) lines.push("Native thread-limit conflict: inspect the selected target's Codex configuration before starting Codex.");
|
package/src/cli/v2.ts
CHANGED
|
@@ -128,6 +128,7 @@ export function v2StatusLine(enabled: boolean): string {
|
|
|
128
128
|
export function multiAgentModeLine(mode: string, keepNativeChatGptOnV1 = false): string {
|
|
129
129
|
switch (mode) {
|
|
130
130
|
case "v1": return "multi_agent_mode: v1 — ALL models forced to v1 surface (upstream pins overridden)";
|
|
131
|
+
case "v2-plaintext": return "multi_agent_mode: v2-plaintext — new sessions select V2; subsequent eligible canonical ChatGPT requests, including existing V2 sessions, use experimental plaintext over HTTPS; global override stays OFF";
|
|
131
132
|
case "v2": return keepNativeChatGptOnV1
|
|
132
133
|
? "multi_agent_mode: v2 hybrid — ChatGPT-native models use v1; routed models use v2"
|
|
133
134
|
: "multi_agent_mode: v2 — ALL models forced to v2 surface (upstream pins overridden)";
|
|
@@ -136,7 +137,7 @@ export function multiAgentModeLine(mode: string, keepNativeChatGptOnV1 = false):
|
|
|
136
137
|
}
|
|
137
138
|
|
|
138
139
|
function requiresGlobalV2Disabled(multiAgentMode: string | undefined, keepNativeChatGptOnV1: boolean): boolean {
|
|
139
|
-
return multiAgentMode === "v2" && keepNativeChatGptOnV1;
|
|
140
|
+
return multiAgentMode === "v2-plaintext" || (multiAgentMode === "v2" && keepNativeChatGptOnV1);
|
|
140
141
|
}
|
|
141
142
|
|
|
142
143
|
function printLocalStatus(deps: V2CliDeps): number {
|
|
@@ -148,20 +149,22 @@ function printLocalStatus(deps: V2CliDeps): number {
|
|
|
148
149
|
const mode = cfg.multiAgentMode ?? "default";
|
|
149
150
|
const keepNativeV1 = cfg.keepNativeChatGptOnV1 === true;
|
|
150
151
|
log.log(multiAgentModeLine(mode, keepNativeV1));
|
|
151
|
-
log.log(
|
|
152
|
+
log.log(mode === "v2-plaintext"
|
|
153
|
+
? "keep_native_chatgpt_on_v1: inactive in v2-plaintext mode; stored preference is preserved"
|
|
154
|
+
: cfg.keepNativeChatGptOnV1 === true
|
|
152
155
|
? requiresGlobalV2Disabled(mode, keepNativeV1) && isEnabled()
|
|
153
156
|
? "keep_native_chatgpt_on_v1: CONFLICT — global multi_agent_v2 overrides the native v1 catalog pin; run 'ocx v2 keep-native-v1 on' to reconcile"
|
|
154
157
|
: "keep_native_chatgpt_on_v1: ON — global V2 override is off; ChatGPT-native rows use v1 and routed rows use v2 when mode is v2"
|
|
155
158
|
: "keep_native_chatgpt_on_v1: OFF");
|
|
156
159
|
const threads = getLogicalMaxThreads();
|
|
157
160
|
log.log(`max_threads: ${threads ?? "(unset — codex default)"}`);
|
|
158
|
-
const v2Active = isEnabled();
|
|
161
|
+
const v2Active = isEnabled() || mode === "v2-plaintext";
|
|
159
162
|
const agentsEnabled = getAgentsEnabled();
|
|
160
163
|
log.log(`agents.enabled: ${agentsEnabled === null ? "(unset — upstream default true)" : agentsEnabled}`);
|
|
161
164
|
const maxDepth = getAgentsMaxDepth();
|
|
162
165
|
// max_depth is V1-only upstream; say so whenever V2 is active so the number
|
|
163
166
|
// cannot be misread as an effective V2 limit.
|
|
164
|
-
log.log(`agents.max_depth: ${maxDepth ?? "(unset — upstream default 1)"}${v2Active ? " (V1-only — ignored
|
|
167
|
+
log.log(`agents.max_depth: ${maxDepth ?? "(unset — upstream default 1)"}${v2Active ? " (V1-only — ignored by V2 sessions)" : ""}`);
|
|
165
168
|
const instructions = getSubagentDeveloperInstructions();
|
|
166
169
|
log.log(`subagent_developer_instructions: ${instructions === null ? "(unset — children inherit)" : instructions === "" ? '"" (clears inherited instructions)' : JSON.stringify(instructions)}`);
|
|
167
170
|
const modeHint = getMultiAgentModeHintText();
|
|
@@ -226,6 +229,10 @@ export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: ()
|
|
|
226
229
|
let successLines: string[];
|
|
227
230
|
let unchangedKeep: boolean | undefined;
|
|
228
231
|
if (parsed.verb === "mode") {
|
|
232
|
+
const needsPlaintextAcknowledgment = () => parsed.value === "v2-plaintext"
|
|
233
|
+
&& config.multiAgentMode !== "v2-plaintext" && !parsed.plaintextAcknowledged;
|
|
234
|
+
const refuseUnacknowledgedPlaintext = () => emit(false, ["Entering v2-plaintext requires --acknowledge-plaintext-agent-messages. Enabled compilation also affects subsequent eligible canonical ChatGPT requests from existing V2 sessions. Task text can remain in Codex history, provider requests and local response/debug state; TLS and authentication stay enabled. Existing ciphertext is not decrypted, and disabling does not delete retained copies."]);
|
|
235
|
+
if (needsPlaintextAcknowledgment()) return refuseUnacknowledgedPlaintext();
|
|
229
236
|
const persistMode = (): boolean => {
|
|
230
237
|
const before = config.multiAgentMode ?? "default";
|
|
231
238
|
if (parsed.value === "default") deleteConfigTopLevelKey(config, "multiAgentMode");
|
|
@@ -235,20 +242,26 @@ export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: ()
|
|
|
235
242
|
};
|
|
236
243
|
if (parsed.value !== "default") {
|
|
237
244
|
let modeChanged = false;
|
|
245
|
+
let acknowledgmentRequired = false;
|
|
238
246
|
const transition = await withCodexCliSelectionParentWriteAsync(() => {
|
|
239
247
|
config = loadConfig();
|
|
248
|
+
if (needsPlaintextAcknowledgment()) {
|
|
249
|
+
acknowledgmentRequired = true;
|
|
250
|
+
return { ok: true as const, changed: false };
|
|
251
|
+
}
|
|
240
252
|
const target = parsed.value === "v2" && config.keepNativeChatGptOnV1 !== true;
|
|
241
253
|
const result = transitionMultiAgentV2(target, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
|
|
242
254
|
if (result.ok) modeChanged = persistMode();
|
|
243
255
|
return result;
|
|
244
256
|
});
|
|
257
|
+
if (acknowledgmentRequired) return refuseUnacknowledgedPlaintext();
|
|
245
258
|
if (!transition.ok) { changed = false; return emit(false, ["Native mode transition failed. Read ocx v2 status before retrying."]); }
|
|
246
259
|
changed = modeChanged || transition.changed;
|
|
247
260
|
} else {
|
|
248
261
|
changed = persistMode();
|
|
249
262
|
}
|
|
250
263
|
successLines = [multiAgentModeLine(parsed.value, config.keepNativeChatGptOnV1 === true),
|
|
251
|
-
"
|
|
264
|
+
"Catalog pins apply to NEW sessions; running sessions keep their pinned multi-agent version. Plaintext compilation follows the current setting for subsequent eligible canonical ChatGPT requests, including existing V2 sessions. Existing ciphertext is not decrypted, stored history is not rewritten, and disabling does not delete retained copies."];
|
|
252
265
|
} else if (parsed.verb === "keep-native-v1") {
|
|
253
266
|
const persistKeep = (): void => {
|
|
254
267
|
unchangedKeep = (config.keepNativeChatGptOnV1 === true) === parsed.value;
|
|
@@ -278,19 +291,21 @@ export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: ()
|
|
|
278
291
|
} else {
|
|
279
292
|
const want = parsed.verb === "on";
|
|
280
293
|
if (want && requiresGlobalV2Disabled(config.multiAgentMode, config.keepNativeChatGptOnV1 === true)) {
|
|
294
|
+
if (config.multiAgentMode === "v2-plaintext") return emit(false, ["v2 on: incompatible with v2-plaintext. Its catalog selects V2 for new sessions while the global override stays OFF. Select another mode explicitly first."]);
|
|
281
295
|
return emit(false, ["v2 on: incompatible with keep-native-v1 while mode is v2 — Codex's global multi_agent_v2 overrides the native v1 catalog pin. Run 'ocx v2 keep-native-v1 off' first."]);
|
|
282
296
|
}
|
|
283
297
|
let incompatible = false;
|
|
284
298
|
const transition = await withCodexCliSelectionParentWriteAsync(() => {
|
|
285
299
|
// Revalidated once admitted: keep-native-v1 or mode v2 may have been set meanwhile.
|
|
286
|
-
|
|
287
|
-
if (want && requiresGlobalV2Disabled(
|
|
300
|
+
config = loadConfig();
|
|
301
|
+
if (want && requiresGlobalV2Disabled(config.multiAgentMode, config.keepNativeChatGptOnV1 === true)) {
|
|
288
302
|
incompatible = true;
|
|
289
303
|
return { ok: true as const, changed: false };
|
|
290
304
|
}
|
|
291
305
|
return transitionMultiAgentV2(want, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
|
|
292
306
|
});
|
|
293
307
|
if (incompatible) {
|
|
308
|
+
if (config.multiAgentMode === "v2-plaintext") return emit(false, ["v2 on: incompatible with v2-plaintext. Its catalog selects V2 for new sessions while the global override stays OFF. Select another mode explicitly first."]);
|
|
294
309
|
return emit(false, ["v2 on: incompatible with keep-native-v1 while mode is v2 — Codex's global multi_agent_v2 overrides the native v1 catalog pin. Run 'ocx v2 keep-native-v1 off' first."]);
|
|
295
310
|
}
|
|
296
311
|
if (!transition.ok) return emit(false, ["Native feature transition failed. Read ocx v2 status before retrying."]);
|