@botiverse/oar 0.125.0 → 0.126.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (436) hide show
  1. package/dist/community/cybion/refused-options.d.ts.map +1 -1
  2. package/dist/community/cybion/refused-options.js +1 -0
  3. package/dist/community/cybion/refused-options.js.map +1 -1
  4. package/dist/community/morph/session.d.ts.map +1 -1
  5. package/dist/community/morph/session.js +1 -0
  6. package/dist/community/morph/session.js.map +1 -1
  7. package/dist/contracts/account-usage.d.ts +1 -1
  8. package/dist/contracts/account-usage.d.ts.map +1 -1
  9. package/dist/contracts/credentials.d.ts +61 -0
  10. package/dist/contracts/credentials.d.ts.map +1 -0
  11. package/dist/contracts/credentials.js +2 -0
  12. package/dist/contracts/credentials.js.map +1 -0
  13. package/dist/contracts/index.d.ts +6 -3
  14. package/dist/contracts/index.d.ts.map +1 -1
  15. package/dist/contracts/index.js.map +1 -1
  16. package/dist/contracts/installation.d.ts +27 -4
  17. package/dist/contracts/installation.d.ts.map +1 -1
  18. package/dist/contracts/login.d.ts +3 -1
  19. package/dist/contracts/login.d.ts.map +1 -1
  20. package/dist/contracts/model-request.d.ts +14 -0
  21. package/dist/contracts/model-request.d.ts.map +1 -0
  22. package/dist/contracts/model-request.js +2 -0
  23. package/dist/contracts/model-request.js.map +1 -0
  24. package/dist/contracts/orientation.d.ts +2 -1
  25. package/dist/contracts/orientation.d.ts.map +1 -1
  26. package/dist/contracts/records.d.ts +3 -1
  27. package/dist/contracts/records.d.ts.map +1 -1
  28. package/dist/contracts/runtime.d.ts +12 -41
  29. package/dist/contracts/runtime.d.ts.map +1 -1
  30. package/dist/contracts/runtime.js.map +1 -1
  31. package/dist/contracts/session-options.d.ts +2 -0
  32. package/dist/contracts/session-options.d.ts.map +1 -1
  33. package/dist/contracts/session.d.ts +5 -1
  34. package/dist/contracts/session.d.ts.map +1 -1
  35. package/dist/contracts/side-question.d.ts +14 -0
  36. package/dist/contracts/side-question.d.ts.map +1 -0
  37. package/dist/contracts/side-question.js +2 -0
  38. package/dist/contracts/side-question.js.map +1 -0
  39. package/dist/contracts/tool-output.d.ts +6 -0
  40. package/dist/contracts/tool-output.d.ts.map +1 -1
  41. package/dist/observe/session-view-tools.d.ts +1 -1
  42. package/dist/observe/session-view-tools.d.ts.map +1 -1
  43. package/dist/observe/session-view-tools.js +1 -0
  44. package/dist/observe/session-view-tools.js.map +1 -1
  45. package/dist/observe/session-view.d.ts +2 -1
  46. package/dist/observe/session-view.d.ts.map +1 -1
  47. package/dist/observe/session-view.js.map +1 -1
  48. package/dist/runtimes/antigravity/account-usage.d.ts +4 -2
  49. package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
  50. package/dist/runtimes/antigravity/account-usage.js +3 -3
  51. package/dist/runtimes/antigravity/account-usage.js.map +1 -1
  52. package/dist/runtimes/antigravity/index.d.ts +31 -0
  53. package/dist/runtimes/antigravity/index.d.ts.map +1 -1
  54. package/dist/runtimes/antigravity/index.js +15 -0
  55. package/dist/runtimes/antigravity/index.js.map +1 -1
  56. package/dist/runtimes/antigravity/installation.d.ts +6 -3
  57. package/dist/runtimes/antigravity/installation.d.ts.map +1 -1
  58. package/dist/runtimes/antigravity/installation.js +25 -30
  59. package/dist/runtimes/antigravity/installation.js.map +1 -1
  60. package/dist/runtimes/antigravity/options.d.ts.map +1 -1
  61. package/dist/runtimes/antigravity/options.js +1 -0
  62. package/dist/runtimes/antigravity/options.js.map +1 -1
  63. package/dist/runtimes/antigravity/quota.d.ts +6 -1
  64. package/dist/runtimes/antigravity/quota.d.ts.map +1 -1
  65. package/dist/runtimes/antigravity/quota.js +46 -13
  66. package/dist/runtimes/antigravity/quota.js.map +1 -1
  67. package/dist/runtimes/claude/account-usage.d.ts.map +1 -1
  68. package/dist/runtimes/claude/account-usage.js +30 -8
  69. package/dist/runtimes/claude/account-usage.js.map +1 -1
  70. package/dist/runtimes/claude/auth-status.d.ts.map +1 -1
  71. package/dist/runtimes/claude/auth-status.js +25 -4
  72. package/dist/runtimes/claude/auth-status.js.map +1 -1
  73. package/dist/runtimes/claude/credentials.d.ts +1 -1
  74. package/dist/runtimes/claude/credentials.d.ts.map +1 -1
  75. package/dist/runtimes/claude/credentials.js +51 -34
  76. package/dist/runtimes/claude/credentials.js.map +1 -1
  77. package/dist/runtimes/claude/index.d.ts +6 -2
  78. package/dist/runtimes/claude/index.d.ts.map +1 -1
  79. package/dist/runtimes/claude/index.js +4 -2
  80. package/dist/runtimes/claude/index.js.map +1 -1
  81. package/dist/runtimes/claude/installation.d.ts +1 -0
  82. package/dist/runtimes/claude/installation.d.ts.map +1 -1
  83. package/dist/runtimes/claude/installation.js +2 -1
  84. package/dist/runtimes/claude/installation.js.map +1 -1
  85. package/dist/runtimes/claude/inventory.js +1 -1
  86. package/dist/runtimes/claude/inventory.js.map +1 -1
  87. package/dist/runtimes/claude/last-account.d.ts +21 -0
  88. package/dist/runtimes/claude/last-account.d.ts.map +1 -1
  89. package/dist/runtimes/claude/last-account.js +58 -6
  90. package/dist/runtimes/claude/last-account.js.map +1 -1
  91. package/dist/runtimes/claude/launch.d.ts +1 -1
  92. package/dist/runtimes/claude/launch.d.ts.map +1 -1
  93. package/dist/runtimes/claude/launch.js +7 -3
  94. package/dist/runtimes/claude/launch.js.map +1 -1
  95. package/dist/runtimes/claude/list-models.js +1 -1
  96. package/dist/runtimes/claude/list-models.js.map +1 -1
  97. package/dist/runtimes/claude/model-request-files.d.ts +19 -0
  98. package/dist/runtimes/claude/model-request-files.d.ts.map +1 -0
  99. package/dist/runtimes/claude/model-request-files.js +104 -0
  100. package/dist/runtimes/claude/model-request-files.js.map +1 -0
  101. package/dist/runtimes/claude/model-requests.d.ts +16 -0
  102. package/dist/runtimes/claude/model-requests.d.ts.map +1 -0
  103. package/dist/runtimes/claude/model-requests.js +190 -0
  104. package/dist/runtimes/claude/model-requests.js.map +1 -0
  105. package/dist/runtimes/claude/open-settings.d.ts +2 -1
  106. package/dist/runtimes/claude/open-settings.d.ts.map +1 -1
  107. package/dist/runtimes/claude/open-settings.js +33 -9
  108. package/dist/runtimes/claude/open-settings.js.map +1 -1
  109. package/dist/runtimes/claude/options.d.ts +4 -0
  110. package/dist/runtimes/claude/options.d.ts.map +1 -1
  111. package/dist/runtimes/claude/options.js +21 -0
  112. package/dist/runtimes/claude/options.js.map +1 -1
  113. package/dist/runtimes/claude/session.d.ts.map +1 -1
  114. package/dist/runtimes/claude/session.js +29 -7
  115. package/dist/runtimes/claude/session.js.map +1 -1
  116. package/dist/runtimes/claude/side-question.d.ts +4 -0
  117. package/dist/runtimes/claude/side-question.d.ts.map +1 -0
  118. package/dist/runtimes/claude/side-question.js +50 -0
  119. package/dist/runtimes/claude/side-question.js.map +1 -0
  120. package/dist/runtimes/codebuddy/index.d.ts +52 -0
  121. package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
  122. package/dist/runtimes/codebuddy/index.js +19 -0
  123. package/dist/runtimes/codebuddy/index.js.map +1 -1
  124. package/dist/runtimes/codebuddy/installation.d.ts.map +1 -1
  125. package/dist/runtimes/codebuddy/installation.js +5 -4
  126. package/dist/runtimes/codebuddy/installation.js.map +1 -1
  127. package/dist/runtimes/codebuddy/options.d.ts.map +1 -1
  128. package/dist/runtimes/codebuddy/options.js +1 -0
  129. package/dist/runtimes/codebuddy/options.js.map +1 -1
  130. package/dist/runtimes/codex/account-id.d.ts +14 -0
  131. package/dist/runtimes/codex/account-id.d.ts.map +1 -0
  132. package/dist/runtimes/codex/account-id.js +173 -0
  133. package/dist/runtimes/codex/account-id.js.map +1 -0
  134. package/dist/runtimes/codex/account-request.d.ts +1 -0
  135. package/dist/runtimes/codex/account-request.d.ts.map +1 -1
  136. package/dist/runtimes/codex/account-request.js +45 -16
  137. package/dist/runtimes/codex/account-request.js.map +1 -1
  138. package/dist/runtimes/codex/account-usage.d.ts.map +1 -1
  139. package/dist/runtimes/codex/account-usage.js +15 -13
  140. package/dist/runtimes/codex/account-usage.js.map +1 -1
  141. package/dist/runtimes/codex/app-server-client.d.ts +3 -1
  142. package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
  143. package/dist/runtimes/codex/app-server-client.js +2 -0
  144. package/dist/runtimes/codex/app-server-client.js.map +1 -1
  145. package/dist/runtimes/codex/home-initialization.d.ts +1 -0
  146. package/dist/runtimes/codex/home-initialization.d.ts.map +1 -1
  147. package/dist/runtimes/codex/home-initialization.js +46 -58
  148. package/dist/runtimes/codex/home-initialization.js.map +1 -1
  149. package/dist/runtimes/codex/index.d.ts +49 -0
  150. package/dist/runtimes/codex/index.d.ts.map +1 -1
  151. package/dist/runtimes/codex/index.js +20 -0
  152. package/dist/runtimes/codex/index.js.map +1 -1
  153. package/dist/runtimes/codex/installation.d.ts.map +1 -1
  154. package/dist/runtimes/codex/installation.js +8 -2
  155. package/dist/runtimes/codex/installation.js.map +1 -1
  156. package/dist/runtimes/codex/inventory.js +1 -1
  157. package/dist/runtimes/codex/inventory.js.map +1 -1
  158. package/dist/runtimes/codex/item-detail.d.ts +4 -0
  159. package/dist/runtimes/codex/item-detail.d.ts.map +1 -1
  160. package/dist/runtimes/codex/item-detail.js +39 -0
  161. package/dist/runtimes/codex/item-detail.js.map +1 -1
  162. package/dist/runtimes/codex/limit-reset.d.ts.map +1 -1
  163. package/dist/runtimes/codex/limit-reset.js +3 -2
  164. package/dist/runtimes/codex/limit-reset.js.map +1 -1
  165. package/dist/runtimes/codex/list-models.js +1 -1
  166. package/dist/runtimes/codex/list-models.js.map +1 -1
  167. package/dist/runtimes/codex/login.d.ts.map +1 -1
  168. package/dist/runtimes/codex/login.js +24 -10
  169. package/dist/runtimes/codex/login.js.map +1 -1
  170. package/dist/runtimes/codex/options.d.ts.map +1 -1
  171. package/dist/runtimes/codex/options.js +1 -0
  172. package/dist/runtimes/codex/options.js.map +1 -1
  173. package/dist/runtimes/codex/projection.d.ts.map +1 -1
  174. package/dist/runtimes/codex/projection.js +7 -23
  175. package/dist/runtimes/codex/projection.js.map +1 -1
  176. package/dist/runtimes/codex/refusal.d.ts +3 -3
  177. package/dist/runtimes/codex/refusal.js +3 -3
  178. package/dist/runtimes/codex/session.d.ts.map +1 -1
  179. package/dist/runtimes/codex/session.js +15 -6
  180. package/dist/runtimes/codex/session.js.map +1 -1
  181. package/dist/runtimes/cursor/index.d.ts.map +1 -1
  182. package/dist/runtimes/cursor/index.js +17 -3
  183. package/dist/runtimes/cursor/index.js.map +1 -1
  184. package/dist/runtimes/cursor/installation.d.ts +13 -9
  185. package/dist/runtimes/cursor/installation.d.ts.map +1 -1
  186. package/dist/runtimes/cursor/installation.js +29 -14
  187. package/dist/runtimes/cursor/installation.js.map +1 -1
  188. package/dist/runtimes/cursor/model.d.ts.map +1 -1
  189. package/dist/runtimes/cursor/model.js +1 -0
  190. package/dist/runtimes/cursor/model.js.map +1 -1
  191. package/dist/runtimes/cursor/run.d.ts +2 -0
  192. package/dist/runtimes/cursor/run.d.ts.map +1 -1
  193. package/dist/runtimes/cursor/run.js +31 -0
  194. package/dist/runtimes/cursor/run.js.map +1 -1
  195. package/dist/runtimes/cursor/session.d.ts +3 -1
  196. package/dist/runtimes/cursor/session.d.ts.map +1 -1
  197. package/dist/runtimes/cursor/session.js +24 -14
  198. package/dist/runtimes/cursor/session.js.map +1 -1
  199. package/dist/runtimes/devin/index.d.ts +17 -0
  200. package/dist/runtimes/devin/index.d.ts.map +1 -1
  201. package/dist/runtimes/devin/index.js +9 -0
  202. package/dist/runtimes/devin/index.js.map +1 -1
  203. package/dist/runtimes/devin/installation.d.ts.map +1 -1
  204. package/dist/runtimes/devin/installation.js +7 -2
  205. package/dist/runtimes/devin/installation.js.map +1 -1
  206. package/dist/runtimes/devin/options.d.ts.map +1 -1
  207. package/dist/runtimes/devin/options.js +1 -0
  208. package/dist/runtimes/devin/options.js.map +1 -1
  209. package/dist/runtimes/dsh/control.d.ts +5 -1
  210. package/dist/runtimes/dsh/control.d.ts.map +1 -1
  211. package/dist/runtimes/dsh/control.js +7 -2
  212. package/dist/runtimes/dsh/control.js.map +1 -1
  213. package/dist/runtimes/dsh/index.d.ts +4 -0
  214. package/dist/runtimes/dsh/index.d.ts.map +1 -1
  215. package/dist/runtimes/dsh/index.js +3 -1
  216. package/dist/runtimes/dsh/index.js.map +1 -1
  217. package/dist/runtimes/dsh/installation.d.ts +2 -3
  218. package/dist/runtimes/dsh/installation.d.ts.map +1 -1
  219. package/dist/runtimes/dsh/installation.js +11 -11
  220. package/dist/runtimes/dsh/installation.js.map +1 -1
  221. package/dist/runtimes/dsh/launch.d.ts +4 -2
  222. package/dist/runtimes/dsh/launch.d.ts.map +1 -1
  223. package/dist/runtimes/dsh/launch.js +9 -3
  224. package/dist/runtimes/dsh/launch.js.map +1 -1
  225. package/dist/runtimes/dsh/list-models.js +3 -3
  226. package/dist/runtimes/dsh/list-models.js.map +1 -1
  227. package/dist/runtimes/dsh/options.d.ts.map +1 -1
  228. package/dist/runtimes/dsh/options.js +1 -0
  229. package/dist/runtimes/dsh/options.js.map +1 -1
  230. package/dist/runtimes/dsh/profile-startup.d.ts +4 -0
  231. package/dist/runtimes/dsh/profile-startup.d.ts.map +1 -0
  232. package/dist/runtimes/dsh/profile-startup.js +21 -0
  233. package/dist/runtimes/dsh/profile-startup.js.map +1 -0
  234. package/dist/runtimes/dsh/session.d.ts.map +1 -1
  235. package/dist/runtimes/dsh/session.js +27 -7
  236. package/dist/runtimes/dsh/session.js.map +1 -1
  237. package/dist/runtimes/dsh/skills.d.ts.map +1 -1
  238. package/dist/runtimes/dsh/skills.js +3 -4
  239. package/dist/runtimes/dsh/skills.js.map +1 -1
  240. package/dist/runtimes/factory/account-usage.d.ts.map +1 -1
  241. package/dist/runtimes/factory/account-usage.js +2 -1
  242. package/dist/runtimes/factory/account-usage.js.map +1 -1
  243. package/dist/runtimes/factory/account.js +1 -1
  244. package/dist/runtimes/factory/account.js.map +1 -1
  245. package/dist/runtimes/factory/index.d.ts +54 -0
  246. package/dist/runtimes/factory/index.d.ts.map +1 -1
  247. package/dist/runtimes/factory/index.js +19 -0
  248. package/dist/runtimes/factory/index.js.map +1 -1
  249. package/dist/runtimes/factory/installation.d.ts +1 -1
  250. package/dist/runtimes/factory/installation.d.ts.map +1 -1
  251. package/dist/runtimes/factory/installation.js +2 -2
  252. package/dist/runtimes/factory/installation.js.map +1 -1
  253. package/dist/runtimes/factory/options.d.ts.map +1 -1
  254. package/dist/runtimes/factory/options.js +1 -0
  255. package/dist/runtimes/factory/options.js.map +1 -1
  256. package/dist/runtimes/factory/session.d.ts.map +1 -1
  257. package/dist/runtimes/factory/session.js +1 -0
  258. package/dist/runtimes/factory/session.js.map +1 -1
  259. package/dist/runtimes/grok/account-usage.d.ts.map +1 -1
  260. package/dist/runtimes/grok/account-usage.js +8 -6
  261. package/dist/runtimes/grok/account-usage.js.map +1 -1
  262. package/dist/runtimes/grok/index.d.ts +30 -0
  263. package/dist/runtimes/grok/index.d.ts.map +1 -1
  264. package/dist/runtimes/grok/index.js +13 -0
  265. package/dist/runtimes/grok/index.js.map +1 -1
  266. package/dist/runtimes/grok/installation.d.ts +1 -0
  267. package/dist/runtimes/grok/installation.d.ts.map +1 -1
  268. package/dist/runtimes/grok/installation.js +8 -1
  269. package/dist/runtimes/grok/installation.js.map +1 -1
  270. package/dist/runtimes/grok/options.d.ts.map +1 -1
  271. package/dist/runtimes/grok/options.js +1 -0
  272. package/dist/runtimes/grok/options.js.map +1 -1
  273. package/dist/runtimes/kimi/account-usage.d.ts.map +1 -1
  274. package/dist/runtimes/kimi/account-usage.js +5 -3
  275. package/dist/runtimes/kimi/account-usage.js.map +1 -1
  276. package/dist/runtimes/kimi/index.d.ts +54 -0
  277. package/dist/runtimes/kimi/index.d.ts.map +1 -1
  278. package/dist/runtimes/kimi/index.js +19 -0
  279. package/dist/runtimes/kimi/index.js.map +1 -1
  280. package/dist/runtimes/kimi/installation.d.ts.map +1 -1
  281. package/dist/runtimes/kimi/installation.js +5 -1
  282. package/dist/runtimes/kimi/installation.js.map +1 -1
  283. package/dist/runtimes/kimi/native-usage.d.ts.map +1 -1
  284. package/dist/runtimes/kimi/native-usage.js +4 -3
  285. package/dist/runtimes/kimi/native-usage.js.map +1 -1
  286. package/dist/runtimes/kimi/options.d.ts.map +1 -1
  287. package/dist/runtimes/kimi/options.js +1 -0
  288. package/dist/runtimes/kimi/options.js.map +1 -1
  289. package/dist/runtimes/kimi/web-startup.d.ts.map +1 -1
  290. package/dist/runtimes/kimi/web-startup.js +4 -18
  291. package/dist/runtimes/kimi/web-startup.js.map +1 -1
  292. package/dist/runtimes/opencode/index.d.ts +117 -0
  293. package/dist/runtimes/opencode/index.d.ts.map +1 -1
  294. package/dist/runtimes/opencode/index.js +30 -0
  295. package/dist/runtimes/opencode/index.js.map +1 -1
  296. package/dist/runtimes/opencode/installation.d.ts +8 -0
  297. package/dist/runtimes/opencode/installation.d.ts.map +1 -1
  298. package/dist/runtimes/opencode/installation.js +26 -1
  299. package/dist/runtimes/opencode/installation.js.map +1 -1
  300. package/dist/runtimes/opencode/options.d.ts.map +1 -1
  301. package/dist/runtimes/opencode/options.js +1 -0
  302. package/dist/runtimes/opencode/options.js.map +1 -1
  303. package/dist/runtimes/pi/credential-shape.d.ts +9 -0
  304. package/dist/runtimes/pi/credential-shape.d.ts.map +1 -0
  305. package/dist/runtimes/pi/credential-shape.js +81 -0
  306. package/dist/runtimes/pi/credential-shape.js.map +1 -0
  307. package/dist/runtimes/pi/index.d.ts +1 -1
  308. package/dist/runtimes/pi/index.d.ts.map +1 -1
  309. package/dist/runtimes/pi/index.js +5 -3
  310. package/dist/runtimes/pi/index.js.map +1 -1
  311. package/dist/runtimes/pi/installation.d.ts +9 -5
  312. package/dist/runtimes/pi/installation.d.ts.map +1 -1
  313. package/dist/runtimes/pi/installation.js +62 -18
  314. package/dist/runtimes/pi/installation.js.map +1 -1
  315. package/dist/runtimes/pi/model-requests.d.ts +9 -0
  316. package/dist/runtimes/pi/model-requests.d.ts.map +1 -0
  317. package/dist/runtimes/pi/model-requests.js +76 -0
  318. package/dist/runtimes/pi/model-requests.js.map +1 -0
  319. package/dist/runtimes/pi/rpc/extension.d.ts.map +1 -1
  320. package/dist/runtimes/pi/rpc/extension.js +1 -0
  321. package/dist/runtimes/pi/rpc/extension.js.map +1 -1
  322. package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
  323. package/dist/runtimes/pi/rpc/open.js +1 -0
  324. package/dist/runtimes/pi/rpc/open.js.map +1 -1
  325. package/dist/runtimes/pi/rpc/session.d.ts.map +1 -1
  326. package/dist/runtimes/pi/rpc/session.js +11 -6
  327. package/dist/runtimes/pi/rpc/session.js.map +1 -1
  328. package/dist/runtimes/pi/session.d.ts.map +1 -1
  329. package/dist/runtimes/pi/session.js +10 -8
  330. package/dist/runtimes/pi/session.js.map +1 -1
  331. package/dist/runtimes/pi-durable/index.d.ts.map +1 -1
  332. package/dist/runtimes/pi-durable/index.js +7 -0
  333. package/dist/runtimes/pi-durable/index.js.map +1 -1
  334. package/dist/runtimes/pi-durable/options.d.ts.map +1 -1
  335. package/dist/runtimes/pi-durable/options.js +1 -0
  336. package/dist/runtimes/pi-durable/options.js.map +1 -1
  337. package/dist/runtimes/pi-durable/projection.d.ts +4 -2
  338. package/dist/runtimes/pi-durable/projection.d.ts.map +1 -1
  339. package/dist/runtimes/pi-durable/projection.js +18 -3
  340. package/dist/runtimes/pi-durable/projection.js.map +1 -1
  341. package/dist/runtimes/pi-durable/session.d.ts.map +1 -1
  342. package/dist/runtimes/pi-durable/session.js +119 -19
  343. package/dist/runtimes/pi-durable/session.js.map +1 -1
  344. package/dist/runtimes/qoder/index.d.ts +17 -0
  345. package/dist/runtimes/qoder/index.d.ts.map +1 -1
  346. package/dist/runtimes/qoder/index.js +8 -0
  347. package/dist/runtimes/qoder/index.js.map +1 -1
  348. package/dist/runtimes/qoder/installation.d.ts +2 -2
  349. package/dist/runtimes/qoder/installation.d.ts.map +1 -1
  350. package/dist/runtimes/qoder/installation.js +10 -17
  351. package/dist/runtimes/qoder/installation.js.map +1 -1
  352. package/dist/runtimes/qoder/launch.d.ts +0 -2
  353. package/dist/runtimes/qoder/launch.d.ts.map +1 -1
  354. package/dist/runtimes/qoder/launch.js +0 -12
  355. package/dist/runtimes/qoder/launch.js.map +1 -1
  356. package/dist/runtimes/qoder/list-models.d.ts.map +1 -1
  357. package/dist/runtimes/qoder/list-models.js +3 -2
  358. package/dist/runtimes/qoder/list-models.js.map +1 -1
  359. package/dist/runtimes/qoder/options.d.ts.map +1 -1
  360. package/dist/runtimes/qoder/options.js +1 -0
  361. package/dist/runtimes/qoder/options.js.map +1 -1
  362. package/dist/runtimes/qoder/session.d.ts.map +1 -1
  363. package/dist/runtimes/qoder/session.js +4 -3
  364. package/dist/runtimes/qoder/session.js.map +1 -1
  365. package/dist/runtimes/qwen/credentials.d.ts +7 -0
  366. package/dist/runtimes/qwen/credentials.d.ts.map +1 -0
  367. package/dist/runtimes/qwen/credentials.js +47 -0
  368. package/dist/runtimes/qwen/credentials.js.map +1 -0
  369. package/dist/runtimes/qwen/index.d.ts +1 -0
  370. package/dist/runtimes/qwen/index.d.ts.map +1 -1
  371. package/dist/runtimes/qwen/index.js +2 -0
  372. package/dist/runtimes/qwen/index.js.map +1 -1
  373. package/dist/runtimes/qwen/installation.d.ts +1 -0
  374. package/dist/runtimes/qwen/installation.d.ts.map +1 -1
  375. package/dist/runtimes/qwen/installation.js +2 -1
  376. package/dist/runtimes/qwen/installation.js.map +1 -1
  377. package/dist/runtimes/qwen/list-models.js +2 -2
  378. package/dist/runtimes/qwen/list-models.js.map +1 -1
  379. package/dist/runtimes/qwen/options.d.ts.map +1 -1
  380. package/dist/runtimes/qwen/options.js +1 -0
  381. package/dist/runtimes/qwen/options.js.map +1 -1
  382. package/dist/runtimes/qwen/session.js +3 -3
  383. package/dist/runtimes/qwen/session.js.map +1 -1
  384. package/dist/shared/executable/close.d.ts +7 -0
  385. package/dist/shared/executable/close.d.ts.map +1 -0
  386. package/dist/shared/executable/close.js +26 -0
  387. package/dist/shared/executable/close.js.map +1 -0
  388. package/dist/shared/executable/index.d.ts +1 -0
  389. package/dist/shared/executable/index.d.ts.map +1 -1
  390. package/dist/shared/executable/index.js +1 -0
  391. package/dist/shared/executable/index.js.map +1 -1
  392. package/dist/shared/executable/run.d.ts +2 -0
  393. package/dist/shared/executable/run.d.ts.map +1 -1
  394. package/dist/shared/executable/run.js +4 -0
  395. package/dist/shared/executable/run.js.map +1 -1
  396. package/dist/shared/host-environment.d.ts +40 -0
  397. package/dist/shared/host-environment.d.ts.map +1 -0
  398. package/dist/shared/host-environment.js +74 -0
  399. package/dist/shared/host-environment.js.map +1 -0
  400. package/dist/shared/installation.d.ts +14 -3
  401. package/dist/shared/installation.d.ts.map +1 -1
  402. package/dist/shared/installation.js +78 -62
  403. package/dist/shared/installation.js.map +1 -1
  404. package/dist/shared/native-home-initialization.d.ts +20 -0
  405. package/dist/shared/native-home-initialization.d.ts.map +1 -0
  406. package/dist/shared/native-home-initialization.js +87 -0
  407. package/dist/shared/native-home-initialization.js.map +1 -0
  408. package/dist/shared/native-session-file.d.ts +3 -0
  409. package/dist/shared/native-session-file.d.ts.map +1 -0
  410. package/dist/shared/native-session-file.js +22 -0
  411. package/dist/shared/native-session-file.js.map +1 -0
  412. package/dist/shared/session-credentials.d.ts.map +1 -1
  413. package/dist/shared/session-credentials.js +2 -0
  414. package/dist/shared/session-credentials.js.map +1 -1
  415. package/dist/shared/session-options.js +1 -1
  416. package/dist/shared/session-options.js.map +1 -1
  417. package/dist/shared/stream-json/profile.d.ts +1 -0
  418. package/dist/shared/stream-json/profile.d.ts.map +1 -1
  419. package/dist/shared/stream-json/session.js +2 -2
  420. package/dist/shared/stream-json/session.js.map +1 -1
  421. package/dist/shared/usage-ratio.d.ts +16 -0
  422. package/dist/shared/usage-ratio.d.ts.map +1 -0
  423. package/dist/shared/usage-ratio.js +52 -0
  424. package/dist/shared/usage-ratio.js.map +1 -0
  425. package/dist/shared/version-range.d.ts +30 -0
  426. package/dist/shared/version-range.d.ts.map +1 -0
  427. package/dist/shared/version-range.js +50 -0
  428. package/dist/shared/version-range.js.map +1 -0
  429. package/dist/testing/scripted-runtime.d.ts.map +1 -1
  430. package/dist/testing/scripted-runtime.js +5 -1
  431. package/dist/testing/scripted-runtime.js.map +1 -1
  432. package/package.json +1 -1
  433. package/dist/runtimes/qwen/close.d.ts +0 -4
  434. package/dist/runtimes/qwen/close.d.ts.map +0 -1
  435. package/dist/runtimes/qwen/close.js +0 -13
  436. package/dist/runtimes/qwen/close.js.map +0 -1
