@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,12 +1,16 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from "node:fs";
|
|
2
2
|
import { randomBytes } from "node:crypto";
|
|
3
3
|
import { normalizeRecordedClient, type UsageClient } from "../usage/client";
|
|
4
|
-
import { stampApiKeyAccountLabel, usesApiKeyAccount } from "../providers/label";
|
|
4
|
+
import { anthropicAccountTagField, stampApiKeyAccountLabel, usesApiKeyAccount } from "../providers/label";
|
|
5
|
+
import { finalizeProviderCacheAffinity } from "./request-log-cache-affinity";
|
|
6
|
+
import { aggregateAttemptUsage } from "./request-log-attempt-usage";
|
|
7
|
+
export { aggregateAttemptUsage } from "./request-log-attempt-usage";
|
|
8
|
+
|
|
5
9
|
import { KEY_ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
|
|
6
10
|
import { attemptAccountChanged, sealRequestAttemptIdentity } from "./request-log-account-rotation";
|
|
7
11
|
export { sealRequestAttemptIdentity };
|
|
8
12
|
export { noteAttemptRecoveryWithheld } from "./request-log-attempt-recovery";
|
|
9
|
-
import { captureUpstreamTerminalDiagnostics, upstreamDiagnosticLogFields, type UpstreamErrorDiagnostics, type UpstreamErrorPayload } from "./request-log-terminal-status";
|
|
13
|
+
import { bareVerdictRowErrorCode, captureUpstreamTerminalDiagnostics, guardedRowCopy, linkLogField, notifyLinkTurnFinal, upstreamDiagnosticLogFields, type LinkRequestLogCarrier, type UpstreamErrorDiagnostics, type UpstreamErrorPayload } from "./request-log-terminal-status";
|
|
10
14
|
export { noteUpstreamRequestId } from "./request-log-terminal-status";
|
|
11
15
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
12
16
|
import type { ResponsesTerminalStatus } from "../bridge";
|
|
@@ -23,7 +27,7 @@ import { CODEX_CONFIG_PATH, readRootTomlString } from "../codex/paths";
|
|
|
23
27
|
import type { CodexAffinityMove, CodexAffinityReason } from "../codex/routing";
|
|
24
28
|
import type { CodexAuthContext } from "../codex/auth-context";
|
|
25
29
|
import { readCodexCatalogPath } from "../codex/catalog";
|
|
26
|
-
import type { AttemptTierOutcome, OcxProviderConfig, OcxUsage } from "../types";
|
|
30
|
+
import type { AttemptTierOutcome, CacheAffinityLogReason, CacheAffinityOutcome, OcxProviderConfig, OcxUsage } from "../types";
|
|
27
31
|
import { normalizeRouteDecisionTrace, type RouteDecisionTraceV1 } from "../routing/trace";
|
|
28
32
|
import { parseProtocolTraceV1, type ProtocolTraceV1 } from "../protocols/dto";
|
|
29
33
|
import { protocolTraceForRequest } from "../protocols/trace";
|
|
@@ -41,12 +45,15 @@ import {
|
|
|
41
45
|
isKnownAdmissionKind,
|
|
42
46
|
isKnownAffinityMove,
|
|
43
47
|
isKnownAffinityReason,
|
|
48
|
+
isKnownCacheAffinity,
|
|
49
|
+
isKnownCacheAffinityReason,
|
|
44
50
|
isKnownCacheTelemetryProvenance,
|
|
45
51
|
isKnownInboundProtocol,
|
|
46
52
|
isKnownTerminalSource,
|
|
47
53
|
isKnownTransportPhase,
|
|
48
54
|
isKnownUsageSurface,
|
|
49
55
|
isCodexUsageAccountLogLabel,
|
|
56
|
+
isAnthropicAccountTag,
|
|
50
57
|
isLogicalRequestId,
|
|
51
58
|
isValidReasoningWireValue,
|
|
52
59
|
normalizeClaudeCompatibilityUsageLog,
|
|
@@ -94,6 +101,7 @@ import {
|
|
|
94
101
|
} from "../usage/jev-stats";
|
|
95
102
|
import { generationWindowFields, recordGenerationEvent } from "./request-log-generation-window";
|
|
96
103
|
import type { RequestMetricsRecorder } from "./request-metrics";
|
|
104
|
+
import { requestBodyField, requestBodyLogField, type RequestBodyEntryField, type RequestBodyLogContext } from "./request-body-facts";
|
|
97
105
|
import type {
|
|
98
106
|
CacheDiagnosticDraft,
|
|
99
107
|
CacheDiagnosticFinalFacts,
|
|
@@ -117,7 +125,7 @@ export function cacheDiagnosticsObserving(): boolean {
|
|
|
117
125
|
return cacheDiagnosticHooks()?.enabled() === true;
|
|
118
126
|
}
|
|
119
127
|
|
|
120
|
-
export interface RequestLogContext extends UpstreamErrorDiagnostics {
|
|
128
|
+
export interface RequestLogContext extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyLogContext {
|
|
121
129
|
model: string;
|
|
122
130
|
provider: string;
|
|
123
131
|
client?: UsageClient;
|
|
@@ -274,6 +282,20 @@ export interface RequestLogContext extends UpstreamErrorDiagnostics {
|
|
|
274
282
|
* Codex pool account was not the issuer. Never an account identifier.
|
|
275
283
|
*/
|
|
276
284
|
conversationStateScrub?: "account-change";
|
|
285
|
+
/** Explicit session lane for provider cache affinity; internal only, never persisted raw. */
|
|
286
|
+
affinityLane?: string;
|
|
287
|
+
affinityKeyEntryId?: string;
|
|
288
|
+
/** Configured provider owning the serving entry, independent of combo display labels. */
|
|
289
|
+
affinityProviderName?: string;
|
|
290
|
+
/** Whether provider cache affinity applies to this request's provider at all. */
|
|
291
|
+
cacheAffinityApplicable?: boolean;
|
|
292
|
+
/** Entry the consult kept this request on, when it did; rotation may still move it. */
|
|
293
|
+
affinityKeptEntryId?: string;
|
|
294
|
+
/** Model identity affinity consults with; recording reuses it so virtual models match. */
|
|
295
|
+
affinityModel?: string;
|
|
296
|
+
/** Provider cache-affinity outcome for this request (bounded enum, persisted on the entry). */
|
|
297
|
+
cacheAffinity?: CacheAffinityOutcome;
|
|
298
|
+
cacheAffinityReason?: CacheAffinityLogReason;
|
|
277
299
|
transportPhase?: "pre_headers" | "mid_stream" | "terminal_sse";
|
|
278
300
|
terminalSource?: "upstream" | "synthetic";
|
|
279
301
|
/** Closed failure evidence supplied by the transport, never inferred from provider text. */
|
|
@@ -307,7 +329,7 @@ export function rebindCacheDiagnosticBody(
|
|
|
307
329
|
cacheDiagnosticHooks()?.rebind(body, draft);
|
|
308
330
|
}
|
|
309
331
|
|
|
310
|
-
export interface RequestLogEntry extends UpstreamErrorDiagnostics {
|
|
332
|
+
export interface RequestLogEntry extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyEntryField {
|
|
311
333
|
requestId: string;
|
|
312
334
|
client?: UsageClient;
|
|
313
335
|
/** The logical request this row belongs to (#4546); absent on rows written without a budget. */
|
|
@@ -338,6 +360,8 @@ export interface RequestLogEntry extends UpstreamErrorDiagnostics {
|
|
|
338
360
|
* since both leave it undefined. */
|
|
339
361
|
inboundProtocol?: "responses" | "chat" | "messages";
|
|
340
362
|
accountLogLabel?: string;
|
|
363
|
+
/** Anthropic pool account of `provider` (#8383): its p-label, beside the unchanged `accountLogLabel`. */
|
|
364
|
+
accountTag?: `p${string}`;
|
|
341
365
|
/** Best-effort chat/session correlation for Logs grouping (#330). */
|
|
342
366
|
conversationId?: string;
|
|
343
367
|
requestedModel?: string;
|
|
@@ -389,6 +413,9 @@ export interface RequestLogEntry extends UpstreamErrorDiagnostics {
|
|
|
389
413
|
affinity?: CodexAffinityMove;
|
|
390
414
|
/** Why that decision was made (#4546): a move is the expensive event, so it names its cause. */
|
|
391
415
|
affinityReason?: CodexAffinityReason;
|
|
416
|
+
/** Provider cache-affinity outcome: kept on, newly bound to, or released from a key-pool credential. */
|
|
417
|
+
cacheAffinity?: CacheAffinityOutcome;
|
|
418
|
+
cacheAffinityReason?: CacheAffinityLogReason;
|
|
392
419
|
/**
|
|
393
420
|
* Set when this request dropped account-bound continuation after a Codex pool
|
|
394
421
|
* account change. Never an account identifier.
|
|
@@ -491,7 +518,8 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
|
|
|
491
518
|
const protocolTrace = parseProtocolTraceV1(entry.protocolTrace);
|
|
492
519
|
// projectErrorDetail bounds the tier fields (top-level and per attempt) itself, so this stays safe
|
|
493
520
|
// for a row that did not come through the disk reader; attempts are copied before it edits them.
|
|
494
|
-
const attempts = Array.isArray(entry.attempts) ? entry.attempts.map(
|
|
521
|
+
const attempts = Array.isArray(entry.attempts) ? entry.attempts.map(({ accountTag, ...attempt }) => ({ ...attempt,
|
|
522
|
+
...(isAnthropicAccountTag(accountTag) ? { accountTag } : {}) })) : entry.attempts;
|
|
495
523
|
return projectErrorDetail({
|
|
496
524
|
requestId: entry.requestId,
|
|
497
525
|
...(isLogicalRequestId(entry.logicalRequestId) ? { logicalRequestId: entry.logicalRequestId } : {}),
|
|
@@ -502,11 +530,12 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
|
|
|
502
530
|
...(entry.firstOutputMs !== undefined ? { firstOutputMs: entry.firstOutputMs } : {}),
|
|
503
531
|
...(entry.genStartMs !== undefined ? { genStartMs: entry.genStartMs } : {}),
|
|
504
532
|
...(entry.lastOutputMs !== undefined ? { lastOutputMs: entry.lastOutputMs } : {}),
|
|
505
|
-
...(isKnownUsageSurface(entry.surface) ? { surface: entry.surface } : {}),
|
|
533
|
+
...(isKnownUsageSurface(entry.surface) ? { surface: entry.surface } : {}), ...linkLogField(entry.link), ...requestBodyField(entry.requestBody),
|
|
506
534
|
...(entry.conversationId ? { conversationId: entry.conversationId } : {}),
|
|
507
535
|
...(isCodexUsageAccountLogLabel(entry.accountLogLabel)
|
|
508
536
|
? { accountLogLabel: entry.accountLogLabel }
|
|
509
537
|
: {}),
|
|
538
|
+
...(isAnthropicAccountTag(entry.accountTag) ? { accountTag: entry.accountTag } : {}),
|
|
510
539
|
...(entry.requestedModel ? { requestedModel: entry.requestedModel } : {}),
|
|
511
540
|
...(entry.requestedAlias ? { requestedAlias: entry.requestedAlias } : {}),
|
|
512
541
|
...(entry.shadowCallRewrittenFrom
|
|
@@ -544,6 +573,7 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
|
|
|
544
573
|
? { cacheProvenance: entry.cacheProvenance }
|
|
545
574
|
: {}),
|
|
546
575
|
...persistedAffinityFields(entry),
|
|
576
|
+
...persistedCacheAffinityFields(entry),
|
|
547
577
|
...(isKnownTransportPhase(entry.transportPhase) ? { transportPhase: entry.transportPhase } : {}),
|
|
548
578
|
...(isKnownTerminalSource(entry.terminalSource) ? { terminalSource: entry.terminalSource } : {}),
|
|
549
579
|
...(routeDecision ? { routeDecision } : {}),
|
|
@@ -572,6 +602,16 @@ function persistedAffinityFields(
|
|
|
572
602
|
};
|
|
573
603
|
}
|
|
574
604
|
|
|
605
|
+
function persistedCacheAffinityFields(
|
|
606
|
+
entry: Pick<RequestLogEntry, "cacheAffinity" | "cacheAffinityReason">,
|
|
607
|
+
): Pick<PersistedUsageEntry, "cacheAffinity" | "cacheAffinityReason"> {
|
|
608
|
+
if (!isKnownCacheAffinity(entry.cacheAffinity)) return {};
|
|
609
|
+
return {
|
|
610
|
+
cacheAffinity: entry.cacheAffinity,
|
|
611
|
+
...(isKnownCacheAffinityReason(entry.cacheAffinityReason) ? { cacheAffinityReason: entry.cacheAffinityReason } : {}),
|
|
612
|
+
};
|
|
613
|
+
}
|
|
614
|
+
|
|
575
615
|
/**
|
|
576
616
|
* Hydration guard: persisted traces are re-normalized before they enter the
|
|
577
617
|
* in-memory ring buffer so a hand-edited or corrupt row cannot poison the DTO.
|
|
@@ -701,10 +741,11 @@ export function addRequestLog(entry: RequestLogEntry) {
|
|
|
701
741
|
// reaches usage.jsonl — which is where the per-key rollup reads from.
|
|
702
742
|
...(entry.apiKeyId ? { apiKeyId: entry.apiKeyId } : {}),
|
|
703
743
|
...(isKnownAdmissionKind(entry.admissionKind) ? { admissionKind: entry.admissionKind } : {}),
|
|
704
|
-
...(isKnownInboundProtocol(entry.inboundProtocol) ? { inboundProtocol: entry.inboundProtocol } : {}),
|
|
744
|
+
...(isKnownInboundProtocol(entry.inboundProtocol) ? { inboundProtocol: entry.inboundProtocol } : {}), ...linkLogField(entry.link), ...requestBodyField(entry.requestBody),
|
|
705
745
|
...(isCodexUsageAccountLogLabel(entry.accountLogLabel)
|
|
706
746
|
? { accountLogLabel: entry.accountLogLabel }
|
|
707
747
|
: {}),
|
|
748
|
+
...(isAnthropicAccountTag(entry.accountTag) ? { accountTag: entry.accountTag } : {}),
|
|
708
749
|
...(entry.conversationId ? { conversationId: entry.conversationId } : {}),
|
|
709
750
|
...(entry.resolvedModel ? { resolvedModel: entry.resolvedModel } : {}),
|
|
710
751
|
...(entry.servedModel ? { servedModel: entry.servedModel } : {}),
|
|
@@ -744,6 +785,7 @@ export function addRequestLog(entry: RequestLogEntry) {
|
|
|
744
785
|
? { cacheProvenance: entry.cacheProvenance }
|
|
745
786
|
: {}),
|
|
746
787
|
...persistedAffinityFields(entry),
|
|
788
|
+
...persistedCacheAffinityFields(entry),
|
|
747
789
|
...(isKnownTransportPhase(entry.transportPhase) ? { transportPhase: entry.transportPhase } : {}),
|
|
748
790
|
...(isKnownTerminalSource(entry.terminalSource) ? { terminalSource: entry.terminalSource } : {}),
|
|
749
791
|
...failureDiagnostics,
|
|
@@ -1128,7 +1170,7 @@ export function inspectResponseLogSsePayloadParsed(
|
|
|
1128
1170
|
if (parsed !== undefined) recordGenerationEvent(logCtx, (parsed as { type?: unknown } | null)?.type);
|
|
1129
1171
|
if (parsed !== undefined) applyResponseLogMetadata(logCtx, parsed);
|
|
1130
1172
|
else logCtx.activeTierMetadata?.markResponseUnparseable();
|
|
1131
|
-
captureUpstreamErrorParsed(logCtx, payload, parsed);
|
|
1173
|
+
captureUpstreamErrorParsed(logCtx, payload, parsed, true);
|
|
1132
1174
|
if (debugEnabled) {
|
|
1133
1175
|
if (!sseAlreadyMarked) {
|
|
1134
1176
|
logCtx.usageDebugBodyKind = "sse";
|
|
@@ -1162,11 +1204,11 @@ function captureUpstreamError(logCtx: RequestLogContext, text: string | null): v
|
|
|
1162
1204
|
function captureUpstreamErrorParsed(
|
|
1163
1205
|
logCtx: RequestLogContext,
|
|
1164
1206
|
text: string,
|
|
1165
|
-
parsed: unknown | undefined,
|
|
1207
|
+
parsed: unknown | undefined, untypedSse = false,
|
|
1166
1208
|
): void {
|
|
1167
1209
|
if (parsed !== undefined && parsed !== null) {
|
|
1168
1210
|
const json = parsed as UpstreamErrorPayload;
|
|
1169
|
-
captureUpstreamTerminalDiagnostics(logCtx, json);
|
|
1211
|
+
if (!captureUpstreamTerminalDiagnostics(logCtx, json, untypedSse)) return;
|
|
1170
1212
|
const reason = json?.response?.incomplete_details?.reason;
|
|
1171
1213
|
if (json.type === "response.incomplete"
|
|
1172
1214
|
&& logCtx.terminalIncompleteReason === undefined
|
|
@@ -1177,7 +1219,7 @@ function captureUpstreamErrorParsed(
|
|
|
1177
1219
|
if (logCtx.upstreamError) return;
|
|
1178
1220
|
const message = upstreamErrorMessageFromPayload(parsed);
|
|
1179
1221
|
if (typeof message === "string" && message.trim()) {
|
|
1180
|
-
logCtx.upstreamError =
|
|
1222
|
+
logCtx.upstreamError = guardedRowCopy(logCtx, message);
|
|
1181
1223
|
return;
|
|
1182
1224
|
}
|
|
1183
1225
|
// No human-readable error message: fall back to the structured incomplete reason emitted by
|
|
@@ -1186,7 +1228,7 @@ function captureUpstreamErrorParsed(
|
|
|
1186
1228
|
// mapped HTTP code.
|
|
1187
1229
|
if (typeof reason === "string" && reason.trim()) {
|
|
1188
1230
|
const incomplete = incompleteReasonDetail(reason.trim()); // A known reason also gets a closed row detail.
|
|
1189
|
-
logCtx.upstreamError =
|
|
1231
|
+
logCtx.upstreamError = guardedRowCopy(logCtx, incomplete.text);
|
|
1190
1232
|
if (incomplete.detail) logCtx.failureDetail = incomplete.detail;
|
|
1191
1233
|
}
|
|
1192
1234
|
return;
|
|
@@ -1194,7 +1236,7 @@ function captureUpstreamErrorParsed(
|
|
|
1194
1236
|
if (logCtx.upstreamError) return;
|
|
1195
1237
|
const trimmed = text.trim();
|
|
1196
1238
|
if (trimmed) {
|
|
1197
|
-
logCtx.upstreamError =
|
|
1239
|
+
logCtx.upstreamError = guardedRowCopy(logCtx, trimmed);
|
|
1198
1240
|
}
|
|
1199
1241
|
}
|
|
1200
1242
|
|
|
@@ -1429,7 +1471,7 @@ export function addFinalRequestLog(
|
|
|
1429
1471
|
): void {
|
|
1430
1472
|
const intercept = finalRequestLogInterceptors.get(logCtx);
|
|
1431
1473
|
if (intercept) { intercept(status, meta); return; }
|
|
1432
|
-
writeFinalRequestLog(requestId, start, logCtx, status, meta, addLog);
|
|
1474
|
+
writeFinalRequestLog(requestId, start, logCtx, status, meta, addLog); notifyLinkTurnFinal(logCtx, meta?.terminalStatus);
|
|
1433
1475
|
}
|
|
1434
1476
|
|
|
1435
1477
|
function writeFinalRequestLog(
|
|
@@ -1448,7 +1490,7 @@ function writeFinalRequestLog(
|
|
|
1448
1490
|
? 499
|
|
1449
1491
|
: status;
|
|
1450
1492
|
// Locally assigned codes name proxy refusals that status and upstream text cannot reconstruct.
|
|
1451
|
-
const errorCode = logCtx.errorCode ?? requestLogErrorCode(
|
|
1493
|
+
const errorCode = logCtx.errorCode ?? bareVerdictRowErrorCode(logCtx) ?? requestLogErrorCode(
|
|
1452
1494
|
effectiveStatus,
|
|
1453
1495
|
logCtx.upstreamError,
|
|
1454
1496
|
logCtx.terminalErrorCode,
|
|
@@ -1471,7 +1513,7 @@ function writeFinalRequestLog(
|
|
|
1471
1513
|
// The final row and its active physical attempt describe the same terminal. Preserve the
|
|
1472
1514
|
// semantic code on both so detailed attempt telemetry cannot regress to a generic status code.
|
|
1473
1515
|
const attemptErrorCode = attemptStatus === undefined ? errorCode : attemptStatus < 400 ? undefined
|
|
1474
|
-
: logCtx.errorCode ?? requestLogErrorCode(attemptStatus, logCtx.upstreamError, logCtx.terminalErrorCode, false);
|
|
1516
|
+
: logCtx.errorCode ?? bareVerdictRowErrorCode(logCtx) ?? requestLogErrorCode(attemptStatus, logCtx.upstreamError, logCtx.terminalErrorCode, false);
|
|
1475
1517
|
if (attemptErrorCode) logCtx.activeAttempt.errorCode = attemptErrorCode;
|
|
1476
1518
|
else delete logCtx.activeAttempt.errorCode;
|
|
1477
1519
|
}
|
|
@@ -1557,6 +1599,14 @@ function writeFinalRequestLog(
|
|
|
1557
1599
|
cacheProvenance,
|
|
1558
1600
|
...(logCtx.cacheDiagnosticDraft ? { draft: logCtx.cacheDiagnosticDraft } : {}),
|
|
1559
1601
|
});
|
|
1602
|
+
// Provider cache affinity: this is the one seam every request passes exactly
|
|
1603
|
+
// once with its terminal status, the credential that ultimately served (the
|
|
1604
|
+
// entry id captured beside the account label at each stamp, rotations
|
|
1605
|
+
// included), and cache usage already normalized from whichever adapter
|
|
1606
|
+
// answered. A success binds or refreshes the conversation on that
|
|
1607
|
+
// credential; a quota/auth terminal releases it so the next request is
|
|
1608
|
+
// placed fresh instead of re-offered a credential that just refused.
|
|
1609
|
+
finalizeProviderCacheAffinity(logCtx, effectiveStatus, logCtx.usage ?? loggedUsage);
|
|
1560
1610
|
// Sanitize at the logging layer, not only at the one call site that populates this today.
|
|
1561
1611
|
// The value originates in an upstream-supplied model id, so an unsanitized newline would
|
|
1562
1612
|
// let a single field forge a record boundary in any line-oriented log viewer. Doing it here
|
|
@@ -1578,13 +1628,14 @@ function writeFinalRequestLog(
|
|
|
1578
1628
|
...(logCtx.surface ? { surface: logCtx.surface } : {}),
|
|
1579
1629
|
...(logCtx.apiKeyId ? { apiKeyId: logCtx.apiKeyId } : {}),
|
|
1580
1630
|
...(logCtx.admissionKind ? { admissionKind: logCtx.admissionKind } : {}),
|
|
1581
|
-
...(logCtx.inboundProtocol ? { inboundProtocol: logCtx.inboundProtocol } : {}),
|
|
1631
|
+
...(logCtx.inboundProtocol ? { inboundProtocol: logCtx.inboundProtocol } : {}), ...linkLogField(logCtx.link), ...requestBodyLogField(logCtx),
|
|
1582
1632
|
...(logCtx.localTerminalReason
|
|
1583
1633
|
? { localTerminalReason: sanitizeLogMetadataString(logCtx.localTerminalReason) }
|
|
1584
1634
|
: {}),
|
|
1585
1635
|
...(isCodexUsageAccountLogLabel(logCtx.accountLogLabel)
|
|
1586
1636
|
? { accountLogLabel: logCtx.accountLogLabel }
|
|
1587
1637
|
: {}),
|
|
1638
|
+
...anthropicAccountTagField(isCombo ? undefined : logCtx.provider),
|
|
1588
1639
|
...(logCtx.conversationId ? { conversationId: logCtx.conversationId } : {}),
|
|
1589
1640
|
...(logCtx.requestedModel ? { requestedModel: logCtx.requestedModel } : {}),
|
|
1590
1641
|
...(logCtx.requestedAlias ? { requestedAlias: logCtx.requestedAlias } : {}),
|
|
@@ -1625,6 +1676,8 @@ function writeFinalRequestLog(
|
|
|
1625
1676
|
...(loggedUsage || cacheProvenance !== "unknown" ? { cacheProvenance } : {}),
|
|
1626
1677
|
...(logCtx.affinity ? { affinity: logCtx.affinity } : {}),
|
|
1627
1678
|
...(logCtx.affinityReason ? { affinityReason: logCtx.affinityReason } : {}),
|
|
1679
|
+
...(logCtx.cacheAffinity ? { cacheAffinity: logCtx.cacheAffinity } : {}),
|
|
1680
|
+
...(logCtx.cacheAffinityReason ? { cacheAffinityReason: logCtx.cacheAffinityReason } : {}),
|
|
1628
1681
|
...(logCtx.conversationStateScrub === "account-change"
|
|
1629
1682
|
? { conversationStateScrub: "account-change" }
|
|
1630
1683
|
: {}),
|
|
@@ -1919,67 +1972,6 @@ export function finishRequestAttempt(
|
|
|
1919
1972
|
return attempt;
|
|
1920
1973
|
}
|
|
1921
1974
|
|
|
1922
|
-
export function aggregateAttemptUsage(
|
|
1923
|
-
attempts: readonly PersistedUsageAttempt[],
|
|
1924
|
-
): FinalizedUsageResult {
|
|
1925
|
-
// A usage-less attempt that never reached upstream spent nothing (summary.ts `spentNothing`),
|
|
1926
|
-
// so it cannot leave the row's usage unknown.
|
|
1927
|
-
const measured = attempts.filter(attempt => attempt.usage
|
|
1928
|
-
|| (attempt.sendCount !== 0 && attempt.locallyAnswered !== true));
|
|
1929
|
-
const status: UsageStatus = measured.length > 0
|
|
1930
|
-
&& measured.every(attempt => attempt.usageStatus === "unsupported")
|
|
1931
|
-
? "unsupported"
|
|
1932
|
-
: measured.some(attempt => (
|
|
1933
|
-
attempt.usageStatus === "unreported" || attempt.usageStatus === "unsupported"
|
|
1934
|
-
))
|
|
1935
|
-
? "unreported"
|
|
1936
|
-
: measured.some(attempt => attempt.usageStatus === "estimated")
|
|
1937
|
-
? "estimated"
|
|
1938
|
-
: measured.length > 0
|
|
1939
|
-
? "reported"
|
|
1940
|
-
: "unreported";
|
|
1941
|
-
|
|
1942
|
-
const usages = attempts.flatMap(attempt => attempt.usage ? [attempt.usage] : []);
|
|
1943
|
-
if (usages.length === 0) return { status };
|
|
1944
|
-
|
|
1945
|
-
const sumOptional = (
|
|
1946
|
-
key: "cachedInputTokens" | "cacheReadInputTokens" | "cacheCreationInputTokens" | "cacheCreation1hInputTokens"
|
|
1947
|
-
| "reasoningOutputTokens" | "providerCredits",
|
|
1948
|
-
): number | undefined => {
|
|
1949
|
-
const present = usages.flatMap(usage => (
|
|
1950
|
-
typeof usage[key] === "number" ? [usage[key] as number] : []
|
|
1951
|
-
));
|
|
1952
|
-
return present.length > 0 ? present.reduce((sum, value) => sum + value, 0) : undefined;
|
|
1953
|
-
};
|
|
1954
|
-
const cachedInputTokens = sumOptional("cachedInputTokens");
|
|
1955
|
-
// Readers take `cacheReadInputTokens ?? cachedInputTokens` (usage/cost.ts), so once any attempt
|
|
1956
|
-
// reports the read field, an attempt that only reports `cachedInputTokens` must count in it too.
|
|
1957
|
-
const cacheReadInputTokens = sumOptional("cacheReadInputTokens") === undefined ? undefined
|
|
1958
|
-
: usages.reduce((sum, usage) => sum + (usage.cacheReadInputTokens ?? usage.cachedInputTokens ?? 0), 0);
|
|
1959
|
-
const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
|
|
1960
|
-
const cacheCreation1hInputTokens = sumOptional("cacheCreation1hInputTokens");
|
|
1961
|
-
const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
|
|
1962
|
-
const providerCredits = sumOptional("providerCredits");
|
|
1963
|
-
const totalTokens = usages.reduce(
|
|
1964
|
-
(sum, usage) => sum + (usageTotalTokens(usage) ?? 0),
|
|
1965
|
-
0,
|
|
1966
|
-
);
|
|
1967
|
-
const aggregate: OcxUsage = {
|
|
1968
|
-
inputTokens: usages.reduce((sum, usage) => sum + usage.inputTokens, 0),
|
|
1969
|
-
outputTokens: usages.reduce((sum, usage) => sum + usage.outputTokens, 0),
|
|
1970
|
-
totalTokens,
|
|
1971
|
-
...(cachedInputTokens !== undefined ? { cachedInputTokens } : {}),
|
|
1972
|
-
...(cacheReadInputTokens !== undefined ? { cacheReadInputTokens } : {}),
|
|
1973
|
-
...(cacheCreationInputTokens !== undefined ? { cacheCreationInputTokens } : {}),
|
|
1974
|
-
...(cacheCreation1hInputTokens !== undefined ? { cacheCreation1hInputTokens } : {}),
|
|
1975
|
-
...(reasoningOutputTokens !== undefined ? { reasoningOutputTokens } : {}),
|
|
1976
|
-
...(providerCredits !== undefined ? { providerCredits } : {}),
|
|
1977
|
-
...(status === "estimated" ? { estimated: true } : {}),
|
|
1978
|
-
...(usages.every(usage => usage.upstreamReported) ? { upstreamReported: true as const } : {}),
|
|
1979
|
-
};
|
|
1980
|
-
return { usage: aggregate, status, totalTokens };
|
|
1981
|
-
}
|
|
1982
|
-
|
|
1983
1975
|
export function getRequestLogEntries(): RequestLogEntry[] { return requestLog; }
|
|
1984
1976
|
|
|
1985
1977
|
/** Test-only process-state reset for isolated integration harnesses. */
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { carryProxyError, proxyErrorPresentation, isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
|
|
2
|
+
import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
|
|
2
3
|
import { bindAnthropicRejectionResponse } from "../../adapters/anthropic-rejection-memo";
|
|
3
4
|
import { deferPhysicalSendReporter } from "./deferred-send-reporter";
|
|
4
5
|
import { responsesSpendTarget } from "./request-spend-target";
|
|
@@ -363,7 +364,7 @@ export function createAdapterContinuations(
|
|
|
363
364
|
// A synthesized replay refusal is not a rate limit; replaying the continuation on
|
|
364
365
|
// it would re-send a turn whose first send may already have been processed.
|
|
365
366
|
&& !isNonReplayableResponse(response) && !isSameTargetRetryHold(response)
|
|
366
|
-
&& rateLimitPolicy !== null
|
|
367
|
+
&& rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
|
|
367
368
|
&& adapterExchange.rateLimitRetries < rateLimitPolicy.attempts
|
|
368
369
|
// The main recovery loop and the passthrough ladder both consult the shared remainder
|
|
369
370
|
// here; this loop did not, so a request whose budget was already spent could still
|
|
@@ -270,6 +270,7 @@ export async function deliverAdapterResponse(
|
|
|
270
270
|
bareCustomToolNames,
|
|
271
271
|
enforceDeclaredToolNames: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
272
272
|
terminalRefusalAsFailed: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
273
|
+
escapeMemoryCitationTags: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
273
274
|
toolParameterSchemas,
|
|
274
275
|
...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
|
|
275
276
|
...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
|
|
@@ -381,6 +382,7 @@ export async function deliverAdapterResponse(
|
|
|
381
382
|
declaredToolNames,
|
|
382
383
|
bareCustomToolNames,
|
|
383
384
|
enforceDeclaredToolNames: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
385
|
+
escapeMemoryCitationTags: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
384
386
|
toolParameterSchemas,
|
|
385
387
|
freeformToolNames,
|
|
386
388
|
toolSearchToolNames,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { recordUpstreamProviderErrorDetail } from "../request-log-failure-detail";
|
|
2
|
+
import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
|
|
2
3
|
import { clientFacingModelText } from "../../lib/error-destination";
|
|
3
4
|
import { responsesSpendTarget } from "./request-spend-target";
|
|
4
5
|
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
@@ -110,7 +111,6 @@ import { isFixedCodexAccount } from "./core-codex-account";
|
|
|
110
111
|
import { recordSubagentQuotaFailureForThreadSpawn } from "../../codex/subagent-model-fallback";
|
|
111
112
|
import {
|
|
112
113
|
CYBER_POLICY_ERROR_CODE,
|
|
113
|
-
SEND_BUDGET_EXHAUSTED_CODE,
|
|
114
114
|
} from "../../lib/errors";
|
|
115
115
|
import { resolveClientRetryAfter } from "../../lib/retry-after";
|
|
116
116
|
import { cancelBodyOnAbort } from "../../lib/abort";
|
|
@@ -121,7 +121,7 @@ import { chargeWorkflowSends } from "../../lib/workflow-budget";
|
|
|
121
121
|
import { hasWorkflowSendObserver } from "../../lib/request-execution-budget";
|
|
122
122
|
import { isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
|
|
123
123
|
import { createAntigravityModelDenialRecovery, recoverAntigravityAccount } from "./antigravity-model-denial-recovery";
|
|
124
|
-
import {
|
|
124
|
+
import { adapterSendBudgetRefusal } from "../workflow-refusal";
|
|
125
125
|
import { AdmissionModelDeniedError, admissionModelDeniedResponse, projectAdmissionModelDeniedLog } from "../admission-model-scope";
|
|
126
126
|
/** One responsibility of the Responses request pipeline; state owners are explicit. */
|
|
127
127
|
export async function prepareAdapterExchange(
|
|
@@ -577,8 +577,7 @@ export async function prepareAdapterExchange(
|
|
|
577
577
|
// blaming the provider makes the caller send the whole turn again -- the amplification this
|
|
578
578
|
// budget exists to stop. The passthrough path has answered 429 here since #4546.
|
|
579
579
|
if (err instanceof SendBudgetExhaustedError) {
|
|
580
|
-
return
|
|
581
|
-
?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message));
|
|
580
|
+
return adapterSendBudgetRefusal(logCtx, sendBudgetState.workflowRootId, err.message);
|
|
582
581
|
}
|
|
583
582
|
const msg = describeUpstreamConnectFailure(err, connectMs);
|
|
584
583
|
return formatErrorResponse(502, "upstream_error", msg);
|
|
@@ -864,8 +863,7 @@ export async function prepareAdapterExchange(
|
|
|
864
863
|
// Same rule on the recovery leg: the ladder refused to send again, so the answer names
|
|
865
864
|
// this proxy rather than the provider it never reached.
|
|
866
865
|
if (err instanceof SendBudgetExhaustedError) {
|
|
867
|
-
return { failed:
|
|
868
|
-
?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message)) };
|
|
866
|
+
return { failed: adapterSendBudgetRefusal(logCtx, sendBudgetState.workflowRootId, err.message) };
|
|
869
867
|
}
|
|
870
868
|
const msg = describeUpstreamConnectFailure(err, connectMs);
|
|
871
869
|
return { failed: formatErrorResponse(502, "upstream_error", msg) };
|
|
@@ -1230,7 +1228,7 @@ export async function prepareAdapterExchange(
|
|
|
1230
1228
|
// key on rate-limit blips; only after the attempts are exhausted does failover run.
|
|
1231
1229
|
while (
|
|
1232
1230
|
upstreamResponse.status === 429 && !isSameTargetRetryHold(upstreamResponse)
|
|
1233
|
-
&& rateLimitPolicy !== null
|
|
1231
|
+
&& rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
|
|
1234
1232
|
&& rateLimitRetries < rateLimitPolicy.attempts
|
|
1235
1233
|
&& !sendBudgetExhausted()
|
|
1236
1234
|
) {
|
|
@@ -29,6 +29,38 @@ export function setAdvisorPlanFactory(config: OcxConfig, factory: AdvisorPlanFac
|
|
|
29
29
|
else factories.delete(config);
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
/** Request-scoped config views (e.g. the Claude replay config) -> the live config they were built from. */
|
|
33
|
+
type AdvisorLinkedConfig = Pick<OcxConfig, "advisor">;
|
|
34
|
+
const views = new WeakMap<AdvisorLinkedConfig, OcxConfig>();
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Record that `view` is a request-scoped copy of `live`. A view resolves the live config's
|
|
38
|
+
* factory at lookup time, so a later disable or re-activation of the live config still applies.
|
|
39
|
+
* The view's `advisor` reads through to the live config: management writes replace that object
|
|
40
|
+
* (`config.advisor = ...`), so a copied reference would keep a revoked consent alive for the
|
|
41
|
+
* plan. Every other request-scoped override on the view is kept. Nothing is stored on the live
|
|
42
|
+
* config, and an accessor is still cloneable (#7974).
|
|
43
|
+
*/
|
|
44
|
+
export function linkAdvisorPlanConfig<T extends OcxConfig>(live: OcxConfig, view: T): T {
|
|
45
|
+
const root = views.get(live) ?? live;
|
|
46
|
+
views.set(view, root);
|
|
47
|
+
if (view !== root) {
|
|
48
|
+
Object.defineProperty(view, "advisor", { get: () => root.advisor, enumerable: true, configurable: true });
|
|
49
|
+
}
|
|
50
|
+
return view;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* The live config a request-scoped view was linked to, or the config itself when it was not
|
|
55
|
+
* linked. Identity-scoped state that must outlive one request (the activity feed the management
|
|
56
|
+
* route reads from its own config object) resolves through the same link as the factory.
|
|
57
|
+
*/
|
|
58
|
+
export function advisorPlanRootConfig<T extends AdvisorLinkedConfig>(config: T): T | OcxConfig {
|
|
59
|
+
return views.get(config) ?? config;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/** Create the plan from the factory registered for this config, or for the live config it was linked to. */
|
|
32
63
|
export function createRegisteredAdvisorPlan(input: AdvisorPlanInput): Promise<RegisteredAdvisorPlan | null> | null {
|
|
33
|
-
|
|
64
|
+
const live = views.get(input.config);
|
|
65
|
+
return (factories.get(input.config) ?? (live && factories.get(live)))?.(input) ?? null;
|
|
34
66
|
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/** Shared, core-owned question bounds; no optional Advisor runtime dependency. */
|
|
2
|
+
export const MAX_ADVISOR_QUESTION_CHARACTERS = 2_000;
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Bound a trimmed question by Unicode code points without splitting surrogate pairs.
|
|
6
|
+
* The fixed notice makes clipping idempotent across interception and prompt construction.
|
|
7
|
+
* Stop after the first excess code point instead of materializing the whole input as an array.
|
|
8
|
+
*/
|
|
9
|
+
export function clipAdvisorQuestion(value: string): string {
|
|
10
|
+
const text = value.trim();
|
|
11
|
+
let characters = 0;
|
|
12
|
+
let end = 0;
|
|
13
|
+
for (const character of text) {
|
|
14
|
+
if (characters === MAX_ADVISOR_QUESTION_CHARACTERS) {
|
|
15
|
+
return `${text.slice(0, end)}… [truncated]`;
|
|
16
|
+
}
|
|
17
|
+
characters += 1;
|
|
18
|
+
end += character.length;
|
|
19
|
+
}
|
|
20
|
+
return text;
|
|
21
|
+
}
|
|
@@ -32,6 +32,7 @@ import type {
|
|
|
32
32
|
import { jsonStringPartsUtf8Bytes, jsonUtf8Bytes } from "../../lib/json-byte-size";
|
|
33
33
|
import { isTranslatorBudgetExceededError, TRANSLATOR_MAX_CALL_ARGUMENT_BYTES, TranslatorBudgetExceededError, type TranslatorBudget } from "../../lib/translator-budget";
|
|
34
34
|
import { AdvisorRetention } from "./advisor-retention";
|
|
35
|
+
import { clipAdvisorQuestion } from "./advisor-question";
|
|
35
36
|
|
|
36
37
|
export const ADVISOR_TOOL_NAME = "advisor";
|
|
37
38
|
|
|
@@ -61,6 +62,8 @@ export interface AdvisorConsultOutcome {
|
|
|
61
62
|
|
|
62
63
|
/** The structural plan the optional advisor subsystem registers per request. */
|
|
63
64
|
export interface AdvisorPlan {
|
|
65
|
+
/** Synchronous admission: invalid question-only calls do not reserve a consultation. */
|
|
66
|
+
shouldCountManualConsultation?(question: string | undefined): boolean;
|
|
64
67
|
/**
|
|
65
68
|
* Run one consultation for the current conversation state. Implementations own dedup,
|
|
66
69
|
* logging, and usage accounting; the guard only consumes the outcome.
|
|
@@ -112,14 +115,17 @@ export function createAdvisorSidecarStep(plan: AdvisorPlan) {
|
|
|
112
115
|
},
|
|
113
116
|
async consultCall(parsed: OcxParsedRequest, call: AdvisorSidecarCall, abortSignal?: AbortSignal) {
|
|
114
117
|
let outcome: AdvisorConsultOutcome;
|
|
115
|
-
|
|
118
|
+
// An invalid question-only call is refused by the plan without a consultation, so it
|
|
119
|
+
// neither reserves nor exhausts the allowance; the continuation bound still applies.
|
|
120
|
+
const counts = plan.shouldCountManualConsultation?.(call.question) !== false;
|
|
121
|
+
if (counts && consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST) {
|
|
116
122
|
outcome = {
|
|
117
123
|
ok: false,
|
|
118
124
|
isError: true,
|
|
119
125
|
content: plan.formatUnavailable("limit", "consultation limit reached for this request"),
|
|
120
126
|
};
|
|
121
127
|
} else {
|
|
122
|
-
consultations += 1;
|
|
128
|
+
if (counts) consultations += 1;
|
|
123
129
|
try {
|
|
124
130
|
outcome = await plan.consult(parsed, "manual", call.question, abortSignal);
|
|
125
131
|
} catch (error) {
|
|
@@ -162,7 +168,8 @@ export function parseAdvisorQuestionArgs(argsBuf: string): { question?: string }
|
|
|
162
168
|
const parsed: unknown = JSON.parse(argsBuf);
|
|
163
169
|
if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
|
|
164
170
|
const question = (parsed as { question?: unknown }).question;
|
|
165
|
-
|
|
171
|
+
const text = typeof question === "string" ? clipAdvisorQuestion(question) : "";
|
|
172
|
+
if (text) return { question: text };
|
|
166
173
|
}
|
|
167
174
|
} catch { /* malformed args → no focus question */ }
|
|
168
175
|
return {};
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { RoutedNamespaceToolAliases } from "../../responses/namespace-tool-compat";
|
|
2
|
+
|
|
3
|
+
type ToolIdentity = { namespace: string; name: string; freeform?: boolean };
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* The bare aliases a request authorized through `buildToolBridgeMaps`: each alias that one namespaced identity claims
|
|
7
|
+
* under its own bare name. Passthrough restoration runs before the undeclared-tool guard copies them into the declared
|
|
8
|
+
* set, so the dispatcher restores calls to these identities first (src/server/responses/passthrough-dispatch.ts).
|
|
9
|
+
*/
|
|
10
|
+
export function authorizedBareNamespaceToolAliases(toolNsMap: Iterable<[string, ToolIdentity]>): RoutedNamespaceToolAliases {
|
|
11
|
+
return new Map(
|
|
12
|
+
[...toolNsMap].flatMap(([alias, identity]) =>
|
|
13
|
+
alias === identity.name
|
|
14
|
+
? [[alias, { namespace: identity.namespace, name: identity.name, kind: identity.freeform ? "custom" as const : "function" as const }] as const]
|
|
15
|
+
: []
|
|
16
|
+
),
|
|
17
|
+
);
|
|
18
|
+
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
2
|
+
import { ResponseBodyInactivityError } from "../../lib/response-body-inactivity";
|
|
2
3
|
import {
|
|
3
4
|
createSseInspector,
|
|
4
5
|
createSseTerminalOutputBoundary,
|
|
6
|
+
createTerminalStatusTracker,
|
|
5
7
|
SseAggregateLimitError,
|
|
6
|
-
terminalStatusFromParsed,
|
|
7
8
|
type CodexSafetyBufferingFilterOptions,
|
|
8
9
|
type SseInspector,
|
|
9
10
|
} from "../relay";
|
|
@@ -109,6 +110,7 @@ function createBufferedTerminalInspector(maxSourceBytes: number): {
|
|
|
109
110
|
let terminalCount = 0;
|
|
110
111
|
let status: ResponsesTerminalStatus | undefined;
|
|
111
112
|
let terminalResponse: Record<string, unknown> | undefined;
|
|
113
|
+
const classifyTerminal = createTerminalStatusTracker();
|
|
112
114
|
const inspector = createSseInspector({
|
|
113
115
|
terminalReconstruction: {
|
|
114
116
|
maxItems: MAX_BUFFERED_RESPONSES_OUTPUT_ITEMS,
|
|
@@ -117,7 +119,7 @@ function createBufferedTerminalInspector(maxSourceBytes: number): {
|
|
|
117
119
|
mergeSparseTerminalOutput: true,
|
|
118
120
|
},
|
|
119
121
|
onParsedPayload(payload) {
|
|
120
|
-
const candidateStatus =
|
|
122
|
+
const candidateStatus = classifyTerminal(payload);
|
|
121
123
|
if (!candidateStatus) return;
|
|
122
124
|
terminalCount += 1;
|
|
123
125
|
status ??= candidateStatus;
|
|
@@ -218,6 +220,8 @@ export async function collectBufferedResponsesSse(
|
|
|
218
220
|
terminalBoundary?: CodexSafetyBufferingFilterOptions;
|
|
219
221
|
read?: BufferedReadOptions;
|
|
220
222
|
retainTranscript?: boolean;
|
|
223
|
+
/** Per-request outbound mask, applied to upstream copy before the boundary bounds it. */
|
|
224
|
+
maskCredential?: (text: string) => string;
|
|
221
225
|
} = {},
|
|
222
226
|
): Promise<BufferedResponsesSseResult> {
|
|
223
227
|
const maxBytes = options.read?.maxBytes ?? MAX_UPSTREAM_JSON_BODY_BYTES;
|
|
@@ -236,6 +240,7 @@ export async function collectBufferedResponsesSse(
|
|
|
236
240
|
const reader = body.getReader();
|
|
237
241
|
const boundary = createSseTerminalOutputBoundary({
|
|
238
242
|
...options.terminalBoundary,
|
|
243
|
+
maskCredential: options.maskCredential,
|
|
239
244
|
maxInputBytes: maxBytes,
|
|
240
245
|
maxOutputBytes: maxBytes,
|
|
241
246
|
maxFrames,
|
|
@@ -328,7 +333,8 @@ export async function collectBufferedResponsesSse(
|
|
|
328
333
|
ok: false,
|
|
329
334
|
kind: options.signal?.aborted
|
|
330
335
|
? "aborted"
|
|
331
|
-
|
|
336
|
+
// A source guarded at its upstream reads reports its stall through the body it feeds us.
|
|
337
|
+
: error instanceof BufferedSseTimeoutError || error instanceof ResponseBodyInactivityError
|
|
332
338
|
? "timeout"
|
|
333
339
|
: error instanceof SseAggregateLimitError
|
|
334
340
|
|| error instanceof SseFrameTooLargeError
|
|
@@ -258,6 +258,17 @@ function renderedNestedTools(description: string): RenderedTool[] {
|
|
|
258
258
|
return rendered;
|
|
259
259
|
}
|
|
260
260
|
|
|
261
|
+
/**
|
|
262
|
+
* Nested tools a codex-rs code-mode exec renders, read from its wire form: a top-level custom
|
|
263
|
+
* `exec` whose description opens with the template header. Each name needs a heading followed by
|
|
264
|
+
* its own declaration, so an example or quoted text in the description renders nothing.
|
|
265
|
+
*/
|
|
266
|
+
export function codeModeRenderedToolNames(name: unknown, description: unknown): string[] {
|
|
267
|
+
if (name !== CODE_MODE_EXEC_TOOL_NAME || typeof description !== "string"
|
|
268
|
+
|| !description.startsWith(CODE_MODE_EXEC_TEMPLATE_HEADER)) return [];
|
|
269
|
+
return renderedNestedTools(description).map(tool => tool.name);
|
|
270
|
+
}
|
|
271
|
+
|
|
261
272
|
/** A nested name that claims a collaboration surface other than V1's. */
|
|
262
273
|
function isForeignCollabName(name: string): boolean {
|
|
263
274
|
if (name.startsWith("mcp__")) return false; // MCP server tools are never native collaboration
|