@bitkyc08/opencodex 2.93.0 → 2.95.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-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- 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 +27 -7
- 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-project-context.ts +3 -3
- 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 +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- 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/single-system.ts +24 -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/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- 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 +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- 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 +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- 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 +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- 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 +62 -73
- package/src/cli/init.ts +2 -2
- 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/internal-command.ts +29 -2
- 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-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- 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-approval.ts +15 -1
- 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 +86 -23
- 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-api.ts +2 -2
- 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 +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- 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/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- 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-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- 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 +259 -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 +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -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 +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -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 +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- 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 +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- 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/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- 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 +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- 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 +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- 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/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- 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/file-identity.ts +15 -0
- 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-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- 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/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- 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 +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- 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 +242 -0
- package/src/local-credentials/inventory.ts +405 -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/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- 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/antigravity-discovery-diagnostics.ts +65 -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 +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- 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/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- 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/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -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 +21 -45
- package/src/server/index/websocket-handler.ts +10 -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 +455 -549
- 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 +80 -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/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -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 +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- 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/request-log.ts +30 -2
- 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 +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- 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/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -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 +18 -8
- 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 +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -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 +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- 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/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- 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/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -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 +199 -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 +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- 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 +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -3,13 +3,13 @@ import { normalizeRoutedAgentMessages } from "../routed-agent-messages";
|
|
|
3
3
|
import { frameCompactionHistory } from "../../responses/compaction-history-framing";
|
|
4
4
|
import { nameRoutedIdentity, repairIdentityInResponsesBody, stripRoutedIdentity } from "../identity";
|
|
5
5
|
import { stripBracketedModelSuffix } from "../openai-chat";
|
|
6
|
-
import {
|
|
6
|
+
import { isOpenCodeGoResponsesUrl, isXaiResponsesUrl, promoteResponsesAdditionalTools } from "../opencode-go-additional-tools";
|
|
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 {
|
|
@@ -40,18 +40,21 @@ import {
|
|
|
40
40
|
emittedFastWire,
|
|
41
41
|
} from "../../providers/fastwire";
|
|
42
42
|
import { dropResponsesReasoningInputItems, mapRoutedResponsesReasoningEffort, normalizeConfiguredReasoningSummaryDelivery, sanitizeReasoningInputContent, stripDisabledReasoningSummaries, stripDisabledVerbosity, stripInternalReasoningEnabled, stripNoneReasoningSummary, stripUnsupportedReasoningSummaryDelivery } from "./reasoning";
|
|
43
|
-
import { repairUrlCitationAnnotations, scrubOcxCompactionItems, stripCanonicalOnlyInputItems, stripCanonicalOnlyToolFields, stripCanonicalOnlyTopLevelFields, stripInternalChatMessageMetadataPassthrough, stripInvalidItemIds, stripItemIdsWhenUnstored, stripProviderInputItemMetadata, stripRejectedSamplingParams } from "./request-strips";
|
|
43
|
+
import { repairUrlCitationAnnotations, scrubOcxCompactionItems, stripUnsupportedOutputInclude, stripCanonicalOnlyInputItems, stripCanonicalOnlyToolFields, stripCanonicalOnlyTopLevelFields, stripInternalChatMessageMetadataPassthrough, stripInvalidItemIds, stripItemIdsWhenUnstored, stripProviderInputItemMetadata, stripRejectedSamplingParams } from "./request-strips";
|
|
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";
|
|
51
|
+
import { tagHistoricalInputItems } from "../../responses/item-provenance";
|
|
50
52
|
import { applyTierDecisionToResponsesBody, normalizeCanonicalForwardContinuationEnvelope, normalizeCanonicalForwardPromptEnvelope, stripCanonicalForwardSamplingParams, stripPreviousResponseId, stripStatefulResponsesParams, stripUnsupportedForwardParams } from "./canonical-forward";
|
|
51
53
|
import { normalizeImageGenClientTools, preferConfiguredHostedTools } from "./image-gen";
|
|
52
54
|
import { stripMuseSparkUnsupportedWebSearchFields, stripOpenAiOnlyWebSearchFields } from "./web-search";
|
|
53
55
|
import { observeOutbound } from "../../usage/cache-diagnostic";
|
|
54
56
|
|
|
57
|
+
import { normalizeMuseToolCatalog } from "./muse-tool-catalog";
|
|
55
58
|
import { normalizeMuseToolChoice } from "./muse-tool-choice";
|
|
56
59
|
import { declaresHostedWebSearch, projectHostedSearchHistory, renderCompactionSearchHistoryItems } from "./compaction-search-history";
|
|
57
60
|
import { stripKimiEmptyAssistantMessages } from "./empty-assistant";
|
|
@@ -124,38 +127,6 @@ function buildRoutedCompactionBody(body: unknown, responsesLite: boolean): unkno
|
|
|
124
127
|
};
|
|
125
128
|
}
|
|
126
129
|
|
|
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
130
|
function responsesPayloadText(response: unknown): string {
|
|
160
131
|
if (!isPlainObject(response) || !Array.isArray(response.output)) return "";
|
|
161
132
|
return response.output
|
|
@@ -205,10 +176,27 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
205
176
|
let plaintextV2AgentMessageAliasedToolNames: ReadonlySet<string> | undefined;
|
|
206
177
|
let convertedMuseToolNameAliases: Map<string, string> | undefined;
|
|
207
178
|
const unexpandedMiss = !!parsed.previousResponseId && parsed._previousResponseInputExpanded !== true;
|
|
208
|
-
|
|
209
|
-
|
|
179
|
+
const replayPrefixLen = parsed._replayPrefixLen;
|
|
180
|
+
let outBody = parsed._rawBody;
|
|
181
|
+
// Clone and tag before any input rewrite can remove, replace, or reorder replay items.
|
|
182
|
+
if (
|
|
183
|
+
typeof replayPrefixLen === "number"
|
|
184
|
+
&& replayPrefixLen > 0
|
|
185
|
+
&& isPlainObject(outBody)
|
|
186
|
+
&& Array.isArray(outBody.input)
|
|
187
|
+
) {
|
|
188
|
+
outBody = {
|
|
189
|
+
...outBody,
|
|
190
|
+
input: tagHistoricalInputItems(outBody.input, replayPrefixLen),
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
outBody = stripPreviousResponseId(
|
|
194
|
+
outBody,
|
|
210
195
|
forward || parsed._previousResponseInputExpanded === true,
|
|
211
196
|
);
|
|
197
|
+
if (isMetaAiResponsesDestination(url)) {
|
|
198
|
+
outBody = normalizeMuseToolCatalog(outBody, parsed._replayPrefixLen, provider.supportsResponsesCustomTools);
|
|
199
|
+
}
|
|
212
200
|
if (!forward) outBody = normalizeRoutedAgentMessages(outBody, {
|
|
213
201
|
allowStringContent: isXaiResponsesDestination(provider),
|
|
214
202
|
});
|
|
@@ -266,6 +254,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
266
254
|
if (adjacentToolResults) {
|
|
267
255
|
outBody = normalizeResponsesToolResultAdjacency(outBody);
|
|
268
256
|
}
|
|
257
|
+
const hostedToolSubstitutions: NonNullable<AdapterRequest["hostedToolSubstitutions"]>[number][] = [];
|
|
269
258
|
if (forward) {
|
|
270
259
|
// `metadata` is stripped on every forward route for compatibility with the canonical backend.
|
|
271
260
|
// `max_output_tokens` is stripped only when this provider is the canonical backend.
|
|
@@ -286,6 +275,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
286
275
|
provider,
|
|
287
276
|
parsed.modelId,
|
|
288
277
|
parsed._openAiVirtualSelectedModelId,
|
|
278
|
+
hostedToolSubstitutions,
|
|
289
279
|
);
|
|
290
280
|
outBody = normalizeImageGenClientTools(outBody);
|
|
291
281
|
}
|
|
@@ -337,7 +327,8 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
337
327
|
outBody = stripCanonicalOnlyTopLevelFields(outBody);
|
|
338
328
|
outBody = stripCanonicalOnlyInputItems(outBody);
|
|
339
329
|
}
|
|
340
|
-
|
|
330
|
+
// Meta already captured discoveries from the original current-turn slice.
|
|
331
|
+
if (!isMetaAiResponsesDestination(url)) outBody = promoteClientLoadedTools(outBody);
|
|
341
332
|
}
|
|
342
333
|
if (!isCanonicalOpenAiForwardProvider(provider)) {
|
|
343
334
|
const rewritten = rewriteRoutedCustomToolsForUpstream(
|
|
@@ -367,6 +358,14 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
367
358
|
// OpenCode Go speaks the same dialect, which the final model id and URL identify.
|
|
368
359
|
outBody = normalizeXaiResponsesWebSearch(outBody, provider, { modelId: parsed.modelId, responseUrl: url });
|
|
369
360
|
outBody = injectXaiResponsesXSearch(outBody, provider, parsed._replayPrefixLen);
|
|
361
|
+
// xAI, Meta and Azure answer 400 for `output.encrypted_content` instead of ignoring it;
|
|
362
|
+
// Codex Desktop asks for it on every turn (#7878).
|
|
363
|
+
// Azure also rejects this exact include entry, including on plain Responses routes.
|
|
364
|
+
const isAzureResponses = provider.adapter === "azure" || provider.adapter === "azure-openai"
|
|
365
|
+
|| new URL(url).hostname.toLowerCase().endsWith(".openai.azure.com");
|
|
366
|
+
if (isXaiResponsesDestination(provider) || isMetaAiResponsesDestination(url) || isAzureResponses) {
|
|
367
|
+
outBody = stripUnsupportedOutputInclude(outBody);
|
|
368
|
+
}
|
|
370
369
|
// xAI and explicitly classified compatible gateways reject these OpenAI web_search
|
|
371
370
|
// extensions. Keep them for OpenAI API-key traffic and unclassified gateways.
|
|
372
371
|
if (provider.supportsOpenAiWebSearchToolFields === false) {
|
|
@@ -384,8 +383,15 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
384
383
|
// Last, so promoted namespace children are also cleared of Codex-private fields.
|
|
385
384
|
outBody = stripCanonicalOnlyToolFields(outBody, provider.supportsOpenAiWebSearchToolFields === false);
|
|
386
385
|
}
|
|
387
|
-
if (
|
|
388
|
-
|
|
386
|
+
if (
|
|
387
|
+
provider.promoteAdditionalTools === true
|
|
388
|
+
|| (!forward && (
|
|
389
|
+
isOpenCodeGoResponsesUrl(url)
|
|
390
|
+
|| isXaiResponsesDestination(provider)
|
|
391
|
+
|| isXaiResponsesUrl(url)
|
|
392
|
+
))
|
|
393
|
+
) {
|
|
394
|
+
outBody = promoteResponsesAdditionalTools(outBody);
|
|
389
395
|
}
|
|
390
396
|
// Same native-v2/portable predicate as the routedCompaction gate in handleResponses():
|
|
391
397
|
// neither forward auth nor native v1 endpoint support implies trigger support. The
|
|
@@ -476,6 +482,11 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
476
482
|
finalBody = { ...finalBody, stream: true };
|
|
477
483
|
}
|
|
478
484
|
if (isCanonicalOpenAiForwardProvider(provider)) {
|
|
485
|
+
const overrideAccountId = (provider as { _codexAccountOverride?: { chatgptAccountId?: string } })._codexAccountOverride?.chatgptAccountId
|
|
486
|
+
?? headers["chatgpt-account-id"];
|
|
487
|
+
if ((provider as { _codexAccountOverride?: unknown })._codexAccountOverride && overrideAccountId) {
|
|
488
|
+
finalBody = isolateCodexPoolClientMetadata(finalBody, overrideAccountId);
|
|
489
|
+
}
|
|
479
490
|
const routingHeaders = new Headers(headers);
|
|
480
491
|
applyCodexRoutingHint(routingHeaders, finalBody);
|
|
481
492
|
// Static headers may use mixed casing. Remove every stale spelling
|
|
@@ -529,6 +540,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
|
|
|
529
540
|
method: "POST",
|
|
530
541
|
headers,
|
|
531
542
|
body,
|
|
543
|
+
hostedToolSubstitutions,
|
|
532
544
|
...(isPlainObject(wireBody) && typeof wireBody.model === "string" ? { outboundModelId: wireBody.model } : {}),
|
|
533
545
|
releaseBodyObservation,
|
|
534
546
|
...(convertedRoutedCustomToolNames ? { convertedRoutedCustomToolNames } : {}),
|
|
@@ -71,7 +71,9 @@ export function stripPromptCacheBreakpoints(
|
|
|
71
71
|
if (!isPlainObject(value)) return { value, changed: false, complete: true };
|
|
72
72
|
|
|
73
73
|
let changed = Object.hasOwn(value, "prompt_cache_breakpoint");
|
|
74
|
-
|
|
74
|
+
// Keep symbol provenance when rebuilding an input item or one of its nested fields.
|
|
75
|
+
const next: Record<string, unknown> = { ...value };
|
|
76
|
+
delete next.prompt_cache_breakpoint;
|
|
75
77
|
for (const [key, entry] of Object.entries(value)) {
|
|
76
78
|
if (key === "prompt_cache_breakpoint") continue;
|
|
77
79
|
const rewritten = stripPromptCacheBreakpoints(entry, state, depth + 1);
|
|
@@ -7,6 +7,22 @@ import { isPlainObject } from "./internal";
|
|
|
7
7
|
import { activateDeferredTool } from "./tool-schema";
|
|
8
8
|
import { stripOpenAiOnlyWebSearchFields } from "./web-search";
|
|
9
9
|
|
|
10
|
+
/**
|
|
11
|
+
* Codex requests output.encrypted_content, which xAI, Meta and Azure reject with HTTP 400.
|
|
12
|
+
* The caller gates this on the destination. Preserve reasoning.encrypted_content
|
|
13
|
+
* for stateless replay and leave unknown or malformed values for upstream validation.
|
|
14
|
+
*/
|
|
15
|
+
export function stripUnsupportedOutputInclude(body: unknown): unknown {
|
|
16
|
+
if (!isPlainObject(body) || !Array.isArray(body.include)) return body;
|
|
17
|
+
const include = body.include.filter(item => item !== "output.encrypted_content");
|
|
18
|
+
if (include.length === body.include.length) return body;
|
|
19
|
+
if (include.length === 0) {
|
|
20
|
+
const { include: _dropped, ...rest } = body;
|
|
21
|
+
return rest;
|
|
22
|
+
}
|
|
23
|
+
return { ...body, include };
|
|
24
|
+
}
|
|
25
|
+
|
|
10
26
|
/**
|
|
11
27
|
* Provider-opaque replay metadata is client history, not an OpenAI input-item field (#7111).
|
|
12
28
|
* The caller gates this on OpenAI-operated destinations; arbitrary gateways may accept it.
|
|
@@ -271,12 +287,15 @@ const CANONICAL_ONLY_INPUT_ITEM_TYPES: ReadonlySet<string> = new Set([
|
|
|
271
287
|
* {@link stripCanonicalOnlyTopLevelFields}; the canonical and OpenAI-operated destinations keep
|
|
272
288
|
* the items verbatim and in order. Returns the input unchanged when none is present.
|
|
273
289
|
*/
|
|
290
|
+
export function isCanonicalOnlyInputItem(item: unknown): boolean {
|
|
291
|
+
return isPlainObject(item)
|
|
292
|
+
&& typeof item.type === "string" && CANONICAL_ONLY_INPUT_ITEM_TYPES.has(item.type);
|
|
293
|
+
}
|
|
294
|
+
|
|
274
295
|
export function stripCanonicalOnlyInputItems(body: unknown): unknown {
|
|
275
296
|
if (!isPlainObject(body) || !Array.isArray(body.input)) return body;
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
if (!body.input.some(isPrivate)) return body;
|
|
279
|
-
return { ...body, input: body.input.filter(item => !isPrivate(item)) };
|
|
297
|
+
if (!body.input.some(isCanonicalOnlyInputItem)) return body;
|
|
298
|
+
return { ...body, input: body.input.filter(item => !isCanonicalOnlyInputItem(item)) };
|
|
280
299
|
}
|
|
281
300
|
|
|
282
301
|
/**
|
|
@@ -3,6 +3,7 @@ import { EMPTY_TOOL_OUTPUT_ANNOTATION, isWhitespaceOnlyTextPartArray } from "../
|
|
|
3
3
|
import { isPlainObject } from "./internal";
|
|
4
4
|
import { peekBridgeSearchReplay } from "../../responses/bridge-search-replay-cache";
|
|
5
5
|
import { externalTaskInputResponsesContent } from "../../responses/task-input";
|
|
6
|
+
import { copyItemProvenance } from "../../responses/item-provenance";
|
|
6
7
|
|
|
7
8
|
const MAX_RESPONSES_CALL_ID_LENGTH = 64;
|
|
8
9
|
|
|
@@ -336,7 +337,7 @@ export function restoreBridgedWebSearchCalls(body: unknown, destinationScope: st
|
|
|
336
337
|
if (memo && !occupiedCallIds.has(memo.callId)) {
|
|
337
338
|
changed = true;
|
|
338
339
|
occupiedCallIds.add(memo.callId);
|
|
339
|
-
|
|
340
|
+
const fnCall: Record<string, unknown> = {
|
|
340
341
|
type: "function_call",
|
|
341
342
|
...(memo.sourceItemId ? { id: memo.sourceItemId } : {}),
|
|
342
343
|
call_id: memo.callId,
|
|
@@ -344,8 +345,16 @@ export function restoreBridgedWebSearchCalls(body: unknown, destinationScope: st
|
|
|
344
345
|
// The bridge records the complete arguments text from the call's own done frame; the
|
|
345
346
|
// empty-object fallback matches what a continuation leg would have sent.
|
|
346
347
|
arguments: memo.argumentsText.length > 0 ? memo.argumentsText : "{}",
|
|
347
|
-
}
|
|
348
|
-
|
|
348
|
+
};
|
|
349
|
+
const fnOutput: Record<string, unknown> = {
|
|
350
|
+
type: "function_call_output",
|
|
351
|
+
call_id: memo.callId,
|
|
352
|
+
output: memo.output,
|
|
353
|
+
};
|
|
354
|
+
copyItemProvenance(item, fnCall);
|
|
355
|
+
copyItemProvenance(item, fnOutput);
|
|
356
|
+
restored.push(fnCall);
|
|
357
|
+
restored.push(fnOutput);
|
|
349
358
|
continue;
|
|
350
359
|
}
|
|
351
360
|
}
|
|
@@ -397,7 +406,7 @@ export function repairOrphanedInputItems(
|
|
|
397
406
|
const taskInput = isFnOutput && !hasStringCallId ? externalTaskInputResponsesContent(item) : undefined;
|
|
398
407
|
if (taskInput) {
|
|
399
408
|
changed = true;
|
|
400
|
-
repaired.push({ type: "message", role: "user", content: taskInput });
|
|
409
|
+
repaired.push(copyItemProvenance(item, { type: "message", role: "user", content: taskInput }));
|
|
401
410
|
continue;
|
|
402
411
|
}
|
|
403
412
|
const callId = typeof item.call_id === "string" ? item.call_id : "";
|
|
@@ -409,11 +418,13 @@ export function repairOrphanedInputItems(
|
|
|
409
418
|
const knownNullOutput = callId.length > 0 && item.output == null;
|
|
410
419
|
if (repairOrphanOutputs && !paired && (knownNullOutput || usableOutput)) {
|
|
411
420
|
changed = true;
|
|
412
|
-
|
|
421
|
+
const msg: Record<string, unknown> = {
|
|
413
422
|
type: "message",
|
|
414
423
|
role: "user",
|
|
415
424
|
content: orphanedToolOutputContent(item.output, callId),
|
|
416
|
-
}
|
|
425
|
+
};
|
|
426
|
+
copyItemProvenance(item, msg);
|
|
427
|
+
repaired.push(msg);
|
|
417
428
|
continue;
|
|
418
429
|
}
|
|
419
430
|
}
|
|
@@ -429,9 +440,11 @@ export function repairOrphanedInputItems(
|
|
|
429
440
|
const name = typeof item.name === "string" && item.name.length > 0 ? item.name : callId;
|
|
430
441
|
const text = `[ocx] no tool result was recorded for "${name}"; execution status unknown — do not treat this as success, failure, or user-provided input.`;
|
|
431
442
|
syntheticKeys.add(`${isFnCall ? "function" : "custom"}:${callId}`);
|
|
432
|
-
|
|
443
|
+
const synthetic: Record<string, unknown> = isFnCall
|
|
433
444
|
? { type: "function_call_output", call_id: callId, output: text }
|
|
434
|
-
: { type: "custom_tool_call_output", call_id: callId, output: text }
|
|
445
|
+
: { type: "custom_tool_call_output", call_id: callId, output: text };
|
|
446
|
+
copyItemProvenance(item, synthetic);
|
|
447
|
+
pendingSyntheticOutputs.push(synthetic);
|
|
435
448
|
}
|
|
436
449
|
}
|
|
437
450
|
continue;
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
XaiToolSchemaCompatibilityError,
|
|
9
9
|
} from "../xai-tool-schema";
|
|
10
10
|
import { isPlainObject } from "./internal";
|
|
11
|
+
import { hasItemProvenance, isHistoricalItem } from "../../responses/item-provenance";
|
|
11
12
|
|
|
12
13
|
function normalizeFunctionToolSchema(tool: unknown, xaiTarget: boolean): unknown | undefined {
|
|
13
14
|
if (!isPlainObject(tool) || tool.type !== "function") return tool;
|
|
@@ -195,11 +196,19 @@ function mergeLoadedTools(declaredTools: unknown[], loadedTools: unknown[]): unk
|
|
|
195
196
|
* serializing the raw request, so activate those returned definitions for upstreams that do not
|
|
196
197
|
* implement the native deferred-loading handshake themselves.
|
|
197
198
|
*/
|
|
198
|
-
export function promoteClientLoadedTools(body: unknown): unknown {
|
|
199
|
+
export function promoteClientLoadedTools(body: unknown, replayPrefixLength?: number): unknown {
|
|
199
200
|
if (!isPlainObject(body) || !Array.isArray(body.input)) return body;
|
|
200
201
|
|
|
201
|
-
const
|
|
202
|
-
|
|
202
|
+
const currentTurnStart = Number.isFinite(replayPrefixLength)
|
|
203
|
+
? Math.max(0, Math.trunc(replayPrefixLength!))
|
|
204
|
+
: 0;
|
|
205
|
+
const hasProvenance = body.input.some(hasItemProvenance);
|
|
206
|
+
const isCurrentItem = (item: unknown, index: number): boolean =>
|
|
207
|
+
hasProvenance ? !isHistoricalItem(item) : index >= currentTurnStart;
|
|
208
|
+
|
|
209
|
+
// Filter the source before declarations lose their item's provenance in a live catalog.
|
|
210
|
+
const loadedTools = body.input.flatMap((item, index) =>
|
|
211
|
+
isCurrentItem(item, index) && isPlainObject(item) && item.type === "tool_search_output" && Array.isArray(item.tools)
|
|
203
212
|
? item.tools
|
|
204
213
|
: []
|
|
205
214
|
);
|
|
@@ -210,17 +219,20 @@ export function promoteClientLoadedTools(body: unknown): unknown {
|
|
|
210
219
|
return tools === body.tools ? body : { ...body, tools };
|
|
211
220
|
}
|
|
212
221
|
|
|
213
|
-
const
|
|
214
|
-
isPlainObject(item) && item.type === "additional_tools" && Array.isArray(item.tools)
|
|
222
|
+
const currentAdditionalToolsIndex = body.input.findIndex((item, index) =>
|
|
223
|
+
isCurrentItem(item, index) && isPlainObject(item) && item.type === "additional_tools" && Array.isArray(item.tools)
|
|
215
224
|
);
|
|
216
|
-
if (additionalToolsIndex < 0) return { ...body, tools: mergeLoadedTools([], loadedTools) };
|
|
217
225
|
|
|
218
|
-
|
|
226
|
+
if (currentAdditionalToolsIndex < 0) {
|
|
227
|
+
return { ...body, tools: mergeLoadedTools([], loadedTools) };
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
const additionalTools = body.input[currentAdditionalToolsIndex];
|
|
219
231
|
if (!isPlainObject(additionalTools) || !Array.isArray(additionalTools.tools)) return body;
|
|
220
232
|
const tools = mergeLoadedTools(additionalTools.tools, loadedTools);
|
|
221
233
|
if (tools === additionalTools.tools) return body;
|
|
222
234
|
const input = [...body.input];
|
|
223
|
-
input[
|
|
235
|
+
input[currentAdditionalToolsIndex] = { ...additionalTools, tools };
|
|
224
236
|
return { ...body, input };
|
|
225
237
|
}
|
|
226
238
|
|
|
@@ -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
|
+
}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { hasItemProvenance, isHistoricalItem } from "../responses/item-provenance";
|
|
2
|
+
|
|
1
3
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
2
4
|
return !!value && typeof value === "object" && !Array.isArray(value);
|
|
3
5
|
}
|
|
@@ -20,13 +22,32 @@ export function isOpenCodeGoResponsesUrl(responseUrl: string): boolean {
|
|
|
20
22
|
&& !destination.href.includes("?") && !destination.href.includes("#");
|
|
21
23
|
}
|
|
22
24
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
const XAI_RESPONSES_HOSTS = new Set(["api.x.ai", "cli-chat-proxy.grok.com"]);
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* True when the Responses target is an official xAI endpoint (public API or Grok CLI proxy).
|
|
29
|
+
*/
|
|
30
|
+
export function isXaiResponsesUrl(responseUrl: string): boolean {
|
|
31
|
+
let destination: URL;
|
|
32
|
+
try {
|
|
33
|
+
destination = new URL(responseUrl);
|
|
34
|
+
} catch {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
return destination.protocol === "https:"
|
|
38
|
+
&& XAI_RESPONSES_HOSTS.has(destination.hostname.toLowerCase())
|
|
39
|
+
&& (destination.port === "" || destination.port === "443");
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Promotes client-loaded `additional_tools` input items into top-level `tools` and strips
|
|
44
|
+
* the wrapper from `input`. Required for gateways whose Rust/OpenAI-strict deserializer
|
|
45
|
+
* rejects unknown items in the `input` array.
|
|
46
|
+
*/
|
|
47
|
+
export function promoteResponsesAdditionalTools(
|
|
25
48
|
body: unknown,
|
|
26
|
-
responseUrl: string,
|
|
27
49
|
replayPrefixLength = 0,
|
|
28
50
|
): unknown {
|
|
29
|
-
if (!isOpenCodeGoResponsesUrl(responseUrl)) return body;
|
|
30
51
|
if (!isRecord(body) || !Array.isArray(body.input)) return body;
|
|
31
52
|
// Do not replace a malformed top-level catalog with a partial promoted one.
|
|
32
53
|
if (body.tools !== undefined && !Array.isArray(body.tools)) return body;
|
|
@@ -36,13 +57,15 @@ export function normalizeOpenCodeGoAdditionalTools(
|
|
|
36
57
|
const currentTurnStart = Number.isFinite(replayPrefixLength)
|
|
37
58
|
? Math.min(body.input.length, Math.max(0, Math.trunc(replayPrefixLength)))
|
|
38
59
|
: 0;
|
|
60
|
+
const hasProvenance = body.input.some(hasItemProvenance);
|
|
39
61
|
let changed = false;
|
|
40
62
|
for (const [index, item] of body.input.entries()) {
|
|
41
63
|
if (isRecord(item) && item.type === "additional_tools" && Array.isArray(item.tools)) {
|
|
42
64
|
changed = true;
|
|
43
65
|
// Replayed wrappers are conversation history, not authority for the current request.
|
|
44
|
-
//
|
|
45
|
-
|
|
66
|
+
// Gateways cannot accept the wrapper itself, so remove it without promoting its catalog.
|
|
67
|
+
const isHistorical = hasProvenance ? isHistoricalItem(item) : (index < currentTurnStart);
|
|
68
|
+
if (isHistorical) continue;
|
|
46
69
|
// Custom/search/namespace lowering already owns identity and deduplication. This pass
|
|
47
70
|
// only moves declarations, including hosted tools that intentionally have no name.
|
|
48
71
|
for (const tool of item.tools) promoted.push(tool);
|
|
@@ -52,3 +75,13 @@ export function normalizeOpenCodeGoAdditionalTools(
|
|
|
52
75
|
}
|
|
53
76
|
return changed ? { ...body, input, tools: [...(body.tools ?? []), ...promoted] } : body;
|
|
54
77
|
}
|
|
78
|
+
|
|
79
|
+
/** Console Go accepts public tools but rejects the private additional_tools input wrapper. */
|
|
80
|
+
export function normalizeOpenCodeGoAdditionalTools(
|
|
81
|
+
body: unknown,
|
|
82
|
+
responseUrl: string,
|
|
83
|
+
replayPrefixLength = 0,
|
|
84
|
+
): unknown {
|
|
85
|
+
if (!isOpenCodeGoResponsesUrl(responseUrl)) return body;
|
|
86
|
+
return promoteResponsesAdditionalTools(body, replayPrefixLength);
|
|
87
|
+
}
|
|
@@ -8,6 +8,7 @@ import { baseScopedEnv, runCodingAgentTurn, type CodingAgentDeps, type CodingAge
|
|
|
8
8
|
import { QODER_PROFILES, resolveQoderProfile, type QoderProfile } from "./profiles";
|
|
9
9
|
import { QoderScaffoldFilter, QODER_SCAFFOLD_ERROR_CODE, qoderScaffoldErrorMessage } from "./scaffold-guard";
|
|
10
10
|
import { ToolEnvelopeEchoFilter } from "../../lib/tool-envelope-echo-filter";
|
|
11
|
+
import { buildQoderConversationInput, qoderCnImageInputSupported } from "./image-input";
|
|
11
12
|
|
|
12
13
|
export type QoderAdapterDeps = CodingAgentDeps;
|
|
13
14
|
|
|
@@ -275,21 +276,13 @@ export function createQoderAdapter(provider: OcxProviderConfig, deps: QoderAdapt
|
|
|
275
276
|
yield { type: "error", message: "Qoder adapter uses runTurn; the fetch/parseStream path is disabled." };
|
|
276
277
|
},
|
|
277
278
|
async runTurn(parsed, incoming, emit): Promise<void> {
|
|
278
|
-
if (resolveQoderProfile(provider.baseUrl)?.region === "cn") {
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
message: "Qoder image input is not enabled because the CLI provider route has no verified multimodal contract.",
|
|
286
|
-
status: 400,
|
|
287
|
-
errorType: "invalid_request_error",
|
|
288
|
-
code: "unsupported_input_modality",
|
|
289
|
-
retryable: false,
|
|
290
|
-
});
|
|
291
|
-
return;
|
|
292
|
-
}
|
|
279
|
+
if (resolveQoderProfile(provider.baseUrl)?.region === "cn" && !qoderCnImageInputSupported(parsed)) {
|
|
280
|
+
emit({
|
|
281
|
+
type: "error", status: 400, errorType: "invalid_request_error",
|
|
282
|
+
code: "unsupported_input_modality", retryable: false,
|
|
283
|
+
message: "Qoder CN raw-image routing is verified only with qoderclicn 1.1.70, DeepSeek-Flash or Qwen3.8-Flash, and one base64 PNG in a single user turn on stream-json stdin. URL, multiple-image, tool-result and history replay surfaces remain unverified; use the vision sidecar for those inputs.",
|
|
284
|
+
});
|
|
285
|
+
return;
|
|
293
286
|
}
|
|
294
287
|
let catalog: ReturnType<typeof buildCodingAgentToolCatalog>;
|
|
295
288
|
try {
|
|
@@ -325,6 +318,7 @@ export function createQoderAdapter(provider: OcxProviderConfig, deps: QoderAdapt
|
|
|
325
318
|
const system = buildSystemPrompt(parsed);
|
|
326
319
|
await runCodingAgentTurn({
|
|
327
320
|
profiles: QODER_PROFILES,
|
|
321
|
+
conversationInput: buildQoderConversationInput,
|
|
328
322
|
classifyFailure: classifyQoderFailure,
|
|
329
323
|
provider,
|
|
330
324
|
parsed,
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import type { OcxParsedRequest } from "../../types";
|
|
2
|
+
import { buildConversationInput } from "../coding-agent/protocol";
|
|
3
|
+
|
|
4
|
+
// Local resource policy: #7516 verifies a 96x96 PNG, not a vendor size maximum.
|
|
5
|
+
// 1 MiB leaves ample room over its 36 KiB RGBA raster while bounding stdin copies.
|
|
6
|
+
const MAX_CN_PNG_BYTES = 1024 * 1024;
|
|
7
|
+
const PNG_DATA_PREFIX = "data:image/png;base64,";
|
|
8
|
+
const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
|
|
9
|
+
const PNG_DEPTHS: Readonly<Record<number, readonly number[]>> = {
|
|
10
|
+
0: [1, 2, 4, 8, 16], 2: [8, 16], 3: [1, 2, 4, 8], 4: [8, 16], 6: [8, 16],
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
function boundedPngDataUrl(imageUrl: string): boolean {
|
|
14
|
+
// Bound encoded input before slicing, scanning, decoding or making stdin copies.
|
|
15
|
+
if (!imageUrl.startsWith(PNG_DATA_PREFIX)
|
|
16
|
+
|| imageUrl.length > PNG_DATA_PREFIX.length + 4 * Math.ceil(MAX_CN_PNG_BYTES / 3)) return false;
|
|
17
|
+
const data = imageUrl.slice(PNG_DATA_PREFIX.length);
|
|
18
|
+
if (!data.length || data.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(data)) return false;
|
|
19
|
+
const padding = data.endsWith("==") ? 2 : data.endsWith("=") ? 1 : 0;
|
|
20
|
+
if (data.length / 4 * 3 - padding > MAX_CN_PNG_BYTES) return false;
|
|
21
|
+
const bytes = Buffer.from(data, "base64");
|
|
22
|
+
// Bun's decoder is permissive; round-trip also rejects nonzero padding bits.
|
|
23
|
+
if (bytes.toString("base64") !== data || bytes.length < 33
|
|
24
|
+
|| !bytes.subarray(0, 8).equals(PNG_SIGNATURE)
|
|
25
|
+
|| bytes.readUInt32BE(8) !== 13 || bytes.readUInt32BE(12) !== 0x49484452) return false;
|
|
26
|
+
const width = bytes.readUInt32BE(16);
|
|
27
|
+
const height = bytes.readUInt32BE(20);
|
|
28
|
+
// Minimal IHDR validation only; this does not decompress or validate all chunks.
|
|
29
|
+
return width > 0 && width <= 0x7fffffff && height > 0 && height <= 0x7fffffff
|
|
30
|
+
&& (PNG_DEPTHS[bytes[25]!] ?? []).includes(bytes[24]!)
|
|
31
|
+
&& bytes[26] === 0 && bytes[27] === 0 && (bytes[28] === 0 || bytes[28] === 1);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** #7516 live evidence: qoderclicn 1.1.70, one user PNG on stream-json stdin. */
|
|
35
|
+
export function qoderCnImageInputSupported(parsed: OcxParsedRequest): boolean {
|
|
36
|
+
const messages = parsed.context.messages;
|
|
37
|
+
const imageMessages = messages.filter(message => Array.isArray(message.content)
|
|
38
|
+
&& message.content.some(part => part.type === "image"));
|
|
39
|
+
if (imageMessages.length === 0) return true;
|
|
40
|
+
const nonDev = messages.filter(message => message.role !== "developer");
|
|
41
|
+
if (imageMessages.length !== 1 || nonDev.length !== 1 || imageMessages[0] !== nonDev[0]
|
|
42
|
+
|| nonDev[0]!.role !== "user"
|
|
43
|
+
|| !["DeepSeek-Flash", "Qwen3.8-Flash"].includes(parsed.modelId)) return false;
|
|
44
|
+
const content = nonDev[0]!.content;
|
|
45
|
+
if (!Array.isArray(content)) return false;
|
|
46
|
+
const images = content.filter(part => part.type === "image");
|
|
47
|
+
return images.length === 1 && boundedPngDataUrl(images[0]!.imageUrl);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** Keep Qoder omission markers out of CodeBuddy's and Claude's replay formats. */
|
|
51
|
+
export const buildQoderConversationInput: typeof buildConversationInput = (parsed, options = {}) =>
|
|
52
|
+
buildConversationInput(parsed, { ...options, markUnsupportedImages: true });
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { hasItemProvenance, isHistoricalItem, REPLAY_HISTORICAL_ITEM } from "../responses/item-provenance";
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* `agent_message` is Codex's private multi-agent input item: it exists only in the ChatGPT
|
|
3
5
|
* Codex backend's schema. Codex replays every sub-agent reply in the history it sends, so
|
|
@@ -36,6 +38,7 @@ export function normalizeRoutedAgentMessages(
|
|
|
36
38
|
changed = true;
|
|
37
39
|
return {
|
|
38
40
|
type: "message", role: "user",
|
|
41
|
+
...(hasItemProvenance(message) ? { [REPLAY_HISTORICAL_ITEM]: isHistoricalItem(message) } : {}),
|
|
39
42
|
content: [
|
|
40
43
|
...(Object.keys(identities).length ? [{ type: "input_text", text: `Agent message ${JSON.stringify(identities)}` }] : []),
|
|
41
44
|
...content,
|