@bitkyc08/opencodex 2.100.1 → 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-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.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-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- 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 +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- 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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- 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 +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- 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 +314 -0
- 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 +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +29 -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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-readiness.ts +16 -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-status.ts +76 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- 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-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- 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-types.ts +2 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- 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/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- 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 +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- 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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- 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 +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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/account-resume-health.ts +60 -0
- 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 +25 -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 +51 -1
- 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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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/config-routes.ts +7 -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 +218 -0
- 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 +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -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 +22 -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-failure-detail.ts +59 -1
- 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 +40 -51
- 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 +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -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 +99 -106
- 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 +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- 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/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -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/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -3,6 +3,7 @@ import { gunzipSync, inflateRawSync, inflateSync, zstdDecompressSync } from "nod
|
|
|
3
3
|
import type { TranslatorBudget } from "../lib/translator-budget";
|
|
4
4
|
import { updateInboundBodyReservation } from "./inbound-body-budget";
|
|
5
5
|
import { serializedJsonByteLength } from "./json-serialized-bytes";
|
|
6
|
+
import { recordRequestBodyFacts } from "./request-body-facts";
|
|
6
7
|
|
|
7
8
|
/**
|
|
8
9
|
* Request-body decompression for the /v1/responses data plane.
|
|
@@ -75,6 +76,24 @@ function megabytes(bytes: number): string | null {
|
|
|
75
76
|
|
|
76
77
|
const INBOUND_CEILING_MB = (MAX_CONFIGURABLE_INBOUND_BODY_BYTES / (1024 * 1024)).toFixed(1);
|
|
77
78
|
|
|
79
|
+
/**
|
|
80
|
+
* Compression-bomb bound (#3023). A zstd frame of about 8 KiB inflates to 256 MiB, and the
|
|
81
|
+
* concurrent inbound budget reserves only the bytes on the wire, so the absolute limit alone lets
|
|
82
|
+
* a few tiny requests allocate the whole budget many times over. Now that Remote Link Children send
|
|
83
|
+
* zstd bodies by default, every encoded body may decode to at most
|
|
84
|
+
* max(COMPRESSED_BODY_RATIO_FLOOR_BYTES, COMPRESSED_BODY_RATIO_LIMIT x its wire bytes), and never
|
|
85
|
+
* past the absolute limit. zlib stops inflating at that size, so memory and time are bounded by it.
|
|
86
|
+
* 200 follows Apache mod_deflate's DeflateInflateRatioLimit; agent request bodies measured about
|
|
87
|
+
* 2.5x, and a body that decodes to 8 MiB or less is never refused for its ratio.
|
|
88
|
+
*/
|
|
89
|
+
export const COMPRESSED_BODY_RATIO_LIMIT = 200;
|
|
90
|
+
export const COMPRESSED_BODY_RATIO_FLOOR_BYTES = 8 * 1024 * 1024;
|
|
91
|
+
|
|
92
|
+
/** The most an encoded body of `wireBytes` may decode to under `maxBytes`. */
|
|
93
|
+
export function compressedBodyDecodeLimit(wireBytes: number, maxBytes: number): number {
|
|
94
|
+
return Math.min(maxBytes, Math.max(COMPRESSED_BODY_RATIO_FLOOR_BYTES, wireBytes * COMPRESSED_BODY_RATIO_LIMIT));
|
|
95
|
+
}
|
|
96
|
+
|
|
78
97
|
|
|
79
98
|
export class UnsupportedContentEncodingError extends Error {
|
|
80
99
|
constructor(readonly encoding: string) {
|
|
@@ -120,6 +139,7 @@ export class DecompressedBodyTooLargeError extends Error {
|
|
|
120
139
|
* as evidence of an upstream context verdict.
|
|
121
140
|
*/
|
|
122
141
|
export function describeInboundBodyRefusal(error: DecompressedBodyTooLargeError): string {
|
|
142
|
+
if (error instanceof CompressionRatioExceededError) return error.message;
|
|
123
143
|
// A lower-bound measurement stopped counting at the cap; reporting it as exact would be a lie.
|
|
124
144
|
const approximate = error.measurement === "declared_wire" || error.measurement === "decoded_exact"
|
|
125
145
|
? "" : "at least ";
|
|
@@ -136,6 +156,18 @@ export function describeInboundBodyRefusal(error: DecompressedBodyTooLargeError)
|
|
|
136
156
|
+ "conversation earlier.";
|
|
137
157
|
}
|
|
138
158
|
|
|
159
|
+
/** An encoded body that would decode past its ratio bound; inflation stopped there. */
|
|
160
|
+
export class CompressionRatioExceededError extends DecompressedBodyTooLargeError {
|
|
161
|
+
constructor(readonly wireBytes: number, readonly ratioLimitBytes: number, limit: number) {
|
|
162
|
+
super(ratioLimitBytes + 1, limit, "decoded_lower_bound");
|
|
163
|
+
this.name = "CompressionRatioExceededError";
|
|
164
|
+
const decoded = megabytes(ratioLimitBytes) ?? "the";
|
|
165
|
+
this.message = `OpenCodex refused this request before reading it: its compressed body (${Number.isSafeInteger(wireBytes) ? wireBytes : "?"} bytes) `
|
|
166
|
+
+ `expands past ${decoded} MB, more than ${COMPRESSED_BODY_RATIO_LIMIT} times its size. This is a local guard against `
|
|
167
|
+
+ "compression bombs, not a provider refusal; send the body uncompressed or with less repeated content.";
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
|
|
139
171
|
function assertBodySizeWithinLimit(
|
|
140
172
|
body: Uint8Array,
|
|
141
173
|
maxBytes: number,
|
|
@@ -269,8 +301,9 @@ export function decodeRequestBody(
|
|
|
269
301
|
const compressed = raw as Uint8Array<ArrayBuffer>;
|
|
270
302
|
// `maxOutputLength` makes zlib abort DURING inflation (ERR_BUFFER_TOO_LARGE), so a
|
|
271
303
|
// decompression bomb never allocates beyond the cap — checking after the fact would
|
|
272
|
-
// already have paid the full allocation (review finding, PR #96).
|
|
273
|
-
const
|
|
304
|
+
// already have paid the full allocation (review finding, PR #96). The cap is the ratio bound.
|
|
305
|
+
const decodeLimit = compressedBodyDecodeLimit(raw.byteLength, maxBytes);
|
|
306
|
+
const opts = { maxOutputLength: decodeLimit };
|
|
274
307
|
let decoded: Uint8Array;
|
|
275
308
|
try {
|
|
276
309
|
if (encoding === "zstd") decoded = zstdDecompressSync(compressed, opts);
|
|
@@ -280,6 +313,7 @@ export function decodeRequestBody(
|
|
|
280
313
|
else throw new UnsupportedContentEncodingError(encoding);
|
|
281
314
|
} catch (err) {
|
|
282
315
|
if ((err as NodeJS.ErrnoException | null)?.code === "ERR_BUFFER_TOO_LARGE") {
|
|
316
|
+
if (decodeLimit < maxBytes) throw new CompressionRatioExceededError(raw.byteLength, decodeLimit, maxBytes);
|
|
283
317
|
// Inflation stopped at the cap; the full decoded size was never measured.
|
|
284
318
|
throw new DecompressedBodyTooLargeError(maxBytes + 1, maxBytes, "decoded_lower_bound");
|
|
285
319
|
}
|
|
@@ -325,6 +359,7 @@ export async function readBoundedJsonRequestBody(
|
|
|
325
359
|
let releaseText: (() => void) | undefined;
|
|
326
360
|
try {
|
|
327
361
|
const decoded = decodeRequestBody(raw, encoding, maxBytes);
|
|
362
|
+
recordRequestBodyFacts(req, raw.byteLength, encoding, decoded.byteLength);
|
|
328
363
|
releaseDecoded = decoded === raw ? undefined : budget?.observeAcceptedRequestCopy(decoded.byteLength);
|
|
329
364
|
const text = new TextDecoder().decode(decoded);
|
|
330
365
|
// Count UTF-8 without allocating another request-sized byte array for diagnostics.
|
|
@@ -360,3 +395,31 @@ export function readJsonRequestBody(
|
|
|
360
395
|
): Promise<unknown> {
|
|
361
396
|
return readBoundedJsonRequestBody(req, maxBytes, budget);
|
|
362
397
|
}
|
|
398
|
+
|
|
399
|
+
/**
|
|
400
|
+
* Admit a body the caller already parsed (a Remote Link WebSocket create, #8600) as if it had been read: its serialized
|
|
401
|
+
* size is held to the same limit and observed by the same budget as the parse at the end of the bounded reader.
|
|
402
|
+
*/
|
|
403
|
+
export function admitParsedJsonRequestBody(body: unknown, maxBytes: number, budget?: TranslatorBudget): unknown {
|
|
404
|
+
const parsedBytes = serializedJsonByteLength(body);
|
|
405
|
+
if (parsedBytes > maxBytes) throw new DecompressedBodyTooLargeError(parsedBytes, maxBytes, "decoded_exact");
|
|
406
|
+
budget?.observeAcceptedRequestCopy(parsedBytes);
|
|
407
|
+
return body;
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
/**
|
|
411
|
+
* A parsed body bound to the one Request it stands for (#8600). It goes with that request alone: a request the pipeline
|
|
412
|
+
* builds for a combo child, a recovery or a retry is another Request and reads its own body. Taken once, like a body.
|
|
413
|
+
*/
|
|
414
|
+
const parsedBodies = new WeakMap<Request, unknown>();
|
|
415
|
+
|
|
416
|
+
export function attachParsedRequestBody(req: Request, body: unknown): void {
|
|
417
|
+
parsedBodies.set(req, body);
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
export function takeParsedRequestBody(req: Request): { body: unknown } | undefined {
|
|
421
|
+
if (!parsedBodies.has(req)) return undefined;
|
|
422
|
+
const body = parsedBodies.get(req);
|
|
423
|
+
parsedBodies.delete(req);
|
|
424
|
+
return { body };
|
|
425
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
|
|
2
|
+
import { anthropicAccountTag } from "../providers/label";
|
|
2
3
|
import { isCodexUsageAccountLogLabel, type PersistedUsageAttempt } from "../usage/log";
|
|
3
4
|
|
|
4
5
|
/**
|
|
@@ -42,6 +43,11 @@ export function sealRequestAttemptIdentity(
|
|
|
42
43
|
attempt.adapter = adapter;
|
|
43
44
|
if (attempt.sendCount === 0) {
|
|
44
45
|
attempt.provider = provider;
|
|
46
|
+
// The Anthropic pool tag is a pure function of this frozen provider, so a failover split
|
|
47
|
+
// (a fresh attempt sealed with the next account's provider) carries the next account's tag.
|
|
48
|
+
const accountTag = anthropicAccountTag(provider);
|
|
49
|
+
if (accountTag) attempt.accountTag = accountTag;
|
|
50
|
+
else delete attempt.accountTag;
|
|
45
51
|
if (isCodexUsageAccountLogLabel(accountLogLabel)) attempt.accountLogLabel = accountLogLabel;
|
|
46
52
|
else delete attempt.accountLogLabel;
|
|
47
53
|
return;
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { usageTotalTokens, type PersistedUsageAttempt, type UsageStatus } from "../usage/log";
|
|
2
|
+
import type { OcxUsage } from "../types";
|
|
3
|
+
|
|
4
|
+
interface FinalizedUsageResult {
|
|
5
|
+
usage?: OcxUsage;
|
|
6
|
+
status: UsageStatus;
|
|
7
|
+
totalTokens?: number;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export function aggregateAttemptUsage(
|
|
11
|
+
attempts: readonly PersistedUsageAttempt[],
|
|
12
|
+
): FinalizedUsageResult {
|
|
13
|
+
// A usage-less attempt that never reached upstream spent nothing (summary.ts `spentNothing`),
|
|
14
|
+
// so it cannot leave the row's usage unknown.
|
|
15
|
+
const measured = attempts.filter(attempt => attempt.usage
|
|
16
|
+
|| (attempt.sendCount !== 0 && attempt.locallyAnswered !== true));
|
|
17
|
+
const status: UsageStatus = measured.length > 0
|
|
18
|
+
&& measured.every(attempt => attempt.usageStatus === "unsupported")
|
|
19
|
+
? "unsupported"
|
|
20
|
+
: measured.some(attempt => (
|
|
21
|
+
attempt.usageStatus === "unreported" || attempt.usageStatus === "unsupported"
|
|
22
|
+
))
|
|
23
|
+
? "unreported"
|
|
24
|
+
: measured.some(attempt => attempt.usageStatus === "estimated")
|
|
25
|
+
? "estimated"
|
|
26
|
+
: measured.length > 0
|
|
27
|
+
? "reported"
|
|
28
|
+
: "unreported";
|
|
29
|
+
|
|
30
|
+
const usages = attempts.flatMap(attempt => attempt.usage ? [attempt.usage] : []);
|
|
31
|
+
if (usages.length === 0) return { status };
|
|
32
|
+
|
|
33
|
+
const sumOptional = (
|
|
34
|
+
key: "cachedInputTokens" | "cacheReadInputTokens" | "cacheCreationInputTokens" | "cacheCreation1hInputTokens"
|
|
35
|
+
| "reasoningOutputTokens" | "providerCredits",
|
|
36
|
+
): number | undefined => {
|
|
37
|
+
const present = usages.flatMap(usage => (
|
|
38
|
+
typeof usage[key] === "number" ? [usage[key] as number] : []
|
|
39
|
+
));
|
|
40
|
+
return present.length > 0 ? present.reduce((sum, value) => sum + value, 0) : undefined;
|
|
41
|
+
};
|
|
42
|
+
const cachedInputTokens = sumOptional("cachedInputTokens");
|
|
43
|
+
// Readers take `cacheReadInputTokens ?? cachedInputTokens` (usage/cost.ts), so once any attempt
|
|
44
|
+
// reports the read field, an attempt that only reports `cachedInputTokens` must count in it too.
|
|
45
|
+
const cacheReadInputTokens = sumOptional("cacheReadInputTokens") === undefined ? undefined
|
|
46
|
+
: usages.reduce((sum, usage) => sum + (usage.cacheReadInputTokens ?? usage.cachedInputTokens ?? 0), 0);
|
|
47
|
+
const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
|
|
48
|
+
const cacheCreation1hInputTokens = sumOptional("cacheCreation1hInputTokens");
|
|
49
|
+
const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
|
|
50
|
+
const providerCredits = sumOptional("providerCredits");
|
|
51
|
+
const totalTokens = usages.reduce(
|
|
52
|
+
(sum, usage) => sum + (usageTotalTokens(usage) ?? 0),
|
|
53
|
+
0,
|
|
54
|
+
);
|
|
55
|
+
const aggregate: OcxUsage = {
|
|
56
|
+
inputTokens: usages.reduce((sum, usage) => sum + usage.inputTokens, 0),
|
|
57
|
+
outputTokens: usages.reduce((sum, usage) => sum + usage.outputTokens, 0),
|
|
58
|
+
totalTokens,
|
|
59
|
+
...(cachedInputTokens !== undefined ? { cachedInputTokens } : {}),
|
|
60
|
+
...(cacheReadInputTokens !== undefined ? { cacheReadInputTokens } : {}),
|
|
61
|
+
...(cacheCreationInputTokens !== undefined ? { cacheCreationInputTokens } : {}),
|
|
62
|
+
...(cacheCreation1hInputTokens !== undefined ? { cacheCreation1hInputTokens } : {}),
|
|
63
|
+
...(reasoningOutputTokens !== undefined ? { reasoningOutputTokens } : {}),
|
|
64
|
+
...(providerCredits !== undefined ? { providerCredits } : {}),
|
|
65
|
+
...(status === "estimated" ? { estimated: true } : {}),
|
|
66
|
+
...(usages.every(usage => usage.upstreamReported) ? { upstreamReported: true as const } : {}),
|
|
67
|
+
};
|
|
68
|
+
return { usage: aggregate, status, totalTokens };
|
|
69
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import {
|
|
2
|
+
boundEntryIdForLane,
|
|
3
|
+
recordProviderCacheAffinity,
|
|
4
|
+
releaseProviderCacheAffinity,
|
|
5
|
+
} from "../providers/cache-affinity";
|
|
6
|
+
import { isAnthropicBillingFailure } from "../providers/anthropic-billing-refusal";
|
|
7
|
+
import type { OcxUsage } from "../types";
|
|
8
|
+
import type { RequestLogContext } from "./request-log";
|
|
9
|
+
import { loadConfig } from "../config";
|
|
10
|
+
import { capturedCacheAffinityIdentity, currentCacheAffinityIdentity } from "../providers/cache-affinity-identity";
|
|
11
|
+
|
|
12
|
+
/** Finalize against the serving credential, never a logical combo's display label. */
|
|
13
|
+
export function finalizeProviderCacheAffinity(
|
|
14
|
+
logCtx: RequestLogContext,
|
|
15
|
+
status: number,
|
|
16
|
+
usage: OcxUsage | undefined,
|
|
17
|
+
): void {
|
|
18
|
+
const {
|
|
19
|
+
affinityLane: lane,
|
|
20
|
+
affinityKeyEntryId: entryId,
|
|
21
|
+
affinityProviderName: providerName,
|
|
22
|
+
} = logCtx;
|
|
23
|
+
if (!lane || !entryId || !providerName || logCtx.cacheAffinityApplicable !== true) return;
|
|
24
|
+
const identity = capturedCacheAffinityIdentity(logCtx);
|
|
25
|
+
if (!identity || identity !== currentCacheAffinityIdentity(providerName, loadConfig().providers[providerName], entryId)) return;
|
|
26
|
+
if (status >= 200 && status < 300 && logCtx.observedTerminalStatus !== "failed") {
|
|
27
|
+
const previouslyBound = boundEntryIdForLane(lane);
|
|
28
|
+
recordProviderCacheAffinity({
|
|
29
|
+
lane,
|
|
30
|
+
providerName,
|
|
31
|
+
entryId,
|
|
32
|
+
identity,
|
|
33
|
+
model: logCtx.affinityModel ?? logCtx.model,
|
|
34
|
+
cacheRead: usage?.cacheReadInputTokens ?? usage?.cachedInputTokens,
|
|
35
|
+
cacheWrite: usage?.cacheCreationInputTokens,
|
|
36
|
+
cacheWriteLong: usage?.cacheCreation1hInputTokens,
|
|
37
|
+
inputTokens: usage?.inputTokens,
|
|
38
|
+
});
|
|
39
|
+
if (logCtx.cacheAffinity === "kept" && logCtx.affinityKeptEntryId !== entryId) {
|
|
40
|
+
logCtx.cacheAffinity = "bound";
|
|
41
|
+
logCtx.cacheAffinityReason = "new";
|
|
42
|
+
} else if (!logCtx.cacheAffinity) {
|
|
43
|
+
logCtx.cacheAffinity = previouslyBound === entryId ? "kept" : "bound";
|
|
44
|
+
logCtx.cacheAffinityReason = previouslyBound === entryId ? "cache" : "new";
|
|
45
|
+
}
|
|
46
|
+
} else if (
|
|
47
|
+
logCtx.terminalSource !== "synthetic" &&
|
|
48
|
+
(status === 401 ||
|
|
49
|
+
status === 402 ||
|
|
50
|
+
status === 429 ||
|
|
51
|
+
(logCtx.providerAdapter === "anthropic" &&
|
|
52
|
+
isAnthropicBillingFailure(status, logCtx.upstreamError ?? "", logCtx.upstreamErrorType)))
|
|
53
|
+
) {
|
|
54
|
+
// Only this request's refusal is evidence. A shared cooldown may have been
|
|
55
|
+
// written by another conversation while this request was in flight.
|
|
56
|
+
if (!releaseProviderCacheAffinity(lane, providerName, entryId, identity)) return;
|
|
57
|
+
logCtx.cacheAffinity = "released";
|
|
58
|
+
logCtx.cacheAffinityReason = status === 401 ? "auth" : "quota";
|
|
59
|
+
}
|
|
60
|
+
}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
* Best-effort chat/session correlation for Logs / usage.jsonl (#330).
|
|
3
3
|
* Opaque ids only — never persist raw emails or Claude Desktop system-hash fallbacks.
|
|
4
4
|
*/
|
|
5
|
-
import { createHash, randomUUID } from "node:crypto";
|
|
5
|
+
import { createHash, createHmac, randomBytes, randomUUID } from "node:crypto";
|
|
6
|
+
import type { OcxConfig } from "../types";
|
|
7
|
+
import { resolveContextPrincipal, type DataPlaneAdmission } from "./auth-cors";
|
|
6
8
|
|
|
7
9
|
/** Reject absurdly long client strings before hashing (DoS / JSONL bloat). */
|
|
8
10
|
export const LOG_CONVERSATION_ID_INPUT_MAX = 4096;
|
|
@@ -75,7 +77,9 @@ export function unwrapLogConversationQuery(query: string): string {
|
|
|
75
77
|
export function logConversationQueryCandidates(query: string): string[] {
|
|
76
78
|
const trimmed = query.trim();
|
|
77
79
|
const unwrapped = unwrapLogConversationQuery(trimmed);
|
|
78
|
-
|
|
80
|
+
// A pasted Claude Code metadata.user_id is stored without its per-turn `tk`.
|
|
81
|
+
const session = trimmed.length > LOG_CONVERSATION_ID_INPUT_MAX ? trimmed : claudeSessionUserId(trimmed);
|
|
82
|
+
return [...new Set([unwrapped, trimmed, session])];
|
|
79
83
|
}
|
|
80
84
|
|
|
81
85
|
/**
|
|
@@ -128,6 +132,42 @@ export function sessionLaneIdFromRequest(headers: Headers): string | undefined {
|
|
|
128
132
|
return specific ?? parent;
|
|
129
133
|
}
|
|
130
134
|
|
|
135
|
+
/**
|
|
136
|
+
* The affinity lane a request binds under, derived once so every entry path agrees.
|
|
137
|
+
*
|
|
138
|
+
* `sessionLaneIdFromRequest` first (explicit thread/session/parent identity), then the
|
|
139
|
+
* explicit `x-opencode-session` header the Claude-Go handoff and
|
|
140
|
+
* `getOrAllocateRequestSessionLane` already treat as lane identity, then the log
|
|
141
|
+
* conversation id — except the Hermes digest, which is log correlation only and must
|
|
142
|
+
* never affect lanes or routing (#330). This expression used to be inlined at four
|
|
143
|
+
* entry paths and drifted: three of the four missed the `x-opencode-session` fallback
|
|
144
|
+
* until PR #7738 aligned them.
|
|
145
|
+
*
|
|
146
|
+
* Scope authenticated lanes to the admitted principal with a process-local HMAC. A translated
|
|
147
|
+
* request carries the principal captured before its caller credential was stripped. Loopback
|
|
148
|
+
* without a recognized credential retains the existing local lane; an authenticated admission
|
|
149
|
+
* without a principal cannot bind. The distinct prefix prevents local lanes from colliding.
|
|
150
|
+
*/
|
|
151
|
+
const AFFINITY_SCOPE_KEY = randomBytes(32);
|
|
152
|
+
|
|
153
|
+
export function affinityLaneFromRequest(
|
|
154
|
+
req: Request,
|
|
155
|
+
slot: LogConversationSlot,
|
|
156
|
+
config: OcxConfig,
|
|
157
|
+
admission?: DataPlaneAdmission,
|
|
158
|
+
capturedPrincipal?: Readonly<{ clientPrincipalId: string | undefined }>,
|
|
159
|
+
): string | undefined {
|
|
160
|
+
const lane = sessionLaneIdFromRequest(req.headers)
|
|
161
|
+
?? normalizeLogConversationId(req.headers.get("x-opencode-session"))
|
|
162
|
+
?? (slot.conversationIdIsHermesFallback ? undefined : normalizeLogConversationId(slot.conversationId));
|
|
163
|
+
if (!lane) return undefined;
|
|
164
|
+
const principal = capturedPrincipal ? capturedPrincipal.clientPrincipalId : resolveContextPrincipal(req, config, admission);
|
|
165
|
+
if (principal) return `principal:${createHmac("sha256", AFFINITY_SCOPE_KEY).update(JSON.stringify([principal, lane])).digest("hex")}`;
|
|
166
|
+
// An authenticated admission with no identity must not join any other caller's lane.
|
|
167
|
+
if (admission && admission.kind !== "loopback") return undefined;
|
|
168
|
+
return lane;
|
|
169
|
+
}
|
|
170
|
+
|
|
131
171
|
function firstSanitizedConversationId(
|
|
132
172
|
...values: Array<string | null | undefined>
|
|
133
173
|
): string | undefined {
|
|
@@ -227,6 +267,7 @@ export function fillHermesLogConversationFallback(slot: LogConversationSlot, hea
|
|
|
227
267
|
* Any other user_id, including one that is nothing but `tk`, is returned unchanged.
|
|
228
268
|
*/
|
|
229
269
|
export function claudeSessionUserId(userId: string): string {
|
|
270
|
+
if (!userId.trimStart().startsWith("{")) return userId;
|
|
230
271
|
try {
|
|
231
272
|
const parsed: unknown = JSON.parse(userId);
|
|
232
273
|
if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) && "tk" in parsed) {
|
|
@@ -245,6 +286,8 @@ export function conversationIdFromClaudeMetadata(
|
|
|
245
286
|
metadata: { user_id?: unknown } | null | undefined,
|
|
246
287
|
): string | undefined {
|
|
247
288
|
if (!metadata || typeof metadata.user_id !== "string") return undefined;
|
|
289
|
+
// Too long to persist: skip parsing a blob normalizeLogConversationId rejects anyway.
|
|
290
|
+
if (metadata.user_id.trim().length > LOG_CONVERSATION_ID_INPUT_MAX) return undefined;
|
|
248
291
|
return normalizeLogConversationId(claudeSessionUserId(metadata.user_id));
|
|
249
292
|
}
|
|
250
293
|
|
|
@@ -10,7 +10,7 @@ import { knownModelIdentity } from "../lib/model-identity";
|
|
|
10
10
|
* upstreamError, which internal classifiers and status heuristics read and which never reaches a row.
|
|
11
11
|
* Only proxy-composed text may be passed here.
|
|
12
12
|
*/
|
|
13
|
-
import { boundedFailureDetail, type FailureDetail, type FailureDetailCode } from "../lib/failure-detail";
|
|
13
|
+
import { boundedFailureDetail, providerErrorTypeOf, providerFailureDetailOf, type FailureDetail, type FailureDetailCode } from "../lib/failure-detail";
|
|
14
14
|
|
|
15
15
|
export type { FailureDetail };
|
|
16
16
|
|
|
@@ -95,3 +95,61 @@ export function recordUpstreamValidationDetail(logCtx: { failureDetail?: Failure
|
|
|
95
95
|
? record.error as Record<string, unknown> : undefined;
|
|
96
96
|
logCtx.failureDetail = boundedFailureDetail({ code: "provider_error", type: nested?.type ?? record.type, validation });
|
|
97
97
|
}
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Capture the closed provider error class from a raw upstream error body (#8446): the envelope
|
|
101
|
+
* `type` (Anthropic/OpenAI) or Google's `error.status`, the latter also as the first element of a
|
|
102
|
+
* streamed JSON array. Validation pairs keep their existing capture and win when present. Only
|
|
103
|
+
* callers holding the provider's own body may use this; a body this proxy formatted is not evidence.
|
|
104
|
+
* An adapter transport that rewrote the body (normalizeUpstreamHttpErrorResponse) attached the class
|
|
105
|
+
* it read from the original to `response`, which is preferred.
|
|
106
|
+
*/
|
|
107
|
+
export function recordUpstreamProviderErrorDetail(
|
|
108
|
+
logCtx: { failureDetail?: FailureDetail },
|
|
109
|
+
status: number,
|
|
110
|
+
payload: unknown,
|
|
111
|
+
response?: object,
|
|
112
|
+
): void {
|
|
113
|
+
if (status < 400 || status >= 600) return;
|
|
114
|
+
const before = logCtx.failureDetail;
|
|
115
|
+
recordUpstreamValidationDetail(logCtx, status, payload);
|
|
116
|
+
if (logCtx.failureDetail !== before) { providerDetails.set(logCtx, logCtx.failureDetail!); return; }
|
|
117
|
+
let type = response ? providerFailureDetailOf(response)?.type : undefined;
|
|
118
|
+
if (type === undefined) {
|
|
119
|
+
let parsed = payload;
|
|
120
|
+
if (typeof payload === "string") {
|
|
121
|
+
if (payload.length > 256 * 1024) return;
|
|
122
|
+
try { parsed = JSON.parse(payload); } catch { return; }
|
|
123
|
+
}
|
|
124
|
+
type = providerErrorTypeOf(parsed);
|
|
125
|
+
}
|
|
126
|
+
if (type === undefined) return;
|
|
127
|
+
const detail: FailureDetail = { code: "provider_error", type };
|
|
128
|
+
logCtx.failureDetail = detail;
|
|
129
|
+
providerDetails.set(logCtx, detail);
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/** The provider detail each context last recorded, so a later success can retract exactly that one. */
|
|
133
|
+
const providerDetails = new WeakMap<object, FailureDetail>();
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Request-log side of every adapter event (the parse seam in request-transport.ts). An error event an
|
|
137
|
+
* adapter tagged with closed provider facts records them as a provider_error detail; a later `done` on
|
|
138
|
+
* the same request (a retry or replay that succeeded) retracts a detail this path recorded, so a
|
|
139
|
+
* successful row never names a provider failure it recovered from.
|
|
140
|
+
*/
|
|
141
|
+
export function observeProviderFailureEvent(logCtx: { failureDetail?: FailureDetail }, event: { type: string }): void {
|
|
142
|
+
if (event.type === "done") {
|
|
143
|
+
const recorded = providerDetails.get(logCtx);
|
|
144
|
+
if (recorded !== undefined && logCtx.failureDetail === recorded) delete logCtx.failureDetail;
|
|
145
|
+
providerDetails.delete(logCtx);
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
if (event.type !== "error") return;
|
|
149
|
+
const facts = providerFailureDetailOf(event);
|
|
150
|
+
if (!facts) return;
|
|
151
|
+
const detail = boundedFailureDetail({ code: "provider_error", ...facts });
|
|
152
|
+
if (!detail) return;
|
|
153
|
+
logCtx.failureDetail = detail;
|
|
154
|
+
providerDetails.set(logCtx, detail);
|
|
155
|
+
}
|