@desplega.ai/agent-swarm 2.10.0 → 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-arrwv4f0.js → acp-targets-5wyy2b9m.js} +9 -9
- package/dist/{actions-y0d2n1c2.js → actions-4nxq386s.js} +24 -23
- package/dist/{agent-fs-provision-tpj7sktd.js → agent-fs-provision-v6enh76w.js} +4 -4
- package/dist/{amp-adapter-vmmnmw8d.js → amp-adapter-ze3x22qn.js} +3 -3
- package/dist/{anthropic-messages-zdca3gv1.js → anthropic-messages-88b7s3n9.js} +177 -25
- package/dist/{app-wb7w45dq.js → app-kyqt8ehw.js} +7 -6
- package/dist/{approval-notifications-7mqr6vbd.js → approval-notifications-a0db0esw.js} +7 -6
- package/dist/{assistant-gf60454p.js → assistant-9g5jzq25.js} +26 -25
- package/dist/{azure-openai-responses-b3y7fz36.js → azure-openai-responses-jeaas6x0.js} +10 -10
- package/dist/{boot-args-schema-qxmd59sr.js → boot-args-schema-d7fme4q1.js} +1 -1
- package/dist/{boot-reembed-wb44vc3s.js → boot-reembed-6wpazmpw.js} +1 -1
- package/dist/{boot-reembed-5tmeskj2.js → boot-reembed-jrwxeye2.js} +1 -1
- package/dist/{boot-scrub-sweep-25bxhnw4.js → boot-scrub-sweep-52h7yntp.js} +2 -2
- package/dist/{boot-seeds-nj9za0vk.js → boot-seeds-kb3dxjex.js} +4 -4
- package/dist/{boxd-wn235q80.js → boxd-jrrmkv3w.js} +2 -2
- package/dist/{claude-adapter-d3krpdyb.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-7y4pwd81.js → claude-managed-setup-9ssb7ct4.js} +4 -4
- package/dist/{claude-sdk-session-d138zy0e.js → claude-sdk-session-p6t0gyse.js} +10941 -10412
- package/dist/{cli-p0n7b5rz.js → cli-075ccjh6.js} +344 -130
- package/dist/{cli-3caf7pmg.js → cli-0bgj4rh5.js} +3 -3
- package/dist/{cli-7r162fxe.js → cli-14xdms9a.js} +23 -17
- package/dist/{cli-rqx70rcz.js → cli-17qzb39j.js} +5 -2
- package/dist/{cli-y4ccxtz5.js → cli-1h4njv9y.js} +144 -6
- package/dist/{cli-6ym4jhzp.js → cli-27fat7st.js} +7 -7
- package/dist/{cli-k3q2va86.js → cli-2aacfdcn.js} +5 -5
- package/dist/{cli-vq2eg24x.js → cli-2gvdvsxj.js} +3 -3
- package/dist/{cli-sb4426be.js → cli-2jtfm8kh.js} +5 -5
- package/dist/{cli-6ehs4mta.js → cli-2z2c4k6q.js} +18 -4
- package/dist/{cli-6237rnyr.js → cli-3bpr3wks.js} +1 -1
- package/dist/{cli-5qhfv9rw.js → cli-453497a0.js} +44 -17
- package/dist/{cli-2rnd5j3t.js → cli-4aswccje.js} +2 -2
- package/dist/{cli-4ymxrwg5.js → cli-4dyzzkfb.js} +2 -2
- package/dist/{cli-p0c3vtch.js → cli-4g323fjh.js} +772 -515
- package/dist/{cli-3kd08rej.js → cli-4jjrhy48.js} +1 -1
- package/dist/{cli-fcfbct2j.js → cli-4kzp7r0q.js} +5 -5
- package/dist/{cli-kxn3747f.js → cli-4se3x6qm.js} +1 -26
- package/dist/{cli-zeh2mhkg.js → cli-5ptj757f.js} +1 -1
- package/dist/{cli-539h29es.js → cli-6a3j25xd.js} +224 -189
- package/dist/{cli-hnamkvnc.js → cli-6c9ve77f.js} +2 -2
- package/dist/{cli-3et6fmfe.js → cli-6n7y5ypy.js} +1 -1
- package/dist/{cli-8y43jx2r.js → cli-6p8p2e6r.js} +16 -9
- package/dist/{cli-zk7v5s89.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-6037prsx.js → cli-892y3vfp.js} +13 -13
- package/dist/cli-8mfdbdhe.js +43 -0
- package/dist/{cli-s1zqk1aj.js → cli-8zmpwe79.js} +15 -9
- 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-aw83sr40.js → cli-9knhkkgr.js} +3 -3
- package/dist/{cli-5mpy301f.js → cli-9t7syepg.js} +1 -1
- package/dist/{cli-qj39vrc6.js → cli-9yjhshah.js} +1 -1
- package/dist/{cli-6cwr32fe.js → cli-a02habn6.js} +422 -140
- package/dist/{cli-7evph51z.js → cli-a49frv85.js} +2 -2
- package/dist/{cli-3f8zbtqa.js → cli-a6q6x15h.js} +9 -8
- package/dist/{cli-j6te8keb.js → cli-atm0hkes.js} +8 -8
- package/dist/{cli-9fjr27ez.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-mk7c5ac4.js → cli-bq97k63w.js} +2 -2
- package/dist/{cli-vfqvrd82.js → cli-cstggwq7.js} +2 -2
- package/dist/{cli-md50mj0r.js → cli-czvvnfr9.js} +3 -3
- package/dist/{cli-b6px1k1q.js → cli-dd2k2mcd.js} +1 -1
- package/dist/{cli-fq2rr3jb.js → cli-djt6wmrc.js} +6 -6
- package/dist/{cli-tsa40663.js → cli-ebqx630g.js} +3 -3
- package/dist/{cli-z0m452jr.js → cli-f7dhm7hh.js} +1 -1
- package/dist/{cli-mys27d03.js → cli-f8yhybxr.js} +3 -3
- package/dist/{cli-5gpqgs8b.js → cli-fwjwkw66.js} +2 -2
- package/dist/{cli-gabsjg8x.js → cli-g56fxddf.js} +1 -1
- package/dist/{cli-y8p78ekx.js → cli-h2qtafm4.js} +18 -18
- package/dist/{cli-psffsanb.js → cli-ha4ek2nb.js} +6 -1
- package/dist/{cli-th1dkc2v.js → cli-hnh8erra.js} +2 -2
- package/dist/{cli-w16kwbzw.js → cli-htymm48w.js} +1 -1
- package/dist/{cli-124ntmf0.js → cli-j2r1apqm.js} +138 -59
- package/dist/{cli-43ms35q9.js → cli-k3c13za2.js} +3 -3
- package/dist/{cli-54vrpgm0.js → cli-k3facve0.js} +8 -5
- package/dist/{cli-v8z0yga9.js → cli-k4r5sfaj.js} +4 -4
- package/dist/{cli-91pkxres.js → cli-kbm659dk.js} +2 -2
- package/dist/{cli-q5srsxq2.js → cli-m00c47q6.js} +110 -27
- package/dist/{cli-3aaeb78m.js → cli-mhrr4d5b.js} +95 -10
- package/dist/{cli-xqdz5cqm.js → cli-mz7ycqn8.js} +1 -0
- package/dist/{cli-qrta34nb.js → cli-n6ygvrrm.js} +4 -4
- package/dist/{cli-k5yewqgd.js → cli-nbakg5xh.js} +3 -3
- package/dist/{cli-nstkanmx.js → cli-nc39ym5q.js} +8 -8
- package/dist/{cli-01k6wpr9.js → cli-p1a4khta.js} +7 -7
- package/dist/{cli-t9ga4qmb.js → cli-p8zqbbt1.js} +40 -33
- package/dist/{cli-v46zsvqk.js → cli-ph95yejc.js} +2 -2
- package/dist/{cli-k6nejceb.js → cli-q4z9s6zs.js} +2 -2
- package/dist/{cli-kbtzfrxj.js → cli-q71g5q39.js} +3 -3
- 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-cc93xzes.js → cli-raqw9fw9.js} +28 -17
- package/dist/cli-rhsc2zyx.js +68 -0
- package/dist/{cli-8st34zhr.js → cli-rpmw4fsv.js} +57 -19
- package/dist/{cli-had1p04a.js → cli-rwgwen5v.js} +4 -4
- package/dist/{cli-tr27kwyg.js → cli-rytq7dm2.js} +261 -6
- package/dist/{cli-s1khw52h.js → cli-s9twe4x0.js} +66 -17
- package/dist/{cli-2v2zdm0a.js → cli-t2s7j5cy.js} +2 -2
- package/dist/{cli-nv4xsvmk.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-jrbq4djp.js → cli-v3zcnr8g.js} +1 -1
- package/dist/{cli-zfqg6fzn.js → cli-vbppqvte.js} +3 -3
- package/dist/{cli-qx4f057j.js → cli-vy3fn0mz.js} +4 -4
- package/dist/{cli-7sf9sb0w.js → cli-w5dar1bk.js} +1 -1
- package/dist/{cli-w1q68d8x.js → cli-wz4e5am2.js} +9 -9
- package/dist/{cli-m9cvf7vs.js → cli-xqbqwpxr.js} +14 -14
- package/dist/{cli-2spnz7ye.js → cli-ynph3b70.js} +11137 -8332
- package/dist/{cli-43evxwj4.js → cli-yvzxbztc.js} +9 -4
- package/dist/{cli-vsw91x06.js → cli-yzxqwcvq.js} +3 -6
- package/dist/{cli-wafmk3fn.js → cli-zb1hff00.js} +12 -12
- package/dist/{cli-yab6sh8p.js → cli-zcghfsdg.js} +23 -4
- package/dist/{cli-wwp1bd3n.js → cli-zhn4r1rz.js} +519 -75
- package/dist/{cli-tvgqesec.js → cli-zqq57pgx.js} +4 -4
- package/dist/cli.js +28 -27
- 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-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-xhznc4g3.js → codex-session-runner-xn63q3h7.js} +9 -9
- package/dist/{commands-d8g349v4.js → commands-ctey7tr5.js} +3 -3
- package/dist/{controller-mwgdmb8y.js → controller-rqhbppg9.js} +4 -4
- package/dist/{controllers-connect-5v7qx04j.js → controllers-connect-w3qbpbt1.js} +22 -21
- package/dist/{core-sxy4epp2.js → core-df1n049h.js} +19 -18
- package/dist/{cursor-adapter-p2q5h35d.js → cursor-adapter-r819hf1a.js} +2 -2
- package/dist/{db-wcw0b2j8.js → db-2ah39cyx.js} +2 -2
- package/dist/{db-qpganbeb.js → db-p5drc1d1.js} +3 -3
- package/dist/{devin-adapter-zp4tqq53.js → devin-adapter-bc6g0x29.js} +1 -1
- package/dist/{dispatcher-8d8s49yz.js → dispatcher-x6w14pde.js} +19 -18
- package/dist/{docker-09tkkg0n.js → docker-6c4reetq.js} +51 -14
- package/dist/{dsh-adapter-me0twn13.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-wv7w5ty6.js → easter-egg-3d-1y6r9gxy.js} +1 -1
- package/dist/{embedding-space-e48xchqa.js → embedding-space-z6ptw3jk.js} +6 -6
- package/dist/{embeddings-tgq2afbq.js → embeddings-0sxb1d2h.js} +1 -1
- package/dist/{event-bus-xr83x566.js → event-bus-swr88jg5.js} +1 -1
- package/dist/{execute-8rhwrk7f.js → execute-6m1ex8ce.js} +8 -4
- package/dist/{external-channel-8bt3j2pm.js → external-channel-ezer7pk0.js} +2 -2
- package/dist/fx-adapter-zwmps9re.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-q0avf919.js +19 -0
- package/dist/handlers-g5jq0e4q.js +36 -0
- package/dist/{heartbeat-x0056ra5.js → heartbeat-6c4fr49t.js} +22 -21
- package/dist/{hook-mrd2ayxv.js → hook-02rt5tvq.js} +8 -8
- package/dist/{hook-a7vmn2st.js → hook-t1c5avbv.js} +5 -5
- package/dist/{http-ym9c5svp.js → http-qa3h32a1.js} +2049 -148
- package/dist/index-1f6m47mq.js +37 -0
- package/dist/index-1p1mpqda.js +36 -0
- package/dist/{index-p46tvwtx.js → index-akbgsdhh.js} +25 -24
- package/dist/{index-ny60jcat.js → index-e42j998x.js} +16 -13
- package/dist/{index-b5wgnm78.js → index-kdmkfjt7.js} +4 -4
- package/dist/{index-01ns1pkw.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-x6azjwm8.js → index-qpjk2hxk.js} +1 -1
- package/dist/index-tnkd410q.js +41 -0
- package/dist/{k8s-m56sw868.js → k8s-7jrh5va2.js} +73 -14
- package/dist/{keepalive-7yxg8z4c.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-6tefxmk1.js → maintenance-g7v15tj1.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-ywgf8tbr.js} +3 -3
- package/dist/{onboard-fja65z08.js → onboard-m3fedypq.js} +3 -3
- 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-19ktcbb9.js} +7 -7
- package/dist/{openrouter-images-xr9gme9x.js → openrouter-images-0jj12a2q.js} +6 -6
- package/dist/{otel-impl-7zhnt6gj.js → otel-impl-3ehm1hgc.js} +2 -2
- package/dist/{pending-h01yzpx4.js → pending-fwj2fatd.js} +20 -19
- package/dist/{pi-messages-2j0fpqwq.js → pi-messages-zk3g4esn.js} +1 -1
- package/dist/{pi-mono-adapter-f52hz743.js → pi-mono-adapter-xdeesvc4.js} +18 -17
- package/dist/{pricing-refresh-fzxvk2zf.js → pricing-refresh-4j8dzvxg.js} +2 -2
- package/dist/{rbac-roles-9v6vhgbs.js → rbac-roles-8msjr07m.js} +3 -3
- package/dist/{rbac-roles-hfgh8sba.js → rbac-roles-n7t2acv8.js} +2 -2
- package/dist/{render-v2-1rgspxzf.js → render-v2-j7qggj8h.js} +7 -6
- package/dist/{resume-tqy61x24.js → resume-hj1mn65y.js} +9 -8
- package/dist/{runtime-exkxyx5f.js → runtime-z31mdsgv.js} +2 -2
- package/dist/{session-access-3act7vt4.js → session-access-w38fh09a.js} +4 -4
- package/dist/{session-source-backfill-82qe7fqq.js → session-source-backfill-ax6qxv20.js} +3 -3
- package/dist/{setup-ry1vfdef.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-vcfj2ak8.js → typesafe-system-one-qkvkgrcz.js} +2 -2
- package/dist/{user-merge-jobs-bx6bf7db.js → user-merge-jobs-mvheb3ed.js} +3 -3
- package/dist/{virtual-modules-s0rjzcqq.js → virtual-modules-w2qk2wew.js} +32 -10
- package/dist/{work-objects-z2e5tv03.js → work-objects-4ahy5es5.js} +22 -21
- package/dist/worker-ews1nyhw.js +75 -0
- package/dist/{worker-follow-up-y3xeg89w.js → worker-follow-up-1gs4aw7y.js} +19 -18
- package/dist/{x-wg164ss9.js → x-3wr8c5sh.js} +2 -2
- package/openapi.json +995 -49
- package/package.json +9 -8
- 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/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/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/model-profile-check.ts +1 -1
- package/src/be/multi-runtime.ts +32 -4
- 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/swarm-config-guard.ts +10 -2
- 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/runner.ts +116 -12
- package/src/extensions/catalog.generated.json +1 -1
- package/src/github/app.ts +59 -14
- package/src/http/all-routes.ts +2 -0
- 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 +21 -0
- package/src/http/mcp-user.ts +11 -8
- package/src/http/mcp.ts +58 -42
- package/src/http/prompt-templates.ts +1 -0
- package/src/http/request-composition.ts +310 -0
- package/src/http/tasks.ts +6 -1
- package/src/http/tool-schema-estimate.ts +95 -0
- package/src/http/workflows.ts +29 -11
- package/src/integrations/chat-sdk/inbound.ts +2 -2
- package/src/prompts/base-prompt.ts +133 -7
- package/src/prompts/resolver.ts +41 -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 +4 -0
- package/src/providers/request-composition-hook.ts +312 -0
- package/src/providers/types.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/server-user.ts +16 -1
- 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/azure-devops-outbound.test.ts +47 -14
- package/src/tests/base-prompt.test.ts +149 -1
- package/src/tests/check-playwright-version.test.ts +33 -0
- package/src/tests/context-preamble-budget.test.ts +65 -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-runtime.test.ts +2 -1
- package/src/tests/deploy-release-dispatch.test.ts +332 -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 +12 -18
- 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/github-app-worker-auth-helper.test.ts +325 -0
- package/src/tests/github-installation-token-route.test.ts +199 -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-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 +86 -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/prompt-template-resolver.test.ts +85 -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/slack-blocks.test.ts +18 -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 +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/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-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.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 +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 +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.test.ts +26 -0
- package/src/tests/workflow-wait.ts +44 -0
- package/src/tools/workflows/create-workflow.ts +7 -3
- package/src/tools/workflows/update-workflow.ts +7 -3
- package/src/types.ts +200 -2
- package/src/utils/credentials.ts +7 -0
- package/src/workflows/checkpoint.ts +18 -0
- package/src/workflows/engine.ts +38 -10
- package/src/workflows/foreach-driver.ts +42 -4
- package/src/workflows/recovery.ts +6 -1
- package/src/workflows/resume.ts +11 -3
- package/src/workflows/retry-poller.ts +17 -4
- 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/wait-poller.ts +6 -2
- package/src/workflows/webhook-filter.ts +203 -0
- package/templates/extensions/slack-reply-gate/hooks.ts +8 -4
- package/templates/skills/swarm-docs/content.md +2 -0
- package/dist/acp-adapter-bht22g3k.js +0 -16
- 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
|
@@ -1,12 +1,21 @@
|
|
|
1
|
-
import { afterAll, beforeEach, describe, expect, test } from "bun:test";
|
|
1
|
+
import { afterAll, afterEach, beforeEach, describe, expect, test } from "bun:test";
|
|
2
2
|
import {
|
|
3
3
|
type BasePromptArgs,
|
|
4
4
|
getBasePrompt,
|
|
5
|
+
getBasePromptWithParts,
|
|
5
6
|
getTaskContextPrompt,
|
|
6
7
|
truncateRepoClaudeMd,
|
|
7
8
|
} from "../prompts/base-prompt";
|
|
8
9
|
import { generateDefaultClaudeMd, generateDefaultIdentityMd } from "../prompts/defaults";
|
|
10
|
+
import { configureDbResolver, resetDbResolver } from "../prompts/resolver";
|
|
9
11
|
import type { ProviderTraits } from "../providers/types";
|
|
12
|
+
import MAIN_BASELINE from "./fixtures/base-prompt-baseline.json";
|
|
13
|
+
import {
|
|
14
|
+
BASELINE_ARGS,
|
|
15
|
+
BASELINE_DEPLOYMENTS,
|
|
16
|
+
BASELINE_SKILLS,
|
|
17
|
+
baselineKey,
|
|
18
|
+
} from "./fixtures/base-prompt-baseline-cases";
|
|
10
19
|
|
|
11
20
|
// ---------------------------------------------------------------------------
|
|
12
21
|
// Fixtures and env handling
|
|
@@ -1523,3 +1532,142 @@ describe("getBasePrompt: harness tool discovery", () => {
|
|
|
1523
1532
|
expect(result).toContain("Swarm tools are already in your tool list.");
|
|
1524
1533
|
});
|
|
1525
1534
|
});
|
|
1535
|
+
|
|
1536
|
+
// ---------------------------------------------------------------------------
|
|
1537
|
+
// Request composition parts
|
|
1538
|
+
// ---------------------------------------------------------------------------
|
|
1539
|
+
|
|
1540
|
+
describe("getBasePromptWithParts", () => {
|
|
1541
|
+
const matrix = BASELINE_ARGS;
|
|
1542
|
+
/** Parts that are text inside our prompt; skills_listing is harness-injected. */
|
|
1543
|
+
const inPrompt = (kind: string) => kind !== "skills_listing";
|
|
1544
|
+
const promptChars = (parts: { kind: string; chars: number }[]) =>
|
|
1545
|
+
parts.filter((part) => inPrompt(part.kind)).reduce((sum, part) => sum + part.chars, 0);
|
|
1546
|
+
|
|
1547
|
+
for (const [deployment, env] of Object.entries(BASELINE_DEPLOYMENTS)) {
|
|
1548
|
+
for (const [name, args] of Object.entries(matrix)) {
|
|
1549
|
+
test(`${deployment} / ${name}: byte-identical to main's prompt, parts sum to its length`, async () => {
|
|
1550
|
+
Object.assign(process.env, env);
|
|
1551
|
+
const { prompt, parts } = await getBasePromptWithParts(args);
|
|
1552
|
+
// Bytes rendered by main's getBasePrompt, not by the helper under test.
|
|
1553
|
+
// Regenerate: bun scripts/capture-base-prompt-baseline.ts <checkout>
|
|
1554
|
+
expect(prompt).toBe(MAIN_BASELINE[baselineKey(deployment, name)]!);
|
|
1555
|
+
expect(promptChars(parts)).toBe(prompt.length);
|
|
1556
|
+
expect(parts.every((part) => part.chars > 0)).toBe(true);
|
|
1557
|
+
});
|
|
1558
|
+
}
|
|
1559
|
+
}
|
|
1560
|
+
|
|
1561
|
+
test("the baseline covers every case", () => {
|
|
1562
|
+
const keys = Object.keys(BASELINE_DEPLOYMENTS).flatMap((deployment) =>
|
|
1563
|
+
Object.keys(matrix).map((name) => baselineKey(deployment, name)),
|
|
1564
|
+
);
|
|
1565
|
+
expect(Object.keys(MAIN_BASELINE).sort()).toEqual(keys.sort());
|
|
1566
|
+
});
|
|
1567
|
+
|
|
1568
|
+
test("the lead docs pointer gets its own part", async () => {
|
|
1569
|
+
const { prompt, parts } = await getBasePromptWithParts({
|
|
1570
|
+
...minimalArgs,
|
|
1571
|
+
role: "lead",
|
|
1572
|
+
traits: localTraits,
|
|
1573
|
+
skillsSummary: [{ name: "swarm-docs", description: "docs index" }],
|
|
1574
|
+
});
|
|
1575
|
+
const docs = parts.find((part) => part.id === "system.agent.lead.docs");
|
|
1576
|
+
expect(docs?.chars).toBeGreaterThan(0);
|
|
1577
|
+
expect(promptChars(parts)).toBe(prompt.length);
|
|
1578
|
+
});
|
|
1579
|
+
|
|
1580
|
+
test("the lead channel thread note gets its own part", async () => {
|
|
1581
|
+
const { prompt, parts } = await getBasePromptWithParts({
|
|
1582
|
+
...minimalArgs,
|
|
1583
|
+
role: "lead",
|
|
1584
|
+
traits: localTraits,
|
|
1585
|
+
serverCapabilities: ["chat-sdk"],
|
|
1586
|
+
});
|
|
1587
|
+
const thread = parts.find((part) => part.id === "system.agent.lead.channel_thread");
|
|
1588
|
+
expect(thread?.chars).toBeGreaterThan(0);
|
|
1589
|
+
expect(promptChars(parts)).toBe(prompt.length);
|
|
1590
|
+
});
|
|
1591
|
+
|
|
1592
|
+
describe("template overrides", () => {
|
|
1593
|
+
const soulOnly: BasePromptArgs = { ...minimalArgs, soulMd: "ZZ" };
|
|
1594
|
+
const overrides = (bodies: Record<string, string>) =>
|
|
1595
|
+
configureDbResolver((eventType) => {
|
|
1596
|
+
const body = bodies[eventType];
|
|
1597
|
+
return body === undefined ? null : { template: { id: eventType, body, scope: "global" } };
|
|
1598
|
+
});
|
|
1599
|
+
const role = (parts: { id: string; chars: number }[]) =>
|
|
1600
|
+
parts.find((part) => part.id === "system.agent.role")?.chars;
|
|
1601
|
+
|
|
1602
|
+
afterEach(() => resetDbResolver());
|
|
1603
|
+
|
|
1604
|
+
test("a role override that omits the persona counts no persona", async () => {
|
|
1605
|
+
overrides({ "system.agent.role": "custom role" });
|
|
1606
|
+
const { prompt, parts } = await getBasePromptWithParts(soulOnly);
|
|
1607
|
+
expect(prompt).not.toContain("ZZ");
|
|
1608
|
+
expect(parts.some((part) => part.kind === "persona")).toBe(false);
|
|
1609
|
+
expect(role(parts)).toBe("custom role".length);
|
|
1610
|
+
expect(promptChars(parts)).toBe(prompt.length);
|
|
1611
|
+
});
|
|
1612
|
+
|
|
1613
|
+
test("a persona moved to another section is counted there, not taken from role", async () => {
|
|
1614
|
+
overrides({
|
|
1615
|
+
"system.agent.role": "custom role",
|
|
1616
|
+
"system.agent.worker": "worker notes\n{{persona}}",
|
|
1617
|
+
});
|
|
1618
|
+
const { prompt, parts } = await getBasePromptWithParts(soulOnly);
|
|
1619
|
+
expect(prompt).toContain("worker notes\n\nZZ\n");
|
|
1620
|
+
expect(parts.find((part) => part.kind === "persona")?.chars).toBe("\nZZ\n".length);
|
|
1621
|
+
expect(role(parts)).toBe("custom role".length);
|
|
1622
|
+
expect(promptChars(parts)).toBe(prompt.length);
|
|
1623
|
+
});
|
|
1624
|
+
|
|
1625
|
+
test("a persona rendered twice counts both copies", async () => {
|
|
1626
|
+
overrides({ "system.agent.role": "custom role\n{{persona}}\n{{persona}}" });
|
|
1627
|
+
const { prompt, parts } = await getBasePromptWithParts(soulOnly);
|
|
1628
|
+
expect(prompt.split("ZZ").length - 1).toBe(2);
|
|
1629
|
+
expect(parts.find((part) => part.kind === "persona")?.chars).toBeGreaterThanOrEqual(
|
|
1630
|
+
2 * "ZZ".length,
|
|
1631
|
+
);
|
|
1632
|
+
expect(role(parts)).toBe("custom role\n\n".length);
|
|
1633
|
+
expect(promptChars(parts)).toBe(prompt.length);
|
|
1634
|
+
});
|
|
1635
|
+
});
|
|
1636
|
+
|
|
1637
|
+
test("splits the composite into its sections and the persona", async () => {
|
|
1638
|
+
const { parts } = await getBasePromptWithParts(matrix["claude worker"]!);
|
|
1639
|
+
// The composite's own glue is only seam newlines, which collapsing removes.
|
|
1640
|
+
const ids = parts.map((part) => part.id).filter((id) => id !== "system.session.worker");
|
|
1641
|
+
expect(ids.slice(0, 7)).toEqual([
|
|
1642
|
+
"persona",
|
|
1643
|
+
"system.agent.role",
|
|
1644
|
+
"system.agent.worker",
|
|
1645
|
+
"system.agent.workspace",
|
|
1646
|
+
"system.agent.memory",
|
|
1647
|
+
"system.agent.communication",
|
|
1648
|
+
"system.agent.secrets",
|
|
1649
|
+
]);
|
|
1650
|
+
expect(ids).toContain("system.agent.tool_discovery.search");
|
|
1651
|
+
expect(ids).toContain("system.agent.tools_skills");
|
|
1652
|
+
expect(parts.find((part) => part.kind === "claude_md")?.chars).toBeGreaterThan(
|
|
1653
|
+
matrix["claude worker"]!.claudeMd!.length,
|
|
1654
|
+
);
|
|
1655
|
+
});
|
|
1656
|
+
|
|
1657
|
+
test("native skill discovery adds a harness-side skills estimate; codex does not", async () => {
|
|
1658
|
+
const claude = await getBasePromptWithParts(matrix["claude worker"]!);
|
|
1659
|
+
const listing = claude.parts.find((part) => part.kind === "skills_listing");
|
|
1660
|
+
expect(listing).toMatchObject({
|
|
1661
|
+
fidelity: "estimate",
|
|
1662
|
+
chars: BASELINE_SKILLS.reduce(
|
|
1663
|
+
(sum, skill) => sum + `- ${skill.name}: ${skill.description}\n`.length,
|
|
1664
|
+
0,
|
|
1665
|
+
),
|
|
1666
|
+
});
|
|
1667
|
+
|
|
1668
|
+
// Codex gets the list inside tools_skills, so it is not counted twice.
|
|
1669
|
+
const codex = await getBasePromptWithParts(matrix.codex!);
|
|
1670
|
+
expect(codex.parts.some((part) => part.kind === "skills_listing")).toBe(false);
|
|
1671
|
+
expect(codex.prompt).toContain("- /alpha: does alpha");
|
|
1672
|
+
});
|
|
1673
|
+
});
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import {
|
|
4
|
+
checkPlaywrightPins,
|
|
5
|
+
DOCKERFILE,
|
|
6
|
+
UI_E2E_PACKAGE_JSON,
|
|
7
|
+
} from "../../scripts/check-playwright-version";
|
|
8
|
+
|
|
9
|
+
const repoRoot = join(import.meta.dir, "..", "..");
|
|
10
|
+
const dockerfile = (version: string) =>
|
|
11
|
+
`RUN cat > package.json <<'EOF'\n{\n "dependencies": {\n "playwright": "${version}"\n }\n}\nEOF\n`;
|
|
12
|
+
const uiE2e = (version: string) => ({ devDependencies: { "@playwright/test": version } });
|
|
13
|
+
|
|
14
|
+
describe("Playwright pin check", () => {
|
|
15
|
+
test("the committed Dockerfile.worker and ui-e2e pins match", async () => {
|
|
16
|
+
const problems = checkPlaywrightPins(
|
|
17
|
+
await Bun.file(join(repoRoot, DOCKERFILE)).text(),
|
|
18
|
+
await Bun.file(join(repoRoot, UI_E2E_PACKAGE_JSON)).json(),
|
|
19
|
+
);
|
|
20
|
+
expect(problems).toEqual([]);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
test("a drifted Dockerfile pin fails", () => {
|
|
24
|
+
expect(checkPlaywrightPins(dockerfile("1.58.0"), uiE2e("1.63.0"))).toEqual([
|
|
25
|
+
`${DOCKERFILE}: global playwright is 1.58.0, ${UI_E2E_PACKAGE_JSON} @playwright/test is 1.63.0`,
|
|
26
|
+
]);
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
test("a missing pin on either side fails", () => {
|
|
30
|
+
expect(checkPlaywrightPins("FROM ubuntu\n", uiE2e("1.63.0"))).toHaveLength(1);
|
|
31
|
+
expect(checkPlaywrightPins(dockerfile("1.63.0"), { devDependencies: {} })).toHaveLength(1);
|
|
32
|
+
});
|
|
33
|
+
});
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test";
|
|
2
|
+
import { resolve } from "node:path";
|
|
3
|
+
import { CHILD_PROCESS_TEST_BUDGET_MS, expectChildOk, runChild } from "./test-proc";
|
|
4
|
+
|
|
5
|
+
// Budgets are read at import time. Use a fresh process per configuration so
|
|
6
|
+
// module caching and the parent test runner's environment cannot mask a failure.
|
|
7
|
+
const probe = `
|
|
8
|
+
import {
|
|
9
|
+
buildContextPreamble,
|
|
10
|
+
buildResumeContextPreamble,
|
|
11
|
+
CONTEXT_PREAMBLE_MAX_TOKENS,
|
|
12
|
+
CONTEXT_PREAMBLE_RESUME_MAX_TOKENS,
|
|
13
|
+
} from ${JSON.stringify(resolve(import.meta.dir, "../commands/context-preamble.ts"))};
|
|
14
|
+
|
|
15
|
+
globalThis.fetch = async (url) => {
|
|
16
|
+
if (new URL(url).pathname.endsWith("/session-logs")) return Response.json({ logs: [] });
|
|
17
|
+
return Response.json({
|
|
18
|
+
id: "parent",
|
|
19
|
+
task: "Original brief: " + "work ".repeat(10000),
|
|
20
|
+
output: "Prior result: " + "done ".repeat(10000),
|
|
21
|
+
});
|
|
22
|
+
};
|
|
23
|
+
console.log(JSON.stringify({
|
|
24
|
+
normalTokens: CONTEXT_PREAMBLE_MAX_TOKENS,
|
|
25
|
+
resumeTokens: CONTEXT_PREAMBLE_RESUME_MAX_TOKENS,
|
|
26
|
+
normal: await buildContextPreamble("http://preamble.test", "", "parent"),
|
|
27
|
+
resume: await buildResumeContextPreamble("http://preamble.test", "", "parent"),
|
|
28
|
+
}));
|
|
29
|
+
`;
|
|
30
|
+
|
|
31
|
+
describe("context preamble environment budgets", () => {
|
|
32
|
+
test.each([
|
|
33
|
+
[undefined, undefined, 2000, 4000],
|
|
34
|
+
...["", " ", "abc", "NaN", "Infinity", "-Infinity", "0", "-1", "1.5", "1e309", "1e308"].map(
|
|
35
|
+
(value) => [value, value, 2000, 4000] as const,
|
|
36
|
+
),
|
|
37
|
+
["300", "600", 300, 600],
|
|
38
|
+
["3000", "5000", 3000, 5000],
|
|
39
|
+
] as const)(
|
|
40
|
+
"normal=%s resume=%s preserves bounded context",
|
|
41
|
+
async (normalValue, resumeValue, normalTokens, resumeTokens) => {
|
|
42
|
+
const result = await runChild([process.execPath, "--eval", probe], {
|
|
43
|
+
env: {
|
|
44
|
+
...process.env,
|
|
45
|
+
CONTEXT_PREAMBLE_MAX_TOKENS: normalValue,
|
|
46
|
+
CONTEXT_PREAMBLE_RESUME_MAX_TOKENS: resumeValue,
|
|
47
|
+
STEERING_ENABLED: "false",
|
|
48
|
+
},
|
|
49
|
+
});
|
|
50
|
+
const actual = JSON.parse(expectChildOk(result, "context preamble budget probe").stdout);
|
|
51
|
+
expect(actual.normalTokens).toBe(normalTokens);
|
|
52
|
+
expect(actual.resumeTokens).toBe(resumeTokens);
|
|
53
|
+
expect(actual.normal).toContain("Prior result: done");
|
|
54
|
+
expect(actual.normal).toMatch(/\[(?:output|context preamble) truncated/);
|
|
55
|
+
expect(actual.normal.length).toBeLessThan(normalTokens * 4 + 100);
|
|
56
|
+
expect(actual.resume).toContain("Original brief: work");
|
|
57
|
+
expect(actual.resume).toContain(
|
|
58
|
+
`[resume preamble truncated to ${resumeTokens}-token budget]`,
|
|
59
|
+
);
|
|
60
|
+
expect(actual.resume.length).toBeGreaterThan(resumeTokens * 4);
|
|
61
|
+
expect(actual.resume.length).toBeLessThan(resumeTokens * 4 + 100);
|
|
62
|
+
},
|
|
63
|
+
CHILD_PROCESS_TEST_BUDGET_MS,
|
|
64
|
+
);
|
|
65
|
+
});
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
|
|
1
|
+
import { afterAll, beforeAll, beforeEach, describe, expect, spyOn, test } from "bun:test";
|
|
2
2
|
import { reportCredentialOutcomeThenFinish } from "../commands/credential-outcome-report";
|
|
3
3
|
import { type ApiConfig, ensureTaskFinished } from "../commands/runner";
|
|
4
4
|
import type { ProviderResult } from "../providers/types";
|
|
5
|
+
import { resolveCredentialPools } from "../utils/credentials";
|
|
5
6
|
|
|
6
7
|
/**
|
|
7
8
|
* Completion-path regression for a `credits_required` seat mismatch. The
|
|
@@ -22,7 +23,9 @@ interface RecordedRequest {
|
|
|
22
23
|
const SEAT_REPORT_DELAY_MS = 150;
|
|
23
24
|
let requests: RecordedRequest[] = [];
|
|
24
25
|
let seatReportRespondedAt: number | undefined;
|
|
26
|
+
let keyReportRespondedAt: number | undefined;
|
|
25
27
|
let originalFetch: typeof fetch;
|
|
28
|
+
let failKeyReport = false;
|
|
26
29
|
|
|
27
30
|
beforeAll(() => {
|
|
28
31
|
originalFetch = globalThis.fetch;
|
|
@@ -40,6 +43,12 @@ beforeAll(() => {
|
|
|
40
43
|
seatReportRespondedAt = Date.now();
|
|
41
44
|
return Response.json({ success: true, message: "recorded" });
|
|
42
45
|
}
|
|
46
|
+
if (path === "/api/keys/report-rate-limit") {
|
|
47
|
+
if (failKeyReport) return Response.json({ error: "db busy" }, { status: 503 });
|
|
48
|
+
await Bun.sleep(SEAT_REPORT_DELAY_MS);
|
|
49
|
+
keyReportRespondedAt = Date.now();
|
|
50
|
+
return Response.json({ success: true });
|
|
51
|
+
}
|
|
43
52
|
if (method === "POST" && /^\/api\/tasks\/[^/]+\/finish$/.test(path)) {
|
|
44
53
|
return Response.json({ success: true, task: { status: "failed" } });
|
|
45
54
|
}
|
|
@@ -54,6 +63,8 @@ afterAll(() => {
|
|
|
54
63
|
beforeEach(() => {
|
|
55
64
|
requests = [];
|
|
56
65
|
seatReportRespondedAt = undefined;
|
|
66
|
+
keyReportRespondedAt = undefined;
|
|
67
|
+
failKeyReport = false;
|
|
57
68
|
});
|
|
58
69
|
|
|
59
70
|
const apiConfig: ApiConfig = {
|
|
@@ -170,6 +181,75 @@ describe("reportCredentialOutcomeThenFinish — seat mismatch after a key-wide r
|
|
|
170
181
|
});
|
|
171
182
|
});
|
|
172
183
|
|
|
184
|
+
describe("reportCredentialOutcomeThenFinish — key-wide rate limit", () => {
|
|
185
|
+
test("the key's bench lands before the finish step, which may resume on another key", async () => {
|
|
186
|
+
const taskId = "33333333-3333-4333-8333-333333333333";
|
|
187
|
+
await completeTask(
|
|
188
|
+
taskId,
|
|
189
|
+
{
|
|
190
|
+
exitCode: 1,
|
|
191
|
+
isError: true,
|
|
192
|
+
sessionId: "session-4",
|
|
193
|
+
failureReason: "You've hit your weekly limit · resets 5pm (UTC)",
|
|
194
|
+
},
|
|
195
|
+
"claude-opus-5-5",
|
|
196
|
+
);
|
|
197
|
+
|
|
198
|
+
expect(requests.filter((r) => r.path === "/api/keys/report-rate-limit")).toHaveLength(1);
|
|
199
|
+
const finish = requests.find((r) => r.path === `/api/tasks/${taskId}/finish`);
|
|
200
|
+
expect(finish).toBeDefined();
|
|
201
|
+
expect(keyReportRespondedAt).toBeDefined();
|
|
202
|
+
expect(finish!.at).toBeGreaterThanOrEqual(keyReportRespondedAt!);
|
|
203
|
+
});
|
|
204
|
+
});
|
|
205
|
+
|
|
206
|
+
describe("reportCredentialOutcomeThenFinish — lost key bench write", () => {
|
|
207
|
+
test("logs the failed write and keeps the failed key out of the resume's draw", async () => {
|
|
208
|
+
failKeyReport = true;
|
|
209
|
+
const log = spyOn(console, "log").mockImplementation(() => {});
|
|
210
|
+
const warn = spyOn(console, "warn").mockImplementation(() => {});
|
|
211
|
+
try {
|
|
212
|
+
const { modelWindowBlocks } = await completeTask(
|
|
213
|
+
"44444444-4444-4444-8444-444444444444",
|
|
214
|
+
{
|
|
215
|
+
exitCode: 1,
|
|
216
|
+
isError: true,
|
|
217
|
+
sessionId: "session-5",
|
|
218
|
+
failureReason: "You've hit your weekly limit · resets 5pm (UTC)",
|
|
219
|
+
},
|
|
220
|
+
"claude-opus-5-5",
|
|
221
|
+
);
|
|
222
|
+
const logged = (spy: typeof log) => spy.mock.calls.map((call) => String(call[0])).join("\n");
|
|
223
|
+
expect(logged(log)).not.toContain("Reported key");
|
|
224
|
+
expect(logged(warn)).toContain("Failed to report key ...TJAAA as rate-limited: HTTP 503");
|
|
225
|
+
|
|
226
|
+
// The resume draws from a pool where the API still lists every key, and
|
|
227
|
+
// again where the availability read failed too. Neither may pick key 3.
|
|
228
|
+
const pool = ["t-AAAAA", "t-BBBBB", "t-CCCCC", "t-TJAAA"];
|
|
229
|
+
for (const availableIndicesMap of [
|
|
230
|
+
{ [credentialInfo.keyType]: { availableIndices: [0, 1, 2, 3] } },
|
|
231
|
+
{},
|
|
232
|
+
]) {
|
|
233
|
+
for (let draw = 0; draw < 40; draw++) {
|
|
234
|
+
const env: Record<string, string | undefined> = {
|
|
235
|
+
[credentialInfo.keyType]: pool.join(","),
|
|
236
|
+
};
|
|
237
|
+
const [selection] = await resolveCredentialPools(env, {
|
|
238
|
+
provider: "claude",
|
|
239
|
+
model: "claude-opus-5-5",
|
|
240
|
+
availableIndicesMap,
|
|
241
|
+
localBlocks: modelWindowBlocks,
|
|
242
|
+
});
|
|
243
|
+
expect(selection?.index).not.toBe(3);
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
} finally {
|
|
247
|
+
log.mockRestore();
|
|
248
|
+
warn.mockRestore();
|
|
249
|
+
}
|
|
250
|
+
});
|
|
251
|
+
});
|
|
252
|
+
|
|
173
253
|
test.each(["account", "removal"])("reports %s without window measurements", async (kind) => {
|
|
174
254
|
const observedAt = new Date().toISOString();
|
|
175
255
|
const result: ProviderResult = {
|
|
@@ -194,6 +194,28 @@ describe("db-client transactions", () => {
|
|
|
194
194
|
expect(await names()).toEqual([]);
|
|
195
195
|
});
|
|
196
196
|
|
|
197
|
+
test("afterRollback runs when the outer transaction rolls back, not when it commits", async () => {
|
|
198
|
+
const fired: string[] = [];
|
|
199
|
+
await client.transaction(async () => {
|
|
200
|
+
await client.transaction(async (tx) => {
|
|
201
|
+
await tx.run("INSERT INTO items (name) VALUES (?)", ["kept"]);
|
|
202
|
+
client.afterRollback(() => fired.push("committed"));
|
|
203
|
+
});
|
|
204
|
+
});
|
|
205
|
+
await expect(
|
|
206
|
+
client.transaction(async () => {
|
|
207
|
+
await client.transaction(async (tx) => {
|
|
208
|
+
await tx.run("INSERT INTO items (name) VALUES (?)", ["doomed"]);
|
|
209
|
+
client.afterRollback(() => fired.push("rolled back"));
|
|
210
|
+
});
|
|
211
|
+
throw new Error("boom");
|
|
212
|
+
}),
|
|
213
|
+
).rejects.toThrow("boom");
|
|
214
|
+
client.afterRollback(() => fired.push("no transaction"));
|
|
215
|
+
expect(fired).toEqual(["rolled back"]);
|
|
216
|
+
expect(await names()).toEqual(["kept"]);
|
|
217
|
+
});
|
|
218
|
+
|
|
197
219
|
test("a throwing getDatabase does not wedge the lock", async () => {
|
|
198
220
|
let boom = true;
|
|
199
221
|
const flaky = createBunSqliteClient(() => {
|
|
@@ -0,0 +1,244 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Retention defaults for new installs. The seed's own rules run in-process;
|
|
3
|
+
* the "which boot seeds" rules run against a real `src/http.ts` process,
|
|
4
|
+
* because only a real boot creates a database file.
|
|
5
|
+
*/
|
|
6
|
+
import { afterEach, beforeEach, describe, expect, test } from "bun:test";
|
|
7
|
+
import { unlink } from "node:fs/promises";
|
|
8
|
+
import type { Subprocess } from "bun";
|
|
9
|
+
import { closeDb, getSwarmConfigs, initDb, upsertSwarmConfig } from "../be/db";
|
|
10
|
+
import { wasDbCreatedThisBoot } from "../be/db/runtime";
|
|
11
|
+
import { DB_RETENTION_TABLES } from "../be/db-retention";
|
|
12
|
+
import { seedDbRetentionDefaults } from "../be/db-retention-defaults";
|
|
13
|
+
import { getFreePort, waitForServer } from "./test-net";
|
|
14
|
+
|
|
15
|
+
const KEYS = DB_RETENTION_TABLES.map((table) => table.envKey);
|
|
16
|
+
const DEFAULTS: Record<string, string> = {
|
|
17
|
+
SESSION_LOG_RETENTION_DAYS: "30",
|
|
18
|
+
AGENT_LOG_RETENTION_DAYS: "90",
|
|
19
|
+
EVENTS_RETENTION_DAYS: "90",
|
|
20
|
+
CONTEXT_VERSIONS_KEEP_LATEST: "100",
|
|
21
|
+
SCRIPT_RUNS_RETENTION_DAYS: "30",
|
|
22
|
+
};
|
|
23
|
+
const ALL_UNSET = Object.fromEntries(KEYS.map((key) => [key, undefined]));
|
|
24
|
+
|
|
25
|
+
describe("seedDbRetentionDefaults", () => {
|
|
26
|
+
let inheritedEnv: Record<string, string | undefined>;
|
|
27
|
+
|
|
28
|
+
// The preload's afterEach puts the inherited values back.
|
|
29
|
+
beforeEach(() => {
|
|
30
|
+
inheritedEnv = Object.fromEntries(KEYS.map((key) => [key, process.env[key]]));
|
|
31
|
+
for (const key of KEYS) delete process.env[key];
|
|
32
|
+
closeDb();
|
|
33
|
+
initDb(":memory:");
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
afterEach(() => closeDb());
|
|
37
|
+
|
|
38
|
+
async function storedRetention(): Promise<Record<string, string>> {
|
|
39
|
+
const rows = await getSwarmConfigs({ scope: "global" });
|
|
40
|
+
return Object.fromEntries(
|
|
41
|
+
rows.filter((row) => KEYS.includes(row.key as never)).map((row) => [row.key, row.value]),
|
|
42
|
+
);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
test("the preload keeps retention off for servers the suite spawns", () => {
|
|
46
|
+
expect(inheritedEnv).toEqual(Object.fromEntries(KEYS.map((key) => [key, "0"])));
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
test("a test database is not a new install, so the default call seeds nothing", async () => {
|
|
50
|
+
expect(wasDbCreatedThisBoot()).toBe(false);
|
|
51
|
+
expect(await seedDbRetentionDefaults()).toEqual([]);
|
|
52
|
+
expect(await storedRetention()).toEqual({});
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
test("an existing install gets nothing", async () => {
|
|
56
|
+
expect(await seedDbRetentionDefaults(false)).toEqual([]);
|
|
57
|
+
expect(await storedRetention()).toEqual({});
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
test("a new install gets every default as a global row", async () => {
|
|
61
|
+
await seedDbRetentionDefaults(true);
|
|
62
|
+
expect(await storedRetention()).toEqual(DEFAULTS);
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
test("an env value or a stored row present at first boot wins over the default", async () => {
|
|
66
|
+
process.env.SESSION_LOG_RETENTION_DAYS = "7";
|
|
67
|
+
process.env.EVENTS_RETENTION_DAYS = "0";
|
|
68
|
+
await upsertSwarmConfig({ scope: "global", key: "SCRIPT_RUNS_RETENTION_DAYS", value: "365" });
|
|
69
|
+
|
|
70
|
+
await seedDbRetentionDefaults(true);
|
|
71
|
+
|
|
72
|
+
expect(await storedRetention()).toEqual({
|
|
73
|
+
AGENT_LOG_RETENTION_DAYS: "90",
|
|
74
|
+
CONTEXT_VERSIONS_KEEP_LATEST: "100",
|
|
75
|
+
SCRIPT_RUNS_RETENTION_DAYS: "365",
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
test("an empty or blank env value at first boot is the operator's off, not a gap to fill", async () => {
|
|
80
|
+
process.env.SESSION_LOG_RETENTION_DAYS = "";
|
|
81
|
+
process.env.AGENT_LOG_RETENTION_DAYS = " ";
|
|
82
|
+
|
|
83
|
+
await seedDbRetentionDefaults(true);
|
|
84
|
+
|
|
85
|
+
expect(await storedRetention()).toEqual({
|
|
86
|
+
EVENTS_RETENTION_DAYS: "90",
|
|
87
|
+
CONTEXT_VERSIONS_KEEP_LATEST: "100",
|
|
88
|
+
SCRIPT_RUNS_RETENTION_DAYS: "30",
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
describe("retention defaults across real boots", () => {
|
|
94
|
+
const API_KEY = "example-test-retention-defaults-key";
|
|
95
|
+
const BOOT_TEST_TIMEOUT_MS = 300_000;
|
|
96
|
+
const headers = { Authorization: `Bearer ${API_KEY}`, "Content-Type": "application/json" };
|
|
97
|
+
|
|
98
|
+
type Api = { proc: Subprocess<"ignore", "pipe", "pipe">; base: string; stdout: { text: string } };
|
|
99
|
+
const booted: Api[] = [];
|
|
100
|
+
const dbPaths: string[] = [];
|
|
101
|
+
|
|
102
|
+
function newDbPath(): string {
|
|
103
|
+
const dbPath = `/tmp/test-retention-defaults-${Date.now()}-${crypto.randomUUID()}.sqlite`;
|
|
104
|
+
dbPaths.push(dbPath);
|
|
105
|
+
return dbPath;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/** An `undefined` value removes the key from the inherited environment. */
|
|
109
|
+
async function bootApi(dbPath: string, env: Record<string, string | undefined>): Promise<Api> {
|
|
110
|
+
const port = await getFreePort();
|
|
111
|
+
const childEnv: Record<string, string | undefined> = {
|
|
112
|
+
...process.env,
|
|
113
|
+
PORT: String(port),
|
|
114
|
+
DATABASE_PATH: dbPath,
|
|
115
|
+
API_KEY,
|
|
116
|
+
CAPABILITIES: "core",
|
|
117
|
+
SLACK_DISABLE: "true",
|
|
118
|
+
GITHUB_DISABLE: "true",
|
|
119
|
+
...env,
|
|
120
|
+
};
|
|
121
|
+
for (const [key, value] of Object.entries(childEnv))
|
|
122
|
+
if (value === undefined) delete childEnv[key];
|
|
123
|
+
const proc = Bun.spawn(["bun", "src/http.ts"], {
|
|
124
|
+
cwd: `${import.meta.dir}/../..`,
|
|
125
|
+
env: childEnv as Record<string, string>,
|
|
126
|
+
stdout: "pipe",
|
|
127
|
+
stderr: "pipe",
|
|
128
|
+
});
|
|
129
|
+
// Drain both pipes from the start so a full buffer cannot stall the server.
|
|
130
|
+
const stdout = { text: "" };
|
|
131
|
+
void (async () => {
|
|
132
|
+
const decoder = new TextDecoder();
|
|
133
|
+
for await (const chunk of proc.stdout) stdout.text += decoder.decode(chunk, { stream: true });
|
|
134
|
+
})();
|
|
135
|
+
void new Response(proc.stderr).text();
|
|
136
|
+
const api: Api = { proc, base: `http://127.0.0.1:${port}`, stdout };
|
|
137
|
+
booted.push(api);
|
|
138
|
+
// A cold first boot (migrations, seeds, transpile cache) can pass the 60 s default.
|
|
139
|
+
await waitForServer(`${api.base}/health`, 120_000);
|
|
140
|
+
return api;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/**
|
|
144
|
+
* Wait for the line that reports what the sweep will apply, then stop the
|
|
145
|
+
* server. The sweep starts after `/health` answers, so a loaded host can
|
|
146
|
+
* reach SIGTERM before the line prints unless the test waits for it.
|
|
147
|
+
*/
|
|
148
|
+
async function stopAndReadSweepConfig(api: Api): Promise<string> {
|
|
149
|
+
const findLine = () =>
|
|
150
|
+
api.stdout.text.split("\n").find((entry) => entry.includes("[db-retention] starting"));
|
|
151
|
+
const deadline = Date.now() + 120_000;
|
|
152
|
+
while (!findLine() && api.proc.exitCode === null && Date.now() < deadline) await Bun.sleep(100);
|
|
153
|
+
api.proc.kill("SIGTERM");
|
|
154
|
+
await api.proc.exited;
|
|
155
|
+
return findLine() ?? "";
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
async function storedRetention(api: Api): Promise<Record<string, { id: string; value: string }>> {
|
|
159
|
+
const res = await fetch(`${api.base}/api/config?scope=global`, { headers });
|
|
160
|
+
expect(res.status).toBe(200);
|
|
161
|
+
const { configs } = (await res.json()) as {
|
|
162
|
+
configs: { id: string; key: string; value: string }[];
|
|
163
|
+
};
|
|
164
|
+
return Object.fromEntries(
|
|
165
|
+
configs
|
|
166
|
+
.filter((row) => KEYS.includes(row.key as never))
|
|
167
|
+
.map((row) => [row.key, { id: row.id, value: row.value }]),
|
|
168
|
+
);
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
const values = (rows: Record<string, { value: string }>) =>
|
|
172
|
+
Object.fromEntries(Object.entries(rows).map(([key, row]) => [key, row.value]));
|
|
173
|
+
|
|
174
|
+
afterEach(async () => {
|
|
175
|
+
for (const api of booted.splice(0)) {
|
|
176
|
+
if (api.proc.exitCode === null) api.proc.kill("SIGKILL");
|
|
177
|
+
await api.proc.exited.catch(() => {});
|
|
178
|
+
}
|
|
179
|
+
for (const dbPath of dbPaths.splice(0))
|
|
180
|
+
for (const suffix of ["", "-wal", "-shm"]) await unlink(dbPath + suffix).catch(() => {});
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
test(
|
|
184
|
+
"a new install stores the defaults, the env wins, and a deleted key stays deleted",
|
|
185
|
+
async () => {
|
|
186
|
+
const dbPath = newDbPath();
|
|
187
|
+
const first = await bootApi(dbPath, { ...ALL_UNSET, SESSION_LOG_RETENTION_DAYS: "7" });
|
|
188
|
+
const seeded = await storedRetention(first);
|
|
189
|
+
const { SESSION_LOG_RETENTION_DAYS: _envOwned, ...seededDefaults } = DEFAULTS;
|
|
190
|
+
expect(values(seeded)).toEqual(seededDefaults);
|
|
191
|
+
|
|
192
|
+
const removed = await fetch(`${first.base}/api/config/${seeded.EVENTS_RETENTION_DAYS?.id}`, {
|
|
193
|
+
method: "DELETE",
|
|
194
|
+
headers,
|
|
195
|
+
});
|
|
196
|
+
expect(removed.status).toBe(200);
|
|
197
|
+
const firstSweep = await stopAndReadSweepConfig(first);
|
|
198
|
+
expect(firstSweep).toContain(
|
|
199
|
+
"session_logs=7, agent_log=90, events=90, context_versions=100, script_runs=30",
|
|
200
|
+
);
|
|
201
|
+
expect(firstSweep).toContain("dryRun=false");
|
|
202
|
+
|
|
203
|
+
const second = await bootApi(dbPath, ALL_UNSET);
|
|
204
|
+
const { EVENTS_RETENTION_DAYS: _deleted, ...kept } = seededDefaults;
|
|
205
|
+
expect(values(await storedRetention(second))).toEqual(kept);
|
|
206
|
+
expect(await stopAndReadSweepConfig(second)).toContain(
|
|
207
|
+
"session_logs=disabled, agent_log=90, events=disabled, context_versions=100, script_runs=30",
|
|
208
|
+
);
|
|
209
|
+
},
|
|
210
|
+
BOOT_TEST_TIMEOUT_MS,
|
|
211
|
+
);
|
|
212
|
+
|
|
213
|
+
test(
|
|
214
|
+
"a new install booted with empty or blank env values stores nothing and sweeps nothing",
|
|
215
|
+
async () => {
|
|
216
|
+
const blank = Object.fromEntries(KEYS.map((key, i) => [key, i % 2 === 0 ? "" : " "]));
|
|
217
|
+
const api = await bootApi(newDbPath(), blank);
|
|
218
|
+
expect(await storedRetention(api)).toEqual({});
|
|
219
|
+
expect(await stopAndReadSweepConfig(api)).toContain(
|
|
220
|
+
"session_logs=disabled, agent_log=disabled, events=disabled, context_versions=disabled, script_runs=disabled",
|
|
221
|
+
);
|
|
222
|
+
},
|
|
223
|
+
BOOT_TEST_TIMEOUT_MS,
|
|
224
|
+
);
|
|
225
|
+
|
|
226
|
+
test(
|
|
227
|
+
"an existing database booted with every key unset stays unset",
|
|
228
|
+
async () => {
|
|
229
|
+
const dbPath = newDbPath();
|
|
230
|
+
// The suite's inherited `0` values stand in for an install created before
|
|
231
|
+
// the defaults existed: the database is built with no retention row.
|
|
232
|
+
const before = await bootApi(dbPath, {});
|
|
233
|
+
expect(await storedRetention(before)).toEqual({});
|
|
234
|
+
await stopAndReadSweepConfig(before);
|
|
235
|
+
|
|
236
|
+
const upgraded = await bootApi(dbPath, ALL_UNSET);
|
|
237
|
+
expect(await storedRetention(upgraded)).toEqual({});
|
|
238
|
+
expect(await stopAndReadSweepConfig(upgraded)).toContain(
|
|
239
|
+
"session_logs=disabled, agent_log=disabled, events=disabled, context_versions=disabled, script_runs=disabled",
|
|
240
|
+
);
|
|
241
|
+
},
|
|
242
|
+
BOOT_TEST_TIMEOUT_MS,
|
|
243
|
+
);
|
|
244
|
+
});
|
|
@@ -140,13 +140,14 @@ afterEach(async () => {
|
|
|
140
140
|
});
|
|
141
141
|
|
|
142
142
|
describe("DB retention", () => {
|
|
143
|
-
test("keeps the closed allowlist limited to the
|
|
143
|
+
test("keeps the closed allowlist limited to the six approved tables", () => {
|
|
144
144
|
expect(DB_RETENTION_TABLES.map((table) => table.table)).toEqual([
|
|
145
145
|
"session_logs",
|
|
146
146
|
"agent_log",
|
|
147
147
|
"events",
|
|
148
148
|
"context_versions",
|
|
149
149
|
"script_runs",
|
|
150
|
+
"workflow_runs",
|
|
150
151
|
]);
|
|
151
152
|
});
|
|
152
153
|
|
|
@@ -21,7 +21,8 @@ afterEach(() => runtime.closeDb());
|
|
|
21
21
|
|
|
22
22
|
describe("database runtime facade", () => {
|
|
23
23
|
test("re-exports the same seven runtime bindings", () => {
|
|
24
|
-
|
|
24
|
+
// wasDbCreatedThisBoot is read by one boot seed and stays off the facade.
|
|
25
|
+
expect(Object.keys(runtime).sort()).toEqual([...runtimeExports, "wasDbCreatedThisBoot"].sort());
|
|
25
26
|
expect(facade.__resetSqliteVecExtensionPathCacheForTests).toBe(
|
|
26
27
|
runtime.__resetSqliteVecExtensionPathCacheForTests,
|
|
27
28
|
);
|