@@ -22,6 +22,58 @@ export declare const codebuddyRuntime: Omit<{
22
22
  };
23
23
  };
24
24
  readonly verifiedPlatforms: readonly ["linux", "darwin"];
25
+ readonly credentials: {
26
+ readonly scope: "single_account";
27
+ readonly management: "native";
28
+ readonly signInPaste: "none";
29
+ readonly env: readonly [{
30
+ readonly name: "CODEBUDDY_AUTH_TOKEN";
31
+ readonly purpose: "token";
32
+ readonly secret: true;
33
+ readonly provider: "codebuddy";
34
+ readonly field: "authToken";
35
+ }, {
36
+ readonly name: "CODEBUDDY_API_KEY";
37
+ readonly purpose: "api_key";
38
+ readonly secret: true;
39
+ readonly provider: "codebuddy";
40
+ readonly field: "apiKey";
41
+ }, {
42
+ readonly name: "CODEBUDDY_BASE_URL";
43
+ readonly purpose: "base_url";
44
+ readonly secret: false;
45
+ readonly provider: "codebuddy";
46
+ readonly field: "baseUrl";
47
+ }, {
48
+ readonly name: "CODEBUDDY_INTERNET_ENVIRONMENT";
49
+ readonly purpose: "account_scope";
50
+ readonly secret: false;
51
+ readonly provider: "codebuddy";
52
+ readonly field: "accountScope";
53
+ }];
54
+ readonly stores: readonly [{
55
+ readonly kind: "dir";
56
+ readonly directoryEnv: "CODEBUDDY_CONFIG_DIR";
57
+ readonly defaultDirectory: ".codebuddy";
58
+ }, {
59
+ readonly kind: "file";
60
+ readonly directoryEnv: "CODEBUDDY_CONFIG_DIR";
61
+ readonly defaultDirectory: ".codebuddy";
62
+ readonly path: "settings.json";
63
+ }, {
64
+ readonly kind: "file";
65
+ readonly defaultDirectory: ".";
66
+ readonly path: ".codebuddy.json";
67
+ }, {
68
+ readonly kind: "file";
69
+ readonly relativeTo: "cwd";
70
+ readonly path: ".codebuddy/settings.local.json";
71
+ }, {
72
+ readonly kind: "file";
73
+ readonly relativeTo: "cwd";
74
+ readonly path: ".codebuddy/settings.json";
75
+ }];
76
+ };
25
77
  readonly refusedSessionOptions: Readonly<Partial<Record<import("../../contracts/runtime.js").RefusableSessionOption, string>>>;
