@bitkyc08/opencodex 2.94.0 → 2.96.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.
Files changed (289) hide show
  1. package/gui/dist/assets/App-B4j-Txmb.css +1 -0
  2. package/gui/dist/assets/App-bwugJRKn.js +58 -0
  3. package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-BOPQyDbH.js} +1 -1
  4. package/gui/dist/assets/index-ebuVUtB7.js +94 -0
  5. package/gui/dist/assets/quota-summary-6HsrHQAy.js +1 -0
  6. package/gui/dist/index.html +1 -1
  7. package/package.json +1 -1
  8. package/src/adapters/anthropic.ts +10 -3
  9. package/src/adapters/command-code-project-context.ts +3 -3
  10. package/src/adapters/kiro/adapter.ts +4 -1
  11. package/src/adapters/kiro/stream.ts +1 -0
  12. package/src/adapters/kiro-events.ts +1 -0
  13. package/src/adapters/ollama-native.ts +10 -6
  14. package/src/adapters/openai-chat/messages.ts +20 -7
  15. package/src/adapters/openai-chat/passthrough.ts +4 -2
  16. package/src/adapters/openai-chat/single-system.ts +24 -0
  17. package/src/adapters/openai-responses/canonical-forward.ts +50 -13
  18. package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
  19. package/src/adapters/openai-responses/passthrough.ts +45 -11
  20. package/src/adapters/openai-responses/prompt-cache.ts +3 -1
  21. package/src/adapters/openai-responses/request-strips.ts +23 -4
  22. package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
  23. package/src/adapters/openai-responses/tool-schema.ts +20 -8
  24. package/src/adapters/openai-responses/transport.ts +17 -26
  25. package/src/adapters/opencode-go-additional-tools.ts +39 -6
  26. package/src/adapters/qoder/adapter.ts +1 -1
  27. package/src/adapters/qoder/image-input.ts +5 -2
  28. package/src/adapters/routed-agent-messages.ts +3 -0
  29. package/src/adapters/xai-web-search.ts +6 -3
  30. package/src/adapters/zed-additional-tools.ts +7 -7
  31. package/src/adapters/zed.ts +1 -6
  32. package/src/advisor/consult.ts +22 -10
  33. package/src/advisor/runtime.ts +10 -4
  34. package/src/bridge/max-output-completion.ts +41 -0
  35. package/src/bridge/response-json.ts +9 -4
  36. package/src/bridge/sse.ts +13 -2
  37. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
  38. package/src/chatgpt/app-server-shim/launcher.ts +40 -6
  39. package/src/claude/compatibility.ts +5 -1
  40. package/src/claude/desktop-3p.ts +27 -6
  41. package/src/claude/desktop-model-visibility.ts +141 -0
  42. package/src/claude/desktop-remote-store-io.ts +8 -8
  43. package/src/claude/inbound-content-options.ts +11 -1
  44. package/src/claude/intercept/proxy-auth.ts +16 -16
  45. package/src/cli/account-main.ts +3 -2
  46. package/src/cli/agent.ts +44 -15
  47. package/src/cli/capabilities-agents-routing.ts +9 -0
  48. package/src/cli/capabilities-provider-models.ts +7 -0
  49. package/src/cli/chatgpt-command.ts +1 -1
  50. package/src/cli/codex-launcher.ts +20 -8
  51. package/src/cli/codex-shim-autorestore.ts +19 -1
  52. package/src/cli/dispatch.ts +6 -6
  53. package/src/cli/doctor.ts +5 -5
  54. package/src/cli/ensure-desired-integrations.ts +4 -3
  55. package/src/cli/index.ts +8 -10
  56. package/src/cli/init.ts +2 -2
  57. package/src/cli/internal-command.ts +29 -2
  58. package/src/cli/message-command.ts +2 -1
  59. package/src/cli/message-mcp-command.ts +29 -0
  60. package/src/cli/provider-cc-switch-import.ts +185 -0
  61. package/src/cli/provider.ts +5 -0
  62. package/src/cli/registry.ts +2 -1
  63. package/src/cli/restart-scope.ts +2 -2
  64. package/src/cli/root.ts +6 -6
  65. package/src/cli/stop-approval.ts +15 -1
  66. package/src/cli/v2.ts +69 -19
  67. package/src/client/machine-api.ts +2 -2
  68. package/src/clients/config-export.ts +14 -3
  69. package/src/codex/account-cooldown-response.ts +18 -0
  70. package/src/codex/account-store.ts +1 -0
  71. package/src/codex/app-server-restart-service.ts +2 -2
  72. package/src/codex/auth-api/login-flow.ts +2 -2
  73. package/src/codex/auth-api/pool-quota-probe.ts +2 -2
  74. package/src/codex/auth-context-provider.ts +15 -0
  75. package/src/codex/auth-context.ts +14 -23
  76. package/src/codex/catalog/bundled.ts +10 -3
  77. package/src/codex/catalog/metadata.ts +4 -5
  78. package/src/codex/catalog/native-omission.ts +28 -0
  79. package/src/codex/catalog/native-template.ts +58 -0
  80. package/src/codex/catalog/parsing.ts +3 -29
  81. package/src/codex/catalog/provider-models.ts +2 -1
  82. package/src/codex/catalog/retained-sync.ts +15 -5
  83. package/src/codex/catalog/write-audit.ts +18 -18
  84. package/src/codex/cli-install-provenance.ts +46 -45
  85. package/src/codex/cli-update-artifacts.ts +8 -6
  86. package/src/codex/cli-update-job-store-windows.ts +99 -27
  87. package/src/codex/cli-update-job-worker.ts +3 -11
  88. package/src/codex/cli-update-recovery.ts +54 -8
  89. package/src/codex/cli-update-selection-gate.ts +74 -4
  90. package/src/codex/cli-windows-plan-provenance.ts +37 -19
  91. package/src/codex/codex-home-owner.ts +9 -8
  92. package/src/codex/convergence.ts +13 -3
  93. package/src/codex/coordinator-doctor.ts +14 -8
  94. package/src/codex/desktop-app/handoff.ts +1 -1
  95. package/src/codex/desktop-app-restart.ts +11 -1
  96. package/src/codex/exec-boundary.ts +26 -5
  97. package/src/codex/forward-transport-headers.ts +33 -33
  98. package/src/codex/history-provider.ts +11 -10
  99. package/src/codex/inject/bounded-config-reader.ts +14 -13
  100. package/src/codex/installation-id.ts +72 -0
  101. package/src/codex/main-account.ts +6 -6
  102. package/src/codex/native-main-lock-file.ts +13 -12
  103. package/src/codex/native-residue.ts +18 -14
  104. package/src/codex/orca-auth-source.ts +8 -7
  105. package/src/codex/quota-types.ts +5 -0
  106. package/src/codex/quota.ts +49 -7
  107. package/src/codex/role-auto-assign.ts +50 -26
  108. package/src/codex/role-capability.ts +160 -0
  109. package/src/codex/role-sizing.ts +24 -6
  110. package/src/codex/routing/cooldown-math.ts +3 -2
  111. package/src/codex/runtime.ts +43 -3
  112. package/src/codex/shim-fingerprint.ts +11 -9
  113. package/src/codex/shim-inspect.ts +3 -2
  114. package/src/codex/shim-restore-lock.ts +11 -14
  115. package/src/codex/shim-state-file.ts +22 -14
  116. package/src/codex/shim-wrapper-write.ts +7 -6
  117. package/src/codex/shim.ts +25 -2
  118. package/src/codex/transition-state.ts +5 -4
  119. package/src/combos/failover.ts +43 -4
  120. package/src/config/atomic-write.ts +38 -7
  121. package/src/config/diagnostics.ts +3 -0
  122. package/src/config/initialize.ts +6 -6
  123. package/src/config/load-degrade.ts +2 -0
  124. package/src/config/process-state.ts +23 -5
  125. package/src/config/salvage.ts +1 -0
  126. package/src/config/schema/config-schema.ts +29 -1
  127. package/src/config/schema/leaf-validators.ts +7 -0
  128. package/src/config/schema/workflow-budget.ts +43 -0
  129. package/src/config/tracked-runtime-inspection.ts +188 -0
  130. package/src/generated/compatibility-version.json +380 -244
  131. package/src/grok/sync.ts +10 -1
  132. package/src/integrations/aside-profile-context.ts +1 -1
  133. package/src/integrations/droid-settings.ts +4 -4
  134. package/src/integrations/hermes-profiles.ts +3 -3
  135. package/src/lib/bounded-file-read.ts +3 -9
  136. package/src/lib/bun-runtime-preflight.ts +9 -8
  137. package/src/lib/file-identity.ts +15 -0
  138. package/src/lib/local-chat-completion.ts +8 -6
  139. package/src/lib/local-destinations.ts +32 -3
  140. package/src/lib/redact-folding.ts +9 -0
  141. package/src/lib/spend-pool-alias-validation.ts +6 -6
  142. package/src/lib/state-store-registrations.ts +2 -0
  143. package/src/lib/test-home-guard.ts +37 -9
  144. package/src/lib/windows-secret-acl.ts +49 -31
  145. package/src/lib/workflow-budget-config.ts +39 -0
  146. package/src/local-credentials/generation.ts +6 -2
  147. package/src/local-credentials/inventory.ts +132 -8
  148. package/src/messaging/mcp-queue-rpc.ts +102 -0
  149. package/src/messaging/mcp-queue-server.ts +42 -0
  150. package/src/messaging/mcp-queue-tools.ts +39 -0
  151. package/src/messaging/remote-forward-failure.ts +35 -0
  152. package/src/messaging/remote-ports.ts +27 -5
  153. package/src/messaging/remote-process.ts +30 -4
  154. package/src/messaging/remote-tunnels.ts +80 -15
  155. package/src/oauth/anthropic-identity.ts +2 -6
  156. package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
  157. package/src/oauth/google-antigravity.ts +23 -10
  158. package/src/oauth/index.ts +7 -0
  159. package/src/oauth/kiro-device-login.ts +87 -30
  160. package/src/oauth/kiro-iam-identity-center.ts +107 -0
  161. package/src/oauth/store.ts +9 -7
  162. package/src/providers/account-quota-disk.ts +18 -4
  163. package/src/providers/anthropic-subscription.ts +25 -0
  164. package/src/providers/cc-switch-import-bytes.ts +991 -0
  165. package/src/providers/cc-switch-import-source.ts +1083 -0
  166. package/src/providers/cc-switch-import.ts +942 -0
  167. package/src/providers/claude-cli-usage.ts +15 -67
  168. package/src/providers/derive.ts +6 -0
  169. package/src/providers/model-discovery-diagnostic.ts +4 -0
  170. package/src/providers/model-discovery.ts +4 -4
  171. package/src/providers/model-rename-fields.ts +2 -0
  172. package/src/providers/model-rename-migration.ts +41 -6
  173. package/src/providers/quota/anthropic-decision-windows.ts +5 -19
  174. package/src/providers/quota/anthropic-usage-windows.ts +55 -0
  175. package/src/providers/quota/report-cache.ts +17 -4
  176. package/src/providers/quota.ts +2 -2
  177. package/src/providers/reasoning-metadata.ts +31 -15
  178. package/src/providers/registry/entries-core.ts +1 -1
  179. package/src/providers/registry/entries-extended.ts +1 -1
  180. package/src/providers/registry/model-ids.ts +1 -0
  181. package/src/providers/registry/model-seeds.ts +2 -1
  182. package/src/providers/registry/types.ts +3 -1
  183. package/src/providers/resolved-model-policy.ts +2 -2
  184. package/src/providers/routed-config.ts +2 -0
  185. package/src/providers/stale-model-roster-migration.ts +5 -1
  186. package/src/providers/xai-transport.ts +4 -4
  187. package/src/remote-control/workspace-codex-runtime.ts +2 -2
  188. package/src/remote-control/workspace-executor.ts +14 -13
  189. package/src/responses/custom-tool-compat.ts +2 -1
  190. package/src/responses/item-provenance.ts +79 -0
  191. package/src/responses/namespace-tool-compat.ts +21 -3
  192. package/src/responses/parser-tools.ts +1 -0
  193. package/src/responses/schema.ts +5 -2
  194. package/src/router.ts +21 -2
  195. package/src/routing/analytics.ts +3 -5
  196. package/src/routing/fallback-policy.ts +7 -3
  197. package/src/routing/health.ts +5 -3
  198. package/src/routing/history/build-file.ts +6 -0
  199. package/src/routing/history/indexer.ts +158 -31
  200. package/src/routing/history/ingest.ts +1 -1
  201. package/src/routing/history/integrity.ts +208 -0
  202. package/src/routing/history/rebuild-job.ts +20 -6
  203. package/src/routing/history/rebuild-protocol.ts +2 -1
  204. package/src/routing/history/rebuild-worker.ts +18 -0
  205. package/src/routing/history/sqlite-errors.ts +9 -0
  206. package/src/server/admission-model-scope.ts +21 -4
  207. package/src/server/advisor-admission-scope.ts +29 -0
  208. package/src/server/audio-dictation.ts +3 -0
  209. package/src/server/audio-live.ts +8 -2
  210. package/src/server/audio-upstream.ts +2 -0
  211. package/src/server/auth-cors.ts +5 -2
  212. package/src/server/capture-admission-policy.ts +91 -0
  213. package/src/server/chat-completions.ts +33 -7
  214. package/src/server/claude-messages.ts +93 -2
  215. package/src/server/codex-model-list.ts +2 -1
  216. package/src/server/configured-credentials.ts +5 -0
  217. package/src/server/context-history.ts +9 -6
  218. package/src/server/images.ts +14 -5
  219. package/src/server/index/live-sideband.ts +16 -2
  220. package/src/server/index/serve-options.ts +13 -2
  221. package/src/server/index/websocket-handler.ts +4 -1
  222. package/src/server/live.ts +30 -5
  223. package/src/server/management/agent-settings-routes.ts +34 -9
  224. package/src/server/management/codex-agent-role-routes.ts +1 -0
  225. package/src/server/management/codex-role-auto-assign.ts +50 -6
  226. package/src/server/management/config-routes.ts +15 -4
  227. package/src/server/management/context.ts +3 -0
  228. package/src/server/management/native-integration-routes.ts +22 -0
  229. package/src/server/management/oauth-account-routes.ts +20 -4
  230. package/src/server/management/provider-overwrite-carry.ts +21 -0
  231. package/src/server/management/provider-routes.ts +3 -1
  232. package/src/server/management/route-registry.ts +2 -0
  233. package/src/server/management/shared.ts +17 -1
  234. package/src/server/management/workflow-budget-routes.ts +70 -3
  235. package/src/server/messages-native-eligibility.ts +6 -5
  236. package/src/server/messages-native-scope.ts +6 -1
  237. package/src/server/messages-shared.ts +57 -17
  238. package/src/server/persistent-gui-session.ts +4 -4
  239. package/src/server/request-log.ts +30 -2
  240. package/src/server/responses/adapter-delivery.ts +4 -0
  241. package/src/server/responses/adapter-dispatch.ts +5 -0
  242. package/src/server/responses/advisor-plan-slot.ts +4 -0
  243. package/src/server/responses/advisor-slot.ts +73 -46
  244. package/src/server/responses/codex-auth-error.ts +9 -1
  245. package/src/server/responses/combo-required-tool-contract.ts +39 -0
  246. package/src/server/responses/compact.ts +41 -20
  247. package/src/server/responses/core-codex-account.ts +17 -6
  248. package/src/server/responses/core-combo-failure.ts +2 -0
  249. package/src/server/responses/core-combo.ts +70 -5
  250. package/src/server/responses/core-lifetime.ts +4 -0
  251. package/src/server/responses/core-normalize.ts +7 -1
  252. package/src/server/responses/core-options.ts +9 -0
  253. package/src/server/responses/core.ts +2 -0
  254. package/src/server/responses/jev-model-invoke.ts +4 -2
  255. package/src/server/responses/passthrough-build-error.ts +36 -0
  256. package/src/server/responses/passthrough-dispatch.ts +10 -24
  257. package/src/server/responses/policy-fallback.ts +2 -0
  258. package/src/server/responses/request-prepare.ts +4 -5
  259. package/src/server/responses/request-send-budget.ts +2 -1
  260. package/src/server/responses/request-sidecar-auth.ts +4 -1
  261. package/src/server/responses/request-transport.ts +2 -3
  262. package/src/server/responses/run-turn-execution.ts +4 -0
  263. package/src/server/responses/sidecar-execution.ts +21 -5
  264. package/src/server/responses-snapshot-repair.ts +18 -4
  265. package/src/server/responses-undeclared-tool-guard.ts +4 -0
  266. package/src/server/search.ts +13 -4
  267. package/src/server/workflow-refusal.ts +2 -1
  268. package/src/server/ws-bridge.ts +5 -2
  269. package/src/service/state-lock.ts +12 -11
  270. package/src/service-manager-probe.ts +53 -8
  271. package/src/types/admission-policy.ts +13 -0
  272. package/src/types/config.ts +25 -0
  273. package/src/types/provider.ts +10 -0
  274. package/src/types/request.ts +7 -0
  275. package/src/types.ts +1 -0
  276. package/src/update/job.ts +20 -0
  277. package/src/update/worker-launch.ts +71 -1
  278. package/src/usage/log.ts +25 -4
  279. package/src/vision/describe.ts +4 -7
  280. package/src/vision/index.ts +2 -0
  281. package/src/vision/plan.ts +4 -0
  282. package/src/vision/routed-describe.ts +38 -23
  283. package/src/web-search/executor.ts +4 -7
  284. package/src/web-search/loop.ts +104 -9
  285. package/src/web-search/parse.ts +10 -2
  286. package/gui/dist/assets/App-DMps4OLk.css +0 -1
  287. package/gui/dist/assets/App-DmvwlhQq.js +0 -58
  288. package/gui/dist/assets/index-3EPO_KbX.js +0 -94
  289. package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
