@bitkyc08/opencodex 2.96.0 → 2.98.0-preview.20261107

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 (465) hide show
  1. package/bin/ocx.mjs +215 -20
  2. package/gui/dist/assets/App-6TFtZsUF.css +1 -0
  3. package/gui/dist/assets/App-B8_sOxoz.js +59 -0
  4. package/gui/dist/assets/Tray-DpWEp6ee.js +1 -0
  5. package/gui/dist/assets/WantedSansVariable.split.0-Dwvb1WRx.woff2 +0 -0
  6. package/gui/dist/assets/WantedSansVariable.split.1-1wKD2RxI.woff2 +0 -0
  7. package/gui/dist/assets/WantedSansVariable.split.10-CAKA6LIP.woff2 +0 -0
  8. package/gui/dist/assets/WantedSansVariable.split.11-k5H85R4b.woff2 +0 -0
  9. package/gui/dist/assets/WantedSansVariable.split.12-BHboLsUv.woff2 +0 -0
  10. package/gui/dist/assets/WantedSansVariable.split.13-9GV377ix.woff2 +0 -0
  11. package/gui/dist/assets/WantedSansVariable.split.14-DovDXnrj.woff2 +0 -0
  12. package/gui/dist/assets/WantedSansVariable.split.15-DTdykCig.woff2 +0 -0
  13. package/gui/dist/assets/WantedSansVariable.split.16-CKz2ccgK.woff2 +0 -0
  14. package/gui/dist/assets/WantedSansVariable.split.17-Z2RD_KRZ.woff2 +0 -0
  15. package/gui/dist/assets/WantedSansVariable.split.18-BcKtfonJ.woff2 +0 -0
  16. package/gui/dist/assets/WantedSansVariable.split.19-DEQPOSZn.woff2 +0 -0
  17. package/gui/dist/assets/WantedSansVariable.split.2-DryboyuA.woff2 +0 -0
  18. package/gui/dist/assets/WantedSansVariable.split.20-Bia5JMls.woff2 +0 -0
  19. package/gui/dist/assets/WantedSansVariable.split.21-Cr4jFw-E.woff2 +0 -0
  20. package/gui/dist/assets/WantedSansVariable.split.22-DjjB69TZ.woff2 +0 -0
  21. package/gui/dist/assets/WantedSansVariable.split.23-CvUzJskt.woff2 +0 -0
  22. package/gui/dist/assets/WantedSansVariable.split.24-i_eMg5ox.woff2 +0 -0
  23. package/gui/dist/assets/WantedSansVariable.split.25-2aKHwPX-.woff2 +0 -0
  24. package/gui/dist/assets/WantedSansVariable.split.26-B6wXoCEL.woff2 +0 -0
  25. package/gui/dist/assets/WantedSansVariable.split.27-D4h1WfGM.woff2 +0 -0
  26. package/gui/dist/assets/WantedSansVariable.split.28-kvRPCStd.woff2 +0 -0
  27. package/gui/dist/assets/WantedSansVariable.split.29-DHAiwleD.woff2 +0 -0
  28. package/gui/dist/assets/WantedSansVariable.split.3-7H--eyZi.woff2 +0 -0
  29. package/gui/dist/assets/WantedSansVariable.split.30-C66cfAY2.woff2 +0 -0
  30. package/gui/dist/assets/WantedSansVariable.split.31-FDmtiNim.woff2 +0 -0
  31. package/gui/dist/assets/WantedSansVariable.split.32-DouHt2Dd.woff2 +0 -0
  32. package/gui/dist/assets/WantedSansVariable.split.33-B8HVvkJX.woff2 +0 -0
  33. package/gui/dist/assets/WantedSansVariable.split.34-BtkRu1FN.woff2 +0 -0
  34. package/gui/dist/assets/WantedSansVariable.split.35-DBylQbtk.woff2 +0 -0
  35. package/gui/dist/assets/WantedSansVariable.split.36-Sg089Kgh.woff2 +0 -0
  36. package/gui/dist/assets/WantedSansVariable.split.37-CYtvbriS.woff2 +0 -0
  37. package/gui/dist/assets/WantedSansVariable.split.38-DKkSLf8Z.woff2 +0 -0
  38. package/gui/dist/assets/WantedSansVariable.split.39-CecotKZD.woff2 +0 -0
  39. package/gui/dist/assets/WantedSansVariable.split.4-Bv8O3ZMb.woff2 +0 -0
  40. package/gui/dist/assets/WantedSansVariable.split.40-DdCvkmOU.woff2 +0 -0
  41. package/gui/dist/assets/WantedSansVariable.split.41-ESn674Hc.woff2 +0 -0
  42. package/gui/dist/assets/WantedSansVariable.split.42-DL9V7NNV.woff2 +0 -0
  43. package/gui/dist/assets/WantedSansVariable.split.43-yipO0cyk.woff2 +0 -0
  44. package/gui/dist/assets/WantedSansVariable.split.44-6rTmLZhm.woff2 +0 -0
  45. package/gui/dist/assets/WantedSansVariable.split.45-BJAj8lrm.woff2 +0 -0
  46. package/gui/dist/assets/WantedSansVariable.split.46-BDTzMn2c.woff2 +0 -0
  47. package/gui/dist/assets/WantedSansVariable.split.47-Bxd4wGgi.woff2 +0 -0
  48. package/gui/dist/assets/WantedSansVariable.split.48-DxnFBLnH.woff2 +0 -0
  49. package/gui/dist/assets/WantedSansVariable.split.49-DnVD0aOD.woff2 +0 -0
  50. package/gui/dist/assets/WantedSansVariable.split.5-B1wI2pp5.woff2 +0 -0
  51. package/gui/dist/assets/WantedSansVariable.split.50-D9JlkZd6.woff2 +0 -0
  52. package/gui/dist/assets/WantedSansVariable.split.51-D9Vw6Bu3.woff2 +0 -0
  53. package/gui/dist/assets/WantedSansVariable.split.52-ClEJk4kn.woff2 +0 -0
  54. package/gui/dist/assets/WantedSansVariable.split.53-BSXU0vh-.woff2 +0 -0
  55. package/gui/dist/assets/WantedSansVariable.split.54-EcuxkR9v.woff2 +0 -0
  56. package/gui/dist/assets/WantedSansVariable.split.55-CYiFhQX8.woff2 +0 -0
  57. package/gui/dist/assets/WantedSansVariable.split.56--Gk9g8BK.woff2 +0 -0
  58. package/gui/dist/assets/WantedSansVariable.split.57-DnkOPZcy.woff2 +0 -0
  59. package/gui/dist/assets/WantedSansVariable.split.58-9MB8504z.woff2 +0 -0
  60. package/gui/dist/assets/WantedSansVariable.split.59-ByxIsN72.woff2 +0 -0
  61. package/gui/dist/assets/WantedSansVariable.split.6-Bmk0dRVw.woff2 +0 -0
  62. package/gui/dist/assets/WantedSansVariable.split.60-Bxwx_aWQ.woff2 +0 -0
  63. package/gui/dist/assets/WantedSansVariable.split.61-DA2z5sm7.woff2 +0 -0
  64. package/gui/dist/assets/WantedSansVariable.split.62-C5iJPJZn.woff2 +0 -0
  65. package/gui/dist/assets/WantedSansVariable.split.63-DAqrmaEc.woff2 +0 -0
  66. package/gui/dist/assets/WantedSansVariable.split.64-BgXFsljb.woff2 +0 -0
  67. package/gui/dist/assets/WantedSansVariable.split.65-DKiWujvu.woff2 +0 -0
  68. package/gui/dist/assets/WantedSansVariable.split.66-8po4vUZ4.woff2 +0 -0
  69. package/gui/dist/assets/WantedSansVariable.split.67-Cy5qyI9O.woff2 +0 -0
  70. package/gui/dist/assets/WantedSansVariable.split.68-BKny7Fy3.woff2 +0 -0
  71. package/gui/dist/assets/WantedSansVariable.split.69-B4VU4u_b.woff2 +0 -0
  72. package/gui/dist/assets/WantedSansVariable.split.7-BuqwNpgA.woff2 +0 -0
  73. package/gui/dist/assets/WantedSansVariable.split.70-BCd4n346.woff2 +0 -0
  74. package/gui/dist/assets/WantedSansVariable.split.71-CkQppaWn.woff2 +0 -0
  75. package/gui/dist/assets/WantedSansVariable.split.72-Db7vaoFs.woff2 +0 -0
  76. package/gui/dist/assets/WantedSansVariable.split.73-DI80TYWl.woff2 +0 -0
  77. package/gui/dist/assets/WantedSansVariable.split.74-tMCtDAHB.woff2 +0 -0
  78. package/gui/dist/assets/WantedSansVariable.split.75-Ciw0D5WG.woff2 +0 -0
  79. package/gui/dist/assets/WantedSansVariable.split.76-DoLjFgp-.woff2 +0 -0
  80. package/gui/dist/assets/WantedSansVariable.split.77-CpT2uvMy.woff2 +0 -0
  81. package/gui/dist/assets/WantedSansVariable.split.78-CkcJ4iZ1.woff2 +0 -0
  82. package/gui/dist/assets/WantedSansVariable.split.79-DsOUJjEM.woff2 +0 -0
  83. package/gui/dist/assets/WantedSansVariable.split.8-DsjypPd6.woff2 +0 -0
  84. package/gui/dist/assets/WantedSansVariable.split.80-C0VwHTte.woff2 +0 -0
  85. package/gui/dist/assets/WantedSansVariable.split.81-DTelu57i.woff2 +0 -0
  86. package/gui/dist/assets/WantedSansVariable.split.82-BiMndGN1.woff2 +0 -0
  87. package/gui/dist/assets/WantedSansVariable.split.83-CVcC6eDG.woff2 +0 -0
  88. package/gui/dist/assets/WantedSansVariable.split.84-DlhZVt_O.woff2 +0 -0
  89. package/gui/dist/assets/WantedSansVariable.split.85-S8I2D3pA.woff2 +0 -0
  90. package/gui/dist/assets/WantedSansVariable.split.86-DozXXpH5.woff2 +0 -0
  91. package/gui/dist/assets/WantedSansVariable.split.87-Dsn0Vuuo.woff2 +0 -0
  92. package/gui/dist/assets/WantedSansVariable.split.88-iNwxxDCr.woff2 +0 -0
  93. package/gui/dist/assets/WantedSansVariable.split.89-B63u_9CZ.woff2 +0 -0
  94. package/gui/dist/assets/WantedSansVariable.split.9-Bi3IzpMI.woff2 +0 -0
  95. package/gui/dist/assets/WantedSansVariable.split.90-ByeH1Pqf.woff2 +0 -0
  96. package/gui/dist/assets/WantedSansVariable.split.91-UQLlagpm.woff2 +0 -0
  97. package/gui/dist/assets/brand-mark-VPhzz-WE.js +1 -0
  98. package/gui/dist/assets/geist-cyrillic-ext-wght-normal-DjL33-gN.woff2 +0 -0
  99. package/gui/dist/assets/geist-cyrillic-wght-normal-BEAKL7Jp.woff2 +0 -0
  100. package/gui/dist/assets/geist-latin-ext-wght-normal-DC-KSUi6.woff2 +0 -0
  101. package/gui/dist/assets/geist-latin-wght-normal-BgDaEnEv.woff2 +0 -0
  102. package/gui/dist/assets/geist-mono-cyrillic-ext-wght-normal-X_5orZeX.woff2 +0 -0
  103. package/gui/dist/assets/geist-mono-cyrillic-wght-normal-DiZS0aHC.woff2 +0 -0
  104. package/gui/dist/assets/geist-mono-latin-ext-wght-normal-Bwz-egvJ.woff2 +0 -0
  105. package/gui/dist/assets/geist-mono-latin-wght-normal-XN7g48iV.woff2 +0 -0
  106. package/gui/dist/assets/geist-mono-symbols2-wght-normal-CO5SzqOn.woff2 +0 -0
  107. package/gui/dist/assets/geist-mono-vietnamese-wght-normal-DadHysG0.woff2 +0 -0
  108. package/gui/dist/assets/geist-vietnamese-wght-normal-6IgcOCM7.woff2 +0 -0
  109. package/gui/dist/assets/index-5REODpG3.css +2 -0
  110. package/gui/dist/assets/index-BWKBeK77.js +94 -0
  111. package/gui/dist/assets/segment-thumb-features-BQYzrze9.js +1 -0
  112. package/gui/dist/classic/assets/App-Bz65x1J6.js +58 -0
  113. package/gui/dist/{assets/Tray-BOPQyDbH.js → classic/assets/Tray-kk7mdO6I.js} +1 -1
  114. package/gui/dist/classic/assets/index-Dp2j8bSc.js +94 -0
  115. package/gui/dist/classic/assets/quota-summary-CvamtHjB.js +1 -0
  116. package/gui/dist/classic/index.html +47 -0
  117. package/gui/dist/favicon.png +0 -0
  118. package/gui/dist/favicon.svg +14 -0
  119. package/gui/dist/index.html +15 -2
  120. package/package.json +1 -1
  121. package/src/adapters/anthropic.ts +17 -8
  122. package/src/adapters/command-code.ts +15 -16
  123. package/src/adapters/cursor/transport-retry.ts +2 -2
  124. package/src/adapters/devin/cloud-direct/chat.ts +15 -6
  125. package/src/adapters/google.ts +7 -7
  126. package/src/adapters/kiro/adapter.ts +18 -3
  127. package/src/adapters/kiro/conversation.ts +8 -8
  128. package/src/adapters/kiro/payload.ts +45 -12
  129. package/src/adapters/kiro/stream.ts +230 -14
  130. package/src/adapters/kiro/structured-output-json.ts +191 -0
  131. package/src/adapters/kiro/structured-output-schema.ts +542 -0
  132. package/src/adapters/kiro/structured-output.ts +367 -0
  133. package/src/adapters/kiro-constants.ts +24 -1
  134. package/src/adapters/kiro-events.ts +31 -1
  135. package/src/adapters/kiro-retry.ts +3 -3
  136. package/src/adapters/kiro-tools.ts +14 -9
  137. package/src/adapters/kiro-wire.ts +9 -5
  138. package/src/adapters/ollama-native.ts +11 -1
  139. package/src/adapters/openai-chat/messages.ts +58 -5
  140. package/src/adapters/openai-chat/mistral-image-limit.ts +50 -0
  141. package/src/adapters/openai-chat/passthrough.ts +5 -3
  142. package/src/adapters/openai-chat/tool-schema.ts +83 -13
  143. package/src/adapters/openai-responses/empty-assistant.ts +15 -3
  144. package/src/adapters/openai-responses/opengateway-input.ts +18 -6
  145. package/src/adapters/openai-responses/passthrough.ts +5 -4
  146. package/src/adapters/openai-responses/reasoning.ts +9 -4
  147. package/src/adapters/openai-responses/request-strips.ts +1 -1
  148. package/src/adapters/openai-responses/tool-output-recovery.ts +79 -0
  149. package/src/adapters/physical-send.ts +3 -3
  150. package/src/adapters/qoder/live-models.ts +115 -1
  151. package/src/adapters/zed-openai-stream.ts +2 -1
  152. package/src/bridge/errors.ts +11 -2
  153. package/src/bridge/response-json.ts +2 -1
  154. package/src/bridge/sse.ts +14 -6
  155. package/src/chat/failure-verdict.ts +21 -0
  156. package/src/chat/outbound.ts +139 -21
  157. package/src/claude/failure-verdict.ts +21 -0
  158. package/src/claude/inbound-content-options.ts +15 -2
  159. package/src/claude/inbound-model-options.ts +2 -1
  160. package/src/claude/inbound-records.ts +2 -0
  161. package/src/claude/inbound.ts +17 -11
  162. package/src/claude/outbound.ts +98 -22
  163. package/src/cli/capabilities-access-remote.ts +13 -0
  164. package/src/cli/capabilities-base.ts +26 -3
  165. package/src/cli/capabilities-command.ts +12 -3
  166. package/src/cli/capabilities-provider-models.ts +3 -3
  167. package/src/cli/capability-contracts.ts +2 -0
  168. package/src/cli/codex-launch-auth.ts +30 -1
  169. package/src/cli/codex-launcher.ts +12 -5
  170. package/src/cli/codex-shim-autorestore.ts +12 -4
  171. package/src/cli/config-command.ts +11 -2
  172. package/src/cli/connect.ts +17 -2
  173. package/src/cli/dispatch.ts +14 -177
  174. package/src/cli/doctor.ts +95 -7
  175. package/src/cli/help.ts +2 -2
  176. package/src/cli/index.ts +17 -8
  177. package/src/cli/link-apply-restart.ts +9 -2
  178. package/src/cli/link.ts +1 -1
  179. package/src/cli/models.ts +124 -38
  180. package/src/cli/registry.ts +12 -4
  181. package/src/cli/restart-failure.ts +17 -0
  182. package/src/cli/root.ts +8 -0
  183. package/src/cli/stop-approval.ts +2 -2
  184. package/src/cli/sync-command.ts +243 -0
  185. package/src/cli/sync-fanout-process.ts +92 -0
  186. package/src/cli/sync-fanout.ts +161 -0
  187. package/src/cli/sync-flags.ts +10 -0
  188. package/src/cli/sync-link-status.ts +39 -0
  189. package/src/cli/sync-update-guard.ts +18 -0
  190. package/src/cli/system-restart-client.ts +5 -0
  191. package/src/cli/uninstall-client-state.ts +12 -1
  192. package/src/cli/update-restart-child.ts +13 -3
  193. package/src/cli/update-restart-home.ts +6 -3
  194. package/src/cli/update-restart.ts +36 -19
  195. package/src/client/connect.ts +35 -15
  196. package/src/client/hub-client.ts +5 -0
  197. package/src/client/link-home.ts +3 -2
  198. package/src/client/link-management-relay.ts +39 -2
  199. package/src/client/link-readiness.ts +3 -1
  200. package/src/client/machine-api.ts +2 -1
  201. package/src/client/machine-listener.ts +10 -0
  202. package/src/client/orphan-token-recovery.ts +322 -0
  203. package/src/client/restore-ownership.ts +19 -1
  204. package/src/client/runtime-restart.ts +12 -4
  205. package/src/client/runtime.ts +40 -11
  206. package/src/client/stop-routing.ts +62 -0
  207. package/src/client/sync-runtime.ts +65 -0
  208. package/src/clients/config-export.ts +32 -3
  209. package/src/codex/auth-context.ts +49 -103
  210. package/src/codex/catalog/antigravity-discovery.ts +16 -5
  211. package/src/codex/catalog/provider-models.ts +18 -12
  212. package/src/codex/forward-transport-headers.ts +35 -6
  213. package/src/codex/inject/config-toml.ts +88 -0
  214. package/src/codex/inject/multi-agent-v2.ts +30 -4
  215. package/src/codex/inject/plan.ts +34 -7
  216. package/src/codex/inject-coordination.ts +11 -0
  217. package/src/codex/inject.ts +18 -7
  218. package/src/codex/lineage.ts +13 -7
  219. package/src/codex/native-profile-api.ts +27 -1
  220. package/src/codex/quota.ts +22 -6
  221. package/src/codex/request-owned-affinity-key.ts +11 -0
  222. package/src/codex/request-owned-affinity.ts +118 -0
  223. package/src/codex/request-owned-main-pin.ts +86 -0
  224. package/src/codex/role-capability.ts +52 -41
  225. package/src/codex/routing/active-account.ts +13 -5
  226. package/src/codex/routing/selection.ts +40 -1
  227. package/src/codex/routing/thread-affinity-store.ts +916 -0
  228. package/src/codex/routing/thread-affinity.ts +90 -12
  229. package/src/codex/shim-diagnostics.ts +7 -0
  230. package/src/codex/shim-legacy-record.ts +290 -0
  231. package/src/codex/shim-windows-refresh.ts +9 -2
  232. package/src/codex/shim-wrapper-write.ts +7 -0
  233. package/src/codex/shim.ts +80 -21
  234. package/src/codex/toml-source-lines.ts +72 -13
  235. package/src/combos/failover.ts +6 -109
  236. package/src/combos/request.ts +2 -2
  237. package/src/combos/resolve.ts +29 -11
  238. package/src/config/diagnostics.ts +9 -9
  239. package/src/config/load-degrade.ts +27 -27
  240. package/src/config/process-state.ts +5 -0
  241. package/src/config/provider-validation.ts +9 -2
  242. package/src/config/removed-opencode-free-backup.ts +6 -3
  243. package/src/config/schema/leaf-validators.ts +1 -0
  244. package/src/config/tracked-runtime-inspection.ts +3 -3
  245. package/src/generated/compatibility-version.json +595 -255
  246. package/src/images/loop.ts +4 -3
  247. package/src/lib/client-error-body.ts +215 -0
  248. package/src/lib/client-retry-after.ts +66 -0
  249. package/src/lib/config-ownership-removal.ts +422 -0
  250. package/src/lib/config-ownership.ts +650 -81
  251. package/src/lib/context-overflow-verdict.ts +113 -0
  252. package/src/lib/crash-guard.ts +4 -2
  253. package/src/lib/desktop-cli-handoff.d.mts +4 -5
  254. package/src/lib/desktop-cli-handoff.mjs +18 -17
  255. package/src/lib/empty-tool-catalog.ts +25 -3
  256. package/src/lib/error-destination.ts +47 -0
  257. package/src/lib/errors.ts +1 -0
  258. package/src/lib/failure-detail.ts +66 -0
  259. package/src/lib/local-management-capability.ts +3 -1
  260. package/src/lib/messages-error-body.ts +162 -0
  261. package/src/lib/messages-sse-error-presentation.ts +93 -0
  262. package/src/lib/model-identity.ts +44 -0
  263. package/src/lib/passive-read.ts +9 -4
  264. package/src/lib/private-sqlite-path.ts +124 -0
  265. package/src/lib/response-service-tier.ts +17 -0
  266. package/src/lib/retry-after.ts +3 -0
  267. package/src/lib/socks5-fetch.ts +21 -9
  268. package/src/lib/spend-ledger-owner.ts +43 -4
  269. package/src/lib/upstream-condition.ts +142 -0
  270. package/src/lib/upstream-retry.ts +95 -12
  271. package/src/lib/windows-owner-acl.ts +22 -9
  272. package/src/lib/winsw.ts +5 -5
  273. package/src/lib/workflow-budget.ts +3 -1
  274. package/src/link/remote-platform.ts +14 -0
  275. package/src/link/remote-windows.ts +51 -9
  276. package/src/link/ssh-argv.ts +63 -10
  277. package/src/oauth/generic-account-failover.ts +13 -11
  278. package/src/oauth/index.ts +42 -73
  279. package/src/oauth/oauth-errors.ts +67 -0
  280. package/src/oauth/store.ts +21 -11
  281. package/src/protocols/codecs/messages-ir.ts +15 -9
  282. package/src/protocols/codecs/ollama.ts +197 -0
  283. package/src/protocols/encoders/adapter-events.ts +30 -7
  284. package/src/protocols/encoders/chat.ts +18 -10
  285. package/src/protocols/encoders/messages.ts +72 -28
  286. package/src/protocols/trace.ts +18 -0
  287. package/src/providers/antigravity-models.ts +45 -12
  288. package/src/providers/fastwire.ts +3 -2
  289. package/src/providers/free-directory.ts +2 -2
  290. package/src/providers/quota/anthropic-usage-windows.ts +13 -3
  291. package/src/providers/quota/vendor-probes-key.ts +60 -24
  292. package/src/providers/reasoning-metadata.ts +2 -1
  293. package/src/providers/registry/entries-extended.ts +9 -0
  294. package/src/providers/request-pacing.ts +3 -2
  295. package/src/reasoning-effort.ts +7 -2
  296. package/src/remote/hub-usage.ts +3 -0
  297. package/src/responses/apply-patch-envelope.ts +45 -19
  298. package/src/responses/compaction-history-framing.ts +5 -1
  299. package/src/responses/freeform-wrapper-scan.ts +5 -3
  300. package/src/responses/progressive-freeform-input.ts +354 -45
  301. package/src/routing/fallback-policy.ts +3 -1
  302. package/src/server/admission-model-scope.ts +17 -6
  303. package/src/server/admitted-http-turn.ts +57 -0
  304. package/src/server/anthropic-rate-limit-headers.ts +75 -3
  305. package/src/server/auth-cors.ts +5 -0
  306. package/src/server/chat-completions.ts +45 -20
  307. package/src/server/chat-native-sse.ts +52 -7
  308. package/src/server/chat-native.ts +60 -35
  309. package/src/server/claude-bridge-pool-session.ts +59 -0
  310. package/src/server/claude-messages.ts +174 -84
  311. package/src/server/context-history.ts +5 -1
  312. package/src/server/gui-static.ts +4 -1
  313. package/src/server/hub-usage.ts +7 -2
  314. package/src/server/inbound-body-admission.ts +11 -4
  315. package/src/server/index/link-management.ts +8 -0
  316. package/src/server/index/ollama-routes.ts +91 -0
  317. package/src/server/index/serve-options.ts +44 -24
  318. package/src/server/index/startup-warnings.ts +5 -12
  319. package/src/server/index/websocket-handler.ts +5 -2
  320. package/src/server/index.ts +6 -36
  321. package/src/server/inference/client-encoder-delivery.ts +9 -3
  322. package/src/server/json-serialized-bytes.ts +44 -0
  323. package/src/server/management/agent-settings-routes.ts +24 -21
  324. package/src/server/management/codex-cli-update-routes.ts +2 -1
  325. package/src/server/management/logs-usage-routes.ts +89 -4
  326. package/src/server/management/provider-routes.ts +2 -22
  327. package/src/server/management/qoder-provider-probe.ts +105 -0
  328. package/src/server/management/route-registry.ts +4 -1
  329. package/src/server/management/usage-aggregate-cache.ts +15 -5
  330. package/src/server/management/usage-source-facets.ts +38 -0
  331. package/src/server/messages-native-scope.ts +2 -1
  332. package/src/server/messages-native-tool-guard.ts +12 -4
  333. package/src/server/messages-native.ts +123 -47
  334. package/src/server/messages-response-headers.ts +25 -11
  335. package/src/server/messages-shared.ts +99 -65
  336. package/src/server/messages-sse-error-filter.ts +199 -0
  337. package/src/server/native-final-log.ts +93 -0
  338. package/src/server/ollama-inbound.ts +349 -0
  339. package/src/server/ollama-native-paths.ts +21 -0
  340. package/src/server/ollama-route-policy.ts +73 -0
  341. package/src/server/relay.ts +22 -3
  342. package/src/server/request-decompress.ts +4 -2
  343. package/src/server/request-log-failure-attribution.ts +22 -0
  344. package/src/server/request-log-failure-detail.ts +80 -0
  345. package/src/server/request-log-terminal-status.ts +4 -2
  346. package/src/server/request-log.ts +91 -42
  347. package/src/server/response-log-body.ts +6 -1
  348. package/src/server/responses/account-change-state.ts +17 -6
  349. package/src/server/responses/adapter-continuation.ts +17 -6
  350. package/src/server/responses/adapter-delivery.ts +17 -10
  351. package/src/server/responses/adapter-dispatch.ts +32 -31
  352. package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
  353. package/src/server/responses/codex-auth-error.ts +24 -19
  354. package/src/server/responses/codex-ws-exchange.ts +11 -8
  355. package/src/server/responses/codex-ws-metadata.ts +94 -21
  356. package/src/server/responses/codex-ws-request.ts +3 -1
  357. package/src/server/responses/codex-ws-wire.ts +19 -3
  358. package/src/server/responses/compact.ts +57 -24
  359. package/src/server/responses/compaction-recovery.ts +4 -2
  360. package/src/server/responses/compaction-routing.ts +9 -4
  361. package/src/server/responses/core-auth.ts +32 -14
  362. package/src/server/responses/core-codex-account.ts +17 -6
  363. package/src/server/responses/core-combo-failure.ts +7 -1
  364. package/src/server/responses/core-combo-native.ts +2 -1
  365. package/src/server/responses/core-combo.ts +43 -27
  366. package/src/server/responses/core-errors.ts +24 -21
  367. package/src/server/responses/core-lifetime.ts +6 -3
  368. package/src/server/responses/core-normalize.ts +1 -0
  369. package/src/server/responses/core-options.ts +9 -0
  370. package/src/server/responses/core-pipeline.ts +4 -3
  371. package/src/server/responses/empty-completion-guard.ts +4 -1
  372. package/src/server/responses/fetch-helpers.ts +7 -1
  373. package/src/server/responses/input-admission.ts +28 -2
  374. package/src/server/responses/native-injection.ts +1 -1
  375. package/src/server/responses/native-response-json.ts +13 -4
  376. package/src/server/responses/native-response-output.ts +1 -2
  377. package/src/server/responses/non-replayable-error.ts +2 -1
  378. package/src/server/responses/pacing-overload.ts +3 -2
  379. package/src/server/responses/passthrough-delivery.ts +55 -14
  380. package/src/server/responses/passthrough-dispatch.ts +20 -18
  381. package/src/server/responses/passthrough-error.ts +9 -9
  382. package/src/server/responses/policy-fallback.ts +2 -1
  383. package/src/server/responses/request-prepare.ts +69 -48
  384. package/src/server/responses/request-transport.ts +36 -31
  385. package/src/server/responses/response-effects.ts +3 -2
  386. package/src/server/responses/run-turn-execution.ts +6 -6
  387. package/src/server/responses/sidecar-execution.ts +16 -12
  388. package/src/server/responses/spend-storage-error.ts +2 -1
  389. package/src/server/responses/terminal-guard.ts +30 -0
  390. package/src/server/responses/ws-upstream.ts +9 -0
  391. package/src/server/responses-custom-tool-repair.ts +14 -3
  392. package/src/server/responses-terminal-repair.ts +5 -2
  393. package/src/server/responses-undeclared-tool-guard.ts +39 -16
  394. package/src/server/restart-replacement.ts +3 -1
  395. package/src/server/safe-response-headers.ts +162 -13
  396. package/src/server/sse-payload-rewrite.ts +23 -11
  397. package/src/server/turn-state-handles.ts +164 -0
  398. package/src/server/workflow-refusal.ts +2 -1
  399. package/src/server/ws-bridge.ts +4 -0
  400. package/src/service/definition.ts +36 -4
  401. package/src/service/launchd.ts +89 -32
  402. package/src/service/logging.ts +34 -7
  403. package/src/service/ownership-mutation-lease.d.mts +11 -2
  404. package/src/service/ownership-mutation-lease.mjs +53 -11
  405. package/src/service/plist-xml.ts +59 -0
  406. package/src/service/state.ts +8 -0
  407. package/src/service/systemd-env.ts +2 -0
  408. package/src/service/systemd.ts +31 -7
  409. package/src/service/windows-taskxml.ts +16 -7
  410. package/src/service-manager-probe.ts +4 -10
  411. package/src/types/config.ts +2 -0
  412. package/src/types/provider.ts +2 -0
  413. package/src/types/request.ts +13 -1
  414. package/src/update/config-preflight.ts +48 -0
  415. package/src/update/index.ts +148 -26
  416. package/src/update/npm-install.d.mts +8 -0
  417. package/src/update/npm-install.mjs +20 -1
  418. package/src/update/orchestrated-admission.d.mts +4 -0
  419. package/src/update/orchestrated-admission.mjs +12 -0
  420. package/src/update/orchestrated-arguments.d.mts +12 -0
  421. package/src/update/orchestrated-arguments.mjs +64 -0
  422. package/src/update/orchestrated-child.d.mts +12 -0
  423. package/src/update/orchestrated-child.mjs +70 -0
  424. package/src/update/orchestrated-entry.ts +234 -0
  425. package/src/update/orchestrated-identity-probe-entry.ts +20 -0
  426. package/src/update/orchestrated-identity.ts +53 -0
  427. package/src/update/orchestrated-live-identity.ts +48 -0
  428. package/src/update/orchestrated-node-driver.mjs +99 -0
  429. package/src/update/orchestrated-outcome.d.mts +21 -0
  430. package/src/update/orchestrated-outcome.mjs +40 -0
  431. package/src/update/orchestrated-plan.ts +49 -0
  432. package/src/update/orchestrated-pnpm.d.mts +8 -0
  433. package/src/update/orchestrated-pnpm.mjs +33 -0
  434. package/src/update/orchestrated-session.d.mts +37 -0
  435. package/src/update/orchestrated-session.mjs +264 -0
  436. package/src/update/orchestrated-token.d.mts +10 -0
  437. package/src/update/orchestrated-token.mjs +21 -0
  438. package/src/update/orchestrated-token.ts +3 -0
  439. package/src/update/orchestrated-tree.d.mts +1 -0
  440. package/src/update/orchestrated-tree.mjs +14 -0
  441. package/src/update/pnpm-global-install.d.mts +6 -0
  442. package/src/update/pnpm-global-install.mjs +9 -2
  443. package/src/update/posix-install-supervisor-entry.mjs +6 -0
  444. package/src/update/posix-install-supervisor.d.mts +10 -0
  445. package/src/update/posix-install-supervisor.mjs +88 -0
  446. package/src/update/sync-update-mutex.d.mts +10 -0
  447. package/src/update/sync-update-mutex.mjs +164 -0
  448. package/src/update/sync-update-mutex.ts +1 -0
  449. package/src/update/test-home-guard.mjs +33 -0
  450. package/src/update/transactional-install.mjs +2 -2
  451. package/src/usage/client.ts +43 -0
  452. package/src/usage/error-detail.ts +225 -0
  453. package/src/usage/log.ts +64 -27
  454. package/src/usage/source-facets.ts +51 -0
  455. package/src/usage/source-filter.ts +65 -0
  456. package/src/usage/summary.ts +50 -8
  457. package/src/web-search/anthropic-executor.ts +105 -24
  458. package/src/web-search/executor.ts +5 -3
  459. package/src/web-search/loop.ts +33 -6
  460. package/src/web-search/progress-stream.ts +64 -5
  461. package/gui/dist/assets/App-bwugJRKn.js +0 -58
  462. package/gui/dist/assets/index-ebuVUtB7.js +0 -94
  463. package/gui/dist/assets/quota-summary-6HsrHQAy.js +0 -1
  464. /package/gui/dist/{assets → classic/assets}/App-B4j-Txmb.css +0 -0
  465. /package/gui/dist/{assets → classic/assets}/index-CHWwDo9L.css +0 -0