26
78
  readonly installation: import("../../browser.js").InstallationProbe;
27
79
  readonly install: import("../../browser.js").Installer;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/codebuddy/index.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAeD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/codebuddy/index.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCD,CAAC"}
@@ -14,6 +14,25 @@ export const codebuddyRuntime = defineRuntime({
14
14
  ...(installation.via === "executable" && semverAtLeast(installation.version, "2.178.1") ? { mcpTransports: ["stdio", "http"] } : {}),
15
15
  }),
16
16
  manualCompaction: { kind: "unsupported", reason: "The published compact method is not implemented by the tested CLI; slash-command completion is unverified." }, brand: runtimeBrands.codebuddy, verifiedPlatforms: verifiedPlatforms.codebuddy,
17
+ // CodeBuddy 2.173.0-2.184.0: CODEBUDDY_CONFIG_DIR moves ~/.codebuddy; CODEBUDDY_AUTH_TOKEN / CODEBUDDY_API_KEY / CODEBUDDY_BASE_URL / CODEBUDDY_INTERNET_ENVIRONMENT.
18
+ credentials: {
19
+ scope: "single_account",
20
+ management: "native",
21
+ signInPaste: "none",
22
+ env: [
23
+ { name: "CODEBUDDY_AUTH_TOKEN", purpose: "token", secret: true, provider: "codebuddy", field: "authToken" },
24
+ { name: "CODEBUDDY_API_KEY", purpose: "api_key", secret: true, provider: "codebuddy", field: "apiKey" },
25
+ { name: "CODEBUDDY_BASE_URL", purpose: "base_url", secret: false, provider: "codebuddy", field: "baseUrl" },
26
+ { name: "CODEBUDDY_INTERNET_ENVIRONMENT", purpose: "account_scope", secret: false, provider: "codebuddy", field: "accountScope" },
27
+ ],
28
+ stores: [
29
+ { kind: "dir", directoryEnv: "CODEBUDDY_CONFIG_DIR", defaultDirectory: ".codebuddy" },
30
+ { kind: "file", directoryEnv: "CODEBUDDY_CONFIG_DIR", defaultDirectory: ".codebuddy", path: "settings.json" },
31
+ { kind: "file", defaultDirectory: ".", path: ".codebuddy.json" },
32
+ { kind: "file", relativeTo: "cwd", path: ".codebuddy/settings.local.json" },
33
+ { kind: "file", relativeTo: "cwd", path: ".codebuddy/settings.json" },
34
+ ],
35
+ },
17
36
  refusedSessionOptions: codebuddyRefusedSessionOptions,
