@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
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
|
@@ -28,6 +28,7 @@ import { getResourceSessionLabels, getSessionLabels } from "../be/db/session-lab
|
|
|
28
28
|
import {
|
|
29
29
|
listPrefixRoots,
|
|
30
30
|
listSharedPrefixRoots,
|
|
31
|
+
moveKeyFavorites,
|
|
31
32
|
moveSessionChains,
|
|
32
33
|
type SessionKeyMove,
|
|
33
34
|
} from "../be/db/session-moves";
|
|
@@ -51,6 +52,7 @@ import {
|
|
|
51
52
|
} from "../be/session-shares";
|
|
52
53
|
import { getTaskSteeringFieldsForTasks } from "../be/steering";
|
|
53
54
|
import { getTaskCitationsForTasks, TaskCitationSchema } from "../be/task-citations";
|
|
55
|
+
import { getTaskUiSpecsForTasks, TaskUiSpecSchema } from "../be/task-ui-spec";
|
|
54
56
|
import {
|
|
55
57
|
AgentTokenExistsError,
|
|
56
58
|
findUserById,
|
|
@@ -80,6 +82,7 @@ import {
|
|
|
80
82
|
import { getRequestAuth } from "../utils/request-auth-context";
|
|
81
83
|
import { isRuntimePoolsEnabled } from "../utils/runtime-pools-flag";
|
|
82
84
|
import { canMutateTaskNamespace } from "./assets";
|
|
85
|
+
import { resolveHttpFavoriteOwner } from "./favorite-owner";
|
|
83
86
|
import { createListTotalCache } from "./list-total-cache";
|
|
84
87
|
import { agentFirstPrincipal, authUserId, requireAuthKind } from "./request-principal";
|
|
85
88
|
import { route } from "./route-def";
|
|
@@ -209,6 +212,7 @@ const SessionKeyFilterSchema = z.string().transform((value, ctx) => {
|
|
|
209
212
|
*/
|
|
210
213
|
const TaskWithSteeringSchema = AgentTaskSchema.extend({
|
|
211
214
|
citations: z.array(TaskCitationSchema),
|
|
215
|
+
uiSpec: TaskUiSpecSchema.nullable(),
|
|
212
216
|
isLeadTask: z.boolean(),
|
|
213
217
|
supportedSteerModes: z.array(SteerModeSchema),
|
|
214
218
|
});
|
|
@@ -1242,6 +1246,21 @@ export async function handleSessions(
|
|
|
1242
1246
|
if (roots.length < SESSION_MOVE_LIMIT) break;
|
|
1243
1247
|
}
|
|
1244
1248
|
const moved = await moveSessionChains({ moves, changedBy });
|
|
1249
|
+
// Stars on the group follow a rename only when no session of any owner is
|
|
1250
|
+
// left under the old key: nothing skipped, nothing remaining. Every user's
|
|
1251
|
+
// stars move only when this request moved sessions, which proves the caller
|
|
1252
|
+
// could move every root. A rename that moves nothing (an emptied group, or a
|
|
1253
|
+
// retry) moves only the caller's own stars. A delete leaves the stars in place.
|
|
1254
|
+
if (
|
|
1255
|
+
key !== null &&
|
|
1256
|
+
skipped.length === 0 &&
|
|
1257
|
+
remaining === 0 &&
|
|
1258
|
+
(await listPrefixRoots({ from, limit: 1 })).length === 0
|
|
1259
|
+
) {
|
|
1260
|
+
const scope =
|
|
1261
|
+
moved.length > 0 ? undefined : (await resolveHttpFavoriteOwner(req, myAgentId))?.scope;
|
|
1262
|
+
if (moved.length > 0 || scope) await moveKeyFavorites({ from, to: key, scope });
|
|
1263
|
+
}
|
|
1245
1264
|
moveSessionPrefix.respond(res, 200, { moved, skipped, remaining });
|
|
1246
1265
|
},
|
|
1247
1266
|
);
|
|
@@ -1281,11 +1300,12 @@ export async function handleSessions(
|
|
|
1281
1300
|
sessionRoot.id,
|
|
1282
1301
|
actor,
|
|
1283
1302
|
);
|
|
1284
|
-
// 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.
|
|
1285
1304
|
const tasks = [root, ...chain];
|
|
1286
|
-
const [steering, citations, approvals, read, groupKey] = await Promise.all([
|
|
1305
|
+
const [steering, citations, uiSpecs, approvals, read, groupKey] = await Promise.all([
|
|
1287
1306
|
getTaskSteeringFieldsForTasks(tasks),
|
|
1288
1307
|
getTaskCitationsForTasks(tasks.map((task) => task.id)),
|
|
1308
|
+
getTaskUiSpecsForTasks(tasks.map((task) => task.id)),
|
|
1289
1309
|
getPendingApprovalsForTasks(tasks.map((task) => task.id)),
|
|
1290
1310
|
// The viewer's read state, so a client marks a session read on open
|
|
1291
1311
|
// without the list row (the same rule as `GET /api/sessions`).
|
|
@@ -1298,6 +1318,7 @@ export async function handleSessions(
|
|
|
1298
1318
|
...task,
|
|
1299
1319
|
...steering.get(task.id)!,
|
|
1300
1320
|
citations: citations.get(task.id)!,
|
|
1321
|
+
uiSpec: uiSpecs.get(task.id) ?? null,
|
|
1301
1322
|
});
|
|
1302
1323
|
getSession.respond(res, 200, {
|
|
1303
1324
|
root: decorate(root),
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
|
+
import { getSlackHttpReceiver } from "../slack/app";
|
|
3
|
+
import { getSlackConfiguration } from "../slack/config";
|
|
4
|
+
import { route } from "./route-def";
|
|
5
|
+
import { BODY_TOO_LARGE, enforceContentLengthCap, jsonError } from "./utils";
|
|
6
|
+
|
|
7
|
+
const slackEventsRoute = route({
|
|
8
|
+
method: "post",
|
|
9
|
+
path: "/api/integrations/slack/events",
|
|
10
|
+
pattern: ["api", "integrations", "slack", "events"],
|
|
11
|
+
summary:
|
|
12
|
+
"Slack HTTP ingress (SLACK_MODE=http): Events API, slash commands and interactivity at one request URL",
|
|
13
|
+
tags: ["Slack"],
|
|
14
|
+
auth: { apiKey: false },
|
|
15
|
+
rbac: {
|
|
16
|
+
ungated:
|
|
17
|
+
"Slack-signed request: HMAC v0 verified with SLACK_SIGNING_SECRET, with a 5-minute timestamp window, before any work",
|
|
18
|
+
},
|
|
19
|
+
responses: {
|
|
20
|
+
200: {
|
|
21
|
+
description: "Accepted",
|
|
22
|
+
unstructured:
|
|
23
|
+
"Slack ack payload: empty, the url_verification challenge, or a command/interactivity response body",
|
|
24
|
+
},
|
|
25
|
+
400: { description: "Malformed body after a valid signature" },
|
|
26
|
+
401: { description: "Missing or invalid signature, or timestamp outside the 5-minute window" },
|
|
27
|
+
403: { description: "Delivery for a workspace this swarm does not own" },
|
|
28
|
+
404: { description: "Slack is disabled or not in HTTP mode" },
|
|
29
|
+
413: { description: "Body exceeds 1 MiB" },
|
|
30
|
+
503: {
|
|
31
|
+
description: "Receiver not ready, workspace unverified, or backlog full; Slack retries",
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
/** Slack payloads are a few KB; the receipt store refuses anything above 1 MiB anyway. */
|
|
37
|
+
const SLACK_EVENTS_MAX_BODY_BYTES = 1024 * 1024;
|
|
38
|
+
|
|
39
|
+
function header(req: IncomingMessage, name: string): string | undefined {
|
|
40
|
+
const value = req.headers[name];
|
|
41
|
+
return Array.isArray(value) ? value[0] : value;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export async function handleSlackEvents(
|
|
45
|
+
req: IncomingMessage,
|
|
46
|
+
res: ServerResponse,
|
|
47
|
+
pathSegments: string[],
|
|
48
|
+
): Promise<boolean> {
|
|
49
|
+
if (!slackEventsRoute.match(req.method, pathSegments)) return false;
|
|
50
|
+
|
|
51
|
+
// Never open ingress under Socket Mode, or without credentials.
|
|
52
|
+
const config = getSlackConfiguration();
|
|
53
|
+
if (config.disabled || config.mode !== "http" || config.missingCredentials.length > 0) {
|
|
54
|
+
jsonError(res, "Slack HTTP mode is not enabled", 404);
|
|
55
|
+
return true;
|
|
56
|
+
}
|
|
57
|
+
const receiver = getSlackHttpReceiver();
|
|
58
|
+
if (!receiver) {
|
|
59
|
+
res.writeHead(503, { "Content-Type": "application/json", "Retry-After": "5" });
|
|
60
|
+
res.end(JSON.stringify({ error: "Slack receiver is not ready" }));
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
// Unauthenticated until the HMAC passes, so bound the body before buffering
|
|
65
|
+
// it. An oversized stream is answered at once and drained without buffering.
|
|
66
|
+
if (enforceContentLengthCap(req, res, SLACK_EVENTS_MAX_BODY_BYTES) === BODY_TOO_LARGE) {
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
69
|
+
const chunks: Buffer[] = [];
|
|
70
|
+
let receivedBytes = 0;
|
|
71
|
+
let tooLarge = false;
|
|
72
|
+
for await (const chunk of req) {
|
|
73
|
+
if (tooLarge) continue;
|
|
74
|
+
receivedBytes += (chunk as Buffer).byteLength;
|
|
75
|
+
if (receivedBytes > SLACK_EVENTS_MAX_BODY_BYTES) {
|
|
76
|
+
tooLarge = true;
|
|
77
|
+
chunks.length = 0;
|
|
78
|
+
jsonError(res, `Payload too large (max ${SLACK_EVENTS_MAX_BODY_BYTES} bytes)`, 413);
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
chunks.push(chunk as Buffer);
|
|
82
|
+
}
|
|
83
|
+
if (tooLarge) return true;
|
|
84
|
+
|
|
85
|
+
const result = await receiver.handle({
|
|
86
|
+
rawBody: Buffer.concat(chunks),
|
|
87
|
+
signature: header(req, "x-slack-signature"),
|
|
88
|
+
timestamp: header(req, "x-slack-request-timestamp"),
|
|
89
|
+
contentType: header(req, "content-type"),
|
|
90
|
+
retryNum: header(req, "x-slack-retry-num"),
|
|
91
|
+
retryReason: header(req, "x-slack-retry-reason"),
|
|
92
|
+
// Read per request so a config reload takes effect; never stored or logged.
|
|
93
|
+
signingSecret: process.env.SLACK_SIGNING_SECRET as string,
|
|
94
|
+
});
|
|
95
|
+
res.writeHead(result.status, {
|
|
96
|
+
...(result.contentType ? { "Content-Type": result.contentType } : {}),
|
|
97
|
+
...result.headers,
|
|
98
|
+
});
|
|
99
|
+
res.end(result.body);
|
|
100
|
+
return true;
|
|
101
|
+
}
|
package/src/http/status.ts
CHANGED
|
@@ -44,6 +44,7 @@ import { getSlackConfiguration } from "../slack/config";
|
|
|
44
44
|
import { getSlackConnectionState } from "../slack/connection-state";
|
|
45
45
|
import { isTelemetryEnabled } from "../telemetry";
|
|
46
46
|
import { type AgentCredStatus, AutomationIntegrationIdSchema, ProviderNameSchema } from "../types";
|
|
47
|
+
import { resolveGitHubHost } from "../utils/github-host";
|
|
47
48
|
import { isRuntimePoolsEnabled } from "../utils/runtime-pools-flag";
|
|
48
49
|
import { resolveAppUrl } from "./config-values";
|
|
49
50
|
import { route } from "./route-def";
|
|
@@ -141,7 +142,7 @@ export type StatusActivity = z.infer<typeof StatusActivitySchema>;
|
|
|
141
142
|
|
|
142
143
|
export const StatusCombSchema = z.object({
|
|
143
144
|
enabled: z.boolean(),
|
|
144
|
-
/**
|
|
145
|
+
/** Why Comb is off (no `AGENT_FS_API_URL`, `COMB_ENABLED=false`, or no browser agent-fs address). Null when on. */
|
|
145
146
|
reason: z.string().nullable(),
|
|
146
147
|
api_url: z.string().nullable(),
|
|
147
148
|
live_url: z.string(),
|
|
@@ -221,6 +222,16 @@ export type AutomationStatus = z.infer<typeof AutomationStatusSchema>;
|
|
|
221
222
|
export const StatusHealthSchema = z.enum(["ok", "degraded", "broken"]);
|
|
222
223
|
export type StatusHealth = z.infer<typeof StatusHealthSchema>;
|
|
223
224
|
|
|
225
|
+
/**
|
|
226
|
+
* The GitHub web base (`GITHUB_URL`, default https://github.com) the dashboard
|
|
227
|
+
* builds and recognizes PR, issue and repo links with. Deployment-env only.
|
|
228
|
+
*/
|
|
229
|
+
export const StatusGitHubSchema = z.object({
|
|
230
|
+
web_url: z.string(),
|
|
231
|
+
enterprise: z.boolean(),
|
|
232
|
+
});
|
|
233
|
+
export type StatusGitHub = z.infer<typeof StatusGitHubSchema>;
|
|
234
|
+
|
|
224
235
|
export const StatusRuntimePoolsSchema = z.object({ enabled: z.boolean(), supervisor: z.string() });
|
|
225
236
|
|
|
226
237
|
export const StatusResponseSchema = z.object({
|
|
@@ -236,6 +247,8 @@ export const StatusResponseSchema = z.object({
|
|
|
236
247
|
telemetry: StatusTelemetrySchema.optional(),
|
|
237
248
|
/** Additive: absent on servers that predate it. */
|
|
238
249
|
instance: StatusInstanceSchema.optional(),
|
|
250
|
+
/** Additive: absent on servers that predate it, or when `GITHUB_URL` is invalid. */
|
|
251
|
+
github: StatusGitHubSchema.optional(),
|
|
239
252
|
});
|
|
240
253
|
export type StatusResponse = z.infer<typeof StatusResponseSchema>;
|
|
241
254
|
|
|
@@ -496,9 +509,6 @@ function slackMilestone(state: AutomationSetupStates["slack"]): SetupMilestone {
|
|
|
496
509
|
hint = "Slack is explicitly disabled (SLACK_DISABLE=true).";
|
|
497
510
|
} else if (!config.mode) {
|
|
498
511
|
hint = "Invalid SLACK_MODE. Use socket or http.";
|
|
499
|
-
} else if (config.mode === "http" && config.missingCredentials.length === 0) {
|
|
500
|
-
hint =
|
|
501
|
-
"HTTP credentials are configured, but HTTP ingress is unavailable until the receiver is installed.";
|
|
502
512
|
} else {
|
|
503
513
|
hint = `Set ${config.missingCredentials.join(" + ")} for Slack ${config.mode} mode.`;
|
|
504
514
|
}
|
|
@@ -511,7 +521,7 @@ function slackMilestone(state: AutomationSetupStates["slack"]): SetupMilestone {
|
|
|
511
521
|
};
|
|
512
522
|
}
|
|
513
523
|
|
|
514
|
-
if (
|
|
524
|
+
if (getSlackConnectionState() === "connected") {
|
|
515
525
|
return {
|
|
516
526
|
id: "slack",
|
|
517
527
|
label: "Slack configured",
|
|
@@ -526,7 +536,7 @@ function slackMilestone(state: AutomationSetupStates["slack"]): SetupMilestone {
|
|
|
526
536
|
state: "configured",
|
|
527
537
|
hint:
|
|
528
538
|
config.mode === "http"
|
|
529
|
-
? "HTTP credentials are configured, but
|
|
539
|
+
? "HTTP credentials are configured, but the receiver is not ready (workspace not verified yet)."
|
|
530
540
|
: "Socket Mode credentials are configured, but the bot is not connected to Slack.",
|
|
531
541
|
action_url: automationIntegrationFixUrl("slack"),
|
|
532
542
|
};
|
|
@@ -780,9 +790,17 @@ export async function buildStatusPayload(): Promise<StatusResponse> {
|
|
|
780
790
|
health: computeHealth(setup, readyLeads),
|
|
781
791
|
telemetry: { enabled: isTelemetryEnabled() },
|
|
782
792
|
instance,
|
|
793
|
+
...githubStatus(),
|
|
783
794
|
};
|
|
784
795
|
}
|
|
785
796
|
|
|
797
|
+
/** Left out on an invalid host config: the GitHub integration logs that error and stays off. */
|
|
798
|
+
function githubStatus(): { github?: StatusGitHub } {
|
|
799
|
+
const host = resolveGitHubHost();
|
|
800
|
+
if (!host.ok) return {};
|
|
801
|
+
return { github: { web_url: host.config.webUrl, enterprise: host.config.enterprise } };
|
|
802
|
+
}
|
|
803
|
+
|
|
786
804
|
function getCombStatus(serviceUserId: string | null): StatusAgentFs["comb"] {
|
|
787
805
|
const comb = getCombConfig();
|
|
788
806
|
return {
|
|
@@ -822,7 +840,7 @@ const getStatus = route({
|
|
|
822
840
|
pattern: ["status"],
|
|
823
841
|
summary: "Identity + setup readiness + live activity for the swarm dashboard",
|
|
824
842
|
description:
|
|
825
|
-
"Single source of truth consumed by the UI home page. Identity comes from SWARM_* envs; setup milestones each emit `unverified | configured | verified`; automations report `running | needs_setup` from the same runtime preflight used at dispatch; activity counts agents alive in the last 5 min, leads that can take work (status idle or busy), and tasks created in the last 24h; agent_fs reports whether AGENT_FS_API_URL is set, plus the Comb settings (whether Files is on and, when off, what is missing; the browser-facing agent-fs URL, the shared org and drive ids, and the agent-fs user id of the swarm service account); telemetry reports the effective ANONYMIZED_TELEMETRY opt-out state.",
|
|
843
|
+
"Single source of truth consumed by the UI home page. Identity comes from SWARM_* envs; setup milestones each emit `unverified | configured | verified`; automations report `running | needs_setup` from the same runtime preflight used at dispatch; activity counts agents alive in the last 5 min, leads that can take work (status idle or busy), and tasks created in the last 24h; agent_fs reports whether AGENT_FS_API_URL is set, plus the Comb settings (whether Files is on and, when off, what is missing; the browser-facing agent-fs URL, the shared org and drive ids, and the agent-fs user id of the swarm service account); telemetry reports the effective ANONYMIZED_TELEMETRY opt-out state; github reports the GitHub web base (GITHUB_URL) for PR and repo links.",
|
|
826
844
|
tags: ["Status"],
|
|
827
845
|
responses: {
|
|
828
846
|
200: { description: "Status payload", schema: StatusResponseSchema },
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { IncomingMessage } from "node:http";
|
|
2
|
+
import { resolveHttpAuditUserId } from "../be/audit-user";
|
|
3
|
+
import { findUserById } from "../be/users";
|
|
4
|
+
import { can } from "../rbac";
|
|
5
|
+
import { agentFirstPrincipal } from "./request-principal";
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Requester for a new task. Prefer trusted server-side identity: an
|
|
9
|
+
* authenticated request user, or the caller's own ownership-gated task context
|
|
10
|
+
* (`X-Source-Task-Id` / ambient current task), the upstream #939 anti-spoofing
|
|
11
|
+
* behavior.
|
|
12
|
+
*
|
|
13
|
+
* TRUST_BODY_REQUESTED_BY_USER_ID (default ON) accepts a body-supplied
|
|
14
|
+
* `requestedByUserId` as a last resort, only when the caller could not be
|
|
15
|
+
* bound to a user (shared operator key), and only after validating it names a
|
|
16
|
+
* real user. Typical single-tenant deployments share ONE operator key, so
|
|
17
|
+
* without this the UI and API callers can never attribute tasks. Set
|
|
18
|
+
* TRUST_BODY_REQUESTED_BY_USER_ID=false anywhere holders of the shared/global
|
|
19
|
+
* key are NOT all equally trusted: with it on, any such caller can attribute
|
|
20
|
+
* a task to any user.
|
|
21
|
+
*
|
|
22
|
+
* Pass `trustedUserId` when the caller already resolved it.
|
|
23
|
+
*
|
|
24
|
+
* Lives outside `tasks.ts` so route modules can share it without importing the
|
|
25
|
+
* task routes, which would change route registration order (and `openapi.json`).
|
|
26
|
+
*/
|
|
27
|
+
export async function resolveTaskRequester(
|
|
28
|
+
req: IncomingMessage,
|
|
29
|
+
myAgentId: string | undefined,
|
|
30
|
+
bodyUserId: string | undefined,
|
|
31
|
+
trustedUserId?: string | null,
|
|
32
|
+
): Promise<string | undefined> {
|
|
33
|
+
const trusted =
|
|
34
|
+
trustedUserId === undefined ? await resolveHttpAuditUserId(req, myAgentId) : trustedUserId;
|
|
35
|
+
if (trusted) return trusted;
|
|
36
|
+
if (process.env.TRUST_BODY_REQUESTED_BY_USER_ID === "false" || !bodyUserId) return undefined;
|
|
37
|
+
// A worker on the shared key is not the operator: its X-Agent-ID names it, so the body
|
|
38
|
+
// hint is dropped like it is when the worker has a requester of its own.
|
|
39
|
+
const mayAssign = can({
|
|
40
|
+
principal: await agentFirstPrincipal(req, myAgentId),
|
|
41
|
+
verb: "task.requester.assign",
|
|
42
|
+
resource: { kind: "none" },
|
|
43
|
+
source: "http",
|
|
44
|
+
}).allow;
|
|
45
|
+
return mayAssign ? (await findUserById(bodyUserId))?.id : undefined;
|
|
46
|
+
}
|