@desplega.ai/agent-swarm 2.9.0 → 2.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (305) hide show
  1. package/dist/acp-adapter-g909b5hw.js +16 -0
  2. package/dist/{acp-targets-swxq55dr.js → acp-targets-ny75x1qy.js} +7 -7
  3. package/dist/{actions-pb678g3e.js → actions-b9qgrmeq.js} +81 -21
  4. package/dist/{agent-fs-provision-dmhnc38q.js → agent-fs-provision-b5dhdsbd.js} +4 -4
  5. package/dist/{amp-adapter-3pa66q27.js → amp-adapter-vtax2c9s.js} +2 -2
  6. package/dist/{anthropic-messages-x2cp5fvf.js → anthropic-messages-r5xf5hqw.js} +10 -10
  7. package/dist/{app-17d12ev4.js → app-g2z15hax.js} +6 -3
  8. package/dist/{approval-notifications-h7vd9pmg.js → approval-notifications-yt13wp8r.js} +8 -5
  9. package/dist/{assistant-t7k39ree.js → assistant-2cgfxsgk.js} +23 -21
  10. package/dist/{boot-args-schema-0gqmkfbe.js → boot-args-schema-3gwy0f60.js} +1 -1
  11. package/dist/{boot-reembed-n6anc01d.js → boot-reembed-92g7s5zp.js} +1 -1
  12. package/dist/{boot-reembed-f064w382.js → boot-reembed-mywmyp4s.js} +1 -1
  13. package/dist/{boot-scrub-sweep-ejd5dnrz.js → boot-scrub-sweep-7dkdzqxx.js} +3 -3
  14. package/dist/{boot-seeds-f99fjs5q.js → boot-seeds-ce7rvgq1.js} +4 -4
  15. package/dist/{claude-adapter-gvznwxgc.js → claude-adapter-3m4q7735.js} +7 -7
  16. package/dist/{claude-managed-adapter-pbrbvc64.js → claude-managed-adapter-t8nfgcgz.js} +2 -2
  17. package/dist/{claude-managed-setup-kdxttvc3.js → claude-managed-setup-c217draw.js} +3 -3
  18. package/dist/{claude-sdk-session-0t2teq6n.js → claude-sdk-session-7fbqm51z.js} +7 -7
  19. package/dist/{cli-9a2rtd77.js → cli-1jykg0py.js} +6 -4
  20. package/dist/{cli-5ntc4we6.js → cli-2czxfnvj.js} +235 -2003
  21. package/dist/{cli-dd37e0cm.js → cli-2dq9yv8p.js} +1 -1
  22. package/dist/{cli-c07v0qfa.js → cli-2xs8tsf7.js} +69 -66
  23. package/dist/{cli-7fx9jyfs.js → cli-2yjj3e31.js} +64 -10
  24. package/dist/{cli-4ghh072d.js → cli-32djehja.js} +36 -36
  25. package/dist/{cli-cw7mc1je.js → cli-3j873zxq.js} +3 -3
  26. package/dist/cli-43ms35q9.js +270 -0
  27. package/dist/cli-47hz21se.js +25584 -0
  28. package/dist/{cli-n515ex5z.js → cli-4ymxrwg5.js} +16 -16
  29. package/dist/{cli-5gygrr67.js → cli-67mwzr35.js} +1 -1
  30. package/dist/{cli-5kcmxwxv.js → cli-6945ywhr.js} +1 -1
  31. package/dist/{cli-812paz57.js → cli-6ehs4mta.js} +18 -2
  32. package/dist/{cli-95930z69.js → cli-6ym4jhzp.js} +2 -2
  33. package/dist/{cli-zg3z63x3.js → cli-7mv4h3sn.js} +1 -1
  34. package/dist/{cli-eg437b5p.js → cli-7sf9sb0w.js} +2 -1
  35. package/dist/{cli-nr46j5pw.js → cli-8zh9nrew.js} +1 -1
  36. package/dist/{cli-wr1h0k28.js → cli-9w8712tq.js} +617 -278
  37. package/dist/{cli-ssvdrk4y.js → cli-b6px1k1q.js} +1 -1
  38. package/dist/{cli-7831nhaw.js → cli-b91nz213.js} +3 -3
  39. package/dist/{cli-7cgf614g.js → cli-bg63qmsx.js} +2 -2
  40. package/dist/{cli-me4maa4j.js → cli-bkjdknnp.js} +9 -5
  41. package/dist/{cli-rts1qvb4.js → cli-bnqncekd.js} +2 -2
  42. package/dist/{cli-25nstr34.js → cli-br0924pw.js} +1 -1
  43. package/dist/{cli-ymct0ycy.js → cli-ctx0b85j.js} +5222 -4978
  44. package/dist/{cli-kqh27v2y.js → cli-dgs10ttj.js} +1 -1
  45. package/dist/{cli-kmvcm34h.js → cli-f3jyzq4g.js} +2 -2
  46. package/dist/cli-f8x9drqr.js +84 -0
  47. package/dist/{cli-8axx8vnw.js → cli-f9gz2vyj.js} +5 -5
  48. package/dist/{cli-vvgaz8t6.js → cli-fh97xn30.js} +2 -2
  49. package/dist/{cli-8x8y70av.js → cli-fkef327x.js} +2 -2
  50. package/dist/{cli-js8zrfyg.js → cli-gfy38pvt.js} +2 -2
  51. package/dist/{cli-kaa4bd7x.js → cli-h9yqfzx9.js} +7 -6
  52. package/dist/{cli-svc803vq.js → cli-j7svy295.js} +11 -11
  53. package/dist/{cli-nhq5js1b.js → cli-jaw5v1sy.js} +3 -3
  54. package/dist/{cli-w7dxb2fj.js → cli-jkw6ptfw.js} +6 -6
  55. package/dist/{cli-1tvdx9t5.js → cli-jm0hvmz2.js} +1 -1
  56. package/dist/{cli-e9973bf0.js → cli-jwampxxq.js} +2 -2
  57. package/dist/{cli-dx439zpg.js → cli-kpgcm7xy.js} +13 -1
  58. package/dist/{cli-pz1c00aa.js → cli-kxx4k2jw.js} +2 -2
  59. package/dist/{cli-aa8s22gn.js → cli-m7c2380k.js} +191 -182
  60. package/dist/{cli-2kg31ted.js → cli-m7zvgt57.js} +11 -11
  61. package/dist/{cli-57pvhnyt.js → cli-mhapr559.js} +1 -1
  62. package/dist/{cli-gddgcnav.js → cli-mjw0yf82.js} +1 -1
  63. package/dist/{cli-h474mvp5.js → cli-mkwkwq81.js} +7 -4
  64. package/dist/{cli-jd3kxppb.js → cli-mw620q3n.js} +1 -1
  65. package/dist/{cli-spzkdgtg.js → cli-n3qe7tyr.js} +172 -168
  66. package/dist/{cli-3zxdz9r7.js → cli-nafvvsp8.js} +3 -3
  67. package/dist/{cli-fnh4b12r.js → cli-nbt14he0.js} +6 -6
  68. package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
  69. package/dist/{cli-faf46gdq.js → cli-p4kckx1z.js} +10 -10
  70. package/dist/{cli-k7pt28ad.js → cli-pb2ay3sh.js} +2 -2
  71. package/dist/{cli-pn1v1pb0.js → cli-psffsanb.js} +3 -2
  72. package/dist/{cli-2tnbc3gw.js → cli-pyjn0qhk.js} +2257 -61
  73. package/dist/{cli-fgphc007.js → cli-rq5rpv6k.js} +1 -1
  74. package/dist/{cli-vw5x18yj.js → cli-sn650d7x.js} +9 -9
  75. package/dist/{cli-mc1fx4xd.js → cli-td9tb872.js} +10 -10
  76. package/dist/{cli-6dp0jkfj.js → cli-tvc4jag9.js} +3 -3
  77. package/dist/{cli-a9hfzg2r.js → cli-ty3gha1p.js} +6 -6
  78. package/dist/{cli-pwsax0vp.js → cli-v57d7fmm.js} +1 -1
  79. package/dist/{cli-nmcpzbty.js → cli-vt89089n.js} +4 -4
  80. package/dist/{cli-sn4pc4qx.js → cli-vyff45ve.js} +2 -2
  81. package/dist/{cli-m1fbz2wj.js → cli-w4n323t3.js} +175 -16
  82. package/dist/{cli-g3zzby8t.js → cli-wn13hhdt.js} +5 -5
  83. package/dist/{cli-q8cfh1t9.js → cli-xag7btpe.js} +1 -1
  84. package/dist/{cli-c5cspahx.js → cli-y2ewxhth.js} +38 -13
  85. package/dist/{cli-k09cxm6m.js → cli-ysvspf5e.js} +2 -2
  86. package/dist/{cli-eepnpee7.js → cli-zh0e5x7p.js} +4 -4
  87. package/dist/{cli-bk9v1xrv.js → cli-zr6qy15y.js} +11 -11
  88. package/dist/cli.js +21 -20
  89. package/dist/{codex-adapter-44yq2fkn.js → codex-adapter-n656pvb8.js} +6 -6
  90. package/dist/{codex-hook-h1zb7cfk.js → codex-hook-59atdwd8.js} +1 -1
  91. package/dist/{codex-login-cdyrr5y1.js → codex-login-a239g1ah.js} +1 -1
  92. package/dist/{codex-session-runner-zbh26gbw.js → codex-session-runner-p0fbv5y9.js} +6 -6
  93. package/dist/{commands-54f02v5b.js → commands-gwea8z5p.js} +3 -3
  94. package/dist/{controller-9gpwcdek.js → controller-t67c3grh.js} +6 -3
  95. package/dist/{controllers-connect-61re6k1n.js → controllers-connect-ks155r0h.js} +22 -20
  96. package/dist/{cursor-adapter-7e4g81vd.js → cursor-adapter-ygwrtmkv.js} +1 -1
  97. package/dist/{db-dg2gc7fd.js → db-kpmx06s9.js} +8 -2
  98. package/dist/{db-wnh0qjy1.js → db-rb2xqdb1.js} +3 -3
  99. package/dist/{dispatcher-jrm24r43.js → dispatcher-31sm0ej2.js} +20 -18
  100. package/dist/{docker-9aq30pp2.js → docker-09tkkg0n.js} +42 -3
  101. package/dist/{dsh-adapter-1yqk267c.js → dsh-adapter-qyxh0w31.js} +1 -1
  102. package/dist/{easter-egg-3d-r4h9cs9m.js → easter-egg-3d-00wjscn6.js} +1 -1
  103. package/dist/{embedding-space-bafjr5f7.js → embedding-space-qhw4g68n.js} +6 -6
  104. package/dist/{embeddings-7xmgqe0e.js → embeddings-zdv9ke6x.js} +1 -1
  105. package/dist/{execute-d6jg5ns0.js → execute-zna8wwr7.js} +1 -1
  106. package/dist/{external-channel-frq1xvq2.js → external-channel-1ac6t56s.js} +2 -2
  107. package/dist/fx-adapter-sk7n0fzc.js +19 -0
  108. package/dist/{google-generative-ai-hh7strj3.js → google-generative-ai-maq6c9bf.js} +1 -1
  109. package/dist/{google-vertex-fy5bw2pm.js → google-vertex-2jgsw2nb.js} +1 -1
  110. package/dist/grok-adapter-sjbcm5ew.js +19 -0
  111. package/dist/handlers-yzy0c87x.js +35 -0
  112. package/dist/{heartbeat-6bpa611t.js → heartbeat-2f6z4kdx.js} +23 -21
  113. package/dist/{hook-w12k146y.js → hook-8y0gvtp1.js} +6 -6
  114. package/dist/{hook-hvm5nf46.js → hook-w1skzaqc.js} +5 -5
  115. package/dist/{http-43tthdvs.js → http-wghxvpef.js} +714 -145
  116. package/dist/{index-1f0vypbg.js → index-0h6qd4p1.js} +34 -24
  117. package/dist/index-25pvya7q.js +40 -0
  118. package/dist/index-2t4859r5.js +35 -0
  119. package/dist/{index-4b1q8kan.js → index-4k7m5dgj.js} +629 -354
  120. package/dist/index-620y7jzq.js +15 -0
  121. package/dist/{index-cret47a5.js → index-8p0j4h4j.js} +506 -43
  122. package/dist/{index-mhq4sh5w.js → index-8zn8nxn5.js} +1 -1
  123. package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
  124. package/dist/{index-ftywhyr0.js → index-9zkchs9t.js} +221 -65
  125. package/dist/{index-bs7gw5fd.js → index-b5wgnm78.js} +44 -44
  126. package/dist/index-cxca2t8y.js +36 -0
  127. package/dist/{index-585gyczt.js → index-pe3d8jfy.js} +3 -3
  128. package/dist/{index-tx9mc2ap.js → index-rv89fvzf.js} +24 -22
  129. package/dist/{index-fn054vsf.js → index-s71ez27v.js} +1 -1
  130. package/dist/{keepalive-rk0j0jvh.js → keepalive-sh02349h.js} +3 -3
  131. package/dist/lead-gk4h5eg7.js +74 -0
  132. package/dist/{maintenance-g6z6kaxw.js → maintenance-yj0dcjja.js} +1 -1
  133. package/dist/{node-jftbyawr.js → node-dqm4xgxw.js} +1 -1
  134. package/dist/{oauth-refresh-sweep-2k3g2q4w.js → oauth-refresh-sweep-d9xedk66.js} +2 -2
  135. package/dist/{onboard-6fdbvh3v.js → onboard-dpgjn03r.js} +2 -2
  136. package/dist/{opencode-adapter-fdbsvts7.js → opencode-adapter-2d31cpjc.js} +6 -6
  137. package/dist/{otel-impl-rvwtc09q.js → otel-impl-1skarpfq.js} +1 -1
  138. package/dist/{pending-sqkrb836.js → pending-bfmxtx0g.js} +21 -19
  139. package/dist/{pi-mono-adapter-asqayqcg.js → pi-mono-adapter-gvppnasy.js} +40 -13
  140. package/dist/{pricing-refresh-f5tkgmw2.js → pricing-refresh-c6b325mk.js} +2 -2
  141. package/dist/{rbac-roles-06s555fa.js → rbac-roles-h80qbdbs.js} +3 -3
  142. package/dist/{rbac-roles-szxsg8t1.js → rbac-roles-zfcx68tx.js} +2 -2
  143. package/dist/{render-v2-103p266q.js → render-v2-nx20t3rb.js} +6 -3
  144. package/dist/{resume-v7kjewt9.js → resume-5ep8agan.js} +10 -7
  145. package/dist/{runtime-f1gmk0b7.js → runtime-r3pj4mce.js} +1 -1
  146. package/dist/{session-access-6shev8ts.js → session-access-n7p3m15b.js} +4 -4
  147. package/dist/{session-source-backfill-bd7spzjd.js → session-source-backfill-v8mt0zwn.js} +3 -3
  148. package/dist/{setup-kmxmztdb.js → setup-z1psaqhe.js} +1 -1
  149. package/dist/thread-buffer-a1re2r9r.js +38 -0
  150. package/dist/{virtual-modules-57eje5wy.js → virtual-modules-rrbjdpxn.js} +3 -3
  151. package/dist/{work-objects-zr47ygmf.js → work-objects-4aghh73z.js} +29 -23
  152. package/dist/worker-3dyyb8ev.js +74 -0
  153. package/dist/{worker-follow-up-grrr3fda.js → worker-follow-up-166zmex1.js} +20 -18
  154. package/openapi.json +1387 -13
  155. package/package.json +7 -6
  156. package/src/apps/catalog.generated.json +43 -3
  157. package/src/apps/page-validator.ts +27 -0
  158. package/src/be/db/model-profiles.ts +4 -1
  159. package/src/be/db/session-costs.ts +219 -0
  160. package/src/be/db/session-log-reasoning.ts +36 -0
  161. package/src/be/db/tasks/read.ts +7 -3
  162. package/src/be/db/tasks/write.ts +33 -1
  163. package/src/be/db.ts +200 -304
  164. package/src/be/key-window-usage.ts +385 -0
  165. package/src/be/migrations/303_task_ui_specs.sql +28 -0
  166. package/src/be/migrations/306_provider_account_telemetry.sql +1 -0
  167. package/src/be/migrations/307_session_cost_credential_attribution.sql +23 -0
  168. package/src/be/migrations/310_session_logs_reasoning.sql +12 -0
  169. package/src/be/runtime-pools/db.ts +3 -0
  170. package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -0
  171. package/src/be/seed-scripts/catalog/boot-triage.ts +1 -0
  172. package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
  173. package/src/be/seed-skills/index.ts +3 -0
  174. package/src/be/swarm-config-guard.ts +24 -1
  175. package/src/be/task-ui-spec.ts +158 -0
  176. package/src/commands/controller.ts +3 -0
  177. package/src/commands/credential-outcome-report.ts +13 -3
  178. package/src/commands/rate-limit-outcome.ts +6 -0
  179. package/src/commands/runner.ts +34 -53
  180. package/src/extensions/catalog.generated.json +3 -3
  181. package/src/extensions/contract-types.generated.ts +1 -1
  182. package/src/http/api-keys.ts +258 -30
  183. package/src/http/session-data.ts +74 -23
  184. package/src/http/sessions.ts +6 -2
  185. package/src/http/tasks.ts +105 -5
  186. package/src/integrations/chat-sdk/relay.ts +87 -0
  187. package/src/jira/outbound.ts +5 -3
  188. package/src/linear/outbound.ts +5 -1
  189. package/src/prompts/base-prompt.ts +8 -0
  190. package/src/prompts/session-templates.ts +19 -2
  191. package/src/providers/acp-targets.ts +1 -1
  192. package/src/providers/amp-adapter.ts +1 -1
  193. package/src/providers/claude-adapter.ts +27 -4
  194. package/src/providers/claude-flag-settings.ts +39 -1
  195. package/src/providers/codex-adapter.ts +85 -3
  196. package/src/providers/codex-app-server.ts +9 -5
  197. package/src/providers/codex-oauth/auth-json.ts +1 -0
  198. package/src/providers/pi-mono-adapter.ts +35 -2
  199. package/src/providers/pricing-sources.md +32 -0
  200. package/src/providers/types.ts +11 -0
  201. package/src/runtime-providers/docker.ts +65 -1
  202. package/src/scheduler/deferred-task-waits.ts +18 -5
  203. package/src/scripts-runtime/types/swarm-extension.d.ts +8 -8
  204. package/src/slack/actions.ts +56 -0
  205. package/src/slack/app.ts +22 -15
  206. package/src/slack/inbound-files.ts +2 -0
  207. package/src/slack/render-v2.ts +107 -23
  208. package/src/slack/responses.ts +3 -2
  209. package/src/slack/work-objects.ts +4 -1
  210. package/src/tasks/errors.ts +5 -0
  211. package/src/tests/acp-adapter.test.ts +4 -6
  212. package/src/tests/api-key-tracking.test.ts +0 -72
  213. package/src/tests/api-keys-status-model-limits.test.ts +93 -1
  214. package/src/tests/api-keys-validation.test.ts +42 -0
  215. package/src/tests/approval-card-resolution.test.ts +7 -1
  216. package/src/tests/approval-requests-notifications.test.ts +11 -1
  217. package/src/tests/apps-catalog-page-frame.test.ts +49 -0
  218. package/src/tests/apps-session-thread.test.ts +79 -0
  219. package/src/tests/base-prompt.test.ts +111 -5
  220. package/src/tests/chat-sdk-relay.test.ts +149 -1
  221. package/src/tests/claude-adapter-binary.test.ts +67 -6
  222. package/src/tests/claude-flag-settings.test.ts +29 -0
  223. package/src/tests/claude-sdk-lifecycle.test.ts +5 -0
  224. package/src/tests/codex-adapter.test.ts +340 -2
  225. package/src/tests/codex-app-server.test.ts +16 -0
  226. package/src/tests/codex-oauth.test.ts +3 -1
  227. package/src/tests/codex-rate-limits.test.ts +384 -0
  228. package/src/tests/credential-outcome-report.test.ts +20 -0
  229. package/src/tests/db-task-read-contract.test.ts +3 -0
  230. package/src/tests/db-task-write-contract.test.ts +4 -0
  231. package/src/tests/deferred-task-wake.test.ts +63 -1
  232. package/src/tests/docker-isolation-config-guard.test.ts +29 -0
  233. package/src/tests/docs-index-footprint.test.js +11 -3
  234. package/src/tests/e2e-visuals-comment.test.ts +82 -0
  235. package/src/tests/e2e-visuals-verify-pr.test.ts +138 -0
  236. package/src/tests/extensions-example-sql-admin-only.test.ts +7 -4
  237. package/src/tests/fixtures/ui-spec-slack/deploys.json +121 -0
  238. package/src/tests/fixtures/ui-spec-slack/incident.json +183 -0
  239. package/src/tests/fixtures/ui-spec-slack/three-charts-stale.json +196 -0
  240. package/src/tests/fixtures/ui-spec-slack/video-rejected-by-slack.json +183 -0
  241. package/src/tests/fixtures/ui-spec-slack/video.json +446 -0
  242. package/src/tests/gitleaks-download-retry.test.ts +85 -0
  243. package/src/tests/human-thread-routing.test.ts +187 -0
  244. package/src/tests/jira-outbound-sync.test.ts +33 -1
  245. package/src/tests/key-window-usage.test.ts +831 -0
  246. package/src/tests/linear-outbound-sync.test.ts +30 -1
  247. package/src/tests/pi-mono-adapter.test.ts +79 -0
  248. package/src/tests/preload-env.test.ts +2 -0
  249. package/src/tests/preload.ts +3 -1
  250. package/src/tests/prompt-template-session.test.ts +4 -3
  251. package/src/tests/provider-quota-persistence.test.ts +362 -0
  252. package/src/tests/rate-limit-event.test.ts +22 -0
  253. package/src/tests/reasoning-events.test.ts +164 -0
  254. package/src/tests/routing-affinity-inventory.test.ts +22 -0
  255. package/src/tests/runtime-providers-docker.test.ts +91 -0
  256. package/src/tests/script-connections.test.ts +5 -0
  257. package/src/tests/secret-canary-sweep.test.ts +41 -5
  258. package/src/tests/seed-scripts.test.ts +23 -0
  259. package/src/tests/session-cost-attribution.test.ts +748 -0
  260. package/src/tests/session-costs.test.ts +14 -15
  261. package/src/tests/session-logs.test.ts +83 -0
  262. package/src/tests/sessions-detail-batch.test.ts +7 -0
  263. package/src/tests/slack-render-v2.test.ts +357 -0
  264. package/src/tests/slack-start-reload-race.test.ts +67 -0
  265. package/src/tests/subscription-plans.test.ts +20 -1
  266. package/src/tests/task-ui-action-route.test.ts +191 -0
  267. package/src/tests/task-ui-actions.test.ts +195 -0
  268. package/src/tests/task-ui-spec-fallback.test.ts +65 -0
  269. package/src/tests/task-ui-spec.test.ts +368 -0
  270. package/src/tests/workflow-agent-task-retry.test.ts +34 -1
  271. package/src/tools/defer-task.ts +1 -1
  272. package/src/tools/store-progress.ts +69 -3
  273. package/src/types.ts +7 -2
  274. package/src/ui-spec/actions.ts +86 -0
  275. package/src/ui-spec/fallback.ts +19 -0
  276. package/src/ui-spec/slack.ts +17 -0
  277. package/src/ui-spec/validate.ts +169 -0
  278. package/src/utils/codex-rate-limits.ts +159 -0
  279. package/src/utils/credentials.ts +2 -0
  280. package/src/utils/error-tracker.ts +19 -0
  281. package/src/utils/provider-account-telemetry.ts +331 -0
  282. package/src/utils/reasoning-events.ts +107 -0
  283. package/src/utils/subscription-plans.ts +11 -59
  284. package/src/utils/task-ui-spec.ts +67 -0
  285. package/src/workflows/task-step-routing.ts +8 -3
  286. package/templates/extensions/sql-admin-only/README.md +2 -1
  287. package/templates/extensions/sql-admin-only/hooks.ts +7 -3
  288. package/templates/extensions/sql-admin-only/manifest.json +1 -1
  289. package/templates/skills/apps/SKILL.md +32 -5
  290. package/templates/skills/apps/content.md +32 -5
  291. package/templates/skills/ui-spec/config.json +14 -0
  292. package/templates/skills/ui-spec/content.md +127 -0
  293. package/dist/acp-adapter-jqn86aam.js +0 -16
  294. package/dist/cli-srtkr1h2.js +0 -12078
  295. package/dist/fx-adapter-0zrkfbkd.js +0 -19
  296. package/dist/grok-adapter-3db1c538.js +0 -19
  297. package/dist/handlers-k22n8mnn.js +0 -33
  298. package/dist/index-8xcyd3mc.js +0 -33
  299. package/dist/index-9sy2bh6n.js +0 -38
  300. package/dist/index-b24j7t2m.js +0 -12797
  301. package/dist/index-wjd56k1v.js +0 -34
  302. package/dist/lead-atxf3q6e.js +0 -72
  303. package/dist/thread-buffer-4yz236d0.js +0 -36
  304. package/dist/worker-p4hbtcy3.js +0 -72
  305. package/dist/{cli-j49yqpvh.js → cli-7evph51z.js} +3 -3
