@bitkyc08/opencodex 2.99.0 → 2.100.1

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 (276) hide show
  1. package/AGENTS_INSTALL.md +19 -1
  2. package/README.md +37 -33
  3. package/SPONSORS.md +5 -1
  4. package/bin/ocx.mjs +1 -1
  5. package/gui/dist/assets/{App-C1hGwaN1.css → App-COo8Yopd.css} +1 -1
  6. package/gui/dist/assets/App-g3Cm2xhZ.js +59 -0
  7. package/gui/dist/assets/Tray-BMDkAiXy.js +1 -0
  8. package/gui/dist/assets/brand-mark-nr3ziR-T.js +1 -0
  9. package/gui/dist/assets/index-Bziu8gTy.css +2 -0
  10. package/gui/dist/assets/index-OYzhQUNP.js +94 -0
  11. package/gui/dist/assets/{segment-thumb-features-fYEMxBaW.js → segment-thumb-features-DKCVUUTi.js} +1 -1
  12. package/gui/dist/classic/assets/App-CgPBKUP-.js +58 -0
  13. package/gui/dist/classic/assets/{Tray-BqZueZOx.js → Tray-BedmOsE7.js} +1 -1
  14. package/gui/dist/classic/assets/index-BR-HhNrp.js +94 -0
  15. package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +1 -0
  16. package/gui/dist/classic/index.html +1 -1
  17. package/gui/dist/index.html +2 -2
  18. package/native/ocx-child/Cargo.lock +215 -0
  19. package/native/ocx-child/Cargo.toml +31 -0
  20. package/native/ocx-child/src/cli.rs +1901 -0
  21. package/native/ocx-child/src/codex_home.rs +429 -0
  22. package/native/ocx-child/src/codex_settings.rs +231 -0
  23. package/native/ocx-child/src/daemon.rs +363 -0
  24. package/native/ocx-child/src/http_wire.rs +619 -0
  25. package/native/ocx-child/src/journal.rs +977 -0
  26. package/native/ocx-child/src/lib.rs +22 -0
  27. package/native/ocx-child/src/main.rs +9 -0
  28. package/native/ocx-child/src/parity.rs +102 -0
  29. package/native/ocx-child/src/platform.rs +1487 -0
  30. package/native/ocx-child/src/relay.rs +1288 -0
  31. package/native/ocx-child/src/relay_auth.rs +166 -0
  32. package/native/ocx-child/src/routes.rs +236 -0
  33. package/native/ocx-child/src/state.rs +190 -0
  34. package/native/ocx-child/src/test_hooks.rs +58 -0
  35. package/native/ocx-child/src/toml_surgeon.rs +1156 -0
  36. package/package.json +8 -2
  37. package/src/adapters/anthropic-image-normalize.ts +1 -1
  38. package/src/adapters/anthropic.ts +28 -2
  39. package/src/adapters/claude-cli/adapter.ts +5 -25
  40. package/src/adapters/claude-cli/instruction-images.ts +31 -0
  41. package/src/adapters/claude-cli/stable-replay.ts +42 -14
  42. package/src/adapters/claude-cli/usage-admission.ts +53 -64
  43. package/src/adapters/client-fingerprint.ts +1 -1
  44. package/src/adapters/coding-agent/protocol.ts +1 -1
  45. package/src/adapters/devin/live-models.ts +3 -0
  46. package/src/adapters/google-http.ts +3 -0
  47. package/src/adapters/google-vertex-key-project.ts +10 -2
  48. package/src/adapters/google.ts +40 -8
  49. package/src/adapters/kiro/usage.ts +3 -13
  50. package/src/adapters/openai-chat/mistral-image-limit.ts +28 -15
  51. package/src/adapters/openai-chat-images.ts +100 -0
  52. package/src/adapters/openai-chat.ts +6 -9
  53. package/src/adapters/openai-responses/passthrough.ts +5 -2
  54. package/src/adapters/openai-responses/request-strips.ts +32 -0
  55. package/src/adapters/openai-responses/tool-schema.ts +9 -4
  56. package/src/chat/inbound.ts +1 -1
  57. package/src/claude/auth-detect.ts +26 -8
  58. package/src/claude/inbound-content-options.ts +18 -3
  59. package/src/claude/inbound.ts +5 -2
  60. package/src/cli/bundled-bun-diagnostic.ts +91 -0
  61. package/src/cli/capabilities-agents-routing.ts +2 -2
  62. package/src/cli/capabilities-observe-system.ts +60 -0
  63. package/src/cli/combo-input.ts +6 -0
  64. package/src/cli/combo-result.ts +1 -1
  65. package/src/cli/combo.ts +4 -0
  66. package/src/cli/config-command.ts +16 -2
  67. package/src/cli/connect.ts +12 -10
  68. package/src/cli/dispatch.ts +4 -0
  69. package/src/cli/doctor.ts +11 -0
  70. package/src/cli/help.ts +1 -0
  71. package/src/cli/init.ts +4 -0
  72. package/src/cli/link-enrollment.ts +152 -25
  73. package/src/cli/link-local-control.ts +49 -0
  74. package/src/cli/link.ts +37 -10
  75. package/src/cli/provider-lifecycle-runtime.ts +4 -2
  76. package/src/cli/registry.ts +13 -0
  77. package/src/cli/star-prompt.ts +2 -0
  78. package/src/cli/status.ts +1 -1
  79. package/src/cli/telemetry-profile.ts +206 -0
  80. package/src/cli/telemetry.ts +260 -0
  81. package/src/client/hub-relay.ts +26 -0
  82. package/src/client/machine-api.ts +3 -0
  83. package/src/clients/config-export/t3code.ts +44 -5
  84. package/src/clients/omo-role-models.ts +1 -1
  85. package/src/codex/catalog/bundled.ts +44 -2
  86. package/src/codex/runtime.ts +12 -0
  87. package/src/codex/shim-restore-lock.ts +67 -30
  88. package/src/combos/types.ts +21 -1
  89. package/src/config/atomic-write.ts +24 -1
  90. package/src/config/diagnostics.ts +15 -0
  91. package/src/config/live-reconcile.ts +17 -0
  92. package/src/config/load-degrade.ts +16 -0
  93. package/src/config/provider-validation.ts +29 -0
  94. package/src/config/schema/config-schema.ts +24 -0
  95. package/src/config/schema/leaf-validators.ts +17 -0
  96. package/src/config/telemetry-carry.ts +30 -0
  97. package/src/config.ts +13 -1
  98. package/src/generated/compatibility-version.json +422 -170
  99. package/src/generated/model-metadata.ts +3 -3
  100. package/src/integrations/aside-profiles.ts +7 -1
  101. package/src/integrations/owned-refresh.ts +9 -2
  102. package/src/lab/artifacts/secure-fs.ts +12 -11
  103. package/src/lab/fabric/scratch.ts +11 -9
  104. package/src/lab/public/community.ts +2 -3
  105. package/src/lab/public/file-safety.ts +18 -20
  106. package/src/lab/public/mutation-lock.ts +109 -337
  107. package/src/lab/public/private-file.ts +4 -3
  108. package/src/lib/bun-runtime-preflight.ts +1 -1
  109. package/src/lib/codex-catalog-read-only.ts +122 -0
  110. package/src/lib/config-ownership.ts +56 -18
  111. package/src/lib/errors.ts +11 -0
  112. package/src/lib/gcp-adc.ts +167 -48
  113. package/src/lib/jsonc.ts +4 -2
  114. package/src/lib/local-control-socket.ts +88 -0
  115. package/src/lib/privacy.ts +15 -0
  116. package/src/lib/provider-client-headers.ts +3 -0
  117. package/src/lib/token-estimate.ts +13 -2
  118. package/src/link/child-binary-source.ts +228 -0
  119. package/src/link/ephemeral-child.ts +45 -0
  120. package/src/link/remote-plant.ts +306 -0
  121. package/src/link/remote-windows.ts +59 -5
  122. package/src/link/ssh-argv.ts +71 -8
  123. package/src/link/status-projection.ts +2 -0
  124. package/src/link/store.ts +5 -1
  125. package/src/oauth/anthropic-model-quota.ts +12 -0
  126. package/src/oauth/anthropic-routing.ts +11 -4
  127. package/src/oauth/claude-keychain-read.ts +165 -0
  128. package/src/oauth/kiro-iam-identity-center.ts +4 -1
  129. package/src/oauth/local-token-detect.ts +14 -17
  130. package/src/protocols/envelope.ts +20 -2
  131. package/src/providers/api-key-selection.ts +8 -2
  132. package/src/providers/claude-cli-identity.ts +9 -3
  133. package/src/providers/claude-cli-usage-state.ts +93 -0
  134. package/src/providers/claude-cli-usage.ts +3 -2
  135. package/src/providers/github-copilot-auto.ts +25 -5
  136. package/src/providers/meta-muse-plan-refusal.ts +94 -0
  137. package/src/providers/model-rename-fields.ts +3 -0
  138. package/src/providers/quota/anthropic-family-headers.ts +8 -1
  139. package/src/providers/quota/anthropic-usage-windows.ts +49 -2
  140. package/src/providers/quota/vendor-probes-key.ts +23 -4
  141. package/src/providers/quota/vendor-probes-oauth.ts +59 -0
  142. package/src/providers/quota/workbuddy.ts +2 -2
  143. package/src/providers/quota-types.ts +7 -0
  144. package/src/providers/quota.ts +25 -18
  145. package/src/providers/registry/entries-core.ts +7 -4
  146. package/src/providers/registry/entries-extended.ts +42 -8
  147. package/src/providers/registry/model-ids.ts +1 -0
  148. package/src/providers/registry/model-seeds.ts +10 -2
  149. package/src/providers/registry/types.ts +6 -0
  150. package/src/providers/resolved-model-policy.ts +4 -0
  151. package/src/providers/routed-config.ts +30 -3
  152. package/src/providers/stale-no-vision-seed-migration.ts +7 -0
  153. package/src/providers/vertex-environment-authority.ts +50 -0
  154. package/src/providers/workbuddy-credit-balance.ts +38 -6
  155. package/src/quota-pool/assemble.ts +14 -6
  156. package/src/responses/retained-compaction.ts +31 -5
  157. package/src/router.ts +1 -0
  158. package/src/server/adapter-resolve.ts +11 -6
  159. package/src/server/audio-dictation.ts +21 -7
  160. package/src/server/auth-cors.ts +19 -0
  161. package/src/server/background-lifecycle.ts +71 -0
  162. package/src/server/chat-completions.ts +2 -0
  163. package/src/server/claude-messages.ts +30 -3
  164. package/src/server/index/live-sideband.ts +15 -1
  165. package/src/server/index/local-control-listener.ts +515 -0
  166. package/src/server/index/optional-listeners.ts +21 -1
  167. package/src/server/index/serve-options.ts +4 -3
  168. package/src/server/index/websocket-handler.ts +2 -0
  169. package/src/server/index.ts +3 -0
  170. package/src/server/management/combo-routes.ts +6 -1
  171. package/src/server/management/context.ts +1 -0
  172. package/src/server/management/link-child-preflight.ts +74 -0
  173. package/src/server/management/link-enrollment.ts +190 -25
  174. package/src/server/management/link-route-state.ts +6 -1
  175. package/src/server/management/link-routes.ts +27 -9
  176. package/src/server/management/model-rows.ts +4 -0
  177. package/src/server/management/oauth-account-routes.ts +9 -4
  178. package/src/server/management/provider-overwrite-carry.ts +9 -2
  179. package/src/server/management/provider-routes.ts +14 -0
  180. package/src/server/management/provider-thinking-display-patch.ts +54 -0
  181. package/src/server/management/route-registry.ts +7 -0
  182. package/src/server/management/session-routes.ts +4 -1
  183. package/src/server/management/telemetry-routes.ts +37 -0
  184. package/src/server/management/usage-aggregate-cache.ts +290 -67
  185. package/src/server/management-api.ts +11 -2
  186. package/src/server/messages-native-preflight.ts +166 -0
  187. package/src/server/messages-native.ts +143 -43
  188. package/src/server/messages-shared.ts +14 -0
  189. package/src/server/proxy-liveness.ts +99 -6
  190. package/src/server/request-log-conversation.ts +18 -2
  191. package/src/server/request-log.ts +7 -2
  192. package/src/server/responses/adapter-continuation.ts +1 -0
  193. package/src/server/responses/adapter-dispatch.ts +11 -28
  194. package/src/server/responses/adapter-failure-message.ts +68 -0
  195. package/src/server/responses/combo-stream-preflight.ts +14 -2
  196. package/src/server/responses/compact.ts +13 -1
  197. package/src/server/responses/core-auth.ts +26 -5
  198. package/src/server/responses/core-codex-account.ts +8 -1
  199. package/src/server/responses/core-combo-failure.ts +6 -1
  200. package/src/server/responses/core-combo-native.ts +150 -37
  201. package/src/server/responses/core-combo.ts +15 -9
  202. package/src/server/responses/core-normalize.ts +1 -0
  203. package/src/server/responses/core-options.ts +7 -1
  204. package/src/server/responses/core-pipeline.ts +21 -1
  205. package/src/server/responses/fetch-helpers.ts +5 -0
  206. package/src/server/responses/opengateway-completion-guard.ts +7 -3
  207. package/src/server/responses/passthrough-delivery.ts +8 -1
  208. package/src/server/responses/passthrough-error.ts +22 -0
  209. package/src/server/responses/request-prepare.ts +7 -1
  210. package/src/server/responses/request-transport.ts +28 -5
  211. package/src/server/responses/run-turn-execution.ts +13 -0
  212. package/src/server/sse-frame-buffer.ts +5 -0
  213. package/src/server/ws-bridge.ts +10 -0
  214. package/src/service/launchd.ts +78 -4
  215. package/src/telemetry/aggregate.ts +348 -0
  216. package/src/telemetry/consent.ts +128 -0
  217. package/src/telemetry/contract.ts +403 -0
  218. package/src/telemetry/disclosure.ts +19 -0
  219. package/src/telemetry/install-id.ts +226 -0
  220. package/src/telemetry/payload.ts +129 -0
  221. package/src/telemetry/profile/client.ts +150 -0
  222. package/src/telemetry/profile/contract.ts +288 -0
  223. package/src/telemetry/profile/disclosure.ts +14 -0
  224. package/src/telemetry/profile/paths.ts +13 -0
  225. package/src/telemetry/profile/routes.ts +99 -0
  226. package/src/telemetry/profile/service.ts +234 -0
  227. package/src/telemetry/profile/state.ts +189 -0
  228. package/src/telemetry/profile/sync.ts +276 -0
  229. package/src/telemetry/routes.ts +183 -0
  230. package/src/telemetry/scheduler.ts +386 -0
  231. package/src/telemetry/sender.ts +97 -0
  232. package/src/telemetry/state.ts +334 -0
  233. package/src/types/combo-jev-effort-mode.ts +11 -0
  234. package/src/types/config.ts +3 -0
  235. package/src/types/provider.ts +11 -1
  236. package/src/types/request.ts +2 -0
  237. package/src/types/telemetry.ts +15 -0
  238. package/src/types/wire.ts +10 -0
  239. package/src/types.ts +5 -0
  240. package/src/update/index.ts +7 -1
  241. package/src/update/minisign.d.mts +17 -0
  242. package/src/update/minisign.mjs +88 -0
  243. package/src/update/signed-supply.d.mts +59 -0
  244. package/src/update/signed-supply.mjs +289 -0
  245. package/src/update/trust-root.json +38 -0
  246. package/src/update/update-bounded-json.d.mts +4 -0
  247. package/src/update/update-bounded-json.mjs +113 -0
  248. package/src/update/update-bytes.d.mts +2 -0
  249. package/src/update/update-bytes.mjs +23 -0
  250. package/src/update/update-candidate-id.d.mts +2 -0
  251. package/src/update/update-candidate-id.mjs +23 -0
  252. package/src/update/update-checkpoint-codec.d.mts +33 -0
  253. package/src/update/update-checkpoint-codec.mjs +217 -0
  254. package/src/update/update-contracts.d.mts +24 -0
  255. package/src/update/update-contracts.mjs +207 -0
  256. package/src/update/update-signature-threshold.d.mts +12 -0
  257. package/src/update/update-signature-threshold.mjs +47 -0
  258. package/src/update/update-signed-version.d.mts +5 -0
  259. package/src/update/update-signed-version.mjs +25 -0
  260. package/src/update/update-trust-anchor.d.mts +2 -0
  261. package/src/update/update-trust-anchor.mjs +2 -0
  262. package/src/usage/cache-diagnostic.ts +195 -50
  263. package/src/usage/expected-prices.ts +20 -2
  264. package/src/usage/filter-index.ts +1469 -0
  265. package/src/usage/ledger-scanner.ts +245 -4
  266. package/src/usage/source-filter.ts +10 -2
  267. package/src/usage/summary.ts +16 -0
  268. package/src/web-search/parse.ts +265 -38
  269. package/gui/dist/assets/App-BepstgEN.js +0 -59
  270. package/gui/dist/assets/Tray-BinxbEZo.js +0 -1
  271. package/gui/dist/assets/brand-mark-wzPe3R-J.js +0 -1
  272. package/gui/dist/assets/index-C-9X2yaI.js +0 -94
  273. package/gui/dist/assets/index-bnUWypyz.css +0 -2
  274. package/gui/dist/classic/assets/App-DX88_GCW.js +0 -58
  275. package/gui/dist/classic/assets/index-fSP71pLB.js +0 -94
  276. package/gui/dist/classic/assets/quota-summary-y2fl0WBv.js +0 -1
