@desplega.ai/agent-swarm 2.8.3 → 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-ny75x1qy.js +23 -0
- package/dist/{actions-ewz7bp4g.js → actions-b9qgrmeq.js} +82 -21
- package/dist/agent-fs-provision-b5dhdsbd.js +27 -0
- package/dist/{amp-adapter-f25tqhnf.js → amp-adapter-vtax2c9s.js} +3 -3
- package/dist/{anthropic-messages-jkva0zps.js → anthropic-messages-r5xf5hqw.js} +37 -37
- package/dist/{app-mkptw0k7.js → app-g2z15hax.js} +9 -4
- package/dist/approval-notifications-yt13wp8r.js +23 -0
- package/dist/{assistant-c47rfe77.js → assistant-2cgfxsgk.js} +56 -33
- package/dist/{azure-openai-responses-wgtqkbr3.js → azure-openai-responses-590s1eea.js} +10 -10
- package/dist/{boot-args-schema-4vb0xsat.js → boot-args-schema-3gwy0f60.js} +1 -1
- package/dist/{boot-reembed-htr73hbs.js → boot-reembed-92g7s5zp.js} +1 -1
- package/dist/{boot-reembed-1ghy2sab.js → boot-reembed-mywmyp4s.js} +1 -1
- package/dist/{boot-scrub-sweep-yrytg42z.js → boot-scrub-sweep-7dkdzqxx.js} +84 -13
- package/dist/{boot-seeds-n2b3dx4e.js → boot-seeds-ce7rvgq1.js} +4 -4
- package/dist/{boxd-jmfqgkqa.js → boxd-wn235q80.js} +7 -7
- package/dist/claude-adapter-3m4q7735.js +28 -0
- package/dist/{claude-managed-adapter-hddmxjyj.js → claude-managed-adapter-t8nfgcgz.js} +4 -4
- package/dist/{claude-managed-setup-hfvry1bd.js → claude-managed-setup-c217draw.js} +10 -10
- package/dist/{claude-sdk-session-0hamqzc7.js → claude-sdk-session-7fbqm51z.js} +9386 -9196
- package/dist/{cli-yjdgea32.js → cli-1jx0srjt.js} +17 -17
- package/dist/{cli-sdvcrq5x.js → cli-1jykg0py.js} +18 -14
- package/dist/{cli-k96cecs7.js → cli-2czxfnvj.js} +1221 -357
- package/dist/{cli-qmqt520k.js → cli-2dq9yv8p.js} +2 -2
- package/dist/{cli-e2w34h6z.js → cli-2xs8tsf7.js} +132 -85
- package/dist/{cli-z8cvws4c.js → cli-2yjj3e31.js} +907 -56
- package/dist/{cli-mdpbjnzq.js → cli-32djehja.js} +42 -42
- package/dist/{cli-gpz1d0t2.js → cli-3j873zxq.js} +4 -4
- 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-f1kwb5fc.js → cli-5a6pqy45.js} +333 -21
- package/dist/{cli-93t5s4zq.js → cli-5gpqgs8b.js} +2 -2
- package/dist/{cli-15204js0.js → cli-6237rnyr.js} +1 -1
- package/dist/{cli-4ax9mvvg.js → cli-67mwzr35.js} +9 -9
- package/dist/{cli-t5ys4ebm.js → cli-6945ywhr.js} +3 -3
- package/dist/{cli-0bcgyj5b.js → cli-6ehs4mta.js} +87 -8
- package/dist/{cli-6yygkr0w.js → cli-6ym4jhzp.js} +15 -7
- package/dist/{cli-8bpgbr8k.js → cli-7evph51z.js} +5 -5
- package/dist/{cli-dtdht77h.js → cli-7mv4h3sn.js} +2 -2
- package/dist/{cli-nx2n3z6p.js → cli-7sf9sb0w.js} +3 -2
- package/dist/{cli-pe4d96rb.js → cli-7zm3b3f5.js} +1 -1
- package/dist/cli-8zh9nrew.js +78 -0
- package/dist/cli-9ttx00s3.js +137 -0
- package/dist/{cli-x6t50dmw.js → cli-9w8712tq.js} +620 -281
- package/dist/{cli-8476gtwf.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-k2rw11py.js → cli-b91nz213.js} +5 -5
- package/dist/{cli-7c5tgqhf.js → cli-bg63qmsx.js} +10 -10
- package/dist/{cli-qps8je6j.js → cli-bkjdknnp.js} +54 -10
- package/dist/{cli-gn9y6fn7.js → cli-bnqncekd.js} +2 -2
- package/dist/{cli-s7zz734a.js → cli-br0924pw.js} +1 -1
- package/dist/{cli-h9yy18gy.js → cli-ctx0b85j.js} +5484 -5078
- package/dist/{cli-0vksaxvr.js → cli-dgs10ttj.js} +2 -2
- package/dist/cli-dqgnbnxs.js +132 -0
- package/dist/{cli-q6mfk1ej.js → cli-dzzh58sy.js} +2 -2
- package/dist/{cli-2znm3dzj.js → cli-eds5xnsz.js} +2 -2
- package/dist/{cli-c0xjnr8z.js → cli-f3jyzq4g.js} +2 -2
- package/dist/cli-f8x9drqr.js +84 -0
- package/dist/{cli-ztq5z4e1.js → cli-f9gz2vyj.js} +6 -6
- package/dist/{cli-bhsfbmk8.js → cli-fh97xn30.js} +93 -44
- package/dist/cli-fkef327x.js +103 -0
- package/dist/{cli-fsgttth8.js → cli-g0vv9dg4.js} +13 -13
- package/dist/{cli-kd56bmk4.js → cli-gabsjg8x.js} +3 -1
- package/dist/{cli-1m96dc36.js → cli-gfy38pvt.js} +3 -3
- package/dist/{cli-922z7gwm.js → cli-h9yqfzx9.js} +15 -11
- package/dist/{cli-5a7szzfh.js → cli-hnamkvnc.js} +2 -2
- package/dist/{cli-c3ng0mb4.js → cli-j7svy295.js} +71 -818
- package/dist/{cli-yss07azk.js → cli-jaw5v1sy.js} +3 -3
- package/dist/cli-jkw6ptfw.js +921 -0
- package/dist/{cli-s8p8hhty.js → cli-jm0hvmz2.js} +2 -2
- package/dist/{cli-knva3nmx.js → cli-jwampxxq.js} +8 -6
- package/dist/cli-kj0hyr43.js +51 -0
- package/dist/{cli-tnzebztn.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-9zmb7ptc.js → cli-kxx4k2jw.js} +8 -753
- package/dist/{cli-am1ptset.js → cli-m7c2380k.js} +208 -194
- package/dist/{cli-kw44j53p.js → cli-m7zvgt57.js} +45 -38
- package/dist/{cli-504akrp9.js → cli-meydjstb.js} +3 -3
- package/dist/{cli-54qr8mcd.js → cli-mhapr559.js} +4 -4
- package/dist/{cli-tf79ryyy.js → cli-mjw0yf82.js} +3 -3
- package/dist/{cli-rjvsf9qa.js → cli-mkwkwq81.js} +14 -11
- package/dist/{cli-n30e0hcp.js → cli-mna6pmfx.js} +2 -2
- package/dist/{cli-awwptga4.js → cli-mw620q3n.js} +1 -1
- package/dist/{cli-6wj7p986.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-4dpkjc2e.js → cli-nafvvsp8.js} +9 -9
- package/dist/{cli-sg27rk2t.js → cli-nbt14he0.js} +25 -19
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-zdaypkq9.js → cli-p4kckx1z.js} +285 -97
- package/dist/{cli-n5t077me.js → cli-pb2ay3sh.js} +10 -3
- package/dist/{cli-t4dv07kr.js → cli-psffsanb.js} +4 -3
- package/dist/{cli-mwwmka77.js → cli-pyjn0qhk.js} +2712 -268
- package/dist/{cli-emekyyhr.js → cli-q2d3e1k1.js} +1 -1
- package/dist/{cli-vqva1teb.js → cli-qe909n63.js} +2 -2
- package/dist/{cli-2d0cghfn.js → cli-qj39vrc6.js} +1 -1
- package/dist/{cli-tas6ckky.js → cli-rq5rpv6k.js} +2 -2
- package/dist/{cli-0agcv1v5.js → cli-rqx70rcz.js} +2 -2
- package/dist/{cli-kmemts3w.js → cli-sn650d7x.js} +39 -69
- package/dist/{cli-98rwmcyc.js → cli-snxhtehz.js} +3 -3
- package/dist/{cli-d829z3xc.js → cli-spfz393q.js} +6 -6
- package/dist/{cli-500c09j9.js → cli-t9ga4qmb.js} +14 -14
- package/dist/{cli-me0r8gzr.js → cli-td9tb872.js} +27 -25
- package/dist/cli-tvc4jag9.js +754 -0
- package/dist/{cli-6ek0hff4.js → cli-ty3gha1p.js} +4 -4
- package/dist/{cli-c71n3bxq.js → cli-v57d7fmm.js} +2 -2
- package/dist/{cli-j8cjdzan.js → cli-vs9vdpy0.js} +1 -1
- package/dist/cli-vt89089n.js +296 -0
- package/dist/{cli-pxwtcgcp.js → cli-vyff45ve.js} +2 -2
- package/dist/{cli-x3ex5bqf.js → cli-w16kwbzw.js} +1 -1
- package/dist/{cli-bj6qhgte.js → cli-w4n323t3.js} +197 -45
- package/dist/{cli-rqfvkx5t.js → cli-wn13hhdt.js} +13 -13
- package/dist/{cli-skmhsnqh.js → cli-x40a0w9j.js} +1 -1
- package/dist/{cli-zeaehgyd.js → cli-xag7btpe.js} +2 -2
- package/dist/{cli-k28wkapa.js → cli-xf1wn5ns.js} +2 -2
- package/dist/{cli-rh15cakt.js → cli-xwsm6xkr.js} +1 -1
- package/dist/{cli-dpsfwh7n.js → cli-y2ewxhth.js} +56 -31
- package/dist/{cli-vx421edw.js → cli-ysvspf5e.js} +9 -7
- package/dist/{cli-crpf163n.js → cli-zh0e5x7p.js} +16 -26
- package/dist/{cli-4e1hfbpq.js → cli-zr6qy15y.js} +24 -24
- package/dist/cli.js +33 -29
- package/dist/{codex-adapter-2brxx5ta.js → codex-adapter-n656pvb8.js} +9 -8
- package/dist/{codex-hook-c930c3ea.js → codex-hook-59atdwd8.js} +6 -6
- package/dist/{codex-login-cbrs1h5w.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-y9anfj0r.js → codex-session-runner-p0fbv5y9.js} +10 -9
- package/dist/{commands-wn9q06qr.js → commands-gwea8z5p.js} +3 -3
- package/dist/{controller-fw608czd.js → controller-t67c3grh.js} +9 -6
- package/dist/{controllers-connect-63j5rdcm.js → controllers-connect-ks155r0h.js} +28 -25
- package/dist/{cursor-adapter-6mb9jme8.js → cursor-adapter-ygwrtmkv.js} +2 -2
- package/dist/{db-y4wfrzbm.js → db-kpmx06s9.js} +21 -13
- package/dist/{db-0m6v5tq4.js → db-rb2xqdb1.js} +3 -3
- package/dist/{devin-adapter-r0yx3gv8.js → devin-adapter-zp4tqq53.js} +1 -1
- package/dist/{dispatcher-9tq2zzdj.js → dispatcher-31sm0ej2.js} +21 -18
- package/dist/{docker-j75atvpt.js → docker-09tkkg0n.js} +47 -8
- package/dist/{dsh-adapter-t09sv4tq.js → dsh-adapter-qyxh0w31.js} +2 -2
- package/dist/{e2b-a7vzs2vj.js → e2b-3v1e745x.js} +6 -6
- package/dist/{e2b-7s9dscap.js → e2b-sm28k0k3.js} +6 -6
- package/dist/{easter-egg-3d-fbwvmwhe.js → easter-egg-3d-00wjscn6.js} +1 -1
- package/dist/{embedding-space-wh8de1t9.js → embedding-space-qhw4g68n.js} +6 -6
- package/dist/{embeddings-3hpbdtjr.js → embeddings-zdv9ke6x.js} +1 -1
- package/dist/{event-bus-tr6h3gv8.js → event-bus-xr83x566.js} +1 -1
- package/dist/{execute-4bdf8sdy.js → execute-zna8wwr7.js} +1 -1
- package/dist/{external-channel-ts2fwqh0.js → external-channel-1ac6t56s.js} +2 -2
- package/dist/fx-adapter-sk7n0fzc.js +19 -0
- package/dist/{getMachineId-bsd-nfgrzarv.js → getMachineId-bsd-637a7rbk.js} +3 -3
- package/dist/{getMachineId-darwin-wz886dsk.js → getMachineId-darwin-9vytrcnn.js} +3 -3
- package/dist/{getMachineId-linux-1nng3p1p.js → getMachineId-linux-mkzsvyyz.js} +3 -3
- package/dist/{getMachineId-unsupported-a0428vw9.js → getMachineId-unsupported-4cfs2n11.js} +3 -3
- package/dist/{getMachineId-win-h45922nq.js → getMachineId-win-154s3qma.js} +3 -3
- package/dist/{google-generative-ai-h7s3e9kk.js → google-generative-ai-maq6c9bf.js} +1 -1
- package/dist/{google-vertex-fhxaafzw.js → google-vertex-2jgsw2nb.js} +5 -5
- package/dist/grok-adapter-sjbcm5ew.js +19 -0
- package/dist/handlers-yzy0c87x.js +35 -0
- package/dist/{heartbeat-2ze5fzpc.js → heartbeat-2f6z4kdx.js} +24 -21
- package/dist/{hook-gaehe2w5.js → hook-8y0gvtp1.js} +14 -14
- package/dist/{hook-ca54yd4s.js → hook-w1skzaqc.js} +5 -5
- package/dist/{http-jfg8t2yk.js → http-wghxvpef.js} +2333 -589
- package/dist/{index-d6wkh8ar.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-25pvya7q.js +40 -0
- package/dist/index-2t4859r5.js +35 -0
- package/dist/{index-enn321kd.js → index-42jq9yy3.js} +3 -3
- package/dist/{index-khe3gp0k.js → index-4k7m5dgj.js} +645 -370
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-gjwaqaq8.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-3gv6sc4z.js → index-8zn8nxn5.js} +1 -1
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-3yvzbhxd.js → index-9zkchs9t.js} +336 -193
- package/dist/{index-0rvk3vd4.js → index-b5wgnm78.js} +47 -47
- package/dist/index-cxca2t8y.js +36 -0
- package/dist/{index-qwj6ntem.js → index-e3krvkh2.js} +4 -4
- package/dist/{index-hjhfk3ra.js → index-pe3d8jfy.js} +3 -3
- package/dist/index-rv89fvzf.js +572 -0
- package/dist/{index-csgrxedz.js → index-s71ez27v.js} +1 -1
- package/dist/{keepalive-k2a3qe73.js → keepalive-sh02349h.js} +4 -4
- package/dist/lead-gk4h5eg7.js +74 -0
- package/dist/{maintenance-gb5sd5nc.js → maintenance-yj0dcjja.js} +1 -1
- package/dist/{node-252anz2h.js → node-dqm4xgxw.js} +4 -4
- package/dist/{node-ray25snp.js → node-zd6shky9.js} +3 -3
- package/dist/{oauth-refresh-sweep-y7rm6bkb.js → oauth-refresh-sweep-d9xedk66.js} +3 -3
- package/dist/{onboard-jmc5qerv.js → onboard-dpgjn03r.js} +8 -8
- package/dist/{openai-codex-responses-k9gapdze.js → openai-codex-responses-bkcd8pjj.js} +9 -9
- package/dist/{openai-responses-4d5dx3c7.js → openai-responses-gbh0wfqe.js} +13 -13
- package/dist/{opencode-adapter-7eade9ev.js → opencode-adapter-2d31cpjc.js} +7 -6
- package/dist/{otel-impl-8j1xhxqd.js → otel-impl-1skarpfq.js} +110 -110
- package/dist/pending-bfmxtx0g.js +82 -0
- package/dist/{pi-mono-adapter-yqmaf32x.js → pi-mono-adapter-gvppnasy.js} +43 -16
- package/dist/{pricing-refresh-1nj722h6.js → pricing-refresh-c6b325mk.js} +2 -2
- package/dist/{rbac-roles-b1mtr6dr.js → rbac-roles-h80qbdbs.js} +3 -3
- package/dist/{rbac-roles-n1f3frk1.js → rbac-roles-zfcx68tx.js} +10 -3
- package/dist/{render-v2-1gfpd8rj.js → render-v2-nx20t3rb.js} +7 -4
- package/dist/{resume-w1s1eh5v.js → resume-5ep8agan.js} +11 -7
- package/dist/{runtime-84g5egsc.js → runtime-r3pj4mce.js} +1 -1
- package/dist/{session-access-y6z1txk4.js → session-access-n7p3m15b.js} +4 -4
- package/dist/{session-source-backfill-gxxwfh12.js → session-source-backfill-v8mt0zwn.js} +4 -4
- package/dist/{setup-r91gstyk.js → setup-z1psaqhe.js} +1 -1
- package/dist/thread-buffer-a1re2r9r.js +38 -0
- package/dist/{virtual-modules-cgnj6kme.js → virtual-modules-rrbjdpxn.js} +5 -5
- package/dist/{work-objects-qcxzg61c.js → work-objects-4aghh73z.js} +31 -23
- package/dist/worker-3dyyb8ev.js +74 -0
- package/dist/{worker-follow-up-y2d2h7km.js → worker-follow-up-166zmex1.js} +21 -18
- package/dist/{x-qhxq2ama.js → x-wg164ss9.js} +2 -2
- package/openapi.json +2561 -131
- package/package.json +15 -11
- package/plugin/commands/create-pr.md +1 -1
- package/plugin/pi-skills/create-pr/SKILL.md +1 -1
- package/src/apps/action-runner.ts +21 -1
- package/src/apps/catalog.generated.json +667 -18
- package/src/apps/page-validator.ts +341 -8
- package/src/assets/key.ts +6 -0
- package/src/be/agent-fs-user-keys.ts +186 -0
- package/src/be/audit-user.ts +27 -13
- package/src/be/automation-preflight.test.ts +14 -14
- package/src/be/automation-preflight.ts +24 -16
- package/src/be/boot-scrub-sweep.ts +143 -14
- package/src/be/caller-session-group.ts +86 -0
- package/src/be/checklist.ts +375 -0
- package/src/be/db/agents.ts +12 -1
- package/src/be/db/approvals.ts +26 -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/session-moves.ts +23 -0
- package/src/be/db/session-tree.ts +78 -19
- package/src/be/db/tasks/eligibility-scan.ts +14 -0
- package/src/be/db/tasks/read.ts +7 -3
- package/src/be/db/tasks/slack-fold.ts +116 -0
- package/src/be/db/tasks/write.ts +67 -1
- package/src/be/db-queries/mcp-servers.ts +13 -0
- package/src/be/db-queries/oauth.ts +6 -0
- package/src/be/db-queries/task-artifacts.ts +10 -8
- package/src/be/db.ts +242 -319
- package/src/be/extensions/assets.ts +17 -13
- package/src/be/import/config.ts +54 -0
- package/src/be/import/dir-source.ts +372 -0
- package/src/be/import/index.ts +149 -0
- package/src/be/import/pending.ts +71 -0
- package/src/be/import/schema.ts +137 -0
- package/src/be/import/seeders.ts +462 -0
- package/src/be/key-window-usage.ts +385 -0
- package/src/be/migrations/297_import_ownership.sql +34 -0
- package/src/be/migrations/301_favorites_key_type.sql +36 -0
- package/src/be/migrations/302_checklist_items.sql +23 -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/multi-runtime.ts +8 -1
- package/src/be/rbac-roles.ts +8 -1
- package/src/be/runtime-pools/db.ts +3 -0
- package/src/be/runtime-pools/demand.ts +20 -2
- package/src/be/runtime-pools/reachability.ts +31 -0
- package/src/be/runtime-pools/routing.ts +8 -1
- package/src/be/runtime-pools/supervisor.ts +6 -7
- package/src/be/savings/read.ts +8 -6
- package/src/be/script-credential-broker.ts +2 -2
- package/src/be/scripts/typecheck.ts +4 -4
- package/src/be/seed/agent-fs-provision.ts +104 -19
- package/src/be/seed/index.ts +1 -1
- package/src/be/seed/registry.ts +27 -8
- package/src/be/seed/runner.ts +1 -1
- package/src/be/seed/schedules-seeder.ts +24 -6
- package/src/be/seed/seed-toggle.ts +32 -0
- package/src/be/seed/types.ts +6 -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/dreaming-gather.ts +2 -2
- package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/steering.ts +27 -4
- package/src/be/swarm-config-guard.ts +54 -1
- package/src/be/task-citations.ts +8 -5
- 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/onboard/agent-fs-version.ts +1 -1
- package/src/commands/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +95 -55
- package/src/e2b/env.ts +2 -0
- package/src/extensions/catalog.generated.json +17 -0
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/github/app.ts +10 -1
- package/src/github/handlers.ts +6 -3
- package/src/github/reactions.ts +12 -14
- package/src/heartbeat/heartbeat.ts +14 -4
- package/src/http/agents.ts +19 -10
- package/src/http/all-routes.ts +2 -0
- package/src/http/api-keys.ts +258 -30
- package/src/http/approval-requests.ts +24 -4
- package/src/http/apps.ts +69 -5
- package/src/http/checklist.ts +176 -0
- package/src/http/db-query-bounded.ts +256 -11
- package/src/http/db-query-shared.ts +9 -0
- package/src/http/favorites.ts +14 -2
- package/src/http/fs.ts +346 -1
- package/src/http/index.ts +29 -1
- package/src/http/kv.ts +13 -0
- package/src/http/mcp-oauth.ts +1 -1
- package/src/http/mcp-servers.ts +15 -2
- package/src/http/onboarding.ts +2 -9
- package/src/http/poll.ts +45 -0
- package/src/http/script-connections.ts +1 -0
- package/src/http/session-data.ts +74 -23
- package/src/http/sessions.ts +23 -2
- package/src/http/slack-events.ts +101 -0
- package/src/http/status.ts +25 -7
- package/src/http/task-requester.ts +46 -0
- package/src/http/tasks.ts +169 -42
- package/src/http/users.ts +14 -0
- package/src/http/webhooks.ts +15 -0
- package/src/integrations/cards/index.ts +151 -0
- package/src/integrations/chat-sdk/outbound.ts +39 -13
- package/src/integrations/chat-sdk/relay.ts +87 -0
- package/src/integrations/chat-sdk/runtime.ts +7 -1
- package/src/integrations/chat-sdk/status.ts +17 -0
- package/src/integrations/chat-sdk/telegram-api.ts +6 -1
- package/src/jira/outbound.ts +5 -3
- package/src/kv-reserved-namespaces.ts +17 -2
- package/src/linear/outbound.ts +5 -1
- package/src/oauth/presets.ts +29 -2
- package/src/prompts/base-prompt.ts +25 -4
- package/src/prompts/session-templates.ts +102 -8
- 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/claude-managed-adapter.ts +5 -1
- package/src/providers/codex-adapter.ts +86 -4
- package/src/providers/codex-app-server.ts +11 -16
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/opencode-adapter.ts +7 -19
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +32 -0
- package/src/providers/runtime-dependencies.ts +158 -0
- package/src/providers/types.ts +11 -0
- package/src/rbac/legacy-policy.ts +2 -0
- package/src/rbac/permissions.ts +10 -1
- package/src/runtime-providers/docker.ts +65 -1
- package/src/scheduler/deferred-task-waits.ts +18 -5
- package/src/scripts-runtime/credential-broker/default-bindings.ts +19 -11
- package/src/scripts-runtime/credential-broker/index.ts +1 -1
- package/src/scripts-runtime/egress-secrets.ts +2 -2
- package/src/scripts-runtime/swarm-sdk.ts +3 -2
- package/src/scripts-runtime/types/stdlib.d.ts +11 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +9 -9
- package/src/scripts-runtime/types/swarm-sdk.d.ts +11 -4
- package/src/server.ts +4 -4
- package/src/slack/actions.ts +56 -0
- package/src/slack/app.ts +107 -59
- package/src/slack/assistant.ts +33 -7
- package/src/slack/handlers.ts +6 -4
- package/src/slack/http-receiver.ts +284 -0
- package/src/slack/inbound-dispatch.ts +43 -7
- package/src/slack/inbound-files.ts +35 -14
- package/src/slack/message-text.ts +47 -4
- package/src/slack/render-v2.ts +109 -24
- package/src/slack/responses.ts +3 -2
- package/src/slack/socket-ack.ts +17 -10
- package/src/slack/steering.ts +5 -0
- package/src/slack/thread-buffer-store.ts +58 -0
- package/src/slack/thread-buffer.ts +341 -57
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/context-key.ts +24 -0
- package/src/tasks/errors.ts +5 -0
- package/src/tasks/sibling-awareness.ts +13 -1
- package/src/tests/acp-adapter.test.ts +4 -6
- package/src/tests/agent-fs-live-url.test.ts +15 -0
- package/src/tests/agent-fs-provision-seeder.test.ts +140 -0
- package/src/tests/agent-fs-user-keys.test.ts +483 -0
- package/src/tests/agentfs-proxy.test.ts +8 -8
- 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 +402 -0
- package/src/tests/approval-requests-notifications.test.ts +12 -2
- package/src/tests/approval-respond-auth.test.ts +28 -0
- package/src/tests/apps-action-parent-task.test.ts +140 -0
- package/src/tests/apps-catalog-additions.test.ts +315 -0
- package/src/tests/apps-catalog-files.test.ts +114 -0
- package/src/tests/apps-catalog-hitl.test.ts +117 -0
- package/src/tests/apps-catalog-inputs.test.ts +86 -0
- package/src/tests/apps-catalog-page-frame.test.ts +49 -0
- package/src/tests/apps-catalog-table.test.ts +47 -0
- package/src/tests/apps-chart-shell.test.ts +1 -1
- package/src/tests/apps-element-assembly.test.ts +52 -3
- package/src/tests/apps-session-thread.test.ts +261 -0
- package/src/tests/asset-key-invariants.test.ts +14 -0
- package/src/tests/base-prompt.test.ts +213 -23
- package/src/tests/boot-scrub-sweep.test.ts +172 -0
- package/src/tests/caller-session-group.test.ts +199 -0
- package/src/tests/cards.test.ts +169 -0
- package/src/tests/chat-sdk-relay.test.ts +149 -1
- package/src/tests/chat-sdk-status-route.test.ts +16 -3
- package/src/tests/chat-sdk-telegram-token.test.ts +76 -0
- package/src/tests/chat-sdk-tools.test.ts +147 -0
- package/src/tests/checklist-nudge.test.ts +208 -0
- package/src/tests/checklist.test.ts +686 -0
- 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 +32 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -0
- package/src/tests/comb-config-guard.test.ts +21 -0
- package/src/tests/comb-default.test.ts +59 -97
- package/src/tests/comb-links.test.ts +86 -16
- package/src/tests/comb-status.test.ts +24 -27
- package/src/tests/create-page-tool.test.ts +101 -1
- package/src/tests/create-schedule-key.test.ts +105 -0
- package/src/tests/credential-broker.test.ts +2 -2
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-query.test.ts +87 -1
- package/src/tests/db-task-read-contract.test.ts +4 -0
- package/src/tests/db-task-write-contract.test.ts +6 -1
- 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/entrypoint-github-enterprise.test.ts +158 -0
- package/src/tests/extensions-assets.test.ts +7 -3
- package/src/tests/extensions-catalog.test.ts +1 -0
- package/src/tests/extensions-example-sql-admin-only.test.ts +201 -0
- package/src/tests/extensions-pre-task.test.ts +3 -3
- package/src/tests/extensions-steering.test.ts +14 -2
- package/src/tests/favorites-agent-fs-path.test.ts +124 -0
- package/src/tests/fetch-resolved-env.test.ts +68 -0
- package/src/tests/fixtures/import-package.ts +32 -0
- package/src/tests/fixtures/runner-missing-dependency.ts +129 -0
- 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/fs-routes.test.ts +505 -2
- package/src/tests/github-ghes-mock.test.ts +196 -0
- package/src/tests/github-host.test.ts +285 -0
- package/src/tests/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/heartbeat-supersede-resume.test.ts +73 -0
- package/src/tests/heartbeat.test.ts +56 -0
- package/src/tests/human-thread-routing.test.ts +187 -0
- package/src/tests/import-config.test.ts +209 -0
- package/src/tests/import.test.ts +464 -0
- package/src/tests/invites-http.test.ts +144 -1
- package/src/tests/jira-outbound-sync.test.ts +33 -1
- package/src/tests/key-window-usage.test.ts +831 -0
- package/src/tests/kv-http.test.ts +11 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -1
- package/src/tests/literal-matcher.test.ts +58 -0
- package/src/tests/mcp-oauth-manual-client.test.ts +1 -1
- package/src/tests/oauth-presets.test.ts +12 -0
- package/src/tests/pi-mono-adapter.test.ts +79 -0
- package/src/tests/pool-affinity.test.ts +50 -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 +53 -5
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/provider-registration.test.ts +2 -55
- package/src/tests/provider-runtime-dependencies.test.ts +212 -0
- package/src/tests/rate-limit-event.test.ts +22 -0
- package/src/tests/rbac-admission.test.ts +19 -0
- package/src/tests/rbac-charact-misc-tools.test.ts +31 -0
- package/src/tests/rbac-engine.test.ts +2 -0
- package/src/tests/rbac-roles.test.ts +2 -0
- package/src/tests/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -0
- package/src/tests/runner-missing-dependency.test.ts +61 -0
- package/src/tests/runtime-pool-reachability.test.ts +135 -1
- package/src/tests/runtime-pool-routing.test.ts +52 -0
- package/src/tests/runtime-providers-docker.test.ts +91 -0
- package/src/tests/runtime-stale-threshold.test.ts +40 -0
- package/src/tests/savings-fleet-slices.test.ts +122 -0
- package/src/tests/savings-read.test.ts +41 -0
- package/src/tests/savings-scripts.test.ts +9 -3
- package/src/tests/script-connections.test.ts +7 -0
- package/src/tests/script-executor-conformance.test.ts +41 -4
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- package/src/tests/secret-scrub-gate.test.ts +257 -0
- package/src/tests/seed-registry.test.ts +142 -9
- 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/session-source-keys.test.ts +42 -1
- package/src/tests/sessions-detail-batch.test.ts +7 -0
- package/src/tests/sessions-move.test.ts +70 -0
- package/src/tests/sessions-tree.test.ts +98 -0
- package/src/tests/sessions.test.ts +69 -0
- package/src/tests/slack-config.test.ts +4 -18
- package/src/tests/slack-http-receiver.test.ts +472 -0
- package/src/tests/slack-inbound-logging.test.ts +64 -0
- package/src/tests/slack-leave-thread.test.ts +1 -1
- package/src/tests/slack-message-text.test.ts +104 -0
- package/src/tests/slack-mode-lifecycle.test.ts +6 -4
- package/src/tests/slack-render-v2.test.ts +405 -0
- package/src/tests/slack-skip-reaction.test.ts +2 -2
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- package/src/tests/slack-steering.test.ts +22 -10
- package/src/tests/slack-thread-buffer-context.test.ts +1 -1
- package/src/tests/slack-thread-buffer-fold.test.ts +417 -0
- package/src/tests/slack-thread-buffer-restore.test.ts +198 -0
- package/src/tests/slack-thread-buffer-startup-restore.test.ts +86 -0
- package/src/tests/slack-thread-buffer.test.ts +34 -34
- package/src/tests/slack-thread-participants.test.ts +23 -5
- package/src/tests/slack-tool-blocks.test.ts +167 -0
- package/src/tests/status.test.ts +32 -6
- package/src/tests/steering-core.test.ts +13 -0
- package/src/tests/steering-enabled.test.ts +7 -1
- package/src/tests/steering-promotion.test.ts +24 -0
- package/src/tests/subscription-plans.test.ts +20 -1
- package/src/tests/swarm-config-reserved-keys.test.ts +17 -0
- package/src/tests/system-one-hosts-ui-mirror.test.ts +67 -0
- package/src/tests/task-artifacts.test.ts +50 -0
- package/src/tests/task-session-prompts.test.ts +95 -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/tests/workflow-system-one-extraction.test.ts +149 -1
- package/src/tools/chat-post.ts +19 -4
- package/src/tools/chat-reply.ts +20 -4
- package/src/tools/create-page.ts +21 -4
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/get-swarm.ts +18 -2
- package/src/tools/join-swarm.ts +2 -1
- package/src/tools/kv/kv-write-auth.ts +17 -1
- package/src/tools/schedules/create-schedule.ts +22 -4
- package/src/tools/slack-post.ts +40 -7
- package/src/tools/slack-reply.ts +50 -14
- package/src/tools/store-progress.ts +69 -3
- package/src/types.ts +50 -4
- 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/constants.ts +60 -138
- package/src/utils/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- package/src/utils/github-host.ts +217 -0
- package/src/utils/github-pull-request.ts +8 -5
- package/src/utils/literal-matcher.ts +118 -0
- package/src/utils/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/secret-scrubber.ts +331 -25
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-attachment-links.ts +9 -12
- package/src/utils/task-ui-spec.ts +67 -0
- package/src/vcs/index.ts +3 -0
- package/src/workflows/approval-notifications.ts +188 -12
- package/src/workflows/executors/system-one-extraction.ts +14 -7
- package/src/workflows/executors/system-one-providers.ts +22 -1
- package/src/workflows/task-step-routing.ts +8 -3
- package/templates/community/open-prompt-showreel/PLAYBOOK.md +1 -1
- package/templates/community/open-prompt-showreel/skills/open-prompt-showreel/SKILL.md +1 -1
- package/templates/extensions/README.md +1 -0
- package/templates/extensions/sql-admin-only/README.md +20 -0
- package/templates/extensions/sql-admin-only/hooks.ts +100 -0
- package/templates/extensions/sql-admin-only/manifest.json +8 -0
- package/templates/import/manifest.schema.json +136 -0
- package/templates/import/sources.schema.json +44 -0
- package/templates/skills/agent-browser/SKILL.md +1 -1
- package/templates/skills/agent-browser/content.md +1 -1
- package/templates/skills/apps/SKILL.md +151 -14
- package/templates/skills/apps/content.md +151 -14
- package/templates/skills/asset-namespaces/content.md +2 -1
- package/templates/skills/chat-sdk/content.md +17 -0
- package/templates/skills/db-query-guidance/content.md +2 -1
- package/templates/skills/scheduling/content.md +27 -0
- package/templates/skills/slack-interaction/content.md +12 -2
- package/templates/skills/swarm-docs/content.md +1 -0
- package/templates/skills/swarm-extensions/config.json +1 -1
- package/templates/skills/swarm-extensions/content.md +33 -23
- package/templates/skills/swarm-scripts/SKILL.md +13 -0
- package/templates/skills/swarm-scripts/content.md +13 -0
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +127 -0
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/templates/skills/workflow-iterate/content.md +4 -7
- package/templates/workflows/dreaming/content.md +2 -2
- package/dist/acp-adapter-xq6s2z6t.js +0 -14
- package/dist/claude-adapter-r33pqnzx.js +0 -24
- package/dist/cli-dns0y538.js +0 -194
- package/dist/cli-m2z8jagn.js +0 -12078
- package/dist/fx-adapter-1rnxnf56.js +0 -17
- package/dist/grok-adapter-efhmf1r8.js +0 -17
- package/dist/handlers-anrr3py9.js +0 -32
- package/dist/index-2skqtd76.js +0 -12795
- package/dist/index-8w2aznds.js +0 -33
- package/dist/index-qnjvr362.js +0 -37
- package/dist/index-yzxd3sn9.js +0 -32
- package/dist/lead-zhxqbfdv.js +0 -69
- package/dist/worker-7j2907g6.js +0 -69
- package/src/tests/entrypoint-acp-target-binary.test.ts +0 -439
- package/dist/{cli-4caa1x7d.js → cli-tsa40663.js} +4 -4
- package/dist/{mistral-conversations-a45tx39a.js → mistral-conversations-0c30em7t.js} +4 -4
- package/dist/{openai-completions-xd579js7.js → openai-completions-f3n69rep.js} +18 -18
- package/dist/{pi-messages-hjbv8v10.js → pi-messages-zebyt7gb.js} +5 -5
|
@@ -138,9 +138,14 @@ function defaultIntervalMs(): number {
|
|
|
138
138
|
return parseHeartbeatIntervalMs(process.env.HEARTBEAT_INTERVAL_MS);
|
|
139
139
|
}
|
|
140
140
|
|
|
141
|
-
/**
|
|
141
|
+
/**
|
|
142
|
+
* Stall threshold: tasks with fresh worker heartbeat but no task update for
|
|
143
|
+
* this many minutes. A positive integer, or 30: `Number(value) || 30` kept a
|
|
144
|
+
* negative threshold, which flagged every recently updated task (#2835).
|
|
145
|
+
*/
|
|
142
146
|
function stallThresholdMinutes(): number {
|
|
143
|
-
|
|
147
|
+
const value = Number(process.env.HEARTBEAT_STALL_THRESHOLD_MIN);
|
|
148
|
+
return Number.isInteger(value) && value > 0 ? value : 30;
|
|
144
149
|
}
|
|
145
150
|
|
|
146
151
|
/** Stall threshold: tasks with no active session (worker clearly dead) */
|
|
@@ -169,9 +174,14 @@ const STALE_CLEANUP_THRESHOLD_MINUTES = Number(process.env.HEARTBEAT_STALE_CLEAN
|
|
|
169
174
|
*/
|
|
170
175
|
const DRAFT_TASK_TIMEOUT_MINUTES = Number(process.env.HEARTBEAT_DRAFT_TASK_TIMEOUT_MIN) || 5;
|
|
171
176
|
|
|
172
|
-
/**
|
|
177
|
+
/**
|
|
178
|
+
* Max crash-recovery resume generations before failing for lead triage: a
|
|
179
|
+
* positive integer, or 3. `Number(value) || 3` kept a negative limit, which
|
|
180
|
+
* exhausted the budget before the first resume (#2834).
|
|
181
|
+
*/
|
|
173
182
|
export function maxResumeGenerations(): number {
|
|
174
|
-
|
|
183
|
+
const value = Number(process.env.HEARTBEAT_MAX_RESUME_GENERATIONS);
|
|
184
|
+
return Number.isInteger(value) && value > 0 ? value : 3;
|
|
175
185
|
}
|
|
176
186
|
|
|
177
187
|
export const RESUME_BUDGET_EXHAUSTED_REASON = "resume_budget_exhausted";
|
package/src/http/agents.ts
CHANGED
|
@@ -51,6 +51,7 @@ import {
|
|
|
51
51
|
upsertRuntimeInstance,
|
|
52
52
|
} from "../be/multi-runtime";
|
|
53
53
|
import { getPoolForAgent, resolvePoolDelivery } from "../be/runtime-pools/db";
|
|
54
|
+
import { isAgentOnDemand } from "../be/runtime-pools/reachability";
|
|
54
55
|
import { ACP_TARGET_IDS } from "../providers/acp-target-catalog";
|
|
55
56
|
import { reasoningCapability } from "../providers/reasoning-effort";
|
|
56
57
|
import { ALL_CAPABILITIES, getEnabledCapabilities } from "../server";
|
|
@@ -382,8 +383,22 @@ async function resolveListClaudeTransports(
|
|
|
382
383
|
/** List/detail rows carry the effective Claude transport so the dashboard can flag SDK agents. */
|
|
383
384
|
const AgentListItemSchema = AgentWithCapacityAndTasksSchema.extend({
|
|
384
385
|
claudeTransport: ClaudeTransportSchema.optional(),
|
|
386
|
+
/** Offline, but its runtime pool starts a runtime when a task is sent (`isAgentOnDemand`). */
|
|
387
|
+
onDemand: z.boolean().optional(),
|
|
385
388
|
});
|
|
386
389
|
|
|
390
|
+
/** The list/detail extras: effective Claude transport and the on-demand flag, when set. */
|
|
391
|
+
async function withListExtras<T extends Agent>(
|
|
392
|
+
agent: T,
|
|
393
|
+
claudeTransport: ClaudeTransport | undefined,
|
|
394
|
+
): Promise<T & { claudeTransport?: ClaudeTransport; onDemand?: true }> {
|
|
395
|
+
return {
|
|
396
|
+
...agent,
|
|
397
|
+
...(claudeTransport ? { claudeTransport } : {}),
|
|
398
|
+
...((await isAgentOnDemand(agent)) ? { onDemand: true as const } : {}),
|
|
399
|
+
};
|
|
400
|
+
}
|
|
401
|
+
|
|
387
402
|
/**
|
|
388
403
|
* The agents whose name, role or id contains `q` (case-insensitive), at most
|
|
389
404
|
* `limit` of them. A swarm has tens of agents, so filtering loaded rows is cheap.
|
|
@@ -919,10 +934,9 @@ export async function handleAgentsRest(
|
|
|
919
934
|
resolveListClaudeTransports(agents),
|
|
920
935
|
]);
|
|
921
936
|
listAgents.respond(res, 200, {
|
|
922
|
-
agents:
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
}),
|
|
937
|
+
agents: await Promise.all(
|
|
938
|
+
agentsWithCapacity.map((agent) => withListExtras(agent, transports.get(agent.id))),
|
|
939
|
+
),
|
|
926
940
|
});
|
|
927
941
|
return true;
|
|
928
942
|
}
|
|
@@ -1649,12 +1663,7 @@ export async function handleAgentsRest(
|
|
|
1649
1663
|
agentWithCapacity(agent),
|
|
1650
1664
|
resolveListClaudeTransports([agent]),
|
|
1651
1665
|
]);
|
|
1652
|
-
|
|
1653
|
-
getAgent.respond(
|
|
1654
|
-
res,
|
|
1655
|
-
200,
|
|
1656
|
-
claudeTransport ? { ...agentWithCap, claudeTransport } : agentWithCap,
|
|
1657
|
-
);
|
|
1666
|
+
getAgent.respond(res, 200, await withListExtras(agentWithCap, transports.get(agent.id)));
|
|
1658
1667
|
return true;
|
|
1659
1668
|
}
|
|
1660
1669
|
|
package/src/http/all-routes.ts
CHANGED
|
@@ -28,6 +28,7 @@ import "./api-keys";
|
|
|
28
28
|
import "./events";
|
|
29
29
|
import "./extensions";
|
|
30
30
|
import "./favorites";
|
|
31
|
+
import "./checklist";
|
|
31
32
|
import "./fs";
|
|
32
33
|
import "./heartbeat";
|
|
33
34
|
import "./inbox-state";
|
|
@@ -60,6 +61,7 @@ import "./savings";
|
|
|
60
61
|
import "./savings-calibration";
|
|
61
62
|
import "./sessions";
|
|
62
63
|
import "./skills";
|
|
64
|
+
import "./slack-events";
|
|
63
65
|
import "./slack-inbound";
|
|
64
66
|
import "./scripts";
|
|
65
67
|
import "./mcp-bridge";
|
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);
|
|
@@ -180,7 +180,15 @@ const ApprovalRequestSummarySchema = ApprovalRequestSchema.omit({
|
|
|
180
180
|
resolutionReason: true,
|
|
181
181
|
notificationChannels: true,
|
|
182
182
|
configState: true,
|
|
183
|
-
}).extend({
|
|
183
|
+
}).extend({
|
|
184
|
+
questionCount: z.number().int(),
|
|
185
|
+
viewerCanRespond: z
|
|
186
|
+
.boolean()
|
|
187
|
+
.optional()
|
|
188
|
+
.describe(
|
|
189
|
+
"Pending rows only: whether the caller may answer, by the same rule as the respond route (a listed user or role, or no users and roles listed).",
|
|
190
|
+
),
|
|
191
|
+
});
|
|
184
192
|
|
|
185
193
|
/**
|
|
186
194
|
* Reshapes a DB `ApprovalRequest` row for `respond()` — identical values,
|
|
@@ -209,9 +217,13 @@ async function toApprovalRequestResponse(
|
|
|
209
217
|
};
|
|
210
218
|
}
|
|
211
219
|
|
|
212
|
-
/**
|
|
220
|
+
/**
|
|
221
|
+
* Slim rows plus `approvalProgress` and `viewerCanRespond` for the pending ones
|
|
222
|
+
* (one extra read). `viewer` is null when the caller cannot answer any request.
|
|
223
|
+
*/
|
|
213
224
|
async function withApprovalProgress(
|
|
214
225
|
rows: Awaited<ReturnType<typeof listApprovalRequestSummaries>>,
|
|
226
|
+
viewer: ApprovalResponder | null,
|
|
215
227
|
): Promise<z.infer<typeof ApprovalRequestSummarySchema>[]> {
|
|
216
228
|
const pendingIds = rows.filter((row) => row.status === "pending").map((row) => row.id);
|
|
217
229
|
const state = new Map(
|
|
@@ -225,6 +237,10 @@ async function withApprovalProgress(
|
|
|
225
237
|
approvalProgress: entry
|
|
226
238
|
? await approvalProgress(entry.approvers as ApproversShape, entry.approvals ?? [])
|
|
227
239
|
: null,
|
|
240
|
+
...(entry && {
|
|
241
|
+
viewerCanRespond:
|
|
242
|
+
viewer !== null && isListedApprover(entry.approvers as ApproversShape, viewer),
|
|
243
|
+
}),
|
|
228
244
|
};
|
|
229
245
|
}),
|
|
230
246
|
);
|
|
@@ -490,7 +506,7 @@ const listRoute = route({
|
|
|
490
506
|
pattern: ["api", "approval-requests"],
|
|
491
507
|
summary: "List approval requests with optional filters",
|
|
492
508
|
description:
|
|
493
|
-
"Returns full approval requests by default. Pass `fields=slim` for the list-view shape: `questions`, `approvers`, `responses`, `resolutionReason` and `notificationChannels` are dropped and `questionCount` is added. Fetch one request in full via `GET /api/approval-requests/{id}`.",
|
|
509
|
+
"Returns full approval requests by default. Pass `fields=slim` for the list-view shape: `questions`, `approvers`, `responses`, `resolutionReason` and `notificationChannels` are dropped and `questionCount` is added, plus `viewerCanRespond` on pending rows. Fetch one request in full via `GET /api/approval-requests/{id}`.",
|
|
494
510
|
tags: ["ApprovalRequests"],
|
|
495
511
|
query: z.object({
|
|
496
512
|
status: z.string().optional(),
|
|
@@ -890,8 +906,12 @@ export async function handleApprovalRequests(
|
|
|
890
906
|
};
|
|
891
907
|
// Opt-in: API, MCP and script callers that don't ask keep the full rows.
|
|
892
908
|
if (parsed.query.fields === "slim") {
|
|
909
|
+
const viewer = await approvalResponder(req);
|
|
893
910
|
listRoute.respond(res, 200, {
|
|
894
|
-
approvalRequests: await withApprovalProgress(
|
|
911
|
+
approvalRequests: await withApprovalProgress(
|
|
912
|
+
await listApprovalRequestSummaries(filters),
|
|
913
|
+
viewer.ok ? viewer.responder : null,
|
|
914
|
+
),
|
|
895
915
|
});
|
|
896
916
|
return true;
|
|
897
917
|
}
|