@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
|
@@ -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)) {
|
|
@@ -41,6 +41,7 @@ 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";
|
|
44
45
|
import { claudeFamilyVersion, rejectsCombinedSampling, rejectsForcedToolChoice, rejectsSamplingParameters, supportsExplicitThinkingDisable, usesAdaptiveThinking, usesBetweenToolsFloor } from "./anthropic-model-contract";
|
|
45
46
|
|
|
46
47
|
/** Map a user content part to an Anthropic content block (text or image source). */
|
|
@@ -958,13 +959,14 @@ function toolsToAnthropicFormat(parsed: OcxParsedRequest, toolNames: { toWire: (
|
|
|
958
959
|
}
|
|
959
960
|
|
|
960
961
|
/**
|
|
961
|
-
* Appends the Claude client's typed
|
|
962
|
-
* them server-side. A same-named function tool
|
|
963
|
-
*
|
|
962
|
+
* Appends the Claude client's typed server tools this destination receives
|
|
963
|
+
* (`planAnthropicServerTools`) so Anthropic runs them server-side. A same-named function tool
|
|
964
|
+
* wins: the web-search sidecar's `web_search` and the proxy Advisor's `advisor` keep priority,
|
|
965
|
+
* and Anthropic rejects duplicate tool names.
|
|
964
966
|
*/
|
|
965
|
-
function withAnthropicServerTools(tools: unknown[] | undefined, parsed: OcxParsedRequest): unknown[] | undefined {
|
|
966
|
-
const serverTools =
|
|
967
|
-
if (!serverTools
|
|
967
|
+
function withAnthropicServerTools(tools: unknown[] | undefined, parsed: OcxParsedRequest, declared: readonly Record<string, unknown>[]): unknown[] | undefined {
|
|
968
|
+
const serverTools = declared.filter(t => !parsed.context.tools?.some(f => f.name === t.name));
|
|
969
|
+
if (!serverTools.length) return tools;
|
|
968
970
|
// The caller's breakpoints are dropped on this lane; applyPromptCaching places its own.
|
|
969
971
|
return [...(tools ?? []), ...serverTools.map(t => ({ ...t, cache_control: undefined }))];
|
|
970
972
|
}
|
|
@@ -1048,9 +1050,12 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1048
1050
|
throw new Error("anthropic provider requires a non-empty apiKey (authMode: key)");
|
|
1049
1051
|
}
|
|
1050
1052
|
|
|
1051
|
-
// Only api.anthropic.com runs Anthropic's
|
|
1053
|
+
// Only api.anthropic.com runs Anthropic's web tools, so only it gets their history back; the
|
|
1054
|
+
// Advisor also reaches a gateway that opted in with forwardAdvisorTool (advisor-tool.ts).
|
|
1055
|
+
const serverToolPlan = planAnthropicServerTools(provider, parsed._anthropicServerTools, parsed._anthropicServerReplay,
|
|
1056
|
+
new Set(parsed.context.tools?.map(tool => tool.name)), usesNativeAnthropicEndpoint(provider));
|
|
1052
1057
|
const { system, messages } = messagesToAnthropicFormat(parsed, toolNames,
|
|
1053
|
-
|
|
1058
|
+
serverToolPlan.replay);
|
|
1054
1059
|
// Before image normalization, so the framing block is present for every downstream pass.
|
|
1055
1060
|
if (isAgentRouterEndpoint(provider.baseUrl)) applyAgentRouterLanguageFraming(messages);
|
|
1056
1061
|
// Primary image layer: resize/re-encode to fit Anthropic limits without dropping
|
|
@@ -1065,7 +1070,7 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1065
1070
|
enforceAnthropicImageLimits(messages);
|
|
1066
1071
|
const converted = toolsToAnthropicFormat(parsed, toolNames);
|
|
1067
1072
|
// A third-party Anthropic-compatible endpoint may not implement Anthropic's server tools.
|
|
1068
|
-
const tools =
|
|
1073
|
+
const tools = withAnthropicServerTools(converted, parsed, serverToolPlan.declared);
|
|
1069
1074
|
|
|
1070
1075
|
// Codex never sends `max_output_tokens`, so the omitted-limit default decides how
|
|
1071
1076
|
// long a Claude answer may run. Honor the provider's configured output budget
|
|
@@ -1300,7 +1305,7 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1300
1305
|
if (isOAuth) applyAnthropicOAuthAuth(headers, provider.apiKey, resolveTranslatedAnthropicSessionKey(parsed, incoming));
|
|
1301
1306
|
else applyAnthropicKeyAuth(headers, provider);
|
|
1302
1307
|
if (provider.headers) Object.assign(headers, provider.headers);
|
|
1303
|
-
mergeAnthropicBetaHeader(headers, [...(fastSpeed?.betas ?? []), ...(progressUpdates ? ["thinking-display-updates-2026-08-18"] : [])]);
|
|
1308
|
+
mergeAnthropicBetaHeader(headers, [...(fastSpeed?.betas ?? []), ...(progressUpdates ? ["thinking-display-updates-2026-08-18"] : []), ...serverToolPlan.betas]);
|
|
1304
1309
|
|
|
1305
1310
|
// Prompt caching: native Anthropic supports top-level automatic caching, which
|
|
1306
1311
|
// follows the moving final block across turns. Keep one breakpoint slot free for it.
|
|
@@ -1354,8 +1359,8 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1354
1359
|
let pendingStopReason: string | undefined;
|
|
1355
1360
|
let emittedDone = false;
|
|
1356
1361
|
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;
|
|
1362
|
+
/** The open server-side web_search / web_fetch / advisor call, until its result block. */
|
|
1363
|
+
let serverSearch: { id: string; name: string; json: string; streaming: boolean } | undefined;
|
|
1359
1364
|
|
|
1360
1365
|
const emitDone = function* (): Generator<AdapterEvent> {
|
|
1361
1366
|
if (emittedDone) return;
|
|
@@ -1447,11 +1452,23 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
|
|
|
1447
1452
|
budget.openCall(currentToolCallId);
|
|
1448
1453
|
yield { type: "tool_call_start", id: currentToolCallId, name: currentToolCallName };
|
|
1449
1454
|
}
|
|
1450
|
-
if (block.type === "server_tool_use" && (block.name === "web_search" || block.name === "web_fetch") && typeof block.id === "string") {
|
|
1455
|
+
if (block.type === "server_tool_use" && (block.name === "web_search" || block.name === "web_fetch" || block.name === "advisor") && typeof block.id === "string") {
|
|
1451
1456
|
// Only the input (query / url) is collected here (input_json_delta below). The cell
|
|
1452
1457
|
// opens at its result: a call Anthropic defers beside a client tool_use has
|
|
1453
1458
|
// no result in this response and must not surface as a completed search.
|
|
1454
|
-
serverSearch = { id: block.id, json: "", streaming: true };
|
|
1459
|
+
serverSearch = { id: block.id, name: block.name, json: "", streaming: true };
|
|
1460
|
+
}
|
|
1461
|
+
if (block.type === "advisor_tool_result") {
|
|
1462
|
+
// The Advisor rides the same lane: both blocks verbatim, keyed by the upstream srvtoolu_ id.
|
|
1463
|
+
// Only a destination that receives the Advisor may surface one, so a gateway never sent
|
|
1464
|
+
// it cannot plant an exchange that a later first-party turn would replay.
|
|
1465
|
+
const exchange = advisorServerToolDestination(provider)
|
|
1466
|
+
? advisorServerExchange(serverSearch, block as Record<string, unknown>) : undefined;
|
|
1467
|
+
if (!exchange) break;
|
|
1468
|
+
yield { type: "web_search_call_begin", id: exchange.blocks.use.id as string };
|
|
1469
|
+
yield { type: "web_search_call_end", id: exchange.blocks.use.id as string, queries: [],
|
|
1470
|
+
status: exchange.completed ? "completed" : "failed", anthropic: exchange.blocks };
|
|
1471
|
+
serverSearch = undefined;
|
|
1455
1472
|
}
|
|
1456
1473
|
if ((block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result") && typeof block.tool_use_id === "string") {
|
|
1457
1474
|
// The begin/end pair the sidecar emits, plus both blocks verbatim so the Claude client holds a
|
|
@@ -88,8 +88,9 @@ const ANTIGRAVITY_IDE_PLATFORM = "windows/amd64";
|
|
|
88
88
|
* Must be the IDE client family (`antigravity/ide/...`): Cloud Code Assist backend gates
|
|
89
89
|
* newer agent models (e.g. `gemini-3.7-flash`) by User-Agent and answers 404 NOT_FOUND to
|
|
90
90
|
* CLI-shaped UAs even with a valid OAuth token. Only `antigravity/ide/<ver>` unlocks them.
|
|
91
|
-
* The
|
|
92
|
-
*
|
|
91
|
+
* The exception is Gemini 4 Argon and Carbon, which CCA was observed to serve ONLY to the CLI
|
|
92
|
+
* family. The CLI rule matches the whole Gemini 4 generation in anticipation: Hydrogen has not been
|
|
93
|
+
* seen on CCA, so its client requirement is unverified. See `antigravityCliUserAgent`.
|
|
93
94
|
* A `GOOGLE_ANTIGRAVITY_USER_AGENT` override (set by the caller) takes precedence upstream.
|
|
94
95
|
*/
|
|
95
96
|
export function antigravityUserAgent(version = ANTIGRAVITY_IDE_VERSION, authMethod = "oauth"): string {
|
|
@@ -109,9 +110,10 @@ const ANTIGRAVITY_CLI_PLATFORM = "darwin/arm64";
|
|
|
109
110
|
* `antigravity/cli/${version} (os_type=${osType}; arch=${arch}; aidev_client; auth_method=oauth)`.
|
|
110
111
|
*
|
|
111
112
|
* Verified 2026-10-14 against live CCA: `gemini-4-argon-{low,medium,high}` answer only to this
|
|
112
|
-
* family and return 404 "Requested entity was not found" to the IDE UA above
|
|
113
|
+
* family and return 404 "Requested entity was not found" to the IDE UA above (2026-11-11:
|
|
114
|
+
* `gemini-4-carbon-*` behaves the same), while
|
|
113
115
|
* `gemini-3.7-flash-tiered` and `gemini-3.1-pro-low` 404 under this one. So it is used ONLY for
|
|
114
|
-
*
|
|
116
|
+
* Gemini 4 requests, model discovery and the quota summary (whose Argon group is likewise CLI-only),
|
|
115
117
|
* never as a general replacement for the IDE UA.
|
|
116
118
|
*
|
|
117
119
|
* `GOOGLE_ANTIGRAVITY_USER_AGENT` deliberately does not apply here: that override names the IDE
|
|
@@ -286,6 +286,23 @@ export function cursorNeedsExternalToolContinuation(modelId: string): boolean {
|
|
|
286
286
|
return wire === "composer-2.5" || wire === "composer-2.5-fast";
|
|
287
287
|
}
|
|
288
288
|
|
|
289
|
+
/**
|
|
290
|
+
* Models whose tool results are replayed as model-visible root text: every external-continuation
|
|
291
|
+
* model, plus the Auto router (wire `default`, any routing level), which still continues with a
|
|
292
|
+
* bare resumeAction.
|
|
293
|
+
*
|
|
294
|
+
* Auto builds its prompt from `rootPromptMessagesJson`; with the result only on `turns[]` it
|
|
295
|
+
* asked to run the same successful command again instead of answering (#8538). Replaying it once
|
|
296
|
+
* taught Auto to echo the `[Tool Result]` envelope as chat (#2317), so everything gated on this
|
|
297
|
+
* predicate also arms the mid-stream envelope strip and next-turn remint (src/adapters/cursor.ts).
|
|
298
|
+
* Checkpoint retention keeps {@link cursorNeedsExternalToolContinuation}: Auto's checkpoint still
|
|
299
|
+
* carries the pending tool state that full replay does not rebuild.
|
|
300
|
+
*/
|
|
301
|
+
export function cursorReplaysToolResultInRoot(modelId: string): boolean {
|
|
302
|
+
if (cursorNeedsExternalToolContinuation(modelId)) return true;
|
|
303
|
+
return stripCursorEffortSuffix(cursorCodexToWireModelId(modelId).trim().toLowerCase()) === CURSOR_AUTO_WIRE_MODEL_ID;
|
|
304
|
+
}
|
|
305
|
+
|
|
289
306
|
function stripCursorEffortSuffix(wireModelId: string): string {
|
|
290
307
|
const suffixes = [...CANONICAL_EFFORT_SUFFIXES].sort((a, b) => b.length - a.length);
|
|
291
308
|
for (const suffix of suffixes) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import { withoutSupervisorMarkers } from "../../lib/supervisor-markers";
|
|
2
3
|
import { shellInvocation } from "../../lib/win-exec";
|
|
3
4
|
import { create } from "@bufbuild/protobuf";
|
|
4
5
|
import {
|
|
@@ -120,7 +121,7 @@ function runExternalJson(command: string, payload: unknown, config: DesktopExecu
|
|
|
120
121
|
const inv = shellInvocation(command);
|
|
121
122
|
const child = spawn(inv.file, inv.args, {
|
|
122
123
|
cwd: config.cwd,
|
|
123
|
-
env: config.env ? { ...process.env, ...config.env } : process.env,
|
|
124
|
+
env: withoutSupervisorMarkers(config.env ? { ...process.env, ...config.env } : process.env),
|
|
124
125
|
stdio: ["pipe", "pipe", "pipe"],
|
|
125
126
|
...inv.options,
|
|
126
127
|
});
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
|
|
2
|
+
import { withoutSupervisorMarkers } from "../../lib/supervisor-markers";
|
|
2
3
|
import { resolve } from "node:path";
|
|
3
4
|
import { foregroundShellUnavailableMessage, runForegroundShell, type CursorForegroundShellOwner } from "./native-foreground-shell";
|
|
4
5
|
import { create } from "@bufbuild/protobuf";
|
|
@@ -430,7 +431,7 @@ export function backgroundShellSpawnExec(execMsg: ExecServerMessage, sessionId:
|
|
|
430
431
|
if (!admissionLease) return backgroundShellSpawnError(execMsg, args.command, cwd, "background shell limit reached");
|
|
431
432
|
let child: ChildProcessWithoutNullStreams;
|
|
432
433
|
try {
|
|
433
|
-
child = backgroundShellRuntime.spawn(args.command, { cwd, shell: true });
|
|
434
|
+
child = backgroundShellRuntime.spawn(args.command, { cwd, shell: true, env: withoutSupervisorMarkers(process.env) });
|
|
434
435
|
} catch (err) {
|
|
435
436
|
admissionLease.release();
|
|
436
437
|
return backgroundShellSpawnError(execMsg, args.command, cwd, errorText(err));
|
|
@@ -57,7 +57,7 @@ import { OCX_RESPONSES_TOOL_PROVIDER } from "./tool-definitions";
|
|
|
57
57
|
import { CODEX_UNIFIED_EXEC_TOOL, cursorRequestHasExecutionPath, cursorRequestHasShellAlias, cursorRequestUsesCodeMode, cursorToolWireName } from "./tool-naming";
|
|
58
58
|
import { CODE_MODE_RESULT_ECHO_SENTENCE } from "../exec-tool-result-normalize";
|
|
59
59
|
import type { OcxTool } from "../../types";
|
|
60
|
-
import { cursorPlainNativeExecFallback, cursorPlainNativeExecRedirectHint, cursorUsesPlainToolWording } from "./tool-wording";
|
|
60
|
+
import { CURSOR_DEFERRED_TOOL_FALLBACK, cursorPlainNativeExecFallback, cursorPlainNativeExecRedirectHint, cursorUsesPlainToolWording } from "./tool-wording";
|
|
61
61
|
|
|
62
62
|
export type CursorNativeExecDeps = CursorNativeNetworkDeps & CursorNativeToolDeps;
|
|
63
63
|
|
|
@@ -135,7 +135,8 @@ export function cursorNativeExecRedirectHint(
|
|
|
135
135
|
function cursorCodeModeExecRedirectHint(): string {
|
|
136
136
|
return (
|
|
137
137
|
`Re-issue this operation NOW through the \`${CODEX_UNIFIED_EXEC_TOOL}\` tool: this turn uses Codex code mode, so \`${CODEX_UNIFIED_EXEC_TOOL}\` takes a JavaScript body and shell, file, search, and fetch are nested helpers called INSIDE that body as \`await tools.<name>(...)\`, for example \`text(await tools.exec_command({cmd: "ls"}))\`. `
|
|
138
|
-
+ "Cursor-native Read/Glob/Grep/LS/Shell/Write/Fetch are not part of this request's catalog; do not retry them, and do not call `shell_command` or `exec_command` at the top level here — code mode exposes no bare shell bridge, only the nested helpers. Every other tool this turn lists
|
|
138
|
+
+ "Cursor-native Read/Glob/Grep/LS/Shell/Write/Fetch are not part of this request's catalog; do not retry them, and do not call `shell_command` or `exec_command` at the top level here — code mode exposes no bare shell bridge, only the nested helpers. Every other tool this turn lists is called directly, outside `exec`, as usual. "
|
|
139
|
+
+ CURSOR_DEFERRED_TOOL_FALLBACK + " "
|
|
139
140
|
+ CODE_MODE_RESULT_ECHO_SENTENCE + " "
|
|
140
141
|
+ `Do NOT narrate this redirect, do NOT comment on tool availability, and do NOT re-announce the task — just make the \`${CODEX_UNIFIED_EXEC_TOOL}\` call.`
|
|
141
142
|
);
|
|
@@ -6,7 +6,7 @@ import { namespacedToolName } from "../../types";
|
|
|
6
6
|
import type { CursorRunRequest } from "./types";
|
|
7
7
|
import { cursorStructuredOutputInstructions } from "./structured-output";
|
|
8
8
|
import { decodeCursorCallId } from "./call-id";
|
|
9
|
-
import { cursorCheckpointModelAffinityId, cursorNeedsExternalToolContinuation, isCursorExternalWireModel } from "./discovery";
|
|
9
|
+
import { cursorCheckpointModelAffinityId, cursorNeedsExternalToolContinuation, cursorReplaysToolResultInRoot, isCursorExternalWireModel } from "./discovery";
|
|
10
10
|
import { stripAssistantEchoedToolEnvelope } from "./envelope-echo";
|
|
11
11
|
import { normalizeCursorToolResultText } from "./tool-result-normalize";
|
|
12
12
|
import { debugProviderDiagnostic } from "../../lib/debug";
|
|
@@ -247,9 +247,9 @@ function assistantRootText(
|
|
|
247
247
|
// so prior history must be replayed here or a ResumeAction has nothing model-visible to continue from.
|
|
248
248
|
// The active user message is excluded because it travels in the action. When the continuation cannot
|
|
249
249
|
// rely on native MCP turn state, tool results stay assistant-role text with a [Tool Result] /
|
|
250
|
-
// [Tool Error] marker so Cursor does not wrap them as `<user_query>` (#1992).
|
|
251
|
-
//
|
|
252
|
-
//
|
|
250
|
+
// [Tool Error] marker so Cursor does not wrap them as `<user_query>` (#1992). Other native resume
|
|
251
|
+
// models carry the paired MCP result on turns[] only; Auto gets the root text too (#8538) with the
|
|
252
|
+
// echo strip armed (cursorReplaysToolResultInRoot). Each entry is a SHA-256 blob ID.
|
|
253
253
|
function rootPromptMessages(
|
|
254
254
|
request: CursorRunRequest,
|
|
255
255
|
requestScope: CursorBlobRequestScopeToken,
|
|
@@ -321,7 +321,7 @@ function rootPromptMessages(
|
|
|
321
321
|
}
|
|
322
322
|
|
|
323
323
|
const externalModel = isCursorExternalWireModel(request.modelId);
|
|
324
|
-
const echoToolResultInRoot =
|
|
324
|
+
const echoToolResultInRoot = cursorReplaysToolResultInRoot(request.modelId);
|
|
325
325
|
// Replayed results name the invocation that produced them; without it the result is orphaned
|
|
326
326
|
// (devlog 260829 000_rca). Indexed once per request rather than rescanned per result.
|
|
327
327
|
const replayedCalls = echoToolResultInRoot ? (knownCalls ?? toolCallsByCallId(messages)) : undefined;
|
|
@@ -423,9 +423,9 @@ function rootPromptMessages(
|
|
|
423
423
|
// "[Tool Result]" envelope below, which carries the same information without a mimickable
|
|
424
424
|
// call template (devlog 260829 002_audit_round2).
|
|
425
425
|
} else if (message.role === "toolResult") {
|
|
426
|
-
//
|
|
427
|
-
// the
|
|
428
|
-
//
|
|
426
|
+
// Other native resume models receive the paired MCP result through turns[] only; Auto needs
|
|
427
|
+
// the text as well (#8538), and its envelope echo (#2317) is stripped and reminted in
|
|
428
|
+
// src/adapters/cursor.ts under the same predicate.
|
|
429
429
|
if (!echoToolResultInRoot) continue;
|
|
430
430
|
// #1920: the prefix must reflect the NORMALIZED error state (an empty
|
|
431
431
|
// node_repl result is an error even when the runtime said isError=false).
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { OcxRequestOptions, OcxTool } from "../../types";
|
|
2
|
-
import { CURSOR_TOOL_CALL_CONTINUATION, cursorUsesPlainToolWording } from "./tool-wording";
|
|
2
|
+
import { CURSOR_DEFERRED_TOOL_FALLBACK, CURSOR_TOOL_CALL_CONTINUATION, cursorUsesPlainToolWording } from "./tool-wording";
|
|
3
3
|
import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE } from "../exec-tool-result-normalize";
|
|
4
4
|
import { CODEX_SHELL_BRIDGE_TOOL_NAMES, CODEX_TOOL_SEARCH_TOOL, CODEX_UNIFIED_EXEC_TOOL, clientSemanticToolNameFromCursorWire, cursorRequestAdvertisesApplyPatch, cursorRequestHasExecutionPath, cursorRequestHasShellAlias, cursorRequestUsesCodeMode, cursorToolAllowedByChoice, cursorToolWireName, isBareCodexShellBridgeTool, isClaudeClientBareToolName, isCodexShellBridgeToolName, isCursorExecutionPathTool, isCursorStructuredEditToolName } from "./tool-naming";
|
|
5
5
|
|
|
@@ -199,14 +199,14 @@ export function buildCursorToolGuidanceSystemNote(
|
|
|
199
199
|
// Code mode: shell/edit/MCP live inside freeform `exec` as nested helpers. Without this the
|
|
200
200
|
// model probes for a top-level shell tool that is not there.
|
|
201
201
|
codeMode
|
|
202
|
-
? `\`${CODEX_UNIFIED_EXEC_TOOL}\` is Codex code mode: its body is JavaScript evaluated in a V8 isolate, not a shell command and not Node. Shell, file edits, and MCP are nested helpers called INSIDE that body as \`await tools.<name>(...)\`, for example \`text(await tools.exec_command({cmd: \"ls\"}))\`. Read the tool description and the isolate global \`ALL_TOOLS\` (not \`tools.ALL_TOOLS\`) for helpers this turn provides; absence from the top-level catalog or from \`exec\`'s description is not absence. Those nested helpers are not themselves top-level tools, so do not call \`exec_command\` or \`shell_command\` at the top level here${codeModeOtherTopLevelNames.length > 0 ? `; every other tool this turn lists, including ${quotedNames(codeModeOtherTopLevelNames)},
|
|
202
|
+
? `\`${CODEX_UNIFIED_EXEC_TOOL}\` is Codex code mode: its body is JavaScript evaluated in a V8 isolate, not a shell command and not Node. Shell, file edits, and MCP are nested helpers called INSIDE that body as \`await tools.<name>(...)\`, for example \`text(await tools.exec_command({cmd: \"ls\"}))\`. Read the tool description and the isolate global \`ALL_TOOLS\` (not \`tools.ALL_TOOLS\`) for helpers this turn provides; absence from the top-level catalog or from \`exec\`'s description is not absence. Those nested helpers are not themselves top-level tools, so do not call \`exec_command\` or \`shell_command\` at the top level here${codeModeOtherTopLevelNames.length > 0 ? `; every other tool this turn lists, including ${quotedNames(codeModeOtherTopLevelNames)}, is called directly, outside \`${CODEX_UNIFIED_EXEC_TOOL}\`, as usual` : ""}. ${CURSOR_DEFERRED_TOOL_FALLBACK} Nested \`tools.apply_patch(input)\` is host-executed: the string must begin exactly with \`*** Begin Patch\` and end with \`*** End Patch\`, each marker line being three asterisks, one space, the two words, then end of line with no further asterisks. OpenCodex does not rewrite JavaScript inside exec, so extra asterisks on a marker line are rejected by Codex before the file is touched.`
|
|
203
203
|
: undefined,
|
|
204
204
|
codeMode
|
|
205
205
|
? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers. " + CODE_MODE_HOST_CONTRACT_SENTENCE
|
|
206
206
|
: undefined,
|
|
207
207
|
codeMode
|
|
208
208
|
? plainToolWording
|
|
209
|
-
? "Cursor-native Shell, Read, Grep, List, and Write are not available in this request. The exec code cell and its nested helpers provide the execution path; separately listed tools
|
|
209
|
+
? "Cursor-native Shell, Read, Grep, List, and Write are not available in this request. The exec code cell and its nested helpers provide the execution path; separately listed tools are called directly, outside the exec cell."
|
|
210
210
|
: "NEVER attempt Cursor-native Shell, Read, Grep, List, Write, or any tool absent from the catalog — they are not executed in this environment and every probe wastes a turn. The exec code cell (with its nested helpers) is the ONLY execution surface; go to it directly on the FIRST attempt and do not narrate switching surfaces."
|
|
211
211
|
: undefined,
|
|
212
212
|
hasBareExec
|
|
@@ -9,6 +9,14 @@ export function cursorUsesPlainToolWording(modelId?: string): boolean {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export const CURSOR_TOOL_CALL_CONTINUATION = "Continue the task with that tool call.";
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Cursor can defer the Codex client tools behind its own GetDynamicTools/CallDynamicTool pair, so a
|
|
15
|
+
* code-mode turn may list `exec` without the model seeing it at the top level (#8132). Name the
|
|
16
|
+
* deferred call path instead of asserting top-level reach.
|
|
17
|
+
*/
|
|
18
|
+
export const CURSOR_DEFERRED_TOOL_FALLBACK = "If a tool this turn lists, including `exec`, is missing from your top-level tool list, Cursor has deferred it: "
|
|
19
|
+
+ `call \`CallDynamicTool\` with namespace \`${OCX_RESPONSES_TOOL_PROVIDER}\`, \`toolName\` set to that tool's name, and the tool's own arguments under \`arguments\`.`;
|
|
12
20
|
const CURSOR_NO_CLIENT_TOOLS = "Cursor-native filesystem, shell, and fetch tools are not available through this execution channel. No client tools are available in this request. Answer without tools using the information already provided, or report that the requested operation cannot be completed without tools.";
|
|
13
21
|
|
|
14
22
|
/** Factual catalog wording; legacy model wording is owned by native-exec.ts unchanged. */
|
|
@@ -29,7 +37,8 @@ export function cursorPlainNativeExecRedirectHint(
|
|
|
29
37
|
+ "Cursor-native Read/Glob/Grep/LS/Shell/Write/Fetch are not available in this request. ";
|
|
30
38
|
if (!cursorRequestHasShellAlias(clientTools) && cursorRequestUsesCodeMode(clientTools)) {
|
|
31
39
|
return catalog + "`exec` takes a JavaScript body evaluated in a V8 isolate, not a shell command. Shell, file, search, and fetch are nested helpers called inside it as `await tools.<name>(...)`, for example `text(await tools.exec_command({cmd: \"ls\"}))`. "
|
|
32
|
-
+ "`shell_command` and `exec_command` are nested helpers, not top-level tools here. Every other listed tool
|
|
40
|
+
+ "`shell_command` and `exec_command` are nested helpers, not top-level tools here. Every other listed tool is called directly, outside `exec`. "
|
|
41
|
+
+ CURSOR_DEFERRED_TOOL_FALLBACK + " "
|
|
33
42
|
+ CODE_MODE_RESULT_ECHO_SENTENCE + " " + CURSOR_TOOL_CALL_CONTINUATION;
|
|
34
43
|
}
|
|
35
44
|
const operation = cursorRequestHasExecutionPath(clientTools)
|
package/src/adapters/cursor.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { decodeCursorJwtPayload } from "../oauth/cursor";
|
|
|
5
5
|
import { isTranslatorBudgetExceededError } from "../lib/translator-budget";
|
|
6
6
|
import { cursorExecDeniedMessage, cursorRequestDeclaresFullAccess } from "./cursor/exec-policy";
|
|
7
7
|
import { isCursorBenignCancelError, isCursorIncompleteToolCallMessage, isCursorInvalidArgumentError, isCursorOverflowRemintCandidate, isCursorRootEnvelopeError, safeCursorErrorMessage, type CursorSizeContext } from "./cursor/cursor-errors";
|
|
8
|
-
import { cursorCheckpointModelAffinityId,
|
|
8
|
+
import { cursorCheckpointModelAffinityId, cursorReplaysToolResultInRoot, inferCursorContextWindow, isCursorExternalWireModel } from "./cursor/discovery";
|
|
9
9
|
import { createCursorKvStore, type CursorKvStore } from "./cursor/kv-store";
|
|
10
10
|
import { mapCursorServerMessage } from "./cursor/message-mapper";
|
|
11
11
|
import {
|
|
@@ -310,11 +310,12 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
|
|
|
310
310
|
const echoSniffer = armEchoSniffer ? new CursorEnvelopeEchoSniffer() : undefined;
|
|
311
311
|
// Mid-stream observer (devlog 260828 F1/F2): diagnostic-only; armed with the
|
|
312
312
|
// prefix sniffer because both fire on flattened tool-result replay priming.
|
|
313
|
-
// The composer-2.5 builds are native-wire but also replay the tool result as root
|
|
314
|
-
// (
|
|
315
|
-
// remint follow that predicate
|
|
316
|
-
// corrective continuation text is encoded for
|
|
317
|
-
|
|
313
|
+
// The composer-2.5 builds and Auto are native-wire but also replay the tool result as root
|
|
314
|
+
// text (cursorReplaysToolResultInRoot), so the client-visible strip and the next-turn
|
|
315
|
+
// remint follow that predicate; Auto's #2317 envelope echo is why it is armed there. The
|
|
316
|
+
// prefix retry above stays external-only: its corrective continuation text is encoded for
|
|
317
|
+
// external wire models alone.
|
|
318
|
+
const armMidstreamEcho = cursorReplaysToolResultInRoot(activeRequest.modelId) && replaysToolResult;
|
|
318
319
|
const midstreamObserver = armMidstreamEcho ? new CursorMidstreamEchoObserver() : undefined;
|
|
319
320
|
const midstreamFilter = armMidstreamEcho ? new ToolEnvelopeEchoFilter() : undefined;
|
|
320
321
|
// Claude's factual redirects allow truthful routing prose; it is not a failure claim.
|
|
@@ -9,12 +9,28 @@
|
|
|
9
9
|
* accept type arrays, so only the Gemini family is rewritten, and only that one
|
|
10
10
|
* keyword: the full Google subset sanitizer would strip keywords this backend
|
|
11
11
|
* accepts.
|
|
12
|
+
*
|
|
13
|
+
* Claude models behind the same wire answer `invalid_argument` for a root
|
|
14
|
+
* `oneOf` (#8302), as Anthropic rejects a root composition in any
|
|
15
|
+
* `input_schema`. Claude uids get the same root flattening as Claude Chat
|
|
16
|
+
* gateways; a schema without a root composition is passed through unchanged.
|
|
12
17
|
*/
|
|
18
|
+
import { flattenClaudeRootToolParameters } from '../../openai-chat/tool-schema.js';
|
|
13
19
|
|
|
14
20
|
export function isDevinGeminiModelUid(modelUid: string): boolean {
|
|
15
21
|
return /^gemini-/i.test(modelUid) || /^MODEL_GOOGLE_GEMINI_/i.test(modelUid);
|
|
16
22
|
}
|
|
17
23
|
|
|
24
|
+
export function isDevinClaudeModelUid(modelUid: string): boolean {
|
|
25
|
+
return /^claude-/i.test(modelUid) || /^MODEL_CLAUDE_/i.test(modelUid);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const ROOT_COMPOSITION_KEYS = ['oneOf', 'anyOf', 'allOf'] as const;
|
|
29
|
+
|
|
30
|
+
function hasRootComposition(parameters: unknown): boolean {
|
|
31
|
+
return isSchema(parameters) && ROOT_COMPOSITION_KEYS.some((key) => Array.isArray(parameters[key]));
|
|
32
|
+
}
|
|
33
|
+
|
|
18
34
|
/** Keys whose values are instance data, not subschemas. */
|
|
19
35
|
const DATA_KEYS = new Set(['enum', 'const', 'default', 'examples', 'example']);
|
|
20
36
|
/** Keys whose values map arbitrary names (which may be "enum" or "default") to subschemas. */
|
|
@@ -79,7 +95,9 @@ function rewrite(node: unknown): unknown {
|
|
|
79
95
|
return splitTypeArray(out, types);
|
|
80
96
|
}
|
|
81
97
|
|
|
82
|
-
/** Rewrite type arrays for Gemini uids
|
|
98
|
+
/** Rewrite type arrays for Gemini uids and root compositions for Claude uids; others are unchanged. */
|
|
83
99
|
export function normalizeDevinToolParameters(modelUid: string, parameters: unknown): unknown {
|
|
84
|
-
|
|
100
|
+
if (isDevinGeminiModelUid(modelUid)) return rewrite(parameters);
|
|
101
|
+
if (isDevinClaudeModelUid(modelUid) && hasRootComposition(parameters)) return flattenClaudeRootToolParameters(parameters);
|
|
102
|
+
return parameters;
|
|
85
103
|
}
|