18
37
  installation: codebuddyInstallation, install: codebuddyInstall, installPlan: codebuddyInstallPlan,
19
38
  listModels: onFirstCall(async () => { const { codebuddyListModels } = await import("./list-models.js"); return codebuddyListModels; }),
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":["../../../src/runtimes/codebuddy/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;IAC5C,EAAE,EAAE,WAAW;IACf,mBAAmB,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACtC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE;QACpF,gJAAgJ;QAChJ,GAAG,CAAC,YAAY,CAAC,GAAG,KAAK,YAAY,IAAI,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,CAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9I,CAAC;IACF,gBAAgB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,4GAA4G,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,SAAS;IAC/O,qBAAqB,EAAE,8BAA8B;IACrD,YAAY,EAAE,qBAAqB,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,oBAAoB;IACjG,UAAU,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACtI,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;IACjH,UAAU,EAAE,WAAW,CAAC,KAAK,IAA+B,EAAE,GAAG,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACjK,MAAM,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IACrH,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAC1H,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sources":["../../../src/runtimes/codebuddy/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;IAC5C,EAAE,EAAE,WAAW;IACf,mBAAmB,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACtC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE;QACpF,gJAAgJ;QAChJ,GAAG,CAAC,YAAY,CAAC,GAAG,KAAK,YAAY,IAAI,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,CAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9I,CAAC;IACF,gBAAgB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,4GAA4G,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,SAAS;IAC/O,sKAAsK;IACtK,WAAW,EAAE;QACX,KAAK,EAAE,gBAAgB;QACvB,UAAU,EAAE,QAAQ;QACpB,WAAW,EAAE,MAAM;QACnB,GAAG,EAAE;YACH,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE;YAC3G,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE;YACvG,EAAE,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE;YAC3G,EAAE,IAAI,EAAE,gCAAgC,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,EAAE;SAClI;QACD,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,YAAY,EAAE;YACrF,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE;YAC7G,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE;YAChE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,gCAAgC,EAAE;YAC3E,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,0BAA0B,EAAE;SACtE;KACF;IACD,qBAAqB,EAAE,8BAA8B;IACrD,YAAY,EAAE,qBAAqB,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,oBAAoB;IACjG,UAAU,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACtI,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;IACjH,UAAU,EAAE,WAAW,CAAC,KAAK,IAA+B,EAAE,GAAG,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACjK,MAAM,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IACrH,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAC1H,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/codebuddy/installation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAUzE,kHAAkH;AAClH,eAAO,MAAM,qBAAqB,EAAE,iBAWnC,CAAC"}
1
+ {"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/codebuddy/installation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAkBzE,kHAAkH;AAClH,eAAO,MAAM,qBAAqB,EAAE,iBAWnC,CAAC"}
@@ -4,9 +4,10 @@ import { environmentValue, sessionEnvironment } from "../../shared/environment.j
4
4
  import { resolveExecutable } from "../../shared/executable/index.js";
