@desplega.ai/agent-swarm 2.10.0 → 2.12.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-11m13kx4.js +16 -0
- package/dist/{acp-targets-arrwv4f0.js → acp-targets-311gcyvw.js} +9 -9
- package/dist/{actions-y0d2n1c2.js → actions-c4chgxp6.js} +27 -24
- package/dist/{agent-fs-provision-tpj7sktd.js → agent-fs-provision-0b9awm5n.js} +10 -5
- package/dist/{amp-adapter-vmmnmw8d.js → amp-adapter-r0veq6x5.js} +3 -3
- package/dist/{anthropic-messages-zdca3gv1.js → anthropic-messages-88b7s3n9.js} +177 -25
- package/dist/{app-wb7w45dq.js → app-hn5fftf5.js} +7 -6
- package/dist/{approval-notifications-7mqr6vbd.js → approval-notifications-3g6yc8nv.js} +7 -6
- package/dist/{assistant-gf60454p.js → assistant-cpjgpjvp.js} +29 -26
- package/dist/{azure-openai-responses-b3y7fz36.js → azure-openai-responses-jeaas6x0.js} +10 -10
- package/dist/{boot-args-schema-qxmd59sr.js → boot-args-schema-hce1av1h.js} +1 -1
- package/dist/{boot-reembed-5tmeskj2.js → boot-reembed-bztbxc4z.js} +1 -1
- package/dist/{boot-reembed-wb44vc3s.js → boot-reembed-d7xcym0j.js} +1 -1
- package/dist/{boot-scrub-sweep-25bxhnw4.js → boot-scrub-sweep-mkmm16gk.js} +2 -2
- package/dist/{boot-seeds-nj9za0vk.js → boot-seeds-arrkbe8t.js} +4 -4
- package/dist/{boxd-wn235q80.js → boxd-68n75y1s.js} +2 -2
- package/dist/{claude-adapter-d3krpdyb.js → claude-adapter-ykpyr5p8.js} +8 -8
- package/dist/{claude-managed-adapter-t8nfgcgz.js → claude-managed-adapter-ssg6z4bt.js} +4 -4
- package/dist/{claude-managed-setup-7y4pwd81.js → claude-managed-setup-trd59v7b.js} +4 -4
- package/dist/{claude-sdk-session-d138zy0e.js → claude-sdk-session-yjcze0j1.js} +10941 -10412
- package/dist/{cli-vq2eg24x.js → cli-01tvvtad.js} +63 -60
- package/dist/cli-04zc3f7b.js +68 -0
- package/dist/{cli-01k6wpr9.js → cli-0k1a0sde.js} +7 -7
- package/dist/{cli-j6te8keb.js → cli-0pp1yjg2.js} +8 -8
- package/dist/{cli-0b4zam62.js → cli-0vcqcwfn.js} +18 -0
- package/dist/{cli-wwp1bd3n.js → cli-12vek61e.js} +564 -97
- package/dist/{cli-rqx70rcz.js → cli-17qzb39j.js} +5 -2
- package/dist/{cli-124ntmf0.js → cli-1htmtqc2.js} +143 -63
- package/dist/{cli-3f8zbtqa.js → cli-2amwhyv2.js} +15 -11
- package/dist/{cli-7sf9sb0w.js → cli-2m6yaq6b.js} +1 -1
- package/dist/{cli-6cwr32fe.js → cli-2tw284hj.js} +422 -140
- package/dist/{cli-6ehs4mta.js → cli-2z2c4k6q.js} +18 -4
- package/dist/{cli-nstkanmx.js → cli-39qm0rtm.js} +8 -8
- package/dist/{cli-hnamkvnc.js → cli-3p288654.js} +2 -2
- package/dist/{cli-4ymxrwg5.js → cli-4dyzzkfb.js} +2 -2
- package/dist/{cli-3kd08rej.js → cli-4jjrhy48.js} +1 -1
- package/dist/{cli-kxn3747f.js → cli-4se3x6qm.js} +1 -26
- package/dist/cli-52nfye5j.js +673 -0
- package/dist/cli-55tc8cj4.js +252 -0
- package/dist/cli-5r95eqbh.js +186 -0
- package/dist/{cli-6037prsx.js → cli-5tg94mdw.js} +13 -13
- package/dist/{cli-2spnz7ye.js → cli-5x03v6en.js} +11137 -8332
- package/dist/{cli-y4ccxtz5.js → cli-5z0g0e8v.js} +153 -6
- package/dist/{cli-8y43jx2r.js → cli-6p8p2e6r.js} +16 -9
- package/dist/{cli-539h29es.js → cli-72yms3ey.js} +224 -189
- package/dist/{cli-y8p78ekx.js → cli-73q4g5nx.js} +21 -21
- package/dist/{cli-p74md7t8.js → cli-7b7rxz22.js} +13 -15
- package/dist/{cli-43ms35q9.js → cli-7wy8gbwb.js} +3 -3
- package/dist/{cli-7mv4h3sn.js → cli-7yn42w6m.js} +2 -2
- package/dist/{cli-gabsjg8x.js → cli-8hp56wat.js} +3 -2
- package/dist/cli-8mfdbdhe.js +43 -0
- package/dist/{cli-zcfpsfzf.js → cli-96234j5w.js} +3 -3
- package/dist/{cli-1z4qggfe.js → cli-9fvk9mv8.js} +30 -21
- package/dist/{cli-2rnd5j3t.js → cli-9qe5y107.js} +2 -2
- package/dist/{cli-5mpy301f.js → cli-9t7syepg.js} +1 -1
- package/dist/{cli-7cp6aa1q.js → cli-9y4tgrkf.js} +23 -177
- package/dist/{cli-7evph51z.js → cli-a49frv85.js} +2 -2
- package/dist/{cli-3aaeb78m.js → cli-agjbj5x0.js} +95 -10
- package/dist/{cli-th1dkc2v.js → cli-b93d81yg.js} +2 -2
- package/dist/{cli-qj39vrc6.js → cli-bhgrhedp.js} +1 -1
- package/dist/{cli-2xv18ywz.js → cli-bmqp0ser.js} +2 -2
- package/dist/{cli-9fjr27ez.js → cli-bp6k9acz.js} +18 -22
- package/dist/{cli-5a6pqy45.js → cli-bpje8n65.js} +31 -4
- package/dist/{cli-2v2zdm0a.js → cli-bz97ff9n.js} +2 -2
- package/dist/{cli-3caf7pmg.js → cli-c7j31hq9.js} +3 -3
- package/dist/{cli-t9ga4qmb.js → cli-cah298e5.js} +40 -33
- package/dist/{cli-aw83sr40.js → cli-cjqyse9q.js} +3 -3
- package/dist/{cli-b6px1k1q.js → cli-dd2k2mcd.js} +1 -1
- package/dist/{cli-nv4xsvmk.js → cli-dkvtfgn4.js} +7 -7
- package/dist/{cli-7r162fxe.js → cli-e3ahxq5y.js} +23 -17
- package/dist/{cli-3et6fmfe.js → cli-e8n0hdzd.js} +1 -1
- package/dist/{cli-tsa40663.js → cli-ebqx630g.js} +3 -3
- package/dist/{cli-kbtzfrxj.js → cli-en6dmkxd.js} +3 -3
- package/dist/{cli-m9cvf7vs.js → cli-eq4kew31.js} +14 -14
- package/dist/{cli-fcfbct2j.js → cli-eqq0hwvx.js} +5 -5
- package/dist/{cli-7zm3b3f5.js → cli-ercwc8xn.js} +1 -1
- package/dist/{cli-vs9vdpy0.js → cli-ex1y88j3.js} +1 -1
- package/dist/{cli-mk7c5ac4.js → cli-fxd1mwtr.js} +2 -2
- package/dist/{cli-91pkxres.js → cli-fy4gb74g.js} +2 -2
- package/dist/{cli-fq2rr3jb.js → cli-fyaq4zdv.js} +6 -6
- package/dist/{cli-cc93xzes.js → cli-gfy6hbd9.js} +28 -17
- package/dist/{cli-s1khw52h.js → cli-h70a2mxy.js} +71 -17
- package/dist/cli-hbvgzjq4.js +69 -0
- package/dist/{cli-qx4f057j.js → cli-hhc47ack.js} +4 -4
- package/dist/{cli-q5srsxq2.js → cli-j5gtytvg.js} +154 -41
- package/dist/{cli-psffsanb.js → cli-js10kdk7.js} +6 -1
- package/dist/{cli-54vrpgm0.js → cli-k3facve0.js} +8 -5
- package/dist/{cli-vsw91x06.js → cli-k5jx8jya.js} +10 -6
- package/dist/{cli-tr27kwyg.js → cli-krbcr00p.js} +261 -6
- package/dist/{cli-5qhfv9rw.js → cli-kwr5qv5g.js} +44 -17
- package/dist/{cli-md50mj0r.js → cli-m5qtmrbc.js} +3 -3
- package/dist/{cli-vfqvrd82.js → cli-ma9ys8rt.js} +2 -2
- package/dist/{cli-w16kwbzw.js → cli-mbwmqb5w.js} +1 -1
- package/dist/{cli-w1q68d8x.js → cli-mcymtvwn.js} +322 -72
- package/dist/{cli-k3q2va86.js → cli-mq2fbgva.js} +66 -5
- package/dist/{cli-xqdz5cqm.js → cli-mz7ycqn8.js} +1 -0
- package/dist/{cli-kpgcm7xy.js → cli-n85m2wkq.js} +1 -1
- package/dist/{cli-v8z0yga9.js → cli-n8f0fs3c.js} +4 -4
- package/dist/{cli-mys27d03.js → cli-nja15knq.js} +3 -3
- package/dist/{cli-zk7v5s89.js → cli-pe3yxedk.js} +3 -3
- package/dist/{cli-v46zsvqk.js → cli-ph95yejc.js} +2 -2
- package/dist/{cli-6237rnyr.js → cli-pqfecppn.js} +1 -1
- package/dist/{cli-qrta34nb.js → cli-q2dywc8h.js} +4 -4
- package/dist/{cli-k6nejceb.js → cli-q4z9s6zs.js} +2 -2
- package/dist/{cli-s1zqk1aj.js → cli-q8tc22bj.js} +15 -9
- package/dist/{cli-hg42n3hx.js → cli-qrzq3hvg.js} +8 -8
- package/dist/{cli-43evxwj4.js → cli-r0mz92by.js} +9 -4
- package/dist/{cli-jrbq4djp.js → cli-r14ac1y0.js} +1 -1
- package/dist/{cli-5gpqgs8b.js → cli-rtmqzat7.js} +2 -2
- package/dist/{cli-tvgqesec.js → cli-s6zk31gr.js} +4 -4
- package/dist/{cli-6ym4jhzp.js → cli-sv2r3bw8.js} +7 -7
- package/dist/{cli-wafmk3fn.js → cli-t75xngj1.js} +12 -12
- package/dist/{cli-x40a0w9j.js → cli-tdk7jtka.js} +1 -1
- package/dist/{cli-zeh2mhkg.js → cli-tm60vtax.js} +1 -1
- package/dist/cli-tsfkcd4v.js +30 -0
- package/dist/{cli-8st34zhr.js → cli-v9ya390t.js} +57 -19
- package/dist/{cli-zfqg6fzn.js → cli-vbppqvte.js} +3 -3
- package/dist/{cli-p0n7b5rz.js → cli-wvjqaqcp.js} +2907 -151
- package/dist/{cli-sb4426be.js → cli-xf4z5bdn.js} +5 -5
- package/dist/{cli-p0c3vtch.js → cli-xm34qj8m.js} +772 -515
- package/dist/{cli-z0m452jr.js → cli-ya3kf4gs.js} +1 -1
- package/dist/{cli-had1p04a.js → cli-yegz2g06.js} +4 -4
- package/dist/{cli-k5yewqgd.js → cli-yfpc6qy9.js} +3 -3
- package/dist/{cli-q2d3e1k1.js → cli-z4f346g5.js} +1 -1
- package/dist/{cli-yab6sh8p.js → cli-zcghfsdg.js} +23 -4
- package/dist/cli.js +34 -30
- package/dist/{cloudflare-workers-ai-system-one-4aysy6rh.js → cloudflare-workers-ai-system-one-w3m0fbf8.js} +2 -2
- package/dist/{codex-adapter-exfdbj73.js → codex-adapter-wc6e4wct.js} +8 -8
- package/dist/{codex-hook-59atdwd8.js → codex-hook-aqtj17yr.js} +1 -1
- package/dist/{codex-login-a239g1ah.js → codex-login-1ven7yje.js} +1 -1
- package/dist/{codex-session-runner-xhznc4g3.js → codex-session-runner-ppfgjd97.js} +9 -9
- package/dist/{commands-d8g349v4.js → commands-tsv2vx5b.js} +3 -3
- package/dist/{controller-mwgdmb8y.js → controller-ye4sdwsy.js} +4 -4
- package/dist/{controllers-connect-5v7qx04j.js → controllers-connect-zn4dg69h.js} +25 -22
- package/dist/core-dxcy02sc.js +41 -0
- package/dist/{cursor-adapter-p2q5h35d.js → cursor-adapter-q2g9vwts.js} +2 -2
- package/dist/{db-wcw0b2j8.js → db-3r1fyr2n.js} +6 -2
- package/dist/{db-qpganbeb.js → db-g111qn9j.js} +3 -3
- package/dist/{devin-adapter-zp4tqq53.js → devin-adapter-t8d86q9x.js} +1 -1
- package/dist/{dispatcher-8d8s49yz.js → dispatcher-4q8s0mx8.js} +22 -19
- package/dist/{docker-09tkkg0n.js → docker-1b41eysj.js} +51 -14
- package/dist/{dsh-adapter-me0twn13.js → dsh-adapter-mmcw1z5s.js} +2 -2
- package/dist/{e2b-3v1e745x.js → e2b-ew8c5j5v.js} +3 -3
- package/dist/{e2b-sm28k0k3.js → e2b-xm60c8ad.js} +6 -6
- package/dist/{easter-egg-3d-wv7w5ty6.js → easter-egg-3d-04ke6hcp.js} +1 -1
- package/dist/{embedding-space-e48xchqa.js → embedding-space-kcdn52vz.js} +6 -6
- package/dist/{embeddings-tgq2afbq.js → embeddings-jnzcd91a.js} +1 -1
- package/dist/{event-bus-xr83x566.js → event-bus-v4ywhc2p.js} +1 -1
- package/dist/{execute-8rhwrk7f.js → execute-74amghty.js} +8 -4
- package/dist/{external-channel-8bt3j2pm.js → external-channel-v9zgxnxz.js} +2 -2
- package/dist/fx-adapter-0ar6pqm3.js +19 -0
- package/dist/{google-generative-ai-bh0djqjp.js → google-generative-ai-sw77egmr.js} +9 -9
- package/dist/{google-vertex-prjbw8dj.js → google-vertex-rrw93g8h.js} +9 -9
- package/dist/grok-adapter-t6m74fb1.js +19 -0
- package/dist/handlers-9kwcrc4k.js +38 -0
- package/dist/{heartbeat-x0056ra5.js → heartbeat-p8pk1msj.js} +25 -22
- package/dist/{hook-a7vmn2st.js → hook-k1h73zd7.js} +5 -5
- package/dist/{hook-mrd2ayxv.js → hook-p5reemds.js} +8 -8
- package/dist/{http-ym9c5svp.js → http-ms1z5xxy.js} +2549 -224
- package/dist/index-23cdfzr6.js +39 -0
- package/dist/{index-01ns1pkw.js → index-76zzxtzf.js} +1 -1
- package/dist/{index-ny60jcat.js → index-fbkqhvvj.js} +40 -18
- package/dist/index-g7kkjs5b.js +38 -0
- package/dist/{index-x6azjwm8.js → index-gjn6qfgn.js} +1 -1
- package/dist/{index-b5wgnm78.js → index-kdmkfjt7.js} +4 -4
- package/dist/{index-p46tvwtx.js → index-kn63q1gr.js} +28 -25
- package/dist/{index-9myfj74s.js → index-kzdqn3dd.js} +3 -3
- package/dist/{index-4a0670yh.js → index-p2f5xg64.js} +6 -6
- package/dist/index-stk36pa5.js +43 -0
- package/dist/{k8s-m56sw868.js → k8s-fy8hbhkg.js} +73 -14
- package/dist/{keepalive-7yxg8z4c.js → keepalive-031js8jz.js} +4 -4
- package/dist/lead-mfggjtfk.js +77 -0
- package/dist/{llama-cpp-classify-nfgswa1m.js → llama-cpp-classify-yvb8vh7w.js} +2 -2
- package/dist/{maintenance-6tefxmk1.js → maintenance-sq9v3qx9.js} +1 -1
- package/dist/{mistral-conversations-tm2vd4gc.js → mistral-conversations-w4bncwbt.js} +7 -7
- package/dist/{node-7qsx5kvm.js → node-z67yjre7.js} +19 -13
- package/dist/{oauth-refresh-sweep-70cavc3a.js → oauth-refresh-sweep-zqmnyvs8.js} +3 -3
- package/dist/object-webhooks-r24wwb5y.js +21 -0
- package/dist/{onboard-fja65z08.js → onboard-p25yhh7t.js} +5 -5
- package/dist/{openai-codex-responses-sxjv60xx.js → openai-codex-responses-70g39cgz.js} +20 -14
- package/dist/{openai-completions-0c7qnhsx.js → openai-completions-cv3hp4h5.js} +18 -11
- package/dist/{openai-decisions-ytp6w6xh.js → openai-decisions-fyq1p9f9.js} +2 -2
- package/dist/{openai-responses-a7h29chp.js → openai-responses-trsvnks6.js} +13 -11
- package/dist/{opencode-adapter-hakkm7yh.js → opencode-adapter-wcjc4zdk.js} +7 -7
- package/dist/{openrouter-images-xr9gme9x.js → openrouter-images-0jj12a2q.js} +6 -6
- package/dist/{otel-impl-7zhnt6gj.js → otel-impl-ff1gf20m.js} +2 -2
- package/dist/{pending-h01yzpx4.js → pending-hxj5yatb.js} +23 -20
- package/dist/{pi-messages-2j0fpqwq.js → pi-messages-zk3g4esn.js} +1 -1
- package/dist/{pi-mono-adapter-f52hz743.js → pi-mono-adapter-vkp4zz7p.js} +19 -18
- package/dist/{pricing-refresh-fzxvk2zf.js → pricing-refresh-9w7gx41w.js} +2 -2
- package/dist/{rbac-roles-9v6vhgbs.js → rbac-roles-84aw10nz.js} +3 -3
- package/dist/{rbac-roles-hfgh8sba.js → rbac-roles-hz74vckp.js} +2 -2
- package/dist/{registry-32b1mft6.js → registry-eeyx1201.js} +1 -1
- package/dist/{render-v2-1rgspxzf.js → render-v2-nrdkg9gf.js} +7 -6
- package/dist/{resume-tqy61x24.js → resume-s6ey36rh.js} +9 -8
- package/dist/{runtime-exkxyx5f.js → runtime-x0b4pyam.js} +2 -2
- package/dist/{session-access-3act7vt4.js → session-access-xv49tk14.js} +4 -4
- package/dist/{session-source-backfill-82qe7fqq.js → session-source-backfill-r5j988ah.js} +3 -3
- package/dist/{setup-ry1vfdef.js → setup-mj0krk1p.js} +1 -1
- package/dist/thread-buffer-temgaqsy.js +41 -0
- package/dist/tree-visibility-cbrsfaar.js +24 -0
- package/dist/{typesafe-system-one-vcfj2ak8.js → typesafe-system-one-qkvkgrcz.js} +2 -2
- package/dist/{user-merge-jobs-bx6bf7db.js → user-merge-jobs-f9d8nwnw.js} +3 -3
- package/dist/{virtual-modules-s0rjzcqq.js → virtual-modules-ns0ryw05.js} +32 -10
- package/dist/{work-objects-z2e5tv03.js → work-objects-pydhzast.js} +25 -22
- package/dist/worker-efcemc22.js +77 -0
- package/dist/{worker-follow-up-y3xeg89w.js → worker-follow-up-9z2xec5e.js} +22 -19
- package/dist/{x-wg164ss9.js → x-3dtaf2r9.js} +2 -2
- package/openapi.json +2040 -559
- package/package.json +15 -11
- package/src/azure-devops/auth.ts +2 -3
- package/src/be/agent-fs-identity.ts +46 -0
- package/src/be/agent-history.ts +215 -0
- package/src/be/db/agents.ts +34 -12
- package/src/be/db/request-composition.ts +190 -0
- package/src/be/db/runtime.ts +15 -0
- package/src/be/db/slack-trees.ts +220 -10
- package/src/be/db/tasks/human-free.ts +3 -2
- package/src/be/db/tasks/write.ts +2 -2
- package/src/be/db/workflow-run-retention.ts +101 -0
- package/src/be/db-client.ts +23 -1
- package/src/be/db-retention-defaults.ts +46 -0
- package/src/be/db-retention.ts +55 -6
- package/src/be/db.ts +2 -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/providers/sqlite-store.ts +110 -24
- package/src/be/memory/review-recall-filter.ts +22 -0
- package/src/be/memory/search-candidates.ts +5 -7
- package/src/be/memory/types.ts +5 -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/migrations/332_primitive_objects.sql +31 -0
- package/src/be/migrations/334_agent_history.sql +23 -0
- package/src/be/migrations/335_primitive_object_webhooks.sql +36 -0
- package/src/be/model-profile-check.ts +1 -1
- package/src/be/multi-runtime.ts +32 -4
- package/src/be/primitives/boards/elements.ts +717 -0
- package/src/be/primitives/boards/excalifont-metrics.json +516 -0
- package/src/be/primitives/boards/service.ts +121 -0
- package/src/be/primitives/object-webhooks.ts +348 -0
- package/src/be/primitives/objects.ts +686 -0
- package/src/be/primitives/sheets/a1.ts +136 -0
- package/src/be/primitives/sheets/engine-worker.ts +194 -0
- package/src/be/primitives/sheets/engine.ts +199 -0
- package/src/be/primitives/sheets/format.ts +106 -0
- package/src/be/primitives/sheets/service.ts +415 -0
- package/src/be/primitives/write-object.ts +83 -0
- package/src/be/runtime-pools/controllers.ts +18 -3
- package/src/be/runtime-pools/db.ts +15 -4
- package/src/be/runtime-pools/supervisor.ts +42 -2
- package/src/be/script-credential-broker.ts +8 -27
- package/src/be/scripts/typecheck.ts +216 -0
- package/src/be/seed/agent-fs-provision.ts +18 -0
- package/src/be/swarm-config-guard.ts +10 -2
- package/src/be/users.ts +19 -0
- 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/steps/harness.tsx +1 -1
- package/src/commands/provider-credentials.ts +1 -0
- package/src/commands/runner.ts +116 -12
- package/src/e2b/env.ts +3 -1
- package/src/extensions/catalog.generated.json +1 -1
- package/src/fs/agent-fs-provider.ts +33 -2
- package/src/github/app.ts +59 -14
- package/src/gitlab/auth.ts +3 -4
- package/src/heartbeat/heartbeat.ts +11 -11
- package/src/http/agent-lifecycle.ts +152 -0
- package/src/http/agents.ts +12 -0
- package/src/http/all-routes.ts +4 -0
- package/src/http/auth.ts +2 -1
- package/src/http/config.ts +2 -1
- package/src/http/core.ts +2 -0
- package/src/http/github-token.ts +66 -0
- package/src/http/index.ts +36 -0
- package/src/http/mcp-user.ts +11 -8
- package/src/http/mcp.ts +58 -42
- package/src/http/object-webhooks.ts +101 -0
- package/src/http/operator-actor.ts +2 -1
- package/src/http/prompt-templates.ts +1 -0
- package/src/http/request-composition.ts +310 -0
- package/src/http/sessions.ts +7 -0
- package/src/http/tasks.ts +6 -1
- package/src/http/tool-schema-estimate.ts +95 -0
- package/src/http/workflows.ts +61 -11
- package/src/integrations/chat-sdk/inbound.ts +2 -2
- package/src/integrations/chat-sdk/outbound-files.ts +3 -2
- 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 +76 -2
- 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 +4 -0
- package/src/providers/request-composition-hook.ts +312 -0
- package/src/providers/types.ts +5 -0
- package/src/rbac/legacy-policy.ts +2 -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/k8s.ts +111 -6
- package/src/runtime-providers/types.ts +17 -0
- package/src/scheduler/scheduler.ts +1 -1
- package/src/script-workflows/guest-ctx.ts +32 -0
- package/src/script-workflows/workflow-ctx.ts +2 -0
- package/src/scripts-runtime/ctx.ts +9 -1
- package/src/scripts-runtime/executors/native.ts +106 -21
- package/src/scripts-runtime/executors/quickjs-prelude.ts +9 -2
- package/src/scripts-runtime/executors/quickjs-runner.ts +12 -1
- package/src/scripts-runtime/sdk-allowlist.ts +88 -0
- package/src/scripts-runtime/swarm-sdk.ts +51 -3
- package/src/scripts-runtime/types/stdlib.d.ts +267 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +267 -0
- package/src/server-user.ts +16 -1
- package/src/server.ts +48 -0
- package/src/slack/ack.ts +10 -5
- package/src/slack/actions.ts +3 -3
- package/src/slack/app.ts +2 -0
- package/src/slack/assistant.ts +4 -4
- package/src/slack/blocks.ts +3 -3
- package/src/slack/handlers.ts +3 -3
- package/src/slack/reaction-shortcode.ts +23 -2
- package/src/slack/render-v2.ts +297 -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/agent-history.test.ts +313 -0
- package/src/tests/azure-devops-auth.test.ts +6 -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-outbound-files.test.ts +3 -1
- package/src/tests/check-playwright-version.test.ts +33 -0
- package/src/tests/check-unit-test-allowlist.test.ts +193 -0
- package/src/tests/context-preamble-budget.test.ts +65 -0
- package/src/tests/credential-check.test.ts +12 -0
- package/src/tests/credential-outcome-report.test.ts +81 -1
- package/src/tests/db-client.test.ts +22 -0
- package/src/tests/db-retention-defaults.test.ts +244 -0
- package/src/tests/db-retention.test.ts +2 -1
- package/src/tests/db-task-read-contract.test.ts +2 -0
- package/src/tests/db-task-write-contract.test.ts +2 -0
- package/src/tests/deploy-release-dispatch.test.ts +332 -0
- package/src/tests/e2b-stack-wizard.test.tsx +156 -0
- package/src/tests/e2e-coverage-contract.test.ts +6 -2
- package/src/tests/e2e-diff-coverage.test.ts +154 -0
- package/src/tests/e2e-rerun-quarantine.test.ts +180 -0
- package/src/tests/e2e-shards.test.ts +137 -0
- package/src/tests/e2e-tracker-ingest.test.ts +266 -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 +12 -18
- package/src/tests/extensions-example-slack-reply-gate.test.ts +15 -0
- package/src/tests/extensions-heartbeat.test.ts +34 -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/github-app-worker-auth-helper.test.ts +325 -0
- package/src/tests/github-installation-token-route.test.ts +199 -0
- package/src/tests/gitlab-auth.test.ts +10 -0
- package/src/tests/heartbeat.test.ts +38 -0
- package/src/tests/http-api-integration.test.ts +0 -6
- package/src/tests/mcp-user-events.test.ts +708 -0
- package/src/tests/memory-key-paths.test.ts +4 -1
- package/src/tests/memory-search-stall.test.ts +421 -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-profile-fallbacks.test.ts +236 -2
- package/src/tests/opencode-adapter.test.ts +97 -0
- 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/primitives-boards.test.ts +686 -0
- package/src/tests/primitives-object-webhooks.test.ts +642 -0
- package/src/tests/primitives-objects.test.ts +248 -0
- package/src/tests/prompt-template-resolver.test.ts +85 -0
- package/src/tests/reasoning-kind-ui-parity.test.ts +112 -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-pools-db.test.ts +80 -0
- package/src/tests/runtime-provider-registration.test.ts +8 -0
- package/src/tests/runtime-providers-docker.test.ts +192 -1
- package/src/tests/runtime-providers-k8s.test.ts +127 -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 +8 -0
- package/src/tests/script-native-sandbox-identity.test.ts +264 -0
- package/src/tests/scripts-namespaces.test.ts +211 -0
- package/src/tests/secret-scrub-gate.test.ts +1 -0
- package/src/tests/secret-scrubber-convex.test.ts +168 -0
- package/src/tests/secret-scrubber.test.ts +1 -1
- package/src/tests/session-tokens.test.ts +27 -0
- package/src/tests/sheet-engine.test.ts +58 -0
- package/src/tests/slack-blocks.test.ts +18 -0
- package/src/tests/slack-empty-icon-config.test.ts +113 -0
- package/src/tests/slack-file-tools-attachments.test.ts +74 -6
- package/src/tests/slack-reaction-config.test.ts +38 -2
- package/src/tests/slack-read-boundaries.test.ts +4 -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 +683 -11
- package/src/tests/swarm-config-reserved-keys.test.ts +1 -0
- package/src/tests/task-session-prompts.test.ts +37 -0
- package/src/tests/task-start-after-commit.test.ts +82 -0
- package/src/tests/ui-logs-parser.test.ts +67 -0
- package/src/tests/user-delete-perf.test.ts +36 -9
- package/src/tests/webhook-filter.test.ts +327 -0
- package/src/tests/workflow-async-v2.test.ts +19 -16
- package/src/tests/workflow-e2e.test.ts +1 -9
- package/src/tests/workflow-finalization-races.test.ts +553 -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 +105 -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-retry-v2.test.ts +158 -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 +36 -2
- package/src/tests/workflow-triggers-v2.test.ts +201 -0
- package/src/tests/workflow-wait-builtin-events.test.ts +3 -1
- package/src/tests/workflow-wait-event.test.ts +28 -2
- 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.ts +44 -0
- package/src/tools/boards.ts +260 -0
- package/src/tools/objects.ts +191 -0
- package/src/tools/sheets.ts +312 -0
- package/src/tools/slack-read.ts +10 -3
- package/src/tools/tool-config.ts +23 -0
- package/src/tools/workflows/create-workflow.ts +18 -4
- package/src/tools/workflows/patch-workflow-node.ts +4 -0
- package/src/tools/workflows/patch-workflow.ts +4 -0
- package/src/tools/workflows/update-workflow.ts +24 -3
- package/src/types.ts +216 -2
- package/src/utils/credentials.ts +7 -0
- package/src/utils/sandboxed-process.ts +47 -2
- package/src/utils/secret-scrubber.ts +61 -6
- package/src/workflows/checkpoint.ts +18 -0
- package/src/workflows/engine.ts +73 -31
- package/src/workflows/foreach-driver.ts +42 -4
- package/src/workflows/input.ts +29 -1
- package/src/workflows/patch-definition.ts +15 -1
- package/src/workflows/recovery.ts +6 -1
- package/src/workflows/resume.ts +11 -3
- package/src/workflows/retry-poller.ts +32 -6
- package/src/workflows/successor-routing.ts +108 -0
- package/src/workflows/task-step-routing.ts +5 -2
- package/src/workflows/triggers.ts +21 -36
- package/src/workflows/validation.ts +10 -0
- package/src/workflows/wait-poller.ts +6 -2
- package/src/workflows/webhook-filter.ts +203 -0
- package/templates/ai-toolbox.manifest.json +1 -1
- package/templates/extensions/slack-reply-gate/hooks.ts +8 -4
- package/templates/skills/agent-browser/SKILL.md +1 -0
- package/templates/skills/agent-browser/content.md +1 -0
- package/templates/skills/pages/content.md +5 -0
- package/templates/skills/swarm-docs/content.md +8 -1
- package/templates/skills/swarm-scripts/SKILL.md +1 -0
- package/templates/skills/swarm-scripts/content.md +1 -0
- package/templates/skills/tdd-planning/content.md +5 -2
- package/dist/acp-adapter-bht22g3k.js +0 -16
- package/dist/core-sxy4epp2.js +0 -38
- package/dist/fx-adapter-adtdb3jb.js +0 -19
- package/dist/grok-adapter-accnn9km.js +0 -19
- package/dist/handlers-1x77561e.js +0 -35
- package/dist/index-48qzcqzj.js +0 -35
- package/dist/index-rkvaambe.js +0 -36
- package/dist/index-xj1mq27m.js +0 -40
- package/dist/lead-enzn86bz.js +0 -74
- package/dist/thread-buffer-3x93yexa.js +0 -38
- package/dist/worker-zfcv2wbf.js +0 -74
- package/src/slack/socket-mode-guard.test.ts +0 -25
- package/src/tests/agent-activity.test.ts +0 -247
- package/src/tests/agent-fs-live-url.test.ts +0 -55
- package/src/tests/agentmail-inbox-mapping.test.ts +0 -73
- package/src/tests/approval-sweeps-config.test.ts +0 -47
- package/src/tests/cards.test.ts +0 -169
- package/src/tests/chat-sdk-facts.test.ts +0 -23
- package/src/tests/config-env-export-chat-sdk.test.ts +0 -11
- package/src/tests/core-auth.test.ts +0 -156
- package/src/tests/date-utils.test.ts +0 -48
- package/src/tests/db-context-versions.test.ts +0 -37
- package/src/tests/db-runtime.test.ts +0 -131
- package/src/tests/enabled-capabilities.test.ts +0 -20
- package/src/tests/extensions-example-mcp-install.test.ts +0 -67
- package/src/tests/extensions-lead-equivalence.test.ts +0 -70
- package/src/tests/get-workflow-run-tool.test.ts +0 -98
- package/src/tests/github-event-labels.test.ts +0 -24
- package/src/tests/haiku-5-5-pricing.test.ts +0 -38
- package/src/tests/http-log-scrubbing.test.ts +0 -123
- package/src/tests/http-semconv-attributes.test.ts +0 -92
- package/src/tests/identity.test.ts +0 -117
- package/src/tests/inbox-state.test.ts +0 -167
- package/src/tests/internal-ai/models.test.ts +0 -54
- package/src/tests/launch-password-rejection.test.ts +0 -140
- package/src/tests/list-total-cache.test.ts +0 -88
- package/src/tests/match-route.test.ts +0 -187
- package/src/tests/memory-feature-flags.test.ts +0 -45
- package/src/tests/memory-get-tool.test.ts +0 -269
- package/src/tests/memory-health-endpoint.test.ts +0 -78
- package/src/tests/memory-http-access.test.ts +0 -221
- package/src/tests/memory-retrieval-purge.test.ts +0 -99
- package/src/tests/multi-runtime-enabled-stats.test.ts +0 -229
- package/src/tests/openai-embedding-provider.test.ts +0 -159
- package/src/tests/org-identity.test.ts +0 -44
- package/src/tests/pages-actions-endpoint.test.ts +0 -103
- package/src/tests/pages-browser-sdk.test.ts +0 -76
- package/src/tests/pages-feedback-keys.test.ts +0 -121
- package/src/tests/pages-frame-ancestors.test.ts +0 -189
- package/src/tests/pages-list-endpoint.test.ts +0 -148
- package/src/tests/pages-password-mode.test.ts +0 -266
- package/src/tests/pages-public-authed-401.test.ts +0 -103
- package/src/tests/pages-public-html.test.ts +0 -297
- package/src/tests/pages-public-json-redirect.test.ts +0 -122
- package/src/tests/pages-view-count.test.ts +0 -245
- package/src/tests/prompt-templates-db.test.ts +0 -616
- package/src/tests/rbac-engine.test.ts +0 -742
- package/src/tests/repo-allow-merge-gate.test.ts +0 -389
- package/src/tests/route-def-find-route.test.ts +0 -192
- package/src/tests/runtime-stale-threshold.test.ts +0 -40
- package/src/tests/schedule-validation-helper.test.ts +0 -51
- package/src/tests/scheduled-tasks-api.test.ts +0 -355
- package/src/tests/scheduler-backoff.test.ts +0 -166
- package/src/tests/script-run-token.test.ts +0 -75
- package/src/tests/scripts-extract-signature.test.ts +0 -47
- package/src/tests/scripts-sdk-bridge-tool-failure.test.ts +0 -141
- package/src/tests/seed-workflow-dreaming.test.ts +0 -117
- package/src/tests/short-id.test.ts +0 -23
- package/src/tests/skill-files-http.test.ts +0 -222
- package/src/tests/skill-get-file-tool.test.ts +0 -110
- package/src/tests/skill-script-refs.test.ts +0 -63
- package/src/tests/skill-update-scope.test.ts +0 -252
- package/src/tests/skills-bundle.test.ts +0 -99
- package/src/tests/slack-app-icon.test.ts +0 -94
- package/src/tests/slack-assistant-comention.test.ts +0 -139
- package/src/tests/slack-delete.test.ts +0 -157
- package/src/tests/slack-inbound-diagnostics-auth.test.ts +0 -93
- package/src/tests/slack-manifest.test.ts +0 -23
- package/src/tests/slack-task-output.test.ts +0 -90
- package/src/tests/store-progress-output-guidance.test.ts +0 -34
- package/src/tests/swarm-diff.test.ts +0 -728
- package/src/tests/task-lifecycle-events.test.ts +0 -53
- package/src/tests/template-asset-config.test.ts +0 -18
- package/src/tests/template-fetch.test.ts +0 -490
- package/src/tests/themes-page-theme.test.ts +0 -155
- package/src/tests/tool-annotations.test.ts +0 -442
- package/src/tests/tool-output-agent-id.test.ts +0 -202
- package/src/tests/update-profile-agentid.test.ts +0 -248
- package/src/tests/whoami-route.test.ts +0 -162
- package/src/tests/workflow-definition-telemetry.test.ts +0 -134
- package/src/tests/workflow-patch.test.ts +0 -169
- package/src/tests/workflow-run-steps-index.test.ts +0 -65
- package/src/tests/workflow-schedule-trigger.test.ts +0 -104
- package/src/tests/workflow-step-claims.test.ts +0 -152
- package/src/tests/workflow-step-order.test.ts +0 -92
- package/src/tests/workflow-trigger-schema.test.ts +0 -359
- package/src/tests/workflow-versions.test.ts +0 -240
|
@@ -44,7 +44,11 @@ import { snapshotCatalogRows } from "../utils/runtime-model-catalog";
|
|
|
44
44
|
import { registerVolatileSecret, scrubSecrets } from "../utils/secret-scrubber";
|
|
45
45
|
import { resolveSlashSkillPrompt } from "./codex-skill-resolver";
|
|
46
46
|
import { OpenRouterBilling } from "./opencode-billing";
|
|
47
|
-
import {
|
|
47
|
+
import {
|
|
48
|
+
createOpencodeSwarmPlugin,
|
|
49
|
+
type OpencodeRequestContext,
|
|
50
|
+
type OpencodeToolLister,
|
|
51
|
+
} from "./opencode-swarm-plugin";
|
|
48
52
|
import {
|
|
49
53
|
apiHeaders,
|
|
50
54
|
autoIndexMemoryFile,
|
|
@@ -54,6 +58,16 @@ import {
|
|
|
54
58
|
syncIdentityFilesToServer,
|
|
55
59
|
} from "./pi-mono-extension";
|
|
56
60
|
import { applyReasoningEffort, type ReasoningEffort } from "./reasoning-effort";
|
|
61
|
+
import {
|
|
62
|
+
BUILTIN_TOOL_GROUP,
|
|
63
|
+
HookCompositionReporter,
|
|
64
|
+
type HookRequestMeasure,
|
|
65
|
+
type HookToolGroup,
|
|
66
|
+
measureHookRequest,
|
|
67
|
+
postHookComposition,
|
|
68
|
+
SWARM_TOOL_GROUP,
|
|
69
|
+
textChars,
|
|
70
|
+
} from "./request-composition-hook";
|
|
57
71
|
import { resolveOpencodeSdkSpecifier } from "./runtime-dependencies";
|
|
58
72
|
import type {
|
|
59
73
|
CostData,
|
|
@@ -101,6 +115,7 @@ function opencodeModelToCredKey(modelStr: string | undefined): string | null {
|
|
|
101
115
|
if (provider === "anthropic") return "ANTHROPIC_API_KEY";
|
|
102
116
|
if (provider === "openrouter") return "OPENROUTER_API_KEY";
|
|
103
117
|
if (provider === "openai") return "OPENAI_API_KEY";
|
|
118
|
+
if (provider === "opencode-go") return "OPENCODE_API_KEY";
|
|
104
119
|
// OpenAI-compatible registry providers (`nan`, `helmcode`).
|
|
105
120
|
const direct = openAICompatibleProvider(provider);
|
|
106
121
|
if (direct) return direct.envVar;
|
|
@@ -123,6 +138,7 @@ const OPENCODE_ANY_KEY_VARS = [
|
|
|
123
138
|
"OPENROUTER_API_KEY",
|
|
124
139
|
"ANTHROPIC_API_KEY",
|
|
125
140
|
"OPENAI_API_KEY",
|
|
141
|
+
"OPENCODE_API_KEY",
|
|
126
142
|
...openAICompatibleKeyVars(),
|
|
127
143
|
];
|
|
128
144
|
|
|
@@ -298,11 +314,12 @@ export function buildOpenAICompatibleProviderBlock(
|
|
|
298
314
|
|
|
299
315
|
/**
|
|
300
316
|
* Built-in OpenCode providers whose key OpenCode reads from `process.env`:
|
|
301
|
-
* `openrouter` plus every registry provider models.dev lists
|
|
317
|
+
* `openrouter`, `opencode-go` plus every registry provider models.dev lists
|
|
302
318
|
* (`catalog: "models.dev"`, e.g. `nan`), which OpenCode ships built in.
|
|
303
319
|
*/
|
|
304
320
|
function envBoundKeyVars(providerId: string): readonly string[] | undefined {
|
|
305
321
|
if (providerId === "openrouter") return ["OPENROUTER_API_KEY"];
|
|
322
|
+
if (providerId === "opencode-go") return ["OPENCODE_API_KEY"];
|
|
306
323
|
const direct = openAICompatibleProvider(providerId);
|
|
307
324
|
return direct?.catalog === "models.dev" ? providerKeyVars(direct) : undefined;
|
|
308
325
|
}
|
|
@@ -532,6 +549,40 @@ function toolResultText(content: ReadonlyArray<{ type: string; text?: string }>
|
|
|
532
549
|
.join("");
|
|
533
550
|
}
|
|
534
551
|
|
|
552
|
+
/**
|
|
553
|
+
* Tool name → schema group. OpenCode keys MCP tools `<server>_<tool>`; any
|
|
554
|
+
* other tool is an OpenCode built-in.
|
|
555
|
+
*/
|
|
556
|
+
export function opencodeToolGroupOf(
|
|
557
|
+
mcpServers: readonly string[],
|
|
558
|
+
): (name: string) => HookToolGroup {
|
|
559
|
+
// Longest first, so `a_b` wins over `a` for a tool `a_b_x`.
|
|
560
|
+
const servers = [...mcpServers].sort((a, b) => b.length - a.length);
|
|
561
|
+
return (name) => {
|
|
562
|
+
const server = servers.find((candidate) => name.startsWith(`${candidate}_`));
|
|
563
|
+
if (!server) return BUILTIN_TOOL_GROUP;
|
|
564
|
+
if (server === SWARM_MCP_SERVER) return SWARM_TOOL_GROUP;
|
|
565
|
+
return { id: `mcp:${server}`, label: `${server} tool schemas` };
|
|
566
|
+
};
|
|
567
|
+
}
|
|
568
|
+
|
|
569
|
+
/** Measure one primary request from OpenCode's `context` hook event. */
|
|
570
|
+
export function measureOpencodeContext(
|
|
571
|
+
event: OpencodeRequestContext,
|
|
572
|
+
groupOf: (name: string) => HookToolGroup,
|
|
573
|
+
): HookRequestMeasure {
|
|
574
|
+
return measureHookRequest({
|
|
575
|
+
system: event.system.map((part) => part.text ?? "").join("\n"),
|
|
576
|
+
tools: Object.entries(event.tools).map(([name, tool]) => ({
|
|
577
|
+
name,
|
|
578
|
+
description: tool.description,
|
|
579
|
+
schema: tool.input,
|
|
580
|
+
})),
|
|
581
|
+
messageChars: textChars(event.messages),
|
|
582
|
+
groupOf,
|
|
583
|
+
});
|
|
584
|
+
}
|
|
585
|
+
|
|
535
586
|
export class OpencodeSession implements ProviderSession {
|
|
536
587
|
private listeners: Array<(event: ProviderEvent) => void> = [];
|
|
537
588
|
// The runner attaches its listener after `createSession` resolves; buffer
|
|
@@ -555,6 +606,8 @@ export class OpencodeSession implements ProviderSession {
|
|
|
555
606
|
// Assistant text by message, in part order; the runner keeps the last emit.
|
|
556
607
|
private textByMessage = new Map<string, string[]>();
|
|
557
608
|
private transcript: string[] = [];
|
|
609
|
+
/** Set when the session posts harness-hook request composition manifests. */
|
|
610
|
+
composition: HookCompositionReporter | undefined;
|
|
558
611
|
/** Fed each step's prompt size; steers the one-time context-bound note. */
|
|
559
612
|
private readonly observeContextBound: (contextTokens: number | undefined) => Promise<void>;
|
|
560
613
|
|
|
@@ -723,6 +776,7 @@ export class OpencodeSession implements ProviderSession {
|
|
|
723
776
|
const t = ev.data.tokens;
|
|
724
777
|
const contextUsed = t.input + t.cache.read + t.cache.write + t.output;
|
|
725
778
|
void this.observeContextBound(t.input + t.cache.read + t.cache.write);
|
|
779
|
+
this.composition?.observeUsage(t.input + t.cache.read + t.cache.write, this.model);
|
|
726
780
|
const contextTotal = getContextWindowSize(this.model || "default");
|
|
727
781
|
if (contextTotal > 0 && contextUsed > 0) {
|
|
728
782
|
this.emit({
|
|
@@ -1014,6 +1068,7 @@ export class OpencodeAdapter implements ProviderAdapter {
|
|
|
1014
1068
|
};
|
|
1015
1069
|
const { sdk, version: opencodeVersion } = await loadOpencodeSdkImpl(env);
|
|
1016
1070
|
let listTools: OpencodeToolLister | undefined;
|
|
1071
|
+
let onContext: ((event: OpencodeRequestContext) => void) | undefined;
|
|
1017
1072
|
const billing = config.model.startsWith("openrouter/") ? new OpenRouterBilling() : undefined;
|
|
1018
1073
|
// The config string carries the spliced provider key and the swarm MCP
|
|
1019
1074
|
// bearer. It goes to the SDK only; nothing logs, writes, or uploads it,
|
|
@@ -1029,6 +1084,7 @@ export class OpencodeAdapter implements ProviderAdapter {
|
|
|
1029
1084
|
listTools = lister;
|
|
1030
1085
|
},
|
|
1031
1086
|
...(billing ? { onOpenRouterResponse: (response) => billing.observe(response) } : {}),
|
|
1087
|
+
onContext: (event) => onContext?.(event),
|
|
1032
1088
|
}),
|
|
1033
1089
|
],
|
|
1034
1090
|
log: {
|
|
@@ -1062,6 +1118,24 @@ export class OpencodeAdapter implements ProviderAdapter {
|
|
|
1062
1118
|
billing,
|
|
1063
1119
|
);
|
|
1064
1120
|
session.emitSessionInit(opencodeVersion ? { version: opencodeVersion } : undefined);
|
|
1121
|
+
if (config.runnerSessionId && taskId) {
|
|
1122
|
+
const composition = new HookCompositionReporter(
|
|
1123
|
+
{ sessionId: config.runnerSessionId, provider: "opencode" },
|
|
1124
|
+
(body) =>
|
|
1125
|
+
postHookComposition({ apiUrl: config.apiUrl, taskId, headers: apiHeaders(swarm) }, body),
|
|
1126
|
+
);
|
|
1127
|
+
session.composition = composition;
|
|
1128
|
+
const groupOf = opencodeToolGroupOf(Object.keys(mcp));
|
|
1129
|
+
onContext = (event) => {
|
|
1130
|
+
// Subagent child sessions share the host; only the task session counts.
|
|
1131
|
+
if (event.sessionID !== sessionId) return;
|
|
1132
|
+
try {
|
|
1133
|
+
composition.observeRequest(measureOpencodeContext(event, groupOf));
|
|
1134
|
+
} catch (err) {
|
|
1135
|
+
console.warn(`[opencode] Request composition measure failed: ${err}`);
|
|
1136
|
+
}
|
|
1137
|
+
};
|
|
1138
|
+
}
|
|
1065
1139
|
|
|
1066
1140
|
// Drive the session from the host's event stream. Closing the host ends
|
|
1067
1141
|
// the stream; ending without a terminal event means the host died.
|
|
@@ -30,6 +30,22 @@ export interface OpencodeSwarmPluginOptions {
|
|
|
30
30
|
onToolRegistry?: (listTools: OpencodeToolLister) => void;
|
|
31
31
|
/** Receives every OpenRouter model response, for the billed cost. */
|
|
32
32
|
onOpenRouterResponse?: (response: Response) => void;
|
|
33
|
+
/**
|
|
34
|
+
* Receives each primary model request's final context (system, messages,
|
|
35
|
+
* tools), after this plugin's own edits. OpenCode fires `context` once per
|
|
36
|
+
* agent-loop step, so this sees every primary call.
|
|
37
|
+
*/
|
|
38
|
+
onContext?: (event: OpencodeRequestContext) => void;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** The parts of OpenCode's `context` hook event the request measurement reads. */
|
|
42
|
+
export interface OpencodeRequestContext {
|
|
43
|
+
readonly sessionID: string;
|
|
44
|
+
readonly system: ReadonlyArray<{ readonly text?: string }>;
|
|
45
|
+
readonly messages: ReadonlyArray<unknown>;
|
|
46
|
+
readonly tools: Readonly<
|
|
47
|
+
Record<string, { readonly description: string; readonly input: unknown }>
|
|
48
|
+
>;
|
|
33
49
|
}
|
|
34
50
|
|
|
35
51
|
/** Keys OpenCode sets on each shell call, on top of its base env. */
|
|
@@ -102,10 +118,13 @@ export function createOpencodeSwarmPlugin(
|
|
|
102
118
|
});
|
|
103
119
|
|
|
104
120
|
// Lead only: tell the model what other sessions are already handling.
|
|
121
|
+
// Then hand the final request to the composition measurement.
|
|
105
122
|
await ctx.session.hook("context", async (event) => {
|
|
106
|
-
if (
|
|
107
|
-
|
|
108
|
-
|
|
123
|
+
if (config.isLead) {
|
|
124
|
+
const concurrent = await fetchConcurrentContext(config);
|
|
125
|
+
if (concurrent) event.system.push({ type: "text", text: concurrent });
|
|
126
|
+
}
|
|
127
|
+
options.onContext?.(event);
|
|
109
128
|
});
|
|
110
129
|
|
|
111
130
|
// Nobody reads a headless session's title. Generating one is a second
|
|
@@ -2138,6 +2138,7 @@ export class PiMonoAdapter implements ProviderAdapter {
|
|
|
2138
2138
|
isLead: config.role === "lead",
|
|
2139
2139
|
env: sessionEnv,
|
|
2140
2140
|
mcpServers: piMcpServers,
|
|
2141
|
+
runnerSessionId: config.runnerSessionId,
|
|
2141
2142
|
});
|
|
2142
2143
|
|
|
2143
2144
|
const features: PiSessionFeatures = {
|
|
@@ -22,6 +22,15 @@ import { summarizeSession as runSummarize } from "../utils/internal-ai";
|
|
|
22
22
|
import { getMemoryRaterNames } from "../utils/memory-raters";
|
|
23
23
|
import { getOpenRouterAttributionHeaders } from "../utils/openrouter-base-url";
|
|
24
24
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
25
|
+
import {
|
|
26
|
+
BUILTIN_TOOL_GROUP,
|
|
27
|
+
HookCompositionReporter,
|
|
28
|
+
type HookToolGroup,
|
|
29
|
+
measureHookRequest,
|
|
30
|
+
postHookComposition,
|
|
31
|
+
SWARM_TOOL_GROUP,
|
|
32
|
+
splitProviderPayload,
|
|
33
|
+
} from "./request-composition-hook";
|
|
25
34
|
|
|
26
35
|
export interface SwarmHooksConfig {
|
|
27
36
|
apiUrl: string;
|
|
@@ -40,6 +49,11 @@ export interface SwarmHooksConfig {
|
|
|
40
49
|
* pi's MCP extension on `session_start`, which connects them.
|
|
41
50
|
*/
|
|
42
51
|
mcpServers?: Record<string, McpServerConfig>;
|
|
52
|
+
/**
|
|
53
|
+
* The runner's session id. Keys the harness-hook request composition
|
|
54
|
+
* manifest to the worker's manifest of the same session; unset, none posts.
|
|
55
|
+
*/
|
|
56
|
+
runnerSessionId?: string;
|
|
43
57
|
}
|
|
44
58
|
|
|
45
59
|
/** Standard headers for swarm API requests */
|
|
@@ -485,6 +499,25 @@ function sendNudge(pi: Parameters<ExtensionFactory>[0], text: string): void {
|
|
|
485
499
|
});
|
|
486
500
|
}
|
|
487
501
|
|
|
502
|
+
/** Tool name → schema group: swarm tools, other MCP servers, pi built-ins. */
|
|
503
|
+
export function piToolGroups(
|
|
504
|
+
tools: ReadonlyArray<{ name: string; namespace?: { name: string } }>,
|
|
505
|
+
): Map<string, HookToolGroup> {
|
|
506
|
+
const groups = new Map<string, HookToolGroup>();
|
|
507
|
+
for (const tool of tools) {
|
|
508
|
+
const namespace = tool.namespace?.name;
|
|
509
|
+
if (!namespace) continue;
|
|
510
|
+
groups.set(
|
|
511
|
+
tool.name,
|
|
512
|
+
// `SWARM_TOOL_NAMESPACE` in pi-mono-adapter.ts.
|
|
513
|
+
namespace === "agent-swarm"
|
|
514
|
+
? SWARM_TOOL_GROUP
|
|
515
|
+
: { id: `mcp:${namespace}`, label: `${namespace} tool schemas` },
|
|
516
|
+
);
|
|
517
|
+
}
|
|
518
|
+
return groups;
|
|
519
|
+
}
|
|
520
|
+
|
|
488
521
|
/**
|
|
489
522
|
* Create the swarm hooks extension factory for pi-mono.
|
|
490
523
|
*
|
|
@@ -495,6 +528,44 @@ export function createSwarmHooksExtension(config: SwarmHooksConfig): ExtensionFa
|
|
|
495
528
|
return (pi) => {
|
|
496
529
|
let lastContextPostTime = 0;
|
|
497
530
|
|
|
531
|
+
// === before_provider_request + message_end → request composition ===
|
|
532
|
+
// The payload is what pi sends, so its system prompt, tool declarations
|
|
533
|
+
// and messages are measured exactly. The call's usage then calibrates the
|
|
534
|
+
// server's chars-to-tokens ratio for pi.
|
|
535
|
+
if (config.taskId && config.runnerSessionId) {
|
|
536
|
+
const composition = new HookCompositionReporter(
|
|
537
|
+
{ sessionId: config.runnerSessionId, provider: "pi" },
|
|
538
|
+
(body) =>
|
|
539
|
+
postHookComposition(
|
|
540
|
+
{ apiUrl: config.apiUrl, taskId: config.taskId, headers: apiHeaders(config) },
|
|
541
|
+
body,
|
|
542
|
+
),
|
|
543
|
+
);
|
|
544
|
+
pi.on("before_provider_request", (event) => {
|
|
545
|
+
try {
|
|
546
|
+
const request = splitProviderPayload(event.payload);
|
|
547
|
+
// Compaction summaries declare no tools; they are not agent calls.
|
|
548
|
+
if (request.tools.length === 0) return undefined;
|
|
549
|
+
const groups = piToolGroups(pi.getAllTools());
|
|
550
|
+
composition.observeRequest(
|
|
551
|
+
measureHookRequest({
|
|
552
|
+
...request,
|
|
553
|
+
groupOf: (name) => groups.get(name) ?? BUILTIN_TOOL_GROUP,
|
|
554
|
+
}),
|
|
555
|
+
);
|
|
556
|
+
} catch (err) {
|
|
557
|
+
console.warn(`[pi] Request composition measure failed: ${err}`);
|
|
558
|
+
}
|
|
559
|
+
return undefined;
|
|
560
|
+
});
|
|
561
|
+
pi.on("message_end", (event, ctx) => {
|
|
562
|
+
const message = event.message;
|
|
563
|
+
if (message.role !== "assistant" || !message.usage) return;
|
|
564
|
+
const { input, cacheRead, cacheWrite } = message.usage;
|
|
565
|
+
composition.observeUsage(input + cacheRead + cacheWrite, ctx.model?.id);
|
|
566
|
+
});
|
|
567
|
+
}
|
|
568
|
+
|
|
498
569
|
pi.on("before_provider_headers", (event, ctx) => {
|
|
499
570
|
Object.assign(
|
|
500
571
|
event.headers,
|
|
@@ -261,6 +261,10 @@ and heartbeat-classified roots are omitted, and the metrics remain separate.
|
|
|
261
261
|
fall back after rejecting the requested model, so that requested ID alone
|
|
262
262
|
cannot justify a rate alias.
|
|
263
263
|
|
|
264
|
+
## Request composition token ratio
|
|
265
|
+
|
|
266
|
+
Request composition parts estimate tokens as `ceil(chars / 4)`. The per-provider correction lives in KV (namespace `swarm`, key `request-composition/token-ratio/<provider>`), not in the pricing table. Pi and opencode learn it from each harness-hook manifest: `promptTokens / (payloadChars / 4)`, folded into an EMA (α = 0.2, seeded by the first observation, bounded 0.5 to 2.0). Claude and codex stay at 1.0 unless an operator writes the key. Details: the cost-and-context guide, section "Request composition and cache-hit ratio".
|
|
267
|
+
|
|
264
268
|
## When a model is missing
|
|
265
269
|
|
|
266
270
|
Cost POSTs accept an optional UUID `id`. The runner reuses it across retries. Repeated IDs return the stored record without changing its price.
|
|
@@ -0,0 +1,312 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Exact request composition from a harness payload hook (pi, opencode).
|
|
3
|
+
*
|
|
4
|
+
* The worker's manifest (`POST /api/tasks/{id}/request-composition`, source
|
|
5
|
+
* `worker`) sizes the prompt parts we assemble and estimates the rest. Pi and
|
|
6
|
+
* OpenCode hand their extensions the request they are about to send, so for
|
|
7
|
+
* them we measure the real system prompt, tool declarations and messages, and
|
|
8
|
+
* post a `harness-hook` manifest. The server merges it with the worker's parts
|
|
9
|
+
* and learns a per-provider chars-to-tokens ratio from the call's usage.
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
import type { RequestCompositionPartInput } from "../types";
|
|
13
|
+
|
|
14
|
+
/** One tool declaration as the harness sends it. */
|
|
15
|
+
export interface HookTool {
|
|
16
|
+
name: string;
|
|
17
|
+
description: string;
|
|
18
|
+
schema: unknown;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/** Which bucket a tool's schema counts under, e.g. `mcp:agent-swarm`. */
|
|
22
|
+
export type HookToolGroup = { id: string; label: string };
|
|
23
|
+
|
|
24
|
+
/** The measured parts of one request. */
|
|
25
|
+
export interface HookRequestMeasure {
|
|
26
|
+
/** Changes only when the system prompt or the tool set changes. */
|
|
27
|
+
hash: string;
|
|
28
|
+
/** Tool-schema groups plus the skills listing, all `exact`. */
|
|
29
|
+
parts: RequestCompositionPartInput[];
|
|
30
|
+
/** Chars of the system prompt as sent, skills listing included. */
|
|
31
|
+
systemChars: number;
|
|
32
|
+
/** Chars of the whole request: system, tools and messages. */
|
|
33
|
+
payloadChars: number;
|
|
34
|
+
/** Text chars of the request's messages. */
|
|
35
|
+
messageChars: number;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** Body of the `harness-hook` manifest POST. */
|
|
39
|
+
export interface HookCompositionBody {
|
|
40
|
+
sessionId: string;
|
|
41
|
+
provider: string;
|
|
42
|
+
model?: string;
|
|
43
|
+
source: "harness-hook";
|
|
44
|
+
toolLoading: "none";
|
|
45
|
+
parts: RequestCompositionPartInput[];
|
|
46
|
+
harness: {
|
|
47
|
+
systemChars: number;
|
|
48
|
+
payloadChars: number;
|
|
49
|
+
promptTokens: number;
|
|
50
|
+
/** First manifest only: the messages are the task prompt plus harness context. */
|
|
51
|
+
firstMessageChars?: number;
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export const SWARM_TOOL_GROUP: HookToolGroup = {
|
|
56
|
+
id: "mcp:agent-swarm",
|
|
57
|
+
label: "swarm tool schemas",
|
|
58
|
+
};
|
|
59
|
+
export const BUILTIN_TOOL_GROUP: HookToolGroup = {
|
|
60
|
+
id: "harness:builtin",
|
|
61
|
+
label: "harness built-in tool schemas",
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
/** Pi's skills block inside its system prompt (native skill discovery). */
|
|
65
|
+
const SKILLS_BLOCK = /<available_skills>[\s\S]*?<\/available_skills>/;
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Keys whose string values are not prompt text: ids, enum tags and binary
|
|
69
|
+
* payloads (image data, thinking signatures) that the provider bills by other
|
|
70
|
+
* rules than chars.
|
|
71
|
+
*/
|
|
72
|
+
const NON_TEXT_KEYS = new Set([
|
|
73
|
+
"type",
|
|
74
|
+
"role",
|
|
75
|
+
"id",
|
|
76
|
+
"call_id",
|
|
77
|
+
"tool_use_id",
|
|
78
|
+
"toolCallId",
|
|
79
|
+
"cache_control",
|
|
80
|
+
"signature",
|
|
81
|
+
"data",
|
|
82
|
+
"media_type",
|
|
83
|
+
"mime_type",
|
|
84
|
+
"mimeType",
|
|
85
|
+
]);
|
|
86
|
+
|
|
87
|
+
/** Chars of the prompt text inside a message structure. */
|
|
88
|
+
export function textChars(value: unknown): number {
|
|
89
|
+
if (typeof value === "string") return value.length;
|
|
90
|
+
if (Array.isArray(value)) return value.reduce<number>((sum, item) => sum + textChars(item), 0);
|
|
91
|
+
if (value && typeof value === "object") {
|
|
92
|
+
let sum = 0;
|
|
93
|
+
for (const [key, item] of Object.entries(value)) {
|
|
94
|
+
if (!NON_TEXT_KEYS.has(key)) sum += textChars(item);
|
|
95
|
+
}
|
|
96
|
+
return sum;
|
|
97
|
+
}
|
|
98
|
+
return 0;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** Chars of a tool declaration, sized like the server's estimate. */
|
|
102
|
+
export function toolChars(tool: HookTool): number {
|
|
103
|
+
return JSON.stringify({
|
|
104
|
+
name: tool.name,
|
|
105
|
+
description: tool.description,
|
|
106
|
+
input_schema: tool.schema,
|
|
107
|
+
}).length;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* Measure one request. `system` is the system prompt text as sent, `tools`
|
|
112
|
+
* the declared tools and `messageChars` the text chars of the conversation.
|
|
113
|
+
*/
|
|
114
|
+
export function measureHookRequest(input: {
|
|
115
|
+
system: string;
|
|
116
|
+
tools: readonly HookTool[];
|
|
117
|
+
messageChars: number;
|
|
118
|
+
groupOf: (toolName: string) => HookToolGroup;
|
|
119
|
+
}): HookRequestMeasure {
|
|
120
|
+
const groups = new Map<string, { group: HookToolGroup; chars: number; count: number }>();
|
|
121
|
+
let toolTotal = 0;
|
|
122
|
+
const toolKeys: string[] = [];
|
|
123
|
+
for (const tool of input.tools) {
|
|
124
|
+
const group = input.groupOf(tool.name);
|
|
125
|
+
const chars = toolChars(tool);
|
|
126
|
+
toolTotal += chars;
|
|
127
|
+
toolKeys.push(`${tool.name}\u0000${chars}`);
|
|
128
|
+
const entry = groups.get(group.id) ?? { group, chars: 0, count: 0 };
|
|
129
|
+
entry.chars += chars;
|
|
130
|
+
entry.count++;
|
|
131
|
+
groups.set(group.id, entry);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
const parts: RequestCompositionPartInput[] = [];
|
|
135
|
+
for (const { group, chars, count } of groups.values()) {
|
|
136
|
+
parts.push({
|
|
137
|
+
kind: "tool_schemas",
|
|
138
|
+
id: group.id,
|
|
139
|
+
label: `${group.label} (${count})`,
|
|
140
|
+
chars,
|
|
141
|
+
fidelity: "exact",
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
const skills = input.system.match(SKILLS_BLOCK)?.[0];
|
|
145
|
+
if (skills) {
|
|
146
|
+
parts.push({
|
|
147
|
+
kind: "skills_listing",
|
|
148
|
+
id: "harness:skills",
|
|
149
|
+
label: "skills listing",
|
|
150
|
+
chars: skills.length,
|
|
151
|
+
fidelity: "exact",
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
return {
|
|
156
|
+
hash: Bun.hash(`${input.system}\u0002${toolKeys.sort().join("\u0001")}`).toString(36),
|
|
157
|
+
parts,
|
|
158
|
+
systemChars: input.system.length,
|
|
159
|
+
payloadChars: input.system.length + toolTotal + input.messageChars,
|
|
160
|
+
messageChars: input.messageChars,
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/**
|
|
165
|
+
* Posts a manifest once per distinct request shape. A new system prompt or
|
|
166
|
+
* tool set makes the next request pending; the first usage that follows it
|
|
167
|
+
* supplies the call's prompt tokens for calibration, then the manifest posts.
|
|
168
|
+
* A request that never gets usage (a failed call) posts nothing.
|
|
169
|
+
*/
|
|
170
|
+
export class HookCompositionReporter {
|
|
171
|
+
private lastHash: string | undefined;
|
|
172
|
+
private pending: HookRequestMeasure | undefined;
|
|
173
|
+
private posted = false;
|
|
174
|
+
|
|
175
|
+
constructor(
|
|
176
|
+
private readonly meta: { sessionId: string; provider: string },
|
|
177
|
+
private readonly post: (body: HookCompositionBody) => void,
|
|
178
|
+
) {}
|
|
179
|
+
|
|
180
|
+
observeRequest(measure: HookRequestMeasure): void {
|
|
181
|
+
if (measure.hash === this.lastHash) return;
|
|
182
|
+
this.lastHash = measure.hash;
|
|
183
|
+
this.pending = measure;
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/** `promptTokens` = input + cache read + cache write of the call. */
|
|
187
|
+
observeUsage(promptTokens: number, model?: string): void {
|
|
188
|
+
const measure = this.pending;
|
|
189
|
+
if (!measure || !(promptTokens > 0)) return;
|
|
190
|
+
this.pending = undefined;
|
|
191
|
+
const first = !this.posted;
|
|
192
|
+
this.posted = true;
|
|
193
|
+
this.post({
|
|
194
|
+
sessionId: this.meta.sessionId,
|
|
195
|
+
provider: this.meta.provider,
|
|
196
|
+
...(model ? { model } : {}),
|
|
197
|
+
source: "harness-hook",
|
|
198
|
+
toolLoading: "none",
|
|
199
|
+
parts: measure.parts,
|
|
200
|
+
harness: {
|
|
201
|
+
systemChars: measure.systemChars,
|
|
202
|
+
payloadChars: measure.payloadChars,
|
|
203
|
+
promptTokens: Math.round(promptTokens),
|
|
204
|
+
...(first ? { firstMessageChars: measure.messageChars } : {}),
|
|
205
|
+
},
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
/** POST a hook manifest. Fire and forget: a lost manifest never fails a session. */
|
|
211
|
+
export function postHookComposition(
|
|
212
|
+
config: { apiUrl: string; taskId: string; headers: Record<string, string> },
|
|
213
|
+
body: HookCompositionBody,
|
|
214
|
+
): void {
|
|
215
|
+
void fetch(`${config.apiUrl}/api/tasks/${config.taskId}/request-composition`, {
|
|
216
|
+
method: "POST",
|
|
217
|
+
headers: config.headers,
|
|
218
|
+
body: JSON.stringify(body),
|
|
219
|
+
})
|
|
220
|
+
.then((response) => {
|
|
221
|
+
if (!response.ok) {
|
|
222
|
+
console.warn(`[request-composition] Hook manifest POST returned ${response.status}`);
|
|
223
|
+
}
|
|
224
|
+
})
|
|
225
|
+
.catch(() => {});
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
// ─── Provider payload shapes (pi) ────────────────────────────────────────────
|
|
229
|
+
|
|
230
|
+
type Obj = Record<string, unknown>;
|
|
231
|
+
const isObj = (value: unknown): value is Obj =>
|
|
232
|
+
typeof value === "object" && value !== null && !Array.isArray(value);
|
|
233
|
+
const SYSTEM_ROLES = new Set(["system", "developer"]);
|
|
234
|
+
|
|
235
|
+
function systemText(value: unknown): string {
|
|
236
|
+
if (typeof value === "string") return value;
|
|
237
|
+
if (Array.isArray(value)) return value.map(systemText).join("\n");
|
|
238
|
+
if (isObj(value)) {
|
|
239
|
+
if (typeof value.text === "string") return value.text;
|
|
240
|
+
if ("parts" in value) return systemText(value.parts);
|
|
241
|
+
if ("content" in value) return systemText(value.content);
|
|
242
|
+
}
|
|
243
|
+
return "";
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
function payloadTools(raw: unknown): HookTool[] {
|
|
247
|
+
if (!Array.isArray(raw)) return [];
|
|
248
|
+
const tools: HookTool[] = [];
|
|
249
|
+
for (const entry of raw) {
|
|
250
|
+
if (!isObj(entry)) continue;
|
|
251
|
+
// Google groups declarations under one tool entry.
|
|
252
|
+
if (Array.isArray(entry.functionDeclarations)) {
|
|
253
|
+
tools.push(...payloadTools(entry.functionDeclarations));
|
|
254
|
+
continue;
|
|
255
|
+
}
|
|
256
|
+
const fn = isObj(entry.function) ? entry.function : entry;
|
|
257
|
+
if (typeof fn.name !== "string") continue;
|
|
258
|
+
tools.push({
|
|
259
|
+
name: fn.name,
|
|
260
|
+
description: typeof fn.description === "string" ? fn.description : "",
|
|
261
|
+
schema: fn.input_schema ?? fn.parameters ?? fn.inputSchema ?? null,
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
return tools;
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
/**
|
|
268
|
+
* Split a provider request body into system text, tools and message chars.
|
|
269
|
+
* Covers the shapes pi sends: Anthropic Messages (`system`, `messages`),
|
|
270
|
+
* OpenAI Chat (`messages` with system/developer roles), OpenAI Responses
|
|
271
|
+
* (`instructions`, `input`) and Google (`systemInstruction`, `contents`).
|
|
272
|
+
*/
|
|
273
|
+
export function splitProviderPayload(payload: unknown): {
|
|
274
|
+
system: string;
|
|
275
|
+
tools: HookTool[];
|
|
276
|
+
messageChars: number;
|
|
277
|
+
} {
|
|
278
|
+
if (!isObj(payload)) return { system: "", tools: [], messageChars: 0 };
|
|
279
|
+
const config = isObj(payload.config) ? payload.config : {};
|
|
280
|
+
const systems: string[] = [];
|
|
281
|
+
for (const value of [
|
|
282
|
+
payload.system,
|
|
283
|
+
payload.instructions,
|
|
284
|
+
payload.systemInstruction,
|
|
285
|
+
config.systemInstruction,
|
|
286
|
+
]) {
|
|
287
|
+
const text = systemText(value);
|
|
288
|
+
if (text) systems.push(text);
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
let messageChars = 0;
|
|
292
|
+
for (const list of [payload.messages, payload.input, payload.contents]) {
|
|
293
|
+
if (typeof list === "string") {
|
|
294
|
+
messageChars += list.length;
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
if (!Array.isArray(list)) continue;
|
|
298
|
+
for (const message of list) {
|
|
299
|
+
if (isObj(message) && typeof message.role === "string" && SYSTEM_ROLES.has(message.role)) {
|
|
300
|
+
systems.push(systemText(message.content));
|
|
301
|
+
} else {
|
|
302
|
+
messageChars += textChars(message);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
return {
|
|
308
|
+
system: systems.join("\n"),
|
|
309
|
+
tools: [...payloadTools(payload.tools), ...payloadTools(config.tools)],
|
|
310
|
+
messageChars,
|
|
311
|
+
};
|
|
312
|
+
}
|
package/src/providers/types.ts
CHANGED
|
@@ -161,6 +161,11 @@ export interface ProviderSessionConfig {
|
|
|
161
161
|
*/
|
|
162
162
|
resumeSessionId?: string;
|
|
163
163
|
iteration?: number;
|
|
164
|
+
/**
|
|
165
|
+
* The runner's session id, the key of the session's request composition
|
|
166
|
+
* manifests. Adapters with a payload hook (pi, opencode) post theirs under it.
|
|
167
|
+
*/
|
|
168
|
+
runnerSessionId?: string;
|
|
164
169
|
logFile: string;
|
|
165
170
|
/** Extra CLI args — used by Claude adapter, ignored by others. */
|
|
166
171
|
additionalArgs?: string[];
|
|
@@ -366,6 +366,8 @@ export const LEGACY_POLICY = {
|
|
|
366
366
|
"runtime_controller.write": operatorOrUser,
|
|
367
367
|
// A worker token stands in for the swarm API key on a worker, so only humans mint it.
|
|
368
368
|
"agent.token.manage": operatorOrUser,
|
|
369
|
+
// Deleting or restoring an agent is a human decision; no agent, the lead included.
|
|
370
|
+
"agent.lifecycle.manage": operatorOrUser,
|
|
369
371
|
// Agents never change human roles.
|
|
370
372
|
"user.role.manage": operatorOrUser,
|
|
371
373
|
"extension.write": extensionWrite,
|
package/src/rbac/permissions.ts
CHANGED
|
@@ -37,6 +37,11 @@ export const PERMISSIONS = {
|
|
|
37
37
|
description: "Mint, rotate, or revoke an agent-bound worker token.",
|
|
38
38
|
namespace: "agent",
|
|
39
39
|
},
|
|
40
|
+
"agent.lifecycle.manage": {
|
|
41
|
+
description:
|
|
42
|
+
"Preview, soft-delete, or restore an agent, list deleted agents, and read their delete/restore audit.",
|
|
43
|
+
namespace: "agent",
|
|
44
|
+
},
|
|
40
45
|
"user.role.manage": {
|
|
41
46
|
description: "Assign or remove a person's RBAC roles.",
|
|
42
47
|
namespace: "user",
|
|
@@ -17,6 +17,7 @@ const traitsSchema = z.object({
|
|
|
17
17
|
ephemeralDisk: z.boolean(),
|
|
18
18
|
supportsPause: z.boolean(),
|
|
19
19
|
persistentCache: z.boolean().optional(),
|
|
20
|
+
persistentWorkspace: z.boolean().optional(),
|
|
20
21
|
maxTtlSec: z.number().positive().optional(),
|
|
21
22
|
maxContinuousSec: z.number().positive().optional(),
|
|
22
23
|
});
|
|
@@ -35,6 +36,12 @@ const provisionSchema = z.object({
|
|
|
35
36
|
cache: RuntimePoolCacheSchema.extend({
|
|
36
37
|
key: z.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9_.-]+$/),
|
|
37
38
|
}).optional(),
|
|
39
|
+
workspace: z
|
|
40
|
+
.object({
|
|
41
|
+
key: z.string().regex(/^swarm-ws-[a-z0-9-]+-\d+$/),
|
|
42
|
+
sizeGb: z.number().int().positive().optional(),
|
|
43
|
+
})
|
|
44
|
+
.optional(),
|
|
38
45
|
});
|
|
39
46
|
const command = { type: z.literal("cmd"), id: z.string().min(1) };
|
|
40
47
|
export const ControllerCommandSchema = z.discriminatedUnion("op", [
|