@@ -41,7 +41,7 @@ import {
41
41
  sessionIdHeaderFromRequest,
42
42
  reasoningReplayConversationIdFromResponsesRequest,
43
43
  } from "../request-log-conversation";
44
- import { resolveContextPrincipal } from "../auth-cors";
44
+ import { contextPrincipalIdOf, resolveContextPrincipal } from "../auth-cors";
45
45
  import { responseTurnMembership } from "./turn-membership";
46
46
  import { resolveSkillsSnapshotScopeKey, snapshotSkillsCatalogInBody } from "./skills-snapshot";
47
47
  import {
@@ -79,6 +79,7 @@ import { mapCodexAuthContextErrorToResponse } from "./codex-auth-error";
79
79
  import type { OcxParsedRequest } from "../../types";
80
80
  import { buildToolBridgeMaps } from "./collaboration";
81
81
  import { parseRequest } from "../../responses/parser";
82
+ import { responsesHasFileImage, responsesHasInstructionImage } from "../../adapters/claude-cli/instruction-images";
82
83
  import { anthropicSessionKeyFromParts } from "../../oauth/anthropic-routing";
83
84
  import { configuredAnthropicInstance } from "../../providers/anthropic-instance";
84
85
  import { isTranslatorBudgetExceededError } from "../../lib/translator-budget";
@@ -249,6 +250,8 @@ export async function prepareResponsesRequest(
249
250
  }
250
251
  return decodeRequestErrorResponse(err, "responses");
251
252
  }