@@ -3,7 +3,7 @@ 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 { normalizeOpenCodeGoAdditionalTools } from "../opencode-go-additional-tools";
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";
@@ -40,7 +40,7 @@ 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";
@@ -48,11 +48,13 @@ import { usageFromResponsesPayload } from "./usage";
48
48
  import { normalizeToolSchemas, promoteClientLoadedTools, stripUnsupportedHostedTools } from "./tool-schema";
49
49
  import { annotateEmptyResponsesToolOutputs, backfillWebSearchQueries, normalizeResponsesToolResultAdjacency, repairOrphanedInputItems, repairOversizedReplayCallIds, repairUnidentifiedToolOutputItems, restoreBridgedWebSearchCalls } from "./tool-output-recovery";
50
50
  import { bridgeSearchReplayScope } from "../../responses/bridge-search-replay-cache";
51
+ import { tagHistoricalInputItems } from "../../responses/item-provenance";
51
52
  import { applyTierDecisionToResponsesBody, normalizeCanonicalForwardContinuationEnvelope, normalizeCanonicalForwardPromptEnvelope, stripCanonicalForwardSamplingParams, stripPreviousResponseId, stripStatefulResponsesParams, stripUnsupportedForwardParams } from "./canonical-forward";
52
53
  import { normalizeImageGenClientTools, preferConfiguredHostedTools } from "./image-gen";