@@ -43,6 +43,13 @@ import {
43
43
  kiroReasoningContent,
44
44
  KIRO_NATIVE_EFFORTS,
45
45
  } from "./reasoning";
46
+ import {
47
+ kiroStructuredOutputInstructions,
48
+ kiroStructuredOutputRetryMessage,
49
+ kiroStructuredOutputSpec,
50
+ kiroStructuredOutputTool,
51
+ type KiroStructuredOutputSpec,
52
+ } from "./structured-output";
46
53
  import { kiroPayloadMessages, userContentText } from "./usage";
47
54
  import {
48
55
  kiroToolWireNames,
@@ -115,6 +122,7 @@ export function buildKiroPayload(
115
122
  nameMap: Map<string, string>;
116
123
  conversationId: string;
117
124
  completionMode: KiroCompletionMode;
125
+ structuredOutput?: KiroStructuredOutputSpec;
118
126
  } {
119
127
  validateKiroCapabilities(parsed);
120
128
  const modelId = mapModelId(parsed.modelId);
@@ -132,11 +140,24 @@ export function buildKiroPayload(
132
140
  // happens before the turn list exists. `forcedCompletionMode` still wins: the fallback retry
133
141
  // passes "text_fallback" explicitly and must not be silently downgraded.
134
142
  const trailingDeliveredAnswer = hasTrailingDeliveredFinalAnswer(kiroPayloadMessages(parsed), parsed);
143
+ // Structured output replaces the completion tool as the turn's terminal channel, and it needs
144
+ // that channel even on a tool-free turn: ordinary text is never an acceptable final answer for a
145
+ // caller that asked for JSON, so the turn is always "required" and the stream validates whatever
146
+ // arrives. Both tools at once would offer the model a prose exit from the JSON contract.
147
+ //
148
+ // It does not yield to `trailingDeliveredAnswer` the way the completion contract does. The
149
+ // adapter's `localTerminal` already answers such a turn without sending anything, and a disabled
150
+ // mode here would relay unvalidated text if any caller ever built that payload directly.
151
+ const structuredOutput = kiroStructuredOutputSpec(parsed);
135
152
  const completionMode: KiroCompletionMode = forcedCompletionMode
136
- ?? (ordinaryTools.length > 0 && !trailingDeliveredAnswer ? "required" : "disabled");
153
+ ?? (structuredOutput || (ordinaryTools.length > 0 && !trailingDeliveredAnswer) ? "required" : "disabled");
154
+ const terminalTool = structuredOutput ? kiroStructuredOutputTool(structuredOutput) : kiroCompletionTool();
155
+ const retryMessage = structuredOutput
156
+ ? kiroStructuredOutputRetryMessage(ordinaryTools.length > 0)
157
+ : KIRO_COMPLETION_RETRY_MESSAGE;
137
158
  const kiroTools = completionMode === "disabled"
138
159
  ? ordinaryTools
139
- : [...ordinaryTools, kiroCompletionTool()];
160
+ : [...ordinaryTools, terminalTool];
140
161
  const nameMap = toolContext.nameMap;
141
162
  const systemParts: string[] = [];
142
163
  const injectedChars = { value: 0 };
@@ -176,15 +197,27 @@ export function buildKiroPayload(
176
197
  const codeModeExecName = emittedCodeModeExec && !emittedShellBridge
177
198
  ? emittedAlias(emittedCodeModeExec)
178
199
  : undefined;
179
- const toolCatalogNudge = buildNonOpenAIToolCatalogNudgeFromNames(
180
- kiroToolWireNames(kiroTools),
181
- name => advertisedAlias.get(name) ?? name,
182
- codeModeExecName,
183
- );
200
+ // A tool-free structured-output turn advertises only its output channel. The catalog nudge is a
201
+ // work-tool contract (shell, file search, result counting) and would describe tools that do not
202
+ // exist, so it is reserved for turns that carry real tools.
203
+ const toolCatalogNudge = structuredOutput && ordinaryTools.length === 0
204
+ ? undefined
205
+ : buildNonOpenAIToolCatalogNudgeFromNames(
206
+ kiroToolWireNames(kiroTools),
207
+ name => advertisedAlias.get(name) ?? name,
208
+ codeModeExecName,
209
+ );
184
210
  const boundedNudge = toolCatalogNudge ? boundedInjectedInstruction(toolCatalogNudge, injectedChars) : undefined;
185
211
  if (boundedNudge) systemParts.push(boundedNudge);
186
212
  if (completionMode !== "disabled") {
187
- const boundedCompletion = boundedInjectedInstruction(KIRO_COMPLETION_INSTRUCTIONS, injectedChars);
213
+ const contract = structuredOutput
214
+ ? kiroStructuredOutputInstructions(
215
+ structuredOutput,
216
+ ordinaryTools.length > 0,
217
+ MAX_KIRO_INJECTED_INSTRUCTION_CHARS - injectedChars.value,
218
+ )
219
+ : KIRO_COMPLETION_INSTRUCTIONS;
220
+ const boundedCompletion = boundedInjectedInstruction(contract, injectedChars);
188
221
  if (boundedCompletion) systemParts.push(boundedCompletion);
189
222
  }
190
223
  const systemPrefix = systemParts.length > 0 ? `${systemParts.join("\n\n")}\n\n` : "";
@@ -364,7 +397,7 @@ export function buildKiroPayload(
364
397
  // structurally valid, but carrying no instruction to resume.
365
398
  const trailing = turns.at(-1);
366
399
  if (trailing?.kind === "assistant") {
367
- const resumeText = completionMode === "text_fallback" ? KIRO_COMPLETION_RETRY_MESSAGE : KIRO_CONTINUATION_MESSAGE;
400
+ const resumeText = completionMode === "text_fallback" ? retryMessage : KIRO_CONTINUATION_MESSAGE;
368
401
  turns.push({
369
402
  kind: "user",
370
403
  content: trailing.finalAnswer ? KIRO_ANSWER_DELIVERED_MESSAGE : resumeText,
@@ -425,8 +458,8 @@ export function buildKiroPayload(
425
458
  // Never append the retry instruction onto the answer-delivered acknowledgement: it exists
426
459
  // precisely to avoid asking a finished turn for another completion call, and appending here
427
460
  // would reinstate the loop it prevents.
428
- if (currentUim.content !== KIRO_COMPLETION_RETRY_MESSAGE && !answerDeliveredAck) {
429
- currentUim.content = appendTurnText(currentUim.content, KIRO_COMPLETION_RETRY_MESSAGE);
461
+ if (currentUim.content !== retryMessage && !answerDeliveredAck) {
462
+ currentUim.content = appendTurnText(currentUim.content, retryMessage);
430
463
  }
431
464
  } else if (
432
465
  !currentUim.userInputMessageContext?.toolResults
@@ -464,5 +497,5 @@ export function buildKiroPayload(
464
497
  }
465
498
  }
466
499
  if (profileArn) payload.profileArn = profileArn;
467
- return { payload, nameMap, conversationId, completionMode };
500
+ return { payload, nameMap, conversationId, completionMode, ...(structuredOutput ? { structuredOutput } : {}) };
468
501
  }
@@ -6,7 +6,11 @@ import {
6
6
  } from "../../lib/translator-budget";
7
7
  import type { AdapterEvent, OcxUsage } from "../../types";
8
8
  import { recordKiroCalibration, rekeyKiroCalibration } from "../kiro-calibration";
9
- import { KIRO_COMPLETION_TOOL_NAME, type KiroCompletionMode } from "../kiro-constants";
9
+ import {
10
+ KIRO_COMPLETION_TOOL_NAME,
11
+ KIRO_STRUCTURED_OUTPUT_TOOL_NAME,
12
+ type KiroCompletionMode,
13
+ } from "../kiro-constants";
10
14
  import {
11
15
  classifyKiroEventError,
12
16
  classifyKiroHttpError,
@@ -15,13 +19,23 @@ import {
15
19
  safeKiroHttpErrorMessage,
16
20
  type KiroErrorClassification,
17
21
  } from "../kiro-errors";
18
- import { parseKiroEvent } from "../kiro-events";
22
+ import { parseKiroEvent, type KiroRefusalDetails } from "../kiro-events";
19
23
  import { noteKiroTransientThrottle } from "../kiro-retry";
20
24
  import { InlineThinkTagParser } from "../inline-think-tags";
21
25
  import { isCompleteKiroToolInput, kiroTruncationErrorMessage } from "../kiro-truncation";
22
26
  import { isValidKiroConversationId } from "../kiro-wire";
23
27
  import { readDisplaySafeErrorPayloadText } from "../upstream-http-error";
24
28
  import { tagKiroReasoningBlob } from "./reasoning";
29
+ import {
30
+ isKiroStructuredCleanStop,
31
+ KIRO_STRUCTURED_EMPTY_FAILURE,
32
+ KIRO_STRUCTURED_TEXT_FAILURE,
33
+ kiroStructuredOutputFailure,
34
+ kiroStructuredStopFailure,
35
+ parseKiroStructuredText,
36
+ parseKiroStructuredToolInput,
37
+ type KiroStructuredOutputSpec,
38
+ } from "./structured-output";
25
39
  import { estimateKiroTokens, kiroUpstreamContextWindow } from "./usage";
26
40
 
27
41
  // Stream parsing (shared by parseStream + parseResponse)
@@ -209,6 +223,37 @@ function retryableKiroIncomplete(
209
223
  };
210
224
  }
211
225
 
226
+ /**
227
+ * Kiro's safety-filter stops. For Claude models CONTENT_FILTERED is the model's own safety
228
+ * classifier, a deterministic verdict on this exact context, so every completion mode maps it to
229
+ * the non-retryable `content_filter` incomplete: Claude outbound renders `stop_reason: "refusal"`
230
+ * and Responses a terminal `response.failed` (`src/bridge/terminal-refusal.ts`). Kiro's refusal
231
+ * category and explanation are model-side copy, never request content, so they ride the message.
232
+ */
233
+ function isKiroContentFilterStop(
234
+ stopReason: string | undefined,
235
+ ): stopReason is "CONTENT_FILTERED" | "GUARDRAIL_INTERVENED" {
236
+ return stopReason === "CONTENT_FILTERED" || stopReason === "GUARDRAIL_INTERVENED";
237
+ }
238
+
239
+ /** The non-retryable `content_filter` incomplete for a filter stop, carrying Kiro's refusal category and explanation when present. */
240
+ function kiroContentFilterIncomplete(
241
+ stopReason: string,
242
+ refusal: KiroRefusalDetails | undefined,
243
+ usage: OcxUsage,
244
+ providerState: { kiro: { conversationId: string } } | undefined,
245
+ ): AdapterEvent {
246
+ const category = refusal?.category ? `, category ${refusal.category}` : "";
247
+ const explanation = refusal?.explanation ? `: ${refusal.explanation}` : "";
248
+ return retryableKiroIncomplete(
249
+ "content_filter",
250
+ `Kiro stopped with ${stopReason}${category}${explanation}`,
251
+ usage,
252
+ providerState,
253
+ false,
254
+ );
255
+ }
256
+
212
257
  /**
213
258
  * Catch-path retryability for #519: only transport/socket failures with no emitted output
214
259
  * are replay-safe. Malformed event payloads (`invalid Kiro …`) and any post-output failure
@@ -227,6 +272,10 @@ export function isRetryableKiroStreamCatchError(err: unknown, emittedOutput: boo
227
272
  /** Native clean-stop reason eligible for bounded private-completion validation. */
228
273
  const KIRO_END_TURN_STOP_REASON = "END_TURN";
229
274
 
275
+ /**
276
+ * Run one attempt through `parseKiroAttemptEvents` while holding commentary until completion is
277
+ * validated, and hand the held events back to the caller so a bounded retry can release or drop them.
278
+ */
230
279
  async function* parseKiroAttempt(
231
280
  response: Response,
232
281
  budget: TranslatorBudget,
@@ -240,6 +289,7 @@ async function* parseKiroAttempt(
240
289
  /** True when an earlier attempt has output that must survive a failed retry. */
241
290
  priorEmittedOutput = false,
242
291
  priorAttempt?: KiroAttemptResult,
292
+ structuredOutput?: KiroStructuredOutputSpec,
243
293
  ): AsyncGenerator<AdapterEvent, KiroAttemptResult> {
244
294
  // Hold commentary through completion validation; tools and failures still release progress.
245
295
  const deferred: AdapterEvent[] = [];
@@ -271,7 +321,13 @@ async function* parseKiroAttempt(
271
321
  contextInputEstimate,
272
322
  priorEmittedOutput,
273
323
  priorAttempt,
324
+ structuredOutput,
274
325
  );
326
+ // Held text that no terminal claimed is prose. On an ordinary turn that is still real progress
327
+ // and is released before a failure; for a structured-output caller it is exactly the wrong-format
328
+ // answer the contract exists to withhold, so only its non-text events are released. A real tool
329
+ // call has already flushed its leading commentary by the time anything reaches these drains.
330
+ const dropHeldProse = structuredOutput !== undefined;
275
331
  let handedOff = false;
276
332
  try {
277
333
  const result = yield* attempt;
@@ -284,8 +340,8 @@ async function* parseKiroAttempt(
284
340
  if (staged && !result.needsFallback) {
285
341
  recordKiroCalibration(staged.conversationId, staged.estimated, staged.charged);
286
342
  }
287
- if (priorAttempt) yield* priorAttempt.drainDeferred();
288
- if (!result.needsFallback) yield* drainDeferred();
343
+ if (priorAttempt) yield* priorAttempt.drainDeferred(dropHeldProse);
344
+ if (!result.needsFallback) yield* drainDeferred(dropHeldProse);
289
345
  handedOff = true;
290
346
  return {
291
347
  ...result, drainDeferred,
@@ -297,6 +353,11 @@ async function* parseKiroAttempt(
297
353
  }
298
354
  }
299
355
 
356
+ /**
357
+ * Parse one Kiro attempt's event stream into adapter events and a terminal decision: text, reasoning,
358
+ * real tool calls, the private terminal tool, usage and the stop reason. In `required` mode it may
359
+ * return `needsFallback` instead of a terminal, which asks the caller for the one bounded retry.
360
+ */
300
361
  async function* parseKiroAttemptEvents(
301
362
  response: Response,
302
363
  budget: TranslatorBudget,
@@ -312,6 +373,7 @@ async function* parseKiroAttemptEvents(
312
373
  contextInputEstimate?: number,
313
374
  priorEmittedOutput = false,
314
375
  priorAttempt?: KiroAttemptResult,
376
+ structuredOutput?: KiroStructuredOutputSpec,
315
377
  ): AsyncGenerator<AdapterEvent, KiroAttemptParseResult> {
316
378
  const emptyResult = (): KiroAttemptParseResult => ({ assistantText: "", sawReasoning: false });
317
379
  // Every early return below is a failure path that stages nothing; only the completion path
@@ -341,9 +403,16 @@ async function* parseKiroAttemptEvents(
341
403
  let sawRealTool = false;
342
404
  let completionAnswer: string | undefined;
343
405
  let completionCalls = 0;
406
+ // A structured-output call whose input failed validation on the FIRST attempt. It earns the one
407
+ // bounded retry instead of failing the turn, because the likely fault (a missing required key, a
408
+ // wrong root type) is one the model can correct when told; the retry itself gets no second one.
409
+ let structuredRetry = false;
410
+ // Structured output replaces the completion tool as the turn's terminal channel (payload.ts).
411
+ const terminalToolName = structuredOutput ? KIRO_STRUCTURED_OUTPUT_TOOL_NAME : KIRO_COMPLETION_TOOL_NAME;
344
412
  let authoritativeUsage: OcxUsage | undefined;
345
413
  let providerCredits: number | undefined;
346
414
  let stopReason: string | undefined;
415
+ let refusal: KiroRefusalDetails | undefined;
347
416
  const fallbackEvents: AdapterEvent[] = [];
348
417
  const thinking = new InlineThinkTagParser(budget);
349
418
 
@@ -408,6 +477,7 @@ async function* parseKiroAttemptEvents(
408
477
  };
409
478
  };
410
479
 
480
+ /** The terminal for a classified upstream error frame; retryable only while nothing has been emitted. */
411
481
  const classifiedTerminal = (failure: KiroErrorClassification): AdapterEvent => {
412
482
  // Upstream exception/error frames can arrive after commentary was already staged (and will be
413
483
  // flushed before this terminal is yielded). Replaying after that content would duplicate it.
@@ -433,8 +503,16 @@ async function* parseKiroAttemptEvents(
433
503
  };
434
504
  };
435
505
 
506
+ /**
507
+ * The terminal for a protocol violation. A malformed private-tool answer on the bounded retry is
508
+ * a retryable incomplete for ordinary turns and a non-retryable failure for structured output;
509
+ * everything else is a non-retryable 502.
510
+ */
436
511
  const protocolTerminal = (message: string, malformedCompletion = false): AdapterEvent => {
437
512
  if (mode === "text_fallback" && malformedCompletion) {
513
+ // The bounded retry was the structured contract's second ask; a malformed answer on it ends
514
+ // the turn with the non-retryable structured failure, never a replayable incomplete.
515
+ if (structuredOutput) return kiroStructuredOutputFailure(message, usage());
438
516
  return retryableKiroIncomplete(
439
517
  "malformed_kiro_completion",
440
518
  message,
@@ -463,13 +541,23 @@ async function* parseKiroAttemptEvents(
463
541
  console.warn("[kiro] dropped the private final-answer call; the turn also carried a real tool call");
464
542
  };
465
543
 
544
+ /**
545
+ * Mark a tool call as the turn's private terminal tool or an ordinary client tool, and return a
546
+ * terminal when the call names a reserved tool this turn did not advertise or completion is disabled.
547
+ */
466
548
  const classifyTool = (
467
549
  tool: { id: string; name: string; chunks: string[]; completion: boolean },
468
550
  ): AdapterEvent | undefined => {
469
- if (tool.name !== KIRO_COMPLETION_TOOL_NAME) {
551
+ if (tool.name !== KIRO_COMPLETION_TOOL_NAME && tool.name !== KIRO_STRUCTURED_OUTPUT_TOOL_NAME) {
470
552
  tool.completion = false;
471
553
  return undefined;
472
554
  }
555
+ // Both private names are reserved against client tools (kiro-wire.ts), so a call to the one
556
+ // this turn did not advertise can only be the model inventing it. Relaying it as a client
557
+ // tool would hand the client a call to a tool it never declared.
558
+ if (tool.name !== terminalToolName) {
559
+ return protocolTerminal("Kiro returned a reserved private tool this turn did not advertise");
560
+ }
473
561
  if (mode === "disabled") {
474
562
  return protocolTerminal("Kiro returned the reserved private final-answer tool while explicit completion was disabled");
475
563
  }
@@ -501,6 +589,11 @@ async function* parseKiroAttemptEvents(
501
589
  return [{ type: "heartbeat" }];
502
590
  };
503
591
 
592
+ /**
593
+ * Account for one content event and route it by completion mode: emitted directly when completion
594
+ * is disabled, held until validation in `required` mode, and retained for the bounded retry's
595
+ * decision in `text_fallback` mode.
596
+ */
504
597
  const stage = (event: AdapterEvent): AdapterEvent[] => {
505
598
  if (event.type === "text_delta") {
506
599
  const nextAssistantTextBytes = appendedUtf8Bytes(assistantText, assistantTextBytes, event.text);
@@ -547,7 +640,12 @@ async function* parseKiroAttemptEvents(
547
640
  return mode === "required" ? defer(event) : [event];
548
641
  };
549
642
 
643
+ /** Parse the private terminal tool's input into the answer text: the validated JSON for structured output, otherwise the completion tool's `answer`. */
550
644
  const parseCompletion = (chunks: string[]): string | Error => {
645
+ if (structuredOutput) {
646
+ const parsed = parseKiroStructuredToolInput(structuredOutput, chunks.join(""));
647
+ return "json" in parsed ? parsed.json : new Error(parsed.error);
648
+ }
551
649
  const raw = chunks.join("").trim();
552
650
  let value: unknown;
553
651
  try {
@@ -565,6 +663,10 @@ async function* parseKiroAttemptEvents(
565
663
  return answer;
566
664
  };
567
665
 
666
+ /**
667
+ * Close the open tool call: record a private terminal answer (or schedule its bounded retry), or
668
+ * emit a real client tool call. Returns a terminal when the call cannot be accepted.
669
+ */
568
670
  const flushOpen = (): { events: AdapterEvent[]; terminal?: AdapterEvent } => {
569
671
  if (!open) return { events: [] };
570
672
  const tool = open;
@@ -572,6 +674,14 @@ async function* parseKiroAttemptEvents(
572
674
  closeOpenCall();
573
675
  const input = tool.chunks.join("");
574
676
  if (!isCompleteKiroToolInput(input)) {
677
+ // A truncated structured answer is the same correctable fault as one that fails to parse: it
678
+ // earns the bounded retry, decided with the stop reason at the end of the attempt. The retry
679
+ // itself (text_fallback) ends non-retryably through protocolTerminal.
680
+ if (structuredOutput && mode === "required" && tool.completion) {
681
+ completionCalls++;
682
+ structuredRetry = true;
683
+ return { events: [] };
684
+ }
575
685
  return { events: [], terminal: protocolTerminal(kiroTruncationErrorMessage("incomplete tool input JSON"), tool.completion) };
576
686
  }
577
687
  if (tool.completion) {
@@ -580,6 +690,11 @@ async function* parseKiroAttemptEvents(
580
690
  return { events: [], terminal: protocolTerminal("Kiro returned more than one private final-answer tool call", true) };
581
691
  }
582
692
  const answer = parseCompletion(tool.chunks);
693
+ if (answer instanceof Error && structuredOutput) {
694
+ if (mode !== "required") return { events: [], terminal: kiroStructuredOutputFailure(answer.message, usage()) };
695
+ structuredRetry = true;
696
+ return { events: [] };
697
+ }
583
698
  if (answer instanceof Error) return { events: [], terminal: protocolTerminal(answer.message, true) };
584
699
  if (sawRealTool) {
585
700
  noteDroppedCompletion();
@@ -639,6 +754,7 @@ async function* parseKiroAttemptEvents(
639
754
  contextUsagePercentage = ev.contextUsagePercentage;
640
755
  }
641
756
  if (ev.stopReason !== undefined) stopReason = ev.stopReason;
757
+ if (ev.refusal) refusal = ev.refusal;
642
758
  break;
643
759
  case "message_metadata":
644
760
  if (isValidKiroConversationId(ev.conversationId)) {
@@ -758,7 +874,11 @@ async function* parseKiroAttemptEvents(
758
874
  }
759
875
  if (open) {
760
876
  const input = open.chunks.join("");
761
- if (!isCompleteKiroToolInput(input)) {
877
+ // A truncated structured answer still open at end of stream goes through flushOpen like one
878
+ // closed by a tool-stop frame: the bounded retry, decided with the stop reason below. Every
879
+ // other open call keeps this guard's terminal.
880
+ const structuredTruncation = structuredOutput !== undefined && mode === "required" && open.completion;
881
+ if (!structuredTruncation && !isCompleteKiroToolInput(input)) {
762
882
  const privateTool = open.completion;
763
883
  open = null;
764
884
  return {
@@ -824,7 +944,12 @@ async function* parseKiroAttemptEvents(
824
944
  sawRealTool,
825
945
  completionCalls,
826
946
  nativeCompletionStop,
827
- ...(stopReason !== undefined ? { stopReason } : {}),
947
+ ...(structuredOutput ? { structuredOutput: true, structuredRetry } : {}),
948
+ ...(stopReason !== undefined ? { stopReason: [
949
+ "END_TURN", "STOP_SEQUENCE", "MAX_TOKENS", "MODEL_CONTEXT_WINDOW_EXCEEDED",
950
+ "MALFORMED_TOOL_USE", "MALFORMED_MODEL_OUTPUT", "TOOL_USE",
951
+ "CONTENT_FILTERED", "GUARDRAIL_INTERVENED",
952
+ ].includes(normalizedStopReason ?? "") ? normalizedStopReason : "other" } : {}),
828
953
  assistantChars: assistantText.length,
829
954
  });
830
955
 
@@ -833,8 +958,27 @@ async function* parseKiroAttemptEvents(
833
958
  }
834
959
 
835
960
  if (mode === "text_fallback") {
961
+ // A validated final answer and a real tool call keep their precedence; only a turn that would
962
+ // otherwise end on its text is read as refused. Neither attempt produced an accepted answer, so
963
+ // the first attempt's held progress is released rather than superseded (retry text normally
964
+ // replaces it), and the filtered retry text follows as the commentary it was staged as.
965
+ if (completionAnswer === undefined && !sawRealTool && isKiroContentFilterStop(normalizedStopReason)) {
966
+ // A structured-output caller never receives prose: text from either attempt is dropped and
967
+ // only their non-text events and the filter terminal remain.
968
+ if (priorAttempt) yield* priorAttempt.drainDeferred(structuredOutput !== undefined);
969
+ yield* structuredOutput ? consumeSupersededByCompletion(fallbackEvents) : emitRetained(fallbackEvents);
970
+ return {
971
+ assistantText,
972
+ sawReasoning,
973
+ terminal: kiroContentFilterIncomplete(normalizedStopReason, refusal, finalUsage, finalProviderState),
974
+ };
975
+ }
836
976
  if (priorAttempt) {
837
- yield* priorAttempt.drainDeferred(completionAnswer !== undefined || (sawText && !sawRealTool));
977
+ // Structured output supersedes first-attempt prose on every outcome but a real tool call:
978
+ // success replaces it, and failure must not relay it (see `dropHeldProse`).
979
+ yield* priorAttempt.drainDeferred(structuredOutput
980
+ ? !sawRealTool
981
+ : completionAnswer !== undefined || (sawText && !sawRealTool));
838
982
  }
839
983
  if (completionAnswer !== undefined) {
840
984
  yield* consumeSupersededByCompletion(fallbackEvents);
@@ -853,6 +997,25 @@ async function* parseKiroAttemptEvents(
853
997
  terminal: { type: "done", usage: finalUsage, endTurn: false, ...(finalProviderState ? { providerState: finalProviderState } : {}) },
854
998
  };
855
999
  }
1000
+ if (sawText && structuredOutput) {
1001
+ // Same clean-stop rule as the first attempt: text a MAX_TOKENS cut ended is not an answer,
1002
+ // even when its prefix parses.
1003
+ const cleanStop = isKiroStructuredCleanStop(normalizedStopReason);
1004
+ const json = cleanStop ? parseKiroStructuredText(structuredOutput, assistantText) : undefined;
1005
+ yield* consumeSupersededByCompletion(fallbackEvents);
1006
+ if (json === undefined) {
1007
+ const message = !cleanStop && normalizedStopReason
1008
+ ? kiroStructuredStopFailure(normalizedStopReason)
1009
+ : KIRO_STRUCTURED_TEXT_FAILURE;
1010
+ return { assistantText, sawReasoning, terminal: kiroStructuredOutputFailure(message, finalUsage) };
1011
+ }
1012
+ yield { type: "text_delta", text: json, phase: "final_answer" };
1013
+ return {
1014
+ assistantText,
1015
+ sawReasoning,
1016
+ terminal: { type: "done", usage: finalUsage, endTurn: true, ...(finalProviderState ? { providerState: finalProviderState } : {}) },
1017
+ };
1018
+ }
856
1019
  if (sawText) {
857
1020
  for (const event of fallbackEvents) {
858
1021
  try {
@@ -868,6 +1031,13 @@ async function* parseKiroAttemptEvents(
868
1031
  terminal: { type: "done", usage: finalUsage, endTurn: true, ...(finalProviderState ? { providerState: finalProviderState } : {}) },
869
1032
  };
870
1033
  }
1034
+ if (structuredOutput) {
1035
+ // The model was already asked twice inside this turn; an empty or reasoning-only retry ends
1036
+ // the structured contract with its non-retryable failure, never a retryable empty fallback
1037
+ // that would let the proxy replay the whole turn.
1038
+ yield* consumeSupersededByCompletion(fallbackEvents);
1039
+ return { assistantText, sawReasoning, terminal: kiroStructuredOutputFailure(KIRO_STRUCTURED_EMPTY_FAILURE, finalUsage) };
1040
+ }
871
1041
  yield* emitRetained(fallbackEvents);
872
1042
  return {
873
1043
  assistantText,
@@ -885,6 +1055,17 @@ async function* parseKiroAttemptEvents(
885
1055
  };
886
1056
  }
887
1057
 
1058
+ // Ahead of the empty-stream fallback below: a tool-less (`disabled`) turn Kiro refuses carries
1059
+ // no content at all, and reading it as a replay-safe empty stream made clients resend a refusal
1060
+ // that repeats deterministically. Partial text before the filter is not a finished answer either.
1061
+ // A validated final answer and a real tool call keep their precedence, as on the retry path.
1062
+ if (completionAnswer === undefined && !sawRealTool && isKiroContentFilterStop(normalizedStopReason)) {
1063
+ return {
1064
+ assistantText,
1065
+ sawReasoning,
1066
+ terminal: kiroContentFilterIncomplete(normalizedStopReason, refusal, finalUsage, finalProviderState),
1067
+ };
1068
+ }
888
1069
  if (completionAnswer !== undefined) {
889
1070
  yield { type: "text_delta", text: completionAnswer, phase: "final_answer" };
890
1071
  return {
@@ -900,6 +1081,34 @@ async function* parseKiroAttemptEvents(
900
1081
  terminal: { type: "done", usage: finalUsage, endTurn: false, ...(finalProviderState ? { providerState: finalProviderState } : {}) },
901
1082
  };
902
1083
  }
1084
+ if (mode === "required" && structuredOutput) {
1085
+ // Any stop reason other than a clean one falls through to its own handling below: a failed
1086
+ // structured answer under MAX_TOKENS, a content filter or an exhausted context window earns no
1087
+ // retry, and a MAX_TOKENS cut is never mistaken for an answer even when its prefix parses.
1088
+ const cleanStop = isKiroStructuredCleanStop(normalizedStopReason);
1089
+ if (structuredRetry && cleanStop) {
1090
+ return { assistantText, sawReasoning, needsFallback: true, usage: finalUsage, providerState: finalProviderState };
1091
+ }
1092
+ // A model that wrote the requested JSON as text, and stopped cleanly, has answered: accept it
1093
+ // without a second paid request.
1094
+ const json = sawText && cleanStop && completionCalls === 0
1095
+ ? parseKiroStructuredText(structuredOutput, assistantText)
1096
+ : undefined;
1097
+ if (json !== undefined) {
1098
+ yield* consumeSupersededByCompletion(deferred);
1099
+ yield { type: "text_delta", text: json, phase: "final_answer" };
1100
+ return {
1101
+ assistantText,
1102
+ sawReasoning,
1103
+ terminal: { type: "done", usage: finalUsage, endTurn: true, ...(finalProviderState ? { providerState: finalProviderState } : {}) },
1104
+ };
1105
+ }
1106
+ // A clean stop without an accepted answer, prose or nothing at all, earns the one bounded
1107
+ // retry: an empty END_TURN is as recoverable as prose, and the caller still needs JSON.
1108
+ if (cleanStop) {
1109
+ return { assistantText, sawReasoning, needsFallback: true, usage: finalUsage, providerState: finalProviderState };
1110
+ }
1111
+ }
903
1112
  if (mode === "required" && nativeCompletionStop) {
904
1113
  return {
905
1114
  assistantText,
@@ -953,9 +1162,6 @@ async function* parseKiroAttemptEvents(
953
1162
  };
954
1163
  }
955
1164
  if (normalizedStopReason === "MAX_TOKENS") return incomplete("max_output_tokens", true);
956
- if (normalizedStopReason === "CONTENT_FILTERED" || normalizedStopReason === "GUARDRAIL_INTERVENED") {
957
- return incomplete("content_filter", false);
958
- }
959
1165
  if (normalizedStopReason === "MALFORMED_TOOL_USE") return incomplete("kiro_malformed_tool_use", false);
960
1166
  if (normalizedStopReason === "MALFORMED_MODEL_OUTPUT") return incomplete("kiro_malformed_model_output", false);
961
1167
  // TOOL_USE here means Kiro claimed a tool call it never emitted.
@@ -1042,6 +1248,10 @@ async function* parseKiroAttemptEvents(
1042
1248
  }
1043
1249
  }
1044
1250
 
1251
+ /**
1252
+ * Parse a Kiro response into adapter events, running at most one bounded retry through
1253
+ * `fallbackFactory` when the first attempt ends without a validated answer.
1254
+ */
1045
1255
  export async function* parseKiroStream(
1046
1256
  response: Response,
1047
1257
  budget: TranslatorBudget,
@@ -1053,8 +1263,11 @@ export async function* parseKiroStream(
1053
1263
  completionMode: KiroCompletionMode = "disabled",
1054
1264
  fallbackFactory?: KiroFallbackFactory,
1055
1265
  contextInputEstimate?: number,
1266
+ structuredOutput?: KiroStructuredOutputSpec,
1056
1267
  ): AsyncGenerator<AdapterEvent> {
1057
1268
  const contextWindowState: KiroContextWindowState = { value: contextWindow };
1269
+ // See `dropHeldProse` in parseKiroAttempt: a structured-output caller never receives held prose.
1270
+ const dropHeldProse = structuredOutput !== undefined;
1058
1271
  const firstResult = yield* parseKiroAttempt(
1059
1272
  response,
1060
1273
  budget,
@@ -1066,6 +1279,8 @@ export async function* parseKiroStream(
1066
1279
  conversationId,
1067
1280
  contextInputEstimate,
1068
1281
  false,
1282
+ undefined,
1283
+ structuredOutput,
1069
1284
  );
1070
1285
  try {
1071
1286
  if (!firstResult.needsFallback) {
@@ -1073,7 +1288,7 @@ export async function* parseKiroStream(
1073
1288
  return;
1074
1289
  }
1075
1290
  if (!fallbackFactory) {
1076
- yield* firstResult.drainDeferred();
1291
+ yield* firstResult.drainDeferred(dropHeldProse);
1077
1292
  yield retryableKiroIncomplete(
1078
1293
  "uncompleted_kiro_response",
1079
1294
  "Kiro produced progress without an explicit final answer and no bounded retry transport was available",
@@ -1098,7 +1313,7 @@ export async function* parseKiroStream(
1098
1313
  budget,
1099
1314
  );
1100
1315
  } catch (err) {
1101
- yield* firstResult.drainDeferred();
1316
+ yield* firstResult.drainDeferred(dropHeldProse);
1102
1317
  firstAssistantText = "";
1103
1318
  firstResult.assistantText = "";
1104
1319
  firstResult.releaseRetained();
@@ -1130,7 +1345,7 @@ export async function* parseKiroStream(
1130
1345
  firstResult.releaseCollectors();
1131
1346
  fallback.releaseRequestBody?.();
1132
1347
  if (!fallback.response.ok) {
1133
- yield* firstResult.drainDeferred();
1348
+ yield* firstResult.drainDeferred(dropHeldProse);
1134
1349
  const payload = await readDisplaySafeErrorPayloadText(fallback.response, fallback.abortSignal);
1135
1350
  const failure = classifyKiroHttpError(fallback.response.status, fallback.response.headers, payload);
1136
1351
  yield {
@@ -1158,6 +1373,7 @@ export async function* parseKiroStream(
1158
1373
  // Failed validation will release the held first-attempt progress.
1159
1374
  priorEmittedOutput,
1160
1375
  firstResult,
1376
+ structuredOutput,
1161
1377
  );
1162
1378
  try {
1163
1379
  if (!secondResult.terminal) {