@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
package/src/adapters/google.ts
CHANGED
|
@@ -1304,9 +1304,23 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1304
1304
|
|
|
1305
1305
|
const reader = response.body.getReader();
|
|
1306
1306
|
const decoder = new TextDecoder();
|
|
1307
|
-
const budgetEncoder = new TextEncoder();
|
|
1308
1307
|
let buffer = "";
|
|
1309
1308
|
let bufferBytes = 0;
|
|
1309
|
+
const appendDecoded = (fragment: string): void => {
|
|
1310
|
+
if (!fragment) return;
|
|
1311
|
+
// TextDecoder emits complete code points, so only new text needs UTF-8 measurement.
|
|
1312
|
+
const nextBytes = bufferBytes + Buffer.byteLength(fragment);
|
|
1313
|
+
const reservation = budget.reserveTransient(nextBytes, { kind: "live_transient" });
|
|
1314
|
+
try {
|
|
1315
|
+
buffer += fragment;
|
|
1316
|
+
reservation.commitRetained();
|
|
1317
|
+
} catch (error) {
|
|
1318
|
+
reservation.release();
|
|
1319
|
+
throw error;
|
|
1320
|
+
}
|
|
1321
|
+
budget.releaseRetained(bufferBytes, { kind: "live_transient" });
|
|
1322
|
+
bufferBytes = nextBytes;
|
|
1323
|
+
};
|
|
1310
1324
|
let pendingUsage: OcxUsage | undefined;
|
|
1311
1325
|
let toolCallsStarted = 0;
|
|
1312
1326
|
let lastFinishReason: string | undefined;
|
|
@@ -1498,13 +1512,8 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1498
1512
|
while (true) {
|
|
1499
1513
|
const { done, value } = await reader.read();
|
|
1500
1514
|
if (done) break;
|
|
1501
|
-
const
|
|
1502
|
-
|
|
1503
|
-
const appendReservation = budget.reserveTransient(nextBufferBytes, { kind: "live_transient" });
|
|
1504
|
-
buffer = nextBuffer;
|
|
1505
|
-
appendReservation.commitRetained();
|
|
1506
|
-
budget.releaseRetained(bufferBytes, { kind: "live_transient" });
|
|
1507
|
-
bufferBytes = nextBufferBytes;
|
|
1515
|
+
const decoded = decoder.decode(value, { stream: true });
|
|
1516
|
+
appendDecoded(decoded);
|
|
1508
1517
|
// Cap incomplete frames before waiting for a newline — otherwise a single
|
|
1509
1518
|
// unterminated data: payload can grow without bound.
|
|
1510
1519
|
if (buffer.length > MAX_SSE_FRAME_BYTES) {
|
|
@@ -1513,9 +1522,11 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1513
1522
|
return;
|
|
1514
1523
|
}
|
|
1515
1524
|
|
|
1525
|
+
// The retained suffix contains no newline; an unfinished line needs no rescan.
|
|
1526
|
+
if (!decoded.includes("\n")) continue;
|
|
1516
1527
|
const lines = buffer.split("\n");
|
|
1517
1528
|
buffer = lines.pop() ?? "";
|
|
1518
|
-
const residualBytes =
|
|
1529
|
+
const residualBytes = Buffer.byteLength(buffer);
|
|
1519
1530
|
const residualReservation = budget.reserveTransient(residualBytes, { kind: "live_transient" });
|
|
1520
1531
|
residualReservation.commitRetained();
|
|
1521
1532
|
budget.releaseRetained(bufferBytes, { kind: "live_transient" });
|
|
@@ -1536,7 +1547,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
|
|
|
1536
1547
|
}
|
|
1537
1548
|
if (sawLiveness && !sawContentEvent) yield { type: "heartbeat" };
|
|
1538
1549
|
}
|
|
1539
|
-
|
|
1550
|
+
appendDecoded(decoder.decode());
|
|
1540
1551
|
if (buffer.trim().length > 0) {
|
|
1541
1552
|
const residual = buffer.trim();
|
|
1542
1553
|
if (residual.startsWith(":")) {
|
|
@@ -64,6 +64,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
|
|
|
64
64
|
let firstRequestBodyBytes = 0;
|
|
65
65
|
let requestAbortSignal: AbortSignal | undefined;
|
|
66
66
|
let requestExecutor: typeof globalThis.fetch | undefined;
|
|
67
|
+
let requestTimeoutMs: number | undefined;
|
|
67
68
|
// Captured the same way as the abort signal, because the text-fallback rebuild below runs
|
|
68
69
|
// outside the fetchResponse frame and used to construct a context without either (#4546).
|
|
69
70
|
let requestSendBudget: RequestExecutionBudget | undefined;
|
|
@@ -237,6 +238,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
|
|
|
237
238
|
const fallbackOrdinalBase = physicalSendsObserved;
|
|
238
239
|
const response = await fetchKiroWithRetry(retry.request, {
|
|
239
240
|
abortSignal: requestAbortSignal,
|
|
241
|
+
timeoutMs: requestTimeoutMs,
|
|
240
242
|
...(requestExecutor ? { executor: requestExecutor } : {}),
|
|
241
243
|
allowGatewayRotation: !_sawReasoning && !assistantText.trim(),
|
|
242
244
|
returnRawErrors: true,
|
|
@@ -322,6 +324,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
|
|
|
322
324
|
// both the first Kiro request and its one allowed completion retry.
|
|
323
325
|
if (ctx?.abortSignal) requestAbortSignal = ctx.abortSignal;
|
|
324
326
|
requestExecutor = ctx?.executor;
|
|
327
|
+
requestTimeoutMs = ctx?.timeoutMs;
|
|
325
328
|
if (ctx?.sendBudget) requestSendBudget = ctx.sendBudget;
|
|
326
329
|
if (ctx?.onPhysicalSend) requestOnPhysicalSend = ctx.onPhysicalSend;
|
|
327
330
|
// Reset per fetch call, because `ordinal` is defined within one call and the caller records
|
|
@@ -454,25 +454,28 @@ async function* parseKiroAttemptEvents(
|
|
|
454
454
|
};
|
|
455
455
|
};
|
|
456
456
|
|
|
457
|
+
// A real tool call and the private final-answer call can share one turn, in either order. The
|
|
458
|
+
// turn then continues through the real tools, so the final answer is dropped: it is held until
|
|
459
|
+
// the stream ends and is never relayed, which makes the drop invisible to the client. A second
|
|
460
|
+
// completion call, a completion call in `disabled` mode and a malformed completion stay errors.
|
|
461
|
+
const noteDroppedCompletion = (): void => {
|
|
462
|
+
console.warn("[kiro] dropped the private final-answer call; the turn also carried a real tool call");
|
|
463
|
+
};
|
|
464
|
+
|
|
457
465
|
const classifyTool = (
|
|
458
466
|
tool: { id: string; name: string; chunks: string[]; completion: boolean },
|
|
459
467
|
): AdapterEvent | undefined => {
|
|
460
468
|
if (tool.name !== KIRO_COMPLETION_TOOL_NAME) {
|
|
461
469
|
tool.completion = false;
|
|
462
|
-
return
|
|
463
|
-
? protocolTerminal("Kiro returned a real tool call alongside a private final answer")
|
|
464
|
-
: undefined;
|
|
470
|
+
return undefined;
|
|
465
471
|
}
|
|
466
472
|
if (mode === "disabled") {
|
|
467
473
|
return protocolTerminal("Kiro returned the reserved private final-answer tool while explicit completion was disabled");
|
|
468
474
|
}
|
|
469
475
|
tool.completion = true;
|
|
470
|
-
if (
|
|
476
|
+
if (completionCalls > 0) {
|
|
471
477
|
return protocolTerminal("Kiro returned more than one private final-answer tool call", true);
|
|
472
478
|
}
|
|
473
|
-
if (sawRealTool) {
|
|
474
|
-
return protocolTerminal("Kiro returned a private final answer alongside a real tool call");
|
|
475
|
-
}
|
|
476
479
|
return undefined;
|
|
477
480
|
};
|
|
478
481
|
|
|
@@ -575,18 +578,20 @@ async function* parseKiroAttemptEvents(
|
|
|
575
578
|
if (completionCalls > 1) {
|
|
576
579
|
return { events: [], terminal: protocolTerminal("Kiro returned more than one private final-answer tool call", true) };
|
|
577
580
|
}
|
|
578
|
-
if (sawRealTool) {
|
|
579
|
-
return { events: [], terminal: protocolTerminal("Kiro returned a private final answer alongside a real tool call") };
|
|
580
|
-
}
|
|
581
581
|
const answer = parseCompletion(tool.chunks);
|
|
582
582
|
if (answer instanceof Error) return { events: [], terminal: protocolTerminal(answer.message, true) };
|
|
583
|
+
if (sawRealTool) {
|
|
584
|
+
noteDroppedCompletion();
|
|
585
|
+
return { events: [] };
|
|
586
|
+
}
|
|
583
587
|
completionAnswer = answer;
|
|
584
588
|
return { events: [] };
|
|
585
589
|
}
|
|
586
|
-
if (completionAnswer !== undefined || completionCalls > 0) {
|
|
587
|
-
return { events: [], terminal: protocolTerminal("Kiro returned a real tool call alongside a private final answer") };
|
|
588
|
-
}
|
|
589
590
|
sawRealTool = true;
|
|
591
|
+
if (completionAnswer !== undefined) {
|
|
592
|
+
completionAnswer = undefined;
|
|
593
|
+
noteDroppedCompletion();
|
|
594
|
+
}
|
|
590
595
|
const restored = nameMap?.get(tool.name) ?? tool.name;
|
|
591
596
|
return {
|
|
592
597
|
events: [
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import type { AdapterEvent, OcxProviderConfig } from "../../types";
|
|
2
|
+
import { modelInList } from "../../types";
|
|
3
|
+
import type { FreeformToolIdentity } from "./serialized-tool-call-content";
|
|
4
|
+
|
|
5
|
+
export const COMPLETED_TOOL_BLOCKS_PROTOCOL = "block-stop-v1";
|
|
6
|
+
|
|
7
|
+
export interface PendingChatToolCall {
|
|
8
|
+
key: string;
|
|
9
|
+
indexKey?: string;
|
|
10
|
+
id: string;
|
|
11
|
+
name: string;
|
|
12
|
+
args: string;
|
|
13
|
+
argsBytes: number;
|
|
14
|
+
sawArgumentsString: boolean;
|
|
15
|
+
blockCompleted?: boolean;
|
|
16
|
+
emittedEarly?: boolean;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export function completedToolBlocksEnabled(
|
|
20
|
+
requested: boolean,
|
|
21
|
+
provider: OcxProviderConfig,
|
|
22
|
+
responseHeaders: Headers,
|
|
23
|
+
modelId: string,
|
|
24
|
+
): boolean {
|
|
25
|
+
return requested
|
|
26
|
+
&& Object.entries(provider.headers ?? {}).some(([key, value]) =>
|
|
27
|
+
key.toLowerCase() === "x-opencodex-tool-completion" && value === COMPLETED_TOOL_BLOCKS_PROTOCOL)
|
|
28
|
+
&& responseHeaders.get("x-opencodex-tool-completion") === COMPLETED_TOOL_BLOCKS_PROTOCOL
|
|
29
|
+
&& !modelInList(provider.inlineThinkTagModels, modelId);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export function observeCompletedToolBlock(
|
|
33
|
+
call: PendingChatToolCall | undefined,
|
|
34
|
+
marker: unknown,
|
|
35
|
+
indexKey: string | undefined,
|
|
36
|
+
id: string,
|
|
37
|
+
hasFunctionDelta: boolean,
|
|
38
|
+
): "ordinary" | "completed" | "invalid" {
|
|
39
|
+
if (!call?.blockCompleted && marker === undefined) return "ordinary";
|
|
40
|
+
if (call?.blockCompleted || marker !== COMPLETED_TOOL_BLOCKS_PROTOCOL || !call
|
|
41
|
+
|| !indexKey || indexKey !== call.indexKey || !id || id !== call.id || hasFunctionDelta) return "invalid";
|
|
42
|
+
call.blockCompleted = true;
|
|
43
|
+
return "completed";
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export function completedToolPrefix(
|
|
47
|
+
calls: PendingChatToolCall[],
|
|
48
|
+
blocked: boolean,
|
|
49
|
+
freeformTools: Map<string, FreeformToolIdentity>,
|
|
50
|
+
restoreName: (name: string) => string,
|
|
51
|
+
): AdapterEvent[] {
|
|
52
|
+
if (blocked) return [];
|
|
53
|
+
const events: AdapterEvent[] = [];
|
|
54
|
+
for (const call of calls) {
|
|
55
|
+
if (call.emittedEarly) continue;
|
|
56
|
+
if (!call.blockCompleted || !call.id || !call.name.trim() || !call.sawArgumentsString || freeformTools.has(call.name)) break;
|
|
57
|
+
let args: unknown;
|
|
58
|
+
try { args = JSON.parse(call.args); } catch { break; }
|
|
59
|
+
if (!args || typeof args !== "object" || Array.isArray(args) || Object.hasOwn(args, "input")) break;
|
|
60
|
+
call.emittedEarly = true;
|
|
61
|
+
events.push({ type: "tool_call_start", id: call.id, name: restoreName(call.name) });
|
|
62
|
+
events.push({ type: "tool_call_delta", arguments: call.args }, { type: "tool_call_end" });
|
|
63
|
+
}
|
|
64
|
+
return events;
|
|
65
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isNativeOpenAIChatTarget, stripBracketedModelSuffix } from "./wire";
|
|
1
|
+
import { isMistralChatTarget, isNativeOpenAIChatTarget, stripBracketedModelSuffix } from "./wire";
|
|
2
2
|
import { reasoningDetailSegmentForWire } from "./response-events";
|
|
3
3
|
import { translatedChatDeveloperWireRole } from "./developer-role";
|
|
4
4
|
import { isVolcengineArkPaygChatTarget } from "./tool-schema";
|
|
@@ -75,7 +75,7 @@ export function toolResultAudioChatParts(content: string | OcxContentPart[]): un
|
|
|
75
75
|
* Whether this wire serializes a replayed thinking block for the given model.
|
|
76
76
|
*
|
|
77
77
|
* The single source of truth for that question on the Chat wire: the assistant branch below uses
|
|
78
|
-
* it to decide
|
|
78
|
+
* it to decide replayed reasoning fields/chunks, and the Messages ingress uses it to decide how much of a
|
|
79
79
|
* prompt is worth counting. Two copies of this rule would drift, and the count would then
|
|
80
80
|
* describe a body this adapter does not send.
|
|
81
81
|
*/
|
|
@@ -84,7 +84,8 @@ export function openAIChatSerializesThinking(
|
|
|
84
84
|
modelId: string,
|
|
85
85
|
): ClaudeThinkingProjection {
|
|
86
86
|
return {
|
|
87
|
-
text:
|
|
87
|
+
text: (isMistralChatTarget(provider) && provider.preserveReasoningContentModels === undefined)
|
|
88
|
+
|| chatReasoningReplayPolicy(provider, modelId).preserve,
|
|
88
89
|
// The wire has no `signature` field — base64 replay tokens are Anthropic-wire-only.
|
|
89
90
|
signature: false,
|
|
90
91
|
// A `redacted_thinking` block is opaque provider data with no Chat representation: the
|
|
@@ -101,6 +102,7 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
|
|
|
101
102
|
// One question, one answer for the whole conversion: does this wire carry replayed thinking
|
|
102
103
|
// back for this model? Asked once so a long history cannot pay for it per message.
|
|
103
104
|
const wireSerializesThinking = openAIChatSerializesThinking(provider, parsed.modelId).text;
|
|
105
|
+
const mistralThinking = isMistralChatTarget(provider);
|
|
104
106
|
|
|
105
107
|
interface PendingToolCall { id: string; name: string }
|
|
106
108
|
let pendingToolCalls: PendingToolCall[] = [];
|
|
@@ -300,7 +302,7 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
|
|
|
300
302
|
// recorded under every call id — join unique texts only.
|
|
301
303
|
if (cached.length > 0) {
|
|
302
304
|
reasoningContent = [...new Set(cached)].join("\n");
|
|
303
|
-
} else if (chatReasoningReplayPolicy(provider, parsed.modelId).placeholder) {
|
|
305
|
+
} else if (!mistralThinking && chatReasoningReplayPolicy(provider, parsed.modelId).placeholder) {
|
|
304
306
|
// Fallback (extends #950 and #1193; fixes #5421): the replay cache is
|
|
305
307
|
// bounded (64 entries / 256 KiB / 1 h TTL) and always misses on
|
|
306
308
|
// long sessions, and some thinking/tool rounds carry no recorded
|
|
@@ -315,16 +317,17 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
|
|
|
315
317
|
}
|
|
316
318
|
}
|
|
317
319
|
if (reasoningContent.length > 0 && wireSerializesThinking) {
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
320
|
+
if (mistralThinking) {
|
|
321
|
+
chatMsg.content = mistralThinkingContent(reasoningContent, chatMsg.content as string | undefined);
|
|
322
|
+
} else if (modelInList(provider.reasoningDetailsModels, parsed.modelId)) {
|
|
323
|
+
// MiniMax requires structured details rather than reasoning_content.
|
|
322
324
|
chatMsg.reasoning_details = [reasoningDetailSegmentForWire(reasoningContent)];
|
|
323
325
|
} else {
|
|
324
326
|
chatMsg.reasoning_content = reasoningContent;
|
|
325
327
|
}
|
|
326
328
|
}
|
|
327
|
-
const hasReplayedReasoning = chatMsg.reasoning_content !== undefined || chatMsg.reasoning_details !== undefined
|
|
329
|
+
const hasReplayedReasoning = chatMsg.reasoning_content !== undefined || chatMsg.reasoning_details !== undefined
|
|
330
|
+
|| (mistralThinking && Array.isArray(chatMsg.content));
|
|
328
331
|
// A turn with no answer text, tools or reasoning carries nothing. Between a call and its
|
|
329
332
|
// result it would also split the pair, so drop it there; a standalone empty answer keeps
|
|
330
333
|
// its slot so templates that require strict user/assistant alternation still accept it.
|
|
@@ -388,12 +391,13 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
|
|
|
388
391
|
// falsy hit as a miss so the placeholder still fires.
|
|
389
392
|
const orphanReasoning =
|
|
390
393
|
cachedReasoning
|
|
391
|
-
|| (wireSerializesThinking
|
|
394
|
+
|| (!mistralThinking && wireSerializesThinking
|
|
392
395
|
&& chatReasoningReplayPolicy(provider, parsed.modelId).placeholder
|
|
393
396
|
? " "
|
|
394
397
|
: undefined);
|
|
395
398
|
const orphanReasoningFields: Record<string, unknown> = !orphanReasoning
|
|
396
399
|
? {}
|
|
400
|
+
: mistralThinking ? { content: mistralThinkingContent(orphanReasoning) }
|
|
397
401
|
: modelInList(provider.reasoningDetailsModels, parsed.modelId)
|
|
398
402
|
? { reasoning_details: [reasoningDetailSegmentForWire(orphanReasoning)] }
|
|
399
403
|
: { reasoning_content: orphanReasoning };
|
|
@@ -437,3 +441,11 @@ export function safeToolName(name: string | undefined): string {
|
|
|
437
441
|
export function emptyAssistantContent(provider: OcxProviderConfig): string | { type: "text"; text: string }[] {
|
|
438
442
|
return isVolcengineArkPaygChatTarget(provider) ? [{ type: "text", text: "" }] : "";
|
|
439
443
|
}
|
|
444
|
+
|
|
445
|
+
/** Reconstruct completed text-only thinking; never invent signatures or placeholder reasoning. */
|
|
446
|
+
function mistralThinkingContent(thinking: string, text?: string): unknown[] {
|
|
447
|
+
return [
|
|
448
|
+
{ type: "thinking", thinking: [{ type: "text", text: thinking }] },
|
|
449
|
+
...(text ? [{ type: "text", text }] : []),
|
|
450
|
+
];
|
|
451
|
+
}
|
|
@@ -18,7 +18,7 @@ function terminalGuard(required: boolean): (event: AdapterEvent) => AdapterEvent
|
|
|
18
18
|
let failed = false;
|
|
19
19
|
return event => {
|
|
20
20
|
if (event.type === "tool_call_start") pending = true;
|
|
21
|
-
if (event.type === "tool_call_end") { fulfilled ||= pending; pending = false; }
|
|
21
|
+
if (event.type === "tool_call_end") { fulfilled ||= pending && !event.incomplete; pending = false; }
|
|
22
22
|
if (event.type === "error" || event.type === "incomplete") failed = true;
|
|
23
23
|
if (event.type !== "done" || !required || fulfilled || failed || isTruncatedStopReason(event.stopReason)) return event;
|
|
24
24
|
// Preserve delivered output and consumption. A mandatory call is a contract, not a hint
|
|
@@ -40,9 +40,9 @@ export function withRequiredChatToolResult(adapter: ProviderAdapter): ProviderAd
|
|
|
40
40
|
required = requiresClientCall(parsed);
|
|
41
41
|
return adapter.buildRequest(parsed, incoming);
|
|
42
42
|
},
|
|
43
|
-
async *parseStream(response, budget, tierMetadata) {
|
|
43
|
+
async *parseStream(response, budget, tierMetadata, streamContext) {
|
|
44
44
|
const guard = terminalGuard(required);
|
|
45
|
-
for await (const event of adapter.parseStream(response, budget, tierMetadata)) yield guard(event);
|
|
45
|
+
for await (const event of adapter.parseStream(response, budget, tierMetadata, streamContext)) yield guard(event);
|
|
46
46
|
},
|
|
47
47
|
...(adapter.parseResponse ? {
|
|
48
48
|
async parseResponse(response: Response, budget: TranslatorBudget, tierMetadata?: AdapterTierMetadata) {
|
|
@@ -298,6 +298,11 @@ export class SerializedToolCallContentBuffer {
|
|
|
298
298
|
return this.observeText(textEvents(text));
|
|
299
299
|
}
|
|
300
300
|
|
|
301
|
+
/** Early completed tools must not overtake retained text or reasoning events. */
|
|
302
|
+
hasHeldEvents(): boolean {
|
|
303
|
+
return this.text.length > 0 || this.queued.length > 0;
|
|
304
|
+
}
|
|
305
|
+
|
|
301
306
|
/** Exposes held text as evidence for narrowly repairing duplicated argument prefixes. */
|
|
302
307
|
current(): string {
|
|
303
308
|
return this.text;
|
|
@@ -48,3 +48,12 @@ export function isNativeOpenAIChatTarget(provider: OcxProviderConfig): boolean {
|
|
|
48
48
|
return false;
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
+
|
|
52
|
+
/** Native Mistral thinking uses content chunks, independently of the hosted model family. */
|
|
53
|
+
export function isMistralChatTarget(provider: OcxProviderConfig): boolean {
|
|
54
|
+
try {
|
|
55
|
+
return new URL(provider.baseUrl).hostname === "api.mistral.ai";
|
|
56
|
+
} catch {
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
@@ -49,6 +49,8 @@ import { openAIChatTransport, stripBracketedModelSuffix } from "./openai-chat/wi
|
|
|
49
49
|
import { toolChoiceToChatFormat, toolsToChatFormatForProvider } from "./openai-chat/tool-schema";
|
|
50
50
|
import { freeformToolsByWireName, type FreeformToolIdentity, reconcileStructuredToolCall, reconcileStructuredToolCalls } from "./openai-chat/serialized-tool-call-content";
|
|
51
51
|
import { StandaloneBareToolCallBuffer, reconcileStandaloneBareToolCallEvents } from "./openai-chat/standalone-bare-tool-calls";
|
|
52
|
+
import { COMPLETED_TOOL_BLOCKS_PROTOCOL, completedToolBlocksEnabled, completedToolPrefix, observeCompletedToolBlock, type PendingChatToolCall } from "./openai-chat/completed-tool-blocks";
|
|
53
|
+
|
|
52
54
|
export { stripBracketedModelSuffix } from "./openai-chat/wire";
|
|
53
55
|
export { buildOpenAIChatPassthroughRequest } from "./openai-chat/passthrough";
|
|
54
56
|
export { formatOpenAIChatErrorBody } from "./openai-chat/errors";
|
|
@@ -97,7 +99,12 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
|
|
|
97
99
|
|
|
98
100
|
buildRequest(parsed: OcxParsedRequest, incoming?: IncomingMeta) {
|
|
99
101
|
lastRequestedModelId = parsed.modelId;
|
|
102
|
+
const completedToolBlocks = incoming?.completedToolBlocks === true;
|
|
100
103
|
const { url, headers, hasCredential } = openAIChatTransport(provider);
|
|
104
|
+
if (!completedToolBlocks) {
|
|
105
|
+
for (const key of Object.keys(headers)) if (key.toLowerCase() === "x-opencodex-tool-completion") delete headers[key];
|
|
106
|
+
}
|
|
107
|
+
|
|
101
108
|
const messages = toolNames.messages(parsed, provider.baseUrl, messagesToChatFormat(parsed, provider));
|
|
102
109
|
freeformTools = freeformToolsByWireName(parsed.context.tools, tool => toolNames.registry().alias(tool));
|
|
103
110
|
const finish = (): AdapterRequest => {
|
|
@@ -273,6 +280,7 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
|
|
|
273
280
|
response: Response,
|
|
274
281
|
budget: TranslatorBudget,
|
|
275
282
|
tierMetadata?: AdapterTierMetadata,
|
|
283
|
+
streamContext?: { completedToolBlocks?: boolean },
|
|
276
284
|
): AsyncGenerator<AdapterEvent> {
|
|
277
285
|
if (!response.body) {
|
|
278
286
|
yield { type: "error", message: "No response body" };
|
|
@@ -284,26 +292,12 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
|
|
|
284
292
|
const budgetEncoder = new TextEncoder();
|
|
285
293
|
let buffer = "";
|
|
286
294
|
let bufferBytes = 0;
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
indexKey?: string;
|
|
290
|
-
id: string;
|
|
291
|
-
name: string;
|
|
292
|
-
args: string;
|
|
293
|
-
argsBytes: number;
|
|
294
|
-
/**
|
|
295
|
-
* Whether this call has ever received `arguments` as an actual string, empty included.
|
|
296
|
-
* An empty string still counts: it proves the upstream sent the field with the right
|
|
297
|
-
* wire type, which is what a later malformed repeat of that field would be padding for.
|
|
298
|
-
* A canonical NAME is not evidence about the ARGUMENTS field and must not stand in.
|
|
299
|
-
*/
|
|
300
|
-
sawArgumentsString: boolean;
|
|
301
|
-
}
|
|
302
|
-
const pendingToolCalls: PendingToolCall[] = [];
|
|
295
|
+
const completedBlocksEnabled = completedToolBlocksEnabled(streamContext?.completedToolBlocks === true, provider, response.headers, lastRequestedModelId ?? "");
|
|
296
|
+
const pendingToolCalls: PendingChatToolCall[] = [];
|
|
303
297
|
const toolCallContent = new StandaloneBareToolCallBuffer(budget, lastRequestedModelId, freeformTools);
|
|
304
298
|
const heldText = (): AdapterEvent[] => toolCallContent.drain([]);
|
|
305
299
|
let toolCallSeq = 0;
|
|
306
|
-
const closeToolCalls = ():
|
|
300
|
+
const closeToolCalls = (): PendingChatToolCall[] => {
|
|
307
301
|
const calls = [...pendingToolCalls];
|
|
308
302
|
for (const call of calls) budget.closeCall(call.key);
|
|
309
303
|
pendingToolCalls.length = 0;
|
|
@@ -340,6 +334,7 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
|
|
|
340
334
|
yield* toolCallContent.recoverStandalone(calls.length === 0 && terminal, () => `call_${++toolCallSeq}`, name => toolNames.restore(name));
|
|
341
335
|
yield* toolCallContent.drain(references);
|
|
342
336
|
for (const call of calls) {
|
|
337
|
+
if (call.emittedEarly) continue;
|
|
343
338
|
if (!call.id) call.id = `call_${++toolCallSeq}`;
|
|
344
339
|
yield { type: "tool_call_start", id: call.id, name: toolNames.restore(call.name) };
|
|
345
340
|
if (call.args.length > 0) yield { type: "tool_call_delta", arguments: call.args };
|
|
@@ -513,6 +508,11 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
|
|
|
513
508
|
let call = key !== undefined ? pendingToolCalls.find(c => c.key === key) : undefined;
|
|
514
509
|
if (!call && indexKey !== undefined) call = pendingToolCalls.find(c => c.indexKey === indexKey);
|
|
515
510
|
if (!call && idDelta) call = pendingToolCalls.find(c => c.id === idDelta);
|
|
511
|
+
const completion = completedBlocksEnabled
|
|
512
|
+
? observeCompletedToolBlock(call, rawToolCall.x_opencodex_completed, indexKey, idDelta, rawFunction !== undefined)
|
|
513
|
+
: "ordinary";
|
|
514
|
+
if (completion === "invalid") return yield* terminateWithError({ type: "error", message: "invalid negotiated tool completion sequence", ...(pendingUsage !== undefined ? { usage: pendingUsage } : {}) });
|
|
515
|
+
if (completion === "completed") continue;
|
|
516
516
|
if (!call) {
|
|
517
517
|
call = {
|
|
518
518
|
key: key ?? `seq:${pendingToolCalls.length}`,
|
|
@@ -582,6 +582,7 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
|
|
|
582
582
|
}
|
|
583
583
|
}
|
|
584
584
|
}
|
|
585
|
+
if (completedBlocksEnabled) yield* completedToolPrefix(pendingToolCalls, toolCallContent.hasHeldEvents(), freeformTools, name => toolNames.restore(name));
|
|
585
586
|
}
|
|
586
587
|
|
|
587
588
|
if (typeof choice.finish_reason === "string" && choice.finish_reason) {
|
|
@@ -72,6 +72,7 @@ export function preferConfiguredHostedTools(
|
|
|
72
72
|
provider: OcxProviderConfig,
|
|
73
73
|
modelId: string,
|
|
74
74
|
selectedModelId?: string,
|
|
75
|
+
substitutions?: Array<{ name: string; namespace?: string; callType: string }>,
|
|
75
76
|
): unknown {
|
|
76
77
|
// A virtual model's advertised id takes precedence over its resolved wire-model id.
|
|
77
78
|
// Read own properties only: a routed model id of `constructor`/`toString` would
|
|
@@ -87,7 +88,20 @@ export function preferConfiguredHostedTools(
|
|
|
87
88
|
if (!preferredTools?.includes(HOSTED_IMAGE_GENERATION_TOOL) || !isPlainObject(body)) return body;
|
|
88
89
|
|
|
89
90
|
const stripGroup = (tools: unknown[]): unknown[] => {
|
|
90
|
-
const filtered = tools.filter(tool =>
|
|
91
|
+
const filtered = tools.filter(tool => {
|
|
92
|
+
if (!declaresImageGenClientTool(tool)) return true;
|
|
93
|
+
const declaration = tool as Record<string, unknown>;
|
|
94
|
+
if (declaration.type === "namespace" && Array.isArray(declaration.tools)) {
|
|
95
|
+
for (const inner of declaration.tools) {
|
|
96
|
+
if (isPlainObject(inner) && typeof inner.name === "string") {
|
|
97
|
+
substitutions?.push({ name: inner.name, namespace: IMAGE_GEN_NAMESPACE, callType: "image_generation_call" });
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
} else if (typeof declaration.name === "string") {
|
|
101
|
+
substitutions?.push({ name: declaration.name, callType: "image_generation_call" });
|
|
102
|
+
}
|
|
103
|
+
return false;
|
|
104
|
+
});
|
|
91
105
|
return filtered.length === tools.length ? tools : filtered;
|
|
92
106
|
};
|
|
93
107
|
|
|
@@ -7,9 +7,9 @@ import { normalizeOpenCodeGoAdditionalTools } from "../opencode-go-additional-to
|
|
|
7
7
|
import { isXaiResponsesDestination } from "../../providers/xai-transport";
|
|
8
8
|
import { applyGithubCopilotContextTier } from "../../providers/github-copilot-context";
|
|
9
9
|
import { Buffer } from "node:buffer";
|
|
10
|
-
import type { IncomingMeta, ProviderAdapter } from "../base";
|
|
10
|
+
import type { AdapterRequest, IncomingMeta, ProviderAdapter } from "../base";
|
|
11
11
|
import { namespacedToolName, type AdapterEvent, type OcxParsedRequest, type OcxProviderConfig, type OcxUsage, type TierDecision } from "../../types";
|
|
12
|
-
import { applyCodexRoutingHint, CODEX_RESPONSES_LITE_HEADER, CODEX_RESPONSES_LITE_METADATA_KEY, CODEX_ROUTING_HINT_HEADER } from "../../codex/forward-transport-headers";
|
|
12
|
+
import { applyCodexRoutingHint, CODEX_RESPONSES_LITE_HEADER, CODEX_RESPONSES_LITE_METADATA_KEY, CODEX_ROUTING_HINT_HEADER, isolateCodexPoolClientMetadata } from "../../codex/forward-transport-headers";
|
|
13
13
|
import { COMPACT_PROMPT, compactionItemToText, decodeCompactionSummary, isCompactionItemType, transferCompactionCiphertextLease } from "../../responses/compaction";
|
|
14
14
|
import { decodeServerSentEvents } from "../../lib/sse-decoder";
|
|
15
15
|
import {
|
|
@@ -44,6 +44,7 @@ import { repairUrlCitationAnnotations, scrubOcxCompactionItems, stripCanonicalOn
|
|
|
44
44
|
import { notePlaintextReasoningDropped } from "./plaintext-reasoning-notice";
|
|
45
45
|
import { stripCanonicalForwardPromptCacheOptions, stripDeprecatedPromptCacheRetention } from "./prompt-cache";
|
|
46
46
|
import { isPlainObject } from "./internal";
|
|
47
|
+
import { usageFromResponsesPayload } from "./usage";
|
|
47
48
|
import { normalizeToolSchemas, promoteClientLoadedTools, stripUnsupportedHostedTools } from "./tool-schema";
|
|
48
49
|
import { annotateEmptyResponsesToolOutputs, backfillWebSearchQueries, normalizeResponsesToolResultAdjacency, repairOrphanedInputItems, repairOversizedReplayCallIds, repairUnidentifiedToolOutputItems, restoreBridgedWebSearchCalls } from "./tool-output-recovery";
|
|
49
50
|
import { bridgeSearchReplayScope } from "../../responses/bridge-search-replay-cache";
|
|
@@ -124,38 +125,6 @@ function buildRoutedCompactionBody(body: unknown, responsesLite: boolean): unkno
|
|
|
124
125
|
};
|
|
125
126
|
}
|
|
126
127
|
|
|
127
|
-
/** Read the Responses `usage` block, if the gateway sent one. */
|
|
128
|
-
function usageFromResponsesPayload(payload: unknown): OcxUsage | undefined {
|
|
129
|
-
if (!isPlainObject(payload) || !isPlainObject(payload.usage)) return undefined;
|
|
130
|
-
const usage = payload.usage;
|
|
131
|
-
const inputTokens = typeof usage.input_tokens === "number" ? usage.input_tokens : 0;
|
|
132
|
-
const outputTokens = typeof usage.output_tokens === "number" ? usage.output_tokens : 0;
|
|
133
|
-
// openai/codex#41980: the raw usage object is wire data a rebuilt response.completed must keep —
|
|
134
|
-
// unknown keys (subscription metadata, future counters) ride along even when the token counts
|
|
135
|
-
// themselves are zero or absent (metadata-only usage).
|
|
136
|
-
const knownKeys = new Set(["input_tokens", "output_tokens", "total_tokens", "input_tokens_details", "output_tokens_details"]);
|
|
137
|
-
const hasExtras = Object.keys(usage).some(key => !knownKeys.has(key))
|
|
138
|
-
|| (isPlainObject(usage.input_tokens_details)
|
|
139
|
-
&& Object.keys(usage.input_tokens_details).some(key => key !== "cached_tokens" && key !== "cache_write_tokens"
|
|
140
|
-
&& key !== "cache_write_1h_tokens"))
|
|
141
|
-
|| (isPlainObject(usage.output_tokens_details)
|
|
142
|
-
&& Object.keys(usage.output_tokens_details).some(key => key !== "reasoning_tokens"));
|
|
143
|
-
if (inputTokens === 0 && outputTokens === 0 && !hasExtras) return undefined;
|
|
144
|
-
const inputDetails = isPlainObject(usage.input_tokens_details) ? usage.input_tokens_details : undefined;
|
|
145
|
-
const outputDetails = isPlainObject(usage.output_tokens_details) ? usage.output_tokens_details : undefined;
|
|
146
|
-
return {
|
|
147
|
-
inputTokens,
|
|
148
|
-
outputTokens,
|
|
149
|
-
...(typeof usage.total_tokens === "number" ? { totalTokens: usage.total_tokens } : {}),
|
|
150
|
-
...(typeof inputDetails?.cached_tokens === "number" ? { cachedInputTokens: inputDetails.cached_tokens } : {}),
|
|
151
|
-
...(typeof inputDetails?.cache_write_tokens === "number" ? { cacheCreationInputTokens: inputDetails.cache_write_tokens } : {}),
|
|
152
|
-
...(typeof inputDetails?.cache_write_1h_tokens === "number"
|
|
153
|
-
? { cacheCreation1hInputTokens: inputDetails.cache_write_1h_tokens } : {}),
|
|
154
|
-
...(typeof outputDetails?.reasoning_tokens === "number" ? { reasoningOutputTokens: outputDetails.reasoning_tokens } : {}),
|
|
155
|
-
...(hasExtras ? { rawUsage: { ...usage } } : {}),
|
|
156
|
-
};
|
|
157
|
-
}
|
|
158
|
-
|
|
159
128
|
function responsesPayloadText(response: unknown): string {
|
|
160
129
|
if (!isPlainObject(response) || !Array.isArray(response.output)) return "";
|
|
161
130
|
return response.output
|
|
@@ -266,6 +235,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
266
235
|
if (adjacentToolResults) {
|
|
267
236
|
outBody = normalizeResponsesToolResultAdjacency(outBody);
|
|
268
237
|
}
|
|
238
|
+
const hostedToolSubstitutions: NonNullable<AdapterRequest["hostedToolSubstitutions"]>[number][] = [];
|
|
269
239
|
if (forward) {
|
|
270
240
|
// `metadata` is stripped on every forward route for compatibility with the canonical backend.
|
|
271
241
|
// `max_output_tokens` is stripped only when this provider is the canonical backend.
|
|
@@ -286,6 +256,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
286
256
|
provider,
|
|
287
257
|
parsed.modelId,
|
|
288
258
|
parsed._openAiVirtualSelectedModelId,
|
|
259
|
+
hostedToolSubstitutions,
|
|
289
260
|
);
|
|
290
261
|
outBody = normalizeImageGenClientTools(outBody);
|
|
291
262
|
}
|
|
@@ -476,6 +447,11 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
476
447
|
finalBody = { ...finalBody, stream: true };
|
|
477
448
|
}
|
|
478
449
|
if (isCanonicalOpenAiForwardProvider(provider)) {
|
|
450
|
+
const overrideAccountId = (provider as { _codexAccountOverride?: { chatgptAccountId?: string } })._codexAccountOverride?.chatgptAccountId
|
|
451
|
+
?? headers["chatgpt-account-id"];
|
|
452
|
+
if ((provider as { _codexAccountOverride?: unknown })._codexAccountOverride && overrideAccountId) {
|
|
453
|
+
finalBody = isolateCodexPoolClientMetadata(finalBody, overrideAccountId);
|
|
454
|
+
}
|
|
479
455
|
const routingHeaders = new Headers(headers);
|
|
480
456
|
applyCodexRoutingHint(routingHeaders, finalBody);
|
|
481
457
|
// Static headers may use mixed casing. Remove every stale spelling
|
|
@@ -529,6 +505,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
529
505
|
method: "POST",
|
|
530
506
|
headers,
|
|
531
507
|
body,
|
|
508
|
+
hostedToolSubstitutions,
|
|
532
509
|
...(isPlainObject(wireBody) && typeof wireBody.model === "string" ? { outboundModelId: wireBody.model } : {}),
|
|
533
510
|
releaseBodyObservation,
|
|
534
511
|
...(convertedRoutedCustomToolNames ? { convertedRoutedCustomToolNames } : {}),
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import type { IncomingMeta } from "../base";
|
|
2
2
|
import type { OcxProviderConfig } from "../../types";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
CODEX_ATTESTATION_HEADER,
|
|
5
|
+
CODEX_INSTALLATION_ID_HEADER,
|
|
6
|
+
CODEX_RESPONSES_LITE_HEADER,
|
|
7
|
+
CODEX_TURN_METADATA_HEADER,
|
|
8
|
+
deriveCodexAccountInstallationId,
|
|
9
|
+
rewriteTurnMetadataInstallationId,
|
|
10
|
+
} from "../../codex/forward-transport-headers";
|
|
4
11
|
import { CODEX_FORWARD_BASE_URL, isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers-destination";
|
|
5
12
|
import { normalizeForwardedClientHeaderName } from "../../lib/provider-client-headers";
|
|
6
13
|
import { AGENT_ASSERTION_HEADER } from "../../lib/authorization-scheme";
|
|
@@ -11,7 +18,7 @@ export const FORWARD_HEADERS = [
|
|
|
11
18
|
"authorization", "chatgpt-account-id", "openai-beta", "originator", "session_id", "session-id",
|
|
12
19
|
"thread-id", "x-client-request-id", "x-codex-beta-features", "x-codex-installation-id",
|
|
13
20
|
"x-codex-parent-thread-id", "x-codex-turn-metadata", "x-codex-turn-state", "x-codex-window-id",
|
|
14
|
-
"x-oai-attestation", "x-openai-subagent", "x-responsesapi-include-timing-metrics", CODEX_RESPONSES_LITE_HEADER,
|
|
21
|
+
"x-oai-attestation", "x-openai-subagent", "x-responsesapi-include-timing-metrics", "version", CODEX_RESPONSES_LITE_HEADER,
|
|
15
22
|
];
|
|
16
23
|
|
|
17
24
|
/** Carry permitted client metadata across an internal compact handoff, never credentials. */
|
|
@@ -70,6 +77,17 @@ export function buildResponsesTransport(provider: OcxProviderConfig, incoming: P
|
|
|
70
77
|
if (override && mayForwardCallerCredentials) {
|
|
71
78
|
headers.authorization = `Bearer ${override.accessToken}`;
|
|
72
79
|
headers["chatgpt-account-id"] = override.chatgptAccountId;
|
|
80
|
+
delete headers[CODEX_ATTESTATION_HEADER];
|
|
81
|
+
if (override.chatgptAccountId?.trim()) {
|
|
82
|
+
const installId = headers[CODEX_INSTALLATION_ID_HEADER];
|
|
83
|
+
if (installId && installId.trim()) {
|
|
84
|
+
headers[CODEX_INSTALLATION_ID_HEADER] = deriveCodexAccountInstallationId(override.chatgptAccountId, installId);
|
|
85
|
+
}
|
|
86
|
+
const turnMeta = headers[CODEX_TURN_METADATA_HEADER];
|
|
87
|
+
if (turnMeta) {
|
|
88
|
+
headers[CODEX_TURN_METADATA_HEADER] = rewriteTurnMetadataInstallationId(turnMeta, override.chatgptAccountId);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
73
91
|
} else if (mayForwardCallerCredentials) {
|
|
74
92
|
// dual_header runtime assertion: first-party Direct only, beside the caller's own Bearer.
|
|
75
93
|
// A pool override above never carries it, and non-canonical transports never see it.
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { OcxUsage } from "../../types";
|
|
2
|
+
import { isPlainObject } from "./internal";
|
|
3
|
+
|
|
4
|
+
/** Read the Responses `usage` block, if the gateway sent one. */
|
|
5
|
+
export function usageFromResponsesPayload(payload: unknown): OcxUsage | undefined {
|
|
6
|
+
if (!isPlainObject(payload) || !isPlainObject(payload.usage)) return undefined;
|
|
7
|
+
const usage = payload.usage;
|
|
8
|
+
const inputTokens = typeof usage.input_tokens === "number" ? usage.input_tokens : 0;
|
|
9
|
+
const outputTokens = typeof usage.output_tokens === "number" ? usage.output_tokens : 0;
|
|
10
|
+
// openai/codex#41980: the raw usage object is wire data a rebuilt response.completed must keep —
|
|
11
|
+
// unknown keys (subscription metadata, future counters) ride along even when the token counts
|
|
12
|
+
// themselves are zero or absent (metadata-only usage).
|
|
13
|
+
const knownKeys = new Set(["input_tokens", "output_tokens", "total_tokens", "input_tokens_details", "output_tokens_details"]);
|
|
14
|
+
const hasExtras = Object.keys(usage).some(key => !knownKeys.has(key))
|
|
15
|
+
|| (isPlainObject(usage.input_tokens_details)
|
|
16
|
+
&& Object.keys(usage.input_tokens_details).some(key => key !== "cached_tokens" && key !== "cache_write_tokens"
|
|
17
|
+
&& key !== "cache_write_1h_tokens"))
|
|
18
|
+
|| (isPlainObject(usage.output_tokens_details)
|
|
19
|
+
&& Object.keys(usage.output_tokens_details).some(key => key !== "reasoning_tokens"));
|
|
20
|
+
if (inputTokens === 0 && outputTokens === 0 && !hasExtras) return undefined;
|
|
21
|
+
const inputDetails = isPlainObject(usage.input_tokens_details) ? usage.input_tokens_details : undefined;
|
|
22
|
+
const outputDetails = isPlainObject(usage.output_tokens_details) ? usage.output_tokens_details : undefined;
|
|
23
|
+
return {
|
|
24
|
+
inputTokens,
|
|
25
|
+
outputTokens,
|
|
26
|
+
...(typeof usage.total_tokens === "number" ? { totalTokens: usage.total_tokens } : {}),
|
|
27
|
+
...(typeof inputDetails?.cached_tokens === "number" ? { cachedInputTokens: inputDetails.cached_tokens } : {}),
|
|
28
|
+
...(typeof inputDetails?.cache_write_tokens === "number" ? { cacheCreationInputTokens: inputDetails.cache_write_tokens } : {}),
|
|
29
|
+
...(typeof inputDetails?.cache_write_1h_tokens === "number"
|
|
30
|
+
? { cacheCreation1hInputTokens: inputDetails.cache_write_1h_tokens } : {}),
|
|
31
|
+
...(typeof outputDetails?.reasoning_tokens === "number" ? { reasoningOutputTokens: outputDetails.reasoning_tokens } : {}),
|
|
32
|
+
...(hasExtras ? { rawUsage: { ...usage } } : {}),
|
|
33
|
+
};
|
|
34
|
+
}
|