53
54
  import { stripMuseSparkUnsupportedWebSearchFields, stripOpenAiOnlyWebSearchFields } from "./web-search";
54
55
  import { observeOutbound } from "../../usage/cache-diagnostic";
55
56
 
57
+ import { normalizeMuseToolCatalog } from "./muse-tool-catalog";
56
58
  import { normalizeMuseToolChoice } from "./muse-tool-choice";
57
59
  import { declaresHostedWebSearch, projectHostedSearchHistory, renderCompactionSearchHistoryItems } from "./compaction-search-history";
58
60
  import { stripKimiEmptyAssistantMessages } from "./empty-assistant";
@@ -174,10 +176,27 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
174
176
  let plaintextV2AgentMessageAliasedToolNames: ReadonlySet<string> | undefined;
175
177
  let convertedMuseToolNameAliases: Map<string, string> | undefined;
176
178
  const unexpandedMiss = !!parsed.previousResponseId && parsed._previousResponseInputExpanded !== true;
177
- let outBody = stripPreviousResponseId(
178
- parsed._rawBody,
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,
179
195
  forward || parsed._previousResponseInputExpanded === true,
180
196
  );
197
+ if (isMetaAiResponsesDestination(url)) {
198
+ outBody = normalizeMuseToolCatalog(outBody, parsed._replayPrefixLen, provider.supportsResponsesCustomTools);
199
+ }
181
200
  if (!forward) outBody = normalizeRoutedAgentMessages(outBody, {
182
201
  allowStringContent: isXaiResponsesDestination(provider),
183
202
  });
