@desplega.ai/agent-swarm 2.9.1 → 2.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp-adapter-weaaxey3.js +16 -0
- package/dist/{acp-targets-ny75x1qy.js → acp-targets-5wyy2b9m.js} +9 -9
- package/dist/{actions-b9qgrmeq.js → actions-4nxq386s.js} +54 -32
- package/dist/{agent-fs-provision-b5dhdsbd.js → agent-fs-provision-v6enh76w.js} +4 -4
- package/dist/{amp-adapter-vtax2c9s.js → amp-adapter-ze3x22qn.js} +3 -3
- package/dist/{anthropic-messages-r5xf5hqw.js → anthropic-messages-88b7s3n9.js} +189 -37
- package/dist/{app-g2z15hax.js → app-kyqt8ehw.js} +7 -6
- package/dist/{approval-notifications-yt13wp8r.js → approval-notifications-a0db0esw.js} +7 -6
- package/dist/{assistant-2cgfxsgk.js → assistant-9g5jzq25.js} +26 -25
- package/dist/{azure-openai-responses-590s1eea.js → azure-openai-responses-jeaas6x0.js} +18 -18
- package/dist/{boot-args-schema-3gwy0f60.js → boot-args-schema-d7fme4q1.js} +1 -1
- package/dist/{boot-reembed-92g7s5zp.js → boot-reembed-6wpazmpw.js} +1 -1
- package/dist/{boot-reembed-mywmyp4s.js → boot-reembed-jrwxeye2.js} +1 -1
- package/dist/boot-scrub-sweep-52h7yntp.js +9 -0
- package/dist/{boot-seeds-ce7rvgq1.js → boot-seeds-kb3dxjex.js} +4 -4
- package/dist/{boxd-wn235q80.js → boxd-jrrmkv3w.js} +2 -2
- package/dist/{claude-adapter-3m4q7735.js → claude-adapter-0c0y8fqp.js} +8 -8
- package/dist/{claude-managed-adapter-t8nfgcgz.js → claude-managed-adapter-w2es07qq.js} +4 -4
- package/dist/{claude-managed-setup-c217draw.js → claude-managed-setup-9ssb7ct4.js} +4 -4
- package/dist/{claude-sdk-session-7fbqm51z.js → claude-sdk-session-p6t0gyse.js} +10941 -10412
- package/dist/{cli-2czxfnvj.js → cli-075ccjh6.js} +961 -178
- package/dist/{cli-fkef327x.js → cli-0bgj4rh5.js} +3 -3
- package/dist/{cli-1jykg0py.js → cli-14xdms9a.js} +41 -28
- package/dist/{cli-rqx70rcz.js → cli-17qzb39j.js} +5 -2
- package/dist/{cli-bkjdknnp.js → cli-1h4njv9y.js} +177 -7
- package/dist/{cli-6ym4jhzp.js → cli-27fat7st.js} +7 -7
- package/dist/{cli-kxx4k2jw.js → cli-2aacfdcn.js} +5 -5
- package/dist/{cli-fh97xn30.js → cli-2gvdvsxj.js} +3 -3
- package/dist/{cli-f9gz2vyj.js → cli-2jtfm8kh.js} +10 -10
- package/dist/{cli-6ehs4mta.js → cli-2z2c4k6q.js} +18 -4
- package/dist/{cli-6237rnyr.js → cli-3bpr3wks.js} +1 -1
- package/dist/{cli-bnqncekd.js → cli-453497a0.js} +44 -17
- package/dist/{cli-jm0hvmz2.js → cli-4aswccje.js} +2 -2
- package/dist/{cli-4ymxrwg5.js → cli-4dyzzkfb.js} +2 -2
- package/dist/{cli-vyff45ve.js → cli-4g323fjh.js} +772 -515
- package/dist/{cli-3kd08rej.js → cli-4jjrhy48.js} +1 -1
- package/dist/{cli-gfy38pvt.js → cli-4kzp7r0q.js} +8 -8
- package/dist/{cli-kxn3747f.js → cli-4se3x6qm.js} +1 -26
- package/dist/{cli-mjw0yf82.js → cli-5ptj757f.js} +1 -1
- package/dist/{cli-pyjn0qhk.js → cli-6a3j25xd.js} +348 -196
- package/dist/{cli-hnamkvnc.js → cli-6c9ve77f.js} +2 -2
- package/dist/{cli-mw620q3n.js → cli-6n7y5ypy.js} +1 -1
- package/dist/{cli-g0vv9dg4.js → cli-6p8p2e6r.js} +19 -12
- package/dist/{cli-jwampxxq.js → cli-6tvh1fwq.js} +3 -3
- package/dist/{cli-p74md7t8.js → cli-7b7rxz22.js} +13 -15
- package/dist/{cli-5a6pqy45.js → cli-7e8sxqv5.js} +1 -1
- package/dist/{cli-p4kckx1z.js → cli-892y3vfp.js} +13 -13
- package/dist/cli-8mfdbdhe.js +43 -0
- package/dist/{cli-mkwkwq81.js → cli-8zmpwe79.js} +29 -16
- package/dist/{cli-zcfpsfzf.js → cli-96234j5w.js} +3 -3
- package/dist/{cli-1z4qggfe.js → cli-9fvk9mv8.js} +30 -21
- package/dist/{cli-7mv4h3sn.js → cli-9g12h1aq.js} +2 -2
- package/dist/{cli-f8x9drqr.js → cli-9knhkkgr.js} +19 -5
- package/dist/{cli-5mpy301f.js → cli-9t7syepg.js} +1 -1
- package/dist/{cli-qj39vrc6.js → cli-9yjhshah.js} +1 -1
- package/dist/{cli-zr6qy15y.js → cli-a02habn6.js} +427 -145
- package/dist/{cli-7evph51z.js → cli-a49frv85.js} +2 -2
- package/dist/{cli-h9yqfzx9.js → cli-a6q6x15h.js} +11 -10
- package/dist/{cli-bg63qmsx.js → cli-atm0hkes.js} +11 -11
- package/dist/{cli-m7zvgt57.js → cli-b82a13ga.js} +13 -13
- package/dist/{cli-7zm3b3f5.js → cli-bf0t77nf.js} +1 -1
- package/dist/{cli-2xv18ywz.js → cli-bmqp0ser.js} +2 -2
- package/dist/{cli-xag7btpe.js → cli-bq97k63w.js} +2 -2
- package/dist/{cli-pb2ay3sh.js → cli-cstggwq7.js} +5 -5
- package/dist/{cli-f3jyzq4g.js → cli-czvvnfr9.js} +3 -3
- package/dist/{cli-b6px1k1q.js → cli-dd2k2mcd.js} +1 -1
- package/dist/{cli-nafvvsp8.js → cli-djt6wmrc.js} +9 -9
- package/dist/{cli-tsa40663.js → cli-ebqx630g.js} +3 -3
- package/dist/{cli-8zh9nrew.js → cli-f7dhm7hh.js} +1 -1
- package/dist/cli-f8yhybxr.js +321 -0
- package/dist/{cli-5gpqgs8b.js → cli-fwjwkw66.js} +2 -2
- package/dist/{cli-gabsjg8x.js → cli-g56fxddf.js} +1 -1
- package/dist/{cli-w4n323t3.js → cli-h2qtafm4.js} +19 -19
- package/dist/{cli-psffsanb.js → cli-ha4ek2nb.js} +6 -1
- package/dist/{cli-dgs10ttj.js → cli-hnh8erra.js} +2 -2
- package/dist/{cli-w16kwbzw.js → cli-htymm48w.js} +1 -1
- package/dist/{cli-2xs8tsf7.js → cli-j2r1apqm.js} +152 -67
- package/dist/{cli-43ms35q9.js → cli-k3c13za2.js} +3 -3
- package/dist/{cli-54vrpgm0.js → cli-k3facve0.js} +8 -5
- package/dist/{cli-67mwzr35.js → cli-k4r5sfaj.js} +7 -7
- package/dist/{cli-rq5rpv6k.js → cli-kbm659dk.js} +2 -2
- package/dist/{cli-j7svy295.js → cli-m00c47q6.js} +114 -31
- package/dist/{cli-m7c2380k.js → cli-mhrr4d5b.js} +99 -14
- package/dist/{cli-xqdz5cqm.js → cli-mz7ycqn8.js} +1 -0
- package/dist/{cli-vt89089n.js → cli-n6ygvrrm.js} +4 -4
- package/dist/{cli-jaw5v1sy.js → cli-nbakg5xh.js} +3 -3
- package/dist/{cli-nbt14he0.js → cli-nc39ym5q.js} +8 -8
- package/dist/{cli-tvc4jag9.js → cli-p1a4khta.js} +8 -8
- package/dist/{cli-t9ga4qmb.js → cli-p8zqbbt1.js} +40 -33
- package/dist/{cli-fjggej24.js → cli-ph95yejc.js} +2 -2
- package/dist/{cli-m0cy2vyf.js → cli-q4z9s6zs.js} +5 -5
- package/dist/cli-q71g5q39.js +404 -0
- package/dist/{cli-vs9vdpy0.js → cli-qncx2r0s.js} +1 -1
- package/dist/{cli-hg42n3hx.js → cli-qrzq3hvg.js} +8 -8
- package/dist/{cli-x40a0w9j.js → cli-r813c7rb.js} +1 -1
- package/dist/{cli-kpgcm7xy.js → cli-ramn8jae.js} +1 -1
- package/dist/{cli-jkw6ptfw.js → cli-raqw9fw9.js} +28 -17
- package/dist/cli-rhsc2zyx.js +68 -0
- package/dist/{cli-sn650d7x.js → cli-rpmw4fsv.js} +68 -20
- package/dist/{boot-scrub-sweep-7dkdzqxx.js → cli-rwgwen5v.js} +9 -10
- package/dist/{cli-3j873zxq.js → cli-rytq7dm2.js} +261 -6
- package/dist/{cli-zh0e5x7p.js → cli-s9twe4x0.js} +71 -22
- package/dist/{cli-2dq9yv8p.js → cli-t2s7j5cy.js} +2 -2
- package/dist/{cli-wn13hhdt.js → cli-tb4j757d.js} +7 -7
- package/dist/{cli-q2d3e1k1.js → cli-thd3005a.js} +1 -1
- package/dist/cli-tsfkcd4v.js +30 -0
- package/dist/{cli-br0924pw.js → cli-v3zcnr8g.js} +1 -1
- package/dist/{cli-zfqg6fzn.js → cli-vbppqvte.js} +3 -3
- package/dist/{cli-ysvspf5e.js → cli-vy3fn0mz.js} +4 -4
- package/dist/{cli-7sf9sb0w.js → cli-w5dar1bk.js} +1 -1
- package/dist/{cli-2yjj3e31.js → cli-wz4e5am2.js} +12 -10
- package/dist/{cli-td9tb872.js → cli-xqbqwpxr.js} +14 -14
- package/dist/{cli-32djehja.js → cli-ynph3b70.js} +11137 -8332
- package/dist/{cli-mhapr559.js → cli-yvzxbztc.js} +9 -4
- package/dist/{cli-v57d7fmm.js → cli-yzxqwcvq.js} +25 -27
- package/dist/{cli-y2ewxhth.js → cli-zb1hff00.js} +16 -16
- package/dist/{cli-yab6sh8p.js → cli-zcghfsdg.js} +23 -4
- package/dist/{cli-ctx0b85j.js → cli-zhn4r1rz.js} +757 -157
- package/dist/{cli-6945ywhr.js → cli-zqq57pgx.js} +9 -7
- package/dist/cli.js +30 -29
- package/dist/{cloudflare-workers-ai-system-one-9y1zx3pt.js → cloudflare-workers-ai-system-one-w3m0fbf8.js} +2 -2
- package/dist/{codex-adapter-n656pvb8.js → codex-adapter-ssahg4h4.js} +8 -8
- package/dist/{codex-hook-59atdwd8.js → codex-hook-aqtj17yr.js} +1 -1
- package/dist/{codex-login-a239g1ah.js → codex-login-9c7aggxe.js} +1 -1
- package/dist/{codex-session-runner-p0fbv5y9.js → codex-session-runner-xn63q3h7.js} +9 -9
- package/dist/{commands-gwea8z5p.js → commands-ctey7tr5.js} +3 -3
- package/dist/{controller-t67c3grh.js → controller-rqhbppg9.js} +4 -4
- package/dist/{controllers-connect-ks155r0h.js → controllers-connect-w3qbpbt1.js} +22 -21
- package/dist/core-df1n049h.js +39 -0
- package/dist/{cursor-adapter-ygwrtmkv.js → cursor-adapter-r819hf1a.js} +2 -2
- package/dist/{db-kpmx06s9.js → db-2ah39cyx.js} +2 -2
- package/dist/{db-rb2xqdb1.js → db-p5drc1d1.js} +3 -3
- package/dist/{devin-adapter-zp4tqq53.js → devin-adapter-bc6g0x29.js} +1 -1
- package/dist/{dispatcher-31sm0ej2.js → dispatcher-x6w14pde.js} +19 -18
- package/dist/{docker-09tkkg0n.js → docker-6c4reetq.js} +51 -14
- package/dist/{dsh-adapter-qyxh0w31.js → dsh-adapter-h8qn14n4.js} +2 -2
- package/dist/{e2b-sm28k0k3.js → e2b-jg7kyyef.js} +6 -6
- package/dist/{e2b-3v1e745x.js → e2b-z4ec0qve.js} +3 -3
- package/dist/{easter-egg-3d-00wjscn6.js → easter-egg-3d-1y6r9gxy.js} +1 -1
- package/dist/{embedding-space-qhw4g68n.js → embedding-space-z6ptw3jk.js} +6 -6
- package/dist/{embeddings-zdv9ke6x.js → embeddings-0sxb1d2h.js} +1 -1
- package/dist/{event-bus-xr83x566.js → event-bus-swr88jg5.js} +1 -1
- package/dist/{execute-zna8wwr7.js → execute-6m1ex8ce.js} +8 -4
- package/dist/{external-channel-1ac6t56s.js → external-channel-ezer7pk0.js} +2 -2
- package/dist/fx-adapter-zwmps9re.js +19 -0
- package/dist/{google-generative-ai-maq6c9bf.js → google-generative-ai-sw77egmr.js} +13 -13
- package/dist/{google-vertex-2jgsw2nb.js → google-vertex-rrw93g8h.js} +13 -13
- package/dist/grok-adapter-q0avf919.js +19 -0
- package/dist/handlers-g5jq0e4q.js +36 -0
- package/dist/{heartbeat-2f6z4kdx.js → heartbeat-6c4fr49t.js} +22 -21
- package/dist/{hook-8y0gvtp1.js → hook-02rt5tvq.js} +8 -8
- package/dist/{hook-w1skzaqc.js → hook-t1c5avbv.js} +5 -5
- package/dist/{http-wghxvpef.js → http-qa3h32a1.js} +2659 -355
- package/dist/index-1f6m47mq.js +37 -0
- package/dist/index-1p1mpqda.js +36 -0
- package/dist/{index-rv89fvzf.js → index-akbgsdhh.js} +25 -24
- package/dist/{index-9zkchs9t.js → index-e42j998x.js} +190 -15
- package/dist/{index-b5wgnm78.js → index-kdmkfjt7.js} +4 -4
- package/dist/{index-s71ez27v.js → index-kqv9ebfj.js} +1 -1
- package/dist/{index-9myfj74s.js → index-kzdqn3dd.js} +3 -3
- package/dist/{index-4a0670yh.js → index-p2f5xg64.js} +6 -6
- package/dist/{index-8zn8nxn5.js → index-qpjk2hxk.js} +1 -1
- package/dist/index-tnkd410q.js +41 -0
- package/dist/k8s-7jrh5va2.js +276 -0
- package/dist/{keepalive-sh02349h.js → keepalive-jmf6pn8c.js} +4 -4
- package/dist/lead-m5e7xt93.js +75 -0
- package/dist/{llama-cpp-classify-nfgswa1m.js → llama-cpp-classify-yvb8vh7w.js} +2 -2
- package/dist/{maintenance-yj0dcjja.js → maintenance-g7v15tj1.js} +1 -1
- package/dist/{mistral-conversations-0c30em7t.js → mistral-conversations-w4bncwbt.js} +11 -11
- package/dist/{node-7qsx5kvm.js → node-z67yjre7.js} +19 -13
- package/dist/{oauth-refresh-sweep-d9xedk66.js → oauth-refresh-sweep-ywgf8tbr.js} +3 -3
- package/dist/{onboard-dpgjn03r.js → onboard-m3fedypq.js} +6 -6
- package/dist/{openai-codex-responses-bkcd8pjj.js → openai-codex-responses-70g39cgz.js} +24 -18
- package/dist/{openai-completions-f3n69rep.js → openai-completions-cv3hp4h5.js} +33 -26
- package/dist/{openai-decisions-q3hh60wr.js → openai-decisions-fyq1p9f9.js} +2 -2
- package/dist/{openai-responses-gbh0wfqe.js → openai-responses-trsvnks6.js} +24 -22
- package/dist/{opencode-adapter-2d31cpjc.js → opencode-adapter-19ktcbb9.js} +7 -7
- package/dist/{openrouter-images-xr9gme9x.js → openrouter-images-0jj12a2q.js} +6 -6
- package/dist/{otel-impl-1skarpfq.js → otel-impl-3ehm1hgc.js} +2 -2
- package/dist/{pending-bfmxtx0g.js → pending-fwj2fatd.js} +20 -19
- package/dist/{pi-messages-zebyt7gb.js → pi-messages-zk3g4esn.js} +6 -6
- package/dist/{pi-mono-adapter-gvppnasy.js → pi-mono-adapter-xdeesvc4.js} +18 -17
- package/dist/{pricing-refresh-c6b325mk.js → pricing-refresh-4j8dzvxg.js} +2 -2
- package/dist/{rbac-roles-h80qbdbs.js → rbac-roles-8msjr07m.js} +3 -3
- package/dist/{rbac-roles-zfcx68tx.js → rbac-roles-n7t2acv8.js} +2 -2
- package/dist/{render-v2-nx20t3rb.js → render-v2-j7qggj8h.js} +7 -6
- package/dist/{resume-5ep8agan.js → resume-hj1mn65y.js} +9 -8
- package/dist/{runtime-r3pj4mce.js → runtime-z31mdsgv.js} +2 -2
- package/dist/{session-access-n7p3m15b.js → session-access-w38fh09a.js} +4 -4
- package/dist/{session-source-backfill-v8mt0zwn.js → session-source-backfill-ax6qxv20.js} +3 -3
- package/dist/{setup-z1psaqhe.js → setup-dsqmpfcr.js} +1 -1
- package/dist/thread-buffer-nf55vwx3.js +39 -0
- package/dist/tree-visibility-6vqmnr71.js +24 -0
- package/dist/{typesafe-system-one-f2en2knd.js → typesafe-system-one-qkvkgrcz.js} +2 -2
- package/dist/user-merge-jobs-mvheb3ed.js +22 -0
- package/dist/{virtual-modules-rrbjdpxn.js → virtual-modules-w2qk2wew.js} +32 -10
- package/dist/{work-objects-4aghh73z.js → work-objects-4ahy5es5.js} +22 -21
- package/dist/worker-ews1nyhw.js +75 -0
- package/dist/{worker-follow-up-166zmex1.js → worker-follow-up-1gs4aw7y.js} +19 -18
- package/dist/{x-wg164ss9.js → x-3wr8c5sh.js} +2 -2
- package/openapi.json +2576 -388
- package/package.json +11 -10
- package/src/be/boot-seeds.ts +7 -1
- package/src/be/db/model-groups.ts +238 -0
- package/src/be/db/model-profiles.ts +26 -8
- package/src/be/db/request-composition.ts +190 -0
- package/src/be/db/runtime.ts +15 -0
- package/src/be/db/session-costs.ts +8 -2
- package/src/be/db/slack-trees.ts +220 -10
- package/src/be/db/tasks/human-free.ts +3 -2
- package/src/be/db/tasks/read.ts +3 -2
- package/src/be/db/tasks/write.ts +2 -1
- package/src/be/db/user-references.ts +75 -0
- package/src/be/db/users/references.ts +185 -0
- package/src/be/db/workflow-run-retention.ts +101 -0
- package/src/be/db-client.ts +93 -20
- package/src/be/db-retention-defaults.ts +46 -0
- package/src/be/db-retention.ts +55 -6
- package/src/be/db.ts +32 -57
- package/src/be/key-window-usage.ts +1 -0
- package/src/be/mcp-events/catalog.ts +108 -0
- package/src/be/mcp-events/dispatcher.ts +202 -0
- package/src/be/mcp-events/protocol.ts +296 -0
- package/src/be/mcp-events/store.ts +231 -0
- package/src/be/mcp-events/webhook.ts +226 -0
- package/src/be/memory/demotion-evidence.ts +34 -0
- package/src/be/memory/providers/sqlite-store.ts +110 -24
- package/src/be/memory/reranker.ts +34 -12
- package/src/be/memory/review-recall-filter.ts +105 -0
- package/src/be/memory/search-candidates.ts +16 -5
- package/src/be/memory/types.ts +16 -0
- package/src/be/migrations/312_task_ui_action_runs_repeatable.sql +6 -0
- package/src/be/migrations/314_model_groups.sql +85 -0
- package/src/be/migrations/318_superseded_workflow_cut_backfill.sql +22 -0
- package/src/be/migrations/319_user_fk_indexes.sql +153 -0
- package/src/be/migrations/320_session_costs_kind.sql +4 -0
- package/src/be/migrations/321_user_merge_jobs.sql +52 -0
- package/src/be/migrations/322_runtime_pool_workspace.sql +8 -0
- package/src/be/migrations/323_slack_task_tree_visibility.sql +9 -0
- package/src/be/migrations/326_slack_reconcile_pages.sql +13 -0
- package/src/be/migrations/327_mcp_event_subscriptions.sql +57 -0
- package/src/be/migrations/329_workflow_run_retention.sql +9 -0
- package/src/be/migrations/330_request_composition.sql +22 -0
- package/src/be/model-profile-check.ts +1 -1
- package/src/be/multi-runtime.ts +32 -4
- package/src/be/pricing-normalize.ts +2 -0
- package/src/be/rbac-roles.ts +6 -4
- package/src/be/runtime-pools/controllers.ts +18 -3
- package/src/be/runtime-pools/db.ts +35 -9
- package/src/be/runtime-pools/supervisor.ts +57 -3
- package/src/be/scripts/db.ts +11 -0
- package/src/be/scripts/typecheck.ts +2 -0
- package/src/be/seed-model-groups.ts +86 -0
- package/src/be/seed-model-profiles.ts +20 -13
- package/src/be/seed-scripts/catalog/dreaming-gather.ts +165 -1
- package/src/be/swarm-config-guard.ts +44 -2
- package/src/be/task-ui-spec.ts +102 -1
- package/src/be/user-merge-jobs.ts +564 -0
- package/src/be/users.ts +41 -23
- package/src/commands/context-preamble.ts +11 -4
- package/src/commands/credential-outcome-report.ts +33 -9
- package/src/commands/e2b-stack-wizard.tsx +12 -6
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +1 -1
- package/src/commands/onboard/env-generator.ts +1 -1
- package/src/commands/provider-credentials.ts +1 -1
- package/src/commands/runner.ts +116 -12
- package/src/extensions/catalog.generated.json +1 -1
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/contract.ts +15 -0
- package/src/extensions/dispatcher.ts +14 -4
- package/src/github/app.ts +59 -14
- package/src/github/handlers.ts +57 -0
- package/src/github/types.ts +4 -0
- package/src/http/all-routes.ts +4 -0
- package/src/http/approval-requests.ts +5 -1
- package/src/http/auth.ts +3 -1
- package/src/http/config.ts +36 -2
- package/src/http/core.ts +2 -0
- package/src/http/github-token.ts +66 -0
- package/src/http/index.ts +34 -0
- package/src/http/mcp-user.ts +11 -8
- package/src/http/mcp.ts +58 -42
- package/src/http/memory.ts +19 -6
- package/src/http/model-groups.ts +277 -0
- package/src/http/model-profiles.ts +30 -13
- package/src/http/prompt-templates.ts +1 -0
- package/src/http/request-composition.ts +310 -0
- package/src/http/tasks.ts +46 -6
- package/src/http/tool-hooks.ts +140 -0
- package/src/http/tool-schema-estimate.ts +95 -0
- package/src/http/users.ts +142 -19
- package/src/http/workflows.ts +37 -1
- package/src/integrations/chat-sdk/inbound.ts +8 -2
- package/src/integrations/chat-sdk/limits.ts +8 -3
- package/src/prompts/base-prompt.ts +133 -7
- package/src/prompts/resolver.ts +41 -2
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/opencode-adapter.ts +72 -1
- package/src/providers/opencode-swarm-plugin.ts +22 -3
- package/src/providers/pi-mono-adapter.ts +1 -0
- package/src/providers/pi-mono-extension.ts +71 -0
- package/src/providers/pricing-sources.md +13 -0
- package/src/providers/request-composition-hook.ts +312 -0
- package/src/providers/types.ts +5 -0
- package/src/rbac/legacy-policy.ts +1 -0
- package/src/rbac/permissions.ts +5 -0
- package/src/runtime-providers/controller-protocol.ts +7 -0
- package/src/runtime-providers/docker.ts +80 -12
- package/src/runtime-providers/index.ts +7 -5
- package/src/runtime-providers/k8s.ts +355 -0
- package/src/runtime-providers/types.ts +17 -0
- package/src/scheduler/scheduler.ts +1 -1
- package/src/scripts-runtime/types/stdlib.d.ts +2 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +16 -1
- package/src/scripts-runtime/types/swarm-sdk.d.ts +2 -0
- package/src/server-user.ts +16 -1
- package/src/slack/ack.ts +10 -5
- package/src/slack/actions.ts +36 -13
- package/src/slack/app.ts +2 -0
- package/src/slack/assistant.ts +4 -4
- package/src/slack/blocks.ts +26 -5
- package/src/slack/handlers.ts +3 -3
- package/src/slack/reaction-shortcode.ts +23 -2
- package/src/slack/render-v2.ts +344 -200
- package/src/slack/responses.ts +7 -5
- package/src/slack/thread-buffer.ts +3 -3
- package/src/slack/tree-visibility.ts +64 -0
- package/src/tasks/worker-follow-up.ts +127 -17
- package/src/tests/acp-adapter.test.ts +26 -0
- package/src/tests/azure-devops-outbound.test.ts +47 -14
- package/src/tests/base-prompt.test.ts +149 -1
- package/src/tests/chat-sdk-relay.test.ts +21 -1
- package/src/tests/check-playwright-version.test.ts +33 -0
- package/src/tests/check-pr-body.test.ts +43 -0
- package/src/tests/context-preamble-budget.test.ts +65 -0
- package/src/tests/credential-check.test.ts +14 -6
- package/src/tests/credential-outcome-report.test.ts +81 -1
- package/src/tests/db-client.test.ts +168 -0
- package/src/tests/db-retention-defaults.test.ts +244 -0
- package/src/tests/db-retention.test.ts +2 -1
- package/src/tests/db-runtime.test.ts +2 -1
- package/src/tests/deploy-guard.test.ts +7 -7
- package/src/tests/deploy-release-dispatch.test.ts +332 -0
- package/src/tests/deploy-select.test.ts +83 -0
- package/src/tests/dreaming-gather-corrections.test.ts +467 -0
- package/src/tests/e2b-stack-wizard.test.tsx +156 -0
- package/src/tests/entrypoint-chown-no-follow.test.ts +69 -0
- package/src/tests/entrypoint-repo-clone-target.test.ts +112 -0
- package/src/tests/env-flag.test.ts +4 -2
- package/src/tests/event-loop-lag.test.ts +16 -20
- package/src/tests/extensions-example-slack-reply-gate.test.ts +15 -0
- package/src/tests/fixtures/base-prompt-baseline-cases.ts +78 -0
- package/src/tests/fixtures/base-prompt-baseline.json +18 -0
- package/src/tests/fixtures/extensions/native-tool-recorder/hooks.ts +26 -0
- package/src/tests/fixtures/extensions/native-tool-recorder/manifest.json +10 -0
- package/src/tests/fixtures/onboard/content.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/content.env.txt +1 -1
- package/src/tests/fixtures/onboard/dev.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/dev.env.txt +1 -1
- package/src/tests/fixtures/onboard/full-all.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/full-all.env.txt +1 -1
- package/src/tests/fixtures/onboard/full.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/full.env.txt +1 -1
- package/src/tests/fixtures/onboard/research.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/research.env.txt +1 -1
- package/src/tests/fixtures/onboard/solo.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/solo.env.txt +1 -1
- package/src/tests/github-app-worker-auth-helper.test.ts +325 -0
- package/src/tests/github-event-filter.test.ts +8 -0
- package/src/tests/github-handlers-inline-comments.test.ts +2 -0
- package/src/tests/github-handlers-reactions.test.ts +4 -0
- package/src/tests/github-handlers.test.ts +3 -0
- package/src/tests/github-installation-token-route.test.ts +199 -0
- package/src/tests/github-sender-trust.test.ts +223 -0
- package/src/tests/http-users.test.ts +142 -41
- package/src/tests/k8s-pool-smoke.test.ts +190 -0
- package/src/tests/key-window-usage.test.ts +15 -0
- package/src/tests/mcp-user-events.test.ts +708 -0
- package/src/tests/memory-key-paths.test.ts +4 -1
- package/src/tests/memory-rater-store.test.ts +35 -1
- package/src/tests/memory-reranker.test.ts +39 -4
- package/src/tests/memory-review-recall-filter.test.ts +205 -0
- package/src/tests/memory-search-stall.test.ts +421 -0
- package/src/tests/migration-318-superseded-workflow-cut-backfill.test.ts +74 -0
- package/src/tests/migration-322-runtime-pool-workspace.test.ts +116 -0
- package/src/tests/migration-329-workflow-run-retention.test.ts +32 -0
- package/src/tests/model-groups-api.test.ts +415 -0
- package/src/tests/model-profile-fallbacks.test.ts +236 -2
- package/src/tests/model-profiles-api.test.ts +1 -0
- package/src/tests/opencode-adapter.test.ts +86 -0
- package/src/tests/operator-granted-credentials.test.ts +7 -2
- package/src/tests/operator-granted-role-wire.test.ts +2 -1
- package/src/tests/pi-mono-extension.test.ts +168 -0
- package/src/tests/preload-env.test.ts +61 -1
- package/src/tests/preload.ts +22 -0
- package/src/tests/prompt-template-resolver.test.ts +85 -0
- package/src/tests/rbac-engine.test.ts +1 -0
- package/src/tests/reload-config.test.ts +45 -0
- package/src/tests/request-composition.test.ts +447 -0
- package/src/tests/runner-max-concurrent.test.ts +86 -0
- package/src/tests/runtime-k8s-pools.test.ts +142 -0
- package/src/tests/runtime-pools-db.test.ts +122 -2
- package/src/tests/runtime-pools-http.test.ts +47 -2
- package/src/tests/runtime-provider-registration.test.ts +13 -14
- package/src/tests/runtime-providers-docker.test.ts +192 -1
- package/src/tests/runtime-providers-k8s.test.ts +430 -0
- package/src/tests/runtime-remote-controller.test.ts +64 -1
- package/src/tests/runtime-supervisor.test.ts +101 -0
- package/src/tests/script-connections.test.ts +21 -1
- package/src/tests/short-id.test.ts +23 -0
- package/src/tests/slack-blocks.test.ts +87 -0
- package/src/tests/slack-empty-icon-config.test.ts +113 -0
- package/src/tests/slack-reaction-config.test.ts +38 -2
- package/src/tests/slack-render-v2-query-plans.test.ts +100 -1
- package/src/tests/slack-render-v2-reconcile.test.ts +75 -4
- package/src/tests/slack-render-v2.test.ts +737 -11
- package/src/tests/spec-base-url.test.ts +13 -1
- package/src/tests/swarm-config-reserved-keys.test.ts +1 -0
- package/src/tests/system-one-decide-session-cost.test.ts +196 -0
- package/src/tests/task-session-prompts.test.ts +37 -0
- package/src/tests/task-ui-action-route.test.ts +59 -1
- package/src/tests/task-ui-script-actions.test.ts +517 -0
- package/src/tests/tool-hooks-http.test.ts +187 -0
- package/src/tests/ui-spec-script-actions-config.test.ts +196 -0
- package/src/tests/user-delete-perf.test.ts +348 -0
- package/src/tests/user-merge-jobs.test.ts +680 -0
- package/src/tests/vcs-provider.test.ts +25 -5
- package/src/tests/vendored-openapi.test.ts +13 -1
- package/src/tests/webhook-filter.test.ts +327 -0
- package/src/tests/workflow-agent-task-retry.test.ts +62 -0
- package/src/tests/workflow-async-v2.test.ts +19 -16
- package/src/tests/workflow-definition-telemetry.test.ts +15 -5
- package/src/tests/workflow-e2e.test.ts +1 -9
- package/src/tests/workflow-finalization-races.test.ts +553 -0
- package/src/tests/workflow-foreach-supersede-retry.test.ts +10 -0
- package/src/tests/workflow-foreach.test.ts +2 -0
- package/src/tests/workflow-hitl-routing.test.ts +26 -20
- package/src/tests/workflow-http-v2.test.ts +132 -2
- package/src/tests/workflow-idempotency.test.ts +41 -0
- package/src/tests/workflow-mcp-webhook-filter.test.ts +214 -0
- package/src/tests/workflow-parallel-park.test.ts +297 -0
- package/src/tests/workflow-replay.test.ts +10 -1
- package/src/tests/workflow-retry-v2.test.ts +57 -21
- package/src/tests/workflow-retry-validation.test.ts +13 -13
- package/src/tests/workflow-runs-retention.test.ts +533 -0
- package/src/tests/workflow-script-principal.test.ts +7 -2
- package/src/tests/workflow-tla-races.test.ts +7 -2
- package/src/tests/workflow-triggers-v2.test.ts +329 -0
- package/src/tests/workflow-wait-builtin-events.test.ts +3 -1
- package/src/tests/workflow-wait-event.test.ts +137 -3
- package/src/tests/workflow-wait-poller.test.ts +94 -0
- package/src/tests/workflow-wait-time.test.ts +7 -3
- package/src/tests/workflow-wait.test.ts +26 -0
- package/src/tests/workflow-wait.ts +44 -0
- package/src/tools/memory-search.ts +14 -3
- package/src/tools/store-progress.ts +26 -26
- package/src/tools/swarm-config/delete-config.ts +12 -1
- package/src/tools/swarm-config/set-config.ts +8 -0
- package/src/tools/system-one-decide.ts +113 -3
- package/src/tools/utils.ts +4 -1
- package/src/tools/workflows/create-workflow.ts +7 -1
- package/src/tools/workflows/update-workflow.ts +8 -2
- package/src/types.ts +284 -2
- package/src/ui-spec/actions.ts +30 -4
- package/src/ui-spec/schema.ts +38 -0
- package/src/ui-spec/script-actions.ts +340 -0
- package/src/ui-spec/script-allowlist.ts +48 -0
- package/src/utils/credentials.ts +7 -0
- package/src/utils/short-id.ts +20 -14
- package/src/utils/task-ui-spec.ts +16 -4
- package/src/vcs/index.ts +12 -2
- package/src/workflows/checkpoint.ts +18 -0
- package/src/workflows/engine.ts +38 -10
- package/src/workflows/executors/system-one-decision.ts +2 -2
- package/src/workflows/foreach-driver.ts +42 -4
- package/src/workflows/recovery.ts +6 -1
- package/src/workflows/resume.ts +14 -5
- package/src/workflows/retry-poller.ts +17 -4
- package/src/workflows/successor-routing.ts +108 -0
- package/src/workflows/task-step-routing.ts +35 -12
- package/src/workflows/triggers.ts +25 -8
- package/src/workflows/wait-poller.ts +6 -2
- package/src/workflows/webhook-filter.ts +203 -0
- package/templates/extensions/manifest.schema.json +13 -0
- package/templates/extensions/slack-reply-gate/hooks.ts +8 -4
- package/templates/skills/swarm-docs/content.md +4 -0
- package/templates/skills/ui-spec/content.md +7 -1
- package/templates/workflows/dreaming/content.md +1 -1
- package/dist/acp-adapter-g909b5hw.js +0 -16
- package/dist/cli-b91nz213.js +0 -93
- package/dist/fx-adapter-sk7n0fzc.js +0 -19
- package/dist/grok-adapter-sjbcm5ew.js +0 -19
- package/dist/handlers-yzy0c87x.js +0 -35
- package/dist/index-25pvya7q.js +0 -40
- package/dist/index-2t4859r5.js +0 -35
- package/dist/index-cxca2t8y.js +0 -36
- package/dist/lead-gk4h5eg7.js +0 -74
- package/dist/thread-buffer-a1re2r9r.js +0 -38
- package/dist/worker-3dyyb8ev.js +0 -74
- /package/dist/{node-dqm4xgxw.js → node-2wfcey7d.js} +0 -0
|
@@ -0,0 +1,404 @@
|
|
|
1
|
+
import {
|
|
2
|
+
sealJson,
|
|
3
|
+
openSealedJson,
|
|
4
|
+
init_sealed_json,
|
|
5
|
+
getDbClient2,
|
|
6
|
+
init_runtime2,
|
|
7
|
+
invalidateTelemetryUserRole,
|
|
8
|
+
scheduleOrgDomainRecompute,
|
|
9
|
+
init_telemetry_identity,
|
|
10
|
+
quoteSqlIdentifier,
|
|
11
|
+
USER_REFERENCE_COLUMNS_SQL,
|
|
12
|
+
userReferenceRewriteSql,
|
|
13
|
+
WORKFLOW_CONTEXT_REQUESTER_SQL,
|
|
14
|
+
init_user_references,
|
|
15
|
+
init_db4
|
|
16
|
+
} from "./cli-zhn4r1rz.js";
|
|
17
|
+
import {
|
|
18
|
+
nextRestRatio2
|
|
19
|
+
} from "./cli-rwgwen5v.js";
|
|
20
|
+
import {
|
|
21
|
+
scrubSecrets,
|
|
22
|
+
init_secret_scrubber
|
|
23
|
+
} from "./cli-7e8sxqv5.js";
|
|
24
|
+
|
|
25
|
+
// src/be/user-merge-jobs.ts
|
|
26
|
+
init_telemetry_identity();
|
|
27
|
+
init_secret_scrubber();
|
|
28
|
+
init_db4();
|
|
29
|
+
|
|
30
|
+
// src/be/db/users/references.ts
|
|
31
|
+
init_sealed_json();
|
|
32
|
+
init_runtime2();
|
|
33
|
+
init_user_references();
|
|
34
|
+
async function discoverUserReferenceColumns(executor = getDbClient2()) {
|
|
35
|
+
const rows = await executor.query(USER_REFERENCE_COLUMNS_SQL);
|
|
36
|
+
const withoutRowidByTable = new Map;
|
|
37
|
+
const references = [];
|
|
38
|
+
for (const row of rows) {
|
|
39
|
+
let withoutRowid = withoutRowidByTable.get(row.tableName);
|
|
40
|
+
if (withoutRowid === undefined) {
|
|
41
|
+
const table = await executor.get(`SELECT instr(upper(sql), 'WITHOUT ROWID') > 0 AS withoutRowid
|
|
42
|
+
FROM sqlite_schema WHERE type = 'table' AND name = ?`, [row.tableName]);
|
|
43
|
+
withoutRowid = Boolean(table?.withoutRowid);
|
|
44
|
+
withoutRowidByTable.set(row.tableName, withoutRowid);
|
|
45
|
+
}
|
|
46
|
+
let keyColumns = ["rowid"];
|
|
47
|
+
if (withoutRowid) {
|
|
48
|
+
const pk = await executor.query("SELECT name FROM pragma_table_info(?) WHERE pk > 0 ORDER BY pk", [row.tableName]);
|
|
49
|
+
keyColumns = pk.map((column) => column.name);
|
|
50
|
+
}
|
|
51
|
+
references.push({ ...row, withoutRowid, keyColumns });
|
|
52
|
+
}
|
|
53
|
+
return references;
|
|
54
|
+
}
|
|
55
|
+
async function rewriteUserReferenceColumn(reference, userId, replacementUserId, limit) {
|
|
56
|
+
if (limit === undefined) {
|
|
57
|
+
const result = await getDbClient2().run(userReferenceRewriteSql(reference), [
|
|
58
|
+
replacementUserId,
|
|
59
|
+
userId
|
|
60
|
+
]);
|
|
61
|
+
return result.changes;
|
|
62
|
+
}
|
|
63
|
+
const table = quoteSqlIdentifier(reference.tableName);
|
|
64
|
+
const column = quoteSqlIdentifier(reference.columnName);
|
|
65
|
+
const keys = reference.keyColumns.map(quoteSqlIdentifier).join(", ");
|
|
66
|
+
const keyTuple = reference.keyColumns.length === 1 ? keys : `(${keys})`;
|
|
67
|
+
const result = await getDbClient2().run(`UPDATE ${table} SET ${column} = ?
|
|
68
|
+
WHERE ${keyTuple} IN (SELECT ${keys} FROM ${table} WHERE ${column} = ? LIMIT ?)`, [replacementUserId, userId, limit]);
|
|
69
|
+
return result.changes;
|
|
70
|
+
}
|
|
71
|
+
async function selectWorkflowRunsRequestedBy(userId, executor = getDbClient2(), limit) {
|
|
72
|
+
const rows = await executor.query(`SELECT id FROM workflow_runs
|
|
73
|
+
WHERE ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?
|
|
74
|
+
ORDER BY id
|
|
75
|
+
LIMIT ?`, [userId, limit ?? -1]);
|
|
76
|
+
return rows.map((row) => row.id);
|
|
77
|
+
}
|
|
78
|
+
async function rewriteWorkflowRunRequester(runIds, userId, replacementUserId) {
|
|
79
|
+
if (runIds.length === 0)
|
|
80
|
+
return 0;
|
|
81
|
+
const client = getDbClient2();
|
|
82
|
+
const placeholders = runIds.map(() => "?").join(", ");
|
|
83
|
+
const sealedContexts = await client.query(`SELECT id, context_replay FROM workflow_runs
|
|
84
|
+
WHERE id IN (${placeholders})
|
|
85
|
+
AND context_replay IS NOT NULL
|
|
86
|
+
AND ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?`, [...runIds, userId]);
|
|
87
|
+
for (const row of sealedContexts) {
|
|
88
|
+
let context;
|
|
89
|
+
try {
|
|
90
|
+
context = openSealedJson(row.context_replay);
|
|
91
|
+
} catch {
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
const swarm = { ...context.swarm };
|
|
95
|
+
if (swarm.requestedByUserId !== userId)
|
|
96
|
+
continue;
|
|
97
|
+
if (replacementUserId)
|
|
98
|
+
swarm.requestedByUserId = replacementUserId;
|
|
99
|
+
else
|
|
100
|
+
delete swarm.requestedByUserId;
|
|
101
|
+
await client.run("UPDATE workflow_runs SET context_replay = ? WHERE id = ?", [
|
|
102
|
+
sealJson({ ...context, swarm }),
|
|
103
|
+
row.id
|
|
104
|
+
]);
|
|
105
|
+
}
|
|
106
|
+
const result = replacementUserId ? await client.run(`UPDATE workflow_runs
|
|
107
|
+
SET context = json_set(context, '$.swarm.requestedByUserId', ?)
|
|
108
|
+
WHERE id IN (${placeholders})
|
|
109
|
+
AND ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?`, [replacementUserId, ...runIds, userId]) : await client.run(`UPDATE workflow_runs
|
|
110
|
+
SET context = json_remove(context, '$.swarm.requestedByUserId')
|
|
111
|
+
WHERE id IN (${placeholders})
|
|
112
|
+
AND ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?`, [...runIds, userId]);
|
|
113
|
+
return result.changes;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
// src/be/user-merge-jobs.ts
|
|
117
|
+
var USER_MERGE_BATCH_SIZE = 5000;
|
|
118
|
+
var USER_MERGE_MAX_ATTEMPTS = 5;
|
|
119
|
+
var WORKFLOW_CONTEXT_PHASE = "workflow-context";
|
|
120
|
+
var DELETE_USER_PHASE = "delete-user";
|
|
121
|
+
|
|
122
|
+
class TerminalUserMergeError extends Error {
|
|
123
|
+
}
|
|
124
|
+
function rowToJob(row) {
|
|
125
|
+
let progress = {};
|
|
126
|
+
try {
|
|
127
|
+
const parsed = JSON.parse(row.progress);
|
|
128
|
+
if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
|
|
129
|
+
progress = Object.fromEntries(Object.entries(parsed).filter((entry) => typeof entry[1] === "number"));
|
|
130
|
+
}
|
|
131
|
+
} catch {}
|
|
132
|
+
return {
|
|
133
|
+
id: row.id,
|
|
134
|
+
sourceUserId: row.sourceUserId,
|
|
135
|
+
targetUserId: row.targetUserId,
|
|
136
|
+
status: row.status,
|
|
137
|
+
phase: row.phase,
|
|
138
|
+
progress,
|
|
139
|
+
error: row.error,
|
|
140
|
+
attempts: row.attempts,
|
|
141
|
+
nextAttemptAt: row.nextAttemptAt,
|
|
142
|
+
createdAt: row.createdAt,
|
|
143
|
+
startedAt: row.startedAt,
|
|
144
|
+
finishedAt: row.finishedAt
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
async function createUserMergeJob2(input) {
|
|
148
|
+
if (input.sourceUserId === input.targetUserId) {
|
|
149
|
+
throw new Error("Merge source and target must differ");
|
|
150
|
+
}
|
|
151
|
+
const id = crypto.randomUUID();
|
|
152
|
+
const now = new Date().toISOString();
|
|
153
|
+
const row = await getDbClient2().get(`INSERT INTO user_merge_jobs
|
|
154
|
+
(id, sourceUserId, targetUserId, status, progress, createdAt, created_by, updated_by)
|
|
155
|
+
VALUES (?, ?, ?, 'pending', '{}', ?, ?, ?)
|
|
156
|
+
RETURNING *`, [
|
|
157
|
+
id,
|
|
158
|
+
input.sourceUserId,
|
|
159
|
+
input.targetUserId,
|
|
160
|
+
now,
|
|
161
|
+
input.createdBy ?? null,
|
|
162
|
+
input.createdBy ?? null
|
|
163
|
+
]);
|
|
164
|
+
if (!row)
|
|
165
|
+
throw new Error("Failed to create user merge job");
|
|
166
|
+
return rowToJob(row);
|
|
167
|
+
}
|
|
168
|
+
async function getUserMergeJob2(id) {
|
|
169
|
+
const row = await getDbClient2().get("SELECT * FROM user_merge_jobs WHERE id = ?", [id]);
|
|
170
|
+
return row ? rowToJob(row) : null;
|
|
171
|
+
}
|
|
172
|
+
async function listUserMergeJobs2(opts) {
|
|
173
|
+
const limit = Math.min(Math.max(opts?.limit ?? 50, 1), 200);
|
|
174
|
+
const rows = opts?.status ? await getDbClient2().query("SELECT * FROM user_merge_jobs WHERE status = ? ORDER BY createdAt DESC LIMIT ?", [opts.status, limit]) : await getDbClient2().query("SELECT * FROM user_merge_jobs ORDER BY createdAt DESC LIMIT ?", [limit]);
|
|
175
|
+
return rows.map(rowToJob);
|
|
176
|
+
}
|
|
177
|
+
async function findActiveUserMergeJob2(userId) {
|
|
178
|
+
const row = await getDbClient2().get(`SELECT * FROM user_merge_jobs
|
|
179
|
+
WHERE status IN ('pending', 'running') AND (sourceUserId = ? OR targetUserId = ?)
|
|
180
|
+
ORDER BY createdAt LIMIT 1`, [userId, userId]);
|
|
181
|
+
return row ? rowToJob(row) : null;
|
|
182
|
+
}
|
|
183
|
+
async function findFailedUserMergeJob2(sourceUserId, targetUserId) {
|
|
184
|
+
const row = await getDbClient2().get(`SELECT * FROM user_merge_jobs
|
|
185
|
+
WHERE status = 'failed' AND sourceUserId = ? AND targetUserId = ?
|
|
186
|
+
ORDER BY createdAt DESC LIMIT 1`, [sourceUserId, targetUserId]);
|
|
187
|
+
return row ? rowToJob(row) : null;
|
|
188
|
+
}
|
|
189
|
+
async function requeueUserMergeJob2(jobId) {
|
|
190
|
+
const row = await getDbClient2().get(`UPDATE user_merge_jobs
|
|
191
|
+
SET status = 'pending', error = NULL, attempts = 0, nextAttemptAt = NULL, finishedAt = NULL
|
|
192
|
+
WHERE id = ? AND status = 'failed'
|
|
193
|
+
RETURNING *`, [jobId]);
|
|
194
|
+
return row ? rowToJob(row) : null;
|
|
195
|
+
}
|
|
196
|
+
var INITIAL_REST_RATIO = 1;
|
|
197
|
+
var LAG_SMOOTHING = 0.3;
|
|
198
|
+
function retryDelayMs(attempt) {
|
|
199
|
+
return Math.min(2000 * 4 ** Math.max(0, attempt - 1), 5 * 60000);
|
|
200
|
+
}
|
|
201
|
+
function createPacer() {
|
|
202
|
+
let ratio = INITIAL_REST_RATIO;
|
|
203
|
+
let lag = 0;
|
|
204
|
+
return {
|
|
205
|
+
async rest(workedMs) {
|
|
206
|
+
const restMs = Math.max(1, workedMs * ratio);
|
|
207
|
+
const restStart = performance.now();
|
|
208
|
+
await new Promise((resolve) => setTimeout(resolve, restMs));
|
|
209
|
+
const late = Math.max(0, performance.now() - restStart - restMs);
|
|
210
|
+
lag = lag * (1 - LAG_SMOOTHING) + late * LAG_SMOOTHING;
|
|
211
|
+
ratio = nextRestRatio2(ratio, lag);
|
|
212
|
+
}
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
async function saveProgress(tx, jobId, phase, progress) {
|
|
216
|
+
await tx.run("UPDATE user_merge_jobs SET phase = ?, progress = ? WHERE id = ?", [
|
|
217
|
+
phase,
|
|
218
|
+
JSON.stringify(progress),
|
|
219
|
+
jobId
|
|
220
|
+
]);
|
|
221
|
+
}
|
|
222
|
+
async function userExists(executor, id) {
|
|
223
|
+
const row = await executor.get("SELECT EXISTS(SELECT 1 FROM users WHERE id = ?) AS present", [id]);
|
|
224
|
+
return row?.present === 1;
|
|
225
|
+
}
|
|
226
|
+
async function claimNextJob() {
|
|
227
|
+
const now = new Date().toISOString();
|
|
228
|
+
const row = await getDbClient2().get(`UPDATE user_merge_jobs
|
|
229
|
+
SET status = 'running', startedAt = COALESCE(startedAt, ?), attempts = attempts + 1,
|
|
230
|
+
nextAttemptAt = NULL, finishedAt = NULL
|
|
231
|
+
WHERE id = (
|
|
232
|
+
SELECT id FROM user_merge_jobs
|
|
233
|
+
WHERE status = 'pending' AND (nextAttemptAt IS NULL OR nextAttemptAt <= ?)
|
|
234
|
+
ORDER BY createdAt LIMIT 1
|
|
235
|
+
)
|
|
236
|
+
RETURNING *`, [now, now]);
|
|
237
|
+
return row ? rowToJob(row) : null;
|
|
238
|
+
}
|
|
239
|
+
function errorMessage(error) {
|
|
240
|
+
const message = scrubSecrets(error instanceof Error ? error.message : String(error));
|
|
241
|
+
return message.slice(0, 2000);
|
|
242
|
+
}
|
|
243
|
+
async function markFailed(jobId, error) {
|
|
244
|
+
await getDbClient2().run("UPDATE user_merge_jobs SET status = 'failed', error = ?, finishedAt = ? WHERE id = ?", [errorMessage(error), new Date().toISOString(), jobId]);
|
|
245
|
+
}
|
|
246
|
+
async function scheduleRetry(jobId, error, delayMs) {
|
|
247
|
+
await getDbClient2().run("UPDATE user_merge_jobs SET status = 'pending', error = ?, nextAttemptAt = ? WHERE id = ?", [errorMessage(error), new Date(Date.now() + delayMs).toISOString(), jobId]);
|
|
248
|
+
}
|
|
249
|
+
async function finishJob(job, progress, references) {
|
|
250
|
+
const client = getDbClient2();
|
|
251
|
+
await saveProgress(client, job.id, DELETE_USER_PHASE, progress);
|
|
252
|
+
await client.transaction(async (tx) => {
|
|
253
|
+
if (references.length > 0) {
|
|
254
|
+
const runIds = await selectWorkflowRunsRequestedBy(job.sourceUserId, tx);
|
|
255
|
+
const contexts = await rewriteWorkflowRunRequester(runIds, job.sourceUserId, job.targetUserId);
|
|
256
|
+
if (contexts > 0) {
|
|
257
|
+
progress[WORKFLOW_CONTEXT_PHASE] = (progress[WORKFLOW_CONTEXT_PHASE] ?? 0) + contexts;
|
|
258
|
+
}
|
|
259
|
+
for (const reference of references) {
|
|
260
|
+
const changes = await rewriteUserReferenceColumn(reference, job.sourceUserId, job.targetUserId);
|
|
261
|
+
if (changes > 0) {
|
|
262
|
+
const phase = `${reference.tableName}.${reference.columnName}`;
|
|
263
|
+
progress[phase] = (progress[phase] ?? 0) + changes;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
const result = await tx.run("DELETE FROM users WHERE id = ?", [job.sourceUserId]);
|
|
268
|
+
progress[DELETE_USER_PHASE] = (progress[DELETE_USER_PHASE] ?? 0) + result.changes;
|
|
269
|
+
await tx.run(`UPDATE user_merge_jobs
|
|
270
|
+
SET status = 'done', phase = ?, progress = ?, error = NULL, finishedAt = ?
|
|
271
|
+
WHERE id = ?`, [DELETE_USER_PHASE, JSON.stringify(progress), new Date().toISOString(), job.id]);
|
|
272
|
+
client.afterCommit(() => {
|
|
273
|
+
invalidateTelemetryUserRole(job.sourceUserId);
|
|
274
|
+
invalidateTelemetryUserRole(job.targetUserId);
|
|
275
|
+
scheduleOrgDomainRecompute();
|
|
276
|
+
});
|
|
277
|
+
});
|
|
278
|
+
}
|
|
279
|
+
async function runJob(job, options) {
|
|
280
|
+
const client = getDbClient2();
|
|
281
|
+
const batchSize = Math.max(1, Math.floor(options.batchSize ?? USER_MERGE_BATCH_SIZE));
|
|
282
|
+
const pacer = options.pace === false ? null : createPacer();
|
|
283
|
+
const progress = { ...job.progress };
|
|
284
|
+
const afterBatch = async (phase, changes, workedMs) => {
|
|
285
|
+
if (changes > 0)
|
|
286
|
+
await options.afterBatch?.({ jobId: job.id, phase, changes });
|
|
287
|
+
if (pacer && changes > 0)
|
|
288
|
+
await pacer.rest(workedMs);
|
|
289
|
+
else
|
|
290
|
+
await new Promise((resolve) => setTimeout(resolve, 0));
|
|
291
|
+
};
|
|
292
|
+
if (!await userExists(client, job.sourceUserId)) {
|
|
293
|
+
await finishJob(job, progress, []);
|
|
294
|
+
return;
|
|
295
|
+
}
|
|
296
|
+
if (!await userExists(client, job.targetUserId)) {
|
|
297
|
+
throw new TerminalUserMergeError("Target user not found");
|
|
298
|
+
}
|
|
299
|
+
while (true) {
|
|
300
|
+
const started = performance.now();
|
|
301
|
+
const changes = await client.transaction(async (tx) => {
|
|
302
|
+
const runIds = await selectWorkflowRunsRequestedBy(job.sourceUserId, tx, batchSize);
|
|
303
|
+
if (runIds.length === 0)
|
|
304
|
+
return 0;
|
|
305
|
+
const rewritten = await rewriteWorkflowRunRequester(runIds, job.sourceUserId, job.targetUserId);
|
|
306
|
+
if (rewritten > 0) {
|
|
307
|
+
progress[WORKFLOW_CONTEXT_PHASE] = (progress[WORKFLOW_CONTEXT_PHASE] ?? 0) + rewritten;
|
|
308
|
+
}
|
|
309
|
+
await saveProgress(tx, job.id, WORKFLOW_CONTEXT_PHASE, progress);
|
|
310
|
+
return rewritten;
|
|
311
|
+
});
|
|
312
|
+
await afterBatch(WORKFLOW_CONTEXT_PHASE, changes, performance.now() - started);
|
|
313
|
+
if (changes < batchSize)
|
|
314
|
+
break;
|
|
315
|
+
}
|
|
316
|
+
const references = await discoverUserReferenceColumns();
|
|
317
|
+
for (const reference of references) {
|
|
318
|
+
const phase = `${reference.tableName}.${reference.columnName}`;
|
|
319
|
+
while (true) {
|
|
320
|
+
const started = performance.now();
|
|
321
|
+
const changes = await client.transaction(async (tx) => {
|
|
322
|
+
const rewritten = await rewriteUserReferenceColumn(reference, job.sourceUserId, job.targetUserId, batchSize);
|
|
323
|
+
if (rewritten > 0)
|
|
324
|
+
progress[phase] = (progress[phase] ?? 0) + rewritten;
|
|
325
|
+
await saveProgress(tx, job.id, phase, progress);
|
|
326
|
+
return rewritten;
|
|
327
|
+
});
|
|
328
|
+
await afterBatch(phase, changes, performance.now() - started);
|
|
329
|
+
if (changes < batchSize)
|
|
330
|
+
break;
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
await finishJob(job, progress, references);
|
|
334
|
+
}
|
|
335
|
+
var retryTimers = new Set;
|
|
336
|
+
function armRetry(delayMs, options) {
|
|
337
|
+
const timer = setTimeout(() => {
|
|
338
|
+
retryTimers.delete(timer);
|
|
339
|
+
runUserMergeJobs2(options);
|
|
340
|
+
}, delayMs);
|
|
341
|
+
timer.unref?.();
|
|
342
|
+
retryTimers.add(timer);
|
|
343
|
+
}
|
|
344
|
+
async function drain(options) {
|
|
345
|
+
while (true) {
|
|
346
|
+
const job = await claimNextJob();
|
|
347
|
+
if (!job)
|
|
348
|
+
return;
|
|
349
|
+
const started = performance.now();
|
|
350
|
+
try {
|
|
351
|
+
await runJob(job, options);
|
|
352
|
+
const seconds = ((performance.now() - started) / 1000).toFixed(1);
|
|
353
|
+
console.log(`[user-merge] job ${job.id} done in ${seconds}s`);
|
|
354
|
+
} catch (err) {
|
|
355
|
+
const terminal = err instanceof TerminalUserMergeError || job.attempts >= USER_MERGE_MAX_ATTEMPTS;
|
|
356
|
+
try {
|
|
357
|
+
if (terminal) {
|
|
358
|
+
console.error(`[user-merge] job ${job.id} failed (attempt ${job.attempts}):`, err);
|
|
359
|
+
await markFailed(job.id, err);
|
|
360
|
+
} else {
|
|
361
|
+
const delayMs = (options.retryDelayMs ?? retryDelayMs)(job.attempts);
|
|
362
|
+
console.error(`[user-merge] job ${job.id} attempt ${job.attempts} failed, retrying in ${Math.round(delayMs / 1000)}s:`, err);
|
|
363
|
+
await scheduleRetry(job.id, err, delayMs);
|
|
364
|
+
armRetry(delayMs, options);
|
|
365
|
+
}
|
|
366
|
+
} catch (markErr) {
|
|
367
|
+
console.error(`[user-merge] could not record the failure of job ${job.id}:`, markErr);
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
var active = null;
|
|
373
|
+
var rerun = false;
|
|
374
|
+
var pausedForTests = false;
|
|
375
|
+
function runUserMergeJobs2(options = {}) {
|
|
376
|
+
if (pausedForTests)
|
|
377
|
+
return Promise.resolve();
|
|
378
|
+
if (active) {
|
|
379
|
+
rerun = true;
|
|
380
|
+
return active;
|
|
381
|
+
}
|
|
382
|
+
active = (async () => {
|
|
383
|
+
try {
|
|
384
|
+
do {
|
|
385
|
+
rerun = false;
|
|
386
|
+
await drain(options);
|
|
387
|
+
} while (rerun);
|
|
388
|
+
} finally {
|
|
389
|
+
active = null;
|
|
390
|
+
}
|
|
391
|
+
})();
|
|
392
|
+
return active;
|
|
393
|
+
}
|
|
394
|
+
async function resumeUserMergeJobs2(options = {}) {
|
|
395
|
+
const requeued = await getDbClient2().run(`UPDATE user_merge_jobs SET status = 'pending', nextAttemptAt = NULL, finishedAt = NULL
|
|
396
|
+
WHERE status = 'running' OR (status = 'pending' AND nextAttemptAt IS NOT NULL)`);
|
|
397
|
+
const pending = await getDbClient2().get("SELECT COUNT(*) AS n FROM user_merge_jobs WHERE status = 'pending'");
|
|
398
|
+
if (!pending || pending.n === 0)
|
|
399
|
+
return;
|
|
400
|
+
console.log(`[user-merge] resuming ${pending.n} job(s) (${requeued.changes} re-queued after restart)`);
|
|
401
|
+
await runUserMergeJobs2(options);
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
export { createUserMergeJob2, getUserMergeJob2, listUserMergeJobs2, findActiveUserMergeJob2, findFailedUserMergeJob2, requeueUserMergeJob2, runUserMergeJobs2, resumeUserMergeJobs2 };
|
|
@@ -1248,7 +1248,7 @@ var _parse = (_Err) => {
|
|
|
1248
1248
|
throw new $ZodAsyncError;
|
|
1249
1249
|
}
|
|
1250
1250
|
return result.issues.length ? failure(_Err, result.issues, ctx) : { success: true, data: result.value };
|
|
1251
|
-
},
|
|
1251
|
+
}, safeParse2, _safeParseAsync = (_Err) => async (schema, value, _ctx) => {
|
|
1252
1252
|
const ctx = _ctx ? { ..._ctx, async: true } : { async: true };
|
|
1253
1253
|
let result = schema._zod.run({ value, issues: [] }, ctx);
|
|
1254
1254
|
if (result instanceof Promise)
|
|
@@ -1312,7 +1312,7 @@ var init_parse = __esm(() => {
|
|
|
1312
1312
|
init_util();
|
|
1313
1313
|
parse = /* @__PURE__ */ _parse($ZodRealError);
|
|
1314
1314
|
parseAsync = /* @__PURE__ */ _parseAsync($ZodRealError);
|
|
1315
|
-
|
|
1315
|
+
safeParse2 = /* @__PURE__ */ _safeParse($ZodRealError);
|
|
1316
1316
|
safeParseAsync = /* @__PURE__ */ _safeParseAsync($ZodRealError);
|
|
1317
1317
|
COMPILE_INVALID = /* @__PURE__ */ Symbol.for("zod.compile.invalid");
|
|
1318
1318
|
COMPILE_FALLBACK = /* @__PURE__ */ Symbol.for("zod.compile.fallback");
|
|
@@ -16755,7 +16755,7 @@ __export(exports_core, {
|
|
|
16755
16755
|
safeDecodeAsync: () => safeDecodeAsync2,
|
|
16756
16756
|
safeEncode: () => safeEncode2,
|
|
16757
16757
|
safeEncodeAsync: () => safeEncodeAsync2,
|
|
16758
|
-
safeParse: () =>
|
|
16758
|
+
safeParse: () => safeParse2,
|
|
16759
16759
|
safeParseAsync: () => safeParseAsync,
|
|
16760
16760
|
standardProps: () => standardProps,
|
|
16761
16761
|
stripTabAndNewline: () => stripTabAndNewline,
|
|
@@ -17041,14 +17041,14 @@ var init_errors2 = __esm(() => {
|
|
|
17041
17041
|
});
|
|
17042
17042
|
|
|
17043
17043
|
// node_modules/zod/v4/classic/parse.js
|
|
17044
|
-
var parse2, parseAsync2,
|
|
17044
|
+
var parse2, parseAsync2, safeParse3, safeParseAsync2, encode, decode, encodeAsync, decodeAsync, safeEncode, safeDecode, safeEncodeAsync, safeDecodeAsync;
|
|
17045
17045
|
var init_parse2 = __esm(() => {
|
|
17046
17046
|
init_core2();
|
|
17047
17047
|
init_errors2();
|
|
17048
17048
|
init_core2();
|
|
17049
17049
|
parse2 = /* @__PURE__ */ _parse(ZodRealError);
|
|
17050
17050
|
parseAsync2 = /* @__PURE__ */ _parseAsync(ZodRealError);
|
|
17051
|
-
|
|
17051
|
+
safeParse3 = /* @__PURE__ */ _safeParse(ZodRealError);
|
|
17052
17052
|
safeParseAsync2 = /* @__PURE__ */ _safeParseAsync(ZodRealError);
|
|
17053
17053
|
encode = /* @__PURE__ */ _encode(ZodRealError);
|
|
17054
17054
|
decode = /* @__PURE__ */ _decode(ZodRealError);
|
|
@@ -17864,7 +17864,7 @@ var init_schemas2 = __esm(() => {
|
|
|
17864
17864
|
return await parseAsync2(this, data, params, { callee: _parseAsync });
|
|
17865
17865
|
},
|
|
17866
17866
|
safeParse(data, params) {
|
|
17867
|
-
return
|
|
17867
|
+
return safeParse3(this, data, params);
|
|
17868
17868
|
},
|
|
17869
17869
|
async safeParseAsync(data, params) {
|
|
17870
17870
|
return safeParseAsync2(this, data, params);
|
|
@@ -19774,7 +19774,7 @@ __export(exports_external, {
|
|
|
19774
19774
|
safeDecodeAsync: () => safeDecodeAsync,
|
|
19775
19775
|
safeEncode: () => safeEncode,
|
|
19776
19776
|
safeEncodeAsync: () => safeEncodeAsync,
|
|
19777
|
-
safeParse: () =>
|
|
19777
|
+
safeParse: () => safeParse3,
|
|
19778
19778
|
safeParseAsync: () => safeParseAsync2,
|
|
19779
19779
|
set: () => set,
|
|
19780
19780
|
setErrorMap: () => setErrorMap,
|
|
@@ -19835,4 +19835,4 @@ var init_external = __esm(() => {
|
|
|
19835
19835
|
init_compat();
|
|
19836
19836
|
});
|
|
19837
19837
|
|
|
19838
|
-
export { toZod, clone, normalizeParams, own, installLazyProp, constantCatch, exports_util, init_util, NEVER, $constructor, $brand, config, flattenError, formatError, treeifyError, prettifyError, parse, parseAsync,
|
|
19838
|
+
export { toZod, clone, normalizeParams, own, installLazyProp, constantCatch, exports_util, init_util, NEVER, $constructor, $brand, config, flattenError, formatError, treeifyError, prettifyError, parse, parseAsync, safeParse2, safeParseAsync, validate, validateAsync, exports_regexes, $ZodType, $ZodString, $ZodNumber, $ZodNever, $ZodArray, $ZodObject, $ZodUnion, getDiscriminatedOption, $ZodRecord, $ZodEnum, $ZodLiteral, $ZodOptional, $ZodCatch, memoizer, exports_locales, init_locales, $output, $input, registry, globalRegistry, INVALID, ZodCompileAsyncError, ZodCompileUnsupportedError, compile, withParser, _string, TimePrecision, _number, _never, _lt, _lte, _gt, _gte, _positive, _negative, _nonpositive, _nonnegative, _multipleOf, _maxSize, _minSize, _size, _maxLength, _minLength, _length, _regex, _lowercase, _uppercase, _includes, _startsWith, _endsWith, _property, _properties, _mime, _overwrite, _normalize, _trim, _toLowerCase, _toUpperCase, _slugify, toJSONSchema, init_json_schema_processors, exports_core, init_core2, ZodError, ZodRealError, parse2, parseAsync2, safeParse3, safeParseAsync2, encode, decode, encodeAsync, decodeAsync, safeEncode, safeDecode, safeEncodeAsync, safeDecodeAsync, ZodType, _ZodString, ZodString, string2, ZodStringFormat, ZodISODateTime, ZodISODate, ZodISOTime, ZodISODuration, ZodEmail, email, ZodGUID, guid, ZodUUID, uuid, uuidv4, uuidv6, uuidv72, ZodURL, url, httpUrl, ZodEmoji, emoji, ZodNanoID, nanoid, ZodCUID, cuid, ZodCUID2, cuid2, ZodULID, ulid, ZodXID, xid, ZodKSUID, ksuid, ZodIPv4, ipv4, ZodMAC, mac, ZodIPv6, ipv6, ZodCIDRv4, cidrv4, ZodCIDRv6, cidrv6, ZodBase64, base64, ZodBase64URL, base64url, ZodE164, e164, ZodCreditCard, creditCard, ZodIBAN, iban, ZodJWT, jwt, ZodCustomStringFormat, stringFormat, hostname, hex, currencyCode, hash, ZodNumber, number2, ZodNumberFormat, int2, float32, float64, int32, uint32, ZodBoolean, boolean, ZodBigInt, bigint, ZodBigIntFormat, int64, uint64, ZodSymbol, symbol, ZodUndefined, _undefined, ZodNull, _null, ZodAny, any, ZodUnknown, unknown, ZodNever, never, ZodVoid, _void, ZodDate, date, ZodArray, array2, keyof, ZodObject, object2, strictObject2, looseObject, ZodUnion, union3, ZodXor, xor, ZodDiscriminatedUnion, discriminatedUnion, ZodIntersection, intersection, ZodTuple, tuple, ZodRecord, record2, partialRecord, looseRecord, ZodMap, map, ZodSet, set, ZodEnum, _enum2, nativeEnum, ZodLiteral, literal2, ZodFile, file, ZodTransform, transform, ZodOptional, optional2, ZodExactOptional, exactOptional, ZodNullable, nullable, nullish, ZodDefault, _default, ZodPrefault, prefault, ZodNonOptional, nonoptional, ZodSuccess, success, ZodCatch, _catch2, ZodNaN, nan, ZodPipe, pipe, ZodCodec, codec, invertCodec, ZodPreprocess, ZodReadonly, readonly, ZodTemplateLiteral, templateLiteral, ZodLazy, lazy, ZodPromise, promise, ZodFunction, _function, ZodCustom, check, custom, refine, superRefine, describe, meta, ZodInstanceOf, _instanceof, stringbool, json2, preprocess, ZodIssueCode, setErrorMap, getErrorMap, ZodFirstPartyTypeKind2, datetime, exports_iso, fromJSONSchema, deepPartial, input, output, number3, exports_coerce, exports_external, init_external };
|
|
@@ -25,17 +25,17 @@ import {
|
|
|
25
25
|
getUserById2,
|
|
26
26
|
getAllUsers2,
|
|
27
27
|
init_db4
|
|
28
|
-
} from "./cli-
|
|
28
|
+
} from "./cli-zhn4r1rz.js";
|
|
29
29
|
import {
|
|
30
30
|
externalChannelToolError2,
|
|
31
31
|
isBlockExternalEnabled2,
|
|
32
32
|
getChannelBlockReason2,
|
|
33
33
|
init_external_channel
|
|
34
|
-
} from "./cli-
|
|
34
|
+
} from "./cli-bq97k63w.js";
|
|
35
35
|
import {
|
|
36
36
|
getSlackApp2,
|
|
37
|
-
|
|
38
|
-
} from "./cli-
|
|
37
|
+
init_app4
|
|
38
|
+
} from "./cli-6a3j25xd.js";
|
|
39
39
|
import {
|
|
40
40
|
isMultiRuntimeEnabled,
|
|
41
41
|
init_multi_runtime2
|
|
@@ -43,18 +43,18 @@ import {
|
|
|
43
43
|
import {
|
|
44
44
|
revokeRuntimeTokensForRuntime,
|
|
45
45
|
init_users
|
|
46
|
-
} from "./cli-
|
|
46
|
+
} from "./cli-yzxqwcvq.js";
|
|
47
47
|
import {
|
|
48
48
|
TERMINAL_TASK_STATUSES,
|
|
49
49
|
init_types5
|
|
50
|
-
} from "./cli-
|
|
50
|
+
} from "./cli-1h4njv9y.js";
|
|
51
51
|
import {
|
|
52
52
|
resolveTemplate,
|
|
53
53
|
init_resolver
|
|
54
|
-
} from "./cli-
|
|
54
|
+
} from "./cli-2z2c4k6q.js";
|
|
55
55
|
import {
|
|
56
56
|
init_zod
|
|
57
|
-
} from "./cli-
|
|
57
|
+
} from "./cli-96234j5w.js";
|
|
58
58
|
import {
|
|
59
59
|
string2,
|
|
60
60
|
boolean,
|
|
@@ -63,7 +63,7 @@ import {
|
|
|
63
63
|
discriminatedUnion,
|
|
64
64
|
_enum2,
|
|
65
65
|
literal2
|
|
66
|
-
} from "./cli-
|
|
66
|
+
} from "./cli-qrzq3hvg.js";
|
|
67
67
|
import {
|
|
68
68
|
getAppUrl,
|
|
69
69
|
init_constants3
|
|
@@ -71,7 +71,7 @@ import {
|
|
|
71
71
|
import {
|
|
72
72
|
scrubSecrets,
|
|
73
73
|
init_secret_scrubber
|
|
74
|
-
} from "./cli-
|
|
74
|
+
} from "./cli-7e8sxqv5.js";
|
|
75
75
|
import {
|
|
76
76
|
__esm
|
|
77
77
|
} from "./cli-242037k3.js";
|
|
@@ -151,6 +151,7 @@ function rowToRuntimeInstance(row) {
|
|
|
151
151
|
idleSince: row.idle_since ?? null,
|
|
152
152
|
leaseExpiresAt: row.lease_expires_at ?? null,
|
|
153
153
|
taskId: row.task_id ?? null,
|
|
154
|
+
workspaceSlot: row.workspace_slot ?? null,
|
|
154
155
|
status: row.status,
|
|
155
156
|
reportedSlots: row.reported_slots,
|
|
156
157
|
credentialReady: row.credential_ready === null ? null : row.credential_ready === 1,
|
|
@@ -195,17 +196,26 @@ async function getRuntimeInstanceById(id) {
|
|
|
195
196
|
}
|
|
196
197
|
async function insertProvisioningRuntime(instance) {
|
|
197
198
|
const row = await getDbClient2().get(`INSERT INTO runtime_instances (id, agent_id, pool_id, controller_id, status,
|
|
198
|
-
reported_slots, provision_requested_at)
|
|
199
|
-
VALUES (?, ?, ?, ?, 'provisioning', ?, ?) RETURNING *`, [
|
|
199
|
+
reported_slots, provision_requested_at, workspace_slot)
|
|
200
|
+
VALUES (?, ?, ?, ?, 'provisioning', ?, ?, ?) RETURNING *`, [
|
|
200
201
|
instance.id,
|
|
201
202
|
instance.agentId,
|
|
202
203
|
instance.poolId,
|
|
203
204
|
instance.controllerId,
|
|
204
205
|
instance.reportedSlots ?? 1,
|
|
205
|
-
new Date().toISOString()
|
|
206
|
+
new Date().toISOString(),
|
|
207
|
+
instance.workspaceSlot ?? null
|
|
206
208
|
]);
|
|
207
209
|
return rowToRuntimeInstance(row);
|
|
208
210
|
}
|
|
211
|
+
async function nextFreeWorkspaceSlot(agentId) {
|
|
212
|
+
const taken = new Set((await getDbClient2().query(`SELECT workspace_slot AS slot FROM runtime_instances
|
|
213
|
+
WHERE agent_id = ? AND workspace_slot IS NOT NULL AND status != 'offline'`, [agentId])).map((row) => row.slot));
|
|
214
|
+
let slot = 0;
|
|
215
|
+
while (taken.has(slot))
|
|
216
|
+
slot++;
|
|
217
|
+
return slot;
|
|
218
|
+
}
|
|
209
219
|
async function markRuntimeTerminated(id, reason) {
|
|
210
220
|
await getDbClient2().transaction(async () => {
|
|
211
221
|
const runtime = await getRuntimeInstanceById(id);
|
|
@@ -226,7 +236,8 @@ async function touchRuntimeInstance(id, agentId) {
|
|
|
226
236
|
const result = await getDbClient2().run(`UPDATE runtime_instances
|
|
227
237
|
SET last_seen_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now'),
|
|
228
238
|
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
|
|
229
|
-
WHERE id = ? AND agent_id = ? AND status = 'active' AND last_seen_at >=
|
|
239
|
+
WHERE id = ? AND agent_id = ? AND status = 'active' AND last_seen_at >= ?
|
|
240
|
+
AND ${WORKSPACE_CONFIRMED_SQL}`, [id, agentId, runtimeLivenessCutoff()]);
|
|
230
241
|
return result.changes > 0;
|
|
231
242
|
}
|
|
232
243
|
async function markRuntimeInstanceOffline(id, agentId) {
|
|
@@ -323,7 +334,7 @@ async function expireStaleRuntimeInstances() {
|
|
|
323
334
|
async function listRuntimeInstancesForPool(poolId) {
|
|
324
335
|
return (await getDbClient2().query("SELECT * FROM runtime_instances WHERE pool_id = ? ORDER BY created_at", [poolId])).map(rowToRuntimeInstance);
|
|
325
336
|
}
|
|
326
|
-
var AGENT_MAX_TASKS_CONFIG_KEY = "AGENT_MAX_TASKS";
|
|
337
|
+
var AGENT_MAX_TASKS_CONFIG_KEY = "AGENT_MAX_TASKS", WORKSPACE_CONFIRMED_SQL = "(workspace_slot IS NULL OR external_handle IS NOT NULL)";
|
|
327
338
|
var init_multi_runtime = __esm(() => {
|
|
328
339
|
init_multi_runtime2();
|
|
329
340
|
init_secret_scrubber();
|
|
@@ -910,7 +921,7 @@ var init_approval_notifications = __esm(() => {
|
|
|
910
921
|
init_db4();
|
|
911
922
|
init_approvals();
|
|
912
923
|
init_resolver();
|
|
913
|
-
|
|
924
|
+
init_app4();
|
|
914
925
|
init_dm();
|
|
915
926
|
init_external_channel();
|
|
916
927
|
init_types5();
|
|
@@ -918,4 +929,4 @@ var init_approval_notifications = __esm(() => {
|
|
|
918
929
|
init_secret_scrubber();
|
|
919
930
|
});
|
|
920
931
|
|
|
921
|
-
export { AGENT_MAX_TASKS_CONFIG_KEY, reconcileAgentMaxTasksPolicy, resetAgentMaxTasksMirror, upsertSwarmConfigWithPolicyMirror, runtimeStaleThresholdMinutes, upsertRuntimeInstance, getRuntimeInstanceById, insertProvisioningRuntime, markRuntimeTerminated, touchRuntimeInstance, markRuntimeInstanceOffline, countActiveRuntimeInstancesForAgent, listRuntimeInstancesForAgent, setRuntimeCredentialReady, reconcileAgentStatusFromRuntimes, agentsWithLiveRuntime, liveRuntimeAuthModes, expireStaleRuntimeInstances, listRuntimeInstancesForPool, init_multi_runtime, ConfigQuestionSettingsSchema, ConfigStateSchema, readConfigState, normalizeApprovalQuestions, isConfigQuestion, parseConfigAnswer, skippedConfigResult, keptConfigResult, applyConfigAnswer, init_approval_config_question, resolveSlackConversationId, init_dm, dispatchApprovalNotifications2, postApprovalCancellationUpdates2, updateResolvedApprovalCards2, createApprovalFollowUpTask2, init_approval_notifications };
|
|
932
|
+
export { AGENT_MAX_TASKS_CONFIG_KEY, reconcileAgentMaxTasksPolicy, resetAgentMaxTasksMirror, upsertSwarmConfigWithPolicyMirror, runtimeStaleThresholdMinutes, upsertRuntimeInstance, getRuntimeInstanceById, insertProvisioningRuntime, nextFreeWorkspaceSlot, markRuntimeTerminated, touchRuntimeInstance, markRuntimeInstanceOffline, countActiveRuntimeInstancesForAgent, listRuntimeInstancesForAgent, setRuntimeCredentialReady, reconcileAgentStatusFromRuntimes, agentsWithLiveRuntime, liveRuntimeAuthModes, expireStaleRuntimeInstances, listRuntimeInstancesForPool, init_multi_runtime, ConfigQuestionSettingsSchema, ConfigStateSchema, readConfigState, normalizeApprovalQuestions, isConfigQuestion, parseConfigAnswer, skippedConfigResult, keptConfigResult, applyConfigAnswer, init_approval_config_question, resolveSlackConversationId, init_dm, dispatchApprovalNotifications2, postApprovalCancellationUpdates2, updateResolvedApprovalCards2, createApprovalFollowUpTask2, init_approval_notifications };
|