5
5
  import { npmGlobalBin, npmGlobalPrefix } from "../../shared/install-npm.js";
6
6
  import { executableInstallation } from "../../shared/installation.js";
7
- const directInstallation = executableInstallation("OAR_CODEBUDDY_BIN", "codebuddy", (env) => [
8
- path.join(environmentHome(env), ".local", "bin", process.platform === "win32" ? "codebuddy.exe" : "codebuddy"),
9
- ], ["--help"]);
7
+ const CODEBUDDY_OPTIONS = {
8
+ identity: { vendor: "CodeBuddy Code", help: /^\s*(?:Usage:\s+(?:codebuddy|cbc)(?:\.exe)?(?:\|(?:codebuddy|cbc))?\b|CodeBuddy Code\b)/imu },
9
+ };
10
+ const directInstallation = executableInstallation("OAR_CODEBUDDY_BIN", "codebuddy", (env) => [path.join(environmentHome(env), ".local", "bin", process.platform === "win32" ? "codebuddy.exe" : "codebuddy")], ["--help"], CODEBUDDY_OPTIONS);
10
11
  /** A configured override remains exclusive. Only an otherwise missing copy triggers npm's local prefix lookup. */
11
12
  export const codebuddyInstallation = async (options = {}) => {
12
13
  const direct = await directInstallation(options);
@@ -24,6 +25,6 @@ export const codebuddyInstallation = async (options = {}) => {
24
25
  return direct;
25
26
  }
26
27
  const command = path.join(npmGlobalBin(prefix), process.platform === "win32" ? "codebuddy.cmd" : "codebuddy");
27
- return executableInstallation("OAR_CODEBUDDY_BIN", "codebuddy", [command], ["--help"])(options);
28
+ return executableInstallation("OAR_CODEBUDDY_BIN", "codebuddy", [command], ["--help"], CODEBUDDY_OPTIONS)(options);
28
29
  };
29
30
  //# sourceMappingURL=installation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"installation.js","sources":["../../../src/runtimes/codebuddy/installation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,mBAAmB,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;IAC3F,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC;CAC/G,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEf,kHAAkH;AAClH,MAAM,CAAC,MAAM,qBAAqB,GAAsB,KAAK,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IAC7E,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAC1D,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC;IAAC,CAAC;IAC9F,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC1C,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC;IAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAS,EAAE,CAAC,IAAI,CAAC,CAAC;IACvE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC;IAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC9G,OAAO,sBAAsB,CAAC,mBAAmB,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAClG,CAAC,CAAC"}