@@ -308,7 +327,8 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
308
327
  outBody = stripCanonicalOnlyTopLevelFields(outBody);
309
328
  outBody = stripCanonicalOnlyInputItems(outBody);
310
329
  }
311
- outBody = promoteClientLoadedTools(outBody);
330
+ // Meta already captured discoveries from the original current-turn slice.
331
+ if (!isMetaAiResponsesDestination(url)) outBody = promoteClientLoadedTools(outBody);
312
332
  }
313
333
  if (!isCanonicalOpenAiForwardProvider(provider)) {
314
334
  const rewritten = rewriteRoutedCustomToolsForUpstream(
@@ -338,6 +358,14 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
338
358
  // OpenCode Go speaks the same dialect, which the final model id and URL identify.
339
359
  outBody = normalizeXaiResponsesWebSearch(outBody, provider, { modelId: parsed.modelId, responseUrl: url });
340
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
+ }
341
369
  // xAI and explicitly classified compatible gateways reject these OpenAI web_search
342
370
  // extensions. Keep them for OpenAI API-key traffic and unclassified gateways.
343
371
  if (provider.supportsOpenAiWebSearchToolFields === false) {
@@ -355,8 +383,15 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
355
383
  // Last, so promoted namespace children are also cleared of Codex-private fields.
356
384
  outBody = stripCanonicalOnlyToolFields(outBody, provider.supportsOpenAiWebSearchToolFields === false);
357
385
  }
358
- if (!forward) {
359
- outBody = normalizeOpenCodeGoAdditionalTools(outBody, url, parsed._replayPrefixLen);
386
+ if (
387
+ provider.promoteAdditionalTools === true
388
+ || (!forward && (
389
+ isOpenCodeGoResponsesUrl(url)
390
+ || isXaiResponsesDestination(provider)
391
+ || isXaiResponsesUrl(url)
392
+ ))
393
+ ) {
394
+ outBody = promoteResponsesAdditionalTools(outBody);
360
395
  }
361
396
  // Same native-v2/portable predicate as the routedCompaction gate in handleResponses():
362
397
  // neither forward auth nor native v1 endpoint support implies trigger support. The
@@ -447,10 +482,9 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
447
482
  finalBody = { ...finalBody, stream: true };
448
483
  }
449
484
  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);