package/src/be/db.ts CHANGED
@@ -1,5 +1,19 @@
1
+ import {
2
+ CREDENTIAL_SUFFIX_SQL,
3
+ CREDENTIAL_TYPE_SQL,
4
+ type CreateSessionCostInput,
5
+ insertSessionCost,
6
+ rowToSessionCost,
7
+ type SessionCostRow,
8
+ } from "./db/session-costs";
9
+
10
+ export {
11
+ type CreateSessionCostInput,
12
+ insertSessionCost,
13
+ SessionCostConflictError,
14
+ } from "./db/session-costs";
15
+
1
16
  import type { Database } from "bun:sqlite";
2
- import { chatgptSubscriptionModelId } from "@desplega/model-catalog";
3
17
  import pkg from "../../package.json";
4
18
  import { defaultAssetKey, normalizeAssetKey } from "../assets/key";
5
19
  import { sessionSourceKey, sessionThreadGroupKey } from "../assets/source-key";
@@ -10,6 +24,7 @@ import {
10
24
  matchesDefaultIdentityMd,
11
25
  } from "../prompts/defaults";
12
26
  import { realtimeBus } from "../realtime/bus";
27
+ import { TaskRoutingAuthorizationError } from "../tasks/errors";
13
28
  import { slackChannelFromContextKey } from "../tasks/slack-routing";
