@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.
- package/dist/acp-adapter-g909b5hw.js +16 -0
- package/dist/{acp-targets-swxq55dr.js → acp-targets-ny75x1qy.js} +7 -7
- package/dist/{actions-pb678g3e.js → actions-b9qgrmeq.js} +81 -21
- package/dist/{agent-fs-provision-dmhnc38q.js → agent-fs-provision-b5dhdsbd.js} +4 -4
- package/dist/{amp-adapter-3pa66q27.js → amp-adapter-vtax2c9s.js} +2 -2
- package/dist/{anthropic-messages-x2cp5fvf.js → anthropic-messages-r5xf5hqw.js} +10 -10
- package/dist/{app-17d12ev4.js → app-g2z15hax.js} +6 -3
- package/dist/{approval-notifications-h7vd9pmg.js → approval-notifications-yt13wp8r.js} +8 -5
- package/dist/{assistant-t7k39ree.js → assistant-2cgfxsgk.js} +23 -21
- package/dist/{boot-args-schema-0gqmkfbe.js → boot-args-schema-3gwy0f60.js} +1 -1
- package/dist/{boot-reembed-n6anc01d.js → boot-reembed-92g7s5zp.js} +1 -1
- package/dist/{boot-reembed-f064w382.js → boot-reembed-mywmyp4s.js} +1 -1
- package/dist/{boot-scrub-sweep-ejd5dnrz.js → boot-scrub-sweep-7dkdzqxx.js} +3 -3
- package/dist/{boot-seeds-f99fjs5q.js → boot-seeds-ce7rvgq1.js} +4 -4
- package/dist/{claude-adapter-gvznwxgc.js → claude-adapter-3m4q7735.js} +7 -7
- package/dist/{claude-managed-adapter-pbrbvc64.js → claude-managed-adapter-t8nfgcgz.js} +2 -2
- package/dist/{claude-managed-setup-kdxttvc3.js → claude-managed-setup-c217draw.js} +3 -3
- package/dist/{claude-sdk-session-0t2teq6n.js → claude-sdk-session-7fbqm51z.js} +7 -7
- package/dist/{cli-9a2rtd77.js → cli-1jykg0py.js} +6 -4
- package/dist/{cli-5ntc4we6.js → cli-2czxfnvj.js} +235 -2003
- package/dist/{cli-dd37e0cm.js → cli-2dq9yv8p.js} +1 -1
- package/dist/{cli-c07v0qfa.js → cli-2xs8tsf7.js} +69 -66
- package/dist/{cli-7fx9jyfs.js → cli-2yjj3e31.js} +64 -10
- package/dist/{cli-4ghh072d.js → cli-32djehja.js} +36 -36
- package/dist/{cli-cw7mc1je.js → cli-3j873zxq.js} +3 -3
- package/dist/cli-43ms35q9.js +270 -0
- package/dist/cli-47hz21se.js +25584 -0
- package/dist/{cli-n515ex5z.js → cli-4ymxrwg5.js} +16 -16
- package/dist/{cli-5gygrr67.js → cli-67mwzr35.js} +1 -1
- package/dist/{cli-5kcmxwxv.js → cli-6945ywhr.js} +1 -1
- package/dist/{cli-812paz57.js → cli-6ehs4mta.js} +18 -2
- package/dist/{cli-95930z69.js → cli-6ym4jhzp.js} +2 -2
- package/dist/{cli-zg3z63x3.js → cli-7mv4h3sn.js} +1 -1
- package/dist/{cli-eg437b5p.js → cli-7sf9sb0w.js} +2 -1
- package/dist/{cli-nr46j5pw.js → cli-8zh9nrew.js} +1 -1
- package/dist/{cli-wr1h0k28.js → cli-9w8712tq.js} +617 -278
- package/dist/{cli-ssvdrk4y.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-7831nhaw.js → cli-b91nz213.js} +3 -3
- package/dist/{cli-7cgf614g.js → cli-bg63qmsx.js} +2 -2
- package/dist/{cli-me4maa4j.js → cli-bkjdknnp.js} +9 -5
- package/dist/{cli-rts1qvb4.js → cli-bnqncekd.js} +2 -2
- package/dist/{cli-25nstr34.js → cli-br0924pw.js} +1 -1
- package/dist/{cli-ymct0ycy.js → cli-ctx0b85j.js} +5222 -4978
- package/dist/{cli-kqh27v2y.js → cli-dgs10ttj.js} +1 -1
- package/dist/{cli-kmvcm34h.js → cli-f3jyzq4g.js} +2 -2
- package/dist/cli-f8x9drqr.js +84 -0
- package/dist/{cli-8axx8vnw.js → cli-f9gz2vyj.js} +5 -5
- package/dist/{cli-vvgaz8t6.js → cli-fh97xn30.js} +2 -2
- package/dist/{cli-8x8y70av.js → cli-fkef327x.js} +2 -2
- package/dist/{cli-js8zrfyg.js → cli-gfy38pvt.js} +2 -2
- package/dist/{cli-kaa4bd7x.js → cli-h9yqfzx9.js} +7 -6
- package/dist/{cli-svc803vq.js → cli-j7svy295.js} +11 -11
- package/dist/{cli-nhq5js1b.js → cli-jaw5v1sy.js} +3 -3
- package/dist/{cli-w7dxb2fj.js → cli-jkw6ptfw.js} +6 -6
- package/dist/{cli-1tvdx9t5.js → cli-jm0hvmz2.js} +1 -1
- package/dist/{cli-e9973bf0.js → cli-jwampxxq.js} +2 -2
- package/dist/{cli-dx439zpg.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-pz1c00aa.js → cli-kxx4k2jw.js} +2 -2
- package/dist/{cli-aa8s22gn.js → cli-m7c2380k.js} +191 -182
- package/dist/{cli-2kg31ted.js → cli-m7zvgt57.js} +11 -11
- package/dist/{cli-57pvhnyt.js → cli-mhapr559.js} +1 -1
- package/dist/{cli-gddgcnav.js → cli-mjw0yf82.js} +1 -1
- package/dist/{cli-h474mvp5.js → cli-mkwkwq81.js} +7 -4
- package/dist/{cli-jd3kxppb.js → cli-mw620q3n.js} +1 -1
- package/dist/{cli-spzkdgtg.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-3zxdz9r7.js → cli-nafvvsp8.js} +3 -3
- package/dist/{cli-fnh4b12r.js → cli-nbt14he0.js} +6 -6
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-faf46gdq.js → cli-p4kckx1z.js} +10 -10
- package/dist/{cli-k7pt28ad.js → cli-pb2ay3sh.js} +2 -2
- package/dist/{cli-pn1v1pb0.js → cli-psffsanb.js} +3 -2
- package/dist/{cli-2tnbc3gw.js → cli-pyjn0qhk.js} +2257 -61
- package/dist/{cli-fgphc007.js → cli-rq5rpv6k.js} +1 -1
- package/dist/{cli-vw5x18yj.js → cli-sn650d7x.js} +9 -9
- package/dist/{cli-mc1fx4xd.js → cli-td9tb872.js} +10 -10
- package/dist/{cli-6dp0jkfj.js → cli-tvc4jag9.js} +3 -3
- package/dist/{cli-a9hfzg2r.js → cli-ty3gha1p.js} +6 -6
- package/dist/{cli-pwsax0vp.js → cli-v57d7fmm.js} +1 -1
- package/dist/{cli-nmcpzbty.js → cli-vt89089n.js} +4 -4
- package/dist/{cli-sn4pc4qx.js → cli-vyff45ve.js} +2 -2
- package/dist/{cli-m1fbz2wj.js → cli-w4n323t3.js} +175 -16
- package/dist/{cli-g3zzby8t.js → cli-wn13hhdt.js} +5 -5
- package/dist/{cli-q8cfh1t9.js → cli-xag7btpe.js} +1 -1
- package/dist/{cli-c5cspahx.js → cli-y2ewxhth.js} +38 -13
- package/dist/{cli-k09cxm6m.js → cli-ysvspf5e.js} +2 -2
- package/dist/{cli-eepnpee7.js → cli-zh0e5x7p.js} +4 -4
- package/dist/{cli-bk9v1xrv.js → cli-zr6qy15y.js} +11 -11
- package/dist/cli.js +21 -20
- package/dist/{codex-adapter-44yq2fkn.js → codex-adapter-n656pvb8.js} +6 -6
- package/dist/{codex-hook-h1zb7cfk.js → codex-hook-59atdwd8.js} +1 -1
- package/dist/{codex-login-cdyrr5y1.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-zbh26gbw.js → codex-session-runner-p0fbv5y9.js} +6 -6
- package/dist/{commands-54f02v5b.js → commands-gwea8z5p.js} +3 -3
- package/dist/{controller-9gpwcdek.js → controller-t67c3grh.js} +6 -3
- package/dist/{controllers-connect-61re6k1n.js → controllers-connect-ks155r0h.js} +22 -20
- package/dist/{cursor-adapter-7e4g81vd.js → cursor-adapter-ygwrtmkv.js} +1 -1
- package/dist/{db-dg2gc7fd.js → db-kpmx06s9.js} +8 -2
- package/dist/{db-wnh0qjy1.js → db-rb2xqdb1.js} +3 -3
- package/dist/{dispatcher-jrm24r43.js → dispatcher-31sm0ej2.js} +20 -18
- package/dist/{docker-9aq30pp2.js → docker-09tkkg0n.js} +42 -3
- package/dist/{dsh-adapter-1yqk267c.js → dsh-adapter-qyxh0w31.js} +1 -1
- package/dist/{easter-egg-3d-r4h9cs9m.js → easter-egg-3d-00wjscn6.js} +1 -1
- package/dist/{embedding-space-bafjr5f7.js → embedding-space-qhw4g68n.js} +6 -6
- package/dist/{embeddings-7xmgqe0e.js → embeddings-zdv9ke6x.js} +1 -1
- package/dist/{execute-d6jg5ns0.js → execute-zna8wwr7.js} +1 -1
- package/dist/{external-channel-frq1xvq2.js → external-channel-1ac6t56s.js} +2 -2
- package/dist/fx-adapter-sk7n0fzc.js +19 -0
- package/dist/{google-generative-ai-hh7strj3.js → google-generative-ai-maq6c9bf.js} +1 -1
- package/dist/{google-vertex-fy5bw2pm.js → google-vertex-2jgsw2nb.js} +1 -1
- package/dist/grok-adapter-sjbcm5ew.js +19 -0
- package/dist/handlers-yzy0c87x.js +35 -0
- package/dist/{heartbeat-6bpa611t.js → heartbeat-2f6z4kdx.js} +23 -21
- package/dist/{hook-w12k146y.js → hook-8y0gvtp1.js} +6 -6
- package/dist/{hook-hvm5nf46.js → hook-w1skzaqc.js} +5 -5
- package/dist/{http-43tthdvs.js → http-wghxvpef.js} +714 -145
- package/dist/{index-1f0vypbg.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-25pvya7q.js +40 -0
- package/dist/index-2t4859r5.js +35 -0
- package/dist/{index-4b1q8kan.js → index-4k7m5dgj.js} +629 -354
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-cret47a5.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-mhq4sh5w.js → index-8zn8nxn5.js} +1 -1
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-ftywhyr0.js → index-9zkchs9t.js} +221 -65
- package/dist/{index-bs7gw5fd.js → index-b5wgnm78.js} +44 -44
- package/dist/index-cxca2t8y.js +36 -0
- package/dist/{index-585gyczt.js → index-pe3d8jfy.js} +3 -3
- package/dist/{index-tx9mc2ap.js → index-rv89fvzf.js} +24 -22
- package/dist/{index-fn054vsf.js → index-s71ez27v.js} +1 -1
- package/dist/{keepalive-rk0j0jvh.js → keepalive-sh02349h.js} +3 -3
- package/dist/lead-gk4h5eg7.js +74 -0
- package/dist/{maintenance-g6z6kaxw.js → maintenance-yj0dcjja.js} +1 -1
- package/dist/{node-jftbyawr.js → node-dqm4xgxw.js} +1 -1
- package/dist/{oauth-refresh-sweep-2k3g2q4w.js → oauth-refresh-sweep-d9xedk66.js} +2 -2
- package/dist/{onboard-6fdbvh3v.js → onboard-dpgjn03r.js} +2 -2
- package/dist/{opencode-adapter-fdbsvts7.js → opencode-adapter-2d31cpjc.js} +6 -6
- package/dist/{otel-impl-rvwtc09q.js → otel-impl-1skarpfq.js} +1 -1
- package/dist/{pending-sqkrb836.js → pending-bfmxtx0g.js} +21 -19
- package/dist/{pi-mono-adapter-asqayqcg.js → pi-mono-adapter-gvppnasy.js} +40 -13
- package/dist/{pricing-refresh-f5tkgmw2.js → pricing-refresh-c6b325mk.js} +2 -2
- package/dist/{rbac-roles-06s555fa.js → rbac-roles-h80qbdbs.js} +3 -3
- package/dist/{rbac-roles-szxsg8t1.js → rbac-roles-zfcx68tx.js} +2 -2
- package/dist/{render-v2-103p266q.js → render-v2-nx20t3rb.js} +6 -3
- package/dist/{resume-v7kjewt9.js → resume-5ep8agan.js} +10 -7
- package/dist/{runtime-f1gmk0b7.js → runtime-r3pj4mce.js} +1 -1
- package/dist/{session-access-6shev8ts.js → session-access-n7p3m15b.js} +4 -4
- package/dist/{session-source-backfill-bd7spzjd.js → session-source-backfill-v8mt0zwn.js} +3 -3
- package/dist/{setup-kmxmztdb.js → setup-z1psaqhe.js} +1 -1
- package/dist/thread-buffer-a1re2r9r.js +38 -0
- package/dist/{virtual-modules-57eje5wy.js → virtual-modules-rrbjdpxn.js} +3 -3
- package/dist/{work-objects-zr47ygmf.js → work-objects-4aghh73z.js} +29 -23
- package/dist/worker-3dyyb8ev.js +74 -0
- package/dist/{worker-follow-up-grrr3fda.js → worker-follow-up-166zmex1.js} +20 -18
- package/openapi.json +1387 -13
- package/package.json +7 -6
- package/src/apps/catalog.generated.json +43 -3
- package/src/apps/page-validator.ts +27 -0
- package/src/be/db/model-profiles.ts +4 -1
- package/src/be/db/session-costs.ts +219 -0
- package/src/be/db/session-log-reasoning.ts +36 -0
- package/src/be/db/tasks/read.ts +7 -3
- package/src/be/db/tasks/write.ts +33 -1
- package/src/be/db.ts +200 -304
- package/src/be/key-window-usage.ts +385 -0
- package/src/be/migrations/303_task_ui_specs.sql +28 -0
- package/src/be/migrations/306_provider_account_telemetry.sql +1 -0
- package/src/be/migrations/307_session_cost_credential_attribution.sql +23 -0
- package/src/be/migrations/310_session_logs_reasoning.sql +12 -0
- package/src/be/runtime-pools/db.ts +3 -0
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -0
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -0
- package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/swarm-config-guard.ts +24 -1
- package/src/be/task-ui-spec.ts +158 -0
- package/src/commands/controller.ts +3 -0
- package/src/commands/credential-outcome-report.ts +13 -3
- package/src/commands/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +34 -53
- package/src/extensions/catalog.generated.json +3 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/http/api-keys.ts +258 -30
- package/src/http/session-data.ts +74 -23
- package/src/http/sessions.ts +6 -2
- package/src/http/tasks.ts +105 -5
- package/src/integrations/chat-sdk/relay.ts +87 -0
- package/src/jira/outbound.ts +5 -3
- package/src/linear/outbound.ts +5 -1
- package/src/prompts/base-prompt.ts +8 -0
- package/src/prompts/session-templates.ts +19 -2
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +27 -4
- package/src/providers/claude-flag-settings.ts +39 -1
- package/src/providers/codex-adapter.ts +85 -3
- package/src/providers/codex-app-server.ts +9 -5
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +32 -0
- package/src/providers/types.ts +11 -0
- package/src/runtime-providers/docker.ts +65 -1
- package/src/scheduler/deferred-task-waits.ts +18 -5
- package/src/scripts-runtime/types/swarm-extension.d.ts +8 -8
- package/src/slack/actions.ts +56 -0
- package/src/slack/app.ts +22 -15
- package/src/slack/inbound-files.ts +2 -0
- package/src/slack/render-v2.ts +107 -23
- package/src/slack/responses.ts +3 -2
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/errors.ts +5 -0
- package/src/tests/acp-adapter.test.ts +4 -6
- package/src/tests/api-key-tracking.test.ts +0 -72
- package/src/tests/api-keys-status-model-limits.test.ts +93 -1
- package/src/tests/api-keys-validation.test.ts +42 -0
- package/src/tests/approval-card-resolution.test.ts +7 -1
- package/src/tests/approval-requests-notifications.test.ts +11 -1
- package/src/tests/apps-catalog-page-frame.test.ts +49 -0
- package/src/tests/apps-session-thread.test.ts +79 -0
- package/src/tests/base-prompt.test.ts +111 -5
- package/src/tests/chat-sdk-relay.test.ts +149 -1
- package/src/tests/claude-adapter-binary.test.ts +67 -6
- package/src/tests/claude-flag-settings.test.ts +29 -0
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -0
- package/src/tests/codex-adapter.test.ts +340 -2
- package/src/tests/codex-app-server.test.ts +16 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -0
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +4 -0
- package/src/tests/deferred-task-wake.test.ts +63 -1
- package/src/tests/docker-isolation-config-guard.test.ts +29 -0
- package/src/tests/docs-index-footprint.test.js +11 -3
- package/src/tests/e2e-visuals-comment.test.ts +82 -0
- package/src/tests/e2e-visuals-verify-pr.test.ts +138 -0
- package/src/tests/extensions-example-sql-admin-only.test.ts +7 -4
- package/src/tests/fixtures/ui-spec-slack/deploys.json +121 -0
- package/src/tests/fixtures/ui-spec-slack/incident.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/three-charts-stale.json +196 -0
- package/src/tests/fixtures/ui-spec-slack/video-rejected-by-slack.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/video.json +446 -0
- package/src/tests/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/human-thread-routing.test.ts +187 -0
- package/src/tests/jira-outbound-sync.test.ts +33 -1
- package/src/tests/key-window-usage.test.ts +831 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -1
- package/src/tests/pi-mono-adapter.test.ts +79 -0
- package/src/tests/preload-env.test.ts +2 -0
- package/src/tests/preload.ts +3 -1
- package/src/tests/prompt-template-session.test.ts +4 -3
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/rate-limit-event.test.ts +22 -0
- package/src/tests/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -0
- package/src/tests/runtime-providers-docker.test.ts +91 -0
- package/src/tests/script-connections.test.ts +5 -0
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- package/src/tests/seed-scripts.test.ts +23 -0
- package/src/tests/session-cost-attribution.test.ts +748 -0
- package/src/tests/session-costs.test.ts +14 -15
- package/src/tests/session-logs.test.ts +83 -0
- package/src/tests/sessions-detail-batch.test.ts +7 -0
- package/src/tests/slack-render-v2.test.ts +357 -0
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- package/src/tests/subscription-plans.test.ts +20 -1
- package/src/tests/task-ui-action-route.test.ts +191 -0
- package/src/tests/task-ui-actions.test.ts +195 -0
- package/src/tests/task-ui-spec-fallback.test.ts +65 -0
- package/src/tests/task-ui-spec.test.ts +368 -0
- package/src/tests/workflow-agent-task-retry.test.ts +34 -1
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/store-progress.ts +69 -3
- package/src/types.ts +7 -2
- package/src/ui-spec/actions.ts +86 -0
- package/src/ui-spec/fallback.ts +19 -0
- package/src/ui-spec/slack.ts +17 -0
- package/src/ui-spec/validate.ts +169 -0
- package/src/utils/codex-rate-limits.ts +159 -0
- package/src/utils/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- package/src/utils/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-ui-spec.ts +67 -0
- package/src/workflows/task-step-routing.ts +8 -3
- package/templates/extensions/sql-admin-only/README.md +2 -1
- package/templates/extensions/sql-admin-only/hooks.ts +7 -3
- package/templates/extensions/sql-admin-only/manifest.json +1 -1
- package/templates/skills/apps/SKILL.md +32 -5
- package/templates/skills/apps/content.md +32 -5
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +127 -0
- package/dist/acp-adapter-jqn86aam.js +0 -16
- package/dist/cli-srtkr1h2.js +0 -12078
- package/dist/fx-adapter-0zrkfbkd.js +0 -19
- package/dist/grok-adapter-3db1c538.js +0 -19
- package/dist/handlers-k22n8mnn.js +0 -33
- package/dist/index-8xcyd3mc.js +0 -33
- package/dist/index-9sy2bh6n.js +0 -38
- package/dist/index-b24j7t2m.js +0 -12797
- package/dist/index-wjd56k1v.js +0 -34
- package/dist/lead-atxf3q6e.js +0 -72
- package/dist/thread-buffer-4yz236d0.js +0 -36
- package/dist/worker-p4hbtcy3.js +0 -72
- package/dist/{cli-j49yqpvh.js → cli-7evph51z.js} +3 -3
package/src/http/api-keys.ts
CHANGED
|
@@ -14,17 +14,43 @@ import {
|
|
|
14
14
|
setApiKeyName,
|
|
15
15
|
setApiKeyPlan,
|
|
16
16
|
} from "../be/db";
|
|
17
|
+
import {
|
|
18
|
+
aggregateKeyWindowUsage,
|
|
19
|
+
currentKeyWindows,
|
|
20
|
+
KeyWindowUsageLimitError,
|
|
21
|
+
keyWindowUsageSchema,
|
|
22
|
+
} from "../be/key-window-usage";
|
|
17
23
|
import { MAX_RATE_LIMIT_RESET_MS, type RateLimitWindowTelemetry } from "../utils/error-tracker";
|
|
18
|
-
import {
|
|
24
|
+
import {
|
|
25
|
+
activeModelBlocks,
|
|
26
|
+
isModelScopedWindow,
|
|
27
|
+
MODEL_SCOPED_WINDOWS,
|
|
28
|
+
} from "../utils/model-rate-limit-windows";
|
|
29
|
+
import {
|
|
30
|
+
MAX_PROVIDER_QUOTA_ENTRIES,
|
|
31
|
+
ProviderQuotaCapacityError,
|
|
32
|
+
type ProviderQuotaReport,
|
|
33
|
+
providerAccountTelemetrySchema,
|
|
34
|
+
rateLimitReplacementSchema,
|
|
35
|
+
windowFieldObservedAtSchema,
|
|
36
|
+
} from "../utils/provider-account-telemetry";
|
|
19
37
|
import {
|
|
20
38
|
isSubscriptionPlanId,
|
|
21
39
|
SUBSCRIPTION_PLANS,
|
|
22
40
|
SUBSCRIPTION_PLANS_CHECKED_AT,
|
|
23
41
|
} from "../utils/subscription-plans";
|
|
42
|
+
import { createIpRateLimiter } from "./ip-rate-limit";
|
|
24
43
|
import { bodyTask, route } from "./route-def";
|
|
25
|
-
import { clearUsageCache } from "./usage-cache";
|
|
44
|
+
import { cachedUsageReport, clearUsageCache } from "./usage-cache";
|
|
26
45
|
import { jsonError } from "./utils";
|
|
27
46
|
|
|
47
|
+
// One process-wide budget for cache misses. Filters, callers, and reports cannot reset it.
|
|
48
|
+
const windowUsageQueryRateLimit = createIpRateLimiter({ capacity: 8, refillPerMs: 1 / 1000 });
|
|
49
|
+
|
|
50
|
+
export function _resetKeyWindowUsageRateLimitForTests(): void {
|
|
51
|
+
windowUsageQueryRateLimit.reset();
|
|
52
|
+
}
|
|
53
|
+
|
|
28
54
|
// ─── Route Definitions ───────────────────────────────────────────────────────
|
|
29
55
|
|
|
30
56
|
/** Wire shape sent by every `report-*` acknowledgement route. */
|
|
@@ -49,6 +75,7 @@ const reportUsage = route({
|
|
|
49
75
|
scopeId: z.string().optional(),
|
|
50
76
|
/** Plan id the worker detected on the credential (`SUBSCRIPTION_PLANS`). Unknown ids are ignored. */
|
|
51
77
|
plan: z.string().max(40).optional(),
|
|
78
|
+
planRaw: z.string().min(1).max(80).optional(),
|
|
52
79
|
}),
|
|
53
80
|
responses: {
|
|
54
81
|
200: { description: "Usage recorded", schema: successMessageSchema },
|
|
@@ -148,58 +175,150 @@ const reportAuthFailure = route({
|
|
|
148
175
|
});
|
|
149
176
|
|
|
150
177
|
export const rateLimitWindowSchema = z.object({
|
|
151
|
-
status: z.string(),
|
|
178
|
+
status: z.string().max(256),
|
|
152
179
|
utilization: z.number().optional(),
|
|
153
180
|
// .finite() rejects NaN/Infinity at the report boundary; sanitizeReportedWindowResets
|
|
154
181
|
// below still has to guard a finite-but-out-of-range or implausibly far-future value.
|
|
155
182
|
resetsAt: z.number().finite().optional(),
|
|
183
|
+
fieldObservedAt: windowFieldObservedAtSchema.optional(),
|
|
184
|
+
durationMins: z.number().int().positive().max(576000).optional(),
|
|
185
|
+
source: z.enum(["claude", "codex"]).optional(),
|
|
186
|
+
limitId: z.string().min(1).max(128).optional(),
|
|
187
|
+
label: z.string().max(256).optional(),
|
|
188
|
+
normalModelSlug: z.string().max(256).optional(),
|
|
189
|
+
overageStatus: z.string().max(256).optional(),
|
|
190
|
+
overageDisabledReason: z.string().max(256).optional(),
|
|
156
191
|
isUsingOverage: z.boolean().optional(),
|
|
157
192
|
surpassedThreshold: z.number().optional(),
|
|
158
193
|
lastSeenAt: z.string().datetime(),
|
|
159
194
|
});
|
|
160
195
|
|
|
161
196
|
/**
|
|
162
|
-
*
|
|
163
|
-
*
|
|
164
|
-
*
|
|
165
|
-
*
|
|
166
|
-
*
|
|
167
|
-
* downstream in `computeModelLimits`, and a representable but implausible
|
|
168
|
-
* value (far-future, or negative/past — a freshly reported window can't
|
|
169
|
-
* reset in the past) that would otherwise read as bogus. NaN/Infinity are
|
|
170
|
-
* already rejected upstream by the route's `.finite()` schema. Applied
|
|
171
|
-
* before storage, so `computeModelLimits` never sees an out-of-range value
|
|
172
|
-
* from data reported through this endpoint.
|
|
197
|
+
* A finite reset can still exceed Date's range and crash status rendering.
|
|
198
|
+
* Model blocks retain the fixed routing ceiling regardless of reported duration.
|
|
199
|
+
* Display-only windows can be monthly and allow one day of provider clock skew.
|
|
200
|
+
* Never extend an expired reset into a new quota period.
|
|
201
|
+
* Sparse updates do not establish a new period.
|
|
173
202
|
*/
|
|
203
|
+
export const MAX_DISPLAY_RESET_MS = 400 * 86400000;
|
|
174
204
|
export function sanitizeReportedWindowResets(
|
|
175
205
|
windows: RateLimitWindowTelemetry,
|
|
176
206
|
): RateLimitWindowTelemetry {
|
|
177
|
-
const
|
|
178
|
-
const
|
|
207
|
+
const nowMs = Date.now();
|
|
208
|
+
const nowSec = Math.floor(nowMs / 1000);
|
|
209
|
+
|
|
179
210
|
const sanitized: RateLimitWindowTelemetry = {};
|
|
180
211
|
for (const [key, window] of Object.entries(windows)) {
|
|
212
|
+
const duration =
|
|
213
|
+
window.durationMins ??
|
|
214
|
+
(key === "five_hour" ? 300 : key.startsWith("seven_day") ? 10080 : undefined);
|
|
215
|
+
const horizonMs = isModelScopedWindow(key)
|
|
216
|
+
? MAX_RATE_LIMIT_RESET_MS
|
|
217
|
+
: duration === undefined
|
|
218
|
+
? MAX_DISPLAY_RESET_MS
|
|
219
|
+
: Math.min(
|
|
220
|
+
MAX_DISPLAY_RESET_MS,
|
|
221
|
+
Math.max(MAX_RATE_LIMIT_RESET_MS, duration * 60000 + 86400000),
|
|
222
|
+
);
|
|
223
|
+
const maxResetsAtSec = Math.floor((nowMs + horizonMs) / 1000);
|
|
181
224
|
sanitized[key] =
|
|
182
225
|
window.resetsAt === undefined
|
|
183
226
|
? window
|
|
184
|
-
: {
|
|
227
|
+
: {
|
|
228
|
+
...window,
|
|
229
|
+
resetsAt: Math.min(
|
|
230
|
+
window.resetsAt < nowSec - MAX_DISPLAY_RESET_MS / 1000 ? nowSec : window.resetsAt,
|
|
231
|
+
maxResetsAtSec,
|
|
232
|
+
),
|
|
233
|
+
};
|
|
185
234
|
}
|
|
186
235
|
return sanitized;
|
|
187
236
|
}
|
|
188
237
|
|
|
238
|
+
/** Future clocks can otherwise prevent every subsequent report from taking effect. */
|
|
239
|
+
export function sanitizeReportedQuotaObservations(
|
|
240
|
+
report: ProviderQuotaReport,
|
|
241
|
+
nowMs = Date.now(),
|
|
242
|
+
): ProviderQuotaReport {
|
|
243
|
+
const bound = (at: string) =>
|
|
244
|
+
Date.parse(at) > nowMs + 60000 ? new Date(nowMs).toISOString() : at;
|
|
245
|
+
const times = <K extends string>(
|
|
246
|
+
values: Partial<Record<K, string>> | undefined,
|
|
247
|
+
): Partial<Record<K, string>> | undefined =>
|
|
248
|
+
values &&
|
|
249
|
+
(Object.fromEntries(Object.entries(values).map(([key, at]) => [key, bound(at as string)])) as
|
|
250
|
+
| Partial<Record<K, string>>
|
|
251
|
+
| undefined);
|
|
252
|
+
return {
|
|
253
|
+
windows: Object.fromEntries(
|
|
254
|
+
Object.entries(report.windows).map(([key, window]) => [
|
|
255
|
+
key,
|
|
256
|
+
{
|
|
257
|
+
...window,
|
|
258
|
+
lastSeenAt: bound(window.lastSeenAt),
|
|
259
|
+
...(window.fieldObservedAt ? { fieldObservedAt: times(window.fieldObservedAt) } : {}),
|
|
260
|
+
},
|
|
261
|
+
]),
|
|
262
|
+
),
|
|
263
|
+
account: report.account && {
|
|
264
|
+
...report.account,
|
|
265
|
+
observedAt: bound(report.account.observedAt),
|
|
266
|
+
...(report.account.fieldObservedAt
|
|
267
|
+
? { fieldObservedAt: times(report.account.fieldObservedAt) }
|
|
268
|
+
: {}),
|
|
269
|
+
...(report.account.limits
|
|
270
|
+
? {
|
|
271
|
+
limits: Object.fromEntries(
|
|
272
|
+
Object.entries(report.account.limits).map(([id, limit]) => [
|
|
273
|
+
id,
|
|
274
|
+
{
|
|
275
|
+
...limit,
|
|
276
|
+
observedAt: bound(limit.observedAt),
|
|
277
|
+
...(limit.fieldObservedAt
|
|
278
|
+
? { fieldObservedAt: times(limit.fieldObservedAt) }
|
|
279
|
+
: {}),
|
|
280
|
+
...(limit.windowRemovedAt
|
|
281
|
+
? { windowRemovedAt: times(limit.windowRemovedAt) }
|
|
282
|
+
: {}),
|
|
283
|
+
},
|
|
284
|
+
]),
|
|
285
|
+
),
|
|
286
|
+
}
|
|
287
|
+
: {}),
|
|
288
|
+
},
|
|
289
|
+
replace: report.replace?.map((replacement) => ({
|
|
290
|
+
...replacement,
|
|
291
|
+
observedAt: bound(replacement.observedAt),
|
|
292
|
+
})),
|
|
293
|
+
};
|
|
294
|
+
}
|
|
295
|
+
|
|
189
296
|
const reportRateLimitWindows = route({
|
|
190
297
|
method: "post",
|
|
191
298
|
path: "/api/keys/report-rate-limit-windows",
|
|
192
299
|
pattern: ["api", "keys", "report-rate-limit-windows"],
|
|
193
300
|
summary: "Record provider-emitted rate-limit window telemetry for an API key",
|
|
301
|
+
description:
|
|
302
|
+
"Reports accept up to 64 windows and 64 account limits within 256 KiB. Stored records have the same count limits.",
|
|
194
303
|
tags: ["API Keys"],
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
304
|
+
maxBodyBytes: 256 * 1024,
|
|
305
|
+
body: z
|
|
306
|
+
.object({
|
|
307
|
+
keyType: z.string(),
|
|
308
|
+
keySuffix: z.string().min(1).max(10),
|
|
309
|
+
keyIndex: z.number().int().min(0),
|
|
310
|
+
windows: z.record(z.string().max(256), rateLimitWindowSchema),
|
|
311
|
+
account: providerAccountTelemetrySchema.optional(),
|
|
312
|
+
replace: z.array(rateLimitReplacementSchema).max(128).optional(),
|
|
313
|
+
scope: z.string().optional(),
|
|
314
|
+
scopeId: z.string().optional(),
|
|
315
|
+
})
|
|
316
|
+
.refine(
|
|
317
|
+
(report) =>
|
|
318
|
+
Object.keys(report.windows).length <= MAX_PROVIDER_QUOTA_ENTRIES &&
|
|
319
|
+
Object.keys(report.account?.limits ?? {}).length <= MAX_PROVIDER_QUOTA_ENTRIES,
|
|
320
|
+
"Reports support at most 64 windows and 64 account limits.",
|
|
321
|
+
),
|
|
203
322
|
responses: {
|
|
204
323
|
200: {
|
|
205
324
|
description: "Rate-limit window telemetry recorded",
|
|
@@ -207,8 +326,12 @@ const reportRateLimitWindows = route({
|
|
|
207
326
|
},
|
|
208
327
|
400: { description: "Validation error" },
|
|
209
328
|
401: { description: "Unauthorized" },
|
|
329
|
+
413: { description: "Telemetry report exceeds 256 KiB" },
|
|
210
330
|
},
|
|
211
331
|
auth: { apiKey: true },
|
|
332
|
+
rbac: {
|
|
333
|
+
ungated: "worker credential telemetry, same posture as POST /api/keys/report-rate-limit",
|
|
334
|
+
},
|
|
212
335
|
});
|
|
213
336
|
|
|
214
337
|
const reportSeatMismatch = route({
|
|
@@ -312,9 +435,11 @@ const ApiKeyStatusSchema = z.object({
|
|
|
312
435
|
provider: z.string(),
|
|
313
436
|
/** Latest provider-emitted rate-limit window snapshots, keyed by window type. */
|
|
314
437
|
rateLimitWindows: z.record(z.string(), rateLimitWindowSchema),
|
|
438
|
+
providerAccount: providerAccountTelemetrySchema.nullable(),
|
|
315
439
|
/** Subscription plan id (see `GET /api/keys/plans`), when known. */
|
|
316
440
|
plan: z.string().nullable(),
|
|
317
441
|
planSource: z.enum(["manual", "detected", "estimated"]).nullable(),
|
|
442
|
+
detectedPlanRaw: z.string().nullable(),
|
|
318
443
|
/** When the CLI last rejected a model with `credits_required` on this key. */
|
|
319
444
|
lastSeatMismatchAt: z.string().nullable(),
|
|
320
445
|
/** Model family of that rejection (`fable`, `opus`, ...). */
|
|
@@ -398,6 +523,38 @@ const listStatuses = route({
|
|
|
398
523
|
auth: { apiKey: true },
|
|
399
524
|
});
|
|
400
525
|
|
|
526
|
+
const getWindowUsage = route({
|
|
527
|
+
method: "get",
|
|
528
|
+
path: "/api/keys/window-usage",
|
|
529
|
+
pattern: ["api", "keys", "window-usage"],
|
|
530
|
+
summary: "Get Swarm-observed usage within current provider windows",
|
|
531
|
+
description:
|
|
532
|
+
"Usage calculations support 256 windows, 16 distinct windows per credential, 90 days, and 100,000 session rows. Oversized requests fail without partial totals.",
|
|
533
|
+
tags: ["API Keys"],
|
|
534
|
+
query: z.object({
|
|
535
|
+
keyType: z.string().max(128).optional(),
|
|
536
|
+
keySuffix: z.string().min(1).max(10).optional(),
|
|
537
|
+
scope: z.string().max(64).optional(),
|
|
538
|
+
scopeId: z.string().max(128).optional(),
|
|
539
|
+
}),
|
|
540
|
+
responses: {
|
|
541
|
+
200: {
|
|
542
|
+
description: "Independent windows with receipt-time tokens and explicit measurement coverage",
|
|
543
|
+
schema: z.object({
|
|
544
|
+
success: z.literal(true),
|
|
545
|
+
asOf: z.string(),
|
|
546
|
+
accounting: z.literal("session_cost_receipt_time"),
|
|
547
|
+
windows: z.array(keyWindowUsageSchema),
|
|
548
|
+
}),
|
|
549
|
+
},
|
|
550
|
+
400: { description: "Invalid filters" },
|
|
551
|
+
401: { description: "Unauthorized" },
|
|
552
|
+
422: { description: "Requested usage exceeds the aggregation bounds" },
|
|
553
|
+
429: { description: "Usage query budget exhausted. Retry after one second" },
|
|
554
|
+
},
|
|
555
|
+
auth: { apiKey: true },
|
|
556
|
+
});
|
|
557
|
+
|
|
401
558
|
/** Mirrors `KeyCostSummary` in `src/be/db.ts`. */
|
|
402
559
|
const KeyCostSummarySchema = z.object({
|
|
403
560
|
keyType: z.string(),
|
|
@@ -562,7 +719,7 @@ export async function handleApiKeys(
|
|
|
562
719
|
const parsed = await reportUsage.parse(req, res, pathSegments, queryParams);
|
|
563
720
|
if (!parsed) return true;
|
|
564
721
|
|
|
565
|
-
const { keyType, keySuffix, keyIndex, taskId, scope, scopeId, plan } = parsed.body;
|
|
722
|
+
const { keyType, keySuffix, keyIndex, taskId, scope, scopeId, plan, planRaw } = parsed.body;
|
|
566
723
|
try {
|
|
567
724
|
const { planChanged } = await recordKeyUsage(
|
|
568
725
|
keyType,
|
|
@@ -572,6 +729,7 @@ export async function handleApiKeys(
|
|
|
572
729
|
scope,
|
|
573
730
|
scopeId ?? null,
|
|
574
731
|
plan && isSubscriptionPlanId(plan) ? plan : null,
|
|
732
|
+
planRaw,
|
|
575
733
|
);
|
|
576
734
|
if (planChanged) clearUsageCache();
|
|
577
735
|
reportUsage.respond(res, 200, { success: true, message: "Key usage recorded" });
|
|
@@ -648,17 +806,27 @@ export async function handleApiKeys(
|
|
|
648
806
|
const parsed = await reportRateLimitWindows.parse(req, res, pathSegments, queryParams);
|
|
649
807
|
if (!parsed) return true;
|
|
650
808
|
|
|
651
|
-
const { keyType, keySuffix, keyIndex,
|
|
809
|
+
const { keyType, keySuffix, keyIndex, scope, scopeId } = parsed.body;
|
|
810
|
+
const { windows, account, replace } = sanitizeReportedQuotaObservations(parsed.body);
|
|
652
811
|
try {
|
|
653
|
-
|
|
812
|
+
// Spend strings retain provider units. Validate their reset independently of routing.
|
|
813
|
+
for (const limit of Object.values(account?.limits ?? {})) {
|
|
814
|
+
if (limit.spend)
|
|
815
|
+
limit.spend.resetsAt = Math.min(
|
|
816
|
+
limit.spend.resetsAt,
|
|
817
|
+
Math.floor(Date.now() / 1000) + 400 * 86400,
|
|
818
|
+
);
|
|
819
|
+
}
|
|
820
|
+
await recordKeyRateLimitWindows(
|
|
654
821
|
keyType,
|
|
655
822
|
keySuffix,
|
|
656
823
|
keyIndex,
|
|
657
824
|
sanitizeReportedWindowResets(windows),
|
|
658
825
|
scope,
|
|
659
826
|
scopeId ?? null,
|
|
827
|
+
account ?? undefined,
|
|
828
|
+
replace,
|
|
660
829
|
);
|
|
661
|
-
if (planChanged) clearUsageCache();
|
|
662
830
|
reportRateLimitWindows.respond(res, 200, {
|
|
663
831
|
success: true,
|
|
664
832
|
message: `Rate-limit windows recorded for ...${keySuffix}`,
|
|
@@ -667,7 +835,7 @@ export async function handleApiKeys(
|
|
|
667
835
|
jsonError(
|
|
668
836
|
res,
|
|
669
837
|
err instanceof Error ? err.message : "Failed to record rate-limit windows",
|
|
670
|
-
500,
|
|
838
|
+
err instanceof ProviderQuotaCapacityError ? 400 : 500,
|
|
671
839
|
);
|
|
672
840
|
}
|
|
673
841
|
return true;
|
|
@@ -734,6 +902,66 @@ export async function handleApiKeys(
|
|
|
734
902
|
return true;
|
|
735
903
|
}
|
|
736
904
|
|
|
905
|
+
// GET /api/keys/window-usage
|
|
906
|
+
if (getWindowUsage.match(req.method, pathSegments)) {
|
|
907
|
+
const parsed = await getWindowUsage.parse(req, res, pathSegments, queryParams);
|
|
908
|
+
if (!parsed) return true;
|
|
909
|
+
const { keyType, keySuffix, scope, scopeId } = parsed.query;
|
|
910
|
+
try {
|
|
911
|
+
const statuses = await getKeyStatuses(keyType, scope, scope ? (scopeId ?? null) : undefined);
|
|
912
|
+
const sampledAt = Date.now();
|
|
913
|
+
const windows = currentKeyWindows(
|
|
914
|
+
statuses.filter((key) => keySuffix === undefined || key.keySuffix === keySuffix),
|
|
915
|
+
sampledAt,
|
|
916
|
+
);
|
|
917
|
+
// Visibility matches /keys/status for every authenticated caller.
|
|
918
|
+
const bounds = windows.map((w) => [
|
|
919
|
+
w.statusId,
|
|
920
|
+
w.windowKey,
|
|
921
|
+
w.startsAt,
|
|
922
|
+
w.endsAt,
|
|
923
|
+
w.modelScope,
|
|
924
|
+
w.unavailableReason,
|
|
925
|
+
]);
|
|
926
|
+
const cached = await cachedUsageReport(
|
|
927
|
+
`key-windows:${JSON.stringify([parsed.query, bounds])}`,
|
|
928
|
+
() => {
|
|
929
|
+
if (!windowUsageQueryRateLimit.take("window-usage")) {
|
|
930
|
+
throw new KeyWindowUsageLimitError(
|
|
931
|
+
"Window usage is busy. Retry after one second.",
|
|
932
|
+
429,
|
|
933
|
+
);
|
|
934
|
+
}
|
|
935
|
+
return aggregateKeyWindowUsage(windows, new Date(sampledAt).toISOString());
|
|
936
|
+
},
|
|
937
|
+
);
|
|
938
|
+
const nowMs = Date.now();
|
|
939
|
+
const byWindow = new Map(
|
|
940
|
+
cached.map((item) => [JSON.stringify([item.statusId, item.windowKey]), item]),
|
|
941
|
+
);
|
|
942
|
+
getWindowUsage.respond(res, 200, {
|
|
943
|
+
success: true,
|
|
944
|
+
asOf: new Date(nowMs).toISOString(),
|
|
945
|
+
accounting: "session_cost_receipt_time",
|
|
946
|
+
windows: windows
|
|
947
|
+
.filter((w) => w.endsAt === null || Date.parse(w.endsAt) > nowMs)
|
|
948
|
+
.map((window) => {
|
|
949
|
+
const aggregate = byWindow.get(JSON.stringify([window.statusId, window.windowKey]));
|
|
950
|
+
return {
|
|
951
|
+
...window,
|
|
952
|
+
observationAgeMs: Math.max(0, nowMs - Date.parse(window.observedAt)),
|
|
953
|
+
...(aggregate ? { dataThrough: aggregate.dataThrough, usage: aggregate.usage } : {}),
|
|
954
|
+
};
|
|
955
|
+
}),
|
|
956
|
+
});
|
|
957
|
+
} catch (err) {
|
|
958
|
+
const status = err instanceof KeyWindowUsageLimitError ? err.status : 500;
|
|
959
|
+
if (status === 429) res.setHeader("Retry-After", "1");
|
|
960
|
+
jsonError(res, err instanceof Error ? err.message : "Failed to get window usage", status);
|
|
961
|
+
}
|
|
962
|
+
return true;
|
|
963
|
+
}
|
|
964
|
+
|
|
737
965
|
// GET /api/keys/costs
|
|
738
966
|
if (getCosts.match(req.method, pathSegments)) {
|
|
739
967
|
const parsed = await getCosts.parse(req, res, pathSegments, queryParams);
|
package/src/http/session-data.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import {
|
|
4
|
-
createSessionCost,
|
|
5
4
|
createSessionLogs,
|
|
6
5
|
getActivePricingRow,
|
|
7
6
|
getAllSessionCosts,
|
|
@@ -13,17 +12,23 @@ import {
|
|
|
13
12
|
getSessionCostsFiltered,
|
|
14
13
|
getSessionLogsByTaskId,
|
|
15
14
|
getTaskById,
|
|
15
|
+
insertSessionCost,
|
|
16
16
|
refreshActiveSessionOnActivity,
|
|
17
|
+
SessionCostConflictError,
|
|
17
18
|
} from "../be/db";
|
|
19
|
+
import { isScriptRunToken } from "../be/users";
|
|
18
20
|
import { recordSessionCost } from "../otel";
|
|
19
21
|
import { incrementServerSessionsProcessed } from "../server-runtime-counters";
|
|
20
22
|
import type { SessionCost } from "../types";
|
|
21
23
|
import {
|
|
22
24
|
PricingProviderSchema,
|
|
25
|
+
ProviderNameSchema,
|
|
23
26
|
SessionCostModelBreakdownSchema,
|
|
24
27
|
SessionCostSchema,
|
|
25
28
|
SessionLogSchema,
|
|
26
29
|
} from "../types";
|
|
30
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
31
|
+
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
27
32
|
import { bodyTask, route } from "./route-def";
|
|
28
33
|
import { canReadSession, SESSION_READ_DENIED } from "./session-access";
|
|
29
34
|
import { recomputeSessionCost } from "./session-cost-recompute";
|
|
@@ -47,6 +52,8 @@ const SessionCostSummaryTotalsSchema = z.object({
|
|
|
47
52
|
excludedCostUsd: z.number(),
|
|
48
53
|
excludedTaskCount: z.number().int(),
|
|
49
54
|
subscriptionCostUsd: z.number(),
|
|
55
|
+
credentialUnattributedCostUsd: z.number(),
|
|
56
|
+
credentialUnattributedSessions: z.number().int(),
|
|
50
57
|
});
|
|
51
58
|
|
|
52
59
|
/** Mirrors `SessionCostDailyRow` in src/be/db.ts. */
|
|
@@ -57,6 +64,8 @@ const SessionCostDailyRowSchema = z.object({
|
|
|
57
64
|
outputTokens: z.number().int(),
|
|
58
65
|
sessions: z.number().int(),
|
|
59
66
|
subscriptionCostUsd: z.number(),
|
|
67
|
+
credentialUnattributedCostUsd: z.number(),
|
|
68
|
+
credentialUnattributedSessions: z.number().int(),
|
|
60
69
|
});
|
|
61
70
|
|
|
62
71
|
/** Mirrors `SessionCostByAgentRow` in src/be/db.ts. */
|
|
@@ -182,6 +191,13 @@ const createSessionCostRoute = route({
|
|
|
182
191
|
id: z.string().uuid().optional(),
|
|
183
192
|
sessionId: z.string().min(1),
|
|
184
193
|
agentId: z.string().min(1),
|
|
194
|
+
credentialKeyType: z
|
|
195
|
+
.string()
|
|
196
|
+
.regex(/^[A-Z][A-Z0-9_]{0,79}$/)
|
|
197
|
+
.nullable()
|
|
198
|
+
.optional(),
|
|
199
|
+
credentialKeySuffix: z.string().min(1).max(10).nullable().optional(),
|
|
200
|
+
harness: ProviderNameSchema.nullable().optional(),
|
|
185
201
|
totalCostUsd: z.number(),
|
|
186
202
|
// The adapter's totalCostUsd is the provider's bill (e.g. OpenRouter's
|
|
187
203
|
// `usage.cost`), so it wins over the pricing table.
|
|
@@ -191,7 +207,7 @@ const createSessionCostRoute = route({
|
|
|
191
207
|
// token counts must be rejected at the wire instead of pricing below $0.
|
|
192
208
|
inputTokens: z.number().int().nonnegative().optional(),
|
|
193
209
|
outputTokens: z.number().int().nonnegative().optional(),
|
|
194
|
-
cacheReadTokens: z.number().int().nonnegative().optional(),
|
|
210
|
+
cacheReadTokens: z.number().int().nonnegative().nullable().optional(),
|
|
195
211
|
// Migration 063: nullable — adapters that can't honestly report cache writes
|
|
196
212
|
// (e.g. Codex SDK) prefer null over a faked 0.
|
|
197
213
|
cacheWriteTokens: z.number().int().nonnegative().nullable().optional(),
|
|
@@ -234,6 +250,8 @@ const createSessionCostRoute = route({
|
|
|
234
250
|
schema: z.object({ success: z.literal(true), cost: SessionCostSchema }),
|
|
235
251
|
},
|
|
236
252
|
400: { description: "Validation error" },
|
|
253
|
+
403: { description: "Untrusted session attribution" },
|
|
254
|
+
409: { description: "Session identity conflict" },
|
|
237
255
|
},
|
|
238
256
|
});
|
|
239
257
|
|
|
@@ -370,6 +388,30 @@ export async function handleSessionData(
|
|
|
370
388
|
const parsed = await createSessionCostRoute.parse(req, res, pathSegments, queryParams);
|
|
371
389
|
if (!parsed) return true;
|
|
372
390
|
|
|
391
|
+
const auth = getRequestAuth(req);
|
|
392
|
+
const trustedWorker =
|
|
393
|
+
!auth?.page &&
|
|
394
|
+
(auth?.kind === "operator" ||
|
|
395
|
+
(auth?.kind === "agent" &&
|
|
396
|
+
(auth.tokenKind === "runtime" ||
|
|
397
|
+
(auth.tokenKind === "agent" && !(await isScriptRunToken(auth.tokenId)))) &&
|
|
398
|
+
auth.agentId === parsed.body.agentId));
|
|
399
|
+
const hasAttribution =
|
|
400
|
+
parsed.body.credentialKeyType != null ||
|
|
401
|
+
parsed.body.credentialKeySuffix != null ||
|
|
402
|
+
parsed.body.harness != null;
|
|
403
|
+
if (hasAttribution && !trustedWorker) {
|
|
404
|
+
jsonError(res, "Session attribution requires a worker or operator credential.", 403);
|
|
405
|
+
return true;
|
|
406
|
+
}
|
|
407
|
+
if (auth?.kind === "agent" && auth.agentId !== parsed.body.agentId) {
|
|
408
|
+
jsonError(res, "Session cost agent does not match the authenticated agent.", 403);
|
|
409
|
+
return true;
|
|
410
|
+
}
|
|
411
|
+
if ((parsed.body.credentialKeyType != null) !== (parsed.body.credentialKeySuffix != null)) {
|
|
412
|
+
jsonError(res, "Session credential type and suffix must be supplied together.", 400);
|
|
413
|
+
return true;
|
|
414
|
+
}
|
|
373
415
|
try {
|
|
374
416
|
const inputTokens = parsed.body.inputTokens ?? 0;
|
|
375
417
|
const cachedInputTokens = parsed.body.cacheReadTokens ?? 0;
|
|
@@ -393,10 +435,10 @@ export async function handleSessionData(
|
|
|
393
435
|
: outputTokens;
|
|
394
436
|
const rowCacheReadTokens = bodyModels
|
|
395
437
|
? bodyModels.reduce((sum, m) => sum + m.cacheReadTokens, 0)
|
|
396
|
-
:
|
|
438
|
+
: (parsed.body.cacheReadTokens ?? null);
|
|
397
439
|
const rowCacheWriteTokens = bodyModels
|
|
398
440
|
? bodyModels.reduce((sum, m) => sum + m.cacheWriteTokens, 0)
|
|
399
|
-
: (parsed.body.cacheWriteTokens ??
|
|
441
|
+
: (parsed.body.cacheWriteTokens ?? null);
|
|
400
442
|
|
|
401
443
|
// Keep the adapter's report even when the pricing-table branch replaces
|
|
402
444
|
// totalCostUsd with the server's canonical recomputation. Harnesses that
|
|
@@ -425,7 +467,10 @@ export async function handleSessionData(
|
|
|
425
467
|
);
|
|
426
468
|
const { totalCostUsd, costSource } = recomputed;
|
|
427
469
|
|
|
428
|
-
const cost = await
|
|
470
|
+
const { cost, created } = await insertSessionCost({
|
|
471
|
+
credentialKeyType: parsed.body.credentialKeyType,
|
|
472
|
+
credentialKeySuffix: parsed.body.credentialKeySuffix,
|
|
473
|
+
harness: parsed.body.harness,
|
|
429
474
|
id: parsed.body.id,
|
|
430
475
|
sessionId: parsed.body.sessionId,
|
|
431
476
|
taskId: parsed.body.taskId || undefined,
|
|
@@ -448,26 +493,32 @@ export async function handleSessionData(
|
|
|
448
493
|
cacheWrite1hTokens: parsed.body.cacheWrite1hTokens,
|
|
449
494
|
modelBreakdown: recomputed.modelBreakdown,
|
|
450
495
|
});
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
496
|
+
if (created) {
|
|
497
|
+
recordSessionCost({
|
|
498
|
+
totalCostUsd,
|
|
499
|
+
harnessCostUsd: harnessCostUsd ?? undefined,
|
|
500
|
+
harness: parsed.body.provider ?? "unknown",
|
|
501
|
+
model,
|
|
502
|
+
costSource,
|
|
503
|
+
isError: parsed.body.isError ?? false,
|
|
504
|
+
tokens: {
|
|
505
|
+
input: rowInputTokens,
|
|
506
|
+
output: rowOutputTokens,
|
|
507
|
+
cacheRead: rowCacheReadTokens ?? 0,
|
|
508
|
+
cacheWrite: rowCacheWriteTokens ?? 0,
|
|
509
|
+
reasoning: parsed.body.reasoningOutputTokens ?? 0,
|
|
510
|
+
thinking: parsed.body.thinkingTokens ?? 0,
|
|
511
|
+
},
|
|
512
|
+
});
|
|
513
|
+
incrementServerSessionsProcessed();
|
|
514
|
+
}
|
|
468
515
|
createSessionCostRoute.respond(res, 201, { success: true, cost });
|
|
469
516
|
} catch (error) {
|
|
470
|
-
|
|
517
|
+
if (error instanceof SessionCostConflictError) {
|
|
518
|
+
jsonError(res, error.message, 409);
|
|
519
|
+
return true;
|
|
520
|
+
}
|
|
521
|
+
console.error("[HTTP] Failed to create session cost:", scrubSecrets(String(error)));
|
|
471
522
|
jsonError(res, "Failed to store session cost", 500);
|
|
472
523
|
}
|
|
473
524
|
return true;
|
package/src/http/sessions.ts
CHANGED
|
@@ -52,6 +52,7 @@ import {
|
|
|
52
52
|
} from "../be/session-shares";
|
|
53
53
|
import { getTaskSteeringFieldsForTasks } from "../be/steering";
|
|
54
54
|
import { getTaskCitationsForTasks, TaskCitationSchema } from "../be/task-citations";
|
|
55
|
+
import { getTaskUiSpecsForTasks, TaskUiSpecSchema } from "../be/task-ui-spec";
|
|
55
56
|
import {
|
|
56
57
|
AgentTokenExistsError,
|
|
57
58
|
findUserById,
|
|
@@ -211,6 +212,7 @@ const SessionKeyFilterSchema = z.string().transform((value, ctx) => {
|
|
|
211
212
|
*/
|
|
212
213
|
const TaskWithSteeringSchema = AgentTaskSchema.extend({
|
|
213
214
|
citations: z.array(TaskCitationSchema),
|
|
215
|
+
uiSpec: TaskUiSpecSchema.nullable(),
|
|
214
216
|
isLeadTask: z.boolean(),
|
|
215
217
|
supportedSteerModes: z.array(SteerModeSchema),
|
|
216
218
|
});
|
|
@@ -1298,11 +1300,12 @@ export async function handleSessions(
|
|
|
1298
1300
|
sessionRoot.id,
|
|
1299
1301
|
actor,
|
|
1300
1302
|
);
|
|
1301
|
-
// Load steering, citations and pending approvals for the already loaded chain.
|
|
1303
|
+
// Load steering, citations, UI specs and pending approvals for the already loaded chain.
|
|
1302
1304
|
const tasks = [root, ...chain];
|
|
1303
|
-
const [steering, citations, approvals, read, groupKey] = await Promise.all([
|
|
1305
|
+
const [steering, citations, uiSpecs, approvals, read, groupKey] = await Promise.all([
|
|
1304
1306
|
getTaskSteeringFieldsForTasks(tasks),
|
|
1305
1307
|
getTaskCitationsForTasks(tasks.map((task) => task.id)),
|
|
1308
|
+
getTaskUiSpecsForTasks(tasks.map((task) => task.id)),
|
|
1306
1309
|
getPendingApprovalsForTasks(tasks.map((task) => task.id)),
|
|
1307
1310
|
// The viewer's read state, so a client marks a session read on open
|
|
1308
1311
|
// without the list row (the same rule as `GET /api/sessions`).
|
|
@@ -1315,6 +1318,7 @@ export async function handleSessions(
|
|
|
1315
1318
|
...task,
|
|
1316
1319
|
...steering.get(task.id)!,
|
|
1317
1320
|
citations: citations.get(task.id)!,
|
|
1321
|
+
uiSpec: uiSpecs.get(task.id) ?? null,
|
|
1318
1322
|
});
|
|
1319
1323
|
getSession.respond(res, 200, {
|
|
1320
1324
|
root: decorate(root),
|