@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Remote Link request-log fields (design T4 section 9.1): how a link request arrived and whether it carried a
|
|
3
|
+
* continuation. Written only for link traffic while the link WebSocket feature is on (src/server/link-turn.ts); a row
|
|
4
|
+
* without them is not link traffic or predates them. threadRef and turnRef are HMAC-SHA256 refs under the Home's
|
|
5
|
+
* private activity reference key, never the raw ids. Lives here so both the in-memory request log and usage.jsonl
|
|
6
|
+
* share one validator, and request-log.ts (at its line cap) only spreads it.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
export type LinkTransport = "http" | "websocket";
|
|
10
|
+
export type LinkContinuation = "chained" | "full" | "miss";
|
|
11
|
+
export type LinkContinuationReason = "first" | "client" | "missing" | "scope_mismatch"
|
|
12
|
+
| "spill_missing" | "spill_corrupt" | "spill_failed" | "spill_too_large";
|
|
13
|
+
|
|
14
|
+
export interface LinkRequestLogFields {
|
|
15
|
+
transport: LinkTransport;
|
|
16
|
+
continuation: LinkContinuation;
|
|
17
|
+
continuationReason?: LinkContinuationReason;
|
|
18
|
+
threadRef?: string;
|
|
19
|
+
turnRef?: string;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/** Mixed into the request-log context, entry and persisted row. */
|
|
23
|
+
export interface LinkRequestLogCarrier { link?: LinkRequestLogFields }
|
|
24
|
+
|
|
25
|
+
const TRANSPORTS: ReadonlySet<string> = new Set<LinkTransport>(["http", "websocket"]);
|
|
26
|
+
const CONTINUATIONS: ReadonlySet<string> = new Set<LinkContinuation>(["chained", "full", "miss"]);
|
|
27
|
+
const REASONS: ReadonlySet<string> = new Set<LinkContinuationReason>(["first", "client", "missing", "scope_mismatch",
|
|
28
|
+
"spill_missing", "spill_corrupt", "spill_failed", "spill_too_large"]);
|
|
29
|
+
const REF = /^[0-9a-f]{64}$/;
|
|
30
|
+
|
|
31
|
+
/** The validated field as a spreadable object: `{ link }` for a well-formed value, `{}` for anything else. */
|
|
32
|
+
export function linkLogField(value: unknown): { link?: LinkRequestLogFields } {
|
|
33
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return {};
|
|
34
|
+
const raw = value as Record<string, unknown>;
|
|
35
|
+
if (typeof raw.transport !== "string" || !TRANSPORTS.has(raw.transport)) return {};
|
|
36
|
+
if (typeof raw.continuation !== "string" || !CONTINUATIONS.has(raw.continuation)) return {};
|
|
37
|
+
if (raw.continuationReason !== undefined && (typeof raw.continuationReason !== "string" || !REASONS.has(raw.continuationReason))) return {};
|
|
38
|
+
for (const key of ["threadRef", "turnRef"] as const) {
|
|
39
|
+
if (raw[key] !== undefined && (typeof raw[key] !== "string" || !REF.test(raw[key] as string))) return {};
|
|
40
|
+
}
|
|
41
|
+
return { link: {
|
|
42
|
+
transport: raw.transport as LinkTransport,
|
|
43
|
+
continuation: raw.continuation as LinkContinuation,
|
|
44
|
+
...(raw.continuationReason !== undefined ? { continuationReason: raw.continuationReason as LinkContinuationReason } : {}),
|
|
45
|
+
...(raw.threadRef !== undefined ? { threadRef: raw.threadRef as string } : {}),
|
|
46
|
+
...(raw.turnRef !== undefined ? { turnRef: raw.turnRef as string } : {}),
|
|
47
|
+
} };
|
|
48
|
+
}
|
package/src/usage/log.ts
CHANGED
|
@@ -10,6 +10,7 @@ import { enforceAppOwnedMemoryBudget } from "../lib/app-owned-memory";
|
|
|
10
10
|
import { recordOwnedConfigPath } from "../lib/config-ownership";
|
|
11
11
|
import { sanitizeLogMetadataString } from "../lib/redact";
|
|
12
12
|
import { usageDisplayTotalTokens } from "./totals";
|
|
13
|
+
import { linkLogField, type LinkRequestLogCarrier } from "./link-log-fields";
|
|
13
14
|
import { normalizeRecordedClient, type UsageClient } from "./client";
|
|
14
15
|
import {
|
|
15
16
|
normalizePersistedJevDecision,
|
|
@@ -22,9 +23,10 @@ import {
|
|
|
22
23
|
type RequestCloseReason,
|
|
23
24
|
type RequestTerminalStatus,
|
|
24
25
|
} from "./request-outcome";
|
|
25
|
-
import type { AttemptTierOutcome, OcxUsage } from "../types";
|
|
26
|
+
import type { AttemptTierOutcome, CacheAffinityLogReason, CacheAffinityOutcome, OcxUsage } from "../types";
|
|
26
27
|
import { normalizeRouteDecisionTrace, type RouteDecisionTraceV1 } from "../routing/trace";
|
|
27
28
|
import { parseProtocolTraceV1, type ProtocolTraceV1 } from "../protocols/dto";
|
|
29
|
+
import { requestBodyField, type RequestBodyFacts } from "./request-body";
|
|
28
30
|
import { ACCOUNT_LOG_LABEL_RE, CODEX_ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
|
|
29
31
|
import { claudeCompatibilityReason, normalizeClaudeFeatureCodes, type ClaudeFeatureCode } from "../claude/compatibility";
|
|
30
32
|
import type { UpstreamCondition } from "../lib/upstream-condition";
|
|
@@ -94,6 +96,11 @@ export function isCodexPoolAccountLogLabel(value: unknown): value is "main" | `p
|
|
|
94
96
|
return value === "main" || (typeof value === "string" && CODEX_ACCOUNT_LOG_LABEL_RE.test(value));
|
|
95
97
|
}
|
|
96
98
|
|
|
99
|
+
/** Anthropic pool account tag (#8383): exactly the `p<hex6>` label of its logged provider, nothing else. */
|
|
100
|
+
export function isAnthropicAccountTag(value: unknown): value is `p${string}` {
|
|
101
|
+
return typeof value === "string" && CODEX_ACCOUNT_LOG_LABEL_RE.test(value);
|
|
102
|
+
}
|
|
103
|
+
|
|
97
104
|
/** Request-time upstream credential class, never a credential or account identifier. */
|
|
98
105
|
export type UsageCredentialSource = "grok-oauth" | "xai-api-key";
|
|
99
106
|
|
|
@@ -171,6 +178,8 @@ export interface PersistedUsageAttempt {
|
|
|
171
178
|
locallyAnswered?: boolean;
|
|
172
179
|
/** Stable non-PII identity for the Codex pool account that served this attempt. */
|
|
173
180
|
accountLogLabel?: CodexUsageAccountLogLabel;
|
|
181
|
+
/** Anthropic pool account that served this attempt: the p-label of its provider (#8383). */
|
|
182
|
+
accountTag?: `p${string}`;
|
|
174
183
|
inputTokenEstimate?: number;
|
|
175
184
|
usage?: OcxUsage;
|
|
176
185
|
totalTokens?: number;
|
|
@@ -302,7 +311,7 @@ export function normalizeRequestSpend(value: unknown): PersistedRequestSpend | u
|
|
|
302
311
|
};
|
|
303
312
|
}
|
|
304
313
|
|
|
305
|
-
export interface PersistedUsageEntry {
|
|
314
|
+
export interface PersistedUsageEntry extends LinkRequestLogCarrier {
|
|
306
315
|
requestedAlias?: string;
|
|
307
316
|
requestId: string;
|
|
308
317
|
/** Best-effort classified client; absent only for records predating attribution. */
|
|
@@ -325,6 +334,8 @@ export interface PersistedUsageEntry {
|
|
|
325
334
|
inboundProtocol?: "responses" | "chat" | "messages";
|
|
326
335
|
/** Stable non-PII identity for Codex Pool usage; absent for Direct/non-Codex traffic. */
|
|
327
336
|
accountLogLabel?: CodexUsageAccountLogLabel;
|
|
337
|
+
/** Anthropic pool account of the row's provider (#8383); never read by account summaries. */
|
|
338
|
+
accountTag?: `p${string}`;
|
|
328
339
|
/** Best-effort chat/session correlation for Logs grouping (#330). */
|
|
329
340
|
conversationId?: string;
|
|
330
341
|
resolvedModel?: string;
|
|
@@ -400,6 +411,9 @@ export interface PersistedUsageEntry {
|
|
|
400
411
|
*/
|
|
401
412
|
affinity?: CodexAffinityMove;
|
|
402
413
|
affinityReason?: CodexAffinityReason;
|
|
414
|
+
/** Provider cache-affinity outcome for key-pool routes; additive, older rows omit it. */
|
|
415
|
+
cacheAffinity?: CacheAffinityOutcome;
|
|
416
|
+
cacheAffinityReason?: CacheAffinityLogReason;
|
|
403
417
|
/**
|
|
404
418
|
* Set when this request dropped account-bound continuation after a Codex pool
|
|
405
419
|
* account change. Never an account identifier.
|
|
@@ -420,6 +434,8 @@ export interface PersistedUsageEntry {
|
|
|
420
434
|
* rows and rows that fail validation carry none, and are never back-filled by guessing.
|
|
421
435
|
*/
|
|
422
436
|
protocolTrace?: ProtocolTraceV1;
|
|
437
|
+
/** The request body as received (#3023): wire bytes, Content-Encoding, decoded bytes. Absent on older rows. */
|
|
438
|
+
requestBody?: RequestBodyFacts;
|
|
423
439
|
/**
|
|
424
440
|
* How far this request got and why it failed (#2366). Projected from the attempt that ended
|
|
425
441
|
* the request so every surface reads the answer off the same row. Absent on a completed
|
|
@@ -543,6 +559,21 @@ export function isKnownAffinityReason(value: unknown): value is NonNullable<Pers
|
|
|
543
559
|
return typeof value === "string" && KNOWN_AFFINITY_REASONS.has(value as NonNullable<PersistedUsageEntry["affinityReason"]>);
|
|
544
560
|
}
|
|
545
561
|
|
|
562
|
+
const KNOWN_CACHE_AFFINITY = new Set<NonNullable<PersistedUsageEntry["cacheAffinity"]>>([
|
|
563
|
+
"kept", "bound", "released",
|
|
564
|
+
]);
|
|
565
|
+
const KNOWN_CACHE_AFFINITY_REASONS = new Set<NonNullable<PersistedUsageEntry["cacheAffinityReason"]>>([
|
|
566
|
+
"cache", "session", "turn", "continuation", "new", "quota", "auth",
|
|
567
|
+
]);
|
|
568
|
+
|
|
569
|
+
export function isKnownCacheAffinity(value: unknown): value is NonNullable<PersistedUsageEntry["cacheAffinity"]> {
|
|
570
|
+
return typeof value === "string" && KNOWN_CACHE_AFFINITY.has(value as NonNullable<PersistedUsageEntry["cacheAffinity"]>);
|
|
571
|
+
}
|
|
572
|
+
|
|
573
|
+
export function isKnownCacheAffinityReason(value: unknown): value is NonNullable<PersistedUsageEntry["cacheAffinityReason"]> {
|
|
574
|
+
return typeof value === "string" && KNOWN_CACHE_AFFINITY_REASONS.has(value as NonNullable<PersistedUsageEntry["cacheAffinityReason"]>);
|
|
575
|
+
}
|
|
576
|
+
|
|
546
577
|
export function usageLogPath(configDir?: string): string {
|
|
547
578
|
return join(configDir ?? getConfigDir(), "usage.jsonl");
|
|
548
579
|
}
|
|
@@ -792,6 +823,7 @@ function normalizeUsageAttempt(raw: unknown): PersistedUsageAttempt | null {
|
|
|
792
823
|
...(isCodexUsageAccountLogLabel(attempt.accountLogLabel)
|
|
793
824
|
? { accountLogLabel: attempt.accountLogLabel }
|
|
794
825
|
: {}),
|
|
826
|
+
...(isAnthropicAccountTag(attempt.accountTag) ? { accountTag: attempt.accountTag } : {}),
|
|
795
827
|
...(isNonNegativeFiniteNumber(attempt.inputTokenEstimate)
|
|
796
828
|
? { inputTokenEstimate: attempt.inputTokenEstimate }
|
|
797
829
|
: {}),
|
|
@@ -1026,6 +1058,10 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
|
|
|
1026
1058
|
const affinityReason = affinity !== undefined && isKnownAffinityReason(entry.affinityReason)
|
|
1027
1059
|
? entry.affinityReason
|
|
1028
1060
|
: undefined;
|
|
1061
|
+
const cacheAffinity = isKnownCacheAffinity(entry.cacheAffinity) ? entry.cacheAffinity : undefined;
|
|
1062
|
+
const cacheAffinityReason = cacheAffinity !== undefined && isKnownCacheAffinityReason(entry.cacheAffinityReason)
|
|
1063
|
+
? entry.cacheAffinityReason
|
|
1064
|
+
: undefined;
|
|
1029
1065
|
const conversationStateScrub = typeof entry.conversationStateScrub === "string"
|
|
1030
1066
|
&& KNOWN_CONVERSATION_STATE_SCRUBS.has(entry.conversationStateScrub)
|
|
1031
1067
|
? entry.conversationStateScrub
|
|
@@ -1053,9 +1089,11 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
|
|
|
1053
1089
|
: {}),
|
|
1054
1090
|
...(isKnownAdmissionKind(entry.admissionKind) ? { admissionKind: entry.admissionKind } : {}),
|
|
1055
1091
|
...(isKnownInboundProtocol(entry.inboundProtocol) ? { inboundProtocol: entry.inboundProtocol } : {}),
|
|
1092
|
+
...linkLogField(entry.link),
|
|
1056
1093
|
...(isCodexUsageAccountLogLabel(entry.accountLogLabel)
|
|
1057
1094
|
? { accountLogLabel: entry.accountLogLabel }
|
|
1058
1095
|
: {}),
|
|
1096
|
+
...(isAnthropicAccountTag(entry.accountTag) ? { accountTag: entry.accountTag } : {}),
|
|
1059
1097
|
...(typeof entry.conversationId === "string" && entry.conversationId.trim()
|
|
1060
1098
|
? { conversationId: entry.conversationId.trim().slice(0, 128) }
|
|
1061
1099
|
: {}),
|
|
@@ -1122,6 +1160,8 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
|
|
|
1122
1160
|
...(terminalSource ? { terminalSource } : {}),
|
|
1123
1161
|
...(affinity ? { affinity } : {}),
|
|
1124
1162
|
...(affinityReason ? { affinityReason } : {}),
|
|
1163
|
+
...(cacheAffinity ? { cacheAffinity } : {}),
|
|
1164
|
+
...(cacheAffinityReason ? { cacheAffinityReason } : {}),
|
|
1125
1165
|
...(conversationStateScrub ? { conversationStateScrub } : {}),
|
|
1126
1166
|
// Closed code, classified condition and numeric reset only; upstream text is never kept.
|
|
1127
1167
|
...errorDetailFor(entry),
|
|
@@ -1134,6 +1174,7 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
|
|
|
1134
1174
|
...(jevDecision ? { jevDecision } : {}),
|
|
1135
1175
|
...(claudeCompatibility ? { claudeCompatibility } : {}),
|
|
1136
1176
|
...(protocolTrace ? { protocolTrace } : {}),
|
|
1177
|
+
...requestBodyField(entry.requestBody),
|
|
1137
1178
|
...normalizeRequestFailureAttribution(entry),
|
|
1138
1179
|
};
|
|
1139
1180
|
if (normalized.attemptNormalizationDropped !== true && (entry.attemptNormalizationDropped === true
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The request body as the proxy received it (#3023): its bytes on the wire, its Content-Encoding and
|
|
3
|
+
* the bytes it decoded to. Carried on request-log rows and usage.jsonl as `requestBody` so a reader
|
|
4
|
+
* can see what a client actually sent, for example a Remote Link Child's bytes per input token.
|
|
5
|
+
* Only bodies the shared JSON reader decoded completely are recorded, so the encoding is one of the
|
|
6
|
+
* codings it accepts. A row written before this field existed has none; a malformed value is dropped
|
|
7
|
+
* on read rather than guessed.
|
|
8
|
+
*/
|
|
9
|
+
export type RequestBodyEncoding = "identity" | "zstd" | "gzip" | "deflate";
|
|
10
|
+
|
|
11
|
+
export interface RequestBodyFacts {
|
|
12
|
+
/** Bytes as received, before any decoding. */
|
|
13
|
+
wireBytes: number;
|
|
14
|
+
encoding: RequestBodyEncoding;
|
|
15
|
+
/** Bytes after decoding; equal to wireBytes for identity. */
|
|
16
|
+
decodedBytes: number;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const ENCODINGS: ReadonlySet<string> = new Set(["identity", "zstd", "gzip", "deflate"]);
|
|
20
|
+
|
|
21
|
+
function byteCount(value: unknown): value is number {
|
|
22
|
+
return Number.isSafeInteger(value) && (value as number) >= 0;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** Validate a stored or recorded value; anything else is absent. */
|
|
26
|
+
export function normalizeRequestBodyFacts(value: unknown): RequestBodyFacts | undefined {
|
|
27
|
+
if (value === null || typeof value !== "object" || Array.isArray(value)) return undefined;
|
|
28
|
+
const row = value as Record<string, unknown>;
|
|
29
|
+
if (!byteCount(row.wireBytes) || !byteCount(row.decodedBytes) || typeof row.encoding !== "string" || !ENCODINGS.has(row.encoding)) return undefined;
|
|
30
|
+
return { wireBytes: row.wireBytes, encoding: row.encoding as RequestBodyEncoding, decodedBytes: row.decodedBytes };
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** The persisted/row field, or nothing. */
|
|
34
|
+
export function requestBodyField(value: unknown): { requestBody?: RequestBodyFacts } {
|
|
35
|
+
const requestBody = normalizeRequestBodyFacts(value);
|
|
36
|
+
return requestBody ? { requestBody } : {};
|
|
37
|
+
}
|
package/src/web-search/loop.ts
CHANGED
|
@@ -390,6 +390,8 @@ export interface WebSearchLoopDeps {
|
|
|
390
390
|
forceEmptyResponseId?: boolean;
|
|
391
391
|
/** Responses inbound only: deliver a non-retryable upstream refusal as `response.failed`. */
|
|
392
392
|
terminalRefusalAsFailed?: boolean;
|
|
393
|
+
/** False for Chat/Messages inbound: their clients never parse `<oai-mem-citation>`, so text stays raw. */
|
|
394
|
+
escapeMemoryCitationTags?: boolean;
|
|
393
395
|
abortSignal?: AbortSignal;
|
|
394
396
|
recordSidecarOutcome?: SidecarOutcomeRecorder;
|
|
395
397
|
beforeSidecarDispatch?: () => void;
|
|
@@ -1337,6 +1339,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
|
|
|
1337
1339
|
...(deps.clientToolCatalogRestriction ? { ...deps.clientToolCatalogRestriction, enforceDeclaredToolNames: false } : {}),
|
|
1338
1340
|
...(deps.forceEmptyResponseId ? { responseId: "" } : {}),
|
|
1339
1341
|
...(deps.terminalRefusalAsFailed ? { terminalRefusalAsFailed: true } : {}),
|
|
1342
|
+
...(deps.escapeMemoryCitationTags === false ? { escapeMemoryCitationTags: false } : {}),
|
|
1340
1343
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
1341
1344
|
chatRawReasoningVisible: deps.chatRawReasoningVisible,
|
|
1342
1345
|
hideRawReasoning: parsed.options.hideRawReasoning,
|