@desplega.ai/agent-swarm 2.9.1 → 2.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp-adapter-weaaxey3.js +16 -0
- package/dist/{acp-targets-ny75x1qy.js → acp-targets-5wyy2b9m.js} +9 -9
- package/dist/{actions-b9qgrmeq.js → actions-4nxq386s.js} +54 -32
- package/dist/{agent-fs-provision-b5dhdsbd.js → agent-fs-provision-v6enh76w.js} +4 -4
- package/dist/{amp-adapter-vtax2c9s.js → amp-adapter-ze3x22qn.js} +3 -3
- package/dist/{anthropic-messages-r5xf5hqw.js → anthropic-messages-88b7s3n9.js} +189 -37
- package/dist/{app-g2z15hax.js → app-kyqt8ehw.js} +7 -6
- package/dist/{approval-notifications-yt13wp8r.js → approval-notifications-a0db0esw.js} +7 -6
- package/dist/{assistant-2cgfxsgk.js → assistant-9g5jzq25.js} +26 -25
- package/dist/{azure-openai-responses-590s1eea.js → azure-openai-responses-jeaas6x0.js} +18 -18
- package/dist/{boot-args-schema-3gwy0f60.js → boot-args-schema-d7fme4q1.js} +1 -1
- package/dist/{boot-reembed-92g7s5zp.js → boot-reembed-6wpazmpw.js} +1 -1
- package/dist/{boot-reembed-mywmyp4s.js → boot-reembed-jrwxeye2.js} +1 -1
- package/dist/boot-scrub-sweep-52h7yntp.js +9 -0
- package/dist/{boot-seeds-ce7rvgq1.js → boot-seeds-kb3dxjex.js} +4 -4
- package/dist/{boxd-wn235q80.js → boxd-jrrmkv3w.js} +2 -2
- package/dist/{claude-adapter-3m4q7735.js → claude-adapter-0c0y8fqp.js} +8 -8
- package/dist/{claude-managed-adapter-t8nfgcgz.js → claude-managed-adapter-w2es07qq.js} +4 -4
- package/dist/{claude-managed-setup-c217draw.js → claude-managed-setup-9ssb7ct4.js} +4 -4
- package/dist/{claude-sdk-session-7fbqm51z.js → claude-sdk-session-p6t0gyse.js} +10941 -10412
- package/dist/{cli-2czxfnvj.js → cli-075ccjh6.js} +961 -178
- package/dist/{cli-fkef327x.js → cli-0bgj4rh5.js} +3 -3
- package/dist/{cli-1jykg0py.js → cli-14xdms9a.js} +41 -28
- package/dist/{cli-rqx70rcz.js → cli-17qzb39j.js} +5 -2
- package/dist/{cli-bkjdknnp.js → cli-1h4njv9y.js} +177 -7
- package/dist/{cli-6ym4jhzp.js → cli-27fat7st.js} +7 -7
- package/dist/{cli-kxx4k2jw.js → cli-2aacfdcn.js} +5 -5
- package/dist/{cli-fh97xn30.js → cli-2gvdvsxj.js} +3 -3
- package/dist/{cli-f9gz2vyj.js → cli-2jtfm8kh.js} +10 -10
- package/dist/{cli-6ehs4mta.js → cli-2z2c4k6q.js} +18 -4
- package/dist/{cli-6237rnyr.js → cli-3bpr3wks.js} +1 -1
- package/dist/{cli-bnqncekd.js → cli-453497a0.js} +44 -17
- package/dist/{cli-jm0hvmz2.js → cli-4aswccje.js} +2 -2
- package/dist/{cli-4ymxrwg5.js → cli-4dyzzkfb.js} +2 -2
- package/dist/{cli-vyff45ve.js → cli-4g323fjh.js} +772 -515
- package/dist/{cli-3kd08rej.js → cli-4jjrhy48.js} +1 -1
- package/dist/{cli-gfy38pvt.js → cli-4kzp7r0q.js} +8 -8
- package/dist/{cli-kxn3747f.js → cli-4se3x6qm.js} +1 -26
- package/dist/{cli-mjw0yf82.js → cli-5ptj757f.js} +1 -1
- package/dist/{cli-pyjn0qhk.js → cli-6a3j25xd.js} +348 -196
- package/dist/{cli-hnamkvnc.js → cli-6c9ve77f.js} +2 -2
- package/dist/{cli-mw620q3n.js → cli-6n7y5ypy.js} +1 -1
- package/dist/{cli-g0vv9dg4.js → cli-6p8p2e6r.js} +19 -12
- package/dist/{cli-jwampxxq.js → cli-6tvh1fwq.js} +3 -3
- package/dist/{cli-p74md7t8.js → cli-7b7rxz22.js} +13 -15
- package/dist/{cli-5a6pqy45.js → cli-7e8sxqv5.js} +1 -1
- package/dist/{cli-p4kckx1z.js → cli-892y3vfp.js} +13 -13
- package/dist/cli-8mfdbdhe.js +43 -0
- package/dist/{cli-mkwkwq81.js → cli-8zmpwe79.js} +29 -16
- package/dist/{cli-zcfpsfzf.js → cli-96234j5w.js} +3 -3
- package/dist/{cli-1z4qggfe.js → cli-9fvk9mv8.js} +30 -21
- package/dist/{cli-7mv4h3sn.js → cli-9g12h1aq.js} +2 -2
- package/dist/{cli-f8x9drqr.js → cli-9knhkkgr.js} +19 -5
- package/dist/{cli-5mpy301f.js → cli-9t7syepg.js} +1 -1
- package/dist/{cli-qj39vrc6.js → cli-9yjhshah.js} +1 -1
- package/dist/{cli-zr6qy15y.js → cli-a02habn6.js} +427 -145
- package/dist/{cli-7evph51z.js → cli-a49frv85.js} +2 -2
- package/dist/{cli-h9yqfzx9.js → cli-a6q6x15h.js} +11 -10
- package/dist/{cli-bg63qmsx.js → cli-atm0hkes.js} +11 -11
- package/dist/{cli-m7zvgt57.js → cli-b82a13ga.js} +13 -13
- package/dist/{cli-7zm3b3f5.js → cli-bf0t77nf.js} +1 -1
- package/dist/{cli-2xv18ywz.js → cli-bmqp0ser.js} +2 -2
- package/dist/{cli-xag7btpe.js → cli-bq97k63w.js} +2 -2
- package/dist/{cli-pb2ay3sh.js → cli-cstggwq7.js} +5 -5
- package/dist/{cli-f3jyzq4g.js → cli-czvvnfr9.js} +3 -3
- package/dist/{cli-b6px1k1q.js → cli-dd2k2mcd.js} +1 -1
- package/dist/{cli-nafvvsp8.js → cli-djt6wmrc.js} +9 -9
- package/dist/{cli-tsa40663.js → cli-ebqx630g.js} +3 -3
- package/dist/{cli-8zh9nrew.js → cli-f7dhm7hh.js} +1 -1
- package/dist/cli-f8yhybxr.js +321 -0
- package/dist/{cli-5gpqgs8b.js → cli-fwjwkw66.js} +2 -2
- package/dist/{cli-gabsjg8x.js → cli-g56fxddf.js} +1 -1
- package/dist/{cli-w4n323t3.js → cli-h2qtafm4.js} +19 -19
- package/dist/{cli-psffsanb.js → cli-ha4ek2nb.js} +6 -1
- package/dist/{cli-dgs10ttj.js → cli-hnh8erra.js} +2 -2
- package/dist/{cli-w16kwbzw.js → cli-htymm48w.js} +1 -1
- package/dist/{cli-2xs8tsf7.js → cli-j2r1apqm.js} +152 -67
- package/dist/{cli-43ms35q9.js → cli-k3c13za2.js} +3 -3
- package/dist/{cli-54vrpgm0.js → cli-k3facve0.js} +8 -5
- package/dist/{cli-67mwzr35.js → cli-k4r5sfaj.js} +7 -7
- package/dist/{cli-rq5rpv6k.js → cli-kbm659dk.js} +2 -2
- package/dist/{cli-j7svy295.js → cli-m00c47q6.js} +114 -31
- package/dist/{cli-m7c2380k.js → cli-mhrr4d5b.js} +99 -14
- package/dist/{cli-xqdz5cqm.js → cli-mz7ycqn8.js} +1 -0
- package/dist/{cli-vt89089n.js → cli-n6ygvrrm.js} +4 -4
- package/dist/{cli-jaw5v1sy.js → cli-nbakg5xh.js} +3 -3
- package/dist/{cli-nbt14he0.js → cli-nc39ym5q.js} +8 -8
- package/dist/{cli-tvc4jag9.js → cli-p1a4khta.js} +8 -8
- package/dist/{cli-t9ga4qmb.js → cli-p8zqbbt1.js} +40 -33
- package/dist/{cli-fjggej24.js → cli-ph95yejc.js} +2 -2
- package/dist/{cli-m0cy2vyf.js → cli-q4z9s6zs.js} +5 -5
- package/dist/cli-q71g5q39.js +404 -0
- package/dist/{cli-vs9vdpy0.js → cli-qncx2r0s.js} +1 -1
- package/dist/{cli-hg42n3hx.js → cli-qrzq3hvg.js} +8 -8
- package/dist/{cli-x40a0w9j.js → cli-r813c7rb.js} +1 -1
- package/dist/{cli-kpgcm7xy.js → cli-ramn8jae.js} +1 -1
- package/dist/{cli-jkw6ptfw.js → cli-raqw9fw9.js} +28 -17
- package/dist/cli-rhsc2zyx.js +68 -0
- package/dist/{cli-sn650d7x.js → cli-rpmw4fsv.js} +68 -20
- package/dist/{boot-scrub-sweep-7dkdzqxx.js → cli-rwgwen5v.js} +9 -10
- package/dist/{cli-3j873zxq.js → cli-rytq7dm2.js} +261 -6
- package/dist/{cli-zh0e5x7p.js → cli-s9twe4x0.js} +71 -22
- package/dist/{cli-2dq9yv8p.js → cli-t2s7j5cy.js} +2 -2
- package/dist/{cli-wn13hhdt.js → cli-tb4j757d.js} +7 -7
- package/dist/{cli-q2d3e1k1.js → cli-thd3005a.js} +1 -1
- package/dist/cli-tsfkcd4v.js +30 -0
- package/dist/{cli-br0924pw.js → cli-v3zcnr8g.js} +1 -1
- package/dist/{cli-zfqg6fzn.js → cli-vbppqvte.js} +3 -3
- package/dist/{cli-ysvspf5e.js → cli-vy3fn0mz.js} +4 -4
- package/dist/{cli-7sf9sb0w.js → cli-w5dar1bk.js} +1 -1
- package/dist/{cli-2yjj3e31.js → cli-wz4e5am2.js} +12 -10
- package/dist/{cli-td9tb872.js → cli-xqbqwpxr.js} +14 -14
- package/dist/{cli-32djehja.js → cli-ynph3b70.js} +11137 -8332
- package/dist/{cli-mhapr559.js → cli-yvzxbztc.js} +9 -4
- package/dist/{cli-v57d7fmm.js → cli-yzxqwcvq.js} +25 -27
- package/dist/{cli-y2ewxhth.js → cli-zb1hff00.js} +16 -16
- package/dist/{cli-yab6sh8p.js → cli-zcghfsdg.js} +23 -4
- package/dist/{cli-ctx0b85j.js → cli-zhn4r1rz.js} +757 -157
- package/dist/{cli-6945ywhr.js → cli-zqq57pgx.js} +9 -7
- package/dist/cli.js +30 -29
- package/dist/{cloudflare-workers-ai-system-one-9y1zx3pt.js → cloudflare-workers-ai-system-one-w3m0fbf8.js} +2 -2
- package/dist/{codex-adapter-n656pvb8.js → codex-adapter-ssahg4h4.js} +8 -8
- package/dist/{codex-hook-59atdwd8.js → codex-hook-aqtj17yr.js} +1 -1
- package/dist/{codex-login-a239g1ah.js → codex-login-9c7aggxe.js} +1 -1
- package/dist/{codex-session-runner-p0fbv5y9.js → codex-session-runner-xn63q3h7.js} +9 -9
- package/dist/{commands-gwea8z5p.js → commands-ctey7tr5.js} +3 -3
- package/dist/{controller-t67c3grh.js → controller-rqhbppg9.js} +4 -4
- package/dist/{controllers-connect-ks155r0h.js → controllers-connect-w3qbpbt1.js} +22 -21
- package/dist/core-df1n049h.js +39 -0
- package/dist/{cursor-adapter-ygwrtmkv.js → cursor-adapter-r819hf1a.js} +2 -2
- package/dist/{db-kpmx06s9.js → db-2ah39cyx.js} +2 -2
- package/dist/{db-rb2xqdb1.js → db-p5drc1d1.js} +3 -3
- package/dist/{devin-adapter-zp4tqq53.js → devin-adapter-bc6g0x29.js} +1 -1
- package/dist/{dispatcher-31sm0ej2.js → dispatcher-x6w14pde.js} +19 -18
- package/dist/{docker-09tkkg0n.js → docker-6c4reetq.js} +51 -14
- package/dist/{dsh-adapter-qyxh0w31.js → dsh-adapter-h8qn14n4.js} +2 -2
- package/dist/{e2b-sm28k0k3.js → e2b-jg7kyyef.js} +6 -6
- package/dist/{e2b-3v1e745x.js → e2b-z4ec0qve.js} +3 -3
- package/dist/{easter-egg-3d-00wjscn6.js → easter-egg-3d-1y6r9gxy.js} +1 -1
- package/dist/{embedding-space-qhw4g68n.js → embedding-space-z6ptw3jk.js} +6 -6
- package/dist/{embeddings-zdv9ke6x.js → embeddings-0sxb1d2h.js} +1 -1
- package/dist/{event-bus-xr83x566.js → event-bus-swr88jg5.js} +1 -1
- package/dist/{execute-zna8wwr7.js → execute-6m1ex8ce.js} +8 -4
- package/dist/{external-channel-1ac6t56s.js → external-channel-ezer7pk0.js} +2 -2
- package/dist/fx-adapter-zwmps9re.js +19 -0
- package/dist/{google-generative-ai-maq6c9bf.js → google-generative-ai-sw77egmr.js} +13 -13
- package/dist/{google-vertex-2jgsw2nb.js → google-vertex-rrw93g8h.js} +13 -13
- package/dist/grok-adapter-q0avf919.js +19 -0
- package/dist/handlers-g5jq0e4q.js +36 -0
- package/dist/{heartbeat-2f6z4kdx.js → heartbeat-6c4fr49t.js} +22 -21
- package/dist/{hook-8y0gvtp1.js → hook-02rt5tvq.js} +8 -8
- package/dist/{hook-w1skzaqc.js → hook-t1c5avbv.js} +5 -5
- package/dist/{http-wghxvpef.js → http-qa3h32a1.js} +2659 -355
- package/dist/index-1f6m47mq.js +37 -0
- package/dist/index-1p1mpqda.js +36 -0
- package/dist/{index-rv89fvzf.js → index-akbgsdhh.js} +25 -24
- package/dist/{index-9zkchs9t.js → index-e42j998x.js} +190 -15
- package/dist/{index-b5wgnm78.js → index-kdmkfjt7.js} +4 -4
- package/dist/{index-s71ez27v.js → index-kqv9ebfj.js} +1 -1
- package/dist/{index-9myfj74s.js → index-kzdqn3dd.js} +3 -3
- package/dist/{index-4a0670yh.js → index-p2f5xg64.js} +6 -6
- package/dist/{index-8zn8nxn5.js → index-qpjk2hxk.js} +1 -1
- package/dist/index-tnkd410q.js +41 -0
- package/dist/k8s-7jrh5va2.js +276 -0
- package/dist/{keepalive-sh02349h.js → keepalive-jmf6pn8c.js} +4 -4
- package/dist/lead-m5e7xt93.js +75 -0
- package/dist/{llama-cpp-classify-nfgswa1m.js → llama-cpp-classify-yvb8vh7w.js} +2 -2
- package/dist/{maintenance-yj0dcjja.js → maintenance-g7v15tj1.js} +1 -1
- package/dist/{mistral-conversations-0c30em7t.js → mistral-conversations-w4bncwbt.js} +11 -11
- package/dist/{node-7qsx5kvm.js → node-z67yjre7.js} +19 -13
- package/dist/{oauth-refresh-sweep-d9xedk66.js → oauth-refresh-sweep-ywgf8tbr.js} +3 -3
- package/dist/{onboard-dpgjn03r.js → onboard-m3fedypq.js} +6 -6
- package/dist/{openai-codex-responses-bkcd8pjj.js → openai-codex-responses-70g39cgz.js} +24 -18
- package/dist/{openai-completions-f3n69rep.js → openai-completions-cv3hp4h5.js} +33 -26
- package/dist/{openai-decisions-q3hh60wr.js → openai-decisions-fyq1p9f9.js} +2 -2
- package/dist/{openai-responses-gbh0wfqe.js → openai-responses-trsvnks6.js} +24 -22
- package/dist/{opencode-adapter-2d31cpjc.js → opencode-adapter-19ktcbb9.js} +7 -7
- package/dist/{openrouter-images-xr9gme9x.js → openrouter-images-0jj12a2q.js} +6 -6
- package/dist/{otel-impl-1skarpfq.js → otel-impl-3ehm1hgc.js} +2 -2
- package/dist/{pending-bfmxtx0g.js → pending-fwj2fatd.js} +20 -19
- package/dist/{pi-messages-zebyt7gb.js → pi-messages-zk3g4esn.js} +6 -6
- package/dist/{pi-mono-adapter-gvppnasy.js → pi-mono-adapter-xdeesvc4.js} +18 -17
- package/dist/{pricing-refresh-c6b325mk.js → pricing-refresh-4j8dzvxg.js} +2 -2
- package/dist/{rbac-roles-h80qbdbs.js → rbac-roles-8msjr07m.js} +3 -3
- package/dist/{rbac-roles-zfcx68tx.js → rbac-roles-n7t2acv8.js} +2 -2
- package/dist/{render-v2-nx20t3rb.js → render-v2-j7qggj8h.js} +7 -6
- package/dist/{resume-5ep8agan.js → resume-hj1mn65y.js} +9 -8
- package/dist/{runtime-r3pj4mce.js → runtime-z31mdsgv.js} +2 -2
- package/dist/{session-access-n7p3m15b.js → session-access-w38fh09a.js} +4 -4
- package/dist/{session-source-backfill-v8mt0zwn.js → session-source-backfill-ax6qxv20.js} +3 -3
- package/dist/{setup-z1psaqhe.js → setup-dsqmpfcr.js} +1 -1
- package/dist/thread-buffer-nf55vwx3.js +39 -0
- package/dist/tree-visibility-6vqmnr71.js +24 -0
- package/dist/{typesafe-system-one-f2en2knd.js → typesafe-system-one-qkvkgrcz.js} +2 -2
- package/dist/user-merge-jobs-mvheb3ed.js +22 -0
- package/dist/{virtual-modules-rrbjdpxn.js → virtual-modules-w2qk2wew.js} +32 -10
- package/dist/{work-objects-4aghh73z.js → work-objects-4ahy5es5.js} +22 -21
- package/dist/worker-ews1nyhw.js +75 -0
- package/dist/{worker-follow-up-166zmex1.js → worker-follow-up-1gs4aw7y.js} +19 -18
- package/dist/{x-wg164ss9.js → x-3wr8c5sh.js} +2 -2
- package/openapi.json +2576 -388
- package/package.json +11 -10
- package/src/be/boot-seeds.ts +7 -1
- package/src/be/db/model-groups.ts +238 -0
- package/src/be/db/model-profiles.ts +26 -8
- package/src/be/db/request-composition.ts +190 -0
- package/src/be/db/runtime.ts +15 -0
- package/src/be/db/session-costs.ts +8 -2
- package/src/be/db/slack-trees.ts +220 -10
- package/src/be/db/tasks/human-free.ts +3 -2
- package/src/be/db/tasks/read.ts +3 -2
- package/src/be/db/tasks/write.ts +2 -1
- package/src/be/db/user-references.ts +75 -0
- package/src/be/db/users/references.ts +185 -0
- package/src/be/db/workflow-run-retention.ts +101 -0
- package/src/be/db-client.ts +93 -20
- package/src/be/db-retention-defaults.ts +46 -0
- package/src/be/db-retention.ts +55 -6
- package/src/be/db.ts +32 -57
- package/src/be/key-window-usage.ts +1 -0
- package/src/be/mcp-events/catalog.ts +108 -0
- package/src/be/mcp-events/dispatcher.ts +202 -0
- package/src/be/mcp-events/protocol.ts +296 -0
- package/src/be/mcp-events/store.ts +231 -0
- package/src/be/mcp-events/webhook.ts +226 -0
- package/src/be/memory/demotion-evidence.ts +34 -0
- package/src/be/memory/providers/sqlite-store.ts +110 -24
- package/src/be/memory/reranker.ts +34 -12
- package/src/be/memory/review-recall-filter.ts +105 -0
- package/src/be/memory/search-candidates.ts +16 -5
- package/src/be/memory/types.ts +16 -0
- package/src/be/migrations/312_task_ui_action_runs_repeatable.sql +6 -0
- package/src/be/migrations/314_model_groups.sql +85 -0
- package/src/be/migrations/318_superseded_workflow_cut_backfill.sql +22 -0
- package/src/be/migrations/319_user_fk_indexes.sql +153 -0
- package/src/be/migrations/320_session_costs_kind.sql +4 -0
- package/src/be/migrations/321_user_merge_jobs.sql +52 -0
- package/src/be/migrations/322_runtime_pool_workspace.sql +8 -0
- package/src/be/migrations/323_slack_task_tree_visibility.sql +9 -0
- package/src/be/migrations/326_slack_reconcile_pages.sql +13 -0
- package/src/be/migrations/327_mcp_event_subscriptions.sql +57 -0
- package/src/be/migrations/329_workflow_run_retention.sql +9 -0
- package/src/be/migrations/330_request_composition.sql +22 -0
- package/src/be/model-profile-check.ts +1 -1
- package/src/be/multi-runtime.ts +32 -4
- package/src/be/pricing-normalize.ts +2 -0
- package/src/be/rbac-roles.ts +6 -4
- package/src/be/runtime-pools/controllers.ts +18 -3
- package/src/be/runtime-pools/db.ts +35 -9
- package/src/be/runtime-pools/supervisor.ts +57 -3
- package/src/be/scripts/db.ts +11 -0
- package/src/be/scripts/typecheck.ts +2 -0
- package/src/be/seed-model-groups.ts +86 -0
- package/src/be/seed-model-profiles.ts +20 -13
- package/src/be/seed-scripts/catalog/dreaming-gather.ts +165 -1
- package/src/be/swarm-config-guard.ts +44 -2
- package/src/be/task-ui-spec.ts +102 -1
- package/src/be/user-merge-jobs.ts +564 -0
- package/src/be/users.ts +41 -23
- package/src/commands/context-preamble.ts +11 -4
- package/src/commands/credential-outcome-report.ts +33 -9
- package/src/commands/e2b-stack-wizard.tsx +12 -6
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +1 -1
- package/src/commands/onboard/env-generator.ts +1 -1
- package/src/commands/provider-credentials.ts +1 -1
- package/src/commands/runner.ts +116 -12
- package/src/extensions/catalog.generated.json +1 -1
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/contract.ts +15 -0
- package/src/extensions/dispatcher.ts +14 -4
- package/src/github/app.ts +59 -14
- package/src/github/handlers.ts +57 -0
- package/src/github/types.ts +4 -0
- package/src/http/all-routes.ts +4 -0
- package/src/http/approval-requests.ts +5 -1
- package/src/http/auth.ts +3 -1
- package/src/http/config.ts +36 -2
- package/src/http/core.ts +2 -0
- package/src/http/github-token.ts +66 -0
- package/src/http/index.ts +34 -0
- package/src/http/mcp-user.ts +11 -8
- package/src/http/mcp.ts +58 -42
- package/src/http/memory.ts +19 -6
- package/src/http/model-groups.ts +277 -0
- package/src/http/model-profiles.ts +30 -13
- package/src/http/prompt-templates.ts +1 -0
- package/src/http/request-composition.ts +310 -0
- package/src/http/tasks.ts +46 -6
- package/src/http/tool-hooks.ts +140 -0
- package/src/http/tool-schema-estimate.ts +95 -0
- package/src/http/users.ts +142 -19
- package/src/http/workflows.ts +37 -1
- package/src/integrations/chat-sdk/inbound.ts +8 -2
- package/src/integrations/chat-sdk/limits.ts +8 -3
- package/src/prompts/base-prompt.ts +133 -7
- package/src/prompts/resolver.ts +41 -2
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/opencode-adapter.ts +72 -1
- package/src/providers/opencode-swarm-plugin.ts +22 -3
- package/src/providers/pi-mono-adapter.ts +1 -0
- package/src/providers/pi-mono-extension.ts +71 -0
- package/src/providers/pricing-sources.md +13 -0
- package/src/providers/request-composition-hook.ts +312 -0
- package/src/providers/types.ts +5 -0
- package/src/rbac/legacy-policy.ts +1 -0
- package/src/rbac/permissions.ts +5 -0
- package/src/runtime-providers/controller-protocol.ts +7 -0
- package/src/runtime-providers/docker.ts +80 -12
- package/src/runtime-providers/index.ts +7 -5
- package/src/runtime-providers/k8s.ts +355 -0
- package/src/runtime-providers/types.ts +17 -0
- package/src/scheduler/scheduler.ts +1 -1
- package/src/scripts-runtime/types/stdlib.d.ts +2 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +16 -1
- package/src/scripts-runtime/types/swarm-sdk.d.ts +2 -0
- package/src/server-user.ts +16 -1
- package/src/slack/ack.ts +10 -5
- package/src/slack/actions.ts +36 -13
- package/src/slack/app.ts +2 -0
- package/src/slack/assistant.ts +4 -4
- package/src/slack/blocks.ts +26 -5
- package/src/slack/handlers.ts +3 -3
- package/src/slack/reaction-shortcode.ts +23 -2
- package/src/slack/render-v2.ts +344 -200
- package/src/slack/responses.ts +7 -5
- package/src/slack/thread-buffer.ts +3 -3
- package/src/slack/tree-visibility.ts +64 -0
- package/src/tasks/worker-follow-up.ts +127 -17
- package/src/tests/acp-adapter.test.ts +26 -0
- package/src/tests/azure-devops-outbound.test.ts +47 -14
- package/src/tests/base-prompt.test.ts +149 -1
- package/src/tests/chat-sdk-relay.test.ts +21 -1
- package/src/tests/check-playwright-version.test.ts +33 -0
- package/src/tests/check-pr-body.test.ts +43 -0
- package/src/tests/context-preamble-budget.test.ts +65 -0
- package/src/tests/credential-check.test.ts +14 -6
- package/src/tests/credential-outcome-report.test.ts +81 -1
- package/src/tests/db-client.test.ts +168 -0
- package/src/tests/db-retention-defaults.test.ts +244 -0
- package/src/tests/db-retention.test.ts +2 -1
- package/src/tests/db-runtime.test.ts +2 -1
- package/src/tests/deploy-guard.test.ts +7 -7
- package/src/tests/deploy-release-dispatch.test.ts +332 -0
- package/src/tests/deploy-select.test.ts +83 -0
- package/src/tests/dreaming-gather-corrections.test.ts +467 -0
- package/src/tests/e2b-stack-wizard.test.tsx +156 -0
- package/src/tests/entrypoint-chown-no-follow.test.ts +69 -0
- package/src/tests/entrypoint-repo-clone-target.test.ts +112 -0
- package/src/tests/env-flag.test.ts +4 -2
- package/src/tests/event-loop-lag.test.ts +16 -20
- package/src/tests/extensions-example-slack-reply-gate.test.ts +15 -0
- package/src/tests/fixtures/base-prompt-baseline-cases.ts +78 -0
- package/src/tests/fixtures/base-prompt-baseline.json +18 -0
- package/src/tests/fixtures/extensions/native-tool-recorder/hooks.ts +26 -0
- package/src/tests/fixtures/extensions/native-tool-recorder/manifest.json +10 -0
- package/src/tests/fixtures/onboard/content.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/content.env.txt +1 -1
- package/src/tests/fixtures/onboard/dev.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/dev.env.txt +1 -1
- package/src/tests/fixtures/onboard/full-all.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/full-all.env.txt +1 -1
- package/src/tests/fixtures/onboard/full.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/full.env.txt +1 -1
- package/src/tests/fixtures/onboard/research.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/research.env.txt +1 -1
- package/src/tests/fixtures/onboard/solo.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/solo.env.txt +1 -1
- package/src/tests/github-app-worker-auth-helper.test.ts +325 -0
- package/src/tests/github-event-filter.test.ts +8 -0
- package/src/tests/github-handlers-inline-comments.test.ts +2 -0
- package/src/tests/github-handlers-reactions.test.ts +4 -0
- package/src/tests/github-handlers.test.ts +3 -0
- package/src/tests/github-installation-token-route.test.ts +199 -0
- package/src/tests/github-sender-trust.test.ts +223 -0
- package/src/tests/http-users.test.ts +142 -41
- package/src/tests/k8s-pool-smoke.test.ts +190 -0
- package/src/tests/key-window-usage.test.ts +15 -0
- package/src/tests/mcp-user-events.test.ts +708 -0
- package/src/tests/memory-key-paths.test.ts +4 -1
- package/src/tests/memory-rater-store.test.ts +35 -1
- package/src/tests/memory-reranker.test.ts +39 -4
- package/src/tests/memory-review-recall-filter.test.ts +205 -0
- package/src/tests/memory-search-stall.test.ts +421 -0
- package/src/tests/migration-318-superseded-workflow-cut-backfill.test.ts +74 -0
- package/src/tests/migration-322-runtime-pool-workspace.test.ts +116 -0
- package/src/tests/migration-329-workflow-run-retention.test.ts +32 -0
- package/src/tests/model-groups-api.test.ts +415 -0
- package/src/tests/model-profile-fallbacks.test.ts +236 -2
- package/src/tests/model-profiles-api.test.ts +1 -0
- package/src/tests/opencode-adapter.test.ts +86 -0
- package/src/tests/operator-granted-credentials.test.ts +7 -2
- package/src/tests/operator-granted-role-wire.test.ts +2 -1
- package/src/tests/pi-mono-extension.test.ts +168 -0
- package/src/tests/preload-env.test.ts +61 -1
- package/src/tests/preload.ts +22 -0
- package/src/tests/prompt-template-resolver.test.ts +85 -0
- package/src/tests/rbac-engine.test.ts +1 -0
- package/src/tests/reload-config.test.ts +45 -0
- package/src/tests/request-composition.test.ts +447 -0
- package/src/tests/runner-max-concurrent.test.ts +86 -0
- package/src/tests/runtime-k8s-pools.test.ts +142 -0
- package/src/tests/runtime-pools-db.test.ts +122 -2
- package/src/tests/runtime-pools-http.test.ts +47 -2
- package/src/tests/runtime-provider-registration.test.ts +13 -14
- package/src/tests/runtime-providers-docker.test.ts +192 -1
- package/src/tests/runtime-providers-k8s.test.ts +430 -0
- package/src/tests/runtime-remote-controller.test.ts +64 -1
- package/src/tests/runtime-supervisor.test.ts +101 -0
- package/src/tests/script-connections.test.ts +21 -1
- package/src/tests/short-id.test.ts +23 -0
- package/src/tests/slack-blocks.test.ts +87 -0
- package/src/tests/slack-empty-icon-config.test.ts +113 -0
- package/src/tests/slack-reaction-config.test.ts +38 -2
- package/src/tests/slack-render-v2-query-plans.test.ts +100 -1
- package/src/tests/slack-render-v2-reconcile.test.ts +75 -4
- package/src/tests/slack-render-v2.test.ts +737 -11
- package/src/tests/spec-base-url.test.ts +13 -1
- package/src/tests/swarm-config-reserved-keys.test.ts +1 -0
- package/src/tests/system-one-decide-session-cost.test.ts +196 -0
- package/src/tests/task-session-prompts.test.ts +37 -0
- package/src/tests/task-ui-action-route.test.ts +59 -1
- package/src/tests/task-ui-script-actions.test.ts +517 -0
- package/src/tests/tool-hooks-http.test.ts +187 -0
- package/src/tests/ui-spec-script-actions-config.test.ts +196 -0
- package/src/tests/user-delete-perf.test.ts +348 -0
- package/src/tests/user-merge-jobs.test.ts +680 -0
- package/src/tests/vcs-provider.test.ts +25 -5
- package/src/tests/vendored-openapi.test.ts +13 -1
- package/src/tests/webhook-filter.test.ts +327 -0
- package/src/tests/workflow-agent-task-retry.test.ts +62 -0
- package/src/tests/workflow-async-v2.test.ts +19 -16
- package/src/tests/workflow-definition-telemetry.test.ts +15 -5
- package/src/tests/workflow-e2e.test.ts +1 -9
- package/src/tests/workflow-finalization-races.test.ts +553 -0
- package/src/tests/workflow-foreach-supersede-retry.test.ts +10 -0
- package/src/tests/workflow-foreach.test.ts +2 -0
- package/src/tests/workflow-hitl-routing.test.ts +26 -20
- package/src/tests/workflow-http-v2.test.ts +132 -2
- package/src/tests/workflow-idempotency.test.ts +41 -0
- package/src/tests/workflow-mcp-webhook-filter.test.ts +214 -0
- package/src/tests/workflow-parallel-park.test.ts +297 -0
- package/src/tests/workflow-replay.test.ts +10 -1
- package/src/tests/workflow-retry-v2.test.ts +57 -21
- package/src/tests/workflow-retry-validation.test.ts +13 -13
- package/src/tests/workflow-runs-retention.test.ts +533 -0
- package/src/tests/workflow-script-principal.test.ts +7 -2
- package/src/tests/workflow-tla-races.test.ts +7 -2
- package/src/tests/workflow-triggers-v2.test.ts +329 -0
- package/src/tests/workflow-wait-builtin-events.test.ts +3 -1
- package/src/tests/workflow-wait-event.test.ts +137 -3
- package/src/tests/workflow-wait-poller.test.ts +94 -0
- package/src/tests/workflow-wait-time.test.ts +7 -3
- package/src/tests/workflow-wait.test.ts +26 -0
- package/src/tests/workflow-wait.ts +44 -0
- package/src/tools/memory-search.ts +14 -3
- package/src/tools/store-progress.ts +26 -26
- package/src/tools/swarm-config/delete-config.ts +12 -1
- package/src/tools/swarm-config/set-config.ts +8 -0
- package/src/tools/system-one-decide.ts +113 -3
- package/src/tools/utils.ts +4 -1
- package/src/tools/workflows/create-workflow.ts +7 -1
- package/src/tools/workflows/update-workflow.ts +8 -2
- package/src/types.ts +284 -2
- package/src/ui-spec/actions.ts +30 -4
- package/src/ui-spec/schema.ts +38 -0
- package/src/ui-spec/script-actions.ts +340 -0
- package/src/ui-spec/script-allowlist.ts +48 -0
- package/src/utils/credentials.ts +7 -0
- package/src/utils/short-id.ts +20 -14
- package/src/utils/task-ui-spec.ts +16 -4
- package/src/vcs/index.ts +12 -2
- package/src/workflows/checkpoint.ts +18 -0
- package/src/workflows/engine.ts +38 -10
- package/src/workflows/executors/system-one-decision.ts +2 -2
- package/src/workflows/foreach-driver.ts +42 -4
- package/src/workflows/recovery.ts +6 -1
- package/src/workflows/resume.ts +14 -5
- package/src/workflows/retry-poller.ts +17 -4
- package/src/workflows/successor-routing.ts +108 -0
- package/src/workflows/task-step-routing.ts +35 -12
- package/src/workflows/triggers.ts +25 -8
- package/src/workflows/wait-poller.ts +6 -2
- package/src/workflows/webhook-filter.ts +203 -0
- package/templates/extensions/manifest.schema.json +13 -0
- package/templates/extensions/slack-reply-gate/hooks.ts +8 -4
- package/templates/skills/swarm-docs/content.md +4 -0
- package/templates/skills/ui-spec/content.md +7 -1
- package/templates/workflows/dreaming/content.md +1 -1
- package/dist/acp-adapter-g909b5hw.js +0 -16
- package/dist/cli-b91nz213.js +0 -93
- package/dist/fx-adapter-sk7n0fzc.js +0 -19
- package/dist/grok-adapter-sjbcm5ew.js +0 -19
- package/dist/handlers-yzy0c87x.js +0 -35
- package/dist/index-25pvya7q.js +0 -40
- package/dist/index-2t4859r5.js +0 -35
- package/dist/index-cxca2t8y.js +0 -36
- package/dist/lead-gk4h5eg7.js +0 -74
- package/dist/thread-buffer-a1re2r9r.js +0 -38
- package/dist/worker-3dyyb8ev.js +0 -74
- /package/dist/{node-dqm4xgxw.js → node-2wfcey7d.js} +0 -0
package/src/http/users.ts
CHANGED
|
@@ -22,7 +22,9 @@
|
|
|
22
22
|
* POST /api/connector/exchange (public: the code is the credential)
|
|
23
23
|
* POST /api/invites
|
|
24
24
|
* POST /api/invites/exchange (public: the code is the credential)
|
|
25
|
-
* POST /api/users/:id/merge
|
|
25
|
+
* POST /api/users/:id/merge (202: queues a user_merge_jobs row)
|
|
26
|
+
* GET /api/users/merge-jobs (must precede /:id)
|
|
27
|
+
* GET /api/users/merge-jobs/:jobId
|
|
26
28
|
* GET /api/users/:id/events
|
|
27
29
|
* POST /api/users/:id/identities
|
|
28
30
|
* DELETE /api/users/:id/identities/:kind/:externalId
|
|
@@ -43,7 +45,6 @@ import {
|
|
|
43
45
|
createUser,
|
|
44
46
|
deleteBudget,
|
|
45
47
|
deleteKv,
|
|
46
|
-
deleteUser,
|
|
47
48
|
getAllUsers,
|
|
48
49
|
getDbClient,
|
|
49
50
|
getUserById,
|
|
@@ -60,6 +61,15 @@ import {
|
|
|
60
61
|
OperatorGrantedTargetError,
|
|
61
62
|
setUserRoles,
|
|
62
63
|
} from "../be/rbac-roles";
|
|
64
|
+
import {
|
|
65
|
+
createUserMergeJob,
|
|
66
|
+
findActiveUserMergeJob,
|
|
67
|
+
findFailedUserMergeJob,
|
|
68
|
+
getUserMergeJob,
|
|
69
|
+
listUserMergeJobs,
|
|
70
|
+
requeueUserMergeJob,
|
|
71
|
+
runUserMergeJobs,
|
|
72
|
+
} from "../be/user-merge-jobs";
|
|
63
73
|
import {
|
|
64
74
|
findUserByEmail,
|
|
65
75
|
getUserIdentities,
|
|
@@ -70,11 +80,17 @@ import {
|
|
|
70
80
|
listUserTokens,
|
|
71
81
|
mintToken,
|
|
72
82
|
recordIdentityEvent,
|
|
83
|
+
revokeAllUserCredentials,
|
|
73
84
|
revokeToken,
|
|
74
85
|
unlinkIdentity,
|
|
75
86
|
} from "../be/users";
|
|
76
87
|
import { isRbacEnabled } from "../rbac";
|
|
77
|
-
import {
|
|
88
|
+
import {
|
|
89
|
+
UserCommsPrefsSchema,
|
|
90
|
+
UserMergeJobSchema,
|
|
91
|
+
UserMergeJobStatusSchema,
|
|
92
|
+
UserSchema,
|
|
93
|
+
} from "../types";
|
|
78
94
|
import { DEFAULT_APP_URL } from "../utils/constants";
|
|
79
95
|
import { assertUrlSafe } from "../utils/egress-guard";
|
|
80
96
|
import { authUser, getRequestAuth } from "../utils/request-auth-context";
|
|
@@ -600,14 +616,16 @@ const mergeUsersRoute = route({
|
|
|
600
616
|
method: "post",
|
|
601
617
|
path: "/api/users/{id}/merge",
|
|
602
618
|
pattern: ["api", "users", null, "merge"],
|
|
603
|
-
summary: "Merge another user into this one
|
|
619
|
+
summary: "Merge another user into this one: moves identities + email aliases, queues the rest",
|
|
620
|
+
description:
|
|
621
|
+
"Moves the source's identities and email aliases to the target, revokes the source's credentials and records a manual_merge event, all in one short transaction. The attribution rewrite across every table and the deletion of the source run as a background job; poll GET /api/users/merge-jobs/{jobId} until its status is done or failed. While the job runs, the source cannot authenticate and identity lookups resolve to the target.",
|
|
604
622
|
tags: ["Users"],
|
|
605
623
|
params: z.object({ id: z.string() }),
|
|
606
624
|
body: z.object({ sourceUserId: z.string().min(1) }),
|
|
607
625
|
responses: {
|
|
608
|
-
|
|
609
|
-
description: "
|
|
610
|
-
schema: z.object({
|
|
626
|
+
202: {
|
|
627
|
+
description: "The queued merge job",
|
|
628
|
+
schema: z.object({ job: UserMergeJobSchema }),
|
|
611
629
|
},
|
|
612
630
|
400: { description: "Validation error (e.g. target == source)" },
|
|
613
631
|
401: { description: "Unauthorized" },
|
|
@@ -616,7 +634,48 @@ const mergeUsersRoute = route({
|
|
|
616
634
|
"Target holds an operator-granted role (auditor) and the caller is not the operator key",
|
|
617
635
|
},
|
|
618
636
|
404: { description: "Target or source user not found" },
|
|
619
|
-
409: {
|
|
637
|
+
409: {
|
|
638
|
+
description:
|
|
639
|
+
"Source is the last active admin (last_admin), or a merge job for the source or target is still running (merge_in_progress)",
|
|
640
|
+
},
|
|
641
|
+
},
|
|
642
|
+
auth: { apiKey: true },
|
|
643
|
+
});
|
|
644
|
+
|
|
645
|
+
const listMergeJobsRoute = route({
|
|
646
|
+
method: "get",
|
|
647
|
+
path: "/api/users/merge-jobs",
|
|
648
|
+
pattern: ["api", "users", "merge-jobs"],
|
|
649
|
+
summary: "List background user merge jobs, newest first",
|
|
650
|
+
tags: ["Users"],
|
|
651
|
+
query: z.object({
|
|
652
|
+
status: UserMergeJobStatusSchema.optional(),
|
|
653
|
+
limit: z.coerce.number().int().min(1).max(200).optional(),
|
|
654
|
+
}),
|
|
655
|
+
responses: {
|
|
656
|
+
200: {
|
|
657
|
+
description: "Merge jobs",
|
|
658
|
+
schema: z.object({ jobs: z.array(UserMergeJobSchema) }),
|
|
659
|
+
},
|
|
660
|
+
401: { description: "Unauthorized" },
|
|
661
|
+
},
|
|
662
|
+
auth: { apiKey: true },
|
|
663
|
+
});
|
|
664
|
+
|
|
665
|
+
const getMergeJobRoute = route({
|
|
666
|
+
method: "get",
|
|
667
|
+
path: "/api/users/merge-jobs/{jobId}",
|
|
668
|
+
pattern: ["api", "users", "merge-jobs", null],
|
|
669
|
+
summary: "A background user merge job (poll until status is done or failed)",
|
|
670
|
+
tags: ["Users"],
|
|
671
|
+
params: z.object({ jobId: z.string() }),
|
|
672
|
+
responses: {
|
|
673
|
+
200: {
|
|
674
|
+
description: "The merge job",
|
|
675
|
+
schema: z.object({ job: UserMergeJobSchema }),
|
|
676
|
+
},
|
|
677
|
+
401: { description: "Unauthorized" },
|
|
678
|
+
404: { description: "Job not found" },
|
|
620
679
|
},
|
|
621
680
|
auth: { apiKey: true },
|
|
622
681
|
});
|
|
@@ -1394,6 +1453,31 @@ export async function handleUsers(
|
|
|
1394
1453
|
return true;
|
|
1395
1454
|
}
|
|
1396
1455
|
|
|
1456
|
+
// ─── GET /api/users/merge-jobs ─────────────────────────────────────────────
|
|
1457
|
+
if (listMergeJobsRoute.match(req.method, pathSegments)) {
|
|
1458
|
+
const parsed = await listMergeJobsRoute.parse(req, res, pathSegments, queryParams);
|
|
1459
|
+
if (!parsed) return true;
|
|
1460
|
+
const jobs = await listUserMergeJobs({
|
|
1461
|
+
status: parsed.query.status,
|
|
1462
|
+
limit: parsed.query.limit,
|
|
1463
|
+
});
|
|
1464
|
+
listMergeJobsRoute.respond(res, 200, { jobs });
|
|
1465
|
+
return true;
|
|
1466
|
+
}
|
|
1467
|
+
|
|
1468
|
+
// ─── GET /api/users/merge-jobs/:jobId ──────────────────────────────────────
|
|
1469
|
+
if (getMergeJobRoute.match(req.method, pathSegments)) {
|
|
1470
|
+
const parsed = await getMergeJobRoute.parse(req, res, pathSegments, queryParams);
|
|
1471
|
+
if (!parsed) return true;
|
|
1472
|
+
const job = await getUserMergeJob(parsed.params.jobId);
|
|
1473
|
+
if (!job) {
|
|
1474
|
+
jsonError(res, "Merge job not found", 404);
|
|
1475
|
+
return true;
|
|
1476
|
+
}
|
|
1477
|
+
getMergeJobRoute.respond(res, 200, { job });
|
|
1478
|
+
return true;
|
|
1479
|
+
}
|
|
1480
|
+
|
|
1397
1481
|
// ─── POST /api/users/:id/merge ─────────────────────────────────────────────
|
|
1398
1482
|
if (mergeUsersRoute.match(req.method, pathSegments)) {
|
|
1399
1483
|
const parsed = await mergeUsersRoute.parse(req, res, pathSegments, queryParams);
|
|
@@ -1417,9 +1501,37 @@ export async function handleUsers(
|
|
|
1417
1501
|
jsonError(res, "Source user not found", 404);
|
|
1418
1502
|
return true;
|
|
1419
1503
|
}
|
|
1504
|
+
// A user still being merged (either way) cannot take part in another merge:
|
|
1505
|
+
// the running job would race the rewrite. A target that is itself a merge
|
|
1506
|
+
// source is on its way out and cannot receive anything.
|
|
1507
|
+
if (
|
|
1508
|
+
targetBefore.mergedIntoUserId ||
|
|
1509
|
+
(await findActiveUserMergeJob(sourceId)) ||
|
|
1510
|
+
(await findActiveUserMergeJob(targetId))
|
|
1511
|
+
) {
|
|
1512
|
+
jsonError(res, "merge_in_progress", 409);
|
|
1513
|
+
return true;
|
|
1514
|
+
}
|
|
1515
|
+
// A source marked by an earlier merge whose job failed for good: the same
|
|
1516
|
+
// pair re-queues that job (identities and aliases already moved); a new
|
|
1517
|
+
// target goes through the short phase again, so the mark moves with it.
|
|
1518
|
+
if (sourceBefore.mergedIntoUserId) {
|
|
1519
|
+
const failed = await findFailedUserMergeJob(sourceId, targetId);
|
|
1520
|
+
if (failed) {
|
|
1521
|
+
const requeued = await requeueUserMergeJob(failed.id);
|
|
1522
|
+
if (requeued) {
|
|
1523
|
+
void runUserMergeJobs();
|
|
1524
|
+
mergeUsersRoute.respond(res, 202, { job: requeued });
|
|
1525
|
+
return true;
|
|
1526
|
+
}
|
|
1527
|
+
}
|
|
1528
|
+
}
|
|
1420
1529
|
try {
|
|
1421
|
-
|
|
1422
|
-
|
|
1530
|
+
// Phase A, one short transaction: the parts a reader must see at once.
|
|
1531
|
+
// The long attribution rewrite and the source row's deletion run as a
|
|
1532
|
+
// background job (src/be/user-merge-jobs.ts): on a large database
|
|
1533
|
+
// they held the event loop for minutes (incident 2026-11-09).
|
|
1534
|
+
const job = await getDbClient().transaction(async () => {
|
|
1423
1535
|
await assertMayActOnOperatorGrantedTarget(actor, targetId);
|
|
1424
1536
|
// Move every identity from source → target.
|
|
1425
1537
|
for (const ident of sourceBefore.identities) {
|
|
@@ -1457,13 +1569,17 @@ export async function handleUsers(
|
|
|
1457
1569
|
// The source's roles go with it; never leave the swarm without an admin.
|
|
1458
1570
|
await assertNotLastAdmin(sourceId);
|
|
1459
1571
|
|
|
1460
|
-
//
|
|
1461
|
-
//
|
|
1462
|
-
await
|
|
1572
|
+
// From here the source is the target for every lookup and can no
|
|
1573
|
+
// longer authenticate (auth.ts isActiveUser, users.ts lookups).
|
|
1574
|
+
await revokeAllUserCredentials(sourceId, actor);
|
|
1575
|
+
await getDbClient().run(
|
|
1576
|
+
"UPDATE users SET mergedIntoUserId = ?, lastUpdatedAt = ? WHERE id = ?",
|
|
1577
|
+
[targetId, new Date().toISOString(), sourceId],
|
|
1578
|
+
);
|
|
1463
1579
|
|
|
1464
1580
|
// Single manual_merge event on target capturing the before/after rows.
|
|
1465
|
-
// The source row is deleted
|
|
1466
|
-
// source user ({id, name, email}) inside the `after` payload under
|
|
1581
|
+
// The source row is deleted by the job, so carry a minimal snapshot of
|
|
1582
|
+
// the source user ({id, name, email}) inside the `after` payload under
|
|
1467
1583
|
// `source` — this lets the UI render "Merged manually from X → Y".
|
|
1468
1584
|
const targetAfter = await composeUser(targetId);
|
|
1469
1585
|
await recordIdentityEvent(targetId, "manual_merge", actor, targetBefore, {
|
|
@@ -1475,11 +1591,18 @@ export async function handleUsers(
|
|
|
1475
1591
|
},
|
|
1476
1592
|
});
|
|
1477
1593
|
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1594
|
+
const queued = await createUserMergeJob({
|
|
1595
|
+
sourceUserId: sourceId,
|
|
1596
|
+
targetUserId: targetId,
|
|
1597
|
+
createdBy: authUser(getRequestAuth(req))?.id ?? null,
|
|
1598
|
+
});
|
|
1599
|
+
// Start the runner once the job row is visible to it.
|
|
1600
|
+
getDbClient().afterCommit(() => {
|
|
1601
|
+
void runUserMergeJobs();
|
|
1602
|
+
});
|
|
1603
|
+
return queued;
|
|
1481
1604
|
});
|
|
1482
|
-
mergeUsersRoute.respond(res,
|
|
1605
|
+
mergeUsersRoute.respond(res, 202, { job });
|
|
1483
1606
|
} catch (err) {
|
|
1484
1607
|
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1485
1608
|
if (err instanceof LastAdminError) {
|
package/src/http/workflows.ts
CHANGED
|
@@ -487,6 +487,25 @@ const webhookTriggerRoute = route({
|
|
|
487
487
|
params: z.object({ workflowId: z.string() }),
|
|
488
488
|
auth: { apiKey: false },
|
|
489
489
|
responses: {
|
|
490
|
+
200: {
|
|
491
|
+
description:
|
|
492
|
+
"Delivery skipped after signature verification and before a run was saved. event-not-allowed: the events allowlist missed. filter-not-matched: a header or JSON body field missed. The received value is not echoed for a filter miss.",
|
|
493
|
+
schema: z.discriminatedUnion("reason", [
|
|
494
|
+
z.object({
|
|
495
|
+
skipped: z.literal(true),
|
|
496
|
+
reason: z.literal("event-not-allowed"),
|
|
497
|
+
event: z.string().nullable(),
|
|
498
|
+
}),
|
|
499
|
+
z.object({
|
|
500
|
+
skipped: z.literal(true),
|
|
501
|
+
reason: z.literal("filter-not-matched"),
|
|
502
|
+
match: z.object({
|
|
503
|
+
source: z.enum(["header", "body"]),
|
|
504
|
+
path: z.string(),
|
|
505
|
+
}),
|
|
506
|
+
}),
|
|
507
|
+
]),
|
|
508
|
+
},
|
|
490
509
|
201: { description: "Webhook processed", schema: z.object({ runId: z.string() }) },
|
|
491
510
|
401: { description: "Invalid signature" },
|
|
492
511
|
404: { description: "Workflow not found" },
|
|
@@ -585,7 +604,24 @@ export async function handleWorkflows(
|
|
|
585
604
|
// Egress stays OUTSIDE the try: `respond()` runtime-validates in dev/test
|
|
586
605
|
// and must fail loudly rather than be reported as a webhook failure for a
|
|
587
606
|
// run that already started.
|
|
588
|
-
|
|
607
|
+
if (result.skipped) {
|
|
608
|
+
// 2xx, not 4xx: GitHub and similar senders count non-2xx as a failed delivery.
|
|
609
|
+
if (result.reason === "event-not-allowed") {
|
|
610
|
+
webhookTriggerRoute.respond(res, 200, {
|
|
611
|
+
skipped: true,
|
|
612
|
+
reason: result.reason,
|
|
613
|
+
event: result.event,
|
|
614
|
+
});
|
|
615
|
+
} else {
|
|
616
|
+
webhookTriggerRoute.respond(res, 200, {
|
|
617
|
+
skipped: true,
|
|
618
|
+
reason: result.reason,
|
|
619
|
+
match: result.match,
|
|
620
|
+
});
|
|
621
|
+
}
|
|
622
|
+
} else {
|
|
623
|
+
webhookTriggerRoute.respond(res, 201, { runId: result.runId });
|
|
624
|
+
}
|
|
589
625
|
return true;
|
|
590
626
|
}
|
|
591
627
|
|
|
@@ -494,7 +494,7 @@ export async function flushChatThread(
|
|
|
494
494
|
try {
|
|
495
495
|
// The adapter verified the platform signature, and the workflow id comes
|
|
496
496
|
// from an operator mapping or an extension, never from the message.
|
|
497
|
-
const
|
|
497
|
+
const result = await handleWebhookTrigger(
|
|
498
498
|
target.workflowId,
|
|
499
499
|
{
|
|
500
500
|
adapter,
|
|
@@ -510,7 +510,13 @@ export async function flushChatThread(
|
|
|
510
510
|
getExecutorRegistry(),
|
|
511
511
|
{ alreadyAuthenticated: true },
|
|
512
512
|
);
|
|
513
|
-
|
|
513
|
+
if (result.skipped) {
|
|
514
|
+
// Header or body filter, or the events allowlist, dropped the delivery.
|
|
515
|
+
// Chat dispatch sends no HTTP headers, so a header clause skips it.
|
|
516
|
+
console.warn(`[chat-sdk] ${threadId}: workflow webhook trigger skipped (${result.reason})`);
|
|
517
|
+
return;
|
|
518
|
+
}
|
|
519
|
+
console.log(`[chat-sdk] ${threadId}: started workflow run ${result.runId}`);
|
|
514
520
|
await subscribe(thread);
|
|
515
521
|
} catch (error) {
|
|
516
522
|
console.error(`[chat-sdk] ${threadId}: workflow dispatch failed: ${errorMessage(error)}`);
|
|
@@ -47,7 +47,8 @@ export const CHAT_FILES_PER_MESSAGE = 10;
|
|
|
47
47
|
* Split `text` into chunks of at most `limit` characters. A chunk ends at the
|
|
48
48
|
* last line break inside the window, else at the last space, else at the
|
|
49
49
|
* limit. Breaks in the first half of the window are ignored, so chunks never
|
|
50
|
-
* get very short.
|
|
50
|
+
* get very short. The break character stays with the chunk it ends, so
|
|
51
|
+
* joining the chunks reproduces `text` exactly.
|
|
51
52
|
*/
|
|
52
53
|
export function splitChatMessage(text: string, limit: number): string[] {
|
|
53
54
|
if (limit <= 0) throw new Error("splitChatMessage: limit must be positive");
|
|
@@ -68,9 +69,13 @@ export function splitChatMessage(text: string, limit: number): string[] {
|
|
|
68
69
|
// advances (cut would otherwise become 0 and loop forever).
|
|
69
70
|
cut = cut > 1 ? cut - 1 : cut + 1;
|
|
70
71
|
}
|
|
72
|
+
} else {
|
|
73
|
+
// Keep the break character in the chunk it ends: trimming it here or
|
|
74
|
+
// stripping it from `rest` would drop it from the delivered text (#2879).
|
|
75
|
+
cut += 1;
|
|
71
76
|
}
|
|
72
|
-
chunks.push(rest.slice(0, cut)
|
|
73
|
-
rest = rest.slice(cut)
|
|
77
|
+
chunks.push(rest.slice(0, cut));
|
|
78
|
+
rest = rest.slice(cut);
|
|
74
79
|
}
|
|
75
80
|
if (rest.length > 0 || chunks.length === 0) chunks.push(rest);
|
|
76
81
|
return chunks.filter((chunk, index) => chunk.length > 0 || index === 0);
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
import type { ProviderTraits } from "../providers/types";
|
|
23
23
|
import { getSlackConfiguration } from "../slack/config";
|
|
24
|
-
import type { ProviderName } from "../types";
|
|
24
|
+
import type { ProviderName, RequestCompositionPartInput } from "../types";
|
|
25
25
|
import { agentFsFileLinkQuery, getAppUrl, resolveAgentFsLinkBase } from "../utils/constants";
|
|
26
26
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
27
27
|
import { isSteeringEnabled } from "../utils/steering-enabled";
|
|
@@ -189,7 +189,21 @@ function promptFlags(args: Pick<BasePromptArgs, "traits" | "provider" | "scripts
|
|
|
189
189
|
};
|
|
190
190
|
}
|
|
191
191
|
|
|
192
|
-
|
|
192
|
+
/** Collapse block seams to one blank line, as the final prompt does. */
|
|
193
|
+
const collapseSeams = (text: string): string => text.replace(/\n{3,}/g, "\n\n");
|
|
194
|
+
|
|
195
|
+
export const getBasePrompt = async (args: BasePromptArgs): Promise<string> =>
|
|
196
|
+
(await getBasePromptWithParts(args)).prompt;
|
|
197
|
+
|
|
198
|
+
/**
|
|
199
|
+
* The base prompt plus the size of each piece in it, for the request
|
|
200
|
+
* composition manifest. Each part's chars are the growth of the collapsed
|
|
201
|
+
* prompt, so the parts sum to `prompt.length` exactly. The prompt text is the
|
|
202
|
+
* same one `getBasePrompt` returns.
|
|
203
|
+
*/
|
|
204
|
+
export const getBasePromptWithParts = async (
|
|
205
|
+
args: BasePromptArgs,
|
|
206
|
+
): Promise<{ prompt: string; parts: RequestCompositionPartInput[] }> => {
|
|
193
207
|
const { role, agentId, traits } = args;
|
|
194
208
|
const { hasMcp, hasToolSearch, hasLocalEnv, nativeSkillDiscovery, provider, scriptsOnlyMode } =
|
|
195
209
|
promptFlags(args);
|
|
@@ -237,11 +251,32 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
237
251
|
const compositeResult = await resolveTemplateAsync(compositeEventType, vars);
|
|
238
252
|
let prompt = compositeResult.text;
|
|
239
253
|
|
|
254
|
+
const parts: RequestCompositionPartInput[] = [];
|
|
255
|
+
let measured = 0;
|
|
256
|
+
// Size of everything appended since the last call, after seam collapsing.
|
|
257
|
+
const grown = (): number => {
|
|
258
|
+
const length = collapseSeams(prompt).length;
|
|
259
|
+
const delta = length - measured;
|
|
260
|
+
measured = length;
|
|
261
|
+
return delta;
|
|
262
|
+
};
|
|
263
|
+
const section = (id: string, chars: number): void => {
|
|
264
|
+
parts.push({ kind: "system_section", id, label: id, chars });
|
|
265
|
+
};
|
|
266
|
+
// The persona counts only as much as it adds to the rendered composite: an
|
|
267
|
+
// override that drops {{persona}} renders none of it, one that moves it
|
|
268
|
+
// elsewhere still counts it. The sections come from the render without it.
|
|
269
|
+
const sectionsResult = persona
|
|
270
|
+
? await resolveTemplateAsync(compositeEventType, { ...vars, persona: "" })
|
|
271
|
+
: compositeResult;
|
|
272
|
+
parts.push(...compositeParts(compositeEventType, sectionsResult, grown()));
|
|
273
|
+
|
|
240
274
|
// Experimental scripts-only MCP surface (code-mode): named swarm tools are
|
|
241
275
|
// not registered, so tell the agent everything goes through script-run.
|
|
242
276
|
if (scriptsOnlyMode) {
|
|
243
277
|
const scriptsOnlyResult = await resolveTemplateAsync("system.agent.scripts_only_mode", {});
|
|
244
278
|
prompt += `\n${scriptsOnlyResult.text}`;
|
|
279
|
+
section("system.agent.scripts_only_mode", grown());
|
|
245
280
|
}
|
|
246
281
|
|
|
247
282
|
// Server-side capability flags gate which MCP tool groups the API server
|
|
@@ -254,12 +289,16 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
254
289
|
// agent-fs CLI needs a local environment with AGENT_FS_API_URL set.
|
|
255
290
|
if (hasMcp && serverHasCapability("pages", true)) {
|
|
256
291
|
const agentFsConfigured = hasLocalEnv && Boolean(process.env.AGENT_FS_API_URL);
|
|
292
|
+
const outputsEvent = agentFsConfigured
|
|
293
|
+
? "system.agent.outputs"
|
|
294
|
+
: "system.agent.outputs.no_agent_fs";
|
|
257
295
|
const fileLinkBase = resolveAgentFsLinkBase("prompt");
|
|
258
|
-
const outputsResult = await resolveTemplateAsync(
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
);
|
|
296
|
+
const outputsResult = await resolveTemplateAsync(outputsEvent, {
|
|
297
|
+
fileLinkBase,
|
|
298
|
+
fileLinkQuery: agentFsFileLinkQuery(fileLinkBase),
|
|
299
|
+
});
|
|
262
300
|
prompt += outputsResult.text;
|
|
301
|
+
section(outputsEvent, grown());
|
|
263
302
|
}
|
|
264
303
|
|
|
265
304
|
// H. Slack. One block for both roles; the scripts-only variant covers Slack
|
|
@@ -268,6 +307,7 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
268
307
|
if (hasMcp && slackPromptToolsEnabled && !scriptsOnlyMode) {
|
|
269
308
|
const slackResult = await resolveTemplateAsync("system.agent.slack", {});
|
|
270
309
|
prompt += slackResult.text;
|
|
310
|
+
section("system.agent.slack", grown());
|
|
271
311
|
}
|
|
272
312
|
|
|
273
313
|
// Use-case channel thread (lead only: every posting tool is lead-only).
|
|
@@ -279,6 +319,7 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
279
319
|
) {
|
|
280
320
|
const threadResult = await resolveTemplateAsync("system.agent.lead.channel_thread", {});
|
|
281
321
|
prompt += threadResult.text;
|
|
322
|
+
section("system.agent.lead.channel_thread", grown());
|
|
282
323
|
}
|
|
283
324
|
|
|
284
325
|
if (
|
|
@@ -292,6 +333,7 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
292
333
|
) {
|
|
293
334
|
const steeringResult = await resolveTemplateAsync("system.agent.steering", {});
|
|
294
335
|
prompt += steeringResult.text;
|
|
336
|
+
section("system.agent.steering", grown());
|
|
295
337
|
}
|
|
296
338
|
|
|
297
339
|
// Rich cards (task uiSpec). Read the flag here, never in a module-level
|
|
@@ -299,6 +341,7 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
299
341
|
if (hasMcp && !scriptsOnlyMode && isEnvFlagEnabled("UI_SPEC_ENABLED", false)) {
|
|
300
342
|
const uiSpecResult = await resolveTemplateAsync("system.agent.ui_spec", {});
|
|
301
343
|
prompt += uiSpecResult.text;
|
|
344
|
+
section("system.agent.ui_spec", grown());
|
|
302
345
|
}
|
|
303
346
|
|
|
304
347
|
// I. Tools and skills. Skipped without MCP: the discovery tools are MCP tools.
|
|
@@ -318,6 +361,13 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
318
361
|
}),
|
|
319
362
|
);
|
|
320
363
|
prompt += toolsResult.text;
|
|
364
|
+
// The discovery line rides inside tools_skills as a variable.
|
|
365
|
+
const toolsChars = grown();
|
|
366
|
+
const discoveryChars = toolsResult.text.includes(discoveryResult.text)
|
|
367
|
+
? Math.min(discoveryResult.text.length, toolsChars)
|
|
368
|
+
: 0;
|
|
369
|
+
if (discoveryChars > 0) section(discoveryEvent, discoveryChars);
|
|
370
|
+
section("system.agent.tools_skills", toolsChars - discoveryChars);
|
|
321
371
|
|
|
322
372
|
// Lead docs pointer: only when the lead has the `swarm-docs` skill. The
|
|
323
373
|
// skill list is unknown on claude-managed (the cloud sandbox owns skill
|
|
@@ -325,6 +375,7 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
325
375
|
if (role === "lead" && hasSwarmDocsSkill(args.skillsSummary)) {
|
|
326
376
|
const docsResult = await resolveTemplateAsync("system.agent.lead.docs", {});
|
|
327
377
|
prompt += docsResult.text;
|
|
378
|
+
section("system.agent.lead.docs", grown());
|
|
328
379
|
}
|
|
329
380
|
}
|
|
330
381
|
|
|
@@ -347,12 +398,87 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
|
|
|
347
398
|
claudeMdSourcePath(provider),
|
|
348
399
|
budget,
|
|
349
400
|
);
|
|
401
|
+
const claudeMdChars = grown();
|
|
402
|
+
if (claudeMdChars > 0) {
|
|
403
|
+
parts.push({
|
|
404
|
+
kind: "claude_md",
|
|
405
|
+
id: "claude_md",
|
|
406
|
+
label: "CLAUDE.md (agent notes)",
|
|
407
|
+
chars: claudeMdChars,
|
|
408
|
+
});
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
// Claude and pi list installed skills from their local skills tree, outside
|
|
413
|
+
// our prompt. Codex and opencode get the list inside tools_skills, already
|
|
414
|
+
// counted above; a session with no local tree reaches skills through MCP.
|
|
415
|
+
if (hasMcp && hasLocalEnv && nativeSkillDiscovery && args.skillsSummary?.length) {
|
|
416
|
+
parts.push({
|
|
417
|
+
kind: "skills_listing",
|
|
418
|
+
id: "skills_listing",
|
|
419
|
+
label: "skills listing (harness-injected)",
|
|
420
|
+
chars: args.skillsSummary.reduce(
|
|
421
|
+
(sum, skill) => sum + `- ${skill.name}: ${skill.description}\n`.length,
|
|
422
|
+
0,
|
|
423
|
+
),
|
|
424
|
+
fidelity: "estimate",
|
|
425
|
+
});
|
|
350
426
|
}
|
|
351
427
|
|
|
352
428
|
// Blocks start and end with a newline; collapse the seams to one blank line.
|
|
353
|
-
return prompt
|
|
429
|
+
return { prompt: collapseSeams(prompt), parts: parts.filter((part) => part.chars > 0) };
|
|
354
430
|
};
|
|
355
431
|
|
|
432
|
+
/**
|
|
433
|
+
* Split the composite into the persona and its referenced templates.
|
|
434
|
+
* `sections` is the composite rendered with an empty persona, so the persona
|
|
435
|
+
* is the difference in collapsed length and no section is charged for it. The
|
|
436
|
+
* composite's own glue entry absorbs the newlines seam collapsing removed, so
|
|
437
|
+
* the parts sum to `total`, the composite's collapsed length.
|
|
438
|
+
*/
|
|
439
|
+
function compositeParts(
|
|
440
|
+
compositeEventType: string,
|
|
441
|
+
sections: { text: string; segments?: { templateId: string; chars: number }[] },
|
|
442
|
+
total: number,
|
|
443
|
+
): RequestCompositionPartInput[] {
|
|
444
|
+
const personaChars = Math.max(0, total - collapseSeams(sections.text).length);
|
|
445
|
+
const sectionsTotal = total - personaChars;
|
|
446
|
+
const entries = (
|
|
447
|
+
sections.segments ?? [{ templateId: compositeEventType, chars: sectionsTotal }]
|
|
448
|
+
).map((segment) => ({ ...segment }));
|
|
449
|
+
// Glue first (the seam newlines live there), then the largest sections.
|
|
450
|
+
const glue = entries.filter((entry) => entry.templateId === compositeEventType);
|
|
451
|
+
const rest = entries
|
|
452
|
+
.filter((entry) => entry.templateId !== compositeEventType)
|
|
453
|
+
.sort((a, b) => b.chars - a.chars);
|
|
454
|
+
let excess = entries.reduce((sum, entry) => sum + entry.chars, 0) - sectionsTotal;
|
|
455
|
+
for (const entry of [...glue, ...rest]) {
|
|
456
|
+
if (excess === 0) break;
|
|
457
|
+
const take = excess > 0 ? Math.min(excess, entry.chars) : excess;
|
|
458
|
+
entry.chars -= take;
|
|
459
|
+
excess -= take;
|
|
460
|
+
}
|
|
461
|
+
|
|
462
|
+
const parts: RequestCompositionPartInput[] = [];
|
|
463
|
+
if (personaChars > 0) {
|
|
464
|
+
parts.push({
|
|
465
|
+
kind: "persona",
|
|
466
|
+
id: "persona",
|
|
467
|
+
label: "persona (description, SOUL.md, IDENTITY.md)",
|
|
468
|
+
chars: personaChars,
|
|
469
|
+
});
|
|
470
|
+
}
|
|
471
|
+
for (const entry of entries) {
|
|
472
|
+
parts.push({
|
|
473
|
+
kind: "system_section",
|
|
474
|
+
id: entry.templateId,
|
|
475
|
+
label: entry.templateId,
|
|
476
|
+
chars: entry.chars,
|
|
477
|
+
});
|
|
478
|
+
}
|
|
479
|
+
return parts;
|
|
480
|
+
}
|
|
481
|
+
|
|
356
482
|
/**
|
|
357
483
|
* Per-task context that used to close the system prompt: the repository block
|
|
358
484
|
* and the scripts-only Slack note. It rides in the task prompt so the system
|
package/src/prompts/resolver.ts
CHANGED
|
@@ -54,6 +54,17 @@ export interface ResolveResult {
|
|
|
54
54
|
skipped: boolean;
|
|
55
55
|
/** Any {{var}} tokens that couldn't be resolved */
|
|
56
56
|
unresolved: string[];
|
|
57
|
+
/**
|
|
58
|
+
* Interpolated size of each top-level `{{@template[id]}}` the body expanded,
|
|
59
|
+
* plus one entry for the template's own text (header and glue). The chars
|
|
60
|
+
* sum to `text.length`. Absent when the body references no template.
|
|
61
|
+
*/
|
|
62
|
+
segments?: ResolveSegment[];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
export interface ResolveSegment {
|
|
66
|
+
templateId: string;
|
|
67
|
+
chars: number;
|
|
57
68
|
}
|
|
58
69
|
|
|
59
70
|
// ─── HTTP Resolver Mode ─────────────────────────────────────────────────────
|
|
@@ -221,7 +232,8 @@ function resolveTemplateViaDb(
|
|
|
221
232
|
}
|
|
222
233
|
|
|
223
234
|
// Expand {{@template[id]}} references in body
|
|
224
|
-
|
|
235
|
+
const expandedRefs: ExpandedRef[] = [];
|
|
236
|
+
body = expandTemplateRefs(body, variables, options, new Set(), 0, expandedRefs);
|
|
225
237
|
|
|
226
238
|
// Compose header + body
|
|
227
239
|
const composed = header ? `${header}\n\n${body}` : body;
|
|
@@ -235,9 +247,32 @@ function resolveTemplateViaDb(
|
|
|
235
247
|
scope,
|
|
236
248
|
skipped: false,
|
|
237
249
|
unresolved,
|
|
250
|
+
...(expandedRefs.length > 0 && {
|
|
251
|
+
segments: measureSegments(eventType, text, expandedRefs, variables),
|
|
252
|
+
}),
|
|
238
253
|
};
|
|
239
254
|
}
|
|
240
255
|
|
|
256
|
+
type ExpandedRef = { templateId: string; body: string };
|
|
257
|
+
|
|
258
|
+
/**
|
|
259
|
+
* Size each expanded reference by interpolating it alone. The template's own
|
|
260
|
+
* entry takes the remainder, so the segments always sum to the final text.
|
|
261
|
+
*/
|
|
262
|
+
function measureSegments(
|
|
263
|
+
eventType: string,
|
|
264
|
+
text: string,
|
|
265
|
+
refs: ExpandedRef[],
|
|
266
|
+
variables: Record<string, unknown>,
|
|
267
|
+
): ResolveSegment[] {
|
|
268
|
+
const children = refs.map((ref) => ({
|
|
269
|
+
templateId: ref.templateId,
|
|
270
|
+
chars: interpolate(ref.body, variables).result.length,
|
|
271
|
+
}));
|
|
272
|
+
const childChars = children.reduce((sum, segment) => sum + segment.chars, 0);
|
|
273
|
+
return [{ templateId: eventType, chars: Math.max(0, text.length - childChars) }, ...children];
|
|
274
|
+
}
|
|
275
|
+
|
|
241
276
|
/**
|
|
242
277
|
* Recursively expand {{@template[id]}} references in a string.
|
|
243
278
|
* Only used in DB mode (API server). HTTP mode handles expansion server-side.
|
|
@@ -248,6 +283,8 @@ function expandTemplateRefs(
|
|
|
248
283
|
options: ResolveOptions,
|
|
249
284
|
visited: Set<string>,
|
|
250
285
|
depth: number,
|
|
286
|
+
/** Collects each top-level reference with its fully expanded body. */
|
|
287
|
+
expandedRefs?: ExpandedRef[],
|
|
251
288
|
): string {
|
|
252
289
|
if (depth > MAX_TEMPLATE_REF_DEPTH) {
|
|
253
290
|
return text;
|
|
@@ -291,6 +328,8 @@ function expandTemplateRefs(
|
|
|
291
328
|
// Recursively expand nested refs in the referenced body
|
|
292
329
|
const newVisited = new Set(visited);
|
|
293
330
|
newVisited.add(referencedId);
|
|
294
|
-
|
|
331
|
+
const expanded = expandTemplateRefs(refBody, variables, options, newVisited, depth + 1);
|
|
332
|
+
expandedRefs?.push({ templateId: referencedId, body: expanded });
|
|
333
|
+
return expanded;
|
|
295
334
|
});
|
|
296
335
|
}
|
|
@@ -427,7 +427,7 @@ const copilotTargetProfile: AcpTargetProfile = {
|
|
|
427
427
|
},
|
|
428
428
|
};
|
|
429
429
|
|
|
430
|
-
/** Qwen Code's `--auth-type` choices (0.27.
|
|
430
|
+
/** Qwen Code's `--auth-type` choices (0.27.1). `qwen-oauth` and `qwen-subscription` need an interactive sign-in, so they are left out. */
|
|
431
431
|
const QWEN_AUTH_TYPES = ["openai", "openai-responses", "anthropic", "gemini", "vertex-ai"] as const;
|
|
432
432
|
|
|
433
433
|
// Qwen Code is a Gemini CLI fork: QWEN_SYSTEM_MD replaces its built-in prompt
|
|
@@ -1002,7 +1002,7 @@ export const fxTargetProfile: AcpTargetProfile = {
|
|
|
1002
1002
|
};
|
|
1003
1003
|
|
|
1004
1004
|
export function resolveAcpTarget(config: ProviderSessionConfig): AcpTargetProfile {
|
|
1005
|
-
const target = readEnv(config, "ACP_TARGET")
|
|
1005
|
+
const target = readEnv(config, "ACP_TARGET")?.trim().toLowerCase() || "custom";
|
|
1006
1006
|
if (!isAcpTarget(target)) {
|
|
1007
1007
|
throw new AcpTargetResolutionError(
|
|
1008
1008
|
`Unsupported ACP target "${target}". Supported targets: ${ACP_TARGET_IDS.join(", ")}.`,
|
|
@@ -45,7 +45,7 @@ import type {
|
|
|
45
45
|
* default; the image installs exactly this version and the per-task settings
|
|
46
46
|
* set `amp.updates.mode: "disabled"`. Bump it deliberately, with a live run.
|
|
47
47
|
*/
|
|
48
|
-
export const AMP_PACKAGE = "@ampcode/cli@0.0.
|
|
48
|
+
export const AMP_PACKAGE = "@ampcode/cli@0.0.1794312042-g538cd5";
|
|
49
49
|
|
|
50
50
|
/** MCP server name. Amp exposes its tools as `agent_swarm` / `store_progress` (dashes become underscores). */
|
|
51
51
|
const AMP_MCP_SERVER_NAME = "agent-swarm";
|