@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
|
@@ -12,20 +12,29 @@ import { antigravityCliUserAgent, antigravityUserAgent } from "./client-fingerpr
|
|
|
12
12
|
export const ANTIGRAVITY_REQUEST_UA = antigravityUserAgent();
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
|
-
* Antigravity CLI User-Agent. CCA serves Gemini 4 Argon only to the
|
|
16
|
-
* 404s other agent models (`gemini-3.7-flash-tiered`,
|
|
17
|
-
* choice is per wire model: see
|
|
15
|
+
* Antigravity CLI User-Agent. CCA serves the Gemini 4 codename models (Argon, Carbon) only to the
|
|
16
|
+
* CLI client family, and it 404s other agent models (`gemini-3.7-flash-tiered`,
|
|
17
|
+
* `gemini-3.1-pro-low`) under it, so the choice is per wire model: see
|
|
18
|
+
* `antigravityUserAgentForWireModel`.
|
|
18
19
|
*/
|
|
19
20
|
export const ANTIGRAVITY_CLI_REQUEST_UA = antigravityCliUserAgent();
|
|
20
21
|
|
|
21
22
|
/**
|
|
22
|
-
* Model discovery (`:fetchAvailableModels`) uses the CLI UA so
|
|
23
|
+
* Model discovery (`:fetchAvailableModels`) uses the CLI UA so the Gemini 4 wire ids are listed;
|
|
23
24
|
* under the IDE UA they are absent.
|
|
24
25
|
*/
|
|
25
26
|
export const ANTIGRAVITY_DISCOVERY_UA = ANTIGRAVITY_CLI_REQUEST_UA;
|
|
26
27
|
|
|
27
|
-
/**
|
|
28
|
-
|
|
28
|
+
/**
|
|
29
|
+
* Wire ids sent with the CLI User-Agent: every Gemini 4 codename, bare or with a low, medium, high
|
|
30
|
+
* or xhigh tier suffix. Observed on CCA: Argon was verified 2026-10-14, and on 2026-11-11 the CLI
|
|
31
|
+
* discovery list was exactly the IDE list plus the Argon and Carbon tiers, with
|
|
32
|
+
* `gemini-4-carbon-medium` answering 404 under the IDE UA and 200 under the CLI UA. Hydrogen
|
|
33
|
+
* (low/medium/high/xhigh, verified on Vertex AI by #8583's author on 2026-11-13) was listed by CCA
|
|
34
|
+
* discovery on 2026-11-12, and `gemini-4-hydrogen-xhigh` answered 200 under the CLI UA. Matching the generation keeps a newly discovered codename
|
|
35
|
+
* callable instead of listing it in the picker and 404ing every request.
|
|
36
|
+
*/
|
|
37
|
+
const ANTIGRAVITY_CLI_ONLY_WIRE_MODEL = /^gemini-4-[a-z][a-z0-9]*(?:-(?:low|medium|high|xhigh))?$/;
|
|
29
38
|
|
|
30
39
|
/** The User-Agent an Antigravity inference request for `wireModelId` must carry. */
|
|
31
40
|
export function antigravityUserAgentForWireModel(wireModelId: string): string {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { redactSecretString } from "../lib/redact";
|
|
2
|
+
import { withProviderFailureFacts } from "../lib/failure-detail";
|
|
2
3
|
import type { AdapterEvent, OcxUsage } from "../types";
|
|
3
4
|
|
|
4
5
|
/** Gemini/Vertex finishReason values that mean the turn was cut off, not cleanly stopped. */
|
|
@@ -37,10 +38,11 @@ export function vertexTruncationErrorEvent(
|
|
|
37
38
|
toolCallsStarted: number,
|
|
38
39
|
usage?: OcxUsage,
|
|
39
40
|
): Extract<AdapterEvent, { type: "error" }> {
|
|
40
|
-
|
|
41
|
+
// The request log keeps the closed finish reason that ended the turn (#8446); the wire event is unchanged.
|
|
42
|
+
return withProviderFailureFacts({
|
|
41
43
|
type: "error",
|
|
42
44
|
message: vertexTruncationErrorMessage(finishReason),
|
|
43
45
|
...(usage ? { usage } : {}),
|
|
44
46
|
...(finishReason === "MALFORMED_FUNCTION_CALL" && toolCallsStarted === 0 ? { replaySafeBeforeOutput: true } : {}),
|
|
45
|
-
};
|
|
47
|
+
} as const, { finishReason });
|
|
46
48
|
}
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
type JsonObject = Record<string, unknown>;
|
|
13
13
|
|
|
14
14
|
const GOOGLE_TOOL_NAME = /^[A-Za-z_][A-Za-z0-9_-]{0,63}$/;
|
|
15
|
-
const GOOGLE_THINKING_LEVELS = new Set(["minimal", "low", "medium", "high"]);
|
|
15
|
+
const GOOGLE_THINKING_LEVELS = new Set(["minimal", "low", "medium", "high", "xhigh"]);
|
|
16
16
|
|
|
17
17
|
export class GoogleToolSchemaPolicyError extends Error {
|
|
18
18
|
readonly phase = "initial" as const;
|
|
@@ -169,7 +169,7 @@ function compileGenerationConfig(value: unknown): JsonObject | undefined {
|
|
|
169
169
|
const raw = value.thinkingConfig.thinkingLevel.toLowerCase();
|
|
170
170
|
const thinkingLevel = GOOGLE_THINKING_LEVELS.has(raw)
|
|
171
171
|
? raw
|
|
172
|
-
: (["
|
|
172
|
+
: (["max", "ultra"].includes(raw) ? "high" : undefined);
|
|
173
173
|
if (thinkingLevel) thinking.thinkingLevel = thinkingLevel;
|
|
174
174
|
}
|
|
175
175
|
const rawBudget = finiteNumber(value.thinkingConfig.thinkingBudget ?? value.thinkingConfig.thinking_budget);
|
package/src/adapters/google.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { AdapterFetchContext, AdapterRequest, IncomingMeta, ProviderAdapter
|
|
|
3
3
|
import { debugDroppedFrame, debugProviderDiagnosticLazy } from "../lib/debug";
|
|
4
4
|
import { createToolCallIdAllocator } from "./tool-call-id";
|
|
5
5
|
import { openCodeGoGeminiEndpoint } from "../types/opencode-go";
|
|
6
|
+
import { withProviderFailureFacts } from "../lib/failure-detail";
|
|
6
7
|
import { createImageBudget, materializeInlineImage, MAX_ENCODED_BYTES_PER_IMAGE, artifactHttpUrl } from "../images/artifacts";
|
|
7
8
|
import type {
|
|
8
9
|
AdapterEvent,
|
|
@@ -20,6 +21,7 @@ import { isAllowedToolChoice, namespacedToolName, resolveToolChoiceWireName, too
|
|
|
20
21
|
import type { OcxTool } from "../types";
|
|
21
22
|
import { contentPartsToText, parseDataUrl } from "./image";
|
|
22
23
|
import { bindVertexRequestAuthority, GCP_CREDENTIAL_MARKER_PREFIX, gcpCredentialMarkerAccount, getVertexAccessTokenWithAuthority } from "../lib/gcp-adc";
|
|
24
|
+
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../providers/api-key-pause";
|
|
23
25
|
import { fetchAntigravityWithRetry, fetchVertexWithRetry } from "./google-http";
|
|
24
26
|
import { safeAntigravityHttpErrorMessage, safeVertexHttpErrorMessage } from "./google-errors";
|
|
25
27
|
import { readDisplaySafeErrorPayloadText } from "./upstream-http-error";
|
|
@@ -1070,7 +1072,11 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1070
1072
|
identityModelId,
|
|
1071
1073
|
stripRejectedClaudeSdkParagraph,
|
|
1072
1074
|
isCloudCodeAssist,
|
|
1073
|
-
provider.googleMode === "vertex" &&
|
|
1075
|
+
provider.googleMode === "vertex" && (
|
|
1076
|
+
parsed.modelId === "gemini-4-argon"
|
|
1077
|
+
|| parsed.modelId === "gemini-4-carbon"
|
|
1078
|
+
|| parsed.modelId === "gemini-4-hydrogen"
|
|
1079
|
+
),
|
|
1074
1080
|
isCloudCodeAssist && /^claude-/i.test(routedModelId),
|
|
1075
1081
|
);
|
|
1076
1082
|
lastInjectedCallIds = [...replayedCallIds];
|
|
@@ -1098,9 +1104,12 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1098
1104
|
// current behavior; Vertex participates only through an explicitly configured ladder (the
|
|
1099
1105
|
// seed google-vertex entry ships none). Image models are excluded — thinkingConfig would
|
|
1100
1106
|
// suppress the responseModalities fallback below. CCA maps effort on its envelope path.
|
|
1101
|
-
const
|
|
1107
|
+
const rawThinkingLevel = thinkingEligible
|
|
1102
1108
|
? mapReasoningEffort(provider, parsed.modelId, parsed.options.reasoning)
|
|
1103
1109
|
: undefined;
|
|
1110
|
+
const thinkingLevel = rawThinkingLevel === "xhigh" && configuredEfforts === undefined
|
|
1111
|
+
? "high"
|
|
1112
|
+
: rawThinkingLevel;
|
|
1104
1113
|
const includeThoughts = thinkingEligible
|
|
1105
1114
|
&& provider.showThinkingSummary === true
|
|
1106
1115
|
&& parsed.options.hideThinkingSummary !== true
|
|
@@ -1238,6 +1247,8 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1238
1247
|
return { url, method: "POST", headers, body: JSON.stringify(envelope) };
|
|
1239
1248
|
}
|
|
1240
1249
|
|
|
1250
|
+
if (isProviderApiKeyPaused(provider)) throw new ProviderApiKeyPausedError();
|
|
1251
|
+
|
|
1241
1252
|
if (provider.googleMode === "vertex") {
|
|
1242
1253
|
if (provider.authMode === "forward") throw new Error("Vertex does not support forward authentication");
|
|
1243
1254
|
const compiled = compileGoogleWireBody(body, toolSchemaProfile, toolSchemaPolicy);
|
|
@@ -1390,12 +1401,14 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1390
1401
|
|
|
1391
1402
|
// Inline provider error inside a 200 stream → terminal error (see openai-chat.ts).
|
|
1392
1403
|
if (chunk.error) {
|
|
1393
|
-
const err = chunk.error as { message?: string } | undefined;
|
|
1404
|
+
const err = chunk.error as { message?: string; status?: unknown } | undefined;
|
|
1394
1405
|
// Clear-on-invalid: a signature rejection means our replayed thoughtSignatures are stale.
|
|
1395
1406
|
// Drop the cache entry and durable store entry for rejected calls so the next turn
|
|
1396
1407
|
// starts clean instead of re-injecting a bad sig.
|
|
1397
1408
|
handleSignatureRejection(err?.message);
|
|
1398
|
-
|
|
1409
|
+
// Only the closed RPC status class and finish reason ride along for the request log (#8446).
|
|
1410
|
+
yield withProviderFailureFacts({ type: "error", message: err?.message ?? "upstream error" } as AdapterEvent,
|
|
1411
|
+
{ type: err?.status, finishReason: lastFinishReason });
|
|
1399
1412
|
return "terminate";
|
|
1400
1413
|
}
|
|
1401
1414
|
|
|
@@ -39,6 +39,7 @@ import {
|
|
|
39
39
|
} from "./conversation";
|
|
40
40
|
import {
|
|
41
41
|
injectKiroThinkingTags,
|
|
42
|
+
kiroEmulatesUnsupportedEffort,
|
|
42
43
|
kiroNativeEffortField,
|
|
43
44
|
kiroReasoningContent,
|
|
44
45
|
KIRO_NATIVE_EFFORTS,
|
|
@@ -199,8 +200,9 @@ export function buildKiroPayload(
|
|
|
199
200
|
: undefined;
|
|
200
201
|
// A tool-free structured-output turn advertises only its output channel. The catalog nudge is a
|
|
201
202
|
// work-tool contract (shell, file search, result counting) and would describe tools that do not
|
|
202
|
-
// exist, so it is reserved for turns that carry real tools.
|
|
203
|
-
|
|
203
|
+
// exist, so it is reserved for turns that carry real tools. Claude Code and Claude Desktop send
|
|
204
|
+
// their own tool rules with the full catalog, so the Codex-oriented nudge only repeats it.
|
|
205
|
+
const toolCatalogNudge = (structuredOutput && ordinaryTools.length === 0) || parsed._anthropicInbound
|
|
204
206
|
? undefined
|
|
205
207
|
: buildNonOpenAIToolCatalogNudgeFromNames(
|
|
206
208
|
kiroToolWireNames(kiroTools),
|
|
@@ -483,10 +485,11 @@ export function buildKiroPayload(
|
|
|
483
485
|
...(history.length > 0 ? { history } : {}),
|
|
484
486
|
},
|
|
485
487
|
};
|
|
486
|
-
const effort = parsed.options.reasoning;
|
|
487
488
|
const effortField = kiroNativeEffortField(parsed.modelId);
|
|
489
|
+
const effort = effortField && parsed.options.reasoning === "ultra" && KIRO_NATIVE_EFFORTS.includes("max")
|
|
490
|
+
? "max" : parsed.options.reasoning;
|
|
488
491
|
if (effortField && effort && effort !== "none") {
|
|
489
|
-
if (!KIRO_NATIVE_EFFORTS.includes(effort)) {
|
|
492
|
+
if (!KIRO_NATIVE_EFFORTS.includes(effort) && !kiroEmulatesUnsupportedEffort(parsed.modelId, effort)) {
|
|
490
493
|
throw new Error(`Kiro ${normalizeKiroModelId(parsed.modelId)} does not support reasoning effort ${JSON.stringify(effort)}`);
|
|
491
494
|
}
|
|
492
495
|
// Model eligibility still owns unsupported-effort validation above; wire eligibility
|
|
@@ -30,9 +30,19 @@ export const KIRO_NATIVE_EFFORT_FIELDS: Record<string, "reasoning" | "output_con
|
|
|
30
30
|
"gpt-6.1-sol": "reasoning",
|
|
31
31
|
// 261027 preemptive: GPT-6.1 Terra (mirrors GPT-6.1 Sol; see kiro-models.ts).
|
|
32
32
|
"gpt-6.1-terra": "reasoning",
|
|
33
|
+
// Claude models whose output_config.effort was accepted by a live probe on 2026-11-07, at every
|
|
34
|
+
// ladder rung except xhigh on the 4.6 pair. Haiku 4.5, Opus 4.5 and Sonnet 4.5 reject the field
|
|
35
|
+
// (HTTP 400). The probe covered these nine ids individually; no other Claude id was measured, so
|
|
36
|
+
// this table stays a per-id allowlist rather than a `claude-*` rule.
|
|
33
37
|
"claude-opus-5": "output_config",
|
|
34
|
-
// 260923 preemptive (see kiro-models.ts): same Claude-specific field as Opus 5.
|
|
35
38
|
"claude-opus-5.5": "output_config",
|
|
39
|
+
"claude-opus-4.8": "output_config",
|
|
40
|
+
"claude-opus-4.7": "output_config",
|
|
41
|
+
"claude-opus-4.6": "output_config",
|
|
42
|
+
"claude-sonnet-5.5": "output_config",
|
|
43
|
+
"claude-sonnet-5": "output_config",
|
|
44
|
+
"claude-sonnet-4.6": "output_config",
|
|
45
|
+
"claude-haiku-5.5": "output_config",
|
|
36
46
|
};
|
|
37
47
|
|
|
38
48
|
export const KIRO_NATIVE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
|
|
@@ -40,6 +50,29 @@ export const KIRO_NATIVE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
|
|
|
40
50
|
// The newly enabled models have evidence for these rungs only. Keep the previous
|
|
41
51
|
// emulation for xhigh, and never widen their native wire when the shared ladder grows.
|
|
42
52
|
const KIRO_LUNA_TERRA_NATIVE_EFFORTS = new Set(["low", "medium", "high", "max"]);
|
|
53
|
+
// Kiro rejects a native xhigh for these two (HTTP 400, live probe 2026-11-07); it stays emulated.
|
|
54
|
+
const KIRO_NO_XHIGH_NATIVE_MODELS = new Set(["claude-opus-4.6", "claude-sonnet-4.6"]);
|
|
55
|
+
// These models used the emulated block for every effort before native effort was verified, so
|
|
56
|
+
// `minimal` — the one value outside the native ladder that arrives as the caller's own request —
|
|
57
|
+
// keeps that block rather than becoming an error. Models absent from this set still reject
|
|
58
|
+
// `minimal`: it is an enumerated compatibility set, not a general unknown-effort fallback. The
|
|
59
|
+
// value check is what keeps it that way: an effort this file has never seen still throws instead
|
|
60
|
+
// of silently dropping reasoning.
|
|
61
|
+
//
|
|
62
|
+
// Caller-supplied `ultra` is folded by the Responses parser, but operator pins are applied
|
|
63
|
+
// afterward. The Kiro payload builder folds `ultra` to `max` for native models; emulated
|
|
64
|
+
// models retain their existing path, which has no `ultra` thinking budget.
|
|
65
|
+
const KIRO_EMULATED_EXTRA_EFFORT_MODELS = new Set([
|
|
66
|
+
"claude-opus-4.8",
|
|
67
|
+
"claude-opus-4.7",
|
|
68
|
+
"claude-opus-4.6",
|
|
69
|
+
"claude-sonnet-5.5",
|
|
70
|
+
"claude-sonnet-5",
|
|
71
|
+
"claude-sonnet-4.6",
|
|
72
|
+
"claude-haiku-5.5",
|
|
73
|
+
]);
|
|
74
|
+
/** The one outside-ladder value that keeps the emulated block instead of failing the request. */
|
|
75
|
+
const KIRO_EMULATED_LEGACY_EFFORT = "minimal";
|
|
43
76
|
|
|
44
77
|
export function kiroNativeEffortField(
|
|
45
78
|
modelId: string,
|
|
@@ -48,9 +81,19 @@ export function kiroNativeEffortField(
|
|
|
48
81
|
const model = normalizeKiroModelId(modelId);
|
|
49
82
|
if ((model === "gpt-5.6-luna" || model === "gpt-5.6-terra")
|
|
50
83
|
&& effort !== undefined && !KIRO_LUNA_TERRA_NATIVE_EFFORTS.has(effort)) return undefined;
|
|
84
|
+
if (KIRO_NO_XHIGH_NATIVE_MODELS.has(model) && effort === "xhigh") return undefined;
|
|
85
|
+
if (KIRO_EMULATED_EXTRA_EFFORT_MODELS.has(model) && effort === KIRO_EMULATED_LEGACY_EFFORT) {
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
51
88
|
return KIRO_NATIVE_EFFORT_FIELDS[model];
|
|
52
89
|
}
|
|
53
90
|
|
|
91
|
+
/** True when an effort outside the native ladder keeps the emulated path instead of failing. */
|
|
92
|
+
export function kiroEmulatesUnsupportedEffort(modelId: string, effort?: string): boolean {
|
|
93
|
+
return effort === KIRO_EMULATED_LEGACY_EFFORT
|
|
94
|
+
&& KIRO_EMULATED_EXTRA_EFFORT_MODELS.has(normalizeKiroModelId(modelId));
|
|
95
|
+
}
|
|
96
|
+
|
|
54
97
|
export function kiroReasoningMode(modelId: string, effort?: string): KiroReasoningMode {
|
|
55
98
|
return kiroNativeEffortField(modelId, effort) ? "native" : "emulated";
|
|
56
99
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AdapterEvent, OcxParsedRequest, OcxUsage } from "../../types";
|
|
2
2
|
import { KIRO_STRUCTURED_OUTPUT_TOOL_NAME } from "../kiro-constants";
|
|
3
|
-
import { sanitizeKiroSchema } from "../kiro-tools";
|
|
3
|
+
import { kiroRejectedSchemaKeys, sanitizeKiroSchema } from "../kiro-tools";
|
|
4
4
|
import { readKiroJson } from "./structured-output-json";
|
|
5
5
|
import { assertKiroStrictSchemaSupported, kiroStrictSchemaProblem, rewriteKiroWrappedRefs } from "./structured-output-schema";
|
|
6
6
|
|
|
@@ -27,7 +27,7 @@ export interface KiroStructuredOutputSpec {
|
|
|
27
27
|
schema?: Record<string, unknown>;
|
|
28
28
|
/** True when the caller asked for `strict: true`, so the value must conform to the whole schema. */
|
|
29
29
|
strict?: boolean;
|
|
30
|
-
/** The tool input schema actually advertised:
|
|
30
|
+
/** The tool input schema actually advertised: stripped of what this model rejects, and wrapped when `wrapped` is true. */
|
|
31
31
|
toolSchema: Record<string, unknown>;
|
|
32
32
|
/**
|
|
33
33
|
* True when the answer rides the tool input's `value` property instead of BEING the input.
|
|
@@ -79,7 +79,7 @@ export function kiroStructuredOutputSpec(parsed: OcxParsedRequest): KiroStructur
|
|
|
79
79
|
if (!schema) return { toolSchema: { type: "object" }, wrapped: false, ...meta };
|
|
80
80
|
if (strict) assertKiroStrictSchemaSupported(schema);
|
|
81
81
|
const contract = { schema, ...(strict ? { strict } : {}) };
|
|
82
|
-
const sanitized = sanitizeKiroSchema(schema) as JsonRecord;
|
|
82
|
+
const sanitized = sanitizeKiroSchema(schema, kiroRejectedSchemaKeys(parsed.modelId)) as JsonRecord;
|
|
83
83
|
if (isPlainObjectRoot(schema)) return { ...contract, toolSchema: sanitized, wrapped: false, ...meta };
|
|
84
84
|
// `#/$defs/...` references resolve against the document root, which is now the wrapper. Hoist the
|
|
85
85
|
// definitions with them so a referenced schema still resolves after it moves under `value`, and
|
|
@@ -102,7 +102,7 @@ export function kiroStructuredOutputSpec(parsed: OcxParsedRequest): KiroStructur
|
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
/** The private terminal tool advertised for a structured-output turn, with the caller's (
|
|
105
|
+
/** The private terminal tool advertised for a structured-output turn, with the caller's (possibly stripped, possibly wrapped) schema as its input schema. */
|
|
106
106
|
export function kiroStructuredOutputTool(spec: KiroStructuredOutputSpec): Record<string, unknown> {
|
|
107
107
|
const delivery = spec.wrapped
|
|
108
108
|
? "Put the complete final JSON value in `value`."
|
|
@@ -122,10 +122,12 @@ export function kiroStructuredOutputTool(spec: KiroStructuredOutputSpec): Record
|
|
|
122
122
|
/**
|
|
123
123
|
* The prose half of the structured-output contract, at most `maxChars` long.
|
|
124
124
|
*
|
|
125
|
-
* The caller's schema is restated verbatim because the advertised one is sanitized:
|
|
126
|
-
*
|
|
127
|
-
*
|
|
128
|
-
*
|
|
125
|
+
* The caller's schema is restated verbatim because the advertised one is sanitized for most models:
|
|
126
|
+
* `kiroRejectedSchemaKeys` drops `additionalProperties`, `pattern`, length and range keywords
|
|
127
|
+
* unless a probe measured that model id taking them, so the tool schema alone can leave the model
|
|
128
|
+
* without constraints the caller wrote. Keywords the model does keep are repeated here as well. A
|
|
129
|
+
* schema that does not fit the injected-instruction budget is dropped whole rather than cut
|
|
130
|
+
* mid-JSON.
|
|
129
131
|
*/
|
|
130
132
|
export function kiroStructuredOutputInstructions(
|
|
131
133
|
spec: KiroStructuredOutputSpec,
|
|
@@ -10,6 +10,10 @@ const MAX_KIRO_TOOL_DESCRIPTION_GPT_56_SOL = 9_216;
|
|
|
10
10
|
// slots for Kiro's private completion tool and headroom for the enclosing request/message fields.
|
|
11
11
|
export const MAX_KIRO_TOOL_COUNT = 48;
|
|
12
12
|
export const MAX_KIRO_TOOL_CATALOG_BYTES = 96_000;
|
|
13
|
+
// Opt-out for operators whose Kiro account accepts the full client catalog; read per request.
|
|
14
|
+
export const KIRO_TOOL_BUDGET_ENV = "OCX_KIRO_TOOL_BUDGET";
|
|
15
|
+
// Same opt-out for the per-tool description cap; read per request.
|
|
16
|
+
export const KIRO_TOOL_DESCRIPTION_LIMIT_ENV = "OCX_KIRO_TOOL_DESCRIPTION_LIMIT";
|
|
13
17
|
const textEncoder = new TextEncoder();
|
|
14
18
|
|
|
15
19
|
// JSON Schema validation/annotation keywords that Kiro's runtimeservice tool-spec validator
|
|
@@ -17,6 +21,8 @@ const textEncoder = new TextEncoder();
|
|
|
17
21
|
// but the `memories__*` tools (add_ad_hoc_note/read/search/list) emit pattern/length/range
|
|
18
22
|
// constraints via schemars, which trip the validator. Strip them everywhere in the schema tree;
|
|
19
23
|
// the constraints are advisory for the model, so dropping them does not change tool behavior.
|
|
24
|
+
// PR #8451 reports keyword probes on claude-opus-4.5 and a constrained-tool probe on two
|
|
25
|
+
// 5.5 models. Other Claude ids have no reported schema-keyword measurements.
|
|
20
26
|
const KIRO_REJECTED_SCHEMA_KEYS = new Set([
|
|
21
27
|
"additionalProperties",
|
|
22
28
|
"pattern",
|
|
@@ -65,28 +71,64 @@ const SCHEMA_MAP_KEYS = new Set(["properties", "$defs", "definitions"]);
|
|
|
65
71
|
// silently changing the value a tool argument must equal.
|
|
66
72
|
const SCHEMA_LITERAL_KEYS = new Set(["const", "enum", "default", "examples"]);
|
|
67
73
|
|
|
68
|
-
|
|
69
|
-
|
|
74
|
+
const NO_SCHEMA_KEYS: ReadonlySet<string> = new Set();
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* The rejected-key set minus `accepted`: the keywords one model id was measured to take.
|
|
78
|
+
*
|
|
79
|
+
* `KIRO_REJECTED_SCHEMA_KEYS` is the default; a probe can only widen what one id accepts, so an
|
|
80
|
+
* exception is written as the keys that probe covered, never as "everything".
|
|
81
|
+
*/
|
|
82
|
+
function rejectAllExcept(accepted: readonly string[]): ReadonlySet<string> {
|
|
83
|
+
const keep = new Set(accepted);
|
|
84
|
+
return new Set([...KIRO_REJECTED_SCHEMA_KEYS].filter(key => !keep.has(key)));
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
// PR #8451 reports the rejected keys above accepted on opus-4.5: its list enumerates 27 items
|
|
88
|
+
// because if/then/else stands for three keys, which is all 29 keys of the set. The report states
|
|
89
|
+
// that total as 28, one fewer than the 29 keys its own list names; the accepted keys, not the
|
|
90
|
+
// stated count, are what the exception below encodes. Its two 5.5 probes explicitly name only
|
|
91
|
+
// pattern and maximum.
|
|
92
|
+
// Other keywords and model ids retain the default strip until supported by evidence.
|
|
93
|
+
const KIRO_SCHEMA_KEY_EXCEPTIONS: ReadonlyMap<string, ReadonlySet<string>> = new Map([
|
|
94
|
+
["claude-opus-4.5", NO_SCHEMA_KEYS],
|
|
95
|
+
["claude-opus-5.5", rejectAllExcept(["pattern", "maximum"])],
|
|
96
|
+
["claude-sonnet-5.5", rejectAllExcept(["pattern", "maximum"])],
|
|
97
|
+
]);
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Schema keywords Kiro rejects for `modelId`.
|
|
101
|
+
*
|
|
102
|
+
* Keys are dropped unless a probe measured that exact id taking them, and only the keys that probe
|
|
103
|
+
* covered survive. An id nobody probed behaves like every other Kiro model, which is the shape that
|
|
104
|
+
* shipped before this exception existed.
|
|
105
|
+
*/
|
|
106
|
+
export function kiroRejectedSchemaKeys(modelId: string): ReadonlySet<string> {
|
|
107
|
+
return KIRO_SCHEMA_KEY_EXCEPTIONS.get(normalizeKiroModelId(modelId)) ?? KIRO_REJECTED_SCHEMA_KEYS;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
function sanitizeSchemaMap(value: unknown, rejected: ReadonlySet<string> = KIRO_REJECTED_SCHEMA_KEYS): unknown {
|
|
111
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return sanitizeKiroSchema(value, rejected);
|
|
70
112
|
// fromEntries defines own properties: a property named "__proto__" stays a property instead of
|
|
71
113
|
// hitting the prototype setter and vanishing from the advertised schema.
|
|
72
|
-
return Object.fromEntries(Object.entries(value as Record<string, unknown>).map(([name, child]) => [name, sanitizeKiroSchema(child)]));
|
|
114
|
+
return Object.fromEntries(Object.entries(value as Record<string, unknown>).map(([name, child]) => [name, sanitizeKiroSchema(child, rejected)]));
|
|
73
115
|
}
|
|
74
116
|
|
|
75
117
|
/** Strip the keywords Kiro's tool-spec validator rejects, everywhere in a schema tree. */
|
|
76
|
-
export function sanitizeKiroSchema(value: unknown): unknown {
|
|
77
|
-
if (Array.isArray(value)) return value.map(sanitizeKiroSchema);
|
|
118
|
+
export function sanitizeKiroSchema(value: unknown, rejected: ReadonlySet<string> = KIRO_REJECTED_SCHEMA_KEYS): unknown {
|
|
119
|
+
if (Array.isArray(value)) return value.map(child => sanitizeKiroSchema(child, rejected));
|
|
78
120
|
if (!value || typeof value !== "object") return value;
|
|
79
121
|
const out: Array<[string, unknown]> = [];
|
|
80
122
|
for (const [key, child] of Object.entries(value as Record<string, unknown>)) {
|
|
81
|
-
if (
|
|
123
|
+
if (rejected.has(key)) continue;
|
|
82
124
|
if (key === "required" && Array.isArray(child) && child.length === 0) continue;
|
|
83
125
|
if (SCHEMA_LITERAL_KEYS.has(key)) out.push([key, child]);
|
|
84
|
-
else out.push([key, SCHEMA_MAP_KEYS.has(key) ? sanitizeSchemaMap(child) : sanitizeKiroSchema(child)]);
|
|
126
|
+
else out.push([key, SCHEMA_MAP_KEYS.has(key) ? sanitizeSchemaMap(child, rejected) : sanitizeKiroSchema(child, rejected)]);
|
|
85
127
|
}
|
|
86
128
|
return Object.fromEntries(out);
|
|
87
129
|
}
|
|
88
130
|
|
|
89
|
-
function ensureRootObjectType(schema: unknown): Record<string, unknown> {
|
|
131
|
+
function ensureRootObjectType(schema: unknown, rejected: ReadonlySet<string> = KIRO_REJECTED_SCHEMA_KEYS): Record<string, unknown> {
|
|
90
132
|
const obj = schema && typeof schema === "object" && !Array.isArray(schema)
|
|
91
133
|
? schema as Record<string, unknown>
|
|
92
134
|
: {};
|
|
@@ -109,7 +151,7 @@ function ensureRootObjectType(schema: unknown): Record<string, unknown> {
|
|
|
109
151
|
// Seed with the root's own properties/required so a schema like
|
|
110
152
|
// { type:"object", properties:{path}, required:["path"], oneOf:[...] } keeps them.
|
|
111
153
|
if (obj.properties && typeof obj.properties === "object") {
|
|
112
|
-
Object.assign(props, sanitizeSchemaMap(obj.properties) as Record<string, unknown>);
|
|
154
|
+
Object.assign(props, sanitizeSchemaMap(obj.properties, rejected) as Record<string, unknown>);
|
|
113
155
|
}
|
|
114
156
|
if (Array.isArray(obj.required)) {
|
|
115
157
|
for (const r of obj.required) if (typeof r === "string") required.add(r);
|
|
@@ -124,7 +166,7 @@ function ensureRootObjectType(schema: unknown): Record<string, unknown> {
|
|
|
124
166
|
if (!variant || typeof variant !== "object" || Array.isArray(variant)) continue;
|
|
125
167
|
const v = variant as Record<string, unknown>;
|
|
126
168
|
if (v.properties && typeof v.properties === "object") {
|
|
127
|
-
Object.assign(props, sanitizeSchemaMap(v.properties) as Record<string, unknown>);
|
|
169
|
+
Object.assign(props, sanitizeSchemaMap(v.properties, rejected) as Record<string, unknown>);
|
|
128
170
|
}
|
|
129
171
|
if (mergeRequired && Array.isArray(v.required)) {
|
|
130
172
|
for (const r of v.required) if (typeof r === "string") required.add(r);
|
|
@@ -147,6 +189,7 @@ function ensureRootObjectType(schema: unknown): Record<string, unknown> {
|
|
|
147
189
|
}
|
|
148
190
|
|
|
149
191
|
function toolDescriptionLimit(modelId: string): number {
|
|
192
|
+
if (process.env[KIRO_TOOL_DESCRIPTION_LIMIT_ENV] === "off") return Number.POSITIVE_INFINITY;
|
|
150
193
|
return normalizeKiroModelId(modelId) === "gpt-5.6-sol"
|
|
151
194
|
? MAX_KIRO_TOOL_DESCRIPTION_GPT_56_SOL
|
|
152
195
|
: MAX_KIRO_TOOL_DESCRIPTION_UNVERIFIED;
|
|
@@ -196,6 +239,7 @@ export function convertKiroToolContext(
|
|
|
196
239
|
): { tools: unknown[]; systemAdditions: string[]; nameMap: Map<string, string>; registry: KiroToolNameRegistry } {
|
|
197
240
|
const tools = parsed.context.tools ?? [];
|
|
198
241
|
const descriptionLimit = toolDescriptionLimit(parsed.modelId);
|
|
242
|
+
const rejectedSchemaKeys = kiroRejectedSchemaKeys(parsed.modelId);
|
|
199
243
|
// Validate every listed name even when tool_choice:none emulates a tool-free turn.
|
|
200
244
|
for (const tool of tools) registry.alias(namespacedToolName(tool.namespace, tool.name));
|
|
201
245
|
const effectiveTools = parsed.options.toolChoice === "none" ? [] : tools;
|
|
@@ -211,13 +255,14 @@ export function convertKiroToolContext(
|
|
|
211
255
|
toolSpecification: {
|
|
212
256
|
name: toolName,
|
|
213
257
|
description: truncateDescription(description, descriptionLimit),
|
|
214
|
-
inputSchema: { json: ensureRootObjectType(sanitizeKiroSchema(tool.parameters ?? {})) },
|
|
258
|
+
inputSchema: { json: ensureRootObjectType(sanitizeKiroSchema(tool.parameters ?? {}, rejectedSchemaKeys), rejectedSchemaKeys) },
|
|
215
259
|
},
|
|
216
260
|
};
|
|
217
261
|
return { tool, index, converted };
|
|
218
262
|
});
|
|
219
|
-
const
|
|
220
|
-
|
|
263
|
+
const unbounded = process.env[KIRO_TOOL_BUDGET_ENV] === "off";
|
|
264
|
+
const exceedsBudget = !unbounded && (convertedEntries.length > MAX_KIRO_TOOL_COUNT
|
|
265
|
+
|| serializedToolCatalogBytes(convertedEntries.map(entry => entry.converted)) > MAX_KIRO_TOOL_CATALOG_BYTES);
|
|
221
266
|
const candidates = exceedsBudget
|
|
222
267
|
? convertedEntries.toSorted((a, b) => boundedCatalogPriority(a.tool) - boundedCatalogPriority(b.tool) || a.index - b.index)
|
|
223
268
|
: convertedEntries;
|
|
@@ -241,8 +286,9 @@ export function convertKiroToolContext(
|
|
|
241
286
|
// subtracting a standalone size would misjudge it by the separators JSON adds between entries.
|
|
242
287
|
const projected = reserved ? [...filled, entry.converted, reserved.converted] : [...filled, entry.converted];
|
|
243
288
|
if (
|
|
244
|
-
|
|
245
|
-
|
|
289
|
+
!unbounded
|
|
290
|
+
&& (projected.length > MAX_KIRO_TOOL_COUNT
|
|
291
|
+
|| serializedToolCatalogBytes(projected) > MAX_KIRO_TOOL_CATALOG_BYTES)
|
|
246
292
|
) break;
|
|
247
293
|
filled.push(entry.converted);
|
|
248
294
|
admitted.add(entry.index);
|
|
@@ -5,6 +5,8 @@ import type { OcxProviderConfig } from "../../types";
|
|
|
5
5
|
const MISTRAL_CHAT_POLICY = {
|
|
6
6
|
rename: { max_completion_tokens: "max_tokens" },
|
|
7
7
|
omit: ["user", "store", "thinking", "include_reasoning", "reasoning", "top_k"],
|
|
8
|
+
/** Replayed inside message history by reasoning-capable Chat clients; Mistral's schema rejects them. */
|
|
9
|
+
omitMessageFields: ["reasoning_content"],
|
|
8
10
|
} as const;
|
|
9
11
|
|
|
10
12
|
/** Final wire projection shared by native and translated Chat; caller objects are not mutated. */
|
|
@@ -15,6 +17,20 @@ export function applyChatDestinationPolicy(body: Record<string, unknown>, provid
|
|
|
15
17
|
delete body[source];
|
|
16
18
|
}
|
|
17
19
|
for (const field of MISTRAL_CHAT_POLICY.omit) delete body[field];
|
|
20
|
+
const messages = body.messages;
|
|
21
|
+
if (Array.isArray(messages)) {
|
|
22
|
+
let sanitized: unknown[] | undefined;
|
|
23
|
+
for (let index = 0; index < messages.length; index++) {
|
|
24
|
+
const message = messages[index];
|
|
25
|
+
if (message === null || typeof message !== "object" || Array.isArray(message)) continue;
|
|
26
|
+
const record = message as Record<string, unknown>;
|
|
27
|
+
if (!MISTRAL_CHAT_POLICY.omitMessageFields.some((field) => field in record)) continue;
|
|
28
|
+
const copy = { ...record };
|
|
29
|
+
for (const field of MISTRAL_CHAT_POLICY.omitMessageFields) delete copy[field];
|
|
30
|
+
(sanitized ??= [...messages])[index] = copy;
|
|
31
|
+
}
|
|
32
|
+
if (sanitized) body.messages = sanitized;
|
|
33
|
+
}
|
|
18
34
|
}
|
|
19
35
|
|
|
20
36
|
/** Native Chat normally preserves effort spelling; Mistral requires its declared model ladder. */
|
|
@@ -2,6 +2,7 @@ import { modelInList, type OcxProviderConfig, type OcxReasoningReplayScopeRef }
|
|
|
2
2
|
import { peekReasoningForCall } from "../../responses/reasoning-replay-cache";
|
|
3
3
|
import { jsonStringPartsUtf8Bytes, jsonUtf8Bytes } from "../../lib/json-byte-size";
|
|
4
4
|
import { isTranslatorBudgetExceededError, TranslatorBudgetExceededError } from "../../lib/translator-budget";
|
|
5
|
+
import { isCanonicalMistralChat } from "../../providers/mistral-transport";
|
|
5
6
|
|
|
6
7
|
type Rec = Record<string, unknown>;
|
|
7
8
|
export const isChatRecord = (value: unknown): value is Rec =>
|
|
@@ -58,7 +59,9 @@ export function planNativeChatReasoningReplay(
|
|
|
58
59
|
maxSerializedBytes = Number.MAX_SAFE_INTEGER,
|
|
59
60
|
): NativeChatReasoningReplayPlan {
|
|
60
61
|
const policy = chatReasoningReplayPolicy(provider, modelId);
|
|
61
|
-
|
|
62
|
+
// Canonical Mistral Chat rejects `reasoning_content` in history (HTTP 422), and the destination
|
|
63
|
+
// policy strips it before this plan is applied; replaying here would restore it (#8432).
|
|
64
|
+
if (!policy.preserve || !Array.isArray(messages) || isCanonicalMistralChat(provider)
|
|
62
65
|
|| modelInList(provider.reasoningDetailsModels, modelId)) {
|
|
63
66
|
return { serializedBytes: 0, hasChanges: false, apply: () => messages as unknown[] };
|
|
64
67
|
}
|
|
@@ -162,6 +162,15 @@ function isClaudeModelId(modelId: string | undefined): boolean {
|
|
|
162
162
|
return tail.startsWith("claude-");
|
|
163
163
|
}
|
|
164
164
|
|
|
165
|
+
/**
|
|
166
|
+
* The Claude root flattening above, for other wires that front Claude with a translated tool
|
|
167
|
+
* schema (Devin's GetChatMessage). Root oneOf/anyOf/allOf branches merge into one object;
|
|
168
|
+
* nested schemas, property values and literal data are copied as they are.
|
|
169
|
+
*/
|
|
170
|
+
export function flattenClaudeRootToolParameters(parameters: unknown): Record<string, unknown> {
|
|
171
|
+
return ensureZenRootObjectSchema(parameters, false);
|
|
172
|
+
}
|
|
173
|
+
|
|
165
174
|
function isAzureOpenAiChatTarget(provider: OcxProviderConfig): boolean {
|
|
166
175
|
try {
|
|
167
176
|
const host = new URL(provider.baseUrl).hostname.toLowerCase();
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { namespacedToolName, type AdapterEvent, type OcxParsedRequest, type OcxProviderConfig, type OcxUsage, type TierDecision } from "../../types";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
declaredUnsupportedHostedTools,
|
|
4
|
+
isHostedToolUnsupportedForModel,
|
|
5
|
+
responsesBodyDeclaresClientTools,
|
|
6
|
+
} from "../../responses/hosted-tool-policy";
|
|
3
7
|
import { debugProviderDiagnostic } from "../../lib/debug";
|
|
4
8
|
import { stripUnicodePropertyPatterns } from "../responses-tool-schema";
|
|
5
9
|
import {
|
|
@@ -249,18 +253,28 @@ export function promoteClientLoadedTools(body: unknown, replayPrefixLength?: num
|
|
|
249
253
|
* Responses gateway with a narrower capability set be described in config instead of
|
|
250
254
|
* requiring a hard-coded destination rule per vendor (#5002).
|
|
251
255
|
*
|
|
256
|
+
* `unsupportedHostedToolsWithClientTools` joins that declaration only when this request also
|
|
257
|
+
* declares client tools (#8204), for a gateway that serves a hosted tool alone but rejects it
|
|
258
|
+
* next to function calling. It feeds the same set, so every filter and selector
|
|
259
|
+
* reconciliation below treats a conditional denial exactly like an unconditional one.
|
|
260
|
+
*
|
|
252
261
|
* No-op (returns the original reference) when nothing matches, keeping the common path
|
|
253
262
|
* allocation-free.
|
|
254
263
|
*/
|
|
255
264
|
export function stripUnsupportedHostedTools(
|
|
256
265
|
body: unknown,
|
|
257
|
-
provider: Pick<OcxProviderConfig, "baseUrl" | "unsupportedHostedTools">,
|
|
266
|
+
provider: Pick<OcxProviderConfig, "baseUrl" | "unsupportedHostedTools" | "unsupportedHostedToolsWithClientTools">,
|
|
258
267
|
): unknown {
|
|
259
268
|
if (!isPlainObject(body)) return body;
|
|
260
269
|
const model = typeof body.model === "string" ? body.model : "";
|
|
261
270
|
// Expanded once per request rather than per tool: the alias walk is the only
|
|
262
|
-
// non-lookup work in this filter.
|
|
263
|
-
|
|
271
|
+
// non-lookup work in this filter. The client-tool scan runs only for a provider that
|
|
272
|
+
// declared a conditional denial, so every other provider skips it.
|
|
273
|
+
const conditional = provider.unsupportedHostedToolsWithClientTools;
|
|
274
|
+
const declaredUnsupported = declaredUnsupportedHostedTools(
|
|
275
|
+
provider,
|
|
276
|
+
Array.isArray(conditional) && conditional.length > 0 && responsesBodyDeclaresClientTools(body),
|
|
277
|
+
);
|
|
264
278
|
const filterTools = (tools: unknown[]): unknown[] => {
|
|
265
279
|
const filtered = tools.filter(t => {
|
|
266
280
|
const type = isPlainObject(t) && typeof t.type === "string" ? t.type : undefined;
|