253
+ options.responsesInstructionImage ||= responsesHasInstructionImage(body);
254
+ options.responsesFileImage ||= responsesHasFileImage(body);
252
255
  // Remove display-only artifact paths before helpers, combo dispatch and upstream replay.
253
256
  const originalSelector = options.mainHardLockFallbackOverride?.sourceModel ?? options.compactionRoutingOverride?.sourceModel
254
257
  ?? (options.comboAttempt || options.policyFallbackCandidate || options.internalDecisionCall || options.memoryModelPhase
@@ -263,6 +266,7 @@ export async function prepareResponsesRequest(
263
266
  options.promptCacheKeyIsSharedCohort === true
264
267
  ? "system-derived"
265
268
  : options.promptCacheKeyIsSharedCohort === false ? "metadata-derived" : "caller",
269
+ contextPrincipalIdOf(options.admission),
266
270
  );
267
271
  if (!concreteSelection && !options.compactionRoutingOverride && inboundWire === "responses") {
268
272
  options.compactionRoutingOverride = applyCompactionRoutingOverride(body, req.headers, config, {
@@ -450,6 +454,8 @@ export async function prepareResponsesRequest(
450
454
  const previousResponseInputExpanded = options.comboReplaySnapshot?.previousResponseInputExpanded
451
455
  ?? (body !== originalBody
452
456
  && typeof (body as { previous_response_id?: unknown }).previous_response_id === "string");
457
+ options.responsesInstructionImage ||= responsesHasInstructionImage(body);
458
+ options.responsesFileImage ||= responsesHasFileImage(body);
453
459
 
454
460
  // Spawn-message compatibility (both directions): agent_message task payloads ride in
455
461
  // encrypted_content slots as plaintext. Rewrite them to input_text on the RAW body BEFORE
@@ -27,6 +27,7 @@ import {
27
27
  } from "../../oauth/store";
28
28
  import { refreshKiroAccountModelsDetached } from "../../providers/kiro-model-catalog";
29
29
  import type { ProviderAdapter, AdapterRequest } from "../../adapters/base";
30
+ import { copyVertexRequestAuthority, hasVertexRequestAuthority, vertexRequestAuthorityIsCurrent } from "../../lib/gcp-adc";
30
31
  import { releaseProviderRequestSlot, waitForProviderRequestSlot, type ProviderRequestSlot } from "../../providers/request-pacing";
31
32
  import type { AdapterEvent, OcxParsedRequest, OcxProviderConfig, OcxUsage } from "../../types";
32
33
  import type { AnthropicAccountSelectionReason } from "../../oauth/anthropic-routing";
@@ -84,7 +85,7 @@ import {
84
85
  resolveCurrentProviderApiKeyTransport,
85
86
  } from "../../providers/api-key-selection";
86
87
  import { resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
87
- import { codexWsExecutorBinding, fetchWithHeaderTimeout, physicalSendObserverInit, providerFetch, sendWithConnectionPolicy } from "./fetch-helpers";
88
+ import { codexWsExecutorBinding, fetchWithHeaderTimeout, physicalSendGuardInit, physicalSendObserverInit, providerFetch, sendWithConnectionPolicy } from "./fetch-helpers";
88
89
  import { resolveConnectTimeoutMs } from "../../stall-timeout";
89
90
  import { isLocalUpstream } from "../../lib/local-upstream";
90
91
  import { deepSeekImageFileBody, needsDeepSeekImageFiles } from "./deepseek-image-files";
@@ -692,7 +693,11 @@ export async function prepareResponsesTransport(
692
693
  // Persistence consent is configuration: capture its generation with the provider snapshot.
693
694
  const fileConsentGeneration = captureConfigGeneration();
694
695
  resolved.buildRequest = async (requestParsed, incoming) => {
695
- const request = await build(requestParsed, incoming);
696
+ const guardedIncoming = incoming ? { ...incoming, beforePhysicalSend: () => {
697
+ incoming.beforePhysicalSend?.();
698
+ if (!selectionIsCurrent(binding)) throw new Error("Credential selection changed before auxiliary send");
699
+ } } : incoming;
700
+ const request = await build(requestParsed, guardedIncoming);
696
701
  // Capture at adapter creation, never from mutable serving state after an await.
697
702
  if (binding) requestBindings.set(request, binding);
698
703
  const allowedImageFileModels = fileProvider.modelCapabilities
@@ -789,6 +794,10 @@ export async function prepareResponsesTransport(
789
794
  if (fresh) current = selectProactiveApiKeyTransport(config, route.providerName, fresh) ?? fresh;
790
795
  }
791
796
  if (!current) throw new Error("API key selection is unavailable before dispatch");
797
+ if (route.provider.googleMode === "vertex" || current.googleMode === "vertex") {
798
+ const freshPolicy = captureRouteStaticPolicy(route.providerName, route.modelId, current, route.staticPolicy.effectiveAlias, inboundWire);
799
+ if (freshPolicy.model.adapter !== route.staticPolicy.model.adapter) throw new Error("Vertex model wire changed before dispatch");
800
+ }
792
801
  await resolveCopilotSelection(requestParsed, true, current);
793
802
  }
794
803
  adapter = activeAdapter = runTurnAdapter = resolveSelectionAdapter(
@@ -905,7 +914,7 @@ export async function prepareResponsesTransport(
905
914
  await reacquirePacing(route.provider, route.modelId);
906
915
  pacingChanged = false;
907
916
  }
908
- if (selectionIsCurrent(requestBindings.get(wireRequest)) && copilotSessionExpiresAt > Date.now() + 1000) {
917
+ if (selectionIsCurrent(requestBindings.get(wireRequest)) && vertexRequestAuthorityIsCurrent(wireRequest) && copilotSessionExpiresAt > Date.now() + 1000) {
909
918
  const ws = codexWsExecutorBinding(execute);
910
919
  const fetchImpl = (route.provider as OcxProviderConfig & { fetch?: typeof globalThis.fetch }).fetch ?? ws?.http ?? execute;
911
920
  const binding = requestBindings.get(wireRequest);
@@ -956,7 +965,10 @@ export async function prepareResponsesTransport(
956
965
  distributedKeyPhysicalFetch(anthropicBillingPhysicalFetch(fetchImpl, route.providerName, route.provider), route.providerName, route.provider, target),
957
966
  input,
958
967
  { ...physicalInit, redirect: "manual",
959
- ...physicalSendObserverInit(observeAutoPause, destination instanceof Request ? destination.url : String(destination), deferredCopilotNote ? commitKeyAttemptSend : undefined) },
968
+ ...physicalSendObserverInit(observeAutoPause, destination instanceof Request ? destination.url : String(destination), deferredCopilotNote ? commitKeyAttemptSend : undefined),
969
+ ...(hasVertexRequestAuthority(wireRequest) ? physicalSendGuardInit((finalTarget, finalHeaders) => {
970
+ if (!selectionIsCurrent(requestBindings.get(wireRequest)) || !vertexRequestAuthorityIsCurrent(wireRequest, finalTarget, finalHeaders)) throw new Error("Vertex credential authority changed before dispatch");
971
+ }) : {}) },
960
972
  { providerName: route.providerName, provider: route.provider },
961
973
  )) as typeof globalThis.fetch;
962
974
  response = await fetchWithHeaderTimeout(target, dispatchInit, dispatchInit.signal ?? options.abortSignal ?? req.signal,
@@ -1000,6 +1012,7 @@ export async function prepareResponsesTransport(
1000
1012
  const rebuilt = await nextAdapter.buildRequest(requestParsed, {
1001
1013
  completedToolBlocks: requestState.completedToolBlocks,
1002
1014
  headers: requestState.selectedForwardHeaders, providerName: route.providerName, translatorBudget,
1015
+ abortSignal: dispatchInit.signal ?? options.abortSignal ?? req.signal,
1003
1016
  dispatchPacingHeld: true,
1004
1017
  ...(imageTierBias > 0 ? { imageTierBias } : {}),
1005
1018
  });
@@ -1008,11 +1021,21 @@ export async function prepareResponsesTransport(
1008
1021
  rebuilt.releaseBodyObservation?.();
1009
1022
  return markProxyError(formatErrorResponse(413, "outbound_body_too_large", describeOutboundBodyRefusal(bodySize)), "outbound");
1010
1023
  }
1024
+ // A Google schema-repair replay owns its modified body. Retain it only when the
1025
+ // credential rebuild produced the same original payload; otherwise refuse to combine
1026
+ // a repair for the old request with a newly constructed request.
1027
+ let refreshedBody: BodyInit | null | undefined = rebuilt.body;
1028
+ if (route.provider.adapter === "google" && route.provider.googleMode === "vertex"
1029
+ && typeof dispatchInit.body === "string" && dispatchInit.body !== wireRequest.body) {
1030
+ if (rebuilt.body !== wireRequest.body) throw new Error("Vertex request changed during schema repair");
1031
+ refreshedBody = dispatchInit.body;
1032
+ }
1011
1033
  const headers = new Headers(dispatchInit.headers);
1012
1034
  for (const name of Object.keys(wireRequest.headers)) headers.delete(name);
1013
1035
  for (const [name, value] of Object.entries(rebuilt.headers)) headers.set(name, value);
1014
1036
  wireRequest.releaseBodyObservation?.();
1015
1037
  Object.assign(wireRequest, rebuilt);
1038
+ copyVertexRequestAuthority(rebuilt, wireRequest);
1016
1039
  const binding = requestBindings.get(rebuilt);
1017
1040
  if (binding) requestBindings.set(wireRequest, binding);
1018
1041
  else requestBindings.delete(wireRequest);
@@ -1020,7 +1043,7 @@ export async function prepareResponsesTransport(
1020
1043
  sameTargetParsed = requestParsed;
1021
1044
  sameTargetToken = transportToken;
1022
1045
  destination = rebuilt.url;
1023
- dispatchInit = { ...dispatchInit, method: rebuilt.method, headers, body: rebuilt.body };
1046
+ dispatchInit = { ...dispatchInit, method: rebuilt.method, headers, body: refreshedBody };
1024
1047
  pacingChanged = route.provider.requestPacing?.enabled === true
1025
1048
  && (!!route.provider.requestPacing.keys || route.provider.requestPacing.keySelection === "round-robin");
1026
1049
  // A refreshed key must reacquire admission before the next synchronous send guard.
@@ -59,6 +59,7 @@ import { WEB_SEARCH_TOOL_NAME } from "../../web-search/synthetic-tool";
59
59
  import { orderDevinMessagesOutput } from "../../claude/devin-output-order";
60
60
  import { unboundPoolSpendRefusalMessage } from "../workflow-refusal";
61
61
  import { claudeUsagePreflight } from "../../adapters/claude-cli/usage-admission";
62
+ import { responsesHasInstructionImage } from "../../adapters/claude-cli/instruction-images";
62
63
 
63
64
  // LOCAL PATCH (runturn-websearch): top-level fields route binding or the
64
65
  // adapter itself may write during a turn. Iteration-local `turnParsed` objects
@@ -181,6 +182,18 @@ export async function executeResponsesRunTurn(
181
182
  // Publish the known subscription pause before headers or a CLI turn, preserving its reset
182
183
  // across both Responses and translated Chat instead of presenting a retryable generic 502.
183
184
  if (transportState.runTurnAdapter.name === "claude-cli") {
185
+ if (options.chatInstructionImage || options.responsesInstructionImage || responsesHasInstructionImage(parsed._rawBody)
186
+ || parsed.context.messages.some(message => message.role === "developer"
187
+ && Array.isArray(message.content) && message.content.some(part => part.type === "image"))) {
188
+ cancelResponseCompletion();
189
+ releaseSearchProbeLease();
190
+ const refusal = new Response(JSON.stringify({ error: {
191
+ type: "invalid_request_error", code: "unsupported_input_modality", param: null,
192
+ message: "Claude Code CLI does not support images in developer instructions.",
193
+ } }), { status: 400, headers: { "Content-Type": "application/json" } });
194
+ markResponseNonReplayable(refusal);
195
+ return refusal;
196
+ }
184
197
  let usage: Awaited<ReturnType<typeof claudeUsagePreflight>>;
185
198
  try {
186
199
  usage = await claudeUsagePreflight(parsed.modelId);
@@ -288,6 +288,11 @@ export class BoundedSseFrameBuffer {
288
288
  }
289
289
  }
290
290
 
291
+ /** Bytes retained for an unfinished frame, including a possible delimiter prefix. */
292
+ get pendingBytes(): number {
293
+ return this.candidateBytes + this.delimiterTail.byteLength;
294
+ }
295
+
291
296
  /** Return the final unterminated block bytes and release all retained state. */
292
297
  finish(): Uint8Array {
293
298
  if (this.disposed) return EMPTY_BYTES;
@@ -58,6 +58,8 @@ export interface WsData {
58
58
  liveFinish?: AudioSocketTarget["finish"];
59
59
  liveOutcome?: number | "timeout" | "connect_error";
60
60
  liveMaxSessionMs?: number;
61
+ liveFinalizationMs?: number;
62
+ liveFinalizing?: boolean;
61
63
  liveConnectTimer?: ReturnType<typeof setTimeout>;
62
64
  liveSessionTimer?: ReturnType<typeof setTimeout>;
63
65
  liveAbortSignal?: AbortSignal;
@@ -128,6 +130,7 @@ export class WsSendDroppedError extends Error {
128
130
  }
129
131
  }
130
132
 
133
+ /** Capture inbound WS auth and metadata for reconstructed turns; provider egress filters again. */
131
134
  export function selectForwardHeaders(
132
135
  headers: Headers,
133
136
  codexOverride?: { accessToken: string; chatgptAccountId: string; kind?: "pool" | "main-pool" },
@@ -137,6 +140,13 @@ export function selectForwardHeaders(
137
140
  const value = headers.get(name);
138
141
  if (value !== null) selected.set(name, value);
139
142
  }
143
+ // WS turns rebuild an HTTP request from this snapshot. Keep original client
144
+ // identity available for the same per-provider policy used by HTTP requests.
145
+ // These are not credentials and do not extend the outbound provider allowlist.
146
+ for (const name of ["user-agent", "x-codex-app-version"]) {
147
+ const value = headers.get(name);
148
+ if (value !== null) selected.set(name, value);
149
+ }
140
150
  if (codexOverride) {
141
151
  selected.set("authorization", `Bearer ${codexOverride.accessToken}`);
142
152
  selected.set("chatgpt-account-id", codexOverride.chatgptAccountId);
@@ -328,9 +328,73 @@ const LAUNCHCTL_NO_SUCH_DOMAIN = 112;
328
328
  /** `launchctl bootstrap`: something is already bootstrapped under that label. */
329
329
  const LAUNCHCTL_BOOTSTRAP_BUSY = 5;
330
330
 
331
+ /** `launchctl bootstrap`: the domain is busy with another operation. */
332
+ const LAUNCHCTL_BOOTSTRAP_IN_PROGRESS = 37;
333
+
331
334
  /** `launchctl bootout`: nothing was loaded under that label, i.e. already stopped. */
332
335
  const LAUNCHCTL_BOOTOUT_NO_SUCH_PROCESS = 3;
333
336
 
337
+ /**
338
+ * Whether a failed `bootstrap` is the still-tearing-down race rather than a definition that
339
+ * launchd will never accept.
340
+ *
341
+ * Exit 5, and the transient 37 ("Operation already in progress"), are both measured answers
342
+ * while a booted-out process is still exiting (#8362). A malformed plist (1) or EPERM is NOT
343
+ * retried: waiting cannot fix it, and the operator needs the real stderr instead of a delayed
344
+ * copy of it.
345
+ */
346
+ function launchctlBootstrapRacedTeardown(result: {
347
+ status: number | null;
348
+ stderr: string;
349
+ }): boolean {
350
+ if (result.status === LAUNCHCTL_BOOTSTRAP_BUSY || result.status === LAUNCHCTL_BOOTSTRAP_IN_PROGRESS) {
351
+ return true;
352
+ }
353
+ // The legacy "Load failed" shape keeps the retry it had. A `bootstrap`-prefixed message has
354
+ // to name a transient NUMBER: "Bootstrap failed: 1: Operation not permitted" and a malformed
355
+ // plist share the prefix but are not races, and retrying them only delays the real report.
356
+ return /\b(?:Bootstrap failed: (?:5|37)|Load failed)\b/i.test(result.stderr);
357
+ }
358
+
359
+ /**
360
+ * Up to 50 attempts with 49 waits of 500 ms between them (24.5 s), past launchd's 20 s
361
+ * `ExitTimeOut`, so an unregistered-but-draining job gets the patience the eviction settle
362
+ * loop gives a registered one.
363
+ */
364
+ const LAUNCHD_BOOTSTRAP_TEARDOWN_ATTEMPTS = 50;
365
+
366
+ const LAUNCHD_BOOTSTRAP_TEARDOWN_DELAY_MS = 500;
367
+
368
+ /**
369
+ * Bootstrap, waiting out a teardown `launchctl print` cannot see (#8362).
370
+ *
371
+ * `bootout` is asynchronous, and a job booted out BY HAND an instant before this command is
372
+ * in the same window: the label is already UNREGISTERED, so `launchctl print` answers 113
373
+ * and the eviction settle loop returns at once — yet `bootstrap` keeps failing 5/EIO until
374
+ * the previous process is gone. The old recovery retried ONCE, back-to-back, which landed
375
+ * inside that very window: the first `ocx service restart`/`repair` printed
376
+ * `installed, not loaded ... no proxy is answering`, and the second run found the domain
377
+ * quiet and succeeded.
378
+ *
379
+ * This waits between attempts instead, and is BOUNDED so a genuinely wedged domain still
380
+ * reaches the diagnosable throw instead of hanging. `sleepSync` is the same seam the
381
+ * eviction settle loop uses.
382
+ */
383
+ function bootstrapWaitingOutTeardown(
384
+ run: typeof runLaunchctl,
385
+ domain: string,
386
+ plist: string,
387
+ sleepSync: (ms: number) => void,
388
+ ): ReturnType<typeof runLaunchctl> {
389
+ let result = run(["bootstrap", domain, plist]);
390
+ for (let attempt = 1; attempt < LAUNCHD_BOOTSTRAP_TEARDOWN_ATTEMPTS; attempt += 1) {
391
+ if (!launchctlBootstrapRacedTeardown(result)) return result;
392
+ sleepSync(LAUNCHD_BOOTSTRAP_TEARDOWN_DELAY_MS);
393
+ result = run(["bootstrap", domain, plist]);
394
+ }
395
+ return result;
396
+ }
397
+
334
398
  /**
335
399
  * Every domain target an eviction has to cover.
336
400
  *
@@ -648,15 +712,25 @@ export function installLaunchd(deps: {
648
712
  evictEveryDomain();
649
713
  return run(["bootstrap", guiDomain, p]);
650
714
  };
715
+ // The recovery round is where a teardown that `launchctl print` cannot see has to be
716
+ // waited out: a job booted out BY HAND a moment ago is already unregistered, so the
717
+ // settle loop above returned at once while `bootstrap` keeps failing 5/EIO until the old
718
+ // process exits (#8362). The FIRST attempt stays a single call so its stderr reaches the
719
+ // operator unchanged; only the recovery path spends the bounded wait.
720
+ const evictThenBootstrapSettling = () => {
721
+ evictEveryDomain();
722
+ return bootstrapWaitingOutTeardown(run, guiDomain, p, sleepSync);
723
+ };
651
724
 
652
725
  let loaded = evictThenBootstrap();
653
726
  verdict = probeLive();
654
727
  // `unknown` is excluded on purpose: a retry means another eviction, and a probe that
655
728
  // could not answer is not a reason to take the job down again.
656
729
  if (verdict.state === "not-loaded" || verdict.state === "loaded-stale") {
657
- // ONE retry. A bounded retry recovers the race; a loop would turn a wedged domain
730
+ // ONE more eviction round, which waits out a teardown between bounded bootstrap
731
+ // attempts (see `bootstrapWaitingOutTeardown`). Unbounded would turn a wedged domain
658
732
  // into a hang instead of the diagnosable throw below.
659
- if (loaded.status === LAUNCHCTL_BOOTSTRAP_BUSY || launchctlLoadFailed(loaded.stderr)) {
733
+ if (launchctlBootstrapRacedTeardown(loaded)) {
660
734
  // "Bootstrap failed: 5: Input/output error" has TWO causes, measured on macOS 27.0
661
735
  // with a throwaway label, and they need opposite remedies:
662
736
  //
@@ -679,7 +753,7 @@ export function installLaunchd(deps: {
679
753
  if (kicked?.ok) verdict = probeLive();
680
754
  if (verdict.state !== "loaded-current") {
681
755
  run(["enable", guiTarget]);
682
- loaded = evictThenBootstrap();
756
+ loaded = evictThenBootstrapSettling();
683
757
  verdict = probeLive();
684
758
  }
685
759
  } else if (loaded.ok) {
@@ -687,7 +761,7 @@ export function installLaunchd(deps: {
687
761
  // again. A load that failed for any OTHER reason — a malformed plist, EPERM — is not
688
762
  // fixed by evicting a job, so it falls straight through to the throw and the
689
763
  // operator sees the real stderr instead of a delayed copy of it.
690
- loaded = evictThenBootstrap();
764
+ loaded = evictThenBootstrapSettling();
691
765
  verdict = probeLive();
692
766
  }
693
767
  }