@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.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 +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -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/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- 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/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- 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/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- 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 +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- 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 +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.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 +178 -0
- package/src/cli/dispatch.ts +61 -13
- 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 +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- 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 +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -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 +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- 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-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- 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 +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- 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 +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -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-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- 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/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- 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 +4 -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/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- 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 +86 -15
- 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 +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- 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/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- 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/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- 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 +52 -9
- 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 +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -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/budget.ts +23 -5
- 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 +50 -6
- 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/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- 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 +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- 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-billing-refusal.ts +27 -3
- 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 +515 -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 +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/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/workbuddy.ts +6 -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/workbuddy-credit-balance.ts +125 -16
- 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/effort-history.ts +732 -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/history/integrity.ts +41 -4
- 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 +111 -3
- 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 +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- 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 +196 -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 +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- 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 +149 -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 +39 -3
- 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 +192 -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 +58 -18
- 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 +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- 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/static-catalog-probe.ts +33 -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 +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- 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 +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- 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/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- 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-selection-keepalive.ts +254 -0
- 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 +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- 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 +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- 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 +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- 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 +19 -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/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- 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/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- 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 +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Anthropic's typed Advisor server tool (`advisor_20260301`, beta `advisor-tool-2026-03-01`) on the
|
|
3
|
+
* translated Messages lane (#8448). Claude Code declares it by default; Anthropic runs the advisor
|
|
4
|
+
* model server-side inside the same request and returns `server_tool_use` (name `advisor`, empty
|
|
5
|
+
* input) followed by `advisor_tool_result`. Both blocks are kept verbatim for the next turn.
|
|
6
|
+
*
|
|
7
|
+
* Pure helpers shared by the inbound replay (`src/claude/inbound-content-options.ts`), the
|
|
8
|
+
* adapter (`src/adapters/anthropic.ts`) and the Claude outbound. Nothing here reads, logs or
|
|
9
|
+
* rewrites a result's text or `encrypted_content`; validation only checks field types.
|
|
10
|
+
*/
|
|
11
|
+
import { credentialDomainFor } from "../../protocols/opaque-state";
|
|
12
|
+
import type { OcxProviderConfig } from "../../types";
|
|
13
|
+
|
|
14
|
+
type Rec = Record<string, unknown>;
|
|
15
|
+
|
|
16
|
+
export const ADVISOR_TOOL_BETA = "advisor-tool-2026-03-01";
|
|
17
|
+
export const ADVISOR_SERVER_TOOL_NAME = "advisor";
|
|
18
|
+
|
|
19
|
+
function isPlainRecord(value: unknown): value is Rec {
|
|
20
|
+
if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
|
|
21
|
+
const prototype = Object.getPrototypeOf(value);
|
|
22
|
+
return prototype === Object.prototype || prototype === null;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** A typed Advisor declaration (`advisor_YYYYMMDD`), the same shape the native lane's scope check reads. */
|
|
26
|
+
export function isAdvisorServerToolType(type: unknown): boolean {
|
|
27
|
+
return typeof type === "string" && /^advisor_\d{8}$/.test(type);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Whether a destination receives the declaration: an `anthropic`-adapter provider on first-party
|
|
32
|
+
* Anthropic by default, an Anthropic-compatible gateway only with `forwardAdvisorTool: true`.
|
|
33
|
+
* An explicit `false` keeps it off even `api.anthropic.com` (a relay that borrows the
|
|
34
|
+
* first-party body builder, like Zed's, sets it).
|
|
35
|
+
*/
|
|
36
|
+
export function advisorServerToolDestination(provider: Pick<OcxProviderConfig, "adapter" | "baseUrl" | "authMode" | "forwardAdvisorTool">): boolean {
|
|
37
|
+
if (provider.adapter !== "anthropic" || provider.forwardAdvisorTool === false) return false;
|
|
38
|
+
return provider.forwardAdvisorTool === true || credentialDomainFor(provider)?.firstPartyAnthropic === true;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** The call input Anthropic documents: always an empty object. */
|
|
42
|
+
export function isAdvisorCallInput(input: unknown): input is Rec {
|
|
43
|
+
return isPlainRecord(input) && Object.keys(input).length === 0;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** A streamed call's assembled `input_json_delta` fragments; none at all is the empty input. */
|
|
47
|
+
export function advisorCallInputFromJson(json: string): Rec | undefined {
|
|
48
|
+
if (json.trim() === "") return {};
|
|
49
|
+
try {
|
|
50
|
+
const input = JSON.parse(json) as unknown;
|
|
51
|
+
return isAdvisorCallInput(input) ? input : undefined;
|
|
52
|
+
} catch {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const RESULT_FIELDS: Readonly<Record<string, { required: string; optional: readonly string[] }>> = {
|
|
58
|
+
advisor_result: { required: "text", optional: ["stop_reason"] },
|
|
59
|
+
advisor_redacted_result: { required: "encrypted_content", optional: ["stop_reason"] },
|
|
60
|
+
advisor_tool_result_error: { required: "error_code", optional: [] },
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* `advisor_tool_result.content`: exactly one documented variant with string fields and no others —
|
|
65
|
+
* `advisor_result` (`text`), `advisor_redacted_result` (`encrypted_content`), each with an
|
|
66
|
+
* optional `stop_reason`, or `advisor_tool_result_error` (`error_code`).
|
|
67
|
+
*/
|
|
68
|
+
export function isAdvisorResultContent(content: unknown): boolean {
|
|
69
|
+
if (!isPlainRecord(content) || typeof content.type !== "string" || !Object.hasOwn(RESULT_FIELDS, content.type)) return false;
|
|
70
|
+
const fields = RESULT_FIELDS[content.type]!;
|
|
71
|
+
if (typeof content[fields.required] !== "string") return false;
|
|
72
|
+
return Object.keys(content).every(key => key === "type" || key === fields.required
|
|
73
|
+
|| (fields.optional.includes(key) && typeof content[key] === "string"));
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* A replayed Advisor block rebuilt from the fields Anthropic documents, so nothing a client added to
|
|
78
|
+
* its history rides along; undefined for any other block, which the caller copies as before.
|
|
79
|
+
*/
|
|
80
|
+
export function advisorReplayBlock(block: Rec): Rec | undefined {
|
|
81
|
+
if (block.type === "server_tool_use" && block.name === ADVISOR_SERVER_TOOL_NAME) {
|
|
82
|
+
return { type: "server_tool_use", id: block.id, name: ADVISOR_SERVER_TOOL_NAME, input: block.input };
|
|
83
|
+
}
|
|
84
|
+
if (block.type === "advisor_tool_result") {
|
|
85
|
+
return { type: "advisor_tool_result", tool_use_id: block.tool_use_id, content: block.content };
|
|
86
|
+
}
|
|
87
|
+
return undefined;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/** Whether a declared catalog or replay run names the Advisor. */
|
|
91
|
+
export function hasAdvisorDeclaration(tools: readonly Rec[] | undefined): boolean {
|
|
92
|
+
return tools?.some(tool => isAdvisorServerToolType(tool.type)) === true;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function runHasAdvisor(run: readonly Rec[]): boolean {
|
|
96
|
+
return run.some(block => block.type === "server_tool_use" && block.name === ADVISOR_SERVER_TOOL_NAME);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
function runHasOtherServerTool(run: readonly Rec[]): boolean {
|
|
100
|
+
return run.some(block => block.type === "server_tool_use" && block.name !== ADVISOR_SERVER_TOOL_NAME);
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* Withhold the caller's Advisor for a turn the proxy Advisor joins: its declaration and every
|
|
105
|
+
* replayed run that contains an Advisor call. The synthetic `advisor` owns the name for the whole
|
|
106
|
+
* turn, so a later leg that drops the synthetic tool (consultations exhausted) must not bring the
|
|
107
|
+
* history or the beta back and change the prompt mid-turn. Returns whether a declaration was withheld.
|
|
108
|
+
*/
|
|
109
|
+
export function withholdAdvisorServerTools(parsed: {
|
|
110
|
+
_anthropicServerTools?: readonly Rec[];
|
|
111
|
+
_anthropicServerReplay?: ReadonlyMap<string, readonly Rec[]>;
|
|
112
|
+
}): boolean {
|
|
113
|
+
const declared = hasAdvisorDeclaration(parsed._anthropicServerTools);
|
|
114
|
+
if (declared) parsed._anthropicServerTools = parsed._anthropicServerTools!.filter(tool => !isAdvisorServerToolType(tool.type));
|
|
115
|
+
const replay = parsed._anthropicServerReplay;
|
|
116
|
+
if (replay && [...replay.values()].some(runHasAdvisor)) {
|
|
117
|
+
const kept = new Map([...replay].filter(([, run]) => !runHasAdvisor(run)));
|
|
118
|
+
if (kept.size > 0) parsed._anthropicServerReplay = kept;
|
|
119
|
+
else delete parsed._anthropicServerReplay;
|
|
120
|
+
}
|
|
121
|
+
return declared;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
export interface AnthropicServerToolPlan {
|
|
125
|
+
/** Typed declarations this destination receives, in caller order. */
|
|
126
|
+
declared: Rec[];
|
|
127
|
+
/** Replayable runs this destination receives. */
|
|
128
|
+
replay?: ReadonlyMap<string, readonly Rec[]>;
|
|
129
|
+
/** Betas the forwarded Advisor declaration or history needs. */
|
|
130
|
+
betas: string[];
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/**
|
|
134
|
+
* Split the caller's out-of-body server tools by destination. Web tools keep their own audience
|
|
135
|
+
* (`webDestination`); the Advisor goes to `advisorServerToolDestination` unless a function tool of
|
|
136
|
+
* the same name owns it this turn (the proxy Advisor's synthetic tool, or a client function). A
|
|
137
|
+
* shadowed or ineligible turn drops both the declaration and the Advisor history, as before #8448.
|
|
138
|
+
*/
|
|
139
|
+
export function planAnthropicServerTools(
|
|
140
|
+
provider: Pick<OcxProviderConfig, "adapter" | "baseUrl" | "authMode" | "forwardAdvisorTool">,
|
|
141
|
+
declared: readonly Rec[] | undefined,
|
|
142
|
+
replay: ReadonlyMap<string, readonly Rec[]> | undefined,
|
|
143
|
+
functionNames: ReadonlySet<string>,
|
|
144
|
+
webDestination: boolean,
|
|
145
|
+
): AnthropicServerToolPlan {
|
|
146
|
+
const advisor = advisorServerToolDestination(provider) && !functionNames.has(ADVISOR_SERVER_TOOL_NAME);
|
|
147
|
+
const tools = (declared ?? []).filter(tool => isAdvisorServerToolType(tool.type) ? advisor : webDestination);
|
|
148
|
+
let runs: Map<string, readonly Rec[]> | undefined;
|
|
149
|
+
let replaysAdvisor = false;
|
|
150
|
+
for (const [anchor, run] of replay ?? []) {
|
|
151
|
+
const hasAdvisor = runHasAdvisor(run);
|
|
152
|
+
if ((hasAdvisor && !advisor) || (runHasOtherServerTool(run) && !webDestination)) continue;
|
|
153
|
+
replaysAdvisor ||= hasAdvisor;
|
|
154
|
+
(runs ??= new Map()).set(anchor, run);
|
|
155
|
+
}
|
|
156
|
+
const betas = advisor && (replaysAdvisor || hasAdvisorDeclaration(tools)) ? [ADVISOR_TOOL_BETA] : [];
|
|
157
|
+
return { declared: tools, ...(runs ? { replay: runs } : {}), betas };
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/**
|
|
161
|
+
* A streamed `advisor_tool_result` paired with the open `server_tool_use` of the same response.
|
|
162
|
+
* Undefined when the call is missing, its id differs, its input is not the documented empty object,
|
|
163
|
+
* or the result content is not a documented variant: the exchange is dropped, never synthesized.
|
|
164
|
+
*/
|
|
165
|
+
export function advisorServerExchange(
|
|
166
|
+
call: { id: string; name?: string; json: string } | undefined,
|
|
167
|
+
result: Rec,
|
|
168
|
+
): { blocks: { use: Rec; result: Rec }; completed: boolean } | undefined {
|
|
169
|
+
if (!call || call.name !== ADVISOR_SERVER_TOOL_NAME || call.id !== result.tool_use_id) return undefined;
|
|
170
|
+
const input = advisorCallInputFromJson(call.json);
|
|
171
|
+
if (!input || !isAdvisorResultContent(result.content)) return undefined;
|
|
172
|
+
return {
|
|
173
|
+
blocks: { use: { type: "server_tool_use", id: call.id, name: ADVISOR_SERVER_TOOL_NAME, input }, result },
|
|
174
|
+
completed: (result.content as Rec).type !== "advisor_tool_result_error",
|
|
175
|
+
};
|
|
176
|
+
}
|
|
@@ -6,6 +6,9 @@ function isRec(value: unknown): value is Rec {
|
|
|
6
6
|
|
|
7
7
|
export const CONTEXT_MANAGEMENT_BETA = "context-management-2025-06-27";
|
|
8
8
|
export const THINKING_BINDING_BETA = "thinking-binding-controls-2026-08-01";
|
|
9
|
+
/** Claude Code auto mode: server-side review of tool calls; the review context rides in the
|
|
10
|
+
* top-level `safeguards` field and the verdicts come back in `message_delta.delta.safeguard_results`. */
|
|
11
|
+
export const DANGEROUS_TOOL_USE_BETA = "dangerous-tool-use-2026-09-03";
|
|
9
12
|
|
|
10
13
|
interface BetaBodyPair {
|
|
11
14
|
beta: string;
|
|
@@ -23,6 +26,9 @@ export const ANTHROPIC_BETA_BODY_PAIRS: readonly BetaBodyPair[] = [
|
|
|
23
26
|
beta: CONTEXT_MANAGEMENT_BETA, path: ["context_management"], nativeClientOnly: true,
|
|
24
27
|
forWire: contextManagementForWire,
|
|
25
28
|
},
|
|
29
|
+
{
|
|
30
|
+
beta: DANGEROUS_TOOL_USE_BETA, path: ["safeguards"], nativeClientOnly: true,
|
|
31
|
+
},
|
|
26
32
|
{
|
|
27
33
|
beta: THINKING_BINDING_BETA, path: ["thinking", "block_binding"], nativeClientOnly: false,
|
|
28
34
|
accepts: body => isRec(body.thinking) && (body.thinking.type === "adaptive" || body.thinking.type === "enabled"),
|
|
@@ -12,6 +12,8 @@ const NAMES = [
|
|
|
12
12
|
"X-Stainless-Retry-Count", "X-Stainless-Timeout",
|
|
13
13
|
] as const;
|
|
14
14
|
const REQUIRED = ["User-Agent", "X-App", "X-Claude-Code-Session-Id", "X-Stainless-Lang", "X-Stainless-Runtime"] as const;
|
|
15
|
+
/** Claude Code sends `cli` from a foreground session and `cli-bg` from a background (`claude --bg`) one. */
|
|
16
|
+
const CLAUDE_CODE_APPS: ReadonlySet<string> = new Set(["cli", "cli-bg"]);
|
|
15
17
|
declare const identityBrand: unique symbol;
|
|
16
18
|
/** Opaque in-memory handle: serializing it cannot publish caller headers. */
|
|
17
19
|
export interface AnthropicClientIdentity { readonly [identityBrand]: true }
|
|
@@ -24,7 +26,7 @@ function valid(name: typeof NAMES[number], value: string): boolean {
|
|
|
24
26
|
return entrypoint === "cli" || entrypoint === "sdk-cli" || entrypoint === "sdk" || entrypoint === "sdk-ts"
|
|
25
27
|
|| (DESKTOP_ENTRYPOINTS as readonly string[]).includes(entrypoint ?? "");
|
|
26
28
|
}
|
|
27
|
-
if (name === "X-App") return value
|
|
29
|
+
if (name === "X-App") return CLAUDE_CODE_APPS.has(value);
|
|
28
30
|
if (name === "X-Claude-Code-Session-Id" || name === "x-client-request-id") return UUID.test(value);
|
|
29
31
|
if (name === "X-Stainless-Lang") return value === "js";
|
|
30
32
|
if (name === "X-Stainless-Runtime") return value === "node";
|
|
@@ -159,6 +159,7 @@ function mapOAuthContentBlocks(blocks: unknown[], mapBlock: (block: Rec) => Rec)
|
|
|
159
159
|
* The Claude OAuth request shape the adapter produces, applied to a Messages body: the Claude
|
|
160
160
|
* Code identity as the first system block, and declared client tool names under the OAuth
|
|
161
161
|
* prefix — in declarations, choices, uses and typed references, including tool-result content.
|
|
162
|
+
* An observed Claude Code client keeps its own tool names (no rename, an empty reverse map).
|
|
162
163
|
* Copy-on-write; arguments, schemas, unknown containers and cache markers stay opaque.
|
|
163
164
|
* Ambiguous original or wire names are refused before any history is rewritten.
|
|
164
165
|
*/
|
|
@@ -166,8 +167,13 @@ export function anthropicOAuthWireBody(body: Rec, clientIdentity?: AnthropicClie
|
|
|
166
167
|
const out: Rec = { ...body };
|
|
167
168
|
const toolNames = new Map<string, string>();
|
|
168
169
|
const owners = new Map<string, string>();
|
|
170
|
+
// An observed Claude Code client already sends the tool names its own OAuth login uses. The
|
|
171
|
+
// prefix would only hide them from first-party features keyed by tool name, such as auto
|
|
172
|
+
// mode's server-side review (`safeguards`), which then reviews none of the client's calls.
|
|
173
|
+
const keepClientToolNames = hasObservedAnthropicClientIdentity(clientIdentity);
|
|
174
|
+
const prefixed = (name: string): string => keepClientToolNames ? name : applyClaudeToolPrefix(name);
|
|
169
175
|
const wireName = (name: string): string => {
|
|
170
|
-
const wire =
|
|
176
|
+
const wire = prefixed(name);
|
|
171
177
|
const owner = owners.get(wire);
|
|
172
178
|
if (owner !== undefined && owner !== name) throw new Error("tool names collide under the Claude OAuth tool prefix");
|
|
173
179
|
owners.set(wire, name);
|
|
@@ -213,10 +219,10 @@ export function anthropicOAuthWireBody(body: Rec, clientIdentity?: AnthropicClie
|
|
|
213
219
|
for (const name of declared) {
|
|
214
220
|
if (typedNames.has(name)) throw new Error(inlineTypedNames.has(name)
|
|
215
221
|
? "inline typed and client tool names collide" : "typed and client tool names collide");
|
|
216
|
-
if (typedNames.has(
|
|
222
|
+
if (typedNames.has(prefixed(name))) throw new Error("typed and client wire tool names collide");
|
|
217
223
|
wireName(name);
|
|
218
224
|
}
|
|
219
|
-
const renames = (name: unknown): name is string => typeof name === "string" && declared.has(name) &&
|
|
225
|
+
const renames = (name: unknown): name is string => typeof name === "string" && declared.has(name) && prefixed(name) !== name;
|
|
220
226
|
const mapDeclaration = (tool: unknown): unknown => isClientTool(tool) && renames(tool.name)
|
|
221
227
|
? { ...tool, name: wireName(tool.name) } : tool;
|
|
222
228
|
if (Array.isArray(body.tools)) {
|
|
@@ -0,0 +1,296 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Production seam for the Anthropic adapter's experimental `perMessageEffort` option (#6895).
|
|
3
|
+
*
|
|
4
|
+
* Off by default. With `providers.<name>.perMessageEffort: true` on an `anthropic`-adapter provider
|
|
5
|
+
* that sends to `api.anthropic.com` with an API key, a Codex conversation that changes reasoning
|
|
6
|
+
* effort keeps its top-level `output_config.effort` at the conversation's first value and carries
|
|
7
|
+
* each change as an effort-only system message, `{role: "system", content: [], output_config: {effort}}`,
|
|
8
|
+
* right before the user message of the turn that changed it, with the
|
|
9
|
+
* `mid-conversation-output-config-2026-07-01` beta. Earlier change points are re-sent at the same
|
|
10
|
+
* message index on every later turn, so the cached prefix stays byte-identical.
|
|
11
|
+
*
|
|
12
|
+
* The decision itself lives in `src/responses/effort-history.ts`. This file maps one request onto
|
|
13
|
+
* it (scope, lineage, receipt, emitted fields), applies a "send" decision to the wire body, and
|
|
14
|
+
* settles the pending slot when the turn completes or fails. Every request the module answers
|
|
15
|
+
* "off" is sent byte-for-byte as it would be without the option.
|
|
16
|
+
*
|
|
17
|
+
* Owner: structure/providers/anthropic-per-message-effort.md.
|
|
18
|
+
*/
|
|
19
|
+
import { codexLineageScopeKey } from "../../codex/lineage";
|
|
20
|
+
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
21
|
+
import { mergeAnthropicBetaHeader } from "../../providers/anthropic-fast";
|
|
22
|
+
import { SUMMARY_PREFIX } from "../../responses/compaction";
|
|
23
|
+
import {
|
|
24
|
+
abandon,
|
|
25
|
+
commit,
|
|
26
|
+
createStore,
|
|
27
|
+
decide,
|
|
28
|
+
hash,
|
|
29
|
+
kindOf,
|
|
30
|
+
lineageFromMetadata,
|
|
31
|
+
rejectUpstream,
|
|
32
|
+
type EffortHistoryDecision,
|
|
33
|
+
type EffortHistoryRequest,
|
|
34
|
+
type EffortHistoryStore,
|
|
35
|
+
} from "../../responses/effort-history";
|
|
36
|
+
import type { OcxParsedRequest, OcxProviderConfig, PerMessageEffortTurn } from "../../types";
|
|
37
|
+
import type { IncomingMeta } from "../base";
|
|
38
|
+
|
|
39
|
+
export const PER_MESSAGE_EFFORT_BETA = "mid-conversation-output-config-2026-07-01";
|
|
40
|
+
const TURN_METADATA = "x-codex-turn-metadata";
|
|
41
|
+
// The only credential generation an API key has: a rotated key is a different credential hash.
|
|
42
|
+
const KEY_GENERATION = "key";
|
|
43
|
+
const NEW_INPUT_KINDS = new Set(["user", "tool_result", "developer", "configuration_update"]);
|
|
44
|
+
|
|
45
|
+
type Rec = Record<string, unknown>;
|
|
46
|
+
const isRec = (value: unknown): value is Rec => value !== null && typeof value === "object" && !Array.isArray(value);
|
|
47
|
+
|
|
48
|
+
let store: EffortHistoryStore = createStore();
|
|
49
|
+
|
|
50
|
+
/** The process store. Tests only. */
|
|
51
|
+
export function perMessageEffortStoreForTests(): EffortHistoryStore {
|
|
52
|
+
return store;
|
|
53
|
+
}
|
|
54
|
+
/** Start from an empty store. Tests only. */
|
|
55
|
+
export function resetPerMessageEffortStoreForTests(): void {
|
|
56
|
+
store = createStore();
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Whether Codex's own turn metadata for THIS request says the conversation is new
|
|
61
|
+
* (`history_initialization: "New"`). Over HTTP that is the request's `x-codex-turn-metadata` header.
|
|
62
|
+
* Over WebSocket only the frame's own `client_metadata` copy counts: the upgrade header describes
|
|
63
|
+
* the turn that opened the socket, not this one.
|
|
64
|
+
*/
|
|
65
|
+
export function codexTurnStartsNewHistory(body: unknown, headers: Headers, transport?: "websocket"): boolean {
|
|
66
|
+
if (transport === "websocket") {
|
|
67
|
+
const client = isRec(body) && isRec(body.client_metadata) ? body.client_metadata : undefined;
|
|
68
|
+
return client !== undefined && Object.hasOwn(client, TURN_METADATA) && lineageFromMetadata(client[TURN_METADATA]);
|
|
69
|
+
}
|
|
70
|
+
return lineageFromMetadata(headers.get(TURN_METADATA));
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** The raw input split into the history the client echoes and this turn's new input. */
|
|
74
|
+
export function splitTurnInput(input: readonly unknown[]): { parent: unknown[]; suffix: unknown[] } {
|
|
75
|
+
let start = input.length;
|
|
76
|
+
while (start > 0 && NEW_INPUT_KINDS.has(kindOf(input[start - 1]))) start--;
|
|
77
|
+
return { parent: input.slice(0, start), suffix: input.slice(start) };
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
function firstInputText(item: unknown): string | undefined {
|
|
81
|
+
if (!isRec(item)) return undefined;
|
|
82
|
+
if (typeof item.content === "string") return item.content;
|
|
83
|
+
if (!Array.isArray(item.content)) return undefined;
|
|
84
|
+
const first = item.content[0];
|
|
85
|
+
return isRec(first) && (first.type === "input_text" || first.type === "text") && typeof first.text === "string" ? first.text : undefined;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function firstWireText(message: Rec): string | undefined {
|
|
89
|
+
if (typeof message.content === "string") return message.content;
|
|
90
|
+
if (!Array.isArray(message.content)) return undefined;
|
|
91
|
+
const first = message.content[0];
|
|
92
|
+
return isRec(first) && first.type === "text" && typeof first.text === "string" ? first.text : undefined;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* The Anthropic `messages` index where this turn's effort message goes: the wire message that
|
|
97
|
+
* starts with this turn's user text. Only the trailing user-role run is searched, since this turn's
|
|
98
|
+
* input is user, tool-result and developer items. A user message merged behind other content, or
|
|
99
|
+
* one that starts with an image, has no such index and the change point is not placed.
|
|
100
|
+
*/
|
|
101
|
+
export function userMessageWireIndex(messages: readonly unknown[], suffix: readonly unknown[]): number | undefined {
|
|
102
|
+
const text = firstInputText(suffix.find(item => kindOf(item) === "user"));
|
|
103
|
+
if (text === undefined) return undefined;
|
|
104
|
+
for (let index = messages.length - 1; index >= 0; index--) {
|
|
105
|
+
const message = messages[index];
|
|
106
|
+
if (!isRec(message) || message.role !== "user") return undefined;
|
|
107
|
+
if (firstWireText(message) === text) return index;
|
|
108
|
+
}
|
|
109
|
+
return undefined;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
// Everything on the wire that does not move with effort. max_tokens and the emitted thinking
|
|
113
|
+
// field are compared on their own (rules 3b and 6).
|
|
114
|
+
function frameOf(body: Rec): string {
|
|
115
|
+
const { messages: _messages, max_tokens: _maxTokens, stream: _stream, thinking: _thinking, output_config: outputConfig, ...rest } = body;
|
|
116
|
+
const pinned = isRec(outputConfig) ? Object.fromEntries(Object.entries(outputConfig).filter(([key]) => key !== "effort")) : outputConfig;
|
|
117
|
+
return hash({ ...rest, output_config: pinned });
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
function destinationOf(url: string): string | undefined {
|
|
121
|
+
try {
|
|
122
|
+
return new URL(url).hostname;
|
|
123
|
+
} catch {
|
|
124
|
+
return undefined;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
/** A turn the option never serves, decided before the store is consulted. */
|
|
129
|
+
function outsideOption(parsed: OcxParsedRequest): boolean {
|
|
130
|
+
return parsed.stream !== true || parsed._advisorGuard !== undefined
|
|
131
|
+
|| parsed._compactionRequest === true || parsed._summaryProhibitsToolCalls === true
|
|
132
|
+
|| parsed._memoryModelPhase !== undefined;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Share one turn record across a hosted sidecar loop (web search, images, video) before its first
|
|
137
|
+
* build. Each iteration builds from a spread copy of the parsed request, so the copies hold this
|
|
138
|
+
* same record: the first build decides, a later iteration abandons the decision and is sent as
|
|
139
|
+
* today, and the loop's completion settles it.
|
|
140
|
+
*/
|
|
141
|
+
export function shareAnthropicPerMessageEffortTurn(parsed: OcxParsedRequest): void {
|
|
142
|
+
parsed._perMessageEffort ??= { builds: 0, generation: KEY_GENERATION };
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
export interface PerMessageEffortBuild {
|
|
146
|
+
provider: OcxProviderConfig;
|
|
147
|
+
parsed: OcxParsedRequest;
|
|
148
|
+
incoming?: IncomingMeta;
|
|
149
|
+
/** The finished wire body, mutated in place on a "send" decision. */
|
|
150
|
+
body: Rec;
|
|
151
|
+
headers: Record<string, string>;
|
|
152
|
+
url: string;
|
|
153
|
+
isOAuth: boolean;
|
|
154
|
+
chatLineage?: string;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
function requestFor(build: PerMessageEffortBuild, input: unknown[]): EffortHistoryRequest {
|
|
158
|
+
const { provider, parsed, incoming, body, url, isOAuth } = build;
|
|
159
|
+
const raw = parsed._rawBody as Rec;
|
|
160
|
+
const { parent, suffix } = splitTurnInput(input);
|
|
161
|
+
const outputConfig = isRec(body.output_config) ? body.output_config : undefined;
|
|
162
|
+
const messages = Array.isArray(body.messages) ? body.messages : [];
|
|
163
|
+
return {
|
|
164
|
+
chatLineage: build.chatLineage,
|
|
165
|
+
scope: {
|
|
166
|
+
cohort: incoming ? codexLineageScopeKey(incoming.headers) : undefined,
|
|
167
|
+
provider: incoming?.providerName,
|
|
168
|
+
destination: destinationOf(url),
|
|
169
|
+
adapter: "anthropic",
|
|
170
|
+
model: typeof body.model === "string" ? body.model : undefined,
|
|
171
|
+
credential: typeof provider.apiKey === "string" && provider.apiKey ? hash(["credential", provider.apiKey]) : undefined,
|
|
172
|
+
authMode: isOAuth ? "oauth" : "apiKey",
|
|
173
|
+
},
|
|
174
|
+
parent,
|
|
175
|
+
suffix,
|
|
176
|
+
effort: typeof outputConfig?.effort === "string" ? outputConfig.effort : undefined,
|
|
177
|
+
thinking: body.thinking,
|
|
178
|
+
emittedMaxTokens: typeof body.max_tokens === "number" ? body.max_tokens : undefined,
|
|
179
|
+
frame: frameOf(body),
|
|
180
|
+
generation: KEY_GENERATION,
|
|
181
|
+
cacheControl: JSON.stringify(body).includes("\"cache_control\""),
|
|
182
|
+
stripped: parsed._stripReasoningEncryptedContent === true,
|
|
183
|
+
transport: "http",
|
|
184
|
+
apiKind: parsed._anthropicInbound === true || parsed._chatCompletionsInput === true ? "messages" : "responses",
|
|
185
|
+
previousResponseId: raw.previous_response_id ?? (parsed._previousResponseInputExpanded === true ? true : undefined),
|
|
186
|
+
compactionSummary: suffix.some(item => kindOf(item) === "user" && firstInputText(item)?.startsWith(SUMMARY_PREFIX) === true),
|
|
187
|
+
newTranscriptReceipt: parsed._codexNewHistory === true,
|
|
188
|
+
changeWireIndex: userMessageWireIndex(messages, suffix),
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
function applySend(build: PerMessageEffortBuild, decision: Extract<EffortHistoryDecision, { action: "send" }>, userIndex: number | undefined): boolean {
|
|
193
|
+
const messages = build.body.messages;
|
|
194
|
+
if (!Array.isArray(messages)) return false;
|
|
195
|
+
const points = decision.changePoints ?? [];
|
|
196
|
+
// Every index must still name a user message, the indices must rise strictly in prefix order, and
|
|
197
|
+
// only this turn's own change point may sit at this turn's user message; otherwise nothing changes.
|
|
198
|
+
if (points.some((point, i) => !isRec(messages[point.wireIndex]) || (messages[point.wireIndex] as Rec).role !== "user"
|
|
199
|
+
|| (i > 0 && point.wireIndex <= points[i - 1].wireIndex))) return false;
|
|
200
|
+
if (userIndex !== undefined && points.some(point => point === decision.insert ? point.wireIndex !== userIndex : point.wireIndex >= userIndex)) return false;
|
|
201
|
+
for (const point of [...points].reverse()) {
|
|
202
|
+
messages.splice(point.wireIndex, 0, { role: "system", content: [], output_config: { effort: point.effort } });
|
|
203
|
+
}
|
|
204
|
+
build.body.output_config = { ...(isRec(build.body.output_config) ? build.body.output_config : {}), effort: decision.anchorEffort };
|
|
205
|
+
mergeAnthropicBetaHeader(build.headers, [PER_MESSAGE_EFFORT_BETA]);
|
|
206
|
+
return true;
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
/**
|
|
210
|
+
* Decide this build and apply a "send" decision to `body` and `headers`. A second build of the same
|
|
211
|
+
* turn (a retry, rebuild or failover) abandons the first decision and is sent as today.
|
|
212
|
+
*/
|
|
213
|
+
export function applyAnthropicPerMessageEffort(build: PerMessageEffortBuild): void {
|
|
214
|
+
const { provider, parsed } = build;
|
|
215
|
+
const existing = parsed._perMessageEffort;
|
|
216
|
+
// Counted before the switch: a failover to a provider without the option is still a second build.
|
|
217
|
+
if (existing && existing.builds > 0) {
|
|
218
|
+
existing.builds += 1;
|
|
219
|
+
const token = existing.token;
|
|
220
|
+
existing.token = undefined;
|
|
221
|
+
if (token) abandon(store, token, { sent: true });
|
|
222
|
+
return;
|
|
223
|
+
}
|
|
224
|
+
if (existing) existing.builds = 1;
|
|
225
|
+
if (provider.perMessageEffort !== true) return;
|
|
226
|
+
const turn: PerMessageEffortTurn = existing ?? { builds: 1, generation: KEY_GENERATION };
|
|
227
|
+
parsed._perMessageEffort = turn;
|
|
228
|
+
if (outsideOption(parsed) || !isRec(parsed._rawBody) || !Array.isArray(parsed._rawBody.input)) return;
|
|
229
|
+
let request: EffortHistoryRequest;
|
|
230
|
+
try {
|
|
231
|
+
request = requestFor(build, parsed._rawBody.input);
|
|
232
|
+
} catch {
|
|
233
|
+
// Mapping the build failed (for example a pathologically deep body): off, sent as today.
|
|
234
|
+
return;
|
|
235
|
+
}
|
|
236
|
+
const decision = decide(store, request, {
|
|
237
|
+
enabled: true,
|
|
238
|
+
activated: true,
|
|
239
|
+
websocketHeaderRead: true,
|
|
240
|
+
compactionMarkerIdentified: true,
|
|
241
|
+
});
|
|
242
|
+
if (decision.action !== "send") return;
|
|
243
|
+
if (!applySend(build, decision, request.changeWireIndex)) {
|
|
244
|
+
abandon(store, decision.pendingToken, { sent: false });
|
|
245
|
+
return;
|
|
246
|
+
}
|
|
247
|
+
turn.token = decision.pendingToken;
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
/**
|
|
251
|
+
* Settle the turn at its terminal response: a completed Anthropic turn commits with its output
|
|
252
|
+
* items and the cache counters on the response's own usage; anything else deletes the pending slot.
|
|
253
|
+
*/
|
|
254
|
+
export function settleAnthropicPerMessageEffort(parsed: OcxParsedRequest, response: Rec, adapterName: string): void {
|
|
255
|
+
const turn = parsed._perMessageEffort;
|
|
256
|
+
const token = turn?.token;
|
|
257
|
+
if (!turn || !token) return;
|
|
258
|
+
turn.token = undefined;
|
|
259
|
+
if (response.status !== "completed" || turn.builds !== 1 || adapterName !== "anthropic") {
|
|
260
|
+
abandon(store, token, { sent: true });
|
|
261
|
+
return;
|
|
262
|
+
}
|
|
263
|
+
// The completed response's usage: cached_tokens is the cache read, cache_write_tokens the creation.
|
|
264
|
+
const usage = isRec(response.usage) && isRec(response.usage.input_tokens_details) ? response.usage.input_tokens_details : {};
|
|
265
|
+
const read = typeof usage.cached_tokens === "number" ? usage.cached_tokens : 0;
|
|
266
|
+
const write = typeof usage.cache_write_tokens === "number" ? usage.cache_write_tokens : 0;
|
|
267
|
+
commit(store, token, {
|
|
268
|
+
messageStop: true,
|
|
269
|
+
cacheRead: read,
|
|
270
|
+
P: read + write,
|
|
271
|
+
outputItems: Array.isArray(response.output) ? response.output : undefined,
|
|
272
|
+
generation: turn.generation,
|
|
273
|
+
});
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
/**
|
|
277
|
+
* An upstream error for a turn that holds a pending slot: the slot is deleted, and the documented
|
|
278
|
+
* model-unsupported 400 marks the model and destination unsupported. Nothing is resent here.
|
|
279
|
+
*/
|
|
280
|
+
export async function rejectAnthropicPerMessageEffort(parsed: OcxParsedRequest, response: Response, signal?: AbortSignal): Promise<void> {
|
|
281
|
+
const turn = parsed._perMessageEffort;
|
|
282
|
+
const token = turn?.token;
|
|
283
|
+
if (!turn || !token || response.ok) return;
|
|
284
|
+
turn.token = undefined;
|
|
285
|
+
let errorText = "";
|
|
286
|
+
if (response.status === 400) {
|
|
287
|
+
try {
|
|
288
|
+
const body = await readBoundedResponseBody(response.clone(), { signal });
|
|
289
|
+
if (body.displaySafe && !body.truncated) errorText = body.text;
|
|
290
|
+
} catch {
|
|
291
|
+
// An unreadable body is an unclassified 400: the slot is still deleted, no capability record.
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
rejectUpstream(store, token, { status: response.status, errorText });
|
|
295
|
+
}
|
|
296
|
+
|
|
@@ -41,6 +41,8 @@ import { resolveReasoningCapabilities } from "../providers/reasoning-capabilitie
|
|
|
41
41
|
import { declaresThinkingToggleWire, reasoningControlsAreUnsupported } from "./reasoning-controls";
|
|
42
42
|
import { applyAgentRouterLanguageFraming, isAgentRouterEndpoint } from "./agentrouter";
|
|
43
43
|
import { anthropicCacheWrite1hTokens, resolveAnthropicCacheRetention, type AnthropicCacheRetention } from "./anthropic/cache-retention";
|
|
44
|
+
import { advisorServerExchange, advisorServerToolDestination, planAnthropicServerTools } from "./anthropic/advisor-tool";
|
|
45
|
+
import { applyAnthropicPerMessageEffort } from "./anthropic/per-message-effort";
|
|
44
46
|
import { claudeFamilyVersion, rejectsCombinedSampling, rejectsForcedToolChoice, rejectsSamplingParameters, supportsExplicitThinkingDisable, usesAdaptiveThinking, usesBetweenToolsFloor } from "./anthropic-model-contract";
|
|
45
47
|
|
|
46
48
|
/** Map a user content part to an Anthropic content block (text or image source). */
|
|
@@ -958,13 +960,14 @@ function toolsToAnthropicFormat(parsed: OcxParsedRequest, toolNames: { toWire: (
|
|
|
958
960
|
}
|
|
959
961
|
|
|
960
962
|
/**
|
|
961
|
-
* Appends the Claude client's typed
|
|
962
|
-
* them server-side. A same-named function tool
|
|
963
|
-
*
|
|
963
|
+
* Appends the Claude client's typed server tools this destination receives
|
|
964
|
+
* (`planAnthropicServerTools`) so Anthropic runs them server-side. A same-named function tool
|
|
965
|
+
* wins: the web-search sidecar's `web_search` and the proxy Advisor's `advisor` keep priority,
|
|
966
|
+
* and Anthropic rejects duplicate tool names.
|
|
964
967
|
*/
|
|
965
|
-
function withAnthropicServerTools(tools: unknown[] | undefined, parsed: OcxParsedRequest): unknown[] | undefined {
|
|
966
|
-
const serverTools =
|
|
967
|
-
if (!serverTools
|
|
968
|
+
function withAnthropicServerTools(tools: unknown[] | undefined, parsed: OcxParsedRequest, declared: readonly Record<string, unknown>[]): unknown[] | undefined {
|
|
969
|
+
const serverTools = declared.filter(t => !parsed.context.tools?.some(f => f.name === t.name));
|
|
970
|
+
if (!serverTools.length) return tools;
|
|
968
971
|
// The caller's breakpoints are dropped on this lane; applyPromptCaching places its own.
|
|
969
972
|
return [...(tools ?? []), ...serverTools.map(t => ({ ...t, cache_control: undefined }))];
|
|
970
973
|
}
|
|
@@ -1048,9 +1051,12 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1048
1051
|
throw new Error("anthropic provider requires a non-empty apiKey (authMode: key)");
|
|
1049
1052
|
}
|
|
1050
1053
|
|
|
1051
|
-
// Only api.anthropic.com runs Anthropic's
|
|
1054
|
+
// Only api.anthropic.com runs Anthropic's web tools, so only it gets their history back; the
|
|
1055
|
+
// Advisor also reaches a gateway that opted in with forwardAdvisorTool (advisor-tool.ts).
|
|
1056
|
+
const serverToolPlan = planAnthropicServerTools(provider, parsed._anthropicServerTools, parsed._anthropicServerReplay,
|
|
1057
|
+
new Set(parsed.context.tools?.map(tool => tool.name)), usesNativeAnthropicEndpoint(provider));
|
|
1052
1058
|
const { system, messages } = messagesToAnthropicFormat(parsed, toolNames,
|
|
1053
|
-
|
|
1059
|
+
serverToolPlan.replay);
|
|
1054
1060
|
// Before image normalization, so the framing block is present for every downstream pass.
|
|
1055
1061
|
if (isAgentRouterEndpoint(provider.baseUrl)) applyAgentRouterLanguageFraming(messages);
|
|
1056
1062
|
// Primary image layer: resize/re-encode to fit Anthropic limits without dropping
|
|
@@ -1065,7 +1071,7 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1065
1071
|
enforceAnthropicImageLimits(messages);
|
|
1066
1072
|
const converted = toolsToAnthropicFormat(parsed, toolNames);
|
|
1067
1073
|
// A third-party Anthropic-compatible endpoint may not implement Anthropic's server tools.
|
|
1068
|
-
const tools =
|
|
1074
|
+
const tools = withAnthropicServerTools(converted, parsed, serverToolPlan.declared);
|
|
1069
1075
|
|
|
1070
1076
|
// Codex never sends `max_output_tokens`, so the omitted-limit default decides how
|
|
1071
1077
|
// long a Claude answer may run. Honor the provider's configured output budget
|
|
@@ -1300,7 +1306,7 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1300
1306
|
if (isOAuth) applyAnthropicOAuthAuth(headers, provider.apiKey, resolveTranslatedAnthropicSessionKey(parsed, incoming));
|
|
1301
1307
|
else applyAnthropicKeyAuth(headers, provider);
|
|
1302
1308
|
if (provider.headers) Object.assign(headers, provider.headers);
|
|
1303
|
-
mergeAnthropicBetaHeader(headers, [...(fastSpeed?.betas ?? []), ...(progressUpdates ? ["thinking-display-updates-2026-08-18"] : [])]);
|
|
1309
|
+
mergeAnthropicBetaHeader(headers, [...(fastSpeed?.betas ?? []), ...(progressUpdates ? ["thinking-display-updates-2026-08-18"] : []), ...serverToolPlan.betas]);
|
|
1304
1310
|
|
|
1305
1311
|
// Prompt caching: native Anthropic supports top-level automatic caching, which
|
|
1306
1312
|
// follows the moving final block across turns. Keep one breakpoint slot free for it.
|
|
@@ -1315,6 +1321,8 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1315
1321
|
});
|
|
1316
1322
|
enforceCacheControlLimit(body, explicitLimit);
|
|
1317
1323
|
normalizeTtlOrdering(body);
|
|
1324
|
+
// Experimental, default off (#6895): pin the top-level effort and carry changes as effort messages.
|
|
1325
|
+
applyAnthropicPerMessageEffort({ provider, parsed, incoming, body, headers, url, isOAuth, chatLineage: resolveTranslatedAnthropicSessionKey(parsed, incoming) });
|
|
1318
1326
|
|
|
1319
1327
|
const request = {
|
|
1320
1328
|
url,
|
|
@@ -1354,8 +1362,8 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1354
1362
|
let pendingStopReason: string | undefined;
|
|
1355
1363
|
let emittedDone = false;
|
|
1356
1364
|
let sawVisibleText = false;
|
|
1357
|
-
/** The open server-side web_search / web_fetch call, until its result block. */
|
|
1358
|
-
let serverSearch: { id: string; json: string; streaming: boolean } | undefined;
|
|
1365
|
+
/** The open server-side web_search / web_fetch / advisor call, until its result block. */
|
|
1366
|
+
let serverSearch: { id: string; name: string; json: string; streaming: boolean } | undefined;
|
|
1359
1367
|
|
|
1360
1368
|
const emitDone = function* (): Generator<AdapterEvent> {
|
|
1361
1369
|
if (emittedDone) return;
|
|
@@ -1447,11 +1455,23 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1447
1455
|
budget.openCall(currentToolCallId);
|
|
1448
1456
|
yield { type: "tool_call_start", id: currentToolCallId, name: currentToolCallName };
|
|
1449
1457
|
}
|
|
1450
|
-
if (block.type === "server_tool_use" && (block.name === "web_search" || block.name === "web_fetch") && typeof block.id === "string") {
|
|
1458
|
+
if (block.type === "server_tool_use" && (block.name === "web_search" || block.name === "web_fetch" || block.name === "advisor") && typeof block.id === "string") {
|
|
1451
1459
|
// Only the input (query / url) is collected here (input_json_delta below). The cell
|
|
1452
1460
|
// opens at its result: a call Anthropic defers beside a client tool_use has
|
|
1453
1461
|
// no result in this response and must not surface as a completed search.
|
|
1454
|
-
serverSearch = { id: block.id, json: "", streaming: true };
|
|
1462
|
+
serverSearch = { id: block.id, name: block.name, json: "", streaming: true };
|
|
1463
|
+
}
|
|
1464
|
+
if (block.type === "advisor_tool_result") {
|
|
1465
|
+
// The Advisor rides the same lane: both blocks verbatim, keyed by the upstream srvtoolu_ id.
|
|
1466
|
+
// Only a destination that receives the Advisor may surface one, so a gateway never sent
|
|
1467
|
+
// it cannot plant an exchange that a later first-party turn would replay.
|
|
1468
|
+
const exchange = advisorServerToolDestination(provider)
|
|
1469
|
+
? advisorServerExchange(serverSearch, block as Record<string, unknown>) : undefined;
|
|
1470
|
+
if (!exchange) break;
|
|
1471
|
+
yield { type: "web_search_call_begin", id: exchange.blocks.use.id as string };
|
|
1472
|
+
yield { type: "web_search_call_end", id: exchange.blocks.use.id as string, queries: [],
|
|
1473
|
+
status: exchange.completed ? "completed" : "failed", anthropic: exchange.blocks };
|
|
1474
|
+
serverSearch = undefined;
|
|
1455
1475
|
}
|
|
1456
1476
|
if ((block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result") && typeof block.tool_use_id === "string") {
|
|
1457
1477
|
// The begin/end pair the sidecar emits, plus both blocks verbatim so the Claude client holds a
|