@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
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { comboFailureDecision } from "../combos";
|
|
2
|
+
import { isProviderModerationRefusal } from "../combos/failover";
|
|
3
|
+
import { attachComboFailureEvidence } from "../lib/client-error-body";
|
|
4
|
+
import { explicitErrorEventStatus } from "./responses/combo-stream-preflight";
|
|
2
5
|
import { httpStatusFromTerminalError } from "../lib/errors";
|
|
3
6
|
import { redactSecretString } from "../lib/redact";
|
|
4
7
|
import { sseFieldValue } from "../lib/sse-decoder";
|
|
@@ -70,6 +73,8 @@ export async function preflightNativeMessagesResponse(
|
|
|
70
73
|
let terminal = false;
|
|
71
74
|
let failure: Rec | undefined;
|
|
72
75
|
let failureStatus = 502;
|
|
76
|
+
/** The whole error event, kept when a moderation verdict decided the hop. */
|
|
77
|
+
let failureEvidence: string | undefined;
|
|
73
78
|
let usage: Rec = {};
|
|
74
79
|
const inspector = new BoundedSseFrameBuffer();
|
|
75
80
|
const decoder = new TextDecoder();
|
|
@@ -93,13 +98,29 @@ export async function preflightNativeMessagesResponse(
|
|
|
93
98
|
// Protocol liveness is not output.
|
|
94
99
|
} else if (payload.type === "error" && isRec(payload.error)) {
|
|
95
100
|
const error = payload.error;
|
|
96
|
-
const
|
|
101
|
+
const wholeEvent = JSON.stringify(payload);
|
|
102
|
+
// A status the event states for itself (any spelling the responses preflight reads) is
|
|
103
|
+
// evidence of its own: a framed 429 or 503 is never read as a moderation refusal.
|
|
104
|
+
const framed = explicitErrorEventStatus(payload);
|
|
105
|
+
const framedAllowsModeration = framed === undefined || framed === 400 || framed === 422;
|
|
106
|
+
// Otherwise a structured moderation verdict on the whole event is a request-level refusal,
|
|
107
|
+
// whatever status the terminal mapping infers for its code; judge it like the HTTP reader.
|
|
108
|
+
const moderation = framedAllowsModeration && isProviderModerationRefusal(400, wholeEvent, undefined, true);
|
|
109
|
+
const mapped = httpStatusFromTerminalError({ type: typeof error.type === "string" ? error.type : undefined,
|
|
97
110
|
code: typeof error.code === "string" ? error.code : undefined,
|
|
98
111
|
message: typeof error.message === "string" ? error.message : undefined }) ?? 502;
|
|
112
|
+
const status = moderation && mapped !== 400 && mapped !== 422 ? 400 : mapped;
|
|
99
113
|
if (logCtx.terminalSource !== "synthetic" && logCtx.errorCode !== UNDECLARED_TOOL_CALL_ERROR_CODE
|
|
100
114
|
&& comboFailureDecision(status, typeof error.message === "string" ? error.message : "", {
|
|
101
115
|
code: typeof error.code === "string" ? error.code : undefined,
|
|
102
|
-
|
|
116
|
+
rootCode: typeof payload.code === "string" ? payload.code : undefined,
|
|
117
|
+
// The whole event, as the HTTP and stream readers judge it, so transports cannot disagree.
|
|
118
|
+
providerModerationRefusal: status === 400 || status === 422
|
|
119
|
+
? framedAllowsModeration && isProviderModerationRefusal(status, wholeEvent, undefined, true) : undefined,
|
|
120
|
+
}) === "hop") {
|
|
121
|
+
failure = error; failureStatus = status;
|
|
122
|
+
failureEvidence = moderation && (status === 400 || status === 422) ? wholeEvent : undefined;
|
|
123
|
+
}
|
|
103
124
|
else committed = true;
|
|
104
125
|
} else if (payload.type === "message_stop") terminal = true;
|
|
105
126
|
else committed = true;
|
|
@@ -140,11 +161,13 @@ export async function preflightNativeMessagesResponse(
|
|
|
140
161
|
release();
|
|
141
162
|
const headers = new Headers(response.headers);
|
|
142
163
|
headers.set("content-type", "application/json"); headers.delete("content-length"); headers.delete("content-encoding");
|
|
143
|
-
|
|
164
|
+
const failed = Response.json({ error: {
|
|
144
165
|
...(typeof failure.type === "string" ? { type: failure.type } : {}),
|
|
145
166
|
...(typeof failure.code === "string" ? { code: failure.code } : {}),
|
|
146
167
|
message,
|
|
147
|
-
} }, { status: failureStatus, headers })
|
|
168
|
+
} }, { status: failureStatus, headers });
|
|
169
|
+
// The rebuilt envelope drops the evidence (root code, innererror) the verdict was judged on.
|
|
170
|
+
return { kind: "failed", response: failureEvidence === undefined ? failed : attachComboFailureEvidence(failed, failureEvidence) };
|
|
148
171
|
}
|
|
149
172
|
let index = 0;
|
|
150
173
|
const body = new ReadableStream<Uint8Array>({
|
|
@@ -72,8 +72,9 @@ import {
|
|
|
72
72
|
UPSTREAM_RESET_REPLAY_REFUSED_CODE,
|
|
73
73
|
} from "../lib/upstream-retry";
|
|
74
74
|
import { distributedKeyPhysicalFetch, distributedKeyResponseOwner, recordDistributedResponseFailure } from "../providers/api-key-response-ownership";
|
|
75
|
+
import { passiveKeyPhysicalFetch } from "../providers/passive-key-observation";
|
|
75
76
|
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../providers/api-key-pause";
|
|
76
|
-
import { providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
|
|
77
|
+
import { providerAffinityGenerationIsCurrent, providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
|
|
77
78
|
import { RequestPacingQueueOverloadError } from "../providers/request-pacing";
|
|
78
79
|
import {
|
|
79
80
|
hasKeyPoolFailover,
|
|
@@ -85,6 +86,7 @@ import {
|
|
|
85
86
|
transientRetryPolicyFor,
|
|
86
87
|
} from "../providers/key-failover";
|
|
87
88
|
import { stampApiKeyAccountLabel } from "../providers/label";
|
|
89
|
+
import { affinityLaneFromRequest } from "./request-log-conversation";
|
|
88
90
|
import { publicOAuthErrorPresentation, OAuthAccountPausedError, OAuthLoginRequiredError, publicOAuthAuthenticationErrorMessage } from "../oauth";
|
|
89
91
|
import { AnthropicAccountCooldownError, formatAnthropicProviderForLog, anthropicRoutingFor } from "../oauth/anthropic-routing";
|
|
90
92
|
import { configuredAnthropicInstance } from "../providers/anthropic-instance";
|
|
@@ -184,6 +186,7 @@ export interface HandleNativeMessagesOptions {
|
|
|
184
186
|
req: Request;
|
|
185
187
|
config: OcxConfig;
|
|
186
188
|
logCtx: RequestLogContext;
|
|
189
|
+
admission?: import("./auth-cors").DataPlaneAdmission;
|
|
187
190
|
logIds?: { requestId: string; start: number; turnAdmissionLease?: AdmissionLease };
|
|
188
191
|
/** The settled, eligible route (see `isNativeMessagesRouteEligible`). */
|
|
189
192
|
route: RouteResult;
|
|
@@ -538,7 +541,12 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
538
541
|
} else {
|
|
539
542
|
// Same pre-dispatch key preference every direct send path applies (see chat-native.ts).
|
|
540
543
|
try {
|
|
541
|
-
const
|
|
544
|
+
const affinityLane = affinityLaneFromRequest(req, logCtx, config, options.admission);
|
|
545
|
+
if (affinityLane) logCtx.affinityLane = affinityLane;
|
|
546
|
+
const lastMessage = Array.isArray(body.messages) ? body.messages.at(-1) : undefined;
|
|
547
|
+
const continuation = Array.isArray(lastMessage?.content)
|
|
548
|
+
&& lastMessage.content.some((block: unknown) => !!block && typeof block === "object" && (block as { type?: unknown }).type === "tool_result");
|
|
549
|
+
const proactiveKeyProvider = selectProactiveApiKeyTransport(config, route.providerName, route.provider, undefined, Date.now(), { lane: affinityLane, model: route.modelId, log: logCtx, continuation });
|
|
542
550
|
if (proactiveKeyProvider) route.provider = proactiveKeyProvider;
|
|
543
551
|
if (isProviderApiKeyPaused(route.provider)) throw new ProviderApiKeyPausedError();
|
|
544
552
|
} catch (error) {
|
|
@@ -546,6 +554,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
546
554
|
const localRefusal = localOAuthFailure(error);
|
|
547
555
|
if (localRefusal) return localRefusal;
|
|
548
556
|
if (!(error instanceof RequestPacingQueueOverloadError)) throw error;
|
|
557
|
+
logCtx.terminalSource = "synthetic";
|
|
549
558
|
const refusal = markProxyError(fail(429, error.message, "rate_limit_error"), error.reason === "keys_exhausted" ? undefined : "pacing");
|
|
550
559
|
const advice = formatClientRetryAfter(error.retryAfterSeconds);
|
|
551
560
|
if (advice !== undefined) refusal.headers.set("Retry-After", advice);
|
|
@@ -695,6 +704,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
695
704
|
}
|
|
696
705
|
} else {
|
|
697
706
|
for (let attempt = 0; !providerApiKeySelectionIsCurrent(config, route.providerName, activeProvider); attempt++) {
|
|
707
|
+
if (!providerAffinityGenerationIsCurrent(config, route.providerName, activeProvider)) throw markProxyError(new Error("Provider affinity selection is no longer available"));
|
|
698
708
|
if (attempt >= 3) throw markProxyError(new Error("Provider key selection changed repeatedly before native Messages dispatch"));
|
|
699
709
|
let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, activeProvider);
|
|
700
710
|
if (!current && activeProvider.requestPacing?.enabled
|
|
@@ -759,9 +769,9 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
759
769
|
if (snapshot && !sendOwner) throw new NativeOAuthSelectionChangedError();
|
|
760
770
|
physicalSendsUsed++;
|
|
761
771
|
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
762
|
-
distributedKeyPhysicalFetch(
|
|
772
|
+
passiveKeyPhysicalFetch(distributedKeyPhysicalFetch(
|
|
763
773
|
anthropicBillingPhysicalFetch((activeProvider as OcxProviderTransport).fetch ?? execute, route.providerName, activeProvider),
|
|
764
|
-
route.providerName, activeProvider, wire.url, activeProvider.apiKeyTransport === "bearer" ? "authorization" : "x-api-key"),
|
|
774
|
+
route.providerName, activeProvider, wire.url, activeProvider.apiKeyTransport === "bearer" ? "authorization" : "x-api-key"), config, route.providerName, activeProvider),
|
|
765
775
|
String(input), physicalInit, { providerName: route.providerName, provider: activeProvider },
|
|
766
776
|
)) as typeof fetch;
|
|
767
777
|
localUpstream = isLocalUpstream(wire.url);
|
|
@@ -869,7 +879,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
869
879
|
response.status === 429
|
|
870
880
|
&& distributedResponseOwnsKey
|
|
871
881
|
&& !isNonReplayableResponse(response)
|
|
872
|
-
&& retryPolicy
|
|
882
|
+
&& retryPolicy && providerAffinityGenerationIsCurrent(config, route.providerName, activeProvider)
|
|
873
883
|
&& retries < retryPolicy.attempts
|
|
874
884
|
&& keySendAvailable()
|
|
875
885
|
) {
|
|
@@ -949,12 +959,14 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
949
959
|
settleDistributedFailure();
|
|
950
960
|
const sendError = error instanceof UpstreamRetryEvidenceError ? error.cause : error;
|
|
951
961
|
if (sendError instanceof RequestPacingQueueOverloadError) {
|
|
962
|
+
logCtx.terminalSource = "synthetic";
|
|
952
963
|
const refusal = markProxyError(fail(429, sendError.message, "rate_limit_error"), sendError.reason === "keys_exhausted" ? undefined : "pacing");
|
|
953
964
|
const advice = formatClientRetryAfter(sendError.retryAfterSeconds);
|
|
954
965
|
if (advice !== undefined) refusal.headers.set("Retry-After", advice);
|
|
955
966
|
return refusal;
|
|
956
967
|
}
|
|
957
968
|
if (sendError instanceof SendBudgetExhaustedError) {
|
|
969
|
+
logCtx.terminalSource = "synthetic";
|
|
958
970
|
const refusal = workflowSendCeilingRefusalResponse(logCtx, req.headers.get("x-codex-parent-thread-id")?.trim() || undefined);
|
|
959
971
|
if (refusal) { finishLog(429); return nativeWorkflowRefusalResponse(refusal); }
|
|
960
972
|
return fail(429, sendError.message, "send_budget_exhausted", "send_budget_exhausted");
|
|
@@ -5,7 +5,7 @@ import { getConfigDir } from "../config/paths";
|
|
|
5
5
|
import { withConfigMutationLockSync } from "../config/mutation-lock";
|
|
6
6
|
import { atomicWriteFileNoFollowStreamed } from "../config/atomic-write";
|
|
7
7
|
import type { OcxConfig } from "../types";
|
|
8
|
-
import { isLoopbackHostname, isTrustedHubManagementRequest, managementRequestOrigin } from "./auth-cors";
|
|
8
|
+
import { dashboardProxyOrigin, isLoopbackHostname, isTrustedHubManagementRequest, managementRequestOrigin } from "./auth-cors";
|
|
9
9
|
import { mintSession, type GuiSessionRecord, type GuiSessionState } from "./gui-session";
|
|
10
10
|
|
|
11
11
|
export const REMEMBERED_GUI_TTL_MS = 30 * 86400_000;
|
|
@@ -28,8 +28,11 @@ function directOrigin(req: Request, config: OcxConfig): string | null {
|
|
|
28
28
|
if (!origin) return null;
|
|
29
29
|
const url = new URL(origin);
|
|
30
30
|
// The process-marked hub management listener sits behind a local TLS terminator, so its
|
|
31
|
-
// request URL is http: while the canonical public origin is https:.
|
|
32
|
-
|
|
31
|
+
// request URL is http: while the canonical public origin is https:. The configured standalone
|
|
32
|
+
// dashboard proxy (#8338) is the same shape, proven by its peer address. Nothing else forwarded
|
|
33
|
+
// is trusted.
|
|
34
|
+
if (new URL(req.url).origin !== origin && !isTrustedHubManagementRequest(req)
|
|
35
|
+
&& dashboardProxyOrigin(req, config) !== origin) return null;
|
|
33
36
|
if (url.protocol !== "https:" && !(url.protocol === "http:" && isLoopbackHostname(url.hostname))) return null;
|
|
34
37
|
const browser = req.headers.get("Origin");
|
|
35
38
|
if (browser !== null && browser !== origin) return null;
|
|
@@ -12,7 +12,10 @@
|
|
|
12
12
|
import { loadConfig } from "../config";
|
|
13
13
|
import { isLoopbackHostname, isWildcardHostname } from "../codex/loopback-target";
|
|
14
14
|
import { normalizeBindHostname } from "./bind-host";
|
|
15
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
hasPublishedOwnershipRecords, isOcxCommandLine, readAlivePid, readProcessCommandLine, readRuntimePort,
|
|
17
|
+
runtimeOwnerScope, sameRuntimeOwnerScope, verifyPidIdentity, type RuntimeOwnerScope,
|
|
18
|
+
} from "../config/process-state";
|
|
16
19
|
import { createServer, isIP } from "node:net";
|
|
17
20
|
import { loopbackFamilyAvailability } from "../lib/loopback-family";
|
|
18
21
|
import {
|
|
@@ -93,7 +96,9 @@ export interface LivenessIo {
|
|
|
93
96
|
* socket address (IPv6 unbracketed) and `timeoutMs` the remaining discovery budget.
|
|
94
97
|
*/
|
|
95
98
|
bindProofFn?: (hostname: string, port: number, timeoutMs: number) => Promise<boolean>;
|
|
96
|
-
readRuntimeFn?: (pid?: number) => { pid?: number; port: number; hostname?: string } | null;
|
|
99
|
+
readRuntimeFn?: (pid?: number) => { pid?: number; port: number; hostname?: string; ownerScope?: unknown } | null;
|
|
100
|
+
/** This process, as the self-record proof in {@link observeProxyLiveness} needs it (#8552). */
|
|
101
|
+
ownProcessFn?: () => OwnProcess;
|
|
97
102
|
configFn?: () => { port?: number; hostname?: string };
|
|
98
103
|
timeoutMs?: number;
|
|
99
104
|
/**
|
|
@@ -513,21 +518,43 @@ export type ProxyLivenessObservation =
|
|
|
513
518
|
| { kind: "live"; live: LiveProxy }
|
|
514
519
|
| { kind: "absent" | "unknown"; live: null };
|
|
515
520
|
|
|
521
|
+
export interface OwnProcess {
|
|
522
|
+
pid: number;
|
|
523
|
+
/** {@link hasPublishedOwnershipRecords}: this process has written ownership records itself. */
|
|
524
|
+
publishedOwnership: boolean;
|
|
525
|
+
scope: RuntimeOwnerScope;
|
|
526
|
+
}
|
|
527
|
+
|
|
528
|
+
function currentOwnProcess(): OwnProcess {
|
|
529
|
+
return { pid: process.pid, publishedOwnership: hasPublishedOwnershipRecords(), scope: runtimeOwnerScope() };
|
|
530
|
+
}
|
|
531
|
+
|
|
516
532
|
/** Recovery additionally covers both available loopback families and fresh PID identity. */
|
|
517
533
|
export async function observeProxyLiveness(io: LivenessIo = {}): Promise<ProxyLivenessObservation> {
|
|
518
|
-
let alivePid: number | null = null, runtimePid: number | undefined, unknown = false;
|
|
534
|
+
let alivePid: number | null = null, runtimePid: number | undefined, runtimeScope: unknown, unknown = false;
|
|
519
535
|
const live = await discoverLiveProxy(io, {
|
|
520
536
|
pid: pid => { alivePid = pid; },
|
|
521
|
-
runtimePid: pid => { runtimePid = pid; },
|
|
537
|
+
runtimePid: (pid, ownerScope) => { runtimePid = pid; runtimeScope = ownerScope; },
|
|
522
538
|
endpoint: result => { if (result === "unknown") unknown = true; },
|
|
523
539
|
});
|
|
524
540
|
if (live) return { kind: "live", live };
|
|
541
|
+
// #8552: in a container the proxy is PID 1 on every start, so the record the previous container
|
|
542
|
+
// left names this very process; signalling it succeeds and its command line is ocx. Such a
|
|
543
|
+
// record is stale only when this process never published ownership itself (so the writer was an
|
|
544
|
+
// earlier lifetime of the PID number) AND the runtime record's owner ran where this process runs
|
|
545
|
+
// (same host and boot, plus the same network namespace or container). That scope check keeps a
|
|
546
|
+
// RollingUpdate safe: the old pod is also PID 1 and its listener sits in another network
|
|
547
|
+
// namespace, which the endpoint probe cannot see. A record without a scope (an older version,
|
|
548
|
+
// which may still be serving during an upgrade) keeps the refusal.
|
|
549
|
+
const own = (io.ownProcessFn ?? currentOwnProcess)();
|
|
550
|
+
const ownEarlierLifetime = !own.publishedOwnership && runtimePid === own.pid && sameRuntimeOwnerScope(runtimeScope, own.scope);
|
|
525
551
|
const candidates = new Set<number>();
|
|
526
552
|
if (alivePid !== null) candidates.add(alivePid);
|
|
527
553
|
if (runtimePid !== undefined && Number.isSafeInteger(runtimePid) && runtimePid > 0) candidates.add(runtimePid);
|
|
528
554
|
for (const pid of candidates) {
|
|
529
555
|
if (unknown) break;
|
|
530
556
|
if (io.deadlineAt !== undefined && (io.nowFn ?? Date.now)() >= io.deadlineAt) { unknown = true; break; }
|
|
557
|
+
if (ownEarlierLifetime && pid === own.pid) continue;
|
|
531
558
|
if (pid !== alivePid) {
|
|
532
559
|
try { process.kill(pid, 0); } catch (error) {
|
|
533
560
|
if ((error as NodeJS.ErrnoException).code === "ESRCH") continue;
|
|
@@ -557,7 +584,7 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
557
584
|
|
|
558
585
|
async function discoverLiveProxy(io: LivenessIo, observer?: {
|
|
559
586
|
pid: (pid: number | null) => void;
|
|
560
|
-
runtimePid: (pid: number | undefined) => void;
|
|
587
|
+
runtimePid: (pid: number | undefined, ownerScope: unknown) => void;
|
|
561
588
|
endpoint: (result: EndpointLiveness) => void;
|
|
562
589
|
}): Promise<LiveProxy | null> {
|
|
563
590
|
// Prefer the cheap alive-pid check: the Windows cmdline probe (WMIC/PowerShell) is too
|
|
@@ -659,7 +686,7 @@ async function discoverLiveProxy(io: LivenessIo, observer?: {
|
|
|
659
686
|
// sibling command, manual deletion). The runtime record still says where it listens —
|
|
660
687
|
// identity-probe it so ensure/update/stop see the live proxy instead of shadowing it.
|
|
661
688
|
const record = readRuntimeFn();
|
|
662
|
-
observer?.runtimePid(record?.pid);
|
|
689
|
+
observer?.runtimePid(record?.pid, record?.ownerScope);
|
|
663
690
|
if (record?.port && record.port !== probedPort) {
|
|
664
691
|
if (budgetExhausted()) return expired();
|
|
665
692
|
const expectedPid = typeof record.pid === "number" ? record.pid : undefined;
|
|
@@ -42,6 +42,8 @@ import {
|
|
|
42
42
|
type SsePayloadRewrite,
|
|
43
43
|
} from "./sse-payload-rewrite";
|
|
44
44
|
import type { TranslatorBudget } from "../lib/translator-budget";
|
|
45
|
+
import type { BareUpstreamError } from "./bare-upstream-error";
|
|
46
|
+
import { carryPacedStream, isPacedStream, PACED_READ_AHEAD_BYTES } from "../lib/paced-stream";
|
|
45
47
|
|
|
46
48
|
export type EagerRelayHooks = {
|
|
47
49
|
/** Feed one upstream chunk through SSE inspection (createSseInspector.feed). */
|
|
@@ -90,6 +92,10 @@ export type EagerRelayOptions = {
|
|
|
90
92
|
terminalBoundary?: CodexSafetyBufferingFilterOptions;
|
|
91
93
|
/** Mask the selected outbound credential in synthetic failures. */
|
|
92
94
|
maskCredential?: (text: string) => string;
|
|
95
|
+
/** Redaction for forwarded typed error frames, applied after classification (see relay.ts). */
|
|
96
|
+
redactForwardedEvidence?: (block: string) => string;
|
|
97
|
+
/** Receives the exact payload of every synthesized bare-verdict tail (see relaySseWithFailedTail). */
|
|
98
|
+
onSyntheticTail?: (payload: string, verdict?: BareUpstreamError) => void;
|
|
93
99
|
/** Injectable clock for tests. */
|
|
94
100
|
now?: () => number;
|
|
95
101
|
};
|
|
@@ -110,7 +116,8 @@ export function relaySseEagerBounded(
|
|
|
110
116
|
hooks: EagerRelayHooks,
|
|
111
117
|
opts?: EagerRelayOptions,
|
|
112
118
|
): ReadableStream<Uint8Array> {
|
|
113
|
-
|
|
119
|
+
// A paced source (#8601) queues one chunk for its client instead of the default allowance.
|
|
120
|
+
const maxQueueBytes = opts?.maxQueueBytes ?? (isPacedStream(body) ? PACED_READ_AHEAD_BYTES : DEFAULT_MAX_QUEUE_BYTES);
|
|
114
121
|
const drainMs = opts?.postCancelDrainMs ?? DEFAULT_DRAIN_MS;
|
|
115
122
|
const drainBytes = opts?.postCancelDrainBytes ?? DEFAULT_DRAIN_BYTES;
|
|
116
123
|
const now = opts?.now ?? Date.now;
|
|
@@ -120,7 +127,7 @@ export function relaySseEagerBounded(
|
|
|
120
127
|
const terminalEncoder = new TextEncoder();
|
|
121
128
|
const adapterEofFrame = adapterEofIncompleteFrame(terminalEncoder);
|
|
122
129
|
const terminalSentinel = doneFrame(terminalEncoder);
|
|
123
|
-
const terminalBoundary = createSseTerminalOutputBoundary(opts?.terminalBoundary);
|
|
130
|
+
const terminalBoundary = createSseTerminalOutputBoundary({ ...opts?.terminalBoundary, maskCredential: opts?.maskCredential, redactForwardedEvidence: opts?.redactForwardedEvidence });
|
|
124
131
|
const activeRewrite: SseBlockRewrite | undefined = hooks.rewriteBlocks
|
|
125
132
|
?? (hooks.rewritePayload ? payloadRewriteAsBlockRewrite(hooks.rewritePayload) : undefined);
|
|
126
133
|
const encodeFailedTail = (error: unknown): Uint8Array | null => {
|
|
@@ -131,18 +138,22 @@ export function relaySseEagerBounded(
|
|
|
131
138
|
}
|
|
132
139
|
};
|
|
133
140
|
/**
|
|
134
|
-
* Same tail, except that a
|
|
135
|
-
* read failure that followed it — the upstream
|
|
136
|
-
* socket did
|
|
141
|
+
* Same tail, except that a bare verdict the boundary already captured outranks the
|
|
142
|
+
* read failure that followed it — the upstream stated the turn's outcome before the
|
|
143
|
+
* socket did. A refusal and a recognized class keep their identity; an ordinary
|
|
144
|
+
* error frame is the provider's own terminal and keeps the transport failure after
|
|
145
|
+
* it, so a mid-stream reset still reads as `upstream_reset`.
|
|
137
146
|
*/
|
|
138
147
|
const encodeTerminalTail = (error: unknown): Uint8Array | null => {
|
|
139
|
-
const
|
|
140
|
-
const
|
|
141
|
-
if (
|
|
148
|
+
const verdict = terminalBoundary.upstreamVerdict();
|
|
149
|
+
const message = terminalBoundary.upstreamError();
|
|
150
|
+
if (verdict === undefined || message === undefined
|
|
151
|
+
|| (verdict.refusalCode === undefined && !terminalBoundary.recognizedBareError())) {
|
|
142
152
|
return encodeFailedTail(error);
|
|
143
153
|
}
|
|
144
154
|
try {
|
|
145
|
-
return refusalFailedTailFrame(terminalEncoder,
|
|
155
|
+
return refusalFailedTailFrame(terminalEncoder, message, verdict.refusalCode,
|
|
156
|
+
opts?.maskCredential, verdict.errorType, verdict.errorCode, verdict, opts?.onSyntheticTail);
|
|
146
157
|
} catch {
|
|
147
158
|
return null;
|
|
148
159
|
}
|
|
@@ -331,6 +342,8 @@ export function relaySseEagerBounded(
|
|
|
331
342
|
// A clean 200 EOF without a Responses terminal must be visible to
|
|
332
343
|
// Codex as one incomplete turn, followed by the normal sentinel.
|
|
333
344
|
const upstreamError = terminalBoundary.upstreamError() ?? opts?.upstreamError;
|
|
345
|
+
// A clean EOF is not a read failure: the winning verdict states the turn's outcome,
|
|
346
|
+
// so the tail carries it exactly as the request row and account inspector do.
|
|
334
347
|
const upstreamErrorFrame = upstreamError === undefined
|
|
335
348
|
? adapterEofFrame
|
|
336
349
|
: upstreamErrorTailFrame(
|
|
@@ -340,6 +353,8 @@ export function relaySseEagerBounded(
|
|
|
340
353
|
opts?.maskCredential,
|
|
341
354
|
terminalBoundary.upstreamErrorType(),
|
|
342
355
|
terminalBoundary.upstreamErrorCode(),
|
|
356
|
+
terminalBoundary.upstreamVerdict(),
|
|
357
|
+
opts?.onSyntheticTail,
|
|
343
358
|
);
|
|
344
359
|
queuedBytes += upstreamErrorFrame.byteLength + terminalSentinel.byteLength;
|
|
345
360
|
try {
|
|
@@ -472,7 +487,16 @@ export function relaySseEagerBounded(
|
|
|
472
487
|
// inspection resynchronized after an oversized frame and observed a
|
|
473
488
|
// later real terminal, it still must not suppress a terminal delivery
|
|
474
489
|
// to the client. Only accounting remains tied to the inspected result.
|
|
475
|
-
if (!hooks.sawTerminal())
|
|
490
|
+
if (!hooks.sawTerminal()) {
|
|
491
|
+
syntheticKind = "failed";
|
|
492
|
+
// Same predicate as encodeTerminalTail: only a refusal or a provider-stated class
|
|
493
|
+
// outranks the read failure. An unrecognized verdict keeps the transport-failure
|
|
494
|
+
// attribution (streamAborted, mid_stream) the tee path also records.
|
|
495
|
+
const verdict = terminalBoundary.upstreamVerdict();
|
|
496
|
+
if (verdict !== undefined && (verdict.refusalCode !== undefined || terminalBoundary.recognizedBareError())) {
|
|
497
|
+
syntheticReason = "upstream_error";
|
|
498
|
+
}
|
|
499
|
+
}
|
|
476
500
|
deliveryFallbackSent = true;
|
|
477
501
|
queuedBytes += tail.byteLength;
|
|
478
502
|
try { controllerRef?.enqueue(tail); } catch { /* client already torn down */ }
|
|
@@ -511,7 +535,7 @@ export function relaySseEagerBounded(
|
|
|
511
535
|
}
|
|
512
536
|
};
|
|
513
537
|
|
|
514
|
-
return new ReadableStream<Uint8Array>({
|
|
538
|
+
return carryPacedStream(body, new ReadableStream<Uint8Array>({
|
|
515
539
|
start(controller) {
|
|
516
540
|
controllerRef = controller;
|
|
517
541
|
clientGoneSignal?.addEventListener("abort", markClientGone, { once: true });
|
|
@@ -528,7 +552,7 @@ export function relaySseEagerBounded(
|
|
|
528
552
|
cancel() {
|
|
529
553
|
markClientGone();
|
|
530
554
|
},
|
|
531
|
-
});
|
|
555
|
+
}));
|
|
532
556
|
}
|
|
533
557
|
|
|
534
558
|
function joinUint8Arrays(first: Uint8Array, second: Uint8Array): Uint8Array {
|