485
+ const override = (provider as { _codexAccountOverride?: { chatgptAccountId: string; kind?: string } })._codexAccountOverride;
486
+ if (override && override.kind !== "main-pool") {
487
+ finalBody = isolateCodexPoolClientMetadata(finalBody, override.chatgptAccountId);
454
488
  }
455
489
  const routingHeaders = new Headers(headers);
456
490
  applyCodexRoutingHint(routingHeaders, finalBody);
@@ -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
- const next: Record<string, unknown> = {};
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
- const isPrivate = (item: unknown): boolean => isPlainObject(item)
277
- && typeof item.type === "string" && CANONICAL_ONLY_INPUT_ITEM_TYPES.has(item.type);
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
- restored.push({
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
- restored.push({ type: "function_call_output", call_id: memo.callId, output: memo.output });
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
- repaired.push({
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
- pendingSyntheticOutputs.push(isFnCall
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 loadedTools = body.input.flatMap(item =>
202
- isPlainObject(item) && item.type === "tool_search_output" && Array.isArray(item.tools)
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 additionalToolsIndex = body.input.findIndex(item =>
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
- const additionalTools = body.input[additionalToolsIndex];
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[additionalToolsIndex] = { ...additionalTools, tools };
235
+ input[currentAdditionalToolsIndex] = { ...additionalTools, tools };
224
236
  return { ...body, input };
225
237
  }
226
238
 
@@ -1,25 +1,17 @@
1
1
  import type { IncomingMeta } from "../base";
2
2
  import type { OcxProviderConfig } from "../../types";
3
3
  import {
4
+ FORWARD_HEADERS,
4
5
  CODEX_ATTESTATION_HEADER,
5
- CODEX_INSTALLATION_ID_HEADER,
6
6
  CODEX_RESPONSES_LITE_HEADER,
7
- CODEX_TURN_METADATA_HEADER,
8
- deriveCodexAccountInstallationId,
9
- rewriteTurnMetadataInstallationId,
7
+ isolateCodexPoolAccountHeaders,
10
8
  } from "../../codex/forward-transport-headers";
11
9
  import { CODEX_FORWARD_BASE_URL, isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers-destination";
12
10
  import { normalizeForwardedClientHeaderName } from "../../lib/provider-client-headers";
13
11
  import { AGENT_ASSERTION_HEADER } from "../../lib/authorization-scheme";
14
12
  import { openaiResponsesUrl } from "../openai-responses-url";
15
13
 
16
- // Caller credentials are forwarded only to the canonical Codex destination, never by capability.
17
- export const FORWARD_HEADERS = [
18
- "authorization", "chatgpt-account-id", "openai-beta", "originator", "session_id", "session-id",
19
- "thread-id", "x-client-request-id", "x-codex-beta-features", "x-codex-installation-id",
20
- "x-codex-parent-thread-id", "x-codex-turn-metadata", "x-codex-turn-state", "x-codex-window-id",
21
- "x-oai-attestation", "x-openai-subagent", "x-responsesapi-include-timing-metrics", "version", CODEX_RESPONSES_LITE_HEADER,
22
- ];
14
+ export { FORWARD_HEADERS } from "../../codex/forward-transport-headers";
23
15
 
24
16
  /** Carry permitted client metadata across an internal compact handoff, never credentials. */
25
17
  export function copyResponsesClientMetadata(target: Headers, incoming: Headers, provider: OcxProviderConfig): void {
@@ -55,16 +47,20 @@ export function buildResponsesTransport(provider: OcxProviderConfig, incoming: P
55
47
  url = `${baseUrl}/responses`;
56
48
  if (provider.headers) Object.assign(headers, provider.headers);
57
49
  const runtimeProvider = provider as {
58
- _codexAccountOverride?: { accessToken: string; chatgptAccountId: string };
50
+ _codexAccountOverride?: { accessToken: string; chatgptAccountId: string; kind?: "pool" | "main-pool" };
59
51
  _codexAccountRequired?: boolean;
60
52
  };
61
53
  if (mayForwardCallerCredentials && runtimeProvider._codexAccountRequired && !runtimeProvider._codexAccountOverride) {
62
54
  throw new Error("Codex pool account auth is required but unavailable");
63
55
  }
64
56
  if (mayForwardCallerCredentials) {
57
+ // Caller-existence gates also apply when provider defaults use mixed casing.
58
+ for (const name of Object.keys(headers)) {
59
+ if (["x-codex-installation-id", "x-codex-turn-metadata", CODEX_ATTESTATION_HEADER].includes(name.toLowerCase())) delete headers[name];
60
+ }
65
61
  for (const name of FORWARD_HEADERS) {
66
62
  const value = incoming.headers.get(name);
67
- if (!value) continue;
63
+ if (value === null) continue;
68
64
  if (name === CODEX_RESPONSES_LITE_HEADER) {
69
65
  for (const existing of Object.keys(headers)) {
70
66
  if (existing.toLowerCase() === name) delete headers[existing];
@@ -75,19 +71,14 @@ export function buildResponsesTransport(provider: OcxProviderConfig, incoming: P
75
71
  }
76
72
  const override = runtimeProvider._codexAccountOverride;
77
73
  if (override && mayForwardCallerCredentials) {
78
- headers.authorization = `Bearer ${override.accessToken}`;
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
- }
74
+ const selected = new Headers(headers);
75
+ selected.set("authorization", `Bearer ${override.accessToken}`);
76
+ selected.set("chatgpt-account-id", override.chatgptAccountId);
77
+ selected.delete(CODEX_ATTESTATION_HEADER);
78
+ if (override.kind !== "main-pool") isolateCodexPoolAccountHeaders(selected, override.chatgptAccountId);
79
+ // Replace every casing of managed fields after static headers and caller headers merge.
80
+ for (const name of Object.keys(headers)) delete headers[name];
81
+ selected.forEach((value, name) => { headers[name] = value; });
91
82
  } else if (mayForwardCallerCredentials) {
92
83
  // dual_header runtime assertion: first-party Direct only, beside the caller's own Bearer.
93
84
  // A pool override above never carries it, and non-canonical transports never see it.
@@ -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
- /** Console Go accepts public tools but rejects the private additional_tools input wrapper. */
24
- export function normalizeOpenCodeGoAdditionalTools(
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
- // Go cannot accept the wrapper itself, so remove it without promoting its catalog.
45
- if (index < currentTurnStart) continue;
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
+ }
@@ -280,7 +280,7 @@ export function createQoderAdapter(provider: OcxProviderConfig, deps: QoderAdapt
280
280
  emit({
281
281
  type: "error", status: 400, errorType: "invalid_request_error",
282
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.",
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. The PNG must be at most 1 MiB decoded, with each edge at most 8192 pixels and at most 16,000,000 total pixels. URL, multiple-image, tool-result and history replay surfaces remain unverified; use the vision sidecar for those inputs.",
284
284
  });
285
285
  return;
286
286
  }
@@ -4,6 +4,8 @@ import { buildConversationInput } from "../coding-agent/protocol";
4
4
  // Local resource policy: #7516 verifies a 96x96 PNG, not a vendor size maximum.
5
5
  // 1 MiB leaves ample room over its 36 KiB RGBA raster while bounding stdin copies.
6
6
  const MAX_CN_PNG_BYTES = 1024 * 1024;
7
+ const MAX_CN_PNG_EDGE = 8192;
8
+ const MAX_CN_PNG_PIXELS = 16_000_000;
7
9
  const PNG_DATA_PREFIX = "data:image/png;base64,";
8
10
  const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
9
11
  const PNG_DEPTHS: Readonly<Record<number, readonly number[]>> = {
@@ -25,8 +27,9 @@ function boundedPngDataUrl(imageUrl: string): boolean {
25
27
  || bytes.readUInt32BE(8) !== 13 || bytes.readUInt32BE(12) !== 0x49484452) return false;
26
28
  const width = bytes.readUInt32BE(16);
27
29
  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
+ // Bound declared raster work before the child can decode compressed pixels.
31
+ return width > 0 && width <= MAX_CN_PNG_EDGE && height > 0 && height <= MAX_CN_PNG_EDGE
32
+ && width * height <= MAX_CN_PNG_PIXELS
30
33
  && (PNG_DEPTHS[bytes[25]!] ?? []).includes(bytes[24]!)
31
34
  && bytes[26] === 0 && bytes[27] === 0 && (bytes[28] === 0 || bytes[28] === 1);
32
35
  }
@@ -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,
@@ -2,6 +2,7 @@ import type { OcxProviderConfig } from "../types";
2
2
  import { debugProviderDiagnostic } from "../lib/debug";
3
3
  import { isXaiResponsesDestination } from "../providers/xai-transport";
4
4
  import { isOpenCodeGoResponsesUrl } from "./opencode-go-additional-tools";
5
+ import { hasItemProvenance, isHistoricalItem } from "../responses/item-provenance";
5
6
 
6
7
  const CODEX_WEB_SEARCH_TOOL = "web_search";
7
8
  const CODEX_WEB_SEARCH_PREVIEW_TOOL = "web_search_preview";
@@ -190,8 +191,8 @@ export function normalizeXaiResponsesWebSearch(
190
191
  const xaiDestination = isXaiResponsesDestination(provider);
191
192
  if (!xaiDestination && !isOpenCodeGoGrokResponses(target?.modelId, target?.responseUrl)) return body;
192
193
  // On Go, a wrapper emptied here stays in place: Go promotion (opencode-go-additional-tools.ts)
193
- // removes every wrapper before the wire and splits them into history and current turn by
194
- // index against _replayPrefixLen, so deleting one would shift the current turn into history.
194
+ // removes every wrapper before the wire. Retain positions for callers with untagged input;
195
+ // transformed adapter input carries per-item historical/live provenance instead.
195
196
  const keepEmptiedWrappers = !xaiDestination;
196
197
 
197
198
  let next: Record<string, unknown> = body;
@@ -264,7 +265,9 @@ export function injectXaiResponsesXSearch(
264
265
 
265
266
  const input = Array.isArray(body.input) ? body.input : undefined;
266
267
  const inputStart = input ? currentInputStart(input.length, replayPrefixLength) : 0;
267
- const currentInput = input?.slice(inputStart) ?? [];
268
+ const currentInput = input?.some(hasItemProvenance)
269
+ ? input.filter(item => !isHistoricalItem(item))
270
+ : input?.slice(inputStart) ?? [];
268
271
  const currentXSearchDeclared = hasToolType(body.tools, XAI_SEARCH_TOOL)
269
272
  || currentInput.some(item =>
270
273
  isPlainObject(item)
@@ -1,4 +1,5 @@
1
1
  import { isPlainObject as isRecord } from "./openai-responses/internal";
2
+ import { hasItemProvenance, isHistoricalItem, tagHistoricalInputItems } from "../responses/item-provenance";
2
3
 
3
4
  function toolKey(tool: Record<string, unknown>): string | undefined {
4
5
  if (typeof tool.type !== "string" || !tool.type) return undefined;
@@ -8,8 +9,8 @@ function toolKey(tool: Record<string, unknown>): string | undefined {
8
9
 
9
10
  /**
10
11
  * Zed's OpenAI Responses schema accepts message and call items, not Codex's private
11
- * additional_tools wrapper. Drop every wrapper. Promote only wrappers at or after the
12
- * replayed prefix: earlier ones are history, not the current turn's tool catalog.
12
+ * additional_tools wrapper. Drop every wrapper. Item provenance owns current-turn
13
+ * membership; a numeric prefix is accepted only for input not yet tagged.
13
14
  * A non-array tools field is left untouched so a malformed catalog is not replaced
14
15
  * by a partial promotion.
15
16
  */
@@ -17,16 +18,15 @@ export function liftZedAdditionalTools(providerRequest: Record<string, unknown>,
17
18
  if (!Array.isArray(providerRequest.input)) return;
18
19
  if (providerRequest.tools !== undefined && !Array.isArray(providerRequest.tools)) return;
19
20
 
20
- const currentTurnStart = Number.isFinite(replayPrefixLength)
21
- ? Math.min(providerRequest.input.length, Math.max(0, Math.trunc(replayPrefixLength)))
22
- : 0;
21
+ const taggedInput = providerRequest.input.some(hasItemProvenance) ? providerRequest.input
22
+ : tagHistoricalInputItems(providerRequest.input, Number.isFinite(replayPrefixLength) ? replayPrefixLength : 0);
23
23
  const input: unknown[] = [];
24
24
  const promoted: unknown[] = [];
25
25
  let changed = false;
26
- for (const [index, item] of providerRequest.input.entries()) {
26
+ for (const item of taggedInput) {
27
27
  if (isRecord(item) && item.type === "additional_tools" && Array.isArray(item.tools)) {
28
28
  changed = true;
29
- if (index >= currentTurnStart) promoted.push(...item.tools);
29
+ if (!isHistoricalItem(item)) promoted.push(...item.tools);
30
30
  continue;
31
31
  }
32
32
  input.push(item);
@@ -354,12 +354,7 @@ export function createZedAdapter(provider: OcxProviderConfig, cacheRetention?: A
354
354
  : item,
355
355
  );
356
356
  }
357
- if (zedProvider === "open_ai") {
358
- // Codex carries this turn's client tools in a private additional_tools input item.
359
- // Zed rejects that variant, so promote the current turn and drop every wrapper
360
- // before the built-in tool filter runs.
361
- liftZedAdditionalTools(providerRequest, parsed._replayPrefixLen ?? 0);
362
- }
357
+ // OpenAI wrappers were promoted before delegation; serialized input has no provenance tags.
363
358
  if (zedProvider === "open_ai" && Array.isArray(providerRequest.tools)) {
364
359
  // Zed's Responses decoder supports function/custom tools, not Codex's built-in web_search.
365
360
  const supported = (tool: unknown) => isRecord(tool) && (tool.type === "function" || tool.type === "custom");