1
+ {"version":3,"file":"installation.js","sources":["../../../src/runtimes/codebuddy/installation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,MAAM,iBAAiB,GAAG;IACxB,QAAQ,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,4FAA4F,EAAE;CAClI,CAAC;AAEX,MAAM,kBAAkB,GAAG,sBAAsB,CAC/C,mBAAmB,EACnB,WAAW,EACX,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EACzH,CAAC,QAAQ,CAAC,EACV,iBAAiB,CAClB,CAAC;AAEF,kHAAkH;AAClH,MAAM,CAAC,MAAM,qBAAqB,GAAsB,KAAK,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IAC7E,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAC1D,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC;IAAC,CAAC;IAC9F,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC1C,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC;IAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAS,EAAE,CAAC,IAAI,CAAC,CAAC;IACvE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC;IAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC9G,OAAO,sBAAsB,CAAC,mBAAmB,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC;AACrH,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/codebuddy/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAGjE,eAAO,MAAM,8BAA8B,EAAE,qBAW5C,CAAC;AASF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,cAAc,CAAC,YAAY,CAAC,GAAG,IAAI,CAEjF"}
1
+ {"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/codebuddy/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAGjE,eAAO,MAAM,8BAA8B,EAAE,qBAY5C,CAAC;AASF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,cAAc,CAAC,YAAY,CAAC,GAAG,IAAI,CAEjF"}
@@ -1,5 +1,6 @@
1
1
  import { checkManagedLaunchArgs } from "../../shared/launch-args.js";
2
2
  export const codebuddyRefusedSessionOptions = {
3
+ modelRequests: "This adapter has no verified capture of the root agent's provider request",
3
4
  fork: "OAR has not verified a native CodeBuddy fork that opens a copy of a saved session under a new id, cut after a chosen turn",
4
5
  goals: "CodeBuddy ACP has no verified structured goal controls",
5
6
  endTurnProcessesOnAbort: "OAR has not verified reading and ending one aborted CodeBuddy turn's processes while its session stays usable",
@@ -1 +1 @@
1
- {"version":3,"file":"options.js","sources":["../../../src/runtimes/codebuddy/options.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,CAAC,MAAM,8BAA8B,GAA0B;IACnE,IAAI,EAAE,2HAA2H;IACjI,KAAK,EAAE,wDAAwD;IAC/D,uBAAuB,EAAE,+GAA+G;IACxI,kBAAkB,EAAE,mEAAmE;IACvF,iBAAiB,EAAE,6GAA6G;IAChI,YAAY,EAAE,2DAA2D;IACzE,IAAI,EAAE,+CAA+C;IACrD,WAAW,EAAE,iEAAiE;IAC9E,qBAAqB,EAAE,wDAAwD;IAC/E,mBAAmB,EAAE,yFAAyF;CAC/G,CAAC;AAEF,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC;IAC5C,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,gBAAgB,EAAE,iBAAiB;IAC3F,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,gBAAgB;IACtE,mBAAmB,EAAE,+BAA+B;IACpD,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,IAAI;CAC1H,CAAC,CAAC;AAEH,MAAM,UAAU,wBAAwB,CAAC,IAAkC;IACzE,sBAAsB,CAAC,IAAI,EAAE,6BAA6B,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,wCAAwC,IAAI,oEAAoE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/M,CAAC"}
1
+ {"version":3,"file":"options.js","sources":["../../../src/runtimes/codebuddy/options.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,CAAC,MAAM,8BAA8B,GAA0B;IACnE,aAAa,EAAE,2EAA2E;IAC1F,IAAI,EAAE,2HAA2H;IACjI,KAAK,EAAE,wDAAwD;IAC/D,uBAAuB,EAAE,+GAA+G;IACxI,kBAAkB,EAAE,mEAAmE;IACvF,iBAAiB,EAAE,6GAA6G;IAChI,YAAY,EAAE,2DAA2D;IACzE,IAAI,EAAE,+CAA+C;IACrD,WAAW,EAAE,iEAAiE;IAC9E,qBAAqB,EAAE,wDAAwD;IAC/E,mBAAmB,EAAE,yFAAyF;CAC/G,CAAC;AAEF,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC;IAC5C,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,gBAAgB,EAAE,iBAAiB;IAC3F,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,gBAAgB;IACtE,mBAAmB,EAAE,+BAA+B;IACpD,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,IAAI;CAC1H,CAAC,CAAC;AAEH,MAAM,UAAU,wBAAwB,CAAC,IAAkC;IACzE,sBAAsB,CAAC,IAAI,EAAE,6BAA6B,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,wCAAwC,IAAI,oEAAoE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/M,CAAC"}
@@ -0,0 +1,14 @@
1
+ import type { AuthStatus, LoginAccount } from "../../contracts/login.js";
2
+ export interface CodexAccountMatch {
3
+ readonly email?: string;
4
+ }
5
+ /**
6
+ * Read-only lookup of Codex's ChatGPT `tokens.account_id` from `$CODEX_HOME/auth.json`.
7
+ * Fails closed whenever config selects keyring/auto/ephemeral storage or cannot be parsed,
8
+ * when `auth_mode` is not `"chatgpt"`, or when `match.email` disagrees with `tokens.id_token`.
9
+ * Never returns or logs token values.
10
+ */
11
+ export declare function readCodexAccountId(env: Readonly<NodeJS.ProcessEnv>, match?: CodexAccountMatch): Promise<string | undefined>;
12
+ export declare function attachCodexAccountId(account: LoginAccount | null, env: Readonly<NodeJS.ProcessEnv>): Promise<LoginAccount | null>;
13
+ export declare function attachCodexStatusAccountId(status: AuthStatus, env: Readonly<NodeJS.ProcessEnv>): Promise<AuthStatus>;
14
+ //# sourceMappingURL=account-id.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account-id.d.ts","sources":["../../../src/runtimes/codex/account-id.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAQzE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AA2GD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAUjI;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAIvI;AAED,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAI1H"}
@@ -0,0 +1,173 @@
1
+ import { constants as fsConstants } from "node:fs";
2
+ import { open } from "node:fs/promises";
3
+ import path from "node:path";
4
+ import { environmentValue } from "../../shared/environment.js";
5
+ import { environmentHome } from "../../shared/environment-home.js";
6
+ import { asRecord, parseJson } from "../../shared/json.js";
7
+ const MAX_CODEX_FILE_BYTES = 1_048_576;
8
+ const READ_FLAGS = fsConstants.O_RDONLY | (typeof fsConstants.O_NONBLOCK === "number" ? fsConstants.O_NONBLOCK : 0);
9
+ function nonEmpty(value) {
10
+ if (typeof value !== "string") {
11
+ return undefined;
12
+ }
13
+ const trimmed = value.trim();
14
+ return trimmed.length > 0 ? trimmed : undefined;
15
+ }
16
+ function codexHomeDirectory(env) {
17
+ const configured = environmentValue(env, "CODEX_HOME");
18
+ return configured !== undefined && configured.length > 0 ? configured : path.join(environmentHome(env), ".codex");
19
+ }
20
+ async function readBoundedFile(filePath) {
21
+ let handle = undefined;
22
+ try {
23
+ handle = await open(filePath, READ_FLAGS);
24
+ const info = await handle.stat();
25
+ if (!info.isFile() || info.size > MAX_CODEX_FILE_BYTES) {
26
+ return { kind: "unreadable" };
27
+ }
28
+ return { kind: "ok", text: await handle.readFile("utf8") };
29
+ }
30
+ catch (error) {
31
+ return error instanceof Error && "code" in error && error.code === "ENOENT" ? { kind: "missing" } : { kind: "unreadable" };
32
+ }
33
+ finally {
34
+ await handle?.close().catch(() => { });
35
+ }
36
+ }
37
+ function stripTomlComment(line) {
38
+ let quote = null;
39
+ let escaped = false;
40
+ for (let i = 0; i < line.length; i += 1) {
41
+ const ch = line[i];
42
+ if (escaped) {
43
+ escaped = false;
44
+ }
45
+ else if (quote === '"' && ch === "\\") {
46
+ escaped = true;
47
+ }
48
+ else if (quote === ch) {
49
+ quote = null;
50
+ }
51
+ else if (quote === null && (ch === '"' || ch === "'")) {
52
+ quote = ch;
53
+ }
54
+ else if (quote === null && ch === "#") {
55
+ return line.slice(0, i);
56
+ }
57
+ }
58
+ return line;
59
+ }
60
+ /**
61
+ * Codex defaults `cli_auth_credentials_store` to `"file"` (`AuthCredentialsStoreMode::File`
62
+ * in codex-rs/config/src/types.rs, verified in `codex 0.170.0`). In `"keyring"` or `"auto"`
63
+ * mode, the OS keyring shadows `auth.json`, so fail closed unless every present config layer
64
+ * leaves the store in `"file"` mode.
65
+ */
66
+ function configAllowsFileAuthStore(text) {
67
+ let inTable = false;
68
+ for (const rawLine of text.split(/\r?\n/u)) {
69
+ const line = stripTomlComment(rawLine).trim();
70
+ if (line.startsWith("[")) {
71
+ inTable = true;
72
+ }
73
+ if (/\bcli_auth_credentials_store\b/u.test(line) && (inTable || !/^cli_auth_credentials_store\s*=\s*(?:"file"|'file')$/u.test(line))) {
74
+ return false;
75
+ }
76
+ }
77
+ return true;
78
+ }
79
+ function systemConfigFiles(env) {
80
+ if (process.platform === "win32") {
81
+ const programData = environmentValue(env, "ProgramData");
82
+ return programData === undefined || programData.length === 0
83
+ ? []
84
+ : [path.join(programData, "OpenAI", "Codex", "config.toml"), path.join(programData, "OpenAI", "Codex", "managed_config.toml")];
85
+ }
86
+ return ["/etc/codex/config.toml", "/etc/codex/managed_config.toml"];
87
+ }
88
+ async function isCodexFileAuthStore(env, codexHome) {
89
+ const files = [path.join(codexHome, "config.toml"), ...systemConfigFiles(env)];
90
+ const results = await Promise.all(files.map(async (file) => {
91
+ const result = await readBoundedFile(file);
92
+ return result;
93
+ }));
94
+ return results.every(result => result.kind === "missing" || (result.kind === "ok" && configAllowsFileAuthStore(result.text)));
95
+ }
96
+ function decodeJwtPayload(token) {
97
+ const parts = token.split(".");
98
+ if (parts.length !== 3 || parts[1] === undefined || parts[1].length === 0) {
99
+ return null;
100
+ }
101
+ try {
102
+ return asRecord(parseJson(Buffer.from(parts[1], "base64url").toString("utf8")));
103
+ }
104
+ catch {
105
+ return null;
106
+ }
107
+ }
108
+ function parseJsonRecord(text) {
109
+ try {
110
+ return asRecord(parseJson(text));
111
+ }
112
+ catch {
113
+ return null;
114
+ }
115
+ }
116
+ function verifyTokenClaims(tokens, accountId, match) {
117
+ const idToken = tokens.id_token;
118
+ if (typeof idToken !== "string") {
119
+ return match?.email === undefined;
120
+ }
121
+ const payload = decodeJwtPayload(idToken);
122
+ if (payload === null) {
123
+ return false;
124
+ }
125
+ const authClaim = asRecord(payload["https://api.openai.com/auth"]);
126
+ const claimId = nonEmpty(authClaim?.chatgpt_account_id);
127
+ if (claimId !== undefined && claimId !== accountId) {
128
+ return false;
129
+ }
130
+ if (match?.email === undefined) {
131
+ return true;
132
+ }
133
+ const tokenEmail = nonEmpty(payload.email);
134
+ return tokenEmail !== undefined && tokenEmail.toLowerCase() === match.email.trim().toLowerCase();
135
+ }
136
+ /**
137
+ * Read-only lookup of Codex's ChatGPT `tokens.account_id` from `$CODEX_HOME/auth.json`.
138
+ * Fails closed whenever config selects keyring/auto/ephemeral storage or cannot be parsed,
139
+ * when `auth_mode` is not `"chatgpt"`, or when `match.email` disagrees with `tokens.id_token`.
140
+ * Never returns or logs token values.
141
+ */
142
+ export async function readCodexAccountId(env, match) {
143
+ const codexHome = codexHomeDirectory(env);
144
+ if (!(await isCodexFileAuthStore(env, codexHome))) {
145
+ return undefined;
146
+ }
147
+ const file = await readBoundedFile(path.join(codexHome, "auth.json"));
148
+ if (file.kind !== "ok") {
149
+ return undefined;
150
+ }
151
+ const root = parseJsonRecord(file.text);
152
+ if (root === null || (root.auth_mode !== undefined && root.auth_mode !== "chatgpt")) {
153
+ return undefined;
154
+ }
155
+ const tokens = asRecord(root.tokens);
156
+ const accountId = nonEmpty(tokens?.account_id);
157
+ return tokens !== null && accountId !== undefined && verifyTokenClaims(tokens, accountId, match) ? accountId : undefined;
158
+ }
159
+ export async function attachCodexAccountId(account, env) {
160
+ if (account === null || account.method !== "chatgpt") {
161
+ return account;
162
+ }
163
+ const accountId = await readCodexAccountId(env, account.email === undefined ? undefined : { email: account.email });
164
+ return accountId === undefined ? account : { ...account, accountId };
165
+ }
166
+ export async function attachCodexStatusAccountId(status, env) {
167
+ if (status.kind !== "logged_in" || status.account === undefined) {
168
+ return status;
169
+ }
170
+ const account = await attachCodexAccountId(status.account, env);
171
+ return account === null || account === status.account ? status : { ...status, account };
172
+ }
173
+ //# sourceMappingURL=account-id.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account-id.js","sources":["../../../src/runtimes/codex/account-id.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,7 @@ export type ReadOutcome = {
13
13
  readonly reason: AccountUsageUnsupportedReason;
14
14
  } | {
15
15
  readonly kind: "error";
16
+ readonly cause?: unknown;
16
17
  };
17
18
  export type StartAppServerClient = (command: string, env?: SessionOptions["env"]) => AppServerClient;
18
19
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"account-request.d.ts","sources":["../../../src/runtimes/codex/account-request.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AAChH,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGpF,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GACrF;IAAE,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,wBAAwB,CAAA;CAAE,GAC/E;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,6BAA6B,CAAA;CAAE,GAChF;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAE/B,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,eAAe,CAAC;AAErG;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjD;AAeD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAMhE;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAMjE;AAED,6GAA6G;AAC7G,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,EACjB,WAAW,GAAE,oBAA2C,EACxD,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,GAC1B,OAAO,CAAC,WAAW,CAAC,CA4CtB"}
1
+ {"version":3,"file":"account-request.d.ts","sources":["../../../src/runtimes/codex/account-request.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AAChH,OAAO,EAAwB,KAAK,eAAe,EAAmB,MAAM,wBAAwB,CAAC;AAGrG,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GACrF;IAAE,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,wBAAwB,CAAA;CAAE,GAC/E;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,6BAA6B,CAAA;CAAE,GAChF;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzD,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,eAAe,CAAC;AAKrG;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjD;AAgDD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAMhE;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAMjE;AAED,6GAA6G;AAC7G,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,EACjB,WAAW,GAAE,oBAA4C,EACzD,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,GAC1B,OAAO,CAAC,WAAW,CAAC,CAyCtB"}
@@ -1,19 +1,47 @@
1
1
  import { withQueryDeadline } from "../../shared/executable/query.js";
2
2
  import { startAppServerClient } from "./app-server-client.js";
3
3
  import { asRecord } from "../../shared/json.js";
4
- async function request(client, call, signal) {
4
+ const startAccountAppServer = (command, env) => startAppServerClient(command, env, {}, undefined, { shutdown: "stdin" });
5
+ async function request(client, call, signal, onSettled) {
5
6
  signal.throwIfAborted();
7
+ const state = {};
8
+ const record = (outcome) => {
9
+ state.outcome = outcome;
10
+ onSettled(outcome);
11
+ };
6
12
  try {
7
- return await client.request(call.method, call.params);
13
+ return await client.request(call.method, call.params, record);
8
14
  }
9
15
  catch (error) {
10
- if (call.legacyParams === undefined || !(error instanceof Error) || !/expected unit/iu.test(error.message)) {
16
+ if (call.legacyParams === undefined || state.outcome?.kind === "exited" || !(error instanceof Error) || !/expected unit/iu.test(error.message)) {
11
17
  throw error;
12
18
  }
13
19
  signal.throwIfAborted();
14
- return client.request(call.method, call.legacyParams);
20
+ return client.request(call.method, call.legacyParams, record);
15
21
  }
16
22
  }
23
+ function classifyAccountError(call, error, outcome) {
24
+ // Never classify process exit/crash stderr as auth or unsupported.
25
+ if (outcome?.kind === "exited") {
26
+ return { kind: "error", cause: error };
27
+ }
28
+ const native = outcome?.kind === "error" ? outcome.native : undefined;
29
+ const nativeCode = typeof native?.code === "number" ? native.code : undefined;
30
+ const message = typeof native?.message === "string" ? native.message : (error instanceof Error ? error.message : "");
31
+ if (/chatgpt authentication required for rate limit reset/iu.test(message)) {
32
+ return { kind: "unsupported", reason: "unsupported_auth_mode" };
33
+ }
34
+ // Only matches the native JSON-RPC error message of `call.method` itself
35
+ // (never process-exit stderr or `initialize`, which are ruled out above).
36
+ if (/authentication required/iu.test(message)) {
37
+ return { kind: "reauth_required", reason: "not_authenticated" };
38
+ }
39
+ // Codex answers a method it predates with JSON-RPC -32601 or `unknown variant` naming the method.
40
+ if (nativeCode === -32_601 || /\bmethod not found\b/iu.test(message) || message.includes(`unknown variant \`${call.method}\``)) {
41
+ return { kind: "unsupported", reason: "endpoint_unavailable" };
42
+ }
43
+ return { kind: "error", cause: error };
44
+ }
17
45
  /**
18
46
  * Native evidence from `account/read` on the same app-server session:
19
47
  *
@@ -45,9 +73,14 @@ export function isNonSubscriptionAccount(result) {
45
73
  || root?.requiresOpenaiAuth === false;
46
74
  }
47
75
  /** One ChatGPT-account request on a fresh app-server, after `account/read` rules out other account modes. */
48
- export async function callAppServer(command, timeoutMs, call, startClient = startAppServerClient, env) {
76
+ export async function callAppServer(command, timeoutMs, call, startClient = startAccountAppServer, env) {
77
+ const state = {
78
+ inAccountCall: false,
79
+ aborted: false,
80
+ };
49
81
  try {
50
82
  return await withQueryDeadline("Codex account request", timeoutMs, async (signal, own) => {
83
+ signal.addEventListener("abort", () => { state.aborted = true; }, { once: true });
51
84
  const client = own(startClient(command, env));
52
85
  await client.request("initialize", {
53
86
  clientInfo: { name: "oar", version: "0.0.0" },
@@ -71,23 +104,19 @@ export async function callAppServer(command, timeoutMs, call, startClient = star
71
104
  if (isNonSubscriptionAccount(account)) {
72
105
  return { kind: "unsupported", reason: "unsupported_auth_mode" };
73
106
  }
74
- const result = await request(client, call, signal);
107
+ state.inAccountCall = true;
108
+ const result = await request(client, call, signal, (outcome) => { state.callOutcome = outcome; });
75
109
  return { kind: "ok", result, email: accountEmail(account) };
76
110
  });
77
111
  }
78
112
  catch (error) {
79
- const message = error instanceof Error ? error.message : "";
80
- if (/chatgpt authentication required for rate limit reset/iu.test(message)) {
81
- return { kind: "unsupported", reason: "unsupported_auth_mode" };
82
- }
83
- if (/authentication required/iu.test(message)) {
84
- return { kind: "reauth_required", reason: "not_authenticated" };
113
+ if (error instanceof RangeError) {
114
+ throw error;
85
115
  }
86
- // Codex answers a method it predates with `unknown variant` and the method name.
87
- if (/method not found|not supported/iu.test(message) || message.includes(`unknown variant \`${call.method}\``)) {
88
- return { kind: "unsupported", reason: "endpoint_unavailable" };
116
+ if (!state.inAccountCall || state.aborted) {
117
+ return { kind: "error", cause: error };
89
118
  }
90
- return { kind: "error" };
119
+ return classifyAccountError(call, error, state.callOutcome);
91
120
  }
92
121
  }
93
122
  //# sourceMappingURL=account-request.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"account-request.js","sources":["../../../src/runtimes/codex/account-request.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"account-request.js","sources":["../../../src/runtimes/codex/account-request.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/codex/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EAErB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAiB,KAAK,WAAW,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAkFlG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAgEvF;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,oBAA2C,EACxD,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,EAC3B,iBAAiB,UAAO,GACvB,OAAO,CAAC,WAAW,CAAC,CAMtB;AAGD,eAAO,MAAM,iBAAiB,EAAE,kBAgB/B,CAAC"}
1
+ {"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/codex/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EAErB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAiB,KAAK,WAAW,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAkFlG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAiEvF;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,oBAAoB,EAClC,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,EAC3B,iBAAiB,UAAO,GACvB,OAAO,CAAC,WAAW,CAAC,CAMtB;AAGD,eAAO,MAAM,iBAAiB,EAAE,kBAiB/B,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { callAppServer } from "./account-request.js";
2
- import { startAppServerClient } from "./app-server-client.js";
3
2
  import { asEpochInstant, asNumber, asRecord } from "../../shared/json.js";
3
+ import { usedRatioFromPercent } from "../../shared/usage-ratio.js";
4
4
  import { projectLimitResets } from "./reset-credits.js";
5
5
  function text(value) {
6
6
  if (typeof value !== "string") {
@@ -117,16 +117,16 @@ export function projectCodexUsage(result, email) {
117
117
  ?? asRecord(indexed?.codex);
118
118
  const accountCredits = projectCredits(accountBucket?.credits);
119
119
  const windows = [];
120
- let rateLimited = false;
120
+ // Top-level rateLimited is account-wide: only the account bucket contributes,
121
+ // while single-model buckets stay in windows without marking the account exhausted.
122
+ const rateLimited = accountBucket !== null
123
+ && accountBucket.rateLimitReachedType !== null
124
+ && accountBucket.rateLimitReachedType !== undefined
125
+ && accountCredits?.available !== true;
121
126
  let plan = undefined;
122
127
  for (const bucket of buckets) {
123
128
  const sourceLabel = limitLabel(bucket);
124
129
  plan ??= text(bucket.planType);
125
- const credits = asRecord(bucket.credits);
126
- const canUseCredits = credits?.hasCredits === true || credits?.unlimited === true;
127
- rateLimited ||= bucket.rateLimitReachedType !== null
128
- && bucket.rateLimitReachedType !== undefined
129
- && !canUseCredits;
130
130
  for (const kind of ["primary", "secondary"]) {
131
131
  const candidate = asRecord(bucket[kind]);
132
132
  if (candidate === null) {
@@ -141,13 +141,14 @@ export function projectCodexUsage(result, email) {
141
141
  const minutes = asNumber(candidate.windowDurationMins);
142
142
  const limitId = text(bucket.limitId);
143
143
  // A named bucket is one model's (`limitName` is the model's name); the
144
- // unnamed `codex` bucket is the account's. Any other is neither, as far as codex says.
144
+ // unnamed `codex` bucket and the legacy single-bucket account view are
145
+ // the account's. Any other unnamed bucket is neither, as far as codex says.
145
146
  const modelName = text(bucket.limitName);
146
147
  const scope = modelName !== undefined ? { kind: "model", name: modelName }
147
- : (limitId === "codex" ? { kind: "account" } : undefined);
148
+ : (limitId === "codex" || bucket === accountBucket ? { kind: "account" } : undefined);
148
149
  windows.push({
149
150
  label: sourceLabel === undefined ? durationLabel : `${sourceLabel} · ${durationLabel}`,
150
- usedRatio: Number((usedPercent / 100).toFixed(6)),
151
+ usedRatio: usedRatioFromPercent(usedPercent),
151
152
  ...(resetsAt === null ? {} : { resetsAt }),
152
153
  ...(limitId === undefined ? {} : { id: `${limitId}:${kind}` }),
153
154
  ...(minutes === null || minutes <= 0 ? {} : { durationMs: minutes * 60_000 }),
@@ -169,7 +170,7 @@ export function projectCodexUsage(result, email) {
169
170
  ...(limitResets === undefined ? {} : { limitResets }),
170
171
  };
171
172
  }
172
- export async function readFromAppServer(command, timeoutMs, startClient = startAppServerClient, env, limitResetDetails = true) {
173
+ export async function readFromAppServer(command, timeoutMs, startClient, env, limitResetDetails = true) {
173
174
  // Older app-servers take this read with no params and refuse any field;
174
175
  // they report no reset credits either, so the bare read loses nothing.
175
176
  const params = limitResetDetails ? {} : { excludeResetCreditDetails: true };
@@ -189,8 +190,9 @@ export const codexAccountUsage = async (installation, options = {}) => {
189
190
  case "unsupported":
190
191
  return outcome;
191
192
  case "error":
192
- break;
193
+ throw new Error("Failed to read Codex account usage", { cause: outcome.cause });
194
+ default:
195
+ throw new Error("Failed to read Codex account usage");
193
196
  }
194
- throw new Error("Failed to read Codex account usage");
195
197
  };
196
198
  //# sourceMappingURL=account-usage.js.map