14
29
  import { _resolveIntegrationType, emitIntegrationConnected, telemetry } from "../telemetry";
15
30
  import { invalidateTelemetryUserRole, scheduleOrgDomainRecompute } from "../telemetry-identity";
@@ -89,8 +104,6 @@ import type {
89
104
  Service,
90
105
  ServiceStatus,
91
106
  SessionCost,
92
- SessionCostModelBreakdown,
93
- SessionCostSource,
94
107
  SessionLog,
95
108
  Skill,
96
109
  SkillFile,
@@ -132,7 +145,6 @@ import {
132
145
  OPEN_TASK_STATUSES,
133
146
  parseModelTier,
134
147
  SERVER_GENERATED_ATTACHMENT_CAPABILITY,
135
- SessionCostModelBreakdownSchema,
136
148
  } from "../types";
137
149
  import {
138
150
  CODEX_AUTH_FAILURE_BENCH_MS,
@@ -159,6 +171,15 @@ import {
159
171
  } from "../utils/identity-field-budget";
160
172
  import { activeModelBlock, type ModelFamily } from "../utils/model-rate-limit-windows";
161
173
  import { isEffectiveOutputSchema } from "../utils/output-schema";
174
+ import {
175
+ applyProviderQuotaReport,
176
+ assertProviderQuotaCapacity,
177
+ type ProviderAccountTelemetry,
178
+ parseProviderAccount,
179
+ type RateLimitReplacement,
180
+ scrubProviderQuotaReport,
181
+ } from "../utils/provider-account-telemetry";
182
+ import { extractReasoning } from "../utils/reasoning-events";
162
183
  import { getCurrentRequestUserId, getCurrentRunProvenance } from "../utils/request-auth-context";
163
184
  import { isRuntimePoolsEnabled } from "../utils/runtime-pools-flag";
164
185
  import {
@@ -167,7 +188,7 @@ import {
167
188
  scrubSecrets,
168
189
  } from "../utils/secret-scrubber";
169
190
  import {
170
- estimateClaudePlan,
191
+ codexPlanFromClaim,
171
192
  planAllowsModelFamily,
172
193
  SUBSCRIPTION_KEY_TYPES,
173
194
  } from "../utils/subscription-plans";
@@ -204,6 +225,7 @@ import { clearAgentModelProfileOnOverrideChange } from "./db/model-profiles";
204
225
  import { pageSearchSql } from "./db/page-search";
205
226
  import { parsePageThemeTokens } from "./db/page-theme-tokens";
206
227
  import { getDb, getDbClient } from "./db/runtime";
228
+ import { classifyClaudeUpdate } from "./db/session-log-reasoning";
207
229
  import {
208
230
  assertAssetKeyMovesAllowed,
209
231
  configureSessionMoveDependencies,
@@ -429,6 +451,7 @@ export {
429
451
  getPausedTasksForAgent,
430
452
  getPendingTaskForAgent,
431
453
  getRecentlyCancelledTasksForAgent,
454
+ markWorkflowStepTaskSuperseded,
432
455
  overwriteTerminalTaskResultText,
433
456
  pauseTask,
434
457
  recordTaskProviderIfUnset,
@@ -2729,7 +2752,9 @@ export async function createTaskExtended(
2729
2752
  if (parent.routingAffinityInvalid && options.inheritParentRoutingAffinity !== false) {
2730
2753
  // Never let a corrupt parent affinity create an apparently untagged
2731
2754
  // continuation. This is a fail-closed quarantine, including recovery.
2732
- throw new Error(`Cannot continue task ${parent.id}: routing affinity is invalid.`);
2755
+ throw new TaskRoutingAuthorizationError(
2756
+ `Cannot continue task ${parent.id}: routing affinity is invalid.`,
2757
+ );
2733
2758
  }
2734
2759
  if (parent.routingAffinity && options.inheritParentRoutingAffinity !== false) {
2735
2760
  // Privilege cannot be shed by a continuation. A child can narrow or
@@ -2888,10 +2913,13 @@ export async function createTaskExtended(
2888
2913
  leadOnly: options.routingAffinity.leadOnly === true,
2889
2914
  targetAgentId,
2890
2915
  decision: "reject_ineligible_assignment",
2916
+ parentTaskId: options.parentTaskId,
2917
+ source: options.source,
2918
+ contextKey: options.contextKey,
2891
2919
  },
2892
2920
  });
2893
2921
  } catch {}
2894
- throw new Error(
2922
+ throw new TaskRoutingAuthorizationError(
2895
2923
  options.routingAffinity.leadOnly
2896
2924
  ? `Lead-only task routing affinity does not authorize assignment or offer to agent "${targetAgentId}".`
2897
2925
  : `Task routing affinity does not authorize assignment or offer to agent "${targetAgentId}".`,
@@ -4851,7 +4879,7 @@ export async function createSessionLogs(logs: {
4851
4879
  for (let start = 0; start < logs.lines.length; start += BATCH_SIZE) {
4852
4880
  // Yield to the event loop between batches.
4853
4881
  if (start > 0) await new Promise<void>((r) => setTimeout(r, 5));
4854
- const batch: string[] = [];
4882
+ const batch: Array<{ content: string; reasoning: ReturnType<typeof extractReasoning> }> = [];
4855
4883
  const end = Math.min(start + BATCH_SIZE, logs.lines.length);
4856
4884
  for (let i = start; i < end; i++) {
4857
4885
  const line = logs.lines[i];
@@ -4860,7 +4888,9 @@ export async function createSessionLogs(logs: {
4860
4888
  // content that is already scrubbed at the adapter emit site. We scrub
4861
4889
  // again here so any future write path that bypasses the adapter still
4862
4890
  // lands clean text in the persistent session_logs table.
4863
- batch.push(scrubSecrets(line));
4891
+ const content = scrubSecrets(line);
4892
+ // Parsed here, next to the scrub, so the write lock covers inserts only.
4893
+ batch.push({ content, reasoning: extractReasoning(logs.cli, content) });
4864
4894
  }
4865
4895
  await getDbClient().transaction(async (tx) => {
4866
4896
  // The worker flushes one (sessionId, iteration) in many POSTs, so the
@@ -4875,10 +4905,13 @@ export async function createSessionLogs(logs: {
4875
4905
  [logs.sessionId, logs.iteration],
4876
4906
  );
4877
4907
  let lineNumber = last ? last.lineNumber + 1 : 0;
4878
- for (const content of batch) {
4908
+ // Consecutive Claude thinking lines of one message just before the current line.
4909
+ let run = 0;
4910
+ let runMessageId: string | undefined;
4911
+ for (const [index, { content, reasoning }] of batch.entries()) {
4879
4912
  await tx.run(
4880
- `INSERT INTO session_logs (id, taskId, sessionId, iteration, cli, content, lineNumber, createdAt)
4881
- VALUES (?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))`,
4913
+ `INSERT INTO session_logs (id, taskId, sessionId, iteration, cli, content, lineNumber, createdAt, reasoningChars, reasoningKind)
4914
+ VALUES (?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'), ?, ?)`,
4882
4915
  [
4883
4916
  crypto.randomUUID(),
4884
4917
  logs.taskId ?? null,
@@ -4886,9 +4919,29 @@ export async function createSessionLogs(logs: {
4886
4919
  logs.iteration,
4887
4920
  logs.cli,
4888
4921
  content,
4889
- lineNumber++,
4922
+ lineNumber,
4923
+ reasoning.reasoning?.chars ?? null,
4924
+ reasoning.reasoning ? "reasoning" : null,
4890
4925
  ],
4891
4926
  );
4927
+ const toolMessageId = reasoning.toolUseMessageId;
4928
+ if (toolMessageId) {
4929
+ const before = runMessageId === toolMessageId ? run : 0;
4930
+ // Only a run of 2+ can hold an update. A run that reaches the batch
4931
+ // start may continue in an earlier POST, so the DB decides that case.
4932
+ if (before >= 2 || before === index) {
4933
+ await classifyClaudeUpdate(tx, logs.sessionId, toolMessageId, lineNumber);
4934
+ }
4935
+ }
4936
+ const messageId = reasoning.reasoning?.messageId;
4937
+ if (logs.cli === "claude" && messageId) {
4938
+ run = runMessageId === messageId ? run + 1 : 1;
4939
+ runMessageId = messageId;
4940
+ } else {
4941
+ run = 0;
4942
+ runMessageId = undefined;
4943
+ }
4944
+ lineNumber++;
4892
4945
  }
4893
4946
  });
4894
4947
  }
@@ -4935,160 +4988,8 @@ export async function getSessionLogsBySession(
4935
4988
  // Session Costs (aggregated cost data per session)
4936
4989
  // ============================================================================
4937
4990
 
4938
- type SessionCostRow = {
4939
- id: string;
4940
- sessionId: string;
4941
- taskId: string | null;
4942
- agentId: string;
4943
- totalCostUsd: number;
4944
- inputTokens: number;
4945
- outputTokens: number;
4946
- cacheReadTokens: number;
4947
- cacheWriteTokens: number;
4948
- // Migration 063 additions:
4949
- reasoningOutputTokens: number;
4950
- thinkingTokens: number;
4951
- durationMs: number;
4952
- numTurns: number | null;
4953
- model: string;
4954
- isError: number;
4955
- costSource: string;
4956
- harnessCostUsd: number | null;
4957
- cacheWrite5mTokens: number | null;
4958
- cacheWrite1hTokens: number | null;
4959
- modelBreakdown: string | null;
4960
- createdAt: string;
4961
- };
4962
-
4963
- function rowToSessionCost(row: SessionCostRow): SessionCost {
4964
- let modelBreakdown: SessionCostModelBreakdown[] | null = null;
4965
- if (row.modelBreakdown) {
4966
- try {
4967
- const parsed = SessionCostModelBreakdownSchema.array().safeParse(
4968
- JSON.parse(row.modelBreakdown),
4969
- );
4970
- if (parsed.success) modelBreakdown = parsed.data;
4971
- } catch {
4972
- // Corrupt JSON (manual edits, partial writes) must not fail the listing.
4973
- }
4974
- }
4975
-
4976
- return {
4977
- id: row.id,
4978
- sessionId: row.sessionId,
4979
- taskId: row.taskId ?? undefined,
4980
- agentId: row.agentId,
4981
- totalCostUsd: row.totalCostUsd,
4982
- inputTokens: row.inputTokens,
4983
- outputTokens: row.outputTokens,
4984
- cacheReadTokens: row.cacheReadTokens,
4985
- cacheWriteTokens: row.cacheWriteTokens,
4986
- reasoningOutputTokens: row.reasoningOutputTokens ?? 0,
4987
- thinkingTokens: row.thinkingTokens ?? 0,
4988
- durationMs: row.durationMs,
4989
- numTurns: row.numTurns,
4990
- model: row.model,
4991
- isError: row.isError === 1,
4992
- costSource: (row.costSource as SessionCostSource) ?? "harness",
4993
- harnessCostUsd: row.harnessCostUsd,
4994
- cacheWrite5mTokens: row.cacheWrite5mTokens,
4995
- cacheWrite1hTokens: row.cacheWrite1hTokens,
4996
- modelBreakdown,
4997
- createdAt: row.createdAt,
4998
- };
4999
- }
5000
-
5001
- export interface CreateSessionCostInput {
5002
- id?: string;
5003
- sessionId: string;
5004
- taskId?: string;
5005
- agentId: string;
5006
- totalCostUsd: number;
5007
- inputTokens?: number;
5008
- outputTokens?: number;
5009
- cacheReadTokens?: number;
5010
- cacheWriteTokens?: number;
5011
- // Migration 063 additions — adapters that have these numbers should pass
5012
- // them; defaulting to 0 preserves the old write shape for callers that don't.
5013
- reasoningOutputTokens?: number;
5014
- thinkingTokens?: number;
5015
- durationMs: number;
5016
- // Nullable: some adapters (claude when num_turns is absent) can't honestly
5017
- // report a turn count; we prefer null over a faked 1.
5018
- numTurns: number | null;
5019
- model: string;
5020
- isError?: boolean;
5021
- /**
5022
- * Phase 6 (migration 063 added 'unpriced'): where `totalCostUsd` came from.
5023
- * - 'harness' — value reported by the harness as-is (default).
5024
- * - 'pricing-table' — value recomputed by the API from `pricing` rows.
5025
- * - 'unpriced' — recompute attempted but no matching pricing rows;
5026
- * `totalCostUsd` is whatever the worker submitted.
5027
- * - 'estimated' — fallback token counts priced at an assumed model
5028
- * (amp with a failed thread export).
5029
- */
5030
- costSource?: SessionCostSource;
5031
- harnessCostUsd?: number | null;
5032
- cacheWrite5mTokens?: number | null;
5033
- cacheWrite1hTokens?: number | null;
5034
- modelBreakdown?: SessionCostModelBreakdown[] | null;
5035
- }
5036
-
5037
4991
  export async function createSessionCost(input: CreateSessionCostInput): Promise<SessionCost> {
5038
- const id = input.id ?? crypto.randomUUID();
5039
- const costSource: SessionCostSource = input.costSource ?? "harness";
5040
- const reasoningOutputTokens = input.reasoningOutputTokens ?? 0;
5041
- const thinkingTokens = input.thinkingTokens ?? 0;
5042
- await getDbClient().run(
5043
- `INSERT INTO session_costs (
5044
- id, sessionId, taskId, agentId,
5045
- totalCostUsd, inputTokens, outputTokens,
5046
- cacheReadTokens, cacheWriteTokens,
5047
- reasoningOutputTokens, thinkingTokens,
5048
- durationMs, numTurns, model, isError,
5049
- costSource, harnessCostUsd, cacheWrite5mTokens, cacheWrite1hTokens,
5050
- modelBreakdown, createdAt
5051
- )
5052
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
5053
- ON CONFLICT(id) DO NOTHING`,
5054
- [
5055
- id,
5056
- input.sessionId,
5057
- input.taskId ?? null,
5058
- input.agentId,
5059
- input.totalCostUsd,
5060
- input.inputTokens ?? 0,
5061
- input.outputTokens ?? 0,
5062
- input.cacheReadTokens ?? 0,
5063
- input.cacheWriteTokens ?? 0,
5064
- reasoningOutputTokens,
5065
- thinkingTokens,
5066
- input.durationMs,
5067
- input.numTurns,
5068
- // Cost rows group by the underlying model, while task configuration and
5069
- // session logs retain the pi route used to select credentials.
5070
- chatgptSubscriptionModelId(input.model)?.toLowerCase() ?? input.model,
5071
- input.isError ? 1 : 0,
5072
- costSource,
5073
- input.harnessCostUsd ?? null,
5074
- input.cacheWrite5mTokens ?? null,
5075
- input.cacheWrite1hTokens ?? null,
5076
- input.modelBreakdown
5077
- ? JSON.stringify(
5078
- input.modelBreakdown.map((entry) => ({
5079
- ...entry,
5080
- model: chatgptSubscriptionModelId(entry.model)?.toLowerCase() ?? entry.model,
5081
- })),
5082
- )
5083
- : null,
5084
- ],
5085
- );
5086
-
5087
- const row = await getDbClient().get<SessionCostRow>("SELECT * FROM session_costs WHERE id = ?", [
5088
- id,
5089
- ]);
5090
- if (!row) throw new Error("Session cost record is missing after insertion.");
5091
- return rowToSessionCost(row);
4992
+ return (await insertSessionCost(input)).cost;
5092
4993
  }
5093
4994
 
5094
4995
  export async function getSessionCostsByTaskId(taskId: string, limit = 500): Promise<SessionCost[]> {
@@ -5190,6 +5091,9 @@ export interface SessionCostSummaryTotals {
5190
5091
  excludedTaskCount: number;
5191
5092
  /** API-priced cost of sessions whose task ran on a subscription credential (`SUBSCRIPTION_KEY_TYPES`). */
5192
5093
  subscriptionCostUsd: number;
5094
+ /** Cost without an immutable credential identity. Its billing type is unknown. */
5095
+ credentialUnattributedCostUsd: number;
5096
+ credentialUnattributedSessions: number;
5193
5097
  }
5194
5098
 
5195
5099
  export interface SessionCostDailyRow {
@@ -5200,6 +5104,9 @@ export interface SessionCostDailyRow {
5200
5104
  sessions: number;
5201
5105
  /** Part of `costUsd` that ran on a subscription credential. */
5202
5106
  subscriptionCostUsd: number;
5107
+ /** Cost without an immutable credential identity. Its billing type is unknown. */
5108
+ credentialUnattributedCostUsd: number;
5109
+ credentialUnattributedSessions: number;
5203
5110
  }
5204
5111
 
5205
5112
  /**
@@ -5210,7 +5117,7 @@ export type PlanSource = "manual" | "detected" | "estimated";
5210
5117
 
5211
5118
  /** Spend per credential, for the subscription vs API comparison. */
5212
5119
  export interface SessionCostByCredentialRow {
5213
- /** `null` when the task recorded no credential (or the session has no task). */
5120
+ /** Null when the executing session reported no credential. */
5214
5121
  keyType: string | null;
5215
5122
  keySuffix: string | null;
5216
5123
  /** Label set on the API Keys page. */
@@ -5307,7 +5214,7 @@ export async function getSessionCostSummary(opts: {
5307
5214
  }
5308
5215
 
5309
5216
  const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
5310
- const subscriptionSql = `t.credentialKeyType IN (${SUBSCRIPTION_KEY_TYPES.map((k) => `'${k}'`).join(", ")})`;
5217
+ const subscriptionSql = `${CREDENTIAL_TYPE_SQL} IN (${SUBSCRIPTION_KEY_TYPES.map((k) => `'${k}'`).join(", ")})`;
5311
5218
 
5312
5219
  // Totals
5313
5220
  type TotalsRow = {
@@ -5323,6 +5230,8 @@ export async function getSessionCostSummary(opts: {
5323
5230
  excludedCostUsd: number;
5324
5231
  excludedTaskCount: number;
5325
5232
  subscriptionCostUsd: number;
5233
+ credentialUnattributedCostUsd: number;
5234
+ credentialUnattributedSessions: number;
5326
5235
  };
5327
5236
 
5328
5237
  const totalsRow = await getDbClient().get<TotalsRow>(
@@ -5342,7 +5251,10 @@ export async function getSessionCostSummary(opts: {
5342
5251
  THEN sc.totalCostUsd ELSE 0 END), 0) as excludedCostUsd,
5343
5252
  COUNT(DISTINCT CASE WHEN ${HUMAN_FREE_SQL} THEN t.id END) as excludedTaskCount,
5344
5253
  COALESCE(SUM(CASE WHEN ${subscriptionSql}
5345
- THEN sc.totalCostUsd ELSE 0 END), 0) as subscriptionCostUsd
5254
+ THEN sc.totalCostUsd ELSE 0 END), 0) as subscriptionCostUsd,
5255
+ COALESCE(SUM(CASE WHEN ${CREDENTIAL_TYPE_SQL} IS NULL
5256
+ THEN sc.totalCostUsd ELSE 0 END), 0) as credentialUnattributedCostUsd,
5257
+ COUNT(CASE WHEN ${CREDENTIAL_TYPE_SQL} IS NULL THEN 1 END) as credentialUnattributedSessions
5346
5258
  ${from} ${where}`,
5347
5259
  params,
5348
5260
  );
@@ -5367,6 +5279,8 @@ export async function getSessionCostSummary(opts: {
5367
5279
  excludedCostUsd: 0,
5368
5280
  excludedTaskCount: 0,
5369
5281
  subscriptionCostUsd: 0,
5282
+ credentialUnattributedCostUsd: 0,
5283
+ credentialUnattributedSessions: 0,
5370
5284
  };
5371
5285
 
5372
5286
  // Daily breakdown
@@ -5380,6 +5294,8 @@ export async function getSessionCostSummary(opts: {
5380
5294
  outputTokens: number;
5381
5295
  sessions: number;
5382
5296
  subscriptionCostUsd: number;
5297
+ credentialUnattributedCostUsd: number;
5298
+ credentialUnattributedSessions: number;
5383
5299
  }>(
5384
5300
  `SELECT
5385
5301
  DATE(sc.createdAt) as date,
@@ -5388,7 +5304,10 @@ export async function getSessionCostSummary(opts: {
5388
5304
  COALESCE(SUM(sc.outputTokens), 0) as outputTokens,
5389
5305
  COUNT(*) as sessions,
5390
5306
  COALESCE(SUM(CASE WHEN ${subscriptionSql} THEN sc.totalCostUsd ELSE 0 END), 0)
5391
- as subscriptionCostUsd
5307
+ as subscriptionCostUsd,
5308
+ COALESCE(SUM(CASE WHEN ${CREDENTIAL_TYPE_SQL} IS NULL
5309
+ THEN sc.totalCostUsd ELSE 0 END), 0) as credentialUnattributedCostUsd,
5310
+ COUNT(CASE WHEN ${CREDENTIAL_TYPE_SQL} IS NULL THEN 1 END) as credentialUnattributedSessions
5392
5311
  ${from} ${where}
5393
5312
  GROUP BY DATE(sc.createdAt)
5394
5313
  ORDER BY date ASC`,
@@ -5448,8 +5367,8 @@ export async function getSessionCostSummary(opts: {
5448
5367
  >;
5449
5368
  const rows = await getDbClient().query<CredentialRow>(
5450
5369
  `SELECT
5451
- t.credentialKeyType as keyType,
5452
- t.credentialKeySuffix as keySuffix,
5370
+ ${CREDENTIAL_TYPE_SQL} as keyType,
5371
+ ${CREDENTIAL_SUFFIX_SQL} as keySuffix,
5453
5372
  COALESCE(SUM(sc.totalCostUsd), 0) as costUsd,
5454
5373
  COALESCE(SUM(sc.inputTokens), 0) as inputTokens,
5455
5374
  COALESCE(SUM(sc.outputTokens), 0) as outputTokens,
@@ -5457,7 +5376,7 @@ export async function getSessionCostSummary(opts: {
5457
5376
  MIN(sc.createdAt) as firstSessionAt,
5458
5377
  MAX(sc.createdAt) as lastSessionAt
5459
5378
  ${from} ${where}
5460
- GROUP BY t.credentialKeyType, t.credentialKeySuffix
5379
+ GROUP BY ${CREDENTIAL_TYPE_SQL}, ${CREDENTIAL_SUFFIX_SQL}
5461
5380
  ORDER BY costUsd DESC`,
5462
5381
  params,
5463
5382
  );
@@ -5510,7 +5429,11 @@ async function getCredentialLabels(): Promise<
5510
5429
  const key = credentialKey(row.keyType, row.keySuffix);
5511
5430
  const seen = labels.get(key);
5512
5431
  if (!seen) {
5513
- labels.set(key, { name: row.name, plan: row.plan, planSource: row.planSource });
5432
+ labels.set(key, {
5433
+ name: row.name,
5434
+ plan: row.planSource === "estimated" ? null : row.plan,
5435
+ planSource: row.planSource,
5436
+ });
5514
5437
  } else if (!seen.name && row.name) {
5515
5438
  seen.name = row.name;
5516
5439
  }
@@ -11890,9 +11813,11 @@ export interface ApiKeyStatus {
11890
11813
  provider: string;
11891
11814
  /** Latest provider-emitted rate-limit window snapshots, keyed by window type. */
11892
11815
  rateLimitWindows: RateLimitWindowTelemetry;
11816
+ providerAccount: ProviderAccountTelemetry | null;
11893
11817
  /** Subscription plan id (`SUBSCRIPTION_PLANS`), when known. */
11894
11818
  plan: string | null;
11895
11819
  planSource: PlanSource | null;
11820
+ detectedPlanRaw: string | null;
11896
11821
  /** When the CLI last rejected a model with `credits_required` on this key. */
11897
11822
  lastSeatMismatchAt: string | null;
11898
11823
  /** Model family of that rejection (`fable`, `opus`, ...). */
@@ -11906,7 +11831,10 @@ export interface ApiKeyStatus {
11906
11831
  updatedAt: string;
11907
11832
  }
11908
11833
 
11909
- type ApiKeyStatusRow = Omit<ApiKeyStatus, "rateLimitWindows"> & { rateLimitWindows: string | null };
11834
+ type ApiKeyStatusRow = Omit<ApiKeyStatus, "rateLimitWindows" | "providerAccount"> & {
11835
+ rateLimitWindows: string | null;
11836
+ providerAccount: string | null;
11837
+ };
11910
11838
 
11911
11839
  function parseRateLimitWindowsJson(value: string | null | undefined): RateLimitWindowTelemetry {
11912
11840
  if (!value) return {};
@@ -11922,7 +11850,11 @@ function parseRateLimitWindowsJson(value: string | null | undefined): RateLimitW
11922
11850
  }
11923
11851
 
11924
11852
  function rowToApiKeyStatus(row: ApiKeyStatusRow): ApiKeyStatus {
11925
- return { ...row, rateLimitWindows: parseRateLimitWindowsJson(row.rateLimitWindows) };
11853
+ return {
11854
+ ...row,
11855
+ rateLimitWindows: parseRateLimitWindowsJson(row.rateLimitWindows),
11856
+ providerAccount: parseProviderAccount(row.providerAccount),
11857
+ };
11926
11858
  }
11927
11859
 
11928
11860
  export interface AvailableKeyIndicesResult {
@@ -12088,18 +12020,19 @@ export async function recordKeyUsage(
12088
12020
  scopeId: string | null = null,
12089
12021
  /** Plan id the worker detected on the credential (for example from the Codex JWT). */
12090
12022
  plan: string | null = null,
12023
+ planRaw?: string | null,
12091
12024
  ): Promise<{ planChanged: boolean }> {
12092
12025
  const now = new Date().toISOString();
12093
- const client = getDbClient();
12094
- const effectiveScopeId = scopeId ?? "";
12095
-
12096
- // Upsert key status record. Sets `provider` on insert (auto-derived from
12097
- // keyType — see deriveProviderFromKeyType in src/utils/credentials.ts).
12098
- // The `name` column is left null on insert and only set via the
12099
- // setApiKeyName API endpoint when the user manually labels the key.
12100
- const provider = deriveProviderFromKeyType(keyType);
12101
- await client.run(
12102
- `INSERT INTO api_key_status (keyType, keySuffix, keyIndex, scope, scopeId, lastUsedAt, totalUsageCount, provider, updatedAt)
12026
+ return getDbClient().transaction(async (client) => {
12027
+ const effectiveScopeId = scopeId ?? "";
12028
+
12029
+ // Upsert key status record. Sets `provider` on insert (auto-derived from
12030
+ // keyType, see deriveProviderFromKeyType in src/utils/credentials.ts).
12031
+ // The `name` column is left null on insert and only set via the
12032
+ // setApiKeyName API endpoint when the user manually labels the key.
12033
+ const provider = deriveProviderFromKeyType(keyType);
12034
+ await client.run(
12035
+ `INSERT INTO api_key_status (keyType, keySuffix, keyIndex, scope, scopeId, lastUsedAt, totalUsageCount, provider, updatedAt)
12103
12036
  VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?)
12104
12037
  ON CONFLICT(keyType, keySuffix, scope, scopeId)
12105
12038
  DO UPDATE SET
@@ -12107,29 +12040,53 @@ export async function recordKeyUsage(
12107
12040
  totalUsageCount = totalUsageCount + 1,
12108
12041
  keyIndex = excluded.keyIndex,
12109
12042
  updatedAt = excluded.updatedAt`,
12110
- [keyType, keySuffix, keyIndex, scope, effectiveScopeId, now, provider, now],
12111
- );
12043
+ [keyType, keySuffix, keyIndex, scope, effectiveScopeId, now, provider, now],
12044
+ );
12112
12045
 
12113
- // A detected plan replaces an estimate, never a plan the operator picked.
12114
- let planChanged = false;
12115
- if (plan) {
12116
- const result = await client.run(
12117
- `UPDATE api_key_status SET plan = ?, planSource = 'detected'
12046
+ const ambiguousPro =
12047
+ keyType === "CODEX_OAUTH" &&
12048
+ (plan === "chatgpt_pro" || plan === "chatgpt_pro_5x" || plan === "chatgpt_pro_500");
12049
+ let planChanged = false;
12050
+ const rawIdentity = planRaw
12051
+ ? scrubSecrets(planRaw).slice(0, 80)
12052
+ : keyType === "CODEX_OAUTH" && plan === "chatgpt_pro"
12053
+ ? "pro"
12054
+ : null;
12055
+ // A legacy plan report must not retain a contradictory raw claim.
12056
+ if (rawIdentity || plan) {
12057
+ await client.run(
12058
+ "UPDATE api_key_status SET detectedPlanRaw = ? WHERE keyType = ? AND keySuffix = ?",
12059
+ [rawIdentity, keyType, keySuffix],
12060
+ );
12061
+ }
12062
+ if (ambiguousPro || (keyType === "CODEX_OAUTH" && planRaw && !codexPlanFromClaim(planRaw))) {
12063
+ plan = null;
12064
+ const cleared = await client.run(
12065
+ "UPDATE api_key_status SET plan = NULL, planSource = 'detected' WHERE keyType = ? AND keySuffix = ? AND COALESCE(planSource, '') != 'manual' AND (plan IS NOT NULL OR planSource IS NOT 'detected')",
12066
+ [keyType, keySuffix],
12067
+ );
12068
+ planChanged = cleared.changes > 0;
12069
+ }
12070
+ // A detected plan replaces an estimate, never a plan the operator picked.
12071
+ if (plan) {
12072
+ const result = await client.run(
12073
+ `UPDATE api_key_status SET plan = ?, planSource = 'detected'
12118
12074
  WHERE keyType = ? AND keySuffix = ? AND COALESCE(planSource, '') != 'manual'
12119
12075
  AND (plan IS NOT ? OR planSource IS NOT 'detected')`,
12120
- [plan, keyType, keySuffix, plan],
12121
- );
12122
- planChanged = result.changes > 0;
12123
- }
12076
+ [plan, keyType, keySuffix, plan],
12077
+ );
12078
+ planChanged = result.changes > 0;
12079
+ }
12124
12080
 
12125
- // Record which key was used on the task
12126
- if (taskId) {
12127
- await client.run(
12128
- "UPDATE agent_tasks SET credentialKeySuffix = ?, credentialKeyType = ? WHERE id = ?",
12129
- [keySuffix, keyType, taskId],
12130
- );
12131
- }
12132
- return { planChanged };
12081
+ // Record which key was used on the task
12082
+ if (taskId) {
12083
+ await client.run(
12084
+ "UPDATE agent_tasks SET credentialKeySuffix = ?, credentialKeyType = ? WHERE id = ?",
12085
+ [keySuffix, keyType, taskId],
12086
+ );
12087
+ }
12088
+ return { planChanged };
12089
+ });
12133
12090
  }
12134
12091
 
12135
12092
  /**
@@ -12244,34 +12201,6 @@ export async function recordKeyAuthFailure(
12244
12201
  });
12245
12202
  }
12246
12203
 
12247
- /**
12248
- * Merges reported window snapshots into the stored ones, one window type at a
12249
- * time. A reported entry replaces the stored entry unless the stored entry was
12250
- * observed strictly later (`lastSeenAt`), so an older `allowed` snapshot that
12251
- * arrives after a terminal rejection cannot reopen an exhausted window. An
12252
- * unparseable `lastSeenAt` on either side falls back to "reported wins".
12253
- */
12254
- function mergeRateLimitWindowTelemetry(
12255
- stored: RateLimitWindowTelemetry,
12256
- reported: RateLimitWindowTelemetry,
12257
- ): RateLimitWindowTelemetry {
12258
- const merged: RateLimitWindowTelemetry = { ...stored };
12259
- for (const [type, entry] of Object.entries(reported)) {
12260
- const current = merged[type];
12261
- const currentSeenMs = current ? Date.parse(current.lastSeenAt) : Number.NaN;
12262
- const reportedSeenMs = Date.parse(entry.lastSeenAt);
12263
- if (
12264
- Number.isFinite(currentSeenMs) &&
12265
- Number.isFinite(reportedSeenMs) &&
12266
- currentSeenMs > reportedSeenMs
12267
- ) {
12268
- continue;
12269
- }
12270
- merged[type] = entry;
12271
- }
12272
- return merged;
12273
- }
12274
-
12275
12204
  /**
12276
12205
  * Persists reported window snapshots for a key. Admission
12277
12206
  * (`getAvailableKeyIndices`) reads these windows, so the read-merge-write
@@ -12286,81 +12215,54 @@ export async function recordKeyRateLimitWindows(
12286
12215
  windows: RateLimitWindowTelemetry,
12287
12216
  scope = "global",
12288
12217
  scopeId: string | null = null,
12289
- ): Promise<{ planChanged: boolean }> {
12290
- if (Object.keys(windows).length === 0) return { planChanged: false };
12218
+ account?: ProviderAccountTelemetry,
12219
+ replace: RateLimitReplacement[] = [],
12220
+ ): Promise<void> {
12221
+ if (Object.keys(windows).length === 0 && !account && !replace.length) return;
12291
12222
 
12292
12223
  const now = new Date().toISOString();
12293
12224
  const effectiveScopeId = scopeId ?? "";
12294
12225
  const provider = deriveProviderFromKeyType(keyType);
12295
- const merged = await getDbClient().transaction(async (tx) => {
12296
- const existing = await tx.get<{ rateLimitWindows: string | null }>(
12297
- `SELECT rateLimitWindows FROM api_key_status
12226
+ await getDbClient().transaction(async (tx) => {
12227
+ const existing = await tx.get<{
12228
+ rateLimitWindows: string | null;
12229
+ providerAccount: string | null;
12230
+ }>(
12231
+ `SELECT rateLimitWindows, providerAccount FROM api_key_status
12298
12232
  WHERE keyType = ? AND keySuffix = ? AND scope = ? AND scopeId = ?`,
12299
12233
  [keyType, keySuffix, scope, effectiveScopeId],
12300
12234
  );
12301
- const mergedWindows = mergeRateLimitWindowTelemetry(
12302
- parseRateLimitWindowsJson(existing?.rateLimitWindows),
12303
- windows,
12235
+ const { windows: mergedWindows, account: mergedAccount } = applyProviderQuotaReport(
12236
+ {
12237
+ windows: parseRateLimitWindowsJson(existing?.rateLimitWindows),
12238
+ account: parseProviderAccount(existing?.providerAccount),
12239
+ },
12240
+ scrubProviderQuotaReport({ windows, account, replace }),
12304
12241
  );
12305
- const serialized = JSON.stringify(mergedWindows);
12306
-
12242
+ assertProviderQuotaCapacity({ windows: mergedWindows, account: mergedAccount });
12307
12243
  await tx.run(
12308
- `INSERT INTO api_key_status (keyType, keySuffix, keyIndex, scope, scopeId, rateLimitWindows, provider, updatedAt)
12309
- VALUES (?, ?, ?, ?, ?, ?, ?, ?)
12244
+ `INSERT INTO api_key_status (keyType, keySuffix, keyIndex, scope, scopeId, rateLimitWindows, providerAccount, provider, updatedAt)
12245
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
12310
12246
  ON CONFLICT(keyType, keySuffix, scope, scopeId)
12311
12247
  DO UPDATE SET
12312
12248
  rateLimitWindows = excluded.rateLimitWindows,
12249
+ providerAccount = excluded.providerAccount,
12313
12250
  keyIndex = excluded.keyIndex,
12314
12251
  provider = excluded.provider,
12315
12252
  updatedAt = excluded.updatedAt`,
12316
- [keyType, keySuffix, keyIndex, scope, effectiveScopeId, serialized, provider, now],
12253
+ [
12254
+ keyType,
12255
+ keySuffix,
12256
+ keyIndex,
12257
+ scope,
12258
+ effectiveScopeId,
12259
+ JSON.stringify(mergedWindows),
12260
+ mergedAccount ? JSON.stringify(mergedAccount) : null,
12261
+ provider,
12262
+ now,
12263
+ ],
12317
12264
  );
12318
- return mergedWindows;
12319
12265
  });
12320
-
12321
- const planChanged =
12322
- keyType === "CLAUDE_CODE_OAUTH_TOKEN" && (await refreshEstimatedClaudePlan(keySuffix, merged));
12323
- return { planChanged };
12324
- }
12325
-
12326
- const WEEK_SECONDS = 7 * 24 * 3600;
12327
-
12328
- /**
12329
- * Estimate the plan of a Claude credential from its 7-day window (see
12330
- * `estimateClaudePlan`), unless a stronger source already set it. Returns
12331
- * true when the stored plan changed.
12332
- */
12333
- async function refreshEstimatedClaudePlan(
12334
- keySuffix: string,
12335
- windows: RateLimitWindowTelemetry,
12336
- ): Promise<boolean> {
12337
- const week = windows.seven_day;
12338
- if (!week?.utilization || !week.resetsAt) return false;
12339
- const client = getDbClient();
12340
- const stronger = await client.get<{ found: number }>(
12341
- `SELECT 1 as found FROM api_key_status
12342
- WHERE keyType = 'CLAUDE_CODE_OAUTH_TOKEN' AND keySuffix = ? AND planSource IN ('manual', 'detected')
12343
- LIMIT 1`,
12344
- [keySuffix],
12345
- );
12346
- if (stronger) return false;
12347
- const windowStart = new Date((week.resetsAt - WEEK_SECONDS) * 1000).toISOString();
12348
- const spend = await client.get<{ spendUsd: number }>(
12349
- `SELECT COALESCE(SUM(sc.totalCostUsd), 0) as spendUsd
12350
- FROM session_costs sc JOIN agent_tasks t ON t.id = sc.taskId
12351
- WHERE t.credentialKeyType = 'CLAUDE_CODE_OAUTH_TOKEN' AND t.credentialKeySuffix = ?
12352
- AND sc.createdAt >= ?`,
12353
- [keySuffix, windowStart],
12354
- );
12355
- const plan = estimateClaudePlan(week.utilization, spend?.spendUsd ?? 0);
12356
- if (!plan) return false;
12357
- const result = await client.run(
12358
- `UPDATE api_key_status SET plan = ?, planSource = 'estimated'
12359
- WHERE keyType = 'CLAUDE_CODE_OAUTH_TOKEN' AND keySuffix = ?
12360
- AND COALESCE(planSource, 'estimated') = 'estimated' AND plan IS NOT ?`,
12361
- [plan, keySuffix, plan],
12362
- );
12363
- return result.changes > 0;
12364
12266
  }
12365
12267
 
12366
12268
  /**
@@ -12479,36 +12381,30 @@ export interface KeyCostSummary {
12479
12381
  }
12480
12382
 
12481
12383
  /**
12482
- * Aggregate cost data per API key by joining session_costs through agent_tasks.
12384
+ * Aggregate cost data using immutable session credentials (legacy rows: the task's).
12483
12385
  */
12484
12386
  export async function getKeyCostSummary(keyType?: string): Promise<KeyCostSummary[]> {
12485
- const conditions = ["t.credentialKeySuffix IS NOT NULL"];
12387
+ const conditions = [`${CREDENTIAL_SUFFIX_SQL} IS NOT NULL`];
12486
12388
  const params: string[] = [];
12487
12389
 
12488
12390
  if (keyType) {
12489
- conditions.push("t.credentialKeyType = ?");
12391
+ conditions.push(`${CREDENTIAL_TYPE_SQL} = ?`);
12490
12392
  params.push(keyType);
12491
12393
  }
12492
12394
 
12493
12395
  const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
12494
- // Phase 13: INNER JOIN -> LEFT JOIN. The `WHERE t.credentialKeySuffix IS NOT NULL`
12495
- // still filters out rows whose taskId doesn't link to a task with credentials,
12496
- // but switching to LEFT JOIN means a future change that drops the WHERE
12497
- // (or a debugging query that wants orphan rows visible) doesn't silently
12498
- // disappear them. Equivalent for the current `WHERE … IS NOT NULL` filter;
12499
- // makes the query's intent (cost rows owned by a credential) explicit.
12500
12396
  return getDbClient().query<KeyCostSummary>(
12501
12397
  `SELECT
12502
- t.credentialKeyType as keyType,
12503
- t.credentialKeySuffix as keySuffix,
12398
+ ${CREDENTIAL_TYPE_SQL} as keyType,
12399
+ ${CREDENTIAL_SUFFIX_SQL} as keySuffix,
12504
12400
  COALESCE(SUM(sc.totalCostUsd), 0) as totalCost,
12505
12401
  COALESCE(SUM(sc.inputTokens), 0) as totalInputTokens,
12506
12402
  COALESCE(SUM(sc.outputTokens), 0) as totalOutputTokens,
12507
12403
  COUNT(DISTINCT sc.taskId) as taskCount
12508
12404
  FROM session_costs sc
12509
- LEFT JOIN agent_tasks t ON sc.taskId = t.id
12405
+ LEFT JOIN agent_tasks t INDEXED BY idx_agent_tasks_usage_cover ON t.id = sc.taskId
12510
12406
  ${where}
12511
- GROUP BY t.credentialKeyType, t.credentialKeySuffix`,
12407
+ GROUP BY ${CREDENTIAL_TYPE_SQL}, ${CREDENTIAL_SUFFIX_SQL}`,
12512
12408
  params,
12513
12409
  );